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

Pull staging driver tree merge from Greg Kroah-Hartman:
 "Here's the big staging tree merge for 3.8-rc1

  There's a lot of patches in here, the majority being the comedi
  rework/cleanup that has been ongoing and is causing a huge reduction
  in overall code size, which is amazing to watch.  We also removed some
  older drivers (telephony and rts_pstor), and added a new one (fwserial
  which also came in through the tty tree due to tty api changes, take
  that one if you get merge conflicts.)

  The iio and ipack drivers are moving out of the staging area into
  their own part of the kernel as they have been cleaned up sufficiently
  and are working well.

  Overall, again a reduction of code:
   768 files changed, 31887 insertions(+), 82166 deletions(-)

  All of this has been in the linux-next tree for a while.

  Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"

* tag 'staging-3.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (1298 commits)
  iio: imu: adis16480: remove duplicated include from adis16480.c
  iio: gyro: adis16136: remove duplicated include from adis16136.c
  iio:imu: adis16480: show_firmware() buffer too small
  iio:gyro: adis16136: divide by zero in write_frequency()
  iio: adc: Add Texas Instruments ADC081C021/027 support
  iio:ad7793: Add support for the ad7796 and ad7797
  iio:ad7793: Add support for the ad7798 and ad7799
  staging:iio: Move ad7793 driver out of staging
  staging:iio:ad7793: Implement stricter id checking
  staging:iio:ad7793: Move register definitions from header to source
  staging:iio:ad7793: Rework regulator handling
  staging:iio:ad7793: Rework platform data
  staging:iio:ad7793: Use kstrtol instead of strict_strtol
  staging:iio:ad7793: Use usleep_range instead of msleep
  staging:iio:ad7793: Fix temperature scale
  staging:iio:ad7793: Fix VDD monitor scale
  staging: gdm72xx: unlock on error in init_usb()
  staging: panel: pass correct lengths to keypad_send_key()
  staging: comedi: addi_apci_2032: fix interrupt support
  staging: comedi: addi_apci_2032: move i_APCI2032_ConfigDigitalOutput()
  ...

751 files changed, 30857 insertions, 81574 deletions

diff --git a/drivers/Kconfig b/drivers/Kconfig
index dbdefa3fe775..f5fb0722a63a 100644
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -156,4 +156,6 @@ source "drivers/pwm/Kconfig"
 
 source "drivers/irqchip/Kconfig"
 
+source "drivers/ipack/Kconfig"
+
 endmenu
diff --git a/drivers/Makefile b/drivers/Makefile
index a16a8d001ae0..7863b9fee50b 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -145,3 +145,4 @@ obj-$(CONFIG_EXTCON)		+= extcon/
 obj-$(CONFIG_MEMORY)            += memory/
 obj-$(CONFIG_IIO)               += iio/
 obj-$(CONFIG_VME_BUS)           += vme/
+obj-$(CONFIG_IPACK_BUS)         += ipack/
diff --git a/drivers/iio/Kconfig b/drivers/iio/Kconfig
index fc937aca71fb..b2f963be3993 100644
--- a/drivers/iio/Kconfig
+++ b/drivers/iio/Kconfig
@@ -20,6 +20,12 @@ config IIO_BUFFER
 
 if IIO_BUFFER
 
+config IIO_BUFFER_CB
+boolean "IIO callback buffer used for push in-kernel interfaces"
+        help
+          Should be selected by any drivers that do-inkernel push
+          usage.  That is, those where the data is pushed to the consumer.
+
 config IIO_KFIFO_BUF
         select IIO_TRIGGER
         tristate "Industrial I/O buffering based on kfifo"
@@ -57,11 +63,12 @@ config IIO_CONSUMERS_PER_TRIGGER
 source "drivers/iio/accel/Kconfig"
 source "drivers/iio/adc/Kconfig"
 source "drivers/iio/amplifiers/Kconfig"
-source "drivers/iio/light/Kconfig"
-source "drivers/iio/frequency/Kconfig"
-source "drivers/iio/dac/Kconfig"
 source "drivers/iio/common/Kconfig"
+source "drivers/iio/dac/Kconfig"
+source "drivers/iio/frequency/Kconfig"
 source "drivers/iio/gyro/Kconfig"
+source "drivers/iio/imu/Kconfig"
+source "drivers/iio/light/Kconfig"
 source "drivers/iio/magnetometer/Kconfig"
 
 endif # IIO
diff --git a/drivers/iio/Makefile b/drivers/iio/Makefile
index 761f2b65ac52..a0e8cdd67e4d 100644
--- a/drivers/iio/Makefile
+++ b/drivers/iio/Makefile
@@ -6,6 +6,7 @@ obj-$(CONFIG_IIO) += industrialio.o
 industrialio-y := industrialio-core.o industrialio-event.o inkern.o
 industrialio-$(CONFIG_IIO_BUFFER) += industrialio-buffer.o
 industrialio-$(CONFIG_IIO_TRIGGER) += industrialio-trigger.o
+industrialio-$(CONFIG_IIO_BUFFER_CB) += buffer_cb.o
 
 obj-$(CONFIG_IIO_TRIGGERED_BUFFER) += industrialio-triggered-buffer.o
 obj-$(CONFIG_IIO_KFIFO_BUF) += kfifo_buf.o
@@ -13,9 +14,10 @@ obj-$(CONFIG_IIO_KFIFO_BUF) += kfifo_buf.o
 obj-y += accel/
 obj-y += adc/
 obj-y += amplifiers/
-obj-y += light/
-obj-y += frequency/
-obj-y += dac/
 obj-y += common/
+obj-y += dac/
 obj-y += gyro/
+obj-y += frequency/
+obj-y += imu/
+obj-y += light/
 obj-y += magnetometer/
diff --git a/drivers/iio/accel/Kconfig b/drivers/iio/accel/Kconfig
index b2510c4d9a5a..fe4bcd7c5b12 100644
--- a/drivers/iio/accel/Kconfig
+++ b/drivers/iio/accel/Kconfig
@@ -8,7 +8,7 @@ config HID_SENSOR_ACCEL_3D
         select IIO_BUFFER
         select IIO_TRIGGERED_BUFFER
         select HID_SENSOR_IIO_COMMON
-        tristate "HID Acelerometers 3D"
+        tristate "HID Accelerometers 3D"
         help
           Say yes here to build support for the HID SENSOR
           accelerometers 3D.
diff --git a/drivers/iio/accel/hid-sensor-accel-3d.c b/drivers/iio/accel/hid-sensor-accel-3d.c
index 314a4057879e..e67bb912bd19 100644
--- a/drivers/iio/accel/hid-sensor-accel-3d.c
+++ b/drivers/iio/accel/hid-sensor-accel-3d.c
@@ -197,21 +197,8 @@ static const struct iio_info accel_3d_info = {
 /* Function to push data to buffer */
 static void hid_sensor_push_data(struct iio_dev *indio_dev, u8 *data, int len)
 {
-        struct iio_buffer *buffer = indio_dev->buffer;
-        int datum_sz;
-
         dev_dbg(&indio_dev->dev, "hid_sensor_push_data\n");
-        if (!buffer) {
-                dev_err(&indio_dev->dev, "Buffer == NULL\n");
-                return;
-        }
-        datum_sz = buffer->access->get_bytes_per_datum(buffer);
-        if (len > datum_sz) {
-                dev_err(&indio_dev->dev, "Datum size mismatch %d:%d\n", len,
-                                datum_sz);
-                return;
-        }
-        iio_push_to_buffer(buffer, (u8 *)data);
+        iio_push_to_buffers(indio_dev, (u8 *)data);
 }
 
 /* Callback handler to send event after all samples are received and captured */
@@ -319,10 +306,10 @@ static int __devinit hid_accel_3d_probe(struct platform_device *pdev)
                 goto error_free_dev;
         }
 
-        channels = kmemdup(accel_3d_channels,
-                                        sizeof(accel_3d_channels),
-                                        GFP_KERNEL);
+        channels = kmemdup(accel_3d_channels, sizeof(accel_3d_channels),
+                           GFP_KERNEL);
         if (!channels) {
+                ret = -ENOMEM;
                 dev_err(&pdev->dev, "failed to duplicate channels\n");
                 goto error_free_dev;
         }
diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig
index 492758120338..961b8d0a4bac 100644
--- a/drivers/iio/adc/Kconfig
+++ b/drivers/iio/adc/Kconfig
@@ -18,6 +18,18 @@ config AD7266
           Say yes here to build support for Analog Devices AD7265 and AD7266
           ADCs.
 
+config AD7298
+        tristate "Analog Devices AD7298 ADC driver"
+        depends on SPI
+        select IIO_BUFFER
+        select IIO_TRIGGERED_BUFFER
+        help
+          Say yes here to build support for Analog Devices AD7298
+          8 Channel ADC with temperature sensor.
+
+          To compile this driver as a module, choose M here: the
+          module will be called ad7298.
+
 config AD7791
         tristate "Analog Devices AD7791 ADC driver"
         depends on SPI
@@ -30,6 +42,18 @@ config AD7791
           To compile this driver as a module, choose M here: the module will be
           called ad7791.
 
+config AD7793
+        tristate "Analog Devices AD7793 and similar ADCs driver"
+        depends on SPI
+        select AD_SIGMA_DELTA
+        help
+          Say yes here to build support for Analog Devices AD7785, AD7792, AD7793,
+          AD7794 and AD7795 SPI analog to digital converters (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 AD7793.
+
 config AD7476
         tristate "Analog Devices AD7476 and similar 1-channel ADCs driver"
         depends on SPI
@@ -45,6 +69,19 @@ 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_BUFFER
+        select IIO_TRIGGERED_BUFFER
+        help
+          Say yes here to build support for Analog Devices
+          AD7887 SPI analog to digital converter (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 AT91_ADC
         tristate "Atmel AT91 ADC"
         depends on ARCH_AT91
@@ -60,4 +97,32 @@ config LP8788_ADC
         help
           Say yes here to build support for TI LP8788 ADC.
 
+config MAX1363
+        tristate "Maxim max1363 ADC driver"
+        depends on I2C
+        select IIO_TRIGGER
+        select MAX1363_RING_BUFFER
+        select IIO_BUFFER
+        select IIO_KFIFO_BUF
+        help
+          Say yes here to build support for many Maxim i2c analog to digital
+          converters (ADC). (max1361, max1362, max1363, max1364, max1036,
+          max1037, max1038, max1039, max1136, max1136, max1137, max1138,
+          max1139, max1236, max1237, max11238, max1239, max11600, max11601,
+          max11602, max11603, max11604, max11605, max11606, max11607,
+          max11608, max11609, max11610, max11611, max11612, max11613,
+          max11614, max11615, max11616, max11617, max11644, max11645,
+          max11646, max11647) Provides direct access via sysfs and buffered
+          data via the iio dev interface.
+
+config TI_ADC081C
+        tristate "Texas Instruments ADC081C021/027"
+        depends on I2C
+        help
+          If you say yes here you get support for Texas Instruments ADC081C021
+          and ADC081C027 ADC chips.
+
+          This driver can also be built as a module. If so, the module will be
+          called ti-adc081c.
+
 endmenu
diff --git a/drivers/iio/adc/Makefile b/drivers/iio/adc/Makefile
index 900995d5e179..472fd7cd2417 100644
--- a/drivers/iio/adc/Makefile
+++ b/drivers/iio/adc/Makefile
@@ -4,7 +4,13 @@
 
 obj-$(CONFIG_AD_SIGMA_DELTA) += ad_sigma_delta.o
 obj-$(CONFIG_AD7266) += ad7266.o
+obj-$(CONFIG_AD7298) += ad7298.o
 obj-$(CONFIG_AD7476) += ad7476.o
 obj-$(CONFIG_AD7791) += ad7791.o
+obj-$(CONFIG_AD7793) += ad7793.o
+obj-$(CONFIG_AD7887) += ad7887.o
 obj-$(CONFIG_AT91_ADC) += at91_adc.o
 obj-$(CONFIG_LP8788_ADC) += lp8788_adc.o
+obj-$(CONFIG_MAX1363) += max1363.o
+obj-$(CONFIG_TI_ADC081C) += ti-adc081c.o
+
diff --git a/drivers/iio/adc/ad7266.c b/drivers/iio/adc/ad7266.c
index b11f214779a2..a6f4fc5f8201 100644
--- a/drivers/iio/adc/ad7266.c
+++ b/drivers/iio/adc/ad7266.c
@@ -91,7 +91,6 @@ static irqreturn_t ad7266_trigger_handler(int irq, void *p)
 {
         struct iio_poll_func *pf = p;
         struct iio_dev *indio_dev = pf->indio_dev;
-        struct iio_buffer *buffer = indio_dev->buffer;
         struct ad7266_state *st = iio_priv(indio_dev);
         int ret;
 
@@ -99,7 +98,7 @@ static irqreturn_t ad7266_trigger_handler(int irq, void *p)
         if (ret == 0) {
                 if (indio_dev->scan_timestamp)
                         ((s64 *)st->data)[1] = pf->timestamp;
-                iio_push_to_buffer(buffer, (u8 *)st->data);
+                iio_push_to_buffers(indio_dev, (u8 *)st->data);
         }
 
         iio_trigger_notify_done(indio_dev->trig);
diff --git a/drivers/staging/iio/adc/ad7298_core.c b/drivers/iio/adc/ad7298.c
index 4c75114e7d7c..2364807a5d6c 100644
--- a/drivers/staging/iio/adc/ad7298_core.c
+++ b/drivers/iio/adc/ad7298.c
@@ -15,12 +15,48 @@
 #include <linux/err.h>
 #include <linux/delay.h>
 #include <linux/module.h>
+#include <linux/interrupt.h>
 
 #include <linux/iio/iio.h>
 #include <linux/iio/sysfs.h>
 #include <linux/iio/buffer.h>
-
-#include "ad7298.h"
+#include <linux/iio/trigger_consumer.h>
+#include <linux/iio/triggered_buffer.h>
+
+#include <linux/platform_data/ad7298.h>
+
+#define AD7298_WRITE    (1 << 15) /* write to the control register */
+#define AD7298_REPEAT   (1 << 14) /* repeated conversion enable */
+#define AD7298_CH(x)    (1 << (13 - (x))) /* channel select */
+#define AD7298_TSENSE   (1 << 5) /* temperature conversion enable */
+#define AD7298_EXTREF   (1 << 2) /* external reference enable */
+#define AD7298_TAVG     (1 << 1) /* temperature sensor averaging enable */
+#define AD7298_PDD      (1 << 0) /* partial power down enable */
+
+#define AD7298_MAX_CHAN         8
+#define AD7298_BITS             12
+#define AD7298_STORAGE_BITS     16
+#define AD7298_INTREF_mV        2500
+
+#define AD7298_CH_TEMP          9
+
+#define RES_MASK(bits)  ((1 << (bits)) - 1)
+
+struct ad7298_state {
+        struct spi_device               *spi;
+        struct regulator                *reg;
+        unsigned                        ext_ref;
+        struct spi_transfer             ring_xfer[10];
+        struct spi_transfer             scan_single_xfer[3];
+        struct spi_message              ring_msg;
+        struct spi_message              scan_single_msg;
+        /*
+         * DMA (thus cache coherency maintenance) requires the
+         * transfer buffers to live in their own cache lines.
+         */
+        __be16                          rx_buf[12] ____cacheline_aligned;
+        __be16                          tx_buf[2];
+};
 
 #define AD7298_V_CHAN(index)                                            \
         {                                                               \
@@ -35,6 +71,7 @@
                         .sign = 'u',                                    \
                         .realbits = 12,                                 \
                         .storagebits = 16,                              \
+                        .endianness = IIO_BE,                           \
                 },                                                      \
         }
 
@@ -44,7 +81,8 @@ static const struct iio_chan_spec ad7298_channels[] = {
                 .indexed = 1,
                 .channel = 0,
                 .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |
-                IIO_CHAN_INFO_SCALE_SEPARATE_BIT,
+                        IIO_CHAN_INFO_SCALE_SEPARATE_BIT |
+                        IIO_CHAN_INFO_OFFSET_SEPARATE_BIT,
                 .address = AD7298_CH_TEMP,
                 .scan_index = -1,
                 .scan_type = {
@@ -64,6 +102,84 @@ static const struct iio_chan_spec ad7298_channels[] = {
         IIO_CHAN_SOFT_TIMESTAMP(8),
 };
 
+/**
+ * ad7298_update_scan_mode() setup the spi transfer buffer for the new scan mask
+ **/
+static int ad7298_update_scan_mode(struct iio_dev *indio_dev,
+        const unsigned long *active_scan_mask)
+{
+        struct ad7298_state *st = iio_priv(indio_dev);
+        int i, m;
+        unsigned short command;
+        int scan_count;
+
+        /* Now compute overall size */
+        scan_count = bitmap_weight(active_scan_mask, indio_dev->masklength);
+
+        command = AD7298_WRITE | st->ext_ref;
+
+        for (i = 0, m = AD7298_CH(0); i < AD7298_MAX_CHAN; i++, m >>= 1)
+                if (test_bit(i, active_scan_mask))
+                        command |= m;
+
+        st->tx_buf[0] = cpu_to_be16(command);
+
+        /* build spi ring message */
+        st->ring_xfer[0].tx_buf = &st->tx_buf[0];
+        st->ring_xfer[0].len = 2;
+        st->ring_xfer[0].cs_change = 1;
+        st->ring_xfer[1].tx_buf = &st->tx_buf[1];
+        st->ring_xfer[1].len = 2;
+        st->ring_xfer[1].cs_change = 1;
+
+        spi_message_init(&st->ring_msg);
+        spi_message_add_tail(&st->ring_xfer[0], &st->ring_msg);
+        spi_message_add_tail(&st->ring_xfer[1], &st->ring_msg);
+
+        for (i = 0; i < scan_count; i++) {
+                st->ring_xfer[i + 2].rx_buf = &st->rx_buf[i];
+                st->ring_xfer[i + 2].len = 2;
+                st->ring_xfer[i + 2].cs_change = 1;
+                spi_message_add_tail(&st->ring_xfer[i + 2], &st->ring_msg);
+        }
+        /* make sure last transfer cs_change is not set */
+        st->ring_xfer[i + 1].cs_change = 0;
+
+        return 0;
+}
+
+/**
+ * ad7298_trigger_handler() bh of trigger launched polling to ring buffer
+ *
+ * Currently there is no option in this driver to disable the saving of
+ * timestamps within the ring.
+ **/
+static irqreturn_t ad7298_trigger_handler(int irq, void *p)
+{
+        struct iio_poll_func *pf = p;
+        struct iio_dev *indio_dev = pf->indio_dev;
+        struct ad7298_state *st = iio_priv(indio_dev);
+        s64 time_ns = 0;
+        int b_sent;
+
+        b_sent = spi_sync(st->spi, &st->ring_msg);
+        if (b_sent)
+                goto done;
+
+        if (indio_dev->scan_timestamp) {
+                time_ns = iio_get_time_ns();
+                memcpy((u8 *)st->rx_buf + indio_dev->scan_bytes - sizeof(s64),
+                        &time_ns, sizeof(time_ns));
+        }
+
+        iio_push_to_buffers(indio_dev, (u8 *)st->rx_buf);
+
+done:
+        iio_trigger_notify_done(indio_dev->trig);
+
+        return IRQ_HANDLED;
+}
+
 static int ad7298_scan_direct(struct ad7298_state *st, unsigned ch)
 {
         int ret;
@@ -79,7 +195,7 @@ static int ad7298_scan_direct(struct ad7298_state *st, unsigned ch)
 
 static int ad7298_scan_temp(struct ad7298_state *st, int *val)
 {
-        int tmp, ret;
+        int ret;
         __be16 buf;
 
         buf = cpu_to_be16(AD7298_WRITE | AD7298_TSENSE |
@@ -101,24 +217,24 @@ static int ad7298_scan_temp(struct ad7298_state *st, int *val)
         if (ret)
                 return ret;
 
-        tmp = be16_to_cpu(buf) & RES_MASK(AD7298_BITS);
+        *val = sign_extend32(be16_to_cpu(buf), 11);
 
-        /*
-         * One LSB of the ADC corresponds to 0.25 deg C.
-         * The temperature reading is in 12-bit twos complement format
-         */
+        return 0;
+}
 
-        if (tmp & (1 << (AD7298_BITS - 1))) {
-                tmp = (4096 - tmp) * 250;
-                tmp -= (2 * tmp);
+static int ad7298_get_ref_voltage(struct ad7298_state *st)
+{
+        int vref;
+
+        if (st->ext_ref) {
+                vref = regulator_get_voltage(st->reg);
+                if (vref < 0)
+                        return vref;
 
+                return vref / 1000;
         } else {
-                tmp *= 250; /* temperature in milli degrees Celsius */
+                return AD7298_INTREF_mV;
         }
-
-        *val = tmp;
-
-        return 0;
 }
 
 static int ad7298_read_raw(struct iio_dev *indio_dev,
@@ -129,7 +245,6 @@ static int ad7298_read_raw(struct iio_dev *indio_dev,
 {
         int ret;
         struct ad7298_state *st = iio_priv(indio_dev);
-        unsigned int scale_uv;
 
         switch (m) {
         case IIO_CHAN_INFO_RAW:
@@ -154,17 +269,19 @@ static int ad7298_read_raw(struct iio_dev *indio_dev,
         case IIO_CHAN_INFO_SCALE:
                 switch (chan->type) {
                 case IIO_VOLTAGE:
-                        scale_uv = (st->int_vref_mv * 1000) >> AD7298_BITS;
-                        *val =  scale_uv / 1000;
-                        *val2 = (scale_uv % 1000) * 1000;
-                        return IIO_VAL_INT_PLUS_MICRO;
+                        *val = ad7298_get_ref_voltage(st);
+                        *val2 = chan->scan_type.realbits;
+                        return IIO_VAL_FRACTIONAL_LOG2;
                 case IIO_TEMP:
-                        *val =  1;
-                        *val2 = 0;
-                        return IIO_VAL_INT_PLUS_MICRO;
+                        *val = ad7298_get_ref_voltage(st);
+                        *val2 = 10;
+                        return IIO_VAL_FRACTIONAL;
                 default:
                         return -EINVAL;
                 }
+        case IIO_CHAN_INFO_OFFSET:
+                *val = 1093 - 2732500 / ad7298_get_ref_voltage(st);
+                return IIO_VAL_INT;
         }
         return -EINVAL;
 }
@@ -179,16 +296,23 @@ static int __devinit ad7298_probe(struct spi_device *spi)
 {
         struct ad7298_platform_data *pdata = spi->dev.platform_data;
         struct ad7298_state *st;
-        int ret;
         struct iio_dev *indio_dev = iio_device_alloc(sizeof(*st));
+        int ret;
 
         if (indio_dev == NULL)
                 return -ENOMEM;
 
         st = iio_priv(indio_dev);
 
-        st->reg = regulator_get(&spi->dev, "vcc");
-        if (!IS_ERR(st->reg)) {
+        if (pdata && pdata->ext_ref)
+                st->ext_ref = AD7298_EXTREF;
+
+        if (st->ext_ref) {
+                st->reg = regulator_get(&spi->dev, "vref");
+                if (IS_ERR(st->reg)) {
+                        ret = PTR_ERR(st->reg);
+                        goto error_free;
+                }
                 ret = regulator_enable(st->reg);
                 if (ret)
                         goto error_put_reg;
@@ -221,14 +345,8 @@ static int __devinit ad7298_probe(struct spi_device *spi)
         spi_message_add_tail(&st->scan_single_xfer[1], &st->scan_single_msg);
         spi_message_add_tail(&st->scan_single_xfer[2], &st->scan_single_msg);
 
-        if (pdata && pdata->vref_mv) {
-                st->int_vref_mv = pdata->vref_mv;
-                st->ext_ref = AD7298_EXTREF;
-        } else {
-                st->int_vref_mv = AD7298_INTREF_mV;
-        }
-
-        ret = ad7298_register_ring_funcs_and_init(indio_dev);
+        ret = iio_triggered_buffer_setup(indio_dev, NULL,
+                        &ad7298_trigger_handler, NULL);
         if (ret)
                 goto error_disable_reg;
 
@@ -239,13 +357,14 @@ static int __devinit ad7298_probe(struct spi_device *spi)
         return 0;
 
 error_cleanup_ring:
-        ad7298_ring_cleanup(indio_dev);
+        iio_triggered_buffer_cleanup(indio_dev);
 error_disable_reg:
-        if (!IS_ERR(st->reg))
+        if (st->ext_ref)
                 regulator_disable(st->reg);
 error_put_reg:
-        if (!IS_ERR(st->reg))
+        if (st->ext_ref)
                 regulator_put(st->reg);
+error_free:
         iio_device_free(indio_dev);
 
         return ret;
@@ -257,8 +376,8 @@ static int __devexit ad7298_remove(struct spi_device *spi)
         struct ad7298_state *st = iio_priv(indio_dev);
 
         iio_device_unregister(indio_dev);
-        ad7298_ring_cleanup(indio_dev);
-        if (!IS_ERR(st->reg)) {
+        iio_triggered_buffer_cleanup(indio_dev);
+        if (st->ext_ref) {
                 regulator_disable(st->reg);
                 regulator_put(st->reg);
         }
diff --git a/drivers/iio/adc/ad7476.c b/drivers/iio/adc/ad7476.c
index 7f2f45a0a48d..330248bfebae 100644
--- a/drivers/iio/adc/ad7476.c
+++ b/drivers/iio/adc/ad7476.c
@@ -76,7 +76,7 @@ static irqreturn_t ad7476_trigger_handler(int irq, void  *p)
         if (indio_dev->scan_timestamp)
                 ((s64 *)st->data)[1] = time_ns;
 
-        iio_push_to_buffer(indio_dev->buffer, st->data);
+        iio_push_to_buffers(indio_dev, st->data);
 done:
         iio_trigger_notify_done(indio_dev->trig);
 
diff --git a/drivers/staging/iio/adc/ad7793.c b/drivers/iio/adc/ad7793.c
index 691a7be6f5cb..334e31ff7a4e 100644
--- a/drivers/staging/iio/adc/ad7793.c
+++ b/drivers/iio/adc/ad7793.c
@@ -25,8 +25,106 @@
 #include <linux/iio/trigger_consumer.h>
 #include <linux/iio/triggered_buffer.h>
 #include <linux/iio/adc/ad_sigma_delta.h>
-
-#include "ad7793.h"
+#include <linux/platform_data/ad7793.h>
+
+/* Registers */
+#define AD7793_REG_COMM         0 /* Communications Register (WO, 8-bit) */
+#define AD7793_REG_STAT         0 /* Status Register         (RO, 8-bit) */
+#define AD7793_REG_MODE         1 /* Mode Register           (RW, 16-bit */
+#define AD7793_REG_CONF         2 /* Configuration Register  (RW, 16-bit) */
+#define AD7793_REG_DATA         3 /* Data Register           (RO, 16-/24-bit) */
+#define AD7793_REG_ID           4 /* ID Register             (RO, 8-bit) */
+#define AD7793_REG_IO           5 /* IO Register             (RO, 8-bit) */
+#define AD7793_REG_OFFSET       6 /* Offset Register         (RW, 16-bit
+                                   * (AD7792)/24-bit (AD7793)) */
+#define AD7793_REG_FULLSALE     7 /* Full-Scale Register
+                                   * (RW, 16-bit (AD7792)/24-bit (AD7793)) */
+
+/* Communications Register Bit Designations (AD7793_REG_COMM) */
+#define AD7793_COMM_WEN         (1 << 7) /* Write Enable */
+#define AD7793_COMM_WRITE       (0 << 6) /* Write Operation */
+#define AD7793_COMM_READ        (1 << 6) /* Read Operation */
+#define AD7793_COMM_ADDR(x)     (((x) & 0x7) << 3) /* Register Address */
+#define AD7793_COMM_CREAD       (1 << 2) /* Continuous Read of Data Register */
+
+/* Status Register Bit Designations (AD7793_REG_STAT) */
+#define AD7793_STAT_RDY         (1 << 7) /* Ready */
+#define AD7793_STAT_ERR         (1 << 6) /* Error (Overrange, Underrange) */
+#define AD7793_STAT_CH3         (1 << 2) /* Channel 3 */
+#define AD7793_STAT_CH2         (1 << 1) /* Channel 2 */
+#define AD7793_STAT_CH1         (1 << 0) /* Channel 1 */
+
+/* Mode Register Bit Designations (AD7793_REG_MODE) */
+#define AD7793_MODE_SEL(x)      (((x) & 0x7) << 13) /* Operation Mode Select */
+#define AD7793_MODE_SEL_MASK    (0x7 << 13) /* Operation Mode Select mask */
+#define AD7793_MODE_CLKSRC(x)   (((x) & 0x3) << 6) /* ADC Clock Source Select */
+#define AD7793_MODE_RATE(x)     ((x) & 0xF) /* Filter Update Rate Select */
+
+#define AD7793_MODE_CONT                0 /* Continuous Conversion Mode */
+#define AD7793_MODE_SINGLE              1 /* Single Conversion Mode */
+#define AD7793_MODE_IDLE                2 /* Idle Mode */
+#define AD7793_MODE_PWRDN               3 /* Power-Down Mode */
+#define AD7793_MODE_CAL_INT_ZERO        4 /* Internal Zero-Scale Calibration */
+#define AD7793_MODE_CAL_INT_FULL        5 /* Internal Full-Scale Calibration */
+#define AD7793_MODE_CAL_SYS_ZERO        6 /* System Zero-Scale Calibration */
+#define AD7793_MODE_CAL_SYS_FULL        7 /* System Full-Scale Calibration */
+
+#define AD7793_CLK_INT          0 /* Internal 64 kHz Clock not
+                                   * available at the CLK pin */
+#define AD7793_CLK_INT_CO       1 /* Internal 64 kHz Clock available
+                                   * at the CLK pin */
+#define AD7793_CLK_EXT          2 /* External 64 kHz Clock */
+#define AD7793_CLK_EXT_DIV2     3 /* External Clock divided by 2 */
+
+/* Configuration Register Bit Designations (AD7793_REG_CONF) */
+#define AD7793_CONF_VBIAS(x)    (((x) & 0x3) << 14) /* Bias Voltage
+                                                     * Generator Enable */
+#define AD7793_CONF_BO_EN       (1 << 13) /* Burnout Current Enable */
+#define AD7793_CONF_UNIPOLAR    (1 << 12) /* Unipolar/Bipolar Enable */
+#define AD7793_CONF_BOOST       (1 << 11) /* Boost Enable */
+#define AD7793_CONF_GAIN(x)     (((x) & 0x7) << 8) /* Gain Select */
+#define AD7793_CONF_REFSEL(x)   ((x) << 6) /* INT/EXT Reference Select */
+#define AD7793_CONF_BUF         (1 << 4) /* Buffered Mode Enable */
+#define AD7793_CONF_CHAN(x)     ((x) & 0xf) /* Channel select */
+#define AD7793_CONF_CHAN_MASK   0xf /* Channel select mask */
+
+#define AD7793_CH_AIN1P_AIN1M   0 /* AIN1(+) - AIN1(-) */
+#define AD7793_CH_AIN2P_AIN2M   1 /* AIN2(+) - AIN2(-) */
+#define AD7793_CH_AIN3P_AIN3M   2 /* AIN3(+) - AIN3(-) */
+#define AD7793_CH_AIN1M_AIN1M   3 /* AIN1(-) - AIN1(-) */
+#define AD7793_CH_TEMP          6 /* Temp Sensor */
+#define AD7793_CH_AVDD_MONITOR  7 /* AVDD Monitor */
+
+#define AD7795_CH_AIN4P_AIN4M   4 /* AIN4(+) - AIN4(-) */
+#define AD7795_CH_AIN5P_AIN5M   5 /* AIN5(+) - AIN5(-) */
+#define AD7795_CH_AIN6P_AIN6M   6 /* AIN6(+) - AIN6(-) */
+#define AD7795_CH_AIN1M_AIN1M   8 /* AIN1(-) - AIN1(-) */
+
+/* ID Register Bit Designations (AD7793_REG_ID) */
+#define AD7785_ID               0xB
+#define AD7792_ID               0xA
+#define AD7793_ID               0xB
+#define AD7794_ID               0xF
+#define AD7795_ID               0xF
+#define AD7796_ID               0xA
+#define AD7797_ID               0xB
+#define AD7798_ID               0x8
+#define AD7799_ID               0x9
+#define AD7793_ID_MASK          0xF
+
+/* IO (Excitation Current Sources) Register Bit Designations (AD7793_REG_IO) */
+#define AD7793_IO_IEXC1_IOUT1_IEXC2_IOUT2       0 /* IEXC1 connect to IOUT1,
+                                                   * IEXC2 connect to IOUT2 */
+#define AD7793_IO_IEXC1_IOUT2_IEXC2_IOUT1       1 /* IEXC1 connect to IOUT2,
+                                                   * IEXC2 connect to IOUT1 */
+#define AD7793_IO_IEXC1_IEXC2_IOUT1             2 /* Both current sources
+                                                   * IEXC1,2 connect to IOUT1 */
+#define AD7793_IO_IEXC1_IEXC2_IOUT2             3 /* Both current sources
+                                                   * IEXC1,2 connect to IOUT2 */
+
+#define AD7793_IO_IXCEN_10uA    (1 << 0) /* Excitation Current 10uA */
+#define AD7793_IO_IXCEN_210uA   (2 << 0) /* Excitation Current 210uA */
+#define AD7793_IO_IXCEN_1mA     (3 << 0) /* Excitation Current 1mA */
 
 /* NOTE:
  * The AD7792/AD7793 features a dual use data out ready DOUT/RDY output.
@@ -36,9 +134,21 @@
  * The DOUT/RDY output must also be wired to an interrupt capable GPIO.
  */
 
+#define AD7793_FLAG_HAS_CLKSEL          BIT(0)
+#define AD7793_FLAG_HAS_REFSEL          BIT(1)
+#define AD7793_FLAG_HAS_VBIAS           BIT(2)
+#define AD7793_HAS_EXITATION_CURRENT    BIT(3)
+#define AD7793_FLAG_HAS_GAIN            BIT(4)
+#define AD7793_FLAG_HAS_BUFFER          BIT(5)
+
 struct ad7793_chip_info {
+        unsigned int id;
         const struct iio_chan_spec *channels;
         unsigned int num_channels;
+        unsigned int flags;
+
+        const struct iio_info *iio_info;
+        const u16 *sample_freq_avail;
 };
 
 struct ad7793_state {
@@ -59,6 +169,10 @@ enum ad7793_supported_device_ids {
         ID_AD7793,
         ID_AD7794,
         ID_AD7795,
+        ID_AD7796,
+        ID_AD7797,
+        ID_AD7798,
+        ID_AD7799,
 };
 
 static struct ad7793_state *ad_sigma_delta_to_ad7793(struct ad_sigma_delta *sd)
@@ -110,19 +224,52 @@ static int ad7793_calibrate_all(struct ad7793_state *st)
                                    ARRAY_SIZE(ad7793_calib_arr));
 }
 
-static int ad7793_setup(struct iio_dev *indio_dev,
+static int ad7793_check_platform_data(struct ad7793_state *st,
         const struct ad7793_platform_data *pdata)
 {
+        if ((pdata->current_source_direction == AD7793_IEXEC1_IEXEC2_IOUT1 ||
+                pdata->current_source_direction == AD7793_IEXEC1_IEXEC2_IOUT2) &&
+                ((pdata->exitation_current != AD7793_IX_10uA) &&
+                (pdata->exitation_current != AD7793_IX_210uA)))
+                return -EINVAL;
+
+        if (!(st->chip_info->flags & AD7793_FLAG_HAS_CLKSEL) &&
+                pdata->clock_src != AD7793_CLK_SRC_INT)
+                return -EINVAL;
+
+        if (!(st->chip_info->flags & AD7793_FLAG_HAS_REFSEL) &&
+                pdata->refsel != AD7793_REFSEL_REFIN1)
+                return -EINVAL;
+
+        if (!(st->chip_info->flags & AD7793_FLAG_HAS_VBIAS) &&
+                pdata->bias_voltage != AD7793_BIAS_VOLTAGE_DISABLED)
+                return -EINVAL;
+
+        if (!(st->chip_info->flags & AD7793_HAS_EXITATION_CURRENT) &&
+                pdata->exitation_current != AD7793_IX_DISABLED)
+                return -EINVAL;
+
+        return 0;
+}
+
+static int ad7793_setup(struct iio_dev *indio_dev,
+        const struct ad7793_platform_data *pdata,
+        unsigned int vref_mv)
+{
         struct ad7793_state *st = iio_priv(indio_dev);
         int i, ret = -1;
         unsigned long long scale_uv;
         u32 id;
 
+        ret = ad7793_check_platform_data(st, pdata);
+        if (ret)
+                return ret;
+
         /* reset the serial interface */
         ret = spi_write(st->sd.spi, (u8 *)&ret, sizeof(ret));
         if (ret < 0)
                 goto out;
-        msleep(1); /* Wait for at least 500us */
+        usleep_range(500, 2000); /* Wait for at least 500us */
 
         /* write/read test for device presence */
         ret = ad_sd_read_reg(&st->sd, AD7793_REG_ID, 1, &id);
@@ -131,13 +278,32 @@ static int ad7793_setup(struct iio_dev *indio_dev,
 
         id &= AD7793_ID_MASK;
 
-        if (!((id == AD7792_ID) || (id == AD7793_ID) || (id == AD7795_ID))) {
+        if (id != st->chip_info->id) {
                 dev_err(&st->sd.spi->dev, "device ID query failed\n");
                 goto out;
         }
 
-        st->mode = pdata->mode;
-        st->conf = pdata->conf;
+        st->mode = AD7793_MODE_RATE(1);
+        st->conf = 0;
+
+        if (st->chip_info->flags & AD7793_FLAG_HAS_CLKSEL)
+                st->mode |= AD7793_MODE_CLKSRC(pdata->clock_src);
+        if (st->chip_info->flags & AD7793_FLAG_HAS_REFSEL)
+                st->conf |= AD7793_CONF_REFSEL(pdata->refsel);
+        if (st->chip_info->flags & AD7793_FLAG_HAS_VBIAS)
+                st->conf |= AD7793_CONF_VBIAS(pdata->bias_voltage);
+        if (pdata->buffered || !(st->chip_info->flags & AD7793_FLAG_HAS_BUFFER))
+                st->conf |= AD7793_CONF_BUF;
+        if (pdata->boost_enable &&
+                (st->chip_info->flags & AD7793_FLAG_HAS_VBIAS))
+                st->conf |= AD7793_CONF_BOOST;
+        if (pdata->burnout_current)
+                st->conf |= AD7793_CONF_BO_EN;
+        if (pdata->unipolar)
+                st->conf |= AD7793_CONF_UNIPOLAR;
+
+        if (!(st->chip_info->flags & AD7793_FLAG_HAS_GAIN))
+                st->conf |= AD7793_CONF_GAIN(7);
 
         ret = ad7793_set_mode(&st->sd, AD_SD_MODE_IDLE);
         if (ret)
@@ -147,10 +313,13 @@ static int ad7793_setup(struct iio_dev *indio_dev,
         if (ret)
                 goto out;
 
-        ret = ad_sd_write_reg(&st->sd, AD7793_REG_IO,
-                               sizeof(pdata->io), pdata->io);
-        if (ret)
-                goto out;
+        if (st->chip_info->flags & AD7793_HAS_EXITATION_CURRENT) {
+                ret = ad_sd_write_reg(&st->sd, AD7793_REG_IO, 1,
+                                pdata->exitation_current |
+                                (pdata->current_source_direction << 2));
+                if (ret)
+                        goto out;
+        }
 
         ret = ad7793_calibrate_all(st);
         if (ret)
@@ -158,7 +327,7 @@ static int ad7793_setup(struct iio_dev *indio_dev,
 
         /* Populate available ADC input ranges */
         for (i = 0; i < ARRAY_SIZE(st->scale_avail); i++) {
-                scale_uv = ((u64)st->int_vref_mv * 100000000)
+                scale_uv = ((u64)vref_mv * 100000000)
                         >> (st->chip_info->channels[0].scan_type.realbits -
                         (!!(st->conf & AD7793_CONF_UNIPOLAR) ? 0 : 1));
                 scale_uv >>= i;
@@ -173,8 +342,11 @@ out:
         return ret;
 }
 
-static const u16 sample_freq_avail[16] = {0, 470, 242, 123, 62, 50, 39, 33, 19,
-                                          17, 16, 12, 10, 8, 6, 4};
+static const u16 ad7793_sample_freq_avail[16] = {0, 470, 242, 123, 62, 50, 39,
+                                        33, 19, 17, 16, 12, 10, 8, 6, 4};
+
+static const u16 ad7797_sample_freq_avail[16] = {0, 0, 0, 123, 62, 50, 0,
+                                        33, 0, 17, 16, 12, 10, 8, 6, 4};
 
 static ssize_t ad7793_read_frequency(struct device *dev,
                 struct device_attribute *attr,
@@ -184,7 +356,7 @@ static ssize_t ad7793_read_frequency(struct device *dev,
         struct ad7793_state *st = iio_priv(indio_dev);
 
         return sprintf(buf, "%d\n",
-                       sample_freq_avail[AD7793_MODE_RATE(st->mode)]);
+               st->chip_info->sample_freq_avail[AD7793_MODE_RATE(st->mode)]);
 }
 
 static ssize_t ad7793_write_frequency(struct device *dev,
@@ -204,14 +376,17 @@ static ssize_t ad7793_write_frequency(struct device *dev,
         }
         mutex_unlock(&indio_dev->mlock);
 
-        ret = strict_strtol(buf, 10, &lval);
+        ret = kstrtol(buf, 10, &lval);
         if (ret)
                 return ret;
 
+        if (lval == 0)
+                return -EINVAL;
+
         ret = -EINVAL;
 
-        for (i = 0; i < ARRAY_SIZE(sample_freq_avail); i++)
-                if (lval == sample_freq_avail[i]) {
+        for (i = 0; i < 16; i++)
+                if (lval == st->chip_info->sample_freq_avail[i]) {
                         mutex_lock(&indio_dev->mlock);
                         st->mode &= ~AD7793_MODE_RATE(-1);
                         st->mode |= AD7793_MODE_RATE(i);
@@ -231,6 +406,9 @@ static IIO_DEV_ATTR_SAMP_FREQ(S_IWUSR | S_IRUGO,
 static IIO_CONST_ATTR_SAMP_FREQ_AVAIL(
         "470 242 123 62 50 39 33 19 17 16 12 10 8 6 4");
 
+static IIO_CONST_ATTR_NAMED(sampling_frequency_available_ad7797,
+        sampling_frequency_available, "123 62 50 33 17 16 12 10 8 6 4");
+
 static ssize_t ad7793_show_scale_available(struct device *dev,
                         struct device_attribute *attr, char *buf)
 {
@@ -262,6 +440,16 @@ static const struct attribute_group ad7793_attribute_group = {
         .attrs = ad7793_attributes,
 };
 
+static struct attribute *ad7797_attributes[] = {
+        &iio_dev_attr_sampling_frequency.dev_attr.attr,
+        &iio_const_attr_sampling_frequency_available_ad7797.dev_attr.attr,
+        NULL
+};
+
+static const struct attribute_group ad7797_attribute_group = {
+        .attrs = ad7797_attributes,
+};
+
 static int ad7793_read_raw(struct iio_dev *indio_dev,
                            struct iio_chan_spec const *chan,
                            int *val,
@@ -292,12 +480,12 @@ static int ad7793_read_raw(struct iio_dev *indio_dev,
                                 return IIO_VAL_INT_PLUS_NANO;
                         } else {
                                 /* 1170mV / 2^23 * 6 */
-                                scale_uv = (1170ULL * 100000000ULL * 6ULL);
+                                scale_uv = (1170ULL * 1000000000ULL * 6ULL);
                         }
                         break;
                 case IIO_TEMP:
                                 /* 1170mV / 0.81 mV/C / 2^23 */
-                                scale_uv = 1444444444444ULL;
+                                scale_uv = 1444444444444444ULL;
                         break;
                 default:
                         return -EINVAL;
@@ -387,6 +575,15 @@ static const struct iio_info ad7793_info = {
         .driver_module = THIS_MODULE,
 };
 
+static const struct iio_info ad7797_info = {
+        .read_raw = &ad7793_read_raw,
+        .write_raw = &ad7793_write_raw,
+        .write_raw_get_fmt = &ad7793_write_raw_get_fmt,
+        .attrs = &ad7793_attribute_group,
+        .validate_trigger = ad_sd_validate_trigger,
+        .driver_module = THIS_MODULE,
+};
+
 #define DECLARE_AD7793_CHANNELS(_name, _b, _sb, _s) \
 const struct iio_chan_spec _name##_channels[] = { \
         AD_SD_DIFF_CHANNEL(0, 0, 0, AD7793_CH_AIN1P_AIN1M, (_b), (_sb), (_s)), \
@@ -412,41 +609,143 @@ const struct iio_chan_spec _name##_channels[] = { \
         IIO_CHAN_SOFT_TIMESTAMP(9), \
 }
 
+#define DECLARE_AD7797_CHANNELS(_name, _b, _sb) \
+const struct iio_chan_spec _name##_channels[] = { \
+        AD_SD_DIFF_CHANNEL(0, 0, 0, AD7793_CH_AIN1P_AIN1M, (_b), (_sb), 0), \
+        AD_SD_SHORTED_CHANNEL(1, 0, AD7793_CH_AIN1M_AIN1M, (_b), (_sb), 0), \
+        AD_SD_TEMP_CHANNEL(2, AD7793_CH_TEMP, (_b), (_sb), 0), \
+        AD_SD_SUPPLY_CHANNEL(3, 3, AD7793_CH_AVDD_MONITOR, (_b), (_sb), 0), \
+        IIO_CHAN_SOFT_TIMESTAMP(4), \
+}
+
+#define DECLARE_AD7799_CHANNELS(_name, _b, _sb) \
+const struct iio_chan_spec _name##_channels[] = { \
+        AD_SD_DIFF_CHANNEL(0, 0, 0, AD7793_CH_AIN1P_AIN1M, (_b), (_sb), 0), \
+        AD_SD_DIFF_CHANNEL(1, 1, 1, AD7793_CH_AIN2P_AIN2M, (_b), (_sb), 0), \
+        AD_SD_DIFF_CHANNEL(2, 2, 2, AD7793_CH_AIN3P_AIN3M, (_b), (_sb), 0), \
+        AD_SD_SHORTED_CHANNEL(3, 0, AD7793_CH_AIN1M_AIN1M, (_b), (_sb), 0), \
+        AD_SD_SUPPLY_CHANNEL(4, 3, AD7793_CH_AVDD_MONITOR, (_b), (_sb), 0), \
+        IIO_CHAN_SOFT_TIMESTAMP(5), \
+}
+
 static DECLARE_AD7793_CHANNELS(ad7785, 20, 32, 4);
 static DECLARE_AD7793_CHANNELS(ad7792, 16, 32, 0);
 static DECLARE_AD7793_CHANNELS(ad7793, 24, 32, 0);
 static DECLARE_AD7795_CHANNELS(ad7794, 16, 32);
 static DECLARE_AD7795_CHANNELS(ad7795, 24, 32);
+static DECLARE_AD7797_CHANNELS(ad7796, 16, 16);
+static DECLARE_AD7797_CHANNELS(ad7797, 24, 32);
+static DECLARE_AD7799_CHANNELS(ad7798, 16, 16);
+static DECLARE_AD7799_CHANNELS(ad7799, 24, 32);
 
 static const struct ad7793_chip_info ad7793_chip_info_tbl[] = {
         [ID_AD7785] = {
+                .id = AD7785_ID,
                 .channels = ad7785_channels,
                 .num_channels = ARRAY_SIZE(ad7785_channels),
+                .iio_info = &ad7793_info,
+                .sample_freq_avail = ad7793_sample_freq_avail,
+                .flags = AD7793_FLAG_HAS_CLKSEL |
+                        AD7793_FLAG_HAS_REFSEL |
+                        AD7793_FLAG_HAS_VBIAS |
+                        AD7793_HAS_EXITATION_CURRENT |
+                        AD7793_FLAG_HAS_GAIN |
+                        AD7793_FLAG_HAS_BUFFER,
         },
         [ID_AD7792] = {
+                .id = AD7792_ID,
                 .channels = ad7792_channels,
                 .num_channels = ARRAY_SIZE(ad7792_channels),
+                .iio_info = &ad7793_info,
+                .sample_freq_avail = ad7793_sample_freq_avail,
+                .flags = AD7793_FLAG_HAS_CLKSEL |
+                        AD7793_FLAG_HAS_REFSEL |
+                        AD7793_FLAG_HAS_VBIAS |
+                        AD7793_HAS_EXITATION_CURRENT |
+                        AD7793_FLAG_HAS_GAIN |
+                        AD7793_FLAG_HAS_BUFFER,
         },
         [ID_AD7793] = {
+                .id = AD7793_ID,
                 .channels = ad7793_channels,
                 .num_channels = ARRAY_SIZE(ad7793_channels),
+                .iio_info = &ad7793_info,
+                .sample_freq_avail = ad7793_sample_freq_avail,
+                .flags = AD7793_FLAG_HAS_CLKSEL |
+                        AD7793_FLAG_HAS_REFSEL |
+                        AD7793_FLAG_HAS_VBIAS |
+                        AD7793_HAS_EXITATION_CURRENT |
+                        AD7793_FLAG_HAS_GAIN |
+                        AD7793_FLAG_HAS_BUFFER,
         },
         [ID_AD7794] = {
+                .id = AD7794_ID,
                 .channels = ad7794_channels,
                 .num_channels = ARRAY_SIZE(ad7794_channels),
+                .iio_info = &ad7793_info,
+                .sample_freq_avail = ad7793_sample_freq_avail,
+                .flags = AD7793_FLAG_HAS_CLKSEL |
+                        AD7793_FLAG_HAS_REFSEL |
+                        AD7793_FLAG_HAS_VBIAS |
+                        AD7793_HAS_EXITATION_CURRENT |
+                        AD7793_FLAG_HAS_GAIN |
+                        AD7793_FLAG_HAS_BUFFER,
         },
         [ID_AD7795] = {
+                .id = AD7795_ID,
                 .channels = ad7795_channels,
                 .num_channels = ARRAY_SIZE(ad7795_channels),
+                .iio_info = &ad7793_info,
+                .sample_freq_avail = ad7793_sample_freq_avail,
+                .flags = AD7793_FLAG_HAS_CLKSEL |
+                        AD7793_FLAG_HAS_REFSEL |
+                        AD7793_FLAG_HAS_VBIAS |
+                        AD7793_HAS_EXITATION_CURRENT |
+                        AD7793_FLAG_HAS_GAIN |
+                        AD7793_FLAG_HAS_BUFFER,
+        },
+        [ID_AD7796] = {
+                .id = AD7796_ID,
+                .channels = ad7796_channels,
+                .num_channels = ARRAY_SIZE(ad7796_channels),
+                .iio_info = &ad7797_info,
+                .sample_freq_avail = ad7797_sample_freq_avail,
+                .flags = AD7793_FLAG_HAS_CLKSEL,
+        },
+        [ID_AD7797] = {
+                .id = AD7797_ID,
+                .channels = ad7797_channels,
+                .num_channels = ARRAY_SIZE(ad7797_channels),
+                .iio_info = &ad7797_info,
+                .sample_freq_avail = ad7797_sample_freq_avail,
+                .flags = AD7793_FLAG_HAS_CLKSEL,
+        },
+        [ID_AD7798] = {
+                .id = AD7798_ID,
+                .channels = ad7798_channels,
+                .num_channels = ARRAY_SIZE(ad7798_channels),
+                .iio_info = &ad7793_info,
+                .sample_freq_avail = ad7793_sample_freq_avail,
+                .flags = AD7793_FLAG_HAS_GAIN |
+                        AD7793_FLAG_HAS_BUFFER,
+        },
+        [ID_AD7799] = {
+                .id = AD7799_ID,
+                .channels = ad7799_channels,
+                .num_channels = ARRAY_SIZE(ad7799_channels),
+                .iio_info = &ad7793_info,
+                .sample_freq_avail = ad7793_sample_freq_avail,
+                .flags = AD7793_FLAG_HAS_GAIN |
+                        AD7793_FLAG_HAS_BUFFER,
         },
 };
 
-static int __devinit ad7793_probe(struct spi_device *spi)
+static int ad7793_probe(struct spi_device *spi)
 {
         const struct ad7793_platform_data *pdata = spi->dev.platform_data;
         struct ad7793_state *st;
         struct iio_dev *indio_dev;
-        int ret, voltage_uv = 0;
+        int ret, vref_mv = 0;
 
         if (!pdata) {
                 dev_err(&spi->dev, "no platform data?\n");
@@ -466,25 +765,31 @@ static int __devinit ad7793_probe(struct spi_device *spi)
 
         ad_sd_init(&st->sd, indio_dev, spi, &ad7793_sigma_delta_info);
 
-        st->reg = regulator_get(&spi->dev, "vcc");
-        if (!IS_ERR(st->reg)) {
+        if (pdata->refsel != AD7793_REFSEL_INTERNAL) {
+                st->reg = regulator_get(&spi->dev, "refin");
+                if (IS_ERR(st->reg)) {
+                        ret = PTR_ERR(st->reg);
+                        goto error_device_free;
+                }
+
                 ret = regulator_enable(st->reg);
                 if (ret)
                         goto error_put_reg;
 
-                voltage_uv = regulator_get_voltage(st->reg);
+                vref_mv = regulator_get_voltage(st->reg);
+                if (vref_mv < 0) {
+                        ret = vref_mv;
+                        goto error_disable_reg;
+                }
+
+                vref_mv /= 1000;
+        } else {
+                vref_mv = 1170; /* Build-in ref */
         }
 
         st->chip_info =
                 &ad7793_chip_info_tbl[spi_get_device_id(spi)->driver_data];
 
-        if (pdata && pdata->vref_mv)
-                st->int_vref_mv = pdata->vref_mv;
-        else if (voltage_uv)
-                st->int_vref_mv = voltage_uv / 1000;
-        else
-                st->int_vref_mv = 1170; /* Build-in ref */
-
         spi_set_drvdata(spi, indio_dev);
 
         indio_dev->dev.parent = &spi->dev;
@@ -492,13 +797,13 @@ static int __devinit ad7793_probe(struct spi_device *spi)
         indio_dev->modes = INDIO_DIRECT_MODE;
         indio_dev->channels = st->chip_info->channels;
         indio_dev->num_channels = st->chip_info->num_channels;
-        indio_dev->info = &ad7793_info;
+        indio_dev->info = st->chip_info->iio_info;
 
         ret = ad_sd_setup_buffer_and_trigger(indio_dev);
         if (ret)
                 goto error_disable_reg;
 
-        ret = ad7793_setup(indio_dev, pdata);
+        ret = ad7793_setup(indio_dev, pdata, vref_mv);
         if (ret)
                 goto error_remove_trigger;
 
@@ -511,26 +816,27 @@ static int __devinit ad7793_probe(struct spi_device *spi)
 error_remove_trigger:
         ad_sd_cleanup_buffer_and_trigger(indio_dev);
 error_disable_reg:
-        if (!IS_ERR(st->reg))
+        if (pdata->refsel != AD7793_REFSEL_INTERNAL)
                 regulator_disable(st->reg);
 error_put_reg:
-        if (!IS_ERR(st->reg))
+        if (pdata->refsel != AD7793_REFSEL_INTERNAL)
                 regulator_put(st->reg);
-
+error_device_free:
         iio_device_free(indio_dev);
 
         return ret;
 }
 
-static int __devexit ad7793_remove(struct spi_device *spi)
+static int ad7793_remove(struct spi_device *spi)
 {
+        const struct ad7793_platform_data *pdata = spi->dev.platform_data;
         struct iio_dev *indio_dev = spi_get_drvdata(spi);
         struct ad7793_state *st = iio_priv(indio_dev);
 
         iio_device_unregister(indio_dev);
         ad_sd_cleanup_buffer_and_trigger(indio_dev);
 
-        if (!IS_ERR(st->reg)) {
+        if (pdata->refsel != AD7793_REFSEL_INTERNAL) {
                 regulator_disable(st->reg);
                 regulator_put(st->reg);
         }
@@ -546,6 +852,10 @@ static const struct spi_device_id ad7793_id[] = {
         {"ad7793", ID_AD7793},
         {"ad7794", ID_AD7794},
         {"ad7795", ID_AD7795},
+        {"ad7796", ID_AD7796},
+        {"ad7797", ID_AD7797},
+        {"ad7798", ID_AD7798},
+        {"ad7799", ID_AD7799},
         {}
 };
 MODULE_DEVICE_TABLE(spi, ad7793_id);
@@ -556,7 +866,7 @@ static struct spi_driver ad7793_driver = {
                 .owner  = THIS_MODULE,
         },
         .probe          = ad7793_probe,
-        .remove         = __devexit_p(ad7793_remove),
+        .remove         = ad7793_remove,
         .id_table       = ad7793_id,
 };
 module_spi_driver(ad7793_driver);
diff --git a/drivers/staging/iio/adc/ad7887_core.c b/drivers/iio/adc/ad7887.c
index 551790584a12..81153fafac7a 100644
--- a/drivers/staging/iio/adc/ad7887_core.c
+++ b/drivers/iio/adc/ad7887.c
@@ -14,13 +14,139 @@
 #include <linux/regulator/consumer.h>
 #include <linux/err.h>
 #include <linux/module.h>
+#include <linux/interrupt.h>
 
 #include <linux/iio/iio.h>
 #include <linux/iio/sysfs.h>
 #include <linux/iio/buffer.h>
 
+#include <linux/iio/trigger_consumer.h>
+#include <linux/iio/triggered_buffer.h>
 
-#include "ad7887.h"
+#include <linux/platform_data/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)
+
+/**
+ * struct ad7887_chip_info - chip specifc information
+ * @int_vref_mv:        the internal reference voltage
+ * @channel:            channel specification
+ */
+struct ad7887_chip_info {
+        u16                             int_vref_mv;
+        struct iio_chan_spec            channel[3];
+};
+
+struct ad7887_state {
+        struct spi_device               *spi;
+        const struct ad7887_chip_info   *chip_info;
+        struct regulator                *reg;
+        struct spi_transfer             xfer[4];
+        struct spi_message              msg[3];
+        struct spi_message              *ring_msg;
+        unsigned char                   tx_cmd_buf[4];
+
+        /*
+         * DMA (thus cache coherency maintenance) requires the
+         * transfer buffers to live in their own cache lines.
+         * Buffer needs to be large enough to hold two 16 bit samples and a
+         * 64 bit aligned 64 bit timestamp.
+         */
+        unsigned char data[ALIGN(4, sizeof(s64)) + sizeof(s64)]
+                ____cacheline_aligned;
+};
+
+enum ad7887_supported_device_ids {
+        ID_AD7887
+};
+
+static int ad7887_ring_preenable(struct iio_dev *indio_dev)
+{
+        struct ad7887_state *st = iio_priv(indio_dev);
+        int ret;
+
+        ret = iio_sw_buffer_preenable(indio_dev);
+        if (ret < 0)
+                return ret;
+
+        /* We know this is a single long so can 'cheat' */
+        switch (*indio_dev->active_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 = iio_priv(indio_dev);
+
+        /* dummy read: restore default CH0 settin */
+        return spi_sync(st->spi, &st->msg[AD7887_CH0]);
+}
+
+/**
+ * ad7887_trigger_handler() bh of trigger launched polling to ring buffer
+ *
+ * Currently there is no option in this driver to disable the saving of
+ * timestamps within the ring.
+ **/
+static irqreturn_t ad7887_trigger_handler(int irq, void *p)
+{
+        struct iio_poll_func *pf = p;
+        struct iio_dev *indio_dev = pf->indio_dev;
+        struct ad7887_state *st = iio_priv(indio_dev);
+        s64 time_ns;
+        int b_sent;
+
+        b_sent = spi_sync(st->spi, st->ring_msg);
+        if (b_sent)
+                goto done;
+
+        time_ns = iio_get_time_ns();
+
+        if (indio_dev->scan_timestamp)
+                memcpy(st->data + indio_dev->scan_bytes - sizeof(s64),
+                       &time_ns, sizeof(time_ns));
+
+        iio_push_to_buffers(indio_dev, st->data);
+done:
+        iio_trigger_notify_done(indio_dev->trig);
+
+        return IRQ_HANDLED;
+}
+
+static const struct iio_buffer_setup_ops ad7887_ring_setup_ops = {
+        .preenable = &ad7887_ring_preenable,
+        .postenable = &iio_triggered_buffer_postenable,
+        .predisable = &iio_triggered_buffer_predisable,
+        .postdisable = &ad7887_ring_postdisable,
+};
 
 static int ad7887_scan_direct(struct ad7887_state *st, unsigned ch)
 {
@@ -39,7 +165,6 @@ static int ad7887_read_raw(struct iio_dev *indio_dev,
 {
         int ret;
         struct ad7887_state *st = iio_priv(indio_dev);
-        unsigned int scale_uv;
 
         switch (m) {
         case IIO_CHAN_INFO_RAW:
@@ -52,15 +177,22 @@ static int ad7887_read_raw(struct iio_dev *indio_dev,
 
                 if (ret < 0)
                         return ret;
-                *val = (ret >> st->chip_info->channel[0].scan_type.shift) &
-                        RES_MASK(st->chip_info->channel[0].scan_type.realbits);
+                *val = ret >> chan->scan_type.shift;
+                *val &= RES_MASK(chan->scan_type.realbits);
                 return IIO_VAL_INT;
         case IIO_CHAN_INFO_SCALE:
-                scale_uv = (st->int_vref_mv * 1000)
-                        >> st->chip_info->channel[0].scan_type.realbits;
-                *val =  scale_uv/1000;
-                *val2 = (scale_uv%1000)*1000;
-                return IIO_VAL_INT_PLUS_MICRO;
+                if (st->reg) {
+                        *val = regulator_get_voltage(st->reg);
+                        if (*val < 0)
+                                return *val;
+                        *val /= 1000;
+                } else {
+                        *val = st->chip_info->int_vref_mv;
+                }
+
+                *val2 = chan->scan_type.realbits;
+
+                return IIO_VAL_FRACTIONAL_LOG2;
         }
         return -EINVAL;
 }
@@ -105,21 +237,25 @@ 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;
         struct iio_dev *indio_dev = iio_device_alloc(sizeof(*st));
+        uint8_t mode;
+        int ret;
 
         if (indio_dev == NULL)
                 return -ENOMEM;
 
         st = iio_priv(indio_dev);
 
-        st->reg = regulator_get(&spi->dev, "vcc");
-        if (!IS_ERR(st->reg)) {
+        if (!pdata || !pdata->use_onchip_ref) {
+                st->reg = regulator_get(&spi->dev, "vref");
+                if (IS_ERR(st->reg)) {
+                        ret = PTR_ERR(st->reg);
+                        goto error_free;
+                }
+
                 ret = regulator_enable(st->reg);
                 if (ret)
                         goto error_put_reg;
-
-                voltage_uv = regulator_get_voltage(st->reg);
         }
 
         st->chip_info =
@@ -136,9 +272,13 @@ static int __devinit ad7887_probe(struct spi_device *spi)
 
         /* Setup default message */
 
-        st->tx_cmd_buf[0] = AD7887_CH_AIN0 | AD7887_PM_MODE4 |
-                            ((pdata && pdata->use_onchip_ref) ?
-                            0 : AD7887_REF_DIS);
+        mode = AD7887_PM_MODE4;
+        if (!pdata || !pdata->use_onchip_ref)
+                mode |= AD7887_REF_DIS;
+        if (pdata && pdata->en_dual)
+                mode |= AD7887_DUAL;
+
+        st->tx_cmd_buf[0] = AD7887_CH_AIN0 | mode;
 
         st->xfer[0].rx_buf = &st->data[0];
         st->xfer[0].tx_buf = &st->tx_cmd_buf[0];
@@ -148,56 +288,36 @@ static int __devinit ad7887_probe(struct spi_device *spi)
         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->tx_cmd_buf[2] = AD7887_CH_AIN1 | mode;
 
                 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].tx_buf = &st->tx_cmd_buf[0];
                 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].rx_buf = &st->data[2];
+                st->xfer[3].tx_buf = &st->tx_cmd_buf[2];
                 st->xfer[3].len = 2;
 
                 spi_message_init(&st->msg[AD7887_CH1]);
                 spi_message_add_tail(&st->xfer[3], &st->msg[AD7887_CH1]);
 
-                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");
-
                 indio_dev->channels = st->chip_info->channel;
                 indio_dev->num_channels = 3;
         } 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");
-
                 indio_dev->channels = &st->chip_info->channel[1];
                 indio_dev->num_channels = 2;
         }
 
-        ret = ad7887_register_ring_funcs_and_init(indio_dev);
+        ret = iio_triggered_buffer_setup(indio_dev, &iio_pollfunc_store_time,
+                        &ad7887_trigger_handler, &ad7887_ring_setup_ops);
         if (ret)
                 goto error_disable_reg;
 
@@ -207,13 +327,14 @@ static int __devinit ad7887_probe(struct spi_device *spi)
 
         return 0;
 error_unregister_ring:
-        ad7887_ring_cleanup(indio_dev);
+        iio_triggered_buffer_cleanup(indio_dev);
 error_disable_reg:
-        if (!IS_ERR(st->reg))
+        if (st->reg)
                 regulator_disable(st->reg);
 error_put_reg:
-        if (!IS_ERR(st->reg))
+        if (st->reg)
                 regulator_put(st->reg);
+error_free:
         iio_device_free(indio_dev);
 
         return ret;
@@ -225,8 +346,8 @@ static int __devexit ad7887_remove(struct spi_device *spi)
         struct ad7887_state *st = iio_priv(indio_dev);
 
         iio_device_unregister(indio_dev);
-        ad7887_ring_cleanup(indio_dev);
-        if (!IS_ERR(st->reg)) {
+        iio_triggered_buffer_cleanup(indio_dev);
+        if (st->reg) {
                 regulator_disable(st->reg);
                 regulator_put(st->reg);
         }
diff --git a/drivers/iio/adc/ad_sigma_delta.c b/drivers/iio/adc/ad_sigma_delta.c
index 67baa1363d7a..afe6d78c8ff0 100644
--- a/drivers/iio/adc/ad_sigma_delta.c
+++ b/drivers/iio/adc/ad_sigma_delta.c
@@ -391,7 +391,7 @@ static irqreturn_t ad_sd_trigger_handler(int irq, void *p)
                 break;
         }
 
-        iio_push_to_buffer(indio_dev->buffer, (uint8_t *)data);
+        iio_push_to_buffers(indio_dev, (uint8_t *)data);
 
         iio_trigger_notify_done(indio_dev->trig);
         sigma_delta->irq_dis = false;
diff --git a/drivers/iio/adc/at91_adc.c b/drivers/iio/adc/at91_adc.c
index 3ed94bf80596..03b85940f4ba 100644
--- a/drivers/iio/adc/at91_adc.c
+++ b/drivers/iio/adc/at91_adc.c
@@ -46,7 +46,6 @@ struct at91_adc_state {
         struct clk              *clk;
         bool                    done;
         int                     irq;
-        bool                    irq_enabled;
         u16                     last_value;
         struct mutex            lock;
         u8                      num_channels;
@@ -66,7 +65,6 @@ static irqreturn_t at91_adc_trigger_handler(int irq, void *p)
         struct iio_poll_func *pf = p;
         struct iio_dev *idev = pf->indio_dev;
         struct at91_adc_state *st = iio_priv(idev);
-        struct iio_buffer *buffer = idev->buffer;
         int i, j = 0;
 
         for (i = 0; i < idev->masklength; i++) {
@@ -82,10 +80,9 @@ static irqreturn_t at91_adc_trigger_handler(int irq, void *p)
                 *timestamp = pf->timestamp;
         }
 
-        buffer->access->store_to(buffer, (u8 *)st->buffer);
+        iio_push_to_buffers(indio_dev, (u8 *)st->buffer);
 
         iio_trigger_notify_done(idev->trig);
-        st->irq_enabled = true;
 
         /* Needed to ACK the DRDY interruption */
         at91_adc_readl(st, AT91_ADC_LCDR);
@@ -106,7 +103,6 @@ static irqreturn_t at91_adc_eoc_trigger(int irq, void *private)
 
         if (iio_buffer_enabled(idev)) {
                 disable_irq_nosync(irq);
-                st->irq_enabled = false;
                 iio_trigger_poll(idev->trig, iio_get_time_ns());
         } else {
                 st->last_value = at91_adc_readl(st, AT91_ADC_LCDR);
diff --git a/drivers/staging/iio/adc/max1363_core.c b/drivers/iio/adc/max1363.c
index d7b4ffcfa052..1e84b5b55093 100644
--- a/drivers/staging/iio/adc/max1363_core.c
+++ b/drivers/iio/adc/max1363.c
@@ -37,8 +37,151 @@
 #include <linux/iio/events.h>
 #include <linux/iio/buffer.h>
 #include <linux/iio/driver.h>
+#include <linux/iio/kfifo_buf.h>
+#include <linux/iio/trigger_consumer.h>
+
+#define MAX1363_SETUP_BYTE(a) ((a) | 0x80)
+
+/* There is a fair bit more defined here than currently
+ * used, but the intention is to support everything these
+ * chips do in the long run */
+
+/* see data sheets */
+/* max1363 and max1236, max1237, max1238, max1239 */
+#define MAX1363_SETUP_AIN3_IS_AIN3_REF_IS_VDD   0x00
+#define MAX1363_SETUP_AIN3_IS_REF_EXT_TO_REF    0x20
+#define MAX1363_SETUP_AIN3_IS_AIN3_REF_IS_INT   0x40
+#define MAX1363_SETUP_AIN3_IS_REF_REF_IS_INT    0x60
+#define MAX1363_SETUP_POWER_UP_INT_REF          0x10
+#define MAX1363_SETUP_POWER_DOWN_INT_REF        0x00
+
+/* think about includeing max11600 etc - more settings */
+#define MAX1363_SETUP_EXT_CLOCK                 0x08
+#define MAX1363_SETUP_INT_CLOCK                 0x00
+#define MAX1363_SETUP_UNIPOLAR                  0x00
+#define MAX1363_SETUP_BIPOLAR                   0x04
+#define MAX1363_SETUP_RESET                     0x00
+#define MAX1363_SETUP_NORESET                   0x02
+/* max1363 only - though don't care on others.
+ * For now monitor modes are not implemented as the relevant
+ * line is not connected on my test board.
+ * The definitions are here as I intend to add this soon.
+ */
+#define MAX1363_SETUP_MONITOR_SETUP             0x01
+
+/* Specific to the max1363 */
+#define MAX1363_MON_RESET_CHAN(a) (1 << ((a) + 4))
+#define MAX1363_MON_INT_ENABLE                  0x01
+
+/* defined for readability reasons */
+/* All chips */
+#define MAX1363_CONFIG_BYTE(a) ((a))
+
+#define MAX1363_CONFIG_SE                       0x01
+#define MAX1363_CONFIG_DE                       0x00
+#define MAX1363_CONFIG_SCAN_TO_CS               0x00
+#define MAX1363_CONFIG_SCAN_SINGLE_8            0x20
+#define MAX1363_CONFIG_SCAN_MONITOR_MODE        0x40
+#define MAX1363_CONFIG_SCAN_SINGLE_1            0x60
+/* max123{6-9} only */
+#define MAX1236_SCAN_MID_TO_CHANNEL             0x40
+
+/* max1363 only - merely part of channel selects or don't care for others*/
+#define MAX1363_CONFIG_EN_MON_MODE_READ 0x18
+
+#define MAX1363_CHANNEL_SEL(a) ((a) << 1)
+
+/* max1363 strictly 0x06 - but doesn't matter */
+#define MAX1363_CHANNEL_SEL_MASK                0x1E
+#define MAX1363_SCAN_MASK                       0x60
+#define MAX1363_SE_DE_MASK                      0x01
+
+#define MAX1363_MAX_CHANNELS 25
+/**
+ * struct max1363_mode - scan mode information
+ * @conf:       The corresponding value of the configuration register
+ * @modemask:   Bit mask corresponding to channels enabled in this mode
+ */
+struct max1363_mode {
+        int8_t          conf;
+        DECLARE_BITMAP(modemask, MAX1363_MAX_CHANNELS);
+};
 
-#include "max1363.h"
+/* This must be maintained along side the max1363_mode_table in max1363_core */
+enum max1363_modes {
+        /* Single read of a single channel */
+        _s0, _s1, _s2, _s3, _s4, _s5, _s6, _s7, _s8, _s9, _s10, _s11,
+        /* Differential single read */
+        d0m1, d2m3, d4m5, d6m7, d8m9, d10m11,
+        d1m0, d3m2, d5m4, d7m6, d9m8, d11m10,
+        /* Scan to channel and mid to channel where overlapping */
+        s0to1, s0to2, s2to3, s0to3, s0to4, s0to5, s0to6,
+        s6to7, s0to7, s6to8, s0to8, s6to9,
+        s0to9, s6to10, s0to10, s6to11, s0to11,
+        /* Differential scan to channel and mid to channel where overlapping */
+        d0m1to2m3, d0m1to4m5, d0m1to6m7, d6m7to8m9,
+        d0m1to8m9, d6m7to10m11, d0m1to10m11, d1m0to3m2,
+        d1m0to5m4, d1m0to7m6, d7m6to9m8, d1m0to9m8,
+        d7m6to11m10, d1m0to11m10,
+};
+
+/**
+ * struct max1363_chip_info - chip specifc information
+ * @info:               iio core function callbacks structure
+ * @channels:           channel specification
+ * @num_channels:       number of channels
+ * @mode_list:          array of available scan modes
+ * @default_mode:       the scan mode in which the chip starts up
+ * @int_vref_mv:        the internal reference voltage
+ * @num_channels:       number of channels
+ * @bits:               accuracy of the adc in bits
+ */
+struct max1363_chip_info {
+        const struct iio_info           *info;
+        const struct iio_chan_spec      *channels;
+        int                             num_channels;
+        const enum max1363_modes        *mode_list;
+        enum max1363_modes              default_mode;
+        u16                             int_vref_mv;
+        u8                              num_modes;
+        u8                              bits;
+};
+
+/**
+ * struct max1363_state - driver instance specific data
+ * @client:             i2c_client
+ * @setupbyte:          cache of current device setup byte
+ * @configbyte:         cache of current device config byte
+ * @chip_info:          chip model specific constants, available modes etc
+ * @current_mode:       the scan mode of this chip
+ * @requestedmask:      a valid requested set of channels
+ * @reg:                supply regulator
+ * @monitor_on:         whether monitor mode is enabled
+ * @monitor_speed:      parameter corresponding to device monitor speed setting
+ * @mask_high:          bitmask for enabled high thresholds
+ * @mask_low:           bitmask for enabled low thresholds
+ * @thresh_high:        high threshold values
+ * @thresh_low:         low threshold values
+ */
+struct max1363_state {
+        struct i2c_client               *client;
+        u8                              setupbyte;
+        u8                              configbyte;
+        const struct max1363_chip_info  *chip_info;
+        const struct max1363_mode       *current_mode;
+        u32                             requestedmask;
+        struct regulator                *reg;
+
+        /* Using monitor modes and buffer at the same time is
+           currently not supported */
+        bool                            monitor_on;
+        unsigned int                    monitor_speed:3;
+        u8                              mask_high;
+        u8                              mask_low;
+        /* 4x unipolar first then the fours bipolar ones */
+        s16                             thresh_high[8];
+        s16                             thresh_low[8];
+};
 
 #define MAX1363_MODE_SINGLE(_num, _mask) {                              \
                 .conf = MAX1363_CHANNEL_SEL(_num)                       \
@@ -148,7 +291,7 @@ static const struct max1363_mode max1363_mode_table[] = {
         MAX1363_MODE_DIFF_SCAN_TO_CHANNEL(11, 6, 0xFC0000),
 };
 
-const struct max1363_mode
+static const struct max1363_mode
 *max1363_match_mode(const unsigned long *mask,
 const struct max1363_chip_info *ci)
 {
@@ -172,7 +315,7 @@ static int max1363_write_basic_config(struct i2c_client *client,
         return i2c_master_send(client, tx_buf, 2);
 }
 
-int max1363_set_scan_mode(struct max1363_state *st)
+static int max1363_set_scan_mode(struct max1363_state *st)
 {
         st->configbyte &= ~(MAX1363_CHANNEL_SEL_MASK
                             | MAX1363_SCAN_MASK
@@ -622,9 +765,9 @@ static int max1363_read_event_config(struct iio_dev *indio_dev,
                                      u64 event_code)
 {
         struct max1363_state *st = iio_priv(indio_dev);
-
         int val;
         int number = IIO_EVENT_CODE_EXTRACT_CHAN(event_code);
+
         mutex_lock(&indio_dev->mlock);
         if (IIO_EVENT_CODE_EXTRACT_DIR(event_code) == IIO_EV_DIR_FALLING)
                 val = (1 << number) & st->mask_low;
@@ -644,7 +787,7 @@ static int max1363_monitor_mode_update(struct max1363_state *st, int enabled)
         const long *modemask;
 
         if (!enabled) {
-                /* transition to ring capture is not currently supported */
+                /* transition to buffered capture is not currently supported */
                 st->setupbyte &= ~MAX1363_SETUP_MONITOR_SETUP;
                 st->configbyte &= ~MAX1363_SCAN_MASK;
                 st->monitor_on = false;
@@ -826,8 +969,21 @@ static struct attribute_group max1363_event_attribute_group = {
         .name = "events",
 };
 
-#define MAX1363_EVENT_FUNCS                                             \
+static int max1363_update_scan_mode(struct iio_dev *indio_dev,
+                                    const unsigned long *scan_mask)
+{
+        struct max1363_state *st = iio_priv(indio_dev);
 
+        /*
+         * Need to figure out the current mode based upon the requested
+         * scan mask in iio_dev
+         */
+        st->current_mode = max1363_match_mode(scan_mask, st->chip_info);
+        if (!st->current_mode)
+                return -EINVAL;
+        max1363_set_scan_mode(st);
+        return 0;
+}
 
 static const struct iio_info max1238_info = {
         .read_raw = &max1363_read_raw,
@@ -1230,8 +1386,6 @@ static const struct max1363_chip_info max1363_chip_info_tbl[] = {
         },
 };
 
-
-
 static int max1363_initial_setup(struct max1363_state *st)
 {
         st->setupbyte = MAX1363_SETUP_AIN3_IS_AIN3_REF_IS_VDD
@@ -1269,34 +1423,137 @@ static int __devinit max1363_alloc_scan_masks(struct iio_dev *indio_dev)
         return 0;
 }
 
+
+static irqreturn_t max1363_trigger_handler(int irq, void *p)
+{
+        struct iio_poll_func *pf = p;
+        struct iio_dev *indio_dev = pf->indio_dev;
+        struct max1363_state *st = iio_priv(indio_dev);
+        s64 time_ns;
+        __u8 *rxbuf;
+        int b_sent;
+        size_t d_size;
+        unsigned long numvals = bitmap_weight(st->current_mode->modemask,
+                                              MAX1363_MAX_CHANNELS);
+
+        /* Ensure the timestamp is 8 byte aligned */
+        if (st->chip_info->bits != 8)
+                d_size = numvals*2;
+        else
+                d_size = numvals;
+        if (indio_dev->scan_timestamp) {
+                d_size += sizeof(s64);
+                if (d_size % sizeof(s64))
+                        d_size += sizeof(s64) - (d_size % sizeof(s64));
+        }
+        /* Monitor mode prevents reading. Whilst not currently implemented
+         * might as well have this test in here in the meantime as it does
+         * no harm.
+         */
+        if (numvals == 0)
+                goto done;
+
+        rxbuf = kmalloc(d_size, GFP_KERNEL);
+        if (rxbuf == NULL)
+                goto done;
+        if (st->chip_info->bits != 8)
+                b_sent = i2c_master_recv(st->client, rxbuf, numvals*2);
+        else
+                b_sent = i2c_master_recv(st->client, rxbuf, numvals);
+        if (b_sent < 0)
+                goto done_free;
+
+        time_ns = iio_get_time_ns();
+
+        if (indio_dev->scan_timestamp)
+                memcpy(rxbuf + d_size - sizeof(s64), &time_ns, sizeof(time_ns));
+        iio_push_to_buffers(indio_dev, rxbuf);
+
+done_free:
+        kfree(rxbuf);
+done:
+        iio_trigger_notify_done(indio_dev->trig);
+
+        return IRQ_HANDLED;
+}
+
+static const struct iio_buffer_setup_ops max1363_buffered_setup_ops = {
+        .postenable = &iio_triggered_buffer_postenable,
+        .preenable = &iio_sw_buffer_preenable,
+        .predisable = &iio_triggered_buffer_predisable,
+};
+
+static int max1363_register_buffered_funcs_and_init(struct iio_dev *indio_dev)
+{
+        struct max1363_state *st = iio_priv(indio_dev);
+        int ret = 0;
+
+        indio_dev->buffer = iio_kfifo_allocate(indio_dev);
+        if (!indio_dev->buffer) {
+                ret = -ENOMEM;
+                goto error_ret;
+        }
+        indio_dev->pollfunc = iio_alloc_pollfunc(NULL,
+                                                 &max1363_trigger_handler,
+                                                 IRQF_ONESHOT,
+                                                 indio_dev,
+                                                 "%s_consumer%d",
+                                                 st->client->name,
+                                                 indio_dev->id);
+        if (indio_dev->pollfunc == NULL) {
+                ret = -ENOMEM;
+                goto error_deallocate_sw_rb;
+        }
+        /* Buffer functions - here trigger setup related */
+        indio_dev->setup_ops = &max1363_buffered_setup_ops;
+
+        /* Flag that polled buffering is possible */
+        indio_dev->modes |= INDIO_BUFFER_TRIGGERED;
+
+        return 0;
+
+error_deallocate_sw_rb:
+        iio_kfifo_free(indio_dev->buffer);
+error_ret:
+        return ret;
+}
+
+static void max1363_buffer_cleanup(struct iio_dev *indio_dev)
+{
+        /* ensure that the trigger has been detached */
+        iio_dealloc_pollfunc(indio_dev->pollfunc);
+        iio_kfifo_free(indio_dev->buffer);
+}
+
 static int __devinit max1363_probe(struct i2c_client *client,
                                    const struct i2c_device_id *id)
 {
         int ret;
         struct max1363_state *st;
         struct iio_dev *indio_dev;
-        struct regulator *reg;
-
-        reg = regulator_get(&client->dev, "vcc");
-        if (IS_ERR(reg)) {
-                ret = PTR_ERR(reg);
-                goto error_out;
-        }
-
-        ret = regulator_enable(reg);
-        if (ret)
-                goto error_put_reg;
 
         indio_dev = iio_device_alloc(sizeof(struct max1363_state));
         if (indio_dev == NULL) {
                 ret = -ENOMEM;
-                goto error_disable_reg;
+                goto error_out;
         }
+
         ret = iio_map_array_register(indio_dev, client->dev.platform_data);
         if (ret < 0)
                 goto error_free_device;
+
         st = iio_priv(indio_dev);
-        st->reg = reg;
+
+        st->reg = regulator_get(&client->dev, "vcc");
+        if (IS_ERR(st->reg)) {
+                ret = PTR_ERR(st->reg);
+                goto error_unregister_map;
+        }
+
+        ret = regulator_enable(st->reg);
+        if (ret)
+                goto error_put_reg;
+
         /* this is only used for device removal purposes */
         i2c_set_clientdata(client, indio_dev);
 
@@ -1305,7 +1562,7 @@ static int __devinit max1363_probe(struct i2c_client *client,
 
         ret = max1363_alloc_scan_masks(indio_dev);
         if (ret)
-                goto error_unregister_map;
+                goto error_disable_reg;
 
         /* Estabilish that the iio_dev is a child of the i2c device */
         indio_dev->dev.parent = &client->dev;
@@ -1320,7 +1577,7 @@ static int __devinit max1363_probe(struct i2c_client *client,
         if (ret < 0)
                 goto error_free_available_scan_masks;
 
-        ret = max1363_register_ring_funcs_and_init(indio_dev);
+        ret = max1363_register_buffered_funcs_and_init(indio_dev);
         if (ret)
                 goto error_free_available_scan_masks;
 
@@ -1328,7 +1585,7 @@ static int __devinit max1363_probe(struct i2c_client *client,
                                   st->chip_info->channels,
                                   st->chip_info->num_channels);
         if (ret)
-                goto error_cleanup_ring;
+                goto error_cleanup_buffer;
 
         if (client->irq) {
                 ret = request_threaded_irq(st->client->irq,
@@ -1339,7 +1596,7 @@ static int __devinit max1363_probe(struct i2c_client *client,
                                            indio_dev);
 
                 if (ret)
-                        goto error_uninit_ring;
+                        goto error_uninit_buffer;
         }
 
         ret = iio_device_register(indio_dev);
@@ -1349,20 +1606,20 @@ static int __devinit max1363_probe(struct i2c_client *client,
         return 0;
 error_free_irq:
         free_irq(st->client->irq, indio_dev);
-error_uninit_ring:
+error_uninit_buffer:
         iio_buffer_unregister(indio_dev);
-error_cleanup_ring:
-        max1363_ring_cleanup(indio_dev);
+error_cleanup_buffer:
+        max1363_buffer_cleanup(indio_dev);
 error_free_available_scan_masks:
         kfree(indio_dev->available_scan_masks);
 error_unregister_map:
         iio_map_array_unregister(indio_dev, client->dev.platform_data);
-error_free_device:
-        iio_device_free(indio_dev);
 error_disable_reg:
-        regulator_disable(reg);
+        regulator_disable(st->reg);
 error_put_reg:
-        regulator_put(reg);
+        regulator_put(st->reg);
+error_free_device:
+        iio_device_free(indio_dev);
 error_out:
         return ret;
 }
@@ -1371,17 +1628,16 @@ static int __devexit max1363_remove(struct i2c_client *client)
 {
         struct iio_dev *indio_dev = i2c_get_clientdata(client);
         struct max1363_state *st = iio_priv(indio_dev);
-        struct regulator *reg = st->reg;
 
         iio_device_unregister(indio_dev);
         if (client->irq)
                 free_irq(st->client->irq, indio_dev);
         iio_buffer_unregister(indio_dev);
-        max1363_ring_cleanup(indio_dev);
+        max1363_buffer_cleanup(indio_dev);
         kfree(indio_dev->available_scan_masks);
-        if (!IS_ERR(reg)) {
-                regulator_disable(reg);
-                regulator_put(reg);
+        if (!IS_ERR(st->reg)) {
+                regulator_disable(st->reg);
+                regulator_put(st->reg);
         }
         iio_map_array_unregister(indio_dev, client->dev.platform_data);
         iio_device_free(indio_dev);
diff --git a/drivers/iio/adc/ti-adc081c.c b/drivers/iio/adc/ti-adc081c.c
new file mode 100644
index 000000000000..f4a46dd8f43b
--- /dev/null
+++ b/drivers/iio/adc/ti-adc081c.c
@@ -0,0 +1,161 @@
+/*
+ * Copyright (C) 2012 Avionic Design GmbH
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/err.h>
+#include <linux/i2c.h>
+#include <linux/module.h>
+
+#include <linux/iio/iio.h>
+#include <linux/regulator/consumer.h>
+
+struct adc081c {
+        struct i2c_client *i2c;
+        struct regulator *ref;
+};
+
+#define REG_CONV_RES 0x00
+
+static int adc081c_read_raw(struct iio_dev *iio,
+                            struct iio_chan_spec const *channel, int *value,
+                            int *shift, long mask)
+{
+        struct adc081c *adc = iio_priv(iio);
+        int err;
+
+        switch (mask) {
+        case IIO_CHAN_INFO_RAW:
+                err = i2c_smbus_read_word_swapped(adc->i2c, REG_CONV_RES);
+                if (err < 0)
+                        return err;
+
+                *value = (err >> 4) & 0xff;
+                return IIO_VAL_INT;
+
+        case IIO_CHAN_INFO_SCALE:
+                err = regulator_get_voltage(adc->ref);
+                if (err < 0)
+                        return err;
+
+                *value = err / 1000;
+                *shift = 8;
+
+                return IIO_VAL_FRACTIONAL_LOG2;
+
+        default:
+                break;
+        }
+
+        return -EINVAL;
+}
+
+static const struct iio_chan_spec adc081c_channel = {
+        .type = IIO_VOLTAGE,
+        .info_mask = IIO_CHAN_INFO_SCALE_SHARED_BIT |
+                     IIO_CHAN_INFO_RAW_SEPARATE_BIT,
+};
+
+static const struct iio_info adc081c_info = {
+        .read_raw = adc081c_read_raw,
+        .driver_module = THIS_MODULE,
+};
+
+static int adc081c_probe(struct i2c_client *client,
+                         const struct i2c_device_id *id)
+{
+        struct iio_dev *iio;
+        struct adc081c *adc;
+        int err;
+
+        if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_WORD_DATA))
+                return -ENODEV;
+
+        iio = iio_device_alloc(sizeof(*adc));
+        if (!iio)
+                return -ENOMEM;
+
+        adc = iio_priv(iio);
+        adc->i2c = client;
+
+        adc->ref = regulator_get(&client->dev, "vref");
+        if (IS_ERR(adc->ref)) {
+                err = PTR_ERR(adc->ref);
+                goto iio_free;
+        }
+
+        err = regulator_enable(adc->ref);
+        if (err < 0)
+                goto regulator_put;
+
+        iio->dev.parent = &client->dev;
+        iio->name = dev_name(&client->dev);
+        iio->modes = INDIO_DIRECT_MODE;
+        iio->info = &adc081c_info;
+
+        iio->channels = &adc081c_channel;
+        iio->num_channels = 1;
+
+        err = iio_device_register(iio);
+        if (err < 0)
+                goto regulator_disable;
+
+        i2c_set_clientdata(client, iio);
+
+        return 0;
+
+regulator_disable:
+        regulator_disable(adc->ref);
+regulator_put:
+        regulator_put(adc->ref);
+iio_free:
+        iio_device_free(iio);
+
+        return err;
+}
+
+static int adc081c_remove(struct i2c_client *client)
+{
+        struct iio_dev *iio = i2c_get_clientdata(client);
+        struct adc081c *adc = iio_priv(iio);
+
+        iio_device_unregister(iio);
+        regulator_disable(adc->ref);
+        regulator_put(adc->ref);
+        iio_device_free(iio);
+
+        return 0;
+}
+
+static const struct i2c_device_id adc081c_id[] = {
+        { "adc081c", 0 },
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, adc081c_id);
+
+#ifdef CONFIG_OF
+static const struct of_device_id adc081c_of_match[] = {
+        { .compatible = "ti,adc081c" },
+        { }
+};
+MODULE_DEVICE_TABLE(of, adc081c_of_match);
+#endif
+
+static struct i2c_driver adc081c_driver = {
+        .driver = {
+                .name = "adc081c",
+                .owner = THIS_MODULE,
+                .of_match_table = of_match_ptr(adc081c_of_match),
+        },
+        .probe = adc081c_probe,
+        .remove = adc081c_remove,
+        .id_table = adc081c_id,
+};
+module_i2c_driver(adc081c_driver);
+
+MODULE_AUTHOR("Thierry Reding <thierry.reding@avionic-design.de>");
+MODULE_DESCRIPTION("Texas Instruments ADC081C021/027 driver");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/iio/buffer_cb.c b/drivers/iio/buffer_cb.c
new file mode 100644
index 000000000000..4d40e24f3721
--- /dev/null
+++ b/drivers/iio/buffer_cb.c
@@ -0,0 +1,113 @@
+#include <linux/kernel.h>
+#include <linux/slab.h>
+#include <linux/err.h>
+#include <linux/export.h>
+#include <linux/iio/buffer.h>
+#include <linux/iio/consumer.h>
+
+struct iio_cb_buffer {
+        struct iio_buffer buffer;
+        int (*cb)(u8 *data, void *private);
+        void *private;
+        struct iio_channel *channels;
+};
+
+static int iio_buffer_cb_store_to(struct iio_buffer *buffer, u8 *data)
+{
+        struct iio_cb_buffer *cb_buff = container_of(buffer,
+                                                     struct iio_cb_buffer,
+                                                     buffer);
+
+        return cb_buff->cb(data, cb_buff->private);
+}
+
+static struct iio_buffer_access_funcs iio_cb_access = {
+        .store_to = &iio_buffer_cb_store_to,
+};
+
+struct iio_cb_buffer *iio_channel_get_all_cb(const char *name,
+                                             int (*cb)(u8 *data,
+                                                       void *private),
+                                             void *private)
+{
+        int ret;
+        struct iio_cb_buffer *cb_buff;
+        struct iio_dev *indio_dev;
+        struct iio_channel *chan;
+
+        cb_buff = kzalloc(sizeof(*cb_buff), GFP_KERNEL);
+        if (cb_buff == NULL) {
+                ret = -ENOMEM;
+                goto error_ret;
+        }
+
+        cb_buff->private = private;
+        cb_buff->cb = cb;
+        cb_buff->buffer.access = &iio_cb_access;
+        INIT_LIST_HEAD(&cb_buff->buffer.demux_list);
+
+        cb_buff->channels = iio_channel_get_all(name);
+        if (IS_ERR(cb_buff->channels)) {
+                ret = PTR_ERR(cb_buff->channels);
+                goto error_free_cb_buff;
+        }
+
+        indio_dev = cb_buff->channels[0].indio_dev;
+        cb_buff->buffer.scan_mask
+                = kcalloc(BITS_TO_LONGS(indio_dev->masklength), sizeof(long),
+                          GFP_KERNEL);
+        if (cb_buff->buffer.scan_mask == NULL) {
+                ret = -ENOMEM;
+                goto error_release_channels;
+        }
+        chan = &cb_buff->channels[0];
+        while (chan->indio_dev) {
+                if (chan->indio_dev != indio_dev) {
+                        ret = -EINVAL;
+                        goto error_release_channels;
+                }
+                set_bit(chan->channel->scan_index,
+                        cb_buff->buffer.scan_mask);
+                chan++;
+        }
+
+        return cb_buff;
+
+error_release_channels:
+        iio_channel_release_all(cb_buff->channels);
+error_free_cb_buff:
+        kfree(cb_buff);
+error_ret:
+        return ERR_PTR(ret);
+}
+EXPORT_SYMBOL_GPL(iio_channel_get_all_cb);
+
+int iio_channel_start_all_cb(struct iio_cb_buffer *cb_buff)
+{
+        return iio_update_buffers(cb_buff->channels[0].indio_dev,
+                                  &cb_buff->buffer,
+                                  NULL);
+}
+EXPORT_SYMBOL_GPL(iio_channel_start_all_cb);
+
+void iio_channel_stop_all_cb(struct iio_cb_buffer *cb_buff)
+{
+        iio_update_buffers(cb_buff->channels[0].indio_dev,
+                           NULL,
+                           &cb_buff->buffer);
+}
+EXPORT_SYMBOL_GPL(iio_channel_stop_all_cb);
+
+void iio_channel_release_all_cb(struct iio_cb_buffer *cb_buff)
+{
+        iio_channel_release_all(cb_buff->channels);
+        kfree(cb_buff);
+}
+EXPORT_SYMBOL_GPL(iio_channel_release_all_cb);
+
+struct iio_channel
+*iio_channel_cb_get_channels(const struct iio_cb_buffer *cb_buffer)
+{
+        return cb_buffer->channels;
+}
+EXPORT_SYMBOL_GPL(iio_channel_cb_get_channels);
diff --git a/drivers/iio/common/hid-sensors/Kconfig b/drivers/iio/common/hid-sensors/Kconfig
index 8e63d81d652a..ae10778da7aa 100644
--- a/drivers/iio/common/hid-sensors/Kconfig
+++ b/drivers/iio/common/hid-sensors/Kconfig
@@ -15,7 +15,7 @@ config HID_SENSOR_IIO_COMMON
           attributes.
 
 config HID_SENSOR_ENUM_BASE_QUIRKS
-        tristate "ENUM base quirks for HID Sensor IIO drivers"
+        bool "ENUM base quirks for HID Sensor IIO drivers"
         depends on HID_SENSOR_IIO_COMMON
         help
           Say yes here to build support for sensor hub FW using
diff --git a/drivers/iio/common/hid-sensors/hid-sensor-trigger.c b/drivers/iio/common/hid-sensors/hid-sensor-trigger.c
index d4b790d18efb..d60198a6ca29 100644
--- a/drivers/iio/common/hid-sensors/hid-sensor-trigger.c
+++ b/drivers/iio/common/hid-sensors/hid-sensor-trigger.c
@@ -36,10 +36,8 @@ static int hid_sensor_data_rdy_trigger_set_state(struct iio_trigger *trig,
         int state_val;
 
         state_val = state ? 1 : 0;
-#if (defined CONFIG_HID_SENSOR_ENUM_BASE_QUIRKS) || \
-        (defined CONFIG_HID_SENSOR_ENUM_BASE_QUIRKS_MODULE)
-        ++state_val;
-#endif
+        if (IS_ENABLED(CONFIG_HID_SENSOR_ENUM_BASE_QUIRKS))
+                ++state_val;
         st->data_ready = state;
         sensor_hub_set_feature(st->hsdev, st->power_state.report_id,
                                         st->power_state.index,
diff --git a/drivers/iio/dac/Kconfig b/drivers/iio/dac/Kconfig
index b1c0ee5294ca..f4a6f0838327 100644
--- a/drivers/iio/dac/Kconfig
+++ b/drivers/iio/dac/Kconfig
@@ -67,6 +67,16 @@ config AD5446
           To compile this driver as a module, choose M here: the
           module will be called ad5446.
 
+config AD5449
+        tristate "Analog Device AD5449 and similar DACs driver"
+        depends on SPI_MASTER
+        help
+          Say yes here to build support for Analog Devices AD5415, AD5426, AD5429,
+          AD5432, AD5439, AD5443, AD5449 Digital to Analog Converters.
+
+          To compile this driver as a module, choose M here: the
+          module will be called ad5449.
+
 config AD5504
         tristate "Analog Devices AD5504/AD5501 DAC SPI driver"
         depends on SPI
@@ -122,7 +132,7 @@ config AD5686
 
 config MAX517
         tristate "Maxim MAX517/518/519 DAC driver"
-        depends on I2C && EXPERIMENTAL
+        depends on I2C
         help
           If you say yes here you get support for the Maxim chips MAX517,
           MAX518 and MAX519 (I2C 8-Bit DACs with rail-to-rail outputs).
diff --git a/drivers/iio/dac/Makefile b/drivers/iio/dac/Makefile
index c0d333b23ba3..5b528ebb3343 100644
--- a/drivers/iio/dac/Makefile
+++ b/drivers/iio/dac/Makefile
@@ -9,6 +9,7 @@ obj-$(CONFIG_AD5624R_SPI) += ad5624r_spi.o
 obj-$(CONFIG_AD5064) += ad5064.o
 obj-$(CONFIG_AD5504) += ad5504.o
 obj-$(CONFIG_AD5446) += ad5446.o
+obj-$(CONFIG_AD5449) += ad5449.o
 obj-$(CONFIG_AD5755) += ad5755.o
 obj-$(CONFIG_AD5764) += ad5764.o
 obj-$(CONFIG_AD5791) += ad5791.o
diff --git a/drivers/iio/dac/ad5449.c b/drivers/iio/dac/ad5449.c
new file mode 100644
index 000000000000..0ee6f8eeba8d
--- /dev/null
+++ b/drivers/iio/dac/ad5449.c
@@ -0,0 +1,376 @@
+/*
+ * AD5415, AD5426, AD5429, AD5432, AD5439, AD5443, AD5449 Digital to Analog
+ * Converter driver.
+ *
+ * Copyright 2012 Analog Devices Inc.
+ *  Author: Lars-Peter Clausen <lars@metafoo.de>
+ *
+ * Licensed under the GPL-2.
+ */
+
+#include <linux/device.h>
+#include <linux/err.h>
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/spi/spi.h>
+#include <linux/slab.h>
+#include <linux/sysfs.h>
+#include <linux/regulator/consumer.h>
+#include <asm/unaligned.h>
+
+#include <linux/iio/iio.h>
+#include <linux/iio/sysfs.h>
+
+#include <linux/platform_data/ad5449.h>
+
+#define AD5449_MAX_CHANNELS             2
+#define AD5449_MAX_VREFS                2
+
+#define AD5449_CMD_NOOP                 0x0
+#define AD5449_CMD_LOAD_AND_UPDATE(x)   (0x1 + (x) * 3)
+#define AD5449_CMD_READ(x)              (0x2 + (x) * 3)
+#define AD5449_CMD_LOAD(x)              (0x3 + (x) * 3)
+#define AD5449_CMD_CTRL                 13
+
+#define AD5449_CTRL_SDO_OFFSET          10
+#define AD5449_CTRL_DAISY_CHAIN         BIT(9)
+#define AD5449_CTRL_HCLR_TO_MIDSCALE    BIT(8)
+#define AD5449_CTRL_SAMPLE_RISING       BIT(7)
+
+/**
+ * struct ad5449_chip_info - chip specific information
+ * @channels:           Channel specification
+ * @num_channels:       Number of channels
+ * @has_ctrl:           Chip has a control register
+ */
+struct ad5449_chip_info {
+        const struct iio_chan_spec *channels;
+        unsigned int num_channels;
+        bool has_ctrl;
+};
+
+/**
+ * struct ad5449 - driver instance specific data
+ * @spi:                the SPI device for this driver instance
+ * @chip_info:          chip model specific constants, available modes etc
+ * @vref_reg:           vref supply regulators
+ * @has_sdo:            whether the SDO line is connected
+ * @dac_cache:          Cache for the DAC values
+ * @data:               spi transfer buffers
+ */
+struct ad5449 {
+        struct spi_device               *spi;
+        const struct ad5449_chip_info   *chip_info;
+        struct regulator_bulk_data      vref_reg[AD5449_MAX_VREFS];
+
+        bool has_sdo;
+        uint16_t dac_cache[AD5449_MAX_CHANNELS];
+
+        /*
+         * DMA (thus cache coherency maintenance) requires the
+         * transfer buffers to live in their own cache lines.
+         */
+        __be16 data[2] ____cacheline_aligned;
+};
+
+enum ad5449_type {
+        ID_AD5426,
+        ID_AD5429,
+        ID_AD5432,
+        ID_AD5439,
+        ID_AD5443,
+        ID_AD5449,
+};
+
+static int ad5449_write(struct iio_dev *indio_dev, unsigned int addr,
+        unsigned int val)
+{
+        struct ad5449 *st = iio_priv(indio_dev);
+        int ret;
+
+        mutex_lock(&indio_dev->mlock);
+        st->data[0] = cpu_to_be16((addr << 12) | val);
+        ret = spi_write(st->spi, st->data, 2);
+        mutex_unlock(&indio_dev->mlock);
+
+        return ret;
+}
+
+static int ad5449_read(struct iio_dev *indio_dev, unsigned int addr,
+        unsigned int *val)
+{
+        struct ad5449 *st = iio_priv(indio_dev);
+        int ret;
+        struct spi_message msg;
+        struct spi_transfer t[] = {
+                {
+                        .tx_buf = &st->data[0],
+                        .len = 2,
+                        .cs_change = 1,
+                }, {
+                        .tx_buf = &st->data[1],
+                        .rx_buf = &st->data[1],
+                        .len = 2,
+                },
+        };
+
+        spi_message_init(&msg);
+        spi_message_add_tail(&t[0], &msg);
+        spi_message_add_tail(&t[1], &msg);
+
+        mutex_lock(&indio_dev->mlock);
+        st->data[0] = cpu_to_be16(addr << 12);
+        st->data[1] = cpu_to_be16(AD5449_CMD_NOOP);
+
+        ret = spi_sync(st->spi, &msg);
+        if (ret < 0)
+                goto out_unlock;
+
+        *val = be16_to_cpu(st->data[1]);
+
+out_unlock:
+        mutex_unlock(&indio_dev->mlock);
+        return ret;
+}
+
+static int ad5449_read_raw(struct iio_dev *indio_dev,
+        struct iio_chan_spec const *chan, int *val, int *val2, long info)
+{
+        struct ad5449 *st = iio_priv(indio_dev);
+        struct regulator_bulk_data *reg;
+        int scale_uv;
+        int ret;
+
+        switch (info) {
+        case IIO_CHAN_INFO_RAW:
+                if (st->has_sdo) {
+                        ret = ad5449_read(indio_dev,
+                                AD5449_CMD_READ(chan->address), val);
+                        if (ret)
+                                return ret;
+                        *val &= 0xfff;
+                } else {
+                        *val = st->dac_cache[chan->address];
+                }
+
+                return IIO_VAL_INT;
+        case IIO_CHAN_INFO_SCALE:
+                reg = &st->vref_reg[chan->channel];
+                scale_uv = regulator_get_voltage(reg->consumer);
+                if (scale_uv < 0)
+                        return scale_uv;
+
+                *val = scale_uv / 1000;
+                *val2 = chan->scan_type.realbits;
+
+                return IIO_VAL_FRACTIONAL_LOG2;
+        default:
+                break;
+        }
+
+        return -EINVAL;
+}
+
+static int ad5449_write_raw(struct iio_dev *indio_dev,
+        struct iio_chan_spec const *chan, int val, int val2, long info)
+{
+        struct ad5449 *st = iio_priv(indio_dev);
+        int ret;
+
+        switch (info) {
+        case IIO_CHAN_INFO_RAW:
+                if (val < 0 || val >= (1 << chan->scan_type.realbits))
+                        return -EINVAL;
+
+                ret = ad5449_write(indio_dev,
+                        AD5449_CMD_LOAD_AND_UPDATE(chan->address),
+                        val << chan->scan_type.shift);
+                if (ret == 0)
+                        st->dac_cache[chan->address] = val;
+                break;
+        default:
+                ret = -EINVAL;
+        }
+
+        return ret;
+}
+
+static const struct iio_info ad5449_info = {
+        .read_raw = ad5449_read_raw,
+        .write_raw = ad5449_write_raw,
+        .driver_module = THIS_MODULE,
+};
+
+#define AD5449_CHANNEL(chan, bits) {                            \
+        .type = IIO_VOLTAGE,                                    \
+        .indexed = 1,                                           \
+        .output = 1,                                            \
+        .channel = (chan),                                      \
+        .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |           \
+                IIO_CHAN_INFO_SCALE_SEPARATE_BIT,               \
+        .address = (chan),                                      \
+        .scan_type = IIO_ST('u', (bits), 16, 12 - (bits)),      \
+}
+
+#define DECLARE_AD5449_CHANNELS(name, bits) \
+const struct iio_chan_spec name[] = { \
+        AD5449_CHANNEL(0, bits), \
+        AD5449_CHANNEL(1, bits), \
+}
+
+static DECLARE_AD5449_CHANNELS(ad5429_channels, 8);
+static DECLARE_AD5449_CHANNELS(ad5439_channels, 10);
+static DECLARE_AD5449_CHANNELS(ad5449_channels, 12);
+
+static const struct ad5449_chip_info ad5449_chip_info[] = {
+        [ID_AD5426] = {
+                .channels = ad5429_channels,
+                .num_channels = 1,
+                .has_ctrl = false,
+        },
+        [ID_AD5429] = {
+                .channels = ad5429_channels,
+                .num_channels = 2,
+                .has_ctrl = true,
+        },
+        [ID_AD5432] = {
+                .channels = ad5439_channels,
+                .num_channels = 1,
+                .has_ctrl = false,
+        },
+        [ID_AD5439] = {
+                .channels = ad5439_channels,
+                .num_channels = 2,
+                .has_ctrl = true,
+        },
+        [ID_AD5443] = {
+                .channels = ad5449_channels,
+                .num_channels = 1,
+                .has_ctrl = false,
+        },
+        [ID_AD5449] = {
+                .channels = ad5449_channels,
+                .num_channels = 2,
+                .has_ctrl = true,
+        },
+};
+
+static const char *ad5449_vref_name(struct ad5449 *st, int n)
+{
+        if (st->chip_info->num_channels == 1)
+                return "VREF";
+
+        if (n == 0)
+                return "VREFA";
+        else
+                return "VREFB";
+}
+
+static int __devinit ad5449_spi_probe(struct spi_device *spi)
+{
+        struct ad5449_platform_data *pdata = spi->dev.platform_data;
+        const struct spi_device_id *id = spi_get_device_id(spi);
+        struct iio_dev *indio_dev;
+        struct ad5449 *st;
+        unsigned int i;
+        int ret;
+
+        indio_dev = iio_device_alloc(sizeof(*st));
+        if (indio_dev == NULL)
+                return -ENOMEM;
+
+        st = iio_priv(indio_dev);
+        spi_set_drvdata(spi, indio_dev);
+
+        st->chip_info = &ad5449_chip_info[id->driver_data];
+        st->spi = spi;
+
+        for (i = 0; i < st->chip_info->num_channels; ++i)
+                st->vref_reg[i].supply = ad5449_vref_name(st, i);
+
+        ret = regulator_bulk_get(&spi->dev, st->chip_info->num_channels,
+                                st->vref_reg);
+        if (ret)
+                goto error_free;
+
+        ret = regulator_bulk_enable(st->chip_info->num_channels, st->vref_reg);
+        if (ret)
+                goto error_free_reg;
+
+        indio_dev->dev.parent = &spi->dev;
+        indio_dev->name = id->name;
+        indio_dev->info = &ad5449_info;
+        indio_dev->modes = INDIO_DIRECT_MODE;
+        indio_dev->channels = st->chip_info->channels;
+        indio_dev->num_channels = st->chip_info->num_channels;
+
+        if (st->chip_info->has_ctrl) {
+                unsigned int ctrl = 0x00;
+                if (pdata) {
+                        if (pdata->hardware_clear_to_midscale)
+                                ctrl |= AD5449_CTRL_HCLR_TO_MIDSCALE;
+                        ctrl |= pdata->sdo_mode << AD5449_CTRL_SDO_OFFSET;
+                        st->has_sdo = pdata->sdo_mode != AD5449_SDO_DISABLED;
+                } else {
+                        st->has_sdo = true;
+                }
+                ad5449_write(indio_dev, AD5449_CMD_CTRL, ctrl);
+        }
+
+        ret = iio_device_register(indio_dev);
+        if (ret)
+                goto error_disable_reg;
+
+        return 0;
+
+error_disable_reg:
+        regulator_bulk_disable(st->chip_info->num_channels, st->vref_reg);
+error_free_reg:
+        regulator_bulk_free(st->chip_info->num_channels, st->vref_reg);
+error_free:
+        iio_device_free(indio_dev);
+
+        return ret;
+}
+
+static int __devexit ad5449_spi_remove(struct spi_device *spi)
+{
+        struct iio_dev *indio_dev = spi_get_drvdata(spi);
+        struct ad5449 *st = iio_priv(indio_dev);
+
+        iio_device_unregister(indio_dev);
+
+        regulator_bulk_disable(st->chip_info->num_channels, st->vref_reg);
+        regulator_bulk_free(st->chip_info->num_channels, st->vref_reg);
+
+        iio_device_free(indio_dev);
+
+        return 0;
+}
+
+static const struct spi_device_id ad5449_spi_ids[] = {
+        { "ad5415", ID_AD5449 },
+        { "ad5426", ID_AD5426 },
+        { "ad5429", ID_AD5429 },
+        { "ad5432", ID_AD5432 },
+        { "ad5439", ID_AD5439 },
+        { "ad5443", ID_AD5443 },
+        { "ad5449", ID_AD5449 },
+        {}
+};
+MODULE_DEVICE_TABLE(spi, ad5449_spi_ids);
+
+static struct spi_driver ad5449_spi_driver = {
+        .driver = {
+                .name = "ad5449",
+                .owner = THIS_MODULE,
+        },
+        .probe = ad5449_spi_probe,
+        .remove = __devexit_p(ad5449_spi_remove),
+        .id_table = ad5449_spi_ids,
+};
+module_spi_driver(ad5449_spi_driver);
+
+MODULE_AUTHOR("Lars-Peter Clausen <lars@metafoo.de>");
+MODULE_DESCRIPTION("Analog Devices AD5449 and similar DACs");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/iio/dac/ad5686.c b/drivers/iio/dac/ad5686.c
index 6948d75e1036..bc92ff9309c2 100644
--- a/drivers/iio/dac/ad5686.c
+++ b/drivers/iio/dac/ad5686.c
@@ -188,7 +188,7 @@ static ssize_t ad5686_write_dac_powerdown(struct iio_dev *indio_dev,
         if (ret)
                 return ret;
 
-        if (readin == true)
+        if (readin)
                 st->pwr_down_mask |= (0x3 << (chan->channel * 2));
         else
                 st->pwr_down_mask &= ~(0x3 << (chan->channel * 2));
diff --git a/drivers/iio/gyro/Kconfig b/drivers/iio/gyro/Kconfig
index 21e27e2fc68c..48ed1483ff27 100644
--- a/drivers/iio/gyro/Kconfig
+++ b/drivers/iio/gyro/Kconfig
@@ -3,6 +3,15 @@
 #
 menu "Digital gyroscope sensors"
 
+config ADIS16136
+        tristate "Analog devices ADIS16136 and similar gyroscopes driver"
+        depends on SPI_MASTER
+        select IIO_ADIS_LIB
+        select IIO_ADIS_LIB_BUFFER if IIO_BUFFER
+        help
+          Say yes here to build support for the Analog Devices ADIS16133, ADIS16135,
+          ADIS16136 gyroscope devices.
+
 config HID_SENSOR_GYRO_3D
         depends on HID_SENSOR_HUB
         select IIO_BUFFER
diff --git a/drivers/iio/gyro/Makefile b/drivers/iio/gyro/Makefile
index 8a895d9fcbce..702a058907e3 100644
--- a/drivers/iio/gyro/Makefile
+++ b/drivers/iio/gyro/Makefile
@@ -2,4 +2,5 @@
 # Makefile for industrial I/O gyroscope sensor drivers
 #
 
+obj-$(CONFIG_ADIS16136) += adis16136.o
 obj-$(CONFIG_HID_SENSOR_GYRO_3D) += hid-sensor-gyro-3d.o
diff --git a/drivers/iio/gyro/adis16136.c b/drivers/iio/gyro/adis16136.c
new file mode 100644
index 000000000000..8cb0bcbfd609
--- /dev/null
+++ b/drivers/iio/gyro/adis16136.c
@@ -0,0 +1,580 @@
+/*
+ * ADIS16133/ADIS16135/ADIS16136 gyroscope driver
+ *
+ * Copyright 2012 Analog Devices Inc.
+ *   Author: Lars-Peter Clausen <lars@metafoo.de>
+ *
+ * Licensed under the GPL-2.
+ */
+
+#include <linux/interrupt.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/module.h>
+
+#include <linux/iio/iio.h>
+#include <linux/iio/sysfs.h>
+#include <linux/iio/buffer.h>
+#include <linux/iio/imu/adis.h>
+
+#include <linux/debugfs.h>
+
+#define ADIS16136_REG_FLASH_CNT         0x00
+#define ADIS16136_REG_TEMP_OUT          0x02
+#define ADIS16136_REG_GYRO_OUT2         0x04
+#define ADIS16136_REG_GYRO_OUT          0x06
+#define ADIS16136_REG_GYRO_OFF2         0x08
+#define ADIS16136_REG_GYRO_OFF          0x0A
+#define ADIS16136_REG_ALM_MAG1          0x10
+#define ADIS16136_REG_ALM_MAG2          0x12
+#define ADIS16136_REG_ALM_SAMPL1        0x14
+#define ADIS16136_REG_ALM_SAMPL2        0x16
+#define ADIS16136_REG_ALM_CTRL          0x18
+#define ADIS16136_REG_GPIO_CTRL         0x1A
+#define ADIS16136_REG_MSC_CTRL          0x1C
+#define ADIS16136_REG_SMPL_PRD          0x1E
+#define ADIS16136_REG_AVG_CNT           0x20
+#define ADIS16136_REG_DEC_RATE          0x22
+#define ADIS16136_REG_SLP_CTRL          0x24
+#define ADIS16136_REG_DIAG_STAT         0x26
+#define ADIS16136_REG_GLOB_CMD          0x28
+#define ADIS16136_REG_LOT1              0x32
+#define ADIS16136_REG_LOT2              0x34
+#define ADIS16136_REG_LOT3              0x36
+#define ADIS16136_REG_PROD_ID           0x38
+#define ADIS16136_REG_SERIAL_NUM        0x3A
+
+#define ADIS16136_DIAG_STAT_FLASH_UPDATE_FAIL   2
+#define ADIS16136_DIAG_STAT_SPI_FAIL            3
+#define ADIS16136_DIAG_STAT_SELF_TEST_FAIL      5
+#define ADIS16136_DIAG_STAT_FLASH_CHKSUM_FAIL   6
+
+#define ADIS16136_MSC_CTRL_MEMORY_TEST BIT(11)
+#define ADIS16136_MSC_CTRL_SELF_TEST BIT(10)
+
+struct adis16136_chip_info {
+        unsigned int precision;
+        unsigned int fullscale;
+};
+
+struct adis16136 {
+        const struct adis16136_chip_info *chip_info;
+
+        struct adis adis;
+};
+
+#ifdef CONFIG_DEBUG_FS
+
+static ssize_t adis16136_show_serial(struct file *file,
+                char __user *userbuf, size_t count, loff_t *ppos)
+{
+        struct adis16136 *adis16136 = file->private_data;
+        uint16_t lot1, lot2, lot3, serial;
+        char buf[20];
+        size_t len;
+        int ret;
+
+        ret = adis_read_reg_16(&adis16136->adis, ADIS16136_REG_SERIAL_NUM,
+                &serial);
+        if (ret < 0)
+                return ret;
+
+        ret = adis_read_reg_16(&adis16136->adis, ADIS16136_REG_LOT1, &lot1);
+        if (ret < 0)
+                return ret;
+
+        ret = adis_read_reg_16(&adis16136->adis, ADIS16136_REG_LOT2, &lot2);
+        if (ret < 0)
+                return ret;
+
+        ret = adis_read_reg_16(&adis16136->adis, ADIS16136_REG_LOT3, &lot3);
+        if (ret < 0)
+                return ret;
+
+        len = snprintf(buf, sizeof(buf), "%.4x%.4x%.4x-%.4x\n", lot1, lot2,
+                lot3, serial);
+
+        return simple_read_from_buffer(userbuf, count, ppos, buf, len);
+}
+
+static const struct file_operations adis16136_serial_fops = {
+        .open = simple_open,
+        .read = adis16136_show_serial,
+        .llseek = default_llseek,
+        .owner = THIS_MODULE,
+};
+
+static int adis16136_show_product_id(void *arg, u64 *val)
+{
+        struct adis16136 *adis16136 = arg;
+        u16 prod_id;
+        int ret;
+
+        ret = adis_read_reg_16(&adis16136->adis, ADIS16136_REG_PROD_ID,
+                &prod_id);
+        if (ret < 0)
+                return ret;
+
+        *val = prod_id;
+
+        return 0;
+}
+DEFINE_SIMPLE_ATTRIBUTE(adis16136_product_id_fops,
+        adis16136_show_product_id, NULL, "%llu\n");
+
+static int adis16136_show_flash_count(void *arg, u64 *val)
+{
+        struct adis16136 *adis16136 = arg;
+        uint16_t flash_count;
+        int ret;
+
+        ret = adis_read_reg_16(&adis16136->adis, ADIS16136_REG_FLASH_CNT,
+                &flash_count);
+        if (ret < 0)
+                return ret;
+
+        *val = flash_count;
+
+        return 0;
+}
+DEFINE_SIMPLE_ATTRIBUTE(adis16136_flash_count_fops,
+        adis16136_show_flash_count, NULL, "%lld\n");
+
+static int adis16136_debugfs_init(struct iio_dev *indio_dev)
+{
+        struct adis16136 *adis16136 = iio_priv(indio_dev);
+
+        debugfs_create_file("serial_number", 0400, indio_dev->debugfs_dentry,
+                adis16136, &adis16136_serial_fops);
+        debugfs_create_file("product_id", 0400, indio_dev->debugfs_dentry,
+                adis16136, &adis16136_product_id_fops);
+        debugfs_create_file("flash_count", 0400, indio_dev->debugfs_dentry,
+                adis16136, &adis16136_flash_count_fops);
+
+        return 0;
+}
+
+#else
+
+static int adis16136_debugfs_init(struct iio_dev *indio_dev)
+{
+        return 0;
+}
+
+#endif
+
+static int adis16136_set_freq(struct adis16136 *adis16136, unsigned int freq)
+{
+        unsigned int t;
+
+        t = 32768 / freq;
+        if (t < 0xf)
+                t = 0xf;
+        else if (t > 0xffff)
+                t = 0xffff;
+        else
+                t--;
+
+        return adis_write_reg_16(&adis16136->adis, ADIS16136_REG_SMPL_PRD, t);
+}
+
+static int adis16136_get_freq(struct adis16136 *adis16136, unsigned int *freq)
+{
+        uint16_t t;
+        int ret;
+
+        ret = adis_read_reg_16(&adis16136->adis, ADIS16136_REG_SMPL_PRD, &t);
+        if (ret < 0)
+                return ret;
+
+        *freq = 32768 / (t + 1);
+
+        return 0;
+}
+
+static ssize_t adis16136_write_frequency(struct device *dev,
+        struct device_attribute *attr, const char *buf, size_t len)
+{
+        struct iio_dev *indio_dev = dev_to_iio_dev(dev);
+        struct adis16136 *adis16136 = iio_priv(indio_dev);
+        unsigned int val;
+        int ret;
+
+        ret = kstrtouint(buf, 10, &val);
+        if (ret)
+                return ret;
+
+        if (val == 0)
+                return -EINVAL;
+
+        ret = adis16136_set_freq(adis16136, val);
+
+        return ret ? ret : len;
+}
+
+static ssize_t adis16136_read_frequency(struct device *dev,
+        struct device_attribute *attr, char *buf)
+{
+        struct iio_dev *indio_dev = dev_to_iio_dev(dev);
+        struct adis16136 *adis16136 = iio_priv(indio_dev);
+        unsigned int freq;
+        int ret;
+
+        ret = adis16136_get_freq(adis16136, &freq);
+        if (ret < 0)
+                return ret;
+
+        return sprintf(buf, "%d\n", freq);
+}
+
+static IIO_DEV_ATTR_SAMP_FREQ(S_IWUSR | S_IRUGO,
+                                  adis16136_read_frequency,
+                                  adis16136_write_frequency);
+
+static const unsigned adis16136_3db_divisors[] = {
+        [0] = 2, /* Special case */
+        [1] = 6,
+        [2] = 12,
+        [3] = 25,
+        [4] = 50,
+        [5] = 100,
+        [6] = 200,
+        [7] = 200, /* Not a valid setting */
+};
+
+static int adis16136_set_filter(struct iio_dev *indio_dev, int val)
+{
+        struct adis16136 *adis16136 = iio_priv(indio_dev);
+        unsigned int freq;
+        int i, ret;
+
+        ret = adis16136_get_freq(adis16136, &freq);
+        if (ret < 0)
+                return ret;
+
+        for (i = ARRAY_SIZE(adis16136_3db_divisors) - 1; i >= 1; i--) {
+                if (freq / adis16136_3db_divisors[i] >= val)
+                        break;
+        }
+
+        return adis_write_reg_16(&adis16136->adis, ADIS16136_REG_AVG_CNT, i);
+}
+
+static int adis16136_get_filter(struct iio_dev *indio_dev, int *val)
+{
+        struct adis16136 *adis16136 = iio_priv(indio_dev);
+        unsigned int freq;
+        uint16_t val16;
+        int ret;
+
+        mutex_lock(&indio_dev->mlock);
+
+        ret = adis_read_reg_16(&adis16136->adis, ADIS16136_REG_AVG_CNT, &val16);
+        if (ret < 0)
+                goto err_unlock;
+
+        ret = adis16136_get_freq(adis16136, &freq);
+        if (ret < 0)
+                goto err_unlock;
+
+        *val = freq / adis16136_3db_divisors[val16 & 0x07];
+
+err_unlock:
+        mutex_unlock(&indio_dev->mlock);
+
+        return ret ? ret : IIO_VAL_INT;
+}
+
+static int adis16136_read_raw(struct iio_dev *indio_dev,
+        const struct iio_chan_spec *chan, int *val, int *val2, long info)
+{
+        struct adis16136 *adis16136 = iio_priv(indio_dev);
+        uint32_t val32;
+        int ret;
+
+        switch (info) {
+        case IIO_CHAN_INFO_RAW:
+                return adis_single_conversion(indio_dev, chan, 0, val);
+        case IIO_CHAN_INFO_SCALE:
+                switch (chan->type) {
+                case IIO_ANGL_VEL:
+                        *val = adis16136->chip_info->precision;
+                        *val2 = (adis16136->chip_info->fullscale << 16);
+                        return IIO_VAL_FRACTIONAL;
+                case IIO_TEMP:
+                        *val = 10;
+                        *val2 = 697000; /* 0.010697 degree Celsius */
+                        return IIO_VAL_INT_PLUS_MICRO;
+                default:
+                        return -EINVAL;
+                }
+        case IIO_CHAN_INFO_CALIBBIAS:
+                ret = adis_read_reg_32(&adis16136->adis,
+                        ADIS16136_REG_GYRO_OFF2, &val32);
+                if (ret < 0)
+                        return ret;
+
+                *val = sign_extend32(val32, 31);
+
+                return IIO_VAL_INT;
+        case IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY:
+                return adis16136_get_filter(indio_dev, val);
+        default:
+                return -EINVAL;
+        }
+}
+
+static int adis16136_write_raw(struct iio_dev *indio_dev,
+        const struct iio_chan_spec *chan, int val, int val2, long info)
+{
+        struct adis16136 *adis16136 = iio_priv(indio_dev);
+
+        switch (info) {
+        case IIO_CHAN_INFO_CALIBBIAS:
+                return adis_write_reg_32(&adis16136->adis,
+                        ADIS16136_REG_GYRO_OFF2, val);
+        case IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY:
+                return adis16136_set_filter(indio_dev, val);
+        default:
+                break;
+        }
+
+        return -EINVAL;
+}
+
+enum {
+        ADIS16136_SCAN_GYRO,
+        ADIS16136_SCAN_TEMP,
+};
+
+static const struct iio_chan_spec adis16136_channels[] = {
+        {
+                .type = IIO_ANGL_VEL,
+                .modified = 1,
+                .channel2 = IIO_MOD_X,
+                .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |
+                        IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT |
+                        IIO_CHAN_INFO_SCALE_SHARED_BIT |
+                        IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY_SEPARATE_BIT,
+                .address = ADIS16136_REG_GYRO_OUT2,
+                .scan_index = ADIS16136_SCAN_GYRO,
+                .scan_type = {
+                        .sign = 's',
+                        .realbits = 32,
+                        .storagebits = 32,
+                        .endianness = IIO_BE,
+                },
+        }, {
+                .type = IIO_TEMP,
+                .indexed = 1,
+                .channel = 0,
+                .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |
+                        IIO_CHAN_INFO_SCALE_SEPARATE_BIT,
+                .address = ADIS16136_REG_TEMP_OUT,
+                .scan_index = ADIS16136_SCAN_TEMP,
+                .scan_type = {
+                        .sign = 's',
+                        .realbits = 16,
+                        .storagebits = 16,
+                        .endianness = IIO_BE,
+                },
+        },
+        IIO_CHAN_SOFT_TIMESTAMP(2),
+};
+
+static struct attribute *adis16136_attributes[] = {
+        &iio_dev_attr_sampling_frequency.dev_attr.attr,
+        NULL
+};
+
+static const struct attribute_group adis16136_attribute_group = {
+        .attrs = adis16136_attributes,
+};
+
+static const struct iio_info adis16136_info = {
+        .driver_module = THIS_MODULE,
+        .attrs = &adis16136_attribute_group,
+        .read_raw = &adis16136_read_raw,
+        .write_raw = &adis16136_write_raw,
+        .update_scan_mode = adis_update_scan_mode,
+        .debugfs_reg_access = adis_debugfs_reg_access,
+};
+
+static int adis16136_stop_device(struct iio_dev *indio_dev)
+{
+        struct adis16136 *adis16136 = iio_priv(indio_dev);
+        int ret;
+
+        ret = adis_write_reg_16(&adis16136->adis, ADIS16136_REG_SLP_CTRL, 0xff);
+        if (ret)
+                dev_err(&indio_dev->dev,
+                        "Could not power down device: %d\n", ret);
+
+        return ret;
+}
+
+static int adis16136_initial_setup(struct iio_dev *indio_dev)
+{
+        struct adis16136 *adis16136 = iio_priv(indio_dev);
+        unsigned int device_id;
+        uint16_t prod_id;
+        int ret;
+
+        ret = adis_initial_startup(&adis16136->adis);
+        if (ret)
+                return ret;
+
+        ret = adis_read_reg_16(&adis16136->adis, ADIS16136_REG_PROD_ID,
+                &prod_id);
+        if (ret)
+                return ret;
+
+        sscanf(indio_dev->name, "adis%u\n", &device_id);
+
+        if (prod_id != device_id)
+                dev_warn(&indio_dev->dev, "Device ID(%u) and product ID(%u) do not match.",
+                                device_id, prod_id);
+
+        return 0;
+}
+
+static const char * const adis16136_status_error_msgs[] = {
+        [ADIS16136_DIAG_STAT_FLASH_UPDATE_FAIL] = "Flash update failed",
+        [ADIS16136_DIAG_STAT_SPI_FAIL] = "SPI failure",
+        [ADIS16136_DIAG_STAT_SELF_TEST_FAIL] = "Self test error",
+        [ADIS16136_DIAG_STAT_FLASH_CHKSUM_FAIL] = "Flash checksum error",
+};
+
+static const struct adis_data adis16136_data = {
+        .diag_stat_reg = ADIS16136_REG_DIAG_STAT,
+        .glob_cmd_reg = ADIS16136_REG_GLOB_CMD,
+        .msc_ctrl_reg = ADIS16136_REG_MSC_CTRL,
+
+        .self_test_mask = ADIS16136_MSC_CTRL_SELF_TEST,
+        .startup_delay = 80,
+
+        .read_delay = 10,
+        .write_delay = 10,
+
+        .status_error_msgs = adis16136_status_error_msgs,
+        .status_error_mask = BIT(ADIS16136_DIAG_STAT_FLASH_UPDATE_FAIL) |
+                BIT(ADIS16136_DIAG_STAT_SPI_FAIL) |
+                BIT(ADIS16136_DIAG_STAT_SELF_TEST_FAIL) |
+                BIT(ADIS16136_DIAG_STAT_FLASH_CHKSUM_FAIL),
+};
+
+enum adis16136_id {
+        ID_ADIS16133,
+        ID_ADIS16135,
+        ID_ADIS16136,
+};
+
+static const struct adis16136_chip_info adis16136_chip_info[] = {
+        [ID_ADIS16133] = {
+                .precision = IIO_DEGREE_TO_RAD(1200),
+                .fullscale = 24000,
+        },
+        [ID_ADIS16135] = {
+                .precision = IIO_DEGREE_TO_RAD(300),
+                .fullscale = 24000,
+        },
+        [ID_ADIS16136] = {
+                .precision = IIO_DEGREE_TO_RAD(450),
+                .fullscale = 24623,
+        },
+};
+
+static int adis16136_probe(struct spi_device *spi)
+{
+        const struct spi_device_id *id = spi_get_device_id(spi);
+        struct adis16136 *adis16136;
+        struct iio_dev *indio_dev;
+        int ret;
+
+        indio_dev = iio_device_alloc(sizeof(*adis16136));
+        if (indio_dev == NULL)
+                return -ENOMEM;
+
+        spi_set_drvdata(spi, indio_dev);
+
+        adis16136 = iio_priv(indio_dev);
+
+        adis16136->chip_info = &adis16136_chip_info[id->driver_data];
+        indio_dev->dev.parent = &spi->dev;
+        indio_dev->name = spi_get_device_id(spi)->name;
+        indio_dev->channels = adis16136_channels;
+        indio_dev->num_channels = ARRAY_SIZE(adis16136_channels);
+        indio_dev->info = &adis16136_info;
+        indio_dev->modes = INDIO_DIRECT_MODE;
+
+        ret = adis_init(&adis16136->adis, indio_dev, spi, &adis16136_data);
+        if (ret)
+                goto error_free_dev;
+
+        ret = adis_setup_buffer_and_trigger(&adis16136->adis, indio_dev, NULL);
+        if (ret)
+                goto error_free_dev;
+
+        ret = adis16136_initial_setup(indio_dev);
+        if (ret)
+                goto error_cleanup_buffer;
+
+        ret = iio_device_register(indio_dev);
+        if (ret)
+                goto error_stop_device;
+
+        adis16136_debugfs_init(indio_dev);
+
+        return 0;
+
+error_stop_device:
+        adis16136_stop_device(indio_dev);
+error_cleanup_buffer:
+        adis_cleanup_buffer_and_trigger(&adis16136->adis, indio_dev);
+error_free_dev:
+        iio_device_free(indio_dev);
+        return ret;
+}
+
+static int adis16136_remove(struct spi_device *spi)
+{
+        struct iio_dev *indio_dev = spi_get_drvdata(spi);
+        struct adis16136 *adis16136 = iio_priv(indio_dev);
+
+        iio_device_unregister(indio_dev);
+        adis16136_stop_device(indio_dev);
+
+        adis_cleanup_buffer_and_trigger(&adis16136->adis, indio_dev);
+
+        iio_device_free(indio_dev);
+
+        return 0;
+}
+
+static const struct spi_device_id adis16136_ids[] = {
+        { "adis16133", ID_ADIS16133 },
+        { "adis16135", ID_ADIS16135 },
+        { "adis16136", ID_ADIS16136 },
+        { }
+};
+MODULE_DEVICE_TABLE(spi, adis16136_ids);
+
+static struct spi_driver adis16136_driver = {
+        .driver = {
+                .name = "adis16136",
+                .owner = THIS_MODULE,
+        },
+        .id_table = adis16136_ids,
+        .probe = adis16136_probe,
+        .remove = adis16136_remove,
+};
+module_spi_driver(adis16136_driver);
+
+MODULE_AUTHOR("Lars-Peter Clausen <lars@metafoo.de>");
+MODULE_DESCRIPTION("Analog Devices ADIS16133/ADIS16135/ADIS16136 gyroscope driver");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/iio/gyro/hid-sensor-gyro-3d.c b/drivers/iio/gyro/hid-sensor-gyro-3d.c
index 4c56ada51c39..4c8b158e40e1 100644
--- a/drivers/iio/gyro/hid-sensor-gyro-3d.c
+++ b/drivers/iio/gyro/hid-sensor-gyro-3d.c
@@ -197,21 +197,8 @@ static const struct iio_info gyro_3d_info = {
 /* Function to push data to buffer */
 static void hid_sensor_push_data(struct iio_dev *indio_dev, u8 *data, int len)
 {
-        struct iio_buffer *buffer = indio_dev->buffer;
-        int datum_sz;
-
         dev_dbg(&indio_dev->dev, "hid_sensor_push_data\n");
-        if (!buffer) {
-                dev_err(&indio_dev->dev, "Buffer == NULL\n");
-                return;
-        }
-        datum_sz = buffer->access->get_bytes_per_datum(buffer);
-        if (len > datum_sz) {
-                dev_err(&indio_dev->dev, "Datum size mismatch %d:%d\n", len,
-                                datum_sz);
-                return;
-        }
-        iio_push_to_buffer(buffer, (u8 *)data);
+        iio_push_to_buffers(indio_dev, (u8 *)data);
 }
 
 /* Callback handler to send event after all samples are received and captured */
@@ -319,10 +306,10 @@ static int __devinit hid_gyro_3d_probe(struct platform_device *pdev)
                 goto error_free_dev;
         }
 
-        channels = kmemdup(gyro_3d_channels,
-                                        sizeof(gyro_3d_channels),
-                                        GFP_KERNEL);
+        channels = kmemdup(gyro_3d_channels, sizeof(gyro_3d_channels),
+                           GFP_KERNEL);
         if (!channels) {
+                ret = -ENOMEM;
                 dev_err(&pdev->dev, "failed to duplicate channels\n");
                 goto error_free_dev;
         }
diff --git a/drivers/iio/imu/Kconfig b/drivers/iio/imu/Kconfig
new file mode 100644
index 000000000000..3d79a40e916b
--- /dev/null
+++ b/drivers/iio/imu/Kconfig
@@ -0,0 +1,27 @@
+#
+# IIO imu drivers configuration
+#
+menu "Inertial measurement units"
+
+config ADIS16480
+        tristate "Analog Devices ADIS16480 and similar IMU driver"
+        depends on SPI
+        select IIO_ADIS_LIB
+        select IIO_ADIS_LIB_BUFFER if IIO_BUFFER
+        help
+          Say yes here to build support for Analog Devices ADIS16375, ADIS16480,
+          ADIS16485, ADIS16488 inertial sensors.
+
+endmenu
+
+config IIO_ADIS_LIB
+        tristate
+        help
+          A set of IO helper functions for the Analog Devices ADIS* device family.
+
+config IIO_ADIS_LIB_BUFFER
+        bool
+        select IIO_TRIGGERED_BUFFER
+        help
+          A set of buffer helper functions for the Analog Devices ADIS* device
+          family.
diff --git a/drivers/iio/imu/Makefile b/drivers/iio/imu/Makefile
new file mode 100644
index 000000000000..cfe57638f6f9
--- /dev/null
+++ b/drivers/iio/imu/Makefile
@@ -0,0 +1,10 @@
+#
+# Makefile for Inertial Measurement Units
+#
+
+obj-$(CONFIG_ADIS16480) += adis16480.o
+
+adis_lib-y += adis.o
+adis_lib-$(CONFIG_IIO_ADIS_LIB_BUFFER) += adis_trigger.o
+adis_lib-$(CONFIG_IIO_ADIS_LIB_BUFFER) += adis_buffer.o
+obj-$(CONFIG_IIO_ADIS_LIB) += adis_lib.o
diff --git a/drivers/iio/imu/adis.c b/drivers/iio/imu/adis.c
new file mode 100644
index 000000000000..911255d41c1a
--- /dev/null
+++ b/drivers/iio/imu/adis.c
@@ -0,0 +1,440 @@
+/*
+ * Common library for ADIS16XXX devices
+ *
+ * Copyright 2012 Analog Devices Inc.
+ *   Author: Lars-Peter Clausen <lars@metafoo.de>
+ *
+ * Licensed under the GPL-2 or later.
+ */
+
+#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/module.h>
+#include <asm/unaligned.h>
+
+#include <linux/iio/iio.h>
+#include <linux/iio/sysfs.h>
+#include <linux/iio/buffer.h>
+#include <linux/iio/imu/adis.h>
+
+#define ADIS_MSC_CTRL_DATA_RDY_EN       BIT(2)
+#define ADIS_MSC_CTRL_DATA_RDY_POL_HIGH BIT(1)
+#define ADIS_MSC_CTRL_DATA_RDY_DIO2     BIT(0)
+#define ADIS_GLOB_CMD_SW_RESET          BIT(7)
+
+int adis_write_reg(struct adis *adis, unsigned int reg,
+        unsigned int value, unsigned int size)
+{
+        unsigned int page = reg / ADIS_PAGE_SIZE;
+        int ret, i;
+        struct spi_message msg;
+        struct spi_transfer xfers[] = {
+                {
+                        .tx_buf = adis->tx,
+                        .bits_per_word = 8,
+                        .len = 2,
+                        .cs_change = 1,
+                        .delay_usecs = adis->data->write_delay,
+                }, {
+                        .tx_buf = adis->tx + 2,
+                        .bits_per_word = 8,
+                        .len = 2,
+                        .cs_change = 1,
+                        .delay_usecs = adis->data->write_delay,
+                }, {
+                        .tx_buf = adis->tx + 4,
+                        .bits_per_word = 8,
+                        .len = 2,
+                        .cs_change = 1,
+                        .delay_usecs = adis->data->write_delay,
+                }, {
+                        .tx_buf = adis->tx + 6,
+                        .bits_per_word = 8,
+                        .len = 2,
+                        .delay_usecs = adis->data->write_delay,
+                }, {
+                        .tx_buf = adis->tx + 8,
+                        .bits_per_word = 8,
+                        .len = 2,
+                        .delay_usecs = adis->data->write_delay,
+                },
+        };
+
+        mutex_lock(&adis->txrx_lock);
+
+        spi_message_init(&msg);
+
+        if (adis->current_page != page) {
+                adis->tx[0] = ADIS_WRITE_REG(ADIS_REG_PAGE_ID);
+                adis->tx[1] = page;
+                spi_message_add_tail(&xfers[0], &msg);
+        }
+
+        switch (size) {
+        case 4:
+                adis->tx[8] = ADIS_WRITE_REG(reg + 3);
+                adis->tx[9] = (value >> 24) & 0xff;
+                adis->tx[6] = ADIS_WRITE_REG(reg + 2);
+                adis->tx[7] = (value >> 16) & 0xff;
+        case 2:
+                adis->tx[4] = ADIS_WRITE_REG(reg + 1);
+                adis->tx[5] = (value >> 8) & 0xff;
+        case 1:
+                adis->tx[2] = ADIS_WRITE_REG(reg);
+                adis->tx[3] = value & 0xff;
+                break;
+        default:
+                ret = -EINVAL;
+                goto out_unlock;
+        }
+
+        xfers[size].cs_change = 0;
+
+        for (i = 1; i <= size; i++)
+                spi_message_add_tail(&xfers[i], &msg);
+
+        ret = spi_sync(adis->spi, &msg);
+        if (ret) {
+                dev_err(&adis->spi->dev, "Failed to write register 0x%02X: %d\n",
+                                reg, ret);
+        } else {
+                adis->current_page = page;
+        }
+
+out_unlock:
+        mutex_unlock(&adis->txrx_lock);
+
+        return ret;
+}
+EXPORT_SYMBOL_GPL(adis_write_reg);
+
+/**
+ * adis_read_reg() - read 2 bytes from a 16-bit register
+ * @adis: The adis device
+ * @reg: The address of the lower of the two registers
+ * @val: The value read back from the device
+ */
+int adis_read_reg(struct adis *adis, unsigned int reg,
+        unsigned int *val, unsigned int size)
+{
+        unsigned int page = reg / ADIS_PAGE_SIZE;
+        struct spi_message msg;
+        int ret;
+        struct spi_transfer xfers[] = {
+                {
+                        .tx_buf = adis->tx,
+                        .bits_per_word = 8,
+                        .len = 2,
+                        .cs_change = 1,
+                        .delay_usecs = adis->data->write_delay,
+                }, {
+                        .tx_buf = adis->tx + 2,
+                        .bits_per_word = 8,
+                        .len = 2,
+                        .cs_change = 1,
+                        .delay_usecs = adis->data->read_delay,
+                }, {
+                        .tx_buf = adis->tx + 4,
+                        .rx_buf = adis->rx,
+                        .bits_per_word = 8,
+                        .len = 2,
+                        .cs_change = 1,
+                        .delay_usecs = adis->data->read_delay,
+                }, {
+                        .rx_buf = adis->rx + 2,
+                        .bits_per_word = 8,
+                        .len = 2,
+                        .delay_usecs = adis->data->read_delay,
+                },
+        };
+
+        mutex_lock(&adis->txrx_lock);
+        spi_message_init(&msg);
+
+        if (adis->current_page != page) {
+                adis->tx[0] = ADIS_WRITE_REG(ADIS_REG_PAGE_ID);
+                adis->tx[1] = page;
+                spi_message_add_tail(&xfers[0], &msg);
+        }
+
+        switch (size) {
+        case 4:
+                adis->tx[2] = ADIS_READ_REG(reg + 2);
+                adis->tx[3] = 0;
+                spi_message_add_tail(&xfers[1], &msg);
+        case 2:
+                adis->tx[4] = ADIS_READ_REG(reg);
+                adis->tx[5] = 0;
+                spi_message_add_tail(&xfers[2], &msg);
+                spi_message_add_tail(&xfers[3], &msg);
+                break;
+        default:
+                ret = -EINVAL;
+                goto out_unlock;
+        }
+
+        ret = spi_sync(adis->spi, &msg);
+        if (ret) {
+                dev_err(&adis->spi->dev, "Failed to read register 0x%02X: %d\n",
+                                reg, ret);
+                goto out_unlock;
+        } else {
+                adis->current_page = page;
+        }
+
+        switch (size) {
+        case 4:
+                *val = get_unaligned_be32(adis->rx);
+                break;
+        case 2:
+                *val = get_unaligned_be16(adis->rx + 2);
+                break;
+        }
+
+out_unlock:
+        mutex_unlock(&adis->txrx_lock);
+
+        return ret;
+}
+EXPORT_SYMBOL_GPL(adis_read_reg);
+
+#ifdef CONFIG_DEBUG_FS
+
+int adis_debugfs_reg_access(struct iio_dev *indio_dev,
+        unsigned int reg, unsigned int writeval, unsigned int *readval)
+{
+        struct adis *adis = iio_device_get_drvdata(indio_dev);
+
+        if (readval) {
+                uint16_t val16;
+                int ret;
+
+                ret = adis_read_reg_16(adis, reg, &val16);
+                *readval = val16;
+
+                return ret;
+        } else {
+                return adis_write_reg_16(adis, reg, writeval);
+        }
+}
+EXPORT_SYMBOL(adis_debugfs_reg_access);
+
+#endif
+
+/**
+ * adis_enable_irq() - Enable or disable data ready IRQ
+ * @adis: The adis device
+ * @enable: Whether to enable the IRQ
+ *
+ * Returns 0 on success, negative error code otherwise
+ */
+int adis_enable_irq(struct adis *adis, bool enable)
+{
+        int ret = 0;
+        uint16_t msc;
+
+        if (adis->data->enable_irq)
+                return adis->data->enable_irq(adis, enable);
+
+        ret = adis_read_reg_16(adis, adis->data->msc_ctrl_reg, &msc);
+        if (ret)
+                goto error_ret;
+
+        msc |= ADIS_MSC_CTRL_DATA_RDY_POL_HIGH;
+        msc &= ~ADIS_MSC_CTRL_DATA_RDY_DIO2;
+        if (enable)
+                msc |= ADIS_MSC_CTRL_DATA_RDY_EN;
+        else
+                msc &= ~ADIS_MSC_CTRL_DATA_RDY_EN;
+
+        ret = adis_write_reg_16(adis, adis->data->msc_ctrl_reg, msc);
+
+error_ret:
+        return ret;
+}
+EXPORT_SYMBOL(adis_enable_irq);
+
+/**
+ * adis_check_status() - Check the device for error conditions
+ * @adis: The adis device
+ *
+ * Returns 0 on success, a negative error code otherwise
+ */
+int adis_check_status(struct adis *adis)
+{
+        uint16_t status;
+        int ret;
+        int i;
+
+        ret = adis_read_reg_16(adis, adis->data->diag_stat_reg, &status);
+        if (ret < 0)
+                return ret;
+
+        status &= adis->data->status_error_mask;
+
+        if (status == 0)
+                return 0;
+
+        for (i = 0; i < 16; ++i) {
+                if (status & BIT(i)) {
+                        dev_err(&adis->spi->dev, "%s.\n",
+                                adis->data->status_error_msgs[i]);
+                }
+        }
+
+        return -EIO;
+}
+EXPORT_SYMBOL_GPL(adis_check_status);
+
+/**
+ * adis_reset() - Reset the device
+ * @adis: The adis device
+ *
+ * Returns 0 on success, a negative error code otherwise
+ */
+int adis_reset(struct adis *adis)
+{
+        int ret;
+
+        ret = adis_write_reg_8(adis, adis->data->glob_cmd_reg,
+                        ADIS_GLOB_CMD_SW_RESET);
+        if (ret)
+                dev_err(&adis->spi->dev, "Failed to reset device: %d\n", ret);
+
+        return ret;
+}
+EXPORT_SYMBOL_GPL(adis_reset);
+
+static int adis_self_test(struct adis *adis)
+{
+        int ret;
+
+        ret = adis_write_reg_16(adis, adis->data->msc_ctrl_reg,
+                        adis->data->self_test_mask);
+        if (ret) {
+                dev_err(&adis->spi->dev, "Failed to initiate self test: %d\n",
+                        ret);
+                return ret;
+        }
+
+        msleep(adis->data->startup_delay);
+
+        return adis_check_status(adis);
+}
+
+/**
+ * adis_inital_startup() - Performs device self-test
+ * @adis: The adis device
+ *
+ * Returns 0 if the device is operational, a negative error code otherwise.
+ *
+ * This function should be called early on in the device initialization sequence
+ * to ensure that the device is in a sane and known state and that it is usable.
+ */
+int adis_initial_startup(struct adis *adis)
+{
+        int ret;
+
+        ret = adis_self_test(adis);
+        if (ret) {
+                dev_err(&adis->spi->dev, "Self-test failed, trying reset.\n");
+                adis_reset(adis);
+                msleep(adis->data->startup_delay);
+                ret = adis_self_test(adis);
+                if (ret) {
+                        dev_err(&adis->spi->dev, "Second self-test failed, giving up.\n");
+                        return ret;
+                }
+        }
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(adis_initial_startup);
+
+/**
+ * adis_single_conversion() - Performs a single sample conversion
+ * @indio_dev: The IIO device
+ * @chan: The IIO channel
+ * @error_mask: Mask for the error bit
+ * @val: Result of the conversion
+ *
+ * Returns IIO_VAL_INT on success, a negative error code otherwise.
+ *
+ * The function performs a single conversion on a given channel and post
+ * processes the value accordingly to the channel spec. If a error_mask is given
+ * the function will check if the mask is set in the returned raw value. If it
+ * is set the function will perform a self-check. If the device does not report
+ * a error bit in the channels raw value set error_mask to 0.
+ */
+int adis_single_conversion(struct iio_dev *indio_dev,
+        const struct iio_chan_spec *chan, unsigned int error_mask, int *val)
+{
+        struct adis *adis = iio_device_get_drvdata(indio_dev);
+        unsigned int uval;
+        int ret;
+
+        mutex_lock(&indio_dev->mlock);
+
+        ret = adis_read_reg(adis, chan->address, &uval,
+                        chan->scan_type.storagebits / 8);
+        if (ret)
+                goto err_unlock;
+
+        if (uval & error_mask) {
+                ret = adis_check_status(adis);
+                if (ret)
+                        goto err_unlock;
+        }
+
+        if (chan->scan_type.sign == 's')
+                *val = sign_extend32(uval, chan->scan_type.realbits - 1);
+        else
+                *val = uval & ((1 << chan->scan_type.realbits) - 1);
+
+        ret = IIO_VAL_INT;
+err_unlock:
+        mutex_unlock(&indio_dev->mlock);
+        return ret;
+}
+EXPORT_SYMBOL_GPL(adis_single_conversion);
+
+/**
+ * adis_init() - Initialize adis device structure
+ * @adis:       The adis device
+ * @indio_dev:  The iio device
+ * @spi:        The spi device
+ * @data:       Chip specific data
+ *
+ * Returns 0 on success, a negative error code otherwise.
+ *
+ * This function must be called, before any other adis helper function may be
+ * called.
+ */
+int adis_init(struct adis *adis, struct iio_dev *indio_dev,
+        struct spi_device *spi, const struct adis_data *data)
+{
+        mutex_init(&adis->txrx_lock);
+        adis->spi = spi;
+        adis->data = data;
+        iio_device_set_drvdata(indio_dev, adis);
+
+        if (data->has_paging) {
+                /* Need to set the page before first read/write */
+                adis->current_page = -1;
+        } else {
+                /* Page will always be 0 */
+                adis->current_page = 0;
+        }
+
+        return adis_enable_irq(adis, false);
+}
+EXPORT_SYMBOL_GPL(adis_init);
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Lars-Peter Clausen <lars@metafoo.de>");
+MODULE_DESCRIPTION("Common library code for ADIS16XXX devices");
diff --git a/drivers/iio/imu/adis16480.c b/drivers/iio/imu/adis16480.c
new file mode 100644
index 000000000000..8c26a5f7cd5d
--- /dev/null
+++ b/drivers/iio/imu/adis16480.c
@@ -0,0 +1,924 @@
+/*
+ * ADIS16480 and similar IMUs driver
+ *
+ * Copyright 2012 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/interrupt.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/module.h>
+
+#include <linux/iio/iio.h>
+#include <linux/iio/sysfs.h>
+#include <linux/iio/buffer.h>
+#include <linux/iio/imu/adis.h>
+
+#include <linux/debugfs.h>
+
+#define ADIS16480_PAGE_SIZE 0x80
+
+#define ADIS16480_REG(page, reg) ((page) * ADIS16480_PAGE_SIZE + (reg))
+
+#define ADIS16480_REG_PAGE_ID 0x00 /* Same address on each page */
+#define ADIS16480_REG_SEQ_CNT                   ADIS16480_REG(0x00, 0x06)
+#define ADIS16480_REG_SYS_E_FLA                 ADIS16480_REG(0x00, 0x08)
+#define ADIS16480_REG_DIAG_STS                  ADIS16480_REG(0x00, 0x0A)
+#define ADIS16480_REG_ALM_STS                   ADIS16480_REG(0x00, 0x0C)
+#define ADIS16480_REG_TEMP_OUT                  ADIS16480_REG(0x00, 0x0E)
+#define ADIS16480_REG_X_GYRO_OUT                ADIS16480_REG(0x00, 0x10)
+#define ADIS16480_REG_Y_GYRO_OUT                ADIS16480_REG(0x00, 0x14)
+#define ADIS16480_REG_Z_GYRO_OUT                ADIS16480_REG(0x00, 0x18)
+#define ADIS16480_REG_X_ACCEL_OUT               ADIS16480_REG(0x00, 0x1C)
+#define ADIS16480_REG_Y_ACCEL_OUT               ADIS16480_REG(0x00, 0x20)
+#define ADIS16480_REG_Z_ACCEL_OUT               ADIS16480_REG(0x00, 0x24)
+#define ADIS16480_REG_X_MAGN_OUT                ADIS16480_REG(0x00, 0x28)
+#define ADIS16480_REG_Y_MAGN_OUT                ADIS16480_REG(0x00, 0x2A)
+#define ADIS16480_REG_Z_MAGN_OUT                ADIS16480_REG(0x00, 0x2C)
+#define ADIS16480_REG_BAROM_OUT                 ADIS16480_REG(0x00, 0x2E)
+#define ADIS16480_REG_X_DELTAANG_OUT            ADIS16480_REG(0x00, 0x40)
+#define ADIS16480_REG_Y_DELTAANG_OUT            ADIS16480_REG(0x00, 0x44)
+#define ADIS16480_REG_Z_DELTAANG_OUT            ADIS16480_REG(0x00, 0x48)
+#define ADIS16480_REG_X_DELTAVEL_OUT            ADIS16480_REG(0x00, 0x4C)
+#define ADIS16480_REG_Y_DELTAVEL_OUT            ADIS16480_REG(0x00, 0x50)
+#define ADIS16480_REG_Z_DELTAVEL_OUT            ADIS16480_REG(0x00, 0x54)
+#define ADIS16480_REG_PROD_ID                   ADIS16480_REG(0x00, 0x7E)
+
+#define ADIS16480_REG_X_GYRO_SCALE              ADIS16480_REG(0x02, 0x04)
+#define ADIS16480_REG_Y_GYRO_SCALE              ADIS16480_REG(0x02, 0x06)
+#define ADIS16480_REG_Z_GYRO_SCALE              ADIS16480_REG(0x02, 0x08)
+#define ADIS16480_REG_X_ACCEL_SCALE             ADIS16480_REG(0x02, 0x0A)
+#define ADIS16480_REG_Y_ACCEL_SCALE             ADIS16480_REG(0x02, 0x0C)
+#define ADIS16480_REG_Z_ACCEL_SCALE             ADIS16480_REG(0x02, 0x0E)
+#define ADIS16480_REG_X_GYRO_BIAS               ADIS16480_REG(0x02, 0x10)
+#define ADIS16480_REG_Y_GYRO_BIAS               ADIS16480_REG(0x02, 0x14)
+#define ADIS16480_REG_Z_GYRO_BIAS               ADIS16480_REG(0x02, 0x18)
+#define ADIS16480_REG_X_ACCEL_BIAS              ADIS16480_REG(0x02, 0x1C)
+#define ADIS16480_REG_Y_ACCEL_BIAS              ADIS16480_REG(0x02, 0x20)
+#define ADIS16480_REG_Z_ACCEL_BIAS              ADIS16480_REG(0x02, 0x24)
+#define ADIS16480_REG_X_HARD_IRON               ADIS16480_REG(0x02, 0x28)
+#define ADIS16480_REG_Y_HARD_IRON               ADIS16480_REG(0x02, 0x2A)
+#define ADIS16480_REG_Z_HARD_IRON               ADIS16480_REG(0x02, 0x2C)
+#define ADIS16480_REG_BAROM_BIAS                ADIS16480_REG(0x02, 0x40)
+#define ADIS16480_REG_FLASH_CNT                 ADIS16480_REG(0x02, 0x7C)
+
+#define ADIS16480_REG_GLOB_CMD                  ADIS16480_REG(0x03, 0x02)
+#define ADIS16480_REG_FNCTIO_CTRL               ADIS16480_REG(0x03, 0x06)
+#define ADIS16480_REG_GPIO_CTRL                 ADIS16480_REG(0x03, 0x08)
+#define ADIS16480_REG_CONFIG                    ADIS16480_REG(0x03, 0x0A)
+#define ADIS16480_REG_DEC_RATE                  ADIS16480_REG(0x03, 0x0C)
+#define ADIS16480_REG_SLP_CNT                   ADIS16480_REG(0x03, 0x10)
+#define ADIS16480_REG_FILTER_BNK0               ADIS16480_REG(0x03, 0x16)
+#define ADIS16480_REG_FILTER_BNK1               ADIS16480_REG(0x03, 0x18)
+#define ADIS16480_REG_ALM_CNFG0                 ADIS16480_REG(0x03, 0x20)
+#define ADIS16480_REG_ALM_CNFG1                 ADIS16480_REG(0x03, 0x22)
+#define ADIS16480_REG_ALM_CNFG2                 ADIS16480_REG(0x03, 0x24)
+#define ADIS16480_REG_XG_ALM_MAGN               ADIS16480_REG(0x03, 0x28)
+#define ADIS16480_REG_YG_ALM_MAGN               ADIS16480_REG(0x03, 0x2A)
+#define ADIS16480_REG_ZG_ALM_MAGN               ADIS16480_REG(0x03, 0x2C)
+#define ADIS16480_REG_XA_ALM_MAGN               ADIS16480_REG(0x03, 0x2E)
+#define ADIS16480_REG_YA_ALM_MAGN               ADIS16480_REG(0x03, 0x30)
+#define ADIS16480_REG_ZA_ALM_MAGN               ADIS16480_REG(0x03, 0x32)
+#define ADIS16480_REG_XM_ALM_MAGN               ADIS16480_REG(0x03, 0x34)
+#define ADIS16480_REG_YM_ALM_MAGN               ADIS16480_REG(0x03, 0x36)
+#define ADIS16480_REG_ZM_ALM_MAGN               ADIS16480_REG(0x03, 0x38)
+#define ADIS16480_REG_BR_ALM_MAGN               ADIS16480_REG(0x03, 0x3A)
+#define ADIS16480_REG_FIRM_REV                  ADIS16480_REG(0x03, 0x78)
+#define ADIS16480_REG_FIRM_DM                   ADIS16480_REG(0x03, 0x7A)
+#define ADIS16480_REG_FIRM_Y                    ADIS16480_REG(0x03, 0x7C)
+
+#define ADIS16480_REG_SERIAL_NUM                ADIS16480_REG(0x04, 0x20)
+
+/* Each filter coefficent bank spans two pages */
+#define ADIS16480_FIR_COEF(page) (x < 60 ? ADIS16480_REG(page, (x) + 8) : \
+                ADIS16480_REG((page) + 1, (x) - 60 + 8))
+#define ADIS16480_FIR_COEF_A(x)                 ADIS16480_FIR_COEF(0x05, (x))
+#define ADIS16480_FIR_COEF_B(x)                 ADIS16480_FIR_COEF(0x07, (x))
+#define ADIS16480_FIR_COEF_C(x)                 ADIS16480_FIR_COEF(0x09, (x))
+#define ADIS16480_FIR_COEF_D(x)                 ADIS16480_FIR_COEF(0x0B, (x))
+
+struct adis16480_chip_info {
+        unsigned int num_channels;
+        const struct iio_chan_spec *channels;
+};
+
+struct adis16480 {
+        const struct adis16480_chip_info *chip_info;
+
+        struct adis adis;
+};
+
+#ifdef CONFIG_DEBUG_FS
+
+static ssize_t adis16480_show_firmware_revision(struct file *file,
+                char __user *userbuf, size_t count, loff_t *ppos)
+{
+        struct adis16480 *adis16480 = file->private_data;
+        char buf[7];
+        size_t len;
+        u16 rev;
+        int ret;
+
+        ret = adis_read_reg_16(&adis16480->adis, ADIS16480_REG_FIRM_REV, &rev);
+        if (ret < 0)
+                return ret;
+
+        len = scnprintf(buf, sizeof(buf), "%x.%x\n", rev >> 8, rev & 0xff);
+
+        return simple_read_from_buffer(userbuf, count, ppos, buf, len);
+}
+
+static const struct file_operations adis16480_firmware_revision_fops = {
+        .open = simple_open,
+        .read = adis16480_show_firmware_revision,
+        .llseek = default_llseek,
+        .owner = THIS_MODULE,
+};
+
+static ssize_t adis16480_show_firmware_date(struct file *file,
+                char __user *userbuf, size_t count, loff_t *ppos)
+{
+        struct adis16480 *adis16480 = file->private_data;
+        u16 md, year;
+        char buf[12];
+        size_t len;
+        int ret;
+
+        ret = adis_read_reg_16(&adis16480->adis, ADIS16480_REG_FIRM_Y, &year);
+        if (ret < 0)
+                return ret;
+
+        ret = adis_read_reg_16(&adis16480->adis, ADIS16480_REG_FIRM_DM, &md);
+        if (ret < 0)
+                return ret;
+
+        len = snprintf(buf, sizeof(buf), "%.2x-%.2x-%.4x\n",
+                        md >> 8, md & 0xff, year);
+
+        return simple_read_from_buffer(userbuf, count, ppos, buf, len);
+}
+
+static const struct file_operations adis16480_firmware_date_fops = {
+        .open = simple_open,
+        .read = adis16480_show_firmware_date,
+        .llseek = default_llseek,
+        .owner = THIS_MODULE,
+};
+
+static int adis16480_show_serial_number(void *arg, u64 *val)
+{
+        struct adis16480 *adis16480 = arg;
+        u16 serial;
+        int ret;
+
+        ret = adis_read_reg_16(&adis16480->adis, ADIS16480_REG_SERIAL_NUM,
+                &serial);
+        if (ret < 0)
+                return ret;
+
+        *val = serial;
+
+        return 0;
+}
+DEFINE_SIMPLE_ATTRIBUTE(adis16480_serial_number_fops,
+        adis16480_show_serial_number, NULL, "0x%.4llx\n");
+
+static int adis16480_show_product_id(void *arg, u64 *val)
+{
+        struct adis16480 *adis16480 = arg;
+        u16 prod_id;
+        int ret;
+
+        ret = adis_read_reg_16(&adis16480->adis, ADIS16480_REG_PROD_ID,
+                &prod_id);
+        if (ret < 0)
+                return ret;
+
+        *val = prod_id;
+
+        return 0;
+}
+DEFINE_SIMPLE_ATTRIBUTE(adis16480_product_id_fops,
+        adis16480_show_product_id, NULL, "%llu\n");
+
+static int adis16480_show_flash_count(void *arg, u64 *val)
+{
+        struct adis16480 *adis16480 = arg;
+        u32 flash_count;
+        int ret;
+
+        ret = adis_read_reg_32(&adis16480->adis, ADIS16480_REG_FLASH_CNT,
+                &flash_count);
+        if (ret < 0)
+                return ret;
+
+        *val = flash_count;
+
+        return 0;
+}
+DEFINE_SIMPLE_ATTRIBUTE(adis16480_flash_count_fops,
+        adis16480_show_flash_count, NULL, "%lld\n");
+
+static int adis16480_debugfs_init(struct iio_dev *indio_dev)
+{
+        struct adis16480 *adis16480 = iio_priv(indio_dev);
+
+        debugfs_create_file("firmware_revision", 0400,
+                indio_dev->debugfs_dentry, adis16480,
+                &adis16480_firmware_revision_fops);
+        debugfs_create_file("firmware_date", 0400, indio_dev->debugfs_dentry,
+                adis16480, &adis16480_firmware_date_fops);
+        debugfs_create_file("serial_number", 0400, indio_dev->debugfs_dentry,
+                adis16480, &adis16480_serial_number_fops);
+        debugfs_create_file("product_id", 0400, indio_dev->debugfs_dentry,
+                adis16480, &adis16480_product_id_fops);
+        debugfs_create_file("flash_count", 0400, indio_dev->debugfs_dentry,
+                adis16480, &adis16480_flash_count_fops);
+
+        return 0;
+}
+
+#else
+
+static int adis16480_debugfs_init(struct iio_dev *indio_dev)
+{
+        return 0;
+}
+
+#endif
+
+static int adis16480_set_freq(struct adis16480 *st, unsigned int freq)
+{
+        unsigned int t;
+
+        t = 2460000 / freq;
+        if (t > 2048)
+                t = 2048;
+
+        if (t != 0)
+                t--;
+
+        return adis_write_reg_16(&st->adis, ADIS16480_REG_DEC_RATE, t);
+}
+
+static int adis16480_get_freq(struct adis16480 *st, unsigned int *freq)
+{
+        uint16_t t;
+        int ret;
+
+        ret = adis_read_reg_16(&st->adis, ADIS16480_REG_DEC_RATE, &t);
+        if (ret < 0)
+                return ret;
+
+        *freq = 2460000 / (t + 1);
+
+        return 0;
+}
+
+static ssize_t adis16480_read_frequency(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *indio_dev = dev_to_iio_dev(dev);
+        struct adis16480 *st = iio_priv(indio_dev);
+        unsigned int freq;
+        int ret;
+
+        ret = adis16480_get_freq(st, &freq);
+        if (ret < 0)
+                return ret;
+
+        return sprintf(buf, "%d.%.3d\n", freq / 1000, freq % 1000);
+}
+
+static ssize_t adis16480_write_frequency(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *indio_dev = dev_to_iio_dev(dev);
+        struct adis16480 *st = iio_priv(indio_dev);
+        int freq_int, freq_fract;
+        long val;
+        int ret;
+
+        ret = iio_str_to_fixpoint(buf, 100, &freq_int, &freq_fract);
+        if (ret)
+                return ret;
+
+        val = freq_int * 1000 + freq_fract;
+
+        if (val <= 0)
+                return -EINVAL;
+
+        ret = adis16480_set_freq(st, val);
+
+        return ret ? ret : len;
+}
+
+static IIO_DEV_ATTR_SAMP_FREQ(S_IWUSR | S_IRUGO,
+                              adis16480_read_frequency,
+                              adis16480_write_frequency);
+
+enum {
+        ADIS16480_SCAN_GYRO_X,
+        ADIS16480_SCAN_GYRO_Y,
+        ADIS16480_SCAN_GYRO_Z,
+        ADIS16480_SCAN_ACCEL_X,
+        ADIS16480_SCAN_ACCEL_Y,
+        ADIS16480_SCAN_ACCEL_Z,
+        ADIS16480_SCAN_MAGN_X,
+        ADIS16480_SCAN_MAGN_Y,
+        ADIS16480_SCAN_MAGN_Z,
+        ADIS16480_SCAN_BARO,
+        ADIS16480_SCAN_TEMP,
+};
+
+static const unsigned int adis16480_calibbias_regs[] = {
+        [ADIS16480_SCAN_GYRO_X] = ADIS16480_REG_X_GYRO_BIAS,
+        [ADIS16480_SCAN_GYRO_Y] = ADIS16480_REG_Y_GYRO_BIAS,
+        [ADIS16480_SCAN_GYRO_Z] = ADIS16480_REG_Z_GYRO_BIAS,
+        [ADIS16480_SCAN_ACCEL_X] = ADIS16480_REG_X_ACCEL_BIAS,
+        [ADIS16480_SCAN_ACCEL_Y] = ADIS16480_REG_Y_ACCEL_BIAS,
+        [ADIS16480_SCAN_ACCEL_Z] = ADIS16480_REG_Z_ACCEL_BIAS,
+        [ADIS16480_SCAN_MAGN_X] = ADIS16480_REG_X_HARD_IRON,
+        [ADIS16480_SCAN_MAGN_Y] = ADIS16480_REG_Y_HARD_IRON,
+        [ADIS16480_SCAN_MAGN_Z] = ADIS16480_REG_Z_HARD_IRON,
+        [ADIS16480_SCAN_BARO] = ADIS16480_REG_BAROM_BIAS,
+};
+
+static const unsigned int adis16480_calibscale_regs[] = {
+        [ADIS16480_SCAN_GYRO_X] = ADIS16480_REG_X_GYRO_SCALE,
+        [ADIS16480_SCAN_GYRO_Y] = ADIS16480_REG_Y_GYRO_SCALE,
+        [ADIS16480_SCAN_GYRO_Z] = ADIS16480_REG_Z_GYRO_SCALE,
+        [ADIS16480_SCAN_ACCEL_X] = ADIS16480_REG_X_ACCEL_SCALE,
+        [ADIS16480_SCAN_ACCEL_Y] = ADIS16480_REG_Y_ACCEL_SCALE,
+        [ADIS16480_SCAN_ACCEL_Z] = ADIS16480_REG_Z_ACCEL_SCALE,
+};
+
+static int adis16480_set_calibbias(struct iio_dev *indio_dev,
+        const struct iio_chan_spec *chan, int bias)
+{
+        unsigned int reg = adis16480_calibbias_regs[chan->scan_index];
+        struct adis16480 *st = iio_priv(indio_dev);
+
+        switch (chan->type) {
+        case IIO_MAGN:
+        case IIO_PRESSURE:
+                if (bias < -0x8000 || bias >= 0x8000)
+                        return -EINVAL;
+                return adis_write_reg_16(&st->adis, reg, bias);
+        case IIO_ANGL_VEL:
+        case IIO_ACCEL:
+                return adis_write_reg_32(&st->adis, reg, bias);
+        default:
+                break;
+        }
+
+        return -EINVAL;
+}
+
+static int adis16480_get_calibbias(struct iio_dev *indio_dev,
+        const struct iio_chan_spec *chan, int *bias)
+{
+        unsigned int reg = adis16480_calibbias_regs[chan->scan_index];
+        struct adis16480 *st = iio_priv(indio_dev);
+        uint16_t val16;
+        uint32_t val32;
+        int ret;
+
+        switch (chan->type) {
+        case IIO_MAGN:
+        case IIO_PRESSURE:
+                ret = adis_read_reg_16(&st->adis, reg, &val16);
+                *bias = sign_extend32(val16, 15);
+                break;
+        case IIO_ANGL_VEL:
+        case IIO_ACCEL:
+                ret = adis_read_reg_32(&st->adis, reg, &val32);
+                *bias = sign_extend32(val32, 31);
+                break;
+        default:
+                        ret = -EINVAL;
+        }
+
+        if (ret < 0)
+                return ret;
+
+        return IIO_VAL_INT;
+}
+
+static int adis16480_set_calibscale(struct iio_dev *indio_dev,
+        const struct iio_chan_spec *chan, int scale)
+{
+        unsigned int reg = adis16480_calibscale_regs[chan->scan_index];
+        struct adis16480 *st = iio_priv(indio_dev);
+
+        if (scale < -0x8000 || scale >= 0x8000)
+                return -EINVAL;
+
+        return adis_write_reg_16(&st->adis, reg, scale);
+}
+
+static int adis16480_get_calibscale(struct iio_dev *indio_dev,
+        const struct iio_chan_spec *chan, int *scale)
+{
+        unsigned int reg = adis16480_calibscale_regs[chan->scan_index];
+        struct adis16480 *st = iio_priv(indio_dev);
+        uint16_t val16;
+        int ret;
+
+        ret = adis_read_reg_16(&st->adis, reg, &val16);
+        if (ret < 0)
+                return ret;
+
+        *scale = sign_extend32(val16, 15);
+        return IIO_VAL_INT;
+}
+
+static const unsigned int adis16480_def_filter_freqs[] = {
+        310,
+        55,
+        275,
+        63,
+};
+
+static const unsigned int ad16480_filter_data[][2] = {
+        [ADIS16480_SCAN_GYRO_X]         = { ADIS16480_REG_FILTER_BNK0, 0 },
+        [ADIS16480_SCAN_GYRO_Y]         = { ADIS16480_REG_FILTER_BNK0, 3 },
+        [ADIS16480_SCAN_GYRO_Z]         = { ADIS16480_REG_FILTER_BNK0, 6 },
+        [ADIS16480_SCAN_ACCEL_X]        = { ADIS16480_REG_FILTER_BNK0, 9 },
+        [ADIS16480_SCAN_ACCEL_Y]        = { ADIS16480_REG_FILTER_BNK0, 12 },
+        [ADIS16480_SCAN_ACCEL_Z]        = { ADIS16480_REG_FILTER_BNK1, 0 },
+        [ADIS16480_SCAN_MAGN_X]         = { ADIS16480_REG_FILTER_BNK1, 3 },
+        [ADIS16480_SCAN_MAGN_Y]         = { ADIS16480_REG_FILTER_BNK1, 6 },
+        [ADIS16480_SCAN_MAGN_Z]         = { ADIS16480_REG_FILTER_BNK1, 9 },
+};
+
+static int adis16480_get_filter_freq(struct iio_dev *indio_dev,
+        const struct iio_chan_spec *chan, int *freq)
+{
+        struct adis16480 *st = iio_priv(indio_dev);
+        unsigned int enable_mask, offset, reg;
+        uint16_t val;
+        int ret;
+
+        reg = ad16480_filter_data[chan->scan_index][0];
+        offset = ad16480_filter_data[chan->scan_index][1];
+        enable_mask = BIT(offset + 2);
+
+        ret = adis_read_reg_16(&st->adis, reg, &val);
+        if (ret < 0)
+                return ret;
+
+        if (!(val & enable_mask))
+                *freq = 0;
+        else
+                *freq = adis16480_def_filter_freqs[(val >> offset) & 0x3];
+
+        return IIO_VAL_INT;
+}
+
+static int adis16480_set_filter_freq(struct iio_dev *indio_dev,
+        const struct iio_chan_spec *chan, unsigned int freq)
+{
+        struct adis16480 *st = iio_priv(indio_dev);
+        unsigned int enable_mask, offset, reg;
+        unsigned int diff, best_diff;
+        unsigned int i, best_freq;
+        uint16_t val;
+        int ret;
+
+        reg = ad16480_filter_data[chan->scan_index][0];
+        offset = ad16480_filter_data[chan->scan_index][1];
+        enable_mask = BIT(offset + 2);
+
+        ret = adis_read_reg_16(&st->adis, reg, &val);
+        if (ret < 0)
+                return ret;
+
+        if (freq == 0) {
+                val &= ~enable_mask;
+        } else {
+                best_freq = 0;
+                best_diff = 310;
+                for (i = 0; i < ARRAY_SIZE(adis16480_def_filter_freqs); i++) {
+                        if (adis16480_def_filter_freqs[i] >= freq) {
+                                diff = adis16480_def_filter_freqs[i] - freq;
+                                if (diff < best_diff) {
+                                        best_diff = diff;
+                                        best_freq = i;
+                                }
+                        }
+                }
+
+                val &= ~(0x3 << offset);
+                val |= best_freq << offset;
+                val |= enable_mask;
+        }
+
+        return adis_write_reg_16(&st->adis, reg, val);
+}
+
+static int adis16480_read_raw(struct iio_dev *indio_dev,
+        const struct iio_chan_spec *chan, int *val, int *val2, long info)
+{
+        switch (info) {
+        case IIO_CHAN_INFO_RAW:
+                return adis_single_conversion(indio_dev, chan, 0, val);
+        case IIO_CHAN_INFO_SCALE:
+                switch (chan->type) {
+                case IIO_ANGL_VEL:
+                        *val = 0;
+                        *val2 = IIO_DEGREE_TO_RAD(20000); /* 0.02 degree/sec */
+                        return IIO_VAL_INT_PLUS_MICRO;
+                case IIO_ACCEL:
+                        *val = 0;
+                        *val2 = IIO_G_TO_M_S_2(800); /* 0.8 mg */
+                        return IIO_VAL_INT_PLUS_MICRO;
+                case IIO_MAGN:
+                        *val = 0;
+                        *val2 = 100; /* 0.0001 gauss */
+                        return IIO_VAL_INT_PLUS_MICRO;
+                case IIO_TEMP:
+                        *val = 5;
+                        *val2 = 650000; /* 5.65 milli degree Celsius */
+                        return IIO_VAL_INT_PLUS_MICRO;
+                case IIO_PRESSURE:
+                        *val = 0;
+                        *val2 = 4000; /* 40ubar = 0.004 kPa */
+                        return IIO_VAL_INT_PLUS_MICRO;
+                default:
+                        return -EINVAL;
+                }
+        case IIO_CHAN_INFO_OFFSET:
+                /* Only the temperature channel has a offset */
+                *val = 4425; /* 25 degree Celsius = 0x0000 */
+                return IIO_VAL_INT;
+        case IIO_CHAN_INFO_CALIBBIAS:
+                return adis16480_get_calibbias(indio_dev, chan, val);
+        case IIO_CHAN_INFO_CALIBSCALE:
+                return adis16480_get_calibscale(indio_dev, chan, val);
+        case IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY:
+                return adis16480_get_filter_freq(indio_dev, chan, val);
+        default:
+                return -EINVAL;
+        }
+}
+
+static int adis16480_write_raw(struct iio_dev *indio_dev,
+        const struct iio_chan_spec *chan, int val, int val2, long info)
+{
+        switch (info) {
+        case IIO_CHAN_INFO_CALIBBIAS:
+                return adis16480_set_calibbias(indio_dev, chan, val);
+        case IIO_CHAN_INFO_CALIBSCALE:
+                return adis16480_set_calibscale(indio_dev, chan, val);
+        case IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY:
+                return adis16480_set_filter_freq(indio_dev, chan, val);
+        default:
+                return -EINVAL;
+        }
+}
+
+#define ADIS16480_MOD_CHANNEL(_type, _mod, _address, _si, _info, _bits) \
+        { \
+                .type = (_type), \
+                .modified = 1, \
+                .channel2 = (_mod), \
+                .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | \
+                        IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT | \
+                        IIO_CHAN_INFO_SCALE_SHARED_BIT | \
+                        _info, \
+                .address = (_address), \
+                .scan_index = (_si), \
+                .scan_type = { \
+                        .sign = 's', \
+                        .realbits = (_bits), \
+                        .storagebits = (_bits), \
+                        .endianness = IIO_BE, \
+                }, \
+        }
+
+#define ADIS16480_GYRO_CHANNEL(_mod) \
+        ADIS16480_MOD_CHANNEL(IIO_ANGL_VEL, IIO_MOD_ ## _mod, \
+        ADIS16480_REG_ ## _mod ## _GYRO_OUT, ADIS16480_SCAN_GYRO_ ## _mod, \
+        IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY_SEPARATE_BIT | \
+        IIO_CHAN_INFO_CALIBSCALE_SEPARATE_BIT, \
+        32)
+
+#define ADIS16480_ACCEL_CHANNEL(_mod) \
+        ADIS16480_MOD_CHANNEL(IIO_ACCEL, IIO_MOD_ ## _mod, \
+        ADIS16480_REG_ ## _mod ## _ACCEL_OUT, ADIS16480_SCAN_ACCEL_ ## _mod, \
+        IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY_SEPARATE_BIT | \
+        IIO_CHAN_INFO_CALIBSCALE_SEPARATE_BIT, \
+        32)
+
+#define ADIS16480_MAGN_CHANNEL(_mod) \
+        ADIS16480_MOD_CHANNEL(IIO_MAGN, IIO_MOD_ ## _mod, \
+        ADIS16480_REG_ ## _mod ## _MAGN_OUT, ADIS16480_SCAN_MAGN_ ## _mod, \
+        IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY_SEPARATE_BIT, \
+        16)
+
+#define ADIS16480_PRESSURE_CHANNEL() \
+        { \
+                .type = IIO_PRESSURE, \
+                .indexed = 1, \
+                .channel = 0, \
+                .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | \
+                        IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT | \
+                        IIO_CHAN_INFO_SCALE_SEPARATE_BIT, \
+                .address = ADIS16480_REG_BAROM_OUT, \
+                .scan_index = ADIS16480_SCAN_BARO, \
+                .scan_type = { \
+                        .sign = 's', \
+                        .realbits = 32, \
+                        .storagebits = 32, \
+                        .endianness = IIO_BE, \
+                }, \
+        }
+
+#define ADIS16480_TEMP_CHANNEL() { \
+                .type = IIO_TEMP, \
+                .indexed = 1, \
+                .channel = 0, \
+                .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | \
+                        IIO_CHAN_INFO_SCALE_SEPARATE_BIT | \
+                        IIO_CHAN_INFO_OFFSET_SEPARATE_BIT, \
+                .address = ADIS16480_REG_TEMP_OUT, \
+                .scan_index = ADIS16480_SCAN_TEMP, \
+                .scan_type = { \
+                        .sign = 's', \
+                        .realbits = 16, \
+                        .storagebits = 16, \
+                        .endianness = IIO_BE, \
+                }, \
+        }
+
+static const struct iio_chan_spec adis16480_channels[] = {
+        ADIS16480_GYRO_CHANNEL(X),
+        ADIS16480_GYRO_CHANNEL(Y),
+        ADIS16480_GYRO_CHANNEL(Z),
+        ADIS16480_ACCEL_CHANNEL(X),
+        ADIS16480_ACCEL_CHANNEL(Y),
+        ADIS16480_ACCEL_CHANNEL(Z),
+        ADIS16480_MAGN_CHANNEL(X),
+        ADIS16480_MAGN_CHANNEL(Y),
+        ADIS16480_MAGN_CHANNEL(Z),
+        ADIS16480_PRESSURE_CHANNEL(),
+        ADIS16480_TEMP_CHANNEL(),
+        IIO_CHAN_SOFT_TIMESTAMP(11)
+};
+
+static const struct iio_chan_spec adis16485_channels[] = {
+        ADIS16480_GYRO_CHANNEL(X),
+        ADIS16480_GYRO_CHANNEL(Y),
+        ADIS16480_GYRO_CHANNEL(Z),
+        ADIS16480_ACCEL_CHANNEL(X),
+        ADIS16480_ACCEL_CHANNEL(Y),
+        ADIS16480_ACCEL_CHANNEL(Z),
+        ADIS16480_TEMP_CHANNEL(),
+        IIO_CHAN_SOFT_TIMESTAMP(7)
+};
+
+enum adis16480_variant {
+        ADIS16375,
+        ADIS16480,
+        ADIS16485,
+        ADIS16488,
+};
+
+static const struct adis16480_chip_info adis16480_chip_info[] = {
+        [ADIS16375] = {
+                .channels = adis16485_channels,
+                .num_channels = ARRAY_SIZE(adis16485_channels),
+        },
+        [ADIS16480] = {
+                .channels = adis16480_channels,
+                .num_channels = ARRAY_SIZE(adis16480_channels),
+        },
+        [ADIS16485] = {
+                .channels = adis16485_channels,
+                .num_channels = ARRAY_SIZE(adis16485_channels),
+        },
+        [ADIS16488] = {
+                .channels = adis16480_channels,
+                .num_channels = ARRAY_SIZE(adis16480_channels),
+        },
+};
+
+static struct attribute *adis16480_attributes[] = {
+        &iio_dev_attr_sampling_frequency.dev_attr.attr,
+        NULL
+};
+
+static const struct attribute_group adis16480_attribute_group = {
+        .attrs = adis16480_attributes,
+};
+
+static const struct iio_info adis16480_info = {
+        .attrs = &adis16480_attribute_group,
+        .read_raw = &adis16480_read_raw,
+        .write_raw = &adis16480_write_raw,
+        .update_scan_mode = adis_update_scan_mode,
+        .driver_module = THIS_MODULE,
+};
+
+static int adis16480_stop_device(struct iio_dev *indio_dev)
+{
+        struct adis16480 *st = iio_priv(indio_dev);
+        int ret;
+
+        ret = adis_write_reg_16(&st->adis, ADIS16480_REG_SLP_CNT, BIT(9));
+        if (ret)
+                dev_err(&indio_dev->dev,
+                        "Could not power down device: %d\n", ret);
+
+        return ret;
+}
+
+static int adis16480_enable_irq(struct adis *adis, bool enable)
+{
+        return adis_write_reg_16(adis, ADIS16480_REG_FNCTIO_CTRL,
+                enable ? BIT(3) : 0);
+}
+
+static int adis16480_initial_setup(struct iio_dev *indio_dev)
+{
+        struct adis16480 *st = iio_priv(indio_dev);
+        uint16_t prod_id;
+        unsigned int device_id;
+        int ret;
+
+        adis_reset(&st->adis);
+        msleep(70);
+
+        ret = adis_write_reg_16(&st->adis, ADIS16480_REG_GLOB_CMD, BIT(1));
+        if (ret)
+                return ret;
+        msleep(30);
+
+        ret = adis_check_status(&st->adis);
+        if (ret)
+                return ret;
+
+        ret = adis_read_reg_16(&st->adis, ADIS16480_REG_PROD_ID, &prod_id);
+        if (ret)
+                return ret;
+
+        sscanf(indio_dev->name, "adis%u\n", &device_id);
+
+        if (prod_id != device_id)
+                dev_warn(&indio_dev->dev, "Device ID(%u) and product ID(%u) do not match.",
+                                device_id, prod_id);
+
+        return 0;
+}
+
+#define ADIS16480_DIAG_STAT_XGYRO_FAIL 0
+#define ADIS16480_DIAG_STAT_YGYRO_FAIL 1
+#define ADIS16480_DIAG_STAT_ZGYRO_FAIL 2
+#define ADIS16480_DIAG_STAT_XACCL_FAIL 3
+#define ADIS16480_DIAG_STAT_YACCL_FAIL 4
+#define ADIS16480_DIAG_STAT_ZACCL_FAIL 5
+#define ADIS16480_DIAG_STAT_XMAGN_FAIL 8
+#define ADIS16480_DIAG_STAT_YMAGN_FAIL 9
+#define ADIS16480_DIAG_STAT_ZMAGN_FAIL 10
+#define ADIS16480_DIAG_STAT_BARO_FAIL 11
+
+static const char * const adis16480_status_error_msgs[] = {
+        [ADIS16480_DIAG_STAT_XGYRO_FAIL] = "X-axis gyroscope self-test failure",
+        [ADIS16480_DIAG_STAT_YGYRO_FAIL] = "Y-axis gyroscope self-test failure",
+        [ADIS16480_DIAG_STAT_ZGYRO_FAIL] = "Z-axis gyroscope self-test failure",
+        [ADIS16480_DIAG_STAT_XACCL_FAIL] = "X-axis accelerometer self-test failure",
+        [ADIS16480_DIAG_STAT_YACCL_FAIL] = "Y-axis accelerometer self-test failure",
+        [ADIS16480_DIAG_STAT_ZACCL_FAIL] = "Z-axis accelerometer self-test failure",
+        [ADIS16480_DIAG_STAT_XMAGN_FAIL] = "X-axis magnetometer self-test failure",
+        [ADIS16480_DIAG_STAT_YMAGN_FAIL] = "Y-axis magnetometer self-test failure",
+        [ADIS16480_DIAG_STAT_ZMAGN_FAIL] = "Z-axis magnetometer self-test failure",
+        [ADIS16480_DIAG_STAT_BARO_FAIL] = "Barometer self-test failure",
+};
+
+static const struct adis_data adis16480_data = {
+        .diag_stat_reg = ADIS16480_REG_DIAG_STS,
+        .glob_cmd_reg = ADIS16480_REG_GLOB_CMD,
+        .has_paging = true,
+
+        .read_delay = 5,
+        .write_delay = 5,
+
+        .status_error_msgs = adis16480_status_error_msgs,
+        .status_error_mask = BIT(ADIS16480_DIAG_STAT_XGYRO_FAIL) |
+                BIT(ADIS16480_DIAG_STAT_YGYRO_FAIL) |
+                BIT(ADIS16480_DIAG_STAT_ZGYRO_FAIL) |
+                BIT(ADIS16480_DIAG_STAT_XACCL_FAIL) |
+                BIT(ADIS16480_DIAG_STAT_YACCL_FAIL) |
+                BIT(ADIS16480_DIAG_STAT_ZACCL_FAIL) |
+                BIT(ADIS16480_DIAG_STAT_XMAGN_FAIL) |
+                BIT(ADIS16480_DIAG_STAT_YMAGN_FAIL) |
+                BIT(ADIS16480_DIAG_STAT_ZMAGN_FAIL) |
+                BIT(ADIS16480_DIAG_STAT_BARO_FAIL),
+
+        .enable_irq = adis16480_enable_irq,
+};
+
+static int adis16480_probe(struct spi_device *spi)
+{
+        const struct spi_device_id *id = spi_get_device_id(spi);
+        struct iio_dev *indio_dev;
+        struct adis16480 *st;
+        int ret;
+
+        indio_dev = iio_device_alloc(sizeof(*st));
+        if (indio_dev == NULL)
+                return -ENOMEM;
+
+        spi_set_drvdata(spi, indio_dev);
+
+        st = iio_priv(indio_dev);
+
+        st->chip_info = &adis16480_chip_info[id->driver_data];
+        indio_dev->dev.parent = &spi->dev;
+        indio_dev->name = spi_get_device_id(spi)->name;
+        indio_dev->channels = st->chip_info->channels;
+        indio_dev->num_channels = st->chip_info->num_channels;
+        indio_dev->info = &adis16480_info;
+        indio_dev->modes = INDIO_DIRECT_MODE;
+
+        ret = adis_init(&st->adis, indio_dev, spi, &adis16480_data);
+        if (ret)
+                goto error_free_dev;
+
+        ret = adis_setup_buffer_and_trigger(&st->adis, indio_dev, NULL);
+        if (ret)
+                goto error_free_dev;
+
+        ret = adis16480_initial_setup(indio_dev);
+        if (ret)
+                goto error_cleanup_buffer;
+
+        ret = iio_device_register(indio_dev);
+        if (ret)
+                goto error_stop_device;
+
+        adis16480_debugfs_init(indio_dev);
+
+        return 0;
+
+error_stop_device:
+        adis16480_stop_device(indio_dev);
+error_cleanup_buffer:
+        adis_cleanup_buffer_and_trigger(&st->adis, indio_dev);
+error_free_dev:
+        iio_device_free(indio_dev);
+        return ret;
+}
+
+static int adis16480_remove(struct spi_device *spi)
+{
+        struct iio_dev *indio_dev = spi_get_drvdata(spi);
+        struct adis16480 *st = iio_priv(indio_dev);
+
+        iio_device_unregister(indio_dev);
+        adis16480_stop_device(indio_dev);
+
+        adis_cleanup_buffer_and_trigger(&st->adis, indio_dev);
+
+        iio_device_free(indio_dev);
+
+        return 0;
+}
+
+static const struct spi_device_id adis16480_ids[] = {
+        { "adis16375", ADIS16375 },
+        { "adis16480", ADIS16480 },
+        { "adis16485", ADIS16485 },
+        { "adis16488", ADIS16488 },
+        { }
+};
+MODULE_DEVICE_TABLE(spi, adis16480_ids);
+
+static struct spi_driver adis16480_driver = {
+        .driver = {
+                .name = "adis16480",
+                .owner = THIS_MODULE,
+        },
+        .id_table = adis16480_ids,
+        .probe = adis16480_probe,
+        .remove = adis16480_remove,
+};
+module_spi_driver(adis16480_driver);
+
+MODULE_AUTHOR("Lars-Peter Clausen <lars@metafoo.de>");
+MODULE_DESCRIPTION("Analog Devices ADIS16480 IMU driver");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/iio/imu/adis_buffer.c b/drivers/iio/imu/adis_buffer.c
new file mode 100644
index 000000000000..99d8e0b0dd34
--- /dev/null
+++ b/drivers/iio/imu/adis_buffer.c
@@ -0,0 +1,176 @@
+/*
+ * Common library for ADIS16XXX devices
+ *
+ * Copyright 2012 Analog Devices Inc.
+ *   Author: Lars-Peter Clausen <lars@metafoo.de>
+ *
+ * Licensed under the GPL-2 or later.
+ */
+
+#include <linux/export.h>
+#include <linux/interrupt.h>
+#include <linux/mutex.h>
+#include <linux/kernel.h>
+#include <linux/spi/spi.h>
+#include <linux/slab.h>
+
+#include <linux/iio/iio.h>
+#include <linux/iio/buffer.h>
+#include <linux/iio/trigger_consumer.h>
+#include <linux/iio/triggered_buffer.h>
+#include <linux/iio/imu/adis.h>
+
+int adis_update_scan_mode(struct iio_dev *indio_dev,
+        const unsigned long *scan_mask)
+{
+        struct adis *adis = iio_device_get_drvdata(indio_dev);
+        const struct iio_chan_spec *chan;
+        unsigned int scan_count;
+        unsigned int i, j;
+        __be16 *tx, *rx;
+
+        kfree(adis->xfer);
+        kfree(adis->buffer);
+
+        scan_count = indio_dev->scan_bytes / 2;
+
+        adis->xfer = kcalloc(scan_count + 1, sizeof(*adis->xfer), GFP_KERNEL);
+        if (!adis->xfer)
+                return -ENOMEM;
+
+        adis->buffer = kzalloc(indio_dev->scan_bytes * 2, GFP_KERNEL);
+        if (!adis->buffer)
+                return -ENOMEM;
+
+        rx = adis->buffer;
+        tx = rx + indio_dev->scan_bytes;
+
+        spi_message_init(&adis->msg);
+
+        for (j = 0; j <= scan_count; j++) {
+                adis->xfer[j].bits_per_word = 8;
+                if (j != scan_count)
+                        adis->xfer[j].cs_change = 1;
+                adis->xfer[j].len = 2;
+                adis->xfer[j].delay_usecs = adis->data->read_delay;
+                if (j < scan_count)
+                        adis->xfer[j].tx_buf = &tx[j];
+                if (j >= 1)
+                        adis->xfer[j].rx_buf = &rx[j - 1];
+                spi_message_add_tail(&adis->xfer[j], &adis->msg);
+        }
+
+        chan = indio_dev->channels;
+        for (i = 0; i < indio_dev->num_channels; i++, chan++) {
+                if (!test_bit(chan->scan_index, scan_mask))
+                        continue;
+                if (chan->scan_type.storagebits == 32)
+                        *tx++ = cpu_to_be16((chan->address + 2) << 8);
+                *tx++ = cpu_to_be16(chan->address << 8);
+        }
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(adis_update_scan_mode);
+
+static irqreturn_t adis_trigger_handler(int irq, void *p)
+{
+        struct iio_poll_func *pf = p;
+        struct iio_dev *indio_dev = pf->indio_dev;
+        struct adis *adis = iio_device_get_drvdata(indio_dev);
+        int ret;
+
+        if (!adis->buffer)
+                return -ENOMEM;
+
+        if (adis->data->has_paging) {
+                mutex_lock(&adis->txrx_lock);
+                if (adis->current_page != 0) {
+                        adis->tx[0] = ADIS_WRITE_REG(ADIS_REG_PAGE_ID);
+                        adis->tx[1] = 0;
+                        spi_write(adis->spi, adis->tx, 2);
+                }
+        }
+
+        ret = spi_sync(adis->spi, &adis->msg);
+        if (ret)
+                dev_err(&adis->spi->dev, "Failed to read data: %d", ret);
+
+
+        if (adis->data->has_paging) {
+                adis->current_page = 0;
+                mutex_unlock(&adis->txrx_lock);
+        }
+
+        /* Guaranteed to be aligned with 8 byte boundary */
+        if (indio_dev->scan_timestamp) {
+                void *b = adis->buffer + indio_dev->scan_bytes - sizeof(s64);
+                *(s64 *)b = pf->timestamp;
+        }
+
+        iio_push_to_buffers(indio_dev, adis->buffer);
+
+        iio_trigger_notify_done(indio_dev->trig);
+
+        return IRQ_HANDLED;
+}
+
+/**
+ * adis_setup_buffer_and_trigger() - Sets up buffer and trigger for the adis device
+ * @adis: The adis device.
+ * @indio_dev: The IIO device.
+ * @trigger_handler: Optional trigger handler, may be NULL.
+ *
+ * Returns 0 on success, a negative error code otherwise.
+ *
+ * This function sets up the buffer and trigger for a adis devices.  If
+ * 'trigger_handler' is NULL the default trigger handler will be used. The
+ * default trigger handler will simply read the registers assigned to the
+ * currently active channels.
+ *
+ * adis_cleanup_buffer_and_trigger() should be called to free the resources
+ * allocated by this function.
+ */
+int adis_setup_buffer_and_trigger(struct adis *adis, struct iio_dev *indio_dev,
+        irqreturn_t (*trigger_handler)(int, void *))
+{
+        int ret;
+
+        if (!trigger_handler)
+                trigger_handler = adis_trigger_handler;
+
+        ret = iio_triggered_buffer_setup(indio_dev, &iio_pollfunc_store_time,
+                trigger_handler, NULL);
+        if (ret)
+                return ret;
+
+        if (adis->spi->irq) {
+                ret = adis_probe_trigger(adis, indio_dev);
+                if (ret)
+                        goto error_buffer_cleanup;
+        }
+        return 0;
+
+error_buffer_cleanup:
+        iio_triggered_buffer_cleanup(indio_dev);
+        return ret;
+}
+EXPORT_SYMBOL_GPL(adis_setup_buffer_and_trigger);
+
+/**
+ * adis_cleanup_buffer_and_trigger() - Free buffer and trigger resources
+ * @adis: The adis device.
+ * @indio_dev: The IIO device.
+ *
+ * Frees resources allocated by adis_setup_buffer_and_trigger()
+ */
+void adis_cleanup_buffer_and_trigger(struct adis *adis,
+        struct iio_dev *indio_dev)
+{
+        if (adis->spi->irq)
+                adis_remove_trigger(adis);
+        kfree(adis->buffer);
+        kfree(adis->xfer);
+        iio_triggered_buffer_cleanup(indio_dev);
+}
+EXPORT_SYMBOL_GPL(adis_cleanup_buffer_and_trigger);
diff --git a/drivers/iio/imu/adis_trigger.c b/drivers/iio/imu/adis_trigger.c
new file mode 100644
index 000000000000..5a24c9cac343
--- /dev/null
+++ b/drivers/iio/imu/adis_trigger.c
@@ -0,0 +1,89 @@
+/*
+ * Common library for ADIS16XXX devices
+ *
+ * Copyright 2012 Analog Devices Inc.
+ *   Author: Lars-Peter Clausen <lars@metafoo.de>
+ *
+ * Licensed under the GPL-2 or later.
+ */
+
+#include <linux/interrupt.h>
+#include <linux/kernel.h>
+#include <linux/spi/spi.h>
+#include <linux/export.h>
+
+#include <linux/iio/iio.h>
+#include <linux/iio/trigger.h>
+#include <linux/iio/imu/adis.h>
+
+static int adis_data_rdy_trigger_set_state(struct iio_trigger *trig,
+                                                bool state)
+{
+        struct adis *adis = trig->private_data;
+
+        return adis_enable_irq(adis, state);
+}
+
+static const struct iio_trigger_ops adis_trigger_ops = {
+        .owner = THIS_MODULE,
+        .set_trigger_state = &adis_data_rdy_trigger_set_state,
+};
+
+/**
+ * adis_probe_trigger() - Sets up trigger for a adis device
+ * @adis: The adis device
+ * @indio_dev: The IIO device
+ *
+ * Returns 0 on success or a negative error code
+ *
+ * adis_remove_trigger() should be used to free the trigger.
+ */
+int adis_probe_trigger(struct adis *adis, struct iio_dev *indio_dev)
+{
+        int ret;
+
+        adis->trig = iio_trigger_alloc("%s-dev%d", indio_dev->name,
+                                        indio_dev->id);
+        if (adis->trig == NULL)
+                return -ENOMEM;
+
+        ret = request_irq(adis->spi->irq,
+                          &iio_trigger_generic_data_rdy_poll,
+                          IRQF_TRIGGER_RISING,
+                          indio_dev->name,
+                          adis->trig);
+        if (ret)
+                goto error_free_trig;
+
+        adis->trig->dev.parent = &adis->spi->dev;
+        adis->trig->ops = &adis_trigger_ops;
+        adis->trig->private_data = adis;
+        ret = iio_trigger_register(adis->trig);
+
+        indio_dev->trig = adis->trig;
+        if (ret)
+                goto error_free_irq;
+
+        return 0;
+
+error_free_irq:
+        free_irq(adis->spi->irq, adis->trig);
+error_free_trig:
+        iio_trigger_free(adis->trig);
+        return ret;
+}
+EXPORT_SYMBOL_GPL(adis_probe_trigger);
+
+/**
+ * adis_remove_trigger() - Remove trigger for a adis devices
+ * @adis: The adis device
+ *
+ * Removes the trigger previously registered with adis_probe_trigger().
+ */
+void adis_remove_trigger(struct adis *adis)
+{
+        iio_trigger_unregister(adis->trig);
+        free_irq(adis->spi->irq, adis->trig);
+        iio_trigger_free(adis->trig);
+}
+EXPORT_SYMBOL_GPL(adis_remove_trigger);
diff --git a/drivers/iio/industrialio-buffer.c b/drivers/iio/industrialio-buffer.c
index d4ad37455a67..aaadd32f9f0d 100644
--- a/drivers/iio/industrialio-buffer.c
+++ b/drivers/iio/industrialio-buffer.c
@@ -31,6 +31,18 @@ static const char * const iio_endian_prefix[] = {
         [IIO_LE] = "le",
 };
 
+static bool iio_buffer_is_active(struct iio_dev *indio_dev,
+                                 struct iio_buffer *buf)
+{
+        struct list_head *p;
+
+        list_for_each(p, &indio_dev->buffer_list)
+                if (p == &buf->buffer_list)
+                        return true;
+
+        return false;
+}
+
 /**
  * iio_buffer_read_first_n_outer() - chrdev read for buffer access
  *
@@ -134,7 +146,7 @@ static ssize_t iio_scan_el_store(struct device *dev,
         if (ret < 0)
                 return ret;
         mutex_lock(&indio_dev->mlock);
-        if (iio_buffer_enabled(indio_dev)) {
+        if (iio_buffer_is_active(indio_dev, indio_dev->buffer)) {
                 ret = -EBUSY;
                 goto error_ret;
         }
@@ -180,12 +192,11 @@ static ssize_t iio_scan_el_ts_store(struct device *dev,
                 return ret;
 
         mutex_lock(&indio_dev->mlock);
-        if (iio_buffer_enabled(indio_dev)) {
+        if (iio_buffer_is_active(indio_dev, indio_dev->buffer)) {
                 ret = -EBUSY;
                 goto error_ret;
         }
         indio_dev->buffer->scan_timestamp = state;
-        indio_dev->scan_timestamp = state;
 error_ret:
         mutex_unlock(&indio_dev->mlock);
 
@@ -371,12 +382,12 @@ ssize_t iio_buffer_write_length(struct device *dev,
                                 const char *buf,
                                 size_t len)
 {
-        int ret;
-        ulong val;
         struct iio_dev *indio_dev = dev_to_iio_dev(dev);
         struct iio_buffer *buffer = indio_dev->buffer;
+        unsigned int val;
+        int ret;
 
-        ret = strict_strtoul(buf, 10, &val);
+        ret = kstrtouint(buf, 10, &val);
         if (ret)
                 return ret;
 
@@ -385,7 +396,7 @@ ssize_t iio_buffer_write_length(struct device *dev,
                         return len;
 
         mutex_lock(&indio_dev->mlock);
-        if (iio_buffer_enabled(indio_dev)) {
+        if (iio_buffer_is_active(indio_dev, indio_dev->buffer)) {
                 ret = -EBUSY;
         } else {
                 if (buffer->access->set_length)
@@ -398,102 +409,14 @@ ssize_t iio_buffer_write_length(struct device *dev,
 }
 EXPORT_SYMBOL(iio_buffer_write_length);
 
-ssize_t iio_buffer_store_enable(struct device *dev,
-                                struct device_attribute *attr,
-                                const char *buf,
-                                size_t len)
-{
-        int ret;
-        bool requested_state, current_state;
-        int previous_mode;
-        struct iio_dev *indio_dev = dev_to_iio_dev(dev);
-        struct iio_buffer *buffer = indio_dev->buffer;
-
-        mutex_lock(&indio_dev->mlock);
-        previous_mode = indio_dev->currentmode;
-        requested_state = !(buf[0] == '0');
-        current_state = iio_buffer_enabled(indio_dev);
-        if (current_state == requested_state) {
-                printk(KERN_INFO "iio-buffer, current state requested again\n");
-                goto done;
-        }
-        if (requested_state) {
-                if (indio_dev->setup_ops->preenable) {
-                        ret = indio_dev->setup_ops->preenable(indio_dev);
-                        if (ret) {
-                                printk(KERN_ERR
-                                       "Buffer not started: "
-                                       "buffer preenable failed\n");
-                                goto error_ret;
-                        }
-                }
-                if (buffer->access->request_update) {
-                        ret = buffer->access->request_update(buffer);
-                        if (ret) {
-                                printk(KERN_INFO
-                                       "Buffer not started: "
-                                       "buffer parameter update failed\n");
-                                goto error_ret;
-                        }
-                }
-                /* Definitely possible for devices to support both of these. */
-                if (indio_dev->modes & INDIO_BUFFER_TRIGGERED) {
-                        if (!indio_dev->trig) {
-                                printk(KERN_INFO
-                                       "Buffer not started: no trigger\n");
-                                ret = -EINVAL;
-                                goto error_ret;
-                        }
-                        indio_dev->currentmode = INDIO_BUFFER_TRIGGERED;
-                } else if (indio_dev->modes & INDIO_BUFFER_HARDWARE)
-                        indio_dev->currentmode = INDIO_BUFFER_HARDWARE;
-                else { /* should never be reached */
-                        ret = -EINVAL;
-                        goto error_ret;
-                }
-
-                if (indio_dev->setup_ops->postenable) {
-                        ret = indio_dev->setup_ops->postenable(indio_dev);
-                        if (ret) {
-                                printk(KERN_INFO
-                                       "Buffer not started: "
-                                       "postenable failed\n");
-                                indio_dev->currentmode = previous_mode;
-                                if (indio_dev->setup_ops->postdisable)
-                                        indio_dev->setup_ops->
-                                                postdisable(indio_dev);
-                                goto error_ret;
-                        }
-                }
-        } else {
-                if (indio_dev->setup_ops->predisable) {
-                        ret = indio_dev->setup_ops->predisable(indio_dev);
-                        if (ret)
-                                goto error_ret;
-                }
-                indio_dev->currentmode = INDIO_DIRECT_MODE;
-                if (indio_dev->setup_ops->postdisable) {
-                        ret = indio_dev->setup_ops->postdisable(indio_dev);
-                        if (ret)
-                                goto error_ret;
-                }
-        }
-done:
-        mutex_unlock(&indio_dev->mlock);
-        return len;
-
-error_ret:
-        mutex_unlock(&indio_dev->mlock);
-        return ret;
-}
-EXPORT_SYMBOL(iio_buffer_store_enable);
-
 ssize_t iio_buffer_show_enable(struct device *dev,
                                struct device_attribute *attr,
                                char *buf)
 {
         struct iio_dev *indio_dev = dev_to_iio_dev(dev);
-        return sprintf(buf, "%d\n", iio_buffer_enabled(indio_dev));
+        return sprintf(buf, "%d\n",
+                       iio_buffer_is_active(indio_dev,
+                                            indio_dev->buffer));
 }
 EXPORT_SYMBOL(iio_buffer_show_enable);
 
@@ -537,35 +460,220 @@ static int iio_compute_scan_bytes(struct iio_dev *indio_dev, const long *mask,
         return bytes;
 }
 
-int iio_sw_buffer_preenable(struct iio_dev *indio_dev)
+int iio_update_buffers(struct iio_dev *indio_dev,
+                       struct iio_buffer *insert_buffer,
+                       struct iio_buffer *remove_buffer)
 {
-        struct iio_buffer *buffer = indio_dev->buffer;
-        dev_dbg(&indio_dev->dev, "%s\n", __func__);
+        int ret;
+        int success = 0;
+        struct iio_buffer *buffer;
+        unsigned long *compound_mask;
+        const unsigned long *old_mask;
 
-        /* How much space will the demuxed element take? */
-        indio_dev->scan_bytes =
-                iio_compute_scan_bytes(indio_dev, buffer->scan_mask,
-                                       buffer->scan_timestamp);
-        buffer->access->set_bytes_per_datum(buffer, indio_dev->scan_bytes);
+        /* Wind down existing buffers - iff there are any */
+        if (!list_empty(&indio_dev->buffer_list)) {
+                if (indio_dev->setup_ops->predisable) {
+                        ret = indio_dev->setup_ops->predisable(indio_dev);
+                        if (ret)
+                                goto error_ret;
+                }
+                indio_dev->currentmode = INDIO_DIRECT_MODE;
+                if (indio_dev->setup_ops->postdisable) {
+                        ret = indio_dev->setup_ops->postdisable(indio_dev);
+                        if (ret)
+                                goto error_ret;
+                }
+        }
+        /* Keep a copy of current setup to allow roll back */
+        old_mask = indio_dev->active_scan_mask;
+        if (!indio_dev->available_scan_masks)
+                indio_dev->active_scan_mask = NULL;
+
+        if (remove_buffer)
+                list_del(&remove_buffer->buffer_list);
+        if (insert_buffer)
+                list_add(&insert_buffer->buffer_list, &indio_dev->buffer_list);
+
+        /* If no buffers in list, we are done */
+        if (list_empty(&indio_dev->buffer_list)) {
+                indio_dev->currentmode = INDIO_DIRECT_MODE;
+                if (indio_dev->available_scan_masks == NULL)
+                        kfree(old_mask);
+                return 0;
+        }
 
         /* What scan mask do we actually have ?*/
-        if (indio_dev->available_scan_masks)
+        compound_mask = kcalloc(BITS_TO_LONGS(indio_dev->masklength),
+                                sizeof(long), GFP_KERNEL);
+        if (compound_mask == NULL) {
+                if (indio_dev->available_scan_masks == NULL)
+                        kfree(old_mask);
+                return -ENOMEM;
+        }
+        indio_dev->scan_timestamp = 0;
+
+        list_for_each_entry(buffer, &indio_dev->buffer_list, buffer_list) {
+                bitmap_or(compound_mask, compound_mask, buffer->scan_mask,
+                          indio_dev->masklength);
+                indio_dev->scan_timestamp |= buffer->scan_timestamp;
+        }
+        if (indio_dev->available_scan_masks) {
                 indio_dev->active_scan_mask =
                         iio_scan_mask_match(indio_dev->available_scan_masks,
                                             indio_dev->masklength,
-                                            buffer->scan_mask);
-        else
-                indio_dev->active_scan_mask = buffer->scan_mask;
-
-        if (indio_dev->active_scan_mask == NULL)
-                return -EINVAL;
+                                            compound_mask);
+                if (indio_dev->active_scan_mask == NULL) {
+                        /*
+                         * Roll back.
+                         * Note can only occur when adding a buffer.
+                         */
+                        list_del(&insert_buffer->buffer_list);
+                        indio_dev->active_scan_mask = old_mask;
+                        success = -EINVAL;
+                }
+        } else {
+                indio_dev->active_scan_mask = compound_mask;
+        }
 
         iio_update_demux(indio_dev);
 
-        if (indio_dev->info->update_scan_mode)
-                return indio_dev->info
+        /* Wind up again */
+        if (indio_dev->setup_ops->preenable) {
+                ret = indio_dev->setup_ops->preenable(indio_dev);
+                if (ret) {
+                        printk(KERN_ERR
+                               "Buffer not started:"
+                               "buffer preenable failed\n");
+                        goto error_remove_inserted;
+                }
+        }
+        indio_dev->scan_bytes =
+                iio_compute_scan_bytes(indio_dev,
+                                       indio_dev->active_scan_mask,
+                                       indio_dev->scan_timestamp);
+        list_for_each_entry(buffer, &indio_dev->buffer_list, buffer_list)
+                if (buffer->access->request_update) {
+                        ret = buffer->access->request_update(buffer);
+                        if (ret) {
+                                printk(KERN_INFO
+                                       "Buffer not started:"
+                                       "buffer parameter update failed\n");
+                                goto error_run_postdisable;
+                        }
+                }
+        if (indio_dev->info->update_scan_mode) {
+                ret = indio_dev->info
                         ->update_scan_mode(indio_dev,
                                            indio_dev->active_scan_mask);
+                if (ret < 0) {
+                        printk(KERN_INFO "update scan mode failed\n");
+                        goto error_run_postdisable;
+                }
+        }
+        /* Definitely possible for devices to support both of these.*/
+        if (indio_dev->modes & INDIO_BUFFER_TRIGGERED) {
+                if (!indio_dev->trig) {
+                        printk(KERN_INFO "Buffer not started: no trigger\n");
+                        ret = -EINVAL;
+                        /* Can only occur on first buffer */
+                        goto error_run_postdisable;
+                }
+                indio_dev->currentmode = INDIO_BUFFER_TRIGGERED;
+        } else if (indio_dev->modes & INDIO_BUFFER_HARDWARE) {
+                indio_dev->currentmode = INDIO_BUFFER_HARDWARE;
+        } else { /* should never be reached */
+                ret = -EINVAL;
+                goto error_run_postdisable;
+        }
+
+        if (indio_dev->setup_ops->postenable) {
+                ret = indio_dev->setup_ops->postenable(indio_dev);
+                if (ret) {
+                        printk(KERN_INFO
+                               "Buffer not started: postenable failed\n");
+                        indio_dev->currentmode = INDIO_DIRECT_MODE;
+                        if (indio_dev->setup_ops->postdisable)
+                                indio_dev->setup_ops->postdisable(indio_dev);
+                        goto error_disable_all_buffers;
+                }
+        }
+
+        if (indio_dev->available_scan_masks)
+                kfree(compound_mask);
+        else
+                kfree(old_mask);
+
+        return success;
+
+error_disable_all_buffers:
+        indio_dev->currentmode = INDIO_DIRECT_MODE;
+error_run_postdisable:
+        if (indio_dev->setup_ops->postdisable)
+                indio_dev->setup_ops->postdisable(indio_dev);
+error_remove_inserted:
+
+        if (insert_buffer)
+                list_del(&insert_buffer->buffer_list);
+        indio_dev->active_scan_mask = old_mask;
+        kfree(compound_mask);
+error_ret:
+
+        return ret;
+}
+EXPORT_SYMBOL_GPL(iio_update_buffers);
+
+ssize_t iio_buffer_store_enable(struct device *dev,
+                                struct device_attribute *attr,
+                                const char *buf,
+                                size_t len)
+{
+        int ret;
+        bool requested_state;
+        struct iio_dev *indio_dev = dev_to_iio_dev(dev);
+        struct iio_buffer *pbuf = indio_dev->buffer;
+        bool inlist;
+
+        ret = strtobool(buf, &requested_state);
+        if (ret < 0)
+                return ret;
+
+        mutex_lock(&indio_dev->mlock);
+
+        /* Find out if it is in the list */
+        inlist = iio_buffer_is_active(indio_dev, pbuf);
+        /* Already in desired state */
+        if (inlist == requested_state)
+                goto done;
+
+        if (requested_state)
+                ret = iio_update_buffers(indio_dev,
+                                         indio_dev->buffer, NULL);
+        else
+                ret = iio_update_buffers(indio_dev,
+                                         NULL, indio_dev->buffer);
+
+        if (ret < 0)
+                goto done;
+done:
+        mutex_unlock(&indio_dev->mlock);
+        return (ret < 0) ? ret : len;
+}
+EXPORT_SYMBOL(iio_buffer_store_enable);
+
+int iio_sw_buffer_preenable(struct iio_dev *indio_dev)
+{
+        struct iio_buffer *buffer;
+        unsigned bytes;
+        dev_dbg(&indio_dev->dev, "%s\n", __func__);
+
+        list_for_each_entry(buffer, &indio_dev->buffer_list, buffer_list)
+                if (buffer->access->set_bytes_per_datum) {
+                        bytes = iio_compute_scan_bytes(indio_dev,
+                                                       buffer->scan_mask,
+                                                       buffer->scan_timestamp);
+
+                        buffer->access->set_bytes_per_datum(buffer, bytes);
+                }
         return 0;
 }
 EXPORT_SYMBOL(iio_sw_buffer_preenable);
@@ -599,7 +707,11 @@ static bool iio_validate_scan_mask(struct iio_dev *indio_dev,
  * iio_scan_mask_set() - set particular bit in the scan mask
  * @buffer: the buffer whose scan mask we are interested in
  * @bit: the bit to be set.
- **/
+ *
+ * Note that at this point we have no way of knowing what other
+ * buffers might request, hence this code only verifies that the
+ * individual buffers request is plausible.
+ */
 int iio_scan_mask_set(struct iio_dev *indio_dev,
                       struct iio_buffer *buffer, int bit)
 {
@@ -682,13 +794,12 @@ static unsigned char *iio_demux(struct iio_buffer *buffer,
         return buffer->demux_bounce;
 }
 
-int iio_push_to_buffer(struct iio_buffer *buffer, unsigned char *data)
+static int iio_push_to_buffer(struct iio_buffer *buffer, unsigned char *data)
 {
         unsigned char *dataout = iio_demux(buffer, data);
 
         return buffer->access->store_to(buffer, dataout);
 }
-EXPORT_SYMBOL_GPL(iio_push_to_buffer);
 
 static void iio_buffer_demux_free(struct iio_buffer *buffer)
 {
@@ -699,10 +810,26 @@ static void iio_buffer_demux_free(struct iio_buffer *buffer)
         }
 }
 
-int iio_update_demux(struct iio_dev *indio_dev)
+
+int iio_push_to_buffers(struct iio_dev *indio_dev, unsigned char *data)
+{
+        int ret;
+        struct iio_buffer *buf;
+
+        list_for_each_entry(buf, &indio_dev->buffer_list, buffer_list) {
+                ret = iio_push_to_buffer(buf, data);
+                if (ret < 0)
+                        return ret;
+        }
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(iio_push_to_buffers);
+
+static int iio_buffer_update_demux(struct iio_dev *indio_dev,
+                                   struct iio_buffer *buffer)
 {
         const struct iio_chan_spec *ch;
-        struct iio_buffer *buffer = indio_dev->buffer;
         int ret, in_ind = -1, out_ind, length;
         unsigned in_loc = 0, out_loc = 0;
         struct iio_demux_table *p;
@@ -787,4 +914,23 @@ error_clear_mux_table:
 
         return ret;
 }
+
+int iio_update_demux(struct iio_dev *indio_dev)
+{
+        struct iio_buffer *buffer;
+        int ret;
+
+        list_for_each_entry(buffer, &indio_dev->buffer_list, buffer_list) {
+                ret = iio_buffer_update_demux(indio_dev, buffer);
+                if (ret < 0)
+                        goto error_clear_mux_table;
+        }
+        return 0;
+
+error_clear_mux_table:
+        list_for_each_entry(buffer, &indio_dev->buffer_list, buffer_list)
+                iio_buffer_demux_free(buffer);
+
+        return ret;
+}
 EXPORT_SYMBOL_GPL(iio_update_demux);
diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c
index 6eb24dbc081e..8848f16c547b 100644
--- a/drivers/iio/industrialio-core.c
+++ b/drivers/iio/industrialio-core.c
@@ -65,6 +65,7 @@ static const char * const iio_chan_type_name_spec[] = {
         [IIO_CAPACITANCE] = "capacitance",
         [IIO_ALTVOLTAGE] = "altvoltage",
         [IIO_CCT] = "cct",
+        [IIO_PRESSURE] = "pressure",
 };
 
 static const char * const iio_modifier_names[] = {
@@ -397,11 +398,74 @@ static ssize_t iio_read_channel_info(struct device *dev,
                 val2 = do_div(tmp, 1000000000LL);
                 val = tmp;
                 return sprintf(buf, "%d.%09u\n", val, val2);
+        case IIO_VAL_FRACTIONAL_LOG2:
+                tmp = (s64)val * 1000000000LL >> val2;
+                val2 = do_div(tmp, 1000000000LL);
+                val = tmp;
+                return sprintf(buf, "%d.%09u\n", val, val2);
         default:
                 return 0;
         }
 }
 
+/**
+ * iio_str_to_fixpoint() - Parse a fixed-point number from a string
+ * @str: The string to parse
+ * @fract_mult: Multiplier for the first decimal place, should be a power of 10
+ * @integer: The integer part of the number
+ * @fract: The fractional part of the number
+ *
+ * Returns 0 on success, or a negative error code if the string could not be
+ * parsed.
+ */
+int iio_str_to_fixpoint(const char *str, int fract_mult,
+        int *integer, int *fract)
+{
+        int i = 0, f = 0;
+        bool integer_part = true, negative = false;
+
+        if (str[0] == '-') {
+                negative = true;
+                str++;
+        } else if (str[0] == '+') {
+                str++;
+        }
+
+        while (*str) {
+                if ('0' <= *str && *str <= '9') {
+                        if (integer_part) {
+                                i = i * 10 + *str - '0';
+                        } else {
+                                f += fract_mult * (*str - '0');
+                                fract_mult /= 10;
+                        }
+                } else if (*str == '\n') {
+                        if (*(str + 1) == '\0')
+                                break;
+                        else
+                                return -EINVAL;
+                } else if (*str == '.' && integer_part) {
+                        integer_part = false;
+                } else {
+                        return -EINVAL;
+                }
+                str++;
+        }
+
+        if (negative) {
+                if (i)
+                        i = -i;
+                else
+                        f = -f;
+        }
+
+        *integer = i;
+        *fract = f;
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(iio_str_to_fixpoint);
+
 static ssize_t iio_write_channel_info(struct device *dev,
                                       struct device_attribute *attr,
                                       const char *buf,
@@ -409,8 +473,8 @@ static ssize_t iio_write_channel_info(struct device *dev,
 {
         struct iio_dev *indio_dev = dev_to_iio_dev(dev);
         struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
-        int ret, integer = 0, fract = 0, fract_mult = 100000;
-        bool integer_part = true, negative = false;
+        int ret, fract_mult = 100000;
+        int integer, fract;
 
         /* Assumes decimal - precision based on number of digits */
         if (!indio_dev->info->write_raw)
@@ -429,39 +493,9 @@ static ssize_t iio_write_channel_info(struct device *dev,
                         return -EINVAL;
                 }
 
-        if (buf[0] == '-') {
-                negative = true;
-                buf++;
-        }
-
-        while (*buf) {
-                if ('0' <= *buf && *buf <= '9') {
-                        if (integer_part)
-                                integer = integer*10 + *buf - '0';
-                        else {
-                                fract += fract_mult*(*buf - '0');
-                                if (fract_mult == 1)
-                                        break;
-                                fract_mult /= 10;
-                        }
-                } else if (*buf == '\n') {
-                        if (*(buf + 1) == '\0')
-                                break;
-                        else
-                                return -EINVAL;
-                } else if (*buf == '.') {
-                        integer_part = false;
-                } else {
-                        return -EINVAL;
-                }
-                buf++;
-        }
-        if (negative) {
-                if (integer)
-                        integer = -integer;
-                else
-                        fract = -fract;
-        }
+        ret = iio_str_to_fixpoint(buf, fract_mult, &integer, &fract);
+        if (ret)
+                return ret;
 
         ret = indio_dev->info->write_raw(indio_dev, this_attr->c,
                                          integer, fract, this_attr->address);
@@ -851,6 +885,7 @@ struct iio_dev *iio_device_alloc(int sizeof_priv)
                         return NULL;
                 }
                 dev_set_name(&dev->dev, "iio:device%d", dev->id);
+                INIT_LIST_HEAD(&dev->buffer_list);
         }
 
         return dev;
diff --git a/drivers/iio/industrialio-event.c b/drivers/iio/industrialio-event.c
index fa6543bf6731..261cae00557e 100644
--- a/drivers/iio/industrialio-event.c
+++ b/drivers/iio/industrialio-event.c
@@ -239,13 +239,13 @@ static ssize_t iio_ev_value_store(struct device *dev,
 {
         struct iio_dev *indio_dev = dev_to_iio_dev(dev);
         struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
-        unsigned long val;
+        int val;
         int ret;
 
         if (!indio_dev->info->write_event_value)
                 return -EINVAL;
 
-        ret = strict_strtoul(buf, 10, &val);
+        ret = kstrtoint(buf, 10, &val);
         if (ret)
                 return ret;
 
@@ -350,15 +350,10 @@ static inline int __iio_add_event_config_attrs(struct iio_dev *indio_dev)
                 ret = iio_device_add_event_sysfs(indio_dev,
                                                  &indio_dev->channels[j]);
                 if (ret < 0)
-                        goto error_clear_attrs;
+                        return ret;
                 attrcount += ret;
         }
         return attrcount;
-
-error_clear_attrs:
-        __iio_remove_event_config_attrs(indio_dev);
-
-        return ret;
 }
 
 static bool iio_check_for_dynamic_events(struct iio_dev *indio_dev)
diff --git a/drivers/iio/inkern.c b/drivers/iio/inkern.c
index f2b78d4fe457..d55e98fb300e 100644
--- a/drivers/iio/inkern.c
+++ b/drivers/iio/inkern.c
@@ -78,7 +78,7 @@ int iio_map_array_unregister(struct iio_dev *indio_dev,
                                 found_it = true;
                                 break;
                         }
-                if (found_it == false) {
+                if (!found_it) {
                         ret = -ENODEV;
                         goto error_ret;
                 }
@@ -203,6 +203,7 @@ struct iio_channel *iio_channel_get_all(const char *name)
                 if (name && strcmp(name, c->map->consumer_dev_name) != 0)
                         continue;
                 chans[mapind].indio_dev = c->indio_dev;
+                chans[mapind].data = c->map->consumer_data;
                 chans[mapind].channel =
                         iio_chan_spec_from_name(chans[mapind].indio_dev,
                                                 c->map->adc_channel_label);
@@ -314,6 +315,9 @@ static int iio_convert_raw_to_processed_unlocked(struct iio_channel *chan,
                 *processed = div_s64(raw64 * (s64)scale_val * scale,
                                      scale_val2);
                 break;
+        case IIO_VAL_FRACTIONAL_LOG2:
+                *processed = (raw64 * (s64)scale_val * scale) >> scale_val2;
+                break;
         default:
                 return -EINVAL;
         }
diff --git a/drivers/iio/light/adjd_s311.c b/drivers/iio/light/adjd_s311.c
index 164b62b91a4b..36d210a06b28 100644
--- a/drivers/iio/light/adjd_s311.c
+++ b/drivers/iio/light/adjd_s311.c
@@ -164,7 +164,6 @@ static irqreturn_t adjd_s311_trigger_handler(int irq, void *p)
         struct iio_poll_func *pf = p;
         struct iio_dev *indio_dev = pf->indio_dev;
         struct adjd_s311_data *data = iio_priv(indio_dev);
-        struct iio_buffer *buffer = indio_dev->buffer;
         s64 time_ns = iio_get_time_ns();
         int len = 0;
         int i, j = 0;
@@ -187,7 +186,7 @@ static irqreturn_t adjd_s311_trigger_handler(int irq, void *p)
         if (indio_dev->scan_timestamp)
                 *(s64 *)((u8 *)data->buffer + ALIGN(len, sizeof(s64)))
                         = time_ns;
-        iio_push_to_buffer(buffer, (u8 *)data->buffer);
+        iio_push_to_buffers(indio_dev, (u8 *)data->buffer);
 
 done:
         iio_trigger_notify_done(indio_dev->trig);
diff --git a/drivers/iio/light/hid-sensor-als.c b/drivers/iio/light/hid-sensor-als.c
index 96e3691e42c4..23eeeef64e84 100644
--- a/drivers/iio/light/hid-sensor-als.c
+++ b/drivers/iio/light/hid-sensor-als.c
@@ -176,21 +176,8 @@ static const struct iio_info als_info = {
 /* Function to push data to buffer */
 static void hid_sensor_push_data(struct iio_dev *indio_dev, u8 *data, int len)
 {
-        struct iio_buffer *buffer = indio_dev->buffer;
-        int datum_sz;
-
         dev_dbg(&indio_dev->dev, "hid_sensor_push_data\n");
-        if (!buffer) {
-                dev_err(&indio_dev->dev, "Buffer == NULL\n");
-                return;
-        }
-        datum_sz = buffer->access->get_bytes_per_datum(buffer);
-        if (len > datum_sz) {
-                dev_err(&indio_dev->dev, "Datum size mismatch %d:%d\n", len,
-                                datum_sz);
-                return;
-        }
-        iio_push_to_buffer(buffer, (u8 *)data);
+        iio_push_to_buffers(indio_dev, (u8 *)data);
 }
 
 /* Callback handler to send event after all samples are received and captured */
@@ -285,10 +272,9 @@ static int __devinit hid_als_probe(struct platform_device *pdev)
                 goto error_free_dev;
         }
 
-        channels = kmemdup(als_channels,
-                                        sizeof(als_channels),
-                                        GFP_KERNEL);
+        channels = kmemdup(als_channels, sizeof(als_channels), GFP_KERNEL);
         if (!channels) {
+                ret = -ENOMEM;
                 dev_err(&pdev->dev, "failed to duplicate channels\n");
                 goto error_free_dev;
         }
diff --git a/drivers/iio/magnetometer/hid-sensor-magn-3d.c b/drivers/iio/magnetometer/hid-sensor-magn-3d.c
index c4f0d274f577..8e75eb76ccd9 100644
--- a/drivers/iio/magnetometer/hid-sensor-magn-3d.c
+++ b/drivers/iio/magnetometer/hid-sensor-magn-3d.c
@@ -198,21 +198,8 @@ static const struct iio_info magn_3d_info = {
 /* Function to push data to buffer */
 static void hid_sensor_push_data(struct iio_dev *indio_dev, u8 *data, int len)
 {
-        struct iio_buffer *buffer = indio_dev->buffer;
-        int datum_sz;
-
         dev_dbg(&indio_dev->dev, "hid_sensor_push_data\n");
-        if (!buffer) {
-                dev_err(&indio_dev->dev, "Buffer == NULL\n");
-                return;
-        }
-        datum_sz = buffer->access->get_bytes_per_datum(buffer);
-        if (len > datum_sz) {
-                dev_err(&indio_dev->dev, "Datum size mismatch %d:%d\n", len,
-                                datum_sz);
-                return;
-        }
-        iio_push_to_buffer(buffer, (u8 *)data);
+        iio_push_to_buffers(indio_dev, (u8 *)data);
 }
 
 /* Callback handler to send event after all samples are received and captured */
@@ -320,10 +307,10 @@ static int __devinit hid_magn_3d_probe(struct platform_device *pdev)
                 goto error_free_dev;
         }
 
-        channels = kmemdup(magn_3d_channels,
-                                        sizeof(magn_3d_channels),
-                                        GFP_KERNEL);
+        channels = kmemdup(magn_3d_channels, sizeof(magn_3d_channels),
+                           GFP_KERNEL);
         if (!channels) {
+                ret = -ENOMEM;
                 dev_err(&pdev->dev, "failed to duplicate channels\n");
                 goto error_free_dev;
         }
diff --git a/drivers/ipack/Kconfig b/drivers/ipack/Kconfig
new file mode 100644
index 000000000000..3949e5589560
--- /dev/null
+++ b/drivers/ipack/Kconfig
@@ -0,0 +1,24 @@
+#
+# IPACK configuration.
+#
+
+menuconfig IPACK_BUS
+        tristate "IndustryPack bus support"
+        depends on HAS_IOMEM
+        ---help---
+          This option provides support for the IndustryPack framework.  There
+          are IndustryPack carrier boards, which interface another bus (such as
+          PCI) to an IndustryPack bus, and IndustryPack modules, that are
+          hosted on these buses.  While IndustryPack modules can provide a
+          large variety of functionality, they are most often found in
+          industrial control applications.
+
+          Say N if unsure.
+
+if IPACK_BUS
+
+source "drivers/ipack/carriers/Kconfig"
+
+source "drivers/ipack/devices/Kconfig"
+
+endif # IPACK
diff --git a/drivers/staging/ipack/Makefile b/drivers/ipack/Makefile
index 85ff223616fd..6f14ade0f8f3 100644
--- a/drivers/staging/ipack/Makefile
+++ b/drivers/ipack/Makefile
@@ -3,4 +3,4 @@
 #
 obj-$(CONFIG_IPACK_BUS)         += ipack.o
 obj-y                           += devices/
-obj-y                           += bridges/
+obj-y                           += carriers/
diff --git a/drivers/ipack/carriers/Kconfig b/drivers/ipack/carriers/Kconfig
new file mode 100644
index 000000000000..922ff5c35acc
--- /dev/null
+++ b/drivers/ipack/carriers/Kconfig
@@ -0,0 +1,7 @@
+config BOARD_TPCI200
+        tristate "Support for the TEWS TPCI-200 IndustryPack carrier board"
+        depends on IPACK_BUS
+        depends on PCI
+        help
+          This driver adds support for the TEWS TPCI200 IndustryPack carrier board.
+        default n
diff --git a/drivers/staging/ipack/bridges/Makefile b/drivers/ipack/carriers/Makefile
index d8b76459300f..d8b76459300f 100644
--- a/drivers/staging/ipack/bridges/Makefile
+++ b/drivers/ipack/carriers/Makefile
diff --git a/drivers/staging/ipack/bridges/tpci200.c b/drivers/ipack/carriers/tpci200.c
index 46d6657280b8..0246b1fddffe 100644
--- a/drivers/staging/ipack/bridges/tpci200.c
+++ b/drivers/ipack/carriers/tpci200.c
@@ -2,9 +2,10 @@
  * tpci200.c
  *
  * driver for the TEWS TPCI-200 device
- * Copyright (c) 2009 Nicolas Serafini, EIC2 SA
- * Copyright (c) 2010,2011 Samuel Iglesias Gonsalvez <siglesia@cern.ch>, CERN
- * Copyright (c) 2012 Samuel Iglesias Gonsalvez <siglesias@igalia.com>, Igalia
+ *
+ * Copyright (C) 2009-2012 CERN (www.cern.ch)
+ * Author: Nicolas Serafini, EIC2 SA
+ * Author: Samuel Iglesias Gonsalvez <siglesias@igalia.com>
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
@@ -15,20 +16,36 @@
 #include <linux/slab.h>
 #include "tpci200.h"
 
-static u16 tpci200_status_timeout[] = {
+static const u16 tpci200_status_timeout[] = {
         TPCI200_A_TIMEOUT,
         TPCI200_B_TIMEOUT,
         TPCI200_C_TIMEOUT,
         TPCI200_D_TIMEOUT,
 };
 
-static u16 tpci200_status_error[] = {
+static const u16 tpci200_status_error[] = {
         TPCI200_A_ERROR,
         TPCI200_B_ERROR,
         TPCI200_C_ERROR,
         TPCI200_D_ERROR,
 };
 
+static const size_t tpci200_space_size[IPACK_SPACE_COUNT] = {
+        [IPACK_IO_SPACE]    = TPCI200_IO_SPACE_SIZE,
+        [IPACK_ID_SPACE]    = TPCI200_ID_SPACE_SIZE,
+        [IPACK_INT_SPACE]   = TPCI200_INT_SPACE_SIZE,
+        [IPACK_MEM8_SPACE]  = TPCI200_MEM8_SPACE_SIZE,
+        [IPACK_MEM16_SPACE] = TPCI200_MEM16_SPACE_SIZE,
+};
+
+static const size_t tpci200_space_interval[IPACK_SPACE_COUNT] = {
+        [IPACK_IO_SPACE]    = TPCI200_IO_SPACE_INTERVAL,
+        [IPACK_ID_SPACE]    = TPCI200_ID_SPACE_INTERVAL,
+        [IPACK_INT_SPACE]   = TPCI200_INT_SPACE_INTERVAL,
+        [IPACK_MEM8_SPACE]  = TPCI200_MEM8_SPACE_INTERVAL,
+        [IPACK_MEM16_SPACE] = TPCI200_MEM16_SPACE_INTERVAL,
+};
+
 static struct tpci200_board *check_slot(struct ipack_device *dev)
 {
         struct tpci200_board *tpci200;
@@ -47,7 +64,7 @@ static struct tpci200_board *check_slot(struct ipack_device *dev)
         if (dev->slot >= TPCI200_NB_SLOT) {
                 dev_info(&dev->dev,
                          "Slot [%d:%d] doesn't exist! Last tpci200 slot is %d.\n",
-                         dev->bus_nr, dev->slot, TPCI200_NB_SLOT-1);
+                         dev->bus->bus_nr, dev->slot, TPCI200_NB_SLOT-1);
                 return NULL;
         }
 
@@ -74,33 +91,19 @@ static void tpci200_set_mask(struct tpci200_board *tpci200,
 
 static void tpci200_unregister(struct tpci200_board *tpci200)
 {
-        int i;
-
         free_irq(tpci200->info->pdev->irq, (void *) tpci200);
 
         pci_iounmap(tpci200->info->pdev, tpci200->info->interface_regs);
-        pci_iounmap(tpci200->info->pdev, tpci200->info->ioidint_space);
-        pci_iounmap(tpci200->info->pdev, tpci200->info->mem8_space);
         pci_iounmap(tpci200->info->pdev, tpci200->info->cfg_regs);
 
         pci_release_region(tpci200->info->pdev, TPCI200_IP_INTERFACE_BAR);
         pci_release_region(tpci200->info->pdev, TPCI200_IO_ID_INT_SPACES_BAR);
+        pci_release_region(tpci200->info->pdev, TPCI200_MEM16_SPACE_BAR);
         pci_release_region(tpci200->info->pdev, TPCI200_MEM8_SPACE_BAR);
         pci_release_region(tpci200->info->pdev, TPCI200_CFG_MEM_BAR);
 
         pci_disable_device(tpci200->info->pdev);
         pci_dev_put(tpci200->info->pdev);
-
-        for (i = 0; i < TPCI200_NB_SLOT; i++) {
-                tpci200->slots[i].io_phys.address = NULL;
-                tpci200->slots[i].io_phys.size = 0;
-                tpci200->slots[i].id_phys.address = NULL;
-                tpci200->slots[i].id_phys.size = 0;
-                tpci200->slots[i].int_phys.address = NULL;
-                tpci200->slots[i].int_phys.size = 0;
-                tpci200->slots[i].mem_phys.address = NULL;
-                tpci200->slots[i].mem_phys.size = 0;
-        }
 }
 
 static void tpci200_enable_irq(struct tpci200_board *tpci200,
@@ -207,7 +210,8 @@ static int tpci200_request_irq(struct ipack_device *dev,
 
         if (tpci200->slots[dev->slot].irq != NULL) {
                 dev_err(&dev->dev,
-                        "Slot [%d:%d] IRQ already registered !\n", dev->bus_nr,
+                        "Slot [%d:%d] IRQ already registered !\n",
+                        dev->bus->bus_nr,
                         dev->slot);
                 res = -EINVAL;
                 goto out_unlock;
@@ -217,7 +221,7 @@ static int tpci200_request_irq(struct ipack_device *dev,
         if (slot_irq == NULL) {
                 dev_err(&dev->dev,
                         "Slot [%d:%d] unable to allocate memory for IRQ !\n",
-                        dev->bus_nr, dev->slot);
+                        dev->bus->bus_nr, dev->slot);
                 res = -ENOMEM;
                 goto out_unlock;
         }
@@ -244,8 +248,7 @@ static int tpci200_register(struct tpci200_board *tpci200)
 {
         int i;
         int res;
-        unsigned long ioidint_base;
-        unsigned long mem_base;
+        phys_addr_t ioidint_base;
         unsigned short slot_ctrl;
 
         if (pci_enable_device(tpci200->info->pdev) < 0)
@@ -274,38 +277,49 @@ static int tpci200_register(struct tpci200_board *tpci200)
                 goto out_release_ip_space;
         }
 
-        /* Request MEM space (Bar 4) */
+        /* Request MEM8 space (Bar 5) */
         res = pci_request_region(tpci200->info->pdev, TPCI200_MEM8_SPACE_BAR,
-                                 "Carrier MEM space");
+                                 "Carrier MEM8 space");
         if (res) {
                 dev_err(&tpci200->info->pdev->dev,
-                        "(bn 0x%X, sn 0x%X) failed to allocate PCI resource for BAR 4!",
+                        "(bn 0x%X, sn 0x%X) failed to allocate PCI resource for BAR 5!",
                         tpci200->info->pdev->bus->number,
                         tpci200->info->pdev->devfn);
                 goto out_release_ioid_int_space;
         }
 
+        /* Request MEM16 space (Bar 4) */
+        res = pci_request_region(tpci200->info->pdev, TPCI200_MEM16_SPACE_BAR,
+                                 "Carrier MEM16 space");
+        if (res) {
+                dev_err(&tpci200->info->pdev->dev,
+                        "(bn 0x%X, sn 0x%X) failed to allocate PCI resource for BAR 4!",
+                        tpci200->info->pdev->bus->number,
+                        tpci200->info->pdev->devfn);
+                goto out_release_mem8_space;
+        }
+
         /* Map internal tpci200 driver user space */
         tpci200->info->interface_regs =
                 ioremap_nocache(pci_resource_start(tpci200->info->pdev,
                                            TPCI200_IP_INTERFACE_BAR),
                         TPCI200_IFACE_SIZE);
-        tpci200->info->ioidint_space =
-                ioremap_nocache(pci_resource_start(tpci200->info->pdev,
-                                           TPCI200_IO_ID_INT_SPACES_BAR),
-                        TPCI200_IOIDINT_SIZE);
-        tpci200->info->mem8_space =
-                ioremap_nocache(pci_resource_start(tpci200->info->pdev,
-                                           TPCI200_MEM8_SPACE_BAR),
-                        TPCI200_MEM8_SIZE);
 
         /* Initialize lock that protects interface_regs */
         spin_lock_init(&tpci200->regs_lock);
 
         ioidint_base = pci_resource_start(tpci200->info->pdev,
                                           TPCI200_IO_ID_INT_SPACES_BAR);
-        mem_base = pci_resource_start(tpci200->info->pdev,
-                                      TPCI200_MEM8_SPACE_BAR);
+        tpci200->mod_mem[IPACK_IO_SPACE] = ioidint_base + TPCI200_IO_SPACE_OFF;
+        tpci200->mod_mem[IPACK_ID_SPACE] = ioidint_base + TPCI200_ID_SPACE_OFF;
+        tpci200->mod_mem[IPACK_INT_SPACE] =
+                ioidint_base + TPCI200_INT_SPACE_OFF;
+        tpci200->mod_mem[IPACK_MEM8_SPACE] =
+                pci_resource_start(tpci200->info->pdev,
+                                   TPCI200_MEM8_SPACE_BAR);
+        tpci200->mod_mem[IPACK_MEM16_SPACE] =
+                pci_resource_start(tpci200->info->pdev,
+                                   TPCI200_MEM16_SPACE_BAR);
 
         /* Set the default parameters of the slot
          * INT0 disabled, level sensitive
@@ -316,30 +330,8 @@ static int tpci200_register(struct tpci200_board *tpci200)
          * clock rate 8 MHz
          */
         slot_ctrl = 0;
-
-        /* Set all slot physical address space */
-        for (i = 0; i < TPCI200_NB_SLOT; i++) {
-                tpci200->slots[i].io_phys.address =
-                        (void __iomem *)ioidint_base +
-                        TPCI200_IO_SPACE_OFF + TPCI200_IO_SPACE_GAP*i;
-                tpci200->slots[i].io_phys.size = TPCI200_IO_SPACE_SIZE;
-
-                tpci200->slots[i].id_phys.address =
-                        (void __iomem *)ioidint_base +
-                        TPCI200_ID_SPACE_OFF + TPCI200_ID_SPACE_GAP*i;
-                tpci200->slots[i].id_phys.size = TPCI200_ID_SPACE_SIZE;
-
-                tpci200->slots[i].int_phys.address =
-                        (void __iomem *)ioidint_base +
-                        TPCI200_INT_SPACE_OFF + TPCI200_INT_SPACE_GAP * i;
-                tpci200->slots[i].int_phys.size = TPCI200_INT_SPACE_SIZE;
-
-                tpci200->slots[i].mem_phys.address =
-                        (void __iomem *)mem_base + TPCI200_MEM8_GAP*i;
-                tpci200->slots[i].mem_phys.size = TPCI200_MEM8_SIZE;
-
+        for (i = 0; i < TPCI200_NB_SLOT; i++)
                 writew(slot_ctrl, &tpci200->info->interface_regs->control[i]);
-        }
 
         res = request_irq(tpci200->info->pdev->irq,
                           tpci200_interrupt, IRQF_SHARED,
@@ -354,6 +346,8 @@ static int tpci200_register(struct tpci200_board *tpci200)
 
         return 0;
 
+out_release_mem8_space:
+        pci_release_region(tpci200->info->pdev, TPCI200_MEM8_SPACE_BAR);
 out_release_ioid_int_space:
         pci_release_region(tpci200->info->pdev, TPCI200_IO_ID_INT_SPACES_BAR);
 out_release_ip_space:
@@ -363,166 +357,6 @@ out_disable_pci:
         return res;
 }
 
-static int tpci200_slot_unmap_space(struct ipack_device *dev, int space)
-{
-        struct ipack_addr_space *virt_addr_space;
-        struct tpci200_board *tpci200;
-
-        tpci200 = check_slot(dev);
-        if (tpci200 == NULL)
-                return -EINVAL;
-
-        if (mutex_lock_interruptible(&tpci200->mutex))
-                return -ERESTARTSYS;
-
-        switch (space) {
-        case IPACK_IO_SPACE:
-                if (dev->io_space.address == NULL) {
-                        dev_info(&dev->dev,
-                                 "Slot [%d:%d] IO space not mapped !\n",
-                                 dev->bus_nr, dev->slot);
-                        goto out_unlock;
-                }
-                virt_addr_space = &dev->io_space;
-                break;
-        case IPACK_ID_SPACE:
-                if (dev->id_space.address == NULL) {
-                        dev_info(&dev->dev,
-                                 "Slot [%d:%d] ID space not mapped !\n",
-                                 dev->bus_nr, dev->slot);
-                        goto out_unlock;
-                }
-                virt_addr_space = &dev->id_space;
-                break;
-        case IPACK_INT_SPACE:
-                if (dev->int_space.address == NULL) {
-                        dev_info(&dev->dev,
-                                 "Slot [%d:%d] INT space not mapped !\n",
-                                 dev->bus_nr, dev->slot);
-                        goto out_unlock;
-                }
-                virt_addr_space = &dev->int_space;
-                break;
-        case IPACK_MEM_SPACE:
-                if (dev->mem_space.address == NULL) {
-                        dev_info(&dev->dev,
-                                 "Slot [%d:%d] MEM space not mapped !\n",
-                                 dev->bus_nr, dev->slot);
-                        goto out_unlock;
-                }
-                virt_addr_space = &dev->mem_space;
-                break;
-        default:
-                dev_err(&dev->dev,
-                        "Slot [%d:%d] space number %d doesn't exist !\n",
-                        dev->bus_nr, dev->slot, space);
-                mutex_unlock(&tpci200->mutex);
-                return -EINVAL;
-        }
-
-        iounmap(virt_addr_space->address);
-
-        virt_addr_space->address = NULL;
-        virt_addr_space->size = 0;
-out_unlock:
-        mutex_unlock(&tpci200->mutex);
-        return 0;
-}
-
-static int tpci200_slot_map_space(struct ipack_device *dev,
-                                  unsigned int memory_size, int space)
-{
-        int res = 0;
-        unsigned int size_to_map;
-        void __iomem *phys_address;
-        struct ipack_addr_space *virt_addr_space;
-        struct tpci200_board *tpci200;
-
-        tpci200 = check_slot(dev);
-        if (tpci200 == NULL)
-                return -EINVAL;
-
-        if (mutex_lock_interruptible(&tpci200->mutex))
-                return -ERESTARTSYS;
-
-        switch (space) {
-        case IPACK_IO_SPACE:
-                if (dev->io_space.address != NULL) {
-                        dev_err(&dev->dev,
-                                "Slot [%d:%d] IO space already mapped !\n",
-                                tpci200->number, dev->slot);
-                        res = -EINVAL;
-                        goto out_unlock;
-                }
-                virt_addr_space = &dev->io_space;
-
-                phys_address = tpci200->slots[dev->slot].io_phys.address;
-                size_to_map = tpci200->slots[dev->slot].io_phys.size;
-                break;
-        case IPACK_ID_SPACE:
-                if (dev->id_space.address != NULL) {
-                        dev_err(&dev->dev,
-                                "Slot [%d:%d] ID space already mapped !\n",
-                                tpci200->number, dev->slot);
-                        res = -EINVAL;
-                        goto out_unlock;
-                }
-                virt_addr_space = &dev->id_space;
-
-                phys_address = tpci200->slots[dev->slot].id_phys.address;
-                size_to_map = tpci200->slots[dev->slot].id_phys.size;
-                break;
-        case IPACK_INT_SPACE:
-                if (dev->int_space.address != NULL) {
-                        dev_err(&dev->dev,
-                                "Slot [%d:%d] INT space already mapped !\n",
-                                tpci200->number, dev->slot);
-                        res = -EINVAL;
-                        goto out_unlock;
-                }
-                virt_addr_space = &dev->int_space;
-
-                phys_address = tpci200->slots[dev->slot].int_phys.address;
-                size_to_map = tpci200->slots[dev->slot].int_phys.size;
-                break;
-        case IPACK_MEM_SPACE:
-                if (dev->mem_space.address != NULL) {
-                        dev_err(&dev->dev,
-                                "Slot [%d:%d] MEM space already mapped !\n",
-                                tpci200->number, dev->slot);
-                        res = -EINVAL;
-                        goto out_unlock;
-                }
-                virt_addr_space = &dev->mem_space;
-
-                if (memory_size > tpci200->slots[dev->slot].mem_phys.size) {
-                        dev_err(&dev->dev,
-                                "Slot [%d:%d] request is 0x%X memory, only 0x%X available !\n",
-                                dev->bus_nr, dev->slot, memory_size,
-                                tpci200->slots[dev->slot].mem_phys.size);
-                        res = -EINVAL;
-                        goto out_unlock;
-                }
-
-                phys_address = tpci200->slots[dev->slot].mem_phys.address;
-                size_to_map = memory_size;
-                break;
-        default:
-                dev_err(&dev->dev, "Slot [%d:%d] space %d doesn't exist !\n",
-                        tpci200->number, dev->slot, space);
-                res = -EINVAL;
-                goto out_unlock;
-        }
-
-        virt_addr_space->size = size_to_map;
-        virt_addr_space->address =
-                ioremap_nocache((unsigned long)phys_address, size_to_map);
-
-out_unlock:
-        mutex_unlock(&tpci200->mutex);
-        return res;
-}
-
 static int tpci200_get_clockrate(struct ipack_device *dev)
 {
         struct tpci200_board *tpci200 = check_slot(dev);
@@ -610,8 +444,6 @@ static void tpci200_uninstall(struct tpci200_board *tpci200)
 }
 
 static const struct ipack_bus_ops tpci200_bus_ops = {
-        .map_space = tpci200_slot_map_space,
-        .unmap_space = tpci200_slot_unmap_space,
         .request_irq = tpci200_request_irq,
         .free_irq = tpci200_free_irq,
         .get_clockrate = tpci200_get_clockrate,
@@ -641,6 +473,31 @@ static int tpci200_install(struct tpci200_board *tpci200)
         return 0;
 }
 
+static void tpci200_release_device(struct ipack_device *dev)
+{
+        kfree(dev);
+}
+
+static int tpci200_create_device(struct tpci200_board *tpci200, int i)
+{
+        enum ipack_space space;
+        struct ipack_device *dev =
+                kzalloc(sizeof(struct ipack_device), GFP_KERNEL);
+        if (!dev)
+                return -ENOMEM;
+        dev->slot = i;
+        dev->bus = tpci200->info->ipack_bus;
+        dev->release = tpci200_release_device;
+
+        for (space = 0; space < IPACK_SPACE_COUNT; space++) {
+                dev->region[space].start =
+                        tpci200->mod_mem[space]
+                        + tpci200_space_interval[space] * i;
+                dev->region[space].size = tpci200_space_size[space];
+        }
+        return ipack_device_register(dev);
+}
+
 static int tpci200_pci_probe(struct pci_dev *pdev,
                              const struct pci_device_id *id)
 {
@@ -716,7 +573,7 @@ static int tpci200_pci_probe(struct pci_dev *pdev,
         dev_set_drvdata(&pdev->dev, tpci200);
 
         for (i = 0; i < TPCI200_NB_SLOT; i++)
-                ipack_device_register(tpci200->info->ipack_bus, i);
+                tpci200_create_device(tpci200, i);
         return 0;
 
 out_err_bus_register:
@@ -742,7 +599,7 @@ static void __tpci200_pci_remove(struct tpci200_board *tpci200)
         kfree(tpci200);
 }
 
-static void __devexit tpci200_pci_remove(struct pci_dev *dev)
+static void tpci200_pci_remove(struct pci_dev *dev)
 {
         struct tpci200_board *tpci200 = pci_get_drvdata(dev);
 
@@ -761,20 +618,10 @@ static struct pci_driver tpci200_pci_drv = {
         .name = "tpci200",
         .id_table = tpci200_idtable,
         .probe = tpci200_pci_probe,
-        .remove = __devexit_p(tpci200_pci_remove),
+        .remove = tpci200_pci_remove,
 };
 
-static int __init tpci200_drvr_init_module(void)
-{
-        return pci_register_driver(&tpci200_pci_drv);
-}
-
-static void __exit tpci200_drvr_exit_module(void)
-{
-        pci_unregister_driver(&tpci200_pci_drv);
-}
+module_pci_driver(tpci200_pci_drv);
 
 MODULE_DESCRIPTION("TEWS TPCI-200 device driver");
 MODULE_LICENSE("GPL");
-module_init(tpci200_drvr_init_module);
-module_exit(tpci200_drvr_exit_module);
diff --git a/drivers/staging/ipack/bridges/tpci200.h b/drivers/ipack/carriers/tpci200.h
index 235d1fe4f48c..a7a151dab83c 100644
--- a/drivers/staging/ipack/bridges/tpci200.h
+++ b/drivers/ipack/carriers/tpci200.h
@@ -2,9 +2,10 @@
  * tpci200.h
  *
  * driver for the carrier TEWS TPCI-200
- * Copyright (c) 2009 Nicolas Serafini, EIC2 SA
- * Copyright (c) 2010,2011 Samuel Iglesias Gonsalvez <siglesia@cern.ch>, CERN
- * Copyright (c) 2012 Samuel Iglesias Gonsalvez <siglesias@igalia.com>, Igalia
+ *
+ * Copyright (C) 2009-2012 CERN (www.cern.ch)
+ * Author: Nicolas Serafini, EIC2 SA
+ * Author: Samuel Iglesias Gonsalvez <siglesias@igalia.com>
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
@@ -19,8 +20,7 @@
 #include <linux/spinlock.h>
 #include <linux/swab.h>
 #include <linux/io.h>
-
-#include "../ipack.h"
+#include <linux/ipack.h>
 
 #define TPCI200_NB_SLOT               0x4
 #define TPCI200_NB_BAR                0x6
@@ -49,20 +49,20 @@ struct tpci200_regs {
 #define TPCI200_IFACE_SIZE            0x100
 
 #define TPCI200_IO_SPACE_OFF          0x0000
-#define TPCI200_IO_SPACE_GAP          0x0100
+#define TPCI200_IO_SPACE_INTERVAL     0x0100
 #define TPCI200_IO_SPACE_SIZE         0x0080
 #define TPCI200_ID_SPACE_OFF          0x0080
-#define TPCI200_ID_SPACE_GAP          0x0100
+#define TPCI200_ID_SPACE_INTERVAL     0x0100
 #define TPCI200_ID_SPACE_SIZE         0x0040
 #define TPCI200_INT_SPACE_OFF         0x00C0
-#define TPCI200_INT_SPACE_GAP         0x0100
+#define TPCI200_INT_SPACE_INTERVAL    0x0100
 #define TPCI200_INT_SPACE_SIZE        0x0040
 #define TPCI200_IOIDINT_SIZE          0x0400
 
-#define TPCI200_MEM8_GAP              0x00400000
-#define TPCI200_MEM8_SIZE             0x00400000
-#define TPCI200_MEM16_GAP             0x00800000
-#define TPCI200_MEM16_SIZE            0x00800000
+#define TPCI200_MEM8_SPACE_INTERVAL   0x00400000
+#define TPCI200_MEM8_SPACE_SIZE       0x00400000
+#define TPCI200_MEM16_SPACE_INTERVAL  0x00800000
+#define TPCI200_MEM16_SPACE_SIZE      0x00800000
 
 /* control field in tpci200_regs */
 #define TPCI200_INT0_EN               0x0040
@@ -137,11 +137,7 @@ struct slot_irq {
  *
  */
 struct tpci200_slot {
-        struct slot_irq         *irq;
-        struct ipack_addr_space io_phys;
-        struct ipack_addr_space id_phys;
-        struct ipack_addr_space int_phys;
-        struct ipack_addr_space mem_phys;
+        struct slot_irq     *irq;
 };
 
 /**
@@ -156,8 +152,6 @@ struct tpci200_infos {
         struct pci_dev                  *pdev;
         struct pci_device_id            *id_table;
         struct tpci200_regs __iomem     *interface_regs;
-        void __iomem                    *ioidint_space;
-        void __iomem                    *mem8_space;
         void __iomem                    *cfg_regs;
         struct ipack_bus_device         *ipack_bus;
 };
@@ -167,6 +161,7 @@ struct tpci200_board {
         spinlock_t              regs_lock;
         struct tpci200_slot     *slots;
         struct tpci200_infos    *info;
+        phys_addr_t             mod_mem[IPACK_SPACE_COUNT];
 };
 
 #endif /* _TPCI200_H_ */
diff --git a/drivers/staging/ipack/devices/Kconfig b/drivers/ipack/devices/Kconfig
index 39f71888a584..0b82fdc198c0 100644
--- a/drivers/staging/ipack/devices/Kconfig
+++ b/drivers/ipack/devices/Kconfig
@@ -4,4 +4,3 @@ config SERIAL_IPOCTAL
         help
           This driver supports the IPOCTAL serial port device for the IndustryPack bus.
         default n
-
diff --git a/drivers/staging/ipack/devices/Makefile b/drivers/ipack/devices/Makefile
index 6de18bda4a9a..6de18bda4a9a 100644
--- a/drivers/staging/ipack/devices/Makefile
+++ b/drivers/ipack/devices/Makefile
diff --git a/drivers/staging/ipack/devices/ipoctal.c b/drivers/ipack/devices/ipoctal.c
index d751edfda839..c06ab396e84f 100644
--- a/drivers/staging/ipack/devices/ipoctal.c
+++ b/drivers/ipack/devices/ipoctal.c
@@ -2,9 +2,10 @@
  * ipoctal.c
  *
  * driver for the GE IP-OCTAL boards
- * Copyright (c) 2009 Nicolas Serafini, EIC2 SA
- * Copyright (c) 2010,2011 Samuel Iglesias Gonsalvez <siglesia@cern.ch>, CERN
- * Copyright (c) 2012 Samuel Iglesias Gonsalvez <siglesias@igalia.com>, Igalia
+ *
+ * Copyright (C) 2009-2012 CERN (www.cern.ch)
+ * Author: Nicolas Serafini, EIC2 SA
+ * Author: Samuel Iglesias Gonsalvez <siglesias@igalia.com>
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
@@ -21,7 +22,7 @@
 #include <linux/slab.h>
 #include <linux/atomic.h>
 #include <linux/io.h>
-#include "../ipack.h"
+#include <linux/ipack.h>
 #include "ipoctal.h"
 #include "scc2698.h"
 
@@ -53,6 +54,8 @@ struct ipoctal {
         struct ipoctal_channel          channel[NR_CHANNELS];
         unsigned char                   write;
         struct tty_driver               *tty_drv;
+        u8 __iomem                      *mem8_space;
+        u8 __iomem                      *int_space;
 };
 
 static int ipoctal_port_activate(struct tty_port *port, struct tty_struct *tty)
@@ -252,35 +255,12 @@ static irqreturn_t ipoctal_irq_handler(void *arg)
                 ipoctal_irq_channel(&ipoctal->channel[i]);
 
         /* Clear the IPack device interrupt */
-        readw(ipoctal->dev->int_space.address + ACK_INT_REQ0);
-        readw(ipoctal->dev->int_space.address + ACK_INT_REQ1);
+        readw(ipoctal->int_space + ACK_INT_REQ0);
+        readw(ipoctal->int_space + ACK_INT_REQ1);
 
         return IRQ_HANDLED;
 }
 
-static int ipoctal_check_model(struct ipack_device *dev, unsigned char *id)
-{
-        unsigned char manufacturerID;
-        unsigned char board_id;
-
-
-        manufacturerID = ioread8(dev->id_space.address + IPACK_IDPROM_OFFSET_MANUFACTURER_ID);
-        if (manufacturerID != IPACK1_VENDOR_ID_SBS)
-                return -ENODEV;
-        board_id = ioread8(dev->id_space.address + IPACK_IDPROM_OFFSET_MODEL);
-        switch (board_id) {
-        case IPACK1_DEVICE_ID_SBS_OCTAL_232:
-        case IPACK1_DEVICE_ID_SBS_OCTAL_422:
-        case IPACK1_DEVICE_ID_SBS_OCTAL_485:
-                *id = board_id;
-                break;
-        default:
-                return -ENODEV;
-        }
-
-        return 0;
-}
-
 static const struct tty_port_operations ipoctal_tty_port_ops = {
         .dtr_rts = NULL,
         .activate = ipoctal_port_activate,
@@ -289,64 +269,55 @@ static const struct tty_port_operations ipoctal_tty_port_ops = {
 static int ipoctal_inst_slot(struct ipoctal *ipoctal, unsigned int bus_nr,
                              unsigned int slot)
 {
-        int res = 0;
+        int res;
         int i;
         struct tty_driver *tty;
         char name[20];
-        unsigned char board_id;
         struct ipoctal_channel *channel;
+        struct ipack_region *region;
+        void __iomem *addr;
         union scc2698_channel __iomem *chan_regs;
         union scc2698_block __iomem *block_regs;
 
-        res = ipoctal->dev->bus->ops->map_space(ipoctal->dev, 0,
-                                                IPACK_ID_SPACE);
-        if (res) {
-                dev_err(&ipoctal->dev->dev,
-                        "Unable to map slot [%d:%d] ID space!\n",
-                        bus_nr, slot);
-                return res;
-        }
-
-        res = ipoctal_check_model(ipoctal->dev, &board_id);
-        if (res) {
-                ipoctal->dev->bus->ops->unmap_space(ipoctal->dev,
-                                                    IPACK_ID_SPACE);
-                goto out_unregister_id_space;
-        }
-        ipoctal->board_id = board_id;
+        ipoctal->board_id = ipoctal->dev->id_device;
 
-        res = ipoctal->dev->bus->ops->map_space(ipoctal->dev, 0,
-                                                IPACK_IO_SPACE);
-        if (res) {
+        region = &ipoctal->dev->region[IPACK_IO_SPACE];
+        addr = devm_ioremap_nocache(&ipoctal->dev->dev,
+                                    region->start, region->size);
+        if (!addr) {
                 dev_err(&ipoctal->dev->dev,
                         "Unable to map slot [%d:%d] IO space!\n",
                         bus_nr, slot);
-                goto out_unregister_id_space;
+                return -EADDRNOTAVAIL;
         }
+        /* Save the virtual address to access the registers easily */
+        chan_regs =
+                (union scc2698_channel __iomem *) addr;
+        block_regs =
+                (union scc2698_block __iomem *) addr;
 
-        res = ipoctal->dev->bus->ops->map_space(ipoctal->dev, 0,
-                                                IPACK_INT_SPACE);
-        if (res) {
+        region = &ipoctal->dev->region[IPACK_INT_SPACE];
+        ipoctal->int_space =
+                devm_ioremap_nocache(&ipoctal->dev->dev,
+                                     region->start, region->size);
+        if (!ipoctal->int_space) {
                 dev_err(&ipoctal->dev->dev,
                         "Unable to map slot [%d:%d] INT space!\n",
                         bus_nr, slot);
-                goto out_unregister_io_space;
+                return -EADDRNOTAVAIL;
         }
 
-        res = ipoctal->dev->bus->ops->map_space(ipoctal->dev,
-                                           0x8000, IPACK_MEM_SPACE);
-        if (res) {
+        region = &ipoctal->dev->region[IPACK_MEM8_SPACE];
+        ipoctal->mem8_space =
+                devm_ioremap_nocache(&ipoctal->dev->dev,
+                                     region->start, 0x8000);
+        if (!addr) {
                 dev_err(&ipoctal->dev->dev,
-                        "Unable to map slot [%d:%d] MEM space!\n",
+                        "Unable to map slot [%d:%d] MEM8 space!\n",
                         bus_nr, slot);
-                goto out_unregister_int_space;
+                return -EADDRNOTAVAIL;
         }
 
-        /* Save the virtual address to access the registers easily */
-        chan_regs =
-                (union scc2698_channel __iomem *) ipoctal->dev->io_space.address;
-        block_regs =
-                (union scc2698_block __iomem *) ipoctal->dev->io_space.address;
 
         /* Disable RX and TX before touching anything */
         for (i = 0; i < NR_CHANNELS ; i++) {
@@ -389,17 +360,15 @@ static int ipoctal_inst_slot(struct ipoctal *ipoctal, unsigned int bus_nr,
         ipoctal->dev->bus->ops->request_irq(ipoctal->dev,
                                        ipoctal_irq_handler, ipoctal);
         /* Dummy write */
-        iowrite8(1, ipoctal->dev->mem_space.address + 1);
+        iowrite8(1, ipoctal->mem8_space + 1);
 
         /* Register the TTY device */
 
         /* Each IP-OCTAL channel is a TTY port */
         tty = alloc_tty_driver(NR_CHANNELS);
 
-        if (!tty) {
-                res = -ENOMEM;
-                goto out_unregister_slot_unmap;
-        }
+        if (!tty)
+                return -ENOMEM;
 
         /* Fill struct tty_driver with ipoctal data */
         tty->owner = THIS_MODULE;
@@ -422,7 +391,7 @@ static int ipoctal_inst_slot(struct ipoctal *ipoctal, unsigned int bus_nr,
         if (res) {
                 dev_err(&ipoctal->dev->dev, "Can't register tty driver.\n");
                 put_tty_driver(tty);
-                goto out_unregister_slot_unmap;
+                return res;
         }
 
         /* Save struct tty_driver for use it when uninstalling the device */
@@ -458,16 +427,6 @@ static int ipoctal_inst_slot(struct ipoctal *ipoctal, unsigned int bus_nr,
         }
 
         return 0;
-
-out_unregister_slot_unmap:
-        ipoctal->dev->bus->ops->unmap_space(ipoctal->dev, IPACK_ID_SPACE);
-out_unregister_int_space:
-        ipoctal->dev->bus->ops->unmap_space(ipoctal->dev, IPACK_INT_SPACE);
-out_unregister_io_space:
-        ipoctal->dev->bus->ops->unmap_space(ipoctal->dev, IPACK_IO_SPACE);
-out_unregister_id_space:
-        ipoctal->dev->bus->ops->unmap_space(ipoctal->dev, IPACK_MEM_SPACE);
-        return res;
 }
 
 static inline int ipoctal_copy_write_buffer(struct ipoctal_channel *channel,
@@ -719,7 +678,7 @@ static int ipoctal_probe(struct ipack_device *dev)
                 return -ENOMEM;
 
         ipoctal->dev = dev;
-        res = ipoctal_inst_slot(ipoctal, dev->bus_nr, dev->slot);
+        res = ipoctal_inst_slot(ipoctal, dev->bus->bus_nr, dev->slot);
         if (res)
                 goto out_uninst;
 
@@ -745,10 +704,6 @@ static void __ipoctal_remove(struct ipoctal *ipoctal)
 
         tty_unregister_driver(ipoctal->tty_drv);
         put_tty_driver(ipoctal->tty_drv);
-        ipoctal->dev->bus->ops->unmap_space(ipoctal->dev, IPACK_MEM_SPACE);
-        ipoctal->dev->bus->ops->unmap_space(ipoctal->dev, IPACK_INT_SPACE);
-        ipoctal->dev->bus->ops->unmap_space(ipoctal->dev, IPACK_IO_SPACE);
-        ipoctal->dev->bus->ops->unmap_space(ipoctal->dev, IPACK_ID_SPACE);
         kfree(ipoctal);
 }
 
diff --git a/drivers/staging/ipack/devices/ipoctal.h b/drivers/ipack/devices/ipoctal.h
index c5b4ed46516f..28f1c4233154 100644
--- a/drivers/staging/ipack/devices/ipoctal.h
+++ b/drivers/ipack/devices/ipoctal.h
@@ -2,9 +2,10 @@
  * ipoctal.h
  *
  * driver for the IPOCTAL boards
- * Copyright (c) 2009 Nicolas Serafini, EIC2 SA
- * Copyright (c) 2010,2011 Samuel Iglesias Gonsalvez <siglesia@cern.ch>, CERN
- * Copyright (c) 2012 Samuel Iglesias Gonsalvez <siglesias@igalia.com>, Igalia
+
+ * Copyright (C) 2009-2012 CERN (www.cern.ch)
+ * Author: Nicolas Serafini, EIC2 SA
+ * Author: Samuel Iglesias Gonsalvez <siglesias@igalia.com>
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
diff --git a/drivers/staging/ipack/devices/scc2698.h b/drivers/ipack/devices/scc2698.h
index 96e8d8c30e14..2ad6acd513fa 100644
--- a/drivers/staging/ipack/devices/scc2698.h
+++ b/drivers/ipack/devices/scc2698.h
@@ -2,9 +2,10 @@
  * scc2698.h
  *
  * driver for the IPOCTAL boards
- * Copyright (c) 2009 Nicolas Serafini, EIC2 SA
- * Copyright (c) 2010,2011 Samuel Iglesias Gonsalvez <siglesia@cern.ch>, CERN
- * Copyright (c) 2012 Samuel Iglesias Gonsalvez <siglesias@igalia.com>, Igalia
+ *
+ * Copyright (C) 2009-2012 CERN (www.cern.ch)
+ * Author: Nicolas Serafini, EIC2 SA
+ * Author: Samuel Iglesias Gonsalvez <siglesias@igalia.com>
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
diff --git a/drivers/staging/ipack/ipack.c b/drivers/ipack/ipack.c
index d1e0651592a2..7ec6b208b1cb 100644
--- a/drivers/staging/ipack/ipack.c
+++ b/drivers/ipack/ipack.c
@@ -1,8 +1,8 @@
 /*
  * Industry-pack bus support functions.
  *
- * (C) 2011 Samuel Iglesias Gonsalvez <siglesia@cern.ch>, CERN
- * (C) 2012 Samuel Iglesias Gonsalvez <siglesias@igalia.com>, Igalia
+ * Copyright (C) 2011-2012 CERN (www.cern.ch)
+ * Author: Samuel Iglesias Gonsalvez <siglesias@igalia.com>
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
@@ -12,8 +12,8 @@
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/idr.h>
-#include <asm/io.h>
-#include "ipack.h"
+#include <linux/io.h>
+#include <linux/ipack.h>
 
 #define to_ipack_dev(device) container_of(device, struct ipack_device, dev)
 #define to_ipack_driver(drv) container_of(drv, struct ipack_driver, driver)
@@ -24,7 +24,7 @@ static void ipack_device_release(struct device *dev)
 {
         struct ipack_device *device = to_ipack_dev(dev);
         kfree(device->id);
-        kfree(device);
+        device->release(device);
 }
 
 static inline const struct ipack_device_id *
@@ -85,8 +85,6 @@ static int ipack_bus_remove(struct device *device)
         return 0;
 }
 
-#ifdef CONFIG_HOTPLUG
-
 static int ipack_uevent(struct device *dev, struct kobj_uevent_env *env)
 {
         struct ipack_device *idev;
@@ -104,12 +102,6 @@ static int ipack_uevent(struct device *dev, struct kobj_uevent_env *env)
         return 0;
 }
 
-#else /* !CONFIG_HOTPLUG */
-
-#define ipack_uevent NULL
-
-#endif /* !CONFIG_HOTPLUG */
-
 #define ipack_device_attr(field, format_string)                         \
 static ssize_t                                                          \
 field##_show(struct device *dev, struct device_attribute *attr,         \
@@ -234,7 +226,7 @@ static int ipack_unregister_bus_member(struct device *dev, void *data)
         struct ipack_device *idev = to_ipack_dev(dev);
         struct ipack_bus_device *bus = data;
 
-        if (idev->bus_nr == bus->bus_nr)
+        if (idev->bus == bus)
                 ipack_device_unregister(idev);
 
         return 1;
@@ -242,7 +234,8 @@ static int ipack_unregister_bus_member(struct device *dev, void *data)
 
 int ipack_bus_unregister(struct ipack_bus_device *bus)
 {
-        bus_for_each_dev(&ipack_bus_type, NULL, bus, ipack_unregister_bus_member);
+        bus_for_each_dev(&ipack_bus_type, NULL, bus,
+                ipack_unregister_bus_member);
         ida_simple_remove(&ipack_ida, bus->bus_nr);
         kfree(bus);
         return 0;
@@ -351,12 +344,12 @@ static int ipack_device_read_id(struct ipack_device *dev)
         int i;
         int ret = 0;
 
-        ret = dev->bus->ops->map_space(dev, 0, IPACK_ID_SPACE);
-        if (ret) {
+        idmem = ioremap(dev->region[IPACK_ID_SPACE].start,
+                        dev->region[IPACK_ID_SPACE].size);
+        if (!idmem) {
                 dev_err(&dev->dev, "error mapping memory\n");
-                return ret;
+                return -ENOMEM;
         }
-        idmem = dev->id_space.address;
 
         /* Determine ID PROM Data Format.  If we find the ids "IPAC" or "IPAH"
          * we are dealing with a IndustryPack  format 1 device.  If we detect
@@ -421,57 +414,44 @@ static int ipack_device_read_id(struct ipack_device *dev)
         }
 
 out:
-        dev->bus->ops->unmap_space(dev, IPACK_ID_SPACE);
+        iounmap(idmem);
 
         return ret;
 }
 
-struct ipack_device *ipack_device_register(struct ipack_bus_device *bus,
-                                           int slot)
+int ipack_device_register(struct ipack_device *dev)
 {
         int ret;
-        struct ipack_device *dev;
-
-        dev = kzalloc(sizeof(struct ipack_device), GFP_KERNEL);
-        if (!dev)
-                return NULL;
 
         dev->dev.bus = &ipack_bus_type;
         dev->dev.release = ipack_device_release;
-        dev->dev.parent = bus->parent;
-        dev->slot = slot;
-        dev->bus_nr = bus->bus_nr;
-        dev->bus = bus;
+        dev->dev.parent = dev->bus->parent;
         dev_set_name(&dev->dev,
-                     "ipack-dev.%u.%u", dev->bus_nr, dev->slot);
+                     "ipack-dev.%u.%u", dev->bus->bus_nr, dev->slot);
 
-        if (bus->ops->set_clockrate(dev, 8))
+        if (dev->bus->ops->set_clockrate(dev, 8))
                 dev_warn(&dev->dev, "failed to switch to 8 MHz operation for reading of device ID.\n");
-        if (bus->ops->reset_timeout(dev))
+        if (dev->bus->ops->reset_timeout(dev))
                 dev_warn(&dev->dev, "failed to reset potential timeout.");
 
         ret = ipack_device_read_id(dev);
         if (ret < 0) {
                 dev_err(&dev->dev, "error reading device id section.\n");
-                kfree(dev);
-                return NULL;
+                return ret;
         }
 
         /* if the device supports 32 MHz operation, use it. */
         if (dev->speed_32mhz) {
-                ret = bus->ops->set_clockrate(dev, 32);
+                ret = dev->bus->ops->set_clockrate(dev, 32);
                 if (ret < 0)
                         dev_err(&dev->dev, "failed to switch to 32 MHz operation.\n");
         }
 
         ret = device_register(&dev->dev);
-        if (ret < 0) {
+        if (ret < 0)
                 kfree(dev->id);
-                kfree(dev);
-                return NULL;
-        }
 
-        return dev;
+        return ret;
 }
 EXPORT_SYMBOL_GPL(ipack_device_register);
 
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index d805eef11915..943ca607200c 100644
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -52,8 +52,6 @@ source "drivers/staging/rtl8192e/Kconfig"
 
 source "drivers/staging/rtl8712/Kconfig"
 
-source "drivers/staging/rts_pstor/Kconfig"
-
 source "drivers/staging/rts5139/Kconfig"
 
 source "drivers/staging/frontier/Kconfig"
@@ -120,14 +118,10 @@ source "drivers/staging/omapdrm/Kconfig"
 
 source "drivers/staging/android/Kconfig"
 
-source "drivers/staging/telephony/Kconfig"
-
 source "drivers/staging/ozwpan/Kconfig"
 
 source "drivers/staging/ccg/Kconfig"
 
-source "drivers/staging/ipack/Kconfig"
-
 source "drivers/staging/gdm72xx/Kconfig"
 
 source "drivers/staging/csr/Kconfig"
@@ -144,4 +138,6 @@ source "drivers/staging/imx-drm/Kconfig"
 
 source "drivers/staging/dgrp/Kconfig"
 
+source "drivers/staging/fwserial/Kconfig"
+
 endif # STAGING
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index 76e2ebd596ff..20c764d7ab33 100644
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -19,7 +19,6 @@ obj-$(CONFIG_R8187SE)		+= rtl8187se/
 obj-$(CONFIG_RTL8192U)          += rtl8192u/
 obj-$(CONFIG_RTL8192E)          += rtl8192e/
 obj-$(CONFIG_R8712U)            += rtl8712/
-obj-$(CONFIG_RTS_PSTOR)         += rts_pstor/
 obj-$(CONFIG_RTS5139)           += rts5139/
 obj-$(CONFIG_TRANZPORT)         += frontier/
 obj-$(CONFIG_IDE_PHISON)        += phison/
@@ -29,7 +28,6 @@ obj-$(CONFIG_OCTEON_ETHERNET)	+= octeon/
 obj-$(CONFIG_VT6655)            += vt6655/
 obj-$(CONFIG_VT6656)            += vt6656/
 obj-$(CONFIG_VME_BUS)           += vme/
-obj-$(CONFIG_IPACK_BUS)         += ipack/
 obj-$(CONFIG_DX_SEP)            += sep/
 obj-$(CONFIG_IIO)               += iio/
 obj-$(CONFIG_ZRAM)              += zram/
@@ -53,7 +51,6 @@ obj-$(CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4)	+= ste_rmi4/
 obj-$(CONFIG_MFD_NVEC)          += nvec/
 obj-$(CONFIG_DRM_OMAP)          += omapdrm/
 obj-$(CONFIG_ANDROID)           += android/
-obj-$(CONFIG_PHONE)             += telephony/
 obj-$(CONFIG_USB_WPAN_HCD)      += ozwpan/
 obj-$(CONFIG_USB_G_CCG)         += ccg/
 obj-$(CONFIG_WIMAX_GDM72XX)     += gdm72xx/
@@ -64,3 +61,4 @@ obj-$(CONFIG_NET_VENDOR_SILICOM)	+= silicom/
 obj-$(CONFIG_CED1401)           += ced1401/
 obj-$(CONFIG_DRM_IMX)           += imx-drm/
 obj-$(CONFIG_DGRP)              += dgrp/
+obj-$(CONFIG_FIREWIRE_SERIAL)   += fwserial/
diff --git a/drivers/staging/android/Makefile b/drivers/staging/android/Makefile
index e16fcd51716e..b35a631734d6 100644
--- a/drivers/staging/android/Makefile
+++ b/drivers/staging/android/Makefile
@@ -1,3 +1,5 @@
+ccflags-y += -I$(src)                   # needed for trace events
+
 obj-$(CONFIG_ANDROID_BINDER_IPC)        += binder.o
 obj-$(CONFIG_ASHMEM)                    += ashmem.o
 obj-$(CONFIG_ANDROID_LOGGER)            += logger.o
diff --git a/drivers/staging/android/binder.c b/drivers/staging/android/binder.c
index 5d4610babd8a..4a36e9ab8cf7 100644
--- a/drivers/staging/android/binder.c
+++ b/drivers/staging/android/binder.c
@@ -15,6 +15,8 @@
  *
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <asm/cacheflush.h>
 #include <linux/fdtable.h>
 #include <linux/file.h>
@@ -35,8 +37,9 @@
 #include <linux/slab.h>
 
 #include "binder.h"
+#include "binder_trace.h"
 
-static DEFINE_MUTEX(binder_lock);
+static DEFINE_MUTEX(binder_main_lock);
 static DEFINE_MUTEX(binder_deferred_lock);
 static DEFINE_MUTEX(binder_mmap_lock);
 
@@ -411,6 +414,19 @@ static long task_close_fd(struct binder_proc *proc, unsigned int fd)
         return retval;
 }
 
+static inline void binder_lock(const char *tag)
+{
+        trace_binder_lock(tag);
+        mutex_lock(&binder_main_lock);
+        trace_binder_locked(tag);
+}
+
+static inline void binder_unlock(const char *tag)
+{
+        trace_binder_unlock(tag);
+        mutex_unlock(&binder_main_lock);
+}
+
 static void binder_set_nice(long nice)
 {
         long min_nice;
@@ -420,12 +436,12 @@ static void binder_set_nice(long nice)
         }
         min_nice = 20 - current->signal->rlim[RLIMIT_NICE].rlim_cur;
         binder_debug(BINDER_DEBUG_PRIORITY_CAP,
-                     "binder: %d: nice value %ld not allowed use "
-                     "%ld instead\n", current->pid, nice, min_nice);
+                     "%d: nice value %ld not allowed use %ld instead\n",
+                      current->pid, nice, min_nice);
         set_user_nice(current, min_nice);
         if (min_nice < 20)
                 return;
-        binder_user_error("binder: %d RLIMIT_NICE not set\n", current->pid);
+        binder_user_error("%d RLIMIT_NICE not set\n", current->pid);
 }
 
 static size_t binder_buffer_size(struct binder_proc *proc,
@@ -452,8 +468,8 @@ static void binder_insert_free_buffer(struct binder_proc *proc,
         new_buffer_size = binder_buffer_size(proc, new_buffer);
 
         binder_debug(BINDER_DEBUG_BUFFER_ALLOC,
-                     "binder: %d: add free buffer, size %zd, "
-                     "at %p\n", proc->pid, new_buffer_size, new_buffer);
+                     "%d: add free buffer, size %zd, at %p\n",
+                      proc->pid, new_buffer_size, new_buffer);
 
         while (*p) {
                 parent = *p;
@@ -531,12 +547,14 @@ static int binder_update_page_range(struct binder_proc *proc, int allocate,
         struct mm_struct *mm;
 
         binder_debug(BINDER_DEBUG_BUFFER_ALLOC,
-                     "binder: %d: %s pages %p-%p\n", proc->pid,
+                     "%d: %s pages %p-%p\n", proc->pid,
                      allocate ? "allocate" : "free", start, end);
 
         if (end <= start)
                 return 0;
 
+        trace_binder_update_page_range(proc, allocate, start, end);
+
         if (vma)
                 mm = NULL;
         else
@@ -546,7 +564,7 @@ static int binder_update_page_range(struct binder_proc *proc, int allocate,
                 down_write(&mm->mmap_sem);
                 vma = proc->vma;
                 if (vma && mm != proc->vma_vm_mm) {
-                        pr_err("binder: %d: vma mm and task mm mismatch\n",
+                        pr_err("%d: vma mm and task mm mismatch\n",
                                 proc->pid);
                         vma = NULL;
                 }
@@ -556,8 +574,8 @@ static int binder_update_page_range(struct binder_proc *proc, int allocate,
                 goto free_range;
 
         if (vma == NULL) {
-                pr_err("binder: %d: binder_alloc_buf failed to "
-                       "map pages in userspace, no vma\n", proc->pid);
+                pr_err("%d: binder_alloc_buf failed to map pages in userspace, no vma\n",
+                        proc->pid);
                 goto err_no_vma;
         }
 
@@ -569,8 +587,8 @@ static int binder_update_page_range(struct binder_proc *proc, int allocate,
                 BUG_ON(*page);
                 *page = alloc_page(GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO);
                 if (*page == NULL) {
-                        pr_err("binder: %d: binder_alloc_buf failed "
-                               "for page at %p\n", proc->pid, page_addr);
+                        pr_err("%d: binder_alloc_buf failed for page at %p\n",
+                                proc->pid, page_addr);
                         goto err_alloc_page_failed;
                 }
                 tmp_area.addr = page_addr;
@@ -578,8 +596,7 @@ static int binder_update_page_range(struct binder_proc *proc, int allocate,
                 page_array_ptr = page;
                 ret = map_vm_area(&tmp_area, PAGE_KERNEL, &page_array_ptr);
                 if (ret) {
-                        pr_err("binder: %d: binder_alloc_buf failed "
-                               "to map page at %p in kernel\n",
+                        pr_err("%d: binder_alloc_buf failed to map page at %p in kernel\n",
                                proc->pid, page_addr);
                         goto err_map_kernel_failed;
                 }
@@ -587,8 +604,7 @@ static int binder_update_page_range(struct binder_proc *proc, int allocate,
                         (uintptr_t)page_addr + proc->user_buffer_offset;
                 ret = vm_insert_page(vma, user_page_addr, page[0]);
                 if (ret) {
-                        pr_err("binder: %d: binder_alloc_buf failed "
-                               "to map page at %lx in userspace\n",
+                        pr_err("%d: binder_alloc_buf failed to map page at %lx in userspace\n",
                                proc->pid, user_page_addr);
                         goto err_vm_insert_page_failed;
                 }
@@ -636,7 +652,7 @@ static struct binder_buffer *binder_alloc_buf(struct binder_proc *proc,
         size_t size;
 
         if (proc->vma == NULL) {
-                pr_err("binder: %d: binder_alloc_buf, no vma\n",
+                pr_err("%d: binder_alloc_buf, no vma\n",
                        proc->pid);
                 return NULL;
         }
@@ -645,16 +661,16 @@ static struct binder_buffer *binder_alloc_buf(struct binder_proc *proc,
                 ALIGN(offsets_size, sizeof(void *));
 
         if (size < data_size || size < offsets_size) {
-                binder_user_error("binder: %d: got transaction with invalid "
-                        "size %zd-%zd\n", proc->pid, data_size, offsets_size);
+                binder_user_error("%d: got transaction with invalid size %zd-%zd\n",
+                                proc->pid, data_size, offsets_size);
                 return NULL;
         }
 
         if (is_async &&
             proc->free_async_space < size + sizeof(struct binder_buffer)) {
                 binder_debug(BINDER_DEBUG_BUFFER_ALLOC,
-                             "binder: %d: binder_alloc_buf size %zd"
-                             "failed, no async space left\n", proc->pid, size);
+                             "%d: binder_alloc_buf size %zd failed, no async space left\n",
+                              proc->pid, size);
                 return NULL;
         }
 
@@ -674,8 +690,8 @@ static struct binder_buffer *binder_alloc_buf(struct binder_proc *proc,
                 }
         }
         if (best_fit == NULL) {
-                pr_err("binder: %d: binder_alloc_buf size %zd failed, "
-                       "no address space\n", proc->pid, size);
+                pr_err("%d: binder_alloc_buf size %zd failed, no address space\n",
+                        proc->pid, size);
                 return NULL;
         }
         if (n == NULL) {
@@ -684,8 +700,8 @@ static struct binder_buffer *binder_alloc_buf(struct binder_proc *proc,
         }
 
         binder_debug(BINDER_DEBUG_BUFFER_ALLOC,
-                     "binder: %d: binder_alloc_buf size %zd got buff"
-                     "er %p size %zd\n", proc->pid, size, buffer, buffer_size);
+                     "%d: binder_alloc_buf size %zd got buffer %p size %zd\n",
+                      proc->pid, size, buffer, buffer_size);
 
         has_page_addr =
                 (void *)(((uintptr_t)buffer->data + buffer_size) & PAGE_MASK);
@@ -713,17 +729,16 @@ static struct binder_buffer *binder_alloc_buf(struct binder_proc *proc,
                 binder_insert_free_buffer(proc, new_buffer);
         }
         binder_debug(BINDER_DEBUG_BUFFER_ALLOC,
-                     "binder: %d: binder_alloc_buf size %zd got "
-                     "%p\n", proc->pid, size, buffer);
+                     "%d: binder_alloc_buf size %zd got %p\n",
+                      proc->pid, size, buffer);
         buffer->data_size = data_size;
         buffer->offsets_size = offsets_size;
         buffer->async_transaction = is_async;
         if (is_async) {
                 proc->free_async_space -= size + sizeof(struct binder_buffer);
                 binder_debug(BINDER_DEBUG_BUFFER_ALLOC_ASYNC,
-                             "binder: %d: binder_alloc_buf size %zd "
-                             "async free %zd\n", proc->pid, size,
-                             proc->free_async_space);
+                             "%d: binder_alloc_buf size %zd async free %zd\n",
+                              proc->pid, size, proc->free_async_space);
         }
 
         return buffer;
@@ -754,8 +769,8 @@ static void binder_delete_free_buffer(struct binder_proc *proc,
                 if (buffer_end_page(prev) == buffer_end_page(buffer))
                         free_page_end = 0;
                 binder_debug(BINDER_DEBUG_BUFFER_ALLOC,
-                             "binder: %d: merge free, buffer %p "
-                             "share page with %p\n", proc->pid, buffer, prev);
+                             "%d: merge free, buffer %p share page with %p\n",
+                              proc->pid, buffer, prev);
         }
 
         if (!list_is_last(&buffer->entry, &proc->buffers)) {
@@ -767,16 +782,14 @@ static void binder_delete_free_buffer(struct binder_proc *proc,
                             buffer_start_page(buffer))
                                 free_page_start = 0;
                         binder_debug(BINDER_DEBUG_BUFFER_ALLOC,
-                                     "binder: %d: merge free, buffer"
-                                     " %p share page with %p\n", proc->pid,
-                                     buffer, prev);
+                                     "%d: merge free, buffer %p share page with %p\n",
+                                      proc->pid, buffer, prev);
                 }
         }
         list_del(&buffer->entry);
         if (free_page_start || free_page_end) {
                 binder_debug(BINDER_DEBUG_BUFFER_ALLOC,
-                             "binder: %d: merge free, buffer %p do "
-                             "not share page%s%s with with %p or %p\n",
+                             "%d: merge free, buffer %p do not share page%s%s with with %p or %p\n",
                              proc->pid, buffer, free_page_start ? "" : " end",
                              free_page_end ? "" : " start", prev, next);
                 binder_update_page_range(proc, 0, free_page_start ?
@@ -797,8 +810,8 @@ static void binder_free_buf(struct binder_proc *proc,
                 ALIGN(buffer->offsets_size, sizeof(void *));
 
         binder_debug(BINDER_DEBUG_BUFFER_ALLOC,
-                     "binder: %d: binder_free_buf %p size %zd buffer"
-                     "_size %zd\n", proc->pid, buffer, size, buffer_size);
+                     "%d: binder_free_buf %p size %zd buffer_size %zd\n",
+                      proc->pid, buffer, size, buffer_size);
 
         BUG_ON(buffer->free);
         BUG_ON(size > buffer_size);
@@ -810,9 +823,8 @@ static void binder_free_buf(struct binder_proc *proc,
                 proc->free_async_space += size + sizeof(struct binder_buffer);
 
                 binder_debug(BINDER_DEBUG_BUFFER_ALLOC_ASYNC,
-                             "binder: %d: binder_free_buf size %zd "
-                             "async free %zd\n", proc->pid, size,
-                             proc->free_async_space);
+                             "%d: binder_free_buf size %zd async free %zd\n",
+                              proc->pid, size, proc->free_async_space);
         }
 
         binder_update_page_range(proc, 0,
@@ -894,7 +906,7 @@ static struct binder_node *binder_new_node(struct binder_proc *proc,
         INIT_LIST_HEAD(&node->work.entry);
         INIT_LIST_HEAD(&node->async_todo);
         binder_debug(BINDER_DEBUG_INTERNAL_REFS,
-                     "binder: %d:%d node %d u%p c%p created\n",
+                     "%d:%d node %d u%p c%p created\n",
                      proc->pid, current->pid, node->debug_id,
                      node->ptr, node->cookie);
         return node;
@@ -909,8 +921,8 @@ static int binder_inc_node(struct binder_node *node, int strong, int internal,
                             node->internal_strong_refs == 0 &&
                             !(node == binder_context_mgr_node &&
                             node->has_strong_ref)) {
-                                pr_err("binder: invalid inc strong "
-                                        "node for %d\n", node->debug_id);
+                                pr_err("invalid inc strong node for %d\n",
+                                        node->debug_id);
                                 return -EINVAL;
                         }
                         node->internal_strong_refs++;
@@ -925,8 +937,8 @@ static int binder_inc_node(struct binder_node *node, int strong, int internal,
                         node->local_weak_refs++;
                 if (!node->has_weak_ref && list_empty(&node->work.entry)) {
                         if (target_list == NULL) {
-                                pr_err("binder: invalid inc weak node "
-                                        "for %d\n", node->debug_id);
+                                pr_err("invalid inc weak node for %d\n",
+                                        node->debug_id);
                                 return -EINVAL;
                         }
                         list_add_tail(&node->work.entry, target_list);
@@ -962,12 +974,12 @@ static int binder_dec_node(struct binder_node *node, int strong, int internal)
                         if (node->proc) {
                                 rb_erase(&node->rb_node, &node->proc->nodes);
                                 binder_debug(BINDER_DEBUG_INTERNAL_REFS,
-                                             "binder: refless node %d deleted\n",
+                                             "refless node %d deleted\n",
                                              node->debug_id);
                         } else {
                                 hlist_del(&node->dead_node);
                                 binder_debug(BINDER_DEBUG_INTERNAL_REFS,
-                                             "binder: dead node %d deleted\n",
+                                             "dead node %d deleted\n",
                                              node->debug_id);
                         }
                         kfree(node);
@@ -1053,14 +1065,13 @@ static struct binder_ref *binder_get_ref_for_node(struct binder_proc *proc,
                 hlist_add_head(&new_ref->node_entry, &node->refs);
 
                 binder_debug(BINDER_DEBUG_INTERNAL_REFS,
-                             "binder: %d new ref %d desc %d for "
-                             "node %d\n", proc->pid, new_ref->debug_id,
-                             new_ref->desc, node->debug_id);
+                             "%d new ref %d desc %d for node %d\n",
+                              proc->pid, new_ref->debug_id, new_ref->desc,
+                              node->debug_id);
         } else {
                 binder_debug(BINDER_DEBUG_INTERNAL_REFS,
-                             "binder: %d new ref %d desc %d for "
-                             "dead node\n", proc->pid, new_ref->debug_id,
-                              new_ref->desc);
+                             "%d new ref %d desc %d for dead node\n",
+                              proc->pid, new_ref->debug_id, new_ref->desc);
         }
         return new_ref;
 }
@@ -1068,9 +1079,9 @@ static struct binder_ref *binder_get_ref_for_node(struct binder_proc *proc,
 static void binder_delete_ref(struct binder_ref *ref)
 {
         binder_debug(BINDER_DEBUG_INTERNAL_REFS,
-                     "binder: %d delete ref %d desc %d for "
-                     "node %d\n", ref->proc->pid, ref->debug_id,
-                     ref->desc, ref->node->debug_id);
+                     "%d delete ref %d desc %d for node %d\n",
+                      ref->proc->pid, ref->debug_id, ref->desc,
+                      ref->node->debug_id);
 
         rb_erase(&ref->rb_node_desc, &ref->proc->refs_by_desc);
         rb_erase(&ref->rb_node_node, &ref->proc->refs_by_node);
@@ -1080,9 +1091,8 @@ static void binder_delete_ref(struct binder_ref *ref)
         binder_dec_node(ref->node, 0, 1);
         if (ref->death) {
                 binder_debug(BINDER_DEBUG_DEAD_BINDER,
-                             "binder: %d delete ref %d desc %d "
-                             "has death notification\n", ref->proc->pid,
-                             ref->debug_id, ref->desc);
+                             "%d delete ref %d desc %d has death notification\n",
+                              ref->proc->pid, ref->debug_id, ref->desc);
                 list_del(&ref->death->work.entry);
                 kfree(ref->death);
                 binder_stats_deleted(BINDER_STAT_DEATH);
@@ -1118,8 +1128,7 @@ static int binder_dec_ref(struct binder_ref *ref, int strong)
 {
         if (strong) {
                 if (ref->strong == 0) {
-                        binder_user_error("binder: %d invalid dec strong, "
-                                          "ref %d desc %d s %d w %d\n",
+                        binder_user_error("%d invalid dec strong, ref %d desc %d s %d w %d\n",
                                           ref->proc->pid, ref->debug_id,
                                           ref->desc, ref->strong, ref->weak);
                         return -EINVAL;
@@ -1133,8 +1142,7 @@ static int binder_dec_ref(struct binder_ref *ref, int strong)
                 }
         } else {
                 if (ref->weak == 0) {
-                        binder_user_error("binder: %d invalid dec weak, "
-                                          "ref %d desc %d s %d w %d\n",
+                        binder_user_error("%d invalid dec weak, ref %d desc %d s %d w %d\n",
                                           ref->proc->pid, ref->debug_id,
                                           ref->desc, ref->strong, ref->weak);
                         return -EINVAL;
@@ -1179,8 +1187,7 @@ static void binder_send_failed_reply(struct binder_transaction *t,
                         }
                         if (target_thread->return_error == BR_OK) {
                                 binder_debug(BINDER_DEBUG_FAILED_TRANSACTION,
-                                             "binder: send failed reply for "
-                                             "transaction %d to %d:%d\n",
+                                             "send failed reply for transaction %d to %d:%d\n",
                                               t->debug_id, target_thread->proc->pid,
                                               target_thread->pid);
 
@@ -1188,9 +1195,8 @@ static void binder_send_failed_reply(struct binder_transaction *t,
                                 target_thread->return_error = error_code;
                                 wake_up_interruptible(&target_thread->wait);
                         } else {
-                                pr_err("binder: reply failed, target "
-                                        "thread, %d:%d, has error code %d "
-                                        "already\n", target_thread->proc->pid,
+                                pr_err("reply failed, target thread, %d:%d, has error code %d already\n",
+                                        target_thread->proc->pid,
                                         target_thread->pid,
                                         target_thread->return_error);
                         }
@@ -1199,21 +1205,19 @@ static void binder_send_failed_reply(struct binder_transaction *t,
                         struct binder_transaction *next = t->from_parent;
 
                         binder_debug(BINDER_DEBUG_FAILED_TRANSACTION,
-                                     "binder: send failed reply "
-                                     "for transaction %d, target dead\n",
+                                     "send failed reply for transaction %d, target dead\n",
                                      t->debug_id);
 
                         binder_pop_transaction(target_thread, t);
                         if (next == NULL) {
                                 binder_debug(BINDER_DEBUG_DEAD_BINDER,
-                                             "binder: reply failed,"
-                                             " no target thread at root\n");
+                                             "reply failed, no target thread at root\n");
                                 return;
                         }
                         t = next;
                         binder_debug(BINDER_DEBUG_DEAD_BINDER,
-                                     "binder: reply failed, no target "
-                                     "thread -- retry %d\n", t->debug_id);
+                                     "reply failed, no target thread -- retry %d\n",
+                                      t->debug_id);
                 }
         }
 }
@@ -1226,7 +1230,7 @@ static void binder_transaction_buffer_release(struct binder_proc *proc,
         int debug_id = buffer->debug_id;
 
         binder_debug(BINDER_DEBUG_TRANSACTION,
-                     "binder: %d buffer release %d, size %zd-%zd, failed at %p\n",
+                     "%d buffer release %d, size %zd-%zd, failed at %p\n",
                      proc->pid, buffer->debug_id,
                      buffer->data_size, buffer->offsets_size, failed_at);
 
@@ -1243,9 +1247,8 @@ static void binder_transaction_buffer_release(struct binder_proc *proc,
                 if (*offp > buffer->data_size - sizeof(*fp) ||
                     buffer->data_size < sizeof(*fp) ||
                     !IS_ALIGNED(*offp, sizeof(void *))) {
-                        pr_err("binder: transaction release %d bad"
-                                        "offset %zd, size %zd\n", debug_id,
-                                        *offp, buffer->data_size);
+                        pr_err("transaction release %d bad offset %zd, size %zd\n",
+                         debug_id, *offp, buffer->data_size);
                         continue;
                 }
                 fp = (struct flat_binder_object *)(buffer->data + *offp);
@@ -1254,8 +1257,8 @@ static void binder_transaction_buffer_release(struct binder_proc *proc,
                 case BINDER_TYPE_WEAK_BINDER: {
                         struct binder_node *node = binder_get_node(proc, fp->binder);
                         if (node == NULL) {
-                                pr_err("binder: transaction release %d"
-                                       " bad node %p\n", debug_id, fp->binder);
+                                pr_err("transaction release %d bad node %p\n",
+                                        debug_id, fp->binder);
                                 break;
                         }
                         binder_debug(BINDER_DEBUG_TRANSACTION,
@@ -1267,9 +1270,8 @@ static void binder_transaction_buffer_release(struct binder_proc *proc,
                 case BINDER_TYPE_WEAK_HANDLE: {
                         struct binder_ref *ref = binder_get_ref(proc, fp->handle);
                         if (ref == NULL) {
-                                pr_err("binder: transaction release %d"
-                                       " bad handle %ld\n", debug_id,
-                                       fp->handle);
+                                pr_err("transaction release %d bad handle %ld\n",
+                                 debug_id, fp->handle);
                                 break;
                         }
                         binder_debug(BINDER_DEBUG_TRANSACTION,
@@ -1286,8 +1288,8 @@ static void binder_transaction_buffer_release(struct binder_proc *proc,
                         break;
 
                 default:
-                        pr_err("binder: transaction release %d bad "
-                               "object type %lx\n", debug_id, fp->type);
+                        pr_err("transaction release %d bad object type %lx\n",
+                                debug_id, fp->type);
                         break;
                 }
         }
@@ -1320,17 +1322,14 @@ static void binder_transaction(struct binder_proc *proc,
         if (reply) {
                 in_reply_to = thread->transaction_stack;
                 if (in_reply_to == NULL) {
-                        binder_user_error("binder: %d:%d got reply transaction "
-                                          "with no transaction stack\n",
+                        binder_user_error("%d:%d got reply transaction with no transaction stack\n",
                                           proc->pid, thread->pid);
                         return_error = BR_FAILED_REPLY;
                         goto err_empty_call_stack;
                 }
                 binder_set_nice(in_reply_to->saved_priority);
                 if (in_reply_to->to_thread != thread) {
-                        binder_user_error("binder: %d:%d got reply transaction "
-                                "with bad transaction stack,"
-                                " transaction %d has target %d:%d\n",
+                        binder_user_error("%d:%d got reply transaction with bad transaction stack, transaction %d has target %d:%d\n",
                                 proc->pid, thread->pid, in_reply_to->debug_id,
                                 in_reply_to->to_proc ?
                                 in_reply_to->to_proc->pid : 0,
@@ -1347,9 +1346,7 @@ static void binder_transaction(struct binder_proc *proc,
                         goto err_dead_binder;
                 }
                 if (target_thread->transaction_stack != in_reply_to) {
-                        binder_user_error("binder: %d:%d got reply transaction "
-                                "with bad target transaction stack %d, "
-                                "expected %d\n",
+                        binder_user_error("%d:%d got reply transaction with bad target transaction stack %d, expected %d\n",
                                 proc->pid, thread->pid,
                                 target_thread->transaction_stack ?
                                 target_thread->transaction_stack->debug_id : 0,
@@ -1365,8 +1362,7 @@ static void binder_transaction(struct binder_proc *proc,
                         struct binder_ref *ref;
                         ref = binder_get_ref(proc, tr->target.handle);
                         if (ref == NULL) {
-                                binder_user_error("binder: %d:%d got "
-                                        "transaction to invalid handle\n",
+                                binder_user_error("%d:%d got transaction to invalid handle\n",
                                         proc->pid, thread->pid);
                                 return_error = BR_FAILED_REPLY;
                                 goto err_invalid_target_handle;
@@ -1389,9 +1385,7 @@ static void binder_transaction(struct binder_proc *proc,
                         struct binder_transaction *tmp;
                         tmp = thread->transaction_stack;
                         if (tmp->to_thread != thread) {
-                                binder_user_error("binder: %d:%d got new "
-                                        "transaction with bad transaction stack"
-                                        ", transaction %d has target %d:%d\n",
+                                binder_user_error("%d:%d got new transaction with bad transaction stack, transaction %d has target %d:%d\n",
                                         proc->pid, thread->pid, tmp->debug_id,
                                         tmp->to_proc ? tmp->to_proc->pid : 0,
                                         tmp->to_thread ?
@@ -1436,16 +1430,14 @@ static void binder_transaction(struct binder_proc *proc,
 
         if (reply)
                 binder_debug(BINDER_DEBUG_TRANSACTION,
-                             "binder: %d:%d BC_REPLY %d -> %d:%d, "
-                             "data %p-%p size %zd-%zd\n",
+                             "%d:%d BC_REPLY %d -> %d:%d, data %p-%p size %zd-%zd\n",
                              proc->pid, thread->pid, t->debug_id,
                              target_proc->pid, target_thread->pid,
                              tr->data.ptr.buffer, tr->data.ptr.offsets,
                              tr->data_size, tr->offsets_size);
         else
                 binder_debug(BINDER_DEBUG_TRANSACTION,
-                             "binder: %d:%d BC_TRANSACTION %d -> "
-                             "%d - node %d, data %p-%p size %zd-%zd\n",
+                             "%d:%d BC_TRANSACTION %d -> %d - node %d, data %p-%p size %zd-%zd\n",
                              proc->pid, thread->pid, t->debug_id,
                              target_proc->pid, target_node->debug_id,
                              tr->data.ptr.buffer, tr->data.ptr.offsets,
@@ -1461,6 +1453,9 @@ static void binder_transaction(struct binder_proc *proc,
         t->code = tr->code;
         t->flags = tr->flags;
         t->priority = task_nice(current);
+
+        trace_binder_transaction(reply, t, target_node);
+
         t->buffer = binder_alloc_buf(target_proc, tr->data_size,
                 tr->offsets_size, !reply && (t->flags & TF_ONE_WAY));
         if (t->buffer == NULL) {
@@ -1471,27 +1466,27 @@ static void binder_transaction(struct binder_proc *proc,
         t->buffer->debug_id = t->debug_id;
         t->buffer->transaction = t;
         t->buffer->target_node = target_node;
+        trace_binder_transaction_alloc_buf(t->buffer);
         if (target_node)
                 binder_inc_node(target_node, 1, 0, NULL);
 
         offp = (size_t *)(t->buffer->data + ALIGN(tr->data_size, sizeof(void *)));
 
         if (copy_from_user(t->buffer->data, tr->data.ptr.buffer, tr->data_size)) {
-                binder_user_error("binder: %d:%d got transaction with invalid "
-                        "data ptr\n", proc->pid, thread->pid);
+                binder_user_error("%d:%d got transaction with invalid data ptr\n",
+                                proc->pid, thread->pid);
                 return_error = BR_FAILED_REPLY;
                 goto err_copy_data_failed;
         }
         if (copy_from_user(offp, tr->data.ptr.offsets, tr->offsets_size)) {
-                binder_user_error("binder: %d:%d got transaction with invalid "
-                        "offsets ptr\n", proc->pid, thread->pid);
+                binder_user_error("%d:%d got transaction with invalid offsets ptr\n",
+                                proc->pid, thread->pid);
                 return_error = BR_FAILED_REPLY;
                 goto err_copy_data_failed;
         }
         if (!IS_ALIGNED(tr->offsets_size, sizeof(size_t))) {
-                binder_user_error("binder: %d:%d got transaction with "
-                        "invalid offsets size, %zd\n",
-                        proc->pid, thread->pid, tr->offsets_size);
+                binder_user_error("%d:%d got transaction with invalid offsets size, %zd\n",
+                                proc->pid, thread->pid, tr->offsets_size);
                 return_error = BR_FAILED_REPLY;
                 goto err_bad_offset;
         }
@@ -1501,9 +1496,8 @@ static void binder_transaction(struct binder_proc *proc,
                 if (*offp > t->buffer->data_size - sizeof(*fp) ||
                     t->buffer->data_size < sizeof(*fp) ||
                     !IS_ALIGNED(*offp, sizeof(void *))) {
-                        binder_user_error("binder: %d:%d got transaction with "
-                                "invalid offset, %zd\n",
-                                proc->pid, thread->pid, *offp);
+                        binder_user_error("%d:%d got transaction with invalid offset, %zd\n",
+                                        proc->pid, thread->pid, *offp);
                         return_error = BR_FAILED_REPLY;
                         goto err_bad_offset;
                 }
@@ -1523,8 +1517,7 @@ static void binder_transaction(struct binder_proc *proc,
                                 node->accept_fds = !!(fp->flags & FLAT_BINDER_FLAG_ACCEPTS_FDS);
                         }
                         if (fp->cookie != node->cookie) {
-                                binder_user_error("binder: %d:%d sending u%p "
-                                        "node %d, cookie mismatch %p != %p\n",
+                                binder_user_error("%d:%d sending u%p node %d, cookie mismatch %p != %p\n",
                                         proc->pid, thread->pid,
                                         fp->binder, node->debug_id,
                                         fp->cookie, node->cookie);
@@ -1543,6 +1536,7 @@ static void binder_transaction(struct binder_proc *proc,
                         binder_inc_ref(ref, fp->type == BINDER_TYPE_HANDLE,
                                        &thread->todo);
 
+                        trace_binder_transaction_node_to_ref(t, node, ref);
                         binder_debug(BINDER_DEBUG_TRANSACTION,
                                      "        node %d u%p -> ref %d desc %d\n",
                                      node->debug_id, node->ptr, ref->debug_id,
@@ -1552,10 +1546,9 @@ static void binder_transaction(struct binder_proc *proc,
                 case BINDER_TYPE_WEAK_HANDLE: {
                         struct binder_ref *ref = binder_get_ref(proc, fp->handle);
                         if (ref == NULL) {
-                                binder_user_error("binder: %d:%d got "
-                                        "transaction with invalid "
-                                        "handle, %ld\n", proc->pid,
-                                        thread->pid, fp->handle);
+                                binder_user_error("%d:%d got transaction with invalid handle, %ld\n",
+                                                proc->pid,
+                                                thread->pid, fp->handle);
                                 return_error = BR_FAILED_REPLY;
                                 goto err_binder_get_ref_failed;
                         }
@@ -1567,6 +1560,7 @@ static void binder_transaction(struct binder_proc *proc,
                                 fp->binder = ref->node->ptr;
                                 fp->cookie = ref->node->cookie;
                                 binder_inc_node(ref->node, fp->type == BINDER_TYPE_BINDER, 0, NULL);
+                                trace_binder_transaction_ref_to_node(t, ref);
                                 binder_debug(BINDER_DEBUG_TRANSACTION,
                                              "        ref %d desc %d -> node %d u%p\n",
                                              ref->debug_id, ref->desc, ref->node->debug_id,
@@ -1580,6 +1574,8 @@ static void binder_transaction(struct binder_proc *proc,
                                 }
                                 fp->handle = new_ref->desc;
                                 binder_inc_ref(new_ref, fp->type == BINDER_TYPE_HANDLE, NULL);
+                                trace_binder_transaction_ref_to_ref(t, ref,
+                                                                    new_ref);
                                 binder_debug(BINDER_DEBUG_TRANSACTION,
                                              "        ref %d desc %d -> ref %d desc %d (node %d)\n",
                                              ref->debug_id, ref->desc, new_ref->debug_id,
@@ -1593,13 +1589,13 @@ static void binder_transaction(struct binder_proc *proc,
 
                         if (reply) {
                                 if (!(in_reply_to->flags & TF_ACCEPT_FDS)) {
-                                        binder_user_error("binder: %d:%d got reply with fd, %ld, but target does not allow fds\n",
+                                        binder_user_error("%d:%d got reply with fd, %ld, but target does not allow fds\n",
                                                 proc->pid, thread->pid, fp->handle);
                                         return_error = BR_FAILED_REPLY;
                                         goto err_fd_not_allowed;
                                 }
                         } else if (!target_node->accept_fds) {
-                                binder_user_error("binder: %d:%d got transaction with fd, %ld, but target does not allow fds\n",
+                                binder_user_error("%d:%d got transaction with fd, %ld, but target does not allow fds\n",
                                         proc->pid, thread->pid, fp->handle);
                                 return_error = BR_FAILED_REPLY;
                                 goto err_fd_not_allowed;
@@ -1607,7 +1603,7 @@ static void binder_transaction(struct binder_proc *proc,
 
                         file = fget(fp->handle);
                         if (file == NULL) {
-                                binder_user_error("binder: %d:%d got transaction with invalid fd, %ld\n",
+                                binder_user_error("%d:%d got transaction with invalid fd, %ld\n",
                                         proc->pid, thread->pid, fp->handle);
                                 return_error = BR_FAILED_REPLY;
                                 goto err_fget_failed;
@@ -1619,6 +1615,7 @@ static void binder_transaction(struct binder_proc *proc,
                                 goto err_get_unused_fd_failed;
                         }
                         task_fd_install(target_proc, target_fd, file);
+                        trace_binder_transaction_fd(t, fp->handle, target_fd);
                         binder_debug(BINDER_DEBUG_TRANSACTION,
                                      "        fd %ld -> %d\n", fp->handle, target_fd);
                         /* TODO: fput? */
@@ -1626,8 +1623,7 @@ static void binder_transaction(struct binder_proc *proc,
                 } break;
 
                 default:
-                        binder_user_error("binder: %d:%d got transactio"
-                                "n with invalid object type, %lx\n",
+                        binder_user_error("%d:%d got transaction with invalid object type, %lx\n",
                                 proc->pid, thread->pid, fp->type);
                         return_error = BR_FAILED_REPLY;
                         goto err_bad_object_type;
@@ -1667,6 +1663,7 @@ err_binder_new_node_failed:
 err_bad_object_type:
 err_bad_offset:
 err_copy_data_failed:
+        trace_binder_transaction_failed_buffer_release(t->buffer);
         binder_transaction_buffer_release(target_proc, t->buffer, offp);
         t->buffer->transaction = NULL;
         binder_free_buf(target_proc, t->buffer);
@@ -1683,7 +1680,7 @@ err_dead_binder:
 err_invalid_target_handle:
 err_no_context_mgr_node:
         binder_debug(BINDER_DEBUG_FAILED_TRANSACTION,
-                     "binder: %d:%d transaction failed %d, size %zd-%zd\n",
+                     "%d:%d transaction failed %d, size %zd-%zd\n",
                      proc->pid, thread->pid, return_error,
                      tr->data_size, tr->offsets_size);
 
@@ -1712,6 +1709,7 @@ int binder_thread_write(struct binder_proc *proc, struct binder_thread *thread,
                 if (get_user(cmd, (uint32_t __user *)ptr))
                         return -EFAULT;
                 ptr += sizeof(uint32_t);
+                trace_binder_command(cmd);
                 if (_IOC_NR(cmd) < ARRAY_SIZE(binder_stats.bc)) {
                         binder_stats.bc[_IOC_NR(cmd)]++;
                         proc->stats.bc[_IOC_NR(cmd)]++;
@@ -1734,18 +1732,14 @@ int binder_thread_write(struct binder_proc *proc, struct binder_thread *thread,
                                 ref = binder_get_ref_for_node(proc,
                                                binder_context_mgr_node);
                                 if (ref->desc != target) {
-                                        binder_user_error("binder: %d:"
-                                                "%d tried to acquire "
-                                                "reference to desc 0, "
-                                                "got %d instead\n",
+                                        binder_user_error("%d:%d tried to acquire reference to desc 0, got %d instead\n",
                                                 proc->pid, thread->pid,
                                                 ref->desc);
                                 }
                         } else
                                 ref = binder_get_ref(proc, target);
                         if (ref == NULL) {
-                                binder_user_error("binder: %d:%d refcou"
-                                        "nt change on invalid ref %d\n",
+                                binder_user_error("%d:%d refcount change on invalid ref %d\n",
                                         proc->pid, thread->pid, target);
                                 break;
                         }
@@ -1769,7 +1763,7 @@ int binder_thread_write(struct binder_proc *proc, struct binder_thread *thread,
                                 break;
                         }
                         binder_debug(BINDER_DEBUG_USER_REFS,
-                                     "binder: %d:%d %s ref %d desc %d s %d w %d for node %d\n",
+                                     "%d:%d %s ref %d desc %d s %d w %d for node %d\n",
                                      proc->pid, thread->pid, debug_string, ref->debug_id,
                                      ref->desc, ref->strong, ref->weak, ref->node->debug_id);
                         break;
@@ -1788,8 +1782,7 @@ int binder_thread_write(struct binder_proc *proc, struct binder_thread *thread,
                         ptr += sizeof(void *);
                         node = binder_get_node(proc, node_ptr);
                         if (node == NULL) {
-                                binder_user_error("binder: %d:%d "
-                                        "%s u%p no match\n",
+                                binder_user_error("%d:%d %s u%p no match\n",
                                         proc->pid, thread->pid,
                                         cmd == BC_INCREFS_DONE ?
                                         "BC_INCREFS_DONE" :
@@ -1798,8 +1791,7 @@ int binder_thread_write(struct binder_proc *proc, struct binder_thread *thread,
                                 break;
                         }
                         if (cookie != node->cookie) {
-                                binder_user_error("binder: %d:%d %s u%p node %d"
-                                        " cookie mismatch %p != %p\n",
+                                binder_user_error("%d:%d %s u%p node %d cookie mismatch %p != %p\n",
                                         proc->pid, thread->pid,
                                         cmd == BC_INCREFS_DONE ?
                                         "BC_INCREFS_DONE" : "BC_ACQUIRE_DONE",
@@ -1809,9 +1801,7 @@ int binder_thread_write(struct binder_proc *proc, struct binder_thread *thread,
                         }
                         if (cmd == BC_ACQUIRE_DONE) {
                                 if (node->pending_strong_ref == 0) {
-                                        binder_user_error("binder: %d:%d "
-                                                "BC_ACQUIRE_DONE node %d has "
-                                                "no pending acquire request\n",
+                                        binder_user_error("%d:%d BC_ACQUIRE_DONE node %d has no pending acquire request\n",
                                                 proc->pid, thread->pid,
                                                 node->debug_id);
                                         break;
@@ -1819,9 +1809,7 @@ int binder_thread_write(struct binder_proc *proc, struct binder_thread *thread,
                                 node->pending_strong_ref = 0;
                         } else {
                                 if (node->pending_weak_ref == 0) {
-                                        binder_user_error("binder: %d:%d "
-                                                "BC_INCREFS_DONE node %d has "
-                                                "no pending increfs request\n",
+                                        binder_user_error("%d:%d BC_INCREFS_DONE node %d has no pending increfs request\n",
                                                 proc->pid, thread->pid,
                                                 node->debug_id);
                                         break;
@@ -1830,17 +1818,17 @@ int binder_thread_write(struct binder_proc *proc, struct binder_thread *thread,
                         }
                         binder_dec_node(node, cmd == BC_ACQUIRE_DONE, 0);
                         binder_debug(BINDER_DEBUG_USER_REFS,
-                                     "binder: %d:%d %s node %d ls %d lw %d\n",
+                                     "%d:%d %s node %d ls %d lw %d\n",
                                      proc->pid, thread->pid,
                                      cmd == BC_INCREFS_DONE ? "BC_INCREFS_DONE" : "BC_ACQUIRE_DONE",
                                      node->debug_id, node->local_strong_refs, node->local_weak_refs);
                         break;
                 }
                 case BC_ATTEMPT_ACQUIRE:
-                        pr_err("binder: BC_ATTEMPT_ACQUIRE not supported\n");
+                        pr_err("BC_ATTEMPT_ACQUIRE not supported\n");
                         return -EINVAL;
                 case BC_ACQUIRE_RESULT:
-                        pr_err("binder: BC_ACQUIRE_RESULT not supported\n");
+                        pr_err("BC_ACQUIRE_RESULT not supported\n");
                         return -EINVAL;
 
                 case BC_FREE_BUFFER: {
@@ -1853,20 +1841,17 @@ int binder_thread_write(struct binder_proc *proc, struct binder_thread *thread,
 
                         buffer = binder_buffer_lookup(proc, data_ptr);
                         if (buffer == NULL) {
-                                binder_user_error("binder: %d:%d "
-                                        "BC_FREE_BUFFER u%p no match\n",
+                                binder_user_error("%d:%d BC_FREE_BUFFER u%p no match\n",
                                         proc->pid, thread->pid, data_ptr);
                                 break;
                         }
                         if (!buffer->allow_user_free) {
-                                binder_user_error("binder: %d:%d "
-                                        "BC_FREE_BUFFER u%p matched "
-                                        "unreturned buffer\n",
+                                binder_user_error("%d:%d BC_FREE_BUFFER u%p matched unreturned buffer\n",
                                         proc->pid, thread->pid, data_ptr);
                                 break;
                         }
                         binder_debug(BINDER_DEBUG_FREE_BUFFER,
-                                     "binder: %d:%d BC_FREE_BUFFER u%p found buffer %d for %s transaction\n",
+                                     "%d:%d BC_FREE_BUFFER u%p found buffer %d for %s transaction\n",
                                      proc->pid, thread->pid, data_ptr, buffer->debug_id,
                                      buffer->transaction ? "active" : "finished");
 
@@ -1881,6 +1866,7 @@ int binder_thread_write(struct binder_proc *proc, struct binder_thread *thread,
                                 else
                                         list_move_tail(buffer->target_node->async_todo.next, &thread->todo);
                         }
+                        trace_binder_transaction_buffer_release(buffer);
                         binder_transaction_buffer_release(proc, buffer, NULL);
                         binder_free_buf(proc, buffer);
                         break;
@@ -1899,19 +1885,15 @@ int binder_thread_write(struct binder_proc *proc, struct binder_thread *thread,
 
                 case BC_REGISTER_LOOPER:
                         binder_debug(BINDER_DEBUG_THREADS,
-                                     "binder: %d:%d BC_REGISTER_LOOPER\n",
+                                     "%d:%d BC_REGISTER_LOOPER\n",
                                      proc->pid, thread->pid);
                         if (thread->looper & BINDER_LOOPER_STATE_ENTERED) {
                                 thread->looper |= BINDER_LOOPER_STATE_INVALID;
-                                binder_user_error("binder: %d:%d ERROR:"
-                                        " BC_REGISTER_LOOPER called "
-                                        "after BC_ENTER_LOOPER\n",
+                                binder_user_error("%d:%d ERROR: BC_REGISTER_LOOPER called after BC_ENTER_LOOPER\n",
                                         proc->pid, thread->pid);
                         } else if (proc->requested_threads == 0) {
                                 thread->looper |= BINDER_LOOPER_STATE_INVALID;
-                                binder_user_error("binder: %d:%d ERROR:"
-                                        " BC_REGISTER_LOOPER called "
-                                        "without request\n",
+                                binder_user_error("%d:%d ERROR: BC_REGISTER_LOOPER called without request\n",
                                         proc->pid, thread->pid);
                         } else {
                                 proc->requested_threads--;
@@ -1921,20 +1903,18 @@ int binder_thread_write(struct binder_proc *proc, struct binder_thread *thread,
                         break;
                 case BC_ENTER_LOOPER:
                         binder_debug(BINDER_DEBUG_THREADS,
-                                     "binder: %d:%d BC_ENTER_LOOPER\n",
+                                     "%d:%d BC_ENTER_LOOPER\n",
                                      proc->pid, thread->pid);
                         if (thread->looper & BINDER_LOOPER_STATE_REGISTERED) {
                                 thread->looper |= BINDER_LOOPER_STATE_INVALID;
-                                binder_user_error("binder: %d:%d ERROR:"
-                                        " BC_ENTER_LOOPER called after "
-                                        "BC_REGISTER_LOOPER\n",
+                                binder_user_error("%d:%d ERROR: BC_ENTER_LOOPER called after BC_REGISTER_LOOPER\n",
                                         proc->pid, thread->pid);
                         }
                         thread->looper |= BINDER_LOOPER_STATE_ENTERED;
                         break;
                 case BC_EXIT_LOOPER:
                         binder_debug(BINDER_DEBUG_THREADS,
-                                     "binder: %d:%d BC_EXIT_LOOPER\n",
+                                     "%d:%d BC_EXIT_LOOPER\n",
                                      proc->pid, thread->pid);
                         thread->looper |= BINDER_LOOPER_STATE_EXITED;
                         break;
@@ -1954,8 +1934,7 @@ int binder_thread_write(struct binder_proc *proc, struct binder_thread *thread,
                         ptr += sizeof(void *);
                         ref = binder_get_ref(proc, target);
                         if (ref == NULL) {
-                                binder_user_error("binder: %d:%d %s "
-                                        "invalid ref %d\n",
+                                binder_user_error("%d:%d %s invalid ref %d\n",
                                         proc->pid, thread->pid,
                                         cmd == BC_REQUEST_DEATH_NOTIFICATION ?
                                         "BC_REQUEST_DEATH_NOTIFICATION" :
@@ -1965,7 +1944,7 @@ int binder_thread_write(struct binder_proc *proc, struct binder_thread *thread,
                         }
 
                         binder_debug(BINDER_DEBUG_DEATH_NOTIFICATION,
-                                     "binder: %d:%d %s %p ref %d desc %d s %d w %d for node %d\n",
+                                     "%d:%d %s %p ref %d desc %d s %d w %d for node %d\n",
                                      proc->pid, thread->pid,
                                      cmd == BC_REQUEST_DEATH_NOTIFICATION ?
                                      "BC_REQUEST_DEATH_NOTIFICATION" :
@@ -1975,10 +1954,7 @@ int binder_thread_write(struct binder_proc *proc, struct binder_thread *thread,
 
                         if (cmd == BC_REQUEST_DEATH_NOTIFICATION) {
                                 if (ref->death) {
-                                        binder_user_error("binder: %d:%"
-                                                "d BC_REQUEST_DEATH_NOTI"
-                                                "FICATION death notific"
-                                                "ation already set\n",
+                                        binder_user_error("%d:%d BC_REQUEST_DEATH_NOTIFICATION death notification already set\n",
                                                 proc->pid, thread->pid);
                                         break;
                                 }
@@ -1986,8 +1962,7 @@ int binder_thread_write(struct binder_proc *proc, struct binder_thread *thread,
                                 if (death == NULL) {
                                         thread->return_error = BR_ERROR;
                                         binder_debug(BINDER_DEBUG_FAILED_TRANSACTION,
-                                                     "binder: %d:%d "
-                                                     "BC_REQUEST_DEATH_NOTIFICATION failed\n",
+                                                     "%d:%d BC_REQUEST_DEATH_NOTIFICATION failed\n",
                                                      proc->pid, thread->pid);
                                         break;
                                 }
@@ -2006,20 +1981,13 @@ int binder_thread_write(struct binder_proc *proc, struct binder_thread *thread,
                                 }
                         } else {
                                 if (ref->death == NULL) {
-                                        binder_user_error("binder: %d:%"
-                                                "d BC_CLEAR_DEATH_NOTIFI"
-                                                "CATION death notificat"
-                                                "ion not active\n",
+                                        binder_user_error("%d:%d BC_CLEAR_DEATH_NOTIFICATION death notification not active\n",
                                                 proc->pid, thread->pid);
                                         break;
                                 }
                                 death = ref->death;
                                 if (death->cookie != cookie) {
-                                        binder_user_error("binder: %d:%"
-                                                "d BC_CLEAR_DEATH_NOTIFI"
-                                                "CATION death notificat"
-                                                "ion cookie mismatch "
-                                                "%p != %p\n",
+                                        binder_user_error("%d:%d BC_CLEAR_DEATH_NOTIFICATION death notification cookie mismatch %p != %p\n",
                                                 proc->pid, thread->pid,
                                                 death->cookie, cookie);
                                         break;
@@ -2055,11 +2023,10 @@ int binder_thread_write(struct binder_proc *proc, struct binder_thread *thread,
                                 }
                         }
                         binder_debug(BINDER_DEBUG_DEAD_BINDER,
-                                     "binder: %d:%d BC_DEAD_BINDER_DONE %p found %p\n",
+                                     "%d:%d BC_DEAD_BINDER_DONE %p found %p\n",
                                      proc->pid, thread->pid, cookie, death);
                         if (death == NULL) {
-                                binder_user_error("binder: %d:%d BC_DEAD"
-                                        "_BINDER_DONE %p not found\n",
+                                binder_user_error("%d:%d BC_DEAD_BINDER_DONE %p not found\n",
                                         proc->pid, thread->pid, cookie);
                                 break;
                         }
@@ -2077,7 +2044,7 @@ int binder_thread_write(struct binder_proc *proc, struct binder_thread *thread,
                 } break;
 
                 default:
-                        pr_err("binder: %d:%d unknown command %d\n",
+                        pr_err("%d:%d unknown command %d\n",
                                proc->pid, thread->pid, cmd);
                         return -EINVAL;
                 }
@@ -2089,6 +2056,7 @@ int binder_thread_write(struct binder_proc *proc, struct binder_thread *thread,
 void binder_stat_br(struct binder_proc *proc, struct binder_thread *thread,
                     uint32_t cmd)
 {
+        trace_binder_return(cmd);
         if (_IOC_NR(cmd) < ARRAY_SIZE(binder_stats.br)) {
                 binder_stats.br[_IOC_NR(cmd)]++;
                 proc->stats.br[_IOC_NR(cmd)]++;
@@ -2135,6 +2103,7 @@ retry:
                         if (put_user(thread->return_error2, (uint32_t __user *)ptr))
                                 return -EFAULT;
                         ptr += sizeof(uint32_t);
+                        binder_stat_br(proc, thread, thread->return_error2);
                         if (ptr == end)
                                 goto done;
                         thread->return_error2 = BR_OK;
@@ -2142,6 +2111,7 @@ retry:
                 if (put_user(thread->return_error, (uint32_t __user *)ptr))
                         return -EFAULT;
                 ptr += sizeof(uint32_t);
+                binder_stat_br(proc, thread, thread->return_error);
                 thread->return_error = BR_OK;
                 goto done;
         }
@@ -2150,13 +2120,16 @@ retry:
         thread->looper |= BINDER_LOOPER_STATE_WAITING;
         if (wait_for_proc_work)
                 proc->ready_threads++;
-        mutex_unlock(&binder_lock);
+
+        binder_unlock(__func__);
+
+        trace_binder_wait_for_work(wait_for_proc_work,
+                                   !!thread->transaction_stack,
+                                   !list_empty(&thread->todo));
         if (wait_for_proc_work) {
                 if (!(thread->looper & (BINDER_LOOPER_STATE_REGISTERED |
                                         BINDER_LOOPER_STATE_ENTERED))) {
-                        binder_user_error("binder: %d:%d ERROR: Thread waiting "
-                                "for process work before calling BC_REGISTER_"
-                                "LOOPER or BC_ENTER_LOOPER (state %x)\n",
+                        binder_user_error("%d:%d ERROR: Thread waiting for process work before calling BC_REGISTER_LOOPER or BC_ENTER_LOOPER (state %x)\n",
                                 proc->pid, thread->pid, thread->looper);
                         wait_event_interruptible(binder_user_error_wait,
                                                  binder_stop_on_user_error < 2);
@@ -2174,7 +2147,9 @@ retry:
                 } else
                         ret = wait_event_interruptible(thread->wait, binder_has_thread_work(thread));
         }
-        mutex_lock(&binder_lock);
+
+        binder_lock(__func__);
+
         if (wait_for_proc_work)
                 proc->ready_threads--;
         thread->looper &= ~BINDER_LOOPER_STATE_WAITING;
@@ -2213,7 +2188,7 @@ retry:
 
                         binder_stat_br(proc, thread, cmd);
                         binder_debug(BINDER_DEBUG_TRANSACTION_COMPLETE,
-                                     "binder: %d:%d BR_TRANSACTION_COMPLETE\n",
+                                     "%d:%d BR_TRANSACTION_COMPLETE\n",
                                      proc->pid, thread->pid);
 
                         list_del(&w->entry);
@@ -2260,13 +2235,13 @@ retry:
 
                                 binder_stat_br(proc, thread, cmd);
                                 binder_debug(BINDER_DEBUG_USER_REFS,
-                                             "binder: %d:%d %s %d u%p c%p\n",
+                                             "%d:%d %s %d u%p c%p\n",
                                              proc->pid, thread->pid, cmd_name, node->debug_id, node->ptr, node->cookie);
                         } else {
                                 list_del_init(&w->entry);
                                 if (!weak && !strong) {
                                         binder_debug(BINDER_DEBUG_INTERNAL_REFS,
-                                                     "binder: %d:%d node %d u%p c%p deleted\n",
+                                                     "%d:%d node %d u%p c%p deleted\n",
                                                      proc->pid, thread->pid, node->debug_id,
                                                      node->ptr, node->cookie);
                                         rb_erase(&node->rb_node, &proc->nodes);
@@ -2274,7 +2249,7 @@ retry:
                                         binder_stats_deleted(BINDER_STAT_NODE);
                                 } else {
                                         binder_debug(BINDER_DEBUG_INTERNAL_REFS,
-                                                     "binder: %d:%d node %d u%p c%p state unchanged\n",
+                                                     "%d:%d node %d u%p c%p state unchanged\n",
                                                      proc->pid, thread->pid, node->debug_id, node->ptr,
                                                      node->cookie);
                                 }
@@ -2297,8 +2272,9 @@ retry:
                         if (put_user(death->cookie, (void * __user *)ptr))
                                 return -EFAULT;
                         ptr += sizeof(void *);
+                        binder_stat_br(proc, thread, cmd);
                         binder_debug(BINDER_DEBUG_DEATH_NOTIFICATION,
-                                     "binder: %d:%d %s %p\n",
+                                     "%d:%d %s %p\n",
                                       proc->pid, thread->pid,
                                       cmd == BR_DEAD_BINDER ?
                                       "BR_DEAD_BINDER" :
@@ -2364,10 +2340,10 @@ retry:
                         return -EFAULT;
                 ptr += sizeof(tr);
 
+                trace_binder_transaction_received(t);
                 binder_stat_br(proc, thread, cmd);
                 binder_debug(BINDER_DEBUG_TRANSACTION,
-                             "binder: %d:%d %s %d %d:%d, cmd %d"
-                             "size %zd-%zd ptr %p-%p\n",
+                             "%d:%d %s %d %d:%d, cmd %d size %zd-%zd ptr %p-%p\n",
                              proc->pid, thread->pid,
                              (cmd == BR_TRANSACTION) ? "BR_TRANSACTION" :
                              "BR_REPLY",
@@ -2400,10 +2376,11 @@ done:
              /*spawn a new thread if we leave this out */) {
                 proc->requested_threads++;
                 binder_debug(BINDER_DEBUG_THREADS,
-                             "binder: %d:%d BR_SPAWN_LOOPER\n",
+                             "%d:%d BR_SPAWN_LOOPER\n",
                              proc->pid, thread->pid);
                 if (put_user(BR_SPAWN_LOOPER, (uint32_t __user *)buffer))
                         return -EFAULT;
+                binder_stat_br(proc, thread, BR_SPAWN_LOOPER);
         }
         return 0;
 }
@@ -2424,7 +2401,7 @@ static void binder_release_work(struct list_head *list)
                                 binder_send_failed_reply(t, BR_DEAD_REPLY);
                         } else {
                                 binder_debug(BINDER_DEBUG_DEAD_TRANSACTION,
-                                        "binder: undelivered transaction %d\n",
+                                        "undelivered transaction %d\n",
                                         t->debug_id);
                                 t->buffer->transaction = NULL;
                                 kfree(t);
@@ -2433,7 +2410,7 @@ static void binder_release_work(struct list_head *list)
                 } break;
                 case BINDER_WORK_TRANSACTION_COMPLETE: {
                         binder_debug(BINDER_DEBUG_DEAD_TRANSACTION,
-                                "binder: undelivered TRANSACTION_COMPLETE\n");
+                                "undelivered TRANSACTION_COMPLETE\n");
                         kfree(w);
                         binder_stats_deleted(BINDER_STAT_TRANSACTION_COMPLETE);
                 } break;
@@ -2443,13 +2420,13 @@ static void binder_release_work(struct list_head *list)
 
                         death = container_of(w, struct binder_ref_death, work);
                         binder_debug(BINDER_DEBUG_DEAD_TRANSACTION,
-                                "binder: undelivered death notification, %p\n",
+                                "undelivered death notification, %p\n",
                                 death->cookie);
                         kfree(death);
                         binder_stats_deleted(BINDER_STAT_DEATH);
                 } break;
                 default:
-                        pr_err("binder: unexpected work type, %d, not freed\n",
+                        pr_err("unexpected work type, %d, not freed\n",
                                w->type);
                         break;
                 }
@@ -2506,8 +2483,8 @@ static int binder_free_thread(struct binder_proc *proc,
         while (t) {
                 active_transactions++;
                 binder_debug(BINDER_DEBUG_DEAD_TRANSACTION,
-                             "binder: release %d:%d transaction %d "
-                             "%s, still active\n", proc->pid, thread->pid,
+                             "release %d:%d transaction %d %s, still active\n",
+                              proc->pid, thread->pid,
                              t->debug_id,
                              (t->to_thread == thread) ? "in" : "out");
 
@@ -2540,12 +2517,14 @@ static unsigned int binder_poll(struct file *filp,
         struct binder_thread *thread = NULL;
         int wait_for_proc_work;
 
-        mutex_lock(&binder_lock);
+        binder_lock(__func__);
+
         thread = binder_get_thread(proc);
 
         wait_for_proc_work = thread->transaction_stack == NULL &&
                 list_empty(&thread->todo) && thread->return_error == BR_OK;
-        mutex_unlock(&binder_lock);
+
+        binder_unlock(__func__);
 
         if (wait_for_proc_work) {
                 if (binder_has_proc_work(proc, thread))
@@ -2573,11 +2552,13 @@ static long binder_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
 
         /*pr_info("binder_ioctl: %d:%d %x %lx\n", proc->pid, current->pid, cmd, arg);*/
 
+        trace_binder_ioctl(cmd, arg);
+
         ret = wait_event_interruptible(binder_user_error_wait, binder_stop_on_user_error < 2);
         if (ret)
-                return ret;
+                goto err_unlocked;
 
-        mutex_lock(&binder_lock);
+        binder_lock(__func__);
         thread = binder_get_thread(proc);
         if (thread == NULL) {
                 ret = -ENOMEM;
@@ -2596,12 +2577,13 @@ static long binder_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
                         goto err;
                 }
                 binder_debug(BINDER_DEBUG_READ_WRITE,
-                             "binder: %d:%d write %ld at %08lx, read %ld at %08lx\n",
-                             proc->pid, thread->pid, bwr.write_size, bwr.write_buffer,
-                             bwr.read_size, bwr.read_buffer);
+                             "%d:%d write %ld at %08lx, read %ld at %08lx\n",
+                             proc->pid, thread->pid, bwr.write_size,
+                             bwr.write_buffer, bwr.read_size, bwr.read_buffer);
 
                 if (bwr.write_size > 0) {
                         ret = binder_thread_write(proc, thread, (void __user *)bwr.write_buffer, bwr.write_size, &bwr.write_consumed);
+                        trace_binder_write_done(ret);
                         if (ret < 0) {
                                 bwr.read_consumed = 0;
                                 if (copy_to_user(ubuf, &bwr, sizeof(bwr)))
@@ -2611,6 +2593,7 @@ static long binder_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
                 }
                 if (bwr.read_size > 0) {
                         ret = binder_thread_read(proc, thread, (void __user *)bwr.read_buffer, bwr.read_size, &bwr.read_consumed, filp->f_flags & O_NONBLOCK);
+                        trace_binder_read_done(ret);
                         if (!list_empty(&proc->todo))
                                 wake_up_interruptible(&proc->wait);
                         if (ret < 0) {
@@ -2620,7 +2603,7 @@ static long binder_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
                         }
                 }
                 binder_debug(BINDER_DEBUG_READ_WRITE,
-                             "binder: %d:%d wrote %ld of %ld, read return %ld of %ld\n",
+                             "%d:%d wrote %ld of %ld, read return %ld of %ld\n",
                              proc->pid, thread->pid, bwr.write_consumed, bwr.write_size,
                              bwr.read_consumed, bwr.read_size);
                 if (copy_to_user(ubuf, &bwr, sizeof(bwr))) {
@@ -2637,14 +2620,13 @@ static long binder_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
                 break;
         case BINDER_SET_CONTEXT_MGR:
                 if (binder_context_mgr_node != NULL) {
-                        pr_err("binder: BINDER_SET_CONTEXT_MGR already set\n");
+                        pr_err("BINDER_SET_CONTEXT_MGR already set\n");
                         ret = -EBUSY;
                         goto err;
                 }
                 if (uid_valid(binder_context_mgr_uid)) {
                         if (!uid_eq(binder_context_mgr_uid, current->cred->euid)) {
-                                pr_err("binder: BINDER_SET_"
-                                       "CONTEXT_MGR bad uid %d != %d\n",
+                                pr_err("BINDER_SET_CONTEXT_MGR bad uid %d != %d\n",
                                        from_kuid(&init_user_ns, current->cred->euid),
                                        from_kuid(&init_user_ns, binder_context_mgr_uid));
                                 ret = -EPERM;
@@ -2663,7 +2645,7 @@ static long binder_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
                 binder_context_mgr_node->has_weak_ref = 1;
                 break;
         case BINDER_THREAD_EXIT:
-                binder_debug(BINDER_DEBUG_THREADS, "binder: %d:%d exit\n",
+                binder_debug(BINDER_DEBUG_THREADS, "%d:%d exit\n",
                              proc->pid, thread->pid);
                 binder_free_thread(proc, thread);
                 thread = NULL;
@@ -2686,10 +2668,12 @@ static long binder_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
 err:
         if (thread)
                 thread->looper &= ~BINDER_LOOPER_STATE_NEED_RETURN;
-        mutex_unlock(&binder_lock);
+        binder_unlock(__func__);
         wait_event_interruptible(binder_user_error_wait, binder_stop_on_user_error < 2);
         if (ret && ret != -ERESTARTSYS)
-                pr_info("binder: %d:%d ioctl %x %lx returned %d\n", proc->pid, current->pid, cmd, arg, ret);
+                pr_info("%d:%d ioctl %x %lx returned %d\n", proc->pid, current->pid, cmd, arg, ret);
+err_unlocked:
+        trace_binder_ioctl_done(ret);
         return ret;
 }
 
@@ -2697,7 +2681,7 @@ static void binder_vma_open(struct vm_area_struct *vma)
 {
         struct binder_proc *proc = vma->vm_private_data;
         binder_debug(BINDER_DEBUG_OPEN_CLOSE,
-                     "binder: %d open vm area %lx-%lx (%ld K) vma %lx pagep %lx\n",
+                     "%d open vm area %lx-%lx (%ld K) vma %lx pagep %lx\n",
                      proc->pid, vma->vm_start, vma->vm_end,
                      (vma->vm_end - vma->vm_start) / SZ_1K, vma->vm_flags,
                      (unsigned long)pgprot_val(vma->vm_page_prot));
@@ -2707,7 +2691,7 @@ static void binder_vma_close(struct vm_area_struct *vma)
 {
         struct binder_proc *proc = vma->vm_private_data;
         binder_debug(BINDER_DEBUG_OPEN_CLOSE,
-                     "binder: %d close vm area %lx-%lx (%ld K) vma %lx pagep %lx\n",
+                     "%d close vm area %lx-%lx (%ld K) vma %lx pagep %lx\n",
                      proc->pid, vma->vm_start, vma->vm_end,
                      (vma->vm_end - vma->vm_start) / SZ_1K, vma->vm_flags,
                      (unsigned long)pgprot_val(vma->vm_page_prot));
@@ -2835,13 +2819,16 @@ static int binder_open(struct inode *nodp, struct file *filp)
         INIT_LIST_HEAD(&proc->todo);
         init_waitqueue_head(&proc->wait);
         proc->default_priority = task_nice(current);
-        mutex_lock(&binder_lock);
+
+        binder_lock(__func__);
+
         binder_stats_created(BINDER_STAT_PROC);
         hlist_add_head(&proc->proc_node, &binder_procs);
         proc->pid = current->group_leader->pid;
         INIT_LIST_HEAD(&proc->delivered_death);
         filp->private_data = proc;
-        mutex_unlock(&binder_lock);
+
+        binder_unlock(__func__);
 
         if (binder_debugfs_dir_entry_proc) {
                 char strbuf[11];
@@ -2949,9 +2936,8 @@ static void binder_deferred_release(struct binder_proc *proc)
                                 }
                         }
                         binder_debug(BINDER_DEBUG_DEAD_BINDER,
-                                     "binder: node %d now dead, "
-                                     "refs %d, death %d\n", node->debug_id,
-                                     incoming_refs, death);
+                                     "node %d now dead, refs %d, death %d\n",
+                                      node->debug_id, incoming_refs, death);
                 }
         }
         outgoing_refs = 0;
@@ -2972,8 +2958,7 @@ static void binder_deferred_release(struct binder_proc *proc)
                 if (t) {
                         t->buffer = NULL;
                         buffer->transaction = NULL;
-                        pr_err("binder: release proc %d, "
-                               "transaction %d, not freed\n",
+                        pr_err("release proc %d, transaction %d, not freed\n",
                                proc->pid, t->debug_id);
                         /*BUG();*/
                 }
@@ -2990,8 +2975,7 @@ static void binder_deferred_release(struct binder_proc *proc)
                         if (proc->pages[i]) {
                                 void *page_addr = proc->buffer + i * PAGE_SIZE;
                                 binder_debug(BINDER_DEBUG_BUFFER_ALLOC,
-                                             "binder_release: %d: "
-                                             "page %d at %p not freed\n",
+                                             "binder_release: %d: page %d at %p not freed\n",
                                              proc->pid, i,
                                              page_addr);
                                 unmap_kernel_range((unsigned long)page_addr,
@@ -3007,9 +2991,7 @@ static void binder_deferred_release(struct binder_proc *proc)
         put_task_struct(proc->tsk);
 
         binder_debug(BINDER_DEBUG_OPEN_CLOSE,
-                     "binder_release: %d threads %d, nodes %d (ref %d), "
-                     "refs %d, active transactions %d, buffers %d, "
-                     "pages %d\n",
+                     "binder_release: %d threads %d, nodes %d (ref %d), refs %d, active transactions %d, buffers %d, pages %d\n",
                      proc->pid, threads, nodes, incoming_refs, outgoing_refs,
                      active_transactions, buffers, page_count);
 
@@ -3023,7 +3005,7 @@ static void binder_deferred_func(struct work_struct *work)
 
         int defer;
         do {
-                mutex_lock(&binder_lock);
+                binder_lock(__func__);
                 mutex_lock(&binder_deferred_lock);
                 if (!hlist_empty(&binder_deferred_list)) {
                         proc = hlist_entry(binder_deferred_list.first,
@@ -3050,7 +3032,7 @@ static void binder_deferred_func(struct work_struct *work)
                 if (defer & BINDER_DEFERRED_RELEASE)
                         binder_deferred_release(proc); /* frees proc */
 
-                mutex_unlock(&binder_lock);
+                binder_unlock(__func__);
                 if (files)
                         put_files_struct(files);
         } while (proc);
@@ -3391,7 +3373,7 @@ static int binder_state_show(struct seq_file *m, void *unused)
         int do_lock = !binder_debug_no_lock;
 
         if (do_lock)
-                mutex_lock(&binder_lock);
+                binder_lock(__func__);
 
         seq_puts(m, "binder state:\n");
 
@@ -3403,7 +3385,7 @@ static int binder_state_show(struct seq_file *m, void *unused)
         hlist_for_each_entry(proc, pos, &binder_procs, proc_node)
                 print_binder_proc(m, proc, 1);
         if (do_lock)
-                mutex_unlock(&binder_lock);
+                binder_unlock(__func__);
         return 0;
 }
 
@@ -3414,7 +3396,7 @@ static int binder_stats_show(struct seq_file *m, void *unused)
         int do_lock = !binder_debug_no_lock;
 
         if (do_lock)
-                mutex_lock(&binder_lock);
+                binder_lock(__func__);
 
         seq_puts(m, "binder stats:\n");
 
@@ -3423,7 +3405,7 @@ static int binder_stats_show(struct seq_file *m, void *unused)
         hlist_for_each_entry(proc, pos, &binder_procs, proc_node)
                 print_binder_proc_stats(m, proc);
         if (do_lock)
-                mutex_unlock(&binder_lock);
+                binder_unlock(__func__);
         return 0;
 }
 
@@ -3434,13 +3416,13 @@ static int binder_transactions_show(struct seq_file *m, void *unused)
         int do_lock = !binder_debug_no_lock;
 
         if (do_lock)
-                mutex_lock(&binder_lock);
+                binder_lock(__func__);
 
         seq_puts(m, "binder transactions:\n");
         hlist_for_each_entry(proc, pos, &binder_procs, proc_node)
                 print_binder_proc(m, proc, 0);
         if (do_lock)
-                mutex_unlock(&binder_lock);
+                binder_unlock(__func__);
         return 0;
 }
 
@@ -3450,11 +3432,11 @@ static int binder_proc_show(struct seq_file *m, void *unused)
         int do_lock = !binder_debug_no_lock;
 
         if (do_lock)
-                mutex_lock(&binder_lock);
+                binder_lock(__func__);
         seq_puts(m, "binder proc state:\n");
         print_binder_proc(m, proc, 1);
         if (do_lock)
-                mutex_unlock(&binder_lock);
+                binder_unlock(__func__);
         return 0;
 }
 
@@ -3549,4 +3531,7 @@ static int __init binder_init(void)
 
 device_initcall(binder_init);
 
+#define CREATE_TRACE_POINTS
+#include "binder_trace.h"
+
 MODULE_LICENSE("GPL v2");
diff --git a/drivers/staging/android/binder_trace.h b/drivers/staging/android/binder_trace.h
new file mode 100644
index 000000000000..82a567c2af67
--- /dev/null
+++ b/drivers/staging/android/binder_trace.h
@@ -0,0 +1,327 @@
+/*
+ * Copyright (C) 2012 Google, Inc.
+ *
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ */
+
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM binder
+
+#if !defined(_BINDER_TRACE_H) || defined(TRACE_HEADER_MULTI_READ)
+#define _BINDER_TRACE_H
+
+#include <linux/tracepoint.h>
+
+struct binder_buffer;
+struct binder_node;
+struct binder_proc;
+struct binder_ref;
+struct binder_thread;
+struct binder_transaction;
+
+TRACE_EVENT(binder_ioctl,
+        TP_PROTO(unsigned int cmd, unsigned long arg),
+        TP_ARGS(cmd, arg),
+
+        TP_STRUCT__entry(
+                __field(unsigned int, cmd)
+                __field(unsigned long, arg)
+        ),
+        TP_fast_assign(
+                __entry->cmd = cmd;
+                __entry->arg = arg;
+        ),
+        TP_printk("cmd=0x%x arg=0x%lx", __entry->cmd, __entry->arg)
+);
+
+DECLARE_EVENT_CLASS(binder_lock_class,
+        TP_PROTO(const char *tag),
+        TP_ARGS(tag),
+        TP_STRUCT__entry(
+                __field(const char *, tag)
+        ),
+        TP_fast_assign(
+                __entry->tag = tag;
+        ),
+        TP_printk("tag=%s", __entry->tag)
+);
+
+#define DEFINE_BINDER_LOCK_EVENT(name)  \
+DEFINE_EVENT(binder_lock_class, name,   \
+        TP_PROTO(const char *func), \
+        TP_ARGS(func))
+
+DEFINE_BINDER_LOCK_EVENT(binder_lock);
+DEFINE_BINDER_LOCK_EVENT(binder_locked);
+DEFINE_BINDER_LOCK_EVENT(binder_unlock);
+
+DECLARE_EVENT_CLASS(binder_function_return_class,
+        TP_PROTO(int ret),
+        TP_ARGS(ret),
+        TP_STRUCT__entry(
+                __field(int, ret)
+        ),
+        TP_fast_assign(
+                __entry->ret = ret;
+        ),
+        TP_printk("ret=%d", __entry->ret)
+);
+
+#define DEFINE_BINDER_FUNCTION_RETURN_EVENT(name)       \
+DEFINE_EVENT(binder_function_return_class, name,        \
+        TP_PROTO(int ret), \
+        TP_ARGS(ret))
+
+DEFINE_BINDER_FUNCTION_RETURN_EVENT(binder_ioctl_done);
+DEFINE_BINDER_FUNCTION_RETURN_EVENT(binder_write_done);
+DEFINE_BINDER_FUNCTION_RETURN_EVENT(binder_read_done);
+
+TRACE_EVENT(binder_wait_for_work,
+        TP_PROTO(bool proc_work, bool transaction_stack, bool thread_todo),
+        TP_ARGS(proc_work, transaction_stack, thread_todo),
+
+        TP_STRUCT__entry(
+                __field(bool, proc_work)
+                __field(bool, transaction_stack)
+                __field(bool, thread_todo)
+        ),
+        TP_fast_assign(
+                __entry->proc_work = proc_work;
+                __entry->transaction_stack = transaction_stack;
+                __entry->thread_todo = thread_todo;
+        ),
+        TP_printk("proc_work=%d transaction_stack=%d thread_todo=%d",
+                  __entry->proc_work, __entry->transaction_stack,
+                  __entry->thread_todo)
+);
+
+TRACE_EVENT(binder_transaction,
+        TP_PROTO(bool reply, struct binder_transaction *t,
+                 struct binder_node *target_node),
+        TP_ARGS(reply, t, target_node),
+        TP_STRUCT__entry(
+                __field(int, debug_id)
+                __field(int, target_node)
+                __field(int, to_proc)
+                __field(int, to_thread)
+                __field(int, reply)
+                __field(unsigned int, code)
+                __field(unsigned int, flags)
+        ),
+        TP_fast_assign(
+                __entry->debug_id = t->debug_id;
+                __entry->target_node = target_node ? target_node->debug_id : 0;
+                __entry->to_proc = t->to_proc->pid;
+                __entry->to_thread = t->to_thread ? t->to_thread->pid : 0;
+                __entry->reply = reply;
+                __entry->code = t->code;
+                __entry->flags = t->flags;
+        ),
+        TP_printk("transaction=%d dest_node=%d dest_proc=%d dest_thread=%d reply=%d flags=0x%x code=0x%x",
+                  __entry->debug_id, __entry->target_node,
+                  __entry->to_proc, __entry->to_thread,
+                  __entry->reply, __entry->flags, __entry->code)
+);
+
+TRACE_EVENT(binder_transaction_received,
+        TP_PROTO(struct binder_transaction *t),
+        TP_ARGS(t),
+
+        TP_STRUCT__entry(
+                __field(int, debug_id)
+        ),
+        TP_fast_assign(
+                __entry->debug_id = t->debug_id;
+        ),
+        TP_printk("transaction=%d", __entry->debug_id)
+);
+
+TRACE_EVENT(binder_transaction_node_to_ref,
+        TP_PROTO(struct binder_transaction *t, struct binder_node *node,
+                 struct binder_ref *ref),
+        TP_ARGS(t, node, ref),
+
+        TP_STRUCT__entry(
+                __field(int, debug_id)
+                __field(int, node_debug_id)
+                __field(void __user *, node_ptr)
+                __field(int, ref_debug_id)
+                __field(uint32_t, ref_desc)
+        ),
+        TP_fast_assign(
+                __entry->debug_id = t->debug_id;
+                __entry->node_debug_id = node->debug_id;
+                __entry->node_ptr = node->ptr;
+                __entry->ref_debug_id = ref->debug_id;
+                __entry->ref_desc = ref->desc;
+        ),
+        TP_printk("transaction=%d node=%d src_ptr=0x%p ==> dest_ref=%d dest_desc=%d",
+                  __entry->debug_id, __entry->node_debug_id, __entry->node_ptr,
+                  __entry->ref_debug_id, __entry->ref_desc)
+);
+
+TRACE_EVENT(binder_transaction_ref_to_node,
+        TP_PROTO(struct binder_transaction *t, struct binder_ref *ref),
+        TP_ARGS(t, ref),
+
+        TP_STRUCT__entry(
+                __field(int, debug_id)
+                __field(int, ref_debug_id)
+                __field(uint32_t, ref_desc)
+                __field(int, node_debug_id)
+                __field(void __user *, node_ptr)
+        ),
+        TP_fast_assign(
+                __entry->debug_id = t->debug_id;
+                __entry->ref_debug_id = ref->debug_id;
+                __entry->ref_desc = ref->desc;
+                __entry->node_debug_id = ref->node->debug_id;
+                __entry->node_ptr = ref->node->ptr;
+        ),
+        TP_printk("transaction=%d node=%d src_ref=%d src_desc=%d ==> dest_ptr=0x%p",
+                  __entry->debug_id, __entry->node_debug_id,
+                  __entry->ref_debug_id, __entry->ref_desc, __entry->node_ptr)
+);
+
+TRACE_EVENT(binder_transaction_ref_to_ref,
+        TP_PROTO(struct binder_transaction *t, struct binder_ref *src_ref,
+                 struct binder_ref *dest_ref),
+        TP_ARGS(t, src_ref, dest_ref),
+
+        TP_STRUCT__entry(
+                __field(int, debug_id)
+                __field(int, node_debug_id)
+                __field(int, src_ref_debug_id)
+                __field(uint32_t, src_ref_desc)
+                __field(int, dest_ref_debug_id)
+                __field(uint32_t, dest_ref_desc)
+        ),
+        TP_fast_assign(
+                __entry->debug_id = t->debug_id;
+                __entry->node_debug_id = src_ref->node->debug_id;
+                __entry->src_ref_debug_id = src_ref->debug_id;
+                __entry->src_ref_desc = src_ref->desc;
+                __entry->dest_ref_debug_id = dest_ref->debug_id;
+                __entry->dest_ref_desc = dest_ref->desc;
+        ),
+        TP_printk("transaction=%d node=%d src_ref=%d src_desc=%d ==> dest_ref=%d dest_desc=%d",
+                  __entry->debug_id, __entry->node_debug_id,
+                  __entry->src_ref_debug_id, __entry->src_ref_desc,
+                  __entry->dest_ref_debug_id, __entry->dest_ref_desc)
+);
+
+TRACE_EVENT(binder_transaction_fd,
+        TP_PROTO(struct binder_transaction *t, int src_fd, int dest_fd),
+        TP_ARGS(t, src_fd, dest_fd),
+
+        TP_STRUCT__entry(
+                __field(int, debug_id)
+                __field(int, src_fd)
+                __field(int, dest_fd)
+        ),
+        TP_fast_assign(
+                __entry->debug_id = t->debug_id;
+                __entry->src_fd = src_fd;
+                __entry->dest_fd = dest_fd;
+        ),
+        TP_printk("transaction=%d src_fd=%d ==> dest_fd=%d",
+                  __entry->debug_id, __entry->src_fd, __entry->dest_fd)
+);
+
+DECLARE_EVENT_CLASS(binder_buffer_class,
+        TP_PROTO(struct binder_buffer *buf),
+        TP_ARGS(buf),
+        TP_STRUCT__entry(
+                __field(int, debug_id)
+                __field(size_t, data_size)
+                __field(size_t, offsets_size)
+        ),
+        TP_fast_assign(
+                __entry->debug_id = buf->debug_id;
+                __entry->data_size = buf->data_size;
+                __entry->offsets_size = buf->offsets_size;
+        ),
+        TP_printk("transaction=%d data_size=%zd offsets_size=%zd",
+                  __entry->debug_id, __entry->data_size, __entry->offsets_size)
+);
+
+DEFINE_EVENT(binder_buffer_class, binder_transaction_alloc_buf,
+        TP_PROTO(struct binder_buffer *buffer),
+        TP_ARGS(buffer));
+
+DEFINE_EVENT(binder_buffer_class, binder_transaction_buffer_release,
+        TP_PROTO(struct binder_buffer *buffer),
+        TP_ARGS(buffer));
+
+DEFINE_EVENT(binder_buffer_class, binder_transaction_failed_buffer_release,
+        TP_PROTO(struct binder_buffer *buffer),
+        TP_ARGS(buffer));
+
+TRACE_EVENT(binder_update_page_range,
+        TP_PROTO(struct binder_proc *proc, bool allocate,
+                 void *start, void *end),
+        TP_ARGS(proc, allocate, start, end),
+        TP_STRUCT__entry(
+                __field(int, proc)
+                __field(bool, allocate)
+                __field(size_t, offset)
+                __field(size_t, size)
+        ),
+        TP_fast_assign(
+                __entry->proc = proc->pid;
+                __entry->allocate = allocate;
+                __entry->offset = start - proc->buffer;
+                __entry->size = end - start;
+        ),
+        TP_printk("proc=%d allocate=%d offset=%zu size=%zu",
+                  __entry->proc, __entry->allocate,
+                  __entry->offset, __entry->size)
+);
+
+TRACE_EVENT(binder_command,
+        TP_PROTO(uint32_t cmd),
+        TP_ARGS(cmd),
+        TP_STRUCT__entry(
+                __field(uint32_t, cmd)
+        ),
+        TP_fast_assign(
+                __entry->cmd = cmd;
+        ),
+        TP_printk("cmd=0x%x %s",
+                  __entry->cmd,
+                  _IOC_NR(__entry->cmd) < ARRAY_SIZE(binder_command_strings) ?
+                          binder_command_strings[_IOC_NR(__entry->cmd)] :
+                          "unknown")
+);
+
+TRACE_EVENT(binder_return,
+        TP_PROTO(uint32_t cmd),
+        TP_ARGS(cmd),
+        TP_STRUCT__entry(
+                __field(uint32_t, cmd)
+        ),
+        TP_fast_assign(
+                __entry->cmd = cmd;
+        ),
+        TP_printk("cmd=0x%x %s",
+                  __entry->cmd,
+                  _IOC_NR(__entry->cmd) < ARRAY_SIZE(binder_return_strings) ?
+                          binder_return_strings[_IOC_NR(__entry->cmd)] :
+                          "unknown")
+);
+
+#endif /* _BINDER_TRACE_H */
+
+#undef TRACE_INCLUDE_PATH
+#undef TRACE_INCLUDE_FILE
+#define TRACE_INCLUDE_PATH .
+#define TRACE_INCLUDE_FILE binder_trace
+#include <trace/define_trace.h>
diff --git a/drivers/staging/android/logger.c b/drivers/staging/android/logger.c
index 1d5ed475364b..dbc63cbb4d3a 100644
--- a/drivers/staging/android/logger.c
+++ b/drivers/staging/android/logger.c
@@ -676,4 +676,25 @@ static int __init logger_init(void)
 out:
         return ret;
 }
+
+static void __exit logger_exit(void)
+{
+        struct logger_log *current_log, *next_log;
+
+        list_for_each_entry_safe(current_log, next_log, &log_list, logs) {
+                /* we have to delete all the entry inside log_list */
+                misc_deregister(&current_log->misc);
+                vfree(current_log->buffer);
+                kfree(current_log->misc.name);
+                list_del(&current_log->logs);
+                kfree(current_log);
+        }
+}
+
+
 device_initcall(logger_init);
+module_exit(logger_exit);
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Robert Love, <rlove@google.com>");
+MODULE_DESCRIPTION("Android Logger");
diff --git a/drivers/staging/bcm/Adapter.h b/drivers/staging/bcm/Adapter.h
index 4d490a99110c..f57794827f73 100644
--- a/drivers/staging/bcm/Adapter.h
+++ b/drivers/staging/bcm/Adapter.h
@@ -151,7 +151,7 @@ struct bcm_packet_info {
         UINT            NumOfPacketsSent;
         UCHAR           ucDirection;
         USHORT          usCID;
-        S_MIBS_EXTSERVICEFLOW_PARAMETERS        stMibsExtServiceFlowTable;
+        struct bcm_mibs_parameters stMibsExtServiceFlowTable;
         UINT            uiCurrentRxRate;
         UINT            uiThisPeriodRxBytes;
         UINT            uiTotalRxBytes;
@@ -198,7 +198,7 @@ struct bcm_tarang_data {
         int                     AppCtrlQueueLen;
         BOOLEAN                 MacTracingEnabled;
         BOOLEAN                 bApplicationToExit;
-        S_MIBS_DROPPED_APP_CNTRL_MESSAGES       stDroppedAppCntrlMsgs;
+        struct bcm_mibs_dropped_cntrl_msg stDroppedAppCntrlMsgs;
         ULONG                   RxCntrlMsgBitMask;
 };
 
@@ -371,8 +371,8 @@ struct bcm_mini_adapter {
         PFLASH2X_VENDORSPECIFIC_INFO psFlash2xVendorInfo;
         UINT                    uiFlashBaseAdd; /* Flash start address */
         UINT                    uiActiveISOOffset; /* Active ISO offset chosen before f/w download */
-        FLASH2X_SECTION_VAL     eActiveISO; /* Active ISO section val */
-        FLASH2X_SECTION_VAL     eActiveDSD;     /* Active DSD val chosen before f/w download */
+        enum bcm_flash2x_section_val eActiveISO; /* Active ISO section val */
+        enum bcm_flash2x_section_val eActiveDSD; /* Active DSD val chosen before f/w download */
         UINT                    uiActiveDSDOffsetAtFwDld;  /* For accessing Active DSD chosen before f/w download */
         UINT                    uiFlashLayoutMajorVersion;
         UINT                    uiFlashLayoutMinorVersion;
diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c
index 3d02c2ebfb8d..efad33e3ba73 100644
--- a/drivers/staging/bcm/Bcmchar.c
+++ b/drivers/staging/bcm/Bcmchar.c
@@ -160,7 +160,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
         struct bcm_mini_adapter *Adapter = pTarang->Adapter;
         INT Status = STATUS_FAILURE;
         int timeout = 0;
-        IOCTL_BUFFER IoBuffer;
+        struct bcm_ioctl_buffer IoBuffer;
         int bytes;
 
         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);
@@ -203,13 +203,13 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
         switch (cmd) {
         /* Rdms for Swin Idle... */
         case IOCTL_BCM_REGISTER_READ_PRIVATE: {
-                RDM_BUFFER  sRdmBuffer = {0};
+                struct bcm_rdm_buffer sRdmBuffer = {0};
                 PCHAR temp_buff;
                 UINT Bufflen;
                 u16 temp_value;
 
                 /* Copy Ioctl Buffer structure */
-                if (copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER)))
+                if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))
                         return -EFAULT;
 
                 if (IoBuffer.InputLength > sizeof(sRdmBuffer))
@@ -248,11 +248,11 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
         }
 
         case IOCTL_BCM_REGISTER_WRITE_PRIVATE: {
-                WRM_BUFFER  sWrmBuffer = {0};
+                struct bcm_wrm_buffer sWrmBuffer = {0};
                 UINT uiTempVar = 0;
                 /* Copy Ioctl Buffer structure */
 
-                if (copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER)))
+                if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))
                         return -EFAULT;
 
                 if (IoBuffer.InputLength > sizeof(sWrmBuffer))
@@ -287,7 +287,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
 
         case IOCTL_BCM_REGISTER_READ:
         case IOCTL_BCM_EEPROM_REGISTER_READ: {
-                RDM_BUFFER  sRdmBuffer = {0};
+                struct bcm_rdm_buffer sRdmBuffer = {0};
                 PCHAR temp_buff = NULL;
                 UINT uiTempVar = 0;
                 if ((Adapter->IdleMode == TRUE) ||
@@ -299,7 +299,7 @@ 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)))
+                if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))
                         return -EFAULT;
 
                 if (IoBuffer.InputLength > sizeof(sRdmBuffer))
@@ -345,8 +345,9 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
         }
         case IOCTL_BCM_REGISTER_WRITE:
         case IOCTL_BCM_EEPROM_REGISTER_WRITE: {
-                WRM_BUFFER  sWrmBuffer = {0};
+                struct bcm_wrm_buffer sWrmBuffer = {0};
                 UINT uiTempVar = 0;
+
                 if ((Adapter->IdleMode == TRUE) ||
                         (Adapter->bShutStatus == TRUE) ||
                         (Adapter->bPreparingForLowPowerMode == TRUE)) {
@@ -356,7 +357,7 @@ 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)))
+                if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))
                         return -EFAULT;
 
                 if (IoBuffer.InputLength > sizeof(sWrmBuffer))
@@ -401,8 +402,8 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
                 UINT value = 0;
                 UINT uiBit = 0;
                 UINT uiOperation = 0;
+                struct bcm_gpio_info gpio_info = {0};
 
-                GPIO_INFO   gpio_info = {0};
                 if ((Adapter->IdleMode == TRUE) ||
                         (Adapter->bShutStatus == TRUE) ||
                         (Adapter->bPreparingForLowPowerMode == TRUE)) {
@@ -411,7 +412,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
                         return -EACCES;
                 }
 
-                if (copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER)))
+                if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))
                         return -EFAULT;
 
                 if (IoBuffer.InputLength > sizeof(gpio_info))
@@ -478,7 +479,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};
+                struct bcm_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) ||
@@ -490,7 +491,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
                         break;
                 }
 
-                if (copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER)))
+                if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))
                         return -EFAULT;
 
                 if (IoBuffer.InputLength > sizeof(threadReq))
@@ -518,14 +519,14 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
         case IOCTL_BCM_GPIO_STATUS_REQUEST: {
                 ULONG uiBit = 0;
                 UCHAR ucRead[4];
-                GPIO_INFO   gpio_info = {0};
+                struct bcm_gpio_info gpio_info = {0};
 
                 if ((Adapter->IdleMode == TRUE) ||
                         (Adapter->bShutStatus == TRUE) ||
                         (Adapter->bPreparingForLowPowerMode == TRUE))
                         return -EACCES;
 
-                if (copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER)))
+                if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))
                         return -EFAULT;
 
                 if (IoBuffer.InputLength > sizeof(gpio_info))
@@ -552,17 +553,17 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
 
         case IOCTL_BCM_GPIO_MULTI_REQUEST: {
                 UCHAR ucResetValue[4];
-                GPIO_MULTI_INFO gpio_multi_info[MAX_IDX];
-                PGPIO_MULTI_INFO pgpio_multi_info = (PGPIO_MULTI_INFO)gpio_multi_info;
+                struct bcm_gpio_multi_info gpio_multi_info[MAX_IDX];
+                struct bcm_gpio_multi_info *pgpio_multi_info = (struct bcm_gpio_multi_info *)gpio_multi_info;
 
-                memset(pgpio_multi_info, 0, MAX_IDX * sizeof(GPIO_MULTI_INFO));
+                memset(pgpio_multi_info, 0, MAX_IDX * sizeof(struct bcm_gpio_multi_info));
 
                 if ((Adapter->IdleMode == TRUE) ||
                         (Adapter->bShutStatus == TRUE) ||
                         (Adapter->bPreparingForLowPowerMode == TRUE))
                         return -EINVAL;
 
-                if (copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER)))
+                if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))
                         return -EFAULT;
 
                 if (IoBuffer.InputLength > sizeof(gpio_multi_info))
@@ -636,15 +637,15 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
 
         case IOCTL_BCM_GPIO_MODE_REQUEST: {
                 UCHAR ucResetValue[4];
-                GPIO_MULTI_MODE gpio_multi_mode[MAX_IDX];
-                PGPIO_MULTI_MODE pgpio_multi_mode = (PGPIO_MULTI_MODE)gpio_multi_mode;
+                struct bcm_gpio_multi_mode gpio_multi_mode[MAX_IDX];
+                struct bcm_gpio_multi_mode *pgpio_multi_mode = (struct bcm_gpio_multi_mode *)gpio_multi_mode;
 
                 if ((Adapter->IdleMode == TRUE) ||
                         (Adapter->bShutStatus == TRUE) ||
                         (Adapter->bPreparingForLowPowerMode == TRUE))
                         return -EINVAL;
 
-                if (copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER)))
+                if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))
                         return -EFAULT;
 
                 if (IoBuffer.InputLength > sizeof(gpio_multi_mode))
@@ -719,7 +720,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
                 PVOID pvBuffer = NULL;
 
                 /* Copy Ioctl Buffer structure */
-                if (copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER)))
+                if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))
                         return -EFAULT;
 
                 if (IoBuffer.InputLength < sizeof(struct bcm_link_request))
@@ -799,7 +800,7 @@ cntrlEnd:
                 }
 
                 /* Copy Ioctl Buffer structure */
-                if (copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER))) {
+                if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer))) {
                         up(&Adapter->fw_download_sema);
                         return -EFAULT;
                 }
@@ -895,7 +896,7 @@ cntrlEnd:
                 mdelay(10);
 
                 /* Wait for MailBox Interrupt */
-                if (StartInterruptUrb((PS_INTERFACE_ADAPTER)Adapter->pvInterfaceAdapter))
+                if (StartInterruptUrb((struct bcm_interface_adapter *)Adapter->pvInterfaceAdapter))
                         BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Unable to send interrupt...\n");
 
                 timeout = 5*HZ;
@@ -1000,7 +1001,7 @@ cntrlEnd:
                 ulong len;
 
                 /* Copy Ioctl Buffer structure */
-                if (copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER)))
+                if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))
                         return -EFAULT;
 
                 len = min_t(ulong, IoBuffer.OutputLength, strlen(VER_FILEVERSION_STR) + 1);
@@ -1015,7 +1016,7 @@ cntrlEnd:
                 LINK_STATE link_state;
 
                 /* Copy Ioctl Buffer structure */
-                if (copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER))) {
+                if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer))) {
                         BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "copy_from_user failed..\n");
                         return -EFAULT;
                 }
@@ -1042,7 +1043,7 @@ cntrlEnd:
                 UINT  tracing_flag;
 
                 /* copy ioctl Buffer structure */
-                if (copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER)))
+                if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))
                         return -EFAULT;
 
                 if (copy_from_user(&tracing_flag, IoBuffer.InputBuffer, sizeof(UINT)))
@@ -1057,13 +1058,13 @@ cntrlEnd:
 
         case IOCTL_BCM_GET_DSX_INDICATION: {
                 ULONG ulSFId = 0;
-                if (copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER)))
+                if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))
                         return -EFAULT;
 
-                if (IoBuffer.OutputLength < sizeof(stLocalSFAddIndicationAlt)) {
+                if (IoBuffer.OutputLength < sizeof(struct bcm_add_indication_alt)) {
                         BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
                                         "Mismatch req: %lx needed is =0x%zx!!!",
-                                        IoBuffer.OutputLength, sizeof(stLocalSFAddIndicationAlt));
+                                        IoBuffer.OutputLength, sizeof(struct bcm_add_indication_alt));
                         return -EINVAL;
                 }
 
@@ -1079,18 +1080,18 @@ cntrlEnd:
         case IOCTL_BCM_GET_HOST_MIBS: {
                 PVOID temp_buff;
 
-                if (copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER)))
+                if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))
                         return -EFAULT;
 
-                if (IoBuffer.OutputLength != sizeof(S_MIBS_HOST_STATS_MIBS)) {
+                if (IoBuffer.OutputLength != sizeof(struct bcm_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));
+                                        IoBuffer.OutputLength, sizeof(struct bcm_host_stats_mibs));
                         return -EINVAL;
                 }
 
                 /* FIXME: HOST_STATS are too big for kmalloc (122048)! */
-                temp_buff = kzalloc(sizeof(S_MIBS_HOST_STATS_MIBS), GFP_KERNEL);
+                temp_buff = kzalloc(sizeof(struct bcm_host_stats_mibs), GFP_KERNEL);
                 if (!temp_buff)
                         return STATUS_FAILURE;
 
@@ -1098,7 +1099,7 @@ cntrlEnd:
                 GetDroppedAppCntrlPktMibs(temp_buff, pTarang);
 
                 if (Status != STATUS_FAILURE)
-                        if (copy_to_user(IoBuffer.OutputBuffer, temp_buff, sizeof(S_MIBS_HOST_STATS_MIBS))) {
+                        if (copy_to_user(IoBuffer.OutputBuffer, temp_buff, sizeof(struct bcm_host_stats_mibs))) {
                                 kfree(temp_buff);
                                 return -EFAULT;
                         }
@@ -1118,7 +1119,7 @@ cntrlEnd:
                 break;
 
         case IOCTL_BCM_BULK_WRM: {
-                PBULKWRM_BUFFER pBulkBuffer;
+                struct bcm_bulk_wrm_buffer *pBulkBuffer;
                 UINT uiTempVar = 0;
                 PCHAR pvBuffer = NULL;
 
@@ -1132,7 +1133,7 @@ cntrlEnd:
                 }
 
                 /* Copy Ioctl Buffer structure */
-                if (copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER)))
+                if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))
                         return -EFAULT;
 
                 if (IoBuffer.InputLength < sizeof(ULONG) * 2)
@@ -1143,7 +1144,7 @@ cntrlEnd:
                 if (IS_ERR(pvBuffer))
                         return PTR_ERR(pvBuffer);
 
-                pBulkBuffer = (PBULKWRM_BUFFER)pvBuffer;
+                pBulkBuffer = (struct bcm_bulk_wrm_buffer *)pvBuffer;
 
                 if (((ULONG)pBulkBuffer->Register & 0x0F000000) != 0x0F000000 ||
                         ((ULONG)pBulkBuffer->Register & 0x3)) {
@@ -1180,7 +1181,7 @@ cntrlEnd:
         }
 
         case IOCTL_BCM_GET_NVM_SIZE:
-                if (copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER)))
+                if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))
                         return -EFAULT;
 
                 if (Adapter->eNVMType == NVM_EEPROM || Adapter->eNVMType == NVM_FLASH) {
@@ -1194,7 +1195,7 @@ cntrlEnd:
         case IOCTL_BCM_CAL_INIT: {
                 UINT uiSectorSize = 0 ;
                 if (Adapter->eNVMType == NVM_FLASH) {
-                        if (copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER)))
+                        if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))
                                 return -EFAULT;
 
                         if (copy_from_user(&uiSectorSize, IoBuffer.InputBuffer, sizeof(UINT)))
@@ -1231,7 +1232,7 @@ cntrlEnd:
                 USER_BCM_DBG_STATE sUserDebugState;
 
                 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "In SET_DEBUG ioctl\n");
-                if (copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER)))
+                if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))
                         return -EFAULT;
 
                 if (copy_from_user(&sUserDebugState, IoBuffer.InputBuffer, sizeof(USER_BCM_DBG_STATE)))
@@ -1262,7 +1263,7 @@ cntrlEnd:
 
         case IOCTL_BCM_NVM_READ:
         case IOCTL_BCM_NVM_WRITE: {
-                NVM_READWRITE  stNVMReadWrite;
+                struct bcm_nvm_readwrite stNVMReadWrite;
                 PUCHAR pReadData = NULL;
                 ULONG ulDSDMagicNumInUsrBuff = 0;
                 struct timeval tv0, tv1;
@@ -1284,12 +1285,12 @@ cntrlEnd:
                 }
 
                 /* Copy Ioctl Buffer structure */
-                if (copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER)))
+                if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))
                         return -EFAULT;
 
                 if (copy_from_user(&stNVMReadWrite,
                                         (IOCTL_BCM_NVM_READ == cmd) ? IoBuffer.OutputBuffer : IoBuffer.InputBuffer,
-                                        sizeof(NVM_READWRITE)))
+                                        sizeof(struct bcm_nvm_readwrite)))
                         return -EFAULT;
 
                 /*
@@ -1404,7 +1405,7 @@ cntrlEnd:
         }
 
         case IOCTL_BCM_FLASH2X_SECTION_READ: {
-                FLASH2X_READWRITE sFlash2xRead = {0};
+                struct bcm_flash2x_readwrite sFlash2xRead = {0};
                 PUCHAR pReadBuff = NULL ;
                 UINT NOB = 0;
                 UINT BuffSize = 0;
@@ -1418,11 +1419,11 @@ cntrlEnd:
                 }
 
                 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "IOCTL_BCM_FLASH2X_SECTION_READ Called");
-                if (copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER)))
+                if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))
                         return -EFAULT;
 
                 /* Reading FLASH 2.x READ structure */
-                if (copy_from_user(&sFlash2xRead, IoBuffer.InputBuffer, sizeof(FLASH2X_READWRITE)))
+                if (copy_from_user(&sFlash2xRead, IoBuffer.InputBuffer, sizeof(struct bcm_flash2x_readwrite)))
                         return -EFAULT;
 
                 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "\nsFlash2xRead.Section :%x", sFlash2xRead.Section);
@@ -1495,7 +1496,7 @@ cntrlEnd:
         break;
 
         case IOCTL_BCM_FLASH2X_SECTION_WRITE: {
-                FLASH2X_READWRITE sFlash2xWrite = {0};
+                struct bcm_flash2x_readwrite sFlash2xWrite = {0};
                 PUCHAR pWriteBuff;
                 void __user *InputAddr;
                 UINT NOB = 0;
@@ -1513,11 +1514,11 @@ cntrlEnd:
 
                 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "IOCTL_BCM_FLASH2X_SECTION_WRITE Called");
 
-                if (copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER)))
+                if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))
                         return -EFAULT;
 
                 /* Reading FLASH 2.x READ structure */
-                if (copy_from_user(&sFlash2xWrite, IoBuffer.InputBuffer, sizeof(FLASH2X_READWRITE)))
+                if (copy_from_user(&sFlash2xWrite, IoBuffer.InputBuffer, sizeof(struct bcm_flash2x_readwrite)))
                         return -EFAULT;
 
                 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "\nsFlash2xRead.Section :%x", sFlash2xWrite.Section);
@@ -1604,16 +1605,16 @@ cntrlEnd:
         break;
 
         case IOCTL_BCM_GET_FLASH2X_SECTION_BITMAP: {
-                PFLASH2X_BITMAP psFlash2xBitMap;
+                struct bcm_flash2x_bitmap *psFlash2xBitMap;
                 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "IOCTL_BCM_GET_FLASH2X_SECTION_BITMAP Called");
 
-                if (copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER)))
+                if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))
                         return -EFAULT;
 
-                if (IoBuffer.OutputLength != sizeof(FLASH2X_BITMAP))
+                if (IoBuffer.OutputLength != sizeof(struct bcm_flash2x_bitmap))
                         return -EINVAL;
 
-                psFlash2xBitMap = kzalloc(sizeof(FLASH2X_BITMAP), GFP_KERNEL);
+                psFlash2xBitMap = kzalloc(sizeof(struct bcm_flash2x_bitmap), GFP_KERNEL);
                 if (psFlash2xBitMap == NULL) {
                         BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Memory is not available");
                         return -ENOMEM;
@@ -1634,7 +1635,7 @@ cntrlEnd:
 
                 BcmGetFlash2xSectionalBitMap(Adapter, psFlash2xBitMap);
                 up(&Adapter->NVMRdmWrmLock);
-                if (copy_to_user(IoBuffer.OutputBuffer, psFlash2xBitMap, sizeof(FLASH2X_BITMAP))) {
+                if (copy_to_user(IoBuffer.OutputBuffer, psFlash2xBitMap, sizeof(struct bcm_flash2x_bitmap))) {
                         kfree(psFlash2xBitMap);
                         return -EFAULT;
                 }
@@ -1644,7 +1645,7 @@ cntrlEnd:
         break;
 
         case IOCTL_BCM_SET_ACTIVE_SECTION: {
-                FLASH2X_SECTION_VAL eFlash2xSectionVal = 0;
+                enum bcm_flash2x_section_val eFlash2xSectionVal = 0;
                 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "IOCTL_BCM_SET_ACTIVE_SECTION Called");
 
                 if (IsFlash2x(Adapter) != TRUE) {
@@ -1652,7 +1653,7 @@ cntrlEnd:
                         return -EINVAL;
                 }
 
-                Status = copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER));
+                Status = copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer));
                 if (Status) {
                         BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Copy of IOCTL BUFFER failed");
                         return -EFAULT;
@@ -1692,7 +1693,7 @@ cntrlEnd:
         break;
 
         case IOCTL_BCM_COPY_SECTION: {
-                FLASH2X_COPY_SECTION sCopySectStrut = {0};
+                struct bcm_flash2x_copy_section sCopySectStrut = {0};
                 Status = STATUS_SUCCESS;
                 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "IOCTL_BCM_COPY_SECTION  Called");
 
@@ -1702,13 +1703,13 @@ cntrlEnd:
                         return -EINVAL;
                 }
 
-                Status = copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER));
+                Status = copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer));
                 if (Status) {
                         BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Copy of IOCTL BUFFER failed Status :%d", Status);
                         return -EFAULT;
                 }
 
-                Status = copy_from_user(&sCopySectStrut, IoBuffer.InputBuffer, sizeof(FLASH2X_COPY_SECTION));
+                Status = copy_from_user(&sCopySectStrut, IoBuffer.InputBuffer, sizeof(struct bcm_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;
@@ -1769,7 +1770,7 @@ cntrlEnd:
                 Status = STATUS_SUCCESS;
                 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, " IOCTL_BCM_GET_FLASH_CS_INFO Called");
 
-                Status = copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER));
+                Status = copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer));
                 if (Status) {
                         BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Copy of IOCTL BUFFER failed");
                         return -EFAULT;
@@ -1799,7 +1800,7 @@ cntrlEnd:
 
         case IOCTL_BCM_SELECT_DSD: {
                 UINT SectOfset = 0;
-                FLASH2X_SECTION_VAL eFlash2xSectionVal;
+                enum bcm_flash2x_section_val eFlash2xSectionVal;
                 eFlash2xSectionVal = NO_SECTION_VAL;
                 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "IOCTL_BCM_SELECT_DSD Called");
 
@@ -1808,7 +1809,7 @@ cntrlEnd:
                         return -EINVAL;
                 }
 
-                Status = copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER));
+                Status = copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer));
                 if (Status) {
                         BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Copy of IOCTL BUFFER failed");
                         return -EFAULT;
@@ -1842,7 +1843,7 @@ cntrlEnd:
         break;
 
         case IOCTL_BCM_NVM_RAW_READ: {
-                NVM_READWRITE stNVMRead;
+                struct bcm_nvm_readwrite stNVMRead;
                 INT NOB ;
                 INT BuffSize ;
                 INT ReadOffset = 0;
@@ -1856,12 +1857,12 @@ cntrlEnd:
                 }
 
                 /* Copy Ioctl Buffer structure */
-                if (copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER))) {
+                if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer))) {
                         BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "copy_from_user 1 failed\n");
                         return -EFAULT;
                 }
 
-                if (copy_from_user(&stNVMRead, IoBuffer.OutputBuffer, sizeof(NVM_READWRITE)))
+                if (copy_from_user(&stNVMRead, IoBuffer.OutputBuffer, sizeof(struct bcm_nvm_readwrite)))
                         return -EFAULT;
 
                 NOB = stNVMRead.uiNumBytes;
@@ -1933,7 +1934,7 @@ cntrlEnd:
                 ULONG RxCntrlMsgBitMask = 0;
 
                 /* Copy Ioctl Buffer structure */
-                Status = copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER));
+                Status = copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer));
                 if (Status) {
                         BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "copy of Ioctl buffer is failed from user space");
                         return -EFAULT;
@@ -1955,7 +1956,7 @@ cntrlEnd:
         break;
 
         case IOCTL_BCM_GET_DEVICE_DRIVER_INFO: {
-                DEVICE_DRIVER_INFO DevInfo;
+                struct bcm_driver_info DevInfo;
 
                 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Called IOCTL_BCM_GET_DEVICE_DRIVER_INFO\n");
 
@@ -1965,7 +1966,7 @@ cntrlEnd:
                 DevInfo.u32NVMType = Adapter->eNVMType;
                 DevInfo.u32InterfaceType = BCM_USB;
 
-                if (copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER)))
+                if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))
                         return -EFAULT;
 
                 if (IoBuffer.OutputLength < sizeof(DevInfo))
@@ -1977,19 +1978,19 @@ cntrlEnd:
         break;
 
         case IOCTL_BCM_TIME_SINCE_NET_ENTRY: {
-                ST_TIME_ELAPSED stTimeElapsedSinceNetEntry = {0};
+                struct bcm_time_elapsed stTimeElapsedSinceNetEntry = {0};
 
                 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "IOCTL_BCM_TIME_SINCE_NET_ENTRY called");
 
-                if (copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER)))
+                if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))
                         return -EFAULT;
 
-                if (IoBuffer.OutputLength < sizeof(ST_TIME_ELAPSED))
+                if (IoBuffer.OutputLength < sizeof(struct bcm_time_elapsed))
                         return -EINVAL;
 
                 stTimeElapsedSinceNetEntry.ul64TimeElapsedSinceNetEntry = get_seconds() - Adapter->liTimeSinceLastNetEntry;
 
-                if (copy_to_user(IoBuffer.OutputBuffer, &stTimeElapsedSinceNetEntry, sizeof(ST_TIME_ELAPSED)))
+                if (copy_to_user(IoBuffer.OutputBuffer, &stTimeElapsedSinceNetEntry, sizeof(struct bcm_time_elapsed)))
                         return -EFAULT;
         }
         break;
diff --git a/drivers/staging/bcm/Bcmnet.c b/drivers/staging/bcm/Bcmnet.c
index 6e8c7f523214..a3b91c7ee8ff 100644
--- a/drivers/staging/bcm/Bcmnet.c
+++ b/drivers/staging/bcm/Bcmnet.c
@@ -142,7 +142,7 @@ static void bcm_get_drvinfo(struct net_device *dev,
                             struct ethtool_drvinfo *info)
 {
         struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(dev);
-        PS_INTERFACE_ADAPTER psIntfAdapter = Adapter->pvInterfaceAdapter;
+        struct bcm_interface_adapter *psIntfAdapter = Adapter->pvInterfaceAdapter;
         struct usb_device *udev = interface_to_usbdev(psIntfAdapter->interface);
 
         strcpy(info->driver, DRV_NAME);
@@ -186,7 +186,7 @@ static const struct ethtool_ops bcm_ethtool_ops = {
 int register_networkdev(struct bcm_mini_adapter *Adapter)
 {
         struct net_device *net = Adapter->dev;
-        PS_INTERFACE_ADAPTER IntfAdapter = Adapter->pvInterfaceAdapter;
+        struct bcm_interface_adapter *IntfAdapter = Adapter->pvInterfaceAdapter;
         struct usb_interface *udev = IntfAdapter->interface;
         struct usb_device *xdev = IntfAdapter->udev;
 
@@ -227,7 +227,7 @@ int register_networkdev(struct bcm_mini_adapter *Adapter)
 void unregister_networkdev(struct bcm_mini_adapter *Adapter)
 {
         struct net_device *net = Adapter->dev;
-        PS_INTERFACE_ADAPTER IntfAdapter = Adapter->pvInterfaceAdapter;
+        struct bcm_interface_adapter *IntfAdapter = Adapter->pvInterfaceAdapter;
         struct usb_interface *udev = IntfAdapter->interface;
         struct usb_device *xdev = IntfAdapter->udev;
 
diff --git a/drivers/staging/bcm/CmHost.c b/drivers/staging/bcm/CmHost.c
index 325b592fd41f..23ddc3d7c9ea 100644
--- a/drivers/staging/bcm/CmHost.c
+++ b/drivers/staging/bcm/CmHost.c
@@ -107,7 +107,7 @@ static VOID deleteSFBySfid(struct bcm_mini_adapter *Adapter, UINT uiSearchRuleIn
         DeleteAllClassifiersForSF(Adapter, uiSearchRuleIndex);
 
         /* Resetting only MIBS related entries in the SF */
-        memset((PVOID)&Adapter->PackInfo[uiSearchRuleIndex], 0, sizeof(S_MIBS_SERVICEFLOW_TABLE));
+        memset((PVOID)&Adapter->PackInfo[uiSearchRuleIndex], 0, sizeof(struct bcm_mibs_table));
 }
 
 static inline VOID
@@ -431,7 +431,7 @@ static VOID CopyToAdapter(register struct bcm_mini_adapter *Adapter, /* <Pointer
                         register struct bcm_connect_mgr_params *psfLocalSet, /* Pointer to the connection manager parameters structure */
                         register UINT uiSearchRuleIndex, /* <Index of Queue, to which this data belongs */
                         register UCHAR ucDsxType,
-                        stLocalSFAddIndicationAlt *pstAddIndication) {
+                        struct bcm_add_indication_alt *pstAddIndication) {
 
         /* UCHAR ucProtocolLength = 0; */
         ULONG ulSFID;
@@ -833,11 +833,11 @@ static VOID DumpCmControlPacket(PVOID pvBuffer)
 {
         int uiLoopIndex;
         int nIndex;
-        stLocalSFAddIndicationAlt *pstAddIndication;
+        struct bcm_add_indication_alt *pstAddIndication;
         UINT nCurClassifierCnt;
         struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev);
 
-        pstAddIndication = (stLocalSFAddIndicationAlt *)pvBuffer;
+        pstAddIndication = (struct bcm_add_indication_alt *)pvBuffer;
         BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "======>");
         BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "u8Type: 0x%X", pstAddIndication->u8Type);
         BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "u8Direction: 0x%X", pstAddIndication->u8Direction);
@@ -1333,13 +1333,13 @@ static ULONG StoreSFParam(struct bcm_mini_adapter *Adapter, PUCHAR pucSrcBuffer,
 
 ULONG StoreCmControlResponseMessage(struct bcm_mini_adapter *Adapter, PVOID pvBuffer, UINT *puBufferLength)
 {
-        stLocalSFAddIndicationAlt *pstAddIndicationAlt = NULL;
+        struct bcm_add_indication_alt *pstAddIndicationAlt = NULL;
         struct bcm_add_indication *pstAddIndication = NULL;
         struct bcm_del_request *pstDeletionRequest;
         UINT uiSearchRuleIndex;
         ULONG ulSFID;
 
-        pstAddIndicationAlt = (stLocalSFAddIndicationAlt *)(pvBuffer);
+        pstAddIndicationAlt = (struct bcm_add_indication_alt *)(pvBuffer);
 
         /*
          * In case of DSD Req By MS, we should immediately delete this SF so that
@@ -1445,29 +1445,29 @@ ULONG StoreCmControlResponseMessage(struct bcm_mini_adapter *Adapter, PVOID pvBu
         return 1;
 }
 
-static inline stLocalSFAddIndicationAlt
+static inline struct bcm_add_indication_alt
 *RestoreCmControlResponseMessage(register struct bcm_mini_adapter *Adapter, register PVOID pvBuffer)
 {
         ULONG ulStatus = 0;
         struct bcm_add_indication *pstAddIndication = NULL;
-        stLocalSFAddIndicationAlt *pstAddIndicationDest = NULL;
+        struct bcm_add_indication_alt *pstAddIndicationDest = NULL;
 
         pstAddIndication = (struct bcm_add_indication *)(pvBuffer);
         BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "=====>");
         if ((pstAddIndication->u8Type == DSD_REQ) ||
                 (pstAddIndication->u8Type == DSD_RSP) ||
                 (pstAddIndication->u8Type == DSD_ACK))
-                return (stLocalSFAddIndicationAlt *)pvBuffer;
+                return (struct bcm_add_indication_alt *)pvBuffer;
 
         BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "Inside RestoreCmControlResponseMessage ");
         /*
          * Need to Allocate memory to contain the SUPER Large structures
          * Our driver can't create these structures on Stack :(
          */
-        pstAddIndicationDest = kmalloc(sizeof(stLocalSFAddIndicationAlt), GFP_KERNEL);
+        pstAddIndicationDest = kmalloc(sizeof(struct bcm_add_indication_alt), GFP_KERNEL);
 
         if (pstAddIndicationDest) {
-                memset(pstAddIndicationDest, 0, sizeof(stLocalSFAddIndicationAlt));
+                memset(pstAddIndicationDest, 0, sizeof(struct bcm_add_indication_alt));
         } else {
                 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "Failed to allocate memory for SF Add Indication Structure ");
                 return NULL;
@@ -1573,36 +1573,36 @@ ULONG SetUpTargetDsxBuffers(struct bcm_mini_adapter *Adapter)
 
 static ULONG GetNextTargetBufferLocation(struct bcm_mini_adapter *Adapter, B_UINT16 tid)
 {
-        ULONG ulTargetDSXBufferAddress;
-        ULONG ulTargetDsxBufferIndexToUse, ulMaxTry;
+        ULONG dsx_buf;
+        ULONG idx, max_try;
 
         if ((Adapter->ulTotalTargetBuffersAvailable == 0) || (Adapter->ulFreeTargetBufferCnt == 0)) {
                 ClearTargetDSXBuffer(Adapter, tid, FALSE);
                 return 0;
         }
 
-        ulTargetDsxBufferIndexToUse = Adapter->ulCurrentTargetBuffer;
-        ulMaxTry = Adapter->ulTotalTargetBuffersAvailable;
-        while ((ulMaxTry) && (Adapter->astTargetDsxBuffer[ulTargetDsxBufferIndexToUse].valid != 1)) {
-                ulTargetDsxBufferIndexToUse = (ulTargetDsxBufferIndexToUse+1) % Adapter->ulTotalTargetBuffersAvailable;
-                ulMaxTry--;
+        idx = Adapter->ulCurrentTargetBuffer;
+        max_try = Adapter->ulTotalTargetBuffersAvailable;
+        while ((max_try) && (Adapter->astTargetDsxBuffer[idx].valid != 1)) {
+                idx = (idx+1) % Adapter->ulTotalTargetBuffersAvailable;
+                max_try--;
         }
 
-        if (ulMaxTry == 0) {
+        if (max_try == 0) {
                 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "\n GetNextTargetBufferLocation : Error No Free Target DSX Buffers FreeCnt : %lx ", Adapter->ulFreeTargetBufferCnt);
                 ClearTargetDSXBuffer(Adapter, tid, FALSE);
                 return 0;
         }
 
-        ulTargetDSXBufferAddress = Adapter->astTargetDsxBuffer[ulTargetDsxBufferIndexToUse].ulTargetDsxBuffer;
-        Adapter->astTargetDsxBuffer[ulTargetDsxBufferIndexToUse].valid = 0;
-        Adapter->astTargetDsxBuffer[ulTargetDsxBufferIndexToUse].tid = tid;
+        dsx_buf = Adapter->astTargetDsxBuffer[idx].ulTargetDsxBuffer;
+        Adapter->astTargetDsxBuffer[idx].valid = 0;
+        Adapter->astTargetDsxBuffer[idx].tid = tid;
         Adapter->ulFreeTargetBufferCnt--;
-        ulTargetDsxBufferIndexToUse = (ulTargetDsxBufferIndexToUse+1)%Adapter->ulTotalTargetBuffersAvailable;
-        Adapter->ulCurrentTargetBuffer = ulTargetDsxBufferIndexToUse;
-        BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "GetNextTargetBufferLocation :Returning address %lx tid %d\n", ulTargetDSXBufferAddress, tid);
+        idx = (idx+1)%Adapter->ulTotalTargetBuffersAvailable;
+        Adapter->ulCurrentTargetBuffer = idx;
+        BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "GetNextTargetBufferLocation :Returning address %lx tid %d\n", dsx_buf, tid);
 
-        return ulTargetDSXBufferAddress;
+        return dsx_buf;
 }
 
 int AllocAdapterDsxBuffer(struct bcm_mini_adapter *Adapter)
@@ -1611,7 +1611,7 @@ int AllocAdapterDsxBuffer(struct bcm_mini_adapter *Adapter)
          * Need to Allocate memory to contain the SUPER Large structures
          * Our driver can't create these structures on Stack
          */
-        Adapter->caDsxReqResp = kmalloc(sizeof(stLocalSFAddIndicationAlt)+LEADER_SIZE, GFP_KERNEL);
+        Adapter->caDsxReqResp = kmalloc(sizeof(struct bcm_add_indication_alt)+LEADER_SIZE, GFP_KERNEL);
         if (!Adapter->caDsxReqResp)
                 return -ENOMEM;
 
@@ -1634,8 +1634,8 @@ BOOLEAN CmControlResponseMessage(struct bcm_mini_adapter *Adapter,  /* <Pointer
                                 PVOID pvBuffer /* Starting Address of the Buffer, that contains the AddIndication Data */)
 {
         struct bcm_connect_mgr_params *psfLocalSet = NULL;
-        stLocalSFAddIndicationAlt *pstAddIndication = NULL;
-        stLocalSFChangeIndicationAlt *pstChangeIndication = NULL;
+        struct bcm_add_indication_alt *pstAddIndication = NULL;
+        struct bcm_change_indication *pstChangeIndication = NULL;
         struct bcm_leader *pLeader = NULL;
 
         /*
@@ -1661,12 +1661,12 @@ BOOLEAN CmControlResponseMessage(struct bcm_mini_adapter *Adapter,  /* <Pointer
         switch (pstAddIndication->u8Type) {
         case DSA_REQ:
         {
-                pLeader->PLength = sizeof(stLocalSFAddIndicationAlt);
+                pLeader->PLength = sizeof(struct bcm_add_indication_alt);
                 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "Sending DSA Response....\n");
                 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "SENDING DSA RESPONSE TO MAC %d", pLeader->PLength);
-                *((stLocalSFAddIndicationAlt *)&(Adapter->caDsxReqResp[LEADER_SIZE]))
+                *((struct bcm_add_indication_alt *)&(Adapter->caDsxReqResp[LEADER_SIZE]))
                         = *pstAddIndication;
-                ((stLocalSFAddIndicationAlt *)&(Adapter->caDsxReqResp[LEADER_SIZE]))->u8Type = DSA_RSP;
+                ((struct bcm_add_indication_alt *)&(Adapter->caDsxReqResp[LEADER_SIZE]))->u8Type = DSA_RSP;
 
                 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, " VCID = %x", ntohs(pstAddIndication->u16VCID));
                 CopyBufferToControlPacket(Adapter, (PVOID)Adapter->caDsxReqResp);
@@ -1675,12 +1675,12 @@ BOOLEAN CmControlResponseMessage(struct bcm_mini_adapter *Adapter,  /* <Pointer
         break;
         case DSA_RSP:
         {
-                pLeader->PLength = sizeof(stLocalSFAddIndicationAlt);
+                pLeader->PLength = sizeof(struct bcm_add_indication_alt);
                 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "SENDING DSA ACK TO MAC %d",
                                 pLeader->PLength);
-                *((stLocalSFAddIndicationAlt *)&(Adapter->caDsxReqResp[LEADER_SIZE]))
+                *((struct bcm_add_indication_alt *)&(Adapter->caDsxReqResp[LEADER_SIZE]))
                         = *pstAddIndication;
-                ((stLocalSFAddIndicationAlt *)&(Adapter->caDsxReqResp[LEADER_SIZE]))->u8Type = DSA_ACK;
+                ((struct bcm_add_indication_alt *)&(Adapter->caDsxReqResp[LEADER_SIZE]))->u8Type = DSA_ACK;
 
         } /* no break here..we should go down. */
         case DSA_ACK:
@@ -1773,12 +1773,12 @@ BOOLEAN CmControlResponseMessage(struct bcm_mini_adapter *Adapter,  /* <Pointer
         break;
         case DSC_REQ:
         {
-                pLeader->PLength = sizeof(stLocalSFChangeIndicationAlt);
-                pstChangeIndication = (stLocalSFChangeIndicationAlt *)pstAddIndication;
+                pLeader->PLength = sizeof(struct bcm_change_indication);
+                pstChangeIndication = (struct bcm_change_indication *)pstAddIndication;
                 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "SENDING DSC RESPONSE TO MAC %d", pLeader->PLength);
 
-                *((stLocalSFChangeIndicationAlt *)&(Adapter->caDsxReqResp[LEADER_SIZE])) = *pstChangeIndication;
-                ((stLocalSFChangeIndicationAlt *)&(Adapter->caDsxReqResp[LEADER_SIZE]))->u8Type = DSC_RSP;
+                *((struct bcm_change_indication *)&(Adapter->caDsxReqResp[LEADER_SIZE])) = *pstChangeIndication;
+                ((struct bcm_change_indication *)&(Adapter->caDsxReqResp[LEADER_SIZE]))->u8Type = DSC_RSP;
 
                 CopyBufferToControlPacket(Adapter, (PVOID)Adapter->caDsxReqResp);
                 kfree(pstAddIndication);
@@ -1786,17 +1786,17 @@ BOOLEAN CmControlResponseMessage(struct bcm_mini_adapter *Adapter,  /* <Pointer
         break;
         case DSC_RSP:
         {
-                pLeader->PLength = sizeof(stLocalSFChangeIndicationAlt);
-                pstChangeIndication = (stLocalSFChangeIndicationAlt *)pstAddIndication;
+                pLeader->PLength = sizeof(struct bcm_change_indication);
+                pstChangeIndication = (struct bcm_change_indication *)pstAddIndication;
                 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "SENDING DSC ACK TO MAC %d", pLeader->PLength);
-                *((stLocalSFChangeIndicationAlt *)&(Adapter->caDsxReqResp[LEADER_SIZE])) = *pstChangeIndication;
-                ((stLocalSFChangeIndicationAlt *)&(Adapter->caDsxReqResp[LEADER_SIZE]))->u8Type = DSC_ACK;
+                *((struct bcm_change_indication *)&(Adapter->caDsxReqResp[LEADER_SIZE])) = *pstChangeIndication;
+                ((struct bcm_change_indication *)&(Adapter->caDsxReqResp[LEADER_SIZE]))->u8Type = DSC_ACK;
         }
         case DSC_ACK:
         {
                 UINT uiSearchRuleIndex = 0;
 
-                pstChangeIndication = (stLocalSFChangeIndicationAlt *)pstAddIndication;
+                pstChangeIndication = (struct bcm_change_indication *)pstAddIndication;
                 uiSearchRuleIndex = SearchSfid(Adapter, ntohl(pstChangeIndication->sfActiveSet.u32SFID));
                 if (uiSearchRuleIndex > NO_OF_QUEUES-1)
                         BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "SF doesn't exist for which DSC_ACK is received");
@@ -1902,7 +1902,7 @@ int get_dsx_sf_data_to_application(struct bcm_mini_adapter *Adapter, UINT uiSFId
         BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "status =%d", status);
         psSfInfo = &Adapter->PackInfo[status];
         if (psSfInfo->pstSFIndication && copy_to_user(user_buffer,
-                                                        psSfInfo->pstSFIndication, sizeof(stLocalSFAddIndicationAlt))) {
+                                                        psSfInfo->pstSFIndication, sizeof(struct bcm_add_indication_alt))) {
                 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "copy to user failed SFID %d, present in queue !!!", uiSFId);
                 status = -EFAULT;
                 return status;
diff --git a/drivers/staging/bcm/CmHost.h b/drivers/staging/bcm/CmHost.h
index 1c5a07c7bbe2..eecad8d90aea 100644
--- a/drivers/staging/bcm/CmHost.h
+++ b/drivers/staging/bcm/CmHost.h
@@ -1,147 +1,66 @@
-/// **************************************************************************
-/// (c) Beceem Communications Inc.
-///     All Rights Reserved
-///
-///   \file        : CmHost.h
-///   \author      : Rajeev Tirumala
-///   \date        : September 8 , 2006
-///   \brief       : Definitions for Connection Management Requests structure
-///                  which we will use to setup our connection structures.Its high
-///                  time we had a header file for CmHost.cpp to isolate the way
-///                  f/w sends DSx messages and the way we interpret them in code.
-///                              Revision History
-///
-///    Date       Author   Version   Description
-///  08-Sep-06    Rajeev       0.1      Created
-/// **************************************************************************
+/***************************************************************************
+ * (c) Beceem Communications Inc.
+ * All Rights Reserved
+ *
+ * file  : CmHost.h
+ * author: Rajeev Tirumala
+ * date  : September 8 , 2006
+ * brief : Definitions for Connection Management Requests structure
+ *          which we will use to setup our connection structures.Its high
+ *          time we had a header file for CmHost.cpp to isolate the way
+ *          f/w sends DSx messages and the way we interpret them in code.
+ *          Revision History
+ *
+ *   Date       Author   Version   Description
+ *   08-Sep-06    Rajeev       0.1      Created
+ ***************************************************************************/
 #ifndef _CM_HOST_H
 #define _CM_HOST_H
 
 #pragma once
-#pragma pack (push,4)
-
-#define  DSX_MESSAGE_EXCHANGE_BUFFER        0xBF60AC84 // This contains the pointer
-#define  DSX_MESSAGE_EXCHANGE_BUFFER_SIZE   72000 // 24 K Bytes
-
-/// \brief structure stLocalSFAddRequest
-typedef struct stLocalSFAddRequestAlt{
-        B_UINT8                         u8Type;
-        B_UINT8      u8Direction;
-
-        B_UINT16                        u16TID;
-   /// \brief 16bitCID
-    B_UINT16                        u16CID;
-    /// \brief 16bitVCID
-    B_UINT16                        u16VCID;
-
-
-        struct bcm_connect_mgr_params sfParameterSet;
-
-    //USE_MEMORY_MANAGER();
-}stLocalSFAddRequestAlt;
-
-/// \brief structure stLocalSFAddIndication
-typedef struct stLocalSFAddIndicationAlt{
-    B_UINT8                         u8Type;
-        B_UINT8      u8Direction;
-        B_UINT16                         u16TID;
-    /// \brief 16bitCID
-    B_UINT16                        u16CID;
-    /// \brief 16bitVCID
-    B_UINT16                        u16VCID;
+#pragma pack(push, 4)
+
+#define DSX_MESSAGE_EXCHANGE_BUFFER        0xBF60AC84 /* This contains the pointer */
+#define DSX_MESSAGE_EXCHANGE_BUFFER_SIZE   72000      /* 24 K Bytes */
+
+struct bcm_add_indication_alt {
+        u8      u8Type;
+        u8      u8Direction;
+        u16     u16TID;
+        /* brief 16bitCID */
+        u16     u16CID;
+        /* brief 16bitVCID */
+        u16     u16VCID;
         struct bcm_connect_mgr_params sfAuthorizedSet;
         struct bcm_connect_mgr_params sfAdmittedSet;
         struct bcm_connect_mgr_params sfActiveSet;
-
-        B_UINT8                                                 u8CC;   /**<  Confirmation Code*/
-        B_UINT8                                                 u8Padd;         /**<  8-bit Padding */
-        B_UINT16                                                u16Padd;        /**< 16 bit Padding */
-//    USE_MEMORY_MANAGER();
-}stLocalSFAddIndicationAlt;
-
-/// \brief structure stLocalSFAddConfirmation
-typedef struct stLocalSFAddConfirmationAlt{
-        B_UINT8                     u8Type;
-        B_UINT8                                 u8Direction;
-        B_UINT16                                        u16TID;
-    /// \brief 16bitCID
-    B_UINT16                        u16CID;
-    /// \brief 16bitVCID
-    B_UINT16                        u16VCID;
+        u8      u8CC;    /* < Confirmation Code */
+        u8      u8Padd;  /* < 8-bit Padding */
+        u16     u16Padd; /* < 16 bit Padding */
+};
+
+struct bcm_change_indication {
+        u8      u8Type;
+        u8      u8Direction;
+        u16     u16TID;
+        /* brief 16bitCID */
+        u16     u16CID;
+        /* brief 16bitVCID */
+        u16     u16VCID;
         struct bcm_connect_mgr_params sfAuthorizedSet;
         struct bcm_connect_mgr_params sfAdmittedSet;
         struct bcm_connect_mgr_params sfActiveSet;
-}stLocalSFAddConfirmationAlt;
-
-
-/// \brief structure stLocalSFChangeRequest
-typedef struct stLocalSFChangeRequestAlt{
-    B_UINT8                         u8Type;
-        B_UINT8      u8Direction;
-        B_UINT16                                        u16TID;
-    /// \brief 16bitCID
-    B_UINT16                        u16CID;
-    /// \brief 16bitVCID
-    B_UINT16                        u16VCID;
-        /*
-        //Pointer location at which following connection manager param Structure can be read
-        //from the target. We only get the address location and we need to read out the
-        //entire connection manager param structure at the given location on target
-        */
-        struct bcm_connect_mgr_params sfAuthorizedSet;
-        struct bcm_connect_mgr_params sfAdmittedSet;
-        struct bcm_connect_mgr_params sfActiveSet;
-
-        B_UINT8                                                 u8CC;   /**<  Confirmation Code*/
-        B_UINT8                                                 u8Padd;         /**<  8-bit Padding */
-        B_UINT16                                                u16Padd;        /**< 16 bit */
-
-}stLocalSFChangeRequestAlt;
-
-/// \brief structure stLocalSFChangeConfirmation
-typedef struct stLocalSFChangeConfirmationAlt{
-        B_UINT8                         u8Type;
-        B_UINT8                                         u8Direction;
-        B_UINT16                                                u16TID;
-    /// \brief 16bitCID
-    B_UINT16                        u16CID;
-    /// \brief 16bitVCID
-    B_UINT16                        u16VCID;
-        struct bcm_connect_mgr_params sfAuthorizedSet;
-        struct bcm_connect_mgr_params sfAdmittedSet;
-        struct bcm_connect_mgr_params sfActiveSet;
-
-}stLocalSFChangeConfirmationAlt;
-
-/// \brief structure stLocalSFChangeIndication
-typedef struct stLocalSFChangeIndicationAlt{
-        B_UINT8                         u8Type;
-                B_UINT8      u8Direction;
-        B_UINT16                                                u16TID;
-    /// \brief 16bitCID
-    B_UINT16                        u16CID;
-    /// \brief 16bitVCID
-    B_UINT16                        u16VCID;
-        struct bcm_connect_mgr_params sfAuthorizedSet;
-        struct bcm_connect_mgr_params sfAdmittedSet;
-        struct bcm_connect_mgr_params sfActiveSet;
-
-        B_UINT8                                                 u8CC;   /**<  Confirmation Code*/
-        B_UINT8                                                 u8Padd;         /**<  8-bit Padding */
-        B_UINT16                                                u16Padd;        /**< 16 bit */
-
-}stLocalSFChangeIndicationAlt;
-
-ULONG StoreCmControlResponseMessage(struct bcm_mini_adapter *Adapter, PVOID pvBuffer,UINT *puBufferLength);
-
-INT AllocAdapterDsxBuffer(struct bcm_mini_adapter *Adapter);
-
-INT FreeAdapterDsxBuffer(struct bcm_mini_adapter *Adapter);
-ULONG SetUpTargetDsxBuffers(struct bcm_mini_adapter *Adapter);
-
-BOOLEAN CmControlResponseMessage(struct bcm_mini_adapter *Adapter, PVOID pvBuffer);
-
-
-#pragma pack (pop)
+        u8      u8CC;    /* < Confirmation Code */
+        u8      u8Padd;  /* < 8-bit Padding */
+        u16     u16Padd; /* < 16 bit */
+};
+
+unsigned long StoreCmControlResponseMessage(struct bcm_mini_adapter *Adapter, void *pvBuffer, unsigned int *puBufferLength);
+int AllocAdapterDsxBuffer(struct bcm_mini_adapter *Adapter);
+int FreeAdapterDsxBuffer(struct bcm_mini_adapter *Adapter);
+unsigned long SetUpTargetDsxBuffers(struct bcm_mini_adapter *Adapter);
+BOOLEAN CmControlResponseMessage(struct bcm_mini_adapter *Adapter, void *pvBuffer);
+
+#pragma pack(pop)
 
 #endif
diff --git a/drivers/staging/bcm/HandleControlPacket.c b/drivers/staging/bcm/HandleControlPacket.c
index 25e5c68bfe85..1bb53e247a62 100644
--- a/drivers/staging/bcm/HandleControlPacket.c
+++ b/drivers/staging/bcm/HandleControlPacket.c
@@ -226,7 +226,7 @@ INT flushAllAppQ(void)
                 pTarang->AppCtrlQueueLen = 0;
                 /* dropped contrl packet statistics also should be reset. */
                 memset((PVOID)&pTarang->stDroppedAppCntrlMsgs, 0,
-                        sizeof(S_MIBS_DROPPED_APP_CNTRL_MESSAGES));
+                        sizeof(struct bcm_mibs_dropped_cntrl_msg));
 
         }
         return STATUS_SUCCESS;
diff --git a/drivers/staging/bcm/HostMIBSInterface.h b/drivers/staging/bcm/HostMIBSInterface.h
index e34531b638e8..f922ac49b70e 100644
--- a/drivers/staging/bcm/HostMIBSInterface.h
+++ b/drivers/staging/bcm/HostMIBSInterface.h
@@ -1,5 +1,3 @@
-
-
 #ifndef _HOST_MIBSINTERFACE_H
 #define _HOST_MIBSINTERFACE_H
 
@@ -10,221 +8,185 @@
  * statistics used for the MIBS.
  */
 
-#define MIBS_MAX_CLASSIFIERS 100
-#define MIBS_MAX_PHSRULES 100
-#define MIBS_MAX_SERVICEFLOWS 17
-#define MIBS_MAX_IP_RANGE_LENGTH 4
-#define MIBS_MAX_PORT_RANGE 4
-#define MIBS_MAX_PROTOCOL_LENGTH   32
-#define MIBS_MAX_PHS_LENGTHS     255
-#define MIBS_IPV6_ADDRESS_SIZEINBYTES 0x10
+#define MIBS_MAX_CLASSIFIERS            100
+#define MIBS_MAX_PHSRULES               100
+#define MIBS_MAX_SERVICEFLOWS           17
+#define MIBS_MAX_IP_RANGE_LENGTH        4
+#define MIBS_MAX_PORT_RANGE             4
+#define MIBS_MAX_PROTOCOL_LENGTH        32
+#define MIBS_MAX_PHS_LENGTHS            255
+#define MIBS_IPV6_ADDRESS_SIZEINBYTES   0x10
 #define MIBS_IP_LENGTH_OF_ADDRESS       4
-#define MIBS_MAX_HIST_ENTRIES 12
-#define MIBS_PKTSIZEHIST_RANGE 128
-
-typedef union _U_MIBS_IP_ADDRESS
-{
-    struct
-        {
-                //Source Ip Address Range
-                ULONG           ulIpv4Addr[MIBS_MAX_IP_RANGE_LENGTH];
-                //Source Ip Mask Address Range
-                ULONG       ulIpv4Mask[MIBS_MAX_IP_RANGE_LENGTH];
+#define MIBS_MAX_HIST_ENTRIES           12
+#define MIBS_PKTSIZEHIST_RANGE          128
+
+union bcm_mibs_ip_addr {
+        struct {
+                /* Source Ip Address Range */
+                unsigned long ulIpv4Addr[MIBS_MAX_IP_RANGE_LENGTH];
+                /* Source Ip Mask Address Range */
+                unsigned long ulIpv4Mask[MIBS_MAX_IP_RANGE_LENGTH];
         };
-        struct
-        {
-                //Source Ip Address Range
-                ULONG           ulIpv6Addr[MIBS_MAX_IP_RANGE_LENGTH * 4];
-                //Source Ip Mask Address Range
-                ULONG       ulIpv6Mask[MIBS_MAX_IP_RANGE_LENGTH * 4];
-
+        struct {
+                /* Source Ip Address Range */
+                unsigned long ulIpv6Addr[MIBS_MAX_IP_RANGE_LENGTH * 4];
+                /* Source Ip Mask Address Range */
+                unsigned long ulIpv6Mask[MIBS_MAX_IP_RANGE_LENGTH * 4];
         };
-        struct
-        {
-                UCHAR           ucIpv4Address[MIBS_MAX_IP_RANGE_LENGTH *
-                                                                        MIBS_IP_LENGTH_OF_ADDRESS];
-                UCHAR           ucIpv4Mask[MIBS_MAX_IP_RANGE_LENGTH *
-                                                                        MIBS_IP_LENGTH_OF_ADDRESS];
+        struct {
+                unsigned char ucIpv4Address[MIBS_MAX_IP_RANGE_LENGTH * MIBS_IP_LENGTH_OF_ADDRESS];
+                unsigned char ucIpv4Mask[MIBS_MAX_IP_RANGE_LENGTH * MIBS_IP_LENGTH_OF_ADDRESS];
         };
-        struct
-        {
-                UCHAR           ucIpv6Address[MIBS_MAX_IP_RANGE_LENGTH * MIBS_IPV6_ADDRESS_SIZEINBYTES];
-                UCHAR           ucIpv6Mask[MIBS_MAX_IP_RANGE_LENGTH * MIBS_IPV6_ADDRESS_SIZEINBYTES];
+        struct {
+                unsigned char ucIpv6Address[MIBS_MAX_IP_RANGE_LENGTH * MIBS_IPV6_ADDRESS_SIZEINBYTES];
+                unsigned char ucIpv6Mask[MIBS_MAX_IP_RANGE_LENGTH * MIBS_IPV6_ADDRESS_SIZEINBYTES];
         };
-}U_MIBS_IP_ADDRESS;
-
-
-typedef struct _S_MIBS_HOST_INFO
-{
-        ULONG64                 GoodTransmits;
-        ULONG64                 GoodReceives;
-        // this to keep track of the Tx and Rx MailBox Registers.
-        ULONG                   NumDesUsed;
-        ULONG                   CurrNumFreeDesc;
-        ULONG                   PrevNumFreeDesc;
-        // to keep track the no of byte received
-        ULONG                   PrevNumRcevBytes;
-        ULONG                   CurrNumRcevBytes;
-
+};
+
+struct bcm_mibs_host_info {
+        u64     GoodTransmits;
+        u64     GoodReceives;
+        /* this to keep track of the Tx and Rx MailBox Registers. */
+        unsigned long   NumDesUsed;
+        unsigned long   CurrNumFreeDesc;
+        unsigned long   PrevNumFreeDesc;
+        /* to keep track the no of byte received */
+        unsigned long   PrevNumRcevBytes;
+        unsigned long   CurrNumRcevBytes;
         /* QOS Related */
-        ULONG                   BEBucketSize;
-        ULONG                   rtPSBucketSize;
-        ULONG                   LastTxQueueIndex;
-        BOOLEAN                 TxOutofDescriptors;
-        BOOLEAN                 TimerActive;
-        UINT32                  u32TotalDSD;
-        UINT32                  aTxPktSizeHist[MIBS_MAX_HIST_ENTRIES];
-        UINT32                  aRxPktSizeHist[MIBS_MAX_HIST_ENTRIES];
-}S_MIBS_HOST_INFO;
-
-typedef struct _S_MIBS_CLASSIFIER_RULE
-{
-        ULONG                           ulSFID;
-        UCHAR               ucReserved[2];
-        B_UINT16            uiClassifierRuleIndex;
-        BOOLEAN                         bUsed;
-        USHORT                          usVCID_Value;
-        // This field detemines the Classifier Priority
-        B_UINT8             u8ClassifierRulePriority;
-        U_MIBS_IP_ADDRESS   stSrcIpAddress;
-        /*IP Source Address Length*/
-        UCHAR               ucIPSourceAddressLength;
-
-        U_MIBS_IP_ADDRESS   stDestIpAddress;
+        unsigned long   BEBucketSize;
+        unsigned long   rtPSBucketSize;
+        unsigned long   LastTxQueueIndex;
+        bool    TxOutofDescriptors;
+        bool    TimerActive;
+        u32     u32TotalDSD;
+        u32     aTxPktSizeHist[MIBS_MAX_HIST_ENTRIES];
+        u32     aRxPktSizeHist[MIBS_MAX_HIST_ENTRIES];
+};
+
+struct bcm_mibs_classifier_rule {
+        unsigned long   ulSFID;
+        unsigned char   ucReserved[2];
+        u16     uiClassifierRuleIndex;
+        bool    bUsed;
+        unsigned short  usVCID_Value;
+        u8      u8ClassifierRulePriority;
+        union bcm_mibs_ip_addr stSrcIpAddress;
+        /* IP Source Address Length */
+        unsigned char   ucIPSourceAddressLength;
+        union bcm_mibs_ip_addr stDestIpAddress;
         /* IP Destination Address Length */
-        UCHAR               ucIPDestinationAddressLength;
-        UCHAR               ucIPTypeOfServiceLength;//Type of service Length
-        UCHAR               ucTosLow;//Tos Low
-        UCHAR               ucTosHigh;//Tos High
-        UCHAR               ucTosMask;//Tos Mask
-        UCHAR               ucProtocolLength;//protocol Length
-        UCHAR               ucProtocol[MIBS_MAX_PROTOCOL_LENGTH];//protocol Length
-        USHORT                          usSrcPortRangeLo[MIBS_MAX_PORT_RANGE];
-        USHORT                          usSrcPortRangeHi[MIBS_MAX_PORT_RANGE];
-        UCHAR               ucSrcPortRangeLength;
-        USHORT                          usDestPortRangeLo[MIBS_MAX_PORT_RANGE];
-        USHORT                          usDestPortRangeHi[MIBS_MAX_PORT_RANGE];
-        UCHAR               ucDestPortRangeLength;
-        BOOLEAN                         bProtocolValid;
-        BOOLEAN                         bTOSValid;
-        BOOLEAN                         bDestIpValid;
-        BOOLEAN                         bSrcIpValid;
-        UCHAR                           ucDirection;
-        BOOLEAN             bIpv6Protocol;
-        UINT32              u32PHSRuleID;
-}S_MIBS_CLASSIFIER_RULE;
-
-
-typedef struct _S_MIBS_PHS_RULE
-{
-        ULONG           ulSFID;
-        /// brief 8bit PHSI Of The Service Flow
-        B_UINT8     u8PHSI;
-        /// brief PHSF Of The Service Flow
-        B_UINT8     u8PHSFLength;
-        B_UINT8     u8PHSF[MIBS_MAX_PHS_LENGTHS];
-        /// brief PHSM Of The Service Flow
-        B_UINT8     u8PHSMLength;
-        B_UINT8     u8PHSM[MIBS_MAX_PHS_LENGTHS];
-        /// brief 8bit PHSS Of The Service Flow
-        B_UINT8     u8PHSS;
-        /// brief 8bit PHSV Of The Service Flow
-        B_UINT8     u8PHSV;
-        // Reserved bytes are 5, so that it is similar to S_PHS_RULE structure.
-        B_UINT8     reserved[5];
+        unsigned char   ucIPDestinationAddressLength;
+        unsigned char   ucIPTypeOfServiceLength;
+        unsigned char   ucTosLow;
+        unsigned char   ucTosHigh;
+        unsigned char   ucTosMask;
+        unsigned char   ucProtocolLength;
+        unsigned char   ucProtocol[MIBS_MAX_PROTOCOL_LENGTH];
+        unsigned short  usSrcPortRangeLo[MIBS_MAX_PORT_RANGE];
+        unsigned short  usSrcPortRangeHi[MIBS_MAX_PORT_RANGE];
+        unsigned char   ucSrcPortRangeLength;
+        unsigned short  usDestPortRangeLo[MIBS_MAX_PORT_RANGE];
+        unsigned short  usDestPortRangeHi[MIBS_MAX_PORT_RANGE];
+        unsigned char   ucDestPortRangeLength;
+        bool    bProtocolValid;
+        bool    bTOSValid;
+        bool    bDestIpValid;
+        bool    bSrcIpValid;
+        unsigned char   ucDirection;
+        bool    bIpv6Protocol;
+        u32     u32PHSRuleID;
+};
+
+struct bcm_mibs_phs_rule {
+        unsigned long   ulSFID;
+        u8      u8PHSI;
+        u8      u8PHSFLength;
+        u8      u8PHSF[MIBS_MAX_PHS_LENGTHS];
+        u8      u8PHSMLength;
+        u8      u8PHSM[MIBS_MAX_PHS_LENGTHS];
+        u8      u8PHSS;
+        u8      u8PHSV;
+        u8      reserved[5];
+        long    PHSModifiedBytes;
+        unsigned long   PHSModifiedNumPackets;
+        unsigned long   PHSErrorNumPackets;
+};
+
+struct bcm_mibs_parameters {
+        u32 wmanIfSfid;
+        u32 wmanIfCmnCpsSfState;
+        u32 wmanIfCmnCpsMaxSustainedRate;
+        u32 wmanIfCmnCpsMaxTrafficBurst;
+        u32 wmanIfCmnCpsMinReservedRate;
+        u32 wmanIfCmnCpsToleratedJitter;
+        u32 wmanIfCmnCpsMaxLatency;
+        u32 wmanIfCmnCpsFixedVsVariableSduInd;
+        u32 wmanIfCmnCpsSduSize;
+        u32 wmanIfCmnCpsSfSchedulingType;
+        u32 wmanIfCmnCpsArqEnable;
+        u32 wmanIfCmnCpsArqWindowSize;
+        u32 wmanIfCmnCpsArqBlockLifetime;
+        u32 wmanIfCmnCpsArqSyncLossTimeout;
+        u32 wmanIfCmnCpsArqDeliverInOrder;
+        u32 wmanIfCmnCpsArqRxPurgeTimeout;
+        u32 wmanIfCmnCpsArqBlockSize;
+        u32 wmanIfCmnCpsMinRsvdTolerableRate;
+        u32 wmanIfCmnCpsReqTxPolicy;
+        u32 wmanIfCmnSfCsSpecification;
+        u32 wmanIfCmnCpsTargetSaid;
+};
+
+struct bcm_mibs_table {
+        unsigned long   ulSFID;
+        unsigned short  usVCID_Value;
+        unsigned int    uiThreshold;
+        u8      u8TrafficPriority;
+        bool    bValid;
+        bool    bActive;
+        bool    bActivateRequestSent;
+        u8      u8QueueType;
+        unsigned int    uiMaxBucketSize;
+        unsigned int    uiCurrentQueueDepthOnTarget;
+        unsigned int    uiCurrentBytesOnHost;
+        unsigned int    uiCurrentPacketsOnHost;
+        unsigned int    uiDroppedCountBytes;
+        unsigned int    uiDroppedCountPackets;
+        unsigned int    uiSentBytes;
+        unsigned int    uiSentPackets;
+        unsigned int    uiCurrentDrainRate;
+        unsigned int    uiThisPeriodSentBytes;
+        u64     liDrainCalculated;
+        unsigned int    uiCurrentTokenCount;
+        u64     liLastUpdateTokenAt;
+        unsigned int    uiMaxAllowedRate;
+        unsigned int    NumOfPacketsSent;
+        unsigned char ucDirection;
+        unsigned short  usCID;
+        struct bcm_mibs_parameters stMibsExtServiceFlowTable;
+        unsigned int    uiCurrentRxRate;
+        unsigned int    uiThisPeriodRxBytes;
+        unsigned int    uiTotalRxBytes;
+        unsigned int    uiTotalTxBytes;
+};
+
+struct bcm_mibs_dropped_cntrl_msg {
+        unsigned long cm_responses;
+        unsigned long cm_control_newdsx_multiclassifier_resp;
+        unsigned long link_control_resp;
+        unsigned long status_rsp;
+        unsigned long stats_pointer_resp;
+        unsigned long idle_mode_status;
+        unsigned long auth_ss_host_msg;
+        unsigned long low_priority_message;
+};
+
+struct bcm_host_stats_mibs {
+        struct bcm_mibs_host_info stHostInfo;
+        struct bcm_mibs_classifier_rule astClassifierTable[MIBS_MAX_CLASSIFIERS];
+        struct bcm_mibs_table   astSFtable[MIBS_MAX_SERVICEFLOWS];
+        struct bcm_mibs_phs_rule astPhsRulesTable[MIBS_MAX_PHSRULES];
+        struct bcm_mibs_dropped_cntrl_msg stDroppedAppCntrlMsgs;
+};
 
-        LONG        PHSModifiedBytes;
-        ULONG       PHSModifiedNumPackets;
-        ULONG           PHSErrorNumPackets;
-}S_MIBS_PHS_RULE;
-
-typedef struct _S_MIBS_EXTSERVICEFLOW_PARAMETERS
-{
-        UINT32          wmanIfSfid;
-        UINT32          wmanIfCmnCpsSfState;
-        UINT32          wmanIfCmnCpsMaxSustainedRate;
-        UINT32          wmanIfCmnCpsMaxTrafficBurst;
-        UINT32          wmanIfCmnCpsMinReservedRate;
-        UINT32          wmanIfCmnCpsToleratedJitter;
-        UINT32          wmanIfCmnCpsMaxLatency;
-        UINT32          wmanIfCmnCpsFixedVsVariableSduInd;
-        UINT32          wmanIfCmnCpsSduSize;
-        UINT32          wmanIfCmnCpsSfSchedulingType;
-        UINT32          wmanIfCmnCpsArqEnable;
-        UINT32          wmanIfCmnCpsArqWindowSize;
-        UINT32          wmanIfCmnCpsArqBlockLifetime;
-        UINT32          wmanIfCmnCpsArqSyncLossTimeout;
-        UINT32          wmanIfCmnCpsArqDeliverInOrder;
-        UINT32          wmanIfCmnCpsArqRxPurgeTimeout;
-        UINT32          wmanIfCmnCpsArqBlockSize;
-        UINT32          wmanIfCmnCpsMinRsvdTolerableRate;
-        UINT32          wmanIfCmnCpsReqTxPolicy;
-        UINT32          wmanIfCmnSfCsSpecification;
-        UINT32          wmanIfCmnCpsTargetSaid;
-
-}S_MIBS_EXTSERVICEFLOW_PARAMETERS;
-
-
-typedef struct _S_MIBS_SERVICEFLOW_TABLE
-{
-         //classification extension Rule
-        ULONG           ulSFID;
-    USHORT              usVCID_Value;
-        UINT            uiThreshold;
-        // This field determines the priority of the SF Queues
-        B_UINT8     u8TrafficPriority;
-
-        BOOLEAN         bValid;
-        BOOLEAN     bActive;
-        BOOLEAN         bActivateRequestSent;
-        //BE or rtPS
-        B_UINT8         u8QueueType;
-        //maximum size of the bucket for the queue
-        UINT            uiMaxBucketSize;
-        UINT            uiCurrentQueueDepthOnTarget;
-        UINT            uiCurrentBytesOnHost;
-        UINT            uiCurrentPacketsOnHost;
-        UINT            uiDroppedCountBytes;
-        UINT            uiDroppedCountPackets;
-        UINT            uiSentBytes;
-        UINT            uiSentPackets;
-        UINT            uiCurrentDrainRate;
-        UINT            uiThisPeriodSentBytes;
-        LARGE_INTEGER   liDrainCalculated;
-        UINT            uiCurrentTokenCount;
-        LARGE_INTEGER   liLastUpdateTokenAt;
-        UINT            uiMaxAllowedRate;
-        UINT        NumOfPacketsSent;
-        UCHAR           ucDirection;
-        USHORT          usCID;
-        S_MIBS_EXTSERVICEFLOW_PARAMETERS        stMibsExtServiceFlowTable;
-        UINT            uiCurrentRxRate;
-        UINT            uiThisPeriodRxBytes;
-        UINT            uiTotalRxBytes;
-        UINT            uiTotalTxBytes;
-}S_MIBS_SERVICEFLOW_TABLE;
-
-typedef struct _S_MIBS_DROPPED_APP_CNTRL_MESSAGES
-{
-        ULONG cm_responses;
-        ULONG cm_control_newdsx_multiclassifier_resp;
-        ULONG link_control_resp;
-        ULONG status_rsp;
-        ULONG stats_pointer_resp;
-        ULONG idle_mode_status;
-        ULONG auth_ss_host_msg;
-        ULONG low_priority_message;
-
-}S_MIBS_DROPPED_APP_CNTRL_MESSAGES;
-
-typedef struct _S_MIBS_HOST_STATS_MIBS
-{
-        S_MIBS_HOST_INFO                                stHostInfo;
-        S_MIBS_CLASSIFIER_RULE                  astClassifierTable[MIBS_MAX_CLASSIFIERS];
-        S_MIBS_SERVICEFLOW_TABLE                astSFtable[MIBS_MAX_SERVICEFLOWS];
-        S_MIBS_PHS_RULE                 astPhsRulesTable[MIBS_MAX_PHSRULES];
-        S_MIBS_DROPPED_APP_CNTRL_MESSAGES       stDroppedAppCntrlMsgs;
-}S_MIBS_HOST_STATS_MIBS;
 #endif
-
-
diff --git a/drivers/staging/bcm/InterfaceAdapter.h b/drivers/staging/bcm/InterfaceAdapter.h
index 4607c265d981..06a6b18bca48 100644
--- a/drivers/staging/bcm/InterfaceAdapter.h
+++ b/drivers/staging/bcm/InterfaceAdapter.h
@@ -1,97 +1,79 @@
 #ifndef _INTERFACE_ADAPTER_H
 #define _INTERFACE_ADAPTER_H
 
-typedef struct _BULK_ENDP_IN
-{
-    PCHAR                   bulk_in_buffer;
-    size_t          bulk_in_size;
-    UCHAR                       bulk_in_endpointAddr;
-    UINT bulk_in_pipe;
-}BULK_ENDP_IN, *PBULK_ENDP_IN;
-
-
-typedef struct _BULK_ENDP_OUT
-{
-    UCHAR                       bulk_out_buffer;
-    size_t          bulk_out_size;
-    UCHAR                       bulk_out_endpointAddr;
-    UINT bulk_out_pipe;
-    //this is used when int out endpoint is used as bulk out end point
-        UCHAR                   int_out_interval;
-}BULK_ENDP_OUT, *PBULK_ENDP_OUT;
-
-typedef struct _INTR_ENDP_IN
-{
-    PCHAR                   int_in_buffer;
-    size_t          int_in_size;
-    UCHAR                       int_in_endpointAddr;
-    UCHAR                       int_in_interval;
-    UINT int_in_pipe;
-}INTR_ENDP_IN, *PINTR_ENDP_IN;
-
-typedef struct _INTR_ENDP_OUT
-{
-    PCHAR                   int_out_buffer;
-    size_t          int_out_size;
-    UCHAR                       int_out_endpointAddr;
-    UCHAR                       int_out_interval;
-    UINT int_out_pipe;
-}INTR_ENDP_OUT, *PINTR_ENDP_OUT;
-
-
-typedef struct _USB_TCB
-{
+struct bcm_bulk_endpoint_in {
+        char    *bulk_in_buffer;
+        size_t  bulk_in_size;
+        unsigned char   bulk_in_endpointAddr;
+        unsigned int    bulk_in_pipe;
+};
+
+struct bcm_bulk_endpoint_out {
+        unsigned char   bulk_out_buffer;
+        size_t  bulk_out_size;
+        unsigned char   bulk_out_endpointAddr;
+        unsigned int    bulk_out_pipe;
+        /* this is used when int out endpoint is used as bulk out end point */
+        unsigned char   int_out_interval;
+};
+
+struct bcm_intr_endpoint_in {
+        char    *int_in_buffer;
+        size_t  int_in_size;
+        unsigned char   int_in_endpointAddr;
+        unsigned char   int_in_interval;
+        unsigned int    int_in_pipe;
+};
+
+struct bcm_intr_endpoint_out {
+        char    *int_out_buffer;
+        size_t  int_out_size;
+        unsigned char   int_out_endpointAddr;
+        unsigned char   int_out_interval;
+        unsigned int    int_out_pipe;
+};
+
+struct bcm_usb_tcb {
         struct urb *urb;
-        PVOID psIntfAdapter;
-        BOOLEAN bUsed;
-}USB_TCB, *PUSB_TCB;
+        void *psIntfAdapter;
+        bool bUsed;
+};
 
-
-typedef struct _USB_RCB
-{
+struct bcm_usb_rcb {
         struct urb *urb;
-        PVOID psIntfAdapter;
-        BOOLEAN bUsed;
-}USB_RCB, *PUSB_RCB;
+        void *psIntfAdapter;
+        bool bUsed;
+};
 
 /*
-//This is the interface specific Sub-Adapter
-//Structure.
-*/
-typedef struct _S_INTERFACE_ADAPTER
-{
-    struct usb_device * udev;
-    struct usb_interface *  interface;
-
+ * This is the interface specific Sub-Adapter
+ * Structure.
+ */
+struct bcm_interface_adapter {
+        struct usb_device *udev;
+        struct usb_interface *interface;
         /* Bulk endpoint in info */
-        BULK_ENDP_IN    sBulkIn;
+        struct bcm_bulk_endpoint_in     sBulkIn;
         /* Bulk endpoint out info */
-        BULK_ENDP_OUT   sBulkOut;
+        struct bcm_bulk_endpoint_out    sBulkOut;
         /* Interrupt endpoint in info */
-        INTR_ENDP_IN    sIntrIn;
+        struct bcm_intr_endpoint_in     sIntrIn;
         /* Interrupt endpoint out info */
-        INTR_ENDP_OUT   sIntrOut;
-
-
-
-        ULONG ulInterruptData[2];
-
+        struct bcm_intr_endpoint_out    sIntrOut;
+        unsigned long           ulInterruptData[2];
         struct urb *psInterruptUrb;
-
-        USB_TCB                 asUsbTcb[MAXIMUM_USB_TCB];
-        USB_RCB                 asUsbRcb[MAXIMUM_USB_RCB];
-        atomic_t                uNumTcbUsed;
-        atomic_t                uCurrTcb;
-        atomic_t                uNumRcbUsed;
-        atomic_t                uCurrRcb;
-
+        struct bcm_usb_tcb      asUsbTcb[MAXIMUM_USB_TCB];
+        struct bcm_usb_rcb      asUsbRcb[MAXIMUM_USB_RCB];
+        atomic_t        uNumTcbUsed;
+        atomic_t        uCurrTcb;
+        atomic_t        uNumRcbUsed;
+        atomic_t        uCurrRcb;
         struct bcm_mini_adapter *psAdapter;
-        BOOLEAN                 bFlashBoot;
-        BOOLEAN                 bHighSpeedDevice ;
-
-        BOOLEAN                 bSuspended;
-        BOOLEAN                 bPreparingForBusSuspend;
+        bool            bFlashBoot;
+        bool            bHighSpeedDevice;
+        bool            bSuspended;
+        bool            bPreparingForBusSuspend;
         struct work_struct usbSuspendWork;
-}S_INTERFACE_ADAPTER,*PS_INTERFACE_ADAPTER;
+};
 
 #endif
diff --git a/drivers/staging/bcm/InterfaceDld.c b/drivers/staging/bcm/InterfaceDld.c
index 3a89e33733ee..87117a797d5b 100644
--- a/drivers/staging/bcm/InterfaceDld.c
+++ b/drivers/staging/bcm/InterfaceDld.c
@@ -6,7 +6,7 @@ int InterfaceFileDownload(PVOID arg, struct file *flp, unsigned int on_chip_loc)
         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;
+        struct bcm_interface_adapter *psIntfAdapter = (struct bcm_interface_adapter *)arg;
         /* struct bcm_mini_adapter *Adapter = psIntfAdapter->psAdapter; */
         char *buff = kmalloc(MAX_TRANSFER_CTRL_BYTE_USB, GFP_KERNEL);
 
@@ -61,7 +61,7 @@ int InterfaceFileReadbackFromChip(PVOID arg, struct file *flp, unsigned int on_c
         loff_t pos = 0;
         static int fw_down;
         INT Status = STATUS_SUCCESS;
-        PS_INTERFACE_ADAPTER psIntfAdapter = (PS_INTERFACE_ADAPTER)arg;
+        struct bcm_interface_adapter *psIntfAdapter = (struct bcm_interface_adapter *)arg;
         int bytes;
 
         buff = kmalloc(MAX_TRANSFER_CTRL_BYTE_USB, GFP_DMA);
diff --git a/drivers/staging/bcm/InterfaceIdleMode.c b/drivers/staging/bcm/InterfaceIdleMode.c
index 4f2f490921e1..a1bf21579d3f 100644
--- a/drivers/staging/bcm/InterfaceIdleMode.c
+++ b/drivers/staging/bcm/InterfaceIdleMode.c
@@ -156,7 +156,7 @@ static int InterfaceAbortIdlemode(struct bcm_mini_adapter *Adapter, unsigned int
 
         int     lenwritten = 0;
         unsigned char aucAbortPattern[8]={0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF};
-        PS_INTERFACE_ADAPTER psInterfaceAdapter = Adapter->pvInterfaceAdapter;
+        struct bcm_interface_adapter *psInterfaceAdapter = Adapter->pvInterfaceAdapter;
 
         //Abort Bus suspend if its already suspended
         if((TRUE == psInterfaceAdapter->bSuspended) && (TRUE == Adapter->bDoSuspend))
diff --git a/drivers/staging/bcm/InterfaceIdleMode.h b/drivers/staging/bcm/InterfaceIdleMode.h
index c3338c8a1dc8..2ef64003aa89 100644
--- a/drivers/staging/bcm/InterfaceIdleMode.h
+++ b/drivers/staging/bcm/InterfaceIdleMode.h
@@ -3,11 +3,12 @@
 
 INT InterfaceIdleModeWakeup(struct bcm_mini_adapter *Adapter);
 
-INT InterfaceIdleModeRespond(struct bcm_mini_adapter *Adapter, unsigned int *puiBuffer);
+INT InterfaceIdleModeRespond(struct bcm_mini_adapter *Adapter,
+                                unsigned int *puiBuffer);
 
 VOID InterfaceWriteIdleModeWakePattern(struct bcm_mini_adapter *Adapter);
 
-INT InterfaceWakeUp(struct bcm_mini_adapter * Adapter);
+INT InterfaceWakeUp(struct bcm_mini_adapter *Adapter);
 
 VOID InterfaceHandleShutdownModeWakeup(struct bcm_mini_adapter *Adapter);
 #endif
diff --git a/drivers/staging/bcm/InterfaceInit.c b/drivers/staging/bcm/InterfaceInit.c
index b05f5f73548c..eb246430b320 100644
--- a/drivers/staging/bcm/InterfaceInit.c
+++ b/drivers/staging/bcm/InterfaceInit.c
@@ -4,11 +4,12 @@ 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_T3B) },
         { USB_DEVICE(BCM_USB_VENDOR_ID_T3, BCM_USB_PRODUCT_ID_T3L) },
-        { USB_DEVICE(BCM_USB_VENDOR_ID_T3, BCM_USB_PRODUCT_ID_SM250) },
+        { USB_DEVICE(BCM_USB_VENDOR_ID_T3, BCM_USB_PRODUCT_ID_SYM) },
         { 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) },
         { USB_DEVICE(BCM_USB_VENDOR_ID_ZTE, BCM_USB_PRODUCT_ID_ZTE_226) },
+        { USB_DEVICE(BCM_USB_VENDOR_ID_ZTE, BCM_USB_PRODUCT_ID_ZTE_326) },
         { }
 };
 MODULE_DEVICE_TABLE(usb, InterfaceUsbtable);
@@ -22,9 +23,9 @@ static const u32 default_msg =
         | 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 int InterfaceAdapterInit(struct bcm_interface_adapter *Adapter);
 
-static void InterfaceAdapterFree(PS_INTERFACE_ADAPTER psIntfAdapter)
+static void InterfaceAdapterFree(struct bcm_interface_adapter *psIntfAdapter)
 {
         int i = 0;
 
@@ -79,7 +80,7 @@ static void ConfigureEndPointTypesThroughEEPROM(struct bcm_mini_adapter *Adapter
 
         ulReg = ntohl(EP2_CFG_REG);
         BeceemEEPROMBulkWrite(Adapter, (PUCHAR)&ulReg, 0x132, 4, TRUE);
-        if (((PS_INTERFACE_ADAPTER)(Adapter->pvInterfaceAdapter))->bHighSpeedDevice == TRUE) {
+        if (((struct bcm_interface_adapter *)(Adapter->pvInterfaceAdapter))->bHighSpeedDevice == TRUE) {
                 ulReg = ntohl(EP2_CFG_INT);
                 BeceemEEPROMBulkWrite(Adapter, (PUCHAR)&ulReg, 0x136, 4, TRUE);
         } else {
@@ -145,7 +146,7 @@ static int usbbcm_device_probe(struct usb_interface *intf, const struct usb_devi
         struct usb_device *udev = interface_to_usbdev(intf);
         int retval;
         struct bcm_mini_adapter *psAdapter;
-        PS_INTERFACE_ADAPTER psIntfAdapter;
+        struct bcm_interface_adapter *psIntfAdapter;
         struct net_device *ndev;
 
         /* Reserve one extra queue for the bit-bucket */
@@ -189,7 +190,7 @@ static int usbbcm_device_probe(struct usb_interface *intf, const struct usb_devi
         }
 
         /* Allocate interface adapter structure */
-        psIntfAdapter = kzalloc(sizeof(S_INTERFACE_ADAPTER), GFP_KERNEL);
+        psIntfAdapter = kzalloc(sizeof(struct bcm_interface_adapter), GFP_KERNEL);
         if (psIntfAdapter == NULL) {
                 dev_err(&udev->dev, DRV_NAME ": no memory for Interface adapter\n");
                 AdapterFree(psAdapter);
@@ -257,7 +258,7 @@ static int usbbcm_device_probe(struct usb_interface *intf, const struct usb_devi
 
 static void usbbcm_disconnect(struct usb_interface *intf)
 {
-        PS_INTERFACE_ADAPTER psIntfAdapter = usb_get_intfdata(intf);
+        struct bcm_interface_adapter *psIntfAdapter = usb_get_intfdata(intf);
         struct bcm_mini_adapter *psAdapter;
         struct usb_device  *udev = interface_to_usbdev(intf);
 
@@ -276,7 +277,7 @@ static void usbbcm_disconnect(struct usb_interface *intf)
         usb_put_dev(udev);
 }
 
-static int AllocUsbCb(PS_INTERFACE_ADAPTER psIntfAdapter)
+static int AllocUsbCb(struct bcm_interface_adapter *psIntfAdapter)
 {
         int i = 0;
 
@@ -311,7 +312,7 @@ static int AllocUsbCb(PS_INTERFACE_ADAPTER psIntfAdapter)
         return 0;
 }
 
-static int device_run(PS_INTERFACE_ADAPTER psIntfAdapter)
+static int device_run(struct bcm_interface_adapter *psIntfAdapter)
 {
         int value = 0;
         UINT status = STATUS_SUCCESS;
@@ -421,7 +422,7 @@ 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);
 }
 
-static int InterfaceAdapterInit(PS_INTERFACE_ADAPTER psIntfAdapter)
+static int InterfaceAdapterInit(struct bcm_interface_adapter *psIntfAdapter)
 {
         struct usb_host_interface *iface_desc;
         struct usb_endpoint_descriptor *endpoint;
@@ -619,7 +620,7 @@ static int InterfaceAdapterInit(PS_INTERFACE_ADAPTER psIntfAdapter)
 
 static int InterfaceSuspend(struct usb_interface *intf, pm_message_t message)
 {
-        PS_INTERFACE_ADAPTER  psIntfAdapter = usb_get_intfdata(intf);
+        struct bcm_interface_adapter *psIntfAdapter = usb_get_intfdata(intf);
 
         psIntfAdapter->bSuspended = TRUE;
 
@@ -646,7 +647,7 @@ static int InterfaceSuspend(struct usb_interface *intf, pm_message_t message)
 
 static int InterfaceResume(struct usb_interface *intf)
 {
-        PS_INTERFACE_ADAPTER  psIntfAdapter = usb_get_intfdata(intf);
+        struct bcm_interface_adapter *psIntfAdapter = usb_get_intfdata(intf);
 
         mdelay(100);
         psIntfAdapter->bSuspended = FALSE;
diff --git a/drivers/staging/bcm/InterfaceInit.h b/drivers/staging/bcm/InterfaceInit.h
index 866924e35f9c..ffa6e9667ec4 100644
--- a/drivers/staging/bcm/InterfaceInit.h
+++ b/drivers/staging/bcm/InterfaceInit.h
@@ -8,11 +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 /* not sure if this is valid */
 #define BCM_USB_PRODUCT_ID_ZTE_226 0x172
+#define BCM_USB_PRODUCT_ID_ZTE_326 0x173 /* ZTE AX326 */
 #define BCM_USB_PRODUCT_ID_ZTE_TU25     0x0007
 
 #define BCM_USB_MINOR_BASE      192
@@ -21,6 +21,6 @@ int InterfaceInitialize(void);
 
 int InterfaceExit(void);
 
-int usbbcm_worker_thread(PS_INTERFACE_ADAPTER psIntfAdapter);
+int usbbcm_worker_thread(struct bcm_interface_adapter *psIntfAdapter);
 
 #endif
diff --git a/drivers/staging/bcm/InterfaceIsr.c b/drivers/staging/bcm/InterfaceIsr.c
index 6ee3428daa55..8322f1b76e2a 100644
--- a/drivers/staging/bcm/InterfaceIsr.c
+++ b/drivers/staging/bcm/InterfaceIsr.c
@@ -4,7 +4,7 @@
 static void read_int_callback(struct urb *urb/*, struct pt_regs *regs*/)
 {
         int             status = urb->status;
-        PS_INTERFACE_ADAPTER psIntfAdapter = (PS_INTERFACE_ADAPTER)urb->context;
+        struct bcm_interface_adapter *psIntfAdapter = (struct bcm_interface_adapter *)urb->context;
         struct bcm_mini_adapter *Adapter = psIntfAdapter->psAdapter ;
 
         if (netif_msg_intr(Adapter))
@@ -114,7 +114,7 @@ static void read_int_callback(struct urb *urb/*, struct pt_regs *regs*/)
 
 }
 
-int CreateInterruptUrb(PS_INTERFACE_ADAPTER psIntfAdapter)
+int CreateInterruptUrb(struct bcm_interface_adapter *psIntfAdapter)
 {
         psIntfAdapter->psInterruptUrb = usb_alloc_urb(0, GFP_KERNEL);
         if (!psIntfAdapter->psInterruptUrb)
@@ -143,7 +143,7 @@ int CreateInterruptUrb(PS_INTERFACE_ADAPTER psIntfAdapter)
 }
 
 
-INT StartInterruptUrb(PS_INTERFACE_ADAPTER psIntfAdapter)
+INT StartInterruptUrb(struct bcm_interface_adapter *psIntfAdapter)
 {
         INT status = 0;
 
diff --git a/drivers/staging/bcm/InterfaceIsr.h b/drivers/staging/bcm/InterfaceIsr.h
index 40399788c419..3073bd71cfeb 100644
--- a/drivers/staging/bcm/InterfaceIsr.h
+++ b/drivers/staging/bcm/InterfaceIsr.h
@@ -1,10 +1,10 @@
 #ifndef _INTERFACE_ISR_H
 #define _INTERFACE_ISR_H
 
-int CreateInterruptUrb(PS_INTERFACE_ADAPTER psIntfAdapter);
+int CreateInterruptUrb(struct bcm_interface_adapter *psIntfAdapter);
 
 
-INT StartInterruptUrb(PS_INTERFACE_ADAPTER psIntfAdapter);
+INT StartInterruptUrb(struct bcm_interface_adapter *psIntfAdapter);
 
 
 VOID InterfaceEnableInterrupt(struct bcm_mini_adapter *Adapter);
diff --git a/drivers/staging/bcm/InterfaceMisc.c b/drivers/staging/bcm/InterfaceMisc.c
index bbe909946091..afca010f9db5 100644
--- a/drivers/staging/bcm/InterfaceMisc.c
+++ b/drivers/staging/bcm/InterfaceMisc.c
@@ -1,17 +1,14 @@
 #include "headers.h"
 
-INT InterfaceRDM(PS_INTERFACE_ADAPTER psIntfAdapter,
-                UINT addr,
-                PVOID buff,
-                INT len)
+int InterfaceRDM(struct bcm_interface_adapter *psIntfAdapter,
+                unsigned int addr,
+                void *buff,
+                int len)
 {
         int bytes;
-        USHORT usRetries = 0;
 
-        if (psIntfAdapter == NULL) {
-                BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_PRINTK, 0, 0, "Interface Adapter is NULL");
+        if (!psIntfAdapter)
                 return -EINVAL;
-        }
 
         if (psIntfAdapter->psAdapter->device_removed == TRUE) {
                 BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_PRINTK, 0, 0, "Device got removed");
@@ -29,27 +26,21 @@ INT InterfaceRDM(PS_INTERFACE_ADAPTER psIntfAdapter,
         }
         psIntfAdapter->psAdapter->DeviceAccess = TRUE;
 
-        do {
-                bytes = usb_control_msg(psIntfAdapter->udev,
-                                        usb_rcvctrlpipe(psIntfAdapter->udev, 0),
-                                        0x02,
-                                        0xC2,
-                                        (addr & 0xFFFF),
-                                        ((addr >> 16) & 0xFFFF),
-                                        buff,
-                                        len,
-                                        5000);
-
-                usRetries++;
-                if (-ENODEV == bytes) {
-                        psIntfAdapter->psAdapter->device_removed = TRUE;
-                        break;
-                }
+        bytes = usb_control_msg(psIntfAdapter->udev,
+                                usb_rcvctrlpipe(psIntfAdapter->udev, 0),
+                                0x02,
+                                0xC2,
+                                (addr & 0xFFFF),
+                                ((addr >> 16) & 0xFFFF),
+                                buff,
+                                len,
+                                5000);
 
-        } while ((bytes < 0) && (usRetries < MAX_RDM_WRM_RETIRES));
+        if (-ENODEV == bytes)
+                psIntfAdapter->psAdapter->device_removed = TRUE;
 
         if (bytes < 0)
-                BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_OTHERS, RDM, DBG_LVL_ALL, "RDM failed status :%d, retires :%d", bytes, usRetries);
+                BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_OTHERS, RDM, DBG_LVL_ALL, "RDM failed status :%d", bytes);
         else
                 BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_OTHERS, RDM, DBG_LVL_ALL, "RDM sent %d", bytes);
 
@@ -57,18 +48,15 @@ INT InterfaceRDM(PS_INTERFACE_ADAPTER psIntfAdapter,
         return bytes;
 }
 
-INT InterfaceWRM(PS_INTERFACE_ADAPTER psIntfAdapter,
-                UINT addr,
-                PVOID buff,
-                INT len)
+int InterfaceWRM(struct bcm_interface_adapter *psIntfAdapter,
+                unsigned int addr,
+                void *buff,
+                int len)
 {
         int retval = 0;
-        USHORT usRetries = 0;
 
-        if (psIntfAdapter == NULL) {
-                BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_PRINTK, 0, 0, "Interface Adapter  is NULL");
+        if (!psIntfAdapter)
                 return -EINVAL;
-        }
 
         if (psIntfAdapter->psAdapter->device_removed == TRUE) {
                 BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_PRINTK, 0, 0, "Device got removed");
@@ -87,27 +75,21 @@ INT InterfaceWRM(PS_INTERFACE_ADAPTER psIntfAdapter,
 
         psIntfAdapter->psAdapter->DeviceAccess = TRUE;
 
-        do {
-                retval = usb_control_msg(psIntfAdapter->udev,
-                                        usb_sndctrlpipe(psIntfAdapter->udev, 0),
-                                        0x01,
-                                        0x42,
-                                        (addr & 0xFFFF),
-                                        ((addr >> 16) & 0xFFFF),
-                                        buff,
-                                        len,
-                                        5000);
-
-                usRetries++;
-                if (-ENODEV == retval) {
-                        psIntfAdapter->psAdapter->device_removed = TRUE;
-                        break;
-                }
+        retval = usb_control_msg(psIntfAdapter->udev,
+                                usb_sndctrlpipe(psIntfAdapter->udev, 0),
+                                0x01,
+                                0x42,
+                                (addr & 0xFFFF),
+                                ((addr >> 16) & 0xFFFF),
+                                buff,
+                                len,
+                                5000);
 
-        } while ((retval < 0) && (usRetries < MAX_RDM_WRM_RETIRES));
+        if (-ENODEV == retval)
+                psIntfAdapter->psAdapter->device_removed = TRUE;
 
         if (retval < 0) {
-                BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_OTHERS, WRM, DBG_LVL_ALL, "WRM failed status :%d, retires :%d", retval, usRetries);
+                BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_OTHERS, WRM, DBG_LVL_ALL, "WRM failed status :%d", retval);
                 psIntfAdapter->psAdapter->DeviceAccess = FALSE;
                 return retval;
         } else {
@@ -117,26 +99,26 @@ INT InterfaceWRM(PS_INTERFACE_ADAPTER psIntfAdapter,
         }
 }
 
-INT BcmRDM(PVOID arg,
-        UINT addr,
-        PVOID buff,
-        INT len)
+int BcmRDM(void *arg,
+        unsigned int addr,
+        void *buff,
+        int len)
 {
-        return InterfaceRDM((PS_INTERFACE_ADAPTER)arg, addr, buff, len);
+        return InterfaceRDM((struct bcm_interface_adapter*)arg, addr, buff, len);
 }
 
-INT BcmWRM(PVOID arg,
-        UINT addr,
-        PVOID buff,
-        INT len)
+int BcmWRM(void *arg,
+        unsigned int addr,
+        void *buff,
+        int len)
 {
-        return InterfaceWRM((PS_INTERFACE_ADAPTER)arg, addr, buff, len);
+        return InterfaceWRM((struct bcm_interface_adapter *)arg, addr, buff, len);
 }
 
-INT Bcm_clear_halt_of_endpoints(struct bcm_mini_adapter *Adapter)
+int Bcm_clear_halt_of_endpoints(struct bcm_mini_adapter *Adapter)
 {
-        PS_INTERFACE_ADAPTER psIntfAdapter = (PS_INTERFACE_ADAPTER)(Adapter->pvInterfaceAdapter);
-        INT status = STATUS_SUCCESS;
+        struct bcm_interface_adapter *psIntfAdapter = (struct bcm_interface_adapter *)(Adapter->pvInterfaceAdapter);
+        int status = STATUS_SUCCESS;
 
         /*
          * usb_clear_halt - tells device to clear endpoint halt/stall condition
@@ -172,10 +154,10 @@ INT Bcm_clear_halt_of_endpoints(struct bcm_mini_adapter *Adapter)
         return status;
 }
 
-VOID Bcm_kill_all_URBs(PS_INTERFACE_ADAPTER psIntfAdapter)
+void Bcm_kill_all_URBs(struct bcm_interface_adapter *psIntfAdapter)
 {
         struct urb *tempUrb = NULL;
-        UINT i;
+        unsigned int i;
 
         /*
          * usb_kill_urb - cancel a transfer request and wait for it to finish
@@ -193,7 +175,7 @@ VOID Bcm_kill_all_URBs(PS_INTERFACE_ADAPTER psIntfAdapter)
          */
 
         /* Cancel submitted Interrupt-URB's */
-        if (psIntfAdapter->psInterruptUrb != NULL) {
+        if (psIntfAdapter->psInterruptUrb) {
                 if (psIntfAdapter->psInterruptUrb->status == -EINPROGRESS)
                         usb_kill_urb(psIntfAdapter->psInterruptUrb);
         }
@@ -222,11 +204,11 @@ VOID Bcm_kill_all_URBs(PS_INTERFACE_ADAPTER psIntfAdapter)
         atomic_set(&psIntfAdapter->uCurrRcb, 0);
 }
 
-VOID putUsbSuspend(struct work_struct *work)
+void putUsbSuspend(struct work_struct *work)
 {
-        PS_INTERFACE_ADAPTER psIntfAdapter = NULL;
+        struct bcm_interface_adapter *psIntfAdapter = NULL;
         struct usb_interface *intf = NULL;
-        psIntfAdapter = container_of(work, S_INTERFACE_ADAPTER, usbSuspendWork);
+        psIntfAdapter = container_of(work, struct bcm_interface_adapter, usbSuspendWork);
         intf = psIntfAdapter->interface;
 
         if (psIntfAdapter->bSuspended == FALSE)
diff --git a/drivers/staging/bcm/InterfaceMisc.h b/drivers/staging/bcm/InterfaceMisc.h
index 1dfabdc3aadd..bce6869a7478 100644
--- a/drivers/staging/bcm/InterfaceMisc.h
+++ b/drivers/staging/bcm/InterfaceMisc.h
@@ -2,13 +2,13 @@
 #define __INTERFACE_MISC_H
 
 INT
-InterfaceRDM(PS_INTERFACE_ADAPTER psIntfAdapter,
+InterfaceRDM(struct bcm_interface_adapter *psIntfAdapter,
                         UINT addr,
                         PVOID buff,
                         INT len);
 
 INT
-InterfaceWRM(PS_INTERFACE_ADAPTER psIntfAdapter,
+InterfaceWRM(struct bcm_interface_adapter *psIntfAdapter,
                         UINT addr,
                         PVOID buff,
                         INT len);
@@ -35,7 +35,7 @@ int BcmWRM(PVOID arg,
 
 INT Bcm_clear_halt_of_endpoints(struct bcm_mini_adapter *Adapter);
 
-VOID Bcm_kill_all_URBs(PS_INTERFACE_ADAPTER psIntfAdapter);
+VOID Bcm_kill_all_URBs(struct bcm_interface_adapter *psIntfAdapter);
 
 #define DISABLE_USB_ZERO_LEN_INT 0x0F011878
 
diff --git a/drivers/staging/bcm/InterfaceRx.c b/drivers/staging/bcm/InterfaceRx.c
index 8a9f90fbdf13..26f5bc76111c 100644
--- a/drivers/staging/bcm/InterfaceRx.c
+++ b/drivers/staging/bcm/InterfaceRx.c
@@ -12,10 +12,10 @@ static int SearchVcid(struct bcm_mini_adapter *Adapter,unsigned short usVcid)
 }
 
 
-static PUSB_RCB
-GetBulkInRcb(PS_INTERFACE_ADAPTER psIntfAdapter)
+static struct bcm_usb_rcb *
+GetBulkInRcb(struct bcm_interface_adapter *psIntfAdapter)
 {
-        PUSB_RCB pRcb = NULL;
+        struct bcm_usb_rcb *pRcb = NULL;
         UINT index = 0;
 
         if((atomic_read(&psIntfAdapter->uNumRcbUsed) < MAXIMUM_USB_RCB) &&
@@ -43,8 +43,8 @@ static void read_bulk_callback(struct urb *urb)
         UINT uiIndex=0;
         int process_done = 1;
         //int idleflag = 0 ;
-        PUSB_RCB pRcb = (PUSB_RCB)urb->context;
-        PS_INTERFACE_ADAPTER psIntfAdapter = pRcb->psIntfAdapter;
+        struct bcm_usb_rcb *pRcb = (struct bcm_usb_rcb *)urb->context;
+        struct bcm_interface_adapter *psIntfAdapter = pRcb->psIntfAdapter;
         struct bcm_mini_adapter *Adapter = psIntfAdapter->psAdapter;
         struct bcm_leader *pLeader = urb->transfer_buffer;
 
@@ -196,7 +196,7 @@ static void read_bulk_callback(struct urb *urb)
         atomic_dec(&psIntfAdapter->uNumRcbUsed);
 }
 
-static int ReceiveRcb(PS_INTERFACE_ADAPTER psIntfAdapter, PUSB_RCB pRcb)
+static int ReceiveRcb(struct bcm_interface_adapter *psIntfAdapter, struct bcm_usb_rcb *pRcb)
 {
         struct urb *urb = pRcb->urb;
         int retval = 0;
@@ -240,10 +240,10 @@ Return:				TRUE  - If Rx was successful.
                                         Other - If an error occurred.
 */
 
-BOOLEAN InterfaceRx (PS_INTERFACE_ADAPTER psIntfAdapter)
+BOOLEAN InterfaceRx (struct bcm_interface_adapter *psIntfAdapter)
 {
         USHORT RxDescCount = NUM_RX_DESC - atomic_read(&psIntfAdapter->uNumRcbUsed);
-        PUSB_RCB pRcb = NULL;
+        struct bcm_usb_rcb *pRcb = NULL;
 
 //      RxDescCount = psIntfAdapter->psAdapter->CurrNumRecvDescs -
 //                              psIntfAdapter->psAdapter->PrevNumRecvDescs;
diff --git a/drivers/staging/bcm/InterfaceRx.h b/drivers/staging/bcm/InterfaceRx.h
index 96e81a1d37b8..424645e9e476 100644
--- a/drivers/staging/bcm/InterfaceRx.h
+++ b/drivers/staging/bcm/InterfaceRx.h
@@ -1,7 +1,7 @@
 #ifndef _INTERFACE_RX_H
 #define _INTERFACE_RX_H
 
-BOOLEAN InterfaceRx(PS_INTERFACE_ADAPTER Adapter);
+BOOLEAN InterfaceRx(struct bcm_interface_adapter *Adapter);
 
 #endif
 
diff --git a/drivers/staging/bcm/InterfaceTx.c b/drivers/staging/bcm/InterfaceTx.c
index 7e2b53be4d9e..b8c785556dda 100644
--- a/drivers/staging/bcm/InterfaceTx.c
+++ b/drivers/staging/bcm/InterfaceTx.c
@@ -3,8 +3,8 @@
 /*this is transmit call-back(BULK OUT)*/
 static void write_bulk_callback(struct urb *urb/*, struct pt_regs *regs*/)
 {
-        PUSB_TCB pTcb= (PUSB_TCB)urb->context;
-        PS_INTERFACE_ADAPTER psIntfAdapter = pTcb->psIntfAdapter;
+        struct bcm_usb_tcb *pTcb= (struct bcm_usb_tcb *)urb->context;
+        struct bcm_interface_adapter *psIntfAdapter = pTcb->psIntfAdapter;
         struct bcm_link_request *pControlMsg = (struct bcm_link_request *)urb->transfer_buffer;
         struct bcm_mini_adapter *psAdapter = psIntfAdapter->psAdapter ;
         BOOLEAN bpowerDownMsg = FALSE ;
@@ -107,9 +107,9 @@ err_exit :
 }
 
 
-static PUSB_TCB GetBulkOutTcb(PS_INTERFACE_ADAPTER psIntfAdapter)
+static struct bcm_usb_tcb *GetBulkOutTcb(struct bcm_interface_adapter *psIntfAdapter)
 {
-        PUSB_TCB pTcb = NULL;
+        struct bcm_usb_tcb *pTcb = NULL;
         UINT index = 0;
 
         if((atomic_read(&psIntfAdapter->uNumTcbUsed) < MAXIMUM_USB_TCB) &&
@@ -128,7 +128,7 @@ static PUSB_TCB GetBulkOutTcb(PS_INTERFACE_ADAPTER psIntfAdapter)
         return pTcb;
 }
 
-static int TransmitTcb(PS_INTERFACE_ADAPTER psIntfAdapter, PUSB_TCB pTcb, PVOID data, int len)
+static int TransmitTcb(struct bcm_interface_adapter *psIntfAdapter, struct bcm_usb_tcb *pTcb, PVOID data, int len)
 {
 
         struct urb *urb = pTcb->urb;
@@ -182,9 +182,9 @@ static int TransmitTcb(PS_INTERFACE_ADAPTER psIntfAdapter, PUSB_TCB pTcb, PVOID
 
 int InterfaceTransmitPacket(PVOID arg, PVOID data, UINT len)
 {
-        PUSB_TCB pTcb= NULL;
+        struct bcm_usb_tcb *pTcb= NULL;
 
-        PS_INTERFACE_ADAPTER psIntfAdapter = (PS_INTERFACE_ADAPTER)arg;
+        struct bcm_interface_adapter *psIntfAdapter = (struct bcm_interface_adapter *)arg;
         pTcb= GetBulkOutTcb(psIntfAdapter);
         if(pTcb == NULL)
         {
diff --git a/drivers/staging/bcm/Ioctl.h b/drivers/staging/bcm/Ioctl.h
index f859cf1c47b0..8c70af90969b 100644
--- a/drivers/staging/bcm/Ioctl.h
+++ b/drivers/staging/bcm/Ioctl.h
@@ -1,247 +1,136 @@
 #ifndef _IOCTL_H_
 #define _IOCTL_H_
 
-typedef struct rdmbuffer
-{
-        ULONG   Register;
-        ULONG   Length;
-}__attribute__((packed)) RDM_BUFFER, *PRDM_BUFFER;
-
-
-typedef struct wrmbuffer
-{
-        ULONG   Register;
-        ULONG   Length;
-        UCHAR   Data[4];
-}__attribute__((packed)) WRM_BUFFER, *PWRM_BUFFER;
-
-
-typedef struct ioctlbuffer
-{
+struct bcm_rdm_buffer {
+        unsigned long Register;
+        unsigned long Length;
+} __packed;
+
+struct bcm_wrm_buffer {
+        unsigned long Register;
+        unsigned long Length;
+        unsigned char Data[4];
+} __packed;
+
+struct bcm_ioctl_buffer {
         void __user *InputBuffer;
-        ULONG   InputLength;
+        unsigned long InputLength;
         void __user *OutputBuffer;
-        ULONG   OutputLength;
-}__attribute__((packed)) IOCTL_BUFFER, *PIOCTL_BUFFER;
-
-typedef struct stGPIOInfo
-{
-        UINT  uiGpioNumber ; /* valid numbers 0-15 */
-        UINT uiGpioValue; /* 1 set ; 0 not  set */
-}__attribute__((packed))GPIO_INFO,*PGPIO_INFO;
-typedef struct stUserThreadReq
-{
-        //0->Inactivate LED thread.
-        //1->Activate the LED thread
-        UINT ThreadState;
-}__attribute__((packed))USER_THREAD_REQ,*PUSER_THREAD_REQ;
-#define LED_THREAD_ACTIVATION_REQ  1
-
-
-////********** ioctl codes ***********////
-
-#define BCM_IOCTL                               'k'
-
-//1.Control code for CONTROL MESSAGES
-
-#define IOCTL_SEND_CONTROL_MESSAGE                      _IOW(BCM_IOCTL, 0x801,int)
-
-//2.Control code to write a particular value to a particular register
-#define IOCTL_BCM_REGISTER_WRITE            _IOW(BCM_IOCTL, 0x802, int) //
-
-//3.
-#define IOCTL_BCM_REGISTER_READ             _IOR(BCM_IOCTL, 0x803, int) //
+        unsigned long OutputLength;
+} __packed;
 
-//4.Control code to write x number of bytes to common memory
-//starting from address y
-#define IOCTL_BCM_COMMON_MEMORY_WRITE       _IOW(BCM_IOCTL, 0x804, int)//
+struct bcm_gpio_info {
+        unsigned int uiGpioNumber; /* valid numbers 0-15 */
+        unsigned int uiGpioValue; /* 1 set ; 0 not  set */
+} __packed;
 
-//5.Control code to write x number of bytes to common memory
-//starting from address y
-#define IOCTL_BCM_COMMON_MEMORY_READ        _IOR(BCM_IOCTL, 0x805, int)//
-
-//6.Control code for CONTROL MESSAGES
-#define IOCTL_GET_CONTROL_MESSAGE                       _IOR(BCM_IOCTL, 0x806, int)//
-
-//7.Control code for FIRMWARE DOWNLOAD
-#define IOCTL_BCM_FIRMWARE_DOWNLOAD             _IOW(BCM_IOCTL, 0x807, int)//
-
-#define IOCTL_BCM_SET_SEND_VCID                 _IOW(BCM_IOCTL, 0x808, int)
-
-//9.Control code for TRANSFER MODE SWITCHING
-#define IOCTL_BCM_SWITCH_TRANSFER_MODE          _IOW(BCM_IOCTL, 0x809, int)
-//10.Control code for LINK UP
-#define IOCTL_LINK_REQ                                          _IOW(BCM_IOCTL, 0x80A, int)
-
-//11.Control code for RSSI Level Request
-#define IOCTL_RSSI_LEVEL_REQ                            _IOW(BCM_IOCTL, 0x80B, int)
-//12.Control code for IDLE MODE CONTROL
-#define IOCTL_IDLE_REQ                                          _IOW(BCM_IOCTL, 0x80C, int)
-//13.Control code for SS/BS info
-#define IOCTL_SS_INFO_REQ                                       _IOW(BCM_IOCTL, 0x80D, int)
+struct bcm_user_thread_req {
+        /* 0->Inactivate LED thread. */
+        /* 1->Activate the LED thread */
+        unsigned int ThreadState;
+} __packed;
 
+#define LED_THREAD_ACTIVATION_REQ  1
+#define BCM_IOCTL                               'k'
+#define IOCTL_SEND_CONTROL_MESSAGE              _IOW(BCM_IOCTL, 0x801, int)
+#define IOCTL_BCM_REGISTER_WRITE                _IOW(BCM_IOCTL, 0x802, int)
+#define IOCTL_BCM_REGISTER_READ                 _IOR(BCM_IOCTL, 0x803, int)
+#define IOCTL_BCM_COMMON_MEMORY_WRITE           _IOW(BCM_IOCTL, 0x804, int)
+#define IOCTL_BCM_COMMON_MEMORY_READ            _IOR(BCM_IOCTL, 0x805, int)
+#define IOCTL_GET_CONTROL_MESSAGE               _IOR(BCM_IOCTL, 0x806, int)
+#define IOCTL_BCM_FIRMWARE_DOWNLOAD             _IOW(BCM_IOCTL, 0x807, int)
+#define IOCTL_BCM_SET_SEND_VCID                 _IOW(BCM_IOCTL, 0x808, int)
+#define IOCTL_BCM_SWITCH_TRANSFER_MODE          _IOW(BCM_IOCTL, 0x809, int)
+#define IOCTL_LINK_REQ                          _IOW(BCM_IOCTL, 0x80A, int)
+#define IOCTL_RSSI_LEVEL_REQ                    _IOW(BCM_IOCTL, 0x80B, int)
+#define IOCTL_IDLE_REQ                          _IOW(BCM_IOCTL, 0x80C, int)
+#define IOCTL_SS_INFO_REQ                       _IOW(BCM_IOCTL, 0x80D, int)
 #define IOCTL_GET_STATISTICS_POINTER            _IOW(BCM_IOCTL, 0x80E, int)
-
-#define IOCTL_CM_REQUEST                                _IOW(BCM_IOCTL, 0x80F, int)
-
-#define IOCTL_INIT_PARAM_REQ                            _IOW(BCM_IOCTL, 0x810, int)
-
-#define IOCTL_MAC_ADDR_REQ                              _IOW(BCM_IOCTL, 0x811, int)
-
-#define IOCTL_MAC_ADDR_RESP                             _IOWR(BCM_IOCTL, 0x812, int)
-
-#define IOCTL_CLASSIFICATION_RULE               _IOW(BCM_IOCTL, 0x813, char)
-
+#define IOCTL_CM_REQUEST                        _IOW(BCM_IOCTL, 0x80F, int)
+#define IOCTL_INIT_PARAM_REQ                    _IOW(BCM_IOCTL, 0x810, int)
+#define IOCTL_MAC_ADDR_REQ                      _IOW(BCM_IOCTL, 0x811, int)
+#define IOCTL_MAC_ADDR_RESP                     _IOWR(BCM_IOCTL, 0x812, int)
+#define IOCTL_CLASSIFICATION_RULE               _IOW(BCM_IOCTL, 0x813, char)
 #define IOCTL_CLOSE_NOTIFICATION                _IO(BCM_IOCTL, 0x814)
-
-#define IOCTL_LINK_UP                                   _IO(BCM_IOCTL, 0x815)
-
-#define IOCTL_LINK_DOWN                                 _IO(BCM_IOCTL, 0x816, IOCTL_BUFFER)
-
-#define IOCTL_CHIP_RESET                _IO(BCM_IOCTL, 0x816)
-
+#define IOCTL_LINK_UP                           _IO(BCM_IOCTL, 0x815)
+#define IOCTL_LINK_DOWN                         _IO(BCM_IOCTL, 0x816, struct bcm_ioctl_buffer)
+#define IOCTL_CHIP_RESET                        _IO(BCM_IOCTL, 0x816)
 #define IOCTL_CINR_LEVEL_REQ                    _IOW(BCM_IOCTL, 0x817, char)
-
-#define IOCTL_WTM_CONTROL_REQ                   _IOW(BCM_IOCTL, 0x817,char)
-
+#define IOCTL_WTM_CONTROL_REQ                   _IOW(BCM_IOCTL, 0x817, char)
 #define IOCTL_BE_BUCKET_SIZE                    _IOW(BCM_IOCTL, 0x818, unsigned long)
-
 #define IOCTL_RTPS_BUCKET_SIZE                  _IOW(BCM_IOCTL, 0x819, unsigned long)
-
-#define IOCTL_QOS_THRESHOLD                             _IOW(BCM_IOCTL, 0x820, unsigned long)
-
-#define IOCTL_DUMP_PACKET_INFO                          _IO(BCM_IOCTL, 0x821)
-
-#define IOCTL_GET_PACK_INFO                                     _IOR(BCM_IOCTL, 0x823, int)
-
+#define IOCTL_QOS_THRESHOLD                     _IOW(BCM_IOCTL, 0x820, unsigned long)
+#define IOCTL_DUMP_PACKET_INFO                  _IO(BCM_IOCTL, 0x821)
+#define IOCTL_GET_PACK_INFO                     _IOR(BCM_IOCTL, 0x823, int)
 #define IOCTL_BCM_GET_DRIVER_VERSION            _IOR(BCM_IOCTL, 0x829, int)
-
-#define IOCTL_BCM_GET_CURRENT_STATUS            _IOW(BCM_IOCTL, 0x828, int)
-
-#define IOCTL_BCM_GPIO_SET_REQUEST                      _IOW(BCM_IOCTL, 0x82A, int)
-
-#define IOCTL_BCM_GPIO_STATUS_REQUEST           _IOW(BCM_IOCTL, 0x82b, int)
-
-#define IOCTL_BCM_GET_DSX_INDICATION            _IOR(BCM_IOCTL, 0x854, int)
-
-#define IOCTL_BCM_BUFFER_DOWNLOAD_START         _IOW(BCM_IOCTL, 0x855, int)
-
-#define IOCTL_BCM_BUFFER_DOWNLOAD                       _IOW(BCM_IOCTL, 0x856, int)
-
-#define IOCTL_BCM_BUFFER_DOWNLOAD_STOP          _IOW(BCM_IOCTL, 0x857, int)
-
-#define IOCTL_BCM_REGISTER_WRITE_PRIVATE        _IOW(BCM_IOCTL, 0x826, char)
-
+#define IOCTL_BCM_GET_CURRENT_STATUS            _IOW(BCM_IOCTL, 0x828, int)
+#define IOCTL_BCM_GPIO_SET_REQUEST              _IOW(BCM_IOCTL, 0x82A, int)
+#define IOCTL_BCM_GPIO_STATUS_REQUEST           _IOW(BCM_IOCTL, 0x82b, int)
+#define IOCTL_BCM_GET_DSX_INDICATION            _IOR(BCM_IOCTL, 0x854, int)
+#define IOCTL_BCM_BUFFER_DOWNLOAD_START         _IOW(BCM_IOCTL, 0x855, int)
+#define IOCTL_BCM_BUFFER_DOWNLOAD               _IOW(BCM_IOCTL, 0x856, int)
+#define IOCTL_BCM_BUFFER_DOWNLOAD_STOP          _IOW(BCM_IOCTL, 0x857, int)
+#define IOCTL_BCM_REGISTER_WRITE_PRIVATE        _IOW(BCM_IOCTL, 0x826, char)
 #define IOCTL_BCM_REGISTER_READ_PRIVATE         _IOW(BCM_IOCTL, 0x827, char)
-
-#define IOCTL_BCM_SET_DEBUG                 _IOW(BCM_IOCTL, 0x824, IOCTL_BUFFER)
-
-#define IOCTL_BCM_EEPROM_REGISTER_WRITE         _IOW(BCM_IOCTL, 0x858, int)
-
-#define IOCTL_BCM_EEPROM_REGISTER_READ          _IOR(BCM_IOCTL, 0x859, int)
-
+#define IOCTL_BCM_SET_DEBUG                     _IOW(BCM_IOCTL, 0x824, struct bcm_ioctl_buffer)
+#define IOCTL_BCM_EEPROM_REGISTER_WRITE         _IOW(BCM_IOCTL, 0x858, int)
+#define IOCTL_BCM_EEPROM_REGISTER_READ          _IOR(BCM_IOCTL, 0x859, int)
 #define IOCTL_BCM_WAKE_UP_DEVICE_FROM_IDLE      _IOR(BCM_IOCTL, 0x860, int)
-
-#define IOCTL_BCM_SET_MAC_TRACING               _IOW(BCM_IOCTL, 0x82c, int)
-
-#define IOCTL_BCM_GET_HOST_MIBS                         _IOW(BCM_IOCTL, 0x853, int)
-
-#define IOCTL_BCM_NVM_READ                                      _IOR(BCM_IOCTL, 0x861, int)
-
-#define IOCTL_BCM_NVM_WRITE                                     _IOW(BCM_IOCTL, 0x862, int)
-
-#define IOCTL_BCM_GET_NVM_SIZE                          _IOR(BCM_IOCTL, 0x863, int)
-
-#define IOCTL_BCM_CAL_INIT                                      _IOR(BCM_IOCTL, 0x864, int)
-
-#define IOCTL_BCM_BULK_WRM                                      _IOW(BCM_IOCTL, 0x90B, int)
-
-#define IOCTL_BCM_FLASH2X_SECTION_READ          _IOR(BCM_IOCTL, 0x865, int)
-
+#define IOCTL_BCM_SET_MAC_TRACING               _IOW(BCM_IOCTL, 0x82c, int)
+#define IOCTL_BCM_GET_HOST_MIBS                 _IOW(BCM_IOCTL, 0x853, int)
+#define IOCTL_BCM_NVM_READ                      _IOR(BCM_IOCTL, 0x861, int)
+#define IOCTL_BCM_NVM_WRITE                     _IOW(BCM_IOCTL, 0x862, int)
+#define IOCTL_BCM_GET_NVM_SIZE                  _IOR(BCM_IOCTL, 0x863, int)
+#define IOCTL_BCM_CAL_INIT                      _IOR(BCM_IOCTL, 0x864, int)
+#define IOCTL_BCM_BULK_WRM                      _IOW(BCM_IOCTL, 0x90B, int)
+#define IOCTL_BCM_FLASH2X_SECTION_READ          _IOR(BCM_IOCTL, 0x865, int)
 #define IOCTL_BCM_FLASH2X_SECTION_WRITE         _IOW(BCM_IOCTL, 0x866, int)
+#define IOCTL_BCM_GET_FLASH2X_SECTION_BITMAP    _IOR(BCM_IOCTL, 0x867, int)
+#define IOCTL_BCM_SET_ACTIVE_SECTION            _IOW(BCM_IOCTL, 0x868, int)
+#define IOCTL_BCM_IDENTIFY_ACTIVE_SECTION       _IO(BCM_IOCTL, 0x869)
+#define IOCTL_BCM_COPY_SECTION                  _IOW(BCM_IOCTL, 0x870, int)
+#define IOCTL_BCM_GET_FLASH_CS_INFO             _IOR(BCM_IOCTL, 0x871, int)
+#define IOCTL_BCM_SELECT_DSD                    _IOW(BCM_IOCTL, 0x872, int)
+#define IOCTL_BCM_NVM_RAW_READ                  _IOR(BCM_IOCTL, 0x875, int)
+#define IOCTL_BCM_CNTRLMSG_MASK                 _IOW(BCM_IOCTL, 0x874, int)
+#define IOCTL_BCM_GET_DEVICE_DRIVER_INFO        _IOR(BCM_IOCTL, 0x877, int)
+#define IOCTL_BCM_TIME_SINCE_NET_ENTRY          _IOR(BCM_IOCTL, 0x876, int)
+#define BCM_LED_THREAD_STATE_CHANGE_REQ         _IOW(BCM_IOCTL, 0x878, int)
+#define IOCTL_BCM_GPIO_MULTI_REQUEST            _IOW(BCM_IOCTL, 0x82D, struct bcm_ioctl_buffer)
+#define IOCTL_BCM_GPIO_MODE_REQUEST             _IOW(BCM_IOCTL, 0x82E, struct bcm_ioctl_buffer)
+
+enum bcm_interface_type {
+        BCM_MII,
+        BCM_CARDBUS,
+        BCM_USB,
+        BCM_SDIO,
+        BCM_PCMCIA
+};
 
-#define IOCTL_BCM_GET_FLASH2X_SECTION_BITMAP _IOR(BCM_IOCTL,0x867, int)
-
-#define IOCTL_BCM_SET_ACTIVE_SECTION            _IOW(BCM_IOCTL,0x868, int)
-
-#define IOCTL_BCM_IDENTIFY_ACTIVE_SECTION       _IO(BCM_IOCTL,0x869)
-
-#define IOCTL_BCM_COPY_SECTION                          _IOW(BCM_IOCTL, 0x870,int)
-
-#define IOCTL_BCM_GET_FLASH_CS_INFO             _IOR(BCM_IOCTL, 0x871, int)
-
-#define IOCTL_BCM_SELECT_DSD                            _IOW(BCM_IOCTL, 0x872, int)
-
-#define IOCTL_BCM_NVM_RAW_READ                          _IOR(BCM_IOCTL, 0x875, int)
-
-#define IOCTL_BCM_CNTRLMSG_MASK                         _IOW(BCM_IOCTL, 0x874, int)
-
-#define IOCTL_BCM_GET_DEVICE_DRIVER_INFO  _IOR(BCM_IOCTL, 0x877, int)
-
-#define IOCTL_BCM_TIME_SINCE_NET_ENTRY  _IOR(BCM_IOCTL, 0x876, int)
-
-#define BCM_LED_THREAD_STATE_CHANGE_REQ   _IOW(BCM_IOCTL, 0x878, int)
-
-#define IOCTL_BCM_GPIO_MULTI_REQUEST            _IOW(BCM_IOCTL, 0x82D, IOCTL_BUFFER)
-#define IOCTL_BCM_GPIO_MODE_REQUEST                     _IOW(BCM_IOCTL, 0x82E, IOCTL_BUFFER)
-
-
-
-typedef enum _BCM_INTERFACE_TYPE
-{
-        BCM_MII,
-        BCM_CARDBUS,
-        BCM_USB,
-        BCM_SDIO,
-        BCM_PCMCIA
-}BCM_INTERFACE_TYPE;
-
-typedef struct _DEVICE_DRIVER_INFO
-{
-        NVM_TYPE                        u32NVMType;
-        UINT                            MaxRDMBufferSize;
-        BCM_INTERFACE_TYPE      u32InterfaceType;
-        UINT                            u32DSDStartOffset;
-        UINT                            u32RxAlignmentCorrection;
-        UINT                            u32Reserved[10];
-} DEVICE_DRIVER_INFO;
-
-typedef  struct _NVM_READWRITE
-{
+struct bcm_driver_info {
+        NVM_TYPE        u32NVMType;
+        unsigned int            MaxRDMBufferSize;
+        enum bcm_interface_type u32InterfaceType;
+        unsigned int            u32DSDStartOffset;
+        unsigned int            u32RxAlignmentCorrection;
+        unsigned int            u32Reserved[10];
+};
 
+struct bcm_nvm_readwrite {
         void __user *pBuffer;
-// Data to be written from|read to. Memory should be allocated by the caller.
-
         uint32_t  uiOffset;
-// offset at which data should be written to or read from.
-
-        uint32_t  uiNumBytes;
-// No. of bytes to be written or read.
-
-        bool  bVerify;
-// Applicable only for write. If set verification of written data will be done.
-
-} NVM_READWRITE,*PNVM_READWRITE;
-typedef struct bulkwrmbuffer
-{
-        ULONG   Register;
-        ULONG   SwapEndian;
-        ULONG   Values[1];
-
-}BULKWRM_BUFFER,*PBULKWRM_BUFFER;
-
-
-/***********Structure used for FlashMap2.x *******************************/
+        uint32_t uiNumBytes;
+        bool bVerify;
+};
 
-/*
-*       These are Sction present inside the Flash.
-*       There is sectional RD/WR for flash Map 2.x.
-*       hence these section will be used in read/write API.
-*/
+struct bcm_bulk_wrm_buffer {
+        unsigned long Register;
+        unsigned long SwapEndian;
+        unsigned long Values[1];
+};
 
-typedef enum _FLASH2X_SECTION_VAL
-{
-        NO_SECTION_VAL = 0, //no section is chosen when absolute offset is given for RD/WR
+enum bcm_flash2x_section_val {
+        NO_SECTION_VAL = 0, /* no section is chosen when absolute offset is given for RD/WR */
         ISO_IMAGE1,
         ISO_IMAGE2,
         DSD0,
@@ -257,104 +146,81 @@ typedef enum _FLASH2X_SECTION_VAL
         ISO_IMAGE2_PART2,
         ISO_IMAGE2_PART3,
         TOTAL_SECTIONS
-}FLASH2X_SECTION_VAL;
+};
 
 /*
-*       Structure used for READ/WRITE Flash  Map2.x
-*/
-typedef struct _FLASH2X_READWRITE
-{
-
-        FLASH2X_SECTION_VAL Section; //which section has to be read/written
-        B_UINT32 offset;                //Offset within Section.
-        B_UINT32 numOfBytes;    //NOB from the offset
-        B_UINT32  bVerify;
-        void __user *pDataBuff; //Buffer for reading/writing
+ * Structure used for READ/WRITE Flash Map2.x
+ */
+struct bcm_flash2x_readwrite {
+        enum bcm_flash2x_section_val Section; /* which section has to be read/written */
+        u32 offset;          /* Offset within Section. */
+        u32 numOfBytes;      /* NOB from the offset */
+        u32 bVerify;
+        void __user *pDataBuff;      /* Buffer for reading/writing */
+};
 
-}FLASH2X_READWRITE, *PFLASH2X_READWRITE;
 /*
-*       This structure is used for coping one section to other.
-*       there are two ways to copy one section to other.
-*       it NOB =0, complete section will be copied on to other.
-*       if NOB !=0, only NOB will be copied from the given offset.
-*/
-
-typedef struct _FLASH2X_COPY_SECTION
-{
-        //Src Section from which Data has to be copied to DstSection
-        FLASH2X_SECTION_VAL SrcSection;
-
-        //Destination Section from where Data has to be coppied.
-        FLASH2X_SECTION_VAL DstSection;
-
-        //Offset within Section. if NOB =0 it will be ignored and data will be coped from offset 0.
-        B_UINT32 offset;
-
-        //NOB from the offset. if NOB = 0 complete src section will be copied to Destination section.
-        B_UINT32 numOfBytes;
-} FLASH2X_COPY_SECTION, *PFLASH2X_COPY_SECTION;
-
-
-typedef enum _SECTION_TYPE
-{
-        ISO = 0,
-        VSA = 1,
-        DSD = 2
-} SECTION_TYPE, *PSECTION_TYPE;
+ * This structure is used for coping one section to other.
+ * there are two ways to copy one section to other.
+ * it NOB =0, complete section will be copied on to other.
+ * if NOB !=0, only NOB will be copied from the given offset.
+ */
+
+struct bcm_flash2x_copy_section {
+        enum bcm_flash2x_section_val SrcSection;
+        enum bcm_flash2x_section_val DstSection;
+        u32 offset;
+        u32 numOfBytes;
+};
 
 /*
-*       This section provide the complete bitmap of the Flash.
-*       using this map lib/APP will isssue read/write command.
-        Fields are defined as :
-        Bit [0] = section is present  //1:present, 0: Not present
-*      Bit [1] = section is valid  //1: valid, 0: not valid
-*      Bit [2] = Section is R/W  //0: RW, 1: RO
-*       Bit [3] = Section is Active or not 1 means Active, 0->inactive
-*      Bit [7...3] = Reserved
-*/
-
-typedef struct _FLASH2X_BITMAP
-{
-        UCHAR ISO_IMAGE1;
-        UCHAR ISO_IMAGE2;
-        UCHAR DSD0;
-        UCHAR DSD1;
-        UCHAR DSD2;
-        UCHAR VSA0;
-        UCHAR VSA1;
-        UCHAR VSA2;
-        UCHAR SCSI;
-        UCHAR CONTROL_SECTION;
-        //Reserved for future use
-        UCHAR Reserved0;
-        UCHAR Reserved1;
-        UCHAR Reserved2;
-}FLASH2X_BITMAP, *PFLASH2X_BITMAP;
+ * This section provide the complete bitmap of the Flash.
+ * using this map lib/APP will isssue read/write command.
+ * Fields are defined as :
+ * Bit [0] = section is present  //1:present, 0: Not present
+ * Bit [1] = section is valid  //1: valid, 0: not valid
+ * Bit [2] = Section is R/W  //0: RW, 1: RO
+ * Bit [3] = Section is Active or not 1 means Active, 0->inactive
+ * Bit [7...3] = Reserved
+ */
+
+struct bcm_flash2x_bitmap {
+        unsigned char ISO_IMAGE1;
+        unsigned char ISO_IMAGE2;
+        unsigned char DSD0;
+        unsigned char DSD1;
+        unsigned char DSD2;
+        unsigned char VSA0;
+        unsigned char VSA1;
+        unsigned char VSA2;
+        unsigned char SCSI;
+        unsigned char CONTROL_SECTION;
+        /* Reserved for future use */
+        unsigned char Reserved0;
+        unsigned char Reserved1;
+        unsigned char Reserved2;
+};
 
-//for net entry time check
-typedef struct _ST_TIME_ELAPSED_
-{
-        ULONG64 ul64TimeElapsedSinceNetEntry;
-        UINT32   uiReserved[4]; //By chance if required for future proofing
-}ST_TIME_ELAPSED,*PST_TIME_ELAPSED;
+struct bcm_time_elapsed {
+        unsigned long long ul64TimeElapsedSinceNetEntry;
+        u32  uiReserved[4];
+};
 
 enum {
-  WIMAX_IDX=0, /*To access WiMAX chip GPIO's for GPIO_MULTI_INFO or GPIO_MULTI_MODE*/
-  HOST_IDX,    /*To access Host chip GPIO's for GPIO_MULTI_INFO or GPIO_MULTI_MODE*/
-  MAX_IDX
+        WIMAX_IDX = 0,  /* To access WiMAX chip GPIO's for GPIO_MULTI_INFO or GPIO_MULTI_MODE */
+        HOST_IDX,       /* To access Host chip GPIO's for GPIO_MULTI_INFO or GPIO_MULTI_MODE */
+        MAX_IDX
 };
-typedef struct stGPIOMultiInfo
-{
-  UINT uiGPIOCommand; /* 1 for set and 0 for get*/
-  UINT uiGPIOMask;    /* set the correspondig bit to 1 to access GPIO*/
-  UINT uiGPIOValue;   /* 0 or 1; value to be set when command is 1.*/
-}__attribute__((packed))GPIO_MULTI_INFO , *PGPIO_MULTI_INFO;
 
-typedef struct stGPIOMultiMode
-{
-  UINT uiGPIOMode;    /* 1 for OUT mode, 0 for IN mode*/
-  UINT uiGPIOMask;    /* GPIO mask to set mode*/
-}__attribute__((packed))GPIO_MULTI_MODE, *PGPIO_MULTI_MODE;
+struct bcm_gpio_multi_info {
+        unsigned int uiGPIOCommand; /* 1 for set and 0 for get */
+        unsigned int uiGPIOMask;    /* set the correspondig bit to 1 to access GPIO */
+        unsigned int uiGPIOValue;   /* 0 or 1; value to be set when command is 1. */
+} __packed;
 
+struct bcm_gpio_multi_mode {
+        unsigned int uiGPIOMode;    /* 1 for OUT mode, 0 for IN mode */
+        unsigned int uiGPIOMask;    /* GPIO mask to set mode */
+} __packed;
 
 #endif
diff --git a/drivers/staging/bcm/LeakyBucket.c b/drivers/staging/bcm/LeakyBucket.c
index 6e8a3279698b..877cf0b2bee1 100644
--- a/drivers/staging/bcm/LeakyBucket.c
+++ b/drivers/staging/bcm/LeakyBucket.c
@@ -21,10 +21,12 @@ static VOID UpdateTokenCount(register struct bcm_mini_adapter *Adapter)
         INT     i = 0;
         struct timeval tv;
 
-        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TOKEN_COUNTS, DBG_LVL_ALL, "=====>\n");
+        BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, TOKEN_COUNTS, DBG_LVL_ALL,
+                        "=====>\n");
         if(NULL == Adapter)
         {
-                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TOKEN_COUNTS, DBG_LVL_ALL, "Adapter found NULL!\n");
+                BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, TOKEN_COUNTS, 
+                                DBG_LVL_ALL, "Adapter found NULL!\n");
                 return;
         }
 
diff --git a/drivers/staging/bcm/Misc.c b/drivers/staging/bcm/Misc.c
index f13a9582a82f..c92078e7fe86 100644
--- a/drivers/staging/bcm/Misc.c
+++ b/drivers/staging/bcm/Misc.c
@@ -1,14 +1,14 @@
 #include "headers.h"
 
 static int BcmFileDownload(struct bcm_mini_adapter *Adapter, const char *path, unsigned int loc);
-static VOID doPowerAutoCorrection(struct bcm_mini_adapter *psAdapter);
+static void doPowerAutoCorrection(struct bcm_mini_adapter *psAdapter);
 static void HandleShutDownModeRequest(struct bcm_mini_adapter *Adapter, PUCHAR pucBuffer);
 static int bcm_parse_target_params(struct bcm_mini_adapter *Adapter);
 static void beceem_protocol_reset(struct bcm_mini_adapter *Adapter);
 
-static VOID default_wimax_protocol_initialize(struct bcm_mini_adapter *Adapter)
+static void default_wimax_protocol_initialize(struct bcm_mini_adapter *Adapter)
 {
-        UINT uiLoopIndex;
+        unsigned int uiLoopIndex;
 
         for (uiLoopIndex = 0; uiLoopIndex < NO_OF_QUEUES-1; uiLoopIndex++) {
                 Adapter->PackInfo[uiLoopIndex].uiThreshold = TX_PACKET_THRESHOLD;
@@ -24,10 +24,10 @@ static VOID default_wimax_protocol_initialize(struct bcm_mini_adapter *Adapter)
         return;
 }
 
-INT InitAdapter(struct bcm_mini_adapter *psAdapter)
+int InitAdapter(struct bcm_mini_adapter *psAdapter)
 {
         int i = 0;
-        INT Status = STATUS_SUCCESS;
+        int Status = STATUS_SUCCESS;
         BCM_DEBUG_PRINT(psAdapter, DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "Initialising Adapter = %p", psAdapter);
 
         if (psAdapter == NULL) {
@@ -93,7 +93,7 @@ INT InitAdapter(struct bcm_mini_adapter *psAdapter)
         return STATUS_SUCCESS;
 }
 
-VOID AdapterFree(struct bcm_mini_adapter *Adapter)
+void AdapterFree(struct bcm_mini_adapter *Adapter)
 {
         int count;
         beceem_protocol_reset(Adapter);
@@ -216,12 +216,12 @@ exit_download:
  * Logical Adapter
  * Control Packet Buffer
  */
-INT CopyBufferToControlPacket(struct bcm_mini_adapter *Adapter, PVOID ioBuffer)
+int CopyBufferToControlPacket(struct bcm_mini_adapter *Adapter, void *ioBuffer)
 {
         struct bcm_leader *pLeader = NULL;
-        INT Status = 0;
-        unsigned char *ctrl_buff = NULL;
-        UINT pktlen = 0;
+        int Status = 0;
+        unsigned char *ctrl_buff;
+        unsigned int pktlen = 0;
         struct bcm_link_request *pLinkReq = NULL;
         PUCHAR pucAddIndication = NULL;
 
@@ -253,7 +253,7 @@ INT CopyBufferToControlPacket(struct bcm_mini_adapter *Adapter, PVOID ioBuffer)
                         return STATUS_FAILURE;
                 }
 
-                if (TRUE == Adapter->bShutStatus) {
+                if (Adapter->bShutStatus == TRUE) {
                         BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, TX_CONTROL, DBG_LVL_ALL, "SYNC UP IN SHUTDOWN..Device WakeUp\n");
                         if (Adapter->bTriedToWakeUpFromlowPowerMode == FALSE) {
                                 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, TX_CONTROL, DBG_LVL_ALL, "Waking up for the First Time..\n");
@@ -275,7 +275,7 @@ INT CopyBufferToControlPacket(struct bcm_mini_adapter *Adapter, PVOID ioBuffer)
                 }
         }
 
-        if (TRUE == Adapter->IdleMode) {
+        if (Adapter->IdleMode == TRUE) {
                 /* BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"Device is in Idle mode ... hence\n"); */
                 if (pLeader->Status == LINK_UP_CONTROL_REQ || pLeader->Status == 0x80 ||
                         pLeader->Status == CM_CONTROL_NEWDSX_MULTICLASSIFIER_REQ) {
@@ -325,64 +325,66 @@ INT CopyBufferToControlPacket(struct bcm_mini_adapter *Adapter, PVOID ioBuffer)
         pktlen = pLeader->PLength;
         ctrl_buff = (char *)Adapter->txctlpacket[atomic_read(&Adapter->index_wr_txcntrlpkt)%MAX_CNTRL_PKTS];
 
+        if (!ctrl_buff) {
+                BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, TX_CONTROL, DBG_LVL_ALL, "mem allocation Failed");
+                return -ENOMEM;
+        }
+
         BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, TX_CONTROL, DBG_LVL_ALL, "Control packet to be taken =%d and address is =%pincoming address is =%p and packet len=%x",
                         atomic_read(&Adapter->index_wr_txcntrlpkt), ctrl_buff, ioBuffer, pktlen);
-        if (ctrl_buff) {
-                if (pLeader) {
-                        if ((pLeader->Status == 0x80) ||
-                                (pLeader->Status == CM_CONTROL_NEWDSX_MULTICLASSIFIER_REQ)) {
-                                /*
-                                 * Restructure the DSX message to handle Multiple classifier Support
-                                 * Write the Service Flow param Structures directly to the target
-                                 * and embed the pointers in the DSX messages sent to target.
-                                 */
-                                /* Lets store the current length of the control packet we are transmitting */
-                                pucAddIndication = (PUCHAR)ioBuffer + LEADER_SIZE;
-                                pktlen = pLeader->PLength;
-                                Status = StoreCmControlResponseMessage(Adapter, pucAddIndication, &pktlen);
-                                if (Status != 1) {
-                                        ClearTargetDSXBuffer(Adapter, ((stLocalSFAddIndicationAlt *)pucAddIndication)->u16TID, FALSE);
-                                        BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, TX_CONTROL, DBG_LVL_ALL, " Error Restoring The DSX Control Packet. Dsx Buffers on Target may not be Setup Properly ");
-                                        return STATUS_FAILURE;
-                                }
-                                /*
-                                 * update the leader to use the new length
-                                 * The length of the control packet is length of message being sent + Leader length
-                                 */
-                                pLeader->PLength = pktlen;
+
+        if (pLeader) {
+                if ((pLeader->Status == 0x80) ||
+                        (pLeader->Status == CM_CONTROL_NEWDSX_MULTICLASSIFIER_REQ)) {
+                        /*
+                         * Restructure the DSX message to handle Multiple classifier Support
+                         * Write the Service Flow param Structures directly to the target
+                         * and embed the pointers in the DSX messages sent to target.
+                         */
+                        /* Lets store the current length of the control packet we are transmitting */
+                        pucAddIndication = (PUCHAR)ioBuffer + LEADER_SIZE;
+                        pktlen = pLeader->PLength;
+                        Status = StoreCmControlResponseMessage(Adapter, pucAddIndication, &pktlen);
+                        if (Status != 1) {
+                                ClearTargetDSXBuffer(Adapter, ((struct bcm_add_indication_alt *)pucAddIndication)->u16TID, FALSE);
+                                BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, TX_CONTROL, DBG_LVL_ALL, " Error Restoring The DSX Control Packet. Dsx Buffers on Target may not be Setup Properly ");
+                                return STATUS_FAILURE;
                         }
+                        /*
+                         * update the leader to use the new length
+                         * The length of the control packet is length of message being sent + Leader length
+                         */
+                        pLeader->PLength = pktlen;
                 }
-
-                if (pktlen + LEADER_SIZE > MAX_CNTL_PKT_SIZE)
-                        return -EINVAL;
-
-                memset(ctrl_buff, 0, pktlen+LEADER_SIZE);
-                BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, TX_CONTROL, DBG_LVL_ALL, "Copying the Control Packet Buffer with length=%d\n", pLeader->PLength);
-                *(struct bcm_leader *)ctrl_buff = *pLeader;
-                memcpy(ctrl_buff + LEADER_SIZE, ((PUCHAR)ioBuffer + LEADER_SIZE), pLeader->PLength);
-                BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, TX_CONTROL, DBG_LVL_ALL, "Enqueuing the Control Packet");
-
-                /* Update the statistics counters */
-                spin_lock_bh(&Adapter->PackInfo[HiPriority].SFQueueLock);
-                Adapter->PackInfo[HiPriority].uiCurrentBytesOnHost += pLeader->PLength;
-                Adapter->PackInfo[HiPriority].uiCurrentPacketsOnHost++;
-                atomic_inc(&Adapter->TotalPacketCount);
-                spin_unlock_bh(&Adapter->PackInfo[HiPriority].SFQueueLock);
-                Adapter->PackInfo[HiPriority].bValid = TRUE;
-
-                BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, TX_CONTROL, DBG_LVL_ALL, "CurrBytesOnHost: %x bValid: %x",
-                                Adapter->PackInfo[HiPriority].uiCurrentBytesOnHost,
-                                Adapter->PackInfo[HiPriority].bValid);
-                Status = STATUS_SUCCESS;
-                /*Queue the packet for transmission */
-                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);
-                wake_up(&Adapter->tx_packet_wait_queue);
-        } else {
-                Status = -ENOMEM;
-                BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, TX_CONTROL, DBG_LVL_ALL, "mem allocation Failed");
         }
+
+        if (pktlen + LEADER_SIZE > MAX_CNTL_PKT_SIZE)
+                return -EINVAL;
+
+        memset(ctrl_buff, 0, pktlen+LEADER_SIZE);
+        BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, TX_CONTROL, DBG_LVL_ALL, "Copying the Control Packet Buffer with length=%d\n", pLeader->PLength);
+        *(struct bcm_leader *)ctrl_buff = *pLeader;
+        memcpy(ctrl_buff + LEADER_SIZE, ((PUCHAR)ioBuffer + LEADER_SIZE), pLeader->PLength);
+        BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, TX_CONTROL, DBG_LVL_ALL, "Enqueuing the Control Packet");
+
+        /* Update the statistics counters */
+        spin_lock_bh(&Adapter->PackInfo[HiPriority].SFQueueLock);
+        Adapter->PackInfo[HiPriority].uiCurrentBytesOnHost += pLeader->PLength;
+        Adapter->PackInfo[HiPriority].uiCurrentPacketsOnHost++;
+        atomic_inc(&Adapter->TotalPacketCount);
+        spin_unlock_bh(&Adapter->PackInfo[HiPriority].SFQueueLock);
+        Adapter->PackInfo[HiPriority].bValid = TRUE;
+
+        BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, TX_CONTROL, DBG_LVL_ALL, "CurrBytesOnHost: %x bValid: %x",
+                        Adapter->PackInfo[HiPriority].uiCurrentBytesOnHost,
+                        Adapter->PackInfo[HiPriority].bValid);
+        Status = STATUS_SUCCESS;
+        /*Queue the packet for transmission */
+        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);
+        wake_up(&Adapter->tx_packet_wait_queue);
+
         BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, TX_CONTROL, DBG_LVL_ALL, "<====");
         return Status;
 }
@@ -397,7 +399,7 @@ INT CopyBufferToControlPacket(struct bcm_mini_adapter *Adapter, PVOID ioBuffer)
 *
 * Returns     - None.
 *******************************************************************/
-VOID LinkMessage(struct bcm_mini_adapter *Adapter)
+void LinkMessage(struct bcm_mini_adapter *Adapter)
 {
         struct bcm_link_request *pstLinkRequest = NULL;
         BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, LINK_UP_MSG, DBG_LVL_ALL, "=====>");
@@ -448,11 +450,11 @@ VOID LinkMessage(struct bcm_mini_adapter *Adapter)
 *
 * Returns     - None.
 ************************************************************************/
-VOID StatisticsResponse(struct bcm_mini_adapter *Adapter, PVOID pvBuffer)
+void StatisticsResponse(struct bcm_mini_adapter *Adapter, void *pvBuffer)
 {
         BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "%s====>", __func__);
         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, "Stats at %x", (unsigned int)Adapter->StatisticsPointer);
         BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "%s <====", __func__);
         return;
 }
@@ -467,7 +469,7 @@ VOID StatisticsResponse(struct bcm_mini_adapter *Adapter, PVOID pvBuffer)
 *
 * Returns     - None.
 ***********************************************************************/
-VOID LinkControlResponseMessage(struct bcm_mini_adapter *Adapter, PUCHAR pucBuffer)
+void LinkControlResponseMessage(struct bcm_mini_adapter *Adapter, PUCHAR pucBuffer)
 {
         BCM_DEBUG_PRINT(Adapter, DBG_TYPE_RX, RX_DPC, DBG_LVL_ALL, "=====>");
 
@@ -543,7 +545,7 @@ VOID LinkControlResponseMessage(struct bcm_mini_adapter *Adapter, PUCHAR pucBuff
 
 void SendIdleModeResponse(struct bcm_mini_adapter *Adapter)
 {
-        INT status = 0, NVMAccess = 0, lowPwrAbortMsg = 0;
+        int status = 0, NVMAccess = 0, lowPwrAbortMsg = 0;
         struct timeval tv;
         struct bcm_link_request stIdleResponse = {{0} };
         memset(&tv, 0, sizeof(tv));
@@ -583,7 +585,7 @@ void SendIdleModeResponse(struct bcm_mini_adapter *Adapter)
 
                 /* Wait for the LED to TURN OFF before sending ACK response */
                 if (Adapter->LEDInfo.led_thread_running & BCM_LED_THREAD_RUNNING_ACTIVELY) {
-                        INT iRetVal = 0;
+                        int iRetVal = 0;
 
                         /* Wake the LED Thread with IDLEMODE_ENTER State */
                         Adapter->DriverState = LOWPOWER_MODE_ENTER;
@@ -609,7 +611,7 @@ void SendIdleModeResponse(struct bcm_mini_adapter *Adapter)
                         up(&Adapter->rdmwrmsync);
                         /* Killing all URBS. */
                         if (Adapter->bDoSuspend == TRUE)
-                                Bcm_kill_all_URBs((PS_INTERFACE_ADAPTER)(Adapter->pvInterfaceAdapter));
+                                Bcm_kill_all_URBs((struct bcm_interface_adapter *)(Adapter->pvInterfaceAdapter));
                 } else {
                         Adapter->bPreparingForLowPowerMode = FALSE;
                 }
@@ -625,7 +627,7 @@ void SendIdleModeResponse(struct bcm_mini_adapter *Adapter)
         if ((status != STATUS_SUCCESS)) {
                 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "fail to send the Idle mode Request\n");
                 Adapter->bPreparingForLowPowerMode = FALSE;
-                StartInterruptUrb((PS_INTERFACE_ADAPTER)(Adapter->pvInterfaceAdapter));
+                StartInterruptUrb((struct bcm_interface_adapter *)(Adapter->pvInterfaceAdapter));
         }
         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);
@@ -640,11 +642,11 @@ void SendIdleModeResponse(struct bcm_mini_adapter *Adapter)
 *
 * Returns     - None.
 *******************************************************************/
-VOID DumpPackInfo(struct bcm_mini_adapter *Adapter)
+void DumpPackInfo(struct bcm_mini_adapter *Adapter)
 {
-        UINT uiLoopIndex = 0;
-        UINT uiIndex = 0;
-        UINT uiClsfrIndex = 0;
+        unsigned int uiLoopIndex = 0;
+        unsigned int uiIndex = 0;
+        unsigned int uiClsfrIndex = 0;
         struct bcm_classifier_rule *pstClassifierEntry = NULL;
 
         for (uiLoopIndex = 0; uiLoopIndex < NO_OF_QUEUES; uiLoopIndex++) {
@@ -776,11 +778,11 @@ int reset_card_proc(struct bcm_mini_adapter *ps_adapter)
 {
         int retval = STATUS_SUCCESS;
         struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev);
-        PS_INTERFACE_ADAPTER psIntfAdapter = NULL;
+        struct bcm_interface_adapter *psIntfAdapter = NULL;
         unsigned int value = 0, uiResetValue = 0;
         int bytes;
 
-        psIntfAdapter = ((PS_INTERFACE_ADAPTER)(ps_adapter->pvInterfaceAdapter));
+        psIntfAdapter = ((struct bcm_interface_adapter *)(ps_adapter->pvInterfaceAdapter));
         ps_adapter->bDDRInitDone = FALSE;
 
         if (ps_adapter->chip_id >= T3LPB) {
@@ -920,7 +922,7 @@ int run_card_proc(struct bcm_mini_adapter *ps_adapter)
 int InitCardAndDownloadFirmware(struct bcm_mini_adapter *ps_adapter)
 {
         int status;
-        UINT value = 0;
+        unsigned int value = 0;
         /*
          * Create the threads first and then download the
          * Firm/DDR Settings..
@@ -1088,7 +1090,7 @@ static int bcm_parse_target_params(struct bcm_mini_adapter *Adapter)
 
 void beceem_parse_target_struct(struct bcm_mini_adapter *Adapter)
 {
-        UINT uiHostDrvrCfg6 = 0, uiEEPROMFlag = 0;
+        unsigned int uiHostDrvrCfg6 = 0, uiEEPROMFlag = 0;
 
         if (ntohl(Adapter->pstargetparams->m_u32PhyParameter2) & AUTO_SYNC_DISABLE) {
                 pr_info(DRV_NAME ": AutoSyncup is Disabled\n");
@@ -1144,9 +1146,9 @@ void beceem_parse_target_struct(struct bcm_mini_adapter *Adapter)
                 doPowerAutoCorrection(Adapter);
 }
 
-static VOID doPowerAutoCorrection(struct bcm_mini_adapter *psAdapter)
+static void doPowerAutoCorrection(struct bcm_mini_adapter *psAdapter)
 {
-        UINT reporting_mode;
+        unsigned int reporting_mode;
 
         reporting_mode = ntohl(psAdapter->pstargetparams->m_u32PowerSavingModeOptions) & 0x02;
         psAdapter->bIsAutoCorrectEnabled = !((char)(psAdapter->ulPowerSaveMode >> 3) & 0x1);
@@ -1175,26 +1177,26 @@ static VOID doPowerAutoCorrection(struct bcm_mini_adapter *psAdapter)
         }
 }
 
-static void convertEndian(B_UINT8 rwFlag, PUINT puiBuffer, UINT uiByteCount)
+static void convertEndian(unsigned char rwFlag, unsigned int *puiBuffer, unsigned int uiByteCount)
 {
-        UINT uiIndex = 0;
+        unsigned int uiIndex = 0;
 
         if (RWM_WRITE == rwFlag) {
-                for (uiIndex = 0; uiIndex < (uiByteCount/sizeof(UINT)); uiIndex++)
+                for (uiIndex = 0; uiIndex < (uiByteCount/sizeof(unsigned int)); uiIndex++)
                         puiBuffer[uiIndex] = htonl(puiBuffer[uiIndex]);
         } else {
-                for (uiIndex = 0; uiIndex < (uiByteCount/sizeof(UINT)); uiIndex++)
+                for (uiIndex = 0; uiIndex < (uiByteCount/sizeof(unsigned int)); uiIndex++)
                         puiBuffer[uiIndex] = ntohl(puiBuffer[uiIndex]);
         }
 }
 
-int rdm(struct bcm_mini_adapter *Adapter, UINT uiAddress, PCHAR pucBuff, size_t sSize)
+int rdm(struct bcm_mini_adapter *Adapter, unsigned int uiAddress, PCHAR pucBuff, size_t sSize)
 {
         return Adapter->interface_rdm(Adapter->pvInterfaceAdapter,
                                 uiAddress, pucBuff, sSize);
 }
 
-int wrm(struct bcm_mini_adapter *Adapter, UINT uiAddress, PCHAR pucBuff, size_t sSize)
+int wrm(struct bcm_mini_adapter *Adapter, unsigned int uiAddress, PCHAR pucBuff, size_t sSize)
 {
         int iRetVal;
 
@@ -1203,25 +1205,25 @@ int wrm(struct bcm_mini_adapter *Adapter, UINT uiAddress, PCHAR pucBuff, size_t
         return iRetVal;
 }
 
-int wrmalt(struct bcm_mini_adapter *Adapter, UINT uiAddress, PUINT pucBuff, size_t size)
+int wrmalt(struct bcm_mini_adapter *Adapter, unsigned int uiAddress, unsigned int *pucBuff, size_t size)
 {
         convertEndian(RWM_WRITE, pucBuff, size);
         return wrm(Adapter, uiAddress, (PUCHAR)pucBuff, size);
 }
 
-int rdmalt(struct bcm_mini_adapter *Adapter, UINT uiAddress, PUINT pucBuff, size_t size)
+int rdmalt(struct bcm_mini_adapter *Adapter, unsigned int uiAddress, unsigned int *pucBuff, size_t size)
 {
-        INT uiRetVal = 0;
+        int uiRetVal = 0;
 
         uiRetVal = rdm(Adapter, uiAddress, (PUCHAR)pucBuff, size);
-        convertEndian(RWM_READ, (PUINT)pucBuff, size);
+        convertEndian(RWM_READ, (unsigned int *)pucBuff, size);
 
         return uiRetVal;
 }
 
-int wrmWithLock(struct bcm_mini_adapter *Adapter, UINT uiAddress, PCHAR pucBuff, size_t sSize)
+int wrmWithLock(struct bcm_mini_adapter *Adapter, unsigned int uiAddress, PCHAR pucBuff, size_t sSize)
 {
-        INT status = STATUS_SUCCESS;
+        int status = STATUS_SUCCESS;
         down(&Adapter->rdmwrmsync);
 
         if ((Adapter->IdleMode == TRUE) ||
@@ -1238,7 +1240,7 @@ exit:
         return status;
 }
 
-int wrmaltWithLock(struct bcm_mini_adapter *Adapter, UINT uiAddress, PUINT pucBuff, size_t size)
+int wrmaltWithLock(struct bcm_mini_adapter *Adapter, unsigned int uiAddress, unsigned int *pucBuff, size_t size)
 {
         int iRetVal = STATUS_SUCCESS;
 
@@ -1258,9 +1260,9 @@ exit:
         return iRetVal;
 }
 
-int rdmaltWithLock(struct bcm_mini_adapter *Adapter, UINT uiAddress, PUINT pucBuff, size_t size)
+int rdmaltWithLock(struct bcm_mini_adapter *Adapter, unsigned int uiAddress, unsigned int *pucBuff, size_t size)
 {
-        INT uiRetVal = STATUS_SUCCESS;
+        int uiRetVal = STATUS_SUCCESS;
 
         down(&Adapter->rdmwrmsync);
         if ((Adapter->IdleMode == TRUE) ||
@@ -1277,13 +1279,13 @@ exit:
         return uiRetVal;
 }
 
-static VOID HandleShutDownModeWakeup(struct bcm_mini_adapter *Adapter)
+static void HandleShutDownModeWakeup(struct bcm_mini_adapter *Adapter)
 {
         int clear_abort_pattern = 0, Status = 0;
         BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, MP_SHUTDOWN, DBG_LVL_ALL, "====>\n");
         /* target has woken up From Shut Down */
         BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, MP_SHUTDOWN, DBG_LVL_ALL, "Clearing Shut Down Software abort pattern\n");
-        Status = wrmalt(Adapter, SW_ABORT_IDLEMODE_LOC, (PUINT)&clear_abort_pattern, sizeof(clear_abort_pattern));
+        Status = wrmalt(Adapter, SW_ABORT_IDLEMODE_LOC, (unsigned int *)&clear_abort_pattern, sizeof(clear_abort_pattern));
         if (Status) {
                 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, MP_SHUTDOWN, DBG_LVL_ALL, "WRM to SW_ABORT_IDLEMODE_LOC failed with err:%d", Status);
                 return;
@@ -1306,11 +1308,11 @@ static VOID HandleShutDownModeWakeup(struct bcm_mini_adapter *Adapter)
         BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, MP_SHUTDOWN, DBG_LVL_ALL, "<====\n");
 }
 
-static VOID SendShutModeResponse(struct bcm_mini_adapter *Adapter)
+static void SendShutModeResponse(struct bcm_mini_adapter *Adapter)
 {
         struct bcm_link_request stShutdownResponse;
-        UINT NVMAccess = 0, lowPwrAbortMsg = 0;
-        UINT Status = 0;
+        unsigned int NVMAccess = 0, lowPwrAbortMsg = 0;
+        unsigned int Status = 0;
 
         memset(&stShutdownResponse, 0, sizeof(struct bcm_link_request));
         stShutdownResponse.Leader.Status  = LINK_UP_CONTROL_REQ;
@@ -1346,7 +1348,7 @@ static VOID SendShutModeResponse(struct bcm_mini_adapter *Adapter)
 
                 /* Wait for the LED to TURN OFF before sending ACK response */
                 if (Adapter->LEDInfo.led_thread_running & BCM_LED_THREAD_RUNNING_ACTIVELY) {
-                        INT iRetVal = 0;
+                        int iRetVal = 0;
 
                         /* Wake the LED Thread with LOWPOWER_MODE_ENTER State */
                         Adapter->DriverState = LOWPOWER_MODE_ENTER;
@@ -1370,7 +1372,7 @@ static VOID SendShutModeResponse(struct bcm_mini_adapter *Adapter)
                         up(&Adapter->rdmwrmsync);
                         /* Killing all URBS. */
                         if (Adapter->bDoSuspend == TRUE)
-                                Bcm_kill_all_URBs((PS_INTERFACE_ADAPTER)(Adapter->pvInterfaceAdapter));
+                                Bcm_kill_all_URBs((struct bcm_interface_adapter *)(Adapter->pvInterfaceAdapter));
                 } else {
                         Adapter->bPreparingForLowPowerMode = FALSE;
                 }
@@ -1386,13 +1388,13 @@ static VOID SendShutModeResponse(struct bcm_mini_adapter *Adapter)
         if ((Status != STATUS_SUCCESS)) {
                 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, MP_SHUTDOWN, DBG_LVL_ALL, "fail to send the Idle mode Request\n");
                 Adapter->bPreparingForLowPowerMode = FALSE;
-                StartInterruptUrb((PS_INTERFACE_ADAPTER)(Adapter->pvInterfaceAdapter));
+                StartInterruptUrb((struct bcm_interface_adapter *)(Adapter->pvInterfaceAdapter));
         }
 }
 
 static void HandleShutDownModeRequest(struct bcm_mini_adapter *Adapter, PUCHAR pucBuffer)
 {
-        B_UINT32 uiResetValue = 0;
+        unsigned int uiResetValue = 0;
 
         BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, MP_SHUTDOWN, DBG_LVL_ALL, "====>\n");
 
@@ -1412,14 +1414,14 @@ static void HandleShutDownModeRequest(struct bcm_mini_adapter *Adapter, PUCHAR p
                 }
 
                 SendShutModeResponse(Adapter);
-                BCM_DEBUG_PRINT (Adapter, DBG_TYPE_OTHERS, MP_SHUTDOWN, DBG_LVL_ALL, "ShutDownModeResponse:Notification received: Sending the response(Ack/Nack)\n");
+                BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, MP_SHUTDOWN, DBG_LVL_ALL, "ShutDownModeResponse:Notification received: Sending the response(Ack/Nack)\n");
         }
 
         BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, MP_SHUTDOWN, DBG_LVL_ALL, "<====\n");
         return;
 }
 
-VOID ResetCounters(struct bcm_mini_adapter *Adapter)
+void ResetCounters(struct bcm_mini_adapter *Adapter)
 {
         beceem_protocol_reset(Adapter);
         Adapter->CurrNumRecvDescs = 0;
@@ -1437,7 +1439,7 @@ VOID ResetCounters(struct bcm_mini_adapter *Adapter)
 
 struct bcm_classifier_rule *GetFragIPClsEntry(struct bcm_mini_adapter *Adapter, USHORT usIpIdentification, ULONG SrcIP)
 {
-        UINT uiIndex = 0;
+        unsigned int uiIndex = 0;
         for (uiIndex = 0; uiIndex < MAX_FRAGMENTEDIP_CLASSIFICATION_ENTRIES; uiIndex++) {
                 if ((Adapter->astFragmentedPktClassifierTable[uiIndex].bUsed) &&
                         (Adapter->astFragmentedPktClassifierTable[uiIndex].usIpIdentification == usIpIdentification) &&
@@ -1451,7 +1453,7 @@ struct bcm_classifier_rule *GetFragIPClsEntry(struct bcm_mini_adapter *Adapter,
 
 void AddFragIPClsEntry(struct bcm_mini_adapter *Adapter, struct bcm_fragmented_packet_info *psFragPktInfo)
 {
-        UINT uiIndex = 0;
+        unsigned int uiIndex = 0;
         for (uiIndex = 0; uiIndex < MAX_FRAGMENTEDIP_CLASSIFICATION_ENTRIES; uiIndex++) {
                 if (!Adapter->astFragmentedPktClassifierTable[uiIndex].bUsed) {
                         memcpy(&Adapter->astFragmentedPktClassifierTable[uiIndex], psFragPktInfo, sizeof(struct bcm_fragmented_packet_info));
@@ -1462,7 +1464,7 @@ void AddFragIPClsEntry(struct bcm_mini_adapter *Adapter, struct bcm_fragmented_p
 
 void DelFragIPClsEntry(struct bcm_mini_adapter *Adapter, USHORT usIpIdentification, ULONG SrcIp)
 {
-        UINT uiIndex = 0;
+        unsigned int uiIndex = 0;
         for (uiIndex = 0; uiIndex < MAX_FRAGMENTEDIP_CLASSIFICATION_ENTRIES; uiIndex++) {
                 if ((Adapter->astFragmentedPktClassifierTable[uiIndex].bUsed) &&
                         (Adapter->astFragmentedPktClassifierTable[uiIndex].usIpIdentification == usIpIdentification) &&
@@ -1474,7 +1476,7 @@ void DelFragIPClsEntry(struct bcm_mini_adapter *Adapter, USHORT usIpIdentificati
 
 void update_per_cid_rx(struct bcm_mini_adapter *Adapter)
 {
-        UINT qindex = 0;
+        unsigned int qindex = 0;
 
         if ((jiffies - Adapter->liDrainCalculated) < XSECONDS)
                 return;
@@ -1498,14 +1500,14 @@ void update_per_cid_rx(struct bcm_mini_adapter *Adapter)
 
 void update_per_sf_desc_cnts(struct bcm_mini_adapter *Adapter)
 {
-        INT iIndex = 0;
+        int iIndex = 0;
         u32 uibuff[MAX_TARGET_DSX_BUFFERS];
         int bytes;
 
         if (!atomic_read(&Adapter->uiMBupdate))
                 return;
 
-        bytes = rdmaltWithLock(Adapter, TARGET_SFID_TXDESC_MAP_LOC, (PUINT)uibuff, sizeof(UINT) * MAX_TARGET_DSX_BUFFERS);
+        bytes = rdmaltWithLock(Adapter, TARGET_SFID_TXDESC_MAP_LOC, (unsigned int *)uibuff, sizeof(unsigned int) * MAX_TARGET_DSX_BUFFERS);
         if (bytes < 0) {
                 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "rdm failed\n");
                 return;
@@ -1522,7 +1524,7 @@ void update_per_sf_desc_cnts(struct bcm_mini_adapter *Adapter)
         atomic_set(&Adapter->uiMBupdate, FALSE);
 }
 
-void flush_queue(struct bcm_mini_adapter *Adapter, UINT iQIndex)
+void flush_queue(struct bcm_mini_adapter *Adapter, unsigned int iQIndex)
 {
         struct sk_buff *PacketToDrop = NULL;
         struct net_device_stats *netstats = &Adapter->dev->stats;
@@ -1573,6 +1575,6 @@ static void beceem_protocol_reset(struct bcm_mini_adapter *Adapter)
         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(&Adapter->PackInfo[i].stMibsExtServiceFlowTable, 0, sizeof(S_MIBS_EXTSERVICEFLOW_PARAMETERS));
+                memset(&Adapter->PackInfo[i].stMibsExtServiceFlowTable, 0, sizeof(struct bcm_mibs_parameters));
         }
 }
diff --git a/drivers/staging/bcm/Prototypes.h b/drivers/staging/bcm/Prototypes.h
index 3ec8f800a5b0..90dbe0f4785e 100644
--- a/drivers/staging/bcm/Prototypes.h
+++ b/drivers/staging/bcm/Prototypes.h
@@ -79,17 +79,17 @@ int rdm(struct bcm_mini_adapter *Adapter, UINT uiAddress, PCHAR pucBuff, size_t
 
 int wrm(struct bcm_mini_adapter *Adapter, UINT uiAddress, PCHAR pucBuff, size_t size);
 
-int wrmalt (struct bcm_mini_adapter *Adapter, UINT uiAddress, PUINT pucBuff, size_t sSize);
+int wrmalt (struct bcm_mini_adapter *Adapter, UINT uiAddress, unsigned int *pucBuff, size_t sSize);
 
-int rdmalt (struct bcm_mini_adapter *Adapter, UINT uiAddress, PUINT pucBuff, size_t sSize);
+int rdmalt (struct bcm_mini_adapter *Adapter, UINT uiAddress, unsigned int *pucBuff, size_t sSize);
 
 int get_dsx_sf_data_to_application(struct bcm_mini_adapter *Adapter, UINT uiSFId, void __user * user_buffer);
 
 void SendIdleModeResponse(struct bcm_mini_adapter *Adapter);
 
 
-int  ProcessGetHostMibs(struct bcm_mini_adapter *Adapter, S_MIBS_HOST_STATS_MIBS *buf);
-void GetDroppedAppCntrlPktMibs(S_MIBS_HOST_STATS_MIBS *ioBuffer, struct bcm_tarang_data *pTarang);
+int  ProcessGetHostMibs(struct bcm_mini_adapter *Adapter, struct bcm_host_stats_mibs *buf);
+void GetDroppedAppCntrlPktMibs(struct bcm_host_stats_mibs *ioBuffer, struct bcm_tarang_data *pTarang);
 void beceem_parse_target_struct(struct bcm_mini_adapter *Adapter);
 
 int bcm_ioctl_fw_download(struct bcm_mini_adapter *Adapter, struct bcm_firmware_info *psFwInfo);
@@ -161,14 +161,14 @@ INT BeceemNVMWrite(
 INT BcmInitNVM(struct bcm_mini_adapter *Adapter);
 
 INT BcmUpdateSectorSize(struct bcm_mini_adapter *Adapter,UINT uiSectorSize);
-BOOLEAN IsSectionExistInFlash(struct bcm_mini_adapter *Adapter, FLASH2X_SECTION_VAL section);
+BOOLEAN IsSectionExistInFlash(struct bcm_mini_adapter *Adapter, enum bcm_flash2x_section_val section);
 
-INT BcmGetFlash2xSectionalBitMap(struct bcm_mini_adapter *Adapter, PFLASH2X_BITMAP psFlash2xBitMap);
+INT BcmGetFlash2xSectionalBitMap(struct bcm_mini_adapter *Adapter, struct bcm_flash2x_bitmap *psFlash2xBitMap);
 
 INT BcmFlash2xBulkWrite(
         struct bcm_mini_adapter *Adapter,
         PUINT pBuffer,
-        FLASH2X_SECTION_VAL eFlashSectionVal,
+        enum bcm_flash2x_section_val eFlashSectionVal,
         UINT uiOffset,
         UINT uiNumBytes,
         UINT bVerify);
@@ -176,24 +176,24 @@ INT BcmFlash2xBulkWrite(
 INT BcmFlash2xBulkRead(
         struct bcm_mini_adapter *Adapter,
         PUINT pBuffer,
-        FLASH2X_SECTION_VAL eFlashSectionVal,
+        enum bcm_flash2x_section_val eFlashSectionVal,
         UINT uiOffsetWithinSectionVal,
         UINT uiNumBytes);
 
-INT BcmGetSectionValStartOffset(struct bcm_mini_adapter *Adapter, FLASH2X_SECTION_VAL eFlashSectionVal);
+INT BcmGetSectionValStartOffset(struct bcm_mini_adapter *Adapter, enum bcm_flash2x_section_val eFlashSectionVal);
 
-INT BcmSetActiveSection(struct bcm_mini_adapter *Adapter, FLASH2X_SECTION_VAL eFlash2xSectVal);
+INT BcmSetActiveSection(struct bcm_mini_adapter *Adapter, enum bcm_flash2x_section_val eFlash2xSectVal);
 INT BcmAllocFlashCSStructure(struct bcm_mini_adapter *psAdapter);
 INT BcmDeAllocFlashCSStructure(struct bcm_mini_adapter *psAdapter);
 
-INT BcmCopyISO(struct bcm_mini_adapter *Adapter, FLASH2X_COPY_SECTION sCopySectStrut);
-INT BcmFlash2xCorruptSig(struct bcm_mini_adapter *Adapter, FLASH2X_SECTION_VAL eFlash2xSectionVal);
-INT BcmFlash2xWriteSig(struct bcm_mini_adapter *Adapter, FLASH2X_SECTION_VAL eFlashSectionVal);
-INT     validateFlash2xReadWrite(struct bcm_mini_adapter *Adapter, PFLASH2X_READWRITE psFlash2xReadWrite);
+INT BcmCopyISO(struct bcm_mini_adapter *Adapter, struct bcm_flash2x_copy_section sCopySectStrut);
+INT BcmFlash2xCorruptSig(struct bcm_mini_adapter *Adapter, enum bcm_flash2x_section_val eFlash2xSectionVal);
+INT BcmFlash2xWriteSig(struct bcm_mini_adapter *Adapter, enum bcm_flash2x_section_val eFlashSectionVal);
+INT     validateFlash2xReadWrite(struct bcm_mini_adapter *Adapter, struct bcm_flash2x_readwrite *psFlash2xReadWrite);
 INT IsFlash2x(struct bcm_mini_adapter *Adapter);
 INT     BcmCopySection(struct bcm_mini_adapter *Adapter,
-                                                FLASH2X_SECTION_VAL SrcSection,
-                                                FLASH2X_SECTION_VAL DstSection,
+                                                enum bcm_flash2x_section_val SrcSection,
+                                                enum bcm_flash2x_section_val DstSection,
                                                 UINT offset,
                                                 UINT numOfBytes);
 
@@ -203,8 +203,8 @@ BOOLEAN IsNonCDLessDevice(struct bcm_mini_adapter *Adapter);
 
 VOID OverrideServiceFlowParams(struct bcm_mini_adapter *Adapter,PUINT puiBuffer);
 
-int wrmaltWithLock (struct bcm_mini_adapter *Adapter, UINT uiAddress, PUINT pucBuff, size_t sSize);
-int rdmaltWithLock (struct bcm_mini_adapter *Adapter, UINT uiAddress, PUINT pucBuff, size_t sSize);
+int wrmaltWithLock (struct bcm_mini_adapter *Adapter, UINT uiAddress, unsigned int *pucBuff, size_t sSize);
+int rdmaltWithLock (struct bcm_mini_adapter *Adapter, UINT uiAddress, unsigned int *pucBuff, size_t sSize);
 
 int wrmWithLock(struct bcm_mini_adapter *Adapter, UINT uiAddress, PCHAR pucBuff, size_t size);
 INT buffDnldVerify(struct bcm_mini_adapter *Adapter, unsigned char *mappedbuffer, unsigned int u32FirmwareLength,
diff --git a/drivers/staging/bcm/Transmit.c b/drivers/staging/bcm/Transmit.c
index 27e8c890777b..f8dc3e20b475 100644
--- a/drivers/staging/bcm/Transmit.c
+++ b/drivers/staging/bcm/Transmit.c
@@ -205,7 +205,7 @@ int tx_pkt_handler(struct bcm_mini_adapter *Adapter /**< pointer to adapter obje
                 if (Adapter->bEndPointHalted == TRUE) {
                         Bcm_clear_halt_of_endpoints(Adapter);
                         Adapter->bEndPointHalted = FALSE;
-                        StartInterruptUrb((PS_INTERFACE_ADAPTER)(Adapter->pvInterfaceAdapter));
+                        StartInterruptUrb((struct bcm_interface_adapter *)(Adapter->pvInterfaceAdapter));
                 }
 
                 if (Adapter->LinkUpStatus && !Adapter->IdleMode) {
diff --git a/drivers/staging/bcm/cntrl_SignalingInterface.h b/drivers/staging/bcm/cntrl_SignalingInterface.h
index 990e809e9680..8683c2d4276e 100644
--- a/drivers/staging/bcm/cntrl_SignalingInterface.h
+++ b/drivers/staging/bcm/cntrl_SignalingInterface.h
@@ -36,91 +36,91 @@
 
 struct bcm_packet_class_rules {
         /* 16bit UserPriority Of The Service Flow */
-        B_UINT16 u16UserPriority;
+        u16 u16UserPriority;
         /* 16bit VLANID Of The Service Flow */
-        B_UINT16 u16VLANID;
+        u16 u16VLANID;
         /* 16bit Packet Classification RuleIndex Of The Service Flow */
-        B_UINT16 u16PacketClassificationRuleIndex;
+        u16 u16PacketClassificationRuleIndex;
         /* 8bit Classifier Rule Priority Of The Service Flow */
-        B_UINT8 u8ClassifierRulePriority;
+        u8 u8ClassifierRulePriority;
         /* Length of IP TypeOfService field */
-        B_UINT8 u8IPTypeOfServiceLength;
+        u8 u8IPTypeOfServiceLength;
         /* 3bytes IP TypeOfService */
-        B_UINT8 u8IPTypeOfService[TYPE_OF_SERVICE_LENGTH];
+        u8 u8IPTypeOfService[TYPE_OF_SERVICE_LENGTH];
         /* Protocol used in classification of Service Flow */
-        B_UINT8 u8Protocol;
+        u8 u8Protocol;
         /* Length of IP Masked Source Address */
-        B_UINT8 u8IPMaskedSourceAddressLength;
+        u8 u8IPMaskedSourceAddressLength;
         /* IP Masked Source Address used in classification for the Service Flow */
-        B_UINT8 u8IPMaskedSourceAddress[IP_MASKED_SRC_ADDRESS_LENGTH];
+        u8 u8IPMaskedSourceAddress[IP_MASKED_SRC_ADDRESS_LENGTH];
         /* Length of IP Destination Address */
-        B_UINT8 u8IPDestinationAddressLength;
+        u8 u8IPDestinationAddressLength;
         /* IP Destination Address used in classification for the Service Flow */
-        B_UINT8 u8IPDestinationAddress[IP_MASKED_DEST_ADDRESS_LENGTH];
+        u8 u8IPDestinationAddress[IP_MASKED_DEST_ADDRESS_LENGTH];
         /* Length of Protocol Source Port Range */
-        B_UINT8 u8ProtocolSourcePortRangeLength;
+        u8 u8ProtocolSourcePortRangeLength;
         /* Protocol Source Port Range used in the Service Flow */
-        B_UINT8 u8ProtocolSourcePortRange[PROTOCOL_SRC_PORT_RANGE_LENGTH];
+        u8 u8ProtocolSourcePortRange[PROTOCOL_SRC_PORT_RANGE_LENGTH];
         /* Length of Protocol Dest Port Range */
-        B_UINT8 u8ProtocolDestPortRangeLength;
+        u8 u8ProtocolDestPortRangeLength;
         /* Protocol Dest Port Range used in the Service Flow */
-        B_UINT8 u8ProtocolDestPortRange[PROTOCOL_DEST_PORT_RANGE_LENGTH];
+        u8 u8ProtocolDestPortRange[PROTOCOL_DEST_PORT_RANGE_LENGTH];
         /* Length of Ethernet Destination MAC Address */
-        B_UINT8 u8EthernetDestMacAddressLength;
+        u8 u8EthernetDestMacAddressLength;
         /* Ethernet Destination MAC Address  used in classification of the Service Flow */
-        B_UINT8 u8EthernetDestMacAddress[ETHERNET_DEST_MAC_ADDR_LENGTH];
+        u8 u8EthernetDestMacAddress[ETHERNET_DEST_MAC_ADDR_LENGTH];
         /* Length of Ethernet Source MAC Address */
-        B_UINT8 u8EthernetSourceMACAddressLength;
+        u8 u8EthernetSourceMACAddressLength;
         /* Ethernet Source MAC Address  used in classification of the Service Flow */
-        B_UINT8 u8EthernetSourceMACAddress[ETHERNET_SRC_MAC_ADDR_LENGTH];
+        u8 u8EthernetSourceMACAddress[ETHERNET_SRC_MAC_ADDR_LENGTH];
         /* Length of Ethertype */
-        B_UINT8 u8EthertypeLength;
+        u8 u8EthertypeLength;
         /* 3bytes Ethertype Of The Service Flow */
-        B_UINT8 u8Ethertype[NUM_ETHERTYPE_BYTES];
+        u8 u8Ethertype[NUM_ETHERTYPE_BYTES];
         /* 8bit Associated PHSI Of The Service Flow */
-        B_UINT8 u8AssociatedPHSI;
+        u8 u8AssociatedPHSI;
         /* Length of Vendor Specific Classifier Param length Of The Service Flow */
-        B_UINT8 u8VendorSpecificClassifierParamLength;
+        u8 u8VendorSpecificClassifierParamLength;
         /* Vendor Specific Classifier Param Of The Service Flow */
-        B_UINT8 u8VendorSpecificClassifierParam[VENDOR_CLASSIFIER_PARAM_LENGTH];
+        u8 u8VendorSpecificClassifierParam[VENDOR_CLASSIFIER_PARAM_LENGTH];
         /* Length Of IPv6 Flow Lable of the Service Flow */
-        B_UINT8 u8IPv6FlowLableLength;
+        u8 u8IPv6FlowLableLength;
         /* IPv6 Flow Lable Of The Service Flow */
-        B_UINT8 u8IPv6FlowLable[NUM_IPV6_FLOWLABLE_BYTES];
+        u8 u8IPv6FlowLable[NUM_IPV6_FLOWLABLE_BYTES];
         /* Action associated with the classifier rule */
-        B_UINT8 u8ClassifierActionRule;
-        B_UINT16 u16ValidityBitMap;
+        u8 u8ClassifierActionRule;
+        u16 u16ValidityBitMap;
 };
 
 struct bcm_phs_rules {
         /* 8bit PHS Index Of The Service Flow */
-        B_UINT8 u8PHSI;
+        u8 u8PHSI;
         /* PHSF Length Of The Service Flow */
-        B_UINT8 u8PHSFLength;
+        u8 u8PHSFLength;
         /* String of bytes containing header information to be suppressed by the sending CS and reconstructed by the receiving CS */
-        B_UINT8 u8PHSF[MAX_PHS_LENGTHS];
+        u8 u8PHSF[MAX_PHS_LENGTHS];
         /* PHSM Length Of The Service Flow */
-        B_UINT8 u8PHSMLength;
+        u8 u8PHSMLength;
         /* PHS Mask for the SF */
-        B_UINT8 u8PHSM[MAX_PHS_LENGTHS];
+        u8 u8PHSM[MAX_PHS_LENGTHS];
         /* 8bit Total number of bytes to be suppressed for the Service Flow */
-        B_UINT8 u8PHSS;
+        u8 u8PHSS;
         /* 8bit Indicates whether or not Packet Header contents need to be verified prior to suppression */
-        B_UINT8 u8PHSV;
+        u8 u8PHSV;
         /* Vendor Specific PHS param Length Of The Service Flow */
-        B_UINT8 u8VendorSpecificPHSParamsLength;
+        u8 u8VendorSpecificPHSParamsLength;
         /* Vendor Specific PHS param Of The Service Flow */
-        B_UINT8 u8VendorSpecificPHSParams[VENDOR_PHS_PARAM_LENGTH];
-        B_UINT8 u8Padding[2];
+        u8 u8VendorSpecificPHSParams[VENDOR_PHS_PARAM_LENGTH];
+        u8 u8Padding[2];
 };
 
 struct bcm_convergence_types {
         /* 8bit Phs Classfier Action Of The Service Flow */
-        B_UINT8 u8ClassfierDSCAction;
+        u8 u8ClassfierDSCAction;
         /* 8bit Phs DSC Action Of The Service Flow */
-        B_UINT8 u8PhsDSCAction;
+        u8 u8PhsDSCAction;
         /* 16bit Padding */
-        B_UINT8 u8Padding[2];
+        u8 u8Padding[2];
         /* Packet classification rules structure */
         struct bcm_packet_class_rules cCPacketClassificationRule;
         /* Payload header suppression rules structure */
@@ -129,118 +129,118 @@ struct bcm_convergence_types {
 
 struct bcm_connect_mgr_params {
         /* 32bitSFID Of The Service Flow */
-        B_UINT32 u32SFID;
+        u32 u32SFID;
         /* 32bit Maximum Sustained Traffic Rate of the Service Flow */
-        B_UINT32 u32MaxSustainedTrafficRate;
+        u32 u32MaxSustainedTrafficRate;
         /* 32bit Maximum Traffic Burst allowed for the Service Flow */
-        B_UINT32 u32MaxTrafficBurst;
+        u32 u32MaxTrafficBurst;
         /* 32bit Minimum Reserved Traffic Rate of the Service Flow */
-        B_UINT32 u32MinReservedTrafficRate;
+        u32 u32MinReservedTrafficRate;
         /* 32bit Tolerated Jitter of the Service Flow */
-        B_UINT32 u32ToleratedJitter;
+        u32 u32ToleratedJitter;
         /* 32bit Maximum Latency of the Service Flow */
-        B_UINT32 u32MaximumLatency;
+        u32 u32MaximumLatency;
         /* 16bitCID Of The Service Flow */
-        B_UINT16 u16CID;
+        u16 u16CID;
         /* 16bit SAID on which the service flow being set up shall be mapped */
-        B_UINT16 u16TargetSAID;
+        u16 u16TargetSAID;
         /* 16bit  ARQ window size negotiated */
-        B_UINT16 u16ARQWindowSize;
+        u16 u16ARQWindowSize;
         /* 16bit Total Tx delay incl sending, receiving & processing delays */
-        B_UINT16 u16ARQRetryTxTimeOut;
+        u16 u16ARQRetryTxTimeOut;
         /* 16bit Total Rx delay incl sending, receiving & processing delays */
-        B_UINT16 u16ARQRetryRxTimeOut;
+        u16 u16ARQRetryRxTimeOut;
         /* 16bit ARQ block lifetime */
-        B_UINT16 u16ARQBlockLifeTime;
+        u16 u16ARQBlockLifeTime;
         /* 16bit ARQ Sync loss timeout */
-        B_UINT16 u16ARQSyncLossTimeOut;
+        u16 u16ARQSyncLossTimeOut;
         /* 16bit ARQ Purge timeout */
-        B_UINT16 u16ARQRxPurgeTimeOut;
+        u16 u16ARQRxPurgeTimeOut;
         /* TODO::Remove this once we move to a new CORR2 driver
          * brief Size of an ARQ block
          */
-        B_UINT16 u16ARQBlockSize;
+        u16 u16ARQBlockSize;
         /* #endif */
         /* 16bit Nominal interval b/w consecutive SDU arrivals at MAC SAP */
-        B_UINT16 u16SDUInterArrivalTime;
+        u16 u16SDUInterArrivalTime;
         /* 16bit Specifies the time base for rate measurement */
-        B_UINT16 u16TimeBase;
+        u16 u16TimeBase;
         /* 16bit Interval b/w Successive Grant oppurtunities */
-        B_UINT16 u16UnsolicitedGrantInterval;
+        u16 u16UnsolicitedGrantInterval;
         /* 16bit Interval b/w Successive Polling grant oppurtunities */
-        B_UINT16 u16UnsolicitedPollingInterval;
+        u16 u16UnsolicitedPollingInterval;
         /* internal var to get the overhead */
-        B_UINT16 u16MacOverhead;
+        u16 u16MacOverhead;
         /* MBS contents Identifier */
-        B_UINT16 u16MBSContentsID[MBS_CONTENTS_ID_LENGTH];
+        u16 u16MBSContentsID[MBS_CONTENTS_ID_LENGTH];
         /* MBS contents Identifier length */
-        B_UINT8 u8MBSContentsIDLength;
+        u8 u8MBSContentsIDLength;
         /* ServiceClassName Length Of The Service Flow */
-        B_UINT8 u8ServiceClassNameLength;
+        u8 u8ServiceClassNameLength;
         /* 32bytes ServiceClassName Of The Service Flow */
-        B_UINT8 u8ServiceClassName[32];
+        u8 u8ServiceClassName[32];
         /* 8bit Indicates whether or not MBS service is requested for this Serivce Flow */
-        B_UINT8 u8MBSService;
+        u8 u8MBSService;
         /* 8bit QOS Parameter Set specifies proper application of QoS parameters to Provisioned, Admitted and Active sets */
-        B_UINT8 u8QosParamSet;
+        u8 u8QosParamSet;
         /* 8bit Traffic Priority Of the Service Flow */
-        B_UINT8 u8TrafficPriority;
+        u8 u8TrafficPriority;
         /* 8bit Uplink Grant Scheduling Type of The Service Flow */
-        B_UINT8 u8ServiceFlowSchedulingType;
+        u8 u8ServiceFlowSchedulingType;
         /* 8bit Request transmission Policy of the Service Flow */
-        B_UINT8 u8RequesttransmissionPolicy;
+        u8 u8RequesttransmissionPolicy;
         /* 8bit Specifies whether SDUs for this Service flow are of FixedLength or Variable length */
-        B_UINT8 u8FixedLengthVSVariableLengthSDUIndicator;
+        u8 u8FixedLengthVSVariableLengthSDUIndicator;
         /* 8bit Length of the SDU for a fixed length SDU service flow */
-        B_UINT8 u8SDUSize;
+        u8 u8SDUSize;
         /* 8bit Indicates whether or not ARQ is requested for this connection */
-        B_UINT8 u8ARQEnable;
+        u8 u8ARQEnable;
         /* < 8bit Indicates whether or not data has tobe delivered in order to higher layer */
-        B_UINT8 u8ARQDeliverInOrder;
+        u8 u8ARQDeliverInOrder;
         /* 8bit Receiver ARQ ACK processing time */
-        B_UINT8 u8RxARQAckProcessingTime;
+        u8 u8RxARQAckProcessingTime;
         /* 8bit Convergence Sublayer Specification Of The Service Flow */
-        B_UINT8 u8CSSpecification;
+        u8 u8CSSpecification;
         /* 8 bit Type of data delivery service */
-        B_UINT8 u8TypeOfDataDeliveryService;
+        u8 u8TypeOfDataDeliveryService;
         /* 8bit Specifies whether a service flow may generate Paging */
-        B_UINT8 u8PagingPreference;
+        u8 u8PagingPreference;
         /* 8bit Indicates the MBS Zone through which the connection or virtual connection is valid */
-        B_UINT8 u8MBSZoneIdentifierassignment;
+        u8 u8MBSZoneIdentifierassignment;
         /* 8bit Specifies whether traffic on SF should generate MOB_TRF_IND to MS in sleep mode */
-        B_UINT8 u8TrafficIndicationPreference;
+        u8 u8TrafficIndicationPreference;
         /* 8bit Speciifes the length of predefined Global QoS parameter set encoding for this SF */
-        B_UINT8 u8GlobalServicesClassNameLength;
+        u8 u8GlobalServicesClassNameLength;
         /* 6 byte Speciifes the predefined Global QoS parameter set encoding for this SF */
-        B_UINT8 u8GlobalServicesClassName[GLOBAL_SF_CLASSNAME_LENGTH];
+        u8 u8GlobalServicesClassName[GLOBAL_SF_CLASSNAME_LENGTH];
         /* 8bit Indicates whether or not SN feedback is enabled for the conn */
-        B_UINT8 u8SNFeedbackEnabled;
+        u8 u8SNFeedbackEnabled;
         /* Indicates the size of the Fragment Sequence Number for the connection */
-        B_UINT8 u8FSNSize;
+        u8 u8FSNSize;
         /* 8bit Number of CIDs in active BS list */
-        B_UINT8 u8CIDAllocation4activeBSsLength;
+        u8 u8CIDAllocation4activeBSsLength;
         /* CIDs of BS in the active list */
-        B_UINT8 u8CIDAllocation4activeBSs[MAX_NUM_ACTIVE_BS];
+        u8 u8CIDAllocation4activeBSs[MAX_NUM_ACTIVE_BS];
         /* Specifies if PDU extended subheader should be applied on every PDU on this conn */
-        B_UINT8 u8PDUSNExtendedSubheader4HarqReordering;
+        u8 u8PDUSNExtendedSubheader4HarqReordering;
         /* 8bit Specifies whether the connection uses HARQ or not */
-        B_UINT8 u8HARQServiceFlows;
+        u8 u8HARQServiceFlows;
         /* Specifies the length of Authorization token */
-        B_UINT8 u8AuthTokenLength;
+        u8 u8AuthTokenLength;
         /* Specifies the Authorization token */
-        B_UINT8 u8AuthToken[AUTH_TOKEN_LENGTH];
+        u8 u8AuthToken[AUTH_TOKEN_LENGTH];
         /* specifes Number of HARQ channels used to carry data length */
-        B_UINT8 u8HarqChannelMappingLength;
+        u8 u8HarqChannelMappingLength;
         /* specifes HARQ channels used to carry data */
-        B_UINT8 u8HARQChannelMapping[NUM_HARQ_CHANNELS];
+        u8 u8HARQChannelMapping[NUM_HARQ_CHANNELS];
         /* 8bit Length of Vendor Specific QoS Params */
-        B_UINT8 u8VendorSpecificQoSParamLength;
+        u8 u8VendorSpecificQoSParamLength;
         /* 1byte  Vendor Specific QoS Param Of The Service Flow */
-        B_UINT8 u8VendorSpecificQoSParam[VENDOR_SPECIF_QOS_PARAM];
+        u8 u8VendorSpecificQoSParam[VENDOR_SPECIF_QOS_PARAM];
         /* indicates total classifiers in the SF */
-        B_UINT8 u8TotalClassifiers;  /* < Total number of valid classifiers */
-        B_UINT8 bValid; /* < Validity flag */
-        B_UINT8 u8Padding;       /* < Padding byte */
+        u8 u8TotalClassifiers;  /* < Total number of valid classifiers */
+        u8 bValid;      /* < Validity flag */
+        u8 u8Padding;    /* < Padding byte */
         /*
          * Structure for Convergence SubLayer Types with a maximum of 4 classifiers
          */
@@ -248,64 +248,64 @@ struct bcm_connect_mgr_params {
 };
 
 struct bcm_add_request {
-        B_UINT8 u8Type; /* < Type */
-        B_UINT8 eConnectionDir; /* < Connection direction */
+        u8 u8Type;      /* < Type */
+        u8 eConnectionDir; /* < Connection direction */
         /* brief 16 bit TID */
-        B_UINT16 u16TID; /* < 16bit TID */
+        u16 u16TID; /* < 16bit TID */
         /* brief 16bitCID */
-        B_UINT16 u16CID; /* < 16bit CID */
+        u16 u16CID; /* < 16bit CID */
         /* brief 16bitVCID */
-        B_UINT16 u16VCID; /* < 16bit VCID */
+        u16 u16VCID; /* < 16bit VCID */
         struct bcm_connect_mgr_params *psfParameterSet; /* < connection manager parameters */
 };
 
 struct bcm_add_indication {
-        B_UINT8 u8Type; /* < Type */
-        B_UINT8 eConnectionDir; /* < Connection Direction */
+        u8 u8Type;      /* < Type */
+        u8 eConnectionDir;      /* < Connection Direction */
         /* brief 16 bit TID */
-        B_UINT16 u16TID; /* < TID */
+        u16 u16TID; /* < TID */
         /* brief 16bitCID */
-        B_UINT16 u16CID; /* < 16bitCID */
+        u16 u16CID; /* < 16bitCID */
         /* brief 16bitVCID */
-        B_UINT16 u16VCID; /* < 16bitVCID */
+        u16 u16VCID; /* < 16bitVCID */
         struct bcm_connect_mgr_params *psfAuthorizedSet; /* Authorized set of connection manager parameters */
         struct bcm_connect_mgr_params *psfAdmittedSet; /* Admitted set of connection manager parameters */
         struct bcm_connect_mgr_params *psfActiveSet; /* Activeset of connection manager parameters */
-        B_UINT8 u8CC; /* <Confirmation Code */
-        B_UINT8 u8Padd; /* < 8-bit Padding */
-        B_UINT16 u16Padd; /* < 16 bit Padding */
+        u8 u8CC; /* <Confirmation Code */
+        u8 u8Padd; /* < 8-bit Padding */
+        u16 u16Padd; /* < 16 bit Padding */
 };
 
 struct bcm_del_request {
-        B_UINT8 u8Type; /* < Type */
-        B_UINT8 u8Padding; /* < Padding byte */
-        B_UINT16 u16TID; /* < TID */
+        u8 u8Type; /* < Type */
+        u8 u8Padding; /* < Padding byte */
+        u16 u16TID; /* < TID */
         /* brief 32bitSFID */
-        B_UINT32 u32SFID; /* < SFID */
+        u32 u32SFID; /* < SFID */
 };
 
 struct bcm_del_indication {
-        B_UINT8 u8Type; /* < Type */
-        B_UINT8 u8Padding; /* < Padding */
-        B_UINT16 u16TID; /* < TID */
+        u8 u8Type;      /* < Type */
+        u8 u8Padding; /* < Padding */
+        u16 u16TID; /* < TID */
         /* brief 16bitCID */
-        B_UINT16 u16CID; /* < CID */
+        u16 u16CID; /* < CID */
         /* brief 16bitVCID */
-        B_UINT16 u16VCID; /* < VCID */
+        u16 u16VCID; /* < VCID */
         /* brief 32bitSFID */
-        B_UINT32 u32SFID; /* < SFID */
+        u32 u32SFID; /* < SFID */
         /* brief 8bit Confirmation code */
-        B_UINT8 u8ConfirmationCode; /* < Confirmation code */
-        B_UINT8 u8Padding1[3]; /* < 3 byte Padding */
+        u8 u8ConfirmationCode; /* < Confirmation code */
+        u8 u8Padding1[3]; /* < 3 byte Padding */
 };
 
 struct bcm_stim_sfhostnotify {
-        B_UINT32 SFID; /* SFID of the service flow */
-        B_UINT16 newCID; /* the new/changed CID */
-        B_UINT16 VCID; /* Get new Vcid if the flow has been made active in CID update TLV, but was inactive earlier or the orig vcid */
-        B_UINT8 RetainSF; /* Indication to Host if the SF is to be retained or deleted; if TRUE-retain else delete */
-        B_UINT8 QoSParamSet; /* QoS paramset of the retained SF */
-        B_UINT16 u16reserved; /* For byte alignment */
+        u32 SFID; /* SFID of the service flow */
+        u16 newCID; /* the new/changed CID */
+        u16 VCID; /* Get new Vcid if the flow has been made active in CID update TLV, but was inactive earlier or the orig vcid */
+        u8 RetainSF; /* Indication to Host if the SF is to be retained or deleted; if TRUE-retain else delete */
+        u8 QoSParamSet; /* QoS paramset of the retained SF */
+        u16 u16reserved; /* For byte alignment */
 };
 
 #endif
diff --git a/drivers/staging/bcm/hostmibs.c b/drivers/staging/bcm/hostmibs.c
index 10361bb35059..3c5f4a5f0376 100644
--- a/drivers/staging/bcm/hostmibs.c
+++ b/drivers/staging/bcm/hostmibs.c
@@ -9,7 +9,7 @@
 
 #include "headers.h"
 
-INT ProcessGetHostMibs(struct bcm_mini_adapter *Adapter, S_MIBS_HOST_STATS_MIBS *pstHostMibs)
+INT ProcessGetHostMibs(struct bcm_mini_adapter *Adapter, struct bcm_host_stats_mibs *pstHostMibs)
 {
         S_SERVICEFLOW_ENTRY *pstServiceFlowEntry = NULL;
         S_PHS_RULE *pstPhsRule = NULL;
@@ -31,7 +31,7 @@ INT ProcessGetHostMibs(struct bcm_mini_adapter *Adapter, S_MIBS_HOST_STATS_MIBS
                                astClassifierTable[nClassifierIndex],
                                (PVOID) & Adapter->
                                astClassifierTable[nClassifierIndex],
-                               sizeof(S_MIBS_CLASSIFIER_RULE));
+                               sizeof(struct bcm_mibs_classifier_rule));
         }
 
         /* Copy the SF Table */
@@ -39,7 +39,7 @@ INT ProcessGetHostMibs(struct bcm_mini_adapter *Adapter, S_MIBS_HOST_STATS_MIBS
                 if (Adapter->PackInfo[nSfIndex].bValid) {
                         memcpy((PVOID) & pstHostMibs->astSFtable[nSfIndex],
                                (PVOID) & Adapter->PackInfo[nSfIndex],
-                               sizeof(S_MIBS_SERVICEFLOW_TABLE));
+                                sizeof(struct bcm_mibs_table));
                 } else {
                         /* If index in not valid,
                          * don't process this for the PHS table.
@@ -94,16 +94,16 @@ INT ProcessGetHostMibs(struct bcm_mini_adapter *Adapter, S_MIBS_HOST_STATS_MIBS
         return STATUS_SUCCESS;
 }
 
-VOID GetDroppedAppCntrlPktMibs(S_MIBS_HOST_STATS_MIBS *pstHostMibs, struct bcm_tarang_data *pTarang)
+VOID GetDroppedAppCntrlPktMibs(struct bcm_host_stats_mibs *pstHostMibs, struct bcm_tarang_data *pTarang)
 {
         memcpy(&(pstHostMibs->stDroppedAppCntrlMsgs),
                &(pTarang->stDroppedAppCntrlMsgs),
-               sizeof(S_MIBS_DROPPED_APP_CNTRL_MESSAGES));
+               sizeof(struct bcm_mibs_dropped_cntrl_msg));
 }
 
 VOID CopyMIBSExtendedSFParameters(struct bcm_mini_adapter *Adapter, struct bcm_connect_mgr_params *psfLocalSet, UINT uiSearchRuleIndex)
 {
-        S_MIBS_EXTSERVICEFLOW_PARAMETERS *t = &Adapter->PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable;
+        struct bcm_mibs_parameters *t = &Adapter->PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable;
 
         t->wmanIfSfid = psfLocalSet->u32SFID;
         t->wmanIfCmnCpsMaxSustainedRate = psfLocalSet->u32MaxSustainedTrafficRate;
diff --git a/drivers/staging/bcm/nvm.c b/drivers/staging/bcm/nvm.c
index b034eb5fa6b1..eab676fe53a6 100644
--- a/drivers/staging/bcm/nvm.c
+++ b/drivers/staging/bcm/nvm.c
@@ -14,25 +14,25 @@ static int BcmGetNvmSize(struct bcm_mini_adapter *Adapter);
 static unsigned int BcmGetFlashSize(struct bcm_mini_adapter *Adapter);
 static NVM_TYPE BcmGetNvmType(struct bcm_mini_adapter *Adapter);
 
-static int BcmGetSectionValEndOffset(struct bcm_mini_adapter *Adapter, FLASH2X_SECTION_VAL eFlash2xSectionVal);
+static int BcmGetSectionValEndOffset(struct bcm_mini_adapter *Adapter, enum bcm_flash2x_section_val eFlash2xSectionVal);
 
 static B_UINT8 IsOffsetWritable(struct bcm_mini_adapter *Adapter, unsigned int uiOffset);
-static int IsSectionWritable(struct bcm_mini_adapter *Adapter, FLASH2X_SECTION_VAL Section);
-static int IsSectionExistInVendorInfo(struct bcm_mini_adapter *Adapter, FLASH2X_SECTION_VAL section);
+static int IsSectionWritable(struct bcm_mini_adapter *Adapter, enum bcm_flash2x_section_val Section);
+static int IsSectionExistInVendorInfo(struct bcm_mini_adapter *Adapter, enum bcm_flash2x_section_val section);
 
-static int ReadDSDPriority(struct bcm_mini_adapter *Adapter, FLASH2X_SECTION_VAL dsd);
-static int ReadDSDSignature(struct bcm_mini_adapter *Adapter, FLASH2X_SECTION_VAL dsd);
-static int ReadISOPriority(struct bcm_mini_adapter *Adapter, FLASH2X_SECTION_VAL iso);
-static int ReadISOSignature(struct bcm_mini_adapter *Adapter, FLASH2X_SECTION_VAL iso);
+static int ReadDSDPriority(struct bcm_mini_adapter *Adapter, enum bcm_flash2x_section_val dsd);
+static int ReadDSDSignature(struct bcm_mini_adapter *Adapter, enum bcm_flash2x_section_val dsd);
+static int ReadISOPriority(struct bcm_mini_adapter *Adapter, enum bcm_flash2x_section_val iso);
+static int ReadISOSignature(struct bcm_mini_adapter *Adapter, enum bcm_flash2x_section_val iso);
 
-static int CorruptDSDSig(struct bcm_mini_adapter *Adapter, FLASH2X_SECTION_VAL eFlash2xSectionVal);
-static int CorruptISOSig(struct bcm_mini_adapter *Adapter, FLASH2X_SECTION_VAL eFlash2xSectionVal);
+static int CorruptDSDSig(struct bcm_mini_adapter *Adapter, enum bcm_flash2x_section_val eFlash2xSectionVal);
+static int CorruptISOSig(struct bcm_mini_adapter *Adapter, enum bcm_flash2x_section_val eFlash2xSectionVal);
 static int SaveHeaderIfPresent(struct bcm_mini_adapter *Adapter, PUCHAR pBuff, unsigned int uiSectAlignAddr);
 static int WriteToFlashWithoutSectorErase(struct bcm_mini_adapter *Adapter, PUINT pBuff,
-                                        FLASH2X_SECTION_VAL eFlash2xSectionVal,
+                                        enum bcm_flash2x_section_val eFlash2xSectionVal,
                                         unsigned int uiOffset, unsigned int uiNumBytes);
-static FLASH2X_SECTION_VAL getHighestPriDSD(struct bcm_mini_adapter *Adapter);
-static FLASH2X_SECTION_VAL getHighestPriISO(struct bcm_mini_adapter *Adapter);
+static enum bcm_flash2x_section_val getHighestPriDSD(struct bcm_mini_adapter *Adapter);
+static enum bcm_flash2x_section_val getHighestPriISO(struct bcm_mini_adapter *Adapter);
 
 static int BeceemFlashBulkRead(
         struct bcm_mini_adapter *Adapter,
@@ -2413,7 +2413,7 @@ static int ConvertEndianOfCSStructure(PFLASH_CS_INFO psFlashCSInfo)
         return STATUS_SUCCESS;
 }
 
-static int IsSectionExistInVendorInfo(struct bcm_mini_adapter *Adapter, FLASH2X_SECTION_VAL section)
+static int IsSectionExistInVendorInfo(struct bcm_mini_adapter *Adapter, enum bcm_flash2x_section_val section)
 {
         return (Adapter->uiVendorExtnFlag &&
                 (Adapter->psFlash2xVendorInfo->VendorSection[section].AccessFlags & FLASH2X_SECTION_PRESENT) &&
@@ -2660,14 +2660,14 @@ static NVM_TYPE BcmGetNvmType(struct bcm_mini_adapter *Adapter)
 /*
  * BcmGetSectionValStartOffset - this will calculate the section's starting offset if section val is given
  * @Adapter : Drivers Private Data structure
- * @eFlashSectionVal : Flash secion value defined in enum FLASH2X_SECTION_VAL
+ * @eFlashSectionVal : Flash secion value defined in enum bcm_flash2x_section_val
  *
  * Return value:-
  * On success it return the start offset of the provided section val
  * On Failure -returns STATUS_FAILURE
  */
 
-int BcmGetSectionValStartOffset(struct bcm_mini_adapter *Adapter, FLASH2X_SECTION_VAL eFlashSectionVal)
+int BcmGetSectionValStartOffset(struct bcm_mini_adapter *Adapter, enum bcm_flash2x_section_val eFlashSectionVal)
 {
         /*
          * Considering all the section for which end offset can be calculated or directly given
@@ -2752,14 +2752,14 @@ int BcmGetSectionValStartOffset(struct bcm_mini_adapter *Adapter, FLASH2X_SECTIO
 /*
  * BcmGetSectionValEndOffset - this will calculate the section's Ending offset if section val is given
  * @Adapter : Drivers Private Data structure
- * @eFlashSectionVal : Flash secion value defined in enum FLASH2X_SECTION_VAL
+ * @eFlashSectionVal : Flash secion value defined in enum bcm_flash2x_section_val
  *
  * Return value:-
  * On success it return the end offset of the provided section val
  * On Failure -returns STATUS_FAILURE
  */
 
-int BcmGetSectionValEndOffset(struct bcm_mini_adapter *Adapter, FLASH2X_SECTION_VAL eFlash2xSectionVal)
+int BcmGetSectionValEndOffset(struct bcm_mini_adapter *Adapter, enum bcm_flash2x_section_val eFlash2xSectionVal)
 {
         int SectEndOffset = 0;
 
@@ -2837,7 +2837,7 @@ int BcmGetSectionValEndOffset(struct bcm_mini_adapter *Adapter, FLASH2X_SECTION_
  * BcmFlash2xBulkRead:- Read API for Flash Map 2.x .
  * @Adapter :Driver Private Data Structure
  * @pBuffer : Buffer where data has to be put after reading
- * @eFlashSectionVal :Flash Section Val defined in FLASH2X_SECTION_VAL
+ * @eFlashSectionVal :Flash Section Val defined in enum bcm_flash2x_section_val
  * @uiOffsetWithinSectionVal :- Offset with in provided section
  * @uiNumBytes : Number of Bytes for Read
  *
@@ -2847,7 +2847,7 @@ int BcmGetSectionValEndOffset(struct bcm_mini_adapter *Adapter, FLASH2X_SECTION_
 
 int BcmFlash2xBulkRead(struct bcm_mini_adapter *Adapter,
                 PUINT pBuffer,
-                FLASH2X_SECTION_VAL eFlash2xSectionVal,
+                enum bcm_flash2x_section_val eFlash2xSectionVal,
                 unsigned int uiOffsetWithinSectionVal,
                 unsigned int uiNumBytes)
 {
@@ -2898,7 +2898,7 @@ int BcmFlash2xBulkRead(struct bcm_mini_adapter *Adapter,
  * BcmFlash2xBulkWrite :-API for Writing on the Flash Map 2.x.
  * @Adapter :Driver Private Data Structure
  * @pBuffer : Buffer From where data has to taken for writing
- * @eFlashSectionVal :Flash Section Val defined in FLASH2X_SECTION_VAL
+ * @eFlashSectionVal :Flash Section Val defined in enum bcm_flash2x_section_val
  * @uiOffsetWithinSectionVal :- Offset with in provided section
  * @uiNumBytes : Number of Bytes for Write
  *
@@ -2909,7 +2909,7 @@ int BcmFlash2xBulkRead(struct bcm_mini_adapter *Adapter,
 
 int BcmFlash2xBulkWrite(struct bcm_mini_adapter *Adapter,
                         PUINT pBuffer,
-                        FLASH2X_SECTION_VAL eFlash2xSectVal,
+                        enum bcm_flash2x_section_val eFlash2xSectVal,
                         unsigned int uiOffset,
                         unsigned int uiNumBytes,
                         unsigned int bVerify)
@@ -2971,7 +2971,7 @@ int BcmFlash2xBulkWrite(struct bcm_mini_adapter *Adapter,
 
 static int BcmGetActiveDSD(struct bcm_mini_adapter *Adapter)
 {
-        FLASH2X_SECTION_VAL uiHighestPriDSD = 0;
+        enum bcm_flash2x_section_val uiHighestPriDSD = 0;
 
         uiHighestPriDSD = getHighestPriDSD(Adapter);
         Adapter->eActiveDSD = uiHighestPriDSD;
@@ -3064,7 +3064,7 @@ B_UINT8 IsOffsetWritable(struct bcm_mini_adapter *Adapter, unsigned int uiOffset
                 return FALSE;
 }
 
-static int BcmDumpFlash2xSectionBitMap(PFLASH2X_BITMAP psFlash2xBitMap)
+static int BcmDumpFlash2xSectionBitMap(struct bcm_flash2x_bitmap *psFlash2xBitMap)
 {
         struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev);
 
@@ -3099,11 +3099,11 @@ static int BcmDumpFlash2xSectionBitMap(PFLASH2X_BITMAP psFlash2xBitMap)
  * Failure:- negative error code
  */
 
-int BcmGetFlash2xSectionalBitMap(struct bcm_mini_adapter *Adapter, PFLASH2X_BITMAP psFlash2xBitMap)
+int BcmGetFlash2xSectionalBitMap(struct bcm_mini_adapter *Adapter, struct bcm_flash2x_bitmap *psFlash2xBitMap)
 {
         PFLASH2X_CS_INFO psFlash2xCSInfo = Adapter->psFlash2xCSInfo;
-        FLASH2X_SECTION_VAL uiHighestPriDSD = 0;
-        FLASH2X_SECTION_VAL uiHighestPriISO = 0;
+        enum bcm_flash2x_section_val uiHighestPriDSD = 0;
+        enum bcm_flash2x_section_val uiHighestPriISO = 0;
         BOOLEAN SetActiveDSDDone = FALSE;
         BOOLEAN SetActiveISODone = FALSE;
 
@@ -3349,7 +3349,7 @@ int BcmGetFlash2xSectionalBitMap(struct bcm_mini_adapter *Adapter, PFLASH2X_BITM
  *
  */
 
-int BcmSetActiveSection(struct bcm_mini_adapter *Adapter, FLASH2X_SECTION_VAL eFlash2xSectVal)
+int BcmSetActiveSection(struct bcm_mini_adapter *Adapter, enum bcm_flash2x_section_val eFlash2xSectVal)
 {
         unsigned int SectImagePriority = 0;
         int Status = STATUS_SUCCESS;
@@ -3529,10 +3529,10 @@ int BcmSetActiveSection(struct bcm_mini_adapter *Adapter, FLASH2X_SECTION_VAL eF
  *
  */
 
-int BcmCopyISO(struct bcm_mini_adapter *Adapter, FLASH2X_COPY_SECTION sCopySectStrut)
+int BcmCopyISO(struct bcm_mini_adapter *Adapter, struct bcm_flash2x_copy_section sCopySectStrut)
 {
         PCHAR Buff = NULL;
-        FLASH2X_SECTION_VAL eISOReadPart = 0, eISOWritePart = 0;
+        enum bcm_flash2x_section_val eISOReadPart = 0, eISOWritePart = 0;
         unsigned int uiReadOffsetWithinPart = 0, uiWriteOffsetWithinPart = 0;
         unsigned int uiTotalDataToCopy = 0;
         BOOLEAN IsThisHeaderSector = FALSE;
@@ -3813,7 +3813,7 @@ out:
  *      Failure :-Return negative error code
  */
 
-int BcmFlash2xCorruptSig(struct bcm_mini_adapter *Adapter, FLASH2X_SECTION_VAL eFlash2xSectionVal)
+int BcmFlash2xCorruptSig(struct bcm_mini_adapter *Adapter, enum bcm_flash2x_section_val eFlash2xSectionVal)
 {
         int Status = STATUS_SUCCESS;
 
@@ -3841,7 +3841,7 @@ int BcmFlash2xCorruptSig(struct bcm_mini_adapter *Adapter, FLASH2X_SECTION_VAL e
  *      Failure :-Return negative error code
  */
 
-int BcmFlash2xWriteSig(struct bcm_mini_adapter *Adapter, FLASH2X_SECTION_VAL eFlashSectionVal)
+int BcmFlash2xWriteSig(struct bcm_mini_adapter *Adapter, enum bcm_flash2x_section_val eFlashSectionVal)
 {
         unsigned int uiSignature = 0;
         unsigned int uiOffset = 0;
@@ -3901,7 +3901,7 @@ int BcmFlash2xWriteSig(struct bcm_mini_adapter *Adapter, FLASH2X_SECTION_VAL eFl
  * Return values:-Return TRUE is request is valid else FALSE.
  */
 
-int validateFlash2xReadWrite(struct bcm_mini_adapter *Adapter, PFLASH2X_READWRITE psFlash2xReadWrite)
+int validateFlash2xReadWrite(struct bcm_mini_adapter *Adapter, struct bcm_flash2x_readwrite *psFlash2xReadWrite)
 {
         unsigned int uiNumOfBytes = 0;
         unsigned int uiSectStartOffset = 0;
@@ -4021,8 +4021,8 @@ static int GetFlashBaseAddr(struct bcm_mini_adapter *Adapter)
  */
 
 int BcmCopySection(struct bcm_mini_adapter *Adapter,
-                FLASH2X_SECTION_VAL SrcSection,
-                FLASH2X_SECTION_VAL DstSection,
+                enum bcm_flash2x_section_val SrcSection,
+                enum bcm_flash2x_section_val DstSection,
                 unsigned int offset,
                 unsigned int numOfBytes)
 {
@@ -4264,7 +4264,7 @@ static int BcmDoChipSelect(struct bcm_mini_adapter *Adapter, unsigned int offset
         return STATUS_SUCCESS;
 }
 
-int ReadDSDSignature(struct bcm_mini_adapter *Adapter, FLASH2X_SECTION_VAL dsd)
+int ReadDSDSignature(struct bcm_mini_adapter *Adapter, enum bcm_flash2x_section_val dsd)
 {
         unsigned int uiDSDsig = 0;
         /* unsigned int sigoffsetInMap = 0;
@@ -4289,7 +4289,7 @@ int ReadDSDSignature(struct bcm_mini_adapter *Adapter, FLASH2X_SECTION_VAL dsd)
         return uiDSDsig;
 }
 
-int ReadDSDPriority(struct bcm_mini_adapter *Adapter, FLASH2X_SECTION_VAL dsd)
+int ReadDSDPriority(struct bcm_mini_adapter *Adapter, enum bcm_flash2x_section_val dsd)
 {
         /* unsigned int priOffsetInMap = 0 ; */
         unsigned int uiDSDPri = STATUS_FAILURE;
@@ -4312,11 +4312,11 @@ int ReadDSDPriority(struct bcm_mini_adapter *Adapter, FLASH2X_SECTION_VAL dsd)
         return uiDSDPri;
 }
 
-FLASH2X_SECTION_VAL getHighestPriDSD(struct bcm_mini_adapter *Adapter)
+enum bcm_flash2x_section_val getHighestPriDSD(struct bcm_mini_adapter *Adapter)
 {
         int DSDHighestPri = STATUS_FAILURE;
         int DsdPri = 0;
-        FLASH2X_SECTION_VAL HighestPriDSD = 0;
+        enum bcm_flash2x_section_val HighestPriDSD = 0;
 
         if (IsSectionWritable(Adapter, DSD2)) {
                 DSDHighestPri = ReadDSDPriority(Adapter, DSD2);
@@ -4344,7 +4344,7 @@ FLASH2X_SECTION_VAL getHighestPriDSD(struct bcm_mini_adapter *Adapter)
         return  HighestPriDSD;
 }
 
-int ReadISOSignature(struct bcm_mini_adapter *Adapter, FLASH2X_SECTION_VAL iso)
+int ReadISOSignature(struct bcm_mini_adapter *Adapter, enum bcm_flash2x_section_val iso)
 {
         unsigned int uiISOsig = 0;
         /* unsigned int sigoffsetInMap = 0;
@@ -4367,7 +4367,7 @@ int ReadISOSignature(struct bcm_mini_adapter *Adapter, FLASH2X_SECTION_VAL iso)
         return uiISOsig;
 }
 
-int ReadISOPriority(struct bcm_mini_adapter *Adapter, FLASH2X_SECTION_VAL iso)
+int ReadISOPriority(struct bcm_mini_adapter *Adapter, enum bcm_flash2x_section_val iso)
 {
         unsigned int ISOPri = STATUS_FAILURE;
         if (IsSectionWritable(Adapter, iso)) {
@@ -4386,11 +4386,11 @@ int ReadISOPriority(struct bcm_mini_adapter *Adapter, FLASH2X_SECTION_VAL iso)
         return ISOPri;
 }
 
-FLASH2X_SECTION_VAL getHighestPriISO(struct bcm_mini_adapter *Adapter)
+enum bcm_flash2x_section_val getHighestPriISO(struct bcm_mini_adapter *Adapter)
 {
         int ISOHighestPri = STATUS_FAILURE;
         int ISOPri = 0;
-        FLASH2X_SECTION_VAL HighestPriISO = NO_SECTION_VAL;
+        enum bcm_flash2x_section_val HighestPriISO = NO_SECTION_VAL;
 
         if (IsSectionWritable(Adapter, ISO_IMAGE2)) {
                 ISOHighestPri = ReadISOPriority(Adapter, ISO_IMAGE2);
@@ -4412,7 +4412,7 @@ FLASH2X_SECTION_VAL getHighestPriISO(struct bcm_mini_adapter *Adapter)
 
 int WriteToFlashWithoutSectorErase(struct bcm_mini_adapter *Adapter,
                                 PUINT pBuff,
-                                FLASH2X_SECTION_VAL eFlash2xSectionVal,
+                                enum bcm_flash2x_section_val eFlash2xSectionVal,
                                 unsigned int uiOffset,
                                 unsigned int uiNumBytes)
 {
@@ -4468,7 +4468,7 @@ int WriteToFlashWithoutSectorErase(struct bcm_mini_adapter *Adapter,
         return Status;
 }
 
-BOOLEAN IsSectionExistInFlash(struct bcm_mini_adapter *Adapter, FLASH2X_SECTION_VAL section)
+BOOLEAN IsSectionExistInFlash(struct bcm_mini_adapter *Adapter, enum bcm_flash2x_section_val section)
 {
         BOOLEAN SectionPresent = FALSE;
 
@@ -4523,7 +4523,7 @@ BOOLEAN IsSectionExistInFlash(struct bcm_mini_adapter *Adapter, FLASH2X_SECTION_
         return SectionPresent;
 }
 
-int IsSectionWritable(struct bcm_mini_adapter *Adapter, FLASH2X_SECTION_VAL Section)
+int IsSectionWritable(struct bcm_mini_adapter *Adapter, enum bcm_flash2x_section_val Section)
 {
         int offset = STATUS_FAILURE;
         int Status = FALSE;
@@ -4546,7 +4546,7 @@ int IsSectionWritable(struct bcm_mini_adapter *Adapter, FLASH2X_SECTION_VAL Sect
         return Status;
 }
 
-static int CorruptDSDSig(struct bcm_mini_adapter *Adapter, FLASH2X_SECTION_VAL eFlash2xSectionVal)
+static int CorruptDSDSig(struct bcm_mini_adapter *Adapter, enum bcm_flash2x_section_val eFlash2xSectionVal)
 {
         PUCHAR pBuff = NULL;
         unsigned int sig = 0;
@@ -4608,7 +4608,7 @@ static int CorruptDSDSig(struct bcm_mini_adapter *Adapter, FLASH2X_SECTION_VAL e
         return STATUS_SUCCESS;
 }
 
-static int CorruptISOSig(struct bcm_mini_adapter *Adapter, FLASH2X_SECTION_VAL eFlash2xSectionVal)
+static int CorruptISOSig(struct bcm_mini_adapter *Adapter, enum bcm_flash2x_section_val eFlash2xSectionVal)
 {
         PUCHAR pBuff = NULL;
         unsigned int sig = 0;
diff --git a/drivers/staging/bcm/vendorspecificextn.c b/drivers/staging/bcm/vendorspecificextn.c
index 833883c21a22..40be60aa909a 100644
--- a/drivers/staging/bcm/vendorspecificextn.c
+++ b/drivers/staging/bcm/vendorspecificextn.c
@@ -89,7 +89,7 @@ INT vendorextnIoctl(struct bcm_mini_adapter *Adapter, UINT cmd, ULONG arg)
 //
 //------------------------------------------------------------------
 
-INT vendorextnReadSection(PVOID  pContext, PUCHAR pBuffer, FLASH2X_SECTION_VAL SectionVal,
+INT vendorextnReadSection(PVOID  pContext, PUCHAR pBuffer, enum bcm_flash2x_section_val SectionVal,
                         UINT offset, UINT numOfBytes)
 {
         return STATUS_FAILURE;
@@ -114,7 +114,7 @@ INT vendorextnReadSection(PVOID  pContext, PUCHAR pBuffer, FLASH2X_SECTION_VAL S
 //              STATUS_SUCCESS/STATUS_FAILURE
 //
 //------------------------------------------------------------------
-INT vendorextnWriteSection(PVOID  pContext, PUCHAR pBuffer, FLASH2X_SECTION_VAL SectionVal,
+INT vendorextnWriteSection(PVOID  pContext, PUCHAR pBuffer, enum bcm_flash2x_section_val SectionVal,
                         UINT offset, UINT numOfBytes, BOOLEAN bVerify)
 {
         return STATUS_FAILURE;
@@ -138,7 +138,7 @@ INT vendorextnWriteSection(PVOID  pContext, PUCHAR pBuffer, FLASH2X_SECTION_VAL
 //              STATUS_SUCCESS/STATUS_FAILURE
 //
 //------------------------------------------------------------------
-INT vendorextnWriteSectionWithoutErase(PVOID  pContext, PUCHAR pBuffer, FLASH2X_SECTION_VAL SectionVal,
+INT vendorextnWriteSectionWithoutErase(PVOID  pContext, PUCHAR pBuffer, enum bcm_flash2x_section_val SectionVal,
                         UINT offset, UINT numOfBytes)
 {
         return STATUS_FAILURE;
diff --git a/drivers/staging/bcm/vendorspecificextn.h b/drivers/staging/bcm/vendorspecificextn.h
index f237891b9f29..834410e29e75 100644
--- a/drivers/staging/bcm/vendorspecificextn.h
+++ b/drivers/staging/bcm/vendorspecificextn.h
@@ -8,11 +8,11 @@ INT vendorextnGetSectionInfo(PVOID  pContext,PFLASH2X_VENDORSPECIFIC_INFO pVendo
 INT vendorextnExit(struct bcm_mini_adapter *Adapter);
 INT vendorextnInit(struct bcm_mini_adapter *Adapter);
 INT vendorextnIoctl(struct bcm_mini_adapter *Adapter, UINT cmd, ULONG arg);
-INT vendorextnReadSection(PVOID  pContext, PUCHAR pBuffer, FLASH2X_SECTION_VAL SectionVal,
+INT vendorextnReadSection(PVOID  pContext, PUCHAR pBuffer, enum bcm_flash2x_section_val SectionVal,
                         UINT offset, UINT numOfBytes);
-INT vendorextnWriteSection(PVOID  pContext, PUCHAR pBuffer, FLASH2X_SECTION_VAL SectionVal,
+INT vendorextnWriteSection(PVOID  pContext, PUCHAR pBuffer, enum bcm_flash2x_section_val SectionVal,
                         UINT offset, UINT numOfBytes, BOOLEAN bVerify);
-INT vendorextnWriteSectionWithoutErase(PVOID  pContext, PUCHAR pBuffer, FLASH2X_SECTION_VAL SectionVal,
+INT vendorextnWriteSectionWithoutErase(PVOID  pContext, PUCHAR pBuffer, enum bcm_flash2x_section_val SectionVal,
                         UINT offset, UINT numOfBytes);
 
 #endif /*  */
diff --git a/drivers/staging/ccg/ccg.c b/drivers/staging/ccg/ccg.c
index 93e1e2ffca0c..ffc5f73a5b5b 100644
--- a/drivers/staging/ccg/ccg.c
+++ b/drivers/staging/ccg/ccg.c
@@ -1239,7 +1239,7 @@ static int ccg_create_device(struct ccg_dev *dev)
 }
 
 
-static int __init init(void)
+static int __init ccg_init(void)
 {
         struct ccg_dev *dev;
         int err;
@@ -1280,13 +1280,13 @@ static int __init init(void)
 
         return err;
 }
-module_init(init);
+module_init(ccg_init);
 
-static void __exit cleanup(void)
+static void __exit ccg_exit(void)
 {
         usb_composite_unregister(&ccg_usb_driver);
         class_destroy(ccg_class);
         kfree(_ccg_dev);
         _ccg_dev = NULL;
 }
-module_exit(cleanup);
+module_exit(ccg_exit);
diff --git a/drivers/staging/ced1401/ced_ioc.c b/drivers/staging/ced1401/ced_ioc.c
index c9492edaaddb..d0434714afd3 100644
--- a/drivers/staging/ced1401/ced_ioc.c
+++ b/drivers/staging/ced1401/ced_ioc.c
@@ -341,7 +341,7 @@ bool Is1401(DEVICE_EXTENSION * pdx)
                 }
 
                 if (iReturn == 0)       // if all is OK...
-                        iReturn = state == 0;   // then sucess is that the state is 0
+                        iReturn = state == 0;   // then success is that the state is 0
         } else
                 iReturn = 0;    // we failed
         pdx->bForceReset = false;       // Clear forced reset flag now
@@ -565,7 +565,7 @@ int LineCount(DEVICE_EXTENSION * pdx)
                         if (dwIndex >= INBUF_SZ)        // see if we fall off buff
                                 dwIndex = 0;
                 }
-                while (dwIndex != dwEnd);       // go to last avaliable
+                while (dwIndex != dwEnd);       // go to last available
         }
 
         spin_unlock_irq(&pdx->charInLock);
@@ -697,8 +697,7 @@ static int SetArea(DEVICE_EXTENSION * pdx, int nArea, char __user * puBuf,
                 return -EFAULT; // ...then we are done
 
         // Now allocate space to hold the page pointer and virtual address pointer tables
-        pPages =
-            (struct page **)kmalloc(len * sizeof(struct page *), GFP_KERNEL);
+        pPages = kmalloc(len * sizeof(struct page *), GFP_KERNEL);
         if (!pPages) {
                 iReturn = U14ERR_NOMEMORY;
                 goto error;
@@ -913,18 +912,24 @@ int GetTransfer(DEVICE_EXTENSION * pdx, TGET_TX_BLOCK __user * pTX)
                 iReturn = U14ERR_BADAREA;
         else {
                 // Return the best information we have - we don't have physical addresses
-                TGET_TX_BLOCK tx;
-                memset(&tx, 0, sizeof(tx));     // clean out local work structure
-                tx.size = pdx->rTransDef[dwIdent].dwLength;
-                tx.linear = (long long)((long)pdx->rTransDef[dwIdent].lpvBuff);
-                tx.avail = GET_TX_MAXENTRIES;   // how many blocks we could return
-                tx.used = 1;    // number we actually return
-                tx.entries[0].physical =
-                    (long long)(tx.linear + pdx->StagedOffset);
-                tx.entries[0].size = tx.size;
-
-                if (copy_to_user(pTX, &tx, sizeof(tx)))
+                TGET_TX_BLOCK *tx;
+
+                tx = kzalloc(sizeof(*tx), GFP_KERNEL);
+                if (!tx) {
+                        mutex_unlock(&pdx->io_mutex);
+                        return -ENOMEM;
+                }
+                tx->size = pdx->rTransDef[dwIdent].dwLength;
+                tx->linear = (long long)((long)pdx->rTransDef[dwIdent].lpvBuff);
+                tx->avail = GET_TX_MAXENTRIES;  // how many blocks we could return
+                tx->used = 1;   // number we actually return
+                tx->entries[0].physical =
+                    (long long)(tx->linear + pdx->StagedOffset);
+                tx->entries[0].size = tx->size;
+
+                if (copy_to_user(pTX, tx, sizeof(*tx)))
                         iReturn = -EFAULT;
+                kfree(tx);
         }
         mutex_unlock(&pdx->io_mutex);
         return iReturn;
@@ -1508,7 +1513,7 @@ int FreeCircBlock(DEVICE_EXTENSION * pdx, TCIRCBLOCK __user * pCB)
                 iReturn = U14ERR_BADAREA;
 
         if (copy_to_user(pCB, &cb, sizeof(cb)))
-                return -EFAULT;
+                iReturn = -EFAULT;
 
         mutex_unlock(&pdx->io_mutex);
         return iReturn;
diff --git a/drivers/staging/ced1401/usb1401.c b/drivers/staging/ced1401/usb1401.c
index 6ba0ef652561..a27043a2f8c5 100644
--- a/drivers/staging/ced1401/usb1401.c
+++ b/drivers/staging/ced1401/usb1401.c
@@ -89,14 +89,11 @@ synchronous non-Urb based transfers.
 #include <linux/mutex.h>
 #include <linux/mm.h>
 #include <linux/highmem.h>
-#include <linux/version.h>
-#if ( LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35) )
 #include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/kref.h>
 #include <linux/uaccess.h>
-#endif
 
 #include "usb1401.h"
 
@@ -123,19 +120,6 @@ MODULE_DEVICE_TABLE(usb, ced_table);
 #define WRITES_IN_FLIGHT        8
 /* arbitrarily chosen */
 
-/* 
-The cause for these errors is that the driver makes use of the functions usb_buffer_alloc() and usb_buffer_free() which got renamed in kernel 2.6.35. This is stated in the Changelog:   USB: rename usb_buffer_alloc() and usb_buffer_free() users
-    For more clearance what the functions actually do,
-      usb_buffer_alloc() is renamed to usb_alloc_coherent()
-      usb_buffer_free()  is renamed to usb_free_coherent()
-   This is needed on Debian 2.6.32-5-amd64
-*/
-#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,35) )
-#define usb_alloc_coherent usb_buffer_alloc
-#define usb_free_coherent  usb_buffer_free
-#define noop_llseek NULL
-#endif
-
 static struct usb_driver ced_driver;
 
 static void ced_delete(struct kref *kref)
@@ -927,9 +911,9 @@ static bool ReadWord(unsigned short *pWord, char *pBuf, unsigned int *pdDone,
 ** ReadHuff
 **
 ** Reads a coded number in and returns it, Code is:
-** If data is in range 0..127 we recieve 1 byte. If data in range 128-16383
-** we recieve two bytes, top bit of first indicates another on its way. If
-** data in range 16383-4194303 we get three bytes, top two bits of first set
+** If data is in range 0..127 we receive 1 byte. If data in range 128-16383
+** we receive two bytes, top bit of first indicates another on its way. If
+** data in range 16384-4194303 we get three bytes, top two bits of first set
 ** to indicate three byte total.
 **
 *****************************************************************************/
@@ -1252,12 +1236,7 @@ int Allowi(DEVICE_EXTENSION * pdx, bool bInCallback)
 ** ulArg    The argument passed in. Note that long is 64-bits in 64-bit system, i.e. it is big
 **          enough for a 64-bit pointer.
 *****************************************************************************/
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)
 static long ced_ioctl(struct file *file, unsigned int cmd, unsigned long ulArg)
-#else
-static int ced_ioctl(struct inode *node, struct file *file, unsigned int cmd,
-                     unsigned long ulArg)
-#endif
 {
         int err = 0;
         DEVICE_EXTENSION *pdx = file->private_data;
@@ -1388,11 +1367,7 @@ static const struct file_operations ced_fops = {
         .release = ced_release,
         .flush = ced_flush,
         .llseek = noop_llseek,
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)
         .unlocked_ioctl = ced_ioctl,
-#else
-        .ioctl = ced_ioctl,
-#endif
 };
 
 /*
@@ -1537,7 +1512,7 @@ error:
 static void ced_disconnect(struct usb_interface *interface)
 {
         DEVICE_EXTENSION *pdx = usb_get_intfdata(interface);
-        int minor = interface->minor;   // save for message at the end
+        int minor = interface->minor;
         int i;
 
         usb_set_intfdata(interface, NULL);      // remove the pdx from the interface
@@ -1572,8 +1547,7 @@ void ced_draw_down(DEVICE_EXTENSION * pdx)
 
         pdx->bInDrawDown = true;
         time = usb_wait_anchor_empty_timeout(&pdx->submitted, 3000);
-        if (!time)              // if we timed out we kill the urbs
-        {
+        if (!time) {            // if we timed out we kill the urbs
                 usb_kill_anchored_urbs(&pdx->submitted);
                 dev_err(&pdx->interface->dev, "%s timed out", __func__);
         }
diff --git a/drivers/staging/ced1401/usb1401.h b/drivers/staging/ced1401/usb1401.h
index 331ca9859829..adb5fa402bd4 100644
--- a/drivers/staging/ced1401/usb1401.h
+++ b/drivers/staging/ced1401/usb1401.h
@@ -165,7 +165,7 @@ typedef struct _DEVICE_EXTENSION
 
     // Parameters relating to a block read\write that is in progress. Some of these values
     //  are equivalent to values in rDMAInfo. The values here are those in use, while those
-    //  in rDMAInfo are those recieved from the 1401 via an escape sequence. If another
+    //  in rDMAInfo are those received from the 1401 via an escape sequence. If another
     //  escape sequence arrives before the previous xfer ends, rDMAInfo values are updated while these
     //  are used to finish off the current transfer.
     volatile short StagedId;            // The transfer area id for this transfer
diff --git a/drivers/staging/ced1401/userspace/use1401.c b/drivers/staging/ced1401/userspace/use1401.c
index d4c63168ea27..38e7c1c82d43 100644
--- a/drivers/staging/ced1401/userspace/use1401.c
+++ b/drivers/staging/ced1401/userspace/use1401.c
@@ -145,7 +145,7 @@
 ** You should add a new one of these to keep things tidy for applications.
 **
 ** DRIVERET_MAX (below) specifies the maximum allowed type code from the
-** 1401 driver; I have set this high to accomodate as yet undesigned 1401
+** 1401 driver; I have set this high to accommodate as yet undesigned 1401
 ** types. Similarly, as long as the command file names follow the ARM,
 ** ARN, ARO sequence, these are calculated by the ExtForType function, so
 ** you don't need to do anything here either.
@@ -160,7 +160,7 @@
 ** have broken backwards compatibility. Minor number changes mean that we
 ** have added new functionality that does not break backwards compatibility.
 ** we starts at 0. Revision changes mean we have fixed something. Each index
-** returns to 0 when a higer one changes.
+** returns to 0 when a higher one changes.
 */
 #define U14LIB_MAJOR 4
 #define U14LIB_MINOR 0
@@ -211,7 +211,7 @@
 
 /*
 ** These are the 1401 type codes returned by the driver, they are a slightly
-** odd sequence & start for reasons of compatability with the DOS driver.
+** odd sequence & start for reasons of compatibility with the DOS driver.
 ** The maximum code value is the upper limit of 1401 device types.
 */
 #define DRIVRET_STD     4       // Codes for 1401 types matching driver values
@@ -2327,7 +2327,7 @@ U14API(short) U14SetTransArea(short hand, WORD wArea, void *pvBuff,
 
 /****************************************************************************
 ** U14SetTransferEvent  Sets an event for notification of application
-** wArea       The tranfer area index, from 0 to MAXAREAS-1
+** wArea       The transfer area index, from 0 to MAXAREAS-1
 **    bEvent      True to create an event, false to remove it
 **    bToHost     Set 0 for notification on to1401 tranfers, 1 for
 **                notification of transfers to the host PC
diff --git a/drivers/staging/comedi/Kconfig b/drivers/staging/comedi/Kconfig
index 2093403af253..7de2a10213bd 100644
--- a/drivers/staging/comedi/Kconfig
+++ b/drivers/staging/comedi/Kconfig
@@ -568,7 +568,6 @@ config COMEDI_8255_PCI
 
 config COMEDI_ADDI_APCI_035
         tristate "ADDI-DATA APCI_035 support"
-        depends on VIRT_TO_BUS
         ---help---
           Enable support for ADDI-DATA APCI_035 cards
 
@@ -577,7 +576,6 @@ config COMEDI_ADDI_APCI_035
 
 config COMEDI_ADDI_APCI_1032
         tristate "ADDI-DATA APCI_1032 support"
-        depends on VIRT_TO_BUS
         ---help---
           Enable support for ADDI-DATA APCI_1032 cards
 
@@ -586,7 +584,6 @@ config COMEDI_ADDI_APCI_1032
 
 config COMEDI_ADDI_APCI_1500
         tristate "ADDI-DATA APCI_1500 support"
-        depends on VIRT_TO_BUS
         ---help---
           Enable support for ADDI-DATA APCI_1500 cards
 
@@ -594,17 +591,17 @@ config COMEDI_ADDI_APCI_1500
           called addi_apci_1500.
 
 config COMEDI_ADDI_APCI_1516
-        tristate "ADDI-DATA APCI_1516 support"
-        depends on VIRT_TO_BUS
+        tristate "ADDI-DATA APCI-1016/1516/2016 support"
         ---help---
-          Enable support for ADDI-DATA APCI_1516 cards
+          Enable support for ADDI-DATA APCI-1016, APCI-1516 and APCI-2016 boards.
+          These are 16 channel, optically isolated, digital I/O boards. The 1516
+          and 2016 boards also have a watchdog for resetting the outputs to "0".
 
           To compile this driver as a module, choose M here: the module will be
           called addi_apci_1516.
 
 config COMEDI_ADDI_APCI_1564
         tristate "ADDI-DATA APCI_1564 support"
-        depends on VIRT_TO_BUS
         ---help---
           Enable support for ADDI-DATA APCI_1564 cards
 
@@ -613,25 +610,14 @@ config COMEDI_ADDI_APCI_1564
 
 config COMEDI_ADDI_APCI_16XX
         tristate "ADDI-DATA APCI_16xx support"
-        depends on VIRT_TO_BUS
         ---help---
           Enable support for ADDI-DATA APCI_16xx cards
 
           To compile this driver as a module, choose M here: the module will be
           called addi_apci_16xx.
 
-config COMEDI_ADDI_APCI_2016
-        tristate "ADDI-DATA APCI_2016 support"
-        depends on VIRT_TO_BUS
-        ---help---
-          Enable support for ADDI-DATA APCI_2016 cards
-
-          To compile this driver as a module, choose M here: the module will be
-          called addi_apci_2016.
-
 config COMEDI_ADDI_APCI_2032
         tristate "ADDI-DATA APCI_2032 support"
-        depends on VIRT_TO_BUS
         ---help---
           Enable support for ADDI-DATA APCI_2032 cards
 
@@ -640,36 +626,24 @@ config COMEDI_ADDI_APCI_2032
 
 config COMEDI_ADDI_APCI_2200
         tristate "ADDI-DATA APCI_2200 support"
-        depends on VIRT_TO_BUS
         ---help---
           Enable support for ADDI-DATA APCI_2200 cards
 
           To compile this driver as a module, choose M here: the module will be
           called addi_apci_2200.
 
-config COMEDI_ADDI_APCI_3001
-        tristate "ADDI-DATA APCI_3001 support"
-        depends on VIRT_TO_BUS
-        select COMEDI_FC
-        ---help---
-          Enable support for ADDI-DATA APCI_3001 cards
-
-          To compile this driver as a module, choose M here: the module will be
-          called addi_apci_3001.
-
 config COMEDI_ADDI_APCI_3120
-        tristate "ADDI-DATA APCI_3520 support"
+        tristate "ADDI-DATA APCI_3120/3001 support"
         depends on VIRT_TO_BUS
         select COMEDI_FC
         ---help---
-          Enable support for ADDI-DATA APCI_3520 cards
+          Enable support for ADDI-DATA APCI_3120/3001 cards
 
           To compile this driver as a module, choose M here: the module will be
           called addi_apci_3120.
 
 config COMEDI_ADDI_APCI_3501
         tristate "ADDI-DATA APCI_3501 support"
-        depends on VIRT_TO_BUS
         ---help---
           Enable support for ADDI-DATA APCI_3501 cards
 
@@ -678,7 +652,6 @@ config COMEDI_ADDI_APCI_3501
 
 config COMEDI_ADDI_APCI_3XXX
         tristate "ADDI-DATA APCI_3xxx support"
-        depends on VIRT_TO_BUS
         ---help---
           Enable support for ADDI-DATA APCI_3xxx cards
 
@@ -761,10 +734,11 @@ config COMEDI_ADV_PCI_DIO
           called adv_pci_dio.
 
 config COMEDI_AMPLC_DIO200_PCI
-        tristate "Amplicon PCI215 and PCI272 DIO board support"
+        tristate "Amplicon PCI215/PCI272/PCIe215/PCIe236/PCIe296 DIO support"
         select COMEDI_AMPLC_DIO200
         ---help---
-          Enable support for Amplicon PCI215 and PCI272 DIO boards.
+          Enable support for Amplicon PCI215, PCI272, PCIe215, PCIe236
+          and PCIe296 DIO boards.
 
           To compile this driver as a module, choose M here: the module will be
           called amplc_dio200.
@@ -1263,7 +1237,6 @@ config COMEDI_FC
 
 config COMEDI_AMPLC_DIO200
         tristate
-        select COMEDI_8255
 
 config COMEDI_AMPLC_PC236
         tristate
diff --git a/drivers/staging/comedi/comedi.h b/drivers/staging/comedi/comedi.h
index 133f013e0f6d..c8a8ca126127 100644
--- a/drivers/staging/comedi/comedi.h
+++ b/drivers/staging/comedi/comedi.h
@@ -283,6 +283,44 @@ enum configuration_ids {
         INSN_CONFIG_PWM_GET_H_BRIDGE = 5004
 };
 
+/*
+ * Settings for INSN_CONFIG_DIGITAL_TRIG:
+ * data[0] = INSN_CONFIG_DIGITAL_TRIG
+ * data[1] = trigger ID
+ * data[2] = configuration operation
+ * data[3] = configuration parameter 1
+ * data[4] = configuration parameter 2
+ * data[5] = configuration parameter 3
+ *
+ * operation                           parameter 1   parameter 2   parameter 3
+ * ---------------------------------   -----------   -----------   -----------
+ * COMEDI_DIGITAL_TRIG_DISABLE
+ * COMEDI_DIGITAL_TRIG_ENABLE_EDGES    left-shift    rising-edges  falling-edges
+ * COMEDI_DIGITAL_TRIG_ENABLE_LEVELS   left-shift    high-levels   low-levels
+ *
+ * COMEDI_DIGITAL_TRIG_DISABLE returns the trigger to its default, inactive,
+ * unconfigured state.
+ *
+ * COMEDI_DIGITAL_TRIG_ENABLE_EDGES sets the rising and/or falling edge inputs
+ * that each can fire the trigger.
+ *
+ * COMEDI_DIGITAL_TRIG_ENABLE_LEVELS sets a combination of high and/or low
+ * level inputs that can fire the trigger.
+ *
+ * "left-shift" is useful if the trigger has more than 32 inputs to specify the
+ * first input for this configuration.
+ *
+ * Some sequences of INSN_CONFIG_DIGITAL_TRIG instructions may have a (partly)
+ * accumulative effect, depending on the low-level driver.  This is useful
+ * when setting up a trigger that has more than 32 inputs or has a combination
+ * of edge and level triggered inputs.
+ */
+enum comedi_digital_trig_op {
+        COMEDI_DIGITAL_TRIG_DISABLE = 0,
+        COMEDI_DIGITAL_TRIG_ENABLE_EDGES = 1,
+        COMEDI_DIGITAL_TRIG_ENABLE_LEVELS = 2
+};
+
 enum comedi_io_direction {
         COMEDI_INPUT = 0,
         COMEDI_OUTPUT = 1,
@@ -888,7 +926,20 @@ enum amplc_dio_clock_source {
                                    subdevice, preceding counter
                                    subdevice is the last counter
                                    subdevice) */
-        AMPLC_DIO_CLK_EXT       /* per chip external input pin */
+        AMPLC_DIO_CLK_EXT,      /* per chip external input pin */
+        /* the following are "enhanced" clock sources for PCIe models */
+        AMPLC_DIO_CLK_VCC,      /* clock input HIGH */
+        AMPLC_DIO_CLK_GND,      /* clock input LOW */
+        AMPLC_DIO_CLK_PAT_PRESENT, /* "pattern present" signal */
+        AMPLC_DIO_CLK_20MHZ     /* 20 MHz internal clock */
+};
+
+/* Values for setting a clock source with INSN_CONFIG_SET_CLOCK_SRC for
+ * timer subdevice on some Amplicon DIO PCIe boards (amplc_dio200 driver). */
+enum amplc_dio_ts_clock_src {
+        AMPLC_DIO_TS_CLK_1GHZ,  /* 1 ns period with 20 ns granularity */
+        AMPLC_DIO_TS_CLK_1MHZ,  /* 1 us period */
+        AMPLC_DIO_TS_CLK_1KHZ   /* 1 ms period */
 };
 
 /* Values for setting a gate source with INSN_CONFIG_SET_GATE_SRC for
@@ -907,7 +958,17 @@ enum amplc_dio_gate_source {
         AMPLC_DIO_GAT_RESERVED4,
         AMPLC_DIO_GAT_RESERVED5,
         AMPLC_DIO_GAT_RESERVED6,
-        AMPLC_DIO_GAT_RESERVED7
+        AMPLC_DIO_GAT_RESERVED7,
+        /* the following are "enhanced" gate sources for PCIe models */
+        AMPLC_DIO_GAT_NGATN = 6, /* negated per channel gate input */
+        AMPLC_DIO_GAT_OUTNM2,   /* non-negated output of counter
+                                   channel minus 2 */
+        AMPLC_DIO_GAT_PAT_PRESENT, /* "pattern present" signal */
+        AMPLC_DIO_GAT_PAT_OCCURRED, /* "pattern occurred" latched */
+        AMPLC_DIO_GAT_PAT_GONE, /* "pattern gone away" latched */
+        AMPLC_DIO_GAT_NPAT_PRESENT, /* negated "pattern present" */
+        AMPLC_DIO_GAT_NPAT_OCCURRED, /* negated "pattern occurred" */
+        AMPLC_DIO_GAT_NPAT_GONE /* negated "pattern gone away" */
 };
 
 #endif /* _COMEDI_H */
diff --git a/drivers/staging/comedi/comedi_compat32.c b/drivers/staging/comedi/comedi_compat32.c
index 0a5057f0919b..4b7cbfad1d74 100644
--- a/drivers/staging/comedi/comedi_compat32.c
+++ b/drivers/staging/comedi/comedi_compat32.c
@@ -24,7 +24,6 @@
 
 */
 
-#define __NO_VERSION__
 #include <linux/uaccess.h>
 #include <linux/compat.h>
 #include <linux/fs.h>
diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c
index c2a32cf95a82..b7bba1790a20 100644
--- a/drivers/staging/comedi/comedi_fops.c
+++ b/drivers/staging/comedi/comedi_fops.c
@@ -23,7 +23,6 @@
 
 #undef DEBUG
 
-#define __NO_VERSION__
 #include "comedi_compat32.h"
 
 #include <linux/module.h>
@@ -880,6 +879,10 @@ static int check_insn_config_length(struct comedi_insn *insn,
                 if (insn->n == 5)
                         return 0;
                 break;
+        case INSN_CONFIG_DIGITAL_TRIG:
+                if (insn->n == 6)
+                        return 0;
+                break;
                 /* by default we allow the insn since we don't have checks for
                  * all possible cases yet */
         default:
diff --git a/drivers/staging/comedi/comedidev.h b/drivers/staging/comedi/comedidev.h
index cb67a5cb9c82..692e1e615d44 100644
--- a/drivers/staging/comedi/comedidev.h
+++ b/drivers/staging/comedi/comedidev.h
@@ -41,6 +41,7 @@
 #include <linux/io.h>
 #include <linux/timer.h>
 #include <linux/pci.h>
+#include <linux/usb.h>
 
 #include "comedi.h"
 
@@ -54,9 +55,21 @@
         COMEDI_MINORVERSION, COMEDI_MICROVERSION)
 #define COMEDI_RELEASE VERSION
 
-#define PCI_VENDOR_ID_ADLINK            0x144a
+/*
+ * PCI Vendor IDs not in <linux/pci_ids.h>
+ */
+#define PCI_VENDOR_ID_KOLTER            0x1001
 #define PCI_VENDOR_ID_ICP               0x104c
+#define PCI_VENDOR_ID_AMCC              0x10e8
+#define PCI_VENDOR_ID_DT                0x1116
+#define PCI_VENDOR_ID_IOTECH            0x1616
 #define PCI_VENDOR_ID_CONTEC            0x1221
+#define PCI_VENDOR_ID_CB                0x1307  /* Measurement Computing */
+#define PCI_VENDOR_ID_ADVANTECH         0x13fe
+#define PCI_VENDOR_ID_MEILHAUS          0x1402
+#define PCI_VENDOR_ID_RTD               0x1435
+#define PCI_VENDOR_ID_ADLINK            0x144a
+#define PCI_VENDOR_ID_AMPLICON          0x14dc
 
 #define COMEDI_NUM_MINORS 0x100
 #define COMEDI_NUM_BOARD_MINORS 0x30
@@ -181,8 +194,6 @@ struct comedi_async {
                         unsigned int x);
 };
 
-struct usb_interface;
-
 struct comedi_driver {
         struct comedi_driver *next;
 
@@ -190,8 +201,7 @@ struct comedi_driver {
         struct module *module;
         int (*attach) (struct comedi_device *, struct comedi_devconfig *);
         void (*detach) (struct comedi_device *);
-        int (*attach_pci) (struct comedi_device *, struct pci_dev *);
-        int (*attach_usb) (struct comedi_device *, struct usb_interface *);
+        int (*auto_attach) (struct comedi_device *, unsigned long);
 
         /* number of elements in board_name and board_id arrays */
         unsigned int num_names;
@@ -235,7 +245,7 @@ struct comedi_device {
         void (*close) (struct comedi_device *dev);
 };
 
-static inline const void *comedi_board(struct comedi_device *dev)
+static inline const void *comedi_board(const struct comedi_device *dev)
 {
         return dev->board_ptr;
 }
@@ -415,14 +425,6 @@ struct comedi_lrange {
 
 /* some silly little inline functions */
 
-static inline int alloc_private(struct comedi_device *dev, int size)
-{
-        dev->private = kzalloc(size, GFP_KERNEL);
-        if (!dev->private)
-                return -ENOMEM;
-        return 0;
-}
-
 static inline unsigned int bytes_per_sample(const struct comedi_subdevice *subd)
 {
         if (subd->subdev_flags & SDF_LSAMPL)
@@ -436,9 +438,10 @@ into comedi's buffer */
 static inline void comedi_set_hw_dev(struct comedi_device *dev,
                                      struct device *hw_dev)
 {
+        if (dev->hw_dev == hw_dev)
+                return;
         if (dev->hw_dev)
                 put_device(dev->hw_dev);
-
         dev->hw_dev = hw_dev;
         if (dev->hw_dev) {
                 dev->hw_dev = get_device(dev->hw_dev);
@@ -451,6 +454,12 @@ static inline struct pci_dev *comedi_to_pci_dev(struct comedi_device *dev)
         return dev->hw_dev ? to_pci_dev(dev->hw_dev) : NULL;
 }
 
+static inline struct usb_interface *
+comedi_to_usb_interface(struct comedi_device *dev)
+{
+        return dev->hw_dev ? to_usb_interface(dev->hw_dev) : NULL;
+}
+
 int comedi_buf_put(struct comedi_async *async, short x);
 int comedi_buf_get(struct comedi_async *async, short *x);
 
@@ -505,11 +514,30 @@ static inline void *comedi_aux_data(int options[], int n)
 int comedi_alloc_subdevice_minor(struct comedi_device *dev,
                                  struct comedi_subdevice *s);
 void comedi_free_subdevice_minor(struct comedi_subdevice *s);
-int comedi_pci_auto_config(struct pci_dev *pcidev,
-                           struct comedi_driver *driver);
-void comedi_pci_auto_unconfig(struct pci_dev *pcidev);
-int comedi_usb_auto_config(struct usb_interface *intf,
-                           struct comedi_driver *driver);
-void comedi_usb_auto_unconfig(struct usb_interface *intf);
+int comedi_auto_config(struct device *hardware_device,
+                       struct comedi_driver *driver, unsigned long context);
+void comedi_auto_unconfig(struct device *hardware_device);
+
+static inline int comedi_pci_auto_config(struct pci_dev *pcidev,
+                                         struct comedi_driver *driver)
+{
+        return comedi_auto_config(&pcidev->dev, driver, 0);
+}
+
+static inline void comedi_pci_auto_unconfig(struct pci_dev *pcidev)
+{
+        comedi_auto_unconfig(&pcidev->dev);
+}
+
+static inline int comedi_usb_auto_config(struct usb_interface *intf,
+                                         struct comedi_driver *driver)
+{
+        return comedi_auto_config(&intf->dev, driver, 0);
+}
+
+static inline void comedi_usb_auto_unconfig(struct usb_interface *intf)
+{
+        comedi_auto_unconfig(&intf->dev);
+}
 
 #endif /* _COMEDIDEV_H */
diff --git a/drivers/staging/comedi/drivers.c b/drivers/staging/comedi/drivers.c
index 1db6bfdbf13b..50cf498698e2 100644
--- a/drivers/staging/comedi/drivers.c
+++ b/drivers/staging/comedi/drivers.c
@@ -21,9 +21,6 @@
 
 */
 
-#define _GNU_SOURCE
-
-#define __NO_VERSION__
 #include <linux/device.h>
 #include <linux/module.h>
 #include <linux/pci.h>
@@ -833,11 +830,8 @@ void comedi_reset_async_buf(struct comedi_async *async)
         async->events = 0;
 }
 
-static int
-comedi_auto_config_helper(struct device *hardware_device,
-                          struct comedi_driver *driver,
-                          int (*attach_wrapper) (struct comedi_device *,
-                                                 void *), void *context)
+int comedi_auto_config(struct device *hardware_device,
+                       struct comedi_driver *driver, unsigned long context)
 {
         int minor;
         struct comedi_device_file_info *dev_file_info;
@@ -847,6 +841,13 @@ comedi_auto_config_helper(struct device *hardware_device,
         if (!comedi_autoconfig)
                 return 0;
 
+        if (!driver->auto_attach) {
+                dev_warn(hardware_device,
+                         "BUG! comedi driver '%s' has no auto_attach handler\n",
+                         driver->driver_name);
+                return -EINVAL;
+        }
+
         minor = comedi_alloc_board_minor(hardware_device);
         if (minor < 0)
                 return minor;
@@ -860,9 +861,9 @@ comedi_auto_config_helper(struct device *hardware_device,
         else if (!try_module_get(driver->module))
                 ret = -EIO;
         else {
-                /* set comedi_dev->driver here for attach wrapper */
+                comedi_set_hw_dev(comedi_dev, hardware_device);
                 comedi_dev->driver = driver;
-                ret = (*attach_wrapper)(comedi_dev, context);
+                ret = driver->auto_attach(comedi_dev, context);
                 if (ret < 0) {
                         module_put(driver->module);
                         __comedi_device_detach(comedi_dev);
@@ -876,49 +877,9 @@ comedi_auto_config_helper(struct device *hardware_device,
                 comedi_free_board_minor(minor);
         return ret;
 }
+EXPORT_SYMBOL_GPL(comedi_auto_config);
 
-static int comedi_auto_config_wrapper(struct comedi_device *dev, void *context)
-{
-        struct comedi_devconfig *it = context;
-        struct comedi_driver *driv = dev->driver;
-
-        if (driv->num_names) {
-                /* look for generic board entry matching driver name, which
-                 * has already been copied to it->board_name */
-                dev->board_ptr = comedi_recognize(driv, it->board_name);
-                if (dev->board_ptr == NULL) {
-                        dev_warn(dev->class_dev,
-                                 "auto config failed to find board entry '%s' for driver '%s'\n",
-                                 it->board_name, driv->driver_name);
-                        comedi_report_boards(driv);
-                        return -EINVAL;
-                }
-        }
-        if (!driv->attach) {
-                dev_warn(dev->class_dev,
-                         "BUG! driver '%s' using old-style auto config but has no attach handler\n",
-                         driv->driver_name);
-                return -EINVAL;
-        }
-        return driv->attach(dev, it);
-}
-
-static int comedi_auto_config(struct device *hardware_device,
-                              struct comedi_driver *driver, const int *options,
-                              unsigned num_options)
-{
-        struct comedi_devconfig it;
-
-        memset(&it, 0, sizeof(it));
-        strncpy(it.board_name, driver->driver_name, COMEDI_NAMELEN);
-        it.board_name[COMEDI_NAMELEN - 1] = '\0';
-        BUG_ON(num_options > COMEDI_NDEVCONFOPTS);
-        memcpy(it.options, options, num_options * sizeof(int));
-        return comedi_auto_config_helper(hardware_device, driver,
-                                         comedi_auto_config_wrapper, &it);
-}
-
-static void comedi_auto_unconfig(struct device *hardware_device)
+void comedi_auto_unconfig(struct device *hardware_device)
 {
         int minor;
 
@@ -930,6 +891,7 @@ static void comedi_auto_unconfig(struct device *hardware_device)
         BUG_ON(minor >= COMEDI_NUM_BOARD_MINORS);
         comedi_free_board_minor(minor);
 }
+EXPORT_SYMBOL_GPL(comedi_auto_unconfig);
 
 /**
  * comedi_pci_enable() - Enable the PCI device and request the regions.
@@ -965,48 +927,6 @@ void comedi_pci_disable(struct pci_dev *pdev)
 }
 EXPORT_SYMBOL_GPL(comedi_pci_disable);
 
-static int comedi_old_pci_auto_config(struct pci_dev *pcidev,
-                                      struct comedi_driver *driver)
-{
-        int options[2];
-
-        /*  pci bus */
-        options[0] = pcidev->bus->number;
-        /*  pci slot */
-        options[1] = PCI_SLOT(pcidev->devfn);
-
-        return comedi_auto_config(&pcidev->dev, driver,
-                                  options, ARRAY_SIZE(options));
-}
-
-static int comedi_pci_attach_wrapper(struct comedi_device *dev, void *pcidev)
-{
-        return dev->driver->attach_pci(dev, pcidev);
-}
-
-static int comedi_new_pci_auto_config(struct pci_dev *pcidev,
-                                      struct comedi_driver *driver)
-{
-        return comedi_auto_config_helper(&pcidev->dev, driver,
-                                         comedi_pci_attach_wrapper, pcidev);
-}
-
-int comedi_pci_auto_config(struct pci_dev *pcidev, struct comedi_driver *driver)
-{
-
-        if (driver->attach_pci)
-                return comedi_new_pci_auto_config(pcidev, driver);
-        else
-                return comedi_old_pci_auto_config(pcidev, driver);
-}
-EXPORT_SYMBOL_GPL(comedi_pci_auto_config);
-
-void comedi_pci_auto_unconfig(struct pci_dev *pcidev)
-{
-        comedi_auto_unconfig(&pcidev->dev);
-}
-EXPORT_SYMBOL_GPL(comedi_pci_auto_unconfig);
-
 int comedi_pci_driver_register(struct comedi_driver *comedi_driver,
                 struct pci_driver *pci_driver)
 {
@@ -1040,42 +960,6 @@ EXPORT_SYMBOL_GPL(comedi_pci_driver_unregister);
 
 #if IS_ENABLED(CONFIG_USB)
 
-static int comedi_old_usb_auto_config(struct usb_interface *intf,
-                                      struct comedi_driver *driver)
-{
-        return comedi_auto_config(&intf->dev, driver, NULL, 0);
-}
-
-static int comedi_usb_attach_wrapper(struct comedi_device *dev, void *intf)
-{
-        return dev->driver->attach_usb(dev, intf);
-}
-
-static int comedi_new_usb_auto_config(struct usb_interface *intf,
-                                      struct comedi_driver *driver)
-{
-        return comedi_auto_config_helper(&intf->dev, driver,
-                                         comedi_usb_attach_wrapper, intf);
-}
-
-int comedi_usb_auto_config(struct usb_interface *intf,
-                           struct comedi_driver *driver)
-{
-        BUG_ON(intf == NULL);
-        if (driver->attach_usb)
-                return comedi_new_usb_auto_config(intf, driver);
-        else
-                return comedi_old_usb_auto_config(intf, driver);
-}
-EXPORT_SYMBOL_GPL(comedi_usb_auto_config);
-
-void comedi_usb_auto_unconfig(struct usb_interface *intf)
-{
-        BUG_ON(intf == NULL);
-        comedi_auto_unconfig(&intf->dev);
-}
-EXPORT_SYMBOL_GPL(comedi_usb_auto_unconfig);
-
 int comedi_usb_driver_register(struct comedi_driver *comedi_driver,
                 struct usb_driver *usb_driver)
 {
diff --git a/drivers/staging/comedi/drivers/8255.c b/drivers/staging/comedi/drivers/8255.c
index a256622e2dd7..c7aa41ad842f 100644
--- a/drivers/staging/comedi/drivers/8255.c
+++ b/drivers/staging/comedi/drivers/8255.c
@@ -249,28 +249,13 @@ static int subdev_8255_cmdtest(struct comedi_device *dev,
         if (err)
                 return 2;
 
-        /* step 3 */
+        /* Step 3: check if arguments are trivially valid */
 
-        if (cmd->start_arg != 0) {
-                cmd->start_arg = 0;
-                err++;
-        }
-        if (cmd->scan_begin_arg != 0) {
-                cmd->scan_begin_arg = 0;
-                err++;
-        }
-        if (cmd->convert_arg != 0) {
-                cmd->convert_arg = 0;
-                err++;
-        }
-        if (cmd->scan_end_arg != 1) {
-                cmd->scan_end_arg = 1;
-                err++;
-        }
-        if (cmd->stop_arg != 0) {
-                cmd->stop_arg = 0;
-                err++;
-        }
+        err |= cfc_check_trigger_arg_is(&cmd->start_arg, 0);
+        err |= cfc_check_trigger_arg_is(&cmd->scan_begin_arg, 0);
+        err |= cfc_check_trigger_arg_is(&cmd->convert_arg, 0);
+        err |= cfc_check_trigger_arg_is(&cmd->scan_end_arg, 1);
+        err |= cfc_check_trigger_arg_is(&cmd->stop_arg, 0);
 
         if (err)
                 return 3;
diff --git a/drivers/staging/comedi/drivers/8255_pci.c b/drivers/staging/comedi/drivers/8255_pci.c
index d00aff6671df..e0a79521f35a 100644
--- a/drivers/staging/comedi/drivers/8255_pci.c
+++ b/drivers/staging/comedi/drivers/8255_pci.c
@@ -65,9 +65,6 @@ Configuration Options: not applicable, uses PCI auto config
 #define PCI_DEVICE_ID_ADLINK_PCI7248    0x7248
 #define PCI_DEVICE_ID_ADLINK_PCI7296    0x7296
 
-/* ComputerBoards is now known as Measurement Computing */
-#define PCI_VENDOR_ID_CB                0x1307
-
 #define PCI_DEVICE_ID_CB_PCIDIO48H      0x000b
 #define PCI_DEVICE_ID_CB_PCIDIO24H      0x0014
 #define PCI_DEVICE_ID_CB_PCIDIO96H      0x0017
@@ -216,9 +213,10 @@ static const void *pci_8255_find_boardinfo(struct comedi_device *dev,
         return NULL;
 }
 
-static int pci_8255_attach_pci(struct comedi_device *dev,
-                               struct pci_dev *pcidev)
+static int pci_8255_auto_attach(struct comedi_device *dev,
+                                          unsigned long context_unused)
 {
+        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
         const struct pci_8255_boardinfo *board;
         struct pci_8255_private *devpriv;
         struct comedi_subdevice *s;
@@ -227,18 +225,16 @@ static int pci_8255_attach_pci(struct comedi_device *dev,
         int ret;
         int i;
 
-        comedi_set_hw_dev(dev, &pcidev->dev);
-
         board = pci_8255_find_boardinfo(dev, pcidev);
         if (!board)
                 return -ENODEV;
         dev->board_ptr = board;
         dev->board_name = board->name;
 
-        ret = alloc_private(dev, sizeof(*devpriv));
-        if (ret < 0)
-                return ret;
-        devpriv = dev->private;
+        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
+        if (!devpriv)
+                return -ENOMEM;
+        dev->private = devpriv;
 
         ret = comedi_pci_enable(pcidev, dev->board_name);
         if (ret)
@@ -308,17 +304,17 @@ static void pci_8255_detach(struct comedi_device *dev)
 static struct comedi_driver pci_8255_driver = {
         .driver_name    = "8255_pci",
         .module         = THIS_MODULE,
-        .attach_pci     = pci_8255_attach_pci,
+        .auto_attach    = pci_8255_auto_attach,
         .detach         = pci_8255_detach,
 };
 
-static int __devinit pci_8255_pci_probe(struct pci_dev *dev,
+static int pci_8255_pci_probe(struct pci_dev *dev,
                                         const struct pci_device_id *ent)
 {
         return comedi_pci_auto_config(dev, &pci_8255_driver);
 }
 
-static void __devexit pci_8255_pci_remove(struct pci_dev *dev)
+static void pci_8255_pci_remove(struct pci_dev *dev)
 {
         comedi_pci_auto_unconfig(dev);
 }
@@ -346,7 +342,7 @@ static struct pci_driver pci_8255_pci_driver = {
         .name           = "8255_pci",
         .id_table       = pci_8255_pci_table,
         .probe          = pci_8255_pci_probe,
-        .remove         = __devexit_p(pci_8255_pci_remove),
+        .remove         = pci_8255_pci_remove,
 };
 module_comedi_pci_driver(pci_8255_driver, pci_8255_pci_driver);
 
diff --git a/drivers/staging/comedi/drivers/Makefile b/drivers/staging/comedi/drivers/Makefile
index a2787c0ca327..0de4d2eb76fc 100644
--- a/drivers/staging/comedi/drivers/Makefile
+++ b/drivers/staging/comedi/drivers/Makefile
@@ -62,10 +62,8 @@ obj-$(CONFIG_COMEDI_ADDI_APCI_1500)	+= addi_apci_1500.o
 obj-$(CONFIG_COMEDI_ADDI_APCI_1516)     += addi_apci_1516.o
 obj-$(CONFIG_COMEDI_ADDI_APCI_1564)     += addi_apci_1564.o
 obj-$(CONFIG_COMEDI_ADDI_APCI_16XX)     += addi_apci_16xx.o
-obj-$(CONFIG_COMEDI_ADDI_APCI_2016)     += addi_apci_2016.o
 obj-$(CONFIG_COMEDI_ADDI_APCI_2032)     += addi_apci_2032.o
 obj-$(CONFIG_COMEDI_ADDI_APCI_2200)     += addi_apci_2200.o
-obj-$(CONFIG_COMEDI_ADDI_APCI_3001)     += addi_apci_3001.o
 obj-$(CONFIG_COMEDI_ADDI_APCI_3120)     += addi_apci_3120.o
 obj-$(CONFIG_COMEDI_ADDI_APCI_3501)     += addi_apci_3501.o
 obj-$(CONFIG_COMEDI_ADDI_APCI_3XXX)     += addi_apci_3xxx.o
diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_82x54.c b/drivers/staging/comedi/drivers/addi-data/APCI1710_82x54.c
index b59f2d484fd9..d0702084caa2 100644
--- a/drivers/staging/comedi/drivers/addi-data/APCI1710_82x54.c
+++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_82x54.c
@@ -18,7 +18,19 @@
   | Description :   APCI-1710 82X54 timer module                          |
 */
 
-#include "APCI1710_82x54.h"
+#define APCI1710_PCI_BUS_CLOCK                  0
+#define APCI1710_FRONT_CONNECTOR_INPUT          1
+#define APCI1710_TIMER_READVALUE                0
+#define APCI1710_TIMER_GETOUTPUTLEVEL           1
+#define APCI1710_TIMER_GETPROGRESSSTATUS        2
+#define APCI1710_TIMER_WRITEVALUE               3
+
+#define APCI1710_TIMER_READINTERRUPT            1
+#define APCI1710_TIMER_READALLTIMER             2
+
+#ifndef APCI1710_10MHZ
+#define APCI1710_10MHZ                          10
+#endif
 
 /*
 +----------------------------------------------------------------------------+
@@ -218,11 +230,12 @@ int i_InsnConfig_InitTimer(struct comedi_device *dev,struct comedi_subdevice *s,
 |                    -9: Selection from hardware gate level is wrong         |
 +----------------------------------------------------------------------------+
 */
-
-int i_APCI1710_InsnConfigInitTimer(struct comedi_device *dev, struct comedi_subdevice *s,
-                                   struct comedi_insn *insn, unsigned int *data)
+static int i_APCI1710_InsnConfigInitTimer(struct comedi_device *dev,
+                                          struct comedi_subdevice *s,
+                                          struct comedi_insn *insn,
+                                          unsigned int *data)
 {
-
+        struct addi_private *devpriv = dev->private;
         int i_ReturnValue = 0;
         unsigned char b_ModulNbr;
         unsigned char b_TimerNbr;
@@ -447,11 +460,12 @@ i_ReturnValue=insn->n;
 |                        See function "i_APCI1710_SetBoardIntRoutineX"       |
 +----------------------------------------------------------------------------+
 */
-
-int i_APCI1710_InsnWriteEnableDisableTimer(struct comedi_device *dev,
-                                           struct comedi_subdevice *s,
-                                           struct comedi_insn *insn, unsigned int *data)
+static int i_APCI1710_InsnWriteEnableDisableTimer(struct comedi_device *dev,
+                                                 struct comedi_subdevice *s,
+                                                 struct comedi_insn *insn,
+                                                 unsigned int *data)
 {
+        struct addi_private *devpriv = dev->private;
         int i_ReturnValue = 0;
         unsigned int dw_DummyRead;
         unsigned char b_ModulNbr;
@@ -589,10 +603,12 @@ int i_APCI1710_InsnReadAllTimerValue(struct comedi_device *dev,struct comedi_sub
 |                        "i_APCI1710_InitTimer"                              |
 +----------------------------------------------------------------------------+
 */
-
-int i_APCI1710_InsnReadAllTimerValue(struct comedi_device *dev, struct comedi_subdevice *s,
-                                     struct comedi_insn *insn, unsigned int *data)
+static int i_APCI1710_InsnReadAllTimerValue(struct comedi_device *dev,
+                                            struct comedi_subdevice *s,
+                                            struct comedi_insn *insn,
+                                            unsigned int *data)
 {
+        struct addi_private *devpriv = dev->private;
         int i_ReturnValue = 0;
         unsigned char b_ModulNbr, b_ReadType;
         unsigned int *pul_TimerValueArray;
@@ -668,70 +684,6 @@ int i_APCI1710_InsnReadAllTimerValue(struct comedi_device *dev, struct comedi_su
 
 /*
 +----------------------------------------------------------------------------+
-| Function Name     :INT i_APCI1710_InsnBitsTimer(struct comedi_device *dev,
-struct comedi_subdevice *s,struct comedi_insn *insn,unsigned int *data)                   |
-+----------------------------------------------------------------------------+
-| Task              : Read write functions for Timer                                          |
-+----------------------------------------------------------------------------+
-| Input Parameters  :
-+----------------------------------------------------------------------------+
-| Output Parameters : -                                                      |
-+----------------------------------------------------------------------------+
-| Return Value      :
-+----------------------------------------------------------------------------+
-*/
-
-int i_APCI1710_InsnBitsTimer(struct comedi_device *dev, struct comedi_subdevice *s,
-                             struct comedi_insn *insn, unsigned int *data)
-{
-        unsigned char b_BitsType;
-        int i_ReturnValue = 0;
-        b_BitsType = data[0];
-
-        printk("\n82X54");
-
-        switch (b_BitsType) {
-        case APCI1710_TIMER_READVALUE:
-                i_ReturnValue = i_APCI1710_ReadTimerValue(dev,
-                                                          (unsigned char)CR_AREF(insn->chanspec),
-                                                          (unsigned char)CR_CHAN(insn->chanspec),
-                                                          (unsigned int *) &data[0]);
-                break;
-
-        case APCI1710_TIMER_GETOUTPUTLEVEL:
-                i_ReturnValue = i_APCI1710_GetTimerOutputLevel(dev,
-                                                               (unsigned char)CR_AREF(insn->chanspec),
-                                                               (unsigned char)CR_CHAN(insn->chanspec),
-                                                               (unsigned char *) &data[0]);
-                break;
-
-        case APCI1710_TIMER_GETPROGRESSSTATUS:
-                i_ReturnValue = i_APCI1710_GetTimerProgressStatus(dev,
-                                                                  (unsigned char)CR_AREF(insn->chanspec),
-                                                                  (unsigned char)CR_CHAN(insn->chanspec),
-                                                                  (unsigned char *)&data[0]);
-                break;
-
-        case APCI1710_TIMER_WRITEVALUE:
-                i_ReturnValue = i_APCI1710_WriteTimerValue(dev,
-                                                           (unsigned char)CR_AREF(insn->chanspec),
-                                                           (unsigned char)CR_CHAN(insn->chanspec),
-                                                           (unsigned int)data[1]);
-
-                break;
-
-        default:
-                printk("Bits Config Parameter Wrong\n");
-                i_ReturnValue = -1;
-        }
-
-        if (i_ReturnValue >= 0)
-                i_ReturnValue = insn->n;
-        return i_ReturnValue;
-}
-
-/*
-+----------------------------------------------------------------------------+
 | Function Name     : _INT_     i_APCI1710_ReadTimerValue                    |
 |                                       (unsigned char_     b_BoardHandle,            |
 |                                        unsigned char_     b_ModulNbr,               |
@@ -759,11 +711,12 @@ int i_APCI1710_InsnBitsTimer(struct comedi_device *dev, struct comedi_subdevice
 |                        "i_APCI1710_InitTimer"                              |
 +----------------------------------------------------------------------------+
 */
-
-int i_APCI1710_ReadTimerValue(struct comedi_device *dev,
-                              unsigned char b_ModulNbr, unsigned char b_TimerNbr,
-                              unsigned int *pul_TimerValue)
+static int i_APCI1710_ReadTimerValue(struct comedi_device *dev,
+                                     unsigned char b_ModulNbr,
+                                     unsigned char b_TimerNbr,
+                                     unsigned int *pul_TimerValue)
 {
+        struct addi_private *devpriv = dev->private;
         int i_ReturnValue = 0;
 
         /* Test the module number */
@@ -847,11 +800,12 @@ int i_APCI1710_ReadTimerValue(struct comedi_device *dev,
            |                        "i_APCI1710_InitTimer"                              |
            +----------------------------------------------------------------------------+
          */
-
-int i_APCI1710_GetTimerOutputLevel(struct comedi_device *dev,
-                                   unsigned char b_ModulNbr, unsigned char b_TimerNbr,
-                                   unsigned char *pb_OutputLevel)
+static int i_APCI1710_GetTimerOutputLevel(struct comedi_device *dev,
+                                          unsigned char b_ModulNbr,
+                                          unsigned char b_TimerNbr,
+                                          unsigned char *pb_OutputLevel)
 {
+        struct addi_private *devpriv = dev->private;
         int i_ReturnValue = 0;
         unsigned int dw_TimerStatus;
 
@@ -926,11 +880,12 @@ int i_APCI1710_GetTimerOutputLevel(struct comedi_device *dev,
 |                        "i_APCI1710_InitTimer"                              |
 +----------------------------------------------------------------------------+
 */
-
-int i_APCI1710_GetTimerProgressStatus(struct comedi_device *dev,
-                                      unsigned char b_ModulNbr, unsigned char b_TimerNbr,
-                                      unsigned char *pb_TimerStatus)
+static int i_APCI1710_GetTimerProgressStatus(struct comedi_device *dev,
+                                             unsigned char b_ModulNbr,
+                                             unsigned char b_TimerNbr,
+                                             unsigned char *pb_TimerStatus)
 {
+        struct addi_private *devpriv = dev->private;
         int i_ReturnValue = 0;
         unsigned int dw_TimerStatus;
 
@@ -1005,11 +960,12 @@ int i_APCI1710_GetTimerProgressStatus(struct comedi_device *dev,
 |                        "i_APCI1710_InitTimer"                              |
 +----------------------------------------------------------------------------+
 */
-
-int i_APCI1710_WriteTimerValue(struct comedi_device *dev,
-                               unsigned char b_ModulNbr, unsigned char b_TimerNbr,
-                               unsigned int ul_WriteValue)
+static int i_APCI1710_WriteTimerValue(struct comedi_device *dev,
+                                      unsigned char b_ModulNbr,
+                                      unsigned char b_TimerNbr,
+                                      unsigned int ul_WriteValue)
 {
+        struct addi_private *devpriv = dev->private;
         int i_ReturnValue = 0;
 
         /* Test the module number */
@@ -1045,3 +1001,68 @@ int i_APCI1710_WriteTimerValue(struct comedi_device *dev,
 
         return i_ReturnValue;
 }
+
+/*
++----------------------------------------------------------------------------+
+| Function Name     :INT i_APCI1710_InsnBitsTimer(struct comedi_device *dev,
+struct comedi_subdevice *s,struct comedi_insn *insn,unsigned int *data)                   |
++----------------------------------------------------------------------------+
+| Task              : Read write functions for Timer                                          |
++----------------------------------------------------------------------------+
+| Input Parameters  :
++----------------------------------------------------------------------------+
+| Output Parameters : -                                                      |
++----------------------------------------------------------------------------+
+| Return Value      :
++----------------------------------------------------------------------------+
+*/
+static int i_APCI1710_InsnBitsTimer(struct comedi_device *dev,
+                                    struct comedi_subdevice *s,
+                                    struct comedi_insn *insn,
+                                    unsigned int *data)
+{
+        unsigned char b_BitsType;
+        int i_ReturnValue = 0;
+        b_BitsType = data[0];
+
+        printk("\n82X54");
+
+        switch (b_BitsType) {
+        case APCI1710_TIMER_READVALUE:
+                i_ReturnValue = i_APCI1710_ReadTimerValue(dev,
+                                                          (unsigned char)CR_AREF(insn->chanspec),
+                                                          (unsigned char)CR_CHAN(insn->chanspec),
+                                                          (unsigned int *) &data[0]);
+                break;
+
+        case APCI1710_TIMER_GETOUTPUTLEVEL:
+                i_ReturnValue = i_APCI1710_GetTimerOutputLevel(dev,
+                                                               (unsigned char)CR_AREF(insn->chanspec),
+                                                               (unsigned char)CR_CHAN(insn->chanspec),
+                                                               (unsigned char *) &data[0]);
+                break;
+
+        case APCI1710_TIMER_GETPROGRESSSTATUS:
+                i_ReturnValue = i_APCI1710_GetTimerProgressStatus(dev,
+                                                                  (unsigned char)CR_AREF(insn->chanspec),
+                                                                  (unsigned char)CR_CHAN(insn->chanspec),
+                                                                  (unsigned char *)&data[0]);
+                break;
+
+        case APCI1710_TIMER_WRITEVALUE:
+                i_ReturnValue = i_APCI1710_WriteTimerValue(dev,
+                                                           (unsigned char)CR_AREF(insn->chanspec),
+                                                           (unsigned char)CR_CHAN(insn->chanspec),
+                                                           (unsigned int)data[1]);
+
+                break;
+
+        default:
+                printk("Bits Config Parameter Wrong\n");
+                i_ReturnValue = -1;
+        }
+
+        if (i_ReturnValue >= 0)
+                i_ReturnValue = insn->n;
+        return i_ReturnValue;
+}
diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_82x54.h b/drivers/staging/comedi/drivers/addi-data/APCI1710_82x54.h
deleted file mode 100644
index 81346dbc35f2..000000000000
--- a/drivers/staging/comedi/drivers/addi-data/APCI1710_82x54.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (C) 2004,2005  ADDI-DATA GmbH for the source code of this module.
- *
- *      ADDI-DATA GmbH
- *      Dieselstrasse 3
- *      D-77833 Ottersweier
- *      Tel: +19(0)7223/9493-0
- *      Fax: +49(0)7223/9493-92
- *      http://www.addi-data.com
- *      info@addi-data.com
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- */
-
-#define APCI1710_PCI_BUS_CLOCK                  0
-#define APCI1710_FRONT_CONNECTOR_INPUT          1
-#define APCI1710_TIMER_READVALUE                0
-#define APCI1710_TIMER_GETOUTPUTLEVEL           1
-#define APCI1710_TIMER_GETPROGRESSSTATUS        2
-#define APCI1710_TIMER_WRITEVALUE               3
-
-#define APCI1710_TIMER_READINTERRUPT            1
-#define APCI1710_TIMER_READALLTIMER             2
-
-/* BEGIN JK 27.10.03 : Add the possibility to use a 40 Mhz quartz */
-#ifndef APCI1710_10MHZ
-#define APCI1710_10MHZ  10
-#endif
-/* END JK 27.10.03 : Add the possibility to use a 40 Mhz quartz */
-
-/*
- * 82X54 TIMER INISIALISATION FUNCTION
- */
-int i_APCI1710_InsnConfigInitTimer(struct comedi_device *dev, struct comedi_subdevice *s,
-                                   struct comedi_insn *insn, unsigned int *data);
-
-int i_APCI1710_InsnWriteEnableDisableTimer(struct comedi_device *dev,
-                                           struct comedi_subdevice *s,
-                                           struct comedi_insn *insn, unsigned int *data);
-
-/*
- * 82X54 READ FUNCTION
- */
-int i_APCI1710_InsnReadAllTimerValue(struct comedi_device *dev, struct comedi_subdevice *s,
-                                     struct comedi_insn *insn, unsigned int *data);
-
-int i_APCI1710_InsnBitsTimer(struct comedi_device *dev, struct comedi_subdevice *s,
-                             struct comedi_insn *insn, unsigned int *data);
-
-/*
- * 82X54 READ & WRITE FUNCTION
- */
-int i_APCI1710_ReadTimerValue(struct comedi_device *dev,
-                              unsigned char b_ModulNbr, unsigned char b_TimerNbr,
-                              unsigned int *pul_TimerValue);
-
-int i_APCI1710_GetTimerOutputLevel(struct comedi_device *dev,
-                                   unsigned char b_ModulNbr, unsigned char b_TimerNbr,
-                                   unsigned char *pb_OutputLevel);
-
-int i_APCI1710_GetTimerProgressStatus(struct comedi_device *dev,
-                                      unsigned char b_ModulNbr, unsigned char b_TimerNbr,
-                                      unsigned char *pb_TimerStatus);
-
-/*
- * 82X54 WRITE FUNCTION
- */
-int i_APCI1710_WriteTimerValue(struct comedi_device *dev,
-                               unsigned char b_ModulNbr, unsigned char b_TimerNbr,
-                               unsigned int ul_WriteValue);
diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_Chrono.c b/drivers/staging/comedi/drivers/addi-data/APCI1710_Chrono.c
index 482a412aa652..5bd7fe64637c 100644
--- a/drivers/staging/comedi/drivers/addi-data/APCI1710_Chrono.c
+++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_Chrono.c
@@ -52,12 +52,22 @@ You should also find the complete GPL in the COPYING file accompanying this sour
   +-----------------------------------------------------------------------+
 */
 
-/*
-+----------------------------------------------------------------------------+
-|                               Included files                               |
-+----------------------------------------------------------------------------+
-*/
-#include "APCI1710_Chrono.h"
+#define APCI1710_30MHZ                  30
+#define APCI1710_33MHZ                  33
+#define APCI1710_40MHZ                  40
+
+#define APCI1710_SINGLE                 0
+#define APCI1710_CONTINUOUS             1
+
+#define APCI1710_CHRONO_PROGRESS_STATUS 0
+#define APCI1710_CHRONO_READVALUE       1
+#define APCI1710_CHRONO_CONVERTVALUE    2
+#define APCI1710_CHRONO_READINTERRUPT   3
+
+#define APCI1710_CHRONO_SET_CHANNELON   0
+#define APCI1710_CHRONO_SET_CHANNELOFF  1
+#define APCI1710_CHRONO_READ_CHANNEL    2
+#define APCI1710_CHRONO_READ_PORT       3
 
 /*
 +----------------------------------------------------------------------------+
@@ -130,10 +140,12 @@ You should also find the complete GPL in the COPYING file accompanying this sour
 |                         this CHRONOS version                               |
 +----------------------------------------------------------------------------+
 */
-
-int i_APCI1710_InsnConfigInitChrono(struct comedi_device *dev, struct comedi_subdevice *s,
-        struct comedi_insn *insn, unsigned int *data)
+static int i_APCI1710_InsnConfigInitChrono(struct comedi_device *dev,
+                                           struct comedi_subdevice *s,
+                                           struct comedi_insn *insn,
+                                           unsigned int *data)
 {
+        struct addi_private *devpriv = dev->private;
         int i_ReturnValue = 0;
         unsigned int ul_TimerValue = 0;
         unsigned int ul_TimingInterval = 0;
@@ -839,10 +851,12 @@ struct comedi_subdevice *s,struct comedi_insn *insn,unsigned int *data)						 |
                       -8: data[0] wrong input    |
 +----------------------------------------------------------------------------+
 */
-
-int i_APCI1710_InsnWriteEnableDisableChrono(struct comedi_device *dev,
-        struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data)
+static int i_APCI1710_InsnWriteEnableDisableChrono(struct comedi_device *dev,
+                                                   struct comedi_subdevice *s,
+                                                   struct comedi_insn *insn,
+                                                   unsigned int *data)
 {
+        struct addi_private *devpriv = dev->private;
         int i_ReturnValue = 0;
         unsigned char b_ModulNbr, b_CycleMode, b_InterruptEnable, b_Action;
         b_ModulNbr = CR_AREF(insn->chanspec);
@@ -1077,87 +1091,6 @@ int i_APCI1710_InsnWriteEnableDisableChrono(struct comedi_device *dev,
 
 /*
 +----------------------------------------------------------------------------+
-| Function Name     :INT        i_APCI1710_InsnReadChrono(struct comedi_device *dev,struct comedi_subdevice *s,
-struct comedi_insn *insn,unsigned int *data)                   |
-+----------------------------------------------------------------------------+
-| Task              : Read  functions for Timer                                     |
-+----------------------------------------------------------------------------+
-| Input Parameters  :
-+----------------------------------------------------------------------------+
-| Output Parameters : -                                                      |
-+----------------------------------------------------------------------------+
-| Return Value      :
-+----------------------------------------------------------------------------+
-*/
-
-int i_APCI1710_InsnReadChrono(struct comedi_device *dev, struct comedi_subdevice *s,
-        struct comedi_insn *insn, unsigned int *data)
-{
-        unsigned char b_ReadType;
-        int i_ReturnValue = insn->n;
-
-        b_ReadType = CR_CHAN(insn->chanspec);
-
-        switch (b_ReadType) {
-        case APCI1710_CHRONO_PROGRESS_STATUS:
-                i_ReturnValue = i_APCI1710_GetChronoProgressStatus(dev,
-                        (unsigned char) CR_AREF(insn->chanspec), (unsigned char *) &data[0]);
-                break;
-
-        case APCI1710_CHRONO_READVALUE:
-                i_ReturnValue = i_APCI1710_ReadChronoValue(dev,
-                        (unsigned char) CR_AREF(insn->chanspec),
-                        (unsigned int) insn->unused[0],
-                        (unsigned char *) &data[0], (unsigned int *) &data[1]);
-                break;
-
-        case APCI1710_CHRONO_CONVERTVALUE:
-                i_ReturnValue = i_APCI1710_ConvertChronoValue(dev,
-                        (unsigned char) CR_AREF(insn->chanspec),
-                        (unsigned int) insn->unused[0],
-                        (unsigned int *) &data[0],
-                        (unsigned char *) &data[1],
-                        (unsigned char *) &data[2],
-                        (unsigned int *) &data[3],
-                        (unsigned int *) &data[4], (unsigned int *) &data[5]);
-                break;
-
-        case APCI1710_CHRONO_READINTERRUPT:
-                printk("In Chrono Read Interrupt\n");
-
-                data[0] = devpriv->s_InterruptParameters.
-                        s_FIFOInterruptParameters[devpriv->
-                        s_InterruptParameters.ui_Read].b_OldModuleMask;
-                data[1] = devpriv->s_InterruptParameters.
-                        s_FIFOInterruptParameters[devpriv->
-                        s_InterruptParameters.ui_Read].ul_OldInterruptMask;
-                data[2] = devpriv->s_InterruptParameters.
-                        s_FIFOInterruptParameters[devpriv->
-                        s_InterruptParameters.ui_Read].ul_OldCounterLatchValue;
-
-                             /**************************/
-                /* Increment the read FIFO */
-                             /***************************/
-
-                devpriv->
-                        s_InterruptParameters.
-                        ui_Read = (devpriv->
-                        s_InterruptParameters.
-                        ui_Read + 1) % APCI1710_SAVE_INTERRUPT;
-                break;
-
-        default:
-                printk("ReadType Parameter wrong\n");
-        }
-
-        if (i_ReturnValue >= 0)
-                i_ReturnValue = insn->n;
-        return i_ReturnValue;
-
-}
-
-/*
-+----------------------------------------------------------------------------+
 | Function Name     : _INT_ i_APCI1710_GetChronoProgressStatus               |
 |                               (unsigned char_    b_BoardHandle,                     |
 |                                unsigned char_    b_ModulNbr,                        |
@@ -1193,10 +1126,11 @@ int i_APCI1710_InsnReadChrono(struct comedi_device *dev, struct comedi_subdevice
 |                         "i_APCI1710_InitChrono"                            |
 +----------------------------------------------------------------------------+
 */
-
-int i_APCI1710_GetChronoProgressStatus(struct comedi_device *dev,
-        unsigned char b_ModulNbr, unsigned char *pb_ChronoStatus)
+static int i_APCI1710_GetChronoProgressStatus(struct comedi_device *dev,
+                                              unsigned char b_ModulNbr,
+                                              unsigned char *pb_ChronoStatus)
 {
+        struct addi_private *devpriv = dev->private;
         int i_ReturnValue = 0;
         unsigned int dw_Status;
 
@@ -1354,11 +1288,13 @@ int i_APCI1710_GetChronoProgressStatus(struct comedi_device *dev,
 |                         directly the chronometer measured timing.          |
 +----------------------------------------------------------------------------+
 */
-
-int i_APCI1710_ReadChronoValue(struct comedi_device *dev,
-        unsigned char b_ModulNbr,
-        unsigned int ui_TimeOut, unsigned char *pb_ChronoStatus, unsigned int *pul_ChronoValue)
+static int i_APCI1710_ReadChronoValue(struct comedi_device *dev,
+                                      unsigned char b_ModulNbr,
+                                      unsigned int ui_TimeOut,
+                                      unsigned char *pb_ChronoStatus,
+                                      unsigned int *pul_ChronoValue)
 {
+        struct addi_private *devpriv = dev->private;
         int i_ReturnValue = 0;
         unsigned int dw_Status;
         unsigned int dw_TimeOut = 0;
@@ -1617,15 +1553,17 @@ int i_APCI1710_ReadChronoValue(struct comedi_device *dev,
 |                         "i_APCI1710_InitChrono"                            |
 +----------------------------------------------------------------------------+
 */
-
-int i_APCI1710_ConvertChronoValue(struct comedi_device *dev,
-        unsigned char b_ModulNbr,
-        unsigned int ul_ChronoValue,
-        unsigned int *pul_Hour,
-        unsigned char *pb_Minute,
-        unsigned char *pb_Second,
-        unsigned int *pui_MilliSecond, unsigned int *pui_MicroSecond, unsigned int *pui_NanoSecond)
+static int i_APCI1710_ConvertChronoValue(struct comedi_device *dev,
+                                         unsigned char b_ModulNbr,
+                                         unsigned int ul_ChronoValue,
+                                         unsigned int *pul_Hour,
+                                         unsigned char *pb_Minute,
+                                         unsigned char *pb_Second,
+                                         unsigned int *pui_MilliSecond,
+                                         unsigned int *pui_MicroSecond,
+                                         unsigned int *pui_NanoSecond)
 {
+        struct addi_private *devpriv = dev->private;
         int i_ReturnValue = 0;
         double d_Hour;
         double d_Minute;
@@ -1756,6 +1694,89 @@ int i_APCI1710_ConvertChronoValue(struct comedi_device *dev,
 
 /*
 +----------------------------------------------------------------------------+
+| Function Name     :INT        i_APCI1710_InsnReadChrono(struct comedi_device *dev,struct comedi_subdevice *s,
+struct comedi_insn *insn,unsigned int *data)                   |
++----------------------------------------------------------------------------+
+| Task              : Read  functions for Timer                                     |
++----------------------------------------------------------------------------+
+| Input Parameters  :
++----------------------------------------------------------------------------+
+| Output Parameters : -                                                      |
++----------------------------------------------------------------------------+
+| Return Value      :
++----------------------------------------------------------------------------+
+*/
+static int i_APCI1710_InsnReadChrono(struct comedi_device *dev,
+                                     struct comedi_subdevice *s,
+                                     struct comedi_insn *insn,
+                                     unsigned int *data)
+{
+        struct addi_private *devpriv = dev->private;
+        unsigned char b_ReadType;
+        int i_ReturnValue = insn->n;
+
+        b_ReadType = CR_CHAN(insn->chanspec);
+
+        switch (b_ReadType) {
+        case APCI1710_CHRONO_PROGRESS_STATUS:
+                i_ReturnValue = i_APCI1710_GetChronoProgressStatus(dev,
+                        (unsigned char) CR_AREF(insn->chanspec), (unsigned char *) &data[0]);
+                break;
+
+        case APCI1710_CHRONO_READVALUE:
+                i_ReturnValue = i_APCI1710_ReadChronoValue(dev,
+                        (unsigned char) CR_AREF(insn->chanspec),
+                        (unsigned int) insn->unused[0],
+                        (unsigned char *) &data[0], (unsigned int *) &data[1]);
+                break;
+
+        case APCI1710_CHRONO_CONVERTVALUE:
+                i_ReturnValue = i_APCI1710_ConvertChronoValue(dev,
+                        (unsigned char) CR_AREF(insn->chanspec),
+                        (unsigned int) insn->unused[0],
+                        (unsigned int *) &data[0],
+                        (unsigned char *) &data[1],
+                        (unsigned char *) &data[2],
+                        (unsigned int *) &data[3],
+                        (unsigned int *) &data[4], (unsigned int *) &data[5]);
+                break;
+
+        case APCI1710_CHRONO_READINTERRUPT:
+                printk("In Chrono Read Interrupt\n");
+
+                data[0] = devpriv->s_InterruptParameters.
+                        s_FIFOInterruptParameters[devpriv->
+                        s_InterruptParameters.ui_Read].b_OldModuleMask;
+                data[1] = devpriv->s_InterruptParameters.
+                        s_FIFOInterruptParameters[devpriv->
+                        s_InterruptParameters.ui_Read].ul_OldInterruptMask;
+                data[2] = devpriv->s_InterruptParameters.
+                        s_FIFOInterruptParameters[devpriv->
+                        s_InterruptParameters.ui_Read].ul_OldCounterLatchValue;
+
+                             /**************************/
+                /* Increment the read FIFO */
+                             /***************************/
+
+                devpriv->
+                        s_InterruptParameters.
+                        ui_Read = (devpriv->
+                        s_InterruptParameters.
+                        ui_Read + 1) % APCI1710_SAVE_INTERRUPT;
+                break;
+
+        default:
+                printk("ReadType Parameter wrong\n");
+        }
+
+        if (i_ReturnValue >= 0)
+                i_ReturnValue = insn->n;
+        return i_ReturnValue;
+
+}
+
+/*
++----------------------------------------------------------------------------+
 | Function Name     : int i_APCI1710_InsnBitsChronoDigitalIO(struct comedi_device *dev,struct comedi_subdevice *s,
         struct comedi_insn *insn,unsigned int *data)                    |
 +----------------------------------------------------------------------------+
@@ -1874,10 +1895,12 @@ int i_APCI1710_ConvertChronoValue(struct comedi_device *dev,
 |                         "i_APCI1710_InitChrono"                            |
 +----------------------------------------------------------------------------+
 */
-
-int i_APCI1710_InsnBitsChronoDigitalIO(struct comedi_device *dev,
-        struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data)
+static int i_APCI1710_InsnBitsChronoDigitalIO(struct comedi_device *dev,
+                                              struct comedi_subdevice *s,
+                                              struct comedi_insn *insn,
+                                              unsigned int *data)
 {
+        struct addi_private *devpriv = dev->private;
         int i_ReturnValue = 0;
         unsigned char b_ModulNbr, b_OutputChannel, b_InputChannel, b_IOType;
         unsigned int dw_Status;
diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_Chrono.h b/drivers/staging/comedi/drivers/addi-data/APCI1710_Chrono.h
deleted file mode 100644
index 29bad1d144a1..000000000000
--- a/drivers/staging/comedi/drivers/addi-data/APCI1710_Chrono.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (C) 2004,2005  ADDI-DATA GmbH for the source code of this module.
- *
- *      ADDI-DATA GmbH
- *      Dieselstrasse 3
- *      D-77833 Ottersweier
- *      Tel: +19(0)7223/9493-0
- *      Fax: +49(0)7223/9493-92
- *      http://www.addi-data-com
- *      info@addi-data.com
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- */
-
-#define APCI1710_30MHZ                  30
-#define APCI1710_33MHZ                  33
-#define APCI1710_40MHZ                  40
-
-#define APCI1710_SINGLE                 0
-#define APCI1710_CONTINUOUS             1
-
-#define APCI1710_CHRONO_PROGRESS_STATUS 0
-#define APCI1710_CHRONO_READVALUE       1
-#define APCI1710_CHRONO_CONVERTVALUE    2
-#define APCI1710_CHRONO_READINTERRUPT   3
-
-#define APCI1710_CHRONO_SET_CHANNELON   0
-#define APCI1710_CHRONO_SET_CHANNELOFF  1
-#define APCI1710_CHRONO_READ_CHANNEL    2
-#define APCI1710_CHRONO_READ_PORT       3
-
-/*
- * CHRONOMETER INISIALISATION FUNCTION
- */
-int i_APCI1710_InsnConfigInitChrono(struct comedi_device *dev, struct comedi_subdevice *s,
-                                    struct comedi_insn *insn, unsigned int *data);
-
-int i_APCI1710_InsnWriteEnableDisableChrono(struct comedi_device *dev,
-                                            struct comedi_subdevice *s,
-                                            struct comedi_insn *insn,
-                                            unsigned int *data);
-
-/*
- * CHRONOMETER READ FUNCTION
- */
-int i_APCI1710_InsnReadChrono(struct comedi_device *dev, struct comedi_subdevice *s,
-                              struct comedi_insn *insn, unsigned int *data);
-
-int i_APCI1710_GetChronoProgressStatus(struct comedi_device *dev,
-                                       unsigned char b_ModulNbr, unsigned char *pb_ChronoStatus);
-
-int i_APCI1710_ReadChronoValue(struct comedi_device *dev,
-                               unsigned char b_ModulNbr,
-                               unsigned int ui_TimeOut, unsigned char *pb_ChronoStatus,
-                               unsigned int *pul_ChronoValue);
-
-int i_APCI1710_ConvertChronoValue(struct comedi_device *dev,
-                                  unsigned char b_ModulNbr,
-                                  unsigned int ul_ChronoValue,
-                                  unsigned int *pul_Hour,
-                                  unsigned char *pb_Minute,
-                                  unsigned char *pb_Second,
-                                  unsigned int *pui_MilliSecond, unsigned int *pui_MicroSecond,
-                                  unsigned int *pui_NanoSecond);
-
-/*
- * CHRONOMETER DIGITAL INPUT OUTPUT FUNCTION
- */
-int i_APCI1710_InsnBitsChronoDigitalIO(struct comedi_device *dev,
-                                       struct comedi_subdevice *s, struct comedi_insn *insn,
-                                       unsigned int *data);
diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_Dig_io.c b/drivers/staging/comedi/drivers/addi-data/APCI1710_Dig_io.c
index 07108f9f4a41..6b38ce7a275b 100644
--- a/drivers/staging/comedi/drivers/addi-data/APCI1710_Dig_io.c
+++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_Dig_io.c
@@ -52,12 +52,16 @@ You should also find the complete GPL in the COPYING file accompanying this sour
   +-----------------------------------------------------------------------+
 */
 
-/*
-+----------------------------------------------------------------------------+
-|                               Included files                               |
-+----------------------------------------------------------------------------+
-*/
-#include "APCI1710_Dig_io.h"
+/* Digital Output ON or OFF */
+#define APCI1710_ON                     1
+#define APCI1710_OFF                    0
+
+/* Digital I/O */
+#define APCI1710_INPUT                  0
+#define APCI1710_OUTPUT                 1
+
+#define APCI1710_DIGIO_MEMORYONOFF      0x10
+#define APCI1710_DIGIO_INIT             0x11
 
 /*
 +----------------------------------------------------------------------------+
@@ -99,9 +103,12 @@ Activates and deactivates the digital output memory.
 +----------------------------------------------------------------------------+
 */
 
-int i_APCI1710_InsnConfigDigitalIO(struct comedi_device *dev, struct comedi_subdevice *s,
-        struct comedi_insn *insn, unsigned int *data)
+static int i_APCI1710_InsnConfigDigitalIO(struct comedi_device *dev,
+                                          struct comedi_subdevice *s,
+                                          struct comedi_insn *insn,
+                                          unsigned int *data)
 {
+        struct addi_private *devpriv = dev->private;
         unsigned char b_ModulNbr, b_ChannelAMode, b_ChannelBMode;
         unsigned char b_MemoryOnOff, b_ConfigType;
         int i_ReturnValue = 0;
@@ -293,9 +300,12 @@ int i_APCI1710_InsnConfigDigitalIO(struct comedi_device *dev, struct comedi_subd
 * unsigned char_ b_ModulNbr, unsigned char_ b_InputChannel,
 * unsigned char *_ pb_ChannelStatus)
 */
-int i_APCI1710_InsnReadDigitalIOChlValue(struct comedi_device *dev,
-        struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data)
+static int i_APCI1710_InsnReadDigitalIOChlValue(struct comedi_device *dev,
+                                                struct comedi_subdevice *s,
+                                                struct comedi_insn *insn,
+                                                unsigned int *data)
 {
+        struct addi_private *devpriv = dev->private;
         int i_ReturnValue = 0;
         unsigned int dw_StatusReg;
         unsigned char b_ModulNbr, b_InputChannel;
@@ -481,9 +491,12 @@ int i_APCI1710_InsnReadDigitalIOChlValue(struct comedi_device *dev,
 * _INT_ i_APCI1710_SetDigitalIOChlOn (unsigned char_ b_BoardHandle,
 * unsigned char_ b_ModulNbr, unsigned char_ b_OutputChannel)
 */
-int i_APCI1710_InsnWriteDigitalIOChlOnOff(struct comedi_device *dev,
-        struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data)
+static int i_APCI1710_InsnWriteDigitalIOChlOnOff(struct comedi_device *dev,
+                                                 struct comedi_subdevice *s,
+                                                 struct comedi_insn *insn,
+                                                 unsigned int *data)
 {
+        struct addi_private *devpriv = dev->private;
         int i_ReturnValue = 0;
         unsigned int dw_WriteValue = 0;
         unsigned char b_ModulNbr, b_OutputChannel;
@@ -731,9 +744,12 @@ int i_APCI1710_InsnWriteDigitalIOChlOnOff(struct comedi_device *dev,
  * b_BoardHandle, unsigned char_ b_ModulNbr, unsigned char_
  * b_PortValue)
 */
-int i_APCI1710_InsnBitsDigitalIOPortOnOff(struct comedi_device *dev,
-        struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data)
+static int i_APCI1710_InsnBitsDigitalIOPortOnOff(struct comedi_device *dev,
+                                                 struct comedi_subdevice *s,
+                                                 struct comedi_insn *insn,
+                                                 unsigned int *data)
 {
+        struct addi_private *devpriv = dev->private;
         int i_ReturnValue = 0;
         unsigned int dw_WriteValue = 0;
         unsigned int dw_StatusReg;
diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_Dig_io.h b/drivers/staging/comedi/drivers/addi-data/APCI1710_Dig_io.h
deleted file mode 100644
index cc3973d7c2a4..000000000000
--- a/drivers/staging/comedi/drivers/addi-data/APCI1710_Dig_io.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2004,2005  ADDI-DATA GmbH for the source code of this module.
- *
- *      ADDI-DATA GmbH
- *      Dieselstrasse 3
- *      D-77833 Ottersweier
- *      Tel: +19(0)7223/9493-0
- *      Fax: +49(0)7223/9493-92
- *      http://www.addi-data.com
- *      info@addi-data.com
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- */
-
-#define APCI1710_ON                     1       /* Digital  Output ON or OFF */
-#define APCI1710_OFF                    0
-
-#define APCI1710_INPUT                  0       /* Digital I/O */
-#define APCI1710_OUTPUT                 1
-
-#define APCI1710_DIGIO_MEMORYONOFF      0x10
-#define APCI1710_DIGIO_INIT             0x11
-
-/*
- * DIGITAL I/O INISIALISATION FUNCTION
- */
-int i_APCI1710_InsnConfigDigitalIO(struct comedi_device *dev, struct comedi_subdevice *s,
-                                   struct comedi_insn *insn, unsigned int *data);
-
-/*
- * INPUT OUTPUT  FUNCTIONS
- */
-int i_APCI1710_InsnReadDigitalIOChlValue(struct comedi_device *dev,
-                                         struct comedi_subdevice *s,
-                                         struct comedi_insn *insn, unsigned int *data);
-
-int i_APCI1710_InsnWriteDigitalIOChlOnOff(struct comedi_device *dev,
-                                          struct comedi_subdevice *s,
-                                          struct comedi_insn *insn, unsigned int *data);
-
-int i_APCI1710_InsnBitsDigitalIOPortOnOff(struct comedi_device *dev,
-                                          struct comedi_subdevice *s,
-                                          struct comedi_insn *insn, unsigned int *data);
diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_INCCPT.c b/drivers/staging/comedi/drivers/addi-data/APCI1710_INCCPT.c
index 14b13eae4c50..70a7f953fa2f 100644
--- a/drivers/staging/comedi/drivers/addi-data/APCI1710_INCCPT.c
+++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_INCCPT.c
@@ -51,93 +51,121 @@ You should also find the complete GPL in the COPYING file accompanying this sour
   +-----------------------------------------------------------------------+
 */
 
-/*
-+----------------------------------------------------------------------------+
-|                               Included files                               |
-+----------------------------------------------------------------------------+
-*/
-
-#include "APCI1710_INCCPT.h"
-
-/*
-+----------------------------------------------------------------------------+
-| int   i_APCI1710_InsnConfigINCCPT(struct comedi_device *dev,struct comedi_subdevice *s,
-struct comedi_insn *insn,unsigned int *data)
-
-+----------------------------------------------------------------------------+
-| Task              : Configuration function for INC_CPT                             |
-+----------------------------------------------------------------------------+
-| Input Parameters  :                                                                                                            |
-+----------------------------------------------------------------------------+
-| Output Parameters : *data
-+----------------------------------------------------------------------------+
-| Return Value      :                 |
-+----------------------------------------------------------------------------+
-*/
-
-int i_APCI1710_InsnConfigINCCPT(struct comedi_device *dev, struct comedi_subdevice *s,
-        struct comedi_insn *insn, unsigned int *data)
-{
-        unsigned int ui_ConfigType;
-        int i_ReturnValue = 0;
-        ui_ConfigType = CR_CHAN(insn->chanspec);
-
-        printk("\nINC_CPT");
-
-        devpriv->tsk_Current = current; /*  Save the current process task structure */
-        switch (ui_ConfigType) {
-        case APCI1710_INCCPT_INITCOUNTER:
-                i_ReturnValue = i_APCI1710_InitCounter(dev,
-                        CR_AREF(insn->chanspec),
-                        (unsigned char) data[0],
-                        (unsigned char) data[1],
-                        (unsigned char) data[2], (unsigned char) data[3], (unsigned char) data[4]);
-                break;
-
-        case APCI1710_INCCPT_COUNTERAUTOTEST:
-                i_ReturnValue = i_APCI1710_CounterAutoTest(dev,
-                        (unsigned char *) &data[0]);
-                break;
-
-        case APCI1710_INCCPT_INITINDEX:
-                i_ReturnValue = i_APCI1710_InitIndex(dev,
-                        CR_AREF(insn->chanspec),
-                        (unsigned char) data[0],
-                        (unsigned char) data[1], (unsigned char) data[2], (unsigned char) data[3]);
-                break;
-
-        case APCI1710_INCCPT_INITREFERENCE:
-                i_ReturnValue = i_APCI1710_InitReference(dev,
-                        CR_AREF(insn->chanspec), (unsigned char) data[0]);
-                break;
-
-        case APCI1710_INCCPT_INITEXTERNALSTROBE:
-                i_ReturnValue = i_APCI1710_InitExternalStrobe(dev,
-                        CR_AREF(insn->chanspec),
-                        (unsigned char) data[0], (unsigned char) data[1]);
-                break;
-
-        case APCI1710_INCCPT_INITCOMPARELOGIC:
-                i_ReturnValue = i_APCI1710_InitCompareLogic(dev,
-                        CR_AREF(insn->chanspec), (unsigned int) data[0]);
-                break;
-
-        case APCI1710_INCCPT_INITFREQUENCYMEASUREMENT:
-                i_ReturnValue = i_APCI1710_InitFrequencyMeasurement(dev,
-                        CR_AREF(insn->chanspec),
-                        (unsigned char) data[0],
-                        (unsigned char) data[1], (unsigned int) data[2], (unsigned int *) &data[0]);
-                break;
-
-        default:
-                printk("Insn Config : Config Parameter Wrong\n");
-
-        }
-
-        if (i_ReturnValue >= 0)
-                i_ReturnValue = insn->n;
-        return i_ReturnValue;
-}
+#define APCI1710_16BIT_COUNTER                  0x10
+#define APCI1710_32BIT_COUNTER                  0x0
+#define APCI1710_QUADRUPLE_MODE                 0x0
+#define APCI1710_DOUBLE_MODE                    0x3
+#define APCI1710_SIMPLE_MODE                    0xF
+#define APCI1710_DIRECT_MODE                    0x80
+#define APCI1710_HYSTERESIS_ON                  0x60
+#define APCI1710_HYSTERESIS_OFF                 0x0
+#define APCI1710_INCREMENT                      0x60
+#define APCI1710_DECREMENT                      0x0
+#define APCI1710_LATCH_COUNTER                  0x1
+#define APCI1710_CLEAR_COUNTER                  0x0
+#define APCI1710_LOW                            0x0
+#define APCI1710_HIGH                           0x1
+
+/*********************/
+/* Version 0600-0229 */
+/*********************/
+#define APCI1710_HIGH_EDGE_CLEAR_COUNTER                0x0
+#define APCI1710_HIGH_EDGE_LATCH_COUNTER                0x1
+#define APCI1710_LOW_EDGE_CLEAR_COUNTER                 0x2
+#define APCI1710_LOW_EDGE_LATCH_COUNTER                 0x3
+#define APCI1710_HIGH_EDGE_LATCH_AND_CLEAR_COUNTER      0x4
+#define APCI1710_LOW_EDGE_LATCH_AND_CLEAR_COUNTER       0x5
+#define APCI1710_SOURCE_0                               0x0
+#define APCI1710_SOURCE_1                               0x1
+
+#define APCI1710_30MHZ                          30
+#define APCI1710_33MHZ                          33
+#define APCI1710_40MHZ                          40
+
+#define APCI1710_ENABLE_LATCH_INT               0x80
+#define APCI1710_DISABLE_LATCH_INT              (~APCI1710_ENABLE_LATCH_INT)
+
+#define APCI1710_INDEX_LATCH_COUNTER            0x10
+#define APCI1710_INDEX_AUTO_MODE                0x8
+#define APCI1710_ENABLE_INDEX                   0x4
+#define APCI1710_DISABLE_INDEX                  (~APCI1710_ENABLE_INDEX)
+#define APCI1710_ENABLE_LATCH_AND_CLEAR         0x8
+#define APCI1710_DISABLE_LATCH_AND_CLEAR        (~APCI1710_ENABLE_LATCH_AND_CLEAR)
+#define APCI1710_SET_LOW_INDEX_LEVEL            0x4
+#define APCI1710_SET_HIGH_INDEX_LEVEL           (~APCI1710_SET_LOW_INDEX_LEVEL)
+#define APCI1710_INVERT_INDEX_RFERENCE          0x2
+#define APCI1710_DEFAULT_INDEX_RFERENCE         (~APCI1710_INVERT_INDEX_RFERENCE)
+
+#define APCI1710_ENABLE_INDEX_INT               0x1
+#define APCI1710_DISABLE_INDEX_INT              (~APCI1710_ENABLE_INDEX_INT)
+
+#define APCI1710_ENABLE_FREQUENCY               0x4
+#define APCI1710_DISABLE_FREQUENCY              (~APCI1710_ENABLE_FREQUENCY)
+
+#define APCI1710_ENABLE_FREQUENCY_INT           0x8
+#define APCI1710_DISABLE_FREQUENCY_INT          (~APCI1710_ENABLE_FREQUENCY_INT)
+
+#define APCI1710_ENABLE_40MHZ_FREQUENCY         0x40
+#define APCI1710_DISABLE_40MHZ_FREQUENCY        (~APCI1710_ENABLE_40MHZ_FREQUENCY)
+
+#define APCI1710_ENABLE_40MHZ_FILTER            0x80
+#define APCI1710_DISABLE_40MHZ_FILTER           (~APCI1710_ENABLE_40MHZ_FILTER)
+
+#define APCI1710_ENABLE_COMPARE_INT             0x2
+#define APCI1710_DISABLE_COMPARE_INT            (~APCI1710_ENABLE_COMPARE_INT)
+
+#define APCI1710_ENABLE_INDEX_ACTION            0x20
+#define APCI1710_DISABLE_INDEX_ACTION           (~APCI1710_ENABLE_INDEX_ACTION)
+#define APCI1710_REFERENCE_HIGH                 0x40
+#define APCI1710_REFERENCE_LOW                  (~APCI1710_REFERENCE_HIGH)
+
+#define APCI1710_TOR_GATE_LOW                   0x40
+#define APCI1710_TOR_GATE_HIGH                  (~APCI1710_TOR_GATE_LOW)
+
+/* INSN CONFIG */
+#define APCI1710_INCCPT_INITCOUNTER                     100
+#define APCI1710_INCCPT_COUNTERAUTOTEST                 101
+#define APCI1710_INCCPT_INITINDEX                       102
+#define APCI1710_INCCPT_INITREFERENCE                   103
+#define APCI1710_INCCPT_INITEXTERNALSTROBE              104
+#define APCI1710_INCCPT_INITCOMPARELOGIC                105
+#define APCI1710_INCCPT_INITFREQUENCYMEASUREMENT        106
+
+/* INSN READ */
+#define APCI1710_INCCPT_READLATCHREGISTERSTATUS         200
+#define APCI1710_INCCPT_READLATCHREGISTERVALUE          201
+#define APCI1710_INCCPT_READ16BITCOUNTERVALUE           202
+#define APCI1710_INCCPT_READ32BITCOUNTERVALUE           203
+#define APCI1710_INCCPT_GETINDEXSTATUS                  204
+#define APCI1710_INCCPT_GETREFERENCESTATUS              205
+#define APCI1710_INCCPT_GETUASSTATUS                    206
+#define APCI1710_INCCPT_GETCBSTATUS                     207
+#define APCI1710_INCCPT_GET16BITCBSTATUS                208
+#define APCI1710_INCCPT_GETUDSTATUS                     209
+#define APCI1710_INCCPT_GETINTERRUPTUDLATCHEDSTATUS     210
+#define APCI1710_INCCPT_READFREQUENCYMEASUREMENT        211
+#define APCI1710_INCCPT_READINTERRUPT                   212
+
+/* INSN BITS */
+#define APCI1710_INCCPT_CLEARCOUNTERVALUE               300
+#define APCI1710_INCCPT_CLEARALLCOUNTERVALUE            301
+#define APCI1710_INCCPT_SETINPUTFILTER                  302
+#define APCI1710_INCCPT_LATCHCOUNTER                    303
+#define APCI1710_INCCPT_SETINDEXANDREFERENCESOURCE      304
+#define APCI1710_INCCPT_SETDIGITALCHLON                 305
+#define APCI1710_INCCPT_SETDIGITALCHLOFF                306
+
+/* INSN WRITE */
+#define APCI1710_INCCPT_ENABLELATCHINTERRUPT            400
+#define APCI1710_INCCPT_DISABLELATCHINTERRUPT           401
+#define APCI1710_INCCPT_WRITE16BITCOUNTERVALUE          402
+#define APCI1710_INCCPT_WRITE32BITCOUNTERVALUE          403
+#define APCI1710_INCCPT_ENABLEINDEX                     404
+#define APCI1710_INCCPT_DISABLEINDEX                    405
+#define APCI1710_INCCPT_ENABLECOMPARELOGIC              406
+#define APCI1710_INCCPT_DISABLECOMPARELOGIC             407
+#define APCI1710_INCCPT_ENABLEFREQUENCYMEASUREMENT      408
+#define APCI1710_INCCPT_DISABLEFREQUENCYMEASUREMENT     409
 
 /*
 +----------------------------------------------------------------------------+
@@ -298,14 +326,15 @@ int i_APCI1710_InsnConfigINCCPT(struct comedi_device *dev, struct comedi_subdevi
 |                        wrong.                                              |
 +----------------------------------------------------------------------------+
 */
-
-int i_APCI1710_InitCounter(struct comedi_device *dev,
-        unsigned char b_ModulNbr,
-        unsigned char b_CounterRange,
-        unsigned char b_FirstCounterModus,
-        unsigned char b_FirstCounterOption,
-        unsigned char b_SecondCounterModus, unsigned char b_SecondCounterOption)
+static int i_APCI1710_InitCounter(struct comedi_device *dev,
+                                  unsigned char b_ModulNbr,
+                                  unsigned char b_CounterRange,
+                                  unsigned char b_FirstCounterModus,
+                                  unsigned char b_FirstCounterOption,
+                                  unsigned char b_SecondCounterModus,
+                                  unsigned char b_SecondCounterOption)
 {
+        struct addi_private *devpriv = dev->private;
         int i_ReturnValue = 0;
 
         /*******************************/
@@ -544,9 +573,10 @@ int i_APCI1710_InitCounter(struct comedi_device *dev,
 |                     -2: No counter module found                            |
 +----------------------------------------------------------------------------+
 */
-
-int i_APCI1710_CounterAutoTest(struct comedi_device *dev, unsigned char *pb_TestStatus)
+static int i_APCI1710_CounterAutoTest(struct comedi_device *dev,
+                                      unsigned char *pb_TestStatus)
 {
+        struct addi_private *devpriv = dev->private;
         unsigned char b_ModulCpt = 0;
         int i_ReturnValue = 0;
         unsigned int dw_LathchValue;
@@ -707,12 +737,14 @@ int i_APCI1710_CounterAutoTest(struct comedi_device *dev, unsigned char *pb_Test
 |                         See function "i_APCI1710_SetBoardIntRoutineX"      |
 +----------------------------------------------------------------------------+
 */
-
-int i_APCI1710_InitIndex(struct comedi_device *dev,
-        unsigned char b_ModulNbr,
-        unsigned char b_ReferenceAction,
-        unsigned char b_IndexOperation, unsigned char b_AutoMode, unsigned char b_InterruptEnable)
+static int i_APCI1710_InitIndex(struct comedi_device *dev,
+                                unsigned char b_ModulNbr,
+                                unsigned char b_ReferenceAction,
+                                unsigned char b_IndexOperation,
+                                unsigned char b_AutoMode,
+                                unsigned char b_InterruptEnable)
 {
+        struct addi_private *devpriv = dev->private;
         int i_ReturnValue = 0;
 
         /**************************/
@@ -1151,10 +1183,11 @@ int i_APCI1710_InitIndex(struct comedi_device *dev,
 |                     -4: Reference level parameter is wrong                 |
 +----------------------------------------------------------------------------+
 */
-
-int i_APCI1710_InitReference(struct comedi_device *dev,
-        unsigned char b_ModulNbr, unsigned char b_ReferenceLevel)
+static int i_APCI1710_InitReference(struct comedi_device *dev,
+                                    unsigned char b_ModulNbr,
+                                    unsigned char b_ReferenceLevel)
 {
+        struct addi_private *devpriv = dev->private;
         int i_ReturnValue = 0;
 
         /**************************/
@@ -1276,10 +1309,12 @@ int i_APCI1710_InitReference(struct comedi_device *dev,
 |                     -5: External strobe level parameter is wrong           |
 +----------------------------------------------------------------------------+
 */
-
-int i_APCI1710_InitExternalStrobe(struct comedi_device *dev,
-        unsigned char b_ModulNbr, unsigned char b_ExternalStrobe, unsigned char b_ExternalStrobeLevel)
+static int i_APCI1710_InitExternalStrobe(struct comedi_device *dev,
+                                         unsigned char b_ModulNbr,
+                                         unsigned char b_ExternalStrobe,
+                                         unsigned char b_ExternalStrobeLevel)
 {
+        struct addi_private *devpriv = dev->private;
         int i_ReturnValue = 0;
 
         /**************************/
@@ -1390,10 +1425,11 @@ int i_APCI1710_InitExternalStrobe(struct comedi_device *dev,
            |                         "i_APCI1710_InitCounter"                           |
            +----------------------------------------------------------------------------+
          */
-
-int i_APCI1710_InitCompareLogic(struct comedi_device *dev,
-        unsigned char b_ModulNbr, unsigned int ui_CompareValue)
+static int i_APCI1710_InitCompareLogic(struct comedi_device *dev,
+                                       unsigned char b_ModulNbr,
+                                       unsigned int ui_CompareValue)
 {
+        struct addi_private *devpriv = dev->private;
         int i_ReturnValue = 0;
 
         /**************************/
@@ -1486,13 +1522,14 @@ int i_APCI1710_InitCompareLogic(struct comedi_device *dev,
 |                     -7: 40MHz quartz not on board                          |
 +----------------------------------------------------------------------------+
 */
-
-int i_APCI1710_InitFrequencyMeasurement(struct comedi_device *dev,
-        unsigned char b_ModulNbr,
-        unsigned char b_PCIInputClock,
-        unsigned char b_TimingUnity,
-        unsigned int ul_TimingInterval, unsigned int *pul_RealTimingInterval)
+static int i_APCI1710_InitFrequencyMeasurement(struct comedi_device *dev,
+                                               unsigned char b_ModulNbr,
+                                               unsigned char b_PCIInputClock,
+                                               unsigned char b_TimingUnity,
+                                               unsigned int ul_TimingInterval,
+                                               unsigned int *pul_RealTimingInterval)
 {
+        struct addi_private *devpriv = dev->private;
         int i_ReturnValue = 0;
         unsigned int ul_TimerValue = 0;
         double d_RealTimingInterval;
@@ -1995,72 +2032,70 @@ int i_APCI1710_InitFrequencyMeasurement(struct comedi_device *dev,
         return i_ReturnValue;
 }
 
-/*########################################################################### */
-
-                                                        /* INSN BITS */
-/*########################################################################### */
-
 /*
-+----------------------------------------------------------------------------+
-| Function Name     :INT        i_APCI1710_InsnBitsINCCPT(struct comedi_device *dev,struct comedi_subdevice *s,
-struct comedi_insn *insn,unsigned int *data)                   |
-+----------------------------------------------------------------------------+
-| Task              : Set & Clear Functions for INC_CPT                                          |
-+----------------------------------------------------------------------------+
-| Input Parameters  :
-+----------------------------------------------------------------------------+
-| Output Parameters : -                                                      |
-+----------------------------------------------------------------------------+
-| Return Value      :
-+----------------------------------------------------------------------------+
-*/
-
-int i_APCI1710_InsnBitsINCCPT(struct comedi_device *dev, struct comedi_subdevice *s,
-        struct comedi_insn *insn, unsigned int *data)
+ * Configuration function for INC_CPT
+ */
+static int i_APCI1710_InsnConfigINCCPT(struct comedi_device *dev,
+                                       struct comedi_subdevice *s,
+                                       struct comedi_insn *insn,
+                                       unsigned int *data)
 {
-        unsigned int ui_BitsType;
+        struct addi_private *devpriv = dev->private;
+        unsigned int ui_ConfigType;
         int i_ReturnValue = 0;
-        ui_BitsType = CR_CHAN(insn->chanspec);
-        devpriv->tsk_Current = current; /*  Save the current process task structure */
 
-        switch (ui_BitsType) {
-        case APCI1710_INCCPT_CLEARCOUNTERVALUE:
-                i_ReturnValue = i_APCI1710_ClearCounterValue(dev,
-                        (unsigned char) CR_AREF(insn->chanspec));
+        ui_ConfigType = CR_CHAN(insn->chanspec);
+
+        printk("\nINC_CPT");
+
+        devpriv->tsk_Current = current; /*  Save the current process task structure */
+        switch (ui_ConfigType) {
+        case APCI1710_INCCPT_INITCOUNTER:
+                i_ReturnValue = i_APCI1710_InitCounter(dev,
+                        CR_AREF(insn->chanspec),
+                        (unsigned char) data[0],
+                        (unsigned char) data[1],
+                        (unsigned char) data[2], (unsigned char) data[3], (unsigned char) data[4]);
                 break;
 
-        case APCI1710_INCCPT_CLEARALLCOUNTERVALUE:
-                i_ReturnValue = i_APCI1710_ClearAllCounterValue(dev);
+        case APCI1710_INCCPT_COUNTERAUTOTEST:
+                i_ReturnValue = i_APCI1710_CounterAutoTest(dev,
+                        (unsigned char *) &data[0]);
                 break;
 
-        case APCI1710_INCCPT_SETINPUTFILTER:
-                i_ReturnValue = i_APCI1710_SetInputFilter(dev,
-                        (unsigned char) CR_AREF(insn->chanspec),
-                        (unsigned char) data[0], (unsigned char) data[1]);
+        case APCI1710_INCCPT_INITINDEX:
+                i_ReturnValue = i_APCI1710_InitIndex(dev,
+                        CR_AREF(insn->chanspec),
+                        (unsigned char) data[0],
+                        (unsigned char) data[1], (unsigned char) data[2], (unsigned char) data[3]);
                 break;
 
-        case APCI1710_INCCPT_LATCHCOUNTER:
-                i_ReturnValue = i_APCI1710_LatchCounter(dev,
-                        (unsigned char) CR_AREF(insn->chanspec), (unsigned char) data[0]);
+        case APCI1710_INCCPT_INITREFERENCE:
+                i_ReturnValue = i_APCI1710_InitReference(dev,
+                        CR_AREF(insn->chanspec), (unsigned char) data[0]);
                 break;
 
-        case APCI1710_INCCPT_SETINDEXANDREFERENCESOURCE:
-                i_ReturnValue = i_APCI1710_SetIndexAndReferenceSource(dev,
-                        (unsigned char) CR_AREF(insn->chanspec), (unsigned char) data[0]);
+        case APCI1710_INCCPT_INITEXTERNALSTROBE:
+                i_ReturnValue = i_APCI1710_InitExternalStrobe(dev,
+                        CR_AREF(insn->chanspec),
+                        (unsigned char) data[0], (unsigned char) data[1]);
                 break;
 
-        case APCI1710_INCCPT_SETDIGITALCHLON:
-                i_ReturnValue = i_APCI1710_SetDigitalChlOn(dev,
-                        (unsigned char) CR_AREF(insn->chanspec));
+        case APCI1710_INCCPT_INITCOMPARELOGIC:
+                i_ReturnValue = i_APCI1710_InitCompareLogic(dev,
+                        CR_AREF(insn->chanspec), (unsigned int) data[0]);
                 break;
 
-        case APCI1710_INCCPT_SETDIGITALCHLOFF:
-                i_ReturnValue = i_APCI1710_SetDigitalChlOff(dev,
-                        (unsigned char) CR_AREF(insn->chanspec));
+        case APCI1710_INCCPT_INITFREQUENCYMEASUREMENT:
+                i_ReturnValue = i_APCI1710_InitFrequencyMeasurement(dev,
+                        CR_AREF(insn->chanspec),
+                        (unsigned char) data[0],
+                        (unsigned char) data[1], (unsigned int) data[2], (unsigned int *) &data[0]);
                 break;
 
         default:
-                printk("Bits Config Parameter Wrong\n");
+                printk("Insn Config : Config Parameter Wrong\n");
+
         }
 
         if (i_ReturnValue >= 0)
@@ -2090,9 +2125,10 @@ int i_APCI1710_InsnBitsINCCPT(struct comedi_device *dev, struct comedi_subdevice
 |                         "i_APCI1710_InitCounter"                           |
 +----------------------------------------------------------------------------+
 */
-
-int i_APCI1710_ClearCounterValue(struct comedi_device *dev, unsigned char b_ModulNbr)
+static int i_APCI1710_ClearCounterValue(struct comedi_device *dev,
+                                        unsigned char b_ModulNbr)
 {
+        struct addi_private *devpriv = dev->private;
         int i_ReturnValue = 0;
 
         /**************************/
@@ -2150,9 +2186,9 @@ int i_APCI1710_ClearCounterValue(struct comedi_device *dev, unsigned char b_Modu
 |                     -2: No counter module found                            |
 +----------------------------------------------------------------------------+
 */
-
-int i_APCI1710_ClearAllCounterValue(struct comedi_device *dev)
+static int i_APCI1710_ClearAllCounterValue(struct comedi_device *dev)
 {
+        struct addi_private *devpriv = dev->private;
         unsigned char b_ModulCpt = 0;
         int i_ReturnValue = 0;
 
@@ -2296,10 +2332,12 @@ int i_APCI1710_ClearAllCounterValue(struct comedi_device *dev)
 |                                         -6: 40MHz quartz not on board                          |
 +----------------------------------------------------------------------------+
 */
-
-int i_APCI1710_SetInputFilter(struct comedi_device *dev,
-        unsigned char b_ModulNbr, unsigned char b_PCIInputClock, unsigned char b_Filter)
+static int i_APCI1710_SetInputFilter(struct comedi_device *dev,
+                                     unsigned char b_ModulNbr,
+                                     unsigned char b_PCIInputClock,
+                                     unsigned char b_Filter)
 {
+        struct addi_private *devpriv = dev->private;
         int i_ReturnValue = 0;
         unsigned int dw_Status = 0;
 
@@ -2560,10 +2598,11 @@ int i_APCI1710_SetInputFilter(struct comedi_device *dev,
 |                     -4: The selected latch register parameter is wrong     |
 +----------------------------------------------------------------------------+
 */
-
-int i_APCI1710_LatchCounter(struct comedi_device *dev,
-        unsigned char b_ModulNbr, unsigned char b_LatchReg)
+static int i_APCI1710_LatchCounter(struct comedi_device *dev,
+                                   unsigned char b_ModulNbr,
+                                   unsigned char b_LatchReg)
 {
+        struct addi_private *devpriv = dev->private;
         int i_ReturnValue = 0;
 
         /**************************/
@@ -2657,10 +2696,11 @@ int i_APCI1710_LatchCounter(struct comedi_device *dev,
 |                     -4: The source selection is wrong                      |
 +----------------------------------------------------------------------------+
 */
-
-int i_APCI1710_SetIndexAndReferenceSource(struct comedi_device *dev,
-        unsigned char b_ModulNbr, unsigned char b_SourceSelection)
+static int i_APCI1710_SetIndexAndReferenceSource(struct comedi_device *dev,
+                                                 unsigned char b_ModulNbr,
+                                                 unsigned char b_SourceSelection)
 {
+        struct addi_private *devpriv = dev->private;
         int i_ReturnValue = 0;
 
         /**************************/
@@ -2794,9 +2834,10 @@ int i_APCI1710_SetIndexAndReferenceSource(struct comedi_device *dev,
 |                         "i_APCI1710_InitCounter"                           |
 +----------------------------------------------------------------------------+
 */
-
-int i_APCI1710_SetDigitalChlOn(struct comedi_device *dev, unsigned char b_ModulNbr)
+static int i_APCI1710_SetDigitalChlOn(struct comedi_device *dev,
+                                      unsigned char b_ModulNbr)
 {
+        struct addi_private *devpriv = dev->private;
         int i_ReturnValue = 0;
 
         /**************************/
@@ -2874,9 +2915,10 @@ int i_APCI1710_SetDigitalChlOn(struct comedi_device *dev, unsigned char b_ModulN
 |                         "i_APCI1710_InitCounter"                           |
 +----------------------------------------------------------------------------+
 */
-
-int i_APCI1710_SetDigitalChlOff(struct comedi_device *dev, unsigned char b_ModulNbr)
+static int i_APCI1710_SetDigitalChlOff(struct comedi_device *dev,
+                                       unsigned char b_ModulNbr)
 {
+        struct addi_private *devpriv = dev->private;
         int i_ReturnValue = 0;
 
         /**************************/
@@ -2932,88 +2974,59 @@ int i_APCI1710_SetDigitalChlOff(struct comedi_device *dev, unsigned char b_Modul
         return i_ReturnValue;
 }
 
-/*########################################################################### */
-
-                                                        /*  INSN WRITE */
-/*########################################################################### */
-
 /*
-+----------------------------------------------------------------------------+
-| Function Name     :INT        i_APCI1710_InsnWriteINCCPT(struct comedi_device *dev,struct comedi_subdevice *s,
-struct comedi_insn *insn,unsigned int *data)                   |
-+----------------------------------------------------------------------------+
-| Task              : Enable Disable functions for INC_CPT                                       |
-+----------------------------------------------------------------------------+
-| Input Parameters  :
-+----------------------------------------------------------------------------+
-| Output Parameters : -                                                      |
-+----------------------------------------------------------------------------+
-| Return Value      :
-+----------------------------------------------------------------------------+
-*/
-int i_APCI1710_InsnWriteINCCPT(struct comedi_device *dev, struct comedi_subdevice *s,
-        struct comedi_insn *insn, unsigned int *data)
+ * Set & Clear Functions for INC_CPT
+ */
+static int i_APCI1710_InsnBitsINCCPT(struct comedi_device *dev,
+                                     struct comedi_subdevice *s,
+                                     struct comedi_insn *insn,
+                                     unsigned int *data)
 {
-        unsigned int ui_WriteType;
+        struct addi_private *devpriv = dev->private;
+        unsigned int ui_BitsType;
         int i_ReturnValue = 0;
 
-        ui_WriteType = CR_CHAN(insn->chanspec);
+        ui_BitsType = CR_CHAN(insn->chanspec);
         devpriv->tsk_Current = current; /*  Save the current process task structure */
 
-        switch (ui_WriteType) {
-        case APCI1710_INCCPT_ENABLELATCHINTERRUPT:
-                i_ReturnValue = i_APCI1710_EnableLatchInterrupt(dev,
+        switch (ui_BitsType) {
+        case APCI1710_INCCPT_CLEARCOUNTERVALUE:
+                i_ReturnValue = i_APCI1710_ClearCounterValue(dev,
                         (unsigned char) CR_AREF(insn->chanspec));
                 break;
 
-        case APCI1710_INCCPT_DISABLELATCHINTERRUPT:
-                i_ReturnValue = i_APCI1710_DisableLatchInterrupt(dev,
-                        (unsigned char) CR_AREF(insn->chanspec));
+        case APCI1710_INCCPT_CLEARALLCOUNTERVALUE:
+                i_ReturnValue = i_APCI1710_ClearAllCounterValue(dev);
                 break;
 
-        case APCI1710_INCCPT_WRITE16BITCOUNTERVALUE:
-                i_ReturnValue = i_APCI1710_Write16BitCounterValue(dev,
+        case APCI1710_INCCPT_SETINPUTFILTER:
+                i_ReturnValue = i_APCI1710_SetInputFilter(dev,
                         (unsigned char) CR_AREF(insn->chanspec),
-                        (unsigned char) data[0], (unsigned int) data[1]);
-                break;
-
-        case APCI1710_INCCPT_WRITE32BITCOUNTERVALUE:
-                i_ReturnValue = i_APCI1710_Write32BitCounterValue(dev,
-                        (unsigned char) CR_AREF(insn->chanspec), (unsigned int) data[0]);
-
-                break;
-
-        case APCI1710_INCCPT_ENABLEINDEX:
-                i_APCI1710_EnableIndex(dev, (unsigned char) CR_AREF(insn->chanspec));
+                        (unsigned char) data[0], (unsigned char) data[1]);
                 break;
 
-        case APCI1710_INCCPT_DISABLEINDEX:
-                i_ReturnValue = i_APCI1710_DisableIndex(dev,
-                        (unsigned char) CR_AREF(insn->chanspec));
+        case APCI1710_INCCPT_LATCHCOUNTER:
+                i_ReturnValue = i_APCI1710_LatchCounter(dev,
+                        (unsigned char) CR_AREF(insn->chanspec), (unsigned char) data[0]);
                 break;
 
-        case APCI1710_INCCPT_ENABLECOMPARELOGIC:
-                i_ReturnValue = i_APCI1710_EnableCompareLogic(dev,
-                        (unsigned char) CR_AREF(insn->chanspec));
+        case APCI1710_INCCPT_SETINDEXANDREFERENCESOURCE:
+                i_ReturnValue = i_APCI1710_SetIndexAndReferenceSource(dev,
+                        (unsigned char) CR_AREF(insn->chanspec), (unsigned char) data[0]);
                 break;
 
-        case APCI1710_INCCPT_DISABLECOMPARELOGIC:
-                i_ReturnValue = i_APCI1710_DisableCompareLogic(dev,
+        case APCI1710_INCCPT_SETDIGITALCHLON:
+                i_ReturnValue = i_APCI1710_SetDigitalChlOn(dev,
                         (unsigned char) CR_AREF(insn->chanspec));
                 break;
 
-        case APCI1710_INCCPT_ENABLEFREQUENCYMEASUREMENT:
-                i_ReturnValue = i_APCI1710_EnableFrequencyMeasurement(dev,
-                        (unsigned char) CR_AREF(insn->chanspec), (unsigned char) data[0]);
-                break;
-
-        case APCI1710_INCCPT_DISABLEFREQUENCYMEASUREMENT:
-                i_ReturnValue = i_APCI1710_DisableFrequencyMeasurement(dev,
+        case APCI1710_INCCPT_SETDIGITALCHLOFF:
+                i_ReturnValue = i_APCI1710_SetDigitalChlOff(dev,
                         (unsigned char) CR_AREF(insn->chanspec));
                 break;
 
         default:
-                printk("Write Config Parameter Wrong\n");
+                printk("Bits Config Parameter Wrong\n");
         }
 
         if (i_ReturnValue >= 0)
@@ -3046,9 +3059,10 @@ int i_APCI1710_InsnWriteINCCPT(struct comedi_device *dev, struct comedi_subdevic
 |                         "i_APCI1710_SetBoardIntRoutine"                    |
 +----------------------------------------------------------------------------+
 */
-
-int i_APCI1710_EnableLatchInterrupt(struct comedi_device *dev, unsigned char b_ModulNbr)
+static int i_APCI1710_EnableLatchInterrupt(struct comedi_device *dev,
+                                           unsigned char b_ModulNbr)
 {
+        struct addi_private *devpriv = dev->private;
         int i_ReturnValue = 0;
 
         /**************************/
@@ -3132,9 +3146,10 @@ int i_APCI1710_EnableLatchInterrupt(struct comedi_device *dev, unsigned char b_M
 |                         "i_APCI1710_SetBoardIntRoutine"                    |
 +----------------------------------------------------------------------------+
 */
-
-int i_APCI1710_DisableLatchInterrupt(struct comedi_device *dev, unsigned char b_ModulNbr)
+static int i_APCI1710_DisableLatchInterrupt(struct comedi_device *dev,
+                                            unsigned char b_ModulNbr)
 {
+        struct addi_private *devpriv = dev->private;
         int i_ReturnValue = 0;
 
         /**************************/
@@ -3230,10 +3245,12 @@ int i_APCI1710_DisableLatchInterrupt(struct comedi_device *dev, unsigned char b_
 |                     -4: The selected 16-Bit counter parameter is wrong     |
 +----------------------------------------------------------------------------+
 */
-
-int i_APCI1710_Write16BitCounterValue(struct comedi_device *dev,
-        unsigned char b_ModulNbr, unsigned char b_SelectedCounter, unsigned int ui_WriteValue)
+static int i_APCI1710_Write16BitCounterValue(struct comedi_device *dev,
+                                             unsigned char b_ModulNbr,
+                                             unsigned char b_SelectedCounter,
+                                             unsigned int ui_WriteValue)
 {
+        struct addi_private *devpriv = dev->private;
         int i_ReturnValue = 0;
 
         /**************************/
@@ -3315,10 +3332,11 @@ int i_APCI1710_Write16BitCounterValue(struct comedi_device *dev,
 |                         "i_APCI1710_InitCounter"                           |
 +----------------------------------------------------------------------------+
 */
-
-int i_APCI1710_Write32BitCounterValue(struct comedi_device *dev,
-        unsigned char b_ModulNbr, unsigned int ul_WriteValue)
+static int i_APCI1710_Write32BitCounterValue(struct comedi_device *dev,
+                                             unsigned char b_ModulNbr,
+                                             unsigned int ul_WriteValue)
 {
+        struct addi_private *devpriv = dev->private;
         int i_ReturnValue = 0;
 
         /**************************/
@@ -3382,9 +3400,10 @@ int i_APCI1710_Write32BitCounterValue(struct comedi_device *dev,
 |                         "i_APCI1710_InitIndex"                             |
 +----------------------------------------------------------------------------+
 */
-
-int i_APCI1710_EnableIndex(struct comedi_device *dev, unsigned char b_ModulNbr)
+static int i_APCI1710_EnableIndex(struct comedi_device *dev,
+                                  unsigned char b_ModulNbr)
 {
+        struct addi_private *devpriv = dev->private;
         int i_ReturnValue = 0;
         unsigned int ul_InterruptLatchReg;
 
@@ -3480,9 +3499,10 @@ int i_APCI1710_EnableIndex(struct comedi_device *dev, unsigned char b_ModulNbr)
 |                         "i_APCI1710_InitIndex"                             |
 +----------------------------------------------------------------------------+
 */
-
-int i_APCI1710_DisableIndex(struct comedi_device *dev, unsigned char b_ModulNbr)
+static int i_APCI1710_DisableIndex(struct comedi_device *dev,
+                                   unsigned char b_ModulNbr)
 {
+        struct addi_private *devpriv = dev->private;
         int i_ReturnValue = 0;
 
         /**************************/
@@ -3579,9 +3599,10 @@ int i_APCI1710_DisableIndex(struct comedi_device *dev, unsigned char b_ModulNbr)
 |                         See function "i_APCI1710_SetBoardIntRoutineX"      |
 +----------------------------------------------------------------------------+
 */
-
-int i_APCI1710_EnableCompareLogic(struct comedi_device *dev, unsigned char b_ModulNbr)
+static int i_APCI1710_EnableCompareLogic(struct comedi_device *dev,
+                                         unsigned char b_ModulNbr)
 {
+        struct addi_private *devpriv = dev->private;
         int i_ReturnValue = 0;
 
         /**************************/
@@ -3679,9 +3700,10 @@ int i_APCI1710_EnableCompareLogic(struct comedi_device *dev, unsigned char b_Mod
 |                         See function "i_APCI1710_InitCompareLogic"         |
 +----------------------------------------------------------------------------+
 */
-
-int i_APCI1710_DisableCompareLogic(struct comedi_device *dev, unsigned char b_ModulNbr)
+static int i_APCI1710_DisableCompareLogic(struct comedi_device *dev,
+                                          unsigned char b_ModulNbr)
 {
+        struct addi_private *devpriv = dev->private;
         int i_ReturnValue = 0;
 
         /**************************/
@@ -3788,10 +3810,11 @@ int i_APCI1710_DisableCompareLogic(struct comedi_device *dev, unsigned char b_Mo
            |                     -6: Interrupt function not initialised.                |
            +----------------------------------------------------------------------------+
          */
-
-int i_APCI1710_EnableFrequencyMeasurement(struct comedi_device *dev,
-        unsigned char b_ModulNbr, unsigned char b_InterruptEnable)
+static int i_APCI1710_EnableFrequencyMeasurement(struct comedi_device *dev,
+                                                 unsigned char b_ModulNbr,
+                                                 unsigned char b_InterruptEnable)
 {
+        struct addi_private *devpriv = dev->private;
         int i_ReturnValue = 0;
 
         /**************************/
@@ -3935,9 +3958,10 @@ int i_APCI1710_EnableFrequencyMeasurement(struct comedi_device *dev,
            |                      See function "i_APCI1710_InitFrequencyMeasurement" |
            +----------------------------------------------------------------------------+
          */
-
-int i_APCI1710_DisableFrequencyMeasurement(struct comedi_device *dev, unsigned char b_ModulNbr)
+static int i_APCI1710_DisableFrequencyMeasurement(struct comedi_device *dev,
+                                                  unsigned char b_ModulNbr)
 {
+        struct addi_private *devpriv = dev->private;
         int i_ReturnValue = 0;
 
         /**************************/
@@ -4029,134 +4053,80 @@ int i_APCI1710_DisableFrequencyMeasurement(struct comedi_device *dev, unsigned c
         return i_ReturnValue;
 }
 
-/*########################################################################### */
-
-                                                        /*  INSN READ */
-
-/*########################################################################### */
-
 /*
-+----------------------------------------------------------------------------+
-| Function Name     :INT        i_APCI1710_InsnWriteINCCPT(struct comedi_device *dev,struct comedi_subdevice *s,
-struct comedi_insn *insn,unsigned int *data)                   |
-+----------------------------------------------------------------------------+
-| Task              : Read and Get functions for INC_CPT                                       |
-+----------------------------------------------------------------------------+
-| Input Parameters  :
-+----------------------------------------------------------------------------+
-| Output Parameters : -                                                      |
-+----------------------------------------------------------------------------+
-| Return Value      :
-+----------------------------------------------------------------------------+
-*/
-int i_APCI1710_InsnReadINCCPT(struct comedi_device *dev, struct comedi_subdevice *s,
-        struct comedi_insn *insn, unsigned int *data)
+ * Enable Disable functions for INC_CPT
+ */
+static int i_APCI1710_InsnWriteINCCPT(struct comedi_device *dev,
+                                      struct comedi_subdevice *s,
+                                      struct comedi_insn *insn,
+                                      unsigned int *data)
 {
-        unsigned int ui_ReadType;
+        struct addi_private *devpriv = dev->private;
+        unsigned int ui_WriteType;
         int i_ReturnValue = 0;
 
-        ui_ReadType = CR_CHAN(insn->chanspec);
-
+        ui_WriteType = CR_CHAN(insn->chanspec);
         devpriv->tsk_Current = current; /*  Save the current process task structure */
-        switch (ui_ReadType) {
-        case APCI1710_INCCPT_READLATCHREGISTERSTATUS:
-                i_ReturnValue = i_APCI1710_ReadLatchRegisterStatus(dev,
-                        (unsigned char) CR_AREF(insn->chanspec),
-                        (unsigned char) CR_RANGE(insn->chanspec), (unsigned char *) &data[0]);
-                break;
 
-        case APCI1710_INCCPT_READLATCHREGISTERVALUE:
-                i_ReturnValue = i_APCI1710_ReadLatchRegisterValue(dev,
-                        (unsigned char) CR_AREF(insn->chanspec),
-                        (unsigned char) CR_RANGE(insn->chanspec), (unsigned int *) &data[0]);
-                printk("Latch Register Value %d\n", data[0]);
+        switch (ui_WriteType) {
+        case APCI1710_INCCPT_ENABLELATCHINTERRUPT:
+                i_ReturnValue = i_APCI1710_EnableLatchInterrupt(dev,
+                        (unsigned char) CR_AREF(insn->chanspec));
                 break;
 
-        case APCI1710_INCCPT_READ16BITCOUNTERVALUE:
-                i_ReturnValue = i_APCI1710_Read16BitCounterValue(dev,
-                        (unsigned char) CR_AREF(insn->chanspec),
-                        (unsigned char) CR_RANGE(insn->chanspec), (unsigned int *) &data[0]);
+        case APCI1710_INCCPT_DISABLELATCHINTERRUPT:
+                i_ReturnValue = i_APCI1710_DisableLatchInterrupt(dev,
+                        (unsigned char) CR_AREF(insn->chanspec));
                 break;
 
-        case APCI1710_INCCPT_READ32BITCOUNTERVALUE:
-                i_ReturnValue = i_APCI1710_Read32BitCounterValue(dev,
-                        (unsigned char) CR_AREF(insn->chanspec), (unsigned int *) &data[0]);
+        case APCI1710_INCCPT_WRITE16BITCOUNTERVALUE:
+                i_ReturnValue = i_APCI1710_Write16BitCounterValue(dev,
+                        (unsigned char) CR_AREF(insn->chanspec),
+                        (unsigned char) data[0], (unsigned int) data[1]);
                 break;
 
-        case APCI1710_INCCPT_GETINDEXSTATUS:
-                i_ReturnValue = i_APCI1710_GetIndexStatus(dev,
-                        (unsigned char) CR_AREF(insn->chanspec), (unsigned char *) &data[0]);
-                break;
+        case APCI1710_INCCPT_WRITE32BITCOUNTERVALUE:
+                i_ReturnValue = i_APCI1710_Write32BitCounterValue(dev,
+                        (unsigned char) CR_AREF(insn->chanspec), (unsigned int) data[0]);
 
-        case APCI1710_INCCPT_GETREFERENCESTATUS:
-                i_ReturnValue = i_APCI1710_GetReferenceStatus(dev,
-                        (unsigned char) CR_AREF(insn->chanspec), (unsigned char *) &data[0]);
                 break;
 
-        case APCI1710_INCCPT_GETUASSTATUS:
-                i_ReturnValue = i_APCI1710_GetUASStatus(dev,
-                        (unsigned char) CR_AREF(insn->chanspec), (unsigned char *) &data[0]);
-                break;
-
-        case APCI1710_INCCPT_GETCBSTATUS:
-                i_ReturnValue = i_APCI1710_GetCBStatus(dev,
-                        (unsigned char) CR_AREF(insn->chanspec), (unsigned char *) &data[0]);
+        case APCI1710_INCCPT_ENABLEINDEX:
+                i_APCI1710_EnableIndex(dev, (unsigned char) CR_AREF(insn->chanspec));
                 break;
 
-        case APCI1710_INCCPT_GET16BITCBSTATUS:
-                i_ReturnValue = i_APCI1710_Get16BitCBStatus(dev,
-                        (unsigned char) CR_AREF(insn->chanspec),
-                        (unsigned char *) &data[0], (unsigned char *) &data[1]);
+        case APCI1710_INCCPT_DISABLEINDEX:
+                i_ReturnValue = i_APCI1710_DisableIndex(dev,
+                        (unsigned char) CR_AREF(insn->chanspec));
                 break;
 
-        case APCI1710_INCCPT_GETUDSTATUS:
-                i_ReturnValue = i_APCI1710_GetUDStatus(dev,
-                        (unsigned char) CR_AREF(insn->chanspec), (unsigned char *) &data[0]);
-
+        case APCI1710_INCCPT_ENABLECOMPARELOGIC:
+                i_ReturnValue = i_APCI1710_EnableCompareLogic(dev,
+                        (unsigned char) CR_AREF(insn->chanspec));
                 break;
 
-        case APCI1710_INCCPT_GETINTERRUPTUDLATCHEDSTATUS:
-                i_ReturnValue = i_APCI1710_GetInterruptUDLatchedStatus(dev,
-                        (unsigned char) CR_AREF(insn->chanspec), (unsigned char *) &data[0]);
+        case APCI1710_INCCPT_DISABLECOMPARELOGIC:
+                i_ReturnValue = i_APCI1710_DisableCompareLogic(dev,
+                        (unsigned char) CR_AREF(insn->chanspec));
                 break;
 
-        case APCI1710_INCCPT_READFREQUENCYMEASUREMENT:
-                i_ReturnValue = i_APCI1710_ReadFrequencyMeasurement(dev,
-                        (unsigned char) CR_AREF(insn->chanspec),
-                        (unsigned char *) &data[0],
-                        (unsigned char *) &data[1], (unsigned int *) &data[2]);
+        case APCI1710_INCCPT_ENABLEFREQUENCYMEASUREMENT:
+                i_ReturnValue = i_APCI1710_EnableFrequencyMeasurement(dev,
+                        (unsigned char) CR_AREF(insn->chanspec), (unsigned char) data[0]);
                 break;
 
-        case APCI1710_INCCPT_READINTERRUPT:
-                data[0] = devpriv->s_InterruptParameters.
-                        s_FIFOInterruptParameters[devpriv->
-                        s_InterruptParameters.ui_Read].b_OldModuleMask;
-                data[1] = devpriv->s_InterruptParameters.
-                        s_FIFOInterruptParameters[devpriv->
-                        s_InterruptParameters.ui_Read].ul_OldInterruptMask;
-                data[2] = devpriv->s_InterruptParameters.
-                        s_FIFOInterruptParameters[devpriv->
-                        s_InterruptParameters.ui_Read].ul_OldCounterLatchValue;
-
-                /**************************/
-                /* Increment the read FIFO */
-                /***************************/
-
-                devpriv->
-                        s_InterruptParameters.
-                        ui_Read = (devpriv->s_InterruptParameters.
-                        ui_Read + 1) % APCI1710_SAVE_INTERRUPT;
-
+        case APCI1710_INCCPT_DISABLEFREQUENCYMEASUREMENT:
+                i_ReturnValue = i_APCI1710_DisableFrequencyMeasurement(dev,
+                        (unsigned char) CR_AREF(insn->chanspec));
                 break;
 
         default:
-                printk("ReadType Parameter wrong\n");
+                printk("Write Config Parameter Wrong\n");
         }
 
         if (i_ReturnValue >= 0)
                 i_ReturnValue = insn->n;
         return i_ReturnValue;
-
 }
 
 /*
@@ -4192,10 +4162,12 @@ int i_APCI1710_InsnReadINCCPT(struct comedi_device *dev, struct comedi_subdevice
 |                     -4: The selected latch register parameter is wrong     |
 +----------------------------------------------------------------------------+
 */
-
-int i_APCI1710_ReadLatchRegisterStatus(struct comedi_device *dev,
-        unsigned char b_ModulNbr, unsigned char b_LatchReg, unsigned char *pb_LatchStatus)
+static int i_APCI1710_ReadLatchRegisterStatus(struct comedi_device *dev,
+                                              unsigned char b_ModulNbr,
+                                              unsigned char b_LatchReg,
+                                              unsigned char *pb_LatchStatus)
 {
+        struct addi_private *devpriv = dev->private;
         int i_ReturnValue = 0;
         unsigned int dw_LatchReg;
 
@@ -4279,10 +4251,12 @@ int i_APCI1710_ReadLatchRegisterStatus(struct comedi_device *dev,
 |                     -4: The selected latch register parameter is wrong     |
 +----------------------------------------------------------------------------+
 */
-
-int i_APCI1710_ReadLatchRegisterValue(struct comedi_device *dev,
-        unsigned char b_ModulNbr, unsigned char b_LatchReg, unsigned int *pul_LatchValue)
+static int i_APCI1710_ReadLatchRegisterValue(struct comedi_device *dev,
+                                             unsigned char b_ModulNbr,
+                                             unsigned char b_LatchReg,
+                                             unsigned int *pul_LatchValue)
 {
+        struct addi_private *devpriv = dev->private;
         int i_ReturnValue = 0;
 
         /**************************/
@@ -4363,10 +4337,12 @@ int i_APCI1710_ReadLatchRegisterValue(struct comedi_device *dev,
 |                     -4: The selected 16-Bit counter parameter is wrong     |
 +----------------------------------------------------------------------------+
 */
-
-int i_APCI1710_Read16BitCounterValue(struct comedi_device *dev,
-        unsigned char b_ModulNbr, unsigned char b_SelectedCounter, unsigned int *pui_CounterValue)
+static int i_APCI1710_Read16BitCounterValue(struct comedi_device *dev,
+                                            unsigned char b_ModulNbr,
+                                            unsigned char b_SelectedCounter,
+                                            unsigned int *pui_CounterValue)
 {
+        struct addi_private *devpriv = dev->private;
         int i_ReturnValue = 0;
         unsigned int dw_LathchValue = 0;
 
@@ -4458,10 +4434,11 @@ int i_APCI1710_Read16BitCounterValue(struct comedi_device *dev,
 |                         "i_APCI1710_InitCounter"                           |
 +----------------------------------------------------------------------------+
 */
-
-int i_APCI1710_Read32BitCounterValue(struct comedi_device *dev,
-        unsigned char b_ModulNbr, unsigned int *pul_CounterValue)
+static int i_APCI1710_Read32BitCounterValue(struct comedi_device *dev,
+                                            unsigned char b_ModulNbr,
+                                            unsigned int *pul_CounterValue)
 {
+        struct addi_private *devpriv = dev->private;
         int i_ReturnValue = 0;
 
         /**************************/
@@ -4534,10 +4511,11 @@ int i_APCI1710_Read32BitCounterValue(struct comedi_device *dev,
 |                         "i_APCI1710_InitIndex"                             |
 +----------------------------------------------------------------------------+
 */
-
-int i_APCI1710_GetIndexStatus(struct comedi_device *dev,
-        unsigned char b_ModulNbr, unsigned char *pb_IndexStatus)
+static int i_APCI1710_GetIndexStatus(struct comedi_device *dev,
+                                     unsigned char b_ModulNbr,
+                                     unsigned char *pb_IndexStatus)
 {
+        struct addi_private *devpriv = dev->private;
         int i_ReturnValue = 0;
         unsigned int dw_StatusReg = 0;
 
@@ -4618,10 +4596,11 @@ int i_APCI1710_GetIndexStatus(struct comedi_device *dev,
 |                         "i_APCI1710_InitReference"                         |
 +----------------------------------------------------------------------------+
 */
-
-int i_APCI1710_GetReferenceStatus(struct comedi_device *dev,
-        unsigned char b_ModulNbr, unsigned char *pb_ReferenceStatus)
+static int i_APCI1710_GetReferenceStatus(struct comedi_device *dev,
+                                         unsigned char b_ModulNbr,
+                                         unsigned char *pb_ReferenceStatus)
 {
+        struct addi_private *devpriv = dev->private;
         int i_ReturnValue = 0;
         unsigned int dw_StatusReg = 0;
 
@@ -4702,10 +4681,11 @@ int i_APCI1710_GetReferenceStatus(struct comedi_device *dev,
 |                         "i_APCI1710_InitCounter"                           |
 +----------------------------------------------------------------------------+
 */
-
-int i_APCI1710_GetUASStatus(struct comedi_device *dev,
-        unsigned char b_ModulNbr, unsigned char *pb_UASStatus)
+static int i_APCI1710_GetUASStatus(struct comedi_device *dev,
+                                   unsigned char b_ModulNbr,
+                                   unsigned char *pb_UASStatus)
 {
+        struct addi_private *devpriv = dev->private;
         int i_ReturnValue = 0;
         unsigned int dw_StatusReg = 0;
 
@@ -4770,10 +4750,11 @@ int i_APCI1710_GetUASStatus(struct comedi_device *dev,
 |                         "i_APCI1710_InitCounter"                           |
 +----------------------------------------------------------------------------+
 */
-
-int i_APCI1710_GetCBStatus(struct comedi_device *dev,
-        unsigned char b_ModulNbr, unsigned char *pb_CBStatus)
+static int i_APCI1710_GetCBStatus(struct comedi_device *dev,
+                                  unsigned char b_ModulNbr,
+                                  unsigned char *pb_CBStatus)
 {
+        struct addi_private *devpriv = dev->private;
         int i_ReturnValue = 0;
         unsigned int dw_StatusReg = 0;
 
@@ -4852,10 +4833,12 @@ int i_APCI1710_GetCBStatus(struct comedi_device *dev,
 |                     -5: Firmware revision error                            |
 +----------------------------------------------------------------------------+
 */
-
-int i_APCI1710_Get16BitCBStatus(struct comedi_device *dev,
-        unsigned char b_ModulNbr, unsigned char *pb_CBStatusCounter0, unsigned char *pb_CBStatusCounter1)
+static int i_APCI1710_Get16BitCBStatus(struct comedi_device *dev,
+                                       unsigned char b_ModulNbr,
+                                       unsigned char *pb_CBStatusCounter0,
+                                       unsigned char *pb_CBStatusCounter1)
 {
+        struct addi_private *devpriv = dev->private;
         int i_ReturnValue = 0;
         unsigned int dw_StatusReg = 0;
 
@@ -4965,10 +4948,11 @@ int i_APCI1710_Get16BitCBStatus(struct comedi_device *dev,
 |                         "i_APCI1710_InitCounter"                           |
 +----------------------------------------------------------------------------+
 */
-
-int i_APCI1710_GetUDStatus(struct comedi_device *dev,
-        unsigned char b_ModulNbr, unsigned char *pb_UDStatus)
+static int i_APCI1710_GetUDStatus(struct comedi_device *dev,
+                                  unsigned char b_ModulNbr,
+                                  unsigned char *pb_UDStatus)
 {
+        struct addi_private *devpriv = dev->private;
         int i_ReturnValue = 0;
         unsigned int dw_StatusReg = 0;
 
@@ -5039,10 +5023,11 @@ int i_APCI1710_GetUDStatus(struct comedi_device *dev,
 |                         See function "i_APCI1710_SetBoardIntRoutineX"      |
 +----------------------------------------------------------------------------+
 */
-
-int i_APCI1710_GetInterruptUDLatchedStatus(struct comedi_device *dev,
-        unsigned char b_ModulNbr, unsigned char *pb_UDStatus)
+static int i_APCI1710_GetInterruptUDLatchedStatus(struct comedi_device *dev,
+                                                  unsigned char b_ModulNbr,
+                                                  unsigned char *pb_UDStatus)
 {
+        struct addi_private *devpriv = dev->private;
         int i_ReturnValue = 0;
         unsigned int dw_StatusReg = 0;
 
@@ -5144,11 +5129,13 @@ int i_APCI1710_GetInterruptUDLatchedStatus(struct comedi_device *dev,
            |                      See function "i_APCI1710_InitFrequencyMeasurement" |
            +----------------------------------------------------------------------------+
          */
-
-int i_APCI1710_ReadFrequencyMeasurement(struct comedi_device *dev,
-        unsigned char b_ModulNbr,
-        unsigned char *pb_Status, unsigned char *pb_UDStatus, unsigned int *pul_ReadValue)
+static int i_APCI1710_ReadFrequencyMeasurement(struct comedi_device *dev,
+                                               unsigned char b_ModulNbr,
+                                               unsigned char *pb_Status,
+                                               unsigned char *pb_UDStatus,
+                                               unsigned int *pul_ReadValue)
 {
+        struct addi_private *devpriv = dev->private;
         int i_ReturnValue = 0;
         unsigned int ui_16BitValue;
         unsigned int dw_StatusReg;
@@ -5361,3 +5348,118 @@ int i_APCI1710_ReadFrequencyMeasurement(struct comedi_device *dev,
 
         return i_ReturnValue;
 }
+/*
+ * Read and Get functions for INC_CPT
+ */
+static int i_APCI1710_InsnReadINCCPT(struct comedi_device *dev,
+                                     struct comedi_subdevice *s,
+                                     struct comedi_insn *insn,
+                                     unsigned int *data)
+{
+        struct addi_private *devpriv = dev->private;
+        unsigned int ui_ReadType;
+        int i_ReturnValue = 0;
+
+        ui_ReadType = CR_CHAN(insn->chanspec);
+
+        devpriv->tsk_Current = current; /*  Save the current process task structure */
+        switch (ui_ReadType) {
+        case APCI1710_INCCPT_READLATCHREGISTERSTATUS:
+                i_ReturnValue = i_APCI1710_ReadLatchRegisterStatus(dev,
+                        (unsigned char) CR_AREF(insn->chanspec),
+                        (unsigned char) CR_RANGE(insn->chanspec), (unsigned char *) &data[0]);
+                break;
+
+        case APCI1710_INCCPT_READLATCHREGISTERVALUE:
+                i_ReturnValue = i_APCI1710_ReadLatchRegisterValue(dev,
+                        (unsigned char) CR_AREF(insn->chanspec),
+                        (unsigned char) CR_RANGE(insn->chanspec), (unsigned int *) &data[0]);
+                printk("Latch Register Value %d\n", data[0]);
+                break;
+
+        case APCI1710_INCCPT_READ16BITCOUNTERVALUE:
+                i_ReturnValue = i_APCI1710_Read16BitCounterValue(dev,
+                        (unsigned char) CR_AREF(insn->chanspec),
+                        (unsigned char) CR_RANGE(insn->chanspec), (unsigned int *) &data[0]);
+                break;
+
+        case APCI1710_INCCPT_READ32BITCOUNTERVALUE:
+                i_ReturnValue = i_APCI1710_Read32BitCounterValue(dev,
+                        (unsigned char) CR_AREF(insn->chanspec), (unsigned int *) &data[0]);
+                break;
+
+        case APCI1710_INCCPT_GETINDEXSTATUS:
+                i_ReturnValue = i_APCI1710_GetIndexStatus(dev,
+                        (unsigned char) CR_AREF(insn->chanspec), (unsigned char *) &data[0]);
+                break;
+
+        case APCI1710_INCCPT_GETREFERENCESTATUS:
+                i_ReturnValue = i_APCI1710_GetReferenceStatus(dev,
+                        (unsigned char) CR_AREF(insn->chanspec), (unsigned char *) &data[0]);
+                break;
+
+        case APCI1710_INCCPT_GETUASSTATUS:
+                i_ReturnValue = i_APCI1710_GetUASStatus(dev,
+                        (unsigned char) CR_AREF(insn->chanspec), (unsigned char *) &data[0]);
+                break;
+
+        case APCI1710_INCCPT_GETCBSTATUS:
+                i_ReturnValue = i_APCI1710_GetCBStatus(dev,
+                        (unsigned char) CR_AREF(insn->chanspec), (unsigned char *) &data[0]);
+                break;
+
+        case APCI1710_INCCPT_GET16BITCBSTATUS:
+                i_ReturnValue = i_APCI1710_Get16BitCBStatus(dev,
+                        (unsigned char) CR_AREF(insn->chanspec),
+                        (unsigned char *) &data[0], (unsigned char *) &data[1]);
+                break;
+
+        case APCI1710_INCCPT_GETUDSTATUS:
+                i_ReturnValue = i_APCI1710_GetUDStatus(dev,
+                        (unsigned char) CR_AREF(insn->chanspec), (unsigned char *) &data[0]);
+
+                break;
+
+        case APCI1710_INCCPT_GETINTERRUPTUDLATCHEDSTATUS:
+                i_ReturnValue = i_APCI1710_GetInterruptUDLatchedStatus(dev,
+                        (unsigned char) CR_AREF(insn->chanspec), (unsigned char *) &data[0]);
+                break;
+
+        case APCI1710_INCCPT_READFREQUENCYMEASUREMENT:
+                i_ReturnValue = i_APCI1710_ReadFrequencyMeasurement(dev,
+                        (unsigned char) CR_AREF(insn->chanspec),
+                        (unsigned char *) &data[0],
+                        (unsigned char *) &data[1], (unsigned int *) &data[2]);
+                break;
+
+        case APCI1710_INCCPT_READINTERRUPT:
+                data[0] = devpriv->s_InterruptParameters.
+                        s_FIFOInterruptParameters[devpriv->
+                        s_InterruptParameters.ui_Read].b_OldModuleMask;
+                data[1] = devpriv->s_InterruptParameters.
+                        s_FIFOInterruptParameters[devpriv->
+                        s_InterruptParameters.ui_Read].ul_OldInterruptMask;
+                data[2] = devpriv->s_InterruptParameters.
+                        s_FIFOInterruptParameters[devpriv->
+                        s_InterruptParameters.ui_Read].ul_OldCounterLatchValue;
+
+                /**************************/
+                /* Increment the read FIFO */
+                /***************************/
+
+                devpriv->
+                        s_InterruptParameters.
+                        ui_Read = (devpriv->s_InterruptParameters.
+                        ui_Read + 1) % APCI1710_SAVE_INTERRUPT;
+
+                break;
+
+        default:
+                printk("ReadType Parameter wrong\n");
+        }
+
+        if (i_ReturnValue >= 0)
+                i_ReturnValue = insn->n;
+        return i_ReturnValue;
+
+}
diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_INCCPT.h b/drivers/staging/comedi/drivers/addi-data/APCI1710_INCCPT.h
deleted file mode 100644
index 358298bfc64f..000000000000
--- a/drivers/staging/comedi/drivers/addi-data/APCI1710_INCCPT.h
+++ /dev/null
@@ -1,271 +0,0 @@
-/*
- * Copyright (C) 2004,2005  ADDI-DATA GmbH for the source code of this module.
- *
- *      ADDI-DATA GmbH
- *      Dieselstrasse 3
- *      D-77833 Ottersweier
- *      Tel: +19(0)7223/9493-0
- *      Fax: +49(0)7223/9493-92
- *      http://www.addi-data.com
- *      info@addi-data.com
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- */
-
-#define APCI1710_16BIT_COUNTER                  0x10
-#define APCI1710_32BIT_COUNTER                  0x0
-#define APCI1710_QUADRUPLE_MODE                 0x0
-#define APCI1710_DOUBLE_MODE                    0x3
-#define APCI1710_SIMPLE_MODE                    0xF
-#define APCI1710_DIRECT_MODE                    0x80
-#define APCI1710_HYSTERESIS_ON                  0x60
-#define APCI1710_HYSTERESIS_OFF                 0x0
-#define APCI1710_INCREMENT                      0x60
-#define APCI1710_DECREMENT                      0x0
-#define APCI1710_LATCH_COUNTER                  0x1
-#define APCI1710_CLEAR_COUNTER                  0x0
-#define APCI1710_LOW                            0x0
-#define APCI1710_HIGH                           0x1
-
-/*********************/
-/* Version 0600-0229 */
-/*********************/
-#define APCI1710_HIGH_EDGE_CLEAR_COUNTER                0x0
-#define APCI1710_HIGH_EDGE_LATCH_COUNTER                0x1
-#define APCI1710_LOW_EDGE_CLEAR_COUNTER                 0x2
-#define APCI1710_LOW_EDGE_LATCH_COUNTER                 0x3
-#define APCI1710_HIGH_EDGE_LATCH_AND_CLEAR_COUNTER      0x4
-#define APCI1710_LOW_EDGE_LATCH_AND_CLEAR_COUNTER       0x5
-#define APCI1710_SOURCE_0                               0x0
-#define APCI1710_SOURCE_1                               0x1
-
-#define APCI1710_30MHZ                          30
-#define APCI1710_33MHZ                          33
-#define APCI1710_40MHZ                          40
-
-#define APCI1710_ENABLE_LATCH_INT               0x80
-#define APCI1710_DISABLE_LATCH_INT              (~APCI1710_ENABLE_LATCH_INT)
-
-#define APCI1710_INDEX_LATCH_COUNTER            0x10
-#define APCI1710_INDEX_AUTO_MODE                0x8
-#define APCI1710_ENABLE_INDEX                   0x4
-#define APCI1710_DISABLE_INDEX                  (~APCI1710_ENABLE_INDEX)
-#define APCI1710_ENABLE_LATCH_AND_CLEAR         0x8
-#define APCI1710_DISABLE_LATCH_AND_CLEAR        (~APCI1710_ENABLE_LATCH_AND_CLEAR)
-#define APCI1710_SET_LOW_INDEX_LEVEL            0x4
-#define APCI1710_SET_HIGH_INDEX_LEVEL           (~APCI1710_SET_LOW_INDEX_LEVEL)
-#define APCI1710_INVERT_INDEX_RFERENCE          0x2
-#define APCI1710_DEFAULT_INDEX_RFERENCE         (~APCI1710_INVERT_INDEX_RFERENCE)
-
-#define APCI1710_ENABLE_INDEX_INT               0x1
-#define APCI1710_DISABLE_INDEX_INT              (~APCI1710_ENABLE_INDEX_INT)
-
-#define APCI1710_ENABLE_FREQUENCY               0x4
-#define APCI1710_DISABLE_FREQUENCY              (~APCI1710_ENABLE_FREQUENCY)
-
-#define APCI1710_ENABLE_FREQUENCY_INT           0x8
-#define APCI1710_DISABLE_FREQUENCY_INT          (~APCI1710_ENABLE_FREQUENCY_INT)
-
-#define APCI1710_ENABLE_40MHZ_FREQUENCY         0x40
-#define APCI1710_DISABLE_40MHZ_FREQUENCY        (~APCI1710_ENABLE_40MHZ_FREQUENCY)
-
-#define APCI1710_ENABLE_40MHZ_FILTER            0x80
-#define APCI1710_DISABLE_40MHZ_FILTER           (~APCI1710_ENABLE_40MHZ_FILTER)
-
-#define APCI1710_ENABLE_COMPARE_INT             0x2
-#define APCI1710_DISABLE_COMPARE_INT            (~APCI1710_ENABLE_COMPARE_INT)
-
-#define APCI1710_ENABLE_INDEX_ACTION            0x20
-#define APCI1710_DISABLE_INDEX_ACTION           (~APCI1710_ENABLE_INDEX_ACTION)
-#define APCI1710_REFERENCE_HIGH                 0x40
-#define APCI1710_REFERENCE_LOW                  (~APCI1710_REFERENCE_HIGH)
-
-#define APCI1710_TOR_GATE_LOW                   0x40
-#define APCI1710_TOR_GATE_HIGH                  (~APCI1710_TOR_GATE_LOW)
-
-/* INSN CONFIG */
-#define APCI1710_INCCPT_INITCOUNTER                             100
-#define APCI1710_INCCPT_COUNTERAUTOTEST                         101
-#define APCI1710_INCCPT_INITINDEX                               102
-#define APCI1710_INCCPT_INITREFERENCE                           103
-#define APCI1710_INCCPT_INITEXTERNALSTROBE                      104
-#define APCI1710_INCCPT_INITCOMPARELOGIC                        105
-#define APCI1710_INCCPT_INITFREQUENCYMEASUREMENT                106
-
-/* INSN READ */
-#define APCI1710_INCCPT_READLATCHREGISTERSTATUS                 200
-#define APCI1710_INCCPT_READLATCHREGISTERVALUE                  201
-#define APCI1710_INCCPT_READ16BITCOUNTERVALUE                   202
-#define APCI1710_INCCPT_READ32BITCOUNTERVALUE                   203
-#define APCI1710_INCCPT_GETINDEXSTATUS                          204
-#define APCI1710_INCCPT_GETREFERENCESTATUS                      205
-#define APCI1710_INCCPT_GETUASSTATUS                            206
-#define APCI1710_INCCPT_GETCBSTATUS                             207
-#define APCI1710_INCCPT_GET16BITCBSTATUS                        208
-#define APCI1710_INCCPT_GETUDSTATUS                             209
-#define APCI1710_INCCPT_GETINTERRUPTUDLATCHEDSTATUS             210
-#define APCI1710_INCCPT_READFREQUENCYMEASUREMENT                211
-#define APCI1710_INCCPT_READINTERRUPT                           212
-
-/* INSN BITS */
-#define APCI1710_INCCPT_CLEARCOUNTERVALUE                       300
-#define APCI1710_INCCPT_CLEARALLCOUNTERVALUE                    301
-#define APCI1710_INCCPT_SETINPUTFILTER                          302
-#define APCI1710_INCCPT_LATCHCOUNTER                            303
-#define APCI1710_INCCPT_SETINDEXANDREFERENCESOURCE              304
-#define APCI1710_INCCPT_SETDIGITALCHLON                         305
-#define APCI1710_INCCPT_SETDIGITALCHLOFF                        306
-
-/* INSN WRITE */
-#define APCI1710_INCCPT_ENABLELATCHINTERRUPT                    400
-#define APCI1710_INCCPT_DISABLELATCHINTERRUPT                   401
-#define APCI1710_INCCPT_WRITE16BITCOUNTERVALUE                  402
-#define APCI1710_INCCPT_WRITE32BITCOUNTERVALUE                  403
-#define APCI1710_INCCPT_ENABLEINDEX                             404
-#define APCI1710_INCCPT_DISABLEINDEX                            405
-#define APCI1710_INCCPT_ENABLECOMPARELOGIC                      406
-#define APCI1710_INCCPT_DISABLECOMPARELOGIC                     407
-#define APCI1710_INCCPT_ENABLEFREQUENCYMEASUREMENT              408
-#define APCI1710_INCCPT_DISABLEFREQUENCYMEASUREMENT             409
-
-/************ Main Functions *************/
-int i_APCI1710_InsnConfigINCCPT(struct comedi_device *dev, struct comedi_subdevice *s,
-                                struct comedi_insn *insn, unsigned int * data);
-
-int i_APCI1710_InsnBitsINCCPT(struct comedi_device *dev, struct comedi_subdevice * s,
-                              struct comedi_insn *insn, unsigned int * data);
-
-int i_APCI1710_InsnWriteINCCPT(struct comedi_device *dev, struct comedi_subdevice * s,
-                               struct comedi_insn *insn, unsigned int * data);
-
-int i_APCI1710_InsnReadINCCPT(struct comedi_device *dev, struct comedi_subdevice * s,
-                              struct comedi_insn *insn, unsigned int * data);
-
-/*********** Supplementary Functions********/
-
-/* INSN CONFIG */
-int i_APCI1710_InitCounter(struct comedi_device *dev,
-                           unsigned char b_ModulNbr,
-                           unsigned char b_CounterRange,
-                           unsigned char b_FirstCounterModus,
-                           unsigned char b_FirstCounterOption,
-                           unsigned char b_SecondCounterModus,
-                           unsigned char b_SecondCounterOption);
-
-int i_APCI1710_CounterAutoTest(struct comedi_device *dev, unsigned char * pb_TestStatus);
-
-int i_APCI1710_InitIndex(struct comedi_device *dev,
-                         unsigned char b_ModulNbr,
-                         unsigned char b_ReferenceAction,
-                         unsigned char b_IndexOperation, unsigned char b_AutoMode,
-                         unsigned char b_InterruptEnable);
-
-int i_APCI1710_InitReference(struct comedi_device *dev,
-                             unsigned char b_ModulNbr, unsigned char b_ReferenceLevel);
-
-int i_APCI1710_InitExternalStrobe(struct comedi_device *dev,
-                                  unsigned char b_ModulNbr, unsigned char b_ExternalStrobe,
-                                  unsigned char b_ExternalStrobeLevel);
-
-int i_APCI1710_InitCompareLogic(struct comedi_device *dev,
-                                unsigned char b_ModulNbr, unsigned int ui_CompareValue);
-
-int i_APCI1710_InitFrequencyMeasurement(struct comedi_device *dev,
-                                        unsigned char b_ModulNbr,
-                                        unsigned char b_PCIInputClock,
-                                        unsigned char b_TimingUnity,
-                                        unsigned int ul_TimingInterval,
-                                        unsigned int *pul_RealTimingInterval);
-
-/* INSN BITS */
-int i_APCI1710_ClearCounterValue(struct comedi_device *dev, unsigned char b_ModulNbr);
-
-int i_APCI1710_ClearAllCounterValue(struct comedi_device *dev);
-
-int i_APCI1710_SetInputFilter(struct comedi_device *dev,
-                              unsigned char b_ModulNbr, unsigned char b_PCIInputClock,
-                              unsigned char b_Filter);
-
-int i_APCI1710_LatchCounter(struct comedi_device *dev,
-                            unsigned char b_ModulNbr, unsigned char b_LatchReg);
-
-int i_APCI1710_SetIndexAndReferenceSource(struct comedi_device *dev,
-                                          unsigned char b_ModulNbr,
-                                          unsigned char b_SourceSelection);
-
-int i_APCI1710_SetDigitalChlOn(struct comedi_device *dev, unsigned char b_ModulNbr);
-
-int i_APCI1710_SetDigitalChlOff(struct comedi_device *dev, unsigned char b_ModulNbr);
-
-/* INSN WRITE */
-int i_APCI1710_EnableLatchInterrupt(struct comedi_device *dev, unsigned char b_ModulNbr);
-
-int i_APCI1710_DisableLatchInterrupt(struct comedi_device *dev, unsigned char b_ModulNbr);
-
-int i_APCI1710_Write16BitCounterValue(struct comedi_device *dev,
-                                      unsigned char b_ModulNbr, unsigned char b_SelectedCounter,
-                                      unsigned int ui_WriteValue);
-
-int i_APCI1710_Write32BitCounterValue(struct comedi_device *dev,
-                                      unsigned char b_ModulNbr, unsigned int ul_WriteValue);
-
-int i_APCI1710_EnableIndex(struct comedi_device *dev, unsigned char b_ModulNbr);
-
-int i_APCI1710_DisableIndex(struct comedi_device *dev, unsigned char b_ModulNbr);
-
-int i_APCI1710_EnableCompareLogic(struct comedi_device *dev, unsigned char b_ModulNbr);
-
-int i_APCI1710_DisableCompareLogic(struct comedi_device *dev, unsigned char b_ModulNbr);
-
-int i_APCI1710_EnableFrequencyMeasurement(struct comedi_device *dev,
-                                          unsigned char b_ModulNbr,
-                                          unsigned char b_InterruptEnable);
-
-int i_APCI1710_DisableFrequencyMeasurement(struct comedi_device *dev,
-                                           unsigned char b_ModulNbr);
-
-/* INSN READ */
-int i_APCI1710_ReadLatchRegisterStatus(struct comedi_device *dev,
-                                       unsigned char b_ModulNbr, unsigned char b_LatchReg,
-                                       unsigned char *pb_LatchStatus);
-
-int i_APCI1710_ReadLatchRegisterValue(struct comedi_device *dev,
-                                      unsigned char b_ModulNbr, unsigned char b_LatchReg,
-                                      unsigned int *pul_LatchValue);
-
-int i_APCI1710_Read16BitCounterValue(struct comedi_device *dev,
-                                     unsigned char b_ModulNbr, unsigned char b_SelectedCounter,
-                                     unsigned int *pui_CounterValue);
-
-int i_APCI1710_Read32BitCounterValue(struct comedi_device *dev,
-                                     unsigned char b_ModulNbr, unsigned int *pul_CounterValue);
-
-int i_APCI1710_GetIndexStatus(struct comedi_device *dev,
-                              unsigned char b_ModulNbr, unsigned char *pb_IndexStatus);
-
-int i_APCI1710_GetReferenceStatus(struct comedi_device *dev,
-                                  unsigned char b_ModulNbr, unsigned char *pb_ReferenceStatus);
-
-int i_APCI1710_GetUASStatus(struct comedi_device *dev,
-                            unsigned char b_ModulNbr, unsigned char *pb_UASStatus);
-
-int i_APCI1710_GetCBStatus(struct comedi_device *dev,
-                           unsigned char b_ModulNbr, unsigned char *pb_CBStatus);
-
-int i_APCI1710_Get16BitCBStatus(struct comedi_device *dev,
-                                unsigned char b_ModulNbr, unsigned char *pb_CBStatusCounter0,
-                                unsigned char *pb_CBStatusCounter1);
-
-int i_APCI1710_GetUDStatus(struct comedi_device *dev,
-                           unsigned char b_ModulNbr, unsigned char *pb_UDStatus);
-
-int i_APCI1710_GetInterruptUDLatchedStatus(struct comedi_device *dev,
-                                           unsigned char b_ModulNbr, unsigned char *pb_UDStatus);
-
-int i_APCI1710_ReadFrequencyMeasurement(struct comedi_device *dev,
-                                        unsigned char b_ModulNbr,
-                                        unsigned char *pb_Status, unsigned char *pb_UDStatus,
-                                        unsigned int *pul_ReadValue);
diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_Inp_cpt.c b/drivers/staging/comedi/drivers/addi-data/APCI1710_Inp_cpt.c
index 3f9cfa20d886..be0c6adbdc94 100644
--- a/drivers/staging/comedi/drivers/addi-data/APCI1710_Inp_cpt.c
+++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_Inp_cpt.c
@@ -49,13 +49,11 @@ You should also find the complete GPL in the COPYING file accompanying this sour
   +-----------------------------------------------------------------------+
 */
 
-/*
-+----------------------------------------------------------------------------+
-|                               Included files                               |
-+----------------------------------------------------------------------------+
-*/
+#define APCI1710_SINGLE                 0
+#define APCI1710_CONTINUOUS             1
 
-#include "APCI1710_Inp_cpt.h"
+#define APCI1710_PULSEENCODER_READ      0
+#define APCI1710_PULSEENCODER_WRITE     1
 
 /*
 +----------------------------------------------------------------------------+
@@ -123,12 +121,14 @@ You should also find the complete GPL in the COPYING file accompanying this sour
 +----------------------------------------------------------------------------+
 */
 
-int i_APCI1710_InsnConfigInitPulseEncoder(struct comedi_device *dev,
-        struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data)
+static int i_APCI1710_InsnConfigInitPulseEncoder(struct comedi_device *dev,
+                                                 struct comedi_subdevice *s,
+                                                 struct comedi_insn *insn,
+                                                 unsigned int *data)
 {
+        struct addi_private *devpriv = dev->private;
         int i_ReturnValue = 0;
         unsigned int dw_IntRegister;
-
         unsigned char b_ModulNbr;
         unsigned char b_PulseEncoderNbr;
         unsigned char b_InputLevelSelection;
@@ -414,9 +414,12 @@ int i_APCI1710_InsnConfigInitPulseEncoder(struct comedi_device *dev,
 +----------------------------------------------------------------------------+
 */
 
-int i_APCI1710_InsnWriteEnableDisablePulseEncoder(struct comedi_device *dev,
-        struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data)
+static int i_APCI1710_InsnWriteEnableDisablePulseEncoder(struct comedi_device *dev,
+                                                         struct comedi_subdevice *s,
+                                                         struct comedi_insn *insn,
+                                                         unsigned int *data)
 {
+        struct addi_private *devpriv = dev->private;
         int i_ReturnValue = 0;
         unsigned char b_ModulNbr;
         unsigned char b_PulseEncoderNbr;
@@ -708,9 +711,12 @@ int i_APCI1710_InsnWriteEnableDisablePulseEncoder(struct comedi_device *dev,
 
                                                  unsigned char *_ pb_Status)
                                                  */
-int i_APCI1710_InsnBitsReadWritePulseEncoder(struct comedi_device *dev,
-        struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data)
+static int i_APCI1710_InsnBitsReadWritePulseEncoder(struct comedi_device *dev,
+                                                    struct comedi_subdevice *s,
+                                                    struct comedi_insn *insn,
+                                                    unsigned int *data)
 {
+        struct addi_private *devpriv = dev->private;
         int i_ReturnValue = 0;
         unsigned int dw_StatusRegister;
         unsigned char b_ModulNbr;
@@ -834,9 +840,12 @@ int i_APCI1710_InsnBitsReadWritePulseEncoder(struct comedi_device *dev,
         return i_ReturnValue;
 }
 
-int i_APCI1710_InsnReadInterruptPulseEncoder(struct comedi_device *dev,
-        struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data)
+static int i_APCI1710_InsnReadInterruptPulseEncoder(struct comedi_device *dev,
+                                                    struct comedi_subdevice *s,
+                                                    struct comedi_insn *insn,
+                                                    unsigned int *data)
 {
+        struct addi_private *devpriv = dev->private;
 
         data[0] = devpriv->s_InterruptParameters.
                 s_FIFOInterruptParameters[devpriv->
diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_Inp_cpt.h b/drivers/staging/comedi/drivers/addi-data/APCI1710_Inp_cpt.h
deleted file mode 100644
index 31fbb0bec52a..000000000000
--- a/drivers/staging/comedi/drivers/addi-data/APCI1710_Inp_cpt.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2004,2005  ADDI-DATA GmbH for the source code of this module.
- *
- *      ADDI-DATA GmbH
- *      Dieselstrasse 3
- *      D-77833 Ottersweier
- *      Tel: +19(0)7223/9493-0
- *      Fax: +49(0)7223/9493-92
- *      http://www.addi-data.com
- *      info@addi-data.com
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- */
-
-#define APCI1710_SINGLE                 0
-#define APCI1710_CONTINUOUS             1
-
-#define APCI1710_PULSEENCODER_READ      0
-#define APCI1710_PULSEENCODER_WRITE     1
-
-int i_APCI1710_InsnConfigInitPulseEncoder(struct comedi_device *dev,
-                                          struct comedi_subdevice *s,
-                                          struct comedi_insn *insn, unsigned int *data);
-
-int i_APCI1710_InsnWriteEnableDisablePulseEncoder(struct comedi_device *dev,
-                                                  struct comedi_subdevice *s,
-                                                  struct comedi_insn *insn,
-                                                  unsigned int *data);
-
-/*
- * READ PULSE ENCODER FUNCTIONS
- */
-int i_APCI1710_InsnReadInterruptPulseEncoder(struct comedi_device *dev,
-                                             struct comedi_subdevice *s,
-                                             struct comedi_insn *insn,
-                                             unsigned int *data);
-
-/*
- * WRITE PULSE ENCODER FUNCTIONS
- */
-int i_APCI1710_InsnBitsReadWritePulseEncoder(struct comedi_device *dev,
-                                             struct comedi_subdevice *s,
-                                             struct comedi_insn *insn,
-                                             unsigned int *data);
diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_Pwm.c b/drivers/staging/comedi/drivers/addi-data/APCI1710_Pwm.c
index 8883e6662115..a211e78dd3ba 100644
--- a/drivers/staging/comedi/drivers/addi-data/APCI1710_Pwm.c
+++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_Pwm.c
@@ -47,72 +47,16 @@ You should also find the complete GPL in the COPYING file accompanying this sour
   +-----------------------------------------------------------------------+
 */
 
-/*
-+----------------------------------------------------------------------------+
-|                               Included files                               |
-+----------------------------------------------------------------------------+
-*/
-
-#include "APCI1710_Pwm.h"
-
-/*
-+----------------------------------------------------------------------------+
-| Function Name     :INT i_APCI1710_InsnConfigPWM(struct comedi_device *dev,
-struct comedi_subdevice *s,struct comedi_insn *insn,unsigned int *data)                        |
-+----------------------------------------------------------------------------+
-| Task              : Pwm Init and Get Pwm Initialisation                    |
-+----------------------------------------------------------------------------+
-| Input Parameters  :
-+----------------------------------------------------------------------------+
-| Output Parameters : -                                                      |
-+----------------------------------------------------------------------------+
-| Return Value      :
-+----------------------------------------------------------------------------+
-*/
+#define APCI1710_30MHZ                  30
+#define APCI1710_33MHZ                  33
+#define APCI1710_40MHZ                  40
 
-int i_APCI1710_InsnConfigPWM(struct comedi_device *dev, struct comedi_subdevice *s,
-        struct comedi_insn *insn, unsigned int *data)
-{
-        unsigned char b_ConfigType;
-        int i_ReturnValue = 0;
-        b_ConfigType = CR_CHAN(insn->chanspec);
+#define APCI1710_PWM_INIT               0
+#define APCI1710_PWM_GETINITDATA        1
 
-        switch (b_ConfigType) {
-        case APCI1710_PWM_INIT:
-                i_ReturnValue = i_APCI1710_InitPWM(dev, (unsigned char) CR_AREF(insn->chanspec),        /*   b_ModulNbr */
-                        (unsigned char) data[0],        /* b_PWM */
-                        (unsigned char) data[1],        /*  b_ClockSelection */
-                        (unsigned char) data[2],        /*  b_TimingUnit */
-                        (unsigned int) data[3], /* ul_LowTiming */
-                        (unsigned int) data[4], /* ul_HighTiming */
-                        (unsigned int *) &data[0],      /* pul_RealLowTiming */
-                        (unsigned int *) &data[1]       /* pul_RealHighTiming */
-                        );
-                break;
-
-        case APCI1710_PWM_GETINITDATA:
-                i_ReturnValue = i_APCI1710_GetPWMInitialisation(dev, (unsigned char) CR_AREF(insn->chanspec),   /*  b_ModulNbr */
-                        (unsigned char) data[0],        /* b_PWM */
-                        (unsigned char *) &data[0],     /* pb_TimingUnit */
-                        (unsigned int *) &data[1],      /* pul_LowTiming */
-                        (unsigned int *) &data[2],      /* pul_HighTiming */
-                        (unsigned char *) &data[3],     /*  pb_StartLevel */
-                        (unsigned char *) &data[4],     /*  pb_StopMode */
-                        (unsigned char *) &data[5],     /*  pb_StopLevel */
-                        (unsigned char *) &data[6],     /*  pb_ExternGate */
-                        (unsigned char *) &data[7],     /*  pb_InterruptEnable */
-                        (unsigned char *) &data[8]      /*  pb_Enable */
-                        );
-                break;
-
-        default:
-                printk(" Config Parameter Wrong\n");
-        }
-
-        if (i_ReturnValue >= 0)
-                i_ReturnValue = insn->n;
-        return i_ReturnValue;
-}
+#define APCI1710_PWM_DISABLE            0
+#define APCI1710_PWM_ENABLE             1
+#define APCI1710_PWM_NEWTIMING          2
 
 /*
 +----------------------------------------------------------------------------+
@@ -178,16 +122,17 @@ int i_APCI1710_InsnConfigPWM(struct comedi_device *dev, struct comedi_subdevice
 |                        this board                                          |
 +----------------------------------------------------------------------------+
 */
-
-int i_APCI1710_InitPWM(struct comedi_device *dev,
-        unsigned char b_ModulNbr,
-        unsigned char b_PWM,
-        unsigned char b_ClockSelection,
-        unsigned char b_TimingUnit,
-        unsigned int ul_LowTiming,
-        unsigned int ul_HighTiming,
-        unsigned int *pul_RealLowTiming, unsigned int *pul_RealHighTiming)
+static int i_APCI1710_InitPWM(struct comedi_device *dev,
+                              unsigned char b_ModulNbr,
+                              unsigned char b_PWM,
+                              unsigned char b_ClockSelection,
+                              unsigned char b_TimingUnit,
+                              unsigned int ul_LowTiming,
+                              unsigned int ul_HighTiming,
+                              unsigned int *pul_RealLowTiming,
+                              unsigned int *pul_RealHighTiming)
 {
+        struct addi_private *devpriv = dev->private;
         int i_ReturnValue = 0;
         unsigned int ul_LowTimerValue = 0;
         unsigned int ul_HighTimerValue = 0;
@@ -1533,18 +1478,20 @@ int i_APCI1710_InitPWM(struct comedi_device *dev,
 |                         "i_APCI1710_InitPWM"                               |
 +----------------------------------------------------------------------------+
 */
-
-int i_APCI1710_GetPWMInitialisation(struct comedi_device *dev,
-        unsigned char b_ModulNbr,
-        unsigned char b_PWM,
-        unsigned char *pb_TimingUnit,
-        unsigned int *pul_LowTiming,
-        unsigned int *pul_HighTiming,
-        unsigned char *pb_StartLevel,
-        unsigned char *pb_StopMode,
-        unsigned char *pb_StopLevel,
-        unsigned char *pb_ExternGate, unsigned char *pb_InterruptEnable, unsigned char *pb_Enable)
+static int i_APCI1710_GetPWMInitialisation(struct comedi_device *dev,
+                                           unsigned char b_ModulNbr,
+                                           unsigned char b_PWM,
+                                           unsigned char *pb_TimingUnit,
+                                           unsigned int *pul_LowTiming,
+                                           unsigned int *pul_HighTiming,
+                                           unsigned char *pb_StartLevel,
+                                           unsigned char *pb_StopMode,
+                                           unsigned char *pb_StopLevel,
+                                           unsigned char *pb_ExternGate,
+                                           unsigned char *pb_InterruptEnable,
+                                           unsigned char *pb_Enable)
 {
+        struct addi_private *devpriv = dev->private;
         int i_ReturnValue = 0;
         unsigned int dw_Status;
         unsigned int dw_Command;
@@ -1669,51 +1616,47 @@ int i_APCI1710_GetPWMInitialisation(struct comedi_device *dev,
 }
 
 /*
-+----------------------------------------------------------------------------+
-| Function Name     :INT i_APCI1710_InsnWritePWM(struct comedi_device *dev,
-struct comedi_subdevice *s,struct comedi_insn *insn,unsigned int *data)                        |
-+----------------------------------------------------------------------------+
-| Task              : Pwm Enable Disable and Set New Timing                  |
-+----------------------------------------------------------------------------+
-| Input Parameters  :
-+----------------------------------------------------------------------------+
-| Output Parameters : -                                                      |
-+----------------------------------------------------------------------------+
-| Return Value      :
-+----------------------------------------------------------------------------+
-*/
-
-int i_APCI1710_InsnWritePWM(struct comedi_device *dev, struct comedi_subdevice *s,
-        struct comedi_insn *insn, unsigned int *data)
+ * Pwm Init and Get Pwm Initialisation
+ */
+static int i_APCI1710_InsnConfigPWM(struct comedi_device *dev,
+                                    struct comedi_subdevice *s,
+                                    struct comedi_insn *insn,
+                                    unsigned int *data)
 {
-        unsigned char b_WriteType;
+        unsigned char b_ConfigType;
         int i_ReturnValue = 0;
-        b_WriteType = CR_CHAN(insn->chanspec);
-
-        switch (b_WriteType) {
-        case APCI1710_PWM_ENABLE:
-                i_ReturnValue = i_APCI1710_EnablePWM(dev,
-                        (unsigned char) CR_AREF(insn->chanspec),
-                        (unsigned char) data[0],
-                        (unsigned char) data[1],
-                        (unsigned char) data[2],
-                        (unsigned char) data[3], (unsigned char) data[4], (unsigned char) data[5]);
-                break;
+        b_ConfigType = CR_CHAN(insn->chanspec);
 
-        case APCI1710_PWM_DISABLE:
-                i_ReturnValue = i_APCI1710_DisablePWM(dev,
-                        (unsigned char) CR_AREF(insn->chanspec), (unsigned char) data[0]);
+        switch (b_ConfigType) {
+        case APCI1710_PWM_INIT:
+                i_ReturnValue = i_APCI1710_InitPWM(dev, (unsigned char) CR_AREF(insn->chanspec),        /*   b_ModulNbr */
+                        (unsigned char) data[0],        /* b_PWM */
+                        (unsigned char) data[1],        /*  b_ClockSelection */
+                        (unsigned char) data[2],        /*  b_TimingUnit */
+                        (unsigned int) data[3], /* ul_LowTiming */
+                        (unsigned int) data[4], /* ul_HighTiming */
+                        (unsigned int *) &data[0],      /* pul_RealLowTiming */
+                        (unsigned int *) &data[1]       /* pul_RealHighTiming */
+                        );
                 break;
 
-        case APCI1710_PWM_NEWTIMING:
-                i_ReturnValue = i_APCI1710_SetNewPWMTiming(dev,
-                        (unsigned char) CR_AREF(insn->chanspec),
-                        (unsigned char) data[0],
-                        (unsigned char) data[1], (unsigned int) data[2], (unsigned int) data[3]);
+        case APCI1710_PWM_GETINITDATA:
+                i_ReturnValue = i_APCI1710_GetPWMInitialisation(dev, (unsigned char) CR_AREF(insn->chanspec),   /*  b_ModulNbr */
+                        (unsigned char) data[0],        /* b_PWM */
+                        (unsigned char *) &data[0],     /* pb_TimingUnit */
+                        (unsigned int *) &data[1],      /* pul_LowTiming */
+                        (unsigned int *) &data[2],      /* pul_HighTiming */
+                        (unsigned char *) &data[3],     /*  pb_StartLevel */
+                        (unsigned char *) &data[4],     /*  pb_StopMode */
+                        (unsigned char *) &data[5],     /*  pb_StopLevel */
+                        (unsigned char *) &data[6],     /*  pb_ExternGate */
+                        (unsigned char *) &data[7],     /*  pb_InterruptEnable */
+                        (unsigned char *) &data[8]      /*  pb_Enable */
+                        );
                 break;
 
         default:
-                printk("Write Config Parameter Wrong\n");
+                printk(" Config Parameter Wrong\n");
         }
 
         if (i_ReturnValue >= 0)
@@ -1805,14 +1748,16 @@ int i_APCI1710_InsnWritePWM(struct comedi_device *dev, struct comedi_subdevice *
 |                         See function "i_APCI1710_SetBoardIntRoutineX"      |
 +----------------------------------------------------------------------------+
 */
-
-int i_APCI1710_EnablePWM(struct comedi_device *dev,
-        unsigned char b_ModulNbr,
-        unsigned char b_PWM,
-        unsigned char b_StartLevel,
-        unsigned char b_StopMode,
-        unsigned char b_StopLevel, unsigned char b_ExternGate, unsigned char b_InterruptEnable)
+static int i_APCI1710_EnablePWM(struct comedi_device *dev,
+                                unsigned char b_ModulNbr,
+                                unsigned char b_PWM,
+                                unsigned char b_StartLevel,
+                                unsigned char b_StopMode,
+                                unsigned char b_StopLevel,
+                                unsigned char b_ExternGate,
+                                unsigned char b_InterruptEnable)
 {
+        struct addi_private *devpriv = dev->private;
         int i_ReturnValue = 0;
         unsigned int dw_Status;
         unsigned int dw_Command;
@@ -2061,9 +2006,11 @@ int i_APCI1710_EnablePWM(struct comedi_device *dev,
 |                         "i_APCI1710_EnablePWM"                             |
 +----------------------------------------------------------------------------+
 */
-
-int i_APCI1710_DisablePWM(struct comedi_device *dev, unsigned char b_ModulNbr, unsigned char b_PWM)
+static int i_APCI1710_DisablePWM(struct comedi_device *dev,
+                                 unsigned char b_ModulNbr,
+                                 unsigned char b_PWM)
 {
+        struct addi_private *devpriv = dev->private;
         int i_ReturnValue = 0;
         unsigned int dw_Status;
 
@@ -2188,11 +2135,14 @@ int i_APCI1710_DisablePWM(struct comedi_device *dev, unsigned char b_ModulNbr, u
 |                    -8: High base timing selection is wrong                 |
 +----------------------------------------------------------------------------+
 */
-
-int i_APCI1710_SetNewPWMTiming(struct comedi_device *dev,
-        unsigned char b_ModulNbr,
-        unsigned char b_PWM, unsigned char b_TimingUnit, unsigned int ul_LowTiming, unsigned int ul_HighTiming)
+static int i_APCI1710_SetNewPWMTiming(struct comedi_device *dev,
+                                      unsigned char b_ModulNbr,
+                                      unsigned char b_PWM,
+                                      unsigned char b_TimingUnit,
+                                      unsigned int ul_LowTiming,
+                                      unsigned int ul_HighTiming)
 {
+        struct addi_private *devpriv = dev->private;
         unsigned char b_ClockSelection;
         int i_ReturnValue = 0;
         unsigned int ul_LowTimerValue = 0;
@@ -3415,6 +3365,49 @@ int i_APCI1710_SetNewPWMTiming(struct comedi_device *dev,
 }
 
 /*
+ * Pwm Enable Disable and Set New Timing
+ */
+static int i_APCI1710_InsnWritePWM(struct comedi_device *dev,
+                                   struct comedi_subdevice *s,
+                                   struct comedi_insn *insn,
+                                   unsigned int *data)
+{
+        unsigned char b_WriteType;
+        int i_ReturnValue = 0;
+        b_WriteType = CR_CHAN(insn->chanspec);
+
+        switch (b_WriteType) {
+        case APCI1710_PWM_ENABLE:
+                i_ReturnValue = i_APCI1710_EnablePWM(dev,
+                        (unsigned char) CR_AREF(insn->chanspec),
+                        (unsigned char) data[0],
+                        (unsigned char) data[1],
+                        (unsigned char) data[2],
+                        (unsigned char) data[3], (unsigned char) data[4], (unsigned char) data[5]);
+                break;
+
+        case APCI1710_PWM_DISABLE:
+                i_ReturnValue = i_APCI1710_DisablePWM(dev,
+                        (unsigned char) CR_AREF(insn->chanspec), (unsigned char) data[0]);
+                break;
+
+        case APCI1710_PWM_NEWTIMING:
+                i_ReturnValue = i_APCI1710_SetNewPWMTiming(dev,
+                        (unsigned char) CR_AREF(insn->chanspec),
+                        (unsigned char) data[0],
+                        (unsigned char) data[1], (unsigned int) data[2], (unsigned int) data[3]);
+                break;
+
+        default:
+                printk("Write Config Parameter Wrong\n");
+        }
+
+        if (i_ReturnValue >= 0)
+                i_ReturnValue = insn->n;
+        return i_ReturnValue;
+}
+
+/*
 +----------------------------------------------------------------------------+
 | Function Name     : _INT_ i_APCI1710_GetPWMStatus                          |
 |                               (unsigned char_    b_BoardHandle,                     |
@@ -3459,13 +3452,14 @@ int i_APCI1710_SetNewPWMTiming(struct comedi_device *dev,
 |                     -6: PWM not enabled see function "i_APCI1710_EnablePWM"|
 +----------------------------------------------------------------------------+
 */
-
-int i_APCI1710_InsnReadGetPWMStatus(struct comedi_device *dev, struct comedi_subdevice *s,
-        struct comedi_insn *insn, unsigned int *data)
+static int i_APCI1710_InsnReadGetPWMStatus(struct comedi_device *dev,
+                                           struct comedi_subdevice *s,
+                                           struct comedi_insn *insn,
+                                           unsigned int *data)
 {
+        struct addi_private *devpriv = dev->private;
         int i_ReturnValue = 0;
         unsigned int dw_Status;
-
         unsigned char b_ModulNbr;
         unsigned char b_PWM;
         unsigned char *pb_PWMOutputStatus;
@@ -3561,9 +3555,13 @@ int i_APCI1710_InsnReadGetPWMStatus(struct comedi_device *dev, struct comedi_sub
         return i_ReturnValue;
 }
 
-int i_APCI1710_InsnBitsReadPWMInterrupt(struct comedi_device *dev,
-        struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data)
+static int i_APCI1710_InsnBitsReadPWMInterrupt(struct comedi_device *dev,
+                                               struct comedi_subdevice *s,
+                                               struct comedi_insn *insn,
+                                               unsigned int *data)
 {
+        struct addi_private *devpriv = dev->private;
+
         data[0] = devpriv->s_InterruptParameters.
                 s_FIFOInterruptParameters[devpriv->
                 s_InterruptParameters.ui_Read].b_OldModuleMask;
diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_Pwm.h b/drivers/staging/comedi/drivers/addi-data/APCI1710_Pwm.h
deleted file mode 100644
index d8ad0b9cf509..000000000000
--- a/drivers/staging/comedi/drivers/addi-data/APCI1710_Pwm.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (C) 2004,2005  ADDI-DATA GmbH for the source code of this module.
- *
- *      ADDI-DATA GmbH
- *      Dieselstrasse 3
- *      D-77833 Ottersweier
- *      Tel: +19(0)7223/9493-0
- *      Fax: +49(0)7223/9493-92
- *      http://www.addi-data.com
- *      info@addi-data.com
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- */
-
-#define APCI1710_30MHZ          30
-#define APCI1710_33MHZ          33
-#define APCI1710_40MHZ          40
-
-#define APCI1710_PWM_INIT               0
-#define APCI1710_PWM_GETINITDATA        1
-
-#define APCI1710_PWM_DISABLE            0
-#define APCI1710_PWM_ENABLE             1
-#define APCI1710_PWM_NEWTIMING          2
-
-int i_APCI1710_InsnConfigPWM(struct comedi_device *dev, struct comedi_subdevice *s,
-                             struct comedi_insn *insn, unsigned int *data);
-
-int i_APCI1710_InitPWM(struct comedi_device *dev,
-                       unsigned char b_ModulNbr,
-                       unsigned char b_PWM,
-                       unsigned char b_ClockSelection,
-                       unsigned char b_TimingUnit,
-                       unsigned int ul_LowTiming,
-                       unsigned int ul_HighTiming,
-                       unsigned int *pul_RealLowTiming, unsigned int *pul_RealHighTiming);
-
-int i_APCI1710_GetPWMInitialisation(struct comedi_device *dev,
-                                    unsigned char b_ModulNbr,
-                                    unsigned char b_PWM,
-                                    unsigned char *pb_TimingUnit,
-                                    unsigned int *pul_LowTiming,
-                                    unsigned int *pul_HighTiming,
-                                    unsigned char *pb_StartLevel,
-                                    unsigned char *pb_StopMode,
-                                    unsigned char *pb_StopLevel,
-                                    unsigned char *pb_ExternGate,
-                                    unsigned char *pb_InterruptEnable, unsigned char *pb_Enable);
-
-int i_APCI1710_InsnWritePWM(struct comedi_device *dev, struct comedi_subdevice *s,
-                            struct comedi_insn *insn, unsigned int *data);
-
-int i_APCI1710_EnablePWM(struct comedi_device *dev,
-                         unsigned char b_ModulNbr,
-                         unsigned char b_PWM,
-                         unsigned char b_StartLevel,
-                         unsigned char b_StopMode,
-                         unsigned char b_StopLevel, unsigned char b_ExternGate,
-                         unsigned char b_InterruptEnable);
-
-int i_APCI1710_SetNewPWMTiming(struct comedi_device *dev,
-                               unsigned char b_ModulNbr,
-                               unsigned char b_PWM, unsigned char b_TimingUnit,
-                               unsigned int ul_LowTiming, unsigned int ul_HighTiming);
-
-int i_APCI1710_DisablePWM(struct comedi_device *dev, unsigned char b_ModulNbr, unsigned char b_PWM);
-
-int i_APCI1710_InsnReadGetPWMStatus(struct comedi_device *dev, struct comedi_subdevice *s,
-                                    struct comedi_insn *insn, unsigned int *data);
-
-int i_APCI1710_InsnBitsReadPWMInterrupt(struct comedi_device *dev,
-                                        struct comedi_subdevice *s,
-                                        struct comedi_insn *insn, unsigned int *data);
diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_Ssi.c b/drivers/staging/comedi/drivers/addi-data/APCI1710_Ssi.c
index c13b00274923..1e05732e9f3d 100644
--- a/drivers/staging/comedi/drivers/addi-data/APCI1710_Ssi.c
+++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_Ssi.c
@@ -40,13 +40,20 @@ You should also find the complete GPL in the COPYING file accompanying this sour
   +-----------------------------------------------------------------------+
 */
 
-/*
-+----------------------------------------------------------------------------+
-|                               Included files                               |
-+----------------------------------------------------------------------------+
-*/
+#define APCI1710_30MHZ                  30
+#define APCI1710_33MHZ                  33
+#define APCI1710_40MHZ                  40
 
-#include "APCI1710_Ssi.h"
+#define APCI1710_BINARY_MODE            0x1
+#define APCI1710_GRAY_MODE              0x0
+
+#define APCI1710_SSI_READ1VALUE         1
+#define APCI1710_SSI_READALLVALUE       2
+
+#define APCI1710_SSI_SET_CHANNELON      0
+#define APCI1710_SSI_SET_CHANNELOFF     1
+#define APCI1710_SSI_READ_1CHANNEL      2
+#define APCI1710_SSI_READ_ALLCHANNEL    3
 
 /*
 +----------------------------------------------------------------------------+
@@ -119,9 +126,12 @@ You should also find the complete GPL in the COPYING file accompanying this sour
 +----------------------------------------------------------------------------+
 */
 
-int i_APCI1710_InsnConfigInitSSI(struct comedi_device *dev, struct comedi_subdevice *s,
-        struct comedi_insn *insn, unsigned int *data)
+static int i_APCI1710_InsnConfigInitSSI(struct comedi_device *dev,
+                                        struct comedi_subdevice *s,
+                                        struct comedi_insn *insn,
+                                        unsigned int *data)
 {
+        struct addi_private *devpriv = dev->private;
         int i_ReturnValue = 0;
         unsigned int ui_TimerValue;
         unsigned char b_ModulNbr, b_SSIProfile, b_PositionTurnLength, b_TurnCptLength,
@@ -386,9 +396,12 @@ pul_Position	=	(unsigned int *) &data[0];
 +----------------------------------------------------------------------------+
 */
 
-int i_APCI1710_InsnReadSSIValue(struct comedi_device *dev, struct comedi_subdevice *s,
-        struct comedi_insn *insn, unsigned int *data)
+static int i_APCI1710_InsnReadSSIValue(struct comedi_device *dev,
+                                       struct comedi_subdevice *s,
+                                       struct comedi_insn *insn,
+                                       unsigned int *data)
 {
+        struct addi_private *devpriv = dev->private;
         int i_ReturnValue = 0;
         unsigned char b_Cpt;
         unsigned char b_Length;
@@ -719,9 +732,12 @@ int i_APCI1710_InsnReadSSIValue(struct comedi_device *dev, struct comedi_subdevi
 +----------------------------------------------------------------------------+
 */
 
-int i_APCI1710_InsnBitsSSIDigitalIO(struct comedi_device *dev, struct comedi_subdevice *s,
-        struct comedi_insn *insn, unsigned int *data)
+static int i_APCI1710_InsnBitsSSIDigitalIO(struct comedi_device *dev,
+                                           struct comedi_subdevice *s,
+                                           struct comedi_insn *insn,
+                                           unsigned int *data)
 {
+        struct addi_private *devpriv = dev->private;
         int i_ReturnValue = 0;
         unsigned int dw_StatusReg;
         unsigned char b_ModulNbr;
@@ -729,6 +745,7 @@ int i_APCI1710_InsnBitsSSIDigitalIO(struct comedi_device *dev, struct comedi_sub
         unsigned char *pb_ChannelStatus;
         unsigned char *pb_InputStatus;
         unsigned char b_IOType;
+
         i_ReturnValue = insn->n;
         b_ModulNbr = (unsigned char) CR_AREF(insn->chanspec);
         b_IOType = (unsigned char) data[0];
diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_Ssi.h b/drivers/staging/comedi/drivers/addi-data/APCI1710_Ssi.h
deleted file mode 100644
index ef4d88789d55..000000000000
--- a/drivers/staging/comedi/drivers/addi-data/APCI1710_Ssi.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2004,2005  ADDI-DATA GmbH for the source code of this module.
- *
- *      ADDI-DATA GmbH
- *      Dieselstrasse 3
- *      D-77833 Ottersweier
- *      Tel: +19(0)7223/9493-0
- *      Fax: +49(0)7223/9493-92
- *      http://www.addi-data.com
- *      info@addi-data.com
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- */
-
-#define APCI1710_30MHZ          30
-#define APCI1710_33MHZ          33
-#define APCI1710_40MHZ          40
-
-#define APCI1710_BINARY_MODE    0x1
-#define APCI1710_GRAY_MODE      0x0
-
-#define APCI1710_SSI_READ1VALUE         1
-#define APCI1710_SSI_READALLVALUE       2
-
-#define APCI1710_SSI_SET_CHANNELON      0
-#define APCI1710_SSI_SET_CHANNELOFF     1
-#define APCI1710_SSI_READ_1CHANNEL      2
-#define APCI1710_SSI_READ_ALLCHANNEL    3
-
-/*
- * SSI INISIALISATION FUNCTION
- */
-int i_APCI1710_InsnConfigInitSSI(struct comedi_device *dev, struct comedi_subdevice *s,
-                                 struct comedi_insn *insn, unsigned int *data);
-
-int i_APCI1710_InsnReadSSIValue(struct comedi_device *dev, struct comedi_subdevice *s,
-                                struct comedi_insn *insn, unsigned int *data);
-
-int i_APCI1710_InsnBitsSSIDigitalIO(struct comedi_device *dev, struct comedi_subdevice *s,
-                                    struct comedi_insn *insn, unsigned int *data);
diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.c b/drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.c
index 0e6affd95962..3bc9826ce40b 100644
--- a/drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.c
+++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.c
@@ -52,13 +52,22 @@ You should also find the complete GPL in the COPYING file accompanying this sour
   +-----------------------------------------------------------------------+
 */
 
-/*
-+----------------------------------------------------------------------------+
-|                               Included files                               |
-+----------------------------------------------------------------------------+
-*/
+#define APCI1710_30MHZ                  30
+#define APCI1710_33MHZ                  33
+#define APCI1710_40MHZ                  40
 
-#include "APCI1710_Tor.h"
+#define APCI1710_GATE_INPUT             10
+
+#define APCI1710_TOR_SIMPLE_MODE        2
+#define APCI1710_TOR_DOUBLE_MODE        3
+#define APCI1710_TOR_QUADRUPLE_MODE     4
+
+#define APCI1710_SINGLE                 0
+#define APCI1710_CONTINUOUS             1
+
+#define APCI1710_TOR_GETPROGRESSSTATUS  0
+#define APCI1710_TOR_GETCOUNTERVALUE    1
+#define APCI1710_TOR_READINTERRUPT      2
 
 /*
 +----------------------------------------------------------------------------+
@@ -130,9 +139,12 @@ You should also find the complete GPL in the COPYING file accompanying this sour
 +----------------------------------------------------------------------------+
 */
 
-int i_APCI1710_InsnConfigInitTorCounter(struct comedi_device *dev,
-        struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data)
+static int i_APCI1710_InsnConfigInitTorCounter(struct comedi_device *dev,
+                                               struct comedi_subdevice *s,
+                                               struct comedi_insn *insn,
+                                               unsigned int *data)
 {
+        struct addi_private *devpriv = dev->private;
         int i_ReturnValue = 0;
         unsigned int ul_TimerValue = 0;
         unsigned int dw_Command;
@@ -987,9 +999,12 @@ int i_APCI1710_InsnConfigInitTorCounter(struct comedi_device *dev,
 +----------------------------------------------------------------------------+
 */
 
-int i_APCI1710_InsnWriteEnableDisableTorCounter(struct comedi_device *dev,
-        struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data)
+static int i_APCI1710_InsnWriteEnableDisableTorCounter(struct comedi_device *dev,
+                                                       struct comedi_subdevice *s,
+                                                       struct comedi_insn *insn,
+                                                       unsigned int *data)
 {
+        struct addi_private *devpriv = dev->private;
         int i_ReturnValue = 0;
         unsigned int dw_Status;
         unsigned int dw_DummyRead;
@@ -1460,9 +1475,12 @@ int i_APCI1710_InsnWriteEnableDisableTorCounter(struct comedi_device *dev,
 +----------------------------------------------------------------------------+
 */
 
-int i_APCI1710_InsnReadGetTorCounterInitialisation(struct comedi_device *dev,
-        struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data)
+static int i_APCI1710_InsnReadGetTorCounterInitialisation(struct comedi_device *dev,
+                                                          struct comedi_subdevice *s,
+                                                          struct comedi_insn *insn,
+                                                          unsigned int *data)
 {
+        struct addi_private *devpriv = dev->private;
         int i_ReturnValue = 0;
         unsigned int dw_Status;
         unsigned char b_ModulNbr;
@@ -1700,13 +1718,15 @@ int i_APCI1710_InsnReadGetTorCounterInitialisation(struct comedi_device *dev,
 +----------------------------------------------------------------------------+
 */
 
-int i_APCI1710_InsnBitsGetTorCounterProgressStatusAndValue(struct comedi_device *dev,
-        struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data)
+static int i_APCI1710_InsnBitsGetTorCounterProgressStatusAndValue(struct comedi_device *dev,
+                                                                  struct comedi_subdevice *s,
+                                                                  struct comedi_insn *insn,
+                                                                  unsigned int *data)
 {
+        struct addi_private *devpriv = dev->private;
         int i_ReturnValue = 0;
         unsigned int dw_Status;
         unsigned int dw_TimeOut = 0;
-
         unsigned char b_ModulNbr;
         unsigned char b_TorCounter;
         unsigned char b_ReadType;
diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.h b/drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.h
deleted file mode 100644
index 537d4755132e..000000000000
--- a/drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (C) 2004,2005  ADDI-DATA GmbH for the source code of this module.
- *
- *      ADDI-DATA GmbH
- *      Dieselstrasse 3
- *      D-77833 Ottersweier
- *      Tel: +19(0)7223/9493-0
- *      Fax: +49(0)7223/9493-92
- *      http://www.addi-data.com
- *      info@addi-data.com
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- */
-
-#define APCI1710_30MHZ          30
-#define APCI1710_33MHZ          33
-#define APCI1710_40MHZ          40
-
-#define APCI1710_GATE_INPUT     10
-
-#define APCI1710_TOR_SIMPLE_MODE        2
-#define APCI1710_TOR_DOUBLE_MODE        3
-#define APCI1710_TOR_QUADRUPLE_MODE     4
-
-#define APCI1710_SINGLE                 0
-#define APCI1710_CONTINUOUS             1
-
-#define APCI1710_TOR_GETPROGRESSSTATUS  0
-#define APCI1710_TOR_GETCOUNTERVALUE    1
-#define APCI1710_TOR_READINTERRUPT      2
-
-/*
- * TOR_COUNTER INISIALISATION FUNCTION
- */
-int i_APCI1710_InsnConfigInitTorCounter(struct comedi_device *dev,
-                                        struct comedi_subdevice *s,
-                                        struct comedi_insn *insn, unsigned int *data);
-
-int i_APCI1710_InsnWriteEnableDisableTorCounter(struct comedi_device *dev,
-                                                struct comedi_subdevice *s,
-                                                struct comedi_insn *insn,
-                                                unsigned int *data);
-
-int i_APCI1710_InsnReadGetTorCounterInitialisation(struct comedi_device *dev,
-                                                   struct comedi_subdevice *s,
-                                                   struct comedi_insn *insn,
-                                                   unsigned int *data);
-/*
- * TOR_COUNTER READ FUNCTION
- */
-int i_APCI1710_InsnBitsGetTorCounterProgressStatusAndValue(struct comedi_device *dev,
-                                                           struct comedi_subdevice *s,
-                                                           struct comedi_insn *insn,
-                                                           unsigned int *data);
diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_Ttl.c b/drivers/staging/comedi/drivers/addi-data/APCI1710_Ttl.c
index 9e177f4af861..c8238b8921cd 100644
--- a/drivers/staging/comedi/drivers/addi-data/APCI1710_Ttl.c
+++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_Ttl.c
@@ -52,13 +52,11 @@ You should also find the complete GPL in the COPYING file accompanying this sour
   +-----------------------------------------------------------------------+
 */
 
-/*
-+----------------------------------------------------------------------------+
-|                               Included files                               |
-+----------------------------------------------------------------------------+
-*/
+#define APCI1710_TTL_INIT               0
+#define APCI1710_TTL_INITDIRECTION      1
 
-#include "APCI1710_Ttl.h"
+#define APCI1710_TTL_READCHANNEL        0
+#define APCI1710_TTL_READPORT           1
 
 /*
 +----------------------------------------------------------------------------+
@@ -100,9 +98,12 @@ You should also find the complete GPL in the COPYING file accompanying this sour
 +----------------------------------------------------------------------------+
 */
 
-int i_APCI1710_InsnConfigInitTTLIO(struct comedi_device *dev, struct comedi_subdevice *s,
-        struct comedi_insn *insn, unsigned int *data)
+static int i_APCI1710_InsnConfigInitTTLIO(struct comedi_device *dev,
+                                          struct comedi_subdevice *s,
+                                          struct comedi_insn *insn,
+                                          unsigned int *data)
 {
+        struct addi_private *devpriv = dev->private;
         int i_ReturnValue = 0;
         unsigned char b_ModulNbr;
         unsigned char b_InitType;
@@ -406,9 +407,12 @@ APCI1710_TTL_READCHANNEL
 +----------------------------------------------------------------------------+
 */
 
-int i_APCI1710_InsnBitsReadTTLIO(struct comedi_device *dev, struct comedi_subdevice *s,
-        struct comedi_insn *insn, unsigned int *data)
+static int i_APCI1710_InsnBitsReadTTLIO(struct comedi_device *dev,
+                                        struct comedi_subdevice *s,
+                                        struct comedi_insn *insn,
+                                        unsigned int *data)
 {
+        struct addi_private *devpriv = dev->private;
         int i_ReturnValue = 0;
         unsigned int dw_StatusReg;
         unsigned char b_ModulNbr;
@@ -655,9 +659,12 @@ int i_APCI1710_InsnBitsReadTTLIO(struct comedi_device *dev, struct comedi_subdev
 +----------------------------------------------------------------------------+
 */
 
-int i_APCI1710_InsnReadTTLIOAllPortValue(struct comedi_device *dev,
-        struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data)
+static int i_APCI1710_InsnReadTTLIOAllPortValue(struct comedi_device *dev,
+                                                struct comedi_subdevice *s,
+                                                struct comedi_insn *insn,
+                                                unsigned int *data)
 {
+        struct addi_private *devpriv = dev->private;
         int i_ReturnValue = 0;
         unsigned int dw_StatusReg;
         unsigned char b_ModulNbr;
@@ -825,9 +832,12 @@ int i_APCI1710_InsnWriteSetTTLIOChlOnOff(struct comedi_device *dev,struct comedi
 +----------------------------------------------------------------------------+
 */
 
-int i_APCI1710_InsnWriteSetTTLIOChlOnOff(struct comedi_device *dev,
-        struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data)
+static int i_APCI1710_InsnWriteSetTTLIOChlOnOff(struct comedi_device *dev,
+                                                struct comedi_subdevice *s,
+                                                struct comedi_insn *insn,
+                                                unsigned int *data)
 {
+        struct addi_private *devpriv = dev->private;
         int i_ReturnValue = 0;
         unsigned int dw_StatusReg = 0;
         unsigned char b_ModulNbr;
diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_Ttl.h b/drivers/staging/comedi/drivers/addi-data/APCI1710_Ttl.h
deleted file mode 100644
index adcab824b25e..000000000000
--- a/drivers/staging/comedi/drivers/addi-data/APCI1710_Ttl.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2004,2005  ADDI-DATA GmbH for the source code of this module.
- *
- *      ADDI-DATA GmbH
- *      Dieselstrasse 3
- *      D-77833 Ottersweier
- *      Tel: +19(0)7223/9493-0
- *      Fax: +49(0)7223/9493-92
- *      http://www.addi-data.com
- *      info@addi-data.com
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- */
-
-#define APCI1710_TTL_INIT               0
-#define APCI1710_TTL_INITDIRECTION      1
-
-#define APCI1710_TTL_READCHANNEL        0
-#define APCI1710_TTL_READPORT           1
-
-/*
- * TTL INISIALISATION FUNCTION
- */
-int i_APCI1710_InsnConfigInitTTLIO(struct comedi_device *dev, struct comedi_subdevice *s,
-                                   struct comedi_insn *insn, unsigned int *data);
-
-/*
- * TTL INPUT FUNCTION
- */
-int i_APCI1710_InsnBitsReadTTLIO(struct comedi_device *dev, struct comedi_subdevice *s,
-                                 struct comedi_insn *insn, unsigned int *data);
-int i_APCI1710_InsnReadTTLIOAllPortValue(struct comedi_device *dev,
-                                         struct comedi_subdevice *s,
-                                         struct comedi_insn *insn, unsigned int *data);
-
-/*
- * TTL OUTPUT FUNCTIONS
- */
-int i_APCI1710_InsnWriteSetTTLIOChlOnOff(struct comedi_device *dev,
-                                         struct comedi_subdevice *s,
-                                         struct comedi_insn *insn, unsigned int *data);
diff --git a/drivers/staging/comedi/drivers/addi-data/addi_amcc_s5933.h b/drivers/staging/comedi/drivers/addi-data/addi_amcc_s5933.h
deleted file mode 100644
index 95f7dc61cd00..000000000000
--- a/drivers/staging/comedi/drivers/addi-data/addi_amcc_s5933.h
+++ /dev/null
@@ -1,469 +0,0 @@
-/*
- *  Copyright (C) 2004,2005  ADDI-DATA GmbH for the source code of this module.
- *
- *      ADDI-DATA GmbH
- *      Dieselstrasse 3
- *      D-77833 Ottersweier
- *      Tel: +19(0)7223/9493-0
- *      Fax: +49(0)7223/9493-92
- *      http://www.addi-data.com
- *      info@addi-data.com
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- */
-
-/* Header file for AMCC  s 5933 */
-
-#ifndef _AMCC_S5933_H_
-#define _AMCC_S5933_H_
-
-#include "../../comedidev.h"
-
-/* written on base0 */
-#define FIFO_ADVANCE_ON_BYTE_2  0x20000000
-
-/* added for step 6 dma written on base2 */
-#define AMWEN_ENABLE            0x02
-
-#define A2P_FIFO_WRITE_ENABLE   0x01
-
-/* for transfer count enable bit */
-#define AGCSTS_TC_ENABLE        0x10000000
-
-/*
- * ADDON RELATED ADDITIONS
- */
-/* Constant */
-#define APCI3120_ENABLE_TRANSFER_ADD_ON_LOW             0x00
-#define APCI3120_ENABLE_TRANSFER_ADD_ON_HIGH            0x1200
-#define APCI3120_A2P_FIFO_MANAGEMENT                    0x04000400L
-#define APCI3120_AMWEN_ENABLE                           0x02
-#define APCI3120_A2P_FIFO_WRITE_ENABLE                  0x01
-#define APCI3120_FIFO_ADVANCE_ON_BYTE_2                 0x20000000L
-#define APCI3120_ENABLE_WRITE_TC_INT                    0x00004000L
-#define APCI3120_CLEAR_WRITE_TC_INT                     0x00040000L
-#define APCI3120_DISABLE_AMWEN_AND_A2P_FIFO_WRITE       0x0
-#define APCI3120_DISABLE_BUS_MASTER_ADD_ON              0x0
-#define APCI3120_DISABLE_BUS_MASTER_PCI                 0x0
-
-/* ADD_ON ::: this needed since apci supports 16 bit interface to add on */
-#define APCI3120_ADD_ON_AGCSTS_LOW      0x3C
-#define APCI3120_ADD_ON_AGCSTS_HIGH     (APCI3120_ADD_ON_AGCSTS_LOW + 2)
-#define APCI3120_ADD_ON_MWAR_LOW        0x24
-#define APCI3120_ADD_ON_MWAR_HIGH       (APCI3120_ADD_ON_MWAR_LOW + 2)
-#define APCI3120_ADD_ON_MWTC_LOW        0x058
-#define APCI3120_ADD_ON_MWTC_HIGH       (APCI3120_ADD_ON_MWTC_LOW + 2)
-
-/* AMCC */
-#define APCI3120_AMCC_OP_MCSR           0x3C
-#define APCI3120_AMCC_OP_REG_INTCSR     0x38
-
-/*
- * AMCC Operation Register Offsets - PCI
- */
-#define AMCC_OP_REG_OMB1                0x00
-#define AMCC_OP_REG_OMB2                0x04
-#define AMCC_OP_REG_OMB3                0x08
-#define AMCC_OP_REG_OMB4                0x0c
-#define AMCC_OP_REG_IMB1                0x10
-#define AMCC_OP_REG_IMB2                0x14
-#define AMCC_OP_REG_IMB3                0x18
-#define AMCC_OP_REG_IMB4                0x1c
-#define AMCC_OP_REG_FIFO                0x20
-#define AMCC_OP_REG_MWAR                0x24
-#define AMCC_OP_REG_MWTC                0x28
-#define AMCC_OP_REG_MRAR                0x2c
-#define AMCC_OP_REG_MRTC                0x30
-#define AMCC_OP_REG_MBEF                0x34
-#define AMCC_OP_REG_INTCSR              0x38
-/* int source */
-#define  AMCC_OP_REG_INTCSR_SRC         (AMCC_OP_REG_INTCSR + 2)
-/* FIFO ctrl */
-#define  AMCC_OP_REG_INTCSR_FEC         (AMCC_OP_REG_INTCSR + 3)
-#define AMCC_OP_REG_MCSR                0x3c
-/* Data in byte 2 */
-#define  AMCC_OP_REG_MCSR_NVDATA        (AMCC_OP_REG_MCSR + 2)
-/* Command in byte 3 */
-#define  AMCC_OP_REG_MCSR_NVCMD         (AMCC_OP_REG_MCSR + 3)
-
-#define AMCC_FIFO_DEPTH_DWORD   8
-#define AMCC_FIFO_DEPTH_BYTES   (8 * sizeof(u32))
-
-/*
- * AMCC Operation Registers Size - PCI
- */
-#define AMCC_OP_REG_SIZE         64     /* in bytes */
-
-/*
- * AMCC Operation Register Offsets - Add-on
- */
-#define AMCC_OP_REG_AIMB1       0x00
-#define AMCC_OP_REG_AIMB2       0x04
-#define AMCC_OP_REG_AIMB3       0x08
-#define AMCC_OP_REG_AIMB4       0x0c
-#define AMCC_OP_REG_AOMB1       0x10
-#define AMCC_OP_REG_AOMB2       0x14
-#define AMCC_OP_REG_AOMB3       0x18
-#define AMCC_OP_REG_AOMB4       0x1c
-#define AMCC_OP_REG_AFIFO       0x20
-#define AMCC_OP_REG_AMWAR       0x24
-#define AMCC_OP_REG_APTA        0x28
-#define AMCC_OP_REG_APTD        0x2c
-#define AMCC_OP_REG_AMRAR       0x30
-#define AMCC_OP_REG_AMBEF       0x34
-#define AMCC_OP_REG_AINT        0x38
-#define AMCC_OP_REG_AGCSTS      0x3c
-#define AMCC_OP_REG_AMWTC       0x58
-#define AMCC_OP_REG_AMRTC       0x5c
-
-/*
- * AMCC - Add-on General Control/Status Register
- */
-#define AGCSTS_CONTROL_MASK     0xfffff000
-#define  AGCSTS_NV_ACC_MASK     0xe0000000
-#define  AGCSTS_RESET_MASK      0x0e000000
-#define  AGCSTS_NV_DA_MASK      0x00ff0000
-#define  AGCSTS_BIST_MASK       0x0000f000
-#define AGCSTS_STATUS_MASK      0x000000ff
-#define  AGCSTS_TCZERO_MASK     0x000000c0
-#define  AGCSTS_FIFO_ST_MASK    0x0000003f
-
-#define AGCSTS_RESET_MBFLAGS    0x08000000
-#define AGCSTS_RESET_P2A_FIFO   0x04000000
-#define AGCSTS_RESET_A2P_FIFO   0x02000000
-#define AGCSTS_RESET_FIFOS      (AGCSTS_RESET_A2P_FIFO | AGCSTS_RESET_P2A_FIFO)
-
-#define AGCSTS_A2P_TCOUNT       0x00000080
-#define AGCSTS_P2A_TCOUNT       0x00000040
-
-#define AGCSTS_FS_P2A_EMPTY     0x00000020
-#define AGCSTS_FS_P2A_HALF      0x00000010
-#define AGCSTS_FS_P2A_FULL      0x00000008
-
-#define AGCSTS_FS_A2P_EMPTY     0x00000004
-#define AGCSTS_FS_A2P_HALF      0x00000002
-#define AGCSTS_FS_A2P_FULL      0x00000001
-
-/*
- * AMCC - Add-on Interrupt Control/Status Register
- */
-#define AINT_INT_MASK           0x00ff0000
-#define AINT_SEL_MASK           0x0000ffff
-#define  AINT_IS_ENSEL_MASK     0x00001f1f
-
-#define AINT_INT_ASSERTED       0x00800000
-#define AINT_BM_ERROR           0x00200000
-#define AINT_BIST_INT           0x00100000
-
-#define AINT_RT_COMPLETE        0x00080000
-#define AINT_WT_COMPLETE        0x00040000
-
-#define AINT_OUT_MB_INT         0x00020000
-#define AINT_IN_MB_INT          0x00010000
-
-#define AINT_READ_COMPL         0x00008000
-#define AINT_WRITE_COMPL        0x00004000
-
-#define AINT_OMB_ENABLE         0x00001000
-#define AINT_OMB_SELECT         0x00000c00
-#define AINT_OMB_BYTE           0x00000300
-
-#define AINT_IMB_ENABLE         0x00000010
-#define AINT_IMB_SELECT         0x0000000c
-#define AINT_IMB_BYTE           0x00000003
-
-/* Enable Bus Mastering */
-#define EN_A2P_TRANSFERS        0x00000400
-/* FIFO Flag Reset */
-#define RESET_A2P_FLAGS         0x04000000L
-/* FIFO Relative Priority */
-#define A2P_HI_PRIORITY         0x00000100L
-/* Identify Interrupt Sources */
-#define ANY_S593X_INT           0x00800000L
-#define READ_TC_INT             0x00080000L
-#define WRITE_TC_INT            0x00040000L
-#define IN_MB_INT               0x00020000L
-#define MASTER_ABORT_INT        0x00100000L
-#define TARGET_ABORT_INT        0x00200000L
-#define BUS_MASTER_INT          0x00200000L
-
-/****************************************************************************/
-
-struct pcilst_struct {
-        struct pcilst_struct *next;
-        int used;
-        struct pci_dev *pcidev;
-        unsigned short vendor;
-        unsigned short device;
-        unsigned char pci_bus;
-        unsigned char pci_slot;
-        unsigned char pci_func;
-        resource_size_t io_addr[5];
-        unsigned int irq;
-};
-
-/* ptr to root list of all amcc devices */
-static struct pcilst_struct *amcc_devices;
-
-static const int i_ADDIDATADeviceID[] = { 0x15B8, 0x10E8 };
-
-/****************************************************************************/
-
-void v_pci_card_list_init(unsigned short pci_vendor, char display);
-void v_pci_card_list_cleanup(unsigned short pci_vendor);
-struct pcilst_struct *ptr_find_free_pci_card_by_device(unsigned short vendor_id,
-                                                       unsigned short
-                                                       device_id);
-int i_find_free_pci_card_by_position(unsigned short vendor_id,
-                                     unsigned short device_id,
-                                     unsigned short pci_bus,
-                                     unsigned short pci_slot,
-                                     struct pcilst_struct **card);
-struct pcilst_struct *ptr_select_and_alloc_pci_card(unsigned short vendor_id,
-                                                    unsigned short device_id,
-                                                    unsigned short pci_bus,
-                                                    unsigned short pci_slot,
-                                                    int i_Master);
-
-int pci_card_alloc(struct pcilst_struct *amcc, int master);
-int i_pci_card_free(struct pcilst_struct *amcc);
-void v_pci_card_list_display(void);
-int i_pci_card_data(struct pcilst_struct *amcc,
-                    unsigned char *pci_bus, unsigned char *pci_slot,
-                    unsigned char *pci_func, resource_size_t * io_addr,
-                    unsigned int *irq);
-
-/****************************************************************************/
-
-/* build list of amcc cards in this system */
-void v_pci_card_list_init(unsigned short pci_vendor, char display)
-{
-        struct pci_dev *pcidev = NULL;
-        struct pcilst_struct *amcc, *last;
-        int i;
-        int i_Count = 0;
-        amcc_devices = NULL;
-        last = NULL;
-
-        for_each_pci_dev(pcidev) {
-                for (i_Count = 0; i_Count < 2; i_Count++) {
-                        pci_vendor = i_ADDIDATADeviceID[i_Count];
-                        if (pcidev->vendor == pci_vendor) {
-                                amcc = kzalloc(sizeof(*amcc), GFP_KERNEL);
-                                if (amcc == NULL)
-                                        continue;
-
-                                amcc->pcidev = pcidev;
-                                if (last)
-                                        last->next = amcc;
-                                else
-                                        amcc_devices = amcc;
-                                last = amcc;
-
-                                amcc->vendor = pcidev->vendor;
-                                amcc->device = pcidev->device;
-                                amcc->pci_bus = pcidev->bus->number;
-                                amcc->pci_slot = PCI_SLOT(pcidev->devfn);
-                                amcc->pci_func = PCI_FUNC(pcidev->devfn);
-                                /* Note: resources may be invalid if PCI device
-                                 * not enabled, but they are corrected in
-                                 * pci_card_alloc. */
-                                for (i = 0; i < 5; i++)
-                                        amcc->io_addr[i] =
-                                            pci_resource_start(pcidev, i);
-                                amcc->irq = pcidev->irq;
-
-                        }
-                }
-        }
-
-        if (display)
-                v_pci_card_list_display();
-}
-
-/****************************************************************************/
-/* free up list of amcc cards in this system */
-void v_pci_card_list_cleanup(unsigned short pci_vendor)
-{
-        struct pcilst_struct *amcc, *next;
-
-        for (amcc = amcc_devices; amcc; amcc = next) {
-                next = amcc->next;
-                kfree(amcc);
-        }
-
-        amcc_devices = NULL;
-}
-
-/****************************************************************************/
-/* find first unused card with this device_id */
-struct pcilst_struct *ptr_find_free_pci_card_by_device(unsigned short vendor_id,
-                                                       unsigned short device_id)
-{
-        struct pcilst_struct *amcc, *next;
-
-        for (amcc = amcc_devices; amcc; amcc = next) {
-                next = amcc->next;
-                if ((!amcc->used) && (amcc->device == device_id)
-                    && (amcc->vendor == vendor_id))
-                        return amcc;
-
-        }
-
-        return NULL;
-}
-
-/****************************************************************************/
-/* find card on requested position */
-int i_find_free_pci_card_by_position(unsigned short vendor_id,
-                                     unsigned short device_id,
-                                     unsigned short pci_bus,
-                                     unsigned short pci_slot,
-                                     struct pcilst_struct **card)
-{
-        struct pcilst_struct *amcc, *next;
-
-        *card = NULL;
-        for (amcc = amcc_devices; amcc; amcc = next) {
-                next = amcc->next;
-                if ((amcc->vendor == vendor_id) && (amcc->device == device_id)
-                    && (amcc->pci_bus == pci_bus)
-                    && (amcc->pci_slot == pci_slot)) {
-                        if (!(amcc->used)) {
-                                *card = amcc;
-                                return 0;       /* ok, card is found */
-                        } else {
-                                printk(" - \nCard on requested position is used b:s %d:%d!\n",
-                                          pci_bus, pci_slot);
-                                return 2;       /* card exist but is used */
-                        }
-                }
-        }
-
-        /* no card found */
-        return 1;
-}
-
-/****************************************************************************/
-/* mark card as used */
-int pci_card_alloc(struct pcilst_struct *amcc, int master)
-{
-        int i;
-
-        if (!amcc)
-                return -1;
-
-        if (amcc->used)
-                return 1;
-        if (comedi_pci_enable(amcc->pcidev, "addi_amcc_s5933"))
-                return -1;
-        /* Resources will be accurate now. */
-        for (i = 0; i < 5; i++)
-                amcc->io_addr[i] = pci_resource_start(amcc->pcidev, i);
-        if (master)
-                pci_set_master(amcc->pcidev);
-        amcc->used = 1;
-
-        return 0;
-}
-
-/****************************************************************************/
-/* mark card as free */
-int i_pci_card_free(struct pcilst_struct *amcc)
-{
-        if (!amcc)
-                return -1;
-
-        if (!amcc->used)
-                return 1;
-        amcc->used = 0;
-        comedi_pci_disable(amcc->pcidev);
-        return 0;
-}
-
-/****************************************************************************/
-/* display list of found cards */
-void v_pci_card_list_display(void)
-{
-        struct pcilst_struct *amcc, *next;
-
-        printk(KERN_DEBUG "List of pci cards\n");
-        printk(KERN_DEBUG "bus:slot:func vendor device io_amcc io_daq irq used\n");
-
-        for (amcc = amcc_devices; amcc; amcc = next) {
-                next = amcc->next;
-                printk
-                    ("%2d   %2d   %2d  0x%4x 0x%4x   0x%8llx 0x%8llx  %2u  %2d\n",
-                     amcc->pci_bus, amcc->pci_slot, amcc->pci_func,
-                     amcc->vendor, amcc->device,
-                     (unsigned long long)amcc->io_addr[0],
-                     (unsigned long long)amcc->io_addr[2], amcc->irq,
-                     amcc->used);
-
-        }
-}
-
-/****************************************************************************/
-/* return all card information for driver */
-int i_pci_card_data(struct pcilst_struct *amcc,
-                    unsigned char *pci_bus, unsigned char *pci_slot,
-                    unsigned char *pci_func, resource_size_t * io_addr,
-                    unsigned int *irq)
-{
-        int i;
-
-        if (!amcc)
-                return -1;
-        *pci_bus = amcc->pci_bus;
-        *pci_slot = amcc->pci_slot;
-        *pci_func = amcc->pci_func;
-        for (i = 0; i < 5; i++)
-                io_addr[i] = amcc->io_addr[i];
-        *irq = amcc->irq;
-        return 0;
-}
-
-/****************************************************************************/
-/* select and alloc card */
-struct pcilst_struct *ptr_select_and_alloc_pci_card(unsigned short vendor_id,
-                                                    unsigned short device_id,
-                                                    unsigned short pci_bus,
-                                                    unsigned short pci_slot,
-                                                    int i_Master)
-{
-        struct pcilst_struct *card;
-
-        if ((pci_bus < 1) & (pci_slot < 1)) {
-                /* use autodetection */
-                card = ptr_find_free_pci_card_by_device(vendor_id, device_id);
-                if (card == NULL) {
-                        printk(" - Unused card not found in system!\n");
-                        return NULL;
-                }
-        } else {
-                switch (i_find_free_pci_card_by_position(vendor_id, device_id,
-                                                         pci_bus, pci_slot,
-                                                         &card)) {
-                case 1:
-                        printk(" - Card not found on requested position b:s %d:%d!\n",
-                                  pci_bus, pci_slot);
-                        return NULL;
-                case 2:
-                        printk(" - Card on requested position is used b:s %d:%d!\n",
-                                  pci_bus, pci_slot);
-                        return NULL;
-                }
-        }
-
-        if (pci_card_alloc(card, i_Master) != 0) {
-                printk(" - Can't allocate card!\n");
-                return NULL;
-
-        }
-
-        return card;
-}
-#endif
diff --git a/drivers/staging/comedi/drivers/addi-data/addi_common.c b/drivers/staging/comedi/drivers/addi-data/addi_common.c
index 99a96bd96716..90cc43263aee 100644
--- a/drivers/staging/comedi/drivers/addi-data/addi_common.c
+++ b/drivers/staging/comedi/drivers/addi-data/addi_common.c
@@ -36,1518 +36,107 @@ You should also find the complete GPL in the COPYING file accompanying this sour
   +-----------------------------------------------------------------------+
   | Description : ADDI COMMON Main Module                                 |
   +-----------------------------------------------------------------------+
-  | CONFIG OPTIONS                                                        |
-  |     option[0] - PCI bus number - if bus number and slot number are 0, |
-  |                              then driver search for first unused card |
-  |     option[1] - PCI slot number                                       |
-  |                                                                       |
-  |     option[2] = 0  - DMA ENABLE                                       |
-  |               = 1  - DMA DISABLE                                      |
-  +----------+-----------+------------------------------------------------+
 */
 
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/sched.h>
-#include <linux/mm.h>
-#include <linux/errno.h>
-#include <linux/ioport.h>
-#include <linux/delay.h>
-#include <linux/interrupt.h>
-#include <linux/timex.h>
-#include <linux/timer.h>
-#include <linux/pci.h>
-#include <linux/gfp.h>
-#include <linux/io.h>
-#include "../../comedidev.h"
-#if defined(CONFIG_APCI_1710) || defined(CONFIG_APCI_3200) || defined(CONFIG_APCI_3300)
-#include <asm/i387.h>
-#endif
-#include "../comedi_fc.h"
-
-#include "addi_common.h"
-#include "addi_amcc_s5933.h"
-
-#ifndef ADDIDATA_DRIVER_NAME
-#define ADDIDATA_DRIVER_NAME    "addi_common"
-#endif
-
-/* Update-0.7.57->0.7.68MODULE_AUTHOR("ADDI-DATA GmbH <info@addi-data.com>"); */
-/* Update-0.7.57->0.7.68MODULE_DESCRIPTION("Comedi ADDI-DATA module"); */
-/* Update-0.7.57->0.7.68MODULE_LICENSE("GPL"); */
-
-#define devpriv ((struct addi_private *)dev->private)
-#define this_board ((const struct addi_board *)dev->board_ptr)
-
-#if defined(CONFIG_APCI_1710) || defined(CONFIG_APCI_3200) || defined(CONFIG_APCI_3300)
-/* BYTE b_SaveFPUReg [94]; */
-
-void fpu_begin(void)
-{
-        /* asm ("fstenv b_SaveFPUReg"); */
-        kernel_fpu_begin();
-}
-
-void fpu_end(void)
-{
-        /*  asm ("frstor b_SaveFPUReg"); */
-        kernel_fpu_end();
-}
-#endif
-
-#include "addi_eeprom.c"
-#if (defined (CONFIG_APCI_3120) || defined (CONFIG_APCI_3001))
-#include "hwdrv_apci3120.c"
-#endif
-#ifdef CONFIG_APCI_1032
-#include "hwdrv_apci1032.c"
-#endif
-#ifdef CONFIG_APCI_1516
-#include "hwdrv_apci1516.c"
-#endif
-#ifdef CONFIG_APCI_2016
-#include "hwdrv_apci2016.c"
-#endif
-#ifdef CONFIG_APCI_2032
-#include "hwdrv_apci2032.c"
-#endif
-#ifdef CONFIG_APCI_2200
-#include "hwdrv_apci2200.c"
-#endif
-#ifdef CONFIG_APCI_1564
-#include "hwdrv_apci1564.c"
-#endif
-#ifdef CONFIG_APCI_1500
-#include "hwdrv_apci1500.c"
-#endif
-#ifdef CONFIG_APCI_3501
-#include "hwdrv_apci3501.c"
-#endif
-#ifdef CONFIG_APCI_035
-#include "hwdrv_apci035.c"
-#endif
-#if (defined (CONFIG_APCI_3200) || defined (CONFIG_APCI_3300))
-#include "hwdrv_apci3200.c"
-#endif
-#ifdef CONFIG_APCI_1710
-#include "hwdrv_APCI1710.c"
-#endif
-#ifdef CONFIG_APCI_16XX
-#include "hwdrv_apci16xx.c"
-#endif
-#ifdef CONFIG_APCI_3XXX
-#include "hwdrv_apci3xxx.c"
-#endif
-
 #ifndef COMEDI_SUBD_TTLIO
 #define COMEDI_SUBD_TTLIO   11  /* Digital Input Output But TTL */
 #endif
 
-static DEFINE_PCI_DEVICE_TABLE(addi_apci_tbl) = {
-#ifdef CONFIG_APCI_3120
-        {PCI_DEVICE(APCI3120_BOARD_VENDOR_ID, 0x818D)},
-#endif
-#ifdef CONFIG_APCI_1032
-        {PCI_DEVICE(APCI1032_BOARD_VENDOR_ID, 0x1003)},
-#endif
-#ifdef CONFIG_APCI_1516
-        {PCI_DEVICE(APCI1516_BOARD_VENDOR_ID, 0x1001)},
-#endif
-#ifdef CONFIG_APCI_2016
-        {PCI_DEVICE(APCI2016_BOARD_VENDOR_ID, 0x1002)},
-#endif
-#ifdef CONFIG_APCI_2032
-        {PCI_DEVICE(APCI2032_BOARD_VENDOR_ID, 0x1004)},
-#endif
-#ifdef CONFIG_APCI_2200
-        {PCI_DEVICE(APCI2200_BOARD_VENDOR_ID, 0x1005)},
-#endif
-#ifdef CONFIG_APCI_1564
-        {PCI_DEVICE(APCI1564_BOARD_VENDOR_ID, 0x1006)},
-#endif
-#ifdef CONFIG_APCI_1500
-        {PCI_DEVICE(APCI1500_BOARD_VENDOR_ID, 0x80fc)},
-#endif
-#ifdef CONFIG_APCI_3001
-        {PCI_DEVICE(APCI3120_BOARD_VENDOR_ID, 0x828D)},
-#endif
-#ifdef CONFIG_APCI_3501
-        {PCI_DEVICE(APCI3501_BOARD_VENDOR_ID, 0x3001)},
-#endif
-#ifdef CONFIG_APCI_035
-        {PCI_DEVICE(APCI035_BOARD_VENDOR_ID,  0x0300)},
-#endif
-#ifdef CONFIG_APCI_3200
-        {PCI_DEVICE(APCI3200_BOARD_VENDOR_ID, 0x3000)},
-#endif
-#ifdef CONFIG_APCI_3300
-        {PCI_DEVICE(APCI3200_BOARD_VENDOR_ID, 0x3007)},
-#endif
-#ifdef CONFIG_APCI_1710
-        {PCI_DEVICE(APCI1710_BOARD_VENDOR_ID, APCI1710_BOARD_DEVICE_ID)},
-#endif
-#ifdef CONFIG_APCI_16XX
-        {PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x1009)},
-        {PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x100A)},
-#endif
-#ifdef CONFIG_APCI_3XXX
-        {PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3010)},
-        {PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x300F)},
-        {PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x300E)},
-        {PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3013)},
-        {PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3014)},
-        {PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3015)},
-        {PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3016)},
-        {PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3017)},
-        {PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3018)},
-        {PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3019)},
-        {PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x301A)},
-        {PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x301B)},
-        {PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x301C)},
-        {PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x301D)},
-        {PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x301E)},
-        {PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x301F)},
-        {PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3020)},
-        {PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3021)},
-        {PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3022)},
-        {PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3023)},
-        {PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x300B)},
-        {PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3002)},
-        {PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3003)},
-        {PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3004)},
-        {PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3024)},
-#endif
-        {0}
-};
-
-MODULE_DEVICE_TABLE(pci, addi_apci_tbl);
-
-static const struct addi_board boardtypes[] = {
-#ifdef CONFIG_APCI_3120
-        {
-                .pc_DriverName          = "apci3120",
-                .i_VendorId             = APCI3120_BOARD_VENDOR_ID,
-                .i_DeviceId             = 0x818D,
-                .i_IorangeBase0         = AMCC_OP_REG_SIZE,
-                .i_IorangeBase1         = APCI3120_ADDRESS_RANGE,
-                .i_IorangeBase2         = 8,
-                .i_PCIEeprom            = ADDIDATA_NO_EEPROM,
-                .i_NbrAiChannel         = 16,
-                .i_NbrAiChannelDiff     = 8,
-                .i_AiChannelList        = 16,
-                .i_NbrAoChannel         = 8,
-                .i_AiMaxdata            = 0xffff,
-                .i_AoMaxdata            = 0x3fff,
-                .pr_AiRangelist         = &range_apci3120_ai,
-                .pr_AoRangelist         = &range_apci3120_ao,
-                .i_NbrDiChannel         = 4,
-                .i_NbrDoChannel         = 4,
-                .i_DoMaxdata            = 0x0f,
-                .i_Dma                  = 1,
-                .i_Timer                = 1,
-                .b_AvailableConvertUnit = 1,
-                .ui_MinAcquisitiontimeNs = 10000,
-                .ui_MinDelaytimeNs      = 100000,
-                .interrupt              = v_APCI3120_Interrupt,
-                .reset                  = i_APCI3120_Reset,
-                .ai_config              = i_APCI3120_InsnConfigAnalogInput,
-                .ai_read                = i_APCI3120_InsnReadAnalogInput,
-                .ai_cmdtest             = i_APCI3120_CommandTestAnalogInput,
-                .ai_cmd                 = i_APCI3120_CommandAnalogInput,
-                .ai_cancel              = i_APCI3120_StopCyclicAcquisition,
-                .ao_write               = i_APCI3120_InsnWriteAnalogOutput,
-                .di_read                = i_APCI3120_InsnReadDigitalInput,
-                .di_bits                = i_APCI3120_InsnBitsDigitalInput,
-                .do_config              = i_APCI3120_InsnConfigDigitalOutput,
-                .do_write               = i_APCI3120_InsnWriteDigitalOutput,
-                .do_bits                = i_APCI3120_InsnBitsDigitalOutput,
-                .timer_config           = i_APCI3120_InsnConfigTimer,
-                .timer_write            = i_APCI3120_InsnWriteTimer,
-                .timer_read             = i_APCI3120_InsnReadTimer,
-        },
-#endif
-#ifdef CONFIG_APCI_1032
-        {
-                .pc_DriverName          = "apci1032",
-                .i_VendorId             = APCI1032_BOARD_VENDOR_ID,
-                .i_DeviceId             = 0x1003,
-                .i_IorangeBase0         = 4,
-                .i_IorangeBase1         = APCI1032_ADDRESS_RANGE,
-                .i_PCIEeprom            = ADDIDATA_EEPROM,
-                .pc_EepromChip          = ADDIDATA_93C76,
-                .i_NbrDiChannel         = 32,
-                .interrupt              = v_APCI1032_Interrupt,
-                .reset                  = i_APCI1032_Reset,
-                .di_config              = i_APCI1032_ConfigDigitalInput,
-                .di_read                = i_APCI1032_Read1DigitalInput,
-                .di_bits                = i_APCI1032_ReadMoreDigitalInput,
-        },
-#endif
-#ifdef CONFIG_APCI_1516
-        {
-                .pc_DriverName          = "apci1516",
-                .i_VendorId             = APCI1516_BOARD_VENDOR_ID,
-                .i_DeviceId             = 0x1001,
-                .i_IorangeBase0         = 128,
-                .i_IorangeBase1         = APCI1516_ADDRESS_RANGE,
-                .i_IorangeBase2         = 32,
-                .i_PCIEeprom            = ADDIDATA_EEPROM,
-                .pc_EepromChip          = ADDIDATA_S5920,
-                .i_NbrDiChannel         = 8,
-                .i_NbrDoChannel         = 8,
-                .i_Timer                = 1,
-                .reset                  = i_APCI1516_Reset,
-                .di_read                = i_APCI1516_Read1DigitalInput,
-                .di_bits                = i_APCI1516_ReadMoreDigitalInput,
-                .do_config              = i_APCI1516_ConfigDigitalOutput,
-                .do_write               = i_APCI1516_WriteDigitalOutput,
-                .do_bits                = i_APCI1516_ReadDigitalOutput,
-                .timer_config           = i_APCI1516_ConfigWatchdog,
-                .timer_write            = i_APCI1516_StartStopWriteWatchdog,
-                .timer_read             = i_APCI1516_ReadWatchdog,
-        },
-#endif
-#ifdef CONFIG_APCI_2016
-        {
-                .pc_DriverName          = "apci2016",
-                .i_VendorId             = APCI2016_BOARD_VENDOR_ID,
-                .i_DeviceId             = 0x1002,
-                .i_IorangeBase0         = 128,
-                .i_IorangeBase1         = APCI2016_ADDRESS_RANGE,
-                .i_IorangeBase2         = 32,
-                .i_PCIEeprom            = ADDIDATA_EEPROM,
-                .pc_EepromChip          = ADDIDATA_S5920,
-                .i_NbrDoChannel         = 16,
-                .i_Timer                = 1,
-                .reset                  = i_APCI2016_Reset,
-                .do_config              = i_APCI2016_ConfigDigitalOutput,
-                .do_write               = i_APCI2016_WriteDigitalOutput,
-                .do_bits                = i_APCI2016_BitsDigitalOutput,
-                .timer_config           = i_APCI2016_ConfigWatchdog,
-                .timer_write            = i_APCI2016_StartStopWriteWatchdog,
-                .timer_read             = i_APCI2016_ReadWatchdog,
-        },
-#endif
-#ifdef CONFIG_APCI_2032
-        {
-                .pc_DriverName          = "apci2032",
-                .i_VendorId             = APCI2032_BOARD_VENDOR_ID,
-                .i_DeviceId             = 0x1004,
-                .i_IorangeBase0         = 4,
-                .i_IorangeBase1         = APCI2032_ADDRESS_RANGE,
-                .i_PCIEeprom            = ADDIDATA_EEPROM,
-                .pc_EepromChip          = ADDIDATA_93C76,
-                .i_NbrDoChannel         = 32,
-                .i_DoMaxdata            = 0xffffffff,
-                .i_Timer                = 1,
-                .interrupt              = v_APCI2032_Interrupt,
-                .reset                  = i_APCI2032_Reset,
-                .do_config              = i_APCI2032_ConfigDigitalOutput,
-                .do_write               = i_APCI2032_WriteDigitalOutput,
-                .do_bits                = i_APCI2032_ReadDigitalOutput,
-                .do_read                = i_APCI2032_ReadInterruptStatus,
-                .timer_config           = i_APCI2032_ConfigWatchdog,
-                .timer_write            = i_APCI2032_StartStopWriteWatchdog,
-                .timer_read             = i_APCI2032_ReadWatchdog,
-        },
-#endif
-#ifdef CONFIG_APCI_2200
-        {
-                .pc_DriverName          = "apci2200",
-                .i_VendorId             = APCI2200_BOARD_VENDOR_ID,
-                .i_DeviceId             = 0x1005,
-                .i_IorangeBase0         = 4,
-                .i_IorangeBase1         = APCI2200_ADDRESS_RANGE,
-                .i_PCIEeprom            = ADDIDATA_EEPROM,
-                .pc_EepromChip          = ADDIDATA_93C76,
-                .i_NbrDiChannel         = 8,
-                .i_NbrDoChannel         = 16,
-                .i_Timer                = 1,
-                .reset                  = i_APCI2200_Reset,
-                .di_read                = i_APCI2200_Read1DigitalInput,
-                .di_bits                = i_APCI2200_ReadMoreDigitalInput,
-                .do_config              = i_APCI2200_ConfigDigitalOutput,
-                .do_write               = i_APCI2200_WriteDigitalOutput,
-                .do_bits                = i_APCI2200_ReadDigitalOutput,
-                .timer_config           = i_APCI2200_ConfigWatchdog,
-                .timer_write            = i_APCI2200_StartStopWriteWatchdog,
-                .timer_read             = i_APCI2200_ReadWatchdog,
-        },
-#endif
-#ifdef CONFIG_APCI_1564
-        {
-                .pc_DriverName          = "apci1564",
-                .i_VendorId             = APCI1564_BOARD_VENDOR_ID,
-                .i_DeviceId             = 0x1006,
-                .i_IorangeBase0         = 128,
-                .i_IorangeBase1         = APCI1564_ADDRESS_RANGE,
-                .i_PCIEeprom            = ADDIDATA_EEPROM,
-                .pc_EepromChip          = ADDIDATA_93C76,
-                .i_NbrDiChannel         = 32,
-                .i_NbrDoChannel         = 32,
-                .i_DoMaxdata            = 0xffffffff,
-                .i_Timer                = 1,
-                .interrupt              = v_APCI1564_Interrupt,
-                .reset                  = i_APCI1564_Reset,
-                .di_config              = i_APCI1564_ConfigDigitalInput,
-                .di_read                = i_APCI1564_Read1DigitalInput,
-                .di_bits                = i_APCI1564_ReadMoreDigitalInput,
-                .do_config              = i_APCI1564_ConfigDigitalOutput,
-                .do_write               = i_APCI1564_WriteDigitalOutput,
-                .do_bits                = i_APCI1564_ReadDigitalOutput,
-                .do_read                = i_APCI1564_ReadInterruptStatus,
-                .timer_config           = i_APCI1564_ConfigTimerCounterWatchdog,
-                .timer_write            = i_APCI1564_StartStopWriteTimerCounterWatchdog,
-                .timer_read             = i_APCI1564_ReadTimerCounterWatchdog,
-        },
-#endif
-#ifdef CONFIG_APCI_1500
-        {
-                .pc_DriverName          = "apci1500",
-                .i_VendorId             = APCI1500_BOARD_VENDOR_ID,
-                .i_DeviceId             = 0x80fc,
-                .i_IorangeBase0         = 128,
-                .i_IorangeBase1         = APCI1500_ADDRESS_RANGE,
-                .i_IorangeBase2         = 4,
-                .i_PCIEeprom            = ADDIDATA_NO_EEPROM,
-                .i_NbrDiChannel         = 16,
-                .i_NbrDoChannel         = 16,
-                .i_DoMaxdata            = 0xffff,
-                .i_Timer                = 1,
-                .interrupt              = v_APCI1500_Interrupt,
-                .reset                  = i_APCI1500_Reset,
-                .di_config              = i_APCI1500_ConfigDigitalInputEvent,
-                .di_read                = i_APCI1500_Initialisation,
-                .di_write               = i_APCI1500_StartStopInputEvent,
-                .di_bits                = i_APCI1500_ReadMoreDigitalInput,
-                .do_config              = i_APCI1500_ConfigDigitalOutputErrorInterrupt,
-                .do_write               = i_APCI1500_WriteDigitalOutput,
-                .do_bits                = i_APCI1500_ConfigureInterrupt,
-                .timer_config           = i_APCI1500_ConfigCounterTimerWatchdog,
-                .timer_write            = i_APCI1500_StartStopTriggerTimerCounterWatchdog,
-                .timer_read             = i_APCI1500_ReadInterruptMask,
-                .timer_bits             = i_APCI1500_ReadCounterTimerWatchdog,
-        },
-#endif
-#ifdef CONFIG_APCI_3001
-        {
-                .pc_DriverName          = "apci3001",
-                .i_VendorId             = APCI3120_BOARD_VENDOR_ID,
-                .i_DeviceId             = 0x828D,
-                .i_IorangeBase0         = AMCC_OP_REG_SIZE,
-                .i_IorangeBase1         = APCI3120_ADDRESS_RANGE,
-                .i_IorangeBase2         = 8,
-                .i_PCIEeprom            = ADDIDATA_NO_EEPROM,
-                .i_NbrAiChannel         = 16,
-                .i_NbrAiChannelDiff     = 8,
-                .i_AiChannelList        = 16,
-                .i_AiMaxdata            = 0xfff,
-                .pr_AiRangelist         = &range_apci3120_ai,
-                .i_NbrDiChannel         = 4,
-                .i_NbrDoChannel         = 4,
-                .i_DoMaxdata            = 0x0f,
-                .i_Dma                  = 1,
-                .i_Timer                = 1,
-                .b_AvailableConvertUnit = 1,
-                .ui_MinAcquisitiontimeNs = 10000,
-                .ui_MinDelaytimeNs      = 100000,
-                .interrupt              = v_APCI3120_Interrupt,
-                .reset                  = i_APCI3120_Reset,
-                .ai_config              = i_APCI3120_InsnConfigAnalogInput,
-                .ai_read                = i_APCI3120_InsnReadAnalogInput,
-                .ai_cmdtest             = i_APCI3120_CommandTestAnalogInput,
-                .ai_cmd                 = i_APCI3120_CommandAnalogInput,
-                .ai_cancel              = i_APCI3120_StopCyclicAcquisition,
-                .di_read                = i_APCI3120_InsnReadDigitalInput,
-                .di_bits                = i_APCI3120_InsnBitsDigitalInput,
-                .do_config              = i_APCI3120_InsnConfigDigitalOutput,
-                .do_write               = i_APCI3120_InsnWriteDigitalOutput,
-                .do_bits                = i_APCI3120_InsnBitsDigitalOutput,
-                .timer_config           = i_APCI3120_InsnConfigTimer,
-                .timer_write            = i_APCI3120_InsnWriteTimer,
-                .timer_read             = i_APCI3120_InsnReadTimer,
-        },
-#endif
-#ifdef CONFIG_APCI_3501
-        {
-                .pc_DriverName          = "apci3501",
-                .i_VendorId             = APCI3501_BOARD_VENDOR_ID,
-                .i_DeviceId             = 0x3001,
-                .i_IorangeBase0         = 64,
-                .i_IorangeBase1         = APCI3501_ADDRESS_RANGE,
-                .i_PCIEeprom            = ADDIDATA_EEPROM,
-                .pc_EepromChip          = ADDIDATA_S5933,
-                .i_AoMaxdata            = 16383,
-                .pr_AoRangelist         = &range_apci3501_ao,
-                .i_NbrDiChannel         = 2,
-                .i_NbrDoChannel         = 2,
-                .i_DoMaxdata            = 0x3,
-                .i_Timer                = 1,
-                .interrupt              = v_APCI3501_Interrupt,
-                .reset                  = i_APCI3501_Reset,
-                .ao_config              = i_APCI3501_ConfigAnalogOutput,
-                .ao_write               = i_APCI3501_WriteAnalogOutput,
-                .di_bits                = i_APCI3501_ReadDigitalInput,
-                .do_config              = i_APCI3501_ConfigDigitalOutput,
-                .do_write               = i_APCI3501_WriteDigitalOutput,
-                .do_bits                = i_APCI3501_ReadDigitalOutput,
-                .timer_config           = i_APCI3501_ConfigTimerCounterWatchdog,
-                .timer_write            = i_APCI3501_StartStopWriteTimerCounterWatchdog,
-                .timer_read             = i_APCI3501_ReadTimerCounterWatchdog,
-        },
-#endif
-#ifdef CONFIG_APCI_035
-        {
-                .pc_DriverName          = "apci035",
-                .i_VendorId             = APCI035_BOARD_VENDOR_ID,
-                .i_DeviceId             = 0x0300,
-                .i_IorangeBase0         = 127,
-                .i_IorangeBase1         = APCI035_ADDRESS_RANGE,
-                .i_PCIEeprom            = 1,
-                .pc_EepromChip          = ADDIDATA_S5920,
-                .i_NbrAiChannel         = 16,
-                .i_NbrAiChannelDiff     = 8,
-                .i_AiChannelList        = 16,
-                .i_AiMaxdata            = 0xff,
-                .pr_AiRangelist         = &range_apci035_ai,
-                .i_Timer                = 1,
-                .ui_MinAcquisitiontimeNs = 10000,
-                .ui_MinDelaytimeNs      = 100000,
-                .interrupt              = v_APCI035_Interrupt,
-                .reset                  = i_APCI035_Reset,
-                .ai_config              = i_APCI035_ConfigAnalogInput,
-                .ai_read                = i_APCI035_ReadAnalogInput,
-                .timer_config           = i_APCI035_ConfigTimerWatchdog,
-                .timer_write            = i_APCI035_StartStopWriteTimerWatchdog,
-                .timer_read             = i_APCI035_ReadTimerWatchdog,
-        },
-#endif
-#ifdef CONFIG_APCI_3200
-        {
-                .pc_DriverName          = "apci3200",
-                .i_VendorId             = APCI3200_BOARD_VENDOR_ID,
-                .i_DeviceId             = 0x3000,
-                .i_IorangeBase0         = 128,
-                .i_IorangeBase1         = 256,
-                .i_IorangeBase2         = 4,
-                .i_IorangeBase3         = 4,
-                .i_PCIEeprom            = ADDIDATA_EEPROM,
-                .pc_EepromChip          = ADDIDATA_S5920,
-                .i_NbrAiChannel         = 16,
-                .i_NbrAiChannelDiff     = 8,
-                .i_AiChannelList        = 16,
-                .i_AiMaxdata            = 0x3ffff,
-                .pr_AiRangelist         = &range_apci3200_ai,
-                .i_NbrDiChannel         = 4,
-                .i_NbrDoChannel         = 4,
-                .ui_MinAcquisitiontimeNs = 10000,
-                .ui_MinDelaytimeNs      = 100000,
-                .interrupt              = v_APCI3200_Interrupt,
-                .reset                  = i_APCI3200_Reset,
-                .ai_config              = i_APCI3200_ConfigAnalogInput,
-                .ai_read                = i_APCI3200_ReadAnalogInput,
-                .ai_write               = i_APCI3200_InsnWriteReleaseAnalogInput,
-                .ai_bits                = i_APCI3200_InsnBits_AnalogInput_Test,
-                .ai_cmdtest             = i_APCI3200_CommandTestAnalogInput,
-                .ai_cmd                 = i_APCI3200_CommandAnalogInput,
-                .ai_cancel              = i_APCI3200_StopCyclicAcquisition,
-                .di_bits                = i_APCI3200_ReadDigitalInput,
-                .do_config              = i_APCI3200_ConfigDigitalOutput,
-                .do_write               = i_APCI3200_WriteDigitalOutput,
-                .do_bits                = i_APCI3200_ReadDigitalOutput,
-        },
-#endif
-#ifdef CONFIG_APCI_3300
-        /* Begin JK     .20.10.2004 = APCI-3300 integration */
-        {
-                .pc_DriverName          = "apci3300",
-                .i_VendorId             = APCI3200_BOARD_VENDOR_ID,
-                .i_DeviceId             = 0x3007,
-                .i_IorangeBase0         = 128,
-                .i_IorangeBase1         = 256,
-                .i_IorangeBase2         = 4,
-                .i_IorangeBase3         = 4,
-                .i_PCIEeprom            = ADDIDATA_EEPROM,
-                .pc_EepromChip          = ADDIDATA_S5920,
-                .i_NbrAiChannelDiff     = 8,
-                .i_AiChannelList        = 8,
-                .i_AiMaxdata            = 0x3ffff,
-                .pr_AiRangelist         = &range_apci3300_ai,
-                .i_NbrDiChannel         = 4,
-                .i_NbrDoChannel         = 4,
-                .ui_MinAcquisitiontimeNs = 10000,
-                .ui_MinDelaytimeNs      = 100000,
-                .interrupt              = v_APCI3200_Interrupt,
-                .reset                  = i_APCI3200_Reset,
-                .ai_config              = i_APCI3200_ConfigAnalogInput,
-                .ai_read                = i_APCI3200_ReadAnalogInput,
-                .ai_write               = i_APCI3200_InsnWriteReleaseAnalogInput,
-                .ai_bits                = i_APCI3200_InsnBits_AnalogInput_Test,
-                .ai_cmdtest             = i_APCI3200_CommandTestAnalogInput,
-                .ai_cmd                 = i_APCI3200_CommandAnalogInput,
-                .ai_cancel              = i_APCI3200_StopCyclicAcquisition,
-                .di_bits                = i_APCI3200_ReadDigitalInput,
-                .do_config              = i_APCI3200_ConfigDigitalOutput,
-                .do_write               = i_APCI3200_WriteDigitalOutput,
-                .do_bits                = i_APCI3200_ReadDigitalOutput,
-        },
-#endif
-#ifdef CONFIG_APCI_1710
-        {
-                .pc_DriverName          = "apci1710",
-                .i_VendorId             = APCI1710_BOARD_VENDOR_ID,
-                .i_DeviceId             = APCI1710_BOARD_DEVICE_ID,
-                .i_IorangeBase0         = 128,
-                .i_IorangeBase1         = 8,
-                .i_IorangeBase2         = 256,
-                .i_PCIEeprom            = ADDIDATA_NO_EEPROM,
-                .interrupt              = v_APCI1710_Interrupt,
-                .reset                  = i_APCI1710_Reset,
-        },
-#endif
-#ifdef CONFIG_APCI_16XX
-        {
-                .pc_DriverName          = "apci1648",
-                .i_VendorId             = PCI_VENDOR_ID_ADDIDATA,
-                .i_DeviceId             = 0x1009,
-                .i_IorangeBase0         = 128,
-                .i_PCIEeprom            = ADDIDATA_NO_EEPROM,
-                .i_NbrTTLChannel        = 48,
-                .reset                  = i_APCI16XX_Reset,
-                .ttl_config             = i_APCI16XX_InsnConfigInitTTLIO,
-                .ttl_bits               = i_APCI16XX_InsnBitsReadTTLIO,
-                .ttl_read               = i_APCI16XX_InsnReadTTLIOAllPortValue,
-                .ttl_write              = i_APCI16XX_InsnBitsWriteTTLIO,
-        }, {
-                .pc_DriverName          = "apci1696",
-                .i_VendorId             = PCI_VENDOR_ID_ADDIDATA,
-                .i_DeviceId             = 0x100A,
-                .i_IorangeBase0         = 128,
-                .i_PCIEeprom            = ADDIDATA_NO_EEPROM,
-                .i_NbrTTLChannel        = 96,
-                .reset                  = i_APCI16XX_Reset,
-                .ttl_config             = i_APCI16XX_InsnConfigInitTTLIO,
-                .ttl_bits               = i_APCI16XX_InsnBitsReadTTLIO,
-                .ttl_read               = i_APCI16XX_InsnReadTTLIOAllPortValue,
-                .ttl_write              = i_APCI16XX_InsnBitsWriteTTLIO,
-        },
-#endif
-#ifdef CONFIG_APCI_3XXX
-        {
-                .pc_DriverName          = "apci3000-16",
-                .i_VendorId             = PCI_VENDOR_ID_ADDIDATA,
-                .i_DeviceId             = 0x3010,
-                .i_IorangeBase0         = 256,
-                .i_IorangeBase1         = 256,
-                .i_IorangeBase2         = 256,
-                .i_IorangeBase3         = 256,
-                .i_PCIEeprom            = ADDIDATA_NO_EEPROM,
-                .pc_EepromChip          = ADDIDATA_9054,
-                .i_NbrAiChannel         = 16,
-                .i_NbrAiChannelDiff     = 8,
-                .i_AiChannelList        = 16,
-                .i_AiMaxdata            = 4095,
-                .pr_AiRangelist         = &range_apci3XXX_ai,
-                .i_NbrTTLChannel        = 24,
-                .b_AvailableConvertUnit = 6,
-                .ui_MinAcquisitiontimeNs = 10000,
-                .interrupt              = v_APCI3XXX_Interrupt,
-                .reset                  = i_APCI3XXX_Reset,
-                .ai_config              = i_APCI3XXX_InsnConfigAnalogInput,
-                .ai_read                = i_APCI3XXX_InsnReadAnalogInput,
-                .ttl_config             = i_APCI3XXX_InsnConfigInitTTLIO,
-                .ttl_bits               = i_APCI3XXX_InsnBitsTTLIO,
-                .ttl_read               = i_APCI3XXX_InsnReadTTLIO,
-                .ttl_write              = i_APCI3XXX_InsnWriteTTLIO,
-        }, {
-                .pc_DriverName          = "apci3000-8",
-                .i_VendorId             = PCI_VENDOR_ID_ADDIDATA,
-                .i_DeviceId             = 0x300F,
-                .i_IorangeBase0         = 256,
-                .i_IorangeBase1         = 256,
-                .i_IorangeBase2         = 256,
-                .i_IorangeBase3         = 256,
-                .i_PCIEeprom            = ADDIDATA_NO_EEPROM,
-                .pc_EepromChip          = ADDIDATA_9054,
-                .i_NbrAiChannel         = 8,
-                .i_NbrAiChannelDiff     = 4,
-                .i_AiChannelList        = 8,
-                .i_AiMaxdata            = 4095,
-                .pr_AiRangelist         = &range_apci3XXX_ai,
-                .i_NbrTTLChannel        = 24,
-                .b_AvailableConvertUnit = 6,
-                .ui_MinAcquisitiontimeNs = 10000,
-                .interrupt              = v_APCI3XXX_Interrupt,
-                .reset                  = i_APCI3XXX_Reset,
-                .ai_config              = i_APCI3XXX_InsnConfigAnalogInput,
-                .ai_read                = i_APCI3XXX_InsnReadAnalogInput,
-                .ttl_config             = i_APCI3XXX_InsnConfigInitTTLIO,
-                .ttl_bits               = i_APCI3XXX_InsnBitsTTLIO,
-                .ttl_read               = i_APCI3XXX_InsnReadTTLIO,
-                .ttl_write              = i_APCI3XXX_InsnWriteTTLIO,
-        }, {
-                .pc_DriverName          = "apci3000-4",
-                .i_VendorId             = PCI_VENDOR_ID_ADDIDATA,
-                .i_DeviceId             = 0x300E,
-                .i_IorangeBase0         = 256,
-                .i_IorangeBase1         = 256,
-                .i_IorangeBase2         = 256,
-                .i_IorangeBase3         = 256,
-                .i_PCIEeprom            = ADDIDATA_NO_EEPROM,
-                .pc_EepromChip          = ADDIDATA_9054,
-                .i_NbrAiChannel         = 4,
-                .i_NbrAiChannelDiff     = 2,
-                .i_AiChannelList        = 4,
-                .i_AiMaxdata            = 4095,
-                .pr_AiRangelist         = &range_apci3XXX_ai,
-                .i_NbrTTLChannel        = 24,
-                .b_AvailableConvertUnit = 6,
-                .ui_MinAcquisitiontimeNs = 10000,
-                .interrupt              = v_APCI3XXX_Interrupt,
-                .reset                  = i_APCI3XXX_Reset,
-                .ai_config              = i_APCI3XXX_InsnConfigAnalogInput,
-                .ai_read                = i_APCI3XXX_InsnReadAnalogInput,
-                .ttl_config             = i_APCI3XXX_InsnConfigInitTTLIO,
-                .ttl_bits               = i_APCI3XXX_InsnBitsTTLIO,
-                .ttl_read               = i_APCI3XXX_InsnReadTTLIO,
-                .ttl_write              = i_APCI3XXX_InsnWriteTTLIO,
-        }, {
-                .pc_DriverName          = "apci3006-16",
-                .i_VendorId             = PCI_VENDOR_ID_ADDIDATA,
-                .i_DeviceId             = 0x3013,
-                .i_IorangeBase0         = 256,
-                .i_IorangeBase1         = 256,
-                .i_IorangeBase2         = 256,
-                .i_IorangeBase3         = 256,
-                .i_PCIEeprom            = ADDIDATA_NO_EEPROM,
-                .pc_EepromChip          = ADDIDATA_9054,
-                .i_NbrAiChannel         = 16,
-                .i_NbrAiChannelDiff     = 8,
-                .i_AiChannelList        = 16,
-                .i_AiMaxdata            = 65535,
-                .pr_AiRangelist         = &range_apci3XXX_ai,
-                .i_NbrTTLChannel        = 24,
-                .b_AvailableConvertUnit = 6,
-                .ui_MinAcquisitiontimeNs = 10000,
-                .interrupt              = v_APCI3XXX_Interrupt,
-                .reset                  = i_APCI3XXX_Reset,
-                .ai_config              = i_APCI3XXX_InsnConfigAnalogInput,
-                .ai_read                = i_APCI3XXX_InsnReadAnalogInput,
-                .ttl_config             = i_APCI3XXX_InsnConfigInitTTLIO,
-                .ttl_bits               = i_APCI3XXX_InsnBitsTTLIO,
-                .ttl_read               = i_APCI3XXX_InsnReadTTLIO,
-                .ttl_write              = i_APCI3XXX_InsnWriteTTLIO,
-        }, {
-                .pc_DriverName          = "apci3006-8",
-                .i_VendorId             = PCI_VENDOR_ID_ADDIDATA,
-                .i_DeviceId             = 0x3014,
-                .i_IorangeBase0         = 256,
-                .i_IorangeBase1         = 256,
-                .i_IorangeBase2         = 256,
-                .i_IorangeBase3         = 256,
-                .i_PCIEeprom            = ADDIDATA_NO_EEPROM,
-                .pc_EepromChip          = ADDIDATA_9054,
-                .i_NbrAiChannel         = 8,
-                .i_NbrAiChannelDiff     = 4,
-                .i_AiChannelList        = 8,
-                .i_AiMaxdata            = 65535,
-                .pr_AiRangelist         = &range_apci3XXX_ai,
-                .i_NbrTTLChannel        = 24,
-                .b_AvailableConvertUnit = 6,
-                .ui_MinAcquisitiontimeNs = 10000,
-                .interrupt              = v_APCI3XXX_Interrupt,
-                .reset                  = i_APCI3XXX_Reset,
-                .ai_config              = i_APCI3XXX_InsnConfigAnalogInput,
-                .ai_read                = i_APCI3XXX_InsnReadAnalogInput,
-                .ttl_config             = i_APCI3XXX_InsnConfigInitTTLIO,
-                .ttl_bits               = i_APCI3XXX_InsnBitsTTLIO,
-                .ttl_read               = i_APCI3XXX_InsnReadTTLIO,
-                .ttl_write              = i_APCI3XXX_InsnWriteTTLIO,
-        }, {
-                .pc_DriverName          = "apci3006-4",
-                .i_VendorId             = PCI_VENDOR_ID_ADDIDATA,
-                .i_DeviceId             = 0x3015,
-                .i_IorangeBase0         = 256,
-                .i_IorangeBase1         = 256,
-                .i_IorangeBase2         = 256,
-                .i_IorangeBase3         = 256,
-                .i_PCIEeprom            = ADDIDATA_NO_EEPROM,
-                .pc_EepromChip          = ADDIDATA_9054,
-                .i_NbrAiChannel         = 4,
-                .i_NbrAiChannelDiff     = 2,
-                .i_AiChannelList        = 4,
-                .i_AiMaxdata            = 65535,
-                .pr_AiRangelist         = &range_apci3XXX_ai,
-                .i_NbrTTLChannel        = 24,
-                .b_AvailableConvertUnit = 6,
-                .ui_MinAcquisitiontimeNs = 10000,
-                .interrupt              = v_APCI3XXX_Interrupt,
-                .reset                  = i_APCI3XXX_Reset,
-                .ai_config              = i_APCI3XXX_InsnConfigAnalogInput,
-                .ai_read                = i_APCI3XXX_InsnReadAnalogInput,
-                .ttl_config             = i_APCI3XXX_InsnConfigInitTTLIO,
-                .ttl_bits               = i_APCI3XXX_InsnBitsTTLIO,
-                .ttl_read               = i_APCI3XXX_InsnReadTTLIO,
-                .ttl_write              = i_APCI3XXX_InsnWriteTTLIO,
-        }, {
-                .pc_DriverName          = "apci3010-16",
-                .i_VendorId             = PCI_VENDOR_ID_ADDIDATA,
-                .i_DeviceId             = 0x3016,
-                .i_IorangeBase0         = 256,
-                .i_IorangeBase1         = 256,
-                .i_IorangeBase2         = 256,
-                .i_IorangeBase3         = 256,
-                .i_PCIEeprom            = ADDIDATA_NO_EEPROM,
-                .pc_EepromChip          = ADDIDATA_9054,
-                .i_NbrAiChannel         = 16,
-                .i_NbrAiChannelDiff     = 8,
-                .i_AiChannelList        = 16,
-                .i_AiMaxdata            = 4095,
-                .pr_AiRangelist         = &range_apci3XXX_ai,
-                .i_NbrDiChannel         = 4,
-                .i_NbrDoChannel         = 4,
-                .i_DoMaxdata            = 1,
-                .i_NbrTTLChannel        = 24,
-                .b_AvailableConvertUnit = 6,
-                .ui_MinAcquisitiontimeNs = 5000,
-                .interrupt              = v_APCI3XXX_Interrupt,
-                .reset                  = i_APCI3XXX_Reset,
-                .ai_config              = i_APCI3XXX_InsnConfigAnalogInput,
-                .ai_read                = i_APCI3XXX_InsnReadAnalogInput,
-                .di_read                = i_APCI3XXX_InsnReadDigitalInput,
-                .di_bits                = i_APCI3XXX_InsnBitsDigitalInput,
-                .do_write               = i_APCI3XXX_InsnWriteDigitalOutput,
-                .do_bits                = i_APCI3XXX_InsnBitsDigitalOutput,
-                .do_read                = i_APCI3XXX_InsnReadDigitalOutput,
-                .ttl_config             = i_APCI3XXX_InsnConfigInitTTLIO,
-                .ttl_bits               = i_APCI3XXX_InsnBitsTTLIO,
-                .ttl_read               = i_APCI3XXX_InsnReadTTLIO,
-                .ttl_write              = i_APCI3XXX_InsnWriteTTLIO,
-        }, {
-                .pc_DriverName          = "apci3010-8",
-                .i_VendorId             = PCI_VENDOR_ID_ADDIDATA,
-                .i_DeviceId             = 0x3017,
-                .i_IorangeBase0         = 256,
-                .i_IorangeBase1         = 256,
-                .i_IorangeBase2         = 256,
-                .i_IorangeBase3         = 256,
-                .i_PCIEeprom            = ADDIDATA_NO_EEPROM,
-                .pc_EepromChip          = ADDIDATA_9054,
-                .i_NbrAiChannel         = 8,
-                .i_NbrAiChannelDiff     = 4,
-                .i_AiChannelList        = 8,
-                .i_AiMaxdata            = 4095,
-                .pr_AiRangelist         = &range_apci3XXX_ai,
-                .i_NbrDiChannel         = 4,
-                .i_NbrDoChannel         = 4,
-                .i_DoMaxdata            = 1,
-                .i_NbrTTLChannel        = 24,
-                .b_AvailableConvertUnit = 6,
-                .ui_MinAcquisitiontimeNs = 5000,
-                .interrupt              = v_APCI3XXX_Interrupt,
-                .reset                  = i_APCI3XXX_Reset,
-                .ai_config              = i_APCI3XXX_InsnConfigAnalogInput,
-                .ai_read                = i_APCI3XXX_InsnReadAnalogInput,
-                .di_read                = i_APCI3XXX_InsnReadDigitalInput,
-                .di_bits                = i_APCI3XXX_InsnBitsDigitalInput,
-                .do_write               = i_APCI3XXX_InsnWriteDigitalOutput,
-                .do_bits                = i_APCI3XXX_InsnBitsDigitalOutput,
-                .do_read                = i_APCI3XXX_InsnReadDigitalOutput,
-                .ttl_config             = i_APCI3XXX_InsnConfigInitTTLIO,
-                .ttl_bits               = i_APCI3XXX_InsnBitsTTLIO,
-                .ttl_read               = i_APCI3XXX_InsnReadTTLIO,
-                .ttl_write              = i_APCI3XXX_InsnWriteTTLIO,
-        }, {
-                .pc_DriverName          = "apci3010-4",
-                .i_VendorId             = PCI_VENDOR_ID_ADDIDATA,
-                .i_DeviceId             = 0x3018,
-                .i_IorangeBase0         = 256,
-                .i_IorangeBase1         = 256,
-                .i_IorangeBase2         = 256,
-                .i_IorangeBase3         = 256,
-                .i_PCIEeprom            = ADDIDATA_NO_EEPROM,
-                .pc_EepromChip          = ADDIDATA_9054,
-                .i_NbrAiChannel         = 4,
-                .i_NbrAiChannelDiff     = 2,
-                .i_AiChannelList        = 4,
-                .i_AiMaxdata            = 4095,
-                .pr_AiRangelist         = &range_apci3XXX_ai,
-                .i_NbrDiChannel         = 4,
-                .i_NbrDoChannel         = 4,
-                .i_DoMaxdata            = 1,
-                .i_NbrTTLChannel        = 24,
-                .b_AvailableConvertUnit = 6,
-                .ui_MinAcquisitiontimeNs = 5000,
-                .interrupt              = v_APCI3XXX_Interrupt,
-                .reset                  = i_APCI3XXX_Reset,
-                .ai_config              = i_APCI3XXX_InsnConfigAnalogInput,
-                .ai_read                = i_APCI3XXX_InsnReadAnalogInput,
-                .di_read                = i_APCI3XXX_InsnReadDigitalInput,
-                .di_bits                = i_APCI3XXX_InsnBitsDigitalInput,
-                .do_write               = i_APCI3XXX_InsnWriteDigitalOutput,
-                .do_bits                = i_APCI3XXX_InsnBitsDigitalOutput,
-                .do_read                = i_APCI3XXX_InsnReadDigitalOutput,
-                .ttl_config             = i_APCI3XXX_InsnConfigInitTTLIO,
-                .ttl_bits               = i_APCI3XXX_InsnBitsTTLIO,
-                .ttl_read               = i_APCI3XXX_InsnReadTTLIO,
-                .ttl_write              = i_APCI3XXX_InsnWriteTTLIO,
-        }, {
-                .pc_DriverName          = "apci3016-16",
-                .i_VendorId             = PCI_VENDOR_ID_ADDIDATA,
-                .i_DeviceId             = 0x3019,
-                .i_IorangeBase0         = 256,
-                .i_IorangeBase1         = 256,
-                .i_IorangeBase2         = 256,
-                .i_IorangeBase3         = 256,
-                .i_PCIEeprom            = ADDIDATA_NO_EEPROM,
-                .pc_EepromChip          = ADDIDATA_9054,
-                .i_NbrAiChannel         = 16,
-                .i_NbrAiChannelDiff     = 8,
-                .i_AiChannelList        = 16,
-                .i_AiMaxdata            = 65535,
-                .pr_AiRangelist         = &range_apci3XXX_ai,
-                .i_NbrDiChannel         = 4,
-                .i_NbrDoChannel         = 4,
-                .i_DoMaxdata            = 1,
-                .i_NbrTTLChannel        = 24,
-                .b_AvailableConvertUnit = 6,
-                .ui_MinAcquisitiontimeNs = 5000,
-                .interrupt              = v_APCI3XXX_Interrupt,
-                .reset                  = i_APCI3XXX_Reset,
-                .ai_config              = i_APCI3XXX_InsnConfigAnalogInput,
-                .ai_read                = i_APCI3XXX_InsnReadAnalogInput,
-                .di_read                = i_APCI3XXX_InsnReadDigitalInput,
-                .di_bits                = i_APCI3XXX_InsnBitsDigitalInput,
-                .do_write               = i_APCI3XXX_InsnWriteDigitalOutput,
-                .do_bits                = i_APCI3XXX_InsnBitsDigitalOutput,
-                .do_read                = i_APCI3XXX_InsnReadDigitalOutput,
-                .ttl_config             = i_APCI3XXX_InsnConfigInitTTLIO,
-                .ttl_bits               = i_APCI3XXX_InsnBitsTTLIO,
-                .ttl_read               = i_APCI3XXX_InsnReadTTLIO,
-                .ttl_write              = i_APCI3XXX_InsnWriteTTLIO,
-        }, {
-                .pc_DriverName          = "apci3016-8",
-                .i_VendorId             = PCI_VENDOR_ID_ADDIDATA,
-                .i_DeviceId             = 0x301A,
-                .i_IorangeBase0         = 256,
-                .i_IorangeBase1         = 256,
-                .i_IorangeBase2         = 256,
-                .i_IorangeBase3         = 256,
-                .i_PCIEeprom            = ADDIDATA_NO_EEPROM,
-                .pc_EepromChip          = ADDIDATA_9054,
-                .i_NbrAiChannel         = 8,
-                .i_NbrAiChannelDiff     = 4,
-                .i_AiChannelList        = 8,
-                .i_AiMaxdata            = 65535,
-                .pr_AiRangelist         = &range_apci3XXX_ai,
-                .i_NbrDiChannel         = 4,
-                .i_NbrDoChannel         = 4,
-                .i_DoMaxdata            = 1,
-                .i_NbrTTLChannel        = 24,
-                .b_AvailableConvertUnit = 6,
-                .ui_MinAcquisitiontimeNs = 5000,
-                .interrupt              = v_APCI3XXX_Interrupt,
-                .reset                  = i_APCI3XXX_Reset,
-                .ai_config              = i_APCI3XXX_InsnConfigAnalogInput,
-                .ai_read                = i_APCI3XXX_InsnReadAnalogInput,
-                .di_read                = i_APCI3XXX_InsnReadDigitalInput,
-                .di_bits                = i_APCI3XXX_InsnBitsDigitalInput,
-                .do_write               = i_APCI3XXX_InsnWriteDigitalOutput,
-                .do_bits                = i_APCI3XXX_InsnBitsDigitalOutput,
-                .do_read                = i_APCI3XXX_InsnReadDigitalOutput,
-                .ttl_config             = i_APCI3XXX_InsnConfigInitTTLIO,
-                .ttl_bits               = i_APCI3XXX_InsnBitsTTLIO,
-                .ttl_read               = i_APCI3XXX_InsnReadTTLIO,
-                .ttl_write              = i_APCI3XXX_InsnWriteTTLIO,
-        }, {
-                .pc_DriverName          = "apci3016-4",
-                .i_VendorId             = PCI_VENDOR_ID_ADDIDATA,
-                .i_DeviceId             = 0x301B,
-                .i_IorangeBase0         = 256,
-                .i_IorangeBase1         = 256,
-                .i_IorangeBase2         = 256,
-                .i_IorangeBase3         = 256,
-                .i_PCIEeprom            = ADDIDATA_NO_EEPROM,
-                .pc_EepromChip          = ADDIDATA_9054,
-                .i_NbrAiChannel         = 4,
-                .i_NbrAiChannelDiff     = 2,
-                .i_AiChannelList        = 4,
-                .i_AiMaxdata            = 65535,
-                .pr_AiRangelist         = &range_apci3XXX_ai,
-                .i_NbrDiChannel         = 4,
-                .i_NbrDoChannel         = 4,
-                .i_DoMaxdata            = 1,
-                .i_NbrTTLChannel        = 24,
-                .b_AvailableConvertUnit = 6,
-                .ui_MinAcquisitiontimeNs = 5000,
-                .interrupt              = v_APCI3XXX_Interrupt,
-                .reset                  = i_APCI3XXX_Reset,
-                .ai_config              = i_APCI3XXX_InsnConfigAnalogInput,
-                .ai_read                = i_APCI3XXX_InsnReadAnalogInput,
-                .di_read                = i_APCI3XXX_InsnReadDigitalInput,
-                .di_bits                = i_APCI3XXX_InsnBitsDigitalInput,
-                .do_write               = i_APCI3XXX_InsnWriteDigitalOutput,
-                .do_bits                = i_APCI3XXX_InsnBitsDigitalOutput,
-                .do_read                = i_APCI3XXX_InsnReadDigitalOutput,
-                .ttl_config             = i_APCI3XXX_InsnConfigInitTTLIO,
-                .ttl_bits               = i_APCI3XXX_InsnBitsTTLIO,
-                .ttl_read               = i_APCI3XXX_InsnReadTTLIO,
-                .ttl_write              = i_APCI3XXX_InsnWriteTTLIO,
-        }, {
-                .pc_DriverName          = "apci3100-16-4",
-                .i_VendorId             = PCI_VENDOR_ID_ADDIDATA,
-                .i_DeviceId             = 0x301C,
-                .i_IorangeBase0         = 256,
-                .i_IorangeBase1         = 256,
-                .i_IorangeBase2         = 256,
-                .i_IorangeBase3         = 256,
-                .i_PCIEeprom            = ADDIDATA_NO_EEPROM,
-                .pc_EepromChip          = ADDIDATA_9054,
-                .i_NbrAiChannel         = 16,
-                .i_NbrAiChannelDiff     = 8,
-                .i_AiChannelList        = 16,
-                .i_NbrAoChannel         = 4,
-                .i_AiMaxdata            = 4095,
-                .i_AoMaxdata            = 4095,
-                .pr_AiRangelist         = &range_apci3XXX_ai,
-                .pr_AoRangelist         = &range_apci3XXX_ao,
-                .i_NbrTTLChannel        = 24,
-                .b_AvailableConvertUnit = 6,
-                .ui_MinAcquisitiontimeNs = 10000,
-                .interrupt              = v_APCI3XXX_Interrupt,
-                .reset                  = i_APCI3XXX_Reset,
-                .ai_config              = i_APCI3XXX_InsnConfigAnalogInput,
-                .ai_read                = i_APCI3XXX_InsnReadAnalogInput,
-                .ao_write               = i_APCI3XXX_InsnWriteAnalogOutput,
-                .ttl_config             = i_APCI3XXX_InsnConfigInitTTLIO,
-                .ttl_bits               = i_APCI3XXX_InsnBitsTTLIO,
-                .ttl_read               = i_APCI3XXX_InsnReadTTLIO,
-                .ttl_write              = i_APCI3XXX_InsnWriteTTLIO,
-        }, {
-                .pc_DriverName          = "apci3100-8-4",
-                .i_VendorId             = PCI_VENDOR_ID_ADDIDATA,
-                .i_DeviceId             = 0x301D,
-                .i_IorangeBase0         = 256,
-                .i_IorangeBase1         = 256,
-                .i_IorangeBase2         = 256,
-                .i_IorangeBase3         = 256,
-                .i_PCIEeprom            = ADDIDATA_NO_EEPROM,
-                .pc_EepromChip          = ADDIDATA_9054,
-                .i_NbrAiChannel         = 8,
-                .i_NbrAiChannelDiff     = 4,
-                .i_AiChannelList        = 8,
-                .i_NbrAoChannel         = 4,
-                .i_AiMaxdata            = 4095,
-                .i_AoMaxdata            = 4095,
-                .pr_AiRangelist         = &range_apci3XXX_ai,
-                .pr_AoRangelist         = &range_apci3XXX_ao,
-                .i_NbrTTLChannel        = 24,
-                .b_AvailableConvertUnit = 6,
-                .ui_MinAcquisitiontimeNs = 10000,
-                .interrupt              = v_APCI3XXX_Interrupt,
-                .reset                  = i_APCI3XXX_Reset,
-                .ai_config              = i_APCI3XXX_InsnConfigAnalogInput,
-                .ai_read                = i_APCI3XXX_InsnReadAnalogInput,
-                .ao_write               = i_APCI3XXX_InsnWriteAnalogOutput,
-                .ttl_config             = i_APCI3XXX_InsnConfigInitTTLIO,
-                .ttl_bits               = i_APCI3XXX_InsnBitsTTLIO,
-                .ttl_read               = i_APCI3XXX_InsnReadTTLIO,
-                .ttl_write              = i_APCI3XXX_InsnWriteTTLIO,
-        }, {
-                .pc_DriverName          = "apci3106-16-4",
-                .i_VendorId             = PCI_VENDOR_ID_ADDIDATA,
-                .i_DeviceId             = 0x301E,
-                .i_IorangeBase0         = 256,
-                .i_IorangeBase1         = 256,
-                .i_IorangeBase2         = 256,
-                .i_IorangeBase3         = 256,
-                .i_PCIEeprom            = ADDIDATA_NO_EEPROM,
-                .pc_EepromChip          = ADDIDATA_9054,
-                .i_NbrAiChannel         = 16,
-                .i_NbrAiChannelDiff     = 8,
-                .i_AiChannelList        = 16,
-                .i_NbrAoChannel         = 4,
-                .i_AiMaxdata            = 65535,
-                .i_AoMaxdata            = 4095,
-                .pr_AiRangelist         = &range_apci3XXX_ai,
-                .pr_AoRangelist         = &range_apci3XXX_ao,
-                .i_NbrTTLChannel        = 24,
-                .b_AvailableConvertUnit = 6,
-                .ui_MinAcquisitiontimeNs = 10000,
-                .interrupt              = v_APCI3XXX_Interrupt,
-                .reset                  = i_APCI3XXX_Reset,
-                .ai_config              = i_APCI3XXX_InsnConfigAnalogInput,
-                .ai_read                = i_APCI3XXX_InsnReadAnalogInput,
-                .ao_write               = i_APCI3XXX_InsnWriteAnalogOutput,
-                .ttl_config             = i_APCI3XXX_InsnConfigInitTTLIO,
-                .ttl_bits               = i_APCI3XXX_InsnBitsTTLIO,
-                .ttl_read               = i_APCI3XXX_InsnReadTTLIO,
-                .ttl_write              = i_APCI3XXX_InsnWriteTTLIO,
-        }, {
-                .pc_DriverName          = "apci3106-8-4",
-                .i_VendorId             = PCI_VENDOR_ID_ADDIDATA,
-                .i_DeviceId             = 0x301F,
-                .i_IorangeBase0         = 256,
-                .i_IorangeBase1         = 256,
-                .i_IorangeBase2         = 256,
-                .i_IorangeBase3         = 256,
-                .i_PCIEeprom            = ADDIDATA_NO_EEPROM,
-                .pc_EepromChip          = ADDIDATA_9054,
-                .i_NbrAiChannel         = 8,
-                .i_NbrAiChannelDiff     = 4,
-                .i_AiChannelList        = 8,
-                .i_NbrAoChannel         = 4,
-                .i_AiMaxdata            = 65535,
-                .i_AoMaxdata            = 4095,
-                .pr_AiRangelist         = &range_apci3XXX_ai,
-                .pr_AoRangelist         = &range_apci3XXX_ao,
-                .i_NbrTTLChannel        = 24,
-                .b_AvailableConvertUnit = 6,
-                .ui_MinAcquisitiontimeNs = 10000,
-                .interrupt              = v_APCI3XXX_Interrupt,
-                .reset                  = i_APCI3XXX_Reset,
-                .ai_config              = i_APCI3XXX_InsnConfigAnalogInput,
-                .ai_read                = i_APCI3XXX_InsnReadAnalogInput,
-                .ao_write               = i_APCI3XXX_InsnWriteAnalogOutput,
-                .ttl_config             = i_APCI3XXX_InsnConfigInitTTLIO,
-                .ttl_bits               = i_APCI3XXX_InsnBitsTTLIO,
-                .ttl_read               = i_APCI3XXX_InsnReadTTLIO,
-                .ttl_write              = i_APCI3XXX_InsnWriteTTLIO,
-        }, {
-                .pc_DriverName          = "apci3110-16-4",
-                .i_VendorId             = PCI_VENDOR_ID_ADDIDATA,
-                .i_DeviceId             = 0x3020,
-                .i_IorangeBase0         = 256,
-                .i_IorangeBase1         = 256,
-                .i_IorangeBase2         = 256,
-                .i_IorangeBase3         = 256,
-                .i_PCIEeprom            = ADDIDATA_NO_EEPROM,
-                .pc_EepromChip          = ADDIDATA_9054,
-                .i_NbrAiChannel         = 16,
-                .i_NbrAiChannelDiff     = 8,
-                .i_AiChannelList        = 16,
-                .i_NbrAoChannel         = 4,
-                .i_AiMaxdata            = 4095,
-                .i_AoMaxdata            = 4095,
-                .pr_AiRangelist         = &range_apci3XXX_ai,
-                .pr_AoRangelist         = &range_apci3XXX_ao,
-                .i_NbrDiChannel         = 4,
-                .i_NbrDoChannel         = 4,
-                .i_DoMaxdata            = 1,
-                .i_NbrTTLChannel        = 24,
-                .b_AvailableConvertUnit = 6,
-                .ui_MinAcquisitiontimeNs = 5000,
-                .interrupt              = v_APCI3XXX_Interrupt,
-                .reset                  = i_APCI3XXX_Reset,
-                .ai_config              = i_APCI3XXX_InsnConfigAnalogInput,
-                .ai_read                = i_APCI3XXX_InsnReadAnalogInput,
-                .ao_write               = i_APCI3XXX_InsnWriteAnalogOutput,
-                .di_read                = i_APCI3XXX_InsnReadDigitalInput,
-                .di_bits                = i_APCI3XXX_InsnBitsDigitalInput,
-                .do_write               = i_APCI3XXX_InsnWriteDigitalOutput,
-                .do_bits                = i_APCI3XXX_InsnBitsDigitalOutput,
-                .do_read                = i_APCI3XXX_InsnReadDigitalOutput,
-                .ttl_config             = i_APCI3XXX_InsnConfigInitTTLIO,
-                .ttl_bits               = i_APCI3XXX_InsnBitsTTLIO,
-                .ttl_read               = i_APCI3XXX_InsnReadTTLIO,
-                .ttl_write              = i_APCI3XXX_InsnWriteTTLIO,
-        }, {
-                .pc_DriverName          = "apci3110-8-4",
-                .i_VendorId             = PCI_VENDOR_ID_ADDIDATA,
-                .i_DeviceId             = 0x3021,
-                .i_IorangeBase0         = 256,
-                .i_IorangeBase1         = 256,
-                .i_IorangeBase2         = 256,
-                .i_IorangeBase3         = 256,
-                .i_PCIEeprom            = ADDIDATA_NO_EEPROM,
-                .pc_EepromChip          = ADDIDATA_9054,
-                .i_NbrAiChannel         = 8,
-                .i_NbrAiChannelDiff     = 4,
-                .i_AiChannelList        = 8,
-                .i_NbrAoChannel         = 4,
-                .i_AiMaxdata            = 4095,
-                .i_AoMaxdata            = 4095,
-                .pr_AiRangelist         = &range_apci3XXX_ai,
-                .pr_AoRangelist         = &range_apci3XXX_ao,
-                .i_NbrDiChannel         = 4,
-                .i_NbrDoChannel         = 4,
-                .i_DoMaxdata            = 1,
-                .i_NbrTTLChannel        = 24,
-                .b_AvailableConvertUnit = 6,
-                .ui_MinAcquisitiontimeNs = 5000,
-                .interrupt              = v_APCI3XXX_Interrupt,
-                .reset                  = i_APCI3XXX_Reset,
-                .ai_config              = i_APCI3XXX_InsnConfigAnalogInput,
-                .ai_read                = i_APCI3XXX_InsnReadAnalogInput,
-                .ao_write               = i_APCI3XXX_InsnWriteAnalogOutput,
-                .di_read                = i_APCI3XXX_InsnReadDigitalInput,
-                .di_bits                = i_APCI3XXX_InsnBitsDigitalInput,
-                .do_write               = i_APCI3XXX_InsnWriteDigitalOutput,
-                .do_bits                = i_APCI3XXX_InsnBitsDigitalOutput,
-                .do_read                = i_APCI3XXX_InsnReadDigitalOutput,
-                .ttl_config             = i_APCI3XXX_InsnConfigInitTTLIO,
-                .ttl_bits               = i_APCI3XXX_InsnBitsTTLIO,
-                .ttl_read               = i_APCI3XXX_InsnReadTTLIO,
-                .ttl_write              = i_APCI3XXX_InsnWriteTTLIO,
-        }, {
-                .pc_DriverName          = "apci3116-16-4",
-                .i_VendorId             = PCI_VENDOR_ID_ADDIDATA,
-                .i_DeviceId             = 0x3022,
-                .i_IorangeBase0         = 256,
-                .i_IorangeBase1         = 256,
-                .i_IorangeBase2         = 256,
-                .i_IorangeBase3         = 256,
-                .i_PCIEeprom            = ADDIDATA_NO_EEPROM,
-                .pc_EepromChip          = ADDIDATA_9054,
-                .i_NbrAiChannel         = 16,
-                .i_NbrAiChannelDiff     = 8,
-                .i_AiChannelList        = 16,
-                .i_NbrAoChannel         = 4,
-                .i_AiMaxdata            = 65535,
-                .i_AoMaxdata            = 4095,
-                .pr_AiRangelist         = &range_apci3XXX_ai,
-                .pr_AoRangelist         = &range_apci3XXX_ao,
-                .i_NbrDiChannel         = 4,
-                .i_NbrDoChannel         = 4,
-                .i_DoMaxdata            = 1,
-                .i_NbrTTLChannel        = 24,
-                .b_AvailableConvertUnit = 6,
-                .ui_MinAcquisitiontimeNs = 5000,
-                .interrupt              = v_APCI3XXX_Interrupt,
-                .reset                  = i_APCI3XXX_Reset,
-                .ai_config              = i_APCI3XXX_InsnConfigAnalogInput,
-                .ai_read                = i_APCI3XXX_InsnReadAnalogInput,
-                .ao_write               = i_APCI3XXX_InsnWriteAnalogOutput,
-                .di_read                = i_APCI3XXX_InsnReadDigitalInput,
-                .di_bits                = i_APCI3XXX_InsnBitsDigitalInput,
-                .do_write               = i_APCI3XXX_InsnWriteDigitalOutput,
-                .do_bits                = i_APCI3XXX_InsnBitsDigitalOutput,
-                .do_read                = i_APCI3XXX_InsnReadDigitalOutput,
-                .ttl_config             = i_APCI3XXX_InsnConfigInitTTLIO,
-                .ttl_bits               = i_APCI3XXX_InsnBitsTTLIO,
-                .ttl_read               = i_APCI3XXX_InsnReadTTLIO,
-                .ttl_write              = i_APCI3XXX_InsnWriteTTLIO,
-        }, {
-                .pc_DriverName          = "apci3116-8-4",
-                .i_VendorId             = PCI_VENDOR_ID_ADDIDATA,
-                .i_DeviceId             = 0x3023,
-                .i_IorangeBase0         = 256,
-                .i_IorangeBase1         = 256,
-                .i_IorangeBase2         = 256,
-                .i_IorangeBase3         = 256,
-                .i_PCIEeprom            = ADDIDATA_NO_EEPROM,
-                .pc_EepromChip          = ADDIDATA_9054,
-                .i_NbrAiChannel         = 8,
-                .i_NbrAiChannelDiff     = 4,
-                .i_AiChannelList        = 8,
-                .i_NbrAoChannel         = 4,
-                .i_AiMaxdata            = 65535,
-                .i_AoMaxdata            = 4095,
-                .pr_AiRangelist         = &range_apci3XXX_ai,
-                .pr_AoRangelist         = &range_apci3XXX_ao,
-                .i_NbrDiChannel         = 4,
-                .i_NbrDoChannel         = 4,
-                .i_DoMaxdata            = 1,
-                .i_NbrTTLChannel        = 24,
-                .b_AvailableConvertUnit = 6,
-                .ui_MinAcquisitiontimeNs = 5000,
-                .interrupt              = v_APCI3XXX_Interrupt,
-                .reset                  = i_APCI3XXX_Reset,
-                .ai_config              = i_APCI3XXX_InsnConfigAnalogInput,
-                .ai_read                = i_APCI3XXX_InsnReadAnalogInput,
-                .ao_write               = i_APCI3XXX_InsnWriteAnalogOutput,
-                .di_read                = i_APCI3XXX_InsnReadDigitalInput,
-                .di_bits                = i_APCI3XXX_InsnBitsDigitalInput,
-                .do_write               = i_APCI3XXX_InsnWriteDigitalOutput,
-                .do_bits                = i_APCI3XXX_InsnBitsDigitalOutput,
-                .do_read                = i_APCI3XXX_InsnReadDigitalOutput,
-                .ttl_config             = i_APCI3XXX_InsnConfigInitTTLIO,
-                .ttl_bits               = i_APCI3XXX_InsnBitsTTLIO,
-                .ttl_read               = i_APCI3XXX_InsnReadTTLIO,
-                .ttl_write              = i_APCI3XXX_InsnWriteTTLIO,
-        }, {
-                .pc_DriverName          = "apci3003",
-                .i_VendorId             = PCI_VENDOR_ID_ADDIDATA,
-                .i_DeviceId             = 0x300B,
-                .i_IorangeBase0         = 256,
-                .i_IorangeBase1         = 256,
-                .i_IorangeBase2         = 256,
-                .i_IorangeBase3         = 256,
-                .i_PCIEeprom            = ADDIDATA_NO_EEPROM,
-                .pc_EepromChip          = ADDIDATA_9054,
-                .i_NbrAiChannelDiff     = 4,
-                .i_AiChannelList        = 4,
-                .i_AiMaxdata            = 65535,
-                .pr_AiRangelist         = &range_apci3XXX_ai,
-                .i_NbrDiChannel         = 4,
-                .i_NbrDoChannel         = 4,
-                .i_DoMaxdata            = 1,
-                .b_AvailableConvertUnit = 7,
-                .ui_MinAcquisitiontimeNs = 2500,
-                .interrupt              = v_APCI3XXX_Interrupt,
-                .reset                  = i_APCI3XXX_Reset,
-                .ai_config              = i_APCI3XXX_InsnConfigAnalogInput,
-                .ai_read                = i_APCI3XXX_InsnReadAnalogInput,
-                .di_read                = i_APCI3XXX_InsnReadDigitalInput,
-                .di_bits                = i_APCI3XXX_InsnBitsDigitalInput,
-                .do_write               = i_APCI3XXX_InsnWriteDigitalOutput,
-                .do_bits                = i_APCI3XXX_InsnBitsDigitalOutput,
-                .do_read                = i_APCI3XXX_InsnReadDigitalOutput,
-        }, {
-                .pc_DriverName          = "apci3002-16",
-                .i_VendorId             = PCI_VENDOR_ID_ADDIDATA,
-                .i_DeviceId             = 0x3002,
-                .i_IorangeBase0         = 256,
-                .i_IorangeBase1         = 256,
-                .i_IorangeBase2         = 256,
-                .i_IorangeBase3         = 256,
-                .i_PCIEeprom            = ADDIDATA_NO_EEPROM,
-                .pc_EepromChip          = ADDIDATA_9054,
-                .i_NbrAiChannelDiff     = 16,
-                .i_AiChannelList        = 16,
-                .i_AiMaxdata            = 65535,
-                .pr_AiRangelist         = &range_apci3XXX_ai,
-                .i_NbrDiChannel         = 4,
-                .i_NbrDoChannel         = 4,
-                .i_DoMaxdata            = 1,
-                .b_AvailableConvertUnit = 6,
-                .ui_MinAcquisitiontimeNs = 5000,
-                .interrupt              = v_APCI3XXX_Interrupt,
-                .reset                  = i_APCI3XXX_Reset,
-                .ai_config              = i_APCI3XXX_InsnConfigAnalogInput,
-                .ai_read                = i_APCI3XXX_InsnReadAnalogInput,
-                .di_read                = i_APCI3XXX_InsnReadDigitalInput,
-                .di_bits                = i_APCI3XXX_InsnBitsDigitalInput,
-                .do_write               = i_APCI3XXX_InsnWriteDigitalOutput,
-                .do_bits                = i_APCI3XXX_InsnBitsDigitalOutput,
-                .do_read                = i_APCI3XXX_InsnReadDigitalOutput,
-        }, {
-                .pc_DriverName          = "apci3002-8",
-                .i_VendorId             = PCI_VENDOR_ID_ADDIDATA,
-                .i_DeviceId             = 0x3003,
-                .i_IorangeBase0         = 256,
-                .i_IorangeBase1         = 256,
-                .i_IorangeBase2         = 256,
-                .i_IorangeBase3         = 256,
-                .i_PCIEeprom            = ADDIDATA_NO_EEPROM,
-                .pc_EepromChip          = ADDIDATA_9054,
-                .i_NbrAiChannelDiff     = 8,
-                .i_AiChannelList        = 8,
-                .i_AiMaxdata            = 65535,
-                .pr_AiRangelist         = &range_apci3XXX_ai,
-                .i_NbrDiChannel         = 4,
-                .i_NbrDoChannel         = 4,
-                .i_DoMaxdata            = 1,
-                .b_AvailableConvertUnit = 6,
-                .ui_MinAcquisitiontimeNs = 5000,
-                .interrupt              = v_APCI3XXX_Interrupt,
-                .reset                  = i_APCI3XXX_Reset,
-                .ai_config              = i_APCI3XXX_InsnConfigAnalogInput,
-                .ai_read                = i_APCI3XXX_InsnReadAnalogInput,
-                .di_read                = i_APCI3XXX_InsnReadDigitalInput,
-                .di_bits                = i_APCI3XXX_InsnBitsDigitalInput,
-                .do_write               = i_APCI3XXX_InsnWriteDigitalOutput,
-                .do_bits                = i_APCI3XXX_InsnBitsDigitalOutput,
-                .do_read                = i_APCI3XXX_InsnReadDigitalOutput,
-        }, {
-                .pc_DriverName          = "apci3002-4",
-                .i_VendorId             = PCI_VENDOR_ID_ADDIDATA,
-                .i_DeviceId             = 0x3004,
-                .i_IorangeBase0         = 256,
-                .i_IorangeBase1         = 256,
-                .i_IorangeBase2         = 256,
-                .i_IorangeBase3         = 256,
-                .i_PCIEeprom            = ADDIDATA_NO_EEPROM,
-                .pc_EepromChip          = ADDIDATA_9054,
-                .i_NbrAiChannelDiff     = 4,
-                .i_AiChannelList        = 4,
-                .i_AiMaxdata            = 65535,
-                .pr_AiRangelist         = &range_apci3XXX_ai,
-                .i_NbrDiChannel         = 4,
-                .i_NbrDoChannel         = 4,
-                .i_DoMaxdata            = 1,
-                .b_AvailableConvertUnit = 6,
-                .ui_MinAcquisitiontimeNs = 5000,
-                .interrupt              = v_APCI3XXX_Interrupt,
-                .reset                  = i_APCI3XXX_Reset,
-                .ai_config              = i_APCI3XXX_InsnConfigAnalogInput,
-                .ai_read                = i_APCI3XXX_InsnReadAnalogInput,
-                .di_read                = i_APCI3XXX_InsnReadDigitalInput,
-                .di_bits                = i_APCI3XXX_InsnBitsDigitalInput,
-                .do_write               = i_APCI3XXX_InsnWriteDigitalOutput,
-                .do_bits                = i_APCI3XXX_InsnBitsDigitalOutput,
-                .do_read                = i_APCI3XXX_InsnReadDigitalOutput,
-        }, {
-                .pc_DriverName          = "apci3500",
-                .i_VendorId             = PCI_VENDOR_ID_ADDIDATA,
-                .i_DeviceId             = 0x3024,
-                .i_IorangeBase0         = 256,
-                .i_IorangeBase1         = 256,
-                .i_IorangeBase2         = 256,
-                .i_IorangeBase3         = 256,
-                .i_PCIEeprom            = ADDIDATA_NO_EEPROM,
-                .pc_EepromChip          = ADDIDATA_9054,
-                .i_NbrAoChannel         = 4,
-                .i_AoMaxdata            = 4095,
-                .pr_AoRangelist         = &range_apci3XXX_ao,
-                .i_NbrTTLChannel        = 24,
-                .interrupt              = v_APCI3XXX_Interrupt,
-                .reset                  = i_APCI3XXX_Reset,
-                .ao_write               = i_APCI3XXX_InsnWriteAnalogOutput,
-                .ttl_config             = i_APCI3XXX_InsnConfigInitTTLIO,
-                .ttl_bits               = i_APCI3XXX_InsnBitsTTLIO,
-                .ttl_read               = i_APCI3XXX_InsnReadTTLIO,
-                .ttl_write              = i_APCI3XXX_InsnWriteTTLIO,
-        },
-#endif
-};
+static int i_ADDIDATA_InsnReadEeprom(struct comedi_device *dev,
+                                     struct comedi_subdevice *s,
+                                     struct comedi_insn *insn,
+                                     unsigned int *data)
+{
+        const struct addi_board *this_board = comedi_board(dev);
+        struct addi_private *devpriv = dev->private;
+        unsigned short w_Address = CR_CHAN(insn->chanspec);
+        unsigned short w_Data;
 
-static struct comedi_driver driver_addi = {
-        .driver_name = ADDIDATA_DRIVER_NAME,
-        .module = THIS_MODULE,
-        .attach = i_ADDI_Attach,
-        .detach = i_ADDI_Detach,
-        .num_names = ARRAY_SIZE(boardtypes),
-        .board_name = &boardtypes[0].pc_DriverName,
-        .offset = sizeof(struct addi_board),
-};
+        w_Data = addi_eeprom_readw(devpriv->i_IobaseAmcc,
+                this_board->pc_EepromChip, 2 * w_Address);
+        data[0] = w_Data;
 
-static int __devinit driver_addi_pci_probe(struct pci_dev *dev,
-                                           const struct pci_device_id *ent)
-{
-        return comedi_pci_auto_config(dev, &driver_addi);
+        return insn->n;
 }
 
-static void __devexit driver_addi_pci_remove(struct pci_dev *dev)
+static irqreturn_t v_ADDI_Interrupt(int irq, void *d)
 {
-        comedi_pci_auto_unconfig(dev);
-}
+        struct comedi_device *dev = d;
+        const struct addi_board *this_board = comedi_board(dev);
 
-static struct pci_driver driver_addi_pci_driver = {
-        .id_table = addi_apci_tbl,
-        .probe = &driver_addi_pci_probe,
-        .remove = __devexit_p(&driver_addi_pci_remove)
-};
+        this_board->interrupt(irq, d);
+        return IRQ_RETVAL(1);
+}
 
-static int __init driver_addi_init_module(void)
+static int i_ADDI_Reset(struct comedi_device *dev)
 {
-        int retval;
-
-        retval = comedi_driver_register(&driver_addi);
-        if (retval < 0)
-                return retval;
+        const struct addi_board *this_board = comedi_board(dev);
 
-        driver_addi_pci_driver.name = (char *)driver_addi.driver_name;
-        return pci_register_driver(&driver_addi_pci_driver);
+        this_board->reset(dev);
+        return 0;
 }
 
-static void __exit driver_addi_cleanup_module(void)
+static const void *addi_find_boardinfo(struct comedi_device *dev,
+                                       struct pci_dev *pcidev)
 {
-        pci_unregister_driver(&driver_addi_pci_driver);
-        comedi_driver_unregister(&driver_addi);
+        const void *p = dev->driver->board_name;
+        const struct addi_board *this_board;
+        int i;
+
+        for (i = 0; i < dev->driver->num_names; i++) {
+                this_board = p;
+                if (this_board->i_VendorId == pcidev->vendor &&
+                    this_board->i_DeviceId == pcidev->device)
+                        return this_board;
+                p += dev->driver->offset;
+        }
+        return NULL;
 }
 
-module_init(driver_addi_init_module);
-module_exit(driver_addi_cleanup_module);
-
-/*
-+----------------------------------------------------------------------------+
-| Function name     :static int i_ADDI_Attach(struct comedi_device *dev,            |
-|                                                                               struct comedi_devconfig *it)        |
-|                                                                                                                |
-+----------------------------------------------------------------------------+
-| Task              :Detects the card.                                       |
-|                        Configure the driver for a particular board.            |
-|                        This function does all the initializations and memory   |
-|                        allocation of data structures for the driver.           |
-+----------------------------------------------------------------------------+
-| Input Parameters  :struct comedi_device *dev                                                                           |
-|                    struct comedi_devconfig *it                                                                         |
-|                                                                                                |
-+----------------------------------------------------------------------------+
-| Return Value      :  0                                                                     |
-|                                                                                                                            |
-+----------------------------------------------------------------------------+
-*/
-
-static int i_ADDI_Attach(struct comedi_device *dev, struct comedi_devconfig *it)
+static int addi_auto_attach(struct comedi_device *dev,
+                                      unsigned long context_unused)
 {
+        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
+        const struct addi_board *this_board;
+        struct addi_private *devpriv;
         struct comedi_subdevice *s;
-        int ret, pages, i, n_subdevices;
+        int ret, n_subdevices;
         unsigned int dw_Dummy;
-        resource_size_t io_addr[5];
-        unsigned int irq;
-        resource_size_t iobase_a, iobase_main, iobase_addon, iobase_reserved;
-        struct pcilst_struct *card = NULL;
-        unsigned char pci_bus, pci_slot, pci_func;
-        int i_Dma = 0;
-
-        ret = alloc_private(dev, sizeof(struct addi_private));
-        if (ret < 0)
-                return -ENOMEM;
-
-        if (!pci_list_builded) {
-                v_pci_card_list_init(this_board->i_VendorId, 1);        /* 1 for displaying the list.. */
-                pci_list_builded = 1;
-        }
-        /* printk("comedi%d: "ADDIDATA_DRIVER_NAME": board=%s",dev->minor,this_board->pc_DriverName); */
-
-        if ((this_board->i_Dma) && (it->options[2] == 0)) {
-                i_Dma = 1;
-        }
-
-        card = ptr_select_and_alloc_pci_card(this_board->i_VendorId,
-                                             this_board->i_DeviceId,
-                                             it->options[0],
-                                             it->options[1], i_Dma);
-
-        if (card == NULL)
-                return -EIO;
-
-        devpriv->allocated = 1;
-
-        if ((i_pci_card_data(card, &pci_bus, &pci_slot, &pci_func, &io_addr[0],
-                                &irq)) < 0) {
-                i_pci_card_free(card);
-                printk(" - Can't get AMCC data!\n");
-                return -EIO;
-        }
-
-        iobase_a = io_addr[0];
-        iobase_main = io_addr[1];
-        iobase_addon = io_addr[2];
-        iobase_reserved = io_addr[3];
-        printk("\nBus %d: Slot %d: Funct%d\nBase0: 0x%8llx\nBase1: 0x%8llx\nBase2: 0x%8llx\nBase3: 0x%8llx\n", pci_bus, pci_slot, pci_func, (unsigned long long)io_addr[0], (unsigned long long)io_addr[1], (unsigned long long)io_addr[2], (unsigned long long)io_addr[3]);
 
-        if ((this_board->pc_EepromChip == NULL)
-                || (strcmp(this_board->pc_EepromChip, ADDIDATA_9054) != 0)) {
-           /************************************/
-                /* Test if more that 1 address used */
-           /************************************/
+        this_board = addi_find_boardinfo(dev, pcidev);
+        if (!this_board)
+                return -ENODEV;
+        dev->board_ptr = this_board;
+        dev->board_name = this_board->pc_DriverName;
 
-                if (this_board->i_IorangeBase1 != 0) {
-                        dev->iobase = (unsigned long)iobase_main;       /*  DAQ base address... */
-                } else {
-                        dev->iobase = (unsigned long)iobase_a;  /*  DAQ base address... */
-                }
-
-                dev->board_name = this_board->pc_DriverName;
-                devpriv->amcc = card;
-                devpriv->iobase = (int) dev->iobase;
-                devpriv->i_IobaseAmcc = (int) iobase_a; /* AMCC base address... */
-                devpriv->i_IobaseAddon = (int) iobase_addon;    /* ADD ON base address.... */
-                devpriv->i_IobaseReserved = (int) iobase_reserved;
+        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
+        if (!devpriv)
+                return -ENOMEM;
+        dev->private = devpriv;
+
+        ret = comedi_pci_enable(pcidev, dev->board_name);
+        if (ret)
+                return ret;
+
+        if (!this_board->pc_EepromChip ||
+            strcmp(this_board->pc_EepromChip, ADDIDATA_9054)) {
+                /* board does not have an eeprom or is not ADDIDATA_9054 */
+                if (this_board->i_IorangeBase1)
+                        dev->iobase = pci_resource_start(pcidev, 1);
+                else
+                        dev->iobase = pci_resource_start(pcidev, 0);
+
+                devpriv->iobase = dev->iobase;
+                devpriv->i_IobaseAmcc = pci_resource_start(pcidev, 0);
+                devpriv->i_IobaseAddon = pci_resource_start(pcidev, 2);
         } else {
-                dev->board_name = this_board->pc_DriverName;
-                dev->iobase = (unsigned long)io_addr[2];
-                devpriv->amcc = card;
-                devpriv->iobase = (int) io_addr[2];
-                devpriv->i_IobaseReserved = (int) io_addr[3];
-                printk("\nioremap begin");
-                devpriv->dw_AiBase = ioremap(io_addr[3],
+                /* board has an ADDIDATA_9054 eeprom */
+                dev->iobase = pci_resource_start(pcidev, 2);
+                devpriv->iobase = pci_resource_start(pcidev, 2);
+                devpriv->dw_AiBase = ioremap(pci_resource_start(pcidev, 3),
                                              this_board->i_IorangeBase3);
-                printk("\nioremap end");
         }
+        devpriv->i_IobaseReserved = pci_resource_start(pcidev, 3);
 
         /* Initialize parameters that can be overridden in EEPROM */
         devpriv->s_EeParameters.i_NbrAiChannel = this_board->i_NbrAiChannel;
@@ -1566,30 +155,19 @@ static int i_ADDI_Attach(struct comedi_device *dev, struct comedi_devconfig *it)
 
         /* ## */
 
-        if (irq > 0) {
-                if (request_irq(irq, v_ADDI_Interrupt, IRQF_SHARED,
-                                this_board->pc_DriverName, dev) < 0) {
-                        printk(", unable to allocate IRQ %u, DISABLING IT",
-                                irq);
-                        irq = 0;        /* Can't use IRQ */
-                } else {
-                        printk("\nirq=%u", irq);
-                }
-        } else {
-                printk(", IRQ disabled");
+        if (pcidev->irq > 0) {
+                ret = request_irq(pcidev->irq, v_ADDI_Interrupt, IRQF_SHARED,
+                                  dev->board_name, dev);
+                if (ret == 0)
+                        dev->irq = pcidev->irq;
         }
 
-        printk("\nOption %d %d %d\n", it->options[0], it->options[1],
-                it->options[2]);
-        dev->irq = irq;
-
         /*  Read eepeom and fill addi_board Structure */
 
         if (this_board->i_PCIEeprom) {
-                printk("\nPCI Eeprom used");
                 if (!(strcmp(this_board->pc_EepromChip, "S5920"))) {
                         /*  Set 3 wait stait */
-                        if (!(strcmp(this_board->pc_DriverName, "apci035"))) {
+                        if (!(strcmp(dev->board_name, "apci035"))) {
                                 outl(0x80808082, devpriv->i_IobaseAmcc + 0x60);
                         } else {
                                 outl(0x83838383, devpriv->i_IobaseAmcc + 0x60);
@@ -1597,340 +175,174 @@ static int i_ADDI_Attach(struct comedi_device *dev, struct comedi_devconfig *it)
                         /*  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 controller");
                 }
-                printk("\nRead Eeprom");
-                i_EepromReadMainHeader(io_addr[0], this_board->pc_EepromChip,
-                        dev);
-        } else {
-                printk("\nPCI Eeprom unused");
-        }
-
-        if (it->options[2] > 0) {
-                devpriv->us_UseDma = ADDI_DISABLE;
-        } else {
-                devpriv->us_UseDma = ADDI_ENABLE;
+                addi_eeprom_read_info(dev, pci_resource_start(pcidev, 0));
         }
 
-        if (devpriv->s_EeParameters.i_Dma) {
-                printk("\nDMA used");
-                if (devpriv->us_UseDma == ADDI_ENABLE) {
-                        /*  alloc DMA buffers */
-                        devpriv->b_DmaDoubleBuffer = 0;
-                        for (i = 0; i < 2; i++) {
-                                for (pages = 4; pages >= 0; pages--) {
-                                        devpriv->ul_DmaBufferVirtual[i] =
-                                                (void *) __get_free_pages(GFP_KERNEL, pages);
-
-                                        if (devpriv->ul_DmaBufferVirtual[i])
-                                                break;
-                                }
-                                if (devpriv->ul_DmaBufferVirtual[i]) {
-                                        devpriv->ui_DmaBufferPages[i] = pages;
-                                        devpriv->ui_DmaBufferSize[i] =
-                                                PAGE_SIZE * pages;
-                                        devpriv->ui_DmaBufferSamples[i] =
-                                                devpriv->
-                                                ui_DmaBufferSize[i] >> 1;
-                                        devpriv->ul_DmaBufferHw[i] =
-                                                virt_to_bus((void *)devpriv->
-                                                ul_DmaBufferVirtual[i]);
-                                }
-                        }
-                        if (!devpriv->ul_DmaBufferVirtual[0]) {
-                                printk
-                                        (", Can't allocate DMA buffer, DMA disabled!");
-                                devpriv->us_UseDma = ADDI_DISABLE;
-                        }
-
-                        if (devpriv->ul_DmaBufferVirtual[1]) {
-                                devpriv->b_DmaDoubleBuffer = 1;
-                        }
-                }
-
-                if ((devpriv->us_UseDma == ADDI_ENABLE)) {
-                        printk("\nDMA ENABLED\n");
+        n_subdevices = 7;
+        ret = comedi_alloc_subdevices(dev, n_subdevices);
+        if (ret)
+                return ret;
+
+        /*  Allocate and Initialise AI Subdevice Structures */
+        s = &dev->subdevices[0];
+        if ((devpriv->s_EeParameters.i_NbrAiChannel)
+                || (this_board->i_NbrAiChannelDiff)) {
+                dev->read_subdev = s;
+                s->type = COMEDI_SUBD_AI;
+                s->subdev_flags =
+                        SDF_READABLE | SDF_COMMON | SDF_GROUND
+                        | SDF_DIFF;
+                if (devpriv->s_EeParameters.i_NbrAiChannel) {
+                        s->n_chan =
+                                devpriv->s_EeParameters.i_NbrAiChannel;
+                        devpriv->b_SingelDiff = 0;
                 } else {
-                        printk("\nDMA DISABLED\n");
+                        s->n_chan = this_board->i_NbrAiChannelDiff;
+                        devpriv->b_SingelDiff = 1;
                 }
-        }
-
-        if (!strcmp(this_board->pc_DriverName, "apci1710")) {
-#ifdef CONFIG_APCI_1710
-                i_ADDI_AttachPCI1710(dev);
-
-                /*  save base address */
-                devpriv->s_BoardInfos.ui_Address = io_addr[2];
-#endif
-        } else {
-                n_subdevices = 7;
-                ret = comedi_alloc_subdevices(dev, n_subdevices);
-                if (ret)
-                        return ret;
+                s->maxdata = devpriv->s_EeParameters.i_AiMaxdata;
+                s->len_chanlist = this_board->i_AiChannelList;
+                s->range_table = this_board->pr_AiRangelist;
 
-                /*  Allocate and Initialise AI Subdevice Structures */
-                s = &dev->subdevices[0];
-                if ((devpriv->s_EeParameters.i_NbrAiChannel)
-                        || (this_board->i_NbrAiChannelDiff)) {
-                        dev->read_subdev = s;
-                        s->type = COMEDI_SUBD_AI;
-                        s->subdev_flags =
-                                SDF_READABLE | SDF_COMMON | SDF_GROUND
-                                | SDF_DIFF;
-                        if (devpriv->s_EeParameters.i_NbrAiChannel) {
-                                s->n_chan =
-                                        devpriv->s_EeParameters.i_NbrAiChannel;
-                                devpriv->b_SingelDiff = 0;
-                        } else {
-                                s->n_chan = this_board->i_NbrAiChannelDiff;
-                                devpriv->b_SingelDiff = 1;
-                        }
-                        s->maxdata = devpriv->s_EeParameters.i_AiMaxdata;
-                        s->len_chanlist = this_board->i_AiChannelList;
-                        s->range_table = this_board->pr_AiRangelist;
-
-                        /* Set the initialisation flag */
-                        devpriv->b_AiInitialisation = 1;
-
-                        s->insn_config = this_board->ai_config;
-                        s->insn_read = this_board->ai_read;
-                        s->insn_write = this_board->ai_write;
-                        s->insn_bits = this_board->ai_bits;
-                        s->do_cmdtest = this_board->ai_cmdtest;
-                        s->do_cmd = this_board->ai_cmd;
-                        s->cancel = this_board->ai_cancel;
-
-                } else {
-                        s->type = COMEDI_SUBD_UNUSED;
-                }
+                /* Set the initialisation flag */
+                devpriv->b_AiInitialisation = 1;
 
-                /*  Allocate and Initialise AO Subdevice Structures */
-                s = &dev->subdevices[1];
-                if (devpriv->s_EeParameters.i_NbrAoChannel) {
-                        s->type = COMEDI_SUBD_AO;
-                        s->subdev_flags = SDF_WRITEABLE | SDF_GROUND | SDF_COMMON;
-                        s->n_chan = devpriv->s_EeParameters.i_NbrAoChannel;
-                        s->maxdata = devpriv->s_EeParameters.i_AoMaxdata;
-                        s->len_chanlist =
-                                devpriv->s_EeParameters.i_NbrAoChannel;
-                        s->range_table = this_board->pr_AoRangelist;
-                        s->insn_config = this_board->ao_config;
-                        s->insn_write = this_board->ao_write;
-                } else {
-                        s->type = COMEDI_SUBD_UNUSED;
-                }
-                /*  Allocate and Initialise DI Subdevice Structures */
-                s = &dev->subdevices[2];
-                if (devpriv->s_EeParameters.i_NbrDiChannel) {
-                        s->type = COMEDI_SUBD_DI;
-                        s->subdev_flags = SDF_READABLE | SDF_GROUND | SDF_COMMON;
-                        s->n_chan = devpriv->s_EeParameters.i_NbrDiChannel;
-                        s->maxdata = 1;
-                        s->len_chanlist =
-                                devpriv->s_EeParameters.i_NbrDiChannel;
-                        s->range_table = &range_digital;
-                        s->io_bits = 0; /* all bits input */
-                        s->insn_config = this_board->di_config;
-                        s->insn_read = this_board->di_read;
-                        s->insn_write = this_board->di_write;
-                        s->insn_bits = this_board->di_bits;
-                } else {
-                        s->type = COMEDI_SUBD_UNUSED;
-                }
-                /*  Allocate and Initialise DO Subdevice Structures */
-                s = &dev->subdevices[3];
-                if (devpriv->s_EeParameters.i_NbrDoChannel) {
-                        s->type = COMEDI_SUBD_DO;
-                        s->subdev_flags =
-                                SDF_READABLE | SDF_WRITEABLE | SDF_GROUND | SDF_COMMON;
-                        s->n_chan = devpriv->s_EeParameters.i_NbrDoChannel;
-                        s->maxdata = devpriv->s_EeParameters.i_DoMaxdata;
-                        s->len_chanlist =
-                                devpriv->s_EeParameters.i_NbrDoChannel;
-                        s->range_table = &range_digital;
-                        s->io_bits = 0xf;       /* all bits output */
+                s->insn_config = this_board->ai_config;
+                s->insn_read = this_board->ai_read;
+                s->insn_write = this_board->ai_write;
+                s->insn_bits = this_board->ai_bits;
+                s->do_cmdtest = this_board->ai_cmdtest;
+                s->do_cmd = this_board->ai_cmd;
+                s->cancel = this_board->ai_cancel;
 
-                        /* insn_config - for digital output memory */
-                        s->insn_config = this_board->do_config;
-                        s->insn_write = this_board->do_write;
-                        s->insn_bits = this_board->do_bits;
-                        s->insn_read = this_board->do_read;
-                } else {
-                        s->type = COMEDI_SUBD_UNUSED;
-                }
+        } else {
+                s->type = COMEDI_SUBD_UNUSED;
+        }
 
-                /*  Allocate and Initialise Timer Subdevice Structures */
-                s = &dev->subdevices[4];
-                if (devpriv->s_EeParameters.i_Timer) {
-                        s->type = COMEDI_SUBD_TIMER;
-                        s->subdev_flags = SDF_WRITEABLE | SDF_GROUND | SDF_COMMON;
-                        s->n_chan = 1;
-                        s->maxdata = 0;
-                        s->len_chanlist = 1;
-                        s->range_table = &range_digital;
+        /*  Allocate and Initialise AO Subdevice Structures */
+        s = &dev->subdevices[1];
+        if (devpriv->s_EeParameters.i_NbrAoChannel) {
+                s->type = COMEDI_SUBD_AO;
+                s->subdev_flags = SDF_WRITEABLE | SDF_GROUND | SDF_COMMON;
+                s->n_chan = devpriv->s_EeParameters.i_NbrAoChannel;
+                s->maxdata = devpriv->s_EeParameters.i_AoMaxdata;
+                s->len_chanlist =
+                        devpriv->s_EeParameters.i_NbrAoChannel;
+                s->range_table = this_board->pr_AoRangelist;
+                s->insn_config = this_board->ao_config;
+                s->insn_write = this_board->ao_write;
+        } else {
+                s->type = COMEDI_SUBD_UNUSED;
+        }
+        /*  Allocate and Initialise DI Subdevice Structures */
+        s = &dev->subdevices[2];
+        if (devpriv->s_EeParameters.i_NbrDiChannel) {
+                s->type = COMEDI_SUBD_DI;
+                s->subdev_flags = SDF_READABLE | SDF_GROUND | SDF_COMMON;
+                s->n_chan = devpriv->s_EeParameters.i_NbrDiChannel;
+                s->maxdata = 1;
+                s->len_chanlist =
+                        devpriv->s_EeParameters.i_NbrDiChannel;
+                s->range_table = &range_digital;
+                s->io_bits = 0; /* all bits input */
+                s->insn_config = this_board->di_config;
+                s->insn_read = this_board->di_read;
+                s->insn_write = this_board->di_write;
+                s->insn_bits = this_board->di_bits;
+        } else {
+                s->type = COMEDI_SUBD_UNUSED;
+        }
+        /*  Allocate and Initialise DO Subdevice Structures */
+        s = &dev->subdevices[3];
+        if (devpriv->s_EeParameters.i_NbrDoChannel) {
+                s->type = COMEDI_SUBD_DO;
+                s->subdev_flags =
+                        SDF_READABLE | SDF_WRITEABLE | SDF_GROUND | SDF_COMMON;
+                s->n_chan = devpriv->s_EeParameters.i_NbrDoChannel;
+                s->maxdata = devpriv->s_EeParameters.i_DoMaxdata;
+                s->len_chanlist =
+                        devpriv->s_EeParameters.i_NbrDoChannel;
+                s->range_table = &range_digital;
+                s->io_bits = 0xf;       /* all bits output */
+
+                /* insn_config - for digital output memory */
+                s->insn_config = this_board->do_config;
+                s->insn_write = this_board->do_write;
+                s->insn_bits = this_board->do_bits;
+                s->insn_read = this_board->do_read;
+        } else {
+                s->type = COMEDI_SUBD_UNUSED;
+        }
 
-                        s->insn_write = this_board->timer_write;
-                        s->insn_read = this_board->timer_read;
-                        s->insn_config = this_board->timer_config;
-                        s->insn_bits = this_board->timer_bits;
-                } else {
-                        s->type = COMEDI_SUBD_UNUSED;
-                }
+        /*  Allocate and Initialise Timer Subdevice Structures */
+        s = &dev->subdevices[4];
+        if (devpriv->s_EeParameters.i_Timer) {
+                s->type = COMEDI_SUBD_TIMER;
+                s->subdev_flags = SDF_WRITEABLE | SDF_GROUND | SDF_COMMON;
+                s->n_chan = 1;
+                s->maxdata = 0;
+                s->len_chanlist = 1;
+                s->range_table = &range_digital;
+
+                s->insn_write = this_board->timer_write;
+                s->insn_read = this_board->timer_read;
+                s->insn_config = this_board->timer_config;
+                s->insn_bits = this_board->timer_bits;
+        } else {
+                s->type = COMEDI_SUBD_UNUSED;
+        }
 
-                /*  Allocate and Initialise TTL */
-                s = &dev->subdevices[5];
-                if (this_board->i_NbrTTLChannel) {
-                        s->type = COMEDI_SUBD_TTLIO;
-                        s->subdev_flags =
-                                SDF_WRITEABLE | SDF_READABLE | SDF_GROUND | SDF_COMMON;
-                        s->n_chan = this_board->i_NbrTTLChannel;
-                        s->maxdata = 1;
-                        s->io_bits = 0; /* all bits input */
-                        s->len_chanlist = this_board->i_NbrTTLChannel;
-                        s->range_table = &range_digital;
-                        s->insn_config = this_board->ttl_config;
-                        s->insn_bits = this_board->ttl_bits;
-                        s->insn_read = this_board->ttl_read;
-                        s->insn_write = this_board->ttl_write;
-                } else {
-                        s->type = COMEDI_SUBD_UNUSED;
-                }
+        /*  Allocate and Initialise TTL */
+        s = &dev->subdevices[5];
+        if (this_board->i_NbrTTLChannel) {
+                s->type = COMEDI_SUBD_TTLIO;
+                s->subdev_flags =
+                        SDF_WRITEABLE | SDF_READABLE | SDF_GROUND | SDF_COMMON;
+                s->n_chan = this_board->i_NbrTTLChannel;
+                s->maxdata = 1;
+                s->io_bits = 0; /* all bits input */
+                s->len_chanlist = this_board->i_NbrTTLChannel;
+                s->range_table = &range_digital;
+                s->insn_config = this_board->ttl_config;
+                s->insn_bits = this_board->ttl_bits;
+                s->insn_read = this_board->ttl_read;
+                s->insn_write = this_board->ttl_write;
+        } else {
+                s->type = COMEDI_SUBD_UNUSED;
+        }
 
-                /* EEPROM */
-                s = &dev->subdevices[6];
-                if (this_board->i_PCIEeprom) {
-                        s->type = COMEDI_SUBD_MEMORY;
-                        s->subdev_flags = SDF_READABLE | SDF_INTERNAL;
-                        s->n_chan = 256;
-                        s->maxdata = 0xffff;
-                        s->insn_read = i_ADDIDATA_InsnReadEeprom;
-                } else {
-                        s->type = COMEDI_SUBD_UNUSED;
-                }
+        /* EEPROM */
+        s = &dev->subdevices[6];
+        if (this_board->i_PCIEeprom) {
+                s->type = COMEDI_SUBD_MEMORY;
+                s->subdev_flags = SDF_READABLE | SDF_INTERNAL;
+                s->n_chan = 256;
+                s->maxdata = 0xffff;
+                s->insn_read = i_ADDIDATA_InsnReadEeprom;
+        } else {
+                s->type = COMEDI_SUBD_UNUSED;
         }
 
-        printk("\ni_ADDI_Attach end\n");
         i_ADDI_Reset(dev);
-        devpriv->b_ValidDriver = 1;
         return 0;
 }
 
 static void i_ADDI_Detach(struct comedi_device *dev)
 {
-        if (dev->private) {
-                if (devpriv->b_ValidDriver)
+        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
+        struct addi_private *devpriv = dev->private;
+
+        if (devpriv) {
+                if (dev->iobase)
                         i_ADDI_Reset(dev);
                 if (dev->irq)
                         free_irq(dev->irq, dev);
-                if ((this_board->pc_EepromChip == NULL) ||
-                    (strcmp(this_board->pc_EepromChip, ADDIDATA_9054) != 0)) {
-                        if (devpriv->allocated)
-                                i_pci_card_free(devpriv->amcc);
-                        if (devpriv->ul_DmaBufferVirtual[0]) {
-                                free_pages((unsigned long)devpriv->
-                                        ul_DmaBufferVirtual[0],
-                                        devpriv->ui_DmaBufferPages[0]);
-                        }
-                        if (devpriv->ul_DmaBufferVirtual[1]) {
-                                free_pages((unsigned long)devpriv->
-                                        ul_DmaBufferVirtual[1],
-                                        devpriv->ui_DmaBufferPages[1]);
-                        }
-                } else {
+                if (devpriv->dw_AiBase)
                         iounmap(devpriv->dw_AiBase);
-                        if (devpriv->allocated)
-                                i_pci_card_free(devpriv->amcc);
-                }
-                if (pci_list_builded) {
-                        v_pci_card_list_cleanup(this_board->i_VendorId);
-                        pci_list_builded = 0;
-                }
         }
-}
-
-/*
-+----------------------------------------------------------------------------+
-| Function name     : static int i_ADDI_Reset(struct comedi_device *dev)                         |
-|                                                                                                                |
-+----------------------------------------------------------------------------+
-| Task              : Disables all interrupts, Resets digital output to low, |
-|                               Set all analog output to low                                             |
-|                                                                                                                |
-+----------------------------------------------------------------------------+
-| Input Parameters  : struct comedi_device *dev                                                                  |
-|                                                                                                                                |
-|                                                                                                |
-+----------------------------------------------------------------------------+
-| Return Value      : 0                                                                          |
-|                                                                                                                            |
-+----------------------------------------------------------------------------+
-*/
-
-static int i_ADDI_Reset(struct comedi_device *dev)
-{
-
-        this_board->reset(dev);
-        return 0;
-}
-
-/* Interrupt function */
-/*
-+----------------------------------------------------------------------------+
-| Function name     :                                                        |
-|static void v_ADDI_Interrupt(int irq, void *d)                 |
-|                                                                                                                |
-+----------------------------------------------------------------------------+
-| Task              : Registerd interrupt routine                                                    |
-|                                                                                                                |
-+----------------------------------------------------------------------------+
-| Input Parameters  :   int irq                                                                                          |
-|                                                                                                                                |
-|                                                                                                |
-+----------------------------------------------------------------------------+
-| Return Value      :                                                                            |
-|                                                                                                                            |
-+----------------------------------------------------------------------------+
-*/
-
-static irqreturn_t v_ADDI_Interrupt(int irq, void *d)
-{
-        struct comedi_device *dev = d;
-        this_board->interrupt(irq, d);
-        return IRQ_RETVAL(1);
-}
-
-/* EEPROM Read Function */
-/*
-+----------------------------------------------------------------------------+
-| Function name     :                                                        |
-|INT i_ADDIDATA_InsnReadEeprom(struct comedi_device *dev,struct comedi_subdevice *s,
-                                                        struct comedi_insn *insn,unsigned int *data)
-|                                                                                                                |
-+----------------------------------------------------------------------------+
-| Task              : Read 256 words from EEPROM                                             |
-|                                                                                                                |
-+----------------------------------------------------------------------------+
-| Input Parameters  :(struct comedi_device *dev,struct comedi_subdevice *s,
-                        struct comedi_insn *insn,unsigned int *data)                                             |
-|                                                                                                                                |
-|                                                                                                |
-+----------------------------------------------------------------------------+
-| Return Value      :                                                                            |
-|                                                                                                                            |
-+----------------------------------------------------------------------------+
-*/
-
-static int i_ADDIDATA_InsnReadEeprom(struct comedi_device *dev, struct comedi_subdevice *s,
-        struct comedi_insn *insn, unsigned int *data)
-{
-        unsigned short w_Data;
-        unsigned short w_Address;
-        w_Address = CR_CHAN(insn->chanspec);    /*  address to be read as 0,1,2,3...255 */
-
-        w_Data = w_EepromReadWord(devpriv->i_IobaseAmcc,
-                this_board->pc_EepromChip, 0x100 + (2 * w_Address));
-        data[0] = w_Data;
-        /* multiplied by 2 bcozinput will be like 0,1,2...255 */
-        return insn->n;
-
+        if (pcidev) {
+                if (dev->iobase)
+                        comedi_pci_disable(pcidev);
+        }
 }
diff --git a/drivers/staging/comedi/drivers/addi-data/addi_common.h b/drivers/staging/comedi/drivers/addi-data/addi_common.h
index b7bbb7164f58..6d8b29f945d5 100644
--- a/drivers/staging/comedi/drivers/addi-data/addi_common.h
+++ b/drivers/staging/comedi/drivers/addi-data/addi_common.h
@@ -15,26 +15,8 @@
  * any later version.
  */
 
-#include <linux/kernel.h>
-#include <linux/module.h>
 #include <linux/sched.h>
-#include <linux/mm.h>
-#include <linux/slab.h>
-#include <linux/errno.h>
-#include <linux/ioport.h>
-#include <linux/delay.h>
 #include <linux/interrupt.h>
-#include <linux/timex.h>
-#include <linux/timer.h>
-#include <linux/pci.h>
-#include <linux/io.h>
-#include <linux/kmod.h>
-#include <linux/uaccess.h>
-#include "../../comedidev.h"
-#include "addi_amcc_s5933.h"
-
-#define ERROR   -1
-#define SUCCESS 1
 
 #define LOBYTE(W)       (unsigned char)((W) & 0xFF)
 #define HIBYTE(W)       (unsigned char)(((W) >> 8) & 0xFF)
@@ -312,9 +294,6 @@ struct addi_private {
         int i_IobaseAddon;      /* addon base address */
         int i_IobaseReserved;
         void __iomem *dw_AiBase;
-        struct pcilst_struct *amcc;     /*  ptr too AMCC data */
-        unsigned char allocated;                /*  we have blocked card */
-        unsigned char b_ValidDriver;    /*  driver is ok */
         unsigned char b_AiContinuous;   /*  we do unlimited AI */
         unsigned char b_AiInitialisation;
         unsigned int ui_AiActualScan;   /* how many scans we finished */
@@ -410,14 +389,3 @@ struct addi_private {
                                         /*  Minimum Delay in Nano secs */
         } s_EeParameters;
 };
-
-static unsigned short pci_list_builded; /* set to 1 when list of card is known */
-
-/* Function declarations */
-static int i_ADDI_Attach(struct comedi_device *dev, struct comedi_devconfig *it);
-static void i_ADDI_Detach(struct comedi_device *dev);
-static int i_ADDI_Reset(struct comedi_device *dev);
-
-static irqreturn_t v_ADDI_Interrupt(int irq, void *d);
-static int i_ADDIDATA_InsnReadEeprom(struct comedi_device *dev, struct comedi_subdevice *s,
-                                     struct comedi_insn *insn, unsigned int *data);
diff --git a/drivers/staging/comedi/drivers/addi-data/addi_eeprom.c b/drivers/staging/comedi/drivers/addi-data/addi_eeprom.c
index 3a9339b92610..5124ac9f1818 100644
--- a/drivers/staging/comedi/drivers/addi-data/addi_eeprom.c
+++ b/drivers/staging/comedi/drivers/addi-data/addi_eeprom.c
@@ -1,1162 +1,365 @@
-/**
-@verbatim
-
-Copyright (C) 2004,2005  ADDI-DATA GmbH for the source code of this module.
-
-        ADDI-DATA GmbH
-        Dieselstrasse 3
-        D-77833 Ottersweier
-        Tel: +19(0)7223/9493-0
-        Fax: +49(0)7223/9493-92
-        http://www.addi-data.com
-        info@addi-data.com
-
-This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
-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
-
-You should also find the complete GPL in the COPYING file accompanying this source code.
-
-@endverbatim
-*/
 /*
-
-  +-----------------------------------------------------------------------+
-  | (C) ADDI-DATA GmbH          Dieselstrasse 3      D-77833 Ottersweier  |
-  +-----------------------------------------------------------------------+
-  | Tel : +49 (0) 7223/9493-0     | email    : info@addi-data.com         |
-  | Fax : +49 (0) 7223/9493-92    | Internet : http://www.addi-data.com   |
-  +-----------------------------------------------------------------------+
-  | Project   : ADDI DATA         | Compiler : GCC                                    |
-  | Modulname : addi_eeprom.c     | Version  : 2.96                       |
-  +-------------------------------+---------------------------------------+
-  | Project manager: Eric Stolz   | Date     :  02/12/2002                |
-  +-----------------------------------------------------------------------+
-  | Description : ADDI EEPROM  Module                                     |
-  +-----------------------------------------------------------------------+
-  |                             UPDATE'S                                  |
-  +-----------------------------------------------------------------------+
-  |   Date   |   Author  |          Description of updates                |
-  +----------+-----------+------------------------------------------------+
-  |          |           |                                                |
-  |          |           |                                                |
-  +----------+-----------+------------------------------------------------+
-*/
-
-#define NVCMD_BEGIN_READ        (0x7 << 5)      /*  nvRam begin read command */
-#define NVCMD_LOAD_LOW          (0x4 << 5)      /*  nvRam load low command */
-#define NVCMD_LOAD_HIGH         (0x5 << 5)      /*  nvRam load high command */
-#define EE76_CMD_LEN            13      /*  bits in instructions */
-#define EE_READ                 0x0180  /*  01 1000 0000 read instruction */
-
-#define EEPROM_DIGITALINPUT                     0
-#define EEPROM_DIGITALOUTPUT                    1
-#define EEPROM_ANALOGINPUT                              2
-#define EEPROM_ANALOGOUTPUT                             3
-#define EEPROM_TIMER                                    4
-#define EEPROM_WATCHDOG                                 5
+ * addi_eeprom.c - ADDI EEPROM Module
+ * Copyright (C) 2004,2005  ADDI-DATA GmbH for the source code of this module.
+ * Project manager: Eric Stolz
+ *
+ *      ADDI-DATA GmbH
+ *      Dieselstrasse 3
+ *      D-77833 Ottersweier
+ *      Tel: +19(0)7223/9493-0
+ *      Fax: +49(0)7223/9493-92
+ *      http://www.addi-data.com
+ *      info@addi-data.com
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * for more details.
+ *
+ * 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
+ *
+ * You should also find the complete GPL in the COPYING file accompanying
+ * this source code.
+ */
+
+#define NVRAM_USER_DATA_START   0x100
+
+#define NVCMD_BEGIN_READ        (0x7 << 5)      /* nvRam begin read command */
+#define NVCMD_LOAD_LOW          (0x4 << 5)      /* nvRam load low command */
+#define NVCMD_LOAD_HIGH         (0x5 << 5)      /* nvRam load high command */
+
+#define EE93C76_CLK_BIT         (1 << 0)
+#define EE93C76_CS_BIT          (1 << 1)
+#define EE93C76_DOUT_BIT        (1 << 2)
+#define EE93C76_DIN_BIT         (1 << 3)
+#define EE93C76_READ_CMD        (0x0180 << 4)
+#define EE93C76_CMD_LEN         13
+
+#define EEPROM_DIGITALINPUT             0
+#define EEPROM_DIGITALOUTPUT            1
+#define EEPROM_ANALOGINPUT              2
+#define EEPROM_ANALOGOUTPUT             3
+#define EEPROM_TIMER                    4
+#define EEPROM_WATCHDOG                 5
 #define EEPROM_TIMER_WATCHDOG_COUNTER   10
 
-struct str_Functionality {
-        unsigned char b_Type;
-        unsigned short w_Address;
-};
-
-struct str_MainHeader {
-        unsigned short w_HeaderSize;
-        unsigned char b_Nfunctions;
-        struct str_Functionality s_Functions[7];
-};
-
-struct str_DigitalInputHeader {
-        unsigned short w_Nchannel;
-        unsigned char b_Interruptible;
-        unsigned short w_NinterruptLogic;
-};
-
-struct str_DigitalOutputHeader {
-
-        unsigned short w_Nchannel;
-};
-
-
-/* used for timer as well as watchdog */
-
-struct str_TimerDetails {
-
-        unsigned short w_HeaderSize;
-        unsigned char b_Resolution;
-        unsigned char b_Mode;           /*  in case of Watchdog it is functionality */
-        unsigned short w_MinTiming;
-        unsigned char b_TimeBase;
-};
-
-struct str_TimerMainHeader {
-
-
-        unsigned short w_Ntimer;
-        struct str_TimerDetails s_TimerDetails[4];      /*   supports 4 timers */
-};
-
-
-struct str_AnalogOutputHeader {
-        unsigned short w_Nchannel;
-        unsigned char b_Resolution;
-};
-
-struct str_AnalogInputHeader {
-        unsigned short w_Nchannel;
-        unsigned short w_MinConvertTiming;
-        unsigned short w_MinDelayTiming;
-        unsigned char b_HasDma;
-        unsigned char b_Resolution;
-};
-
-
-                /*****************************************/
-                /*            Read Header Functions              */
-                /*****************************************/
-
-int i_EepromReadMainHeader(unsigned short w_PCIBoardEepromAddress,
-        char *pc_PCIChipInformation, struct comedi_device *dev);
-
-int i_EepromReadDigitalInputHeader(unsigned short w_PCIBoardEepromAddress,
-        char *pc_PCIChipInformation, unsigned short w_Address,
-        struct str_DigitalInputHeader *s_Header);
-
-int i_EepromReadDigitalOutputHeader(unsigned short w_PCIBoardEepromAddress,
-        char *pc_PCIChipInformation, unsigned short w_Address,
-        struct str_DigitalOutputHeader *s_Header);
-
-int i_EepromReadTimerHeader(unsigned short w_PCIBoardEepromAddress,
-        char *pc_PCIChipInformation, unsigned short w_Address,
-        struct str_TimerMainHeader *s_Header);
-
-int i_EepromReadAnlogOutputHeader(unsigned short w_PCIBoardEepromAddress,
-        char *pc_PCIChipInformation, unsigned short w_Address,
-        struct str_AnalogOutputHeader *s_Header);
-
-int i_EepromReadAnlogInputHeader(unsigned short w_PCIBoardEepromAddress,
-        char *pc_PCIChipInformation, unsigned short w_Address,
-        struct str_AnalogInputHeader *s_Header);
-
-                /******************************************/
-                /*      Eeprom Specific Functions                         */
-                /******************************************/
-unsigned short w_EepromReadWord(unsigned short w_PCIBoardEepromAddress, char *pc_PCIChipInformation,
-        unsigned short w_EepromStartAddress);
-void v_EepromWaitBusy(unsigned short w_PCIBoardEepromAddress);
-void v_EepromClock76(unsigned int dw_Address, unsigned int dw_RegisterValue);
-void v_EepromWaitBusy(unsigned short w_PCIBoardEepromAddress);
-void v_EepromSendCommand76(unsigned int dw_Address, unsigned int dw_EepromCommand,
-        unsigned char b_DataLengthInBits);
-void v_EepromCs76Read(unsigned int dw_Address, unsigned short w_offset, unsigned short *pw_Value);
-
-/*
-+----------------------------------------------------------------------------+
-| Function   Name   : unsigned short w_EepromReadWord                                  |
-|                               (unsigned short w_PCIBoardEepromAddress,                         |
-|                                char * pc_PCIChipInformation,                           |
-|                                unsigned short   w_EepromStartAddress)                          |
-+----------------------------------------------------------------------------+
-| Task              : Read from eepromn a word                               |
-+----------------------------------------------------------------------------+
-| Input Parameters  : unsigned short w_PCIBoardEepromAddress : PCI eeprom address      |
-|                                                                                                                                        |
-|                     char *pc_PCIChipInformation  : PCI Chip Type.          |
-|                                                                                                                                        |
-|                     unsigned short w_EepromStartAddress    : Selected eeprom address |
-+----------------------------------------------------------------------------+
-| Output Parameters : -                                                      |
-+----------------------------------------------------------------------------+
-| Return Value      : Read word value from eeprom                            |
-+----------------------------------------------------------------------------+
-*/
-
-unsigned short w_EepromReadWord(unsigned short w_PCIBoardEepromAddress, char *pc_PCIChipInformation,
-        unsigned short w_EepromStartAddress)
+static void addi_eeprom_clk_93c76(unsigned long iobase, unsigned int val)
 {
-
-        unsigned char b_Counter = 0;
-
-        unsigned char b_ReadByte = 0;
-
-        unsigned char b_ReadLowByte = 0;
-
-        unsigned char b_ReadHighByte = 0;
-
-        unsigned char b_SelectedAddressLow = 0;
-
-        unsigned char b_SelectedAddressHigh = 0;
-
-        unsigned short w_ReadWord = 0;
-
-        /**************************/
-
-        /* Test the PCI chip type */
-
-        /**************************/
-
-        if ((!strcmp(pc_PCIChipInformation, "S5920")) ||
-                (!strcmp(pc_PCIChipInformation, "S5933")))
-        {
-
-                for (b_Counter = 0; b_Counter < 2; b_Counter++)
-                {
-
-                        b_SelectedAddressLow = (w_EepromStartAddress + b_Counter) % 256;        /* Read the low 8 bit part */
-
-                        b_SelectedAddressHigh = (w_EepromStartAddress + b_Counter) / 256;       /* Read the high 8 bit part */
-
-              /************************************/
-
-                        /* Select the load low address mode */
-
-              /************************************/
-
-                        outb(NVCMD_LOAD_LOW, w_PCIBoardEepromAddress + 0x3F);
-
-              /****************/
-
-                        /* Wait on busy */
-
-              /****************/
-
-                        v_EepromWaitBusy(w_PCIBoardEepromAddress);
-
-              /************************/
-
-                        /* Load the low address */
-
-              /************************/
-
-                        outb(b_SelectedAddressLow,
-                                w_PCIBoardEepromAddress + 0x3E);
-
-              /****************/
-
-                        /* Wait on busy */
-
-              /****************/
-
-                        v_EepromWaitBusy(w_PCIBoardEepromAddress);
-
-              /*************************************/
-
-                        /* Select the load high address mode */
-
-              /*************************************/
-
-                        outb(NVCMD_LOAD_HIGH, w_PCIBoardEepromAddress + 0x3F);
-
-              /****************/
-
-                        /* Wait on busy */
-
-              /****************/
-
-                        v_EepromWaitBusy(w_PCIBoardEepromAddress);
-
-              /*************************/
-
-                        /* Load the high address */
-
-              /*************************/
-
-                        outb(b_SelectedAddressHigh,
-                                w_PCIBoardEepromAddress + 0x3E);
-
-              /****************/
-
-                        /* Wait on busy */
-
-              /****************/
-
-                        v_EepromWaitBusy(w_PCIBoardEepromAddress);
-
-              /************************/
-
-                        /* Select the READ mode */
-
-              /************************/
-
-                        outb(NVCMD_BEGIN_READ, w_PCIBoardEepromAddress + 0x3F);
-
-              /****************/
-
-                        /* Wait on busy */
-
-              /****************/
-
-                        v_EepromWaitBusy(w_PCIBoardEepromAddress);
-
-              /*****************************/
-
-                        /* Read data into the EEPROM */
-
-              /*****************************/
-
-                        b_ReadByte = inb(w_PCIBoardEepromAddress + 0x3E);
-
-              /****************/
-
-                        /* Wait on busy */
-
-              /****************/
-
-                        v_EepromWaitBusy(w_PCIBoardEepromAddress);
-
-              /*********************************/
-
-                        /* Select the upper address part */
-
-              /*********************************/
-
-                        if (b_Counter == 0)
-                        {
-
-                                b_ReadLowByte = b_ReadByte;
-
-                        }       /*  if(b_Counter==0) */
-
-                        else
-                        {
-
-                                b_ReadHighByte = b_ReadByte;
-
-                        }       /*  if(b_Counter==0) */
-
-                }               /*  for (b_Counter=0; b_Counter<2; b_Counter++) */
-
-                w_ReadWord = (b_ReadLowByte | (((unsigned short) b_ReadHighByte) * 256));
-
-        }                       /*  end of if ((!strcmp(pc_PCIChipInformation, "S5920")) || (!strcmp(pc_PCIChipInformation, "S5933"))) */
-
-        if (!strcmp(pc_PCIChipInformation, "93C76"))
-        {
-
-           /*************************************/
-
-                /* Read 16 bit from the EEPROM 93C76 */
-
-           /*************************************/
-
-                v_EepromCs76Read(w_PCIBoardEepromAddress, w_EepromStartAddress,
-                        &w_ReadWord);
-
-        }
-
-        return w_ReadWord;
-
-}
-
-/*
-
-+----------------------------------------------------------------------------+
-
-| Function   Name   : void v_EepromWaitBusy                                  |
-
-|                       (unsigned short w_PCIBoardEepromAddress)                         |
-
-+----------------------------------------------------------------------------+
-
-| Task              : Wait the busy flag from PCI controller                 |
-
-+----------------------------------------------------------------------------+
-
-| Input Parameters  : unsigned short w_PCIBoardEepromAddress : PCI eeprom base address |
-
-+----------------------------------------------------------------------------+
-
-| Output Parameters : -                                                      |
-
-+----------------------------------------------------------------------------+
-
-| Return Value      : -                                                      |
-
-+----------------------------------------------------------------------------+
-
-*/
-
-void v_EepromWaitBusy(unsigned short w_PCIBoardEepromAddress)
-{
-
-        unsigned char b_EepromBusy = 0;
-
-        do
-        {
-
-           /*************/
-
-                /* IMPORTANT */
-
-           /*************/
-
-           /************************************************************************/
-
-                /* An error has been written in the AMCC 5933 book at the page B-13 */
-
-                /* Ex: if you read a byte and look for the busy statusEEPROM=0x80 and   */
-
-                /*      the operator register is AMCC_OP_REG_MCSR+3 */
-
-                /*      unsigned short read  EEPROM=0x8000 andAMCC_OP_REG_MCSR+2                  */
-
-                /*      unsigned int read  EEPROM=0x80000000 and AMCC_OP_REG_MCSR */
-
-           /************************************************************************/
-
-                b_EepromBusy = inb(w_PCIBoardEepromAddress + 0x3F);
-                b_EepromBusy = b_EepromBusy & 0x80;
-
-        } while (b_EepromBusy == 0x80);
-
-}
-
-/*
-
-+---------------------------------------------------------------------------------+
-
-| Function   Name   : void v_EepromClock76(unsigned int dw_Address,                      |
-
-|                                          unsigned int dw_RegisterValue)                                         |
-
-+---------------------------------------------------------------------------------+
-
-| Task              : This function sends the clocking sequence to the EEPROM.    |
-
-+---------------------------------------------------------------------------------+
-
-| Input Parameters  : unsigned int dw_Address : PCI eeprom base address                  |
-
-|                     unsigned int dw_RegisterValue : PCI eeprom register value to write.|
-
-+---------------------------------------------------------------------------------+
-
-| Output Parameters : -                                                           |
-
-+---------------------------------------------------------------------------------+
-
-| Return Value      : -                                                           |
-
-+---------------------------------------------------------------------------------+
-
-*/
-
-void v_EepromClock76(unsigned int dw_Address, unsigned int dw_RegisterValue)
-{
-
-   /************************/
-
-        /* Set EEPROM clock Low */
-
-   /************************/
-
-        outl(dw_RegisterValue & 0x6, dw_Address);
-
-   /***************/
-
-        /* Wait 0.1 ms */
-
-   /***************/
-
+        outl(val & ~EE93C76_CLK_BIT, iobase);
         udelay(100);
 
-   /*************************/
-
-        /* Set EEPROM clock High */
-
-   /*************************/
-
-        outl(dw_RegisterValue | 0x1, dw_Address);
-
-   /***************/
-
-        /* Wait 0.1 ms */
-
-   /***************/
-
+        outl(val | EE93C76_CLK_BIT, iobase);
         udelay(100);
-
 }
 
-/*
-
-+---------------------------------------------------------------------------------+
-
-| Function   Name   : void v_EepromSendCommand76(unsigned int dw_Address,                |
-
-|                                          unsigned int   dw_EepromCommand,                               |
-
-|                                          unsigned char    b_DataLengthInBits)                        |
-
-+---------------------------------------------------------------------------------+
-
-| Task              : This function sends a Command to the EEPROM 93C76.          |
-
-+---------------------------------------------------------------------------------+
-
-| Input Parameters  : unsigned int dw_Address : PCI eeprom base address                  |
-
-|                     unsigned int dw_EepromCommand : PCI eeprom command to write.       |
-
-|                     unsigned char  b_DataLengthInBits : PCI eeprom command data length.  |
-
-+---------------------------------------------------------------------------------+
-
-| Output Parameters : -                                                           |
-
-+---------------------------------------------------------------------------------+
-
-| Return Value      : -                                                           |
-
-+---------------------------------------------------------------------------------+
-
-*/
-
-void v_EepromSendCommand76(unsigned int dw_Address, unsigned int dw_EepromCommand,
-        unsigned char b_DataLengthInBits)
+static unsigned int addi_eeprom_cmd_93c76(unsigned long iobase,
+                                          unsigned int cmd,
+                                          unsigned char len)
 {
-
-        char c_BitPos = 0;
-
-        unsigned int dw_RegisterValue = 0;
-
-   /*****************************/
-
-        /* Enable EEPROM Chip Select */
-
-   /*****************************/
-
-        dw_RegisterValue = 0x2;
-
-   /********************************************************************/
+        unsigned int val = EE93C76_CS_BIT;
+        int i;
 
         /* Toggle EEPROM's Chip select to get it out of Shift Register Mode */
-
-   /********************************************************************/
-
-        outl(dw_RegisterValue, dw_Address);
-
-   /***************/
-
-        /* Wait 0.1 ms */
-
-   /***************/
-
+        outl(val, iobase);
         udelay(100);
 
-   /*******************************************/
-
         /* Send EEPROM command - one bit at a time */
-
-   /*******************************************/
-
-        for (c_BitPos = (b_DataLengthInBits - 1); c_BitPos >= 0; c_BitPos--)
-        {
-
-      /**********************************/
-
-                /* Check if current bit is 0 or 1 */
-
-      /**********************************/
-
-                if (dw_EepromCommand & (1 << c_BitPos))
-                {
-
-         /***********/
-
-                        /* Write 1 */
-
-         /***********/
-
-                        dw_RegisterValue = dw_RegisterValue | 0x4;
-
-                }
-
+        for (i = (len - 1); i >= 0; i--) {
+                if (cmd & (1 << i))
+                        val |= EE93C76_DOUT_BIT;
                 else
-                {
-
-         /***********/
-
-                        /* Write 0 */
-
-         /***********/
-
-                        dw_RegisterValue = dw_RegisterValue & 0x3;
-
-                }
-
-      /*********************/
+                        val &= ~EE93C76_DOUT_BIT;
 
                 /* Write the command */
-
-      /*********************/
-
-                outl(dw_RegisterValue, dw_Address);
-
-      /***************/
-
-                /* Wait 0.1 ms */
-
-      /***************/
-
+                outl(val, iobase);
                 udelay(100);
 
-      /****************************/
-
-                /* Trigger the EEPROM clock */
-
-      /****************************/
-
-                v_EepromClock76(dw_Address, dw_RegisterValue);
-
+                addi_eeprom_clk_93c76(iobase, val);
         }
-
+        return val;
 }
 
-/*
-
-+---------------------------------------------------------------------------------+
-
-| Function   Name   : void v_EepromCs76Read(unsigned int dw_Address,                     |
-
-|                                          unsigned short    w_offset,                                            |
-
-|                                          unsigned short *   pw_Value)                                           |
-
-+---------------------------------------------------------------------------------+
-
-| Task              : This function read a value from the EEPROM 93C76.           |
-
-+---------------------------------------------------------------------------------+
-
-| Input Parameters  : unsigned int dw_Address : PCI eeprom base address                  |
-
-|                     unsigned short    w_offset : Offset of the address to read             |
-
-|                     unsigned short *   pw_Value : PCI eeprom 16 bit read value.            |
-
-+---------------------------------------------------------------------------------+
-
-| Output Parameters : -                                                           |
-
-+---------------------------------------------------------------------------------+
-
-| Return Value      : -                                                           |
-
-+---------------------------------------------------------------------------------+
-
-*/
-
-void v_EepromCs76Read(unsigned int dw_Address, unsigned short w_offset, unsigned short *pw_Value)
+static unsigned short addi_eeprom_readw_93c76(unsigned long iobase,
+                                              unsigned short addr)
 {
-
-        char c_BitPos = 0;
-
-        unsigned int dw_RegisterValue = 0;
-
-        unsigned int dw_RegisterValueRead = 0;
-
-   /*************************************************/
+        unsigned short val = 0;
+        unsigned int cmd;
+        unsigned int tmp;
+        int i;
 
         /* Send EEPROM read command and offset to EEPROM */
-
-   /*************************************************/
-
-        v_EepromSendCommand76(dw_Address, (EE_READ << 4) | (w_offset / 2),
-                EE76_CMD_LEN);
-
-   /*******************************/
-
-        /* Get the last register value */
-
-   /*******************************/
-
-        dw_RegisterValue = (((w_offset / 2) & 0x1) << 2) | 0x2;
-
-   /*****************************/
-
-        /* Set the 16-bit value of 0 */
-
-   /*****************************/
-
-        *pw_Value = 0;
-
-   /************************/
+        cmd = EE93C76_READ_CMD | (addr / 2);
+        cmd = addi_eeprom_cmd_93c76(iobase, cmd, EE93C76_CMD_LEN);
 
         /* Get the 16-bit value */
+        for (i = 0; i < 16; i++) {
+                addi_eeprom_clk_93c76(iobase, cmd);
 
-   /************************/
-
-        for (c_BitPos = 0; c_BitPos < 16; c_BitPos++)
-        {
-
-      /****************************/
-
-                /* Trigger the EEPROM clock */
-
-      /****************************/
-
-                v_EepromClock76(dw_Address, dw_RegisterValue);
-
-      /**********************/
-
-                /* Get the result bit */
-
-      /**********************/
-
-                dw_RegisterValueRead = inl(dw_Address);
-
-      /***************/
-
-                /* Wait 0.1 ms */
-
-      /***************/
-
+                tmp = inl(iobase);
                 udelay(100);
 
-      /***************************************/
-
-                /* Get bit value and shift into result */
-
-      /***************************************/
-
-                if (dw_RegisterValueRead & 0x8)
-                {
-
-         /**********/
+                val <<= 1;
+                if (tmp & EE93C76_DIN_BIT)
+                        val |= 0x1;
+        }
 
-                        /* Read 1 */
+        /* Toggle EEPROM's Chip select to get it out of Shift Register Mode */
+        outl(0, iobase);
+        udelay(100);
 
-         /**********/
+        return val;
+}
 
-                        *pw_Value = (*pw_Value << 1) | 0x1;
+static void addi_eeprom_nvram_wait(unsigned long iobase)
+{
+        unsigned char val;
 
-                }
+        do {
+                val = inb(iobase + AMCC_OP_REG_MCSR_NVCMD);
+        } while (val & 0x80);
+}
 
+static unsigned short addi_eeprom_readw_nvram(unsigned long iobase,
+                                              unsigned short addr)
+{
+        unsigned short val = 0;
+        unsigned char tmp;
+        unsigned char i;
+
+        for (i = 0; i < 2; i++) {
+                /* Load the low 8 bit address */
+                outb(NVCMD_LOAD_LOW, iobase + AMCC_OP_REG_MCSR_NVCMD);
+                addi_eeprom_nvram_wait(iobase);
+                outb((addr + i) & 0xff, iobase + AMCC_OP_REG_MCSR_NVDATA);
+                addi_eeprom_nvram_wait(iobase);
+
+                /* Load the high 8 bit address */
+                outb(NVCMD_LOAD_HIGH, iobase + AMCC_OP_REG_MCSR_NVCMD);
+                addi_eeprom_nvram_wait(iobase);
+                outb(((addr + i) >> 8) & 0xff,
+                        iobase + AMCC_OP_REG_MCSR_NVDATA);
+                addi_eeprom_nvram_wait(iobase);
+
+                /* Read the eeprom data byte */
+                outb(NVCMD_BEGIN_READ, iobase + AMCC_OP_REG_MCSR_NVCMD);
+                addi_eeprom_nvram_wait(iobase);
+                tmp = inb(iobase + AMCC_OP_REG_MCSR_NVDATA);
+                addi_eeprom_nvram_wait(iobase);
+
+                if (i == 0)
+                        val |= tmp;
                 else
-                {
-
-         /**********/
-
-                        /* Read 0 */
+                        val |= (tmp << 8);
+        }
 
-         /**********/
+        return val;
+}
 
-                        *pw_Value = (*pw_Value << 1);
+static unsigned short addi_eeprom_readw(unsigned long iobase,
+                                        char *type,
+                                        unsigned short addr)
+{
+        unsigned short val = 0;
 
-                }
+        /* Add the offset to the start of the user data */
+        addr += NVRAM_USER_DATA_START;
 
-        }
+        if (!strcmp(type, "S5920") || !strcmp(type, "S5933"))
+                val = addi_eeprom_readw_nvram(iobase, addr);
 
-   /*************************/
+        if (!strcmp(type, "93C76"))
+                val = addi_eeprom_readw_93c76(iobase, addr);
 
-        /* Clear all EEPROM bits */
+        return val;
+}
 
-   /*************************/
+static void addi_eeprom_read_di_info(struct comedi_device *dev,
+                                     unsigned long iobase,
+                                     unsigned short addr)
+{
+        const struct addi_board *this_board = comedi_board(dev);
+        struct addi_private *devpriv = dev->private;
+        char *type = this_board->pc_EepromChip;
+        unsigned short tmp;
 
-        dw_RegisterValue = 0x0;
+        /* Number of channels */
+        tmp = addi_eeprom_readw(iobase, type, addr + 6);
+        devpriv->s_EeParameters.i_NbrDiChannel = tmp;
 
-   /********************************************************************/
+        /* Interruptible or not */
+        tmp = addi_eeprom_readw(iobase, type, addr + 8);
+        tmp = (tmp >> 7) & 0x01;
 
-        /* Toggle EEPROM's Chip select to get it out of Shift Register Mode */
+        /* How many interruptible logic */
+        tmp = addi_eeprom_readw(iobase, type, addr + 10);
+}
 
-   /********************************************************************/
+static void addi_eeprom_read_do_info(struct comedi_device *dev,
+                                     unsigned long iobase,
+                                     unsigned short addr)
+{
+        const struct addi_board *this_board = comedi_board(dev);
+        struct addi_private *devpriv = dev->private;
+        char *type = this_board->pc_EepromChip;
+        unsigned short tmp;
 
-        outl(dw_RegisterValue, dw_Address);
+        /* Number of channels */
+        tmp = addi_eeprom_readw(iobase, type, addr + 6);
+        devpriv->s_EeParameters.i_NbrDoChannel = tmp;
 
-   /***************/
+        devpriv->s_EeParameters.i_DoMaxdata = 0xffffffff >> (32 - tmp);
+}
 
-        /* Wait 0.1 ms */
+static void addi_eeprom_read_timer_info(struct comedi_device *dev,
+                                        unsigned long iobase,
+                                        unsigned short addr)
+{
+        struct addi_private *devpriv = dev->private;
+#if 0
+        const struct addi_board *this_board = comedi_board(dev);
+        char *type = this_board->pc_EepromChip;
+        unsigned short offset = 0;
+        unsigned short ntimers;
+        unsigned short tmp;
+        int i;
+
+        /* Number of Timers */
+        ntimers = addi_eeprom_readw(iobase, type, addr + 6);
+
+        /* Read header size */
+        for (i = 0; i < ntimers; i++) {
+                unsigned short size;
+                unsigned short res;
+                unsigned short mode;
+                unsigned short min_timing;
+                unsigned short timebase;
+
+                size = addi_eeprom_readw(iobase, type, addr + 8 + offset + 0);
+
+                /* Resolution / Mode */
+                tmp = addi_eeprom_readw(iobase, type, addr + 8 + offset + 2);
+                res = (tmp >> 10) & 0x3f;
+                mode = (tmp >> 4) & 0x3f;
+
+                /* MinTiming / Timebase */
+                tmp = addi_eeprom_readw(iobase, type, addr + 8 + offset + 4);
+                min_timing = (tmp  >> 6) & 0x3ff;
+                Timebase = tmp & 0x3f;
+
+                offset += size;
+        }
+#endif
+        /* Timer subdevice present */
+        devpriv->s_EeParameters.i_Timer = 1;
+}
 
-   /***************/
+static void addi_eeprom_read_ao_info(struct comedi_device *dev,
+                                     unsigned long iobase,
+                                     unsigned short addr)
+{
+        const struct addi_board *this_board = comedi_board(dev);
+        struct addi_private *devpriv = dev->private;
+        char *type = this_board->pc_EepromChip;
+        unsigned short tmp;
+
+        /* No of channels for 1st hard component */
+        tmp = addi_eeprom_readw(iobase, type, addr + 10);
+        devpriv->s_EeParameters.i_NbrAoChannel = (tmp >> 4) & 0x3ff;
+
+        /* Resolution for 1st hard component */
+        tmp = addi_eeprom_readw(iobase, type, addr + 16);
+        tmp = (tmp >> 8) & 0xff;
+        devpriv->s_EeParameters.i_AoMaxdata = 0xfff >> (16 - tmp);
+}
 
-        udelay(100);
+static void addi_eeprom_read_ai_info(struct comedi_device *dev,
+                                     unsigned long iobase,
+                                     unsigned short addr)
+{
+        const struct addi_board *this_board = comedi_board(dev);
+        struct addi_private *devpriv = dev->private;
+        char *type = this_board->pc_EepromChip;
+        unsigned short offset;
+        unsigned short tmp;
+
+        /* No of channels for 1st hard component */
+        tmp = addi_eeprom_readw(iobase, type, addr + 10);
+        devpriv->s_EeParameters.i_NbrAiChannel = (tmp >> 4) & 0x3ff;
+        if (!strcmp(this_board->pc_DriverName, "apci3200"))
+                devpriv->s_EeParameters.i_NbrAiChannel *= 4;
+
+        tmp = addi_eeprom_readw(iobase, type, addr + 16);
+        devpriv->s_EeParameters.ui_MinAcquisitiontimeNs = tmp * 1000;
+
+        tmp = addi_eeprom_readw(iobase, type, addr + 30);
+        devpriv->s_EeParameters.ui_MinDelaytimeNs = tmp * 1000;
+
+        tmp = addi_eeprom_readw(iobase, type, addr + 20);
+        devpriv->s_EeParameters.i_Dma = (tmp >> 13) & 0x01;
+
+        tmp = addi_eeprom_readw(iobase, type, addr + 72) & 0xff;
+        if (tmp) {              /* > 0 */
+                /* offset of first analog input single header */
+                offset = 74 + (2 * tmp) + (10 * (1 + (tmp / 16)));
+        } else {                /* = 0 */
+                offset = 74;
+        }
 
+        /* Resolution */
+        tmp = addi_eeprom_readw(iobase, type, addr + offset + 2) & 0x1f;
+        devpriv->s_EeParameters.i_AiMaxdata = 0xffff >> (16 - tmp);
 }
 
-        /******************************************/
-        /*      EEPROM HEADER READ FUNCTIONS      */
-        /******************************************/
-
-/*
-+----------------------------------------------------------------------------+
-| Function Name  : int i_EepromReadMainHeader(unsigned short w_PCIBoardEepromAddress,  |
-|                               char *  pc_PCIChipInformation,struct comedi_device *dev)    |
-+----------------------------------------------------------------------------+
-| Task              : Read from eeprom Main Header                           |
-+----------------------------------------------------------------------------+
-| Input Parameters  : unsigned short w_PCIBoardEepromAddress : PCI eeprom address      |
-|                                                                                                                                        |
-|                     char *pc_PCIChipInformation  : PCI Chip Type.          |
-|                                                                                                                                        |
-|                         struct comedi_device *dev                : comedi device structure |
-|                                                                                        pointer                                 |
-+----------------------------------------------------------------------------+
-| Output Parameters : -                                                      |
-+----------------------------------------------------------------------------+
-| Return Value      : 0                                                                              |
-+----------------------------------------------------------------------------+
-*/
-
-int i_EepromReadMainHeader(unsigned short w_PCIBoardEepromAddress,
-        char *pc_PCIChipInformation, struct comedi_device *dev)
+static void addi_eeprom_read_info(struct comedi_device *dev,
+                                  unsigned long iobase)
 {
-        unsigned short w_Temp, i, w_Count = 0;
-        unsigned int ui_Temp;
-        struct str_MainHeader s_MainHeader;
-        struct str_DigitalInputHeader s_DigitalInputHeader;
-        struct str_DigitalOutputHeader s_DigitalOutputHeader;
-        /* struct str_TimerMainHeader     s_TimerMainHeader,s_WatchdogMainHeader; */
-        struct str_AnalogOutputHeader s_AnalogOutputHeader;
-        struct str_AnalogInputHeader s_AnalogInputHeader;
-
-        /* Read size */
-        s_MainHeader.w_HeaderSize =
-                w_EepromReadWord(w_PCIBoardEepromAddress, pc_PCIChipInformation,
-                0x100 + 8);
-
-        /* Read nbr of functionality */
-        w_Temp = w_EepromReadWord(w_PCIBoardEepromAddress,
-                pc_PCIChipInformation, 0x100 + 10);
-        s_MainHeader.b_Nfunctions = (unsigned char) w_Temp & 0x00FF;
+        const struct addi_board *this_board = comedi_board(dev);
+        char *type = this_board->pc_EepromChip;
+        unsigned short size;
+        unsigned char nfuncs;
+        int i;
+
+        size = addi_eeprom_readw(iobase, type, 8);
+        nfuncs = addi_eeprom_readw(iobase, type, 10) & 0xff;
 
         /* Read functionality details */
-        for (i = 0; i < s_MainHeader.b_Nfunctions; i++) {
-                /* Read Type */
-                w_Temp = w_EepromReadWord(w_PCIBoardEepromAddress,
-                        pc_PCIChipInformation, 0x100 + 12 + w_Count);
-                s_MainHeader.s_Functions[i].b_Type = (unsigned char) w_Temp & 0x3F;
-                w_Count = w_Count + 2;
-                /* Read Address */
-                s_MainHeader.s_Functions[i].w_Address =
-                        w_EepromReadWord(w_PCIBoardEepromAddress,
-                        pc_PCIChipInformation, 0x100 + 12 + w_Count);
-                w_Count = w_Count + 2;
-        }
+        for (i = 0; i < nfuncs; i++) {
+                unsigned short offset = i * 4;
+                unsigned short addr;
+                unsigned char func;
 
-        /* Display main header info */
-        for (i = 0; i < s_MainHeader.b_Nfunctions; i++) {
+                func = addi_eeprom_readw(iobase, type, 12 + offset) & 0x3f;
+                addr = addi_eeprom_readw(iobase, type, 14 + offset);
 
-                switch (s_MainHeader.s_Functions[i].b_Type) {
+                switch (func) {
                 case EEPROM_DIGITALINPUT:
-                        i_EepromReadDigitalInputHeader(w_PCIBoardEepromAddress,
-                                pc_PCIChipInformation,
-                                s_MainHeader.s_Functions[i].w_Address,
-                                &s_DigitalInputHeader);
-                        devpriv->s_EeParameters.i_NbrDiChannel =
-                                s_DigitalInputHeader.w_Nchannel;
+                        addi_eeprom_read_di_info(dev, iobase, addr);
                         break;
 
                 case EEPROM_DIGITALOUTPUT:
-                        i_EepromReadDigitalOutputHeader(w_PCIBoardEepromAddress,
-                                pc_PCIChipInformation,
-                                s_MainHeader.s_Functions[i].w_Address,
-                                &s_DigitalOutputHeader);
-                        devpriv->s_EeParameters.i_NbrDoChannel =
-                                s_DigitalOutputHeader.w_Nchannel;
-                        ui_Temp = 0xffffffff;
-                        devpriv->s_EeParameters.i_DoMaxdata =
-                                ui_Temp >> (32 -
-                                        devpriv->s_EeParameters.i_NbrDoChannel);
+                        addi_eeprom_read_do_info(dev, iobase, addr);
                         break;
 
                 case EEPROM_ANALOGINPUT:
-                        i_EepromReadAnlogInputHeader(w_PCIBoardEepromAddress,
-                                pc_PCIChipInformation,
-                                s_MainHeader.s_Functions[i].w_Address,
-                                &s_AnalogInputHeader);
-                        if (!(strcmp(this_board->pc_DriverName, "apci3200")))
-                                devpriv->s_EeParameters.i_NbrAiChannel =
-                                        s_AnalogInputHeader.w_Nchannel * 4;
-                        else
-                                devpriv->s_EeParameters.i_NbrAiChannel =
-                                        s_AnalogInputHeader.w_Nchannel;
-                        devpriv->s_EeParameters.i_Dma =
-                                s_AnalogInputHeader.b_HasDma;
-                        devpriv->s_EeParameters.ui_MinAcquisitiontimeNs =
-                                (unsigned int) s_AnalogInputHeader.w_MinConvertTiming *
-                                1000;
-                        devpriv->s_EeParameters.ui_MinDelaytimeNs =
-                                (unsigned int) s_AnalogInputHeader.w_MinDelayTiming *
-                                1000;
-                        ui_Temp = 0xffff;
-                        devpriv->s_EeParameters.i_AiMaxdata =
-                                ui_Temp >> (16 -
-                                s_AnalogInputHeader.b_Resolution);
+                        addi_eeprom_read_ai_info(dev, iobase, addr);
                         break;
 
                 case EEPROM_ANALOGOUTPUT:
-                        i_EepromReadAnlogOutputHeader(w_PCIBoardEepromAddress,
-                                pc_PCIChipInformation,
-                                s_MainHeader.s_Functions[i].w_Address,
-                                &s_AnalogOutputHeader);
-                        devpriv->s_EeParameters.i_NbrAoChannel =
-                                s_AnalogOutputHeader.w_Nchannel;
-                        ui_Temp = 0xffff;
-                        devpriv->s_EeParameters.i_AoMaxdata =
-                                ui_Temp >> (16 -
-                                s_AnalogOutputHeader.b_Resolution);
+                        addi_eeprom_read_ao_info(dev, iobase, addr);
                         break;
 
                 case EEPROM_TIMER:
-                        /* Timer subdevice present */
-                        devpriv->s_EeParameters.i_Timer = 1;
-                        break;
-
                 case EEPROM_WATCHDOG:
-                        /* Timer subdevice present */
-                        devpriv->s_EeParameters.i_Timer = 1;
-                        break;
-
                 case EEPROM_TIMER_WATCHDOG_COUNTER:
-                        /* Timer subdevice present */
-                        devpriv->s_EeParameters.i_Timer = 1;
+                        addi_eeprom_read_timer_info(dev, iobase, addr);
                         break;
                 }
         }
-
-        return 0;
-}
-
-/*
-+----------------------------------------------------------------------------+
-| Function Name  : int i_EepromReadDigitalInputHeader(unsigned short                                     |
-|                       w_PCIBoardEepromAddress,char *pc_PCIChipInformation,     |
-|                       unsigned short w_Address,struct str_DigitalInputHeader *s_Header)                |
-|                                                                                                                                        |
-+----------------------------------------------------------------------------+
-| Task              : Read Digital Input Header                              |
-+----------------------------------------------------------------------------+
-| Input Parameters  : unsigned short w_PCIBoardEepromAddress : PCI eeprom address      |
-|                                                                                                                                        |
-|                     char *pc_PCIChipInformation  : PCI Chip Type.          |
-|                                                                                                                                        |
-|                        struct str_DigitalInputHeader *s_Header: Digita Input Header   |
-|                                                                                                  Pointer                       |
-+----------------------------------------------------------------------------+
-| Output Parameters : -                                                      |
-+----------------------------------------------------------------------------+
-| Return Value      : 0                                                                              |
-+----------------------------------------------------------------------------+
-*/
-int i_EepromReadDigitalInputHeader(unsigned short w_PCIBoardEepromAddress,
-        char *pc_PCIChipInformation, unsigned short w_Address,
-        struct str_DigitalInputHeader *s_Header)
-{
-        unsigned short w_Temp;
-
-        /*  read nbr of channels */
-        s_Header->w_Nchannel =
-                w_EepromReadWord(w_PCIBoardEepromAddress, pc_PCIChipInformation,
-                0x100 + w_Address + 6);
-
-        /*  interruptible or not */
-        w_Temp = w_EepromReadWord(w_PCIBoardEepromAddress,
-                pc_PCIChipInformation, 0x100 + w_Address + 8);
-        s_Header->b_Interruptible = (unsigned char) (w_Temp >> 7) & 0x01;
-
-/* How many interruptible logic */
-        s_Header->w_NinterruptLogic =
-                w_EepromReadWord(w_PCIBoardEepromAddress, pc_PCIChipInformation,
-                0x100 + w_Address + 10);
-
-        return 0;
-}
-
-/*
-+----------------------------------------------------------------------------+
-| Function Name  : int i_EepromReadDigitalOutputHeader(unsigned short                            |
-|                       w_PCIBoardEepromAddress,char *pc_PCIChipInformation,     |
-|                       unsigned short w_Address,struct str_DigitalOutputHeader *s_Header)           |
-|                                                                                                                                        |
-+----------------------------------------------------------------------------+
-| Task              : Read Digital Output Header                             |
-+----------------------------------------------------------------------------+
-| Input Parameters  : unsigned short w_PCIBoardEepromAddress : PCI eeprom address      |
-|                                                                                                                                        |
-|                     char *pc_PCIChipInformation  : PCI Chip Type.          |
-|                                                                                                                                        |
-|                        struct str_DigitalOutputHeader *s_Header: Digital Output Header|
-|                                                                                          Pointer                               |
-+----------------------------------------------------------------------------+
-| Output Parameters : -                                                      |
-+----------------------------------------------------------------------------+
-| Return Value      : 0                                                                              |
-+----------------------------------------------------------------------------+
-*/
-int i_EepromReadDigitalOutputHeader(unsigned short w_PCIBoardEepromAddress,
-        char *pc_PCIChipInformation, unsigned short w_Address,
-        struct str_DigitalOutputHeader *s_Header)
-{
-/* Read Nbr channels */
-        s_Header->w_Nchannel =
-                w_EepromReadWord(w_PCIBoardEepromAddress, pc_PCIChipInformation,
-                0x100 + w_Address + 6);
-        return 0;
-}
-
-/*
-+----------------------------------------------------------------------------+
-| Function Name  : int i_EepromReadTimerHeader(unsigned short w_PCIBoardEepromAddress, |
-|                       char *pc_PCIChipInformation,WORD w_Address,                              |
-|                       struct str_TimerMainHeader *s_Header)                                                    |
-+----------------------------------------------------------------------------+
-| Task              : Read Timer or Watchdog Header                          |
-+----------------------------------------------------------------------------+
-| Input Parameters  : unsigned short w_PCIBoardEepromAddress : PCI eeprom address      |
-|                                                                                                                                        |
-|                     char *pc_PCIChipInformation  : PCI Chip Type.          |
-|                                                                                                                                        |
-|                        struct str_TimerMainHeader *s_Header: Timer Header                      |
-|                                                                                          Pointer                               |
-+----------------------------------------------------------------------------+
-| Output Parameters : -                                                      |
-+----------------------------------------------------------------------------+
-| Return Value      : 0                                                                              |
-+----------------------------------------------------------------------------+
-*/
-int i_EepromReadTimerHeader(unsigned short w_PCIBoardEepromAddress,
-        char *pc_PCIChipInformation, unsigned short w_Address,
-        struct str_TimerMainHeader *s_Header)
-{
-
-        unsigned short i, w_Size = 0, w_Temp;
-
-/* Read No of Timer */
-        s_Header->w_Ntimer =
-                w_EepromReadWord(w_PCIBoardEepromAddress, pc_PCIChipInformation,
-                0x100 + w_Address + 6);
-/* Read header size */
-
-        for (i = 0; i < s_Header->w_Ntimer; i++) {
-                s_Header->s_TimerDetails[i].w_HeaderSize =
-                        w_EepromReadWord(w_PCIBoardEepromAddress,
-                        pc_PCIChipInformation,
-                        0x100 + w_Address + 8 + w_Size + 0);
-                w_Temp = w_EepromReadWord(w_PCIBoardEepromAddress,
-                        pc_PCIChipInformation,
-                        0x100 + w_Address + 8 + w_Size + 2);
-
-                /* Read Resolution */
-                s_Header->s_TimerDetails[i].b_Resolution =
-                        (unsigned char) (w_Temp >> 10) & 0x3F;
-
-                /* Read Mode */
-                s_Header->s_TimerDetails[i].b_Mode =
-                        (unsigned char) (w_Temp >> 4) & 0x3F;
-
-                w_Temp = w_EepromReadWord(w_PCIBoardEepromAddress,
-                        pc_PCIChipInformation,
-                        0x100 + w_Address + 8 + w_Size + 4);
-
-                /* Read MinTiming */
-                s_Header->s_TimerDetails[i].w_MinTiming = (w_Temp >> 6) & 0x3FF;
-
-                /* Read Timebase */
-                s_Header->s_TimerDetails[i].b_TimeBase = (unsigned char) (w_Temp) & 0x3F;
-                w_Size += s_Header->s_TimerDetails[i].w_HeaderSize;
-        }
-
-        return 0;
-}
-
-/*
-+----------------------------------------------------------------------------+
-| Function Name  : int i_EepromReadAnlogOutputHeader(unsigned short                                      |
-|                       w_PCIBoardEepromAddress,char *pc_PCIChipInformation,     |
-|                       unsigned short w_Address,str_AnalogOutputHeader *s_Header)         |
-+----------------------------------------------------------------------------+
-| Task              : Read Nalog Output  Header                              |
-+----------------------------------------------------------------------------+
-| Input Parameters  : unsigned short w_PCIBoardEepromAddress : PCI eeprom address      |
-|                                                                                                                                        |
-|                     char *pc_PCIChipInformation  : PCI Chip Type.          |
-|                                                                                                                                        |
-|                        str_AnalogOutputHeader *s_Header:Anlog Output Header    |
-|                                                                                          Pointer                               |
-+----------------------------------------------------------------------------+
-| Output Parameters : -                                                      |
-+----------------------------------------------------------------------------+
-| Return Value      : 0                                                                              |
-+----------------------------------------------------------------------------+
-*/
-
-int i_EepromReadAnlogOutputHeader(unsigned short w_PCIBoardEepromAddress,
-        char *pc_PCIChipInformation, unsigned short w_Address,
-        struct str_AnalogOutputHeader *s_Header)
-{
-        unsigned short w_Temp;
-        /*  No of channels for 1st hard component */
-        w_Temp = w_EepromReadWord(w_PCIBoardEepromAddress,
-                pc_PCIChipInformation, 0x100 + w_Address + 10);
-        s_Header->w_Nchannel = (w_Temp >> 4) & 0x03FF;
-        /*  Resolution for 1st hard component */
-        w_Temp = w_EepromReadWord(w_PCIBoardEepromAddress,
-                pc_PCIChipInformation, 0x100 + w_Address + 16);
-        s_Header->b_Resolution = (unsigned char) (w_Temp >> 8) & 0xFF;
-        return 0;
-}
-
-/*
-+----------------------------------------------------------------------------+
-| Function Name  : int i_EepromReadAnlogInputHeader(unsigned short                                       |
-|                       w_PCIBoardEepromAddress,char *pc_PCIChipInformation,     |
-|                       unsigned short w_Address,struct str_AnalogInputHeader *s_Header)          |
-+----------------------------------------------------------------------------+
-| Task              : Read Nalog Output  Header                              |
-+----------------------------------------------------------------------------+
-| Input Parameters  : unsigned short w_PCIBoardEepromAddress : PCI eeprom address      |
-|                                                                                                                                        |
-|                     char *pc_PCIChipInformation  : PCI Chip Type.          |
-|                                                                                                                                        |
-|                        struct str_AnalogInputHeader *s_Header:Anlog Input Header      |
-|                                                                                          Pointer                               |
-+----------------------------------------------------------------------------+
-| Output Parameters : -                                                      |
-+----------------------------------------------------------------------------+
-| Return Value      : 0                                                                              |
-+----------------------------------------------------------------------------+
-*/
-
-/* Reads only for ONE  hardware component */
-int i_EepromReadAnlogInputHeader(unsigned short w_PCIBoardEepromAddress,
-        char *pc_PCIChipInformation, unsigned short w_Address,
-        struct str_AnalogInputHeader *s_Header)
-{
-        unsigned short w_Temp, w_Offset;
-        w_Temp = w_EepromReadWord(w_PCIBoardEepromAddress,
-                pc_PCIChipInformation, 0x100 + w_Address + 10);
-        s_Header->w_Nchannel = (w_Temp >> 4) & 0x03FF;
-        s_Header->w_MinConvertTiming =
-                w_EepromReadWord(w_PCIBoardEepromAddress, pc_PCIChipInformation,
-                0x100 + w_Address + 16);
-        s_Header->w_MinDelayTiming =
-                w_EepromReadWord(w_PCIBoardEepromAddress, pc_PCIChipInformation,
-                0x100 + w_Address + 30);
-        w_Temp = w_EepromReadWord(w_PCIBoardEepromAddress,
-                pc_PCIChipInformation, 0x100 + w_Address + 20);
-        s_Header->b_HasDma = (w_Temp >> 13) & 0x01;     /*  whether dma present or not */
-
-        w_Temp = w_EepromReadWord(w_PCIBoardEepromAddress, pc_PCIChipInformation, 0x100 + w_Address + 72);      /*  reading Y */
-        w_Temp = w_Temp & 0x00FF;
-        if (w_Temp)             /* Y>0 */
-        {
-                w_Offset = 74 + (2 * w_Temp) + (10 * (1 + (w_Temp / 16)));      /*  offset of first analog input single header */
-                w_Offset = w_Offset + 2;        /*  resolution */
-        } else                  /* Y=0 */
-        {
-                w_Offset = 74;
-                w_Offset = w_Offset + 2;        /*  resolution */
-        }
-
-/* read Resolution */
-        w_Temp = w_EepromReadWord(w_PCIBoardEepromAddress,
-                pc_PCIChipInformation, 0x100 + w_Address + w_Offset);
-        s_Header->b_Resolution = w_Temp & 0x001F;       /*  last 5 bits */
-
-        return 0;
 }
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_APCI1710.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_APCI1710.c
index f9a8937be8ed..b05f8505c894 100644
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_APCI1710.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_APCI1710.c
@@ -44,7 +44,35 @@ You should also find the complete GPL in the COPYING file accompanying this sour
   |          |           |                                                |
   +----------+-----------+------------------------------------------------+
 */
-#include "hwdrv_APCI1710.h"
+
+#define COMEDI_SUBD_TTLIO               11      /* Digital Input Output But TTL */
+#define COMEDI_SUBD_PWM                 12      /* Pulse width Measurement */
+#define COMEDI_SUBD_SSI                 13      /* Synchronous serial interface */
+#define COMEDI_SUBD_TOR                 14      /* Tor counter */
+#define COMEDI_SUBD_CHRONO              15      /* Chrono meter */
+#define COMEDI_SUBD_PULSEENCODER        16      /* Pulse Encoder INP CPT */
+#define COMEDI_SUBD_INCREMENTALCOUNTER  17      /* Incremental Counter */
+
+#define APCI1710_BOARD_NAME             "apci1710"
+#define APCI1710_BOARD_DEVICE_ID        0x818F
+#define APCI1710_ADDRESS_RANGE          256
+#define APCI1710_CONFIG_ADDRESS_RANGE   8
+#define APCI1710_INCREMENTAL_COUNTER    0x53430000UL
+#define APCI1710_SSI_COUNTER            0x53490000UL
+#define APCI1710_TTL_IO                 0x544C0000UL
+#define APCI1710_DIGITAL_IO             0x44490000UL
+#define APCI1710_82X54_TIMER            0x49430000UL
+#define APCI1710_CHRONOMETER            0x43480000UL
+#define APCI1710_PULSE_ENCODER          0x495A0000UL
+#define APCI1710_TOR_COUNTER            0x544F0000UL
+#define APCI1710_PWM                    0x50570000UL
+#define APCI1710_ETM                    0x45540000UL
+#define APCI1710_CDA                    0x43440000UL
+#define APCI1710_DISABLE                0
+#define APCI1710_ENABLE                 1
+#define APCI1710_SYNCHRONOUS_MODE       1
+#define APCI1710_ASYNCHRONOUS_MODE      0
+
 #include "APCI1710_Inp_cpt.c"
 
 #include "APCI1710_Ssi.c"
@@ -56,7 +84,34 @@ You should also find the complete GPL in the COPYING file accompanying this sour
 #include "APCI1710_Pwm.c"
 #include "APCI1710_INCCPT.c"
 
-void i_ADDI_AttachPCI1710(struct comedi_device *dev)
+static const struct comedi_lrange range_apci1710_ttl = {
+        4, {
+                BIP_RANGE(10),
+                BIP_RANGE(5),
+                BIP_RANGE(2),
+                BIP_RANGE(1)
+        }
+};
+
+static const struct comedi_lrange range_apci1710_ssi = {
+        4, {
+                BIP_RANGE(10),
+                BIP_RANGE(5),
+                BIP_RANGE(2),
+                BIP_RANGE(1)
+        }
+};
+
+static const struct comedi_lrange range_apci1710_inccpt = {
+        4, {
+                BIP_RANGE(10),
+                BIP_RANGE(5),
+                BIP_RANGE(2),
+                BIP_RANGE(1)
+        }
+};
+
+static void i_ADDI_AttachPCI1710(struct comedi_device *dev)
 {
         struct comedi_subdevice *s;
         int ret = 0;
@@ -195,12 +250,9 @@ void i_ADDI_AttachPCI1710(struct comedi_device *dev)
         s->insn_bits = i_APCI1710_InsnBitsINCCPT;
 }
 
-int i_APCI1710_Reset(struct comedi_device *dev);
-void v_APCI1710_Interrupt(int irq, void *d);
-/* for 1710 */
-
-int i_APCI1710_Reset(struct comedi_device *dev)
+static int i_APCI1710_Reset(struct comedi_device *dev)
 {
+        struct addi_private *devpriv = dev->private;
         int ret;
         unsigned int dw_Dummy;
 
@@ -247,9 +299,10 @@ int i_APCI1710_Reset(struct comedi_device *dev)
 +----------------------------------------------------------------------------+
 */
 
-void v_APCI1710_Interrupt(int irq, void *d)
+static void v_APCI1710_Interrupt(int irq, void *d)
 {
         struct comedi_device *dev = d;
+        struct addi_private *devpriv = dev->private;
         unsigned char b_ModuleCpt = 0;
         unsigned char b_InterruptFlag = 0;
         unsigned char b_PWMCpt = 0;
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_APCI1710.h b/drivers/staging/comedi/drivers/addi-data/hwdrv_APCI1710.h
deleted file mode 100644
index 89c99eb5228d..000000000000
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_APCI1710.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (C) 2004,2005  ADDI-DATA GmbH for the source code of this module.
- *
- *      ADDI-DATA GmbH
- *      Dieselstrasse 3
- *      D-77833 Ottersweier
- *      Tel: +19(0)7223/9493-0
- *      Fax: +49(0)7223/9493-92
- *      http://www.addi-data.com
- *      info@addi-data.com
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- */
-
-#define COMEDI_SUBD_TTLIO               11      /* Digital Input Output But TTL */
-#define COMEDI_SUBD_PWM                 12      /* Pulse width Measurement */
-#define COMEDI_SUBD_SSI                 13      /* Synchronous serial interface */
-#define COMEDI_SUBD_TOR                 14      /* Tor counter */
-#define COMEDI_SUBD_CHRONO              15      /* Chrono meter */
-#define COMEDI_SUBD_PULSEENCODER        16      /* Pulse Encoder INP CPT */
-#define COMEDI_SUBD_INCREMENTALCOUNTER  17      /* Incremental Counter */
-
-#define APCI1710_BOARD_NAME             "apci1710"
-#define APCI1710_BOARD_VENDOR_ID        0x10E8
-#define APCI1710_BOARD_DEVICE_ID        0x818F
-#define APCI1710_ADDRESS_RANGE          256
-#define APCI1710_CONFIG_ADDRESS_RANGE   8
-#define APCI1710_INCREMENTAL_COUNTER    0x53430000UL
-#define APCI1710_SSI_COUNTER            0x53490000UL
-#define APCI1710_TTL_IO                 0x544C0000UL
-#define APCI1710_DIGITAL_IO             0x44490000UL
-#define APCI1710_82X54_TIMER            0x49430000UL
-#define APCI1710_CHRONOMETER            0x43480000UL
-#define APCI1710_PULSE_ENCODER          0x495A0000UL
-#define APCI1710_TOR_COUNTER            0x544F0000UL
-#define APCI1710_PWM                    0x50570000UL
-#define APCI1710_ETM                    0x45540000UL
-#define APCI1710_CDA                    0x43440000UL
-#define APCI1710_DISABLE                0
-#define APCI1710_ENABLE                 1
-#define APCI1710_SYNCHRONOUS_MODE       1
-#define APCI1710_ASYNCHRONOUS_MODE      0
-
-/* MODULE INFO STRUCTURE */
-
-static const struct comedi_lrange range_apci1710_ttl = { 4, {
-                                                      BIP_RANGE(10),
-                                                      BIP_RANGE(5),
-                                                      BIP_RANGE(2),
-                                                      BIP_RANGE(1)
-                                                      }
-};
-
-static const struct comedi_lrange range_apci1710_ssi = { 4, {
-                                                      BIP_RANGE(10),
-                                                      BIP_RANGE(5),
-                                                      BIP_RANGE(2),
-                                                      BIP_RANGE(1)
-                                                      }
-};
-
-static const struct comedi_lrange range_apci1710_inccpt = { 4, {
-                                                         BIP_RANGE(10),
-                                                         BIP_RANGE(5),
-                                                         BIP_RANGE(2),
-                                                         BIP_RANGE(1)
-                                                         }
-};
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.c
index 5997b2f504ad..3d66e48e0cf7 100644
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.c
@@ -46,12 +46,70 @@ You should also find the complete GPL in the COPYING file accompanying this sour
   +----------+-----------+------------------------------------------------+
 */
 
-/*
-+----------------------------------------------------------------------------+
-|                               Included files                               |
-+----------------------------------------------------------------------------+
-*/
-#include "hwdrv_apci035.h"
+/* Card Specific information */
+#define APCI035_ADDRESS_RANGE           255
+
+/* Timer / Watchdog Related Defines */
+#define APCI035_TCW_SYNC_ENABLEDISABLE  0
+#define APCI035_TCW_RELOAD_VALUE        4
+#define APCI035_TCW_TIMEBASE            8
+#define APCI035_TCW_PROG                12
+#define APCI035_TCW_TRIG_STATUS         16
+#define APCI035_TCW_IRQ                 20
+#define APCI035_TCW_WARN_TIMEVAL        24
+#define APCI035_TCW_WARN_TIMEBASE       28
+
+#define ADDIDATA_TIMER                  0
+/* #define ADDIDATA_WATCHDOG            1 */
+
+#define APCI035_TW1                     0
+#define APCI035_TW2                     32
+#define APCI035_TW3                     64
+#define APCI035_TW4                     96
+
+#define APCI035_AI_OFFSET               0
+#define APCI035_TEMP                    128
+#define APCI035_ALR_SEQ                 4
+#define APCI035_START_STOP_INDEX        8
+#define APCI035_ALR_START_STOP          12
+#define APCI035_ALR_IRQ                 16
+#define APCI035_EOS                     20
+#define APCI035_CHAN_NO                 24
+#define APCI035_CHAN_VAL                28
+#define APCI035_CONV_TIME_TIME_BASE     36
+#define APCI035_RELOAD_CONV_TIME_VAL    32
+#define APCI035_DELAY_TIME_TIME_BASE    44
+#define APCI035_RELOAD_DELAY_TIME_VAL   40
+#define ENABLE_EXT_TRIG                 1
+#define ENABLE_EXT_GATE                 2
+#define ENABLE_EXT_TRIG_GATE            3
+
+#define ANALOG_INPUT                    0
+#define TEMPERATURE                     1
+#define RESISTANCE                      2
+
+#define ADDIDATA_GREATER_THAN_TEST      0
+#define ADDIDATA_LESS_THAN_TEST         1
+
+#define APCI035_MAXVOLT                 2.5
+
+#define ADDIDATA_UNIPOLAR               1
+#define ADDIDATA_BIPOLAR                2
+
+/* ANALOG INPUT RANGE */
+static struct comedi_lrange range_apci035_ai = {
+        8, {
+                BIP_RANGE(10),
+                BIP_RANGE(5),
+                BIP_RANGE(2),
+                BIP_RANGE(1),
+                UNI_RANGE(10),
+                UNI_RANGE(5),
+                UNI_RANGE(2),
+                UNI_RANGE(1)
+        }
+};
+
 static int i_WatchdogNbr = 0;
 static int i_Temp = 0;
 static int i_Flag = 1;
@@ -109,12 +167,16 @@ static int i_Flag = 1;
 |                                                                                |
 +----------------------------------------------------------------------------+
 */
-int i_APCI035_ConfigTimerWatchdog(struct comedi_device *dev, struct comedi_subdevice *s,
-        struct comedi_insn *insn, unsigned int *data)
+static int i_APCI035_ConfigTimerWatchdog(struct comedi_device *dev,
+                                         struct comedi_subdevice *s,
+                                         struct comedi_insn *insn,
+                                         unsigned int *data)
 {
+        struct addi_private *devpriv = dev->private;
         unsigned int ui_Status = 0;
         unsigned int ui_Command = 0;
         unsigned int ui_Mode = 0;
+
         i_Temp = 0;
         devpriv->tsk_Current = current;
         devpriv->b_TimerSelectMode = data[0];
@@ -278,11 +340,15 @@ int i_APCI035_ConfigTimerWatchdog(struct comedi_device *dev, struct comedi_subde
 |                                                                                        |
 +----------------------------------------------------------------------------+
 */
-int i_APCI035_StartStopWriteTimerWatchdog(struct comedi_device *dev,
-        struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data)
+static int i_APCI035_StartStopWriteTimerWatchdog(struct comedi_device *dev,
+                                                 struct comedi_subdevice *s,
+                                                 struct comedi_insn *insn,
+                                                 unsigned int *data)
 {
+        struct addi_private *devpriv = dev->private;
         unsigned int ui_Command = 0;
         int i_Count = 0;
+
         if (data[0] == 1) {
                 ui_Command =
                         inl(devpriv->iobase + ((i_WatchdogNbr - 1) * 32) + 12);
@@ -393,10 +459,14 @@ int i_APCI035_StartStopWriteTimerWatchdog(struct comedi_device *dev,
 |                                                                                |
 +----------------------------------------------------------------------------+
 */
-int i_APCI035_ReadTimerWatchdog(struct comedi_device *dev, struct comedi_subdevice *s,
-        struct comedi_insn *insn, unsigned int *data)
+static int i_APCI035_ReadTimerWatchdog(struct comedi_device *dev,
+                                       struct comedi_subdevice *s,
+                                       struct comedi_insn *insn,
+                                       unsigned int *data)
 {
+        struct addi_private *devpriv = dev->private;
         unsigned int ui_Status = 0;     /*  Status register */
+
         i_WatchdogNbr = insn->unused[0];
 
         /******************/
@@ -453,9 +523,13 @@ int i_APCI035_ReadTimerWatchdog(struct comedi_device *dev, struct comedi_subdevi
 |                                                                                |
 +----------------------------------------------------------------------------+
 */
-int i_APCI035_ConfigAnalogInput(struct comedi_device *dev, struct comedi_subdevice *s,
-        struct comedi_insn *insn, unsigned int *data)
+static int i_APCI035_ConfigAnalogInput(struct comedi_device *dev,
+                                       struct comedi_subdevice *s,
+                                       struct comedi_insn *insn,
+                                       unsigned int *data)
 {
+        struct addi_private *devpriv = dev->private;
+
         devpriv->tsk_Current = current;
         outl(0x200 | 0, devpriv->iobase + 128 + 0x4);
         outl(0, devpriv->iobase + 128 + 0);
@@ -490,10 +564,14 @@ int i_APCI035_ConfigAnalogInput(struct comedi_device *dev, struct comedi_subdevi
 |                                                                                |
 +----------------------------------------------------------------------------+
 */
-int i_APCI035_ReadAnalogInput(struct comedi_device *dev, struct comedi_subdevice *s,
-        struct comedi_insn *insn, unsigned int *data)
+static int i_APCI035_ReadAnalogInput(struct comedi_device *dev,
+                                     struct comedi_subdevice *s,
+                                     struct comedi_insn *insn,
+                                     unsigned int *data)
 {
+        struct addi_private *devpriv = dev->private;
         unsigned int ui_CommandRegister = 0;
+
 /******************/
 /*  Set the start */
 /******************/
@@ -525,9 +603,11 @@ int i_APCI035_ReadAnalogInput(struct comedi_device *dev, struct comedi_subdevice
 |                                                                                        |
 +----------------------------------------------------------------------------+
 */
-int i_APCI035_Reset(struct comedi_device *dev)
+static int i_APCI035_Reset(struct comedi_device *dev)
 {
+        struct addi_private *devpriv = dev->private;
         int i_Count = 0;
+
         for (i_Count = 1; i_Count <= 4; i_Count++) {
                 i_WatchdogNbr = i_Count;
                 outl(0x0, devpriv->iobase + ((i_WatchdogNbr - 1) * 32) + 0);    /* stop all timers */
@@ -557,11 +637,13 @@ int i_APCI035_Reset(struct comedi_device *dev)
 static void v_APCI035_Interrupt(int irq, void *d)
 {
         struct comedi_device *dev = d;
+        struct addi_private *devpriv = dev->private;
         unsigned int ui_StatusRegister1 = 0;
         unsigned int ui_StatusRegister2 = 0;
         unsigned int ui_ReadCommand = 0;
         unsigned int ui_ChannelNumber = 0;
         unsigned int ui_DigitalTemperature = 0;
+
         if (i_Temp == 1) {
                 i_WatchdogNbr = i_Flag;
                 i_Flag = i_Flag + 1;
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.h b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.h
deleted file mode 100644
index 3c700c7bf818..000000000000
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright (C) 2004,2005  ADDI-DATA GmbH for the source code of this module.
- *
- *      ADDI-DATA GmbH
- *      Dieselstrasse 3
- *      D-77833 Ottersweier
- *      Tel: +19(0)7223/9493-0
- *      Fax: +49(0)7223/9493-92
- *      http://www.addi-data.com
- *      info@addi-data.com
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- */
-
-/* Card Specific information */
-#define APCI035_BOARD_VENDOR_ID         0x15B8
-#define APCI035_ADDRESS_RANGE           255
-
-/* ANALOG INPUT RANGE */
-static struct comedi_lrange range_apci035_ai = { 8, {
-                                       BIP_RANGE(10),
-                                       BIP_RANGE(5),
-                                       BIP_RANGE(2),
-                                       BIP_RANGE(1),
-                                       UNI_RANGE(10),
-                                       UNI_RANGE(5),
-                                       UNI_RANGE(2),
-                                       UNI_RANGE(1)
-                                       }
-};
-
-/* Timer / Watchdog Related Defines */
-#define APCI035_TCW_SYNC_ENABLEDISABLE  0
-#define APCI035_TCW_RELOAD_VALUE        4
-#define APCI035_TCW_TIMEBASE            8
-#define APCI035_TCW_PROG                12
-#define APCI035_TCW_TRIG_STATUS         16
-#define APCI035_TCW_IRQ                 20
-#define APCI035_TCW_WARN_TIMEVAL        24
-#define APCI035_TCW_WARN_TIMEBASE       28
-
-#define ADDIDATA_TIMER                  0
-/* #define ADDIDATA_WATCHDOG            1 */
-
-#define APCI035_TW1                               0
-#define APCI035_TW2                               32
-#define APCI035_TW3                               64
-#define APCI035_TW4                               96
-
-#define APCI035_AI_OFFSET                        0
-#define APCI035_TEMP                             128
-#define APCI035_ALR_SEQ                          4
-#define APCI035_START_STOP_INDEX                 8
-#define APCI035_ALR_START_STOP                   12
-#define APCI035_ALR_IRQ                          16
-#define APCI035_EOS                              20
-#define APCI035_CHAN_NO                          24
-#define APCI035_CHAN_VAL                         28
-#define APCI035_CONV_TIME_TIME_BASE     36
-#define APCI035_RELOAD_CONV_TIME_VAL    32
-#define APCI035_DELAY_TIME_TIME_BASE    44
-#define APCI035_RELOAD_DELAY_TIME_VAL   40
-#define ENABLE_EXT_TRIG                 1
-#define ENABLE_EXT_GATE                 2
-#define ENABLE_EXT_TRIG_GATE            3
-
-#define ANALOG_INPUT                    0
-#define TEMPERATURE                     1
-#define RESISTANCE                      2
-
-#define ADDIDATA_GREATER_THAN_TEST      0
-#define ADDIDATA_LESS_THAN_TEST         1
-
-#define APCI035_MAXVOLT                         2.5
-
-#define ADDIDATA_UNIPOLAR                        1
-#define ADDIDATA_BIPOLAR                         2
-
-/* ADDIDATA Enable Disable */
-#define ADDIDATA_ENABLE                         1
-#define ADDIDATA_DISABLE                        0
-
-/* Hardware Layer functions for Apci035 */
-
-/* TIMER */
-/* timer value is passed as u seconds */
-int i_APCI035_ConfigTimerWatchdog(struct comedi_device *dev, struct comedi_subdevice *s,
-                                  struct comedi_insn *insn, unsigned int *data);
-int i_APCI035_StartStopWriteTimerWatchdog(struct comedi_device *dev,
-                                          struct comedi_subdevice *s,
-                                          struct comedi_insn *insn, unsigned int *data);
-int i_APCI035_ReadTimerWatchdog(struct comedi_device *dev, struct comedi_subdevice *s,
-                                struct comedi_insn *insn, unsigned int *data);
-
-/* Temperature Related Defines (Analog Input Subdevice) */
-
-int i_APCI035_ConfigAnalogInput(struct comedi_device *dev, struct comedi_subdevice *s,
-                                struct comedi_insn *insn, unsigned int *data);
-int i_APCI035_ReadAnalogInput(struct comedi_device *dev, struct comedi_subdevice *s,
-                              struct comedi_insn *insn, unsigned int *data);
-
-/* Interrupt */
-static void v_APCI035_Interrupt(int irq, void *d);
-
-/* Reset functions */
-int i_APCI035_Reset(struct comedi_device *dev);
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.c
deleted file mode 100644
index bab7b61a53bc..000000000000
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.c
+++ /dev/null
@@ -1,287 +0,0 @@
-/**
-@verbatim
-
-Copyright (C) 2004,2005  ADDI-DATA GmbH for the source code of this module.
-
-        ADDI-DATA GmbH
-        Dieselstrasse 3
-        D-77833 Ottersweier
-        Tel: +19(0)7223/9493-0
-        Fax: +49(0)7223/9493-92
-        http://www.addi-data.com
-        info@addi-data.com
-
-This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
-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
-
-You should also find the complete GPL in the COPYING file accompanying this source code.
-
-@endverbatim
-*/
-/*
-
-  +-----------------------------------------------------------------------+
-  | (C) ADDI-DATA GmbH          Dieselstraße 3       D-77833 Ottersweier  |
-  +-----------------------------------------------------------------------+
-  | Tel : +49 (0) 7223/9493-0     | email    : info@addi-data.com         |
-  | Fax : +49 (0) 7223/9493-92    | Internet : http://www.addi-data.com   |
-  +-------------------------------+---------------------------------------+
-  | Project     : APCI-1032       | Compiler   : GCC                      |
-  | Module name : hwdrv_apci1032.c| Version    : 2.96                     |
-  +-------------------------------+---------------------------------------+
-  | Project manager: Eric Stolz   | Date       :  02/12/2002              |
-  +-------------------------------+---------------------------------------+
-  | Description :   Hardware Layer Access For APCI-1032                   |
-  +-----------------------------------------------------------------------+
-  |                             UPDATES                                   |
-  +----------+-----------+------------------------------------------------+
-  |   Date   |   Author  |          Description of updates                |
-  +----------+-----------+------------------------------------------------+
-  |          |           |                                                |
-  |          |           |                                                |
-  |          |           |                                                |
-  +----------+-----------+------------------------------------------------+
-*/
-
-/*
-+----------------------------------------------------------------------------+
-|                               Included files                               |
-+----------------------------------------------------------------------------+
-*/
-#include "hwdrv_apci1032.h"
-#include <linux/delay.h>
-
-static unsigned int ui_InterruptStatus;
-
-/*
-+----------------------------------------------------------------------------+
-| Function   Name   : int i_APCI1032_ConfigDigitalInput                      |
-|                         (struct comedi_device *dev,struct comedi_subdevice *s,               |
-|                      struct comedi_insn *insn,unsigned int *data)                     |
-+----------------------------------------------------------------------------+
-| Task              : Configures the digital input Subdevice                 |
-+----------------------------------------------------------------------------+
-| Input Parameters  : struct comedi_device *dev : Driver handle                     |
-|                     unsigned int *data         : Data Pointer contains         |
-|                                          configuration parameters as below |
-|                                                                            |
-|                         data[0]            : 1 Enable  Digital Input Interrupt |
-|                                                                  0 Disable Digital Input Interrupt |
-|                         data[1]            : 0 ADDIDATA Interrupt OR LOGIC     |
-|                                                                : 1 ADDIDATA Interrupt AND LOGIC    |
-|                         data[2]                        : Interrupt mask for the mode 1         |
-|                         data[3]                        : Interrupt mask for the mode 2         |
-|                                                                                                                                        |
-+----------------------------------------------------------------------------+
-| Output Parameters :   --                                                                                                       |
-+----------------------------------------------------------------------------+
-| Return Value      : TRUE  : No error occur                                 |
-|                           : FALSE : Error occur. Return the error          |
-|                                                                                |
-+----------------------------------------------------------------------------+
-*/
-
-int i_APCI1032_ConfigDigitalInput(struct comedi_device *dev, struct comedi_subdevice *s,
-        struct comedi_insn *insn, unsigned int *data)
-{
-        unsigned int ui_TmpValue;
-
-        unsigned int ul_Command1 = 0;
-        unsigned int ul_Command2 = 0;
-        devpriv->tsk_Current = current;
-
-  /*******************************/
-        /* Set the digital input logic */
-  /*******************************/
-        if (data[0] == ADDIDATA_ENABLE) {
-                ul_Command1 = ul_Command1 | data[2];
-                ul_Command2 = ul_Command2 | data[3];
-                outl(ul_Command1,
-                        devpriv->iobase + APCI1032_DIGITAL_IP_INTERRUPT_MODE1);
-                outl(ul_Command2,
-                        devpriv->iobase + APCI1032_DIGITAL_IP_INTERRUPT_MODE2);
-                if (data[1] == ADDIDATA_OR) {
-                        outl(0x4, devpriv->iobase + APCI1032_DIGITAL_IP_IRQ);
-                        ui_TmpValue =
-                                inl(devpriv->iobase + APCI1032_DIGITAL_IP_IRQ);
-                }               /* if (data[1] == ADDIDATA_OR) */
-                else
-                        outl(0x6, devpriv->iobase + APCI1032_DIGITAL_IP_IRQ);
-                                /* else if(data[1] == ADDIDATA_OR) */
-        }                       /*  if( data[0] == ADDIDATA_ENABLE) */
-        else {
-                ul_Command1 = ul_Command1 & 0xFFFF0000;
-                ul_Command2 = ul_Command2 & 0xFFFF0000;
-                outl(ul_Command1,
-                        devpriv->iobase + APCI1032_DIGITAL_IP_INTERRUPT_MODE1);
-                outl(ul_Command2,
-                        devpriv->iobase + APCI1032_DIGITAL_IP_INTERRUPT_MODE2);
-                outl(0x0, devpriv->iobase + APCI1032_DIGITAL_IP_IRQ);
-        }                       /* else if  ( data[0] == ADDIDATA_ENABLE) */
-
-        return insn->n;
-}
-
-/*
-+----------------------------------------------------------------------------+
-| Function   Name   : int i_APCI1032_Read1DigitalInput                       |
-|                         (struct comedi_device *dev,struct comedi_subdevice *s,               |
-|                      struct comedi_insn *insn,unsigned int *data)                     |
-+----------------------------------------------------------------------------+
-| Task              : Return the status of the digital input                 |
-+----------------------------------------------------------------------------+
-| Input Parameters  : struct comedi_device *dev      : Driver handle                |
-|                             unsigned int ui_Channel : Channel number to read       |
-|                     unsigned int *data          : Data Pointer to read status  |
-+----------------------------------------------------------------------------+
-| Output Parameters :   --                                                                                                       |
-+----------------------------------------------------------------------------+
-| Return Value      : TRUE  : No error occur                                 |
-|                           : FALSE : Error occur. Return the error          |
-|                                                                                |
-+----------------------------------------------------------------------------+
-*/
-int i_APCI1032_Read1DigitalInput(struct comedi_device *dev, struct comedi_subdevice *s,
-        struct comedi_insn *insn, unsigned int *data)
-{
-        unsigned int ui_TmpValue = 0;
-        unsigned int ui_Channel;
-        ui_Channel = CR_CHAN(insn->chanspec);
-        if (ui_Channel <= 31) {
-                ui_TmpValue = (unsigned int) inl(devpriv->iobase + APCI1032_DIGITAL_IP);
-/*
-* since only 1 channel reqd to bring it to last bit it is rotated 8
-* +(chan - 1) times then ANDed with 1 for last bit.
-*/
-                *data = (ui_TmpValue >> ui_Channel) & 0x1;
-        }                       /* if(ui_Channel >= 0 && ui_Channel <=31) */
-        else {
-                /* comedi_error(dev," \n chan spec wrong\n"); */
-                return -EINVAL; /*  "sorry channel spec wrong " */
-        }                       /* else if(ui_Channel >= 0 && ui_Channel <=31) */
-        return insn->n;
-}
-
-/*
-+----------------------------------------------------------------------------+
-| Function   Name   : int i_APCI1032_ReadMoreDigitalInput                    |
-|                         (struct comedi_device *dev,struct comedi_subdevice *s,               |
-|                     struct comedi_insn *insn,unsigned int *data)                      |
-+----------------------------------------------------------------------------+
-| Task              : Return the status of the Requested digital inputs      |
-+----------------------------------------------------------------------------+
-| Input Parameters  : struct comedi_device *dev      : Driver handle                |
-|                     unsigned int ui_NoOfChannels    : No Of Channels To be Read    |
-|                      unsigned int *data             : Data Pointer to read status  |
-+----------------------------------------------------------------------------+
-| Output Parameters :   --                                                                                                       |
-+----------------------------------------------------------------------------+
-| Return Value      : TRUE  : No error occur                                 |
-|                           : FALSE : Error occur. Return the error          |
-|                                                                                |
-+----------------------------------------------------------------------------+
-*/
-
-int i_APCI1032_ReadMoreDigitalInput(struct comedi_device *dev, struct comedi_subdevice *s,
-        struct comedi_insn *insn, unsigned int *data)
-{
-        unsigned int ui_PortValue = data[0];
-        unsigned int ui_Mask = 0;
-        unsigned int ui_NoOfChannels;
-
-        ui_NoOfChannels = CR_CHAN(insn->chanspec);
-        if (data[1] == 0) {
-                *data = (unsigned int) inl(devpriv->iobase + APCI1032_DIGITAL_IP);
-                switch (ui_NoOfChannels) {
-                case 2:
-                        ui_Mask = 3;
-                        *data = (*data >> (2 * ui_PortValue)) & ui_Mask;
-                        break;
-                case 4:
-                        ui_Mask = 15;
-                        *data = (*data >> (4 * ui_PortValue)) & ui_Mask;
-                        break;
-                case 8:
-                        ui_Mask = 255;
-                        *data = (*data >> (8 * ui_PortValue)) & ui_Mask;
-                        break;
-                case 16:
-                        ui_Mask = 65535;
-                        *data = (*data >> (16 * ui_PortValue)) & ui_Mask;
-                        break;
-                case 31:
-                        break;
-                default:
-                        /* comedi_error(dev," \nchan spec wrong\n"); */
-                        return -EINVAL; /*  "sorry channel spec wrong " */
-                        break;
-                }               /* switch(ui_NoOfChannels) */
-        }                       /* if(data[1]==0) */
-        else {
-                if (data[1] == 1)
-                        *data = ui_InterruptStatus;
-                                /* if(data[1]==1) */
-        }                       /* else if(data[1]==0) */
-        return insn->n;
-}
-
-/*
-+----------------------------------------------------------------------------+
-| Function   Name   : static void v_APCI1032_Interrupt                                       |
-|                                         (int irq , void *d)      |
-+----------------------------------------------------------------------------+
-| Task              : Interrupt handler for the interruptible digital inputs |
-+----------------------------------------------------------------------------+
-| Input Parameters  : int irq                 : irq number                   |
-|                     void *d                 : void pointer                 |
-+----------------------------------------------------------------------------+
-| Output Parameters :   --                                                   |
-+----------------------------------------------------------------------------+
-| Return Value      : TRUE  : No error occur                                 |
-|                           : FALSE : Error occur. Return the error          |
-|                                                                            |
-+----------------------------------------------------------------------------+
-*/
-static void v_APCI1032_Interrupt(int irq, void *d)
-{
-        struct comedi_device *dev = d;
-
-        unsigned int ui_Temp;
-        /* disable the interrupt */
-        ui_Temp = inl(devpriv->iobase + APCI1032_DIGITAL_IP_IRQ);
-        outl(ui_Temp & APCI1032_DIGITAL_IP_INTERRUPT_DISABLE,
-                devpriv->iobase + APCI1032_DIGITAL_IP_IRQ);
-        ui_InterruptStatus =
-                inl(devpriv->iobase + APCI1032_DIGITAL_IP_INTERRUPT_STATUS);
-        ui_InterruptStatus = ui_InterruptStatus & 0X0000FFFF;
-        send_sig(SIGIO, devpriv->tsk_Current, 0);       /*  send signal to the sample */
-        outl(ui_Temp, devpriv->iobase + APCI1032_DIGITAL_IP_IRQ);       /* enable the interrupt */
-        return;
-}
-
-/*
-+----------------------------------------------------------------------------+
-| Function   Name   : int i_APCI1032_Reset(struct comedi_device *dev)               |                                                       |
-+----------------------------------------------------------------------------+
-| Task              :resets all the registers                                |
-+----------------------------------------------------------------------------+
-| Input Parameters  : struct comedi_device *dev
-+----------------------------------------------------------------------------+
-| Output Parameters :   --                                                                                                       |
-+----------------------------------------------------------------------------+
-| Return Value      :                                                        |
-|                                                                                |
-+----------------------------------------------------------------------------+
-*/
-
-int i_APCI1032_Reset(struct comedi_device *dev)
-{
-        outl(0x0, devpriv->iobase + APCI1032_DIGITAL_IP_IRQ);   /* disable the interrupts */
-        inl(devpriv->iobase + APCI1032_DIGITAL_IP_INTERRUPT_STATUS);    /* Reset the interrupt status register */
-        outl(0x0, devpriv->iobase + APCI1032_DIGITAL_IP_INTERRUPT_MODE1);       /* Disable the and/or interrupt */
-        outl(0x0, devpriv->iobase + APCI1032_DIGITAL_IP_INTERRUPT_MODE2);
-        return 0;
-}
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.h b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.h
deleted file mode 100644
index 7114acb4bd2b..000000000000
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (C) 2004,2005  ADDI-DATA GmbH for the source code of this module.
- *
- *      ADDI-DATA GmbH
- *      Dieselstrasse 3
- *      D-77833 Ottersweier
- *      Tel: +19(0)7223/9493-0
- *      Fax: +49(0)7223/9493-92
- *      http://www.addi-data.com
- *      info@addi-data.com
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- */
-
-/*********      Definitions for APCI-1032 card  *****/
-
-#define APCI1032_BOARD_VENDOR_ID 0x15B8
-#define APCI1032_ADDRESS_RANGE  20
-/* DIGITAL INPUT DEFINE */
-
-#define APCI1032_DIGITAL_IP                     0
-#define APCI1032_DIGITAL_IP_INTERRUPT_MODE1     4
-#define APCI1032_DIGITAL_IP_INTERRUPT_MODE2     8
-#define APCI1032_DIGITAL_IP_IRQ                 16
-
-/* Digital Input IRQ Function Selection */
-#define ADDIDATA_OR                  0
-#define ADDIDATA_AND                 1
-
-/* Digital Input Interrupt Status */
-#define APCI1032_DIGITAL_IP_INTERRUPT_STATUS    12
-
-/* Digital Input Interrupt Enable Disable. */
-#define APCI1032_DIGITAL_IP_INTERRUPT_ENABLE    0x4
-#define APCI1032_DIGITAL_IP_INTERRUPT_DISABLE   0xFFFFFFFB
-
-/* ADDIDATA Enable Disable */
-
-#define ADDIDATA_ENABLE                            1
-#define ADDIDATA_DISABLE                           0
-
-/* Hardware Layer  functions for Apci1032 */
-
-/*
-* DI for di read
-*/
-
-int i_APCI1032_ConfigDigitalInput(struct comedi_device *dev, struct comedi_subdevice *s,
-                                  struct comedi_insn *insn, unsigned int *data);
-
-int i_APCI1032_Read1DigitalInput(struct comedi_device *dev, struct comedi_subdevice *s,
-                                 struct comedi_insn *insn, unsigned int *data);
-
-int i_APCI1032_ReadMoreDigitalInput(struct comedi_device *dev, struct comedi_subdevice *s,
-                                    struct comedi_insn *insn, unsigned int *data);
-
-/* Interrupt functions..... */
-
-static void v_APCI1032_Interrupt(int irq, void *d);
-/* Reset */
-int i_APCI1032_Reset(struct comedi_device *dev);
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c
index 62f421a06f05..24c4c983db38 100644
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c
@@ -45,7 +45,105 @@ You should also find the complete GPL in the COPYING file accompanying this sour
   |          |           |                                                |
   +----------+-----------+------------------------------------------------+
 */
-#include "hwdrv_apci1500.h"
+
+/*********      Definitions for APCI-1500 card  *****/
+
+/* Card Specific information */
+#define APCI1500_ADDRESS_RANGE          4
+
+/* DIGITAL INPUT-OUTPUT DEFINE */
+
+#define APCI1500_DIGITAL_OP             2
+#define APCI1500_DIGITAL_IP             0
+#define APCI1500_AND                    2
+#define APCI1500_OR                     4
+#define APCI1500_OR_PRIORITY            6
+#define APCI1500_CLK_SELECT             0
+#define COUNTER1                        0
+#define COUNTER2                        1
+#define COUNTER3                        2
+#define APCI1500_COUNTER                0x20
+#define APCI1500_TIMER                  0
+#define APCI1500_WATCHDOG               0
+#define APCI1500_SINGLE                 0
+#define APCI1500_CONTINUOUS             0x80
+#define APCI1500_DISABLE                0
+#define APCI1500_ENABLE                 1
+#define APCI1500_SOFTWARE_TRIGGER       0x4
+#define APCI1500_HARDWARE_TRIGGER       0x10
+#define APCI1500_SOFTWARE_GATE          0
+#define APCI1500_HARDWARE_GATE          0x8
+#define START                           0
+#define STOP                            1
+#define TRIGGER                         2
+
+/*
+ * Zillog I/O enumeration
+ */
+enum {
+        APCI1500_Z8536_PORT_C,
+        APCI1500_Z8536_PORT_B,
+        APCI1500_Z8536_PORT_A,
+        APCI1500_Z8536_CONTROL_REGISTER
+};
+
+/*
+ * Z8536 CIO Internal Address
+ */
+enum {
+        APCI1500_RW_MASTER_INTERRUPT_CONTROL,
+        APCI1500_RW_MASTER_CONFIGURATION_CONTROL,
+        APCI1500_RW_PORT_A_INTERRUPT_CONTROL,
+        APCI1500_RW_PORT_B_INTERRUPT_CONTROL,
+        APCI1500_RW_TIMER_COUNTER_INTERRUPT_VECTOR,
+        APCI1500_RW_PORT_C_DATA_PCITCH_POLARITY,
+        APCI1500_RW_PORT_C_DATA_DIRECTION,
+        APCI1500_RW_PORT_C_SPECIAL_IO_CONTROL,
+
+        APCI1500_RW_PORT_A_COMMAND_AND_STATUS,
+        APCI1500_RW_PORT_B_COMMAND_AND_STATUS,
+        APCI1500_RW_CPT_TMR1_CMD_STATUS,
+        APCI1500_RW_CPT_TMR2_CMD_STATUS,
+        APCI1500_RW_CPT_TMR3_CMD_STATUS,
+        APCI1500_RW_PORT_A_DATA,
+        APCI1500_RW_PORT_B_DATA,
+        APCI1500_RW_PORT_C_DATA,
+
+        APCI1500_R_CPT_TMR1_VALUE_HIGH,
+        APCI1500_R_CPT_TMR1_VALUE_LOW,
+        APCI1500_R_CPT_TMR2_VALUE_HIGH,
+        APCI1500_R_CPT_TMR2_VALUE_LOW,
+        APCI1500_R_CPT_TMR3_VALUE_HIGH,
+        APCI1500_R_CPT_TMR3_VALUE_LOW,
+        APCI1500_RW_CPT_TMR1_TIME_CST_HIGH,
+        APCI1500_RW_CPT_TMR1_TIME_CST_LOW,
+        APCI1500_RW_CPT_TMR2_TIME_CST_HIGH,
+        APCI1500_RW_CPT_TMR2_TIME_CST_LOW,
+        APCI1500_RW_CPT_TMR3_TIME_CST_HIGH,
+        APCI1500_RW_CPT_TMR3_TIME_CST_LOW,
+        APCI1500_RW_CPT_TMR1_MODE_SPECIFICATION,
+        APCI1500_RW_CPT_TMR2_MODE_SPECIFICATION,
+        APCI1500_RW_CPT_TMR3_MODE_SPECIFICATION,
+        APCI1500_R_CURRENT_VECTOR,
+
+        APCI1500_RW_PORT_A_SPECIFICATION,
+        APCI1500_RW_PORT_A_HANDSHAKE_SPECIFICATION,
+        APCI1500_RW_PORT_A_DATA_PCITCH_POLARITY,
+        APCI1500_RW_PORT_A_DATA_DIRECTION,
+        APCI1500_RW_PORT_A_SPECIAL_IO_CONTROL,
+        APCI1500_RW_PORT_A_PATTERN_POLARITY,
+        APCI1500_RW_PORT_A_PATTERN_TRANSITION,
+        APCI1500_RW_PORT_A_PATTERN_MASK,
+
+        APCI1500_RW_PORT_B_SPECIFICATION,
+        APCI1500_RW_PORT_B_HANDSHAKE_SPECIFICATION,
+        APCI1500_RW_PORT_B_DATA_PCITCH_POLARITY,
+        APCI1500_RW_PORT_B_DATA_DIRECTION,
+        APCI1500_RW_PORT_B_SPECIAL_IO_CONTROL,
+        APCI1500_RW_PORT_B_PATTERN_POLARITY,
+        APCI1500_RW_PORT_B_PATTERN_TRANSITION,
+        APCI1500_RW_PORT_B_PATTERN_MASK
+};
 
 static int i_TimerCounter1Init = 0;
 static int i_TimerCounter2Init = 0;
@@ -141,6 +239,7 @@ static int i_APCI1500_ConfigDigitalInputEvent(struct comedi_device *dev,
                                               struct comedi_insn *insn,
                                               unsigned int *data)
 {
+        struct addi_private *devpriv = dev->private;
         int i_PatternPolarity = 0, i_PatternTransition = 0, i_PatternMask = 0;
         int i_MaxChannel = 0, i_Count = 0, i_EventMask = 0;
         int i_PatternTransitionCount = 0, i_RegValue;
@@ -525,8 +624,10 @@ static int i_APCI1500_StartStopInputEvent(struct comedi_device *dev,
                                           struct comedi_insn *insn,
                                           unsigned int *data)
 {
+        struct addi_private *devpriv = dev->private;
         int i_Event1InterruptStatus = 0, i_Event2InterruptStatus =
                 0, i_RegValue;
+
         switch (data[0]) {
         case START:
               /*************************/
@@ -792,7 +893,9 @@ static int i_APCI1500_Initialisation(struct comedi_device *dev,
                                      struct comedi_insn *insn,
                                      unsigned int *data)
 {
+        struct addi_private *devpriv = dev->private;
         int i_DummyRead = 0;
+
     /******************/
         /* Software reset */
     /******************/
@@ -939,82 +1042,15 @@ static int i_APCI1500_Initialisation(struct comedi_device *dev,
         return insn->n;
 }
 
-/*
-+----------------------------------------------------------------------------+
-| Function   Name   : int i_APCI1500_ReadMoreDigitalInput                    |
-|                         (struct comedi_device *dev,struct comedi_subdevice *s,               |
-|                     struct comedi_insn *insn,unsigned int *data)                      |
-+----------------------------------------------------------------------------+
-| Task              : Return the status of the Requested digital inputs      |
-+----------------------------------------------------------------------------+
-| Input Parameters  : struct comedi_device *dev      : Driver handle                |
-|                     unsigned int ui_NoOfChannels    : No Of Channels To be Read    |
-|                      unsigned int *data             : Data Pointer
-|                      data[0]                 : 0 Read a single channel
-|                                                1 read a port value
-|                      data[1]                 : port value
-+----------------------------------------------------------------------------+
-| Output Parameters :   --      data[0]    :The read status value
-+----------------------------------------------------------------------------+
-| Return Value      : TRUE  : No error occur                                 |
-|                           : FALSE : Error occur. Return the error          |
-|                                                                                |
-+----------------------------------------------------------------------------+
-*/
-static int i_APCI1500_ReadMoreDigitalInput(struct comedi_device *dev,
-                                           struct comedi_subdevice *s,
-                                           struct comedi_insn *insn,
-                                           unsigned int *data)
+static int apci1500_di_insn_bits(struct comedi_device *dev,
+                                 struct comedi_subdevice *s,
+                                 struct comedi_insn *insn,
+                                 unsigned int *data)
 {
-        unsigned int ui_PortValue = data[1];
-        unsigned int ui_Mask = 0;
-        unsigned int ui_Channel;
-        unsigned int ui_TmpValue = 0;
-        ui_Channel = CR_CHAN(insn->chanspec);
+        struct addi_private *devpriv = dev->private;
 
-        switch (data[0]) {
-        case 0:
-                if (ui_Channel <= 15) {
-                        ui_TmpValue =
-                                (unsigned int) inw(devpriv->i_IobaseAddon +
-                                APCI1500_DIGITAL_IP);
-                        *data = (ui_TmpValue >> ui_Channel) & 0x1;
-                }               /* if(ui_Channel >= 0 && ui_Channel <=15) */
-                else {
-                        printk("\nThe channel specification are in error\n");
-                        return -EINVAL; /*  "sorry channel spec wrong " */
-                }               /* else if(ui_Channel >= 0 && ui_Channel <=15) */
-                break;
-        case 1:
+        data[1] = inw(devpriv->i_IobaseAddon + APCI1500_DIGITAL_IP);
 
-                *data = (unsigned int) inw(devpriv->i_IobaseAddon +
-                        APCI1500_DIGITAL_IP);
-                switch (ui_Channel) {
-                case 2:
-                        ui_Mask = 3;
-                        *data = (*data >> (2 * ui_PortValue)) & ui_Mask;
-                        break;
-                case 4:
-                        ui_Mask = 15;
-                        *data = (*data >> (4 * ui_PortValue)) & ui_Mask;
-                        break;
-                case 8:
-                        ui_Mask = 255;
-                        *data = (*data >> (8 * ui_PortValue)) & ui_Mask;
-                        break;
-                case 15:
-                        break;
-
-                default:
-                        printk("\nSpecified channel cannot be read \n");
-                        return -EINVAL; /*  "sorry channel spec wrong " */
-                        break;
-                }               /* switch(ui_Channel) */
-                break;
-        default:
-                printk("\nThe specified functionality does not exist\n");
-                return -EINVAL;
-        }                       /* switch(data[0]) */
         return insn->n;
 }
 
@@ -1051,6 +1087,8 @@ static int i_APCI1500_ConfigDigitalOutputErrorInterrupt(struct comedi_device *de
                                                         struct comedi_insn *insn,
                                                         unsigned int *data)
 {
+        struct addi_private *devpriv = dev->private;
+
         devpriv->b_OutputMemoryStatus = data[0];
         return insn->n;
 }
@@ -1079,9 +1117,9 @@ static int i_APCI1500_WriteDigitalOutput(struct comedi_device *dev,
                                          struct comedi_insn *insn,
                                          unsigned int *data)
 {
+        struct addi_private *devpriv = dev->private;
         static unsigned int ui_Temp = 0;
         unsigned int ui_Temp1;
-
         unsigned int ui_NoOfChannel = CR_CHAN(insn->chanspec);  /*  get the channel */
 
         if (!devpriv->b_OutputMemoryStatus) {
@@ -1274,6 +1312,7 @@ static int i_APCI1500_ConfigCounterTimerWatchdog(struct comedi_device *dev,
                                                  struct comedi_insn *insn,
                                                  unsigned int *data)
 {
+        struct addi_private *devpriv = dev->private;
         int i_TimerCounterMode, i_MasterConfiguration;
 
         devpriv->tsk_Current = current;
@@ -1875,6 +1914,7 @@ static int i_APCI1500_StartStopTriggerTimerCounterWatchdog(struct comedi_device
                                                            struct comedi_insn *insn,
                                                            unsigned int *data)
 {
+        struct addi_private *devpriv = dev->private;
         int i_CommandAndStatusValue;
 
         switch (data[0]) {
@@ -2198,7 +2238,9 @@ static int i_APCI1500_ReadCounterTimerWatchdog(struct comedi_device *dev,
                                                struct comedi_insn *insn,
                                                unsigned int *data)
 {
+        struct addi_private *devpriv = dev->private;
         int i_CommandAndStatusValue;
+
         switch (data[0]) {
         case COUNTER1:
                 /* Read counter/timer1 */
@@ -2421,9 +2463,11 @@ static int i_APCI1500_ConfigureInterrupt(struct comedi_device *dev,
                                          struct comedi_insn *insn,
                                          unsigned int *data)
 {
+        struct addi_private *devpriv = dev->private;
         unsigned int ui_Status;
         int i_RegValue;
         int i_Constant;
+
         devpriv->tsk_Current = current;
         outl(0x0, devpriv->i_IobaseAmcc + 0x38);
         if (data[0] == 1) {
@@ -2597,6 +2641,7 @@ static void v_APCI1500_Interrupt(int irq, void *d)
 {
 
         struct comedi_device *dev = d;
+        struct addi_private *devpriv = dev->private;
         unsigned int ui_InterruptStatus = 0;
         int i_RegValue = 0;
         i_InterruptMask = 0;
@@ -2840,7 +2885,9 @@ static void v_APCI1500_Interrupt(int irq, void *d)
 */
 static int i_APCI1500_Reset(struct comedi_device *dev)
 {
+        struct addi_private *devpriv = dev->private;
         int i_DummyRead = 0;
+
         i_TimerCounter1Init = 0;
         i_TimerCounter2Init = 0;
         i_WatchdogCounter3Init = 0;
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.h b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.h
deleted file mode 100644
index 647f9ebf552a..000000000000
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.h
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * Copyright (C) 2004,2005  ADDI-DATA GmbH for the source code of this module.
- *
- *      ADDI-DATA GmbH
- *      Dieselstrasse 3
- *      D-77833 Ottersweier
- *      Tel: +19(0)7223/9493-0
- *      Fax: +49(0)7223/9493-92
- *      http://www.addi-data.com
- *      info@addi-data.com
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- */
-
-/*********      Definitions for APCI-1500 card  *****/
-
-/* Card Specific information */
-#define APCI1500_BOARD_VENDOR_ID           0x10e8
-#define APCI1500_ADDRESS_RANGE              4
-
-/* DIGITAL INPUT-OUTPUT DEFINE */
-
-#define  APCI1500_DIGITAL_OP                    2
-#define  APCI1500_DIGITAL_IP                    0
-#define  APCI1500_AND                               2
-#define  APCI1500_OR                                4
-#define  APCI1500_OR_PRIORITY                       6
-#define  APCI1500_CLK_SELECT                    0
-#define  COUNTER1                               0
-#define  COUNTER2                               1
-#define  COUNTER3                               2
-#define  APCI1500_COUNTER                               0x20
-#define  APCI1500_TIMER                                 0
-#define  APCI1500_WATCHDOG                          0
-#define  APCI1500_SINGLE                            0
-#define  APCI1500_CONTINUOUS                        0x80
-#define  APCI1500_DISABLE                               0
-#define  APCI1500_ENABLE                                1
-#define  APCI1500_SOFTWARE_TRIGGER                  0x4
-#define  APCI1500_HARDWARE_TRIGGER                  0x10
-#define  APCI1500_SOFTWARE_GATE                     0
-#define  APCI1500_HARDWARE_GATE                     0x8
-#define  START                                      0
-#define  STOP                                       1
-#define  TRIGGER                                    2
-
-/*
- * Zillog I/O enumeration
- */
-enum {
-        APCI1500_Z8536_PORT_C,
-        APCI1500_Z8536_PORT_B,
-        APCI1500_Z8536_PORT_A,
-        APCI1500_Z8536_CONTROL_REGISTER
-};
-
-/*
- * Z8536 CIO Internal Address
- */
-enum {
-        APCI1500_RW_MASTER_INTERRUPT_CONTROL,
-        APCI1500_RW_MASTER_CONFIGURATION_CONTROL,
-        APCI1500_RW_PORT_A_INTERRUPT_CONTROL,
-        APCI1500_RW_PORT_B_INTERRUPT_CONTROL,
-        APCI1500_RW_TIMER_COUNTER_INTERRUPT_VECTOR,
-        APCI1500_RW_PORT_C_DATA_PCITCH_POLARITY,
-        APCI1500_RW_PORT_C_DATA_DIRECTION,
-        APCI1500_RW_PORT_C_SPECIAL_IO_CONTROL,
-
-        APCI1500_RW_PORT_A_COMMAND_AND_STATUS,
-        APCI1500_RW_PORT_B_COMMAND_AND_STATUS,
-        APCI1500_RW_CPT_TMR1_CMD_STATUS,
-        APCI1500_RW_CPT_TMR2_CMD_STATUS,
-        APCI1500_RW_CPT_TMR3_CMD_STATUS,
-        APCI1500_RW_PORT_A_DATA,
-        APCI1500_RW_PORT_B_DATA,
-        APCI1500_RW_PORT_C_DATA,
-
-        APCI1500_R_CPT_TMR1_VALUE_HIGH,
-        APCI1500_R_CPT_TMR1_VALUE_LOW,
-        APCI1500_R_CPT_TMR2_VALUE_HIGH,
-        APCI1500_R_CPT_TMR2_VALUE_LOW,
-        APCI1500_R_CPT_TMR3_VALUE_HIGH,
-        APCI1500_R_CPT_TMR3_VALUE_LOW,
-        APCI1500_RW_CPT_TMR1_TIME_CST_HIGH,
-        APCI1500_RW_CPT_TMR1_TIME_CST_LOW,
-        APCI1500_RW_CPT_TMR2_TIME_CST_HIGH,
-        APCI1500_RW_CPT_TMR2_TIME_CST_LOW,
-        APCI1500_RW_CPT_TMR3_TIME_CST_HIGH,
-        APCI1500_RW_CPT_TMR3_TIME_CST_LOW,
-        APCI1500_RW_CPT_TMR1_MODE_SPECIFICATION,
-        APCI1500_RW_CPT_TMR2_MODE_SPECIFICATION,
-        APCI1500_RW_CPT_TMR3_MODE_SPECIFICATION,
-        APCI1500_R_CURRENT_VECTOR,
-
-        APCI1500_RW_PORT_A_SPECIFICATION,
-        APCI1500_RW_PORT_A_HANDSHAKE_SPECIFICATION,
-        APCI1500_RW_PORT_A_DATA_PCITCH_POLARITY,
-        APCI1500_RW_PORT_A_DATA_DIRECTION,
-        APCI1500_RW_PORT_A_SPECIAL_IO_CONTROL,
-        APCI1500_RW_PORT_A_PATTERN_POLARITY,
-        APCI1500_RW_PORT_A_PATTERN_TRANSITION,
-        APCI1500_RW_PORT_A_PATTERN_MASK,
-
-        APCI1500_RW_PORT_B_SPECIFICATION,
-        APCI1500_RW_PORT_B_HANDSHAKE_SPECIFICATION,
-        APCI1500_RW_PORT_B_DATA_PCITCH_POLARITY,
-        APCI1500_RW_PORT_B_DATA_DIRECTION,
-        APCI1500_RW_PORT_B_SPECIAL_IO_CONTROL,
-        APCI1500_RW_PORT_B_PATTERN_POLARITY,
-        APCI1500_RW_PORT_B_PATTERN_TRANSITION,
-        APCI1500_RW_PORT_B_PATTERN_MASK
-};
-
- /*----------DIGITAL INPUT----------------*/
-static int i_APCI1500_Initialisation(struct comedi_device *dev, struct comedi_subdevice *s,
-                                     struct comedi_insn *insn, unsigned int *data);
-static int i_APCI1500_ConfigDigitalInputEvent(struct comedi_device *dev,
-                                              struct comedi_subdevice *s,
-                                              struct comedi_insn *insn,
-                                              unsigned int *data);
-
-static int i_APCI1500_StartStopInputEvent(struct comedi_device *dev,
-                                          struct comedi_subdevice *s,
-                                          struct comedi_insn *insn, unsigned int *data);
-static int i_APCI1500_ReadMoreDigitalInput(struct comedi_device *dev,
-                                           struct comedi_subdevice *s,
-                                           struct comedi_insn *insn, unsigned int *data);
-
-/*----------    DIGITAL OUTPUT------------*/
-static int i_APCI1500_ConfigDigitalOutputErrorInterrupt(struct comedi_device *dev,
-                                                        struct comedi_subdevice *s,
-                                                        struct comedi_insn *insn,
-                                                        unsigned int *data);
-static int i_APCI1500_WriteDigitalOutput(struct comedi_device *dev,
-                                         struct comedi_subdevice *s,
-                                         struct comedi_insn *insn, unsigned int *data);
-
-/*----------TIMER----------------*/
-static int i_APCI1500_ConfigCounterTimerWatchdog(struct comedi_device *dev,
-                                                 struct comedi_subdevice *s,
-                                                 struct comedi_insn *insn,
-                                                 unsigned int *data);
-static int i_APCI1500_StartStopTriggerTimerCounterWatchdog(struct comedi_device *dev,
-                                                           struct comedi_subdevice *s,
-                                                           struct comedi_insn *insn,
-                                                           unsigned int *data);
-static int i_APCI1500_ReadCounterTimerWatchdog(struct comedi_device *dev,
-                                               struct comedi_subdevice *s,
-                                               struct comedi_insn *insn,
-                                               unsigned int *data);
-static int i_APCI1500_ReadInterruptMask(struct comedi_device *dev,
-                                        struct comedi_subdevice *s,
-                                        struct comedi_insn *insn, unsigned int *data);
-
-/*----------INTERRUPT HANDLER------*/
-static void v_APCI1500_Interrupt(int irq, void *d);
-static int i_APCI1500_ConfigureInterrupt(struct comedi_device *dev,
-                                         struct comedi_subdevice *s,
-                                         struct comedi_insn *insn, unsigned int *data);
-/*----------RESET---------------*/
-static int i_APCI1500_Reset(struct comedi_device *dev);
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.c
deleted file mode 100644
index 8a584a014b0b..000000000000
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.c
+++ /dev/null
@@ -1,542 +0,0 @@
-/**
-@verbatim
-
-Copyright (C) 2004,2005  ADDI-DATA GmbH for the source code of this module.
-
-        ADDI-DATA GmbH
-        Dieselstrasse 3
-        D-77833 Ottersweier
-        Tel: +19(0)7223/9493-0
-        Fax: +49(0)7223/9493-92
-        http://www.addi-data.com
-        info@addi-data.com
-
-This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
-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
-
-You should also find the complete GPL in the COPYING file accompanying this source code.
-
-@endverbatim
-*/
-/*
-
-  +-----------------------------------------------------------------------+
-  | (C) ADDI-DATA GmbH          Dieselstraße 3       D-77833 Ottersweier  |
-  +-----------------------------------------------------------------------+
-  | Tel : +49 (0) 7223/9493-0     | email    : info@addi-data.com         |
-  | Fax : +49 (0) 7223/9493-92    | Internet : http://www.addi-data.com   |
-  +-------------------------------+---------------------------------------+
-  | Project     : APCI-1516       | Compiler   : GCC                      |
-  | Module name : hwdrv_apci1516.c| Version    : 2.96                     |
-  +-------------------------------+---------------------------------------+
-  | Project manager: Eric Stolz   | Date       :  02/12/2002              |
-  +-------------------------------+---------------------------------------+
-  | Description :   Hardware Layer Access For APCI-1516                   |
-  +-----------------------------------------------------------------------+
-  |                             UPDATES                                   |
-  +----------+-----------+------------------------------------------------+
-  |   Date   |   Author  |          Description of updates                |
-  +----------+-----------+------------------------------------------------+
-  |          |           |                                                |
-  |          |           |                                                |
-  |          |           |                                                |
-  +----------+-----------+------------------------------------------------+
-*/
-
-/*
-+----------------------------------------------------------------------------+
-|                               Included files                               |
-+----------------------------------------------------------------------------+
-*/
-#include "hwdrv_apci1516.h"
-
-/*
-+----------------------------------------------------------------------------+
-| Function   Name   : int i_APCI1516_Read1DigitalInput                       |
-|                         (struct comedi_device *dev,struct comedi_subdevice *s,               |
-|                      struct comedi_insn *insn,unsigned int *data)                     |
-+----------------------------------------------------------------------------+
-| Task              : Return the status of the digital input                 |
-+----------------------------------------------------------------------------+
-| Input Parameters  : struct comedi_device *dev      : Driver handle                |
-|                      struct comedi_subdevice *s,   :pointer to subdevice structure
-|                       struct comedi_insn *insn      :pointer to insn structure     |
-|                     unsigned int *data          : Data Pointer to read status  |
-+----------------------------------------------------------------------------+
-| Output Parameters :   --                                                                                                       |
-+----------------------------------------------------------------------------+
-| Return Value      : TRUE  : No error occur                                 |
-|                           : FALSE : Error occur. Return the error          |
-|                                                                                |
-+----------------------------------------------------------------------------+
-*/
-int i_APCI1516_Read1DigitalInput(struct comedi_device *dev, struct comedi_subdevice *s,
-        struct comedi_insn *insn, unsigned int *data)
-{
-        unsigned int ui_TmpValue = 0;
-        unsigned int ui_Channel;
-        ui_Channel = CR_CHAN(insn->chanspec);
-        if (ui_Channel <= 7) {
-                ui_TmpValue = (unsigned int) inw(devpriv->iobase + APCI1516_DIGITAL_IP);
-                /*   since only 1 channel reqd  to bring it to last bit it is rotated */
-                /*   8 +(chan - 1) times then ANDed with 1 for last bit. */
-                *data = (ui_TmpValue >> ui_Channel) & 0x1;
-        }                       /* if(ui_Channel >= 0 && ui_Channel <=7) */
-        else {
-                /* comedi_error(dev," \n chan spec wrong\n"); */
-                return -EINVAL; /*  "sorry channel spec wrong " */
-        }                       /* else if(ui_Channel >= 0 && ui_Channel <=7) */
-
-        return insn->n;
-}
-
-/*
-+----------------------------------------------------------------------------+
-| Function   Name   : int i_APCI1516_ReadMoreDigitalInput                    |
-|                         (struct comedi_device *dev,struct comedi_subdevice *s,               |
-|                     struct comedi_insn *insn,unsigned int *data)                      |
-+----------------------------------------------------------------------------+
-| Task              : Return the status of the Requested digital inputs      |
-+----------------------------------------------------------------------------+
-| Input Parameters  : struct comedi_device *dev      : Driver handle                |
-|                      struct comedi_subdevice *s,   :pointer to subdevice structure
-|                       struct comedi_insn *insn      :pointer to insn structure     |
-|                      unsigned int *data         : Data Pointer to read status  |
-+----------------------------------------------------------------------------+
-| Output Parameters :   --                                                                                                       |
-+----------------------------------------------------------------------------+
-| Return Value      : TRUE  : No error occur                                 |
-|                           : FALSE : Error occur. Return the error          |
-|                                                                                |
-+----------------------------------------------------------------------------+
-*/
-
-int i_APCI1516_ReadMoreDigitalInput(struct comedi_device *dev, struct comedi_subdevice *s,
-        struct comedi_insn *insn, unsigned int *data)
-{
-
-        unsigned int ui_PortValue = data[0];
-        unsigned int ui_Mask = 0;
-        unsigned int ui_NoOfChannels;
-
-        ui_NoOfChannels = CR_CHAN(insn->chanspec);
-
-        *data = (unsigned int) inw(devpriv->iobase + APCI1516_DIGITAL_IP);
-        switch (ui_NoOfChannels) {
-        case 2:
-                ui_Mask = 3;
-                *data = (*data >> (2 * ui_PortValue)) & ui_Mask;
-                break;
-        case 4:
-                ui_Mask = 15;
-                *data = (*data >> (4 * ui_PortValue)) & ui_Mask;
-                break;
-        case 7:
-                break;
-
-        default:
-                printk("\nWrong parameters\n");
-                return -EINVAL; /*  "sorry channel spec wrong " */
-                break;
-        }                       /* switch(ui_NoOfChannels) */
-
-        return insn->n;
-}
-
-/*
-+----------------------------------------------------------------------------+
-| Function   Name   : int i_APCI1516_ConfigDigitalOutput (struct comedi_device *dev,
-|                    struct comedi_subdevice *s struct comedi_insn *insn,unsigned int *data)    |
-|                                                                                    |
-+----------------------------------------------------------------------------+
-| Task              : Configures The Digital Output Subdevice.               |
-+----------------------------------------------------------------------------+
-| Input Parameters  : struct comedi_device *dev : Driver handle                     |
-|                     unsigned int *data         : Data Pointer contains         |
-|                                          configuration parameters as below |
-|                      struct comedi_subdevice *s,   :pointer to subdevice structure
-|                      struct comedi_insn *insn      :pointer to insn structure                                                           |
-|                                         data[0]  :1:Memory on                          |
-|                                                   0:Memory off                         |
-|                                                                                                            |
-|                                                                                                                                        |
-+----------------------------------------------------------------------------+
-| Output Parameters :   --                                                                                                       |
-+----------------------------------------------------------------------------+
-| Return Value      : TRUE  : No error occur                                 |
-|                           : FALSE : Error occur. Return the error          |
-|                                                                                |
-+----------------------------------------------------------------------------+
-*/
-int i_APCI1516_ConfigDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s,
-        struct comedi_insn *insn, unsigned int *data)
-{
-        devpriv->b_OutputMemoryStatus = data[0];
-        return insn->n;
-}
-
-/*
-+----------------------------------------------------------------------------+
-| Function   Name   : int i_APCI1516_WriteDigitalOutput                      |
-|                       (struct comedi_device *dev,struct comedi_subdevice *s,struct comedi_insn *insn,
-|                     unsigned int *data)                                         |
-+----------------------------------------------------------------------------+
-| Task              : Writes port value  To the selected port                |
-+----------------------------------------------------------------------------+
-| Input Parameters  : struct comedi_device *dev      : Driver handle                |
-|                     struct comedi_subdevice *s,   :pointer to subdevice structure
-|                     struct comedi_insn *insn      :pointer to insn structure      |
-|                    unsigned int *data           : Data Pointer to read status  |
-+----------------------------------------------------------------------------+
-| Output Parameters :   --                                                                                                       |
-+----------------------------------------------------------------------------+
-| Return Value      : TRUE  : No error occur                                 |
-|                           : FALSE : Error occur. Return the error          |
-|                                                                                |
-+----------------------------------------------------------------------------+
-*/
-
-int i_APCI1516_WriteDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s,
-        struct comedi_insn *insn, unsigned int *data)
-{
-        unsigned int ui_Temp, ui_Temp1;
-        unsigned int ui_NoOfChannel = CR_CHAN(insn->chanspec);  /*  get the channel */
-
-        printk("EL311003 : @=%x\n", devpriv->iobase + APCI1516_DIGITAL_OP);
-
-        if (devpriv->b_OutputMemoryStatus) {
-                ui_Temp = inw(devpriv->iobase + APCI1516_DIGITAL_OP);
-
-        }                       /* if(devpriv->b_OutputMemoryStatus ) */
-        else {
-                ui_Temp = 0;
-        }                       /* if(devpriv->b_OutputMemoryStatus ) */
-        if (data[3] == 0) {
-                if (data[1] == 0) {
-                        data[0] = (data[0] << ui_NoOfChannel) | ui_Temp;
-                        outw(data[0], devpriv->iobase + APCI1516_DIGITAL_OP);
-
-                        printk("EL311003 : d=%d @=%x\n", data[0],
-                                devpriv->iobase + APCI1516_DIGITAL_OP);
-
-                }               /* if(data[1]==0) */
-                else {
-                        if (data[1] == 1) {
-                                switch (ui_NoOfChannel) {
-
-                                case 2:
-                                        data[0] =
-                                                (data[0] << (2 *
-                                                        data[2])) | ui_Temp;
-                                        break;
-
-                                case 4:
-                                        data[0] =
-                                                (data[0] << (4 *
-                                                        data[2])) | ui_Temp;
-                                        break;
-
-                                case 7:
-                                        data[0] = data[0] | ui_Temp;
-                                        break;
-
-                                default:
-                                        comedi_error(dev, " chan spec wrong");
-                                        return -EINVAL; /*  "sorry channel spec wrong " */
-
-                                }       /* switch(ui_NoOfChannels) */
-
-                                outw(data[0],
-                                        devpriv->iobase + APCI1516_DIGITAL_OP);
-
-                                printk("EL311003 : d=%d @=%x\n", data[0],
-                                        devpriv->iobase + APCI1516_DIGITAL_OP);
-                        }       /*  if(data[1]==1) */
-                        else {
-                                printk("\nSpecified channel not supported\n");
-                        }       /* else if(data[1]==1) */
-                }               /* elseif(data[1]==0) */
-        }                       /* if(data[3]==0) */
-        else {
-                if (data[3] == 1) {
-                        if (data[1] == 0) {
-                                data[0] = ~data[0] & 0x1;
-                                ui_Temp1 = 1;
-                                ui_Temp1 = ui_Temp1 << ui_NoOfChannel;
-                                ui_Temp = ui_Temp | ui_Temp1;
-                                data[0] = (data[0] << ui_NoOfChannel) ^ 0xff;
-                                data[0] = data[0] & ui_Temp;
-                                outw(data[0],
-                                        devpriv->iobase + APCI1516_DIGITAL_OP);
-
-                                printk("EL311003 : d=%d @=%x\n", data[0],
-                                        devpriv->iobase + APCI1516_DIGITAL_OP);
-
-                        }       /* if(data[1]==0) */
-                        else {
-                                if (data[1] == 1) {
-                                        switch (ui_NoOfChannel) {
-
-                                        case 2:
-                                                data[0] = ~data[0] & 0x3;
-                                                ui_Temp1 = 3;
-                                                ui_Temp1 =
-                                                        ui_Temp1 << 2 * data[2];
-                                                ui_Temp = ui_Temp | ui_Temp1;
-                                                data[0] =
-                                                        ((data[0] << (2 *
-                                                                        data
-                                                                        [2])) ^
-                                                        0xff) & ui_Temp;
-                                                break;
-
-                                        case 4:
-                                                data[0] = ~data[0] & 0xf;
-                                                ui_Temp1 = 15;
-                                                ui_Temp1 =
-                                                        ui_Temp1 << 4 * data[2];
-                                                ui_Temp = ui_Temp | ui_Temp1;
-                                                data[0] =
-                                                        ((data[0] << (4 *
-                                                                        data
-                                                                        [2])) ^
-                                                        0xff) & ui_Temp;
-                                                break;
-
-                                        case 7:
-                                                break;
-
-                                        default:
-                                                comedi_error(dev,
-                                                        " chan spec wrong");
-                                                return -EINVAL; /*  "sorry channel spec wrong " */
-
-                                        }       /* switch(ui_NoOfChannels) */
-
-                                        outw(data[0],
-                                                devpriv->iobase +
-                                                APCI1516_DIGITAL_OP);
-
-                                        printk("EL311003 : d=%d @=%x\n",
-                                                data[0],
-                                                devpriv->iobase +
-                                                APCI1516_DIGITAL_OP);
-                                }       /*  if(data[1]==1) */
-                                else {
-                                        printk("\nSpecified channel not supported\n");
-                                }       /* else if(data[1]==1) */
-                        }       /* elseif(data[1]==0) */
-                }               /* if(data[3]==1); */
-                else {
-                        printk("\nSpecified functionality does not exist\n");
-                        return -EINVAL;
-                }               /* if else data[3]==1) */
-        }                       /* if else data[3]==0) */
-        return (insn->n);
-}
-
-/*
-+----------------------------------------------------------------------------+
-| Function   Name   : int i_APCI1516_ReadDigitalOutput                       |
-|                       (struct comedi_device *dev,struct comedi_subdevice *s,struct comedi_insn *insn,
-|                    unsigned int *data)                                             |
-+----------------------------------------------------------------------------+
-| Task              : Read  value  of the selected channel or port           |
-+----------------------------------------------------------------------------+
-| Input Parameters  : struct comedi_device *dev      : Driver handle                |
-|                     struct comedi_subdevice *s,   :pointer to subdevice structure
-|                     struct comedi_insn *insn      :pointer to insn structure      |
-|                     unsigned int *data          : Data Pointer to read status  |
-+----------------------------------------------------------------------------+
-| Output Parameters :   --                                                                                                       |
-+----------------------------------------------------------------------------+
-| Return Value      : TRUE  : No error occur                                 |
-|                           : FALSE : Error occur. Return the error          |
-|                                                                                |
-+----------------------------------------------------------------------------+
-*/
-
-int i_APCI1516_ReadDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s,
-        struct comedi_insn *insn, unsigned int *data)
-{
-
-        unsigned int ui_Temp;
-        unsigned int ui_NoOfChannel = CR_CHAN(insn->chanspec);  /*  get the channel */
-        ui_Temp = data[0];
-        *data = inw(devpriv->iobase + APCI1516_DIGITAL_OP_RW);
-        if (ui_Temp == 0) {
-                *data = (*data >> ui_NoOfChannel) & 0x1;
-        }                       /* if(ui_Temp==0) */
-        else {
-                if (ui_Temp == 1) {
-                        switch (ui_NoOfChannel) {
-
-                        case 2:
-                                *data = (*data >> (2 * data[1])) & 3;
-                                break;
-
-                        case 4:
-                                *data = (*data >> (4 * data[1])) & 15;
-                                break;
-
-                        case 7:
-                                break;
-
-                        default:
-                                comedi_error(dev, " chan spec wrong");
-                                return -EINVAL; /*  "sorry channel spec wrong " */
-
-                        }       /* switch(ui_NoOfChannels) */
-                }               /* if(ui_Temp==1) */
-                else {
-                        printk("\nSpecified channel not supported \n");
-                }               /* elseif(ui_Temp==1) */
-        }                       /* elseif(ui_Temp==0) */
-        return insn->n;
-}
-
-/*
-+----------------------------------------------------------------------------+
-| Function   Name   : int i_APCI1516_ConfigWatchdog(struct comedi_device *dev,
-|                      struct comedi_subdevice *s,struct comedi_insn *insn,unsigned int *data)  |
-|                                                                                    |
-+----------------------------------------------------------------------------+
-| Task              : Configures The Watchdog                                |
-+----------------------------------------------------------------------------+
-| Input Parameters  :   struct comedi_device *dev      : Driver handle              |
-|                     struct comedi_subdevice *s,   :pointer to subdevice structure
-|                      struct comedi_insn *insn      :pointer to insn structure      |
-|                     unsigned int *data          : Data Pointer to read status                                                     |
-+----------------------------------------------------------------------------+
-| Output Parameters :   --                                                                                                       |
-+----------------------------------------------------------------------------+
-| Return Value      : TRUE  : No error occur                                 |
-|                           : FALSE : Error occur. Return the error          |
-|                                                                                |
-+----------------------------------------------------------------------------+
-*/
-
-int i_APCI1516_ConfigWatchdog(struct comedi_device *dev, struct comedi_subdevice *s,
-        struct comedi_insn *insn, unsigned int *data)
-{
-        if (data[0] == 0) {
-                /* Disable the watchdog */
-                outw(0x0,
-                        devpriv->i_IobaseAddon +
-                        APCI1516_WATCHDOG_ENABLEDISABLE);
-                /* Loading the Reload value */
-                outw(data[1],
-                        devpriv->i_IobaseAddon +
-                        APCI1516_WATCHDOG_RELOAD_VALUE);
-                data[1] = data[1] >> 16;
-                outw(data[1],
-                        devpriv->i_IobaseAddon +
-                        APCI1516_WATCHDOG_RELOAD_VALUE + 2);
-        }                       /* if(data[0]==0) */
-        else {
-                printk("\nThe input parameters are wrong\n");
-                return -EINVAL;
-        }                       /* elseif(data[0]==0) */
-
-        return insn->n;
-}
-
- /*
-    +----------------------------------------------------------------------------+
-    | Function   Name   : int i_APCI1516_StartStopWriteWatchdog                  |
-    |                           (struct comedi_device *dev,struct comedi_subdevice *s,
-    struct comedi_insn *insn,unsigned int *data);                      |
-    +----------------------------------------------------------------------------+
-    | Task              : Start / Stop The Watchdog                              |
-    +----------------------------------------------------------------------------+
-    | Input Parameters  : struct comedi_device *dev      : Driver handle                |
-    |                     struct comedi_subdevice *s,   :pointer to subdevice structure
-    struct comedi_insn *insn      :pointer to insn structure      |
-    |                     unsigned int *data          : Data Pointer to read status  |
-    +----------------------------------------------------------------------------+
-    | Output Parameters :       --                                                                                                       |
-    +----------------------------------------------------------------------------+
-    | Return Value      : TRUE  : No error occur                                 |
-    |                       : FALSE : Error occur. Return the error          |
-    |                                                                            |
-    +----------------------------------------------------------------------------+
-  */
-
-int i_APCI1516_StartStopWriteWatchdog(struct comedi_device *dev, struct comedi_subdevice *s,
-        struct comedi_insn *insn, unsigned int *data)
-{
-        switch (data[0]) {
-        case 0:         /* stop the watchdog */
-                outw(0x0, devpriv->i_IobaseAddon + APCI1516_WATCHDOG_ENABLEDISABLE);    /* disable the watchdog */
-                break;
-        case 1:         /* start the watchdog */
-                outw(0x0001,
-                        devpriv->i_IobaseAddon +
-                        APCI1516_WATCHDOG_ENABLEDISABLE);
-                break;
-        case 2:         /* Software trigger */
-                outw(0x0201,
-                        devpriv->i_IobaseAddon +
-                        APCI1516_WATCHDOG_ENABLEDISABLE);
-                break;
-        default:
-                printk("\nSpecified functionality does not exist\n");
-                return -EINVAL;
-        }                       /*  switch(data[0]) */
-        return insn->n;
-}
-
-/*
-+----------------------------------------------------------------------------+
-| Function   Name   : int i_APCI1516_ReadWatchdog                            |
-|                       (struct comedi_device *dev,struct comedi_subdevice *s,struct comedi_insn *insn,
-                    unsigned int *data);                                             |
-+----------------------------------------------------------------------------+
-| Task              : Read The Watchdog                                      |
-+----------------------------------------------------------------------------+
-| Input Parameters  :   struct comedi_device *dev      : Driver handle              |
-|                     struct comedi_subdevice *s,   :pointer to subdevice structure
-                      struct comedi_insn *insn      :pointer to insn structure      |
-|                     unsigned int *data          : Data Pointer to read status  |
-+----------------------------------------------------------------------------+
-| Output Parameters :   --                                                                                                       |
-+----------------------------------------------------------------------------+
-| Return Value      : TRUE  : No error occur                                 |
-|                           : FALSE : Error occur. Return the error          |
-|                                                                                |
-+----------------------------------------------------------------------------+
-*/
-
-int i_APCI1516_ReadWatchdog(struct comedi_device *dev, struct comedi_subdevice *s,
-        struct comedi_insn *insn, unsigned int *data)
-{
-        data[0] = inw(devpriv->i_IobaseAddon + APCI1516_WATCHDOG_STATUS) & 0x1;
-        return insn->n;
-}
-
-/*
-+----------------------------------------------------------------------------+
-| Function   Name   : int i_APCI1516_Reset(struct comedi_device *dev)               |                                                                                                          |
-+----------------------------------------------------------------------------+
-| Task              :resets all the registers                                |
-+----------------------------------------------------------------------------+
-| Input Parameters  : struct comedi_device *dev
-+----------------------------------------------------------------------------+
-| Output Parameters :   --                                                                                                       |
-+----------------------------------------------------------------------------+
-| Return Value      :                                                        |
-|                                                                                |
-+----------------------------------------------------------------------------+
-*/
-
-int i_APCI1516_Reset(struct comedi_device *dev)
-{
-        outw(0x0, devpriv->iobase + APCI1516_DIGITAL_OP);       /* RESETS THE DIGITAL OUTPUTS */
-        outw(0x0, devpriv->i_IobaseAddon + APCI1516_WATCHDOG_ENABLEDISABLE);
-        outw(0x0, devpriv->i_IobaseAddon + APCI1516_WATCHDOG_RELOAD_VALUE);
-        outw(0x0, devpriv->i_IobaseAddon + APCI1516_WATCHDOG_RELOAD_VALUE + 2);
-        return 0;
-}
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.h b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.h
deleted file mode 100644
index 44728293e494..000000000000
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (C) 2004,2005  ADDI-DATA GmbH for the source code of this module.
- *
- *      ADDI-DATA GmbH
- *      Dieselstrasse 3
- *      D-77833 Ottersweier
- *      Tel: +19(0)7223/9493-0
- *      Fax: +49(0)7223/9493-92
- *      http://www.addi-data.com
- *      info@addi-data.com
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- */
-
-/*********      Definitions for APCI-1516 card  *****/
-
-/* Card Specific information */
-#define APCI1516_BOARD_VENDOR_ID                 0x15B8
-#define APCI1516_ADDRESS_RANGE                   8
-
-/* DIGITAL INPUT-OUTPUT DEFINE */
-
-#define APCI1516_DIGITAL_OP                     4
-#define APCI1516_DIGITAL_OP_RW                  4
-#define APCI1516_DIGITAL_IP                     0
-
-/* TIMER COUNTER WATCHDOG DEFINES */
-
-#define ADDIDATA_WATCHDOG                          2
-#define APCI1516_DIGITAL_OP_WATCHDOG               0
-#define APCI1516_WATCHDOG_ENABLEDISABLE            12
-#define APCI1516_WATCHDOG_RELOAD_VALUE             4
-#define APCI1516_WATCHDOG_STATUS                   16
-
-/* Hardware Layer  functions for Apci1516 */
-
-/* Digital Input */
-int i_APCI1516_ReadMoreDigitalInput(struct comedi_device *dev, struct comedi_subdevice *s,
-                                    struct comedi_insn *insn, unsigned int *data);
-int i_APCI1516_Read1DigitalInput(struct comedi_device *dev, struct comedi_subdevice *s,
-                                 struct comedi_insn *insn, unsigned int *data);
-
-/* Digital Output */
-int i_APCI1516_ConfigDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s,
-                                   struct comedi_insn *insn, unsigned int *data);
-int i_APCI1516_WriteDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s,
-                                  struct comedi_insn *insn, unsigned int *data);
-int i_APCI1516_ReadDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s,
-                                 struct comedi_insn *insn, unsigned int *data);
-
-/*
-* TIMER timer value is passed as u seconds
-*/
-int i_APCI1516_ConfigWatchdog(struct comedi_device *dev, struct comedi_subdevice *s,
-                              struct comedi_insn *insn, unsigned int *data);
-int i_APCI1516_StartStopWriteWatchdog(struct comedi_device *dev, struct comedi_subdevice *s,
-                                      struct comedi_insn *insn, unsigned int *data);
-int i_APCI1516_ReadWatchdog(struct comedi_device *dev, struct comedi_subdevice *s,
-                            struct comedi_insn *insn, unsigned int *data);
-
-/* reset */
-int i_APCI1516_Reset(struct comedi_device *dev);
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c
index 5b92e45c9ae3..fc31c4b93407 100644
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c
@@ -46,14 +46,62 @@ You should also find the complete GPL in the COPYING file accompanying this sour
   +----------+-----------+------------------------------------------------+
 */
 
-/*
-+----------------------------------------------------------------------------+
-|                               Included files                               |
-+----------------------------------------------------------------------------+
-*/
-
-#include <linux/delay.h>
-#include "hwdrv_apci1564.h"
+/*********      Definitions for APCI-1564 card  *****/
+
+#define APCI1564_ADDRESS_RANGE                          128
+
+/* DIGITAL INPUT-OUTPUT DEFINE */
+/* Input defines */
+#define APCI1564_DIGITAL_IP                             0x04
+#define APCI1564_DIGITAL_IP_INTERRUPT_MODE1             4
+#define APCI1564_DIGITAL_IP_INTERRUPT_MODE2             8
+#define APCI1564_DIGITAL_IP_IRQ                         16
+
+/* Output defines */
+#define APCI1564_DIGITAL_OP                             0x18
+#define APCI1564_DIGITAL_OP_RW                          0
+#define APCI1564_DIGITAL_OP_INTERRUPT                   4
+#define APCI1564_DIGITAL_OP_IRQ                         12
+
+/* Digital Input IRQ Function Selection */
+#define ADDIDATA_OR                                     0
+#define ADDIDATA_AND                                    1
+
+/* Digital Input Interrupt Status */
+#define APCI1564_DIGITAL_IP_INTERRUPT_STATUS            12
+
+/* Digital Output Interrupt Status */
+#define APCI1564_DIGITAL_OP_INTERRUPT_STATUS            8
+
+/* Digital Input Interrupt Enable Disable. */
+#define APCI1564_DIGITAL_IP_INTERRUPT_ENABLE            0x4
+#define APCI1564_DIGITAL_IP_INTERRUPT_DISABLE           0xfffffffb
+
+/* Digital Output Interrupt Enable Disable. */
+#define APCI1564_DIGITAL_OP_VCC_INTERRUPT_ENABLE        0x1
+#define APCI1564_DIGITAL_OP_VCC_INTERRUPT_DISABLE       0xfffffffe
+#define APCI1564_DIGITAL_OP_CC_INTERRUPT_ENABLE         0x2
+#define APCI1564_DIGITAL_OP_CC_INTERRUPT_DISABLE        0xfffffffd
+
+/* TIMER COUNTER WATCHDOG DEFINES */
+
+#define ADDIDATA_TIMER                                  0
+#define ADDIDATA_COUNTER                                1
+#define ADDIDATA_WATCHDOG                               2
+#define APCI1564_DIGITAL_OP_WATCHDOG                    0x28
+#define APCI1564_TIMER                                  0x48
+#define APCI1564_COUNTER1                               0x0
+#define APCI1564_COUNTER2                               0x20
+#define APCI1564_COUNTER3                               0x40
+#define APCI1564_COUNTER4                               0x60
+#define APCI1564_TCW_SYNC_ENABLEDISABLE                 0
+#define APCI1564_TCW_RELOAD_VALUE                       4
+#define APCI1564_TCW_TIMEBASE                           8
+#define APCI1564_TCW_PROG                               12
+#define APCI1564_TCW_TRIG_STATUS                        16
+#define APCI1564_TCW_IRQ                                20
+#define APCI1564_TCW_WARN_TIMEVAL                       24
+#define APCI1564_TCW_WARN_TIMEBASE                      28
 
 /* Global variables */
 static unsigned int ui_InterruptStatus_1564 = 0;
@@ -86,9 +134,13 @@ static unsigned int ui_InterruptData, ui_Type;
 |                                                                                |
 +----------------------------------------------------------------------------+
 */
-int i_APCI1564_ConfigDigitalInput(struct comedi_device *dev, struct comedi_subdevice *s,
-        struct comedi_insn *insn, unsigned int *data)
+static int i_APCI1564_ConfigDigitalInput(struct comedi_device *dev,
+                                         struct comedi_subdevice *s,
+                                         struct comedi_insn *insn,
+                                         unsigned int *data)
 {
+        struct addi_private *devpriv = dev->private;
+
         devpriv->tsk_Current = current;
    /*******************************/
         /* Set the digital input logic */
@@ -128,107 +180,15 @@ int i_APCI1564_ConfigDigitalInput(struct comedi_device *dev, struct comedi_subde
         return insn->n;
 }
 
-/*
-+----------------------------------------------------------------------------+
-| Function   Name   : int i_APCI1564_Read1DigitalInput                       |
-|                         (struct comedi_device *dev,struct comedi_subdevice *s,               |
-|                      struct comedi_insn *insn,unsigned int *data)                     |
-+----------------------------------------------------------------------------+
-| Task              : Return the status of the digital input                 |
-+----------------------------------------------------------------------------+
-| Input Parameters  : struct comedi_device *dev      : Driver handle                |
-|                             unsigned int ui_Channel : Channel number to read       |
-|                     unsigned int *data          : Data Pointer to read status  |
-+----------------------------------------------------------------------------+
-| Output Parameters :   --                                                                                                       |
-+----------------------------------------------------------------------------+
-| Return Value      : TRUE  : No error occur                                 |
-|                           : FALSE : Error occur. Return the error          |
-|                                                                                |
-+----------------------------------------------------------------------------+
-*/
-int i_APCI1564_Read1DigitalInput(struct comedi_device *dev, struct comedi_subdevice *s,
-        struct comedi_insn *insn, unsigned int *data)
+static int apci1564_di_insn_bits(struct comedi_device *dev,
+                                 struct comedi_subdevice *s,
+                                 struct comedi_insn *insn,
+                                 unsigned int *data)
 {
-        unsigned int ui_TmpValue = 0;
-        unsigned int ui_Channel;
+        struct addi_private *devpriv = dev->private;
 
-        ui_Channel = CR_CHAN(insn->chanspec);
-        if (ui_Channel <= 31) {
-                ui_TmpValue =
-                        (unsigned int) inl(devpriv->i_IobaseAmcc + APCI1564_DIGITAL_IP);
-/*
-* since only 1 channel reqd to bring it to last bit it is rotated 8
-* +(chan - 1) times then ANDed with 1 for last bit.
-*/
-                *data = (ui_TmpValue >> ui_Channel) & 0x1;
-        }                       /*  if  (ui_Channel >= 0 && ui_Channel <=31) */
-        else {
-                comedi_error(dev, "Not a valid channel number !!! \n");
-                return -EINVAL; /*  "sorry channel spec wrong " */
-        }                       /* else if  (ui_Channel >= 0 && ui_Channel <=31) */
-        return insn->n;
-}
+        data[1] = inl(devpriv->i_IobaseAmcc + APCI1564_DIGITAL_IP);
 
-/*
-+----------------------------------------------------------------------------+
-| Function   Name   : int i_APCI1564_ReadMoreDigitalInput                    |
-|                         (struct comedi_device *dev,struct comedi_subdevice *s,               |
-|                     struct comedi_insn *insn,unsigned int *data)                      |
-+----------------------------------------------------------------------------+
-| Task              : Return the status of the Requested digital inputs      |
-+----------------------------------------------------------------------------+
-| Input Parameters  : struct comedi_device *dev      : Driver handle                |
-|                     unsigned int ui_NoOfChannels    : No Of Channels To be Read    |
-|                      unsigned int *data             : Data Pointer to read status  |
-+----------------------------------------------------------------------------+
-| Output Parameters :   --                                                                                                       |
-+----------------------------------------------------------------------------+
-| Return Value      : TRUE  : No error occur                                 |
-|                           : FALSE : Error occur. Return the error          |
-|                                                                                |
-+----------------------------------------------------------------------------+
-*/
-int i_APCI1564_ReadMoreDigitalInput(struct comedi_device *dev, struct comedi_subdevice *s,
-        struct comedi_insn *insn, unsigned int *data)
-{
-        unsigned int ui_PortValue = data[0];
-        unsigned int ui_Mask = 0;
-        unsigned int ui_NoOfChannels;
-
-        ui_NoOfChannels = CR_CHAN(insn->chanspec);
-        if (data[1] == 0) {
-                *data = (unsigned int) inl(devpriv->i_IobaseAmcc + APCI1564_DIGITAL_IP);
-                switch (ui_NoOfChannels) {
-                case 2:
-                        ui_Mask = 3;
-                        *data = (*data >> (2 * ui_PortValue)) & ui_Mask;
-                        break;
-                case 4:
-                        ui_Mask = 15;
-                        *data = (*data >> (4 * ui_PortValue)) & ui_Mask;
-                        break;
-                case 8:
-                        ui_Mask = 255;
-                        *data = (*data >> (8 * ui_PortValue)) & ui_Mask;
-                        break;
-                case 16:
-                        ui_Mask = 65535;
-                        *data = (*data >> (16 * ui_PortValue)) & ui_Mask;
-                        break;
-                case 31:
-                        break;
-                default:
-                        comedi_error(dev, "Not a valid Channel number !!!\n");
-                        return -EINVAL; /*  "sorry channel spec wrong " */
-                        break;
-                }               /*  switch  (ui_NoOfChannels) */
-        }                       /*  if  (data[1]==0) */
-        else {
-                if (data[1] == 1) {
-                        *data = ui_InterruptStatus_1564;
-                }               /*  if  (data[1]==1) */
-        }                       /*  else if  (data[1]==0) */
         return insn->n;
 }
 
@@ -257,9 +217,12 @@ int i_APCI1564_ReadMoreDigitalInput(struct comedi_device *dev, struct comedi_sub
 |                                                                                |
 +----------------------------------------------------------------------------+
 */
-int i_APCI1564_ConfigDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s,
-        struct comedi_insn *insn, unsigned int *data)
+static int i_APCI1564_ConfigDigitalOutput(struct comedi_device *dev,
+                                          struct comedi_subdevice *s,
+                                          struct comedi_insn *insn,
+                                          unsigned int *data)
 {
+        struct addi_private *devpriv = dev->private;
         unsigned int ul_Command = 0;
 
         if ((data[0] != 0) && (data[0] != 1)) {
@@ -295,244 +258,27 @@ int i_APCI1564_ConfigDigitalOutput(struct comedi_device *dev, struct comedi_subd
         return insn->n;
 }
 
-/*
-+----------------------------------------------------------------------------+
-| Function   Name   : int i_APCI1564_WriteDigitalOutput                      |
-|                         (struct comedi_device *dev,struct comedi_subdevice *s,               |
-|                      struct comedi_insn *insn,unsigned int *data)                     |
-+----------------------------------------------------------------------------+
-| Task              : Writes port value  To the selected port                |
-+----------------------------------------------------------------------------+
-| Input Parameters  : struct comedi_device *dev      : Driver handle                |
-|                     unsigned int ui_NoOfChannels    : No Of Channels To Write      |
-|                     unsigned int *data              : Data Pointer to read status  |
-+----------------------------------------------------------------------------+
-| Output Parameters :   --                                                                                                       |
-+----------------------------------------------------------------------------+
-| Return Value      : TRUE  : No error occur                                 |
-|                           : FALSE : Error occur. Return the error          |
-|                                                                                |
-+----------------------------------------------------------------------------+
-*/
-int i_APCI1564_WriteDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s,
-        struct comedi_insn *insn, unsigned int *data)
+static int apci1564_do_insn_bits(struct comedi_device *dev,
+                                 struct comedi_subdevice *s,
+                                 struct comedi_insn *insn,
+                                 unsigned int *data)
 {
-        unsigned int ui_Temp, ui_Temp1;
-        unsigned int ui_NoOfChannel;
+        struct addi_private *devpriv = dev->private;
+        unsigned int mask = data[0];
+        unsigned int bits = data[1];
 
-        ui_NoOfChannel = CR_CHAN(insn->chanspec);
-        if (devpriv->b_OutputMemoryStatus) {
-                ui_Temp =
-                        inl(devpriv->i_IobaseAmcc + APCI1564_DIGITAL_OP +
+        s->state = inl(devpriv->i_IobaseAmcc + APCI1564_DIGITAL_OP +
                         APCI1564_DIGITAL_OP_RW);
-        }                       /*  if  (devpriv->b_OutputMemoryStatus ) */
-        else {
-                ui_Temp = 0;
-        }                       /*  else if  (devpriv->b_OutputMemoryStatus ) */
-        if (data[3] == 0) {
-                if (data[1] == 0) {
-                        data[0] = (data[0] << ui_NoOfChannel) | ui_Temp;
-                        outl(data[0],
-                                devpriv->i_IobaseAmcc + APCI1564_DIGITAL_OP +
-                                APCI1564_DIGITAL_OP_RW);
-                }               /*  if  (data[1]==0) */
-                else {
-                        if (data[1] == 1) {
-                                switch (ui_NoOfChannel) {
-                                case 2:
-                                        data[0] =
-                                                (data[0] << (2 *
-                                                        data[2])) | ui_Temp;
-                                        break;
-                                case 4:
-                                        data[0] =
-                                                (data[0] << (4 *
-                                                        data[2])) | ui_Temp;
-                                        break;
-                                case 8:
-                                        data[0] =
-                                                (data[0] << (8 *
-                                                        data[2])) | ui_Temp;
-                                        break;
-                                case 16:
-                                        data[0] =
-                                                (data[0] << (16 *
-                                                        data[2])) | ui_Temp;
-                                        break;
-                                case 31:
-                                        data[0] = data[0] | ui_Temp;
-                                        break;
-                                default:
-                                        comedi_error(dev, " chan spec wrong");
-                                        return -EINVAL; /*  "sorry channel spec wrong " */
-                                }       /*  switch (ui_NoOfChannels) */
-                                outl(data[0],
-                                        devpriv->i_IobaseAmcc +
-                                        APCI1564_DIGITAL_OP +
-                                        APCI1564_DIGITAL_OP_RW);
-                        }       /*  if  (data[1]==1) */
-                        else {
-                                printk("\nSpecified channel not supported\n");
-                        }       /*  else if  (data[1]==1) */
-                }               /*  else if (data[1]==0) */
-        }                       /* if(data[3]==0) */
-        else {
-                if (data[3] == 1) {
-                        if (data[1] == 0) {
-                                data[0] = ~data[0] & 0x1;
-                                ui_Temp1 = 1;
-                                ui_Temp1 = ui_Temp1 << ui_NoOfChannel;
-                                ui_Temp = ui_Temp | ui_Temp1;
-                                data[0] =
-                                        (data[0] << ui_NoOfChannel) ^
-                                        0xffffffff;
-                                data[0] = data[0] & ui_Temp;
-                                outl(data[0],
-                                        devpriv->i_IobaseAmcc +
-                                        APCI1564_DIGITAL_OP +
-                                        APCI1564_DIGITAL_OP_RW);
-                        }       /*  if  (data[1]==0) */
-                        else {
-                                if (data[1] == 1) {
-                                        switch (ui_NoOfChannel) {
-                                        case 2:
-                                                data[0] = ~data[0] & 0x3;
-                                                ui_Temp1 = 3;
-                                                ui_Temp1 =
-                                                        ui_Temp1 << 2 * data[2];
-                                                ui_Temp = ui_Temp | ui_Temp1;
-                                                data[0] =
-                                                        ((data[0] << (2 *
-                                                                        data
-                                                                        [2])) ^
-                                                        0xffffffff) & ui_Temp;
-                                                break;
-                                        case 4:
-                                                data[0] = ~data[0] & 0xf;
-                                                ui_Temp1 = 15;
-                                                ui_Temp1 =
-                                                        ui_Temp1 << 4 * data[2];
-                                                ui_Temp = ui_Temp | ui_Temp1;
-                                                data[0] =
-                                                        ((data[0] << (4 *
-                                                                        data
-                                                                        [2])) ^
-                                                        0xffffffff) & ui_Temp;
-                                                break;
-                                        case 8:
-                                                data[0] = ~data[0] & 0xff;
-                                                ui_Temp1 = 255;
-                                                ui_Temp1 =
-                                                        ui_Temp1 << 8 * data[2];
-                                                ui_Temp = ui_Temp | ui_Temp1;
-                                                data[0] =
-                                                        ((data[0] << (8 *
-                                                                        data
-                                                                        [2])) ^
-                                                        0xffffffff) & ui_Temp;
-                                                break;
-                                        case 16:
-                                                data[0] = ~data[0] & 0xffff;
-                                                ui_Temp1 = 65535;
-                                                ui_Temp1 =
-                                                        ui_Temp1 << 16 *
-                                                        data[2];
-                                                ui_Temp = ui_Temp | ui_Temp1;
-                                                data[0] =
-                                                        ((data[0] << (16 *
-                                                                        data
-                                                                        [2])) ^
-                                                        0xffffffff) & ui_Temp;
-                                                break;
-                                        case 31:
-                                                break;
-                                        default:
-                                                comedi_error(dev,
-                                                        " chan spec wrong");
-                                                return -EINVAL; /*  "sorry channel spec wrong " */
-                                        }       /* switch(ui_NoOfChannels) */
-                                        outl(data[0],
-                                                devpriv->i_IobaseAmcc +
-                                                APCI1564_DIGITAL_OP +
-                                                APCI1564_DIGITAL_OP_RW);
-                                }       /*  if  (data[1]==1) */
-                                else {
-                                        printk("\nSpecified channel not supported\n");
-                                }       /*  else if  (data[1]==1) */
-                        }       /*  else if  (data[1]==0) */
-                }               /*  if  (data[3]==1); */
-                else {
-                        printk("\nSpecified functionality does not exist\n");
-                        return -EINVAL;
-                }               /*  else if (data[3]==1) */
-        }                       /*  else if (data[3]==0) */
-        return insn->n;
-}
+        if (mask) {
+                s->state &= ~mask;
+                s->state |= (bits & mask);
+
+                outl(s->state, devpriv->i_IobaseAmcc + APCI1564_DIGITAL_OP +
+                        APCI1564_DIGITAL_OP_RW);
+        }
+
+        data[1] = s->state;
 
-/*
-+----------------------------------------------------------------------------+
-| Function   Name   : int i_APCI1564_ReadDigitalOutput                       |
-|                         (struct comedi_device *dev,struct comedi_subdevice *s,               |
-|                      struct comedi_insn *insn,unsigned int *data)                     |
-+----------------------------------------------------------------------------+
-| Task              : Read  value  of the selected channel or port           |
-+----------------------------------------------------------------------------+
-| Input Parameters  : struct comedi_device *dev      : Driver handle                |
-|                     unsigned int ui_NoOfChannels    : No Of Channels To read       |
-|                     unsigned int *data              : Data Pointer to read status  |
-+----------------------------------------------------------------------------+
-| Output Parameters :   --                                                                                                       |
-+----------------------------------------------------------------------------+
-| Return Value      : TRUE  : No error occur                                 |
-|                           : FALSE : Error occur. Return the error          |
-|                                                                                |
-+----------------------------------------------------------------------------+
-*/
-int i_APCI1564_ReadDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s,
-        struct comedi_insn *insn, unsigned int *data)
-{
-        unsigned int ui_Temp;
-        unsigned int ui_NoOfChannel;
-
-        ui_NoOfChannel = CR_CHAN(insn->chanspec);
-        ui_Temp = data[0];
-        *data = inl(devpriv->i_IobaseAmcc + APCI1564_DIGITAL_OP +
-                APCI1564_DIGITAL_OP_RW);
-        if (ui_Temp == 0) {
-                *data = (*data >> ui_NoOfChannel) & 0x1;
-        }                       /*  if  (ui_Temp==0) */
-        else {
-                if (ui_Temp == 1) {
-                        switch (ui_NoOfChannel) {
-                        case 2:
-                                *data = (*data >> (2 * data[1])) & 3;
-                                break;
-
-                        case 4:
-                                *data = (*data >> (4 * data[1])) & 15;
-                                break;
-
-                        case 8:
-                                *data = (*data >> (8 * data[1])) & 255;
-                                break;
-
-                        case 16:
-                                *data = (*data >> (16 * data[1])) & 65535;
-                                break;
-
-                        case 31:
-                                break;
-
-                        default:
-                                comedi_error(dev, " chan spec wrong");
-                                return -EINVAL; /*  "sorry channel spec wrong " */
-                                break;
-                        }       /*  switch(ui_NoOfChannels) */
-                }               /*  if  (ui_Temp==1) */
-                else {
-                        printk("\nSpecified channel not supported \n");
-                }               /*  else if (ui_Temp==1) */
-        }                       /*  else if  (ui_Temp==0) */
         return insn->n;
 }
 
@@ -566,10 +312,14 @@ int i_APCI1564_ReadDigitalOutput(struct comedi_device *dev, struct comedi_subdev
 |                                                                                |
 +----------------------------------------------------------------------------+
 */
-int i_APCI1564_ConfigTimerCounterWatchdog(struct comedi_device *dev,
-        struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data)
+static int i_APCI1564_ConfigTimerCounterWatchdog(struct comedi_device *dev,
+                                                 struct comedi_subdevice *s,
+                                                 struct comedi_insn *insn,
+                                                 unsigned int *data)
 {
+        struct addi_private *devpriv = dev->private;
         unsigned int ul_Command1 = 0;
+
         devpriv->tsk_Current = current;
         if (data[0] == ADDIDATA_WATCHDOG) {
                 devpriv->b_TimerSelectMode = ADDIDATA_WATCHDOG;
@@ -720,10 +470,14 @@ int i_APCI1564_ConfigTimerCounterWatchdog(struct comedi_device *dev,
 |                                                                                |
 +----------------------------------------------------------------------------+
 */
-int i_APCI1564_StartStopWriteTimerCounterWatchdog(struct comedi_device *dev,
-        struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data)
+static int i_APCI1564_StartStopWriteTimerCounterWatchdog(struct comedi_device *dev,
+                                                         struct comedi_subdevice *s,
+                                                         struct comedi_insn *insn,
+                                                         unsigned int *data)
 {
+        struct addi_private *devpriv = dev->private;
         unsigned int ul_Command1 = 0;
+
         if (devpriv->b_TimerSelectMode == ADDIDATA_WATCHDOG) {
                 switch (data[1]) {
                 case 0: /* stop the watchdog */
@@ -815,9 +569,12 @@ int i_APCI1564_StartStopWriteTimerCounterWatchdog(struct comedi_device *dev,
 |                                                                                |
 +----------------------------------------------------------------------------+
 */
-int i_APCI1564_ReadTimerCounterWatchdog(struct comedi_device *dev,
-        struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data)
+static int i_APCI1564_ReadTimerCounterWatchdog(struct comedi_device *dev,
+                                               struct comedi_subdevice *s,
+                                               struct comedi_insn *insn,
+                                               unsigned int *data)
 {
+        struct addi_private *devpriv = dev->private;
         unsigned int ul_Command1 = 0;
 
         if (devpriv->b_TimerSelectMode == ADDIDATA_WATCHDOG) {
@@ -894,8 +651,10 @@ int i_APCI1564_ReadTimerCounterWatchdog(struct comedi_device *dev,
 +----------------------------------------------------------------------------+
 */
 
-int i_APCI1564_ReadInterruptStatus(struct comedi_device *dev, struct comedi_subdevice *s,
-        struct comedi_insn *insn, unsigned int *data)
+static int i_APCI1564_ReadInterruptStatus(struct comedi_device *dev,
+                                          struct comedi_subdevice *s,
+                                          struct comedi_insn *insn,
+                                          unsigned int *data)
 {
         *data = ui_Type;
         return insn->n;
@@ -921,10 +680,12 @@ int i_APCI1564_ReadInterruptStatus(struct comedi_device *dev, struct comedi_subd
 static void v_APCI1564_Interrupt(int irq, void *d)
 {
         struct comedi_device *dev = d;
+        struct addi_private *devpriv = dev->private;
         unsigned int ui_DO, ui_DI;
         unsigned int ui_Timer;
         unsigned int ui_C1, ui_C2, ui_C3, ui_C4;
         unsigned int ul_Command2 = 0;
+
         ui_DI = inl(devpriv->i_IobaseAmcc + APCI1564_DIGITAL_IP +
                 APCI1564_DIGITAL_IP_IRQ) & 0x01;
         ui_DO = inl(devpriv->i_IobaseAmcc + APCI1564_DIGITAL_OP +
@@ -1104,8 +865,10 @@ static void v_APCI1564_Interrupt(int irq, void *d)
 +----------------------------------------------------------------------------+
 */
 
-int i_APCI1564_Reset(struct comedi_device *dev)
+static int i_APCI1564_Reset(struct comedi_device *dev)
 {
+        struct addi_private *devpriv = dev->private;
+
         outl(0x0, devpriv->i_IobaseAmcc + APCI1564_DIGITAL_IP_IRQ);     /* disable the interrupts */
         inl(devpriv->i_IobaseAmcc + APCI1564_DIGITAL_IP_INTERRUPT_STATUS);      /* Reset the interrupt status register */
         outl(0x0, devpriv->i_IobaseAmcc + APCI1564_DIGITAL_IP_INTERRUPT_MODE1); /* Disable the and/or interrupt */
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.h b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.h
deleted file mode 100644
index c91594d56a42..000000000000
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.h
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Copyright (C) 2004,2005  ADDI-DATA GmbH for the source code of this module.
- *
- *      ADDI-DATA GmbH
- *      Dieselstrasse 3
- *      D-77833 Ottersweier
- *      Tel: +19(0)7223/9493-0
- *      Fax: +49(0)7223/9493-92
- *      http://www.addi-data.com
- *      info@addi-data.com
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- */
-
-/*********      Definitions for APCI-1564 card  *****/
-
-#define APCI1564_BOARD_VENDOR_ID                0x15B8
-#define APCI1564_ADDRESS_RANGE                  128
-
-/* DIGITAL INPUT-OUTPUT DEFINE */
-/* Input defines */
-#define APCI1564_DIGITAL_IP                     0x04
-#define APCI1564_DIGITAL_IP_INTERRUPT_MODE1     4
-#define APCI1564_DIGITAL_IP_INTERRUPT_MODE2     8
-#define APCI1564_DIGITAL_IP_IRQ                 16
-
-/* Output defines */
-#define APCI1564_DIGITAL_OP                     0x18
-#define APCI1564_DIGITAL_OP_RW                  0
-#define APCI1564_DIGITAL_OP_INTERRUPT           4
-#define APCI1564_DIGITAL_OP_IRQ                 12
-
-/* Digital Input IRQ Function Selection */
-#define ADDIDATA_OR                             0
-#define ADDIDATA_AND                            1
-
-/* Digital Input Interrupt Status */
-#define APCI1564_DIGITAL_IP_INTERRUPT_STATUS    12
-
-/* Digital Output Interrupt Status */
-#define APCI1564_DIGITAL_OP_INTERRUPT_STATUS    8
-
-/* Digital Input Interrupt Enable Disable. */
-#define APCI1564_DIGITAL_IP_INTERRUPT_ENABLE    0x4
-#define APCI1564_DIGITAL_IP_INTERRUPT_DISABLE   0xFFFFFFFB
-
-/* Digital Output Interrupt Enable Disable. */
-#define APCI1564_DIGITAL_OP_VCC_INTERRUPT_ENABLE   0x1
-#define APCI1564_DIGITAL_OP_VCC_INTERRUPT_DISABLE  0xFFFFFFFE
-#define APCI1564_DIGITAL_OP_CC_INTERRUPT_ENABLE    0x2
-#define APCI1564_DIGITAL_OP_CC_INTERRUPT_DISABLE   0xFFFFFFFD
-
-/* ADDIDATA Enable Disable */
-
-#define ADDIDATA_ENABLE                            1
-#define ADDIDATA_DISABLE                           0
-
-/* TIMER COUNTER WATCHDOG DEFINES */
-
-#define ADDIDATA_TIMER                             0
-#define ADDIDATA_COUNTER                           1
-#define ADDIDATA_WATCHDOG                          2
-#define APCI1564_DIGITAL_OP_WATCHDOG               0x28
-#define APCI1564_TIMER                             0x48
-#define APCI1564_COUNTER1                          0x0
-#define APCI1564_COUNTER2                          0x20
-#define APCI1564_COUNTER3                          0x40
-#define APCI1564_COUNTER4                          0x60
-#define APCI1564_TCW_SYNC_ENABLEDISABLE            0
-#define APCI1564_TCW_RELOAD_VALUE                  4
-#define APCI1564_TCW_TIMEBASE                      8
-#define APCI1564_TCW_PROG                          12
-#define APCI1564_TCW_TRIG_STATUS                   16
-#define APCI1564_TCW_IRQ                           20
-#define APCI1564_TCW_WARN_TIMEVAL                  24
-#define APCI1564_TCW_WARN_TIMEBASE                 28
-
-/* Hardware Layer  functions for Apci1564 */
-
-/*
-* DI for di read
-*/
-int i_APCI1564_ConfigDigitalInput(struct comedi_device *dev, struct comedi_subdevice *s,
-                                  struct comedi_insn *insn, unsigned int *data);
-int i_APCI1564_Read1DigitalInput(struct comedi_device *dev, struct comedi_subdevice *s,
-                                 struct comedi_insn *insn, unsigned int *data);
-int i_APCI1564_ReadMoreDigitalInput(struct comedi_device *dev, struct comedi_subdevice *s,
-                                    struct comedi_insn *insn, unsigned int *data);
-
-/* DO */
-int i_APCI1564_ConfigDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s,
-                                   struct comedi_insn *insn, unsigned int *data);
-int i_APCI1564_WriteDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s,
-                                  struct comedi_insn *insn, unsigned int *data);
-int i_APCI1564_ReadDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s,
-                                 struct comedi_insn *insn, unsigned int *data);
-int i_APCI1564_ReadInterruptStatus(struct comedi_device *dev, struct comedi_subdevice *s,
-                                   struct comedi_insn *insn, unsigned int *data);
-
-/*
-* TIMER timer value is passed as u seconds
-*/
-int i_APCI1564_ConfigTimerCounterWatchdog(struct comedi_device *dev,
-                                          struct comedi_subdevice *s,
-                                          struct comedi_insn *insn, unsigned int *data);
-int i_APCI1564_StartStopWriteTimerCounterWatchdog(struct comedi_device *dev,
-                                                  struct comedi_subdevice *s,
-                                                  struct comedi_insn *insn,
-                                                  unsigned int *data);
-int i_APCI1564_ReadTimerCounterWatchdog(struct comedi_device *dev,
-                                        struct comedi_subdevice *s,
-                                        struct comedi_insn *insn, unsigned int *data);
-
-/* intERRUPT */
-static void v_APCI1564_Interrupt(int irq, void *d);
-
-/* RESET */
-int i_APCI1564_Reset(struct comedi_device *dev);
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci16xx.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci16xx.c
index 00a088f820a7..5958a9cb2a38 100644
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci16xx.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci16xx.c
@@ -47,13 +47,24 @@ You should also find the complete GPL in the COPYING file accompanying this sour
   +-----------------------------------------------------------------------+
 */
 
-/*
-+----------------------------------------------------------------------------+
-|                               Included files                               |
-+----------------------------------------------------------------------------+
-*/
+#ifndef COMEDI_SUBD_TTLIO
+#define COMEDI_SUBD_TTLIO               11 /* Digital Input Output But TTL */
+#endif
+
+#define APCI16XX_TTL_INIT               0
+#define APCI16XX_TTL_INITDIRECTION      1
+#define APCI16XX_TTL_OUTPUTMEMORY       2
+
+#define APCI16XX_TTL_READCHANNEL        0
+#define APCI16XX_TTL_READPORT           1
+
+#define APCI16XX_TTL_WRITECHANNEL_ON    0
+#define APCI16XX_TTL_WRITECHANNEL_OFF   1
+#define APCI16XX_TTL_WRITEPORT_ON       2
+#define APCI16XX_TTL_WRITEPORT_OFF      3
 
-#include "hwdrv_apci16xx.h"
+#define APCI16XX_TTL_READ_ALL_INPUTS    0
+#define APCI16XX_TTL_READ_ALL_OUTPUTS   1
 
 /*
 +----------------------------------------------------------------------------+
@@ -90,9 +101,13 @@ You should also find the complete GPL in the COPYING file accompanying this sour
 +----------------------------------------------------------------------------+
 */
 
-int i_APCI16XX_InsnConfigInitTTLIO(struct comedi_device *dev,
-        struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data)
+static int i_APCI16XX_InsnConfigInitTTLIO(struct comedi_device *dev,
+                                          struct comedi_subdevice *s,
+                                          struct comedi_insn *insn,
+                                          unsigned int *data)
 {
+        const struct addi_board *this_board = comedi_board(dev);
+        struct addi_private *devpriv = dev->private;
         int i_ReturnValue = insn->n;
         unsigned char b_Command = 0;
         unsigned char b_Cpt = 0;
@@ -283,9 +298,13 @@ int i_APCI16XX_InsnConfigInitTTLIO(struct comedi_device *dev,
 +----------------------------------------------------------------------------+
 */
 
-int i_APCI16XX_InsnBitsReadTTLIO(struct comedi_device *dev,
-        struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data)
+static int i_APCI16XX_InsnBitsReadTTLIO(struct comedi_device *dev,
+                                        struct comedi_subdevice *s,
+                                        struct comedi_insn *insn,
+                                        unsigned int *data)
 {
+        const struct addi_board *this_board = comedi_board(dev);
+        struct addi_private *devpriv = dev->private;
         int i_ReturnValue = insn->n;
         unsigned char b_Command = 0;
         unsigned char b_NumberOfPort =
@@ -430,9 +449,13 @@ int i_APCI16XX_InsnBitsReadTTLIO(struct comedi_device *dev,
 +----------------------------------------------------------------------------+
 */
 
-int i_APCI16XX_InsnReadTTLIOAllPortValue(struct comedi_device *dev,
-        struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data)
+static int i_APCI16XX_InsnReadTTLIOAllPortValue(struct comedi_device *dev,
+                                                struct comedi_subdevice *s,
+                                                struct comedi_insn *insn,
+                                                unsigned int *data)
 {
+        const struct addi_board *this_board = comedi_board(dev);
+        struct addi_private *devpriv = dev->private;
         unsigned char b_Command = (unsigned char) CR_AREF(insn->chanspec);
         int i_ReturnValue = insn->n;
         unsigned char b_Cpt = 0;
@@ -570,9 +593,13 @@ int i_APCI16XX_InsnReadTTLIOAllPortValue(struct comedi_device *dev,
 +----------------------------------------------------------------------------+
 */
 
-int i_APCI16XX_InsnBitsWriteTTLIO(struct comedi_device *dev,
-        struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data)
+static int i_APCI16XX_InsnBitsWriteTTLIO(struct comedi_device *dev,
+                                         struct comedi_subdevice *s,
+                                         struct comedi_insn *insn,
+                                         unsigned int *data)
 {
+        const struct addi_board *this_board = comedi_board(dev);
+        struct addi_private *devpriv = dev->private;
         int i_ReturnValue = insn->n;
         unsigned char b_Command = 0;
         unsigned char b_NumberOfPort =
@@ -774,7 +801,7 @@ int i_APCI16XX_InsnBitsWriteTTLIO(struct comedi_device *dev,
 +----------------------------------------------------------------------------+
 */
 
-int i_APCI16XX_Reset(struct comedi_device *dev)
+static int i_APCI16XX_Reset(struct comedi_device *dev)
 {
         return 0;
 }
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci16xx.h b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci16xx.h
deleted file mode 100644
index a12df4bc88ac..000000000000
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci16xx.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (C) 2004,2005  ADDI-DATA GmbH for the source code of this module.
- *
- *      ADDI-DATA GmbH
- *      Dieselstrasse 3
- *      D-77833 Ottersweier
- *      Tel: +19(0)7223/9493-0
- *      Fax: +49(0)7223/9493-92
- *      http://www.addi-data-com
- *      info@addi-data.com
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- */
-
-#ifndef COMEDI_SUBD_TTLIO
-#define COMEDI_SUBD_TTLIO   11  /* Digital Input Output But TTL */
-#endif
-
-#ifndef ADDIDATA_ENABLE
-#define ADDIDATA_ENABLE  1
-#define ADDIDATA_DISABLE 0
-#endif
-
-#define APCI16XX_TTL_INIT           0
-#define APCI16XX_TTL_INITDIRECTION  1
-#define APCI16XX_TTL_OUTPUTMEMORY   2
-
-#define APCI16XX_TTL_READCHANNEL            0
-#define APCI16XX_TTL_READPORT               1
-
-#define APCI16XX_TTL_WRITECHANNEL_ON        0
-#define APCI16XX_TTL_WRITECHANNEL_OFF       1
-#define APCI16XX_TTL_WRITEPORT_ON           2
-#define APCI16XX_TTL_WRITEPORT_OFF          3
-
-#define APCI16XX_TTL_READ_ALL_INPUTS        0
-#define APCI16XX_TTL_READ_ALL_OUTPUTS       1
-
-#ifdef __KERNEL__
-
-/*
-+----------------------------------------------------------------------------+
-|                       TTL INISIALISATION FUNCTION                          |
-+----------------------------------------------------------------------------+
-*/
-
-int i_APCI16XX_InsnConfigInitTTLIO(struct comedi_device *dev,
-                                   struct comedi_subdevice *s, struct comedi_insn *insn,
-                                   unsigned int *data);
-
-/*
-+----------------------------------------------------------------------------+
-|                       TTL INPUT FUNCTION                                   |
-+----------------------------------------------------------------------------+
-*/
-
-int i_APCI16XX_InsnBitsReadTTLIO(struct comedi_device *dev,
-                                 struct comedi_subdevice *s, struct comedi_insn *insn,
-                                 unsigned int *data);
-
-int i_APCI16XX_InsnReadTTLIOAllPortValue(struct comedi_device *dev,
-                                         struct comedi_subdevice *s,
-                                         struct comedi_insn *insn, unsigned int *data);
-
-/*
-+----------------------------------------------------------------------------+
-|                            TTL OUTPUT FUNCTIONS                            |
-+----------------------------------------------------------------------------+
-*/
-
-int i_APCI16XX_InsnBitsWriteTTLIO(struct comedi_device *dev,
-                                  struct comedi_subdevice *s, struct comedi_insn *insn,
-                                  unsigned int *data);
-
-int i_APCI16XX_Reset(struct comedi_device *dev);
-#endif
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.c
deleted file mode 100644
index 49dcbe24fcd3..000000000000
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.c
+++ /dev/null
@@ -1,460 +0,0 @@
-/**
-@verbatim
-
-Copyright (C) 2004,2005  ADDI-DATA GmbH for the source code of this module.
-
-        ADDI-DATA GmbH
-        Dieselstrasse 3
-        D-77833 Ottersweier
-        Tel: +19(0)7223/9493-0
-        Fax: +49(0)7223/9493-92
-        http://www.addi-data.com
-        info@addi-data.com
-
-This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
-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
-
-You should also find the complete GPL in the COPYING file accompanying this source code.
-
-@endverbatim
-*/
-/*
-
-  +-----------------------------------------------------------------------+
-  | (C) ADDI-DATA GmbH          Dieselstraße 3       D-77833 Ottersweier  |
-  +-----------------------------------------------------------------------+
-  | Tel : +49 (0) 7223/9493-0     | email    : info@addi-data.com         |
-  | Fax : +49 (0) 7223/9493-92    | Internet : http://www.addi-data.com   |
-  +-------------------------------+---------------------------------------+
-  | Project     : APCI-2016       | Compiler   : GCC                      |
-  | Module name : hwdrv_apci2016.c| Version    : 2.96                     |
-  +-------------------------------+---------------------------------------+
-  | Project manager: Eric Stolz   | Date       :  02/12/2002              |
-  +-------------------------------+---------------------------------------+
-  | Description :   Hardware Layer Access For APCI-2016                   |
-  +-----------------------------------------------------------------------+
-  |                             UPDATES                                   |
-  +----------+-----------+------------------------------------------------+
-  |   Date   |   Author  |          Description of updates                |
-  +----------+-----------+------------------------------------------------+
-  |          |           |                                                |
-  |          |           |                                                |
-  |          |           |                                                |
-  +----------+-----------+------------------------------------------------+
-*/
-
-/*
-+----------------------------------------------------------------------------+
-|                               Included files                               |
-+----------------------------------------------------------------------------+
-*/
-#include "hwdrv_apci2016.h"
-
-/*
-+----------------------------------------------------------------------------+
-| Function   Name   : int i_APCI2016_ConfigDigitalOutput                     |
-|                         (struct comedi_device *dev,struct comedi_subdevice *s,               |
-|                      struct comedi_insn *insn,unsigned int *data)                     |
-+----------------------------------------------------------------------------+
-| Task              : Configures The Digital Output Subdevice.               |
-+----------------------------------------------------------------------------+
-| Input Parameters  : struct comedi_device *dev : Driver handle                     |
-|                     unsigned int *data         : Data Pointer contains             |
-|                                          configuration parameters as below |
-|                                                                            |
-|                         data[0]            : 1 Digital Memory On               |
-|                                                          0 Digital Memory Off              |
-+----------------------------------------------------------------------------+
-| Output Parameters :   --                                                                                                       |
-+----------------------------------------------------------------------------+
-| Return Value      : TRUE  : No error occur                                 |
-|                           : FALSE : Error occur. Return the error          |
-|                                                                                |
-+----------------------------------------------------------------------------+
-*/
-int i_APCI2016_ConfigDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s,
-        struct comedi_insn *insn, unsigned int *data)
-{
-        if ((data[0] != 0) && (data[0] != 1)) {
-                comedi_error(dev,
-                        "Not a valid Data !!! ,Data should be 1 or 0\n");
-                return -EINVAL;
-        }                       /*  if  ((data[0]!=0) && (data[0]!=1)) */
-        if (data[0]) {
-                devpriv->b_OutputMemoryStatus = ADDIDATA_ENABLE;
-        }                       /*  if  (data[0] */
-        else {
-                devpriv->b_OutputMemoryStatus = ADDIDATA_DISABLE;
-        }                       /*  else if  (data[0] */
-        return insn->n;
-}
-
-/*
-+----------------------------------------------------------------------------+
-| Function   Name   : int i_APCI2016_WriteDigitalOutput                      |
-|                         (struct comedi_device *dev,struct comedi_subdevice *s,               |
-|                      struct comedi_insn *insn,unsigned int *data)                     |
-+----------------------------------------------------------------------------+
-| Task              : Writes port value  To the selected port                |
-+----------------------------------------------------------------------------+
-| Input Parameters  : struct comedi_device *dev      : Driver handle                |
-|                     unsigned int ui_NoOfChannels    : No Of Channels To Write      |
-|                     unsigned int *data              : Data Pointer to read status  |
-+----------------------------------------------------------------------------+
-| Output Parameters :   --                                                                                                       |
-+----------------------------------------------------------------------------+
-| Return Value      : TRUE  : No error occur                                 |
-|                           : FALSE : Error occur. Return the error          |
-|                                                                                |
-+----------------------------------------------------------------------------+
-*/
-int i_APCI2016_WriteDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s,
-        struct comedi_insn *insn, unsigned int *data)
-{
-        unsigned int ui_NoOfChannel;
-        unsigned int ui_Temp, ui_Temp1;
-        ui_NoOfChannel = CR_CHAN(insn->chanspec);
-        if (ui_NoOfChannel > 15) {
-                comedi_error(dev,
-                        "Invalid Channel Numbers !!!, Channel Numbers must be between 0 and 15\n");
-                return -EINVAL;
-        }                       /*  if  ((ui_NoOfChannel<0) || (ui_NoOfChannel>15)) */
-        if (devpriv->b_OutputMemoryStatus) {
-                ui_Temp = inw(devpriv->iobase + APCI2016_DIGITAL_OP);
-        }                       /*  if  (devpriv->b_OutputMemoryStatus ) */
-        else {
-                ui_Temp = 0;
-        }                       /*  else if  (devpriv->b_OutputMemoryStatus ) */
-        if ((data[1] != 0) && (data[1] != 1)) {
-                comedi_error(dev,
-                        "Invalid Data[1] value !!!, Data[1] should be 0 or 1\n");
-                return -EINVAL;
-        }                       /*  if  ((data[1]!=0) && (data[1]!=1)) */
-
-        if (data[3] == 0) {
-                if (data[1] == 0) {
-                        data[0] = (data[0] << ui_NoOfChannel) | ui_Temp;
-                        outw(data[0], devpriv->iobase + APCI2016_DIGITAL_OP);
-                }               /*  if (data[1]==0) */
-                else {
-                        if (data[1] == 1) {
-                                switch (ui_NoOfChannel) {
-                                case 2:
-                                        data[0] =
-                                                (data[0] << (2 *
-                                                        data[2])) | ui_Temp;
-                                        break;
-                                case 4:
-                                        data[0] =
-                                                (data[0] << (4 *
-                                                        data[2])) | ui_Temp;
-                                        break;
-                                case 8:
-                                        data[0] =
-                                                (data[0] << (8 *
-                                                        data[2])) | ui_Temp;
-                                        break;
-                                case 15:
-                                        data[0] = data[0] | ui_Temp;
-                                        break;
-                                default:
-                                        comedi_error(dev, " chan spec wrong");
-                                        return -EINVAL; /*  "sorry channel spec wrong " */
-                                }       /* switch(ui_NoOfChannels) */
-                                outw(data[0],
-                                        devpriv->iobase + APCI2016_DIGITAL_OP);
-                        }       /*  if  (data[1]==1) */
-                        else {
-                                printk("\nSpecified channel not supported\n");
-                        }       /*  else if  (data[1]==1) */
-                }               /*  else if (data[1]==0) */
-        }                       /*  if (data[3]==0) */
-        else {
-                if (data[3] == 1) {
-                        if (data[1] == 0) {
-                                data[0] = ~data[0] & 0x1;
-                                ui_Temp1 = 1;
-                                ui_Temp1 = ui_Temp1 << ui_NoOfChannel;
-                                ui_Temp = ui_Temp | ui_Temp1;
-                                data[0] = (data[0] << ui_NoOfChannel) ^ 0xffff;
-                                data[0] = data[0] & ui_Temp;
-                                outw(data[0],
-                                        devpriv->iobase + APCI2016_DIGITAL_OP);
-                        }       /*  if  (data[1]==0) */
-                        else {
-                                if (data[1] == 1) {
-                                        switch (ui_NoOfChannel) {
-                                        case 2:
-                                                data[0] = ~data[0] & 0x3;
-                                                ui_Temp1 = 3;
-                                                ui_Temp1 =
-                                                        ui_Temp1 << 2 * data[2];
-                                                ui_Temp = ui_Temp | ui_Temp1;
-                                                data[0] =
-                                                        ((data[0] << (2 *
-                                                                        data
-                                                                        [2])) ^
-                                                        0xffff) & ui_Temp;
-                                                break;
-                                        case 4:
-                                                data[0] = ~data[0] & 0xf;
-                                                ui_Temp1 = 15;
-                                                ui_Temp1 =
-                                                        ui_Temp1 << 4 * data[2];
-                                                ui_Temp = ui_Temp | ui_Temp1;
-                                                data[0] =
-                                                        ((data[0] << (4 *
-                                                                        data
-                                                                        [2])) ^
-                                                        0xffff) & ui_Temp;
-                                                break;
-                                        case 8:
-                                                data[0] = ~data[0] & 0xff;
-                                                ui_Temp1 = 255;
-                                                ui_Temp1 =
-                                                        ui_Temp1 << 8 * data[2];
-                                                ui_Temp = ui_Temp | ui_Temp1;
-                                                data[0] =
-                                                        ((data[0] << (8 *
-                                                                        data
-                                                                        [2])) ^
-                                                        0xffff) & ui_Temp;
-                                                break;
-                                        case 15:
-                                                break;
-                                        default:
-                                                comedi_error(dev,
-                                                        " chan spec wrong");
-                                                return -EINVAL; /*  "sorry channel spec wrong " */
-                                        }       /* switch(ui_NoOfChannels) */
-                                        outw(data[0],
-                                                devpriv->iobase +
-                                                APCI2016_DIGITAL_OP);
-                                }       /*  if(data[1]==1) */
-                                else {
-                                        printk("\nSpecified channel not supported\n");
-                                }       /* else if(data[1]==1) */
-                        }       /* elseif(data[1]==0) */
-                }               /* if(data[3]==1); */
-                else {
-                        printk("\nSpecified functionality does not exist\n");
-                        return -EINVAL;
-                }               /* if else data[3]==1) */
-        }                       /* if else data[3]==0) */
-        return insn->n;
-}
-
-/*
-+----------------------------------------------------------------------------+
-| Function   Name   : int i_APCI2016_BitsDigitalOutput                       |
-|                         (struct comedi_device *dev,struct comedi_subdevice *s,               |
-|                      struct comedi_insn *insn,unsigned int *data)                     |
-+----------------------------------------------------------------------------+
-| Task              : Read  value  of the selected channel or port           |
-+----------------------------------------------------------------------------+
-| Input Parameters  : struct comedi_device *dev      : Driver handle                |
-|                     unsigned int ui_NoOfChannels    : No Of Channels To read       |
-|                     unsigned int *data              : Data Pointer to read status  |
-+----------------------------------------------------------------------------+
-| Output Parameters :   --                                                                                                       |
-+----------------------------------------------------------------------------+
-| Return Value      : TRUE  : No error occur                                 |
-|                           : FALSE : Error occur. Return the error          |
-|                                                                                |
-+----------------------------------------------------------------------------+
-*/
-int i_APCI2016_BitsDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s,
-        struct comedi_insn *insn, unsigned int *data)
-{
-        unsigned int ui_Temp;
-        unsigned int ui_NoOfChannel;
-        ui_NoOfChannel = CR_CHAN(insn->chanspec);
-        if (ui_NoOfChannel > 15) {
-                comedi_error(dev,
-                        "Invalid Channel Numbers !!!, Channel Numbers must be between 0 and 15\n");
-                return -EINVAL;
-        }                       /*  if  ((ui_NoOfChannel<0) || (ui_NoOfChannel>15)) */
-        if ((data[0] != 0) && (data[0] != 1)) {
-                comedi_error(dev,
-                        "Invalid Data[0] value !!!, Data[0] should be 0 or 1\n");
-                return -EINVAL;
-        }                       /*  if  ((data[0]!=0) && (data[0]!=1)) */
-        ui_Temp = data[0];
-        *data = inw(devpriv->iobase + APCI2016_DIGITAL_OP_RW);
-        if (ui_Temp == 0) {
-                *data = (*data >> ui_NoOfChannel) & 0x1;
-        }                       /*  if  (ui_Temp==0) */
-        else {
-                if (ui_Temp == 1) {
-                        switch (ui_NoOfChannel) {
-                        case 2:
-                                *data = (*data >> (2 * data[1])) & 3;
-                                break;
-
-                        case 4:
-                                *data = (*data >> (4 * data[1])) & 15;
-                                break;
-
-                        case 8:
-                                *data = (*data >> (8 * data[1])) & 255;
-                                break;
-
-                        case 15:
-                                break;
-
-                        default:
-                                comedi_error(dev, " chan spec wrong");
-                                return -EINVAL; /*  "sorry channel spec wrong " */
-                        }       /* switch(ui_NoOfChannel) */
-                }               /*  if  (ui_Temp==1) */
-                else {
-                        printk("\nSpecified channel not supported \n");
-                }               /*  else if  (ui_Temp==1) */
-        }                       /*  if  (ui_Temp==0) */
-        return insn->n;
-}
-
-/*
-+----------------------------------------------------------------------------+
-| Function   Name   : int i_APCI2016_ConfigWatchdog                          |
-|                         (struct comedi_device *dev,struct comedi_subdevice *s,               |
-|                      struct comedi_insn *insn,unsigned int *data)                     |
-+----------------------------------------------------------------------------+
-| Task              : Configures The Watchdog                                |
-+----------------------------------------------------------------------------+
-| Input Parameters  :   struct comedi_device *dev      : Driver handle              |
-|                     struct comedi_subdevice *s,   :pointer to subdevice structure |
-|                     struct comedi_insn *insn      :pointer to insn structure      |
-|                     unsigned int *data          : Data Pointer to read status  |
-+----------------------------------------------------------------------------+
-| Output Parameters :   --                                                                                                       |
-+----------------------------------------------------------------------------+
-| Return Value      : TRUE  : No error occur                                 |
-|                           : FALSE : Error occur. Return the error          |
-|                                                                                |
-+----------------------------------------------------------------------------+
-*/
-int i_APCI2016_ConfigWatchdog(struct comedi_device *dev, struct comedi_subdevice *s,
-        struct comedi_insn *insn, unsigned int *data)
-{
-
-        if (data[0] == 0) {
-                /* Disable the watchdog */
-                outw(0x0,
-                        devpriv->i_IobaseAddon +
-                        APCI2016_WATCHDOG_ENABLEDISABLE);
-                /* Loading the Reload value */
-                outw(data[1],
-                        devpriv->i_IobaseAddon +
-                        APCI2016_WATCHDOG_RELOAD_VALUE);
-                data[1] = data[1] >> 16;
-                outw(data[1],
-                        devpriv->i_IobaseAddon +
-                        APCI2016_WATCHDOG_RELOAD_VALUE + 2);
-        } else {
-                printk("\nThe input parameters are wrong\n");
-        }
-        return insn->n;
-}
-
-/*
-+----------------------------------------------------------------------------+
-| Function   Name   : int i_APCI2016_StartStopWriteWatchdog                  |
-|                         (struct comedi_device *dev,struct comedi_subdevice *s,               |
-|                      struct comedi_insn *insn,unsigned int *data)                     |
-+----------------------------------------------------------------------------+
-| Task              : Start / Stop The Watchdog                              |
-+----------------------------------------------------------------------------+
-| Input Parameters  : struct comedi_device *dev      : Driver handle                |
-|                     struct comedi_subdevice *s,   :pointer to subdevice structure |
-|                     struct comedi_insn *insn      :pointer to insn structure      |
-|                     unsigned int *data          : Data Pointer to read status  |
-+----------------------------------------------------------------------------+
-| Output Parameters :   --                                                                                                       |
-+----------------------------------------------------------------------------+
-| Return Value      : TRUE  : No error occur                                 |
-|                           : FALSE : Error occur. Return the error          |
-|                                                                                |
-+----------------------------------------------------------------------------+
-*/
-int i_APCI2016_StartStopWriteWatchdog(struct comedi_device *dev, struct comedi_subdevice *s,
-        struct comedi_insn *insn, unsigned int *data)
-{
-
-        switch (data[0]) {
-        case 0:         /* stop the watchdog */
-                outw(0x0, devpriv->i_IobaseAddon + APCI2016_WATCHDOG_ENABLEDISABLE);    /* disable the watchdog */
-                break;
-        case 1:         /* start the watchdog */
-                outw(0x0001,
-                        devpriv->i_IobaseAddon +
-                        APCI2016_WATCHDOG_ENABLEDISABLE);
-                break;
-        case 2:         /* Software trigger */
-                outw(0x0201,
-                        devpriv->i_IobaseAddon +
-                        APCI2016_WATCHDOG_ENABLEDISABLE);
-                break;
-        default:
-                printk("\nSpecified functionality does not exist\n");
-                return -EINVAL;
-        }                       /*  switch(data[0]) */
-
-        return insn->n;
-}
-
-/*
-+----------------------------------------------------------------------------+
-| Function   Name   : int i_APCI2016_ReadWatchdog                            |
-|                         (struct comedi_device *dev,struct comedi_subdevice *s,               |
-|                      struct comedi_insn *insn,unsigned int *data)                     |
-+----------------------------------------------------------------------------+
-| Task              : Read The Watchdog                                      |
-+----------------------------------------------------------------------------+
-| Input Parameters  : struct comedi_device *dev      : Driver handle                |
-|                     struct comedi_subdevice *s,   :pointer to subdevice structure |
-|                     struct comedi_insn *insn      :pointer to insn structure      |
-|                     unsigned int *data          : Data Pointer to read status  |
-+----------------------------------------------------------------------------+
-| Output Parameters :   --                                                                                                       |
-+----------------------------------------------------------------------------+
-| Return Value      : TRUE  : No error occur                                 |
-|                           : FALSE : Error occur. Return the error          |
-|                                                                                |
-+----------------------------------------------------------------------------+
-*/
-
-int i_APCI2016_ReadWatchdog(struct comedi_device *dev, struct comedi_subdevice *s,
-        struct comedi_insn *insn, unsigned int *data)
-{
-        udelay(5);
-        data[0] = inw(devpriv->i_IobaseAddon + APCI2016_WATCHDOG_STATUS) & 0x1;
-        return insn->n;
-}
-
-/*
-+----------------------------------------------------------------------------+
-| Function   Name   : int i_APCI2016_Reset(struct comedi_device *dev)               |                                                       |
-+----------------------------------------------------------------------------+
-| Task              :resets all the registers                                |
-+----------------------------------------------------------------------------+
-| Input Parameters  : struct comedi_device *dev
-+----------------------------------------------------------------------------+
-| Output Parameters :   --                                                                                                       |
-+----------------------------------------------------------------------------+
-| Return Value      :                                                        |
-|                                                                                |
-+----------------------------------------------------------------------------+
-*/
-
-int i_APCI2016_Reset(struct comedi_device *dev)
-{
-        outw(0x0, devpriv->iobase + APCI2016_DIGITAL_OP);       /*  Resets the digital output channels */
-        outw(0x0, devpriv->i_IobaseAddon + APCI2016_WATCHDOG_ENABLEDISABLE);
-        outw(0x0, devpriv->i_IobaseAddon + APCI2016_WATCHDOG_RELOAD_VALUE);
-        outw(0x0, devpriv->i_IobaseAddon + APCI2016_WATCHDOG_RELOAD_VALUE + 2);
-        return 0;
-}
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.h b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.h
deleted file mode 100644
index c42612af0faf..000000000000
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (C) 2004,2005  ADDI-DATA GmbH for the source code of this module.
- *
- *      ADDI-DATA GmbH
- *      Dieselstrasse 3
- *      D-77833 Ottersweier
- *      Tel: +19(0)7223/9493-0
- *      Fax: +49(0)7223/9493-92
- *      http://www.addi-data.com
- *      info@addi-data.com
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- */
-/*********      Definitions for APCI-2016 card  *****/
-
-#define APCI2016_BOARD_VENDOR_ID 0x15B8
-#define APCI2016_ADDRESS_RANGE   8
-
-/* DIGITAL INPUT-OUTPUT DEFINE */
-
-#define APCI2016_DIGITAL_OP                     0x04
-#define APCI2016_DIGITAL_OP_RW                  4
-
-/* ADDIDATA Enable Disable */
-
-#define ADDIDATA_ENABLE                            1
-#define ADDIDATA_DISABLE                           0
-
-/* TIMER COUNTER WATCHDOG DEFINES */
-
-#define ADDIDATA_WATCHDOG                          2
-#define APCI2016_DIGITAL_OP_WATCHDOG               0
-#define APCI2016_WATCHDOG_ENABLEDISABLE            12
-#define APCI2016_WATCHDOG_RELOAD_VALUE             4
-#define APCI2016_WATCHDOG_STATUS                   16
-
-/* Hardware Layer  functions for Apci2016 */
-
-/* DO */
-int i_APCI2016_ConfigDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s,
-                                   struct comedi_insn *insn, unsigned int *data);
-
-int i_APCI2016_WriteDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s,
-                                  struct comedi_insn *insn, unsigned int *data);
-
-int i_APCI2016_BitsDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s,
-                                 struct comedi_insn *insn, unsigned int *data);
-
-/*
-* TIMER
-* timer value is passed as u seconds
-*/
-
-int i_APCI2016_ConfigWatchdog(struct comedi_device *dev, struct comedi_subdevice *s,
-                              struct comedi_insn *insn, unsigned int *data);
-
-int i_APCI2016_StartStopWriteWatchdog(struct comedi_device *dev, struct comedi_subdevice *s,
-                                      struct comedi_insn *insn, unsigned int *data);
-
-int i_APCI2016_ReadWatchdog(struct comedi_device *dev, struct comedi_subdevice *s,
-                            struct comedi_insn *insn, unsigned int *data);
-
-/* Interrupt functions..... */
-
-/* void v_APCI2016_Interrupt(int irq, void *d); */
-
-/* void v_APCI2016_Interrupt(int irq, void *d); */
-/* RESET */
-int i_APCI2016_Reset(struct comedi_device *dev);
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2032.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2032.c
deleted file mode 100644
index 002297dfe33f..000000000000
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2032.c
+++ /dev/null
@@ -1,579 +0,0 @@
-/**
-@verbatim
-
-Copyright (C) 2004,2005  ADDI-DATA GmbH for the source code of this module.
-
-        ADDI-DATA GmbH
-        Dieselstrasse 3
-        D-77833 Ottersweier
-        Tel: +19(0)7223/9493-0
-        Fax: +49(0)7223/9493-92
-        http://www.addi-data.com
-        info@addi-data.com
-
-This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
-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
-
-You should also find the complete GPL in the COPYING file accompanying this source code.
-
-@endverbatim
-*/
-/*
-
-  +-----------------------------------------------------------------------+
-  | (C) ADDI-DATA GmbH          Dieselstraße 3       D-77833 Ottersweier  |
-  +-----------------------------------------------------------------------+
-  | Tel : +49 (0) 7223/9493-0     | email    : info@addi-data.com         |
-  | Fax : +49 (0) 7223/9493-92    | Internet : http://www.addi-data.com   |
-  +-------------------------------+---------------------------------------+
-  | Project     : APCI-2032       | Compiler   : GCC                      |
-  | Module name : hwdrv_apci2032.c| Version    : 2.96                     |
-  +-------------------------------+---------------------------------------+
-  | Project manager: Eric Stolz   | Date       :  02/12/2002              |
-  +-------------------------------+---------------------------------------+
-  | Description :   Hardware Layer Access For APCI-2032                   |
-  +-----------------------------------------------------------------------+
-  |                             UPDATES                                   |
-  +----------+-----------+------------------------------------------------+
-  |   Date   |   Author  |          Description of updates                |
-  +----------+-----------+------------------------------------------------+
-  |          |           |                                                |
-  |          |           |                                                |
-  |          |           |                                                |
-  +----------+-----------+------------------------------------------------+
-*/
-
-/*
-+----------------------------------------------------------------------------+
-|                               Included files                               |
-+----------------------------------------------------------------------------+
-*/
-
-#include "hwdrv_apci2032.h"
-static unsigned int ui_InterruptData, ui_Type;
-/*
-+----------------------------------------------------------------------------+
-| Function   Name   : int i_APCI2032_ConfigDigitalOutput                     |
-|                         (struct comedi_device *dev,struct comedi_subdevice *s,               |
-|                      struct comedi_insn *insn,unsigned int *data)                     |
-+----------------------------------------------------------------------------+
-| Task              : Configures The Digital Output Subdevice.               |
-+----------------------------------------------------------------------------+
-| Input Parameters  : struct comedi_device *dev : Driver handle                     |
-|                     unsigned int *data         : Data Pointer contains             |
-|                                          configuration parameters as below |
-|                                                                            |
-|                                         data[1]            : 1 Enable  VCC  Interrupt  |
-|                                                                                  0 Disable VCC  Interrupt  |
-|                                         data[2]            : 1 Enable  CC  Interrupt   |
-|                                                                                  0 Disable CC  Interrupt   |
-|                                                                                                                                        |
-+----------------------------------------------------------------------------+
-| Output Parameters :   --                                                                                                       |
-+----------------------------------------------------------------------------+
-| Return Value      : TRUE  : No error occur                                 |
-|                           : FALSE : Error occur. Return the error          |
-|                                                                                |
-+----------------------------------------------------------------------------+
-*/
-int i_APCI2032_ConfigDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s,
-        struct comedi_insn *insn, unsigned int *data)
-{
-        unsigned int ul_Command = 0;
-        devpriv->tsk_Current = current;
-
-        if ((data[0] != 0) && (data[0] != 1)) {
-                comedi_error(dev,
-                        "Not a valid Data !!! ,Data should be 1 or 0\n");
-                return -EINVAL;
-        }                       /* if  ( (data[0]!=0) && (data[0]!=1) ) */
-        if (data[0]) {
-                devpriv->b_OutputMemoryStatus = ADDIDATA_ENABLE;
-        }                       /*  if  (data[0]) */
-        else {
-                devpriv->b_OutputMemoryStatus = ADDIDATA_DISABLE;
-        }                       /* else if  (data[0]) */
-
-        if (data[1] == ADDIDATA_ENABLE) {
-                ul_Command = ul_Command | 0x1;
-        }                       /* if  (data[1] == ADDIDATA_ENABLE) */
-        else {
-                ul_Command = ul_Command & 0xFFFFFFFE;
-        }                       /* elseif  (data[1] == ADDIDATA_ENABLE) */
-        if (data[2] == ADDIDATA_ENABLE) {
-                ul_Command = ul_Command | 0x2;
-        }                       /* if  (data[2] == ADDIDATA_ENABLE) */
-        else {
-                ul_Command = ul_Command & 0xFFFFFFFD;
-        }                       /* elseif  (data[2] == ADDIDATA_ENABLE) */
-        outl(ul_Command, devpriv->iobase + APCI2032_DIGITAL_OP_INTERRUPT);
-        ui_InterruptData = inl(devpriv->iobase + APCI2032_DIGITAL_OP_INTERRUPT);
-        return insn->n;
-}
-
-/*
-+----------------------------------------------------------------------------+
-| Function   Name   : int i_APCI2032_WriteDigitalOutput                      |
-|                         (struct comedi_device *dev,struct comedi_subdevice *s,               |
-|                      struct comedi_insn *insn,unsigned int *data)                     |
-+----------------------------------------------------------------------------+
-| Task              : Writes port value  To the selected port                |
-+----------------------------------------------------------------------------+
-| Input Parameters  : struct comedi_device *dev      : Driver handle                |
-|                     unsigned int ui_NoOfChannels    : No Of Channels To Write      |
-|                     unsigned int *data              : Data Pointer to read status  |
-+----------------------------------------------------------------------------+
-| Output Parameters :   --                                                                                                       |
-+----------------------------------------------------------------------------+
-| Return Value      : TRUE  : No error occur                                 |
-|                           : FALSE : Error occur. Return the error          |
-|                                                                                |
-+----------------------------------------------------------------------------+
-*/
-
-int i_APCI2032_WriteDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s,
-        struct comedi_insn *insn, unsigned int *data)
-{
-        unsigned int ui_Temp, ui_Temp1;
-        unsigned int ui_NoOfChannel = CR_CHAN(insn->chanspec);  /*  get the channel */
-        if (devpriv->b_OutputMemoryStatus) {
-                ui_Temp = inl(devpriv->iobase + APCI2032_DIGITAL_OP);
-
-        }                       /* if(devpriv->b_OutputMemoryStatus ) */
-        else {
-                ui_Temp = 0;
-        }                       /* if(devpriv->b_OutputMemoryStatus ) */
-        if (data[3] == 0) {
-                if (data[1] == 0) {
-                        data[0] = (data[0] << ui_NoOfChannel) | ui_Temp;
-                        outl(data[0], devpriv->iobase + APCI2032_DIGITAL_OP);
-                }               /* if(data[1]==0) */
-                else {
-                        if (data[1] == 1) {
-                                switch (ui_NoOfChannel) {
-
-                                case 2:
-                                        data[0] =
-                                                (data[0] << (2 *
-                                                        data[2])) | ui_Temp;
-                                        break;
-
-                                case 4:
-                                        data[0] =
-                                                (data[0] << (4 *
-                                                        data[2])) | ui_Temp;
-                                        break;
-
-                                case 8:
-                                        data[0] =
-                                                (data[0] << (8 *
-                                                        data[2])) | ui_Temp;
-                                        break;
-
-                                case 16:
-                                        data[0] =
-                                                (data[0] << (16 *
-                                                        data[2])) | ui_Temp;
-                                        break;
-                                case 31:
-                                        data[0] = data[0] | ui_Temp;
-                                        break;
-
-                                default:
-                                        comedi_error(dev, " chan spec wrong");
-                                        return -EINVAL; /*  "sorry channel spec wrong " */
-
-                                }       /* switch(ui_NoOfChannels) */
-
-                                outl(data[0],
-                                        devpriv->iobase + APCI2032_DIGITAL_OP);
-                        }       /*  if(data[1]==1) */
-                        else {
-                                printk("\nSpecified channel not supported\n");
-                        }       /* else if(data[1]==1) */
-                }               /* elseif(data[1]==0) */
-        }                       /* if(data[3]==0) */
-        else {
-                if (data[3] == 1) {
-                        if (data[1] == 0) {
-                                data[0] = ~data[0] & 0x1;
-                                ui_Temp1 = 1;
-                                ui_Temp1 = ui_Temp1 << ui_NoOfChannel;
-                                ui_Temp = ui_Temp | ui_Temp1;
-                                data[0] =
-                                        (data[0] << ui_NoOfChannel) ^
-                                        0xffffffff;
-                                data[0] = data[0] & ui_Temp;
-                                outl(data[0],
-                                        devpriv->iobase + APCI2032_DIGITAL_OP);
-                        }       /* if(data[1]==0) */
-                        else {
-                                if (data[1] == 1) {
-                                        switch (ui_NoOfChannel) {
-
-                                        case 2:
-                                                data[0] = ~data[0] & 0x3;
-                                                ui_Temp1 = 3;
-                                                ui_Temp1 =
-                                                        ui_Temp1 << 2 * data[2];
-                                                ui_Temp = ui_Temp | ui_Temp1;
-                                                data[0] =
-                                                        ((data[0] << (2 *
-                                                                        data
-                                                                        [2])) ^
-                                                        0xffffffff) & ui_Temp;
-                                                break;
-
-                                        case 4:
-                                                data[0] = ~data[0] & 0xf;
-                                                ui_Temp1 = 15;
-                                                ui_Temp1 =
-                                                        ui_Temp1 << 4 * data[2];
-                                                ui_Temp = ui_Temp | ui_Temp1;
-                                                data[0] =
-                                                        ((data[0] << (4 *
-                                                                        data
-                                                                        [2])) ^
-                                                        0xffffffff) & ui_Temp;
-                                                break;
-
-                                        case 8:
-                                                data[0] = ~data[0] & 0xff;
-                                                ui_Temp1 = 255;
-                                                ui_Temp1 =
-                                                        ui_Temp1 << 8 * data[2];
-                                                ui_Temp = ui_Temp | ui_Temp1;
-                                                data[0] =
-                                                        ((data[0] << (8 *
-                                                                        data
-                                                                        [2])) ^
-                                                        0xffffffff) & ui_Temp;
-                                                break;
-
-                                        case 16:
-                                                data[0] = ~data[0] & 0xffff;
-                                                ui_Temp1 = 65535;
-                                                ui_Temp1 =
-                                                        ui_Temp1 << 16 *
-                                                        data[2];
-                                                ui_Temp = ui_Temp | ui_Temp1;
-                                                data[0] =
-                                                        ((data[0] << (16 *
-                                                                        data
-                                                                        [2])) ^
-                                                        0xffffffff) & ui_Temp;
-                                                break;
-
-                                        case 31:
-                                                break;
-                                        default:
-                                                comedi_error(dev,
-                                                        " chan spec wrong");
-                                                return -EINVAL; /*  "sorry channel spec wrong " */
-
-                                        }       /* switch(ui_NoOfChannels) */
-
-                                        outl(data[0],
-                                                devpriv->iobase +
-                                                APCI2032_DIGITAL_OP);
-                                }       /*  if(data[1]==1) */
-                                else {
-                                        printk("\nSpecified channel not supported\n");
-                                }       /* else if(data[1]==1) */
-                        }       /* elseif(data[1]==0) */
-                }               /* if(data[3]==1); */
-                else {
-                        printk("\nSpecified functionality does not exist\n");
-                        return -EINVAL;
-                }               /* if else data[3]==1) */
-        }                       /* if else data[3]==0) */
-        return insn->n;
-}
-
-/*
-+----------------------------------------------------------------------------+
-| Function   Name   : int i_APCI2032_ReadDigitalOutput                       |
-|                         (struct comedi_device *dev,struct comedi_subdevice *s,               |
-|                      struct comedi_insn *insn,unsigned int *data)                     |
-+----------------------------------------------------------------------------+
-| Task              : Read  value  of the selected channel or port           |
-+----------------------------------------------------------------------------+
-| Input Parameters  : struct comedi_device *dev      : Driver handle                |
-|                     unsigned int ui_NoOfChannels    : No Of Channels To read       |
-|                     unsigned int *data              : Data Pointer to read status  |
-+----------------------------------------------------------------------------+
-| Output Parameters :   --                                                                                                       |
-+----------------------------------------------------------------------------+
-| Return Value      : TRUE  : No error occur                                 |
-|                           : FALSE : Error occur. Return the error          |
-|                                                                                |
-+----------------------------------------------------------------------------+
-*/
-
-int i_APCI2032_ReadDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s,
-        struct comedi_insn *insn, unsigned int *data)
-{
-        unsigned int ui_Temp;
-        unsigned int ui_NoOfChannel;
-        ui_NoOfChannel = CR_CHAN(insn->chanspec);
-        ui_Temp = data[0];
-        *data = inl(devpriv->iobase + APCI2032_DIGITAL_OP_RW);
-        if (ui_Temp == 0) {
-                *data = (*data >> ui_NoOfChannel) & 0x1;
-        }                       /* if  (ui_Temp==0) */
-        else {
-                if (ui_Temp == 1) {
-                        switch (ui_NoOfChannel) {
-
-                        case 2:
-                                *data = (*data >> (2 * data[1])) & 3;
-                                break;
-
-                        case 4:
-                                *data = (*data >> (4 * data[1])) & 15;
-                                break;
-
-                        case 8:
-                                *data = (*data >> (8 * data[1])) & 255;
-                                break;
-
-                        case 16:
-                                *data = (*data >> (16 * data[1])) & 65535;
-                                break;
-
-                        case 31:
-                                break;
-
-                        default:
-                                comedi_error(dev, " chan spec wrong");
-                                return -EINVAL; /*  "sorry channel spec wrong " */
-
-                        }       /* switch(ui_NoOfChannels) */
-                }               /* if  (ui_Temp==1) */
-                else {
-                        printk("\nSpecified channel not supported \n");
-                }               /* elseif  (ui_Temp==1) */
-        }
-        return insn->n;
-}
-
-/*
-+----------------------------------------------------------------------------+
-| Function   Name   : int i_APCI2032_ConfigWatchdog(comedi_device
-|                   *dev,struct comedi_subdevice *s,struct comedi_insn *insn,unsigned int *data)|
-|                                                                                    |
-+----------------------------------------------------------------------------+
-| Task              : Configures The Watchdog                                |
-+----------------------------------------------------------------------------+
-| Input Parameters  : struct comedi_device *dev      : Driver handle                |
-|                     struct comedi_subdevice *s,   :pointer to subdevice structure
-|                      struct comedi_insn *insn      :pointer to insn structure      |
-|                     unsigned int *data          : Data Pointer to read status                                                                                                             |
-+----------------------------------------------------------------------------+
-| Output Parameters :   --                                                                                                       |
-+----------------------------------------------------------------------------+
-| Return Value      : TRUE  : No error occur                                 |
-|                           : FALSE : Error occur. Return the error          |
-|                                                                                |
-+----------------------------------------------------------------------------+
-*/
-int i_APCI2032_ConfigWatchdog(struct comedi_device *dev, struct comedi_subdevice *s,
-        struct comedi_insn *insn, unsigned int *data)
-{
-        if (data[0] == 0) {
-                /* Disable the watchdog */
-                outl(0x0,
-                        devpriv->iobase + APCI2032_DIGITAL_OP_WATCHDOG +
-                        APCI2032_TCW_PROG);
-                /* Loading the Reload value */
-                outl(data[1],
-                        devpriv->iobase + APCI2032_DIGITAL_OP_WATCHDOG +
-                        APCI2032_TCW_RELOAD_VALUE);
-        } else {
-                printk("\nThe input parameters are wrong\n");
-                return -EINVAL;
-        }
-
-        return insn->n;
-}
-
- /*
-    +----------------------------------------------------------------------------+
-    | Function   Name   : int i_APCI2032_StartStopWriteWatchdog                  |
-    |                           (struct comedi_device *dev,struct comedi_subdevice *s,
-    struct comedi_insn *insn,unsigned int *data);                      |
-    +----------------------------------------------------------------------------+
-    | Task              : Start / Stop The Watchdog                              |
-    +----------------------------------------------------------------------------+
-    | Input Parameters  : struct comedi_device *dev      : Driver handle                |
-    |                     struct comedi_subdevice *s,   :pointer to subdevice structure
-    struct comedi_insn *insn      :pointer to insn structure      |
-    |                     unsigned int *data          : Data Pointer to read status  |
-    +----------------------------------------------------------------------------+
-    | Output Parameters :       --                                                                                                       |
-    +----------------------------------------------------------------------------+
-    | Return Value      : TRUE  : No error occur                                 |
-    |                       : FALSE : Error occur. Return the error          |
-    |                                                                            |
-    +----------------------------------------------------------------------------+
-  */
-
-int i_APCI2032_StartStopWriteWatchdog(struct comedi_device *dev, struct comedi_subdevice *s,
-        struct comedi_insn *insn, unsigned int *data)
-{
-        switch (data[0]) {
-        case 0:         /* stop the watchdog */
-                outl(0x0, devpriv->iobase + APCI2032_DIGITAL_OP_WATCHDOG + APCI2032_TCW_PROG);  /* disable the watchdog */
-                break;
-        case 1:         /* start the watchdog */
-                outl(0x0001,
-                        devpriv->iobase + APCI2032_DIGITAL_OP_WATCHDOG +
-                        APCI2032_TCW_PROG);
-                break;
-        case 2:         /* Software trigger */
-                outl(0x0201,
-                        devpriv->iobase + APCI2032_DIGITAL_OP_WATCHDOG +
-                        APCI2032_TCW_PROG);
-                break;
-        default:
-                printk("\nSpecified functionality does not exist\n");
-                return -EINVAL;
-        }
-        return insn->n;
-}
-
-/*
-+----------------------------------------------------------------------------+
-| Function   Name   : int i_APCI2032_ReadWatchdog                            |
-|                       (struct comedi_device *dev,struct comedi_subdevice *s,struct comedi_insn *insn,
-|                    unsigned int *data);                                            |
-+----------------------------------------------------------------------------+
-| Task              : Read The Watchdog                                      |
-+----------------------------------------------------------------------------+
-| Input Parameters  :   struct comedi_device *dev      : Driver handle              |
-|                     struct comedi_subdevice *s,   :pointer to subdevice structure
-|                      struct comedi_insn *insn      :pointer to insn structure      |
-|                     unsigned int *data          : Data Pointer to read status  |
-+----------------------------------------------------------------------------+
-| Output Parameters :   --                                                                                                       |
-+----------------------------------------------------------------------------+
-| Return Value      : TRUE  : No error occur                                 |
-|                           : FALSE : Error occur. Return the error          |
-|                                                                                |
-+----------------------------------------------------------------------------+
-*/
-
-int i_APCI2032_ReadWatchdog(struct comedi_device *dev, struct comedi_subdevice *s,
-        struct comedi_insn *insn, unsigned int *data)
-{
-
-        data[0] =
-                inl(devpriv->iobase + APCI2032_DIGITAL_OP_WATCHDOG +
-                APCI2032_TCW_TRIG_STATUS) & 0x1;
-        return insn->n;
-}
-
-/*
-+----------------------------------------------------------------------------+
-| Function   Name   :  void v_APCI2032_Interrupt                                                 |
-|                                         (int irq , void *d)      |
-+----------------------------------------------------------------------------+
-| Task              : Writes port value  To the selected port                |
-+----------------------------------------------------------------------------+
-| Input Parameters  : int irq                 : irq number                   |
-|                     void *d                 : void pointer                 |
-+----------------------------------------------------------------------------+
-| Output Parameters :   --                                                                                                       |
-+----------------------------------------------------------------------------+
-| Return Value      : TRUE  : No error occur                                 |
-|                           : FALSE : Error occur. Return the error          |
-|                                                                                |
-+----------------------------------------------------------------------------+
-*/
-void v_APCI2032_Interrupt(int irq, void *d)
-{
-        struct comedi_device *dev = d;
-        unsigned int ui_DO;
-
-        ui_DO = inl(devpriv->iobase + APCI2032_DIGITAL_OP_IRQ) & 0x1;   /* Check if VCC OR CC interrupt has occurred. */
-
-        if (ui_DO == 0) {
-                printk("\nInterrupt from unKnown source\n");
-        }                       /*  if(ui_DO==0) */
-        if (ui_DO) {
-                /*  Check for Digital Output interrupt Type - 1: Vcc interrupt 2: CC interrupt. */
-                ui_Type =
-                        inl(devpriv->iobase +
-                        APCI2032_DIGITAL_OP_INTERRUPT_STATUS) & 0x3;
-                outl(0x0,
-                        devpriv->iobase + APCI2032_DIGITAL_OP +
-                        APCI2032_DIGITAL_OP_INTERRUPT);
-                if (ui_Type == 1) {
-                        /* Sends signal to user space */
-                        send_sig(SIGIO, devpriv->tsk_Current, 0);
-                }               /*  if (ui_Type==1) */
-                else {
-                        if (ui_Type == 2) {
-                                /*  Sends signal to user space */
-                                send_sig(SIGIO, devpriv->tsk_Current, 0);
-                        }       /* if (ui_Type==2) */
-                }               /* else if (ui_Type==1) */
-        }                       /* if(ui_DO) */
-
-        return;
-
-}
-
-/*
-+----------------------------------------------------------------------------+
-| Function   Name   :  int i_APCI2032_ReadInterruptStatus                    |
-|                         (struct comedi_device *dev,struct comedi_subdevice *s,               |
-|                      struct comedi_insn *insn,unsigned int *data)                     |
-+----------------------------------------------------------------------------+
-| Task              :Reads the interrupt status register                     |
-+----------------------------------------------------------------------------+
-| Input Parameters  :                                                        |
-+----------------------------------------------------------------------------+
-| Output Parameters :   --                                                                                                       |
-+----------------------------------------------------------------------------+
-| Return Value      :                                                        |
-|                                                                                |
-+----------------------------------------------------------------------------+
-*/
-
-int i_APCI2032_ReadInterruptStatus(struct comedi_device *dev, struct comedi_subdevice *s,
-        struct comedi_insn *insn, unsigned int *data)
-{
-        *data = ui_Type;
-        return insn->n;
-}
-
-/*
-+----------------------------------------------------------------------------+
-| Function   Name   :  int i_APCI2032_Reset(struct comedi_device *dev)                       |
-|                                                                                        |
-+----------------------------------------------------------------------------+
-| Task              :Resets the registers of the card                        |
-+----------------------------------------------------------------------------+
-| Input Parameters  :                                                        |
-+----------------------------------------------------------------------------+
-| Output Parameters :   --                                                                                                       |
-+----------------------------------------------------------------------------+
-| Return Value      :                                                        |
-|                                                                                |
-+----------------------------------------------------------------------------+
-*/
-
-int i_APCI2032_Reset(struct comedi_device *dev)
-{
-        devpriv->b_DigitalOutputRegister = 0;
-        ui_Type = 0;
-        outl(0x0, devpriv->iobase + APCI2032_DIGITAL_OP);       /* Resets the output channels */
-        outl(0x0, devpriv->iobase + APCI2032_DIGITAL_OP_INTERRUPT);     /* Disables the interrupt. */
-        outl(0x0, devpriv->iobase + APCI2032_DIGITAL_OP_WATCHDOG + APCI2032_TCW_PROG);  /* disable the watchdog */
-        outl(0x0, devpriv->iobase + APCI2032_DIGITAL_OP_WATCHDOG + APCI2032_TCW_RELOAD_VALUE);  /* reload=0 */
-        return 0;
-}
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2032.h b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2032.h
deleted file mode 100644
index ab145e7c9405..000000000000
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2032.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright (C) 2004,2005  ADDI-DATA GmbH for the source code of this module.
- *
- *      ADDI-DATA GmbH
- *      Dieselstrasse 3
- *      D-77833 Ottersweier
- *      Tel: +19(0)7223/9493-0
- *      Fax: +49(0)7223/9493-92
- *      http://www.addi-data.com
- *      info@addi-data.com
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- */
-
-/*********      Definitions for APCI-2032 card  *****/
-
-/* Card Specific information */
-#define APCI2032_BOARD_VENDOR_ID                 0x15B8
-#define APCI2032_ADDRESS_RANGE                   63
-
-/* DIGITAL INPUT-OUTPUT DEFINE */
-
-#define APCI2032_DIGITAL_OP                     0
-#define APCI2032_DIGITAL_OP_RW                  0
-#define APCI2032_DIGITAL_OP_INTERRUPT           4
-#define APCI2032_DIGITAL_OP_IRQ                 12
-
-/* Digital Output Interrupt Status */
-#define APCI2032_DIGITAL_OP_INTERRUPT_STATUS    8
-
-/* Digital Output Interrupt Enable Disable. */
-#define APCI2032_DIGITAL_OP_VCC_INTERRUPT_ENABLE   0x1
-#define APCI2032_DIGITAL_OP_VCC_INTERRUPT_DISABLE  0xFFFFFFFE
-#define APCI2032_DIGITAL_OP_CC_INTERRUPT_ENABLE    0x2
-#define APCI2032_DIGITAL_OP_CC_INTERRUPT_DISABLE   0xFFFFFFFD
-
-/* ADDIDATA Enable Disable */
-
-#define ADDIDATA_ENABLE                            1
-#define ADDIDATA_DISABLE                           0
-
-/* TIMER COUNTER WATCHDOG DEFINES */
-
-#define ADDIDATA_WATCHDOG                          2
-#define APCI2032_DIGITAL_OP_WATCHDOG               16
-#define APCI2032_TCW_RELOAD_VALUE                  4
-#define APCI2032_TCW_TIMEBASE                      8
-#define APCI2032_TCW_PROG                          12
-#define APCI2032_TCW_TRIG_STATUS                   16
-#define APCI2032_TCW_IRQ                           20
-
-/* Hardware Layer  functions for Apci2032 */
-
-/* DO */
-int i_APCI2032_ConfigDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s,
-                                   struct comedi_insn *insn, unsigned int *data);
-int i_APCI2032_WriteDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s,
-                                  struct comedi_insn *insn, unsigned int *data);
-int i_APCI2032_ReadDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s,
-                                 struct comedi_insn *insn, unsigned int *data);
-int i_APCI2032_ReadInterruptStatus(struct comedi_device *dev, struct comedi_subdevice *s,
-                                   struct comedi_insn *insn, unsigned int *data);
-
-/* TIMER
- * timer value is passed as u seconds
-*/
-
-int i_APCI2032_ConfigWatchdog(struct comedi_device *dev, struct comedi_subdevice *s,
-                              struct comedi_insn *insn, unsigned int *data);
-int i_APCI2032_StartStopWriteWatchdog(struct comedi_device *dev, struct comedi_subdevice *s,
-                                      struct comedi_insn *insn, unsigned int *data);
-int i_APCI2032_ReadWatchdog(struct comedi_device *dev, struct comedi_subdevice *s,
-                            struct comedi_insn *insn, unsigned int *data);
-
-/* Interrupt functions..... */
-
-void v_APCI2032_Interrupt(int irq, void *d);
-
-/* Reset functions */
-int i_APCI2032_Reset(struct comedi_device *dev);
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2200.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2200.c
index 3d378b5ecbce..9d4a117aad43 100644
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2200.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2200.c
@@ -46,354 +46,54 @@ You should also find the complete GPL in the COPYING file accompanying this sour
   +----------+-----------+------------------------------------------------+
 */
 
-/*
-+----------------------------------------------------------------------------+
-|                               Included files                               |
-+----------------------------------------------------------------------------+
-*/
-#include "hwdrv_apci2200.h"
+/*********      Definitions for APCI-2200 card  *****/
 
-/*
-+----------------------------------------------------------------------------+
-| Function   Name   : int i_APCI2200_Read1DigitalInput                       |
-|                         (struct comedi_device *dev,struct comedi_subdevice *s,               |
-|                      struct comedi_insn *insn,unsigned int *data)                     |
-+----------------------------------------------------------------------------+
-| Task              : Return the status of the digital input                 |
-+----------------------------------------------------------------------------+
-| Input Parameters  : struct comedi_device *dev      : Driver handle                |
-|                      struct comedi_subdevice *s,   :pointer to subdevice structure
-|                       struct comedi_insn *insn      :pointer to insn structure     |
-|                     unsigned int *data          : Data Pointer to read status  |
-+----------------------------------------------------------------------------+
-| Output Parameters :   --                                                                                                       |
-+----------------------------------------------------------------------------+
-| Return Value      : TRUE  : No error occur                                 |
-|                           : FALSE : Error occur. Return the error          |
-|                                                                                |
-+----------------------------------------------------------------------------+
-*/
-int i_APCI2200_Read1DigitalInput(struct comedi_device *dev, struct comedi_subdevice *s,
-        struct comedi_insn *insn, unsigned int *data)
-{
-        unsigned int ui_TmpValue = 0;
-        unsigned int ui_Channel;
-        ui_Channel = CR_CHAN(insn->chanspec);
-        if (ui_Channel <= 7) {
-                ui_TmpValue = (unsigned int) inw(devpriv->iobase + APCI2200_DIGITAL_IP);
-                *data = (ui_TmpValue >> ui_Channel) & 0x1;
-        }                       /* if(ui_Channel >= 0 && ui_Channel <=7) */
-        else {
-                printk("\nThe specified channel does not exist\n");
-                return -EINVAL; /*  "sorry channel spec wrong " */
-        }                       /* else if(ui_Channel >= 0 && ui_Channel <=7) */
+/* Card Specific information */
+#define APCI2200_ADDRESS_RANGE          64
 
-        return insn->n;
-}
-
-/*
-+----------------------------------------------------------------------------+
-| Function   Name   : int i_APCI2200_ReadMoreDigitalInput                    |
-|                         (struct comedi_device *dev,struct comedi_subdevice *s,               |
-|                     struct comedi_insn *insn,unsigned int *data)                      |
-+----------------------------------------------------------------------------+
-| Task              : Return the status of the Requested digital inputs      |
-+----------------------------------------------------------------------------+
-| Input Parameters  : struct comedi_device *dev      : Driver handle                |
-|                      struct comedi_subdevice *s,   :pointer to subdevice structure
-|                       struct comedi_insn *insn      :pointer to insn structure     |
-|                      unsigned int *data         : Data Pointer to read status  |
-+----------------------------------------------------------------------------+
-| Output Parameters :   --                                                                                                       |
-+----------------------------------------------------------------------------+
-| Return Value      : TRUE  : No error occur                                 |
-|                           : FALSE : Error occur. Return the error          |
-|                                                                                |
-+----------------------------------------------------------------------------+
-*/
+/* DIGITAL INPUT-OUTPUT DEFINE */
 
-int i_APCI2200_ReadMoreDigitalInput(struct comedi_device *dev, struct comedi_subdevice *s,
-        struct comedi_insn *insn, unsigned int *data)
-{
+#define APCI2200_DIGITAL_OP             4
+#define APCI2200_DIGITAL_IP             0
 
-        unsigned int ui_PortValue = data[0];
-        unsigned int ui_Mask = 0;
-        unsigned int ui_NoOfChannels;
+/* TIMER COUNTER WATCHDOG DEFINES */
 
-        ui_NoOfChannels = CR_CHAN(insn->chanspec);
+#define APCI2200_WATCHDOG               0x08
+#define APCI2200_WATCHDOG_ENABLEDISABLE 12
+#define APCI2200_WATCHDOG_RELOAD_VALUE  4
+#define APCI2200_WATCHDOG_STATUS        16
 
-        *data = (unsigned int) inw(devpriv->iobase + APCI2200_DIGITAL_IP);
-        switch (ui_NoOfChannels) {
-        case 2:
-                ui_Mask = 3;
-                *data = (*data >> (2 * ui_PortValue)) & ui_Mask;
-                break;
-        case 4:
-                ui_Mask = 15;
-                *data = (*data >> (4 * ui_PortValue)) & ui_Mask;
-                break;
-        case 7:
-                break;
+static int apci2200_di_insn_bits(struct comedi_device *dev,
+                                 struct comedi_subdevice *s,
+                                 struct comedi_insn *insn,
+                                 unsigned int *data)
+{
+        struct addi_private *devpriv = dev->private;
 
-        default:
-                printk("\nWrong parameters\n");
-                return -EINVAL; /*  "sorry channel spec wrong " */
-                break;
-        }                       /* switch(ui_NoOfChannels) */
+        data[1] = inw(devpriv->iobase + APCI2200_DIGITAL_IP);
 
         return insn->n;
 }
 
-/*
-+----------------------------------------------------------------------------+
-| Function   Name   : int i_APCI2200_ConfigDigitalOutput (struct comedi_device *dev,
-|                    struct comedi_subdevice *s struct comedi_insn *insn,unsigned int *data)    |
-|                                                                                    |
-+----------------------------------------------------------------------------+
-| Task              : Configures The Digital Output Subdevice.               |
-+----------------------------------------------------------------------------+
-| Input Parameters  : struct comedi_device *dev : Driver handle                     |
-|                     unsigned int *data         : Data Pointer contains         |
-|                                          configuration parameters as below |
-|                      struct comedi_subdevice *s,   :pointer to subdevice structure
-|                       struct comedi_insn *insn      :pointer to insn structure                                                           |
-|                                         data[0]  :1:Memory on                          |
-|                                                   0:Memory off                         |
-|                                                                                                            |
-|                                                                                                                                        |
-+----------------------------------------------------------------------------+
-| Output Parameters :   --                                                                                                       |
-+----------------------------------------------------------------------------+
-| Return Value      : TRUE  : No error occur                                 |
-|                           : FALSE : Error occur. Return the error          |
-|                                                                                |
-+----------------------------------------------------------------------------+
-*/
-int i_APCI2200_ConfigDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s,
-        struct comedi_insn *insn, unsigned int *data)
+static int apci2200_do_insn_bits(struct comedi_device *dev,
+                                 struct comedi_subdevice *s,
+                                 struct comedi_insn *insn,
+                                 unsigned int *data)
 {
-        devpriv->b_OutputMemoryStatus = data[0];
-        return insn->n;
-}
+        struct addi_private *devpriv = dev->private;
+        unsigned int mask = data[0];
+        unsigned int bits = data[1];
 
-/*
-+----------------------------------------------------------------------------+
-| Function   Name   : int i_APCI2200_WriteDigitalOutput                      |
-|                       (struct comedi_device *dev,struct comedi_subdevice *s,struct comedi_insn *insn,
-|                     unsigned int *data)                                         |
-+----------------------------------------------------------------------------+
-| Task              : Writes port value  To the selected port                |
-+----------------------------------------------------------------------------+
-| Input Parameters  : struct comedi_device *dev      : Driver handle                |
-|                     struct comedi_subdevice *s,   :pointer to subdevice structure
-|                      struct comedi_insn *insn      :pointer to insn structure      |
-|                    unsigned int *data           : Data Pointer to read status  |
-+----------------------------------------------------------------------------+
-| Output Parameters :   --                                                                                                       |
-+----------------------------------------------------------------------------+
-| Return Value      : TRUE  : No error occur                                 |
-|                           : FALSE : Error occur. Return the error          |
-|                                                                                |
-+----------------------------------------------------------------------------+
-*/
+        s->state = inw(devpriv->iobase + APCI2200_DIGITAL_OP);
+        if (mask) {
+                s->state &= ~mask;
+                s->state |= (bits & mask);
 
-int i_APCI2200_WriteDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s,
-        struct comedi_insn *insn, unsigned int *data)
-{
-        unsigned int ui_Temp, ui_Temp1;
-        unsigned int ui_NoOfChannel = CR_CHAN(insn->chanspec);  /*  get the channel */
-        if (devpriv->b_OutputMemoryStatus) {
-                ui_Temp = inw(devpriv->iobase + APCI2200_DIGITAL_OP);
+                outw(s->state, devpriv->iobase + APCI2200_DIGITAL_OP);
+        }
 
-        }                       /* if(devpriv->b_OutputMemoryStatus ) */
-        else {
-                ui_Temp = 0;
-        }                       /* if(devpriv->b_OutputMemoryStatus ) */
-        if (data[3] == 0) {
-                if (data[1] == 0) {
-                        data[0] = (data[0] << ui_NoOfChannel) | ui_Temp;
-                        outw(data[0], devpriv->iobase + APCI2200_DIGITAL_OP);
-                }               /* if(data[1]==0) */
-                else {
-                        if (data[1] == 1) {
-                                switch (ui_NoOfChannel) {
-
-                                case 2:
-                                        data[0] =
-                                                (data[0] << (2 *
-                                                        data[2])) | ui_Temp;
-                                        break;
-
-                                case 4:
-                                        data[0] =
-                                                (data[0] << (4 *
-                                                        data[2])) | ui_Temp;
-                                        break;
-
-                                case 8:
-                                        data[0] =
-                                                (data[0] << (8 *
-                                                        data[2])) | ui_Temp;
-                                        break;
-                                case 15:
-                                        data[0] = data[0] | ui_Temp;
-                                        break;
-                                default:
-                                        comedi_error(dev, " chan spec wrong");
-                                        return -EINVAL; /*  "sorry channel spec wrong " */
-
-                                }       /* switch(ui_NoOfChannels) */
-
-                                outw(data[0],
-                                        devpriv->iobase + APCI2200_DIGITAL_OP);
-                        }       /*  if(data[1]==1) */
-                        else {
-                                printk("\nSpecified channel not supported\n");
-                        }       /* else if(data[1]==1) */
-                }               /* elseif(data[1]==0) */
-        }                       /* if(data[3]==0) */
-        else {
-                if (data[3] == 1) {
-                        if (data[1] == 0) {
-                                data[0] = ~data[0] & 0x1;
-                                ui_Temp1 = 1;
-                                ui_Temp1 = ui_Temp1 << ui_NoOfChannel;
-                                ui_Temp = ui_Temp | ui_Temp1;
-                                data[0] = (data[0] << ui_NoOfChannel) ^ 0xffff;
-                                data[0] = data[0] & ui_Temp;
-                                outw(data[0],
-                                        devpriv->iobase + APCI2200_DIGITAL_OP);
-                        }       /* if(data[1]==0) */
-                        else {
-                                if (data[1] == 1) {
-                                        switch (ui_NoOfChannel) {
-
-                                        case 2:
-                                                data[0] = ~data[0] & 0x3;
-                                                ui_Temp1 = 3;
-                                                ui_Temp1 =
-                                                        ui_Temp1 << 2 * data[2];
-                                                ui_Temp = ui_Temp | ui_Temp1;
-                                                data[0] =
-                                                        ((data[0] << (2 *
-                                                                        data
-                                                                        [2])) ^
-                                                        0xffff) & ui_Temp;
-                                                break;
-
-                                        case 4:
-                                                data[0] = ~data[0] & 0xf;
-                                                ui_Temp1 = 15;
-                                                ui_Temp1 =
-                                                        ui_Temp1 << 4 * data[2];
-                                                ui_Temp = ui_Temp | ui_Temp1;
-                                                data[0] =
-                                                        ((data[0] << (4 *
-                                                                        data
-                                                                        [2])) ^
-                                                        0xffff) & ui_Temp;
-                                                break;
-
-                                        case 8:
-                                                data[0] = ~data[0] & 0xff;
-                                                ui_Temp1 = 255;
-                                                ui_Temp1 =
-                                                        ui_Temp1 << 8 * data[2];
-                                                ui_Temp = ui_Temp | ui_Temp1;
-                                                data[0] =
-                                                        ((data[0] << (8 *
-                                                                        data
-                                                                        [2])) ^
-                                                        0xffff) & ui_Temp;
-                                                break;
-                                        case 15:
-                                                break;
-
-                                        default:
-                                                comedi_error(dev,
-                                                        " chan spec wrong");
-                                                return -EINVAL; /*  "sorry channel spec wrong " */
-
-                                        }       /* switch(ui_NoOfChannels) */
-
-                                        outw(data[0],
-                                                devpriv->iobase +
-                                                APCI2200_DIGITAL_OP);
-                                }       /*  if(data[1]==1) */
-                                else {
-                                        printk("\nSpecified channel not supported\n");
-                                }       /* else if(data[1]==1) */
-                        }       /* elseif(data[1]==0) */
-                }               /* if(data[3]==1); */
-                else {
-                        printk("\nSpecified functionality does not exist\n");
-                        return -EINVAL;
-                }               /* if else data[3]==1) */
-        }                       /* if else data[3]==0) */
-        return insn->n;
-}
-
-/*
-+----------------------------------------------------------------------------+
-| Function   Name   : int i_APCI2200_ReadDigitalOutput                       |
-|                       (struct comedi_device *dev,struct comedi_subdevice *s,struct comedi_insn *insn,
-|                    unsigned int *data)                                             |
-+----------------------------------------------------------------------------+
-| Task              : Read  value  of the selected channel or port           |
-+----------------------------------------------------------------------------+
-| Input Parameters  : struct comedi_device *dev      : Driver handle                |
-|                     struct comedi_subdevice *s,   :pointer to subdevice structure
-|                     struct comedi_insn *insn      :pointer to insn structure      |
-|                     unsigned int *data          : Data Pointer to read status  |
-+----------------------------------------------------------------------------+
-| Output Parameters :   --                                                                                                       |
-+----------------------------------------------------------------------------+
-| Return Value      : TRUE  : No error occur                                 |
-|                           : FALSE : Error occur. Return the error          |
-|                                                                                |
-+----------------------------------------------------------------------------+
-*/
-
-int i_APCI2200_ReadDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s,
-        struct comedi_insn *insn, unsigned int *data)
-{
+        data[1] = s->state;
 
-        unsigned int ui_Temp;
-        unsigned int ui_NoOfChannel = CR_CHAN(insn->chanspec);  /*  get the channel */
-        ui_Temp = data[0];
-        *data = inw(devpriv->iobase + APCI2200_DIGITAL_OP);
-        if (ui_Temp == 0) {
-                *data = (*data >> ui_NoOfChannel) & 0x1;
-        }                       /* if(ui_Temp==0) */
-        else {
-                if (ui_Temp == 1) {
-                        switch (ui_NoOfChannel) {
-
-                        case 2:
-                                *data = (*data >> (2 * data[1])) & 3;
-                                break;
-
-                        case 4:
-                                *data = (*data >> (4 * data[1])) & 15;
-                                break;
-
-                        case 8:
-                                *data = (*data >> (8 * data[1])) & 255;
-                                break;
-
-                        case 15:
-                                break;
-
-                        default:
-                                comedi_error(dev, " chan spec wrong");
-                                return -EINVAL; /*  "sorry channel spec wrong " */
-
-                        }       /* switch(ui_NoOfChannels) */
-                }               /* if(ui_Temp==1) */
-                else {
-                        printk("\nSpecified channel not supported \n");
-                }               /* elseif(ui_Temp==1) */
-        }                       /* elseif(ui_Temp==0) */
         return insn->n;
 }
 
@@ -418,9 +118,13 @@ int i_APCI2200_ReadDigitalOutput(struct comedi_device *dev, struct comedi_subdev
 +----------------------------------------------------------------------------+
 */
 
-int i_APCI2200_ConfigWatchdog(struct comedi_device *dev, struct comedi_subdevice *s,
-        struct comedi_insn *insn, unsigned int *data)
+static int i_APCI2200_ConfigWatchdog(struct comedi_device *dev,
+                                     struct comedi_subdevice *s,
+                                     struct comedi_insn *insn,
+                                     unsigned int *data)
 {
+        struct addi_private *devpriv = dev->private;
+
         if (data[0] == 0) {
                 /* Disable the watchdog */
                 outw(0x0,
@@ -464,9 +168,13 @@ int i_APCI2200_ConfigWatchdog(struct comedi_device *dev, struct comedi_subdevice
     +----------------------------------------------------------------------------+
   */
 
-int i_APCI2200_StartStopWriteWatchdog(struct comedi_device *dev, struct comedi_subdevice *s,
-        struct comedi_insn *insn, unsigned int *data)
+static int i_APCI2200_StartStopWriteWatchdog(struct comedi_device *dev,
+                                             struct comedi_subdevice *s,
+                                             struct comedi_insn *insn,
+                                             unsigned int *data)
 {
+        struct addi_private *devpriv = dev->private;
+
         switch (data[0]) {
         case 0:         /* stop the watchdog */
                 outw(0x0, devpriv->iobase + APCI2200_WATCHDOG + APCI2200_WATCHDOG_ENABLEDISABLE);       /* disable the watchdog */
@@ -509,9 +217,13 @@ int i_APCI2200_StartStopWriteWatchdog(struct comedi_device *dev, struct comedi_s
 +----------------------------------------------------------------------------+
 */
 
-int i_APCI2200_ReadWatchdog(struct comedi_device *dev, struct comedi_subdevice *s,
-        struct comedi_insn *insn, unsigned int *data)
+static int i_APCI2200_ReadWatchdog(struct comedi_device *dev,
+                                   struct comedi_subdevice *s,
+                                   struct comedi_insn *insn,
+                                   unsigned int *data)
 {
+        struct addi_private *devpriv = dev->private;
+
         data[0] =
                 inw(devpriv->iobase + APCI2200_WATCHDOG +
                 APCI2200_WATCHDOG_STATUS) & 0x1;
@@ -533,8 +245,10 @@ int i_APCI2200_ReadWatchdog(struct comedi_device *dev, struct comedi_subdevice *
 +----------------------------------------------------------------------------+
 */
 
-int i_APCI2200_Reset(struct comedi_device *dev)
+static int i_APCI2200_Reset(struct comedi_device *dev)
 {
+        struct addi_private *devpriv = dev->private;
+
         outw(0x0, devpriv->iobase + APCI2200_DIGITAL_OP);       /* RESETS THE DIGITAL OUTPUTS */
         outw(0x0,
                 devpriv->iobase + APCI2200_WATCHDOG +
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2200.h b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2200.h
deleted file mode 100644
index 83f42af84b8f..000000000000
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2200.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (C) 2004,2005  ADDI-DATA GmbH for the source code of this module.
- *
- *      ADDI-DATA GmbH
- *      Dieselstrasse 3
- *      D-77833 Ottersweier
- *      Tel: +19(0)7223/9493-0
- *      Fax: +49(0)7223/9493-92
- *      http://www.addi-data.com
- *      info@addi-data.com
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- */
-
-/*********      Definitions for APCI-2200 card  *****/
-
-/* Card Specific information */
-#define APCI2200_BOARD_VENDOR_ID                 0x15b8
-#define APCI2200_ADDRESS_RANGE                   64
-
-/* DIGITAL INPUT-OUTPUT DEFINE */
-
-#define APCI2200_DIGITAL_OP                     4
-#define APCI2200_DIGITAL_IP                     0
-
-/* TIMER COUNTER WATCHDOG DEFINES */
-
-#define APCI2200_WATCHDOG                          0x08
-#define APCI2200_WATCHDOG_ENABLEDISABLE            12
-#define APCI2200_WATCHDOG_RELOAD_VALUE             4
-#define APCI2200_WATCHDOG_STATUS                   16
-
-/* Hardware Layer  functions for Apci2200 */
-
-/* Digital Input */
-int i_APCI2200_ReadMoreDigitalInput(struct comedi_device *dev, struct comedi_subdevice *s,
-                                    struct comedi_insn *insn, unsigned int *data);
-int i_APCI2200_Read1DigitalInput(struct comedi_device *dev, struct comedi_subdevice *s,
-                                 struct comedi_insn *insn, unsigned int *data);
-
-/* Digital Output */
-int i_APCI2200_ConfigDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s,
-                                   struct comedi_insn *insn, unsigned int *data);
-int i_APCI2200_WriteDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s,
-                                  struct comedi_insn *insn, unsigned int *data);
-int i_APCI2200_ReadDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s,
-                                 struct comedi_insn *insn, unsigned int *data);
-
-/* TIMER */
-int i_APCI2200_ConfigWatchdog(struct comedi_device *dev, struct comedi_subdevice *s,
-                              struct comedi_insn *insn, unsigned int *data);
-int i_APCI2200_StartStopWriteWatchdog(struct comedi_device *dev, struct comedi_subdevice *s,
-                                      struct comedi_insn *insn, unsigned int *data);
-int i_APCI2200_ReadWatchdog(struct comedi_device *dev, struct comedi_subdevice *s,
-                            struct comedi_insn *insn, unsigned int *data);
-
-/* reset */
-int i_APCI2200_Reset(struct comedi_device *dev);
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
index f406dfb2a677..74065baa3c08 100644
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
@@ -44,8 +44,203 @@ You should also find the complete GPL in the COPYING file accompanying this sour
   +----------+-----------+------------------------------------------------+
 */
 
-#include "hwdrv_apci3120.h"
-static unsigned int ui_Temp;
+/*
+ * ADDON RELATED ADDITIONS
+ */
+/* Constant */
+#define APCI3120_ENABLE_TRANSFER_ADD_ON_LOW             0x00
+#define APCI3120_ENABLE_TRANSFER_ADD_ON_HIGH            0x1200
+#define APCI3120_A2P_FIFO_MANAGEMENT                    0x04000400L
+#define APCI3120_AMWEN_ENABLE                           0x02
+#define APCI3120_A2P_FIFO_WRITE_ENABLE                  0x01
+#define APCI3120_FIFO_ADVANCE_ON_BYTE_2                 0x20000000L
+#define APCI3120_ENABLE_WRITE_TC_INT                    0x00004000L
+#define APCI3120_CLEAR_WRITE_TC_INT                     0x00040000L
+#define APCI3120_DISABLE_AMWEN_AND_A2P_FIFO_WRITE       0x0
+#define APCI3120_DISABLE_BUS_MASTER_ADD_ON              0x0
+#define APCI3120_DISABLE_BUS_MASTER_PCI                 0x0
+
+/* ADD_ON ::: this needed since apci supports 16 bit interface to add on */
+#define APCI3120_ADD_ON_AGCSTS_LOW      0x3C
+#define APCI3120_ADD_ON_AGCSTS_HIGH     (APCI3120_ADD_ON_AGCSTS_LOW + 2)
+#define APCI3120_ADD_ON_MWAR_LOW        0x24
+#define APCI3120_ADD_ON_MWAR_HIGH       (APCI3120_ADD_ON_MWAR_LOW + 2)
+#define APCI3120_ADD_ON_MWTC_LOW        0x058
+#define APCI3120_ADD_ON_MWTC_HIGH       (APCI3120_ADD_ON_MWTC_LOW + 2)
+
+/* AMCC */
+#define APCI3120_AMCC_OP_MCSR           0x3C
+#define APCI3120_AMCC_OP_REG_INTCSR     0x38
+
+/* for transfer count enable bit */
+#define AGCSTS_TC_ENABLE        0x10000000
+
+/* used for test on mixture of BIP/UNI ranges */
+#define APCI3120_BIPOLAR_RANGES         4
+
+#define APCI3120_ADDRESS_RANGE          16
+
+#define APCI3120_DISABLE                0
+#define APCI3120_ENABLE                 1
+
+#define APCI3120_START                  1
+#define APCI3120_STOP                   0
+
+#define APCI3120_EOC_MODE               1
+#define APCI3120_EOS_MODE               2
+#define APCI3120_DMA_MODE               3
+
+/* DIGITAL INPUT-OUTPUT DEFINE */
+
+#define APCI3120_DIGITAL_OUTPUT         0x0d
+#define APCI3120_RD_STATUS              0x02
+#define APCI3120_RD_FIFO                0x00
+
+/* digital output insn_write ON /OFF selection */
+#define APCI3120_SET4DIGITALOUTPUTON    1
+#define APCI3120_SET4DIGITALOUTPUTOFF   0
+
+/* analog output SELECT BIT */
+#define APCI3120_ANALOG_OP_CHANNEL_1    0x0000
+#define APCI3120_ANALOG_OP_CHANNEL_2    0x4000
+#define APCI3120_ANALOG_OP_CHANNEL_3    0x8000
+#define APCI3120_ANALOG_OP_CHANNEL_4    0xc000
+#define APCI3120_ANALOG_OP_CHANNEL_5    0x0000
+#define APCI3120_ANALOG_OP_CHANNEL_6    0x4000
+#define APCI3120_ANALOG_OP_CHANNEL_7    0x8000
+#define APCI3120_ANALOG_OP_CHANNEL_8    0xc000
+
+/* Enable external trigger bit in nWrAddress */
+#define APCI3120_ENABLE_EXT_TRIGGER     0x8000
+
+/* ANALOG OUTPUT AND INPUT DEFINE */
+#define APCI3120_UNIPOLAR               0x80
+#define APCI3120_BIPOLAR                0x00
+#define APCI3120_ANALOG_OUTPUT_1        0x08
+#define APCI3120_ANALOG_OUTPUT_2        0x0a
+#define APCI3120_1_GAIN                 0x00
+#define APCI3120_2_GAIN                 0x10
+#define APCI3120_5_GAIN                 0x20
+#define APCI3120_10_GAIN                0x30
+#define APCI3120_SEQ_RAM_ADDRESS        0x06
+#define APCI3120_RESET_FIFO             0x0c
+#define APCI3120_TIMER_0_MODE_2         0x01
+#define APCI3120_TIMER_0_MODE_4         0x2
+#define APCI3120_SELECT_TIMER_0_WORD    0x00
+#define APCI3120_ENABLE_TIMER0          0x1000
+#define APCI3120_CLEAR_PR               0xf0ff
+#define APCI3120_CLEAR_PA               0xfff0
+#define APCI3120_CLEAR_PA_PR            (APCI3120_CLEAR_PR & APCI3120_CLEAR_PA)
+
+/* nWrMode_Select */
+#define APCI3120_ENABLE_SCAN            0x8
+#define APCI3120_DISABLE_SCAN           (~APCI3120_ENABLE_SCAN)
+#define APCI3120_ENABLE_EOS_INT         0x2
+
+#define APCI3120_DISABLE_EOS_INT        (~APCI3120_ENABLE_EOS_INT)
+#define APCI3120_ENABLE_EOC_INT         0x1
+#define APCI3120_DISABLE_EOC_INT        (~APCI3120_ENABLE_EOC_INT)
+#define APCI3120_DISABLE_ALL_INTERRUPT_WITHOUT_TIMER    \
+        (APCI3120_DISABLE_EOS_INT & APCI3120_DISABLE_EOC_INT)
+#define APCI3120_DISABLE_ALL_INTERRUPT                  \
+        (APCI3120_DISABLE_TIMER_INT & APCI3120_DISABLE_EOS_INT & APCI3120_DISABLE_EOC_INT)
+
+/* status register bits */
+#define APCI3120_EOC                    0x8000
+#define APCI3120_EOS                    0x2000
+
+/* software trigger dummy register */
+#define APCI3120_START_CONVERSION       0x02
+
+/* TIMER DEFINE */
+#define APCI3120_QUARTZ_A               70
+#define APCI3120_QUARTZ_B               50
+#define APCI3120_TIMER                  1
+#define APCI3120_WATCHDOG               2
+#define APCI3120_TIMER_DISABLE          0
+#define APCI3120_TIMER_ENABLE           1
+#define APCI3120_ENABLE_TIMER2          0x4000
+#define APCI3120_DISABLE_TIMER2         (~APCI3120_ENABLE_TIMER2)
+#define APCI3120_ENABLE_TIMER_INT       0x04
+#define APCI3120_DISABLE_TIMER_INT      (~APCI3120_ENABLE_TIMER_INT)
+#define APCI3120_WRITE_MODE_SELECT      0x0e
+#define APCI3120_SELECT_TIMER_0_WORD    0x00
+#define APCI3120_SELECT_TIMER_1_WORD    0x01
+#define APCI3120_TIMER_1_MODE_2         0x4
+
+/* $$ BIT FOR MODE IN nCsTimerCtr1 */
+#define APCI3120_TIMER_2_MODE_0         0x0
+#define APCI3120_TIMER_2_MODE_2         0x10
+#define APCI3120_TIMER_2_MODE_5         0x30
+
+/* $$ BIT FOR MODE IN nCsTimerCtr0 */
+#define APCI3120_SELECT_TIMER_2_LOW_WORD        0x02
+#define APCI3120_SELECT_TIMER_2_HIGH_WORD       0x03
+
+#define APCI3120_TIMER_CRT0             0x0d
+#define APCI3120_TIMER_CRT1             0x0c
+
+#define APCI3120_TIMER_VALUE            0x04
+#define APCI3120_TIMER_STATUS_REGISTER  0x0d
+#define APCI3120_RD_STATUS              0x02
+#define APCI3120_WR_ADDRESS             0x00
+#define APCI3120_ENABLE_WATCHDOG        0x20
+#define APCI3120_DISABLE_WATCHDOG       (~APCI3120_ENABLE_WATCHDOG)
+#define APCI3120_ENABLE_TIMER_COUNTER   0x10
+#define APCI3120_DISABLE_TIMER_COUNTER  (~APCI3120_ENABLE_TIMER_COUNTER)
+#define APCI3120_FC_TIMER               0x1000
+#define APCI3120_ENABLE_TIMER0          0x1000
+#define APCI3120_ENABLE_TIMER1          0x2000
+#define APCI3120_ENABLE_TIMER2          0x4000
+#define APCI3120_DISABLE_TIMER0         (~APCI3120_ENABLE_TIMER0)
+#define APCI3120_DISABLE_TIMER1         (~APCI3120_ENABLE_TIMER1)
+#define APCI3120_DISABLE_TIMER2         (~APCI3120_ENABLE_TIMER2)
+
+#define APCI3120_TIMER2_SELECT_EOS      0xc0
+#define APCI3120_COUNTER                3
+#define APCI3120_DISABLE_ALL_TIMER      (APCI3120_DISABLE_TIMER0 &      \
+                                         APCI3120_DISABLE_TIMER1 &      \
+                                         APCI3120_DISABLE_TIMER2)
+
+#define MAX_ANALOGINPUT_CHANNELS        32
+
+struct str_AnalogReadInformation {
+        /* EOC or EOS */
+        unsigned char b_Type;
+        /* Interrupt use or not */
+        unsigned char b_InterruptFlag;
+        /* Selection of the conversion time */
+        unsigned int ui_ConvertTiming;
+        /* Number of channel to read */
+        unsigned char b_NbrOfChannel;
+        /* Number of the channel to be read */
+        unsigned int ui_ChannelList[MAX_ANALOGINPUT_CHANNELS];
+        /* Gain of each channel */
+        unsigned int ui_RangeList[MAX_ANALOGINPUT_CHANNELS];
+};
+
+/* ANALOG INPUT RANGE */
+static const struct comedi_lrange range_apci3120_ai = {
+        8, {
+                BIP_RANGE(10),
+                BIP_RANGE(5),
+                BIP_RANGE(2),
+                BIP_RANGE(1),
+                UNI_RANGE(10),
+                UNI_RANGE(5),
+                UNI_RANGE(2),
+                UNI_RANGE(1)
+        }
+};
+
+/* ANALOG OUTPUT RANGE */
+static const struct comedi_lrange range_apci3120_ao = {
+        2, {
+                BIP_RANGE(10),
+                UNI_RANGE(10)
+        }
+};
+
 
 /* FUNCTION DEFINITIONS */
 
@@ -55,28 +250,13 @@ static unsigned int ui_Temp;
 +----------------------------------------------------------------------------+
 */
 
-/*
-+----------------------------------------------------------------------------+
-| Function name     :int i_APCI3120_InsnConfigAnalogInput(struct comedi_device *dev,|
-|  struct comedi_subdevice *s,struct comedi_insn *insn,unsigned int *data)                                       |
-|                                                                                                |
-+----------------------------------------------------------------------------+
-| Task              : Calls card specific function                                           |
-|                                                                                                                |
-+----------------------------------------------------------------------------+
-| Input Parameters  : struct comedi_device *dev                                                                  |
-|                     struct comedi_subdevice *s                                                                         |
-|                     struct comedi_insn *insn                                      |
-|                     unsigned int *data                                                                 |
-+----------------------------------------------------------------------------+
-| Return Value      :                                                                            |
-|                                                                                                                            |
-+----------------------------------------------------------------------------+
-*/
-
-int i_APCI3120_InsnConfigAnalogInput(struct comedi_device *dev, struct comedi_subdevice *s,
-        struct comedi_insn *insn, unsigned int *data)
+static int i_APCI3120_InsnConfigAnalogInput(struct comedi_device *dev,
+                                            struct comedi_subdevice *s,
+                                            struct comedi_insn *insn,
+                                            unsigned int *data)
 {
+        const struct addi_board *this_board = comedi_board(dev);
+        struct addi_private *devpriv = dev->private;
         unsigned int i;
 
         if ((data[0] != APCI3120_EOC_MODE) && (data[0] != APCI3120_EOS_MODE))
@@ -91,7 +271,7 @@ int i_APCI3120_InsnConfigAnalogInput(struct comedi_device *dev, struct comedi_su
                 for (i = 0; i < data[3]; i++) {
 
                         if (CR_CHAN(data[4 + i]) >=
-                                devpriv->s_EeParameters.i_NbrAiChannel) {
+                                this_board->i_NbrAiChannel) {
                                 printk("bad channel list\n");
                                 return -2;
                         }
@@ -121,31 +301,72 @@ int i_APCI3120_InsnConfigAnalogInput(struct comedi_device *dev, struct comedi_su
 }
 
 /*
-+----------------------------------------------------------------------------+
-| Function name     :int i_APCI3120_InsnReadAnalogInput(struct comedi_device *dev,  |
-|                       struct comedi_subdevice *s,struct comedi_insn *insn, unsigned int *data)         |
-|                                                                                                |
-+----------------------------------------------------------------------------+
-| Task              :  card specific function                                                            |
-|                               Reads analog input in synchronous mode               |
-|                         EOC and EOS is selected as per configured              |
-|                     if no conversion time is set uses default conversion   |
-|                         time 10 microsec.                                                                      |
-|                                                                                                                |
-+----------------------------------------------------------------------------+
-| Input Parameters  : struct comedi_device *dev                                                                  |
-|                     struct comedi_subdevice *s                                                                         |
-|                     struct comedi_insn *insn                                      |
-|                     unsigned int *data                                                                         |
-+----------------------------------------------------------------------------+
-| Return Value      :                                                                            |
-|                                                                                                                            |
-+----------------------------------------------------------------------------+
-*/
+ * This function will first check channel list is ok or not and then
+ * initialize the sequence RAM with the polarity, Gain,Channel number.
+ * If the last argument of function "check"is 1 then it only checks
+ * the channel list is ok or not.
+ */
+static int i_APCI3120_SetupChannelList(struct comedi_device *dev,
+                                       struct comedi_subdevice *s,
+                                       int n_chan,
+                                       unsigned int *chanlist,
+                                       char check)
+{
+        struct addi_private *devpriv = dev->private;
+        unsigned int i;         /* , differencial=0, bipolar=0; */
+        unsigned int gain;
+        unsigned short us_TmpValue;
 
-int i_APCI3120_InsnReadAnalogInput(struct comedi_device *dev, struct comedi_subdevice *s,
-        struct comedi_insn *insn, unsigned int *data)
+        /* correct channel and range number check itself comedi/range.c */
+        if (n_chan < 1) {
+                if (!check)
+                        comedi_error(dev, "range/channel list is empty!");
+                return 0;
+        }
+        /*  All is ok, so we can setup channel/range list */
+        if (check)
+                return 1;
+
+        /* Code  to set the PA and PR...Here it set PA to 0.. */
+        devpriv->us_OutputRegister =
+                devpriv->us_OutputRegister & APCI3120_CLEAR_PA_PR;
+        devpriv->us_OutputRegister = ((n_chan - 1) & 0xf) << 8;
+        outw(devpriv->us_OutputRegister, dev->iobase + APCI3120_WR_ADDRESS);
+
+        for (i = 0; i < n_chan; i++) {
+                /*  store range list to card */
+                us_TmpValue = CR_CHAN(chanlist[i]);     /*  get channel number; */
+
+                if (CR_RANGE(chanlist[i]) < APCI3120_BIPOLAR_RANGES)
+                        us_TmpValue &= ((~APCI3120_UNIPOLAR) & 0xff);   /*  set bipolar */
+                else
+                        us_TmpValue |= APCI3120_UNIPOLAR;       /*  enable unipolar...... */
+
+                gain = CR_RANGE(chanlist[i]);   /*  get gain number */
+                us_TmpValue |= ((gain & 0x03) << 4);    /* <<4 for G0 and G1 bit in RAM */
+                us_TmpValue |= i << 8;  /* To select the RAM LOCATION.... */
+                outw(us_TmpValue, dev->iobase + APCI3120_SEQ_RAM_ADDRESS);
+
+                printk("\n Gain = %i",
+                        (((unsigned char)CR_RANGE(chanlist[i]) & 0x03) << 2));
+                printk("\n Channel = %i", CR_CHAN(chanlist[i]));
+                printk("\n Polarity = %i", us_TmpValue & APCI3120_UNIPOLAR);
+        }
+        return 1;               /*  we can serve this with scan logic */
+}
+
+/*
+ * Reads analog input in synchronous mode EOC and EOS is selected
+ * as per configured if no conversion time is set uses default
+ * conversion time 10 microsec.
+ */
+static int i_APCI3120_InsnReadAnalogInput(struct comedi_device *dev,
+                                          struct comedi_subdevice *s,
+                                          struct comedi_insn *insn,
+                                          unsigned int *data)
 {
+        const struct addi_board *this_board = comedi_board(dev);
+        struct addi_private *devpriv = dev->private;
         unsigned short us_ConvertTiming, us_TmpValue, i;
         unsigned char b_Tmp;
 
@@ -387,26 +608,86 @@ int i_APCI3120_InsnReadAnalogInput(struct comedi_device *dev, struct comedi_subd
 
 }
 
+static int i_APCI3120_Reset(struct comedi_device *dev)
+{
+        struct addi_private *devpriv = dev->private;
+        unsigned int i;
+        unsigned short us_TmpValue;
+
+        devpriv->b_AiCyclicAcquisition = APCI3120_DISABLE;
+        devpriv->b_EocEosInterrupt = APCI3120_DISABLE;
+        devpriv->b_InterruptMode = APCI3120_EOC_MODE;
+        devpriv->ui_EocEosConversionTime = 0;   /*  set eoc eos conv time to 0 */
+        devpriv->b_OutputMemoryStatus = 0;
+
+        /*  variables used in timer subdevice */
+        devpriv->b_Timer2Mode = 0;
+        devpriv->b_Timer2Interrupt = 0;
+        devpriv->b_ExttrigEnable = 0;   /*  Disable ext trigger */
+
+        /* Disable all interrupts, watchdog for the anolog output */
+        devpriv->b_ModeSelectRegister = 0;
+        outb(devpriv->b_ModeSelectRegister,
+                dev->iobase + APCI3120_WRITE_MODE_SELECT);
+
+        /*  Disables all counters, ext trigger and clears PA, PR */
+        devpriv->us_OutputRegister = 0;
+        outw(devpriv->us_OutputRegister, dev->iobase + APCI3120_WR_ADDRESS);
+
 /*
-+----------------------------------------------------------------------------+
-| Function name     :int i_APCI3120_StopCyclicAcquisition(struct comedi_device *dev,|
-|                                                                                            struct comedi_subdevice *s)|
-|                                                                                                                |
-+----------------------------------------------------------------------------+
-| Task              : Stops Cyclic acquisition                                                       |
-|                                                                                                                |
-+----------------------------------------------------------------------------+
-| Input Parameters  : struct comedi_device *dev                                                                  |
-|                     struct comedi_subdevice *s                                                                         |
-|                                                                                                |
-+----------------------------------------------------------------------------+
-| Return Value      :0                                                                       |
-|                                                                                                                            |
-+----------------------------------------------------------------------------+
-*/
+ * Code to set the all anolog o/p channel to 0v 8191 is decimal
+ * value for zero(0 v)volt in bipolar mode(default)
+ */
+        outw(8191 | APCI3120_ANALOG_OP_CHANNEL_1, dev->iobase + APCI3120_ANALOG_OUTPUT_1);      /* channel 1 */
+        outw(8191 | APCI3120_ANALOG_OP_CHANNEL_2, dev->iobase + APCI3120_ANALOG_OUTPUT_1);      /* channel 2 */
+        outw(8191 | APCI3120_ANALOG_OP_CHANNEL_3, dev->iobase + APCI3120_ANALOG_OUTPUT_1);      /* channel 3 */
+        outw(8191 | APCI3120_ANALOG_OP_CHANNEL_4, dev->iobase + APCI3120_ANALOG_OUTPUT_1);      /* channel 4 */
 
-int i_APCI3120_StopCyclicAcquisition(struct comedi_device *dev, struct comedi_subdevice *s)
+        outw(8191 | APCI3120_ANALOG_OP_CHANNEL_5, dev->iobase + APCI3120_ANALOG_OUTPUT_2);      /* channel 5 */
+        outw(8191 | APCI3120_ANALOG_OP_CHANNEL_6, dev->iobase + APCI3120_ANALOG_OUTPUT_2);      /* channel 6 */
+        outw(8191 | APCI3120_ANALOG_OP_CHANNEL_7, dev->iobase + APCI3120_ANALOG_OUTPUT_2);      /* channel 7 */
+        outw(8191 | APCI3120_ANALOG_OP_CHANNEL_8, dev->iobase + APCI3120_ANALOG_OUTPUT_2);      /* channel 8 */
+
+        /*   Reset digital output to L0W */
+
+/* ES05  outb(0x0,dev->iobase+APCI3120_DIGITAL_OUTPUT); */
+        udelay(10);
+
+        inw(dev->iobase + 0);   /* make a dummy read */
+        inb(dev->iobase + APCI3120_RESET_FIFO); /*  flush FIFO */
+        inw(dev->iobase + APCI3120_RD_STATUS);  /*  flush A/D status register */
+
+        /* code to reset the RAM sequence */
+        for (i = 0; i < 16; i++) {
+                us_TmpValue = i << 8;   /* select the location */
+                outw(us_TmpValue, dev->iobase + APCI3120_SEQ_RAM_ADDRESS);
+        }
+        return 0;
+}
+
+static int i_APCI3120_ExttrigEnable(struct comedi_device *dev)
 {
+        struct addi_private *devpriv = dev->private;
+
+        devpriv->us_OutputRegister |= APCI3120_ENABLE_EXT_TRIGGER;
+        outw(devpriv->us_OutputRegister, dev->iobase + APCI3120_WR_ADDRESS);
+        return 0;
+}
+
+static int i_APCI3120_ExttrigDisable(struct comedi_device *dev)
+{
+        struct addi_private *devpriv = dev->private;
+
+        devpriv->us_OutputRegister &= ~APCI3120_ENABLE_EXT_TRIGGER;
+        outw(devpriv->us_OutputRegister, dev->iobase + APCI3120_WR_ADDRESS);
+        return 0;
+}
+
+static int i_APCI3120_StopCyclicAcquisition(struct comedi_device *dev,
+                                            struct comedi_subdevice *s)
+{
+        struct addi_private *devpriv = dev->private;
+
         /*  Disable A2P Fifo write and AMWEN signal */
         outw(0, devpriv->i_IobaseAddon + 4);
 
@@ -456,28 +737,11 @@ int i_APCI3120_StopCyclicAcquisition(struct comedi_device *dev, struct comedi_su
         return 0;
 }
 
-/*
-+----------------------------------------------------------------------------+
-| Function name     :int i_APCI3120_CommandTestAnalogInput(struct comedi_device *dev|
-|                       ,struct comedi_subdevice *s,struct comedi_cmd *cmd)                                      |
-|                                                                                                                |
-+----------------------------------------------------------------------------+
-| Task              : Test validity for a command for cyclic anlog input     |
-|                       acquisition                                                                      |
-|                                                                                                                |
-+----------------------------------------------------------------------------+
-| Input Parameters  : struct comedi_device *dev                                                                  |
-|                     struct comedi_subdevice *s                                                                         |
-|                     struct comedi_cmd *cmd                                                             |
-+----------------------------------------------------------------------------+
-| Return Value      :0                                                                       |
-|                                                                                                                            |
-+----------------------------------------------------------------------------+
-*/
-
-int i_APCI3120_CommandTestAnalogInput(struct comedi_device *dev, struct comedi_subdevice *s,
-        struct comedi_cmd *cmd)
+static int i_APCI3120_CommandTestAnalogInput(struct comedi_device *dev,
+                                             struct comedi_subdevice *s,
+                                             struct comedi_cmd *cmd)
 {
+        const struct addi_board *this_board = comedi_board(dev);
         int err = 0;
 
         /* Step 1 : check if triggers are trivially valid */
@@ -503,63 +767,32 @@ int i_APCI3120_CommandTestAnalogInput(struct comedi_device *dev, struct comedi_s
         if (err)
                 return 2;
 
-        /*  step 3: make sure arguments are trivially compatible */
+        /* Step 3: check if arguments are trivially valid */
 
-        if (cmd->start_arg != 0) {
-                cmd->start_arg = 0;
-                err++;
-        }
+        err |= cfc_check_trigger_arg_is(&cmd->start_arg, 0);
 
-        if (cmd->scan_begin_src == TRIG_TIMER) {        /*  Test Delay timing */
-                if (cmd->scan_begin_arg <
-                                devpriv->s_EeParameters.ui_MinDelaytimeNs) {
-                        cmd->scan_begin_arg =
-                                devpriv->s_EeParameters.ui_MinDelaytimeNs;
-                        err++;
-                }
-        }
+        if (cmd->scan_begin_src == TRIG_TIMER)  /* Test Delay timing */
+                err |= cfc_check_trigger_arg_min(&cmd->scan_begin_arg, 100000);
 
         if (cmd->convert_src == TRIG_TIMER) {   /*  Test Acquisition timing */
                 if (cmd->scan_begin_src == TRIG_TIMER) {
-                        if ((cmd->convert_arg)
-                                && (cmd->convert_arg <
-                                        devpriv->s_EeParameters.
-                                                ui_MinAcquisitiontimeNs)) {
-                                cmd->convert_arg = devpriv->s_EeParameters.
-                                        ui_MinAcquisitiontimeNs;
-                                err++;
-                        }
+                        if (cmd->convert_arg)
+                                err |= cfc_check_trigger_arg_min(
+                                                &cmd->convert_arg, 10000);
                 } else {
-                        if (cmd->convert_arg <
-                                devpriv->s_EeParameters.ui_MinAcquisitiontimeNs
-                                ) {
-                                cmd->convert_arg = devpriv->s_EeParameters.
-                                        ui_MinAcquisitiontimeNs;
-                                err++;
-
-                        }
+                        err |= cfc_check_trigger_arg_min(&cmd->convert_arg,
+                                                        10000);
                 }
         }
 
-        if (!cmd->chanlist_len) {
-                cmd->chanlist_len = 1;
-                err++;
-        }
-        if (cmd->chanlist_len > this_board->i_AiChannelList) {
-                cmd->chanlist_len = this_board->i_AiChannelList;
-                err++;
-        }
-        if (cmd->stop_src == TRIG_COUNT) {
-                if (!cmd->stop_arg) {
-                        cmd->stop_arg = 1;
-                        err++;
-                }
-        } else {                /*  TRIG_NONE */
-                if (cmd->stop_arg != 0) {
-                        cmd->stop_arg = 0;
-                        err++;
-                }
-        }
+        err |= cfc_check_trigger_arg_min(&cmd->chanlist_len, 1);
+        err |= cfc_check_trigger_arg_max(&cmd->chanlist_len,
+                                         this_board->i_AiChannelList);
+
+        if (cmd->stop_src == TRIG_COUNT)
+                err |= cfc_check_trigger_arg_min(&cmd->stop_arg, 1);
+        else    /*  TRIG_NONE */
+                err |= cfc_check_trigger_arg_is(&cmd->stop_arg, 0);
 
         if (err)
                 return 3;
@@ -584,100 +817,17 @@ int i_APCI3120_CommandTestAnalogInput(struct comedi_device *dev, struct comedi_s
 }
 
 /*
-+----------------------------------------------------------------------------+
-| Function name     : int i_APCI3120_CommandAnalogInput(struct comedi_device *dev,  |
-|                                                                                               struct comedi_subdevice *s) |
-|                                                                                                                |
-+----------------------------------------------------------------------------+
-| Task              : Does asynchronous acquisition                          |
-|                     Determines the mode 1 or 2.                                                    |
-|                                                                                                                |
-+----------------------------------------------------------------------------+
-| Input Parameters  : struct comedi_device *dev                                                                  |
-|                     struct comedi_subdevice *s                                                                         |
-|                                                                                                                                |
-+----------------------------------------------------------------------------+
-| Return Value      :                                                                            |
-|                                                                                                                            |
-+----------------------------------------------------------------------------+
-*/
-
-int i_APCI3120_CommandAnalogInput(struct comedi_device *dev, struct comedi_subdevice *s)
-{
-        struct comedi_cmd *cmd = &s->async->cmd;
-
-        /* loading private structure with cmd structure inputs */
-        devpriv->ui_AiFlags = cmd->flags;
-        devpriv->ui_AiNbrofChannels = cmd->chanlist_len;
-        devpriv->ui_AiScanLength = cmd->scan_end_arg;
-        devpriv->pui_AiChannelList = cmd->chanlist;
-
-        /* UPDATE-0.7.57->0.7.68devpriv->AiData=s->async->data; */
-        devpriv->AiData = s->async->prealloc_buf;
-        /* UPDATE-0.7.57->0.7.68devpriv->ui_AiDataLength=s->async->data_len; */
-        devpriv->ui_AiDataLength = s->async->prealloc_bufsz;
-
-        if (cmd->stop_src == TRIG_COUNT)
-                devpriv->ui_AiNbrofScans = cmd->stop_arg;
-        else
-                devpriv->ui_AiNbrofScans = 0;
-
-        devpriv->ui_AiTimer0 = 0;       /*  variables changed to timer0,timer1 */
-        devpriv->ui_AiTimer1 = 0;
-        if ((devpriv->ui_AiNbrofScans == 0) || (devpriv->ui_AiNbrofScans == -1))
-                devpriv->b_AiContinuous = 1;    /*  user want neverending analog acquisition */
-        /*  stopped using cancel */
-
-        if (cmd->start_src == TRIG_EXT)
-                devpriv->b_ExttrigEnable = APCI3120_ENABLE;
-        else
-                devpriv->b_ExttrigEnable = APCI3120_DISABLE;
-
-        if (cmd->scan_begin_src == TRIG_FOLLOW) {
-                /*  mode 1 or 3 */
-                if (cmd->convert_src == TRIG_TIMER) {
-                        /*  mode 1 */
-
-                        devpriv->ui_AiTimer0 = cmd->convert_arg;        /*  timer constant in nano seconds */
-                        /* return this_board->ai_cmd(1,dev,s); */
-                        return i_APCI3120_CyclicAnalogInput(1, dev, s);
-                }
-
-        }
-        if ((cmd->scan_begin_src == TRIG_TIMER)
-                && (cmd->convert_src == TRIG_TIMER)) {
-                /*  mode 2 */
-                devpriv->ui_AiTimer1 = cmd->scan_begin_arg;
-                devpriv->ui_AiTimer0 = cmd->convert_arg;        /*  variable changed timer2 to timer0 */
-                /* return this_board->ai_cmd(2,dev,s); */
-                return i_APCI3120_CyclicAnalogInput(2, dev, s);
-        }
-        return -1;
-}
-
-/*
-+----------------------------------------------------------------------------+
-| Function name     :  int i_APCI3120_CyclicAnalogInput(int mode,            |
-|                          struct comedi_device * dev,struct comedi_subdevice * s)                       |
-+----------------------------------------------------------------------------+
-| Task              : This is used for analog input cyclic acquisition       |
-|                         Performs the command operations.                       |
-|                         If DMA is configured does DMA initialization           |
-|                         otherwise does the acquisition with EOS interrupt.     |
-|                                                                                                                |
-+----------------------------------------------------------------------------+
-| Input Parameters  :                                                                                                            |
-|                                                                                                                                |
-|                                                                                                |
-+----------------------------------------------------------------------------+
-| Return Value      :                                                                            |
-|                                                                                                                            |
-+----------------------------------------------------------------------------+
-*/
-
-int i_APCI3120_CyclicAnalogInput(int mode, struct comedi_device *dev,
-        struct comedi_subdevice *s)
+ * This is used for analog input cyclic acquisition.
+ * Performs the command operations.
+ * If DMA is configured does DMA initialization otherwise does the
+ * acquisition with EOS interrupt.
+ */
+static int i_APCI3120_CyclicAnalogInput(int mode,
+                                        struct comedi_device *dev,
+                                        struct comedi_subdevice *s)
 {
+        const struct addi_board *this_board = comedi_board(dev);
+        struct addi_private *devpriv = dev->private;
         unsigned char b_Tmp;
         unsigned int ui_Tmp, ui_DelayTiming = 0, ui_TimerValue1 = 0, dmalen0 =
                 0, dmalen1 = 0, ui_TimerValue2 =
@@ -1186,241 +1336,277 @@ int i_APCI3120_CyclicAnalogInput(int mode, struct comedi_device *dev,
 }
 
 /*
-+----------------------------------------------------------------------------+
-|                       intERNAL FUNCTIONS                                                               |
-+----------------------------------------------------------------------------+
-*/
+ * Does asynchronous acquisition.
+ * Determines the mode 1 or 2.
+ */
+static int i_APCI3120_CommandAnalogInput(struct comedi_device *dev,
+                                         struct comedi_subdevice *s)
+{
+        struct addi_private *devpriv = dev->private;
+        struct comedi_cmd *cmd = &s->async->cmd;
 
-/*
-+----------------------------------------------------------------------------+
-| Function name     : int i_APCI3120_Reset(struct comedi_device *dev)               |
-|                                                                                                                |
-|                                                                                                |
-+----------------------------------------------------------------------------+
-| Task              : Hardware reset function                                                        |
-|                                                                                                                |
-+----------------------------------------------------------------------------+
-| Input Parameters  :   struct comedi_device *dev                                                                        |
-|                                                                                                                                |
-|                                                                                                |
-+----------------------------------------------------------------------------+
-| Return Value      :                                                                            |
-|                                                                                                                            |
-+----------------------------------------------------------------------------+
-*/
+        /* loading private structure with cmd structure inputs */
+        devpriv->ui_AiFlags = cmd->flags;
+        devpriv->ui_AiNbrofChannels = cmd->chanlist_len;
+        devpriv->ui_AiScanLength = cmd->scan_end_arg;
+        devpriv->pui_AiChannelList = cmd->chanlist;
 
-int i_APCI3120_Reset(struct comedi_device *dev)
-{
-        unsigned int i;
-        unsigned short us_TmpValue;
+        /* UPDATE-0.7.57->0.7.68devpriv->AiData=s->async->data; */
+        devpriv->AiData = s->async->prealloc_buf;
+        /* UPDATE-0.7.57->0.7.68devpriv->ui_AiDataLength=s->async->data_len; */
+        devpriv->ui_AiDataLength = s->async->prealloc_bufsz;
 
-        devpriv->b_AiCyclicAcquisition = APCI3120_DISABLE;
-        devpriv->b_EocEosInterrupt = APCI3120_DISABLE;
-        devpriv->b_InterruptMode = APCI3120_EOC_MODE;
-        devpriv->ui_EocEosConversionTime = 0;   /*  set eoc eos conv time to 0 */
-        devpriv->b_OutputMemoryStatus = 0;
+        if (cmd->stop_src == TRIG_COUNT)
+                devpriv->ui_AiNbrofScans = cmd->stop_arg;
+        else
+                devpriv->ui_AiNbrofScans = 0;
 
-        /*  variables used in timer subdevice */
-        devpriv->b_Timer2Mode = 0;
-        devpriv->b_Timer2Interrupt = 0;
-        devpriv->b_ExttrigEnable = 0;   /*  Disable ext trigger */
+        devpriv->ui_AiTimer0 = 0;       /*  variables changed to timer0,timer1 */
+        devpriv->ui_AiTimer1 = 0;
+        if ((devpriv->ui_AiNbrofScans == 0) || (devpriv->ui_AiNbrofScans == -1))
+                devpriv->b_AiContinuous = 1;    /*  user want neverending analog acquisition */
+        /*  stopped using cancel */
 
-        /* Disable all interrupts, watchdog for the anolog output */
-        devpriv->b_ModeSelectRegister = 0;
-        outb(devpriv->b_ModeSelectRegister,
-                dev->iobase + APCI3120_WRITE_MODE_SELECT);
+        if (cmd->start_src == TRIG_EXT)
+                devpriv->b_ExttrigEnable = APCI3120_ENABLE;
+        else
+                devpriv->b_ExttrigEnable = APCI3120_DISABLE;
 
-        /*  Disables all counters, ext trigger and clears PA, PR */
-        devpriv->us_OutputRegister = 0;
-        outw(devpriv->us_OutputRegister, dev->iobase + APCI3120_WR_ADDRESS);
+        if (cmd->scan_begin_src == TRIG_FOLLOW) {
+                /*  mode 1 or 3 */
+                if (cmd->convert_src == TRIG_TIMER) {
+                        /*  mode 1 */
+
+                        devpriv->ui_AiTimer0 = cmd->convert_arg;        /*  timer constant in nano seconds */
+                        /* return this_board->ai_cmd(1,dev,s); */
+                        return i_APCI3120_CyclicAnalogInput(1, dev, s);
+                }
+
+        }
+        if ((cmd->scan_begin_src == TRIG_TIMER)
+                && (cmd->convert_src == TRIG_TIMER)) {
+                /*  mode 2 */
+                devpriv->ui_AiTimer1 = cmd->scan_begin_arg;
+                devpriv->ui_AiTimer0 = cmd->convert_arg;        /*  variable changed timer2 to timer0 */
+                /* return this_board->ai_cmd(2,dev,s); */
+                return i_APCI3120_CyclicAnalogInput(2, dev, s);
+        }
+        return -1;
+}
 
 /*
- * Code to set the all anolog o/p channel to 0v 8191 is decimal
- * value for zero(0 v)volt in bipolar mode(default)
+ * This function copies the data from DMA buffer to the Comedi buffer.
  */
-        outw(8191 | APCI3120_ANALOG_OP_CHANNEL_1, dev->iobase + APCI3120_ANALOG_OUTPUT_1);      /* channel 1 */
-        outw(8191 | APCI3120_ANALOG_OP_CHANNEL_2, dev->iobase + APCI3120_ANALOG_OUTPUT_1);      /* channel 2 */
-        outw(8191 | APCI3120_ANALOG_OP_CHANNEL_3, dev->iobase + APCI3120_ANALOG_OUTPUT_1);      /* channel 3 */
-        outw(8191 | APCI3120_ANALOG_OP_CHANNEL_4, dev->iobase + APCI3120_ANALOG_OUTPUT_1);      /* channel 4 */
+static void v_APCI3120_InterruptDmaMoveBlock16bit(struct comedi_device *dev,
+                                                  struct comedi_subdevice *s,
+                                                  short *dma_buffer,
+                                                  unsigned int num_samples)
+{
+        struct addi_private *devpriv = dev->private;
 
-        outw(8191 | APCI3120_ANALOG_OP_CHANNEL_5, dev->iobase + APCI3120_ANALOG_OUTPUT_2);      /* channel 5 */
-        outw(8191 | APCI3120_ANALOG_OP_CHANNEL_6, dev->iobase + APCI3120_ANALOG_OUTPUT_2);      /* channel 6 */
-        outw(8191 | APCI3120_ANALOG_OP_CHANNEL_7, dev->iobase + APCI3120_ANALOG_OUTPUT_2);      /* channel 7 */
-        outw(8191 | APCI3120_ANALOG_OP_CHANNEL_8, dev->iobase + APCI3120_ANALOG_OUTPUT_2);      /* channel 8 */
+        devpriv->ui_AiActualScan +=
+                (s->async->cur_chan + num_samples) / devpriv->ui_AiScanLength;
+        s->async->cur_chan += num_samples;
+        s->async->cur_chan %= devpriv->ui_AiScanLength;
 
-        /*   Reset digital output to L0W */
+        cfc_write_array_to_buffer(s, dma_buffer, num_samples * sizeof(short));
+}
 
-/* ES05  outb(0x0,dev->iobase+APCI3120_DIGITAL_OUTPUT); */
-        udelay(10);
+/*
+ * This is a handler for the DMA interrupt.
+ * This function copies the data to Comedi Buffer.
+ * For continuous DMA it reinitializes the DMA operation.
+ * For single mode DMA it stop the acquisition.
+ */
+static void v_APCI3120_InterruptDma(int irq, void *d)
+{
+        struct comedi_device *dev = d;
+        struct addi_private *devpriv = dev->private;
+        struct comedi_subdevice *s = &dev->subdevices[0];
+        unsigned int next_dma_buf, samplesinbuf;
+        unsigned long low_word, high_word, var;
+        unsigned int ui_Tmp;
 
-        inw(dev->iobase + 0);   /* make a dummy read */
-        inb(dev->iobase + APCI3120_RESET_FIFO); /*  flush FIFO */
-        inw(dev->iobase + APCI3120_RD_STATUS);  /*  flush A/D status register */
+        samplesinbuf =
+                devpriv->ui_DmaBufferUsesize[devpriv->ui_DmaActualBuffer] -
+                inl(devpriv->i_IobaseAmcc + AMCC_OP_REG_MWTC);
 
-        /* code to reset the RAM sequence */
-        for (i = 0; i < 16; i++) {
-                us_TmpValue = i << 8;   /* select the location */
-                outw(us_TmpValue, dev->iobase + APCI3120_SEQ_RAM_ADDRESS);
+        if (samplesinbuf <
+                devpriv->ui_DmaBufferUsesize[devpriv->ui_DmaActualBuffer]) {
+                comedi_error(dev, "Interrupted DMA transfer!");
         }
-        return 0;
-}
+        if (samplesinbuf & 1) {
+                comedi_error(dev, "Odd count of bytes in DMA ring!");
+                i_APCI3120_StopCyclicAcquisition(dev, s);
+                devpriv->b_AiCyclicAcquisition = APCI3120_DISABLE;
+
+                return;
+        }
+        samplesinbuf = samplesinbuf >> 1;       /*  number of received samples */
+        if (devpriv->b_DmaDoubleBuffer) {
+                /*  switch DMA buffers if is used double buffering */
+                next_dma_buf = 1 - devpriv->ui_DmaActualBuffer;
+
+                ui_Tmp = AGCSTS_TC_ENABLE | AGCSTS_RESET_A2P_FIFO;
+                outl(ui_Tmp, devpriv->i_IobaseAddon + AMCC_OP_REG_AGCSTS);
+
+                /*  changed  since 16 bit interface for add on */
+                outw(APCI3120_ADD_ON_AGCSTS_LOW, devpriv->i_IobaseAddon + 0);
+                outw(APCI3120_ENABLE_TRANSFER_ADD_ON_LOW,
+                        devpriv->i_IobaseAddon + 2);
+                outw(APCI3120_ADD_ON_AGCSTS_HIGH, devpriv->i_IobaseAddon + 0);
+                outw(APCI3120_ENABLE_TRANSFER_ADD_ON_HIGH, devpriv->i_IobaseAddon + 2); /*  0x1000 is out putted in windows driver */
+
+                var = devpriv->ul_DmaBufferHw[next_dma_buf];
+                low_word = var & 0xffff;
+                var = devpriv->ul_DmaBufferHw[next_dma_buf];
+                high_word = var / 65536;
+
+                /* DMA Start Address Low */
+                outw(APCI3120_ADD_ON_MWAR_LOW, devpriv->i_IobaseAddon + 0);
+                outw(low_word, devpriv->i_IobaseAddon + 2);
+
+                /* DMA Start Address High */
+                outw(APCI3120_ADD_ON_MWAR_HIGH, devpriv->i_IobaseAddon + 0);
+                outw(high_word, devpriv->i_IobaseAddon + 2);
+
+                var = devpriv->ui_DmaBufferUsesize[next_dma_buf];
+                low_word = var & 0xffff;
+                var = devpriv->ui_DmaBufferUsesize[next_dma_buf];
+                high_word = var / 65536;
+
+                /* Nbr of acquisition LOW */
+                outw(APCI3120_ADD_ON_MWTC_LOW, devpriv->i_IobaseAddon + 0);
+                outw(low_word, devpriv->i_IobaseAddon + 2);
+
+                /* Nbr of acquisition HIGH */
+                outw(APCI3120_ADD_ON_MWTC_HIGH, devpriv->i_IobaseAddon + 0);
+                outw(high_word, devpriv->i_IobaseAddon + 2);
 
 /*
-+----------------------------------------------------------------------------+
-| Function name     : int i_APCI3120_SetupChannelList(struct comedi_device * dev,   |
-|                     struct comedi_subdevice * s, int n_chan,unsigned int *chanlist|
-|                         ,char check)                                                                                   |
-|                                                                                                |
-+----------------------------------------------------------------------------+
-| Task              :This function will first check channel list is ok or not|
-|and then initialize the sequence RAM with the polarity, Gain,Channel number |
-|If the last argument of function "check"is 1 then it only checks the channel|
-|list is ok or not.                                                                                                              |
-|                                                                                                                |
-+----------------------------------------------------------------------------+
-| Input Parameters  : struct comedi_device * dev                                                                         |
-|                     struct comedi_subdevice * s                                                                        |
-|                     int n_chan                                                                 |
-                          unsigned int *chanlist
-                          char check
-+----------------------------------------------------------------------------+
-| Return Value      :                                                                            |
-|                                                                                                                            |
-+----------------------------------------------------------------------------+
-*/
+ * To configure A2P FIFO
+ * ENABLE A2P FIFO WRITE AND ENABLE AMWEN
+ * AMWEN_ENABLE | A2P_FIFO_WRITE_ENABLE (0x01|0x02)=0x03
+ */
+                outw(3, devpriv->i_IobaseAddon + 4);
+                /* initialise end of dma interrupt  AINT_WRITE_COMPL = ENABLE_WRITE_TC_INT(ADDI) */
+                outl((APCI3120_FIFO_ADVANCE_ON_BYTE_2 |
+                                APCI3120_ENABLE_WRITE_TC_INT),
+                        devpriv->i_IobaseAmcc + AMCC_OP_REG_INTCSR);
 
-int i_APCI3120_SetupChannelList(struct comedi_device *dev, struct comedi_subdevice *s,
-        int n_chan, unsigned int *chanlist, char check)
-{
-        unsigned int i;         /* , differencial=0, bipolar=0; */
-        unsigned int gain;
-        unsigned short us_TmpValue;
+        }
+        if (samplesinbuf) {
+                v_APCI3120_InterruptDmaMoveBlock16bit(dev, s,
+                        devpriv->ul_DmaBufferVirtual[devpriv->
+                                ui_DmaActualBuffer], samplesinbuf);
 
-        /* correct channel and range number check itself comedi/range.c */
-        if (n_chan < 1) {
-                if (!check)
-                        comedi_error(dev, "range/channel list is empty!");
-                return 0;
+                if (!(devpriv->ui_AiFlags & TRIG_WAKE_EOS)) {
+                        s->async->events |= COMEDI_CB_EOS;
+                        comedi_event(dev, s);
+                }
         }
-        /*  All is ok, so we can setup channel/range list */
-        if (check)
-                return 1;
+        if (!devpriv->b_AiContinuous)
+                if (devpriv->ui_AiActualScan >= devpriv->ui_AiNbrofScans) {
+                        /*  all data sampled */
+                        i_APCI3120_StopCyclicAcquisition(dev, s);
+                        devpriv->b_AiCyclicAcquisition = APCI3120_DISABLE;
+                        s->async->events |= COMEDI_CB_EOA;
+                        comedi_event(dev, s);
+                        return;
+                }
 
-        /* Code  to set the PA and PR...Here it set PA to 0.. */
-        devpriv->us_OutputRegister =
-                devpriv->us_OutputRegister & APCI3120_CLEAR_PA_PR;
-        devpriv->us_OutputRegister = ((n_chan - 1) & 0xf) << 8;
-        outw(devpriv->us_OutputRegister, dev->iobase + APCI3120_WR_ADDRESS);
+        if (devpriv->b_DmaDoubleBuffer) {       /*  switch dma buffers */
+                devpriv->ui_DmaActualBuffer = 1 - devpriv->ui_DmaActualBuffer;
+        } else {
+/*
+ * restart DMA if is not used double buffering
+ * ADDED REINITIALISE THE DMA
+ */
+                ui_Tmp = AGCSTS_TC_ENABLE | AGCSTS_RESET_A2P_FIFO;
+                outl(ui_Tmp, devpriv->i_IobaseAddon + AMCC_OP_REG_AGCSTS);
 
-        for (i = 0; i < n_chan; i++) {
-                /*  store range list to card */
-                us_TmpValue = CR_CHAN(chanlist[i]);     /*  get channel number; */
+                /*  changed  since 16 bit interface for add on */
+                outw(APCI3120_ADD_ON_AGCSTS_LOW, devpriv->i_IobaseAddon + 0);
+                outw(APCI3120_ENABLE_TRANSFER_ADD_ON_LOW,
+                        devpriv->i_IobaseAddon + 2);
+                outw(APCI3120_ADD_ON_AGCSTS_HIGH, devpriv->i_IobaseAddon + 0);
+                outw(APCI3120_ENABLE_TRANSFER_ADD_ON_HIGH, devpriv->i_IobaseAddon + 2); /*  */
+/*
+ * A2P FIFO MANAGEMENT
+ * A2P fifo reset & transfer control enable
+ */
+                outl(APCI3120_A2P_FIFO_MANAGEMENT,
+                        devpriv->i_IobaseAmcc + AMCC_OP_REG_MCSR);
 
-                if (CR_RANGE(chanlist[i]) < APCI3120_BIPOLAR_RANGES)
-                        us_TmpValue &= ((~APCI3120_UNIPOLAR) & 0xff);   /*  set bipolar */
-                else
-                        us_TmpValue |= APCI3120_UNIPOLAR;       /*  enable unipolar...... */
+                var = devpriv->ul_DmaBufferHw[0];
+                low_word = var & 0xffff;
+                var = devpriv->ul_DmaBufferHw[0];
+                high_word = var / 65536;
+                outw(APCI3120_ADD_ON_MWAR_LOW, devpriv->i_IobaseAddon + 0);
+                outw(low_word, devpriv->i_IobaseAddon + 2);
+                outw(APCI3120_ADD_ON_MWAR_HIGH, devpriv->i_IobaseAddon + 0);
+                outw(high_word, devpriv->i_IobaseAddon + 2);
 
-                gain = CR_RANGE(chanlist[i]);   /*  get gain number */
-                us_TmpValue |= ((gain & 0x03) << 4);    /* <<4 for G0 and G1 bit in RAM */
-                us_TmpValue |= i << 8;  /* To select the RAM LOCATION.... */
-                outw(us_TmpValue, dev->iobase + APCI3120_SEQ_RAM_ADDRESS);
+                var = devpriv->ui_DmaBufferUsesize[0];
+                low_word = var & 0xffff;        /* changed */
+                var = devpriv->ui_DmaBufferUsesize[0];
+                high_word = var / 65536;
+                outw(APCI3120_ADD_ON_MWTC_LOW, devpriv->i_IobaseAddon + 0);
+                outw(low_word, devpriv->i_IobaseAddon + 2);
+                outw(APCI3120_ADD_ON_MWTC_HIGH, devpriv->i_IobaseAddon + 0);
+                outw(high_word, devpriv->i_IobaseAddon + 2);
 
-                printk("\n Gain = %i",
-                        (((unsigned char)CR_RANGE(chanlist[i]) & 0x03) << 2));
-                printk("\n Channel = %i", CR_CHAN(chanlist[i]));
-                printk("\n Polarity = %i", us_TmpValue & APCI3120_UNIPOLAR);
+/*
+ * To configure A2P FIFO
+ * ENABLE A2P FIFO WRITE AND ENABLE AMWEN
+ * AMWEN_ENABLE | A2P_FIFO_WRITE_ENABLE (0x01|0x02)=0x03
+ */
+                outw(3, devpriv->i_IobaseAddon + 4);
+                /* initialise end of dma interrupt  AINT_WRITE_COMPL = ENABLE_WRITE_TC_INT(ADDI) */
+                outl((APCI3120_FIFO_ADVANCE_ON_BYTE_2 |
+                                APCI3120_ENABLE_WRITE_TC_INT),
+                        devpriv->i_IobaseAmcc + AMCC_OP_REG_INTCSR);
         }
-        return 1;               /*  we can serve this with scan logic */
 }
 
 /*
-+----------------------------------------------------------------------------+
-| Function name     :   int i_APCI3120_ExttrigEnable(struct comedi_device * dev)    |
-|                                                                                                                |
-|                                                                                                |
-+----------------------------------------------------------------------------+
-| Task              :   Enable the external trigger                                                  |
-|                                                                                                                |
-+----------------------------------------------------------------------------+
-| Input Parameters  :   struct comedi_device * dev                                                                       |
-|                                                                                                                                |
-|                                                                                                |
-+----------------------------------------------------------------------------+
-| Return Value      :      0                                                                     |
-|                                                                                                                            |
-+----------------------------------------------------------------------------+
-*/
-
-int i_APCI3120_ExttrigEnable(struct comedi_device *dev)
+ * This function handles EOS interrupt.
+ * This function copies the acquired data(from FIFO) to Comedi buffer.
+ */
+static int i_APCI3120_InterruptHandleEos(struct comedi_device *dev)
 {
+        struct addi_private *devpriv = dev->private;
+        int n_chan, i;
+        struct comedi_subdevice *s = &dev->subdevices[0];
+        int err = 1;
 
-        devpriv->us_OutputRegister |= APCI3120_ENABLE_EXT_TRIGGER;
-        outw(devpriv->us_OutputRegister, dev->iobase + APCI3120_WR_ADDRESS);
-        return 0;
-}
+        n_chan = devpriv->ui_AiNbrofChannels;
 
-/*
-+----------------------------------------------------------------------------+
-| Function name     :   int i_APCI3120_ExttrigDisable(struct comedi_device * dev)   |
-|                                                                                                                |
-+----------------------------------------------------------------------------+
-| Task              :   Disables the external trigger                                        |
-|                                                                                                                |
-+----------------------------------------------------------------------------+
-| Input Parameters  :   struct comedi_device * dev                                                                       |
-|                                                                                                                                |
-|                                                                                                |
-+----------------------------------------------------------------------------+
-| Return Value      :    0                                                                       |
-|                                                                                                                            |
-+----------------------------------------------------------------------------+
-*/
+        s->async->events = 0;
 
-int i_APCI3120_ExttrigDisable(struct comedi_device *dev)
-{
-        devpriv->us_OutputRegister &= ~APCI3120_ENABLE_EXT_TRIGGER;
-        outw(devpriv->us_OutputRegister, dev->iobase + APCI3120_WR_ADDRESS);
-        return 0;
-}
+        for (i = 0; i < n_chan; i++)
+                err &= comedi_buf_put(s->async, inw(dev->iobase + 0));
 
-/*
-+----------------------------------------------------------------------------+
-|                    intERRUPT FUNCTIONS                                                 |
-+----------------------------------------------------------------------------+
-*/
+        s->async->events |= COMEDI_CB_EOS;
 
-/*
-+----------------------------------------------------------------------------+
-| Function name     : void v_APCI3120_Interrupt(int irq, void *d)                                                                |
-|                                                                                                                |
-|                                                                                                |
-+----------------------------------------------------------------------------+
-| Task              :Interrupt handler for APCI3120                              |
-|                        When interrupt occurs this gets called.                 |
-|                        First it finds which interrupt has been generated and   |
-|                        handles  corresponding interrupt                        |
-|                                                                                                                |
-+----------------------------------------------------------------------------+
-| Input Parameters  :   int irq                                                                                          |
-|                        void *d                                                                                         |
-|                                                                                                |
-+----------------------------------------------------------------------------+
-| Return Value      : void                                                                       |
-|                                                                                                                            |
-+----------------------------------------------------------------------------+
-*/
+        if (err == 0)
+                s->async->events |= COMEDI_CB_OVERFLOW;
+
+        comedi_event(dev, s);
+
+        return 0;
+}
 
-void v_APCI3120_Interrupt(int irq, void *d)
+static void v_APCI3120_Interrupt(int irq, void *d)
 {
         struct comedi_device *dev = d;
+        struct addi_private *devpriv = dev->private;
         unsigned short int_daq;
-
         unsigned int int_amcc, ui_Check, i;
         unsigned short us_TmpValue;
         unsigned char b_DummyRead;
-
         struct comedi_subdevice *s = &dev->subdevices[0];
+
         ui_Check = 1;
 
         int_daq = inw(dev->iobase + APCI3120_RD_STATUS) & 0xf000;       /*  get IRQ reasons */
@@ -1602,284 +1788,20 @@ void v_APCI3120_Interrupt(int irq, void *d)
 }
 
 /*
-+----------------------------------------------------------------------------+
-| Function name     :int i_APCI3120_InterruptHandleEos(struct comedi_device *dev)   |
-|                                                                                                                |
-|                                                                                                |
-+----------------------------------------------------------------------------+
-| Task              : This function handles EOS interrupt.                   |
-|                     This function copies the acquired data(from FIFO)      |
-|                               to Comedi buffer.                                                                        |
-|                                                                                                                |
-+----------------------------------------------------------------------------+
-| Input Parameters  : struct comedi_device *dev                                                                  |
-|                                                                                                                                |
-|                                                                                                |
-+----------------------------------------------------------------------------+
-| Return Value      : 0                                                                          |
-|                                                                                                                            |
-+----------------------------------------------------------------------------+
-*/
-
-
-int i_APCI3120_InterruptHandleEos(struct comedi_device *dev)
-{
-        int n_chan, i;
-        struct comedi_subdevice *s = &dev->subdevices[0];
-        int err = 1;
-
-        n_chan = devpriv->ui_AiNbrofChannels;
-
-        s->async->events = 0;
-
-        for (i = 0; i < n_chan; i++)
-                err &= comedi_buf_put(s->async, inw(dev->iobase + 0));
-
-        s->async->events |= COMEDI_CB_EOS;
-
-        if (err == 0)
-                s->async->events |= COMEDI_CB_OVERFLOW;
-
-        comedi_event(dev, s);
-
-        return 0;
-}
-
-/*
-+----------------------------------------------------------------------------+
-| Function name     : void v_APCI3120_InterruptDma(int irq, void *d)                                                                     |
-|                                                                                                                |
-+----------------------------------------------------------------------------+
-| Task              : This is a handler for the DMA interrupt                |
-|                         This function copies the data to Comedi Buffer.        |
-|                         For continuous DMA it reinitializes the DMA operation. |
-|                         For single mode DMA it stop the acquisition.           |
-|                                                                                                                                |
-+----------------------------------------------------------------------------+
-| Input Parameters  : int irq, void *d                           |
-|                                                                                                                                |
-+----------------------------------------------------------------------------+
-| Return Value      :  void                                                                      |
-|                                                                                                                            |
-+----------------------------------------------------------------------------+
-*/
-
-void v_APCI3120_InterruptDma(int irq, void *d)
-{
-        struct comedi_device *dev = d;
-        struct comedi_subdevice *s = &dev->subdevices[0];
-        unsigned int next_dma_buf, samplesinbuf;
-        unsigned long low_word, high_word, var;
-
-        unsigned int ui_Tmp;
-        samplesinbuf =
-                devpriv->ui_DmaBufferUsesize[devpriv->ui_DmaActualBuffer] -
-                inl(devpriv->i_IobaseAmcc + AMCC_OP_REG_MWTC);
-
-        if (samplesinbuf <
-                devpriv->ui_DmaBufferUsesize[devpriv->ui_DmaActualBuffer]) {
-                comedi_error(dev, "Interrupted DMA transfer!");
-        }
-        if (samplesinbuf & 1) {
-                comedi_error(dev, "Odd count of bytes in DMA ring!");
-                i_APCI3120_StopCyclicAcquisition(dev, s);
-                devpriv->b_AiCyclicAcquisition = APCI3120_DISABLE;
-
-                return;
-        }
-        samplesinbuf = samplesinbuf >> 1;       /*  number of received samples */
-        if (devpriv->b_DmaDoubleBuffer) {
-                /*  switch DMA buffers if is used double buffering */
-                next_dma_buf = 1 - devpriv->ui_DmaActualBuffer;
-
-                ui_Tmp = AGCSTS_TC_ENABLE | AGCSTS_RESET_A2P_FIFO;
-                outl(ui_Tmp, devpriv->i_IobaseAddon + AMCC_OP_REG_AGCSTS);
-
-                /*  changed  since 16 bit interface for add on */
-                outw(APCI3120_ADD_ON_AGCSTS_LOW, devpriv->i_IobaseAddon + 0);
-                outw(APCI3120_ENABLE_TRANSFER_ADD_ON_LOW,
-                        devpriv->i_IobaseAddon + 2);
-                outw(APCI3120_ADD_ON_AGCSTS_HIGH, devpriv->i_IobaseAddon + 0);
-                outw(APCI3120_ENABLE_TRANSFER_ADD_ON_HIGH, devpriv->i_IobaseAddon + 2); /*  0x1000 is out putted in windows driver */
-
-                var = devpriv->ul_DmaBufferHw[next_dma_buf];
-                low_word = var & 0xffff;
-                var = devpriv->ul_DmaBufferHw[next_dma_buf];
-                high_word = var / 65536;
-
-                /* DMA Start Address Low */
-                outw(APCI3120_ADD_ON_MWAR_LOW, devpriv->i_IobaseAddon + 0);
-                outw(low_word, devpriv->i_IobaseAddon + 2);
-
-                /* DMA Start Address High */
-                outw(APCI3120_ADD_ON_MWAR_HIGH, devpriv->i_IobaseAddon + 0);
-                outw(high_word, devpriv->i_IobaseAddon + 2);
-
-                var = devpriv->ui_DmaBufferUsesize[next_dma_buf];
-                low_word = var & 0xffff;
-                var = devpriv->ui_DmaBufferUsesize[next_dma_buf];
-                high_word = var / 65536;
-
-                /* Nbr of acquisition LOW */
-                outw(APCI3120_ADD_ON_MWTC_LOW, devpriv->i_IobaseAddon + 0);
-                outw(low_word, devpriv->i_IobaseAddon + 2);
-
-                /* Nbr of acquisition HIGH */
-                outw(APCI3120_ADD_ON_MWTC_HIGH, devpriv->i_IobaseAddon + 0);
-                outw(high_word, devpriv->i_IobaseAddon + 2);
-
-/*
- * To configure A2P FIFO
- * ENABLE A2P FIFO WRITE AND ENABLE AMWEN
- * AMWEN_ENABLE | A2P_FIFO_WRITE_ENABLE (0x01|0x02)=0x03
+ * Configure Timer 2
+ *
+ * data[0] = TIMER configure as timer
+ *         = WATCHDOG configure as watchdog
+ * data[1] = Timer constant
+ * data[2] = Timer2 interrupt (1)enable or(0) disable
  */
-                outw(3, devpriv->i_IobaseAddon + 4);
-                /* initialise end of dma interrupt  AINT_WRITE_COMPL = ENABLE_WRITE_TC_INT(ADDI) */
-                outl((APCI3120_FIFO_ADVANCE_ON_BYTE_2 |
-                                APCI3120_ENABLE_WRITE_TC_INT),
-                        devpriv->i_IobaseAmcc + AMCC_OP_REG_INTCSR);
-
-        }
-        if (samplesinbuf) {
-                v_APCI3120_InterruptDmaMoveBlock16bit(dev, s,
-                        devpriv->ul_DmaBufferVirtual[devpriv->
-                                ui_DmaActualBuffer], samplesinbuf);
-
-                if (!(devpriv->ui_AiFlags & TRIG_WAKE_EOS)) {
-                        s->async->events |= COMEDI_CB_EOS;
-                        comedi_event(dev, s);
-                }
-        }
-        if (!devpriv->b_AiContinuous)
-                if (devpriv->ui_AiActualScan >= devpriv->ui_AiNbrofScans) {
-                        /*  all data sampled */
-                        i_APCI3120_StopCyclicAcquisition(dev, s);
-                        devpriv->b_AiCyclicAcquisition = APCI3120_DISABLE;
-                        s->async->events |= COMEDI_CB_EOA;
-                        comedi_event(dev, s);
-                        return;
-                }
-
-        if (devpriv->b_DmaDoubleBuffer) {       /*  switch dma buffers */
-                devpriv->ui_DmaActualBuffer = 1 - devpriv->ui_DmaActualBuffer;
-        } else {
-/*
- * restart DMA if is not used double buffering
- * ADDED REINITIALISE THE DMA
- */
-                ui_Tmp = AGCSTS_TC_ENABLE | AGCSTS_RESET_A2P_FIFO;
-                outl(ui_Tmp, devpriv->i_IobaseAddon + AMCC_OP_REG_AGCSTS);
-
-                /*  changed  since 16 bit interface for add on */
-                outw(APCI3120_ADD_ON_AGCSTS_LOW, devpriv->i_IobaseAddon + 0);
-                outw(APCI3120_ENABLE_TRANSFER_ADD_ON_LOW,
-                        devpriv->i_IobaseAddon + 2);
-                outw(APCI3120_ADD_ON_AGCSTS_HIGH, devpriv->i_IobaseAddon + 0);
-                outw(APCI3120_ENABLE_TRANSFER_ADD_ON_HIGH, devpriv->i_IobaseAddon + 2); /*  */
-/*
- * A2P FIFO MANAGEMENT
- * A2P fifo reset & transfer control enable
- */
-                outl(APCI3120_A2P_FIFO_MANAGEMENT,
-                        devpriv->i_IobaseAmcc + AMCC_OP_REG_MCSR);
-
-                var = devpriv->ul_DmaBufferHw[0];
-                low_word = var & 0xffff;
-                var = devpriv->ul_DmaBufferHw[0];
-                high_word = var / 65536;
-                outw(APCI3120_ADD_ON_MWAR_LOW, devpriv->i_IobaseAddon + 0);
-                outw(low_word, devpriv->i_IobaseAddon + 2);
-                outw(APCI3120_ADD_ON_MWAR_HIGH, devpriv->i_IobaseAddon + 0);
-                outw(high_word, devpriv->i_IobaseAddon + 2);
-
-                var = devpriv->ui_DmaBufferUsesize[0];
-                low_word = var & 0xffff;        /* changed */
-                var = devpriv->ui_DmaBufferUsesize[0];
-                high_word = var / 65536;
-                outw(APCI3120_ADD_ON_MWTC_LOW, devpriv->i_IobaseAddon + 0);
-                outw(low_word, devpriv->i_IobaseAddon + 2);
-                outw(APCI3120_ADD_ON_MWTC_HIGH, devpriv->i_IobaseAddon + 0);
-                outw(high_word, devpriv->i_IobaseAddon + 2);
-
-/*
- * To configure A2P FIFO
- * ENABLE A2P FIFO WRITE AND ENABLE AMWEN
- * AMWEN_ENABLE | A2P_FIFO_WRITE_ENABLE (0x01|0x02)=0x03
- */
-                outw(3, devpriv->i_IobaseAddon + 4);
-                /* initialise end of dma interrupt  AINT_WRITE_COMPL = ENABLE_WRITE_TC_INT(ADDI) */
-                outl((APCI3120_FIFO_ADVANCE_ON_BYTE_2 |
-                                APCI3120_ENABLE_WRITE_TC_INT),
-                        devpriv->i_IobaseAmcc + AMCC_OP_REG_INTCSR);
-        }
-}
-
-/*
-+----------------------------------------------------------------------------+
-| Function name     :void v_APCI3120_InterruptDmaMoveBlock16bit(comedi_device|
-|*dev,struct comedi_subdevice *s,short *dma,short *data,int n)                               |
-|                                                                                                                |
-+----------------------------------------------------------------------------+
-| Task              : This function copies the data from DMA buffer to the   |
-|                                Comedi buffer                                                                           |
-|                                                                                                                |
-+----------------------------------------------------------------------------+
-| Input Parameters  : struct comedi_device *dev                                                                  |
-|                     struct comedi_subdevice *s                                                                         |
-|                     short *dma                                                                                         |
-|                     short *data,int n                                                          |
-+----------------------------------------------------------------------------+
-| Return Value      : void                                                                       |
-|                                                                                                                            |
-+----------------------------------------------------------------------------+
-*/
-
-void v_APCI3120_InterruptDmaMoveBlock16bit(struct comedi_device *dev,
-        struct comedi_subdevice *s, short *dma_buffer, unsigned int num_samples)
-{
-        devpriv->ui_AiActualScan +=
-                (s->async->cur_chan + num_samples) / devpriv->ui_AiScanLength;
-        s->async->cur_chan += num_samples;
-        s->async->cur_chan %= devpriv->ui_AiScanLength;
-
-        cfc_write_array_to_buffer(s, dma_buffer, num_samples * sizeof(short));
-}
-
-/*
-+----------------------------------------------------------------------------+
-|                           TIMER SUBDEVICE                                      |
-+----------------------------------------------------------------------------+
-*/
-
-/*
-+----------------------------------------------------------------------------+
-| Function name     :int i_APCI3120_InsnConfigTimer(struct comedi_device *dev,          |
-|       struct comedi_subdevice *s,struct comedi_insn *insn,unsigned int *data)                              |
-|                                                                                                                |
-+----------------------------------------------------------------------------+
-| Task              :Configure Timer 2                                                                       |
-|                                                                                                                |
-+----------------------------------------------------------------------------+
-| Input Parameters  : struct comedi_device *dev                                                                  |
-|                     struct comedi_subdevice *s                                                                         |
-|                     struct comedi_insn *insn                                      |
-|                     unsigned int *data                                                                                 |
-|                                                                                                                                |
-|                      data[0]= TIMER  configure as timer                    |
-|                                        = WATCHDOG configure as watchdog                                |
-|                                 data[1] = Timer constant                                                       |
-|                                 data[2] = Timer2 interrupt (1)enable or(0) disable |
-|                                                                                                |
-+----------------------------------------------------------------------------+
-| Return Value      :                                                                            |
-|                                                                                                                            |
-+----------------------------------------------------------------------------+
-*/
-
-int i_APCI3120_InsnConfigTimer(struct comedi_device *dev, struct comedi_subdevice *s,
-        struct comedi_insn *insn, unsigned int *data)
+static int i_APCI3120_InsnConfigTimer(struct comedi_device *dev,
+                                      struct comedi_subdevice *s,
+                                      struct comedi_insn *insn,
+                                      unsigned int *data)
 {
-
+        const struct addi_board *this_board = comedi_board(dev);
+        struct addi_private *devpriv = dev->private;
         unsigned int ui_Timervalue2;
         unsigned short us_TmpValue;
         unsigned char b_Tmp;
@@ -2007,37 +1929,24 @@ int i_APCI3120_InsnConfigTimer(struct comedi_device *dev, struct comedi_subdevic
 }
 
 /*
-+----------------------------------------------------------------------------+
-| Function name     :int i_APCI3120_InsnWriteTimer(struct comedi_device *dev,           |
-|                    struct comedi_subdevice *s, struct comedi_insn *insn,unsigned int *data)  |
-|                                                                                                |
-+----------------------------------------------------------------------------+
-| Task              :    To start and stop the timer                             |
-+----------------------------------------------------------------------------+
-| Input Parameters  : struct comedi_device *dev                                                                  |
-|                     struct comedi_subdevice *s                                                                         |
-|                     struct comedi_insn *insn                                      |
-|                     unsigned int *data                                         |
-|                                                                            |
-|                               data[0] = 1 (start)                                  |
-|                               data[0] = 0 (stop )                                  |
-|                               data[0] = 2  (write new value)                       |
-|                               data[1]= new value                                   |
-|                                                                            |
-|                               devpriv->b_Timer2Mode =  0 DISABLE                   |
-|                                                                1 Timer                     |
-|                                                                                2 Watch dog                         |
-|                                                                                                |
-+----------------------------------------------------------------------------+
-| Return Value      :                                                                            |
-|                                                                                                                            |
-+----------------------------------------------------------------------------+
-*/
-
-int i_APCI3120_InsnWriteTimer(struct comedi_device *dev, struct comedi_subdevice *s,
-        struct comedi_insn *insn, unsigned int *data)
+ * To start and stop the timer
+ *
+ * data[0] = 1 (start)
+ *         = 0 (stop)
+ *         = 2 (write new value)
+ * data[1] = new value
+ *
+ * devpriv->b_Timer2Mode = 0 DISABLE
+ *                       = 1 Timer
+ *                       = 2 Watch dog
+ */
+static int i_APCI3120_InsnWriteTimer(struct comedi_device *dev,
+                                     struct comedi_subdevice *s,
+                                     struct comedi_insn *insn,
+                                     unsigned int *data)
 {
-
+        const struct addi_board *this_board = comedi_board(dev);
+        struct addi_private *devpriv = dev->private;
         unsigned int ui_Timervalue2 = 0;
         unsigned short us_TmpValue;
         unsigned char b_Tmp;
@@ -2196,31 +2105,19 @@ int i_APCI3120_InsnWriteTimer(struct comedi_device *dev, struct comedi_subdevice
 }
 
 /*
-+----------------------------------------------------------------------------+
-| Function name     : int i_APCI3120_InsnReadTimer(struct comedi_device *dev,           |
-|               struct comedi_subdevice *s,struct comedi_insn *insn, unsigned int *data)                 |
-|                                                                                                                |
-|                                                                                                |
-+----------------------------------------------------------------------------+
-| Task              : read the Timer value                                                       |
-+----------------------------------------------------------------------------+
-| Input Parameters  :   struct comedi_device *dev                                                                        |
-|                     struct comedi_subdevice *s                                                                         |
-|                     struct comedi_insn *insn                                      |
-|                     unsigned int *data                                                                                 |
-|                                                                                                                                |
-+----------------------------------------------------------------------------+
-| Return Value      :                                                                                                            |
-|                       for Timer:      data[0]= Timer constant                                          |
-|                                                                                                                                        |
-|                       for watchdog: data[0]=0 (still running)                  |
-|                                         data[0]=1  (run down)                                  |
-|                                                                                                                            |
-+----------------------------------------------------------------------------+
-*/
-int i_APCI3120_InsnReadTimer(struct comedi_device *dev, struct comedi_subdevice *s,
-        struct comedi_insn *insn, unsigned int *data)
+ * Read the Timer value
+ *
+ * for Timer: data[0]= Timer constant
+ *
+ * for watchdog: data[0] = 0 (still running)
+ *                       = 1 (run down)
+ */
+static int i_APCI3120_InsnReadTimer(struct comedi_device *dev,
+                                    struct comedi_subdevice *s,
+                                    struct comedi_insn *insn,
+                                    unsigned int *data)
 {
+        struct addi_private *devpriv = dev->private;
         unsigned char b_Tmp;
         unsigned short us_TmpValue, us_TmpValue_2, us_StatusValue;
 
@@ -2265,299 +2162,52 @@ int i_APCI3120_InsnReadTimer(struct comedi_device *dev, struct comedi_subdevice
         return insn->n;
 }
 
-/*
-+----------------------------------------------------------------------------+
-|                           DIGITAL INPUT SUBDEVICE                              |
-+----------------------------------------------------------------------------+
-*/
-
-/*
-+----------------------------------------------------------------------------+
-| Function name     :int i_APCI3120_InsnReadDigitalInput(struct comedi_device *dev,     |
-|                       struct comedi_subdevice *s, struct comedi_insn *insn,unsigned int *data)   |
-|                                                                                                                |
-|                                                                                                |
-+----------------------------------------------------------------------------+
-| Task              : Reads the value of the specified  Digital input channel|
-|                                                                                                                |
-+----------------------------------------------------------------------------+
-| Input Parameters  : struct comedi_device *dev                                                                  |
-|                     struct comedi_subdevice *s                                                                         |
-|                     struct comedi_insn *insn                                      |
-|                     unsigned int *data                                                                                 |
-+----------------------------------------------------------------------------+
-| Return Value      :                                                                            |
-|                                                                                                                            |
-+----------------------------------------------------------------------------+
-*/
-
-int i_APCI3120_InsnReadDigitalInput(struct comedi_device *dev,
-                                    struct comedi_subdevice *s,
-                                    struct comedi_insn *insn,
-                                    unsigned int *data)
-{
-        unsigned int ui_Chan, ui_TmpValue;
-
-        ui_Chan = CR_CHAN(insn->chanspec);      /*  channel specified */
-
-        /* this_board->di_read(dev,ui_Chan,data); */
-        if (ui_Chan <= 3) {
-                ui_TmpValue = (unsigned int) inw(devpriv->iobase + APCI3120_RD_STATUS);
-
-/*
- * since only 1 channel reqd to bring it to last bit it is rotated 8
- * +(chan - 1) times then ANDed with 1 for last bit.
- */
-                *data = (ui_TmpValue >> (ui_Chan + 8)) & 1;
-                /* return 0; */
-        } else {
-                /*       comedi_error(dev," chan spec wrong"); */
-                return -EINVAL; /*  "sorry channel spec wrong " */
-        }
-        return insn->n;
-
-}
-
-/*
-+----------------------------------------------------------------------------+
-| Function name     :int i_APCI3120_InsnBitsDigitalInput(struct comedi_device *dev, |
-|struct comedi_subdevice *s, struct comedi_insn *insn,unsigned int *data)                      |
-|                                                                                                                |
-+----------------------------------------------------------------------------+
-| Task              : Reads the value of the Digital input Port i.e.4channels|
-|   value is returned in data[0]                                                                                         |
-|                                                                                                                |
-+----------------------------------------------------------------------------+
-| Input Parameters  : struct comedi_device *dev                                                                  |
-|                     struct comedi_subdevice *s                                                                         |
-|                     struct comedi_insn *insn                                      |
-|                     unsigned int *data                                                                                 |
-+----------------------------------------------------------------------------+
-| Return Value      :                                                                            |
-|                                                                                                                            |
-+----------------------------------------------------------------------------+
-*/
-int i_APCI3120_InsnBitsDigitalInput(struct comedi_device *dev, struct comedi_subdevice *s,
-        struct comedi_insn *insn, unsigned int *data)
-{
-        unsigned int ui_TmpValue;
-        ui_TmpValue = (unsigned int) inw(devpriv->iobase + APCI3120_RD_STATUS);
-        /*****  state of 4 channels  in the 11, 10, 9, 8   bits of status reg
-                        rotated right 8 times to bring them to last four bits
-                        ANDed with oxf for  value.
-        *****/
-
-        *data = (ui_TmpValue >> 8) & 0xf;
-        /* this_board->di_bits(dev,data); */
-        return insn->n;
-}
-
-/*
-+----------------------------------------------------------------------------+
-|                           DIGITAL OUTPUT SUBDEVICE                             |
-+----------------------------------------------------------------------------+
-*/
-/*
-+----------------------------------------------------------------------------+
-| Function name     :int i_APCI3120_InsnConfigDigitalOutput(struct comedi_device    |
-| *dev,struct comedi_subdevice *s,struct comedi_insn *insn,unsigned int *data)                           |
-|                                                                                                |
-+----------------------------------------------------------------------------+
-| Task              :Configure the output memory ON or OFF                                   |
-|                                                                                                                |
-+----------------------------------------------------------------------------+
-| Input Parameters  :struct comedi_device *dev                                                                           |
-|                     struct comedi_subdevice *s                                                                         |
-|                     struct comedi_insn *insn                                      |
-|                     unsigned int *data                                                                                 |
-+----------------------------------------------------------------------------+
-| Return Value      :                                                                            |
-|                                                                                                                            |
-+----------------------------------------------------------------------------+
-*/
-
-int i_APCI3120_InsnConfigDigitalOutput(struct comedi_device *dev,
-        struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data)
-{
-
-        if ((data[0] != 0) && (data[0] != 1)) {
-                comedi_error(dev,
-                        "Not a valid Data !!! ,Data should be 1 or 0\n");
-                return -EINVAL;
-        }
-        if (data[0]) {
-                devpriv->b_OutputMemoryStatus = APCI3120_ENABLE;
-
-        } else {
-                devpriv->b_OutputMemoryStatus = APCI3120_DISABLE;
-                devpriv->b_DigitalOutputRegister = 0;
-        }
-        if (!devpriv->b_OutputMemoryStatus)
-                ui_Temp = 0;
-                                /* if(!devpriv->b_OutputMemoryStatus ) */
-
-        return insn->n;
-}
-
-/*
-+----------------------------------------------------------------------------+
-| Function name     :int i_APCI3120_InsnBitsDigitalOutput(struct comedi_device *dev,    |
-|               struct comedi_subdevice *s, struct comedi_insn *insn,unsigned int *data)                 |
-|                                                                                                                |
-+----------------------------------------------------------------------------+
-| Task              : write diatal output port                                                       |
-|                                                                                                                |
-+----------------------------------------------------------------------------+
-| Input Parameters  : struct comedi_device *dev                                                                  |
-|                     struct comedi_subdevice *s                                                                         |
-|                     struct comedi_insn *insn                                      |
-|                     unsigned int *data                                                                                 |
-|                      data[0]     Value to be written
-|                      data[1]    :1 Set digital o/p ON
-|                      data[1]     2 Set digital o/p OFF with memory ON
-+----------------------------------------------------------------------------+
-| Return Value      :                                                                            |
-|                                                                                                                            |
-+----------------------------------------------------------------------------+
-*/
-
-int i_APCI3120_InsnBitsDigitalOutput(struct comedi_device *dev,
-                                     struct comedi_subdevice *s,
-                                     struct comedi_insn *insn,
-                                     unsigned int *data)
+static int apci3120_di_insn_bits(struct comedi_device *dev,
+                                 struct comedi_subdevice *s,
+                                 struct comedi_insn *insn,
+                                 unsigned int *data)
 {
-        if ((data[0] > devpriv->s_EeParameters.i_DoMaxdata) || (data[0] < 0)) {
-
-                comedi_error(dev, "Data is not valid !!! \n");
-                return -EINVAL;
-        }
+        struct addi_private *devpriv = dev->private;
+        unsigned int val;
 
-        switch (data[1]) {
-        case 1:
-                data[0] = (data[0] << 4) | devpriv->b_DigitalOutputRegister;
-                break;
-
-        case 2:
-                data[0] = data[0];
-                break;
-        default:
-                printk("\nThe parameter passed is in error \n");
-                return -EINVAL;
-        }                       /*  switch(data[1]) */
-        outb(data[0], devpriv->iobase + APCI3120_DIGITAL_OUTPUT);
-
-        devpriv->b_DigitalOutputRegister = data[0] & 0xF0;
+        /* the input channels are bits 11:8 of the status reg */
+        val = inw(devpriv->iobase + APCI3120_RD_STATUS);
+        data[1] = (val >> 8) & 0xf;
 
         return insn->n;
-
 }
 
-/*
-+----------------------------------------------------------------------------+
-| Function name         :int i_APCI3120_InsnWriteDigitalOutput(struct comedi_device *dev,|
-|struct comedi_subdevice *s,struct comedi_insn *insn,unsigned int *data)        |
-|                                                                               |
-+----------------------------------------------------------------------------+
-| Task                  : Write digiatl output                                  |
-|                                                                               |
-+----------------------------------------------------------------------------+
-| Input Parameters      : struct comedi_device *dev                             |
-|                       struct comedi_subdevice *s                              |
-|                       struct comedi_insn *insn                                |
-|                       unsigned int *data                                      |
-                        data[0]     Value to be written
-                        data[1]    :1 Set digital o/p ON
-                        data[1]     2 Set digital o/p OFF with memory ON
-+----------------------------------------------------------------------------+
-| Return Value          :                                                       |
-|                                                                               |
-+----------------------------------------------------------------------------+
-*/
-
-int i_APCI3120_InsnWriteDigitalOutput(struct comedi_device *dev,
-                                      struct comedi_subdevice *s,
-                                      struct comedi_insn *insn,
-                                      unsigned int *data)
+static int apci3120_do_insn_bits(struct comedi_device *dev,
+                                 struct comedi_subdevice *s,
+                                 struct comedi_insn *insn,
+                                 unsigned int *data)
 {
-
-        unsigned int ui_Temp1;
-
-        unsigned int ui_NoOfChannel = CR_CHAN(insn->chanspec);  /*  get the channel */
-
-        if ((data[0] != 0) && (data[0] != 1)) {
-                comedi_error(dev,
-                        "Not a valid Data !!! ,Data should be 1 or 0\n");
-                return -EINVAL;
-        }
-        if (ui_NoOfChannel > devpriv->s_EeParameters.i_NbrDoChannel - 1) {
-                comedi_error(dev,
-                        "This board doesn't have specified channel !!! \n");
-                return -EINVAL;
+        struct addi_private *devpriv = dev->private;
+        unsigned int mask = data[0];
+        unsigned int bits = data[1];
+        unsigned int val;
+
+        /* The do channels are bits 7:4 of the do register */
+        val = devpriv->b_DigitalOutputRegister >> 4;
+        if (mask) {
+                val &= ~mask;
+                val |= (bits & mask);
+                devpriv->b_DigitalOutputRegister = val << 4;
+
+                outb(val << 4, devpriv->iobase + APCI3120_DIGITAL_OUTPUT);
         }
 
-        switch (data[1]) {
-        case 1:
-                data[0] = (data[0] << ui_NoOfChannel);
-/* ES05                   data[0]=(data[0]<<4)|ui_Temp; */
-                data[0] = (data[0] << 4) | devpriv->b_DigitalOutputRegister;
-                break;
+        data[1] = val;
 
-        case 2:
-                data[0] = ~data[0] & 0x1;
-                ui_Temp1 = 1;
-                ui_Temp1 = ui_Temp1 << ui_NoOfChannel;
-                ui_Temp1 = ui_Temp1 << 4;
-/* ES05                   ui_Temp=ui_Temp|ui_Temp1; */
-                devpriv->b_DigitalOutputRegister =
-                        devpriv->b_DigitalOutputRegister | ui_Temp1;
-
-                data[0] = (data[0] << ui_NoOfChannel) ^ 0xf;
-                data[0] = data[0] << 4;
-/* ES05                   data[0]=data[0]& ui_Temp; */
-                data[0] = data[0] & devpriv->b_DigitalOutputRegister;
-                break;
-        default:
-                printk("\nThe parameter passed is in error \n");
-                return -EINVAL;
-        }                       /*  switch(data[1]) */
-        outb(data[0], devpriv->iobase + APCI3120_DIGITAL_OUTPUT);
-
-/* ES05        ui_Temp=data[0] & 0xf0; */
-        devpriv->b_DigitalOutputRegister = data[0] & 0xf0;
         return insn->n;
-
 }
 
-/*
-+----------------------------------------------------------------------------+
-|                            ANALOG OUTPUT SUBDEVICE                         |
-+----------------------------------------------------------------------------+
-*/
-
-/*
-+----------------------------------------------------------------------------+
-| Function name     :int i_APCI3120_InsnWriteAnalogOutput(struct comedi_device *dev,|
-|struct comedi_subdevice *s, struct comedi_insn *insn,unsigned int *data)                                    |
-|                                                                                                                |
-+----------------------------------------------------------------------------+
-| Task              : Write  analog output                                                           |
-|                                                                                                                |
-+----------------------------------------------------------------------------+
-| Input Parameters  : struct comedi_device *dev                                                                  |
-|                     struct comedi_subdevice *s                                                                         |
-|                     struct comedi_insn *insn                                      |
-|                     unsigned int *data                                                                                 |
-+----------------------------------------------------------------------------+
-| Return Value      :                                                                            |
-|                                                                                                                            |
-+----------------------------------------------------------------------------+
-*/
-
-int i_APCI3120_InsnWriteAnalogOutput(struct comedi_device *dev,
-                                     struct comedi_subdevice *s,
-                                     struct comedi_insn *insn,
-                                     unsigned int *data)
+static int i_APCI3120_InsnWriteAnalogOutput(struct comedi_device *dev,
+                                            struct comedi_subdevice *s,
+                                            struct comedi_insn *insn,
+                                            unsigned int *data)
 {
+        struct addi_private *devpriv = dev->private;
         unsigned int ui_Range, ui_Channel;
         unsigned short us_TmpValue;
 
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.h b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.h
deleted file mode 100644
index 50eb0a0a0a05..000000000000
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.h
+++ /dev/null
@@ -1,249 +0,0 @@
-
-/* hwdrv_apci3120.h */
-
-/*
- * Copyright (C) 2004,2005  ADDI-DATA GmbH for the source code of this module.
- *
- *      ADDI-DATA GmbH
- *      Dieselstrasse 3
- *      D-77833 Ottersweier
- *      Tel: +19(0)7223/9493-0
- *      Fax: +49(0)7223/9493-92
- *      http://www.addi-data.com
- *      info@addi-data.com
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- */
-
-/* comedi related defines */
-
-/* ANALOG INPUT RANGE */
-static const struct comedi_lrange range_apci3120_ai = { 8, {
-                                                     BIP_RANGE(10),
-                                                     BIP_RANGE(5),
-                                                     BIP_RANGE(2),
-                                                     BIP_RANGE(1),
-                                                     UNI_RANGE(10),
-                                                     UNI_RANGE(5),
-                                                     UNI_RANGE(2),
-                                                     UNI_RANGE(1)
-                                                     }
-};
-
-/* ANALOG OUTPUT RANGE */
-static const struct comedi_lrange range_apci3120_ao = { 2, {
-                                                     BIP_RANGE(10),
-                                                     UNI_RANGE(10)
-                                                     }
-};
-
-#define APCI3120_BIPOLAR_RANGES 4       /*  used for test on mixture of BIP/UNI ranges */
-
-#define APCI3120_BOARD_VENDOR_ID                 0x10E8
-#define APCI3120_ADDRESS_RANGE                                  16
-
-#define APCI3120_DISABLE                         0
-#define APCI3120_ENABLE                          1
-
-#define APCI3120_START                           1
-#define APCI3120_STOP                            0
-
-#define     APCI3120_EOC_MODE         1
-#define     APCI3120_EOS_MODE         2
-#define     APCI3120_DMA_MODE         3
-
-/* DIGITAL INPUT-OUTPUT DEFINE */
-
-#define APCI3120_DIGITAL_OUTPUT                         0x0D
-#define APCI3120_RD_STATUS                              0x02
-#define APCI3120_RD_FIFO                                0x00
-
-/* digital output insn_write ON /OFF selection */
-#define APCI3120_SET4DIGITALOUTPUTON                            1
-#define APCI3120_SET4DIGITALOUTPUTOFF                           0
-
-/* analog output SELECT BIT */
-#define APCI3120_ANALOG_OP_CHANNEL_1   0x0000
-#define APCI3120_ANALOG_OP_CHANNEL_2   0x4000
-#define APCI3120_ANALOG_OP_CHANNEL_3   0x8000
-#define APCI3120_ANALOG_OP_CHANNEL_4   0xC000
-#define APCI3120_ANALOG_OP_CHANNEL_5   0x0000
-#define APCI3120_ANALOG_OP_CHANNEL_6   0x4000
-#define APCI3120_ANALOG_OP_CHANNEL_7   0x8000
-#define APCI3120_ANALOG_OP_CHANNEL_8   0xC000
-
-/* Enable external trigger bit in nWrAddress */
-#define APCI3120_ENABLE_EXT_TRIGGER    0x8000
-
-/* ANALOG OUTPUT AND INPUT DEFINE */
-#define APCI3120_UNIPOLAR 0x80  /* $$ RAM sequence polarity BIT */
-#define APCI3120_BIPOLAR  0x00  /* $$ RAM sequence polarity BIT */
-#define APCI3120_ANALOG_OUTPUT_1 0x08   /*  (ADDRESS ) */
-#define APCI3120_ANALOG_OUTPUT_2 0x0A   /*  (ADDRESS ) */
-#define APCI3120_1_GAIN              0x00       /* $$ RAM sequence Gain Bits for gain 1 */
-#define APCI3120_2_GAIN              0x10       /* $$ RAM sequence Gain Bits for gain 2 */
-#define APCI3120_5_GAIN              0x20       /* $$ RAM sequence Gain Bits for gain 5 */
-#define APCI3120_10_GAIN             0x30       /* $$ RAM sequence Gain Bits for gain 10 */
-#define APCI3120_SEQ_RAM_ADDRESS        0x06    /* $$ EARLIER NAMED APCI3120_FIFO_ADDRESS */
-#define APCI3120_RESET_FIFO          0x0C       /* (ADDRESS) */
-#define APCI3120_TIMER_0_MODE_2      0x01       /* $$ Bits for timer mode */
-#define APCI3120_TIMER_0_MODE_4       0x2
-#define APCI3120_SELECT_TIMER_0_WORD 0x00
-#define APCI3120_ENABLE_TIMER0     0x1000       /* $$Gatebit 0 in nWrAddress */
-#define APCI3120_CLEAR_PR          0xF0FF
-#define APCI3120_CLEAR_PA          0xFFF0
-#define APCI3120_CLEAR_PA_PR       (APCI3120_CLEAR_PR & APCI3120_CLEAR_PA)
-
-/* nWrMode_Select */
-#define APCI3120_ENABLE_SCAN          0x8       /* $$ bit in nWrMode_Select */
-#define APCI3120_DISABLE_SCAN      (~APCI3120_ENABLE_SCAN)
-#define APCI3120_ENABLE_EOS_INT       0x2       /* $$ bit in nWrMode_Select */
-
-#define APCI3120_DISABLE_EOS_INT   (~APCI3120_ENABLE_EOS_INT)
-#define APCI3120_ENABLE_EOC_INT       0x1
-#define APCI3120_DISABLE_EOC_INT   (~APCI3120_ENABLE_EOC_INT)
-#define APCI3120_DISABLE_ALL_INTERRUPT_WITHOUT_TIMER   (APCI3120_DISABLE_EOS_INT & APCI3120_DISABLE_EOC_INT)
-#define APCI3120_DISABLE_ALL_INTERRUPT   (APCI3120_DISABLE_TIMER_INT & APCI3120_DISABLE_EOS_INT & APCI3120_DISABLE_EOC_INT)
-
-/* status register bits */
-#define APCI3120_EOC                     0x8000
-#define APCI3120_EOS                     0x2000
-
-/* software trigger dummy register */
-#define APCI3120_START_CONVERSION        0x02   /* (ADDRESS) */
-
-/* TIMER DEFINE */
-#define APCI3120_QUARTZ_A                                 70
-#define APCI3120_QUARTZ_B                                 50
-#define APCI3120_TIMER                            1
-#define APCI3120_WATCHDOG                         2
-#define APCI3120_TIMER_DISABLE                    0
-#define APCI3120_TIMER_ENABLE                     1
-#define APCI3120_ENABLE_TIMER2                    0x4000        /* $$ gatebit 2 in nWrAddress */
-#define APCI3120_DISABLE_TIMER2                   (~APCI3120_ENABLE_TIMER2)
-#define APCI3120_ENABLE_TIMER_INT                 0x04  /* $$ ENAIRQ_FC_Bit in nWrModeSelect */
-#define APCI3120_DISABLE_TIMER_INT                (~APCI3120_ENABLE_TIMER_INT)
-#define APCI3120_WRITE_MODE_SELECT                0x0E  /*  (ADDRESS) */
-#define APCI3120_SELECT_TIMER_0_WORD  0x00
-#define APCI3120_SELECT_TIMER_1_WORD  0x01
-#define APCI3120_TIMER_1_MODE_2       0x4
-
-/* $$ BIT FOR MODE IN nCsTimerCtr1 */
-#define APCI3120_TIMER_2_MODE_0                   0x0
-#define APCI3120_TIMER_2_MODE_2                   0x10
-#define APCI3120_TIMER_2_MODE_5                   0x30
-
-/* $$ BIT FOR MODE IN nCsTimerCtr0 */
-#define APCI3120_SELECT_TIMER_2_LOW_WORD          0x02
-#define APCI3120_SELECT_TIMER_2_HIGH_WORD         0x03
-
-#define APCI3120_TIMER_CRT0                       0x0D  /* (ADDRESS for cCsTimerCtr0) */
-#define APCI3120_TIMER_CRT1                       0x0C  /* (ADDRESS for cCsTimerCtr1) */
-
-#define APCI3120_TIMER_VALUE                      0x04  /* ADDRESS for nCsTimerWert */
-#define APCI3120_TIMER_STATUS_REGISTER            0x0D  /* ADDRESS for delete timer 2 interrupt */
-#define APCI3120_RD_STATUS                        0x02  /* ADDRESS */
-#define APCI3120_WR_ADDRESS                       0x00  /* ADDRESS */
-#define APCI3120_ENABLE_WATCHDOG                  0x20  /* $$BIT in nWrMode_Select */
-#define APCI3120_DISABLE_WATCHDOG                 (~APCI3120_ENABLE_WATCHDOG)
-#define APCI3120_ENABLE_TIMER_COUNTER                     0x10  /* $$BIT in nWrMode_Select */
-#define APCI3120_DISABLE_TIMER_COUNTER            (~APCI3120_ENABLE_TIMER_COUNTER)
-#define APCI3120_FC_TIMER                         0x1000        /* bit in  status register */
-#define APCI3120_ENABLE_TIMER0                    0x1000
-#define APCI3120_ENABLE_TIMER1                    0x2000
-#define APCI3120_ENABLE_TIMER2                    0x4000
-#define APCI3120_DISABLE_TIMER0                           (~APCI3120_ENABLE_TIMER0)
-#define APCI3120_DISABLE_TIMER1                       (~APCI3120_ENABLE_TIMER1)
-#define APCI3120_DISABLE_TIMER2                   (~APCI3120_ENABLE_TIMER2)
-
-#define APCI3120_TIMER2_SELECT_EOS                0xC0  /*  ADDED on 20-6 */
-#define APCI3120_COUNTER                          3     /*  on 20-6 */
-#define APCI3120_DISABLE_ALL_TIMER                (APCI3120_DISABLE_TIMER0 & APCI3120_DISABLE_TIMER1 & APCI3120_DISABLE_TIMER2) /*  on 20-6 */
-
-#define MAX_ANALOGINPUT_CHANNELS    32
-
-struct str_AnalogReadInformation {
-
-        unsigned char b_Type;           /* EOC or EOS */
-        unsigned char b_InterruptFlag;  /* Interrupt use or not                    */
-        unsigned int ui_ConvertTiming;  /* Selection of the conversion time        */
-        unsigned char b_NbrOfChannel;   /* Number of channel to read               */
-        unsigned int ui_ChannelList[MAX_ANALOGINPUT_CHANNELS];  /* Number of the channel to be read        */
-        unsigned int ui_RangeList[MAX_ANALOGINPUT_CHANNELS];    /* Gain of each channel                    */
-
-};
-
-
-/* Function Declaration For APCI-3120 */
-
-/* Internal functions */
-int i_APCI3120_SetupChannelList(struct comedi_device *dev, struct comedi_subdevice *s,
-                                int n_chan, unsigned int *chanlist, char check);
-int i_APCI3120_ExttrigEnable(struct comedi_device *dev);
-int i_APCI3120_ExttrigDisable(struct comedi_device *dev);
-int i_APCI3120_StopCyclicAcquisition(struct comedi_device *dev, struct comedi_subdevice *s);
-int i_APCI3120_Reset(struct comedi_device *dev);
-int i_APCI3120_CyclicAnalogInput(int mode, struct comedi_device *dev,
-                                 struct comedi_subdevice *s);
-/* Interrupt functions */
-void v_APCI3120_Interrupt(int irq, void *d);
-/* UPDATE-0.7.57->0.7.68 void v_APCI3120_InterruptDmaMoveBlock16bit(struct comedi_device *dev,struct comedi_subdevice *s,short *dma,short *data,int n); */
-void v_APCI3120_InterruptDmaMoveBlock16bit(struct comedi_device *dev,
-                                           struct comedi_subdevice *s,
-                                           short *dma_buffer,
-                                           unsigned int num_samples);
-int i_APCI3120_InterruptHandleEos(struct comedi_device *dev);
-void v_APCI3120_InterruptDma(int irq, void *d);
-
-/* TIMER */
-
-int i_APCI3120_InsnConfigTimer(struct comedi_device *dev, struct comedi_subdevice *s,
-                               struct comedi_insn *insn, unsigned int *data);
-int i_APCI3120_InsnWriteTimer(struct comedi_device *dev, struct comedi_subdevice *s,
-                              struct comedi_insn *insn, unsigned int *data);
-int i_APCI3120_InsnReadTimer(struct comedi_device *dev, struct comedi_subdevice *s,
-                             struct comedi_insn *insn, unsigned int *data);
-
-/*
-* DI for di read
-*/
-
-int i_APCI3120_InsnBitsDigitalInput(struct comedi_device *dev, struct comedi_subdevice *s,
-                                    struct comedi_insn *insn, unsigned int *data);
-int i_APCI3120_InsnReadDigitalInput(struct comedi_device *dev, struct comedi_subdevice *s,
-                                    struct comedi_insn *insn, unsigned int *data);
-
-/* DO */
-/* int i_APCI3120_WriteDigitalOutput(struct comedi_device *dev,
- * unsigned char data);
- */
-int i_APCI3120_InsnConfigDigitalOutput(struct comedi_device *dev,
-                                       struct comedi_subdevice *s, struct comedi_insn *insn,
-                                       unsigned int *data);
-int i_APCI3120_InsnBitsDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s,
-                                     struct comedi_insn *insn, unsigned int *data);
-int i_APCI3120_InsnWriteDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s,
-                                      struct comedi_insn *insn, unsigned int *data);
-
-/* AO */
-/* int i_APCI3120_Write1AnalogValue(struct comedi_device *dev,UINT ui_Range,
- * UINT ui_Channel,UINT data );
- */
-
-int i_APCI3120_InsnWriteAnalogOutput(struct comedi_device *dev, struct comedi_subdevice *s,
-                                     struct comedi_insn *insn, unsigned int *data);
-
-/* AI HArdware layer */
-
-int i_APCI3120_InsnConfigAnalogInput(struct comedi_device *dev, struct comedi_subdevice *s,
-                                     struct comedi_insn *insn, unsigned int *data);
-int i_APCI3120_InsnReadAnalogInput(struct comedi_device *dev, struct comedi_subdevice *s,
-                                   struct comedi_insn *insn, unsigned int *data);
-int i_APCI3120_CommandTestAnalogInput(struct comedi_device *dev, struct comedi_subdevice *s,
-                                      struct comedi_cmd *cmd);
-int i_APCI3120_CommandAnalogInput(struct comedi_device *dev, struct comedi_subdevice *s);
-/* int i_APCI3120_CancelAnalogInput(struct comedi_device *dev, struct comedi_subdevice *s); */
-int i_APCI3120_StopCyclicAcquisition(struct comedi_device *dev, struct comedi_subdevice *s);
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c
index 38ab49917d7e..829af187b249 100644
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c
@@ -51,15 +51,131 @@ You should also find the complete GPL in the COPYING file accompanying this sour
   +----------+-----------+------------------------------------------------+
 */
 
-/*
-  +----------------------------------------------------------------------------+
-  |                               Included files                               |
-  +----------------------------------------------------------------------------+
-*/
-#include "hwdrv_apci3200.h"
-
 /* #define PRINT_INFO */
 
+/* Card Specific information */
+/* #define APCI3200_ADDRESS_RANGE       264 */
+
+/* Analog Input related Defines */
+#define APCI3200_AI_OFFSET_GAIN         0
+#define APCI3200_AI_SC_TEST             4
+#define APCI3200_AI_IRQ                 8
+#define APCI3200_AI_AUTOCAL             12
+#define APCI3200_RELOAD_CONV_TIME_VAL   32
+#define APCI3200_CONV_TIME_TIME_BASE    36
+#define APCI3200_RELOAD_DELAY_TIME_VAL  40
+#define APCI3200_DELAY_TIME_TIME_BASE   44
+#define APCI3200_AI_MODULE1             0
+#define APCI3200_AI_MODULE2             64
+#define APCI3200_AI_MODULE3             128
+#define APCI3200_AI_MODULE4             192
+#define TRUE                            1
+#define FALSE                           0
+#define APCI3200_AI_EOSIRQ              16
+#define APCI3200_AI_EOS                 20
+#define APCI3200_AI_CHAN_ID             24
+#define APCI3200_AI_CHAN_VAL            28
+#define ANALOG_INPUT                    0
+#define TEMPERATURE                     1
+#define RESISTANCE                      2
+
+#define ENABLE_EXT_TRIG                 1
+#define ENABLE_EXT_GATE                 2
+#define ENABLE_EXT_TRIG_GATE            3
+
+#define APCI3200_MAXVOLT                2.5
+#define ADDIDATA_GREATER_THAN_TEST      0
+#define ADDIDATA_LESS_THAN_TEST         1
+
+#define ADDIDATA_UNIPOLAR               1
+#define ADDIDATA_BIPOLAR                2
+
+#define MAX_MODULE                      4
+
+/* ANALOG INPUT RANGE */
+static const struct comedi_lrange range_apci3200_ai = {
+        8, {
+                BIP_RANGE(10),
+                BIP_RANGE(5),
+                BIP_RANGE(2),
+                BIP_RANGE(1),
+                UNI_RANGE(10),
+                UNI_RANGE(5),
+                UNI_RANGE(2),
+                UNI_RANGE(1)
+        }
+};
+
+static const struct comedi_lrange range_apci3300_ai = {
+        4, {
+                UNI_RANGE(10),
+                UNI_RANGE(5),
+                UNI_RANGE(2),
+                UNI_RANGE(1)
+        }
+};
+
+int MODULE_NO;
+struct {
+        int i_Gain;
+        int i_Polarity;
+        int i_OffsetRange;
+        int i_Coupling;
+        int i_SingleDiff;
+        int i_AutoCalibration;
+        unsigned int ui_ReloadValue;
+        unsigned int ui_TimeUnitReloadVal;
+        int i_Interrupt;
+        int i_ModuleSelection;
+} Config_Parameters_Module1, Config_Parameters_Module2,
+    Config_Parameters_Module3, Config_Parameters_Module4;
+
+
+struct str_ADDIDATA_RTDStruct {
+        unsigned int ul_NumberOfValue;
+        unsigned int *pul_ResistanceValue;
+        unsigned int *pul_TemperatureValue;
+};
+
+struct str_Module {
+        unsigned long ul_CurrentSourceCJC;
+        unsigned long ul_CurrentSource[5];
+        unsigned long ul_GainFactor[8]; /*  Gain Factor */
+        unsigned int w_GainValue[10];
+};
+
+struct str_BoardInfos {
+
+        int i_CJCAvailable;
+        int i_CJCPolarity;
+        int i_CJCGain;
+        int i_InterruptFlag;
+        int i_ADDIDATAPolarity;
+        int i_ADDIDATAGain;
+        int i_AutoCalibration;
+        int i_ADDIDATAConversionTime;
+        int i_ADDIDATAConversionTimeUnit;
+        int i_ADDIDATAType;
+        int i_ChannelNo;
+        int i_ChannelCount;
+        int i_ScanType;
+        int i_FirstChannel;
+        int i_LastChannel;
+        int i_Sum;
+        int i_Offset;
+        unsigned int ui_Channel_num;
+        int i_Count;
+        int i_Initialised;
+        unsigned int ui_InterruptChannelValue[144];     /* Buffer */
+        unsigned char b_StructInitialized;
+        /* 7 is the maximal number of channels */
+        unsigned int ui_ScanValueArray[7 + 12]; 
+
+        int i_ConnectionType;
+        int i_NbrOfModule;
+        struct str_Module s_Module[MAX_MODULE];
+};
+
 /* BEGIN JK 06.07.04: Management of sevrals boards */
 /*
   int i_CJCAvailable=1;
@@ -94,27 +210,10 @@ struct str_BoardInfos s_BoardInfos[100];	/*  100 will be the max number of board
 #define NVCMD_BEGIN_READ        (0x7 << 5)      /* nvRam begin read command */
 #define NVCMD_BEGIN_WRITE       (0x6 << 5)      /* EEPROM begin write command */
 
-/*+----------------------------------------------------------------------------+*/
-/*| Function   Name   : int i_AddiHeaderRW_ReadEeprom                          |*/
-/*|                               (int    i_NbOfWordsToRead,                   |*/
-/*|                                unsigned int dw_PCIBoardEepromAddress,             |*/
-/*|                                unsigned short   w_EepromStartAddress,                |*/
-/*|                                unsigned short * pw_DataRead)                          |*/
-/*+----------------------------------------------------------------------------+*/
-/*| Task              : Read word from the 5920 eeprom.                        |*/
-/*+----------------------------------------------------------------------------+*/
-/*| Input Parameters  : int    i_NbOfWordsToRead : Nbr. of word to read        |*/
-/*|                     unsigned int dw_PCIBoardEepromAddress : Address of the eeprom |*/
-/*|                     unsigned short   w_EepromStartAddress : Eeprom start address     |*/
-/*+----------------------------------------------------------------------------+*/
-/*| Output Parameters : unsigned short * pw_DataRead : Read data                          |*/
-/*+----------------------------------------------------------------------------+*/
-/*| Return Value      : -                                                      |*/
-/*+----------------------------------------------------------------------------+*/
-
-int i_AddiHeaderRW_ReadEeprom(int i_NbOfWordsToRead,
-        unsigned int dw_PCIBoardEepromAddress,
-        unsigned short w_EepromStartAddress, unsigned short *pw_DataRead)
+static int i_AddiHeaderRW_ReadEeprom(int i_NbOfWordsToRead,
+                                     unsigned int dw_PCIBoardEepromAddress,
+                                     unsigned short w_EepromStartAddress,
+                                     unsigned short *pw_DataRead)
 {
         unsigned int dw_eeprom_busy = 0;
         int i_Counter = 0;
@@ -241,20 +340,8 @@ int i_AddiHeaderRW_ReadEeprom(int i_NbOfWordsToRead,
         return 0;
 }
 
-/*+----------------------------------------------------------------------------+*/
-/*| Function   Name   : void v_GetAPCI3200EepromCalibrationValue (void)        |*/
-/*+----------------------------------------------------------------------------+*/
-/*| Task              : Read calibration value from the APCI-3200 eeprom.      |*/
-/*+----------------------------------------------------------------------------+*/
-/*| Input Parameters  : -                                                      |*/
-/*+----------------------------------------------------------------------------+*/
-/*| Output Parameters : -                                                      |*/
-/*+----------------------------------------------------------------------------+*/
-/*| Return Value      : -                                                      |*/
-/*+----------------------------------------------------------------------------+*/
-
-void v_GetAPCI3200EepromCalibrationValue(unsigned int dw_PCIBoardEepromAddress,
-        struct str_BoardInfos *BoardInformations)
+static void v_GetAPCI3200EepromCalibrationValue(unsigned int dw_PCIBoardEepromAddress,
+                                                struct str_BoardInfos *BoardInformations)
 {
         unsigned short w_AnalogInputMainHeaderAddress;
         unsigned short w_AnalogInputComponentAddress;
@@ -448,9 +535,11 @@ void v_GetAPCI3200EepromCalibrationValue(unsigned int dw_PCIBoardEepromAddress,
         }
 }
 
-int i_APCI3200_GetChannelCalibrationValue(struct comedi_device *dev,
-        unsigned int ui_Channel_num, unsigned int *CJCCurrentSource,
-        unsigned int *ChannelCurrentSource, unsigned int *ChannelGainFactor)
+static int i_APCI3200_GetChannelCalibrationValue(struct comedi_device *dev,
+                                                 unsigned int ui_Channel_num,
+                                                 unsigned int *CJCCurrentSource,
+                                                 unsigned int *ChannelCurrentSource,
+                                                 unsigned int *ChannelGainFactor)
 {
         int i_DiffChannel = 0;
         int i_Module = 0;
@@ -520,1135 +609,46 @@ int i_APCI3200_GetChannelCalibrationValue(struct comedi_device *dev,
         return 0;
 }
 
-/* End JK 21.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values */
-
-/*
-  +----------------------------------------------------------------------------+
-  | Function   Name   : int i_APCI3200_ReadDigitalInput                       |
-  |                       (struct comedi_device *dev,struct comedi_subdevice *s,               |
-  |                      struct comedi_insn *insn,unsigned int *data)                     |
-  +----------------------------------------------------------------------------+
-  | Task              : Read  value  of the selected channel or port           |
-  +----------------------------------------------------------------------------+
-  | Input Parameters  : struct comedi_device *dev      : Driver handle                |
-  |                     unsigned int ui_NoOfChannels    : No Of Channels To read  for Port
-  Channel Numberfor single channel
-  |                     unsigned int data[0]            : 0: Read single channel
-  1: Read port value
-  data[1]              Port number
-  +----------------------------------------------------------------------------+
-  | Output Parameters : --      data[0] :Read status value
-  +----------------------------------------------------------------------------+
-  | Return Value      : TRUE  : No error occur                                 |
-  |                         : FALSE : Error occur. Return the error          |
-  |                                                                              |
-  +----------------------------------------------------------------------------+
-*/
-
-int i_APCI3200_ReadDigitalInput(struct comedi_device *dev, struct comedi_subdevice *s,
-        struct comedi_insn *insn, unsigned int *data)
+static int apci3200_di_insn_bits(struct comedi_device *dev,
+                                 struct comedi_subdevice *s,
+                                 struct comedi_insn *insn,
+                                 unsigned int *data)
 {
-        unsigned int ui_Temp = 0;
-        unsigned int ui_NoOfChannel = 0;
-        ui_NoOfChannel = CR_CHAN(insn->chanspec);
-        ui_Temp = data[0];
-        *data = inl(devpriv->i_IobaseReserved);
-
-        if (ui_Temp == 0) {
-                *data = (*data >> ui_NoOfChannel) & 0x1;
-        }                       /* if  (ui_Temp==0) */
-        else {
-                if (ui_Temp == 1) {
-                        if (data[1] < 0 || data[1] > 1) {
-                                printk("\nThe port number is in error\n");
-                                return -EINVAL;
-                        }       /* if(data[1] < 0 || data[1] >1) */
-                        switch (ui_NoOfChannel) {
-
-                        case 2:
-                                *data = (*data >> (2 * data[1])) & 0x3;
-                                break;
-                        case 3:
-                                *data = (*data & 15);
-                                break;
-                        default:
-                                comedi_error(dev, " chan spec wrong");
-                                return -EINVAL; /*  "sorry channel spec wrong " */
-
-                        }       /* switch(ui_NoOfChannels) */
-                }               /* if  (ui_Temp==1) */
-                else {
-                        printk("\nSpecified channel not supported \n");
-                }               /* elseif  (ui_Temp==1) */
-        }
-        return insn->n;
-}
+        struct addi_private *devpriv = dev->private;
 
-/*
-  +----------------------------------------------------------------------------+
-  | Function   Name   : int i_APCI3200_ConfigDigitalOutput                     |
-  |                       (struct comedi_device *dev,struct comedi_subdevice *s,                                 |
-  |                      struct comedi_insn *insn,unsigned int *data)                     |
-  +----------------------------------------------------------------------------+
-  | Task              : Configures The Digital Output Subdevice.               |
-  +----------------------------------------------------------------------------+
-  | Input Parameters  : struct comedi_device *dev : Driver handle                     |
-  |                       data[0]  :1  Memory enable
-  0  Memory Disable
-  +----------------------------------------------------------------------------+
-  | Output Parameters : --                                                                                                       |
-  +----------------------------------------------------------------------------+
-  | Return Value      : TRUE  : No error occur                                 |
-  |                         : FALSE : Error occur. Return the error                      |
-  |                                                                                                                                      |
-  +----------------------------------------------------------------------------+
-*/
-int i_APCI3200_ConfigDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s,
-        struct comedi_insn *insn, unsigned int *data)
-{
+        data[1] = inl(devpriv->i_IobaseReserved) & 0xf;
 
-        if ((data[0] != 0) && (data[0] != 1)) {
-                comedi_error(dev,
-                        "Not a valid Data !!! ,Data should be 1 or 0\n");
-                return -EINVAL;
-        }                       /* if  ( (data[0]!=0) && (data[0]!=1) ) */
-        if (data[0]) {
-                devpriv->b_OutputMemoryStatus = ADDIDATA_ENABLE;
-        }                       /*  if  (data[0]) */
-        else {
-                devpriv->b_OutputMemoryStatus = ADDIDATA_DISABLE;
-        }                       /* else if  (data[0]) */
         return insn->n;
 }
 
-/*
-  +----------------------------------------------------------------------------+
-  | Function   Name   : int i_APCI3200_WriteDigitalOutput                      |
-  |                       (struct comedi_device *dev,struct comedi_subdevice *s,                                 |
-  |                      struct comedi_insn *insn,unsigned int *data)                     |
-  +----------------------------------------------------------------------------+
-  | Task              : writes To the digital Output Subdevice                 |
-  +----------------------------------------------------------------------------+
-  | Input Parameters  : struct comedi_device *dev      : Driver handle                |
-  |                     struct comedi_subdevice *s     : Subdevice Pointer            |
-  |                     struct comedi_insn *insn       : Insn Structure Pointer       |
-  |                     unsigned int *data          : Data Pointer contains        |
-  |                                          configuration parameters as below |
-  |                     data[0]             :Value to output
-  data[1]             : 0 o/p single channel
-  1 o/p port
-  data[2]             : port no
-  data[3]             :0 set the digital o/p on
-  1 set the digital o/p off
-  +----------------------------------------------------------------------------+
-  | Output Parameters : --                                                                                                       |
-  +----------------------------------------------------------------------------+
-  | Return Value      : TRUE  : No error occur                                 |
-  |                         : FALSE : Error occur. Return the error              |
-  |                                                                              |
-  +----------------------------------------------------------------------------+
-*/
-int i_APCI3200_WriteDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s,
-        struct comedi_insn *insn, unsigned int *data)
+static int apci3200_do_insn_bits(struct comedi_device *dev,
+                                 struct comedi_subdevice *s,
+                                 struct comedi_insn *insn,
+                                 unsigned int *data)
 {
-        unsigned int ui_Temp = 0, ui_Temp1 = 0;
-        unsigned int ui_NoOfChannel = CR_CHAN(insn->chanspec);  /*  get the channel */
-        if (devpriv->b_OutputMemoryStatus) {
-                ui_Temp = inl(devpriv->i_IobaseAddon);
-
-        }                       /* if(devpriv->b_OutputMemoryStatus ) */
-        else {
-                ui_Temp = 0;
-        }                       /* if(devpriv->b_OutputMemoryStatus ) */
-        if (data[3] == 0) {
-                if (data[1] == 0) {
-                        data[0] = (data[0] << ui_NoOfChannel) | ui_Temp;
-                        outl(data[0], devpriv->i_IobaseAddon);
-                }               /* if(data[1]==0) */
-                else {
-                        if (data[1] == 1) {
-                                switch (ui_NoOfChannel) {
-
-                                case 2:
-                                        data[0] =
-                                                (data[0] << (2 *
-                                                        data[2])) | ui_Temp;
-                                        break;
-                                case 3:
-                                        data[0] = (data[0] | ui_Temp);
-                                        break;
-                                }       /* switch(ui_NoOfChannels) */
-
-                                outl(data[0], devpriv->i_IobaseAddon);
-                        }       /*  if(data[1]==1) */
-                        else {
-                                printk("\nSpecified channel not supported\n");
-                        }       /* else if(data[1]==1) */
-                }               /* elseif(data[1]==0) */
-        }                       /* if(data[3]==0) */
-        else {
-                if (data[3] == 1) {
-                        if (data[1] == 0) {
-                                data[0] = ~data[0] & 0x1;
-                                ui_Temp1 = 1;
-                                ui_Temp1 = ui_Temp1 << ui_NoOfChannel;
-                                ui_Temp = ui_Temp | ui_Temp1;
-                                data[0] = (data[0] << ui_NoOfChannel) ^ 0xf;
-                                data[0] = data[0] & ui_Temp;
-                                outl(data[0], devpriv->i_IobaseAddon);
-                        }       /* if(data[1]==0) */
-                        else {
-                                if (data[1] == 1) {
-                                        switch (ui_NoOfChannel) {
-
-                                        case 2:
-                                                data[0] = ~data[0] & 0x3;
-                                                ui_Temp1 = 3;
-                                                ui_Temp1 =
-                                                        ui_Temp1 << 2 * data[2];
-                                                ui_Temp = ui_Temp | ui_Temp1;
-                                                data[0] =
-                                                        ((data[0] << (2 *
-                                                                        data
-                                                                        [2])) ^
-                                                        0xf) & ui_Temp;
-
-                                                break;
-                                        case 3:
-                                                break;
-
-                                        default:
-                                                comedi_error(dev,
-                                                        " chan spec wrong");
-                                                return -EINVAL; /*  "sorry channel spec wrong " */
-                                        }       /* switch(ui_NoOfChannels) */
-
-                                        outl(data[0], devpriv->i_IobaseAddon);
-                                }       /*  if(data[1]==1) */
-                                else {
-                                        printk("\nSpecified channel not supported\n");
-                                }       /* else if(data[1]==1) */
-                        }       /* elseif(data[1]==0) */
-                }               /* if(data[3]==1); */
-                else {
-                        printk("\nSpecified functionality does not exist\n");
-                        return -EINVAL;
-                }               /* if else data[3]==1) */
-        }                       /* if else data[3]==0) */
-        return insn->n;
-}
-
-/*
-  +----------------------------------------------------------------------------+
-  | Function   Name   : int i_APCI3200_ReadDigitalOutput                       |
-  |                       (struct comedi_device *dev,struct comedi_subdevice *s,               |
-  |                      struct comedi_insn *insn,unsigned int *data)                     |
-  +----------------------------------------------------------------------------+
-  | Task              : Read  value  of the selected channel or port           |
-  +----------------------------------------------------------------------------+
-  | Input Parameters  : struct comedi_device *dev      : Driver handle                |
-  |                     unsigned int ui_NoOfChannels    : No Of Channels To read       |
-  |                     unsigned int *data              : Data Pointer to read status  |
-  data[0]                 :0 read single channel
-  1 read port value
-  data[1]                  port no
-
-  +----------------------------------------------------------------------------+
-  | Output Parameters : --                                                                                                       |
-  +----------------------------------------------------------------------------+
-  | Return Value      : TRUE  : No error occur                                 |
-  |                         : FALSE : Error occur. Return the error          |
-  |                                                                              |
-  +----------------------------------------------------------------------------+
-*/
-int i_APCI3200_ReadDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s,
-        struct comedi_insn *insn, unsigned int *data)
-{
-        unsigned int ui_Temp;
-        unsigned int ui_NoOfChannel;
-        ui_NoOfChannel = CR_CHAN(insn->chanspec);
-        ui_Temp = data[0];
-        *data = inl(devpriv->i_IobaseAddon);
-        if (ui_Temp == 0) {
-                *data = (*data >> ui_NoOfChannel) & 0x1;
-        }                       /*  if  (ui_Temp==0) */
-        else {
-                if (ui_Temp == 1) {
-                        if (data[1] < 0 || data[1] > 1) {
-                                printk("\nThe port selection is in error\n");
-                                return -EINVAL;
-                        }       /* if(data[1] <0 ||data[1] >1) */
-                        switch (ui_NoOfChannel) {
-                        case 2:
-                                *data = (*data >> (2 * data[1])) & 3;
-                                break;
-
-                        case 3:
-                                break;
-
-                        default:
-                                comedi_error(dev, " chan spec wrong");
-                                return -EINVAL; /*  "sorry channel spec wrong " */
-                                break;
-                        }       /*  switch(ui_NoOfChannels) */
-                }               /*  if  (ui_Temp==1) */
-                else {
-                        printk("\nSpecified channel not supported \n");
-                }               /*  else if (ui_Temp==1) */
-        }                       /*  else if  (ui_Temp==0) */
-        return insn->n;
-}
-
-/*
-  +----------------------------------------------------------------------------+
-  | Function   Name   : int i_APCI3200_ConfigAnalogInput                       |
-  |                       (struct comedi_device *dev,struct comedi_subdevice *s,               |
-  |                      struct comedi_insn *insn,unsigned int *data)                     |
-  +----------------------------------------------------------------------------+
-  | Task              : Configures The Analog Input Subdevice                  |
-  +----------------------------------------------------------------------------+
-  | Input Parameters  : struct comedi_device *dev      : Driver handle                |
-  |                     struct comedi_subdevice *s     : Subdevice Pointer            |
-  |                     struct comedi_insn *insn       : Insn Structure Pointer       |
-  |                     unsigned int *data          : Data Pointer contains        |
-  |                                          configuration parameters as below |
-  |                                                                            |
-  |                                     data[0]
-  |                                               0:Normal AI                  |
-  |                                               1:RTD                        |
-  |                                               2:THERMOCOUPLE               |
-  |                                 data[1]            : Gain To Use                 |
-  |                                                                            |
-  |                           data[2]            : Polarity
-  |                                                0:Bipolar                   |
-  |                                                1:Unipolar                  |
-  |                                                                                                                              |
-  |                           data[3]            : Offset Range
-  |                                                                            |
-  |                           data[4]            : Coupling
-  |                                                0:DC Coupling               |
-  |                                                1:AC Coupling               |
-  |                                                                            |
-  |                           data[5]            :Differential/Single
-  |                                                0:Single                    |
-  |                                                1:Differential              |
-  |                                                                            |
-  |                           data[6]            :TimerReloadValue
-  |                                                                            |
-  |                           data[7]            :ConvertingTimeUnit
-  |                                                                            |
-  |                           data[8]             :0 Analog voltage measurement
-  1 Resistance measurement
-  2 Temperature measurement
-  |                           data[9]            :Interrupt
-  |                                              0:Disable
-  |                                              1:Enable
-  data[10]           :Type of Thermocouple
-  |                          data[11]           : 0: single channel
-  Module Number
-  |
-  |                          data[12]
-  |                                             0:Single Read
-  |                                             1:Read more channel
-  2:Single scan
-  |                                             3:Continuous Scan
-  data[13]          :Number of channels to read
-  |                          data[14]          :RTD connection type
-  :0:RTD not used
-  1:RTD 2 wire connection
-  2:RTD 3 wire connection
-  3:RTD 4 wire connection
-  |                                                                            |
-  |                                                                            |
-  |                                                                            |
-  +----------------------------------------------------------------------------+
-  | Output Parameters : --                                                                                                       |
-  +----------------------------------------------------------------------------+
-  | Return Value      : TRUE  : No error occur                                 |
-  |                         : FALSE : Error occur. Return the error          |
-  |                                                                              |
-  +----------------------------------------------------------------------------+
-*/
-int i_APCI3200_ConfigAnalogInput(struct comedi_device *dev, struct comedi_subdevice *s,
-        struct comedi_insn *insn, unsigned int *data)
-{
-
-        unsigned int ul_Config = 0, ul_Temp = 0;
-        unsigned int ui_ChannelNo = 0;
-        unsigned int ui_Dummy = 0;
-        int i_err = 0;
-
-        /* Begin JK 21.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values */
-
-#ifdef PRINT_INFO
-        int i = 0, i2 = 0;
-#endif
-        /* End JK 21.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values */
-
-        /* BEGIN JK 06.07.04: Management of sevrals boards */
-        /*  Initialize the structure */
-        if (s_BoardInfos[dev->minor].b_StructInitialized != 1) {
-                s_BoardInfos[dev->minor].i_CJCAvailable = 1;
-                s_BoardInfos[dev->minor].i_CJCPolarity = 0;
-                s_BoardInfos[dev->minor].i_CJCGain = 2; /* changed from 0 to 2 */
-                s_BoardInfos[dev->minor].i_InterruptFlag = 0;
-                s_BoardInfos[dev->minor].i_AutoCalibration = 0; /* : auto calibration */
-                s_BoardInfos[dev->minor].i_ChannelCount = 0;
-                s_BoardInfos[dev->minor].i_Sum = 0;
-                s_BoardInfos[dev->minor].ui_Channel_num = 0;
-                s_BoardInfos[dev->minor].i_Count = 0;
-                s_BoardInfos[dev->minor].i_Initialised = 0;
-                s_BoardInfos[dev->minor].b_StructInitialized = 1;
-
-                /* Begin JK 21.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values */
-                s_BoardInfos[dev->minor].i_ConnectionType = 0;
-                /* End JK 21.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values */
-
-                /* Begin JK 21.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values */
-                memset(s_BoardInfos[dev->minor].s_Module, 0,
-                        sizeof(s_BoardInfos[dev->minor].s_Module[MAX_MODULE]));
-
-                v_GetAPCI3200EepromCalibrationValue(devpriv->i_IobaseAmcc,
-                        &s_BoardInfos[dev->minor]);
-
-#ifdef PRINT_INFO
-                for (i = 0; i < MAX_MODULE; i++) {
-                        printk("\n s_Module[%i].ul_CurrentSourceCJC = %lu", i,
-                                s_BoardInfos[dev->minor].s_Module[i].
-                                ul_CurrentSourceCJC);
-
-                        for (i2 = 0; i2 < 5; i2++) {
-                                printk("\n s_Module[%i].ul_CurrentSource [%i] = %lu", i, i2, s_BoardInfos[dev->minor].s_Module[i].ul_CurrentSource[i2]);
-                        }
-
-                        for (i2 = 0; i2 < 8; i2++) {
-                                printk("\n s_Module[%i].ul_GainFactor [%i] = %lu", i, i2, s_BoardInfos[dev->minor].s_Module[i].ul_GainFactor[i2]);
-                        }
-
-                        for (i2 = 0; i2 < 8; i2++) {
-                                printk("\n s_Module[%i].w_GainValue [%i] = %u",
-                                        i, i2,
-                                        s_BoardInfos[dev->minor].s_Module[i].
-                                        w_GainValue[i2]);
-                        }
-                }
-#endif
-                /* End JK 21.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values */
-        }
-
-        if (data[0] != 0 && data[0] != 1 && data[0] != 2) {
-                printk("\nThe selection of acquisition type is in error\n");
-                i_err++;
-        }                       /* if(data[0]!=0 && data[0]!=1 && data[0]!=2) */
-        if (data[0] == 1) {
-                if (data[14] != 0 && data[14] != 1 && data[14] != 2
-                        && data[14] != 4) {
-                        printk("\n Error in selection of RTD connection type\n");
-                        i_err++;
-                }               /* if(data[14]!=0 && data[14]!=1 && data[14]!=2 && data[14]!=4) */
-        }                       /* if(data[0]==1 ) */
-        if (data[1] < 0 || data[1] > 7) {
-                printk("\nThe selection of gain is in error\n");
-                i_err++;
-        }                       /*  if(data[1]<0 || data[1]>7) */
-        if (data[2] != 0 && data[2] != 1) {
-                printk("\nThe selection of polarity is in error\n");
-                i_err++;
-        }                       /* if(data[2]!=0 &&  data[2]!=1) */
-        if (data[3] != 0) {
-                printk("\nThe selection of offset range  is in error\n");
-                i_err++;
-        }                       /*  if(data[3]!=0) */
-        if (data[4] != 0 && data[4] != 1) {
-                printk("\nThe selection of coupling is in error\n");
-                i_err++;
-        }                       /* if(data[4]!=0 &&  data[4]!=1) */
-        if (data[5] != 0 && data[5] != 1) {
-                printk("\nThe selection of single/differential mode is in error\n");
-                i_err++;
-        }                       /* if(data[5]!=0 &&  data[5]!=1) */
-        if (data[8] != 0 && data[8] != 1 && data[2] != 2) {
-                printk("\nError in selection of functionality\n");
-        }                       /* if(data[8]!=0 && data[8]!=1 && data[2]!=2) */
-        if (data[12] == 0 || data[12] == 1) {
-                if (data[6] != 20 && data[6] != 40 && data[6] != 80
-                        && data[6] != 160) {
-                        printk("\nThe selection of conversion time reload value is in error\n");
-                        i_err++;
-                }               /*  if (data[6]!=20 && data[6]!=40 && data[6]!=80 && data[6]!=160 ) */
-                if (data[7] != 2) {
-                        printk("\nThe selection of conversion time unit  is in error\n");
-                        i_err++;
-                }               /*  if(data[7]!=2) */
-        }
-        if (data[9] != 0 && data[9] != 1) {
-                printk("\nThe selection of interrupt enable is in error\n");
-                i_err++;
-        }                       /* if(data[9]!=0 &&  data[9]!=1) */
-        if (data[11] < 0 || data[11] > 4) {
-                printk("\nThe selection of module is in error\n");
-                i_err++;
-        }                       /* if(data[11] <0 ||  data[11]>1) */
-        if (data[12] < 0 || data[12] > 3) {
-                printk("\nThe selection of singlechannel/scan selection is in error\n");
-                i_err++;
-        }                       /* if(data[12] < 0 ||  data[12]> 3) */
-        if (data[13] < 0 || data[13] > 16) {
-                printk("\nThe selection of number of channels is in error\n");
-                i_err++;
-        }                       /*  if(data[13] <0 ||data[13] >15) */
-
-        /* BEGIN JK 06.07.04: Management of sevrals boards */
-        /*
-           i_ChannelCount=data[13];
-           i_ScanType=data[12];
-           i_ADDIDATAPolarity = data[2];
-           i_ADDIDATAGain=data[1];
-           i_ADDIDATAConversionTime=data[6];
-           i_ADDIDATAConversionTimeUnit=data[7];
-           i_ADDIDATAType=data[0];
-         */
-
-        /*  Save acquisition configuration for the actual board */
-        s_BoardInfos[dev->minor].i_ChannelCount = data[13];
-        s_BoardInfos[dev->minor].i_ScanType = data[12];
-        s_BoardInfos[dev->minor].i_ADDIDATAPolarity = data[2];
-        s_BoardInfos[dev->minor].i_ADDIDATAGain = data[1];
-        s_BoardInfos[dev->minor].i_ADDIDATAConversionTime = data[6];
-        s_BoardInfos[dev->minor].i_ADDIDATAConversionTimeUnit = data[7];
-        s_BoardInfos[dev->minor].i_ADDIDATAType = data[0];
-        /* Begin JK 19.10.2004: APCI-3200 Driver update 0.7.57 -> 0.7.68 */
-        s_BoardInfos[dev->minor].i_ConnectionType = data[5];
-        /* End JK 19.10.2004: APCI-3200 Driver update 0.7.57 -> 0.7.68 */
-        /* END JK 06.07.04: Management of sevrals boards */
-
-        /* Begin JK 19.10.2004: APCI-3200 Driver update 0.7.57 -> 0.7.68 */
-        memset(s_BoardInfos[dev->minor].ui_ScanValueArray, 0, (7 + 12) * sizeof(unsigned int)); /*  7 is the maximal number of channels */
-        /* End JK 19.10.2004: APCI-3200 Driver update 0.7.57 -> 0.7.68 */
-
-        /* BEGIN JK 02.07.04 : This while can't be do, it block the process when using severals boards */
-        /* while(i_InterruptFlag==1) */
-        while (s_BoardInfos[dev->minor].i_InterruptFlag == 1) {
-#ifndef MSXBOX
-                udelay(1);
-#else
-                /*  In the case where the driver is compiled for the MSX-Box */
-                /*  we used a printk to have a little delay because udelay */
-                /*  seems to be broken under the MSX-Box. */
-                /*  This solution hat to be studied. */
-                printk("");
-#endif
-        }
-        /* END JK 02.07.04 : This while can't be do, it block the process when using severals boards */
-
-        ui_ChannelNo = CR_CHAN(insn->chanspec); /*  get the channel */
-        /* BEGIN JK 06.07.04: Management of sevrals boards */
-        /* i_ChannelNo=ui_ChannelNo; */
-        /* ui_Channel_num =ui_ChannelNo; */
-
-        s_BoardInfos[dev->minor].i_ChannelNo = ui_ChannelNo;
-        s_BoardInfos[dev->minor].ui_Channel_num = ui_ChannelNo;
-
-        /* END JK 06.07.04: Management of sevrals boards */
-
-        if (data[5] == 0) {
-                if (ui_ChannelNo < 0 || ui_ChannelNo > 15) {
-                        printk("\nThe Selection of the channel is in error\n");
-                        i_err++;
-                }               /*  if(ui_ChannelNo<0 || ui_ChannelNo>15) */
-        }                       /* if(data[5]==0) */
-        else {
-                if (data[14] == 2) {
-                        if (ui_ChannelNo < 0 || ui_ChannelNo > 3) {
-                                printk("\nThe Selection of the channel is in error\n");
-                                i_err++;
-                        }       /*  if(ui_ChannelNo<0 || ui_ChannelNo>3) */
-                }               /* if(data[14]==2) */
-                else {
-                        if (ui_ChannelNo < 0 || ui_ChannelNo > 7) {
-                                printk("\nThe Selection of the channel is in error\n");
-                                i_err++;
-                        }       /*  if(ui_ChannelNo<0 || ui_ChannelNo>7) */
-                }               /* elseif(data[14]==2) */
-        }                       /* elseif(data[5]==0) */
-        if (data[12] == 0 || data[12] == 1) {
-                switch (data[5]) {
-                case 0:
-                        if (ui_ChannelNo >= 0 && ui_ChannelNo <= 3) {
-                                /* BEGIN JK 06.07.04: Management of sevrals boards */
-                                /* i_Offset=0; */
-                                s_BoardInfos[dev->minor].i_Offset = 0;
-                                /* END JK 06.07.04: Management of sevrals boards */
-                        }       /* if(ui_ChannelNo >=0 && ui_ChannelNo <=3) */
-                        if (ui_ChannelNo >= 4 && ui_ChannelNo <= 7) {
-                                /* BEGIN JK 06.07.04: Management of sevrals boards */
-                                /* i_Offset=64; */
-                                s_BoardInfos[dev->minor].i_Offset = 64;
-                                /* END JK 06.07.04: Management of sevrals boards */
-                        }       /* if(ui_ChannelNo >=4 && ui_ChannelNo <=7) */
-                        if (ui_ChannelNo >= 8 && ui_ChannelNo <= 11) {
-                                /* BEGIN JK 06.07.04: Management of sevrals boards */
-                                /* i_Offset=128; */
-                                s_BoardInfos[dev->minor].i_Offset = 128;
-                                /* END JK 06.07.04: Management of sevrals boards */
-                        }       /* if(ui_ChannelNo >=8 && ui_ChannelNo <=11) */
-                        if (ui_ChannelNo >= 12 && ui_ChannelNo <= 15) {
-                                /* BEGIN JK 06.07.04: Management of sevrals boards */
-                                /* i_Offset=192; */
-                                s_BoardInfos[dev->minor].i_Offset = 192;
-                                /* END JK 06.07.04: Management of sevrals boards */
-                        }       /* if(ui_ChannelNo >=12 && ui_ChannelNo <=15) */
-                        break;
-                case 1:
-                        if (data[14] == 2) {
-                                if (ui_ChannelNo == 0) {
-                                        /* BEGIN JK 06.07.04: Management of sevrals boards */
-                                        /* i_Offset=0; */
-                                        s_BoardInfos[dev->minor].i_Offset = 0;
-                                        /* END JK 06.07.04: Management of sevrals boards */
-                                }       /* if(ui_ChannelNo ==0 ) */
-                                if (ui_ChannelNo == 1) {
-                                        /* BEGIN JK 06.07.04: Management of sevrals boards */
-                                        /* i_Offset=0; */
-                                        s_BoardInfos[dev->minor].i_Offset = 64;
-                                        /* END JK 06.07.04: Management of sevrals boards */
-                                }       /*  if(ui_ChannelNo ==1) */
-                                if (ui_ChannelNo == 2) {
-                                        /* BEGIN JK 06.07.04: Management of sevrals boards */
-                                        /* i_Offset=128; */
-                                        s_BoardInfos[dev->minor].i_Offset = 128;
-                                        /* END JK 06.07.04: Management of sevrals boards */
-                                }       /* if(ui_ChannelNo ==2 ) */
-                                if (ui_ChannelNo == 3) {
-                                        /* BEGIN JK 06.07.04: Management of sevrals boards */
-                                        /* i_Offset=192; */
-                                        s_BoardInfos[dev->minor].i_Offset = 192;
-                                        /* END JK 06.07.04: Management of sevrals boards */
-                                }       /* if(ui_ChannelNo ==3) */
-
-                                /* BEGIN JK 06.07.04: Management of sevrals boards */
-                                /* i_ChannelNo=0; */
-                                s_BoardInfos[dev->minor].i_ChannelNo = 0;
-                                /* END JK 06.07.04: Management of sevrals boards */
-                                ui_ChannelNo = 0;
-                                break;
-                        }       /* if(data[14]==2) */
-                        if (ui_ChannelNo >= 0 && ui_ChannelNo <= 1) {
-                                /* BEGIN JK 06.07.04: Management of sevrals boards */
-                                /* i_Offset=0; */
-                                s_BoardInfos[dev->minor].i_Offset = 0;
-                                /* END JK 06.07.04: Management of sevrals boards */
-                        }       /* if(ui_ChannelNo >=0 && ui_ChannelNo <=1) */
-                        if (ui_ChannelNo >= 2 && ui_ChannelNo <= 3) {
-                                /* BEGIN JK 06.07.04: Management of sevrals boards */
-                                /* i_ChannelNo=i_ChannelNo-2; */
-                                /* i_Offset=64; */
-                                s_BoardInfos[dev->minor].i_ChannelNo =
-                                        s_BoardInfos[dev->minor].i_ChannelNo -
-                                        2;
-                                s_BoardInfos[dev->minor].i_Offset = 64;
-                                /* END JK 06.07.04: Management of sevrals boards */
-                                ui_ChannelNo = ui_ChannelNo - 2;
-                        }       /* if(ui_ChannelNo >=2 && ui_ChannelNo <=3) */
-                        if (ui_ChannelNo >= 4 && ui_ChannelNo <= 5) {
-                                /* BEGIN JK 06.07.04: Management of sevrals boards */
-                                /* i_ChannelNo=i_ChannelNo-4; */
-                                /* i_Offset=128; */
-                                s_BoardInfos[dev->minor].i_ChannelNo =
-                                        s_BoardInfos[dev->minor].i_ChannelNo -
-                                        4;
-                                s_BoardInfos[dev->minor].i_Offset = 128;
-                                /* END JK 06.07.04: Management of sevrals boards */
-                                ui_ChannelNo = ui_ChannelNo - 4;
-                        }       /* if(ui_ChannelNo >=4 && ui_ChannelNo <=5) */
-                        if (ui_ChannelNo >= 6 && ui_ChannelNo <= 7) {
-                                /* BEGIN JK 06.07.04: Management of sevrals boards */
-                                /* i_ChannelNo=i_ChannelNo-6; */
-                                /* i_Offset=192; */
-                                s_BoardInfos[dev->minor].i_ChannelNo =
-                                        s_BoardInfos[dev->minor].i_ChannelNo -
-                                        6;
-                                s_BoardInfos[dev->minor].i_Offset = 192;
-                                /* END JK 06.07.04: Management of sevrals boards */
-                                ui_ChannelNo = ui_ChannelNo - 6;
-                        }       /* if(ui_ChannelNo >=6 && ui_ChannelNo <=7) */
-                        break;
-
-                default:
-                        printk("\n This selection of polarity does not exist\n");
-                        i_err++;
-                }               /* switch(data[2]) */
-        }                       /* if(data[12]==0 || data[12]==1) */
-        else {
-                switch (data[11]) {
-                case 1:
-                        /* BEGIN JK 06.07.04: Management of sevrals boards */
-                        /* i_Offset=0; */
-                        s_BoardInfos[dev->minor].i_Offset = 0;
-                        /* END JK 06.07.04: Management of sevrals boards */
-                        break;
-                case 2:
-                        /* BEGIN JK 06.07.04: Management of sevrals boards */
-                        /* i_Offset=64; */
-                        s_BoardInfos[dev->minor].i_Offset = 64;
-                        /* END JK 06.07.04: Management of sevrals boards */
-                        break;
-                case 3:
-                        /* BEGIN JK 06.07.04: Management of sevrals boards */
-                        /* i_Offset=128; */
-                        s_BoardInfos[dev->minor].i_Offset = 128;
-                        /* END JK 06.07.04: Management of sevrals boards */
-                        break;
-                case 4:
-                        /* BEGIN JK 06.07.04: Management of sevrals boards */
-                        /* i_Offset=192; */
-                        s_BoardInfos[dev->minor].i_Offset = 192;
-                        /* END JK 06.07.04: Management of sevrals boards */
-                        break;
-                default:
-                        printk("\nError in module selection\n");
-                        i_err++;
-                }               /*  switch(data[11]) */
-        }                       /*  elseif(data[12]==0 || data[12]==1) */
-        if (i_err) {
-                i_APCI3200_Reset(dev);
-                return -EINVAL;
-        }
-        /* if(i_ScanType!=1) */
-        if (s_BoardInfos[dev->minor].i_ScanType != 1) {
-                /* BEGIN JK 06.07.04: Management of sevrals boards */
-                /* i_Count=0; */
-                /* i_Sum=0; */
-                s_BoardInfos[dev->minor].i_Count = 0;
-                s_BoardInfos[dev->minor].i_Sum = 0;
-                /* END JK 06.07.04: Management of sevrals boards */
-        }                       /* if(i_ScanType!=1) */
-
-        ul_Config =
-                data[1] | (data[2] << 6) | (data[5] << 7) | (data[3] << 8) |
-                (data[4] << 9);
-        /* BEGIN JK 06.07.04: Management of sevrals boards */
-        /* while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1); */
-        while (((inl(devpriv->iobase + s_BoardInfos[dev->minor].i_Offset +
-                                        12) >> 19) & 1) != 1) ;
-        /* END JK 06.07.04: Management of sevrals boards */
-  /*********************************/
-        /* Write the channel to configure */
-  /*********************************/
-        /* BEGIN JK 06.07.04: Management of sevrals boards */
-        /* outl(0 | ui_ChannelNo , devpriv->iobase+i_Offset + 0x4); */
-        outl(0 | ui_ChannelNo,
-                devpriv->iobase + s_BoardInfos[dev->minor].i_Offset + 0x4);
-        /* END JK 06.07.04: Management of sevrals boards */
-
-        /* BEGIN JK 06.07.04: Management of sevrals boards */
-        /* while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1); */
-        while (((inl(devpriv->iobase + s_BoardInfos[dev->minor].i_Offset +
-                                        12) >> 19) & 1) != 1) ;
-        /* END JK 06.07.04: Management of sevrals boards */
-  /**************************/
-        /* Reset the configuration */
-  /**************************/
-        /* BEGIN JK 06.07.04: Management of sevrals boards */
-        /* outl(0 , devpriv->iobase+i_Offset + 0x0); */
-        outl(0, devpriv->iobase + s_BoardInfos[dev->minor].i_Offset + 0x0);
-        /* END JK 06.07.04: Management of sevrals boards */
-
-        /* BEGIN JK 06.07.04: Management of sevrals boards */
-        /* while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1); */
-        while (((inl(devpriv->iobase + s_BoardInfos[dev->minor].i_Offset +
-                                        12) >> 19) & 1) != 1) ;
-        /* END JK 06.07.04: Management of sevrals boards */
-
-  /***************************/
-        /* Write the configuration */
-  /***************************/
-        /* BEGIN JK 06.07.04: Management of sevrals boards */
-        /* outl(ul_Config , devpriv->iobase+i_Offset + 0x0); */
-        outl(ul_Config,
-                devpriv->iobase + s_BoardInfos[dev->minor].i_Offset + 0x0);
-        /* END JK 06.07.04: Management of sevrals boards */
-
-  /***************************/
-        /*Reset the calibration bit */
-  /***************************/
-        /* BEGIN JK 06.07.04: Management of sevrals boards */
-        /* ul_Temp = inl(devpriv->iobase+i_Offset + 12); */
-        ul_Temp = inl(devpriv->iobase + s_BoardInfos[dev->minor].i_Offset + 12);
-        /* END JK 06.07.04: Management of sevrals boards */
-
-        /* BEGIN JK 06.07.04: Management of sevrals boards */
-        /* while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1); */
-        while (((inl(devpriv->iobase + s_BoardInfos[dev->minor].i_Offset +
-                                        12) >> 19) & 1) != 1) ;
-        /* END JK 06.07.04: Management of sevrals boards */
-
-        /* BEGIN JK 06.07.04: Management of sevrals boards */
-        /* outl((ul_Temp & 0xFFF9FFFF) , devpriv->iobase+.i_Offset + 12); */
-        outl((ul_Temp & 0xFFF9FFFF),
-                devpriv->iobase + s_BoardInfos[dev->minor].i_Offset + 12);
-        /* END JK 06.07.04: Management of sevrals boards */
+        struct addi_private *devpriv = dev->private;
+        unsigned int mask = data[0];
+        unsigned int bits = data[1];
 
-        if (data[9] == 1) {
-                devpriv->tsk_Current = current;
-                /* BEGIN JK 06.07.04: Management of sevrals boards */
-                /* i_InterruptFlag=1; */
-                s_BoardInfos[dev->minor].i_InterruptFlag = 1;
-                /* END JK 06.07.04: Management of sevrals boards */
-        }                       /*  if(data[9]==1) */
-        else {
-                /* BEGIN JK 06.07.04: Management of sevrals boards */
-                /* i_InterruptFlag=0; */
-                s_BoardInfos[dev->minor].i_InterruptFlag = 0;
-                /* END JK 06.07.04: Management of sevrals boards */
-        }                       /* else  if(data[9]==1) */
-
-        /* BEGIN JK 06.07.04: Management of sevrals boards */
-        /* i_Initialised=1; */
-        s_BoardInfos[dev->minor].i_Initialised = 1;
-        /* END JK 06.07.04: Management of sevrals boards */
+        s->state = inl(devpriv->i_IobaseAddon) & 0xf;
+        if (mask) {
+                s->state &= ~mask;
+                s->state |= (bits & mask)
 
-        /* BEGIN JK 06.07.04: Management of sevrals boards */
-        /* if(i_ScanType==1) */
-        if (s_BoardInfos[dev->minor].i_ScanType == 1)
-                /* END JK 06.07.04: Management of sevrals boards */
-        {
-                /* BEGIN JK 06.07.04: Management of sevrals boards */
-                /* i_Sum=i_Sum+1; */
-                s_BoardInfos[dev->minor].i_Sum =
-                        s_BoardInfos[dev->minor].i_Sum + 1;
-                /* END JK 06.07.04: Management of sevrals boards */
-
-                insn->unused[0] = 0;
-                i_APCI3200_ReadAnalogInput(dev, s, insn, &ui_Dummy);
+                outl(s->state, devpriv->i_IobaseAddon);
         }
 
-        return insn->n;
-}
-
-/*
-  +----------------------------------------------------------------------------+
-  | Function   Name   : int i_APCI3200_ReadAnalogInput                         |
-  |                               (struct comedi_device *dev,struct comedi_subdevice *s,       |
-  |                     struct comedi_insn *insn,unsigned int *data)                      |
-  +----------------------------------------------------------------------------+
-  | Task              : Read  value  of the selected channel                             |
-  +----------------------------------------------------------------------------+
-  | Input Parameters  : struct comedi_device *dev      : Driver handle                |
-  |                     unsigned int ui_NoOfChannels    : No Of Channels To read       |
-  |                     unsigned int *data              : Data Pointer to read status  |
-  +----------------------------------------------------------------------------+
-  | Output Parameters : --                                                                                                       |
-  |                             data[0]  : Digital Value Of Input             |
-  |                             data[1]  : Calibration Offset Value           |
-  |                             data[2]  : Calibration Gain Value
-  |                             data[3]  : CJC value
-  |                             data[4]  : CJC offset value
-  |                             data[5]  : CJC gain value
-  | Begin JK 21.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values
-  |                             data[6] : CJC current source from eeprom
-  |                             data[7] : Channel current source from eeprom
-  |                             data[8] : Channle gain factor from eeprom
-  | End JK 21.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values
-  +----------------------------------------------------------------------------+
-  | Return Value      : TRUE  : No error occur                                 |
-  |                         : FALSE : Error occur. Return the error          |
-  |                                                                              |
-  +----------------------------------------------------------------------------+
-*/
-int i_APCI3200_ReadAnalogInput(struct comedi_device *dev, struct comedi_subdevice *s,
-        struct comedi_insn *insn, unsigned int *data)
-{
-        unsigned int ui_DummyValue = 0;
-        int i_ConvertCJCCalibration;
-        int i = 0;
-
-        /* BEGIN JK 06.07.04: Management of sevrals boards */
-        /* if(i_Initialised==0) */
-        if (s_BoardInfos[dev->minor].i_Initialised == 0)
-                /* END JK 06.07.04: Management of sevrals boards */
-        {
-                i_APCI3200_Reset(dev);
-                return -EINVAL;
-        }                       /* if(i_Initialised==0); */
-
-#ifdef PRINT_INFO
-        printk("\n insn->unused[0] = %i", insn->unused[0]);
-#endif
-
-        switch (insn->unused[0]) {
-        case 0:
-
-                i_APCI3200_Read1AnalogInputChannel(dev, s, insn,
-                        &ui_DummyValue);
-                /* BEGIN JK 06.07.04: Management of sevrals boards */
-                /* ui_InterruptChannelValue[i_Count+0]=ui_DummyValue; */
-                s_BoardInfos[dev->minor].
-                        ui_InterruptChannelValue[s_BoardInfos[dev->minor].
-                        i_Count + 0] = ui_DummyValue;
-                /* END JK 06.07.04: Management of sevrals boards */
-
-                /* Begin JK 25.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values */
-                i_APCI3200_GetChannelCalibrationValue(dev,
-                        s_BoardInfos[dev->minor].ui_Channel_num,
-                        &s_BoardInfos[dev->minor].
-                        ui_InterruptChannelValue[s_BoardInfos[dev->minor].
-                                i_Count + 6],
-                        &s_BoardInfos[dev->minor].
-                        ui_InterruptChannelValue[s_BoardInfos[dev->minor].
-                                i_Count + 7],
-                        &s_BoardInfos[dev->minor].
-                        ui_InterruptChannelValue[s_BoardInfos[dev->minor].
-                                i_Count + 8]);
-
-#ifdef PRINT_INFO
-                printk("\n s_BoardInfos [dev->minor].ui_InterruptChannelValue[s_BoardInfos [dev->minor].i_Count+6] = %lu", s_BoardInfos[dev->minor].ui_InterruptChannelValue[s_BoardInfos[dev->minor].i_Count + 6]);
-
-                printk("\n s_BoardInfos [dev->minor].ui_InterruptChannelValue[s_BoardInfos [dev->minor].i_Count+7] = %lu", s_BoardInfos[dev->minor].ui_InterruptChannelValue[s_BoardInfos[dev->minor].i_Count + 7]);
-
-                printk("\n s_BoardInfos [dev->minor].ui_InterruptChannelValue[s_BoardInfos [dev->minor].i_Count+8] = %lu", s_BoardInfos[dev->minor].ui_InterruptChannelValue[s_BoardInfos[dev->minor].i_Count + 8]);
-#endif
-
-                /* End JK 25.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values */
-
-                /* BEGIN JK 06.07.04: Management of sevrals boards */
-                /* if((i_ADDIDATAType==2) && (i_InterruptFlag == FALSE) && (i_CJCAvailable==1)) */
-                if ((s_BoardInfos[dev->minor].i_ADDIDATAType == 2)
-                        && (s_BoardInfos[dev->minor].i_InterruptFlag == FALSE)
-                        && (s_BoardInfos[dev->minor].i_CJCAvailable == 1))
-                        /* END JK 06.07.04: Management of sevrals boards */
-                {
-                        i_APCI3200_ReadCJCValue(dev, &ui_DummyValue);
-                        /* BEGIN JK 06.07.04: Management of sevrals boards */
-                        /* ui_InterruptChannelValue[i_Count + 3]=ui_DummyValue; */
-                        s_BoardInfos[dev->minor].
-                                ui_InterruptChannelValue[s_BoardInfos[dev->
-                                        minor].i_Count + 3] = ui_DummyValue;
-                        /* END JK 06.07.04: Management of sevrals boards */
-                }               /* if((i_ADDIDATAType==2) && (i_InterruptFlag == FALSE)) */
-                else {
-                        /* BEGIN JK 06.07.04: Management of sevrals boards */
-                        /* ui_InterruptChannelValue[i_Count + 3]=0; */
-                        s_BoardInfos[dev->minor].
-                                ui_InterruptChannelValue[s_BoardInfos[dev->
-                                        minor].i_Count + 3] = 0;
-                        /* END JK 06.07.04: Management of sevrals boards */
-                }               /* elseif((i_ADDIDATAType==2) && (i_InterruptFlag == FALSE) && (i_CJCAvailable==1)) */
-
-                /* BEGIN JK 06.07.04: Management of sevrals boards */
-                /* if (( i_AutoCalibration == FALSE) && (i_InterruptFlag == FALSE)) */
-                if ((s_BoardInfos[dev->minor].i_AutoCalibration == FALSE)
-                        && (s_BoardInfos[dev->minor].i_InterruptFlag == FALSE))
-                        /* END JK 06.07.04: Management of sevrals boards */
-                {
-                        i_APCI3200_ReadCalibrationOffsetValue(dev,
-                                &ui_DummyValue);
-                        /* BEGIN JK 06.07.04: Management of sevrals boards */
-                        /* ui_InterruptChannelValue[i_Count + 1]=ui_DummyValue; */
-                        s_BoardInfos[dev->minor].
-                                ui_InterruptChannelValue[s_BoardInfos[dev->
-                                        minor].i_Count + 1] = ui_DummyValue;
-                        /* END JK 06.07.04: Management of sevrals boards */
-                        i_APCI3200_ReadCalibrationGainValue(dev,
-                                &ui_DummyValue);
-                        /* BEGIN JK 06.07.04: Management of sevrals boards */
-                        /* ui_InterruptChannelValue[i_Count + 2]=ui_DummyValue; */
-                        s_BoardInfos[dev->minor].
-                                ui_InterruptChannelValue[s_BoardInfos[dev->
-                                        minor].i_Count + 2] = ui_DummyValue;
-                        /* END JK 06.07.04: Management of sevrals boards */
-                }               /* if (( i_AutoCalibration == FALSE) && (i_InterruptFlag == FALSE)) */
-
-                /* BEGIN JK 06.07.04: Management of sevrals boards */
-                /* if((i_ADDIDATAType==2) && (i_InterruptFlag == FALSE)&& (i_CJCAvailable==1)) */
-                if ((s_BoardInfos[dev->minor].i_ADDIDATAType == 2)
-                        && (s_BoardInfos[dev->minor].i_InterruptFlag == FALSE)
-                        && (s_BoardInfos[dev->minor].i_CJCAvailable == 1))
-                        /* END JK 06.07.04: Management of sevrals boards */
-                {
-          /**********************************************************/
-                        /*Test if the Calibration channel must be read for the CJC */
-          /**********************************************************/
-          /**********************************/
-                        /*Test if the polarity is the same */
-          /**********************************/
-                        /* BEGIN JK 06.07.04: Management of sevrals boards */
-                        /* if(i_CJCPolarity!=i_ADDIDATAPolarity) */
-                        if (s_BoardInfos[dev->minor].i_CJCPolarity !=
-                                s_BoardInfos[dev->minor].i_ADDIDATAPolarity)
-                                /* END JK 06.07.04: Management of sevrals boards */
-                        {
-                                i_ConvertCJCCalibration = 1;
-                        }       /* if(i_CJCPolarity!=i_ADDIDATAPolarity) */
-                        else {
-                                /* BEGIN JK 06.07.04: Management of sevrals boards */
-                                /* if(i_CJCGain==i_ADDIDATAGain) */
-                                if (s_BoardInfos[dev->minor].i_CJCGain ==
-                                        s_BoardInfos[dev->minor].i_ADDIDATAGain)
-                                        /* END JK 06.07.04: Management of sevrals boards */
-                                {
-                                        i_ConvertCJCCalibration = 0;
-                                }       /* if(i_CJCGain==i_ADDIDATAGain) */
-                                else {
-                                        i_ConvertCJCCalibration = 1;
-                                }       /* elseif(i_CJCGain==i_ADDIDATAGain) */
-                        }       /* elseif(i_CJCPolarity!=i_ADDIDATAPolarity) */
-                        if (i_ConvertCJCCalibration == 1) {
-                                i_APCI3200_ReadCJCCalOffset(dev,
-                                        &ui_DummyValue);
-                                /* BEGIN JK 06.07.04: Management of sevrals boards */
-                                /* ui_InterruptChannelValue[i_Count+4]=ui_DummyValue; */
-                                s_BoardInfos[dev->minor].
-                                        ui_InterruptChannelValue[s_BoardInfos
-                                        [dev->minor].i_Count + 4] =
-                                        ui_DummyValue;
-                                /* END JK 06.07.04: Management of sevrals boards */
-
-                                i_APCI3200_ReadCJCCalGain(dev, &ui_DummyValue);
-
-                                /* BEGIN JK 06.07.04: Management of sevrals boards */
-                                /* ui_InterruptChannelValue[i_Count+5]=ui_DummyValue; */
-                                s_BoardInfos[dev->minor].
-                                        ui_InterruptChannelValue[s_BoardInfos
-                                        [dev->minor].i_Count + 5] =
-                                        ui_DummyValue;
-                                /* END JK 06.07.04: Management of sevrals boards */
-                        }       /* if(i_ConvertCJCCalibration==1) */
-                        else {
-                                /* BEGIN JK 06.07.04: Management of sevrals boards */
-                                /* ui_InterruptChannelValue[i_Count+4]=0; */
-                                /* ui_InterruptChannelValue[i_Count+5]=0; */
-
-                                s_BoardInfos[dev->minor].
-                                        ui_InterruptChannelValue[s_BoardInfos
-                                        [dev->minor].i_Count + 4] = 0;
-                                s_BoardInfos[dev->minor].
-                                        ui_InterruptChannelValue[s_BoardInfos
-                                        [dev->minor].i_Count + 5] = 0;
-                                /* END JK 06.07.04: Management of sevrals boards */
-                        }       /* elseif(i_ConvertCJCCalibration==1) */
-                }               /* if((i_ADDIDATAType==2) && (i_InterruptFlag == FALSE)) */
-
-                /* BEGIN JK 06.07.04: Management of sevrals boards */
-                /* if(i_ScanType!=1) */
-                if (s_BoardInfos[dev->minor].i_ScanType != 1) {
-                        /* i_Count=0; */
-                        s_BoardInfos[dev->minor].i_Count = 0;
-                }               /* if(i_ScanType!=1) */
-                else {
-                        /* i_Count=i_Count +6; */
-                        /* Begin JK 22.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values */
-                        /* s_BoardInfos [dev->minor].i_Count=s_BoardInfos [dev->minor].i_Count +6; */
-                        s_BoardInfos[dev->minor].i_Count =
-                                s_BoardInfos[dev->minor].i_Count + 9;
-                        /* End JK 22.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values */
-                }               /* else if(i_ScanType!=1) */
-
-                /* if((i_ScanType==1) &&(i_InterruptFlag==1)) */
-                if ((s_BoardInfos[dev->minor].i_ScanType == 1)
-                        && (s_BoardInfos[dev->minor].i_InterruptFlag == 1)) {
-                        /* i_Count=i_Count-6; */
-                        /* Begin JK 22.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values */
-                        /* s_BoardInfos [dev->minor].i_Count=s_BoardInfos [dev->minor].i_Count-6; */
-                        s_BoardInfos[dev->minor].i_Count =
-                                s_BoardInfos[dev->minor].i_Count - 9;
-                        /* End JK 22.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values */
-                }
-                /* if(i_ScanType==0) */
-                if (s_BoardInfos[dev->minor].i_ScanType == 0) {
-                        /*
-                           data[0]= ui_InterruptChannelValue[0];
-                           data[1]= ui_InterruptChannelValue[1];
-                           data[2]= ui_InterruptChannelValue[2];
-                           data[3]= ui_InterruptChannelValue[3];
-                           data[4]= ui_InterruptChannelValue[4];
-                           data[5]= ui_InterruptChannelValue[5];
-                         */
-#ifdef PRINT_INFO
-                        printk("\n data[0]= s_BoardInfos [dev->minor].ui_InterruptChannelValue[0];");
-#endif
-                        data[0] =
-                                s_BoardInfos[dev->minor].
-                                ui_InterruptChannelValue[0];
-                        data[1] =
-                                s_BoardInfos[dev->minor].
-                                ui_InterruptChannelValue[1];
-                        data[2] =
-                                s_BoardInfos[dev->minor].
-                                ui_InterruptChannelValue[2];
-                        data[3] =
-                                s_BoardInfos[dev->minor].
-                                ui_InterruptChannelValue[3];
-                        data[4] =
-                                s_BoardInfos[dev->minor].
-                                ui_InterruptChannelValue[4];
-                        data[5] =
-                                s_BoardInfos[dev->minor].
-                                ui_InterruptChannelValue[5];
-
-                        /* Begin JK 22.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values */
-                        /* printk("\n 0 - i_APCI3200_GetChannelCalibrationValue data [6] = %lu, data [7] = %lu, data [8] = %lu", data [6], data [7], data [8]); */
-                        i_APCI3200_GetChannelCalibrationValue(dev,
-                                s_BoardInfos[dev->minor].ui_Channel_num,
-                                &data[6], &data[7], &data[8]);
-                        /* End JK 22.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values */
-                }
-                break;
-        case 1:
-
-                for (i = 0; i < insn->n; i++) {
-                        /* data[i]=ui_InterruptChannelValue[i]; */
-                        data[i] =
-                                s_BoardInfos[dev->minor].
-                                ui_InterruptChannelValue[i];
-                }
-
-                /* i_Count=0; */
-                /* i_Sum=0; */
-                /* if(i_ScanType==1) */
-                s_BoardInfos[dev->minor].i_Count = 0;
-                s_BoardInfos[dev->minor].i_Sum = 0;
-                if (s_BoardInfos[dev->minor].i_ScanType == 1) {
-                        /* i_Initialised=0; */
-                        /* i_InterruptFlag=0; */
-                        s_BoardInfos[dev->minor].i_Initialised = 0;
-                        s_BoardInfos[dev->minor].i_InterruptFlag = 0;
-                        /* END JK 06.07.04: Management of sevrals boards */
-                }
-                break;
-        default:
-                printk("\nThe parameters passed are in error\n");
-                i_APCI3200_Reset(dev);
-                return -EINVAL;
-        }                       /* switch(insn->unused[0]) */
+        data[1] = s->state;
 
         return insn->n;
 }
 
-/*
-  +----------------------------------------------------------------------------+
-  | Function   Name   : int i_APCI3200_Read1AnalogInputChannel                 |
-  |                               (struct comedi_device *dev,struct comedi_subdevice *s,       |
-  |                     struct comedi_insn *insn,unsigned int *data)                      |
-  +----------------------------------------------------------------------------+
-  | Task              : Read  value  of the selected channel                             |
-  +----------------------------------------------------------------------------+
-  | Input Parameters  : struct comedi_device *dev      : Driver handle                |
-  |                     unsigned int ui_NoOfChannel    : Channel No to read            |
-  |                     unsigned int *data              : Data Pointer to read status  |
-  +----------------------------------------------------------------------------+
-  | Output Parameters : --                                                                                                       |
-  |                               data[0]  : Digital Value read                   |
-  |
-  +----------------------------------------------------------------------------+
-  | Return Value      : TRUE  : No error occur                                 |
-  |                         : FALSE : Error occur. Return the error          |
-  |                                                                              |
-  +----------------------------------------------------------------------------+
-*/
-int i_APCI3200_Read1AnalogInputChannel(struct comedi_device *dev,
-        struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data)
+static int i_APCI3200_Read1AnalogInputChannel(struct comedi_device *dev,
+                                              struct comedi_subdevice *s,
+                                              struct comedi_insn *insn,
+                                              unsigned int *data)
 {
+        struct addi_private *devpriv = dev->private;
         unsigned int ui_EOC = 0;
         unsigned int ui_ChannelNo = 0;
         unsigned int ui_CommandRegister = 0;
@@ -1751,28 +751,10 @@ int i_APCI3200_Read1AnalogInputChannel(struct comedi_device *dev,
         return 0;
 }
 
-/*
-  +----------------------------------------------------------------------------+
-  | Function   Name   : int i_APCI3200_ReadCalibrationOffsetValue              |
-  |                               (struct comedi_device *dev,struct comedi_subdevice *s,       |
-  |                     struct comedi_insn *insn,unsigned int *data)                      |
-  +----------------------------------------------------------------------------+
-  | Task              : Read calibration offset  value  of the selected channel|
-  +----------------------------------------------------------------------------+
-  | Input Parameters  : struct comedi_device *dev      : Driver handle                |
-  |                     unsigned int *data              : Data Pointer to read status  |
-  +----------------------------------------------------------------------------+
-  | Output Parameters : --                                                                                                       |
-  |                               data[0]  : Calibration offset Value   |
-  |
-  +----------------------------------------------------------------------------+
-  | Return Value      : TRUE  : No error occur                                 |
-  |                         : FALSE : Error occur. Return the error          |
-  |                                                                              |
-  +----------------------------------------------------------------------------+
-*/
-int i_APCI3200_ReadCalibrationOffsetValue(struct comedi_device *dev, unsigned int *data)
+static int i_APCI3200_ReadCalibrationOffsetValue(struct comedi_device *dev,
+                                                 unsigned int *data)
 {
+        struct addi_private *devpriv = dev->private;
         unsigned int ui_Temp = 0, ui_EOC = 0;
         unsigned int ui_CommandRegister = 0;
 
@@ -1887,28 +869,10 @@ int i_APCI3200_ReadCalibrationOffsetValue(struct comedi_device *dev, unsigned in
         return 0;
 }
 
-/*
-  +----------------------------------------------------------------------------+
-  | Function   Name   : int i_APCI3200_ReadCalibrationGainValue                |
-  |                               (struct comedi_device *dev,struct comedi_subdevice *s,       |
-  |                     struct comedi_insn *insn,unsigned int *data)                      |
-  +----------------------------------------------------------------------------+
-  | Task              : Read calibration gain  value  of the selected channel  |
-  +----------------------------------------------------------------------------+
-  | Input Parameters  : struct comedi_device *dev      : Driver handle                |
-  |                     unsigned int *data              : Data Pointer to read status  |
-  +----------------------------------------------------------------------------+
-  | Output Parameters : --                                                                                                       |
-  |                               data[0]  : Calibration gain Value Of Input     |
-  |
-  +----------------------------------------------------------------------------+
-  | Return Value      : TRUE  : No error occur                                 |
-  |                         : FALSE : Error occur. Return the error          |
-  |                                                                              |
-  +----------------------------------------------------------------------------+
-*/
-int i_APCI3200_ReadCalibrationGainValue(struct comedi_device *dev, unsigned int *data)
+static int i_APCI3200_ReadCalibrationGainValue(struct comedi_device *dev,
+                                               unsigned int *data)
 {
+        struct addi_private *devpriv = dev->private;
         unsigned int ui_EOC = 0;
         int ui_CommandRegister = 0;
 
@@ -2022,29 +986,10 @@ int i_APCI3200_ReadCalibrationGainValue(struct comedi_device *dev, unsigned int
         return 0;
 }
 
-/*
-  +----------------------------------------------------------------------------+
-  | Function   Name   : int i_APCI3200_ReadCJCValue                            |
-  |                               (struct comedi_device *dev,struct comedi_subdevice *s,       |
-  |                     struct comedi_insn *insn,unsigned int *data)                      |
-  +----------------------------------------------------------------------------+
-  | Task              : Read CJC  value  of the selected channel               |
-  +----------------------------------------------------------------------------+
-  | Input Parameters  : struct comedi_device *dev      : Driver handle                |
-  |                     unsigned int *data              : Data Pointer to read status  |
-  +----------------------------------------------------------------------------+
-  | Output Parameters : --                                                                                                       |
-  |                               data[0]  : CJC Value                           |
-  |
-  +----------------------------------------------------------------------------+
-  | Return Value      : TRUE  : No error occur                                 |
-  |                         : FALSE : Error occur. Return the error          |
-  |                                                                              |
-  +----------------------------------------------------------------------------+
-*/
-
-int i_APCI3200_ReadCJCValue(struct comedi_device *dev, unsigned int *data)
+static int i_APCI3200_ReadCJCValue(struct comedi_device *dev,
+                                   unsigned int *data)
 {
+        struct addi_private *devpriv = dev->private;
         unsigned int ui_EOC = 0;
         int ui_CommandRegister = 0;
 
@@ -2142,30 +1087,13 @@ int i_APCI3200_ReadCJCValue(struct comedi_device *dev, unsigned int *data)
         return 0;
 }
 
-/*
-  +----------------------------------------------------------------------------+
-  | Function   Name   : int i_APCI3200_ReadCJCCalOffset                        |
-  |                               (struct comedi_device *dev,struct comedi_subdevice *s,       |
-  |                     struct comedi_insn *insn,unsigned int *data)                      |
-  +----------------------------------------------------------------------------+
-  | Task              : Read CJC calibration offset  value  of the selected channel
-  +----------------------------------------------------------------------------+
-  | Input Parameters  : struct comedi_device *dev      : Driver handle                |
-  |                     unsigned int *data              : Data Pointer to read status  |
-  +----------------------------------------------------------------------------+
-  | Output Parameters : --                                                                                                       |
-  |                               data[0]  : CJC calibration offset Value
-  |
-  +----------------------------------------------------------------------------+
-  | Return Value      : TRUE  : No error occur                                 |
-  |                         : FALSE : Error occur. Return the error          |
-  |                                                                              |
-  +----------------------------------------------------------------------------+
-*/
-int i_APCI3200_ReadCJCCalOffset(struct comedi_device *dev, unsigned int *data)
+static int i_APCI3200_ReadCJCCalOffset(struct comedi_device *dev,
+                                       unsigned int *data)
 {
+        struct addi_private *devpriv = dev->private;
         unsigned int ui_EOC = 0;
         int ui_CommandRegister = 0;
+
   /*******************************************/
         /*Read calibration offset value for the CJC */
   /*******************************************/
@@ -2257,31 +1185,13 @@ int i_APCI3200_ReadCJCCalOffset(struct comedi_device *dev, unsigned int *data)
         return 0;
 }
 
-/*
-  +----------------------------------------------------------------------------+
-  | Function   Name   : int i_APCI3200_ReadCJCGainValue                        |
-  |                               (struct comedi_device *dev,struct comedi_subdevice *s,       |
-  |                     struct comedi_insn *insn,unsigned int *data)                      |
-  +----------------------------------------------------------------------------+
-  | Task              : Read CJC calibration gain value
-  +----------------------------------------------------------------------------+
-  | Input Parameters  : struct comedi_device *dev      : Driver handle                |
-  |                     unsigned int ui_NoOfChannels    : No Of Channels To read       |
-  |                     unsigned int *data              : Data Pointer to read status  |
-  +----------------------------------------------------------------------------+
-  | Output Parameters : --                                                                                                       |
-  |                               data[0]  : CJC calibration gain value
-  |
-  +----------------------------------------------------------------------------+
-  | Return Value      : TRUE  : No error occur                                 |
-  |                         : FALSE : Error occur. Return the error          |
-  |                                                                              |
-  +----------------------------------------------------------------------------+
-*/
-int i_APCI3200_ReadCJCCalGain(struct comedi_device *dev, unsigned int *data)
+static int i_APCI3200_ReadCJCCalGain(struct comedi_device *dev,
+                                     unsigned int *data)
 {
+        struct addi_private *devpriv = dev->private;
         unsigned int ui_EOC = 0;
         int ui_CommandRegister = 0;
+
   /*******************************/
         /* Set the convert timing unit */
   /*******************************/
@@ -2367,43 +1277,842 @@ int i_APCI3200_ReadCJCCalGain(struct comedi_device *dev, unsigned int *data)
         return 0;
 }
 
+static int i_APCI3200_Reset(struct comedi_device *dev)
+{
+        struct addi_private *devpriv = dev->private;
+        int i_Temp;
+        unsigned int dw_Dummy;
+
+        /* i_InterruptFlag=0; */
+        /* i_Initialised==0; */
+        /* i_Count=0; */
+        /* i_Sum=0; */
+
+        s_BoardInfos[dev->minor].i_InterruptFlag = 0;
+        s_BoardInfos[dev->minor].i_Initialised = 0;
+        s_BoardInfos[dev->minor].i_Count = 0;
+        s_BoardInfos[dev->minor].i_Sum = 0;
+        s_BoardInfos[dev->minor].b_StructInitialized = 0;
+
+        outl(0x83838383, devpriv->i_IobaseAmcc + 0x60);
+
+        /*  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 */
+  /***************/
+        /*Empty the buffer */
+  /**************/
+        for (i_Temp = 0; i_Temp <= 95; i_Temp++) {
+                /* ui_InterruptChannelValue[i_Temp]=0; */
+                s_BoardInfos[dev->minor].ui_InterruptChannelValue[i_Temp] = 0;
+        }                       /* for(i_Temp=0;i_Temp<=95;i_Temp++) */
+  /*****************************/
+        /*Reset the START and IRQ bit */
+  /*****************************/
+        for (i_Temp = 0; i_Temp <= 192;) {
+                while (((inl(devpriv->iobase + i_Temp + 12) >> 19) & 1) != 1) ;
+                outl(0, devpriv->iobase + i_Temp + 8);
+                i_Temp = i_Temp + 64;
+        }                       /* for(i_Temp=0;i_Temp<=192;i_Temp+64) */
+        return 0;
+}
+
 /*
-  +----------------------------------------------------------------------------+
-  | Function   Name   : int i_APCI3200_InsnBits_AnalogInput_Test               |
-  |                       (struct comedi_device *dev,struct comedi_subdevice *s,               |
-  |                      struct comedi_insn *insn,unsigned int *data)                     |
-  +----------------------------------------------------------------------------+
-  | Task              : Tests the Selected Anlog Input Channel                 |
-  +----------------------------------------------------------------------------+
-  | Input Parameters  : struct comedi_device *dev      : Driver handle                |
-  |                     struct comedi_subdevice *s     : Subdevice Pointer            |
-  |                     struct comedi_insn *insn       : Insn Structure Pointer       |
-  |                     unsigned int *data          : Data Pointer contains        |
-  |                                          configuration parameters as below |
-  |
-  |
-  |                           data[0]            : 0 TestAnalogInputShortCircuit
-  |                                                                          1 TestAnalogInputConnection                                                                                                                                                                                                |
-
-  +----------------------------------------------------------------------------+
-  | Output Parameters : --                                                                                                       |
-  |                             data[0]            : Digital value obtained      |
-  |                           data[1]            : calibration offset          |
-  |                           data[2]            : calibration gain            |
-  |                                                                              |
-  |                                                                              |
-  +----------------------------------------------------------------------------+
-  | Return Value      : TRUE  : No error occur                                 |
-  |                         : FALSE : Error occur. Return the error          |
-  |                                                                              |
-  +----------------------------------------------------------------------------+
-*/
+ * Read value of the selected channel
+ *
+ * data[0]  : Digital Value Of Input
+ * data[1]  : Calibration Offset Value
+ * data[2]  : Calibration Gain Value
+ * data[3]  : CJC value
+ * data[4]  : CJC offset value
+ * data[5]  : CJC gain value
+ * data[6] : CJC current source from eeprom
+ * data[7] : Channel current source from eeprom
+ * data[8] : Channle gain factor from eeprom
+ */
+static int i_APCI3200_ReadAnalogInput(struct comedi_device *dev,
+                                      struct comedi_subdevice *s,
+                                      struct comedi_insn *insn,
+                                      unsigned int *data)
+{
+        unsigned int ui_DummyValue = 0;
+        int i_ConvertCJCCalibration;
+        int i = 0;
+
+        /* BEGIN JK 06.07.04: Management of sevrals boards */
+        /* if(i_Initialised==0) */
+        if (s_BoardInfos[dev->minor].i_Initialised == 0)
+                /* END JK 06.07.04: Management of sevrals boards */
+        {
+                i_APCI3200_Reset(dev);
+                return -EINVAL;
+        }                       /* if(i_Initialised==0); */
+
+#ifdef PRINT_INFO
+        printk("\n insn->unused[0] = %i", insn->unused[0]);
+#endif
+
+        switch (insn->unused[0]) {
+        case 0:
 
-int i_APCI3200_InsnBits_AnalogInput_Test(struct comedi_device *dev,
-        struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data)
+                i_APCI3200_Read1AnalogInputChannel(dev, s, insn,
+                        &ui_DummyValue);
+                /* BEGIN JK 06.07.04: Management of sevrals boards */
+                /* ui_InterruptChannelValue[i_Count+0]=ui_DummyValue; */
+                s_BoardInfos[dev->minor].
+                        ui_InterruptChannelValue[s_BoardInfos[dev->minor].
+                        i_Count + 0] = ui_DummyValue;
+                /* END JK 06.07.04: Management of sevrals boards */
+
+                /* Begin JK 25.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values */
+                i_APCI3200_GetChannelCalibrationValue(dev,
+                        s_BoardInfos[dev->minor].ui_Channel_num,
+                        &s_BoardInfos[dev->minor].
+                        ui_InterruptChannelValue[s_BoardInfos[dev->minor].
+                                i_Count + 6],
+                        &s_BoardInfos[dev->minor].
+                        ui_InterruptChannelValue[s_BoardInfos[dev->minor].
+                                i_Count + 7],
+                        &s_BoardInfos[dev->minor].
+                        ui_InterruptChannelValue[s_BoardInfos[dev->minor].
+                                i_Count + 8]);
+
+#ifdef PRINT_INFO
+                printk("\n s_BoardInfos [dev->minor].ui_InterruptChannelValue[s_BoardInfos [dev->minor].i_Count+6] = %lu", s_BoardInfos[dev->minor].ui_InterruptChannelValue[s_BoardInfos[dev->minor].i_Count + 6]);
+
+                printk("\n s_BoardInfos [dev->minor].ui_InterruptChannelValue[s_BoardInfos [dev->minor].i_Count+7] = %lu", s_BoardInfos[dev->minor].ui_InterruptChannelValue[s_BoardInfos[dev->minor].i_Count + 7]);
+
+                printk("\n s_BoardInfos [dev->minor].ui_InterruptChannelValue[s_BoardInfos [dev->minor].i_Count+8] = %lu", s_BoardInfos[dev->minor].ui_InterruptChannelValue[s_BoardInfos[dev->minor].i_Count + 8]);
+#endif
+
+                /* End JK 25.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values */
+
+                /* BEGIN JK 06.07.04: Management of sevrals boards */
+                /* if((i_ADDIDATAType==2) && (i_InterruptFlag == FALSE) && (i_CJCAvailable==1)) */
+                if ((s_BoardInfos[dev->minor].i_ADDIDATAType == 2)
+                        && (s_BoardInfos[dev->minor].i_InterruptFlag == FALSE)
+                        && (s_BoardInfos[dev->minor].i_CJCAvailable == 1))
+                        /* END JK 06.07.04: Management of sevrals boards */
+                {
+                        i_APCI3200_ReadCJCValue(dev, &ui_DummyValue);
+                        /* BEGIN JK 06.07.04: Management of sevrals boards */
+                        /* ui_InterruptChannelValue[i_Count + 3]=ui_DummyValue; */
+                        s_BoardInfos[dev->minor].
+                                ui_InterruptChannelValue[s_BoardInfos[dev->
+                                        minor].i_Count + 3] = ui_DummyValue;
+                        /* END JK 06.07.04: Management of sevrals boards */
+                }               /* if((i_ADDIDATAType==2) && (i_InterruptFlag == FALSE)) */
+                else {
+                        /* BEGIN JK 06.07.04: Management of sevrals boards */
+                        /* ui_InterruptChannelValue[i_Count + 3]=0; */
+                        s_BoardInfos[dev->minor].
+                                ui_InterruptChannelValue[s_BoardInfos[dev->
+                                        minor].i_Count + 3] = 0;
+                        /* END JK 06.07.04: Management of sevrals boards */
+                }               /* elseif((i_ADDIDATAType==2) && (i_InterruptFlag == FALSE) && (i_CJCAvailable==1)) */
+
+                /* BEGIN JK 06.07.04: Management of sevrals boards */
+                /* if (( i_AutoCalibration == FALSE) && (i_InterruptFlag == FALSE)) */
+                if ((s_BoardInfos[dev->minor].i_AutoCalibration == FALSE)
+                        && (s_BoardInfos[dev->minor].i_InterruptFlag == FALSE))
+                        /* END JK 06.07.04: Management of sevrals boards */
+                {
+                        i_APCI3200_ReadCalibrationOffsetValue(dev,
+                                &ui_DummyValue);
+                        /* BEGIN JK 06.07.04: Management of sevrals boards */
+                        /* ui_InterruptChannelValue[i_Count + 1]=ui_DummyValue; */
+                        s_BoardInfos[dev->minor].
+                                ui_InterruptChannelValue[s_BoardInfos[dev->
+                                        minor].i_Count + 1] = ui_DummyValue;
+                        /* END JK 06.07.04: Management of sevrals boards */
+                        i_APCI3200_ReadCalibrationGainValue(dev,
+                                &ui_DummyValue);
+                        /* BEGIN JK 06.07.04: Management of sevrals boards */
+                        /* ui_InterruptChannelValue[i_Count + 2]=ui_DummyValue; */
+                        s_BoardInfos[dev->minor].
+                                ui_InterruptChannelValue[s_BoardInfos[dev->
+                                        minor].i_Count + 2] = ui_DummyValue;
+                        /* END JK 06.07.04: Management of sevrals boards */
+                }               /* if (( i_AutoCalibration == FALSE) && (i_InterruptFlag == FALSE)) */
+
+                /* BEGIN JK 06.07.04: Management of sevrals boards */
+                /* if((i_ADDIDATAType==2) && (i_InterruptFlag == FALSE)&& (i_CJCAvailable==1)) */
+                if ((s_BoardInfos[dev->minor].i_ADDIDATAType == 2)
+                        && (s_BoardInfos[dev->minor].i_InterruptFlag == FALSE)
+                        && (s_BoardInfos[dev->minor].i_CJCAvailable == 1))
+                        /* END JK 06.07.04: Management of sevrals boards */
+                {
+          /**********************************************************/
+                        /*Test if the Calibration channel must be read for the CJC */
+          /**********************************************************/
+          /**********************************/
+                        /*Test if the polarity is the same */
+          /**********************************/
+                        /* BEGIN JK 06.07.04: Management of sevrals boards */
+                        /* if(i_CJCPolarity!=i_ADDIDATAPolarity) */
+                        if (s_BoardInfos[dev->minor].i_CJCPolarity !=
+                                s_BoardInfos[dev->minor].i_ADDIDATAPolarity)
+                                /* END JK 06.07.04: Management of sevrals boards */
+                        {
+                                i_ConvertCJCCalibration = 1;
+                        }       /* if(i_CJCPolarity!=i_ADDIDATAPolarity) */
+                        else {
+                                /* BEGIN JK 06.07.04: Management of sevrals boards */
+                                /* if(i_CJCGain==i_ADDIDATAGain) */
+                                if (s_BoardInfos[dev->minor].i_CJCGain ==
+                                        s_BoardInfos[dev->minor].i_ADDIDATAGain)
+                                        /* END JK 06.07.04: Management of sevrals boards */
+                                {
+                                        i_ConvertCJCCalibration = 0;
+                                }       /* if(i_CJCGain==i_ADDIDATAGain) */
+                                else {
+                                        i_ConvertCJCCalibration = 1;
+                                }       /* elseif(i_CJCGain==i_ADDIDATAGain) */
+                        }       /* elseif(i_CJCPolarity!=i_ADDIDATAPolarity) */
+                        if (i_ConvertCJCCalibration == 1) {
+                                i_APCI3200_ReadCJCCalOffset(dev,
+                                        &ui_DummyValue);
+                                /* BEGIN JK 06.07.04: Management of sevrals boards */
+                                /* ui_InterruptChannelValue[i_Count+4]=ui_DummyValue; */
+                                s_BoardInfos[dev->minor].
+                                        ui_InterruptChannelValue[s_BoardInfos
+                                        [dev->minor].i_Count + 4] =
+                                        ui_DummyValue;
+                                /* END JK 06.07.04: Management of sevrals boards */
+
+                                i_APCI3200_ReadCJCCalGain(dev, &ui_DummyValue);
+
+                                /* BEGIN JK 06.07.04: Management of sevrals boards */
+                                /* ui_InterruptChannelValue[i_Count+5]=ui_DummyValue; */
+                                s_BoardInfos[dev->minor].
+                                        ui_InterruptChannelValue[s_BoardInfos
+                                        [dev->minor].i_Count + 5] =
+                                        ui_DummyValue;
+                                /* END JK 06.07.04: Management of sevrals boards */
+                        }       /* if(i_ConvertCJCCalibration==1) */
+                        else {
+                                /* BEGIN JK 06.07.04: Management of sevrals boards */
+                                /* ui_InterruptChannelValue[i_Count+4]=0; */
+                                /* ui_InterruptChannelValue[i_Count+5]=0; */
+
+                                s_BoardInfos[dev->minor].
+                                        ui_InterruptChannelValue[s_BoardInfos
+                                        [dev->minor].i_Count + 4] = 0;
+                                s_BoardInfos[dev->minor].
+                                        ui_InterruptChannelValue[s_BoardInfos
+                                        [dev->minor].i_Count + 5] = 0;
+                                /* END JK 06.07.04: Management of sevrals boards */
+                        }       /* elseif(i_ConvertCJCCalibration==1) */
+                }               /* if((i_ADDIDATAType==2) && (i_InterruptFlag == FALSE)) */
+
+                /* BEGIN JK 06.07.04: Management of sevrals boards */
+                /* if(i_ScanType!=1) */
+                if (s_BoardInfos[dev->minor].i_ScanType != 1) {
+                        /* i_Count=0; */
+                        s_BoardInfos[dev->minor].i_Count = 0;
+                }               /* if(i_ScanType!=1) */
+                else {
+                        /* i_Count=i_Count +6; */
+                        /* Begin JK 22.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values */
+                        /* s_BoardInfos [dev->minor].i_Count=s_BoardInfos [dev->minor].i_Count +6; */
+                        s_BoardInfos[dev->minor].i_Count =
+                                s_BoardInfos[dev->minor].i_Count + 9;
+                        /* End JK 22.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values */
+                }               /* else if(i_ScanType!=1) */
+
+                /* if((i_ScanType==1) &&(i_InterruptFlag==1)) */
+                if ((s_BoardInfos[dev->minor].i_ScanType == 1)
+                        && (s_BoardInfos[dev->minor].i_InterruptFlag == 1)) {
+                        /* i_Count=i_Count-6; */
+                        /* Begin JK 22.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values */
+                        /* s_BoardInfos [dev->minor].i_Count=s_BoardInfos [dev->minor].i_Count-6; */
+                        s_BoardInfos[dev->minor].i_Count =
+                                s_BoardInfos[dev->minor].i_Count - 9;
+                        /* End JK 22.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values */
+                }
+                /* if(i_ScanType==0) */
+                if (s_BoardInfos[dev->minor].i_ScanType == 0) {
+                        /*
+                           data[0]= ui_InterruptChannelValue[0];
+                           data[1]= ui_InterruptChannelValue[1];
+                           data[2]= ui_InterruptChannelValue[2];
+                           data[3]= ui_InterruptChannelValue[3];
+                           data[4]= ui_InterruptChannelValue[4];
+                           data[5]= ui_InterruptChannelValue[5];
+                         */
+#ifdef PRINT_INFO
+                        printk("\n data[0]= s_BoardInfos [dev->minor].ui_InterruptChannelValue[0];");
+#endif
+                        data[0] =
+                                s_BoardInfos[dev->minor].
+                                ui_InterruptChannelValue[0];
+                        data[1] =
+                                s_BoardInfos[dev->minor].
+                                ui_InterruptChannelValue[1];
+                        data[2] =
+                                s_BoardInfos[dev->minor].
+                                ui_InterruptChannelValue[2];
+                        data[3] =
+                                s_BoardInfos[dev->minor].
+                                ui_InterruptChannelValue[3];
+                        data[4] =
+                                s_BoardInfos[dev->minor].
+                                ui_InterruptChannelValue[4];
+                        data[5] =
+                                s_BoardInfos[dev->minor].
+                                ui_InterruptChannelValue[5];
+
+                        /* Begin JK 22.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values */
+                        /* printk("\n 0 - i_APCI3200_GetChannelCalibrationValue data [6] = %lu, data [7] = %lu, data [8] = %lu", data [6], data [7], data [8]); */
+                        i_APCI3200_GetChannelCalibrationValue(dev,
+                                s_BoardInfos[dev->minor].ui_Channel_num,
+                                &data[6], &data[7], &data[8]);
+                        /* End JK 22.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values */
+                }
+                break;
+        case 1:
+
+                for (i = 0; i < insn->n; i++) {
+                        /* data[i]=ui_InterruptChannelValue[i]; */
+                        data[i] =
+                                s_BoardInfos[dev->minor].
+                                ui_InterruptChannelValue[i];
+                }
+
+                /* i_Count=0; */
+                /* i_Sum=0; */
+                /* if(i_ScanType==1) */
+                s_BoardInfos[dev->minor].i_Count = 0;
+                s_BoardInfos[dev->minor].i_Sum = 0;
+                if (s_BoardInfos[dev->minor].i_ScanType == 1) {
+                        /* i_Initialised=0; */
+                        /* i_InterruptFlag=0; */
+                        s_BoardInfos[dev->minor].i_Initialised = 0;
+                        s_BoardInfos[dev->minor].i_InterruptFlag = 0;
+                        /* END JK 06.07.04: Management of sevrals boards */
+                }
+                break;
+        default:
+                printk("\nThe parameters passed are in error\n");
+                i_APCI3200_Reset(dev);
+                return -EINVAL;
+        }                       /* switch(insn->unused[0]) */
+
+        return insn->n;
+}
+
+/*
+ * Configures The Analog Input Subdevice
+ *
+ * data[0]  = 0  Normal AI
+ *          = 1  RTD
+ *          = 2  THERMOCOUPLE
+ * data[1]  = Gain To Use
+ * data[2]  = 0  Bipolar
+ *          = 1  Unipolar
+ * data[3]  = Offset Range
+ * data[4]  = 0  DC Coupling
+ *          = 1  AC Coupling
+ * data[5]  = 0  Single
+ *          = 1  Differential
+ * data[6]  = TimerReloadValue
+ * data[7]  = ConvertingTimeUnit
+ * data[8]  = 0  Analog voltage measurement
+ *          = 1  Resistance measurement
+ *          = 2  Temperature measurement
+ * data[9]  = 0  Interrupt Disable
+ *          = 1  INterrupt Enable
+ * data[10] = Type of Thermocouple
+ * data[11] = single channel Module Number
+ * data[12] = 0  Single Read
+ *          = 1  Read more channel
+ *          = 2  Single scan
+ *          = 3  Continuous Scan
+ * data[13] = Number of channels to read
+ * data[14] = 0  RTD not used
+ *          = 1  RTD 2 wire connection
+ *          = 2  RTD 3 wire connection
+ *          = 3  RTD 4 wire connection
+ */
+static int i_APCI3200_ConfigAnalogInput(struct comedi_device *dev,
+                                        struct comedi_subdevice *s,
+                                        struct comedi_insn *insn,
+                                        unsigned int *data)
 {
+        struct addi_private *devpriv = dev->private;
+        unsigned int ul_Config = 0, ul_Temp = 0;
+        unsigned int ui_ChannelNo = 0;
+        unsigned int ui_Dummy = 0;
+        int i_err = 0;
+
+        /* Begin JK 21.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values */
+
+#ifdef PRINT_INFO
+        int i = 0, i2 = 0;
+#endif
+        /* End JK 21.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values */
+
+        /* BEGIN JK 06.07.04: Management of sevrals boards */
+        /*  Initialize the structure */
+        if (s_BoardInfos[dev->minor].b_StructInitialized != 1) {
+                s_BoardInfos[dev->minor].i_CJCAvailable = 1;
+                s_BoardInfos[dev->minor].i_CJCPolarity = 0;
+                s_BoardInfos[dev->minor].i_CJCGain = 2; /* changed from 0 to 2 */
+                s_BoardInfos[dev->minor].i_InterruptFlag = 0;
+                s_BoardInfos[dev->minor].i_AutoCalibration = 0; /* : auto calibration */
+                s_BoardInfos[dev->minor].i_ChannelCount = 0;
+                s_BoardInfos[dev->minor].i_Sum = 0;
+                s_BoardInfos[dev->minor].ui_Channel_num = 0;
+                s_BoardInfos[dev->minor].i_Count = 0;
+                s_BoardInfos[dev->minor].i_Initialised = 0;
+                s_BoardInfos[dev->minor].b_StructInitialized = 1;
+
+                /* Begin JK 21.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values */
+                s_BoardInfos[dev->minor].i_ConnectionType = 0;
+                /* End JK 21.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values */
+
+                /* Begin JK 21.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values */
+                memset(s_BoardInfos[dev->minor].s_Module, 0,
+                        sizeof(s_BoardInfos[dev->minor].s_Module[MAX_MODULE]));
+
+                v_GetAPCI3200EepromCalibrationValue(devpriv->i_IobaseAmcc,
+                        &s_BoardInfos[dev->minor]);
+
+#ifdef PRINT_INFO
+                for (i = 0; i < MAX_MODULE; i++) {
+                        printk("\n s_Module[%i].ul_CurrentSourceCJC = %lu", i,
+                                s_BoardInfos[dev->minor].s_Module[i].
+                                ul_CurrentSourceCJC);
+
+                        for (i2 = 0; i2 < 5; i2++) {
+                                printk("\n s_Module[%i].ul_CurrentSource [%i] = %lu", i, i2, s_BoardInfos[dev->minor].s_Module[i].ul_CurrentSource[i2]);
+                        }
+
+                        for (i2 = 0; i2 < 8; i2++) {
+                                printk("\n s_Module[%i].ul_GainFactor [%i] = %lu", i, i2, s_BoardInfos[dev->minor].s_Module[i].ul_GainFactor[i2]);
+                        }
+
+                        for (i2 = 0; i2 < 8; i2++) {
+                                printk("\n s_Module[%i].w_GainValue [%i] = %u",
+                                        i, i2,
+                                        s_BoardInfos[dev->minor].s_Module[i].
+                                        w_GainValue[i2]);
+                        }
+                }
+#endif
+                /* End JK 21.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values */
+        }
+
+        if (data[0] != 0 && data[0] != 1 && data[0] != 2) {
+                printk("\nThe selection of acquisition type is in error\n");
+                i_err++;
+        }                       /* if(data[0]!=0 && data[0]!=1 && data[0]!=2) */
+        if (data[0] == 1) {
+                if (data[14] != 0 && data[14] != 1 && data[14] != 2
+                        && data[14] != 4) {
+                        printk("\n Error in selection of RTD connection type\n");
+                        i_err++;
+                }               /* if(data[14]!=0 && data[14]!=1 && data[14]!=2 && data[14]!=4) */
+        }                       /* if(data[0]==1 ) */
+        if (data[1] < 0 || data[1] > 7) {
+                printk("\nThe selection of gain is in error\n");
+                i_err++;
+        }                       /*  if(data[1]<0 || data[1]>7) */
+        if (data[2] != 0 && data[2] != 1) {
+                printk("\nThe selection of polarity is in error\n");
+                i_err++;
+        }                       /* if(data[2]!=0 &&  data[2]!=1) */
+        if (data[3] != 0) {
+                printk("\nThe selection of offset range  is in error\n");
+                i_err++;
+        }                       /*  if(data[3]!=0) */
+        if (data[4] != 0 && data[4] != 1) {
+                printk("\nThe selection of coupling is in error\n");
+                i_err++;
+        }                       /* if(data[4]!=0 &&  data[4]!=1) */
+        if (data[5] != 0 && data[5] != 1) {
+                printk("\nThe selection of single/differential mode is in error\n");
+                i_err++;
+        }                       /* if(data[5]!=0 &&  data[5]!=1) */
+        if (data[8] != 0 && data[8] != 1 && data[2] != 2) {
+                printk("\nError in selection of functionality\n");
+        }                       /* if(data[8]!=0 && data[8]!=1 && data[2]!=2) */
+        if (data[12] == 0 || data[12] == 1) {
+                if (data[6] != 20 && data[6] != 40 && data[6] != 80
+                        && data[6] != 160) {
+                        printk("\nThe selection of conversion time reload value is in error\n");
+                        i_err++;
+                }               /*  if (data[6]!=20 && data[6]!=40 && data[6]!=80 && data[6]!=160 ) */
+                if (data[7] != 2) {
+                        printk("\nThe selection of conversion time unit  is in error\n");
+                        i_err++;
+                }               /*  if(data[7]!=2) */
+        }
+        if (data[9] != 0 && data[9] != 1) {
+                printk("\nThe selection of interrupt enable is in error\n");
+                i_err++;
+        }                       /* if(data[9]!=0 &&  data[9]!=1) */
+        if (data[11] < 0 || data[11] > 4) {
+                printk("\nThe selection of module is in error\n");
+                i_err++;
+        }                       /* if(data[11] <0 ||  data[11]>1) */
+        if (data[12] < 0 || data[12] > 3) {
+                printk("\nThe selection of singlechannel/scan selection is in error\n");
+                i_err++;
+        }                       /* if(data[12] < 0 ||  data[12]> 3) */
+        if (data[13] < 0 || data[13] > 16) {
+                printk("\nThe selection of number of channels is in error\n");
+                i_err++;
+        }                       /*  if(data[13] <0 ||data[13] >15) */
+
+        /* BEGIN JK 06.07.04: Management of sevrals boards */
+        /*
+           i_ChannelCount=data[13];
+           i_ScanType=data[12];
+           i_ADDIDATAPolarity = data[2];
+           i_ADDIDATAGain=data[1];
+           i_ADDIDATAConversionTime=data[6];
+           i_ADDIDATAConversionTimeUnit=data[7];
+           i_ADDIDATAType=data[0];
+         */
+
+        /*  Save acquisition configuration for the actual board */
+        s_BoardInfos[dev->minor].i_ChannelCount = data[13];
+        s_BoardInfos[dev->minor].i_ScanType = data[12];
+        s_BoardInfos[dev->minor].i_ADDIDATAPolarity = data[2];
+        s_BoardInfos[dev->minor].i_ADDIDATAGain = data[1];
+        s_BoardInfos[dev->minor].i_ADDIDATAConversionTime = data[6];
+        s_BoardInfos[dev->minor].i_ADDIDATAConversionTimeUnit = data[7];
+        s_BoardInfos[dev->minor].i_ADDIDATAType = data[0];
+        /* Begin JK 19.10.2004: APCI-3200 Driver update 0.7.57 -> 0.7.68 */
+        s_BoardInfos[dev->minor].i_ConnectionType = data[5];
+        /* End JK 19.10.2004: APCI-3200 Driver update 0.7.57 -> 0.7.68 */
+        /* END JK 06.07.04: Management of sevrals boards */
+
+        /* Begin JK 19.10.2004: APCI-3200 Driver update 0.7.57 -> 0.7.68 */
+        memset(s_BoardInfos[dev->minor].ui_ScanValueArray, 0, (7 + 12) * sizeof(unsigned int)); /*  7 is the maximal number of channels */
+        /* End JK 19.10.2004: APCI-3200 Driver update 0.7.57 -> 0.7.68 */
+
+        /* BEGIN JK 02.07.04 : This while can't be do, it block the process when using severals boards */
+        /* while(i_InterruptFlag==1) */
+        while (s_BoardInfos[dev->minor].i_InterruptFlag == 1) {
+#ifndef MSXBOX
+                udelay(1);
+#else
+                /*  In the case where the driver is compiled for the MSX-Box */
+                /*  we used a printk to have a little delay because udelay */
+                /*  seems to be broken under the MSX-Box. */
+                /*  This solution hat to be studied. */
+                printk("");
+#endif
+        }
+        /* END JK 02.07.04 : This while can't be do, it block the process when using severals boards */
+
+        ui_ChannelNo = CR_CHAN(insn->chanspec); /*  get the channel */
+        /* BEGIN JK 06.07.04: Management of sevrals boards */
+        /* i_ChannelNo=ui_ChannelNo; */
+        /* ui_Channel_num =ui_ChannelNo; */
+
+        s_BoardInfos[dev->minor].i_ChannelNo = ui_ChannelNo;
+        s_BoardInfos[dev->minor].ui_Channel_num = ui_ChannelNo;
+
+        /* END JK 06.07.04: Management of sevrals boards */
+
+        if (data[5] == 0) {
+                if (ui_ChannelNo < 0 || ui_ChannelNo > 15) {
+                        printk("\nThe Selection of the channel is in error\n");
+                        i_err++;
+                }               /*  if(ui_ChannelNo<0 || ui_ChannelNo>15) */
+        }                       /* if(data[5]==0) */
+        else {
+                if (data[14] == 2) {
+                        if (ui_ChannelNo < 0 || ui_ChannelNo > 3) {
+                                printk("\nThe Selection of the channel is in error\n");
+                                i_err++;
+                        }       /*  if(ui_ChannelNo<0 || ui_ChannelNo>3) */
+                }               /* if(data[14]==2) */
+                else {
+                        if (ui_ChannelNo < 0 || ui_ChannelNo > 7) {
+                                printk("\nThe Selection of the channel is in error\n");
+                                i_err++;
+                        }       /*  if(ui_ChannelNo<0 || ui_ChannelNo>7) */
+                }               /* elseif(data[14]==2) */
+        }                       /* elseif(data[5]==0) */
+        if (data[12] == 0 || data[12] == 1) {
+                switch (data[5]) {
+                case 0:
+                        if (ui_ChannelNo >= 0 && ui_ChannelNo <= 3) {
+                                /* BEGIN JK 06.07.04: Management of sevrals boards */
+                                /* i_Offset=0; */
+                                s_BoardInfos[dev->minor].i_Offset = 0;
+                                /* END JK 06.07.04: Management of sevrals boards */
+                        }       /* if(ui_ChannelNo >=0 && ui_ChannelNo <=3) */
+                        if (ui_ChannelNo >= 4 && ui_ChannelNo <= 7) {
+                                /* BEGIN JK 06.07.04: Management of sevrals boards */
+                                /* i_Offset=64; */
+                                s_BoardInfos[dev->minor].i_Offset = 64;
+                                /* END JK 06.07.04: Management of sevrals boards */
+                        }       /* if(ui_ChannelNo >=4 && ui_ChannelNo <=7) */
+                        if (ui_ChannelNo >= 8 && ui_ChannelNo <= 11) {
+                                /* BEGIN JK 06.07.04: Management of sevrals boards */
+                                /* i_Offset=128; */
+                                s_BoardInfos[dev->minor].i_Offset = 128;
+                                /* END JK 06.07.04: Management of sevrals boards */
+                        }       /* if(ui_ChannelNo >=8 && ui_ChannelNo <=11) */
+                        if (ui_ChannelNo >= 12 && ui_ChannelNo <= 15) {
+                                /* BEGIN JK 06.07.04: Management of sevrals boards */
+                                /* i_Offset=192; */
+                                s_BoardInfos[dev->minor].i_Offset = 192;
+                                /* END JK 06.07.04: Management of sevrals boards */
+                        }       /* if(ui_ChannelNo >=12 && ui_ChannelNo <=15) */
+                        break;
+                case 1:
+                        if (data[14] == 2) {
+                                if (ui_ChannelNo == 0) {
+                                        /* BEGIN JK 06.07.04: Management of sevrals boards */
+                                        /* i_Offset=0; */
+                                        s_BoardInfos[dev->minor].i_Offset = 0;
+                                        /* END JK 06.07.04: Management of sevrals boards */
+                                }       /* if(ui_ChannelNo ==0 ) */
+                                if (ui_ChannelNo == 1) {
+                                        /* BEGIN JK 06.07.04: Management of sevrals boards */
+                                        /* i_Offset=0; */
+                                        s_BoardInfos[dev->minor].i_Offset = 64;
+                                        /* END JK 06.07.04: Management of sevrals boards */
+                                }       /*  if(ui_ChannelNo ==1) */
+                                if (ui_ChannelNo == 2) {
+                                        /* BEGIN JK 06.07.04: Management of sevrals boards */
+                                        /* i_Offset=128; */
+                                        s_BoardInfos[dev->minor].i_Offset = 128;
+                                        /* END JK 06.07.04: Management of sevrals boards */
+                                }       /* if(ui_ChannelNo ==2 ) */
+                                if (ui_ChannelNo == 3) {
+                                        /* BEGIN JK 06.07.04: Management of sevrals boards */
+                                        /* i_Offset=192; */
+                                        s_BoardInfos[dev->minor].i_Offset = 192;
+                                        /* END JK 06.07.04: Management of sevrals boards */
+                                }       /* if(ui_ChannelNo ==3) */
+
+                                /* BEGIN JK 06.07.04: Management of sevrals boards */
+                                /* i_ChannelNo=0; */
+                                s_BoardInfos[dev->minor].i_ChannelNo = 0;
+                                /* END JK 06.07.04: Management of sevrals boards */
+                                ui_ChannelNo = 0;
+                                break;
+                        }       /* if(data[14]==2) */
+                        if (ui_ChannelNo >= 0 && ui_ChannelNo <= 1) {
+                                /* BEGIN JK 06.07.04: Management of sevrals boards */
+                                /* i_Offset=0; */
+                                s_BoardInfos[dev->minor].i_Offset = 0;
+                                /* END JK 06.07.04: Management of sevrals boards */
+                        }       /* if(ui_ChannelNo >=0 && ui_ChannelNo <=1) */
+                        if (ui_ChannelNo >= 2 && ui_ChannelNo <= 3) {
+                                /* BEGIN JK 06.07.04: Management of sevrals boards */
+                                /* i_ChannelNo=i_ChannelNo-2; */
+                                /* i_Offset=64; */
+                                s_BoardInfos[dev->minor].i_ChannelNo =
+                                        s_BoardInfos[dev->minor].i_ChannelNo -
+                                        2;
+                                s_BoardInfos[dev->minor].i_Offset = 64;
+                                /* END JK 06.07.04: Management of sevrals boards */
+                                ui_ChannelNo = ui_ChannelNo - 2;
+                        }       /* if(ui_ChannelNo >=2 && ui_ChannelNo <=3) */
+                        if (ui_ChannelNo >= 4 && ui_ChannelNo <= 5) {
+                                /* BEGIN JK 06.07.04: Management of sevrals boards */
+                                /* i_ChannelNo=i_ChannelNo-4; */
+                                /* i_Offset=128; */
+                                s_BoardInfos[dev->minor].i_ChannelNo =
+                                        s_BoardInfos[dev->minor].i_ChannelNo -
+                                        4;
+                                s_BoardInfos[dev->minor].i_Offset = 128;
+                                /* END JK 06.07.04: Management of sevrals boards */
+                                ui_ChannelNo = ui_ChannelNo - 4;
+                        }       /* if(ui_ChannelNo >=4 && ui_ChannelNo <=5) */
+                        if (ui_ChannelNo >= 6 && ui_ChannelNo <= 7) {
+                                /* BEGIN JK 06.07.04: Management of sevrals boards */
+                                /* i_ChannelNo=i_ChannelNo-6; */
+                                /* i_Offset=192; */
+                                s_BoardInfos[dev->minor].i_ChannelNo =
+                                        s_BoardInfos[dev->minor].i_ChannelNo -
+                                        6;
+                                s_BoardInfos[dev->minor].i_Offset = 192;
+                                /* END JK 06.07.04: Management of sevrals boards */
+                                ui_ChannelNo = ui_ChannelNo - 6;
+                        }       /* if(ui_ChannelNo >=6 && ui_ChannelNo <=7) */
+                        break;
+
+                default:
+                        printk("\n This selection of polarity does not exist\n");
+                        i_err++;
+                }               /* switch(data[2]) */
+        }                       /* if(data[12]==0 || data[12]==1) */
+        else {
+                switch (data[11]) {
+                case 1:
+                        /* BEGIN JK 06.07.04: Management of sevrals boards */
+                        /* i_Offset=0; */
+                        s_BoardInfos[dev->minor].i_Offset = 0;
+                        /* END JK 06.07.04: Management of sevrals boards */
+                        break;
+                case 2:
+                        /* BEGIN JK 06.07.04: Management of sevrals boards */
+                        /* i_Offset=64; */
+                        s_BoardInfos[dev->minor].i_Offset = 64;
+                        /* END JK 06.07.04: Management of sevrals boards */
+                        break;
+                case 3:
+                        /* BEGIN JK 06.07.04: Management of sevrals boards */
+                        /* i_Offset=128; */
+                        s_BoardInfos[dev->minor].i_Offset = 128;
+                        /* END JK 06.07.04: Management of sevrals boards */
+                        break;
+                case 4:
+                        /* BEGIN JK 06.07.04: Management of sevrals boards */
+                        /* i_Offset=192; */
+                        s_BoardInfos[dev->minor].i_Offset = 192;
+                        /* END JK 06.07.04: Management of sevrals boards */
+                        break;
+                default:
+                        printk("\nError in module selection\n");
+                        i_err++;
+                }               /*  switch(data[11]) */
+        }                       /*  elseif(data[12]==0 || data[12]==1) */
+        if (i_err) {
+                i_APCI3200_Reset(dev);
+                return -EINVAL;
+        }
+        /* if(i_ScanType!=1) */
+        if (s_BoardInfos[dev->minor].i_ScanType != 1) {
+                /* BEGIN JK 06.07.04: Management of sevrals boards */
+                /* i_Count=0; */
+                /* i_Sum=0; */
+                s_BoardInfos[dev->minor].i_Count = 0;
+                s_BoardInfos[dev->minor].i_Sum = 0;
+                /* END JK 06.07.04: Management of sevrals boards */
+        }                       /* if(i_ScanType!=1) */
+
+        ul_Config =
+                data[1] | (data[2] << 6) | (data[5] << 7) | (data[3] << 8) |
+                (data[4] << 9);
+        /* BEGIN JK 06.07.04: Management of sevrals boards */
+        /* while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1); */
+        while (((inl(devpriv->iobase + s_BoardInfos[dev->minor].i_Offset +
+                                        12) >> 19) & 1) != 1) ;
+        /* END JK 06.07.04: Management of sevrals boards */
+  /*********************************/
+        /* Write the channel to configure */
+  /*********************************/
+        /* BEGIN JK 06.07.04: Management of sevrals boards */
+        /* outl(0 | ui_ChannelNo , devpriv->iobase+i_Offset + 0x4); */
+        outl(0 | ui_ChannelNo,
+                devpriv->iobase + s_BoardInfos[dev->minor].i_Offset + 0x4);
+        /* END JK 06.07.04: Management of sevrals boards */
+
+        /* BEGIN JK 06.07.04: Management of sevrals boards */
+        /* while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1); */
+        while (((inl(devpriv->iobase + s_BoardInfos[dev->minor].i_Offset +
+                                        12) >> 19) & 1) != 1) ;
+        /* END JK 06.07.04: Management of sevrals boards */
+  /**************************/
+        /* Reset the configuration */
+  /**************************/
+        /* BEGIN JK 06.07.04: Management of sevrals boards */
+        /* outl(0 , devpriv->iobase+i_Offset + 0x0); */
+        outl(0, devpriv->iobase + s_BoardInfos[dev->minor].i_Offset + 0x0);
+        /* END JK 06.07.04: Management of sevrals boards */
+
+        /* BEGIN JK 06.07.04: Management of sevrals boards */
+        /* while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1); */
+        while (((inl(devpriv->iobase + s_BoardInfos[dev->minor].i_Offset +
+                                        12) >> 19) & 1) != 1) ;
+        /* END JK 06.07.04: Management of sevrals boards */
+
+  /***************************/
+        /* Write the configuration */
+  /***************************/
+        /* BEGIN JK 06.07.04: Management of sevrals boards */
+        /* outl(ul_Config , devpriv->iobase+i_Offset + 0x0); */
+        outl(ul_Config,
+                devpriv->iobase + s_BoardInfos[dev->minor].i_Offset + 0x0);
+        /* END JK 06.07.04: Management of sevrals boards */
+
+  /***************************/
+        /*Reset the calibration bit */
+  /***************************/
+        /* BEGIN JK 06.07.04: Management of sevrals boards */
+        /* ul_Temp = inl(devpriv->iobase+i_Offset + 12); */
+        ul_Temp = inl(devpriv->iobase + s_BoardInfos[dev->minor].i_Offset + 12);
+        /* END JK 06.07.04: Management of sevrals boards */
+
+        /* BEGIN JK 06.07.04: Management of sevrals boards */
+        /* while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1); */
+        while (((inl(devpriv->iobase + s_BoardInfos[dev->minor].i_Offset +
+                                        12) >> 19) & 1) != 1) ;
+        /* END JK 06.07.04: Management of sevrals boards */
+
+        /* BEGIN JK 06.07.04: Management of sevrals boards */
+        /* outl((ul_Temp & 0xFFF9FFFF) , devpriv->iobase+.i_Offset + 12); */
+        outl((ul_Temp & 0xFFF9FFFF),
+                devpriv->iobase + s_BoardInfos[dev->minor].i_Offset + 12);
+        /* END JK 06.07.04: Management of sevrals boards */
+
+        if (data[9] == 1) {
+                devpriv->tsk_Current = current;
+                /* BEGIN JK 06.07.04: Management of sevrals boards */
+                /* i_InterruptFlag=1; */
+                s_BoardInfos[dev->minor].i_InterruptFlag = 1;
+                /* END JK 06.07.04: Management of sevrals boards */
+        }                       /*  if(data[9]==1) */
+        else {
+                /* BEGIN JK 06.07.04: Management of sevrals boards */
+                /* i_InterruptFlag=0; */
+                s_BoardInfos[dev->minor].i_InterruptFlag = 0;
+                /* END JK 06.07.04: Management of sevrals boards */
+        }                       /* else  if(data[9]==1) */
+
+        /* BEGIN JK 06.07.04: Management of sevrals boards */
+        /* i_Initialised=1; */
+        s_BoardInfos[dev->minor].i_Initialised = 1;
+        /* END JK 06.07.04: Management of sevrals boards */
+
+        /* BEGIN JK 06.07.04: Management of sevrals boards */
+        /* if(i_ScanType==1) */
+        if (s_BoardInfos[dev->minor].i_ScanType == 1)
+                /* END JK 06.07.04: Management of sevrals boards */
+        {
+                /* BEGIN JK 06.07.04: Management of sevrals boards */
+                /* i_Sum=i_Sum+1; */
+                s_BoardInfos[dev->minor].i_Sum =
+                        s_BoardInfos[dev->minor].i_Sum + 1;
+                /* END JK 06.07.04: Management of sevrals boards */
+
+                insn->unused[0] = 0;
+                i_APCI3200_ReadAnalogInput(dev, s, insn, &ui_Dummy);
+        }
+
+        return insn->n;
+}
+
+/*
+ * Tests the Selected Anlog Input Channel
+ *
+ * data[0] = 0  TestAnalogInputShortCircuit
+ *         = 1  TestAnalogInputConnection
+ *
+ * data[0] : Digital value obtained
+ * data[1] : calibration offset
+ * data[2] : calibration gain
+ */
+static int i_APCI3200_InsnBits_AnalogInput_Test(struct comedi_device *dev,
+                                                struct comedi_subdevice *s,
+                                                struct comedi_insn *insn,
+                                                unsigned int *data)
+{
+        struct addi_private *devpriv = dev->private;
         unsigned int ui_Configuration = 0;
         int i_Temp;             /* ,i_TimeUnit; */
+
         /* if(i_Initialised==0) */
 
         if (s_BoardInfos[dev->minor].i_Initialised == 0) {
@@ -2502,61 +2211,18 @@ int i_APCI3200_InsnBits_AnalogInput_Test(struct comedi_device *dev,
         return insn->n;
 }
 
-/*
-  +----------------------------------------------------------------------------+
-  | Function   Name   : int i_APCI3200_InsnWriteReleaseAnalogInput             |
-  |                       (struct comedi_device *dev,struct comedi_subdevice *s,               |
-  |                      struct comedi_insn *insn,unsigned int *data)                     |
-  +----------------------------------------------------------------------------+
-  | Task              :  Resets the channels                                                      |
-  +----------------------------------------------------------------------------+
-  | Input Parameters  : struct comedi_device *dev      : Driver handle                |
-  |                     struct comedi_subdevice *s     : Subdevice Pointer            |
-  |                     struct comedi_insn *insn       : Insn Structure Pointer       |
-  |                     unsigned int *data          : Data Pointer
-  +----------------------------------------------------------------------------+
-  | Output Parameters : --                                                                                                       |
-
-  +----------------------------------------------------------------------------+
-  | Return Value      : TRUE  : No error occur                                 |
-  |                         : FALSE : Error occur. Return the error          |
-  |                                                                              |
-  +----------------------------------------------------------------------------+
-*/
-
-int i_APCI3200_InsnWriteReleaseAnalogInput(struct comedi_device *dev,
-        struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data)
+static int i_APCI3200_InsnWriteReleaseAnalogInput(struct comedi_device *dev,
+                                                  struct comedi_subdevice *s,
+                                                  struct comedi_insn *insn,
+                                                  unsigned int *data)
 {
         i_APCI3200_Reset(dev);
         return insn->n;
 }
 
-/*
-  +----------------------------------------------------------------------------+
-  | Function name     :int i_APCI3200_CommandTestAnalogInput(struct comedi_device *dev|
-  |                     ,struct comedi_subdevice *s,struct comedi_cmd *cmd)                              |
-  |                                                                                                              |
-  +----------------------------------------------------------------------------+
-  | Task              : Test validity for a command for cyclic anlog input     |
-  |                       acquisition                                                                    |
-  |                                                                                                                      |
-  +----------------------------------------------------------------------------+
-  | Input Parameters  : struct comedi_device *dev                                                                        |
-  |                     struct comedi_subdevice *s                                                                       |
-  |                     struct comedi_cmd *cmd                                                           |
-  |                                                                                                                      |
-  |
-  |                                                                                                                      |
-  |                                                                                                                      |
-  |                                                                                                                      |
-  +----------------------------------------------------------------------------+
-  | Return Value      :0                                                                     |
-  |                                                                                                                          |
-  +----------------------------------------------------------------------------+
-*/
-
-int i_APCI3200_CommandTestAnalogInput(struct comedi_device *dev, struct comedi_subdevice *s,
-        struct comedi_cmd *cmd)
+static int i_APCI3200_CommandTestAnalogInput(struct comedi_device *dev,
+                                             struct comedi_subdevice *s,
+                                             struct comedi_cmd *cmd)
 {
 
         int err = 0;
@@ -2716,27 +2382,12 @@ int i_APCI3200_CommandTestAnalogInput(struct comedi_device *dev, struct comedi_s
         return 0;
 }
 
-/*
-  +----------------------------------------------------------------------------+
-  | Function name     :int i_APCI3200_StopCyclicAcquisition(struct comedi_device *dev,|
-  |                                                                                          struct comedi_subdevice *s)|
-  |                                                                                                              |
-  +----------------------------------------------------------------------------+
-  | Task              : Stop the  acquisition                                                |
-  |                                                                                                                      |
-  +----------------------------------------------------------------------------+
-  | Input Parameters  : struct comedi_device *dev                                                                        |
-  |                     struct comedi_subdevice *s                                                                       |
-  |                                                                                              |
-  +----------------------------------------------------------------------------+
-  | Return Value      :0                                                                     |
-  |                                                                                                                          |
-  +----------------------------------------------------------------------------+
-*/
-
-int i_APCI3200_StopCyclicAcquisition(struct comedi_device *dev, struct comedi_subdevice *s)
+static int i_APCI3200_StopCyclicAcquisition(struct comedi_device *dev,
+                                            struct comedi_subdevice *s)
 {
+        struct addi_private *devpriv = dev->private;
         unsigned int ui_Configuration = 0;
+
         /* i_InterruptFlag=0; */
         /* i_Initialised=0; */
         /* i_Count=0; */
@@ -2765,27 +2416,13 @@ int i_APCI3200_StopCyclicAcquisition(struct comedi_device *dev, struct comedi_su
 }
 
 /*
-  +----------------------------------------------------------------------------+
-  | Function name     : int i_APCI3200_CommandAnalogInput(struct comedi_device *dev,  |
-  |                                                                                             struct comedi_subdevice *s) |
-  |                                                                                                              |
-  +----------------------------------------------------------------------------+
-  | Task              : Does asynchronous acquisition                          |
-  |                     Determines the mode 1 or 2.                                                  |
-  |                                                                                                                      |
-  +----------------------------------------------------------------------------+
-  | Input Parameters  : struct comedi_device *dev                                                                        |
-  |                     struct comedi_subdevice *s                                                                       |
-  |                                                                                                                                      |
-  |                                                                                                                                      |
-  +----------------------------------------------------------------------------+
-  | Return Value      :                                                                          |
-  |                                                                                                                          |
-  +----------------------------------------------------------------------------+
-*/
-
-int i_APCI3200_CommandAnalogInput(struct comedi_device *dev, struct comedi_subdevice *s)
+ * Does asynchronous acquisition
+ * Determines the mode 1 or 2.
+ */
+static int i_APCI3200_CommandAnalogInput(struct comedi_device *dev,
+                                         struct comedi_subdevice *s)
 {
+        struct addi_private *devpriv = dev->private;
         struct comedi_cmd *cmd = &s->async->cmd;
         unsigned int ui_Configuration = 0;
         /* INT  i_CurrentSource = 0; */
@@ -2798,6 +2435,7 @@ int i_APCI3200_CommandAnalogInput(struct comedi_device *dev, struct comedi_subde
         unsigned int ui_DelayTime = 0;
         unsigned int ui_DelayTimeBase = 0;
         unsigned int ui_DelayMode = 0;
+
         /* i_FirstChannel=cmd->chanlist[0]; */
         /* i_LastChannel=cmd->chanlist[1]; */
         s_BoardInfos[dev->minor].i_FirstChannel = cmd->chanlist[0];
@@ -2956,80 +2594,155 @@ int i_APCI3200_CommandAnalogInput(struct comedi_device *dev, struct comedi_subde
 }
 
 /*
-  +----------------------------------------------------------------------------+
-  | Function   Name   :  int i_APCI3200_Reset(struct comedi_device *dev)                             |
-  |                                                                                              |
-  +----------------------------------------------------------------------------+
-  | Task              :Resets the registers of the card                        |
-  +----------------------------------------------------------------------------+
-  | Input Parameters  :                                                        |
-  +----------------------------------------------------------------------------+
-  | Output Parameters : --                                                                                                       |
-  +----------------------------------------------------------------------------+
-  | Return Value      :                                                        |
-  |                                                                                      |
-  +----------------------------------------------------------------------------+
-*/
-
-int i_APCI3200_Reset(struct comedi_device *dev)
+ * This function copies the acquired data(from FIFO) to Comedi buffer.
+ */
+static int i_APCI3200_InterruptHandleEos(struct comedi_device *dev)
 {
-        int i_Temp;
-        unsigned int dw_Dummy;
-        /* i_InterruptFlag=0; */
-        /* i_Initialised==0; */
-        /* i_Count=0; */
-        /* i_Sum=0; */
+        struct addi_private *devpriv = dev->private;
+        unsigned int ui_StatusRegister = 0;
+        struct comedi_subdevice *s = &dev->subdevices[0];
 
-        s_BoardInfos[dev->minor].i_InterruptFlag = 0;
-        s_BoardInfos[dev->minor].i_Initialised = 0;
-        s_BoardInfos[dev->minor].i_Count = 0;
-        s_BoardInfos[dev->minor].i_Sum = 0;
-        s_BoardInfos[dev->minor].b_StructInitialized = 0;
+        /* BEGIN JK 18.10.2004: APCI-3200 Driver update 0.7.57 -> 0.7.68 */
+        /* comedi_async *async = s->async; */
+        /* UINT *data; */
+        /* data=async->data+async->buf_int_ptr;//new samples added from here onwards */
+        int n = 0, i = 0;
+        /* END JK 18.10.2004: APCI-3200 Driver update 0.7.57 -> 0.7.68 */
 
-        outl(0x83838383, devpriv->i_IobaseAmcc + 0x60);
+  /************************************/
+        /*Read the interrupt status register */
+  /************************************/
+        /* ui_StatusRegister = inl(devpriv->iobase+i_Offset + 16); */
+        ui_StatusRegister =
+                inl(devpriv->iobase + s_BoardInfos[dev->minor].i_Offset + 16);
 
-        /*  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 */
-  /***************/
-        /*Empty the buffer */
-  /**************/
-        for (i_Temp = 0; i_Temp <= 95; i_Temp++) {
-                /* ui_InterruptChannelValue[i_Temp]=0; */
-                s_BoardInfos[dev->minor].ui_InterruptChannelValue[i_Temp] = 0;
-        }                       /* for(i_Temp=0;i_Temp<=95;i_Temp++) */
-  /*****************************/
-        /*Reset the START and IRQ bit */
-  /*****************************/
-        for (i_Temp = 0; i_Temp <= 192;) {
-                while (((inl(devpriv->iobase + i_Temp + 12) >> 19) & 1) != 1) ;
-                outl(0, devpriv->iobase + i_Temp + 8);
-                i_Temp = i_Temp + 64;
-        }                       /* for(i_Temp=0;i_Temp<=192;i_Temp+64) */
+  /*************************/
+        /*Test if interrupt occur */
+  /*************************/
+
+        if ((ui_StatusRegister & 0x2) == 0x2) {
+      /*************************/
+                /*Read the channel number */
+      /*************************/
+                /* ui_ChannelNumber = inl(devpriv->iobase+i_Offset + 24); */
+                /* BEGIN JK 18.10.2004: APCI-3200 Driver update 0.7.57 -> 0.7.68 */
+                /* This value is not used */
+                /* ui_ChannelNumber = inl(devpriv->iobase+s_BoardInfos [dev->minor].i_Offset + 24); */
+                s->async->events = 0;
+                /* END JK 18.10.2004: APCI-3200 Driver update 0.7.57 -> 0.7.68 */
+
+      /*************************************/
+                /*Read the digital Analog Input value */
+      /*************************************/
+
+                /* data[i_Count] = inl(devpriv->iobase+i_Offset + 28); */
+                /* Begin JK 18.10.2004: APCI-3200 Driver update 0.7.57 -> 0.7.68 */
+                /* data[s_BoardInfos [dev->minor].i_Count] = inl(devpriv->iobase+s_BoardInfos [dev->minor].i_Offset + 28); */
+                s_BoardInfos[dev->minor].ui_ScanValueArray[s_BoardInfos[dev->
+                                minor].i_Count] =
+                        inl(devpriv->iobase +
+                        s_BoardInfos[dev->minor].i_Offset + 28);
+                /* End JK 18.10.2004: APCI-3200 Driver update 0.7.57 -> 0.7.68 */
+
+                /* if((i_Count == (i_LastChannel-i_FirstChannel+3))) */
+                if ((s_BoardInfos[dev->minor].i_Count ==
+                                (s_BoardInfos[dev->minor].i_LastChannel -
+                                        s_BoardInfos[dev->minor].
+                                        i_FirstChannel + 3))) {
+
+                        /* Begin JK 22.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values */
+                        s_BoardInfos[dev->minor].i_Count++;
+
+                        for (i = s_BoardInfos[dev->minor].i_FirstChannel;
+                                i <= s_BoardInfos[dev->minor].i_LastChannel;
+                                i++) {
+                                i_APCI3200_GetChannelCalibrationValue(dev, i,
+                                        &s_BoardInfos[dev->minor].
+                                        ui_ScanValueArray[s_BoardInfos[dev->
+                                                        minor].i_Count + ((i -
+                                                                s_BoardInfos
+                                                                [dev->minor].
+                                                                i_FirstChannel)
+                                                        * 3)],
+                                        &s_BoardInfos[dev->minor].
+                                        ui_ScanValueArray[s_BoardInfos[dev->
+                                                        minor].i_Count + ((i -
+                                                                s_BoardInfos
+                                                                [dev->minor].
+                                                                i_FirstChannel)
+                                                        * 3) + 1],
+                                        &s_BoardInfos[dev->minor].
+                                        ui_ScanValueArray[s_BoardInfos[dev->
+                                                        minor].i_Count + ((i -
+                                                                s_BoardInfos
+                                                                [dev->minor].
+                                                                i_FirstChannel)
+                                                        * 3) + 2]);
+                        }
+
+                        /* End JK 22.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values */
+
+                        /* i_Count=-1; */
+
+                        s_BoardInfos[dev->minor].i_Count = -1;
+
+                        /* async->buf_int_count+=(i_LastChannel-i_FirstChannel+4)*sizeof(unsigned int); */
+                        /* Begin JK 18.10.2004: APCI-3200 Driver update 0.7.57 -> 0.7.68 */
+                        /* async->buf_int_count+=(s_BoardInfos [dev->minor].i_LastChannel-s_BoardInfos [dev->minor].i_FirstChannel+4)*sizeof(unsigned int); */
+                        /* End JK 18.10.2004: APCI-3200 Driver update 0.7.57 -> 0.7.68 */
+                        /* async->buf_int_ptr+=(i_LastChannel-i_FirstChannel+4)*sizeof(unsigned int); */
+                        /* Begin JK 18.10.2004: APCI-3200 Driver update 0.7.57 -> 0.7.68 */
+                        /* async->buf_int_ptr+=(s_BoardInfos [dev->minor].i_LastChannel-s_BoardInfos [dev->minor].i_FirstChannel+4)*sizeof(unsigned int); */
+                        /* comedi_eos(dev,s); */
+
+                        /*  Set the event type (Comedi Buffer End Of Scan) */
+                        s->async->events |= COMEDI_CB_EOS;
+
+                        /*  Test if enougth memory is available and allocate it for 7 values */
+                        /* n = comedi_buf_write_alloc(s->async, 7*sizeof(unsigned int)); */
+                        n = comedi_buf_write_alloc(s->async,
+                                (7 + 12) * sizeof(unsigned int));
+
+                        /*  If not enough memory available, event is set to Comedi Buffer Error */
+                        if (n > ((7 + 12) * sizeof(unsigned int))) {
+                                printk("\ncomedi_buf_write_alloc n = %i", n);
+                                s->async->events |= COMEDI_CB_ERROR;
+                        }
+                        /*  Write all 7 scan values in the comedi buffer */
+                        comedi_buf_memcpy_to(s->async, 0,
+                                (unsigned int *) s_BoardInfos[dev->minor].
+                                ui_ScanValueArray, (7 + 12) * sizeof(unsigned int));
+
+                        /*  Update comedi buffer pinters indexes */
+                        comedi_buf_write_free(s->async,
+                                (7 + 12) * sizeof(unsigned int));
+
+                        /*  Send events */
+                        comedi_event(dev, s);
+                        /* End JK 18.10.2004: APCI-3200 Driver update 0.7.57 -> 0.7.68 */
+
+                        /* BEGIN JK 18.10.2004: APCI-3200 Driver update 0.7.57 -> 0.7.68 */
+                        /*  */
+                        /* if (s->async->buf_int_ptr>=s->async->data_len) //  for buffer rool over */
+                        /*   { */
+                        /*     /* buffer rollover */ */
+                        /*     s->async->buf_int_ptr=0; */
+                        /*     comedi_eobuf(dev,s); */
+                        /*   } */
+                        /* End JK 18.10.2004: APCI-3200 Driver update 0.7.57 -> 0.7.68 */
+                }
+                /* i_Count++; */
+                s_BoardInfos[dev->minor].i_Count++;
+        }
+        /* i_InterruptFlag=0; */
+        s_BoardInfos[dev->minor].i_InterruptFlag = 0;
         return 0;
 }
 
-/*
-  +----------------------------------------------------------------------------+
-  | Function   Name   : static void v_APCI3200_Interrupt                                             |
-  |                                       (int irq , void *d)                            |
-  +----------------------------------------------------------------------------+
-  | Task              : Interrupt processing Routine                           |
-  +----------------------------------------------------------------------------+
-  | Input Parameters  : int irq                 : irq number                   |
-  |                     void *d                 : void pointer                 |
-  +----------------------------------------------------------------------------+
-  | Output Parameters : --                                                                                                       |
-  +----------------------------------------------------------------------------+
-  | Return Value      : TRUE  : No error occur                                 |
-  |                         : FALSE : Error occur. Return the error                                      |
-  |                                                                                              |
-  +----------------------------------------------------------------------------+
-*/
-void v_APCI3200_Interrupt(int irq, void *d)
+static void v_APCI3200_Interrupt(int irq, void *d)
 {
         struct comedi_device *dev = d;
+        struct addi_private *devpriv = dev->private;
         unsigned int ui_StatusRegister = 0;
         unsigned int ui_ChannelNumber = 0;
         int i_CalibrationFlag = 0;
@@ -3038,7 +2751,6 @@ void v_APCI3200_Interrupt(int irq, void *d)
         unsigned int ui_DigitalTemperature = 0;
         unsigned int ui_DigitalInput = 0;
         int i_ConvertCJCCalibration;
-
         /* BEGIN JK TEST */
         int i_ReturnValue = 0;
         /* END JK TEST */
@@ -3449,164 +3161,3 @@ void v_APCI3200_Interrupt(int irq, void *d)
         }                       /* switch(i_ScanType) */
         return;
 }
-
-/*
-  +----------------------------------------------------------------------------+
-  | Function name     :int i_APCI3200_InterruptHandleEos(struct comedi_device *dev)   |
-  |                                                                                                              |
-  |                                                                                              |
-  +----------------------------------------------------------------------------+
-  | Task              : .                   |
-  |                     This function copies the acquired data(from FIFO)      |
-  |                             to Comedi buffer.                                                                        |
-  |                                                                                                                      |
-  +----------------------------------------------------------------------------+
-  | Input Parameters  : struct comedi_device *dev                                                                        |
-  |                                                                                                                                      |
-  |                                                                                              |
-  +----------------------------------------------------------------------------+
-  | Return Value      : 0                                                                        |
-  |                                                                                                                          |
-  +----------------------------------------------------------------------------+
-*/
-int i_APCI3200_InterruptHandleEos(struct comedi_device *dev)
-{
-        unsigned int ui_StatusRegister = 0;
-        struct comedi_subdevice *s = &dev->subdevices[0];
-
-        /* BEGIN JK 18.10.2004: APCI-3200 Driver update 0.7.57 -> 0.7.68 */
-        /* comedi_async *async = s->async; */
-        /* UINT *data; */
-        /* data=async->data+async->buf_int_ptr;//new samples added from here onwards */
-        int n = 0, i = 0;
-        /* END JK 18.10.2004: APCI-3200 Driver update 0.7.57 -> 0.7.68 */
-
-  /************************************/
-        /*Read the interrupt status register */
-  /************************************/
-        /* ui_StatusRegister = inl(devpriv->iobase+i_Offset + 16); */
-        ui_StatusRegister =
-                inl(devpriv->iobase + s_BoardInfos[dev->minor].i_Offset + 16);
-
-  /*************************/
-        /*Test if interrupt occur */
-  /*************************/
-
-        if ((ui_StatusRegister & 0x2) == 0x2) {
-      /*************************/
-                /*Read the channel number */
-      /*************************/
-                /* ui_ChannelNumber = inl(devpriv->iobase+i_Offset + 24); */
-                /* BEGIN JK 18.10.2004: APCI-3200 Driver update 0.7.57 -> 0.7.68 */
-                /* This value is not used */
-                /* ui_ChannelNumber = inl(devpriv->iobase+s_BoardInfos [dev->minor].i_Offset + 24); */
-                s->async->events = 0;
-                /* END JK 18.10.2004: APCI-3200 Driver update 0.7.57 -> 0.7.68 */
-
-      /*************************************/
-                /*Read the digital Analog Input value */
-      /*************************************/
-
-                /* data[i_Count] = inl(devpriv->iobase+i_Offset + 28); */
-                /* Begin JK 18.10.2004: APCI-3200 Driver update 0.7.57 -> 0.7.68 */
-                /* data[s_BoardInfos [dev->minor].i_Count] = inl(devpriv->iobase+s_BoardInfos [dev->minor].i_Offset + 28); */
-                s_BoardInfos[dev->minor].ui_ScanValueArray[s_BoardInfos[dev->
-                                minor].i_Count] =
-                        inl(devpriv->iobase +
-                        s_BoardInfos[dev->minor].i_Offset + 28);
-                /* End JK 18.10.2004: APCI-3200 Driver update 0.7.57 -> 0.7.68 */
-
-                /* if((i_Count == (i_LastChannel-i_FirstChannel+3))) */
-                if ((s_BoardInfos[dev->minor].i_Count ==
-                                (s_BoardInfos[dev->minor].i_LastChannel -
-                                        s_BoardInfos[dev->minor].
-                                        i_FirstChannel + 3))) {
-
-                        /* Begin JK 22.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values */
-                        s_BoardInfos[dev->minor].i_Count++;
-
-                        for (i = s_BoardInfos[dev->minor].i_FirstChannel;
-                                i <= s_BoardInfos[dev->minor].i_LastChannel;
-                                i++) {
-                                i_APCI3200_GetChannelCalibrationValue(dev, i,
-                                        &s_BoardInfos[dev->minor].
-                                        ui_ScanValueArray[s_BoardInfos[dev->
-                                                        minor].i_Count + ((i -
-                                                                s_BoardInfos
-                                                                [dev->minor].
-                                                                i_FirstChannel)
-                                                        * 3)],
-                                        &s_BoardInfos[dev->minor].
-                                        ui_ScanValueArray[s_BoardInfos[dev->
-                                                        minor].i_Count + ((i -
-                                                                s_BoardInfos
-                                                                [dev->minor].
-                                                                i_FirstChannel)
-                                                        * 3) + 1],
-                                        &s_BoardInfos[dev->minor].
-                                        ui_ScanValueArray[s_BoardInfos[dev->
-                                                        minor].i_Count + ((i -
-                                                                s_BoardInfos
-                                                                [dev->minor].
-                                                                i_FirstChannel)
-                                                        * 3) + 2]);
-                        }
-
-                        /* End JK 22.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values */
-
-                        /* i_Count=-1; */
-
-                        s_BoardInfos[dev->minor].i_Count = -1;
-
-                        /* async->buf_int_count+=(i_LastChannel-i_FirstChannel+4)*sizeof(unsigned int); */
-                        /* Begin JK 18.10.2004: APCI-3200 Driver update 0.7.57 -> 0.7.68 */
-                        /* async->buf_int_count+=(s_BoardInfos [dev->minor].i_LastChannel-s_BoardInfos [dev->minor].i_FirstChannel+4)*sizeof(unsigned int); */
-                        /* End JK 18.10.2004: APCI-3200 Driver update 0.7.57 -> 0.7.68 */
-                        /* async->buf_int_ptr+=(i_LastChannel-i_FirstChannel+4)*sizeof(unsigned int); */
-                        /* Begin JK 18.10.2004: APCI-3200 Driver update 0.7.57 -> 0.7.68 */
-                        /* async->buf_int_ptr+=(s_BoardInfos [dev->minor].i_LastChannel-s_BoardInfos [dev->minor].i_FirstChannel+4)*sizeof(unsigned int); */
-                        /* comedi_eos(dev,s); */
-
-                        /*  Set the event type (Comedi Buffer End Of Scan) */
-                        s->async->events |= COMEDI_CB_EOS;
-
-                        /*  Test if enougth memory is available and allocate it for 7 values */
-                        /* n = comedi_buf_write_alloc(s->async, 7*sizeof(unsigned int)); */
-                        n = comedi_buf_write_alloc(s->async,
-                                (7 + 12) * sizeof(unsigned int));
-
-                        /*  If not enough memory available, event is set to Comedi Buffer Error */
-                        if (n > ((7 + 12) * sizeof(unsigned int))) {
-                                printk("\ncomedi_buf_write_alloc n = %i", n);
-                                s->async->events |= COMEDI_CB_ERROR;
-                        }
-                        /*  Write all 7 scan values in the comedi buffer */
-                        comedi_buf_memcpy_to(s->async, 0,
-                                (unsigned int *) s_BoardInfos[dev->minor].
-                                ui_ScanValueArray, (7 + 12) * sizeof(unsigned int));
-
-                        /*  Update comedi buffer pinters indexes */
-                        comedi_buf_write_free(s->async,
-                                (7 + 12) * sizeof(unsigned int));
-
-                        /*  Send events */
-                        comedi_event(dev, s);
-                        /* End JK 18.10.2004: APCI-3200 Driver update 0.7.57 -> 0.7.68 */
-
-                        /* BEGIN JK 18.10.2004: APCI-3200 Driver update 0.7.57 -> 0.7.68 */
-                        /*  */
-                        /* if (s->async->buf_int_ptr>=s->async->data_len) //  for buffer rool over */
-                        /*   { */
-                        /*     /* buffer rollover */ */
-                        /*     s->async->buf_int_ptr=0; */
-                        /*     comedi_eobuf(dev,s); */
-                        /*   } */
-                        /* End JK 18.10.2004: APCI-3200 Driver update 0.7.57 -> 0.7.68 */
-                }
-                /* i_Count++; */
-                s_BoardInfos[dev->minor].i_Count++;
-        }
-        /* i_InterruptFlag=0; */
-        s_BoardInfos[dev->minor].i_InterruptFlag = 0;
-        return 0;
-}
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.h b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.h
deleted file mode 100644
index 812a9c46e119..000000000000
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.h
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- * Copyright (C) 2004,2005  ADDI-DATA GmbH for the source code of this module.
- *
- *      ADDI-DATA GmbH
- *      Dieselstrasse 3
- *      D-77833 Ottersweier
- *      Tel: +19(0)7223/9493-0
- *      Fax: +49(0)7223/9493-92
- *      http://www.addi-data.com
- *      info@addi-data.com
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- */
-
-/* Card Specific information */
-#define APCI3200_BOARD_VENDOR_ID                 0x15B8
-/* #define APCI3200_ADDRESS_RANGE                   264 */
-
-int MODULE_NO;
-struct {
-        int i_Gain;
-        int i_Polarity;
-        int i_OffsetRange;
-        int i_Coupling;
-        int i_SingleDiff;
-        int i_AutoCalibration;
-        unsigned int ui_ReloadValue;
-        unsigned int ui_TimeUnitReloadVal;
-        int i_Interrupt;
-        int i_ModuleSelection;
-} Config_Parameters_Module1, Config_Parameters_Module2,
-    Config_Parameters_Module3, Config_Parameters_Module4;
-
-/* ANALOG INPUT RANGE */
-static const struct comedi_lrange range_apci3200_ai = { 8, {
-                                                     BIP_RANGE(10),
-                                                     BIP_RANGE(5),
-                                                     BIP_RANGE(2),
-                                                     BIP_RANGE(1),
-                                                     UNI_RANGE(10),
-                                                     UNI_RANGE(5),
-                                                     UNI_RANGE(2),
-                                                     UNI_RANGE(1)
-                                                     }
-};
-
-static const struct comedi_lrange range_apci3300_ai = { 4, {
-                                                     UNI_RANGE(10),
-                                                     UNI_RANGE(5),
-                                                     UNI_RANGE(2),
-                                                     UNI_RANGE(1)
-                                                     }
-};
-
-/* Analog Input related Defines */
-#define APCI3200_AI_OFFSET_GAIN                  0
-#define APCI3200_AI_SC_TEST                      4
-#define APCI3200_AI_IRQ                          8
-#define APCI3200_AI_AUTOCAL                      12
-#define APCI3200_RELOAD_CONV_TIME_VAL            32
-#define APCI3200_CONV_TIME_TIME_BASE             36
-#define APCI3200_RELOAD_DELAY_TIME_VAL           40
-#define APCI3200_DELAY_TIME_TIME_BASE            44
-#define APCI3200_AI_MODULE1                      0
-#define APCI3200_AI_MODULE2                      64
-#define APCI3200_AI_MODULE3                      128
-#define APCI3200_AI_MODULE4                      192
-#define TRUE                                     1
-#define FALSE                                    0
-#define APCI3200_AI_EOSIRQ                       16
-#define APCI3200_AI_EOS                          20
-#define APCI3200_AI_CHAN_ID                      24
-#define APCI3200_AI_CHAN_VAL                     28
-#define ANALOG_INPUT                             0
-#define TEMPERATURE                              1
-#define RESISTANCE                               2
-
-#define ENABLE_EXT_TRIG                          1
-#define ENABLE_EXT_GATE                          2
-#define ENABLE_EXT_TRIG_GATE                     3
-
-#define APCI3200_MAXVOLT                         2.5
-#define ADDIDATA_GREATER_THAN_TEST               0
-#define ADDIDATA_LESS_THAN_TEST                  1
-
-#define ADDIDATA_UNIPOLAR                        1
-#define ADDIDATA_BIPOLAR                         2
-
-/* BEGIN JK 21.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values */
-#define MAX_MODULE                              4
-/* END JK 21.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values */
-
-struct str_ADDIDATA_RTDStruct {
-        unsigned int ul_NumberOfValue;
-        unsigned int *pul_ResistanceValue;
-        unsigned int *pul_TemperatureValue;
-};
-
-/* BEGIN JK 21.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values */
-struct str_Module {
-
-        /*  Begin JK 05/08/2003 change for Linux */
-        unsigned long ul_CurrentSourceCJC;
-        unsigned long ul_CurrentSource[5];
-        /*  End JK 05/08/2003 change for Linux */
-
-        /*  Begin CG 15/02/02 Rev 1.0 -> Rev 1.1 : Add Header Type 1 */
-        unsigned long ul_GainFactor[8]; /*  Gain Factor */
-        unsigned int w_GainValue[10];
-        /*  End CG 15/02/02 Rev 1.0 -> Rev 1.1 : Add Header Type 1 */
-};
-
-/* END JK 21.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values */
-
-/* BEGIN JK 06.07.04: Management of sevrals boards */
-struct str_BoardInfos {
-
-        int i_CJCAvailable;
-        int i_CJCPolarity;
-        int i_CJCGain;
-        int i_InterruptFlag;
-        int i_ADDIDATAPolarity;
-        int i_ADDIDATAGain;
-        int i_AutoCalibration;
-        int i_ADDIDATAConversionTime;
-        int i_ADDIDATAConversionTimeUnit;
-        int i_ADDIDATAType;
-        int i_ChannelNo;
-        int i_ChannelCount;
-        int i_ScanType;
-        int i_FirstChannel;
-        int i_LastChannel;
-        int i_Sum;
-        int i_Offset;
-        unsigned int ui_Channel_num;
-        int i_Count;
-        int i_Initialised;
-        /* UINT ui_InterruptChannelValue[96]; //Buffer */
-        unsigned int ui_InterruptChannelValue[144];     /* Buffer */
-        unsigned char b_StructInitialized;
-        /* Begin JK 19.10.2004: APCI-3200 Driver update 0.7.57 -> 0.7.68 */
-        unsigned int ui_ScanValueArray[7 + 12]; /*  7 is the maximal number of channels */
-        /* End JK 19.10.2004: APCI-3200 Driver update 0.7.57 -> 0.7.68 */
-
-        /* Begin JK 21.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values */
-        int i_ConnectionType;
-        int i_NbrOfModule;
-        struct str_Module s_Module[MAX_MODULE];
-        /* End JK 21.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values */
-};
-
-/* END JK 06.07.04: Management of sevrals boards */
-
-/* Hardware Layer  functions for Apci3200 */
-
-/* AI */
-
-int i_APCI3200_ConfigAnalogInput(struct comedi_device *dev, struct comedi_subdevice *s,
-                                 struct comedi_insn *insn, unsigned int *data);
-int i_APCI3200_ReadAnalogInput(struct comedi_device *dev, struct comedi_subdevice *s,
-                               struct comedi_insn *insn, unsigned int *data);
-int i_APCI3200_InsnWriteReleaseAnalogInput(struct comedi_device *dev,
-                                           struct comedi_subdevice *s,
-                                           struct comedi_insn *insn, unsigned int *data);
-int i_APCI3200_InsnBits_AnalogInput_Test(struct comedi_device *dev,
-                                         struct comedi_subdevice *s,
-                                         struct comedi_insn *insn, unsigned int *data);
-int i_APCI3200_StopCyclicAcquisition(struct comedi_device *dev, struct comedi_subdevice *s);
-int i_APCI3200_InterruptHandleEos(struct comedi_device *dev);
-int i_APCI3200_CommandTestAnalogInput(struct comedi_device *dev, struct comedi_subdevice *s,
-                                      struct comedi_cmd *cmd);
-int i_APCI3200_CommandAnalogInput(struct comedi_device *dev, struct comedi_subdevice *s);
-int i_APCI3200_ReadDigitalInput(struct comedi_device *dev, struct comedi_subdevice *s,
-                                struct comedi_insn *insn, unsigned int *data);
-/* Interrupt */
-void v_APCI3200_Interrupt(int irq, void *d);
-int i_APCI3200_InterruptHandleEos(struct comedi_device *dev);
-/* Reset functions */
-int i_APCI3200_Reset(struct comedi_device *dev);
-
-int i_APCI3200_ReadCJCCalOffset(struct comedi_device *dev, unsigned int *data);
-int i_APCI3200_ReadCJCValue(struct comedi_device *dev, unsigned int *data);
-int i_APCI3200_ReadCalibrationGainValue(struct comedi_device *dev, unsigned int *data);
-int i_APCI3200_ReadCalibrationOffsetValue(struct comedi_device *dev, unsigned int *data);
-int i_APCI3200_Read1AnalogInputChannel(struct comedi_device *dev,
-                                       struct comedi_subdevice *s, struct comedi_insn *insn,
-                                       unsigned int *data);
-int i_APCI3200_ReadCJCCalGain(struct comedi_device *dev, unsigned int *data);
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.c
index acaceb01629a..7a18ce704ba4 100644
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.c
@@ -46,229 +46,75 @@ You should also find the complete GPL in the COPYING file accompanying this sour
   +----------+-----------+------------------------------------------------+
 */
 
-/*
-+----------------------------------------------------------------------------+
-|                               Included files                               |
-+----------------------------------------------------------------------------+
-*/
-#include "hwdrv_apci3501.h"
-
-/*
-+----------------------------------------------------------------------------+
-| Function   Name   : int i_APCI3501_ReadDigitalInput                    |
-|                         (struct comedi_device *dev,struct comedi_subdevice *s,               |
-|                      struct comedi_insn *insn,unsigned int *data)                     |
-+----------------------------------------------------------------------------+
-| Task              : Read  value  of the selected channel or port           |
-+----------------------------------------------------------------------------+
-| Input Parameters  : struct comedi_device *dev      : Driver handle                |
-|                     unsigned int ui_NoOfChannels    : No Of Channels To read       |
-|                     unsigned int *data              : Data Pointer to read status  |
-+----------------------------------------------------------------------------+
-| Output Parameters :   --                                                                                                       |
-+----------------------------------------------------------------------------+
-| Return Value      : TRUE  : No error occur                                 |
-|                           : FALSE : Error occur. Return the error          |
-|                                                                                |
-+----------------------------------------------------------------------------+
-*/
+/* Card Specific information */
+#define APCI3501_ADDRESS_RANGE          255
+
+#define APCI3501_DIGITAL_IP             0x50
+#define APCI3501_DIGITAL_OP             0x40
+#define APCI3501_ANALOG_OUTPUT          0x00
+
+/* Analog Output related Defines */
+#define APCI3501_AO_VOLT_MODE           0
+#define APCI3501_AO_PROG                4
+#define APCI3501_AO_TRIG_SCS            8
+#define UNIPOLAR                        0
+#define BIPOLAR                         1
+#define MODE0                           0
+#define MODE1                           1
+
+/* Watchdog Related Defines */
+
+#define APCI3501_WATCHDOG               0x20
+#define APCI3501_TCW_SYNC_ENABLEDISABLE 0
+#define APCI3501_TCW_RELOAD_VALUE       4
+#define APCI3501_TCW_TIMEBASE           8
+#define APCI3501_TCW_PROG               12
+#define APCI3501_TCW_TRIG_STATUS        16
+#define APCI3501_TCW_IRQ                20
+#define APCI3501_TCW_WARN_TIMEVAL       24
+#define APCI3501_TCW_WARN_TIMEBASE      28
+#define ADDIDATA_TIMER                  0
+#define ADDIDATA_WATCHDOG               2
+
+/* ANALOG OUTPUT RANGE */
+static struct comedi_lrange range_apci3501_ao = {
+        2, {
+                BIP_RANGE(10),
+                UNI_RANGE(10)
+        }
+};
 
-int i_APCI3501_ReadDigitalInput(struct comedi_device *dev, struct comedi_subdevice *s,
-        struct comedi_insn *insn, unsigned int *data)
+static int apci3501_di_insn_bits(struct comedi_device *dev,
+                                 struct comedi_subdevice *s,
+                                 struct comedi_insn *insn,
+                                 unsigned int *data)
 {
-        unsigned int ui_Temp;
-        unsigned int ui_NoOfChannel;
-        ui_NoOfChannel = CR_CHAN(insn->chanspec);
-        ui_Temp = data[0];
-        *data = inl(devpriv->iobase + APCI3501_DIGITAL_IP);
-        if (ui_Temp == 0) {
-                *data = (*data >> ui_NoOfChannel) & 0x1;
-        }                       /* if  (ui_Temp==0) */
-        else {
-                if (ui_Temp == 1) {
-
-                        *data = *data & 0x3;
-                }               /* if  (ui_Temp==1) */
-                else {
-                        printk("\nSpecified channel not supported \n");
-                }               /* elseif  (ui_Temp==1) */
-        }                       /* elseif  (ui_Temp==0) */
-        return insn->n;
-}
+        struct addi_private *devpriv = dev->private;
 
-/*
-+----------------------------------------------------------------------------+
-| Function   Name   : int i_APCI3501_ConfigDigitalOutput                     |
-|                         (struct comedi_device *dev,struct comedi_subdevice *s,               |
-|                      struct comedi_insn *insn,unsigned int *data)                     |
-+----------------------------------------------------------------------------+
-| Task              : Configures The Digital Output Subdevice.               |
-+----------------------------------------------------------------------------+
-| Input Parameters  : struct comedi_device *dev : Driver handle                     |
-|                     unsigned int *data         : Data Pointer contains             |
-|                                          configuration parameters as below |
-|                                                                            |
-|                                         data[1]            : 1 Enable  VCC  Interrupt  |
-|                                                                                  0 Disable VCC  Interrupt  |
-|                                         data[2]            : 1 Enable  CC  Interrupt   |
-|                                                                                  0 Disable CC  Interrupt   |
-|                                                                                                                                        |
-+----------------------------------------------------------------------------+
-| Output Parameters :   --                                                                                                       |
-+----------------------------------------------------------------------------+
-| Return Value      : TRUE  : No error occur                                 |
-|                           : FALSE : Error occur. Return the error          |
-|                                                                                |
-+----------------------------------------------------------------------------+
-*/
-int i_APCI3501_ConfigDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s,
-        struct comedi_insn *insn, unsigned int *data)
-{
+        data[1] = inl(devpriv->iobase + APCI3501_DIGITAL_IP) & 0x3;
 
-        if ((data[0] != 0) && (data[0] != 1)) {
-                comedi_error(dev,
-                        "Not a valid Data !!! ,Data should be 1 or 0\n");
-                return -EINVAL;
-        }                       /* if  ( (data[0]!=0) && (data[0]!=1) ) */
-        if (data[0]) {
-                devpriv->b_OutputMemoryStatus = ADDIDATA_ENABLE;
-        }                       /*  if  (data[0]) */
-        else {
-                devpriv->b_OutputMemoryStatus = ADDIDATA_DISABLE;
-        }                       /* else if  (data[0]) */
         return insn->n;
 }
 
-/*
-+----------------------------------------------------------------------------+
-| Function   Name   : int i_APCI3501_WriteDigitalOutput                      |
-|                         (struct comedi_device *dev,struct comedi_subdevice *s,               |
-|                      struct comedi_insn *insn,unsigned int *data)                     |
-+----------------------------------------------------------------------------+
-| Task              : writes To the digital Output Subdevice                 |
-+----------------------------------------------------------------------------+
-| Input Parameters  : struct comedi_device *dev      : Driver handle                |
-|                     struct comedi_subdevice *s     : Subdevice Pointer            |
-|                     struct comedi_insn *insn       : Insn Structure Pointer       |
-|                     unsigned int *data          : Data Pointer contains        |
-|                                          configuration parameters as below |
-|                                                                            |
-+----------------------------------------------------------------------------+
-| Output Parameters :   --                                                                                                       |
-+----------------------------------------------------------------------------+
-| Return Value      : TRUE  : No error occur                                 |
-|                           : FALSE : Error occur. Return the error          |
-|                                                                                |
-+----------------------------------------------------------------------------+
-*/
-int i_APCI3501_WriteDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s,
-        struct comedi_insn *insn, unsigned int *data)
+static int apci3501_do_insn_bits(struct comedi_device *dev,
+                                 struct comedi_subdevice *s,
+                                 struct comedi_insn *insn,
+                                 unsigned int *data)
 {
-        unsigned int ui_Temp, ui_Temp1;
-        unsigned int ui_NoOfChannel = CR_CHAN(insn->chanspec);  /*  get the channel */
-        if (devpriv->b_OutputMemoryStatus) {
-                ui_Temp = inl(devpriv->iobase + APCI3501_DIGITAL_OP);
-        }                       /* if(devpriv->b_OutputMemoryStatus ) */
-        else {
-                ui_Temp = 0;
-        }                       /* if(devpriv->b_OutputMemoryStatus ) */
-        if (data[3] == 0) {
-                if (data[1] == 0) {
-                        data[0] = (data[0] << ui_NoOfChannel) | ui_Temp;
-                        outl(data[0], devpriv->iobase + APCI3501_DIGITAL_OP);
-                }               /* if(data[1]==0) */
-                else {
-                        if (data[1] == 1) {
-                                data[0] = (data[0] << (2 * data[2])) | ui_Temp;
-                                outl(data[0],
-                                        devpriv->iobase + APCI3501_DIGITAL_OP);
-                        }       /*  if(data[1]==1) */
-                        else {
-                                printk("\nSpecified channel not supported\n");
-                        }       /* else if(data[1]==1) */
-                }               /* elseif(data[1]==0) */
-        }                       /* if(data[3]==0) */
-        else {
-                if (data[3] == 1) {
-                        if (data[1] == 0) {
-                                data[0] = ~data[0] & 0x1;
-                                ui_Temp1 = 1;
-                                ui_Temp1 = ui_Temp1 << ui_NoOfChannel;
-                                ui_Temp = ui_Temp | ui_Temp1;
-                                data[0] =
-                                        (data[0] << ui_NoOfChannel) ^
-                                        0xffffffff;
-                                data[0] = data[0] & ui_Temp;
-                                outl(data[0],
-                                        devpriv->iobase + APCI3501_DIGITAL_OP);
-                        }       /* if(data[1]==0) */
-                        else {
-                                if (data[1] == 1) {
-                                        data[0] = ~data[0] & 0x3;
-                                        ui_Temp1 = 3;
-                                        ui_Temp1 = ui_Temp1 << 2 * data[2];
-                                        ui_Temp = ui_Temp | ui_Temp1;
-                                        data[0] =
-                                                ((data[0] << (2 *
-                                                                data[2])) ^
-                                                0xffffffff) & ui_Temp;
-                                        outl(data[0],
-                                                devpriv->iobase +
-                                                APCI3501_DIGITAL_OP);
-                                }       /*  if(data[1]==1) */
-                                else {
-                                        printk("\nSpecified channel not supported\n");
-                                }       /* else if(data[1]==1) */
-                        }       /* elseif(data[1]==0) */
-                }               /* if(data[3]==1); */
-                else {
-                        printk("\nSpecified functionality does not exist\n");
-                        return -EINVAL;
-                }               /* if else data[3]==1) */
-        }                       /* if else data[3]==0) */
-        return insn->n;
-}
+        struct addi_private *devpriv = dev->private;
+        unsigned int mask = data[0];
+        unsigned int bits = data[1];
+
+        s->state = inl(devpriv->iobase + APCI3501_DIGITAL_OP);
+        if (mask) {
+                s->state &= ~mask;
+                s->state |= (bits & mask);
+
+                outl(s->state, devpriv->iobase + APCI3501_DIGITAL_OP);
+        }
+
+        data[1] = s->state;
 
-/*
-+----------------------------------------------------------------------------+
-| Function   Name   : int i_APCI3501_ReadDigitalOutput                       |
-|                         (struct comedi_device *dev,struct comedi_subdevice *s,               |
-|                      struct comedi_insn *insn,unsigned int *data)                     |
-+----------------------------------------------------------------------------+
-| Task              : Read  value  of the selected channel or port           |
-+----------------------------------------------------------------------------+
-| Input Parameters  : struct comedi_device *dev      : Driver handle                |
-|                     unsigned int ui_NoOfChannels    : No Of Channels To read       |
-|                     unsigned int *data              : Data Pointer to read status  |
-+----------------------------------------------------------------------------+
-| Output Parameters :   --                                                                                                       |
-+----------------------------------------------------------------------------+
-| Return Value      : TRUE  : No error occur                                 |
-|                           : FALSE : Error occur. Return the error          |
-|                                                                                |
-+----------------------------------------------------------------------------+
-*/
-int i_APCI3501_ReadDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s,
-        struct comedi_insn *insn, unsigned int *data)
-{
-        unsigned int ui_Temp;
-        unsigned int ui_NoOfChannel;
-
-        ui_NoOfChannel = CR_CHAN(insn->chanspec);
-        ui_Temp = data[0];
-        *data = inl(devpriv->iobase + APCI3501_DIGITAL_OP);
-        if (ui_Temp == 0) {
-                *data = (*data >> ui_NoOfChannel) & 0x1;
-        }                       /*  if  (ui_Temp==0) */
-        else {
-                if (ui_Temp == 1) {
-                        *data = *data & 0x3;
-
-                }               /*  if  (ui_Temp==1) */
-                else {
-                        printk("\nSpecified channel not supported \n");
-                }               /*  else if (ui_Temp==1) */
-        }                       /*  else if  (ui_Temp==0) */
         return insn->n;
 }
 
@@ -298,9 +144,13 @@ int i_APCI3501_ReadDigitalOutput(struct comedi_device *dev, struct comedi_subdev
 |                                                                                |
 +----------------------------------------------------------------------------+
 */
-int i_APCI3501_ConfigAnalogOutput(struct comedi_device *dev, struct comedi_subdevice *s,
-        struct comedi_insn *insn, unsigned int *data)
+static int i_APCI3501_ConfigAnalogOutput(struct comedi_device *dev,
+                                         struct comedi_subdevice *s,
+                                         struct comedi_insn *insn,
+                                         unsigned int *data)
 {
+        struct addi_private *devpriv = dev->private;
+
         outl(data[0],
                 devpriv->iobase + APCI3501_ANALOG_OUTPUT +
                 APCI3501_AO_VOLT_MODE);
@@ -336,9 +186,12 @@ 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)
+static int i_APCI3501_WriteAnalogOutput(struct comedi_device *dev,
+                                        struct comedi_subdevice *s,
+                                        struct comedi_insn *insn,
+                                        unsigned int *data)
 {
+        struct addi_private *devpriv = dev->private;
         unsigned int ul_Command1 = 0, ul_Channel_no, ul_Polarity, ul_DAC_Ready = 0;
 
         ul_Channel_no = CR_CHAN(insn->chanspec);
@@ -410,10 +263,14 @@ int i_APCI3501_WriteAnalogOutput(struct comedi_device *dev, struct comedi_subdev
 |                                                                                |
 +----------------------------------------------------------------------------+
 */
-int i_APCI3501_ConfigTimerCounterWatchdog(struct comedi_device *dev,
-        struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data)
+static int i_APCI3501_ConfigTimerCounterWatchdog(struct comedi_device *dev,
+                                                 struct comedi_subdevice *s,
+                                                 struct comedi_insn *insn,
+                                                 unsigned int *data)
 {
+        struct addi_private *devpriv = dev->private;
         unsigned int ul_Command1 = 0;
+
         devpriv->tsk_Current = current;
         if (data[0] == ADDIDATA_WATCHDOG) {
 
@@ -511,11 +368,15 @@ int i_APCI3501_ConfigTimerCounterWatchdog(struct comedi_device *dev,
 +----------------------------------------------------------------------------+
 */
 
-int i_APCI3501_StartStopWriteTimerCounterWatchdog(struct comedi_device *dev,
-        struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data)
+static int i_APCI3501_StartStopWriteTimerCounterWatchdog(struct comedi_device *dev,
+                                                         struct comedi_subdevice *s,
+                                                         struct comedi_insn *insn,
+                                                         unsigned int *data)
 {
+        struct addi_private *devpriv = dev->private;
         unsigned int ul_Command1 = 0;
         int i_Temp;
+
         if (devpriv->b_TimerSelectMode == ADDIDATA_WATCHDOG) {
 
                 if (data[1] == 1) {
@@ -613,9 +474,12 @@ int i_APCI3501_StartStopWriteTimerCounterWatchdog(struct comedi_device *dev,
 +----------------------------------------------------------------------------+
 */
 
-int i_APCI3501_ReadTimerCounterWatchdog(struct comedi_device *dev,
-        struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data)
+static int i_APCI3501_ReadTimerCounterWatchdog(struct comedi_device *dev,
+                                               struct comedi_subdevice *s,
+                                               struct comedi_insn *insn,
+                                               unsigned int *data)
 {
+        struct addi_private *devpriv = dev->private;
 
         if (devpriv->b_TimerSelectMode == ADDIDATA_WATCHDOG) {
                 data[0] =
@@ -654,10 +518,12 @@ int i_APCI3501_ReadTimerCounterWatchdog(struct comedi_device *dev,
 +----------------------------------------------------------------------------+
 */
 
-int i_APCI3501_Reset(struct comedi_device *dev)
+static int i_APCI3501_Reset(struct comedi_device *dev)
 {
+        struct addi_private *devpriv = dev->private;
         int i_Count = 0, i_temp = 0;
         unsigned int ul_Command1 = 0, ul_Polarity, ul_DAC_Ready = 0;
+
         outl(0x0, devpriv->iobase + APCI3501_DIGITAL_OP);
         outl(1, devpriv->iobase + APCI3501_ANALOG_OUTPUT +
                 APCI3501_AO_VOLT_MODE);
@@ -705,12 +571,14 @@ int i_APCI3501_Reset(struct comedi_device *dev)
 |                                                                                |
 +----------------------------------------------------------------------------+
 */
-void v_APCI3501_Interrupt(int irq, void *d)
+static void v_APCI3501_Interrupt(int irq, void *d)
 {
         int i_temp;
         struct comedi_device *dev = d;
+        struct addi_private *devpriv = dev->private;
         unsigned int ui_Timer_AOWatchdog;
         unsigned long ul_Command1;
+
         /*  Disable Interrupt */
         ul_Command1 =
                 inl(devpriv->iobase + APCI3501_WATCHDOG + APCI3501_TCW_PROG);
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.h b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.h
deleted file mode 100644
index 63df635a7b68..000000000000
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright (C) 2004,2005  ADDI-DATA GmbH for the source code of this module.
- *
- *      ADDI-DATA GmbH
- *      Dieselstrasse 3
- *      D-77833 Ottersweier
- *      Tel: +19(0)7223/9493-0
- *      Fax: +49(0)7223/9493-92
- *      http://www.addi-data.com
- *      info@addi-data.com
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- */
-
-/* Card Specific information */
-#define APCI3501_BOARD_VENDOR_ID                 0x15B8
-#define APCI3501_ADDRESS_RANGE                   255
-
-#define APCI3501_DIGITAL_IP                       0x50
-#define APCI3501_DIGITAL_OP                       0x40
-#define APCI3501_ANALOG_OUTPUT                    0x00
-
-/* Analog Output related Defines */
-#define APCI3501_AO_VOLT_MODE                     0
-#define APCI3501_AO_PROG                          4
-#define APCI3501_AO_TRIG_SCS                      8
-#define UNIPOLAR                                  0
-#define BIPOLAR                                   1
-#define MODE0                                     0
-#define MODE1                                     1
-/* ANALOG OUTPUT RANGE */
-static struct comedi_lrange range_apci3501_ao = { 2, {
-                                        BIP_RANGE(10),
-                                        UNI_RANGE(10)
-                                        }
-};
-
-/* Watchdog Related Defines */
-
-#define APCI3501_WATCHDOG                         0x20
-#define APCI3501_TCW_SYNC_ENABLEDISABLE           0
-#define APCI3501_TCW_RELOAD_VALUE                 4
-#define APCI3501_TCW_TIMEBASE                     8
-#define APCI3501_TCW_PROG                         12
-#define APCI3501_TCW_TRIG_STATUS                  16
-#define APCI3501_TCW_IRQ                          20
-#define APCI3501_TCW_WARN_TIMEVAL                 24
-#define APCI3501_TCW_WARN_TIMEBASE                28
-#define ADDIDATA_TIMER                            0
-#define ADDIDATA_WATCHDOG                         2
-
-/* Hardware Layer  functions for Apci3501 */
-
-/* AO */
-int i_APCI3501_ConfigAnalogOutput(struct comedi_device *dev, struct comedi_subdevice *s,
-                                  struct comedi_insn *insn, unsigned int *data);
-int i_APCI3501_WriteAnalogOutput(struct comedi_device *dev, struct comedi_subdevice *s,
-                                 struct comedi_insn *insn, unsigned int *data);
-
-/*
-* DI for di read INT i_APCI3501_ReadDigitalInput(struct
-* comedi_device *dev,struct comedi_subdevice *s,struct comedi_insn
-* *insn,unsigned int *data);
-*/
-
-int i_APCI3501_ReadDigitalInput(struct comedi_device *dev, struct comedi_subdevice *s,
-                                struct comedi_insn *insn, unsigned int *data);
-
-/* DO */
-int i_APCI3501_ConfigDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s,
-                                   struct comedi_insn *insn, unsigned int *data);
-int i_APCI3501_WriteDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s,
-                                  struct comedi_insn *insn, unsigned int *data);
-int i_APCI3501_ReadDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s,
-                                 struct comedi_insn *insn, unsigned int *data);
-
-/* TIMER
- * timer value is passed as u seconds
- */
-
-int i_APCI3501_ConfigTimerCounterWatchdog(struct comedi_device *dev,
-                                          struct comedi_subdevice *s,
-                                          struct comedi_insn *insn, unsigned int *data);
-int i_APCI3501_StartStopWriteTimerCounterWatchdog(struct comedi_device *dev,
-                                                  struct comedi_subdevice *s,
-                                                  struct comedi_insn *insn,
-                                                  unsigned int *data);
-int i_APCI3501_ReadTimerCounterWatchdog(struct comedi_device *dev,
-                                        struct comedi_subdevice *s,
-                                        struct comedi_insn *insn, unsigned int *data);
-/* Interrupt */
-void v_APCI3501_Interrupt(int irq, void *d);
-
-/* Reset functions */
-int i_APCI3501_Reset(struct comedi_device *dev);
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.c
index fff99df51e92..a45a2a26e0da 100644
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.c
@@ -44,7 +44,35 @@ You should also find the complete GPL in the COPYING file accompanying this sour
   +----------+-----------+------------------------------------------------+
 */
 
-#include "hwdrv_apci3xxx.h"
+#ifndef COMEDI_SUBD_TTLIO
+#define COMEDI_SUBD_TTLIO       11      /* Digital Input Output But TTL */
+#endif
+
+#define APCI3XXX_SINGLE                         0
+#define APCI3XXX_DIFF                           1
+#define APCI3XXX_CONFIGURATION                  0
+
+#define APCI3XXX_TTL_INIT_DIRECTION_PORT2       0
+
+static const struct comedi_lrange range_apci3XXX_ai = {
+        8, {
+                BIP_RANGE(10),
+                BIP_RANGE(5),
+                BIP_RANGE(2),
+                BIP_RANGE(1),
+                UNI_RANGE(10),
+                UNI_RANGE(5),
+                UNI_RANGE(2),
+                UNI_RANGE(1)
+        }
+};
+
+static const struct comedi_lrange range_apci3XXX_ao = {
+        2, {
+                BIP_RANGE(10),
+                UNI_RANGE(10)
+        }
+};
 
 /*
 +----------------------------------------------------------------------------+
@@ -69,6 +97,8 @@ You should also find the complete GPL in the COPYING file accompanying this sour
 */
 static int i_APCI3XXX_TestConversionStarted(struct comedi_device *dev)
 {
+        struct addi_private *devpriv = dev->private;
+
         if ((readl(devpriv->dw_AiBase + 8) & 0x80000UL) == 0x80000UL)
                 return 1;
         else
@@ -108,6 +138,8 @@ static int i_APCI3XXX_AnalogInputConfigOperatingMode(struct comedi_device *dev,
                                                      struct comedi_insn *insn,
                                                      unsigned int *data)
 {
+        const struct addi_board *this_board = comedi_board(dev);
+        struct addi_private *devpriv = dev->private;
         int i_ReturnValue = insn->n;
         unsigned char b_TimeBase = 0;
         unsigned char b_SingleDiff = 0;
@@ -358,6 +390,8 @@ static int i_APCI3XXX_InsnReadAnalogInput(struct comedi_device *dev,
                                           struct comedi_insn *insn,
                                           unsigned int *data)
 {
+        const struct addi_board *this_board = comedi_board(dev);
+        struct addi_private *devpriv = dev->private;
         int i_ReturnValue = insn->n;
         unsigned char b_Configuration = (unsigned char) CR_RANGE(insn->chanspec);
         unsigned char b_Channel = (unsigned char) CR_CHAN(insn->chanspec);
@@ -571,6 +605,7 @@ static int i_APCI3XXX_InsnReadAnalogInput(struct comedi_device *dev,
 static void v_APCI3XXX_Interrupt(int irq, void *d)
 {
         struct comedi_device *dev = d;
+        struct addi_private *devpriv = dev->private;
         unsigned char b_CopyCpt = 0;
         unsigned int dw_Status = 0;
 
@@ -651,6 +686,7 @@ static int i_APCI3XXX_InsnWriteAnalogOutput(struct comedi_device *dev,
                                             struct comedi_insn *insn,
                                             unsigned int *data)
 {
+        struct addi_private *devpriv = dev->private;
         unsigned char b_Range = (unsigned char) CR_RANGE(insn->chanspec);
         unsigned char b_Channel = (unsigned char) CR_CHAN(insn->chanspec);
         unsigned int dw_Status = 0;
@@ -755,6 +791,7 @@ static int i_APCI3XXX_InsnConfigInitTTLIO(struct comedi_device *dev,
                                           struct comedi_insn *insn,
                                           unsigned int *data)
 {
+        struct addi_private *devpriv = dev->private;
         int i_ReturnValue = insn->n;
         unsigned char b_Command = 0;
 
@@ -884,6 +921,7 @@ static int i_APCI3XXX_InsnBitsTTLIO(struct comedi_device *dev,
                                     struct comedi_insn *insn,
                                     unsigned int *data)
 {
+        struct addi_private *devpriv = dev->private;
         int i_ReturnValue = insn->n;
         unsigned char b_ChannelCpt = 0;
         unsigned int dw_ChannelMask = 0;
@@ -1040,6 +1078,7 @@ static int i_APCI3XXX_InsnReadTTLIO(struct comedi_device *dev,
                                     struct comedi_insn *insn,
                                     unsigned int *data)
 {
+        struct addi_private *devpriv = dev->private;
         unsigned char b_Channel = (unsigned char) CR_CHAN(insn->chanspec);
         int i_ReturnValue = insn->n;
         unsigned int *pls_ReadData = data;
@@ -1154,6 +1193,7 @@ static int i_APCI3XXX_InsnWriteTTLIO(struct comedi_device *dev,
                                      struct comedi_insn *insn,
                                      unsigned int *data)
 {
+        struct addi_private *devpriv = dev->private;
         int i_ReturnValue = insn->n;
         unsigned char b_Channel = (unsigned char) CR_CHAN(insn->chanspec);
         unsigned char b_State = 0;
@@ -1236,367 +1276,38 @@ static int i_APCI3XXX_InsnWriteTTLIO(struct comedi_device *dev,
         return i_ReturnValue;
 }
 
-/*
-+----------------------------------------------------------------------------+
-|                           DIGITAL INPUT SUBDEVICE                          |
-+----------------------------------------------------------------------------+
-*/
-
-/*
-+----------------------------------------------------------------------------+
-| Function name     :int i_APCI3XXX_InsnReadDigitalInput                     |
-|                                          (struct comedi_device *dev,              |
-|                                           struct comedi_subdevice *s,             |
-|                                           struct comedi_insn *insn,               |
-|                                           unsigned int *data)                  |
-+----------------------------------------------------------------------------+
-| Task              : Reads the value of the specified Digital input channel |
-+----------------------------------------------------------------------------+
-| Input Parameters  : b_Channel = CR_CHAN(insn->chanspec) (0 to 3)           |
-+----------------------------------------------------------------------------+
-| Output Parameters : data[0] : Channel value                                |
-+----------------------------------------------------------------------------+
-| Return Value      : 0   : No error                                         |
-|                    -3   : Channel selection error                          |
-|                    -101 : Data size error                                  |
-+----------------------------------------------------------------------------+
-*/
-
-static int i_APCI3XXX_InsnReadDigitalInput(struct comedi_device *dev,
-                                           struct comedi_subdevice *s,
-                                           struct comedi_insn *insn,
-                                           unsigned int *data)
-{
-        int i_ReturnValue = insn->n;
-        unsigned char b_Channel = (unsigned char) CR_CHAN(insn->chanspec);
-        unsigned int dw_Temp = 0;
-
-        /***************************/
-        /* Test the channel number */
-        /***************************/
-
-        if (b_Channel <= devpriv->s_EeParameters.i_NbrDiChannel) {
-           /************************/
-                /* Test the buffer size */
-           /************************/
-
-                if (insn->n >= 1) {
-                        dw_Temp = inl(devpriv->iobase + 32);
-                        *data = (dw_Temp >> b_Channel) & 1;
-                } else {
-              /*******************/
-                        /* Data size error */
-              /*******************/
-
-                        printk("Buffer size error\n");
-                        i_ReturnValue = -101;
-                }
-        } else {
-           /***************************/
-                /* Channel selection error */
-           /***************************/
-
-                printk("Channel selection error\n");
-                i_ReturnValue = -3;
-        }
-
-        return i_ReturnValue;
-}
-
-/*
-+----------------------------------------------------------------------------+
-| Function name     :int i_APCI3XXX_InsnBitsDigitalInput                     |
-|                                          (struct comedi_device *dev,              |
-|                                           struct comedi_subdevice *s,             |
-|                                           struct comedi_insn *insn,               |
-|                                           unsigned int *data)                  |
-+----------------------------------------------------------------------------+
-| Task              : Reads the value of the Digital input Port i.e.4channels|
-+----------------------------------------------------------------------------+
-| Input Parameters  : -                                                      |
-+----------------------------------------------------------------------------+
-| Output Parameters : data[0] : Port value                                   |
-+----------------------------------------------------------------------------+
-| Return Value      :>0: No error                                            |
-|                    ....                                                    |
-|                    -101 : Data size error                                  |
-+----------------------------------------------------------------------------+
-*/
-static int i_APCI3XXX_InsnBitsDigitalInput(struct comedi_device *dev,
-                                           struct comedi_subdevice *s,
-                                           struct comedi_insn *insn,
-                                           unsigned int *data)
-{
-        int i_ReturnValue = insn->n;
-        unsigned int dw_Temp = 0;
-
-        /************************/
-        /* Test the buffer size */
-        /************************/
-
-        if (insn->n >= 1) {
-                dw_Temp = inl(devpriv->iobase + 32);
-                *data = dw_Temp & 0xf;
-        } else {
-           /*******************/
-                /* Data size error */
-           /*******************/
-
-                printk("Buffer size error\n");
-                i_ReturnValue = -101;
-        }
-
-        return i_ReturnValue;
-}
-
-/*
-+----------------------------------------------------------------------------+
-|                           DIGITAL OUTPUT SUBDEVICE                         |
-+----------------------------------------------------------------------------+
-
-*/
-
-/*
-+----------------------------------------------------------------------------+
-| Function name     :int i_APCI3XXX_InsnBitsDigitalOutput                    |
-|                                          (struct comedi_device *dev,              |
-|                                           struct comedi_subdevice *s,             |
-|                                           struct comedi_insn *insn,               |
-|                                           unsigned int *data)                  |
-+----------------------------------------------------------------------------+
-| Task              : Write the selected output mask and read the status from|
-|                     all digital output channles                            |
-+----------------------------------------------------------------------------+
-| Input Parameters  : dw_ChannelMask = data [0];                             |
-|                     dw_BitMask     = data [1];                             |
-+----------------------------------------------------------------------------+
-| Output Parameters : data[1] : All digital output channles states           |
-+----------------------------------------------------------------------------+
-| Return Value      : >0  : No error                                         |
-|                    -4   : Channel mask error                               |
-|                    -101 : Data size error                                  |
-+----------------------------------------------------------------------------+
-*/
-static int i_APCI3XXX_InsnBitsDigitalOutput(struct comedi_device *dev,
-                                            struct comedi_subdevice *s,
-                                            struct comedi_insn *insn,
-                                            unsigned int *data)
+static int apci3xxx_di_insn_bits(struct comedi_device *dev,
+                                 struct comedi_subdevice *s,
+                                 struct comedi_insn *insn,
+                                 unsigned int *data)
 {
-        int i_ReturnValue = insn->n;
-        unsigned char b_ChannelCpt = 0;
-        unsigned int dw_ChannelMask = 0;
-        unsigned int dw_BitMask = 0;
-        unsigned int dw_Status = 0;
-
-        /************************/
-        /* Test the buffer size */
-        /************************/
-
-        if (insn->n >= 2) {
-           /*******************************/
-                /* Get the channe and bit mask */
-           /*******************************/
-
-                dw_ChannelMask = data[0];
-                dw_BitMask = data[1];
-
-           /*************************/
-                /* Test the channel mask */
-           /*************************/
-
-                if ((dw_ChannelMask & 0XFFFFFFF0) == 0) {
-              /*********************************/
-                        /* Test if set/reset any channel */
-              /*********************************/
-
-                        if (dw_ChannelMask & 0xF) {
-                 /********************************/
-                                /* Read the digital output port */
-                 /********************************/
-
-                                dw_Status = inl(devpriv->iobase + 48);
+        struct addi_private *devpriv = dev->private;
 
-                                for (b_ChannelCpt = 0; b_ChannelCpt < 4;
-                                        b_ChannelCpt++) {
-                                        if ((dw_ChannelMask >> b_ChannelCpt) &
-                                                1) {
-                                                dw_Status =
-                                                        (dw_Status & (0xF -
-                                                                (1 << b_ChannelCpt))) | (dw_BitMask & (1 << b_ChannelCpt));
-                                        }
-                                }
-
-                                outl(dw_Status, devpriv->iobase + 48);
-                        }
-
-              /********************************/
-                        /* Read the digital output port */
-              /********************************/
-
-                        data[1] = inl(devpriv->iobase + 48);
-                } else {
-              /************************/
-                        /* Config command error */
-              /************************/
-
-                        printk("Channel mask error\n");
-                        i_ReturnValue = -4;
-                }
-        } else {
-           /*******************/
-                /* Data size error */
-           /*******************/
-
-                printk("Buffer size error\n");
-                i_ReturnValue = -101;
-        }
+        data[1] = inl(devpriv->iobase + 32) & 0xf;
 
-        return i_ReturnValue;
+        return insn->n;
 }
 
-/*
-+----------------------------------------------------------------------------+
-| Function name     :int i_APCI3XXX_InsnWriteDigitalOutput                   |
-|                                          (struct comedi_device *dev,              |
-|                                           struct comedi_subdevice *s,             |
-|                                           struct comedi_insn *insn,               |
-|                                           unsigned int *data)                  |
-+----------------------------------------------------------------------------+
-| Task              : Set the state from digital output channel              |
-+----------------------------------------------------------------------------+
-| Input Parameters  : b_Channel = CR_CHAN(insn->chanspec)                    |
-|                     b_State   = data [0]                                   |
-+----------------------------------------------------------------------------+
-| Output Parameters : -                                                      |
-+----------------------------------------------------------------------------+
-| Return Value      : >0  : No error                                         |
-|                    -3   : Channel selection error                          |
-|                    -101 : Data size error                                  |
-+----------------------------------------------------------------------------+
-*/
-
-static int i_APCI3XXX_InsnWriteDigitalOutput(struct comedi_device *dev,
-                                             struct comedi_subdevice *s,
-                                             struct comedi_insn *insn,
-                                             unsigned int *data)
+static int apci3xxx_do_insn_bits(struct comedi_device *dev,
+                                 struct comedi_subdevice *s,
+                                 struct comedi_insn *insn,
+                                 unsigned int *data)
 {
-        int i_ReturnValue = insn->n;
-        unsigned char b_Channel = CR_CHAN(insn->chanspec);
-        unsigned char b_State = 0;
-        unsigned int dw_Status = 0;
-
-        /************************/
-        /* Test the buffer size */
-        /************************/
-
-        if (insn->n >= 1) {
-           /***************************/
-                /* Test the channel number */
-           /***************************/
-
-                if (b_Channel < devpriv->s_EeParameters.i_NbrDoChannel) {
-              /*******************/
-                        /* Get the command */
-              /*******************/
-
-                        b_State = (unsigned char) data[0];
-
-              /********************************/
-                        /* Read the digital output port */
-              /********************************/
-
-                        dw_Status = inl(devpriv->iobase + 48);
-
-                        dw_Status =
-                                (dw_Status & (0xF -
-                                        (1 << b_Channel))) | ((b_State & 1) <<
-                                b_Channel);
-                        outl(dw_Status, devpriv->iobase + 48);
-                } else {
-              /***************************/
-                        /* Channel selection error */
-              /***************************/
+        struct addi_private *devpriv = dev->private;
+        unsigned int mask = data[0];
+        unsigned int bits = data[1];
 
-                        printk("Channel selection error\n");
-                        i_ReturnValue = -3;
-                }
-        } else {
-           /*******************/
-                /* Data size error */
-           /*******************/
+        s->state = inl(devpriv->iobase + 48) & 0xf;
+        if (mask) {
+                s->state &= ~mask;
+                s->state |= (bits & mask);
 
-                printk("Buffer size error\n");
-                i_ReturnValue = -101;
+                outl(s->state, devpriv->iobase + 48);
         }
 
-        return i_ReturnValue;
-}
-
-/*
-+----------------------------------------------------------------------------+
-| Function name     :int i_APCI3XXX_InsnReadDigitalOutput                    |
-|                                          (struct comedi_device *dev,              |
-|                                           struct comedi_subdevice *s,             |
-|                                           struct comedi_insn *insn,               |
-|                                           unsigned int *data)                  |
-+----------------------------------------------------------------------------+
-| Task              : Read the state from digital output channel             |
-+----------------------------------------------------------------------------+
-| Input Parameters  : b_Channel = CR_CHAN(insn->chanspec)                    |
-+----------------------------------------------------------------------------+
-| Output Parameters : b_State   = data [0]                                   |
-+----------------------------------------------------------------------------+
-| Return Value      : >0  : No error                                         |
-|                    -3   : Channel selection error                          |
-|                    -101 : Data size error                                  |
-+----------------------------------------------------------------------------+
-*/
+        data[1] = s->state;
 
-static int i_APCI3XXX_InsnReadDigitalOutput(struct comedi_device *dev,
-                                            struct comedi_subdevice *s,
-                                            struct comedi_insn *insn,
-                                            unsigned int *data)
-{
-        int i_ReturnValue = insn->n;
-        unsigned char b_Channel = CR_CHAN(insn->chanspec);
-        unsigned int dw_Status = 0;
-
-        /************************/
-        /* Test the buffer size */
-        /************************/
-
-        if (insn->n >= 1) {
-           /***************************/
-                /* Test the channel number */
-           /***************************/
-
-                if (b_Channel < devpriv->s_EeParameters.i_NbrDoChannel) {
-              /********************************/
-                        /* Read the digital output port */
-              /********************************/
-
-                        dw_Status = inl(devpriv->iobase + 48);
-
-                        dw_Status = (dw_Status >> b_Channel) & 1;
-                        *data = dw_Status;
-                } else {
-              /***************************/
-                        /* Channel selection error */
-              /***************************/
-
-                        printk("Channel selection error\n");
-                        i_ReturnValue = -3;
-                }
-        } else {
-           /*******************/
-                /* Data size error */
-           /*******************/
-
-                printk("Buffer size error\n");
-                i_ReturnValue = -101;
-        }
-
-        return i_ReturnValue;
+        return insn->n;
 }
 
 /*
@@ -1614,6 +1325,7 @@ static int i_APCI3XXX_InsnReadDigitalOutput(struct comedi_device *dev,
 
 static int i_APCI3XXX_Reset(struct comedi_device *dev)
 {
+        struct addi_private *devpriv = dev->private;
         unsigned char b_Cpt = 0;
 
         /*************************/
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.h b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.h
deleted file mode 100644
index e10b7e510335..000000000000
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (C) 2004,2005  ADDI-DATA GmbH for the source code of this module.
- *
- *      ADDI-DATA GmbH
- *      Dieselstrasse 3
- *      D-77833 Ottersweier
- *      Tel: +19(0)7223/9493-0
- *      Fax: +49(0)7223/9493-92
- *      http://www.addi-data.com
- *      info@addi-data.com
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- */
-
-#ifndef COMEDI_SUBD_TTLIO
-#define COMEDI_SUBD_TTLIO   11  /* Digital Input Output But TTL */
-#endif
-
-#ifndef ADDIDATA_ENABLE
-#define ADDIDATA_ENABLE  1
-#define ADDIDATA_DISABLE 0
-#endif
-
-#define APCI3XXX_SINGLE                              0
-#define APCI3XXX_DIFF                                1
-#define APCI3XXX_CONFIGURATION                       0
-
-#define APCI3XXX_TTL_INIT_DIRECTION_PORT2   0
-
-#ifdef __KERNEL__
-
-static const struct comedi_lrange range_apci3XXX_ai = { 8, {BIP_RANGE(10),
-                                                     BIP_RANGE(5),
-                                                     BIP_RANGE(2),
-                                                     BIP_RANGE(1),
-                                                     UNI_RANGE(10),
-                                                     UNI_RANGE(5),
-                                                     UNI_RANGE(2),
-                                                     UNI_RANGE(1)}
-};
-
-static const struct comedi_lrange range_apci3XXX_ao = { 2, {BIP_RANGE(10),
-                                                     UNI_RANGE(10)}
-};
-#endif
diff --git a/drivers/staging/comedi/drivers/addi_apci_035.c b/drivers/staging/comedi/drivers/addi_apci_035.c
index 4c00df4bc153..c981d4b1cc73 100644
--- a/drivers/staging/comedi/drivers/addi_apci_035.c
+++ b/drivers/staging/comedi/drivers/addi_apci_035.c
@@ -1,11 +1,77 @@
-#define CONFIG_APCI_035 1
+#include "../comedidev.h"
+#include "comedi_fc.h"
+#include "amcc_s5933.h"
 
-#define ADDIDATA_WATCHDOG 2     /*  Or shold it be something else */
+#include "addi-data/addi_common.h"
 
-#define ADDIDATA_DRIVER_NAME    "addi_apci_035"
+#define ADDIDATA_WATCHDOG 2     /*  Or shold it be something else */
 
+#include "addi-data/addi_eeprom.c"
+#include "addi-data/hwdrv_apci035.c"
 #include "addi-data/addi_common.c"
 
+static const struct addi_board apci035_boardtypes[] = {
+        {
+                .pc_DriverName          = "apci035",
+                .i_VendorId             = PCI_VENDOR_ID_ADDIDATA,
+                .i_DeviceId             = 0x0300,
+                .i_IorangeBase0         = 127,
+                .i_IorangeBase1         = APCI035_ADDRESS_RANGE,
+                .i_PCIEeprom            = 1,
+                .pc_EepromChip          = ADDIDATA_S5920,
+                .i_NbrAiChannel         = 16,
+                .i_NbrAiChannelDiff     = 8,
+                .i_AiChannelList        = 16,
+                .i_AiMaxdata            = 0xff,
+                .pr_AiRangelist         = &range_apci035_ai,
+                .i_Timer                = 1,
+                .ui_MinAcquisitiontimeNs = 10000,
+                .ui_MinDelaytimeNs      = 100000,
+                .interrupt              = v_APCI035_Interrupt,
+                .reset                  = i_APCI035_Reset,
+                .ai_config              = i_APCI035_ConfigAnalogInput,
+                .ai_read                = i_APCI035_ReadAnalogInput,
+                .timer_config           = i_APCI035_ConfigTimerWatchdog,
+                .timer_write            = i_APCI035_StartStopWriteTimerWatchdog,
+                .timer_read             = i_APCI035_ReadTimerWatchdog,
+        },
+};
+
+static struct comedi_driver apci035_driver = {
+        .driver_name    = "addi_apci_035",
+        .module         = THIS_MODULE,
+        .auto_attach    = addi_auto_attach,
+        .detach         = i_ADDI_Detach,
+        .num_names      = ARRAY_SIZE(apci035_boardtypes),
+        .board_name     = &apci035_boardtypes[0].pc_DriverName,
+        .offset         = sizeof(struct addi_board),
+};
+
+static int apci035_pci_probe(struct pci_dev *dev,
+                                       const struct pci_device_id *ent)
+{
+        return comedi_pci_auto_config(dev, &apci035_driver);
+}
+
+static void apci035_pci_remove(struct pci_dev *dev)
+{
+        comedi_pci_auto_unconfig(dev);
+}
+
+static DEFINE_PCI_DEVICE_TABLE(apci035_pci_table) = {
+        { PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA,  0x0300) },
+        { 0 }
+};
+MODULE_DEVICE_TABLE(pci, apci035_pci_table);
+
+static struct pci_driver apci035_pci_driver = {
+        .name           = "addi_apci_035",
+        .id_table       = apci035_pci_table,
+        .probe          = apci035_pci_probe,
+        .remove         = apci035_pci_remove,
+};
+module_comedi_pci_driver(apci035_driver, apci035_pci_driver);
+
 MODULE_AUTHOR("Comedi http://www.comedi.org");
 MODULE_DESCRIPTION("Comedi low-level driver");
 MODULE_LICENSE("GPL");
diff --git a/drivers/staging/comedi/drivers/addi_apci_1032.c b/drivers/staging/comedi/drivers/addi_apci_1032.c
index 7831ce33b02e..7f9424205a64 100644
--- a/drivers/staging/comedi/drivers/addi_apci_1032.c
+++ b/drivers/staging/comedi/drivers/addi_apci_1032.c
@@ -1,8 +1,398 @@
-#define CONFIG_APCI_1032 1
+/*
+ * addi_apci_1032.c
+ * Copyright (C) 2004,2005  ADDI-DATA GmbH for the source code of this module.
+ * Project manager: Eric Stolz
+ *
+ *      ADDI-DATA GmbH
+ *      Dieselstrasse 3
+ *      D-77833 Ottersweier
+ *      Tel: +19(0)7223/9493-0
+ *      Fax: +49(0)7223/9493-92
+ *      http://www.addi-data.com
+ *      info@addi-data.com
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * 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
+ *
+ * You should also find the complete GPL in the COPYING file accompanying this
+ * source code.
+ */
 
-#define ADDIDATA_DRIVER_NAME    "addi_apci_1032"
+#include "../comedidev.h"
+#include "comedi_fc.h"
+#include "amcc_s5933.h"
 
-#include "addi-data/addi_common.c"
+/*
+ * I/O Register Map
+ */
+#define APCI1032_DI_REG                 0x00
+#define APCI1032_MODE1_REG              0x04
+#define APCI1032_MODE2_REG              0x08
+#define APCI1032_STATUS_REG             0x0c
+#define APCI1032_CTRL_REG               0x10
+#define APCI1032_CTRL_INT_OR            (0 << 1)
+#define APCI1032_CTRL_INT_AND           (1 << 1)
+#define APCI1032_CTRL_INT_ENA           (1 << 2)
+
+struct apci1032_private {
+        unsigned long amcc_iobase;      /* base of AMCC I/O registers */
+        unsigned int mode1;     /* rising-edge/high level channels */
+        unsigned int mode2;     /* falling-edge/low level channels */
+        unsigned int ctrl;      /* interrupt mode OR (edge) . AND (level) */
+};
+
+static int apci1032_reset(struct comedi_device *dev)
+{
+        /* disable the interrupts */
+        outl(0x0, dev->iobase + APCI1032_CTRL_REG);
+        /* Reset the interrupt status register */
+        inl(dev->iobase + APCI1032_STATUS_REG);
+        /* Disable the and/or interrupt */
+        outl(0x0, dev->iobase + APCI1032_MODE1_REG);
+        outl(0x0, dev->iobase + APCI1032_MODE2_REG);
+
+        return 0;
+}
+
+/*
+ * Change-Of-State (COS) interrupt configuration
+ *
+ * Channels 0 to 15 are interruptible. These channels can be configured
+ * to generate interrupts based on AND/OR logic for the desired channels.
+ *
+ *      OR logic
+ *              - reacts to rising or falling edges
+ *              - interrupt is generated when any enabled channel
+ *                meet the desired interrupt condition
+ *
+ *      AND logic
+ *              - reacts to changes in level of the selected inputs
+ *              - interrupt is generated when all enabled channels
+ *                meet the desired interrupt condition
+ *              - after an interrupt, a change in level must occur on
+ *                the selected inputs to release the IRQ logic
+ *
+ * The COS interrupt must be configured before it can be enabled.
+ *
+ *      data[0] : INSN_CONFIG_DIGITAL_TRIG
+ *      data[1] : trigger number (= 0)
+ *      data[2] : configuration operation:
+ *                COMEDI_DIGITAL_TRIG_DISABLE = no interrupts
+ *                COMEDI_DIGITAL_TRIG_ENABLE_EDGES = OR (edge) interrupts
+ *                COMEDI_DIGITAL_TRIG_ENABLE_LEVELS = AND (level) interrupts
+ *      data[3] : left-shift for data[4] and data[5]
+ *      data[4] : rising-edge/high level channels
+ *      data[5] : falling-edge/low level channels
+ */
+static int apci1032_cos_insn_config(struct comedi_device *dev,
+                                    struct comedi_subdevice *s,
+                                    struct comedi_insn *insn,
+                                    unsigned int *data)
+{
+        struct apci1032_private *devpriv = dev->private;
+        unsigned int shift, oldmask;
+
+        switch (data[0]) {
+        case INSN_CONFIG_DIGITAL_TRIG:
+                if (data[1] != 0)
+                        return -EINVAL;
+                shift = data[3];
+                oldmask = (1U << shift) - 1;
+                switch (data[2]) {
+                case COMEDI_DIGITAL_TRIG_DISABLE:
+                        devpriv->ctrl = 0;
+                        devpriv->mode1 = 0;
+                        devpriv->mode2 = 0;
+                        apci1032_reset(dev);
+                        break;
+                case COMEDI_DIGITAL_TRIG_ENABLE_EDGES:
+                        if (devpriv->ctrl != (APCI1032_CTRL_INT_ENA |
+                                              APCI1032_CTRL_INT_OR)) {
+                                /* switching to 'OR' mode */
+                                devpriv->ctrl = APCI1032_CTRL_INT_ENA |
+                                                APCI1032_CTRL_INT_OR;
+                                /* wipe old channels */
+                                devpriv->mode1 = 0;
+                                devpriv->mode2 = 0;
+                        } else {
+                                /* preserve unspecified channels */
+                                devpriv->mode1 &= oldmask;
+                                devpriv->mode2 &= oldmask;
+                        }
+                        /* configure specified channels */
+                        devpriv->mode1 |= data[4] << shift;
+                        devpriv->mode2 |= data[5] << shift;
+                        break;
+                case COMEDI_DIGITAL_TRIG_ENABLE_LEVELS:
+                        if (devpriv->ctrl != (APCI1032_CTRL_INT_ENA |
+                                              APCI1032_CTRL_INT_AND)) {
+                                /* switching to 'AND' mode */
+                                devpriv->ctrl = APCI1032_CTRL_INT_ENA |
+                                                APCI1032_CTRL_INT_AND;
+                                /* wipe old channels */
+                                devpriv->mode1 = 0;
+                                devpriv->mode2 = 0;
+                        } else {
+                                /* preserve unspecified channels */
+                                devpriv->mode1 &= oldmask;
+                                devpriv->mode2 &= oldmask;
+                        }
+                        /* configure specified channels */
+                        devpriv->mode1 |= data[4] << shift;
+                        devpriv->mode2 |= data[5] << shift;
+                        break;
+                default:
+                        return -EINVAL;
+                }
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        return insn->n;
+}
+
+static int apci1032_cos_insn_bits(struct comedi_device *dev,
+                                  struct comedi_subdevice *s,
+                                  struct comedi_insn *insn,
+                                  unsigned int *data)
+{
+        data[1] = s->state;
+
+        return 0;
+}
+
+static int apci1032_cos_cmdtest(struct comedi_device *dev,
+                                struct comedi_subdevice *s,
+                                struct comedi_cmd *cmd)
+{
+        int err = 0;
+
+        /* Step 1 : check if triggers are trivially valid */
+
+        err |= cfc_check_trigger_src(&cmd->start_src, TRIG_NOW);
+        err |= cfc_check_trigger_src(&cmd->scan_begin_src, TRIG_EXT);
+        err |= cfc_check_trigger_src(&cmd->convert_src, TRIG_FOLLOW);
+        err |= cfc_check_trigger_src(&cmd->scan_end_src, TRIG_COUNT);
+        err |= cfc_check_trigger_src(&cmd->stop_src, TRIG_NONE);
+
+        if (err)
+                return 1;
+
+        /* Step 2a : make sure trigger sources are unique */
+        /* Step 2b : and mutually compatible */
+
+        if (err)
+                return 2;
+
+        /* Step 3: check if arguments are trivially valid */
+
+        err |= cfc_check_trigger_arg_is(&cmd->start_arg, 0);
+        err |= cfc_check_trigger_arg_is(&cmd->scan_begin_arg, 0);
+        err |= cfc_check_trigger_arg_is(&cmd->convert_arg, 0);
+        err |= cfc_check_trigger_arg_is(&cmd->scan_end_arg, 1);
+        err |= cfc_check_trigger_arg_is(&cmd->stop_arg, 0);
+
+        if (err)
+                return 3;
+
+        /* step 4: ignored */
+
+        if (err)
+                return 4;
+
+        return 0;
+}
+
+/*
+ * Change-Of-State (COS) 'do_cmd' operation
+ *
+ * Enable the COS interrupt as configured by apci1032_cos_insn_config().
+ */
+static int apci1032_cos_cmd(struct comedi_device *dev,
+                            struct comedi_subdevice *s)
+{
+        struct apci1032_private *devpriv = dev->private;
+
+        if (!devpriv->ctrl) {
+                dev_warn(dev->class_dev,
+                        "Interrupts disabled due to mode configuration!\n");
+                return -EINVAL;
+        }
+
+        outl(devpriv->mode1, dev->iobase + APCI1032_MODE1_REG);
+        outl(devpriv->mode2, dev->iobase + APCI1032_MODE2_REG);
+        outl(devpriv->ctrl, dev->iobase + APCI1032_CTRL_REG);
+
+        return 0;
+}
+
+static int apci1032_cos_cancel(struct comedi_device *dev,
+                               struct comedi_subdevice *s)
+{
+        return apci1032_reset(dev);
+}
+
+static irqreturn_t apci1032_interrupt(int irq, void *d)
+{
+        struct comedi_device *dev = d;
+        struct apci1032_private *devpriv = dev->private;
+        struct comedi_subdevice *s = dev->read_subdev;
+        unsigned int ctrl;
+
+        /* check interrupt is from this device */
+        if ((inl(devpriv->amcc_iobase + AMCC_OP_REG_INTCSR) &
+             INTCSR_INTR_ASSERTED) == 0)
+                return IRQ_NONE;
+
+        /* check interrupt is enabled */
+        ctrl = inl(dev->iobase + APCI1032_CTRL_REG);
+        if ((ctrl & APCI1032_CTRL_INT_ENA) == 0)
+                return IRQ_HANDLED;
+
+        /* disable the interrupt */
+        outl(ctrl & ~APCI1032_CTRL_INT_ENA, dev->iobase + APCI1032_CTRL_REG);
+
+        s->state = inl(dev->iobase + APCI1032_STATUS_REG) & 0xffff;
+        comedi_buf_put(s->async, s->state);
+        s->async->events |= COMEDI_CB_BLOCK | COMEDI_CB_EOS;
+        comedi_event(dev, s);
+
+        /* enable the interrupt */
+        outl(ctrl, dev->iobase + APCI1032_CTRL_REG);
+
+        return IRQ_HANDLED;
+}
+
+static int apci1032_di_insn_bits(struct comedi_device *dev,
+                                 struct comedi_subdevice *s,
+                                 struct comedi_insn *insn,
+                                 unsigned int *data)
+{
+        data[1] = inl(dev->iobase + APCI1032_DI_REG);
+
+        return insn->n;
+}
+
+static int apci1032_auto_attach(struct comedi_device *dev,
+                                          unsigned long context_unused)
+{
+        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
+        struct apci1032_private *devpriv;
+        struct comedi_subdevice *s;
+        int ret;
+
+        dev->board_name = dev->driver->driver_name;
+
+        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
+        if (!devpriv)
+                return -ENOMEM;
+        dev->private = devpriv;
+
+        ret = comedi_pci_enable(pcidev, dev->board_name);
+        if (ret)
+                return ret;
+
+        devpriv->amcc_iobase = pci_resource_start(pcidev, 0);
+        dev->iobase = pci_resource_start(pcidev, 1);
+        apci1032_reset(dev);
+        if (pcidev->irq > 0) {
+                ret = request_irq(pcidev->irq, apci1032_interrupt, IRQF_SHARED,
+                                  dev->board_name, dev);
+                if (ret == 0)
+                        dev->irq = pcidev->irq;
+        }
+
+        ret = comedi_alloc_subdevices(dev, 2);
+        if (ret)
+                return ret;
+
+        /*  Allocate and Initialise DI Subdevice Structures */
+        s = &dev->subdevices[0];
+        s->type         = COMEDI_SUBD_DI;
+        s->subdev_flags = SDF_READABLE;
+        s->n_chan       = 32;
+        s->maxdata      = 1;
+        s->range_table  = &range_digital;
+        s->insn_bits    = apci1032_di_insn_bits;
+
+        /* Change-Of-State (COS) interrupt subdevice */
+        s = &dev->subdevices[1];
+        if (dev->irq) {
+                dev->read_subdev = s;
+                s->type         = COMEDI_SUBD_DI | SDF_CMD_READ;
+                s->subdev_flags = SDF_READABLE;
+                s->n_chan       = 1;
+                s->maxdata      = 1;
+                s->range_table  = &range_digital;
+                s->insn_config  = apci1032_cos_insn_config;
+                s->insn_bits    = apci1032_cos_insn_bits;
+                s->do_cmdtest   = apci1032_cos_cmdtest;
+                s->do_cmd       = apci1032_cos_cmd;
+                s->cancel       = apci1032_cos_cancel;
+        } else {
+                s->type         = COMEDI_SUBD_UNUSED;
+        }
+
+        return 0;
+}
+
+static void apci1032_detach(struct comedi_device *dev)
+{
+        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
+
+        if (dev->iobase)
+                apci1032_reset(dev);
+        if (dev->irq)
+                free_irq(dev->irq, dev);
+        if (pcidev) {
+                if (dev->iobase)
+                        comedi_pci_disable(pcidev);
+        }
+}
+
+static struct comedi_driver apci1032_driver = {
+        .driver_name    = "addi_apci_1032",
+        .module         = THIS_MODULE,
+        .auto_attach    = apci1032_auto_attach,
+        .detach         = apci1032_detach,
+};
+
+static int apci1032_pci_probe(struct pci_dev *dev,
+                                        const struct pci_device_id *ent)
+{
+        return comedi_pci_auto_config(dev, &apci1032_driver);
+}
+
+static void apci1032_pci_remove(struct pci_dev *dev)
+{
+        comedi_pci_auto_unconfig(dev);
+}
+
+static DEFINE_PCI_DEVICE_TABLE(apci1032_pci_table) = {
+        { PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x1003) },
+        { 0 }
+};
+MODULE_DEVICE_TABLE(pci, apci1032_pci_table);
+
+static struct pci_driver apci1032_pci_driver = {
+        .name           = "addi_apci_1032",
+        .id_table       = apci1032_pci_table,
+        .probe          = apci1032_pci_probe,
+        .remove         = apci1032_pci_remove,
+};
+module_comedi_pci_driver(apci1032_driver, apci1032_pci_driver);
 
 MODULE_AUTHOR("Comedi http://www.comedi.org");
 MODULE_DESCRIPTION("Comedi low-level driver");
diff --git a/drivers/staging/comedi/drivers/addi_apci_1500.c b/drivers/staging/comedi/drivers/addi_apci_1500.c
index bfd84f66d9c0..8e686a9b811b 100644
--- a/drivers/staging/comedi/drivers/addi_apci_1500.c
+++ b/drivers/staging/comedi/drivers/addi_apci_1500.c
@@ -1,9 +1,77 @@
-#define CONFIG_APCI_1500 1
+#include "../comedidev.h"
+#include "comedi_fc.h"
+#include "amcc_s5933.h"
 
-#define ADDIDATA_DRIVER_NAME    "addi_apci_1500"
+#include "addi-data/addi_common.h"
 
+#include "addi-data/addi_eeprom.c"
+#include "addi-data/hwdrv_apci1500.c"
 #include "addi-data/addi_common.c"
 
+static const struct addi_board apci1500_boardtypes[] = {
+        {
+                .pc_DriverName          = "apci1500",
+                .i_VendorId             = PCI_VENDOR_ID_ADDIDATA_OLD,
+                .i_DeviceId             = 0x80fc,
+                .i_IorangeBase0         = 128,
+                .i_IorangeBase1         = APCI1500_ADDRESS_RANGE,
+                .i_IorangeBase2         = 4,
+                .i_PCIEeprom            = ADDIDATA_NO_EEPROM,
+                .i_NbrDiChannel         = 16,
+                .i_NbrDoChannel         = 16,
+                .i_DoMaxdata            = 0xffff,
+                .i_Timer                = 1,
+                .interrupt              = v_APCI1500_Interrupt,
+                .reset                  = i_APCI1500_Reset,
+                .di_config              = i_APCI1500_ConfigDigitalInputEvent,
+                .di_read                = i_APCI1500_Initialisation,
+                .di_write               = i_APCI1500_StartStopInputEvent,
+                .di_bits                = apci1500_di_insn_bits,
+                .do_config              = i_APCI1500_ConfigDigitalOutputErrorInterrupt,
+                .do_write               = i_APCI1500_WriteDigitalOutput,
+                .do_bits                = i_APCI1500_ConfigureInterrupt,
+                .timer_config           = i_APCI1500_ConfigCounterTimerWatchdog,
+                .timer_write            = i_APCI1500_StartStopTriggerTimerCounterWatchdog,
+                .timer_read             = i_APCI1500_ReadInterruptMask,
+                .timer_bits             = i_APCI1500_ReadCounterTimerWatchdog,
+        },
+};
+
+static struct comedi_driver apci1500_driver = {
+        .driver_name    = "addi_apci_1500",
+        .module         = THIS_MODULE,
+        .auto_attach    = addi_auto_attach,
+        .detach         = i_ADDI_Detach,
+        .num_names      = ARRAY_SIZE(apci1500_boardtypes),
+        .board_name     = &apci1500_boardtypes[0].pc_DriverName,
+        .offset         = sizeof(struct addi_board),
+};
+
+static int apci1500_pci_probe(struct pci_dev *dev,
+                                        const struct pci_device_id *ent)
+{
+        return comedi_pci_auto_config(dev, &apci1500_driver);
+}
+
+static void apci1500_pci_remove(struct pci_dev *dev)
+{
+        comedi_pci_auto_unconfig(dev);
+}
+
+static DEFINE_PCI_DEVICE_TABLE(apci1500_pci_table) = {
+        { PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA_OLD, 0x80fc) },
+        { 0 }
+};
+MODULE_DEVICE_TABLE(pci, apci1500_pci_table);
+
+static struct pci_driver apci1500_pci_driver = {
+        .name           = "addi_apci_1500",
+        .id_table       = apci1500_pci_table,
+        .probe          = apci1500_pci_probe,
+        .remove         = apci1500_pci_remove,
+};
+module_comedi_pci_driver(apci1500_driver, apci1500_pci_driver);
+
 MODULE_AUTHOR("Comedi http://www.comedi.org");
 MODULE_DESCRIPTION("Comedi low-level driver");
 MODULE_LICENSE("GPL");
diff --git a/drivers/staging/comedi/drivers/addi_apci_1516.c b/drivers/staging/comedi/drivers/addi_apci_1516.c
index a12e2f421370..8fef04b4d197 100644
--- a/drivers/staging/comedi/drivers/addi_apci_1516.c
+++ b/drivers/staging/comedi/drivers/addi_apci_1516.c
@@ -1,9 +1,349 @@
-#define CONFIG_APCI_1516 1
+/*
+ * addi_apci_1516.c
+ * Copyright (C) 2004,2005  ADDI-DATA GmbH for the source code of this module.
+ * Project manager: Eric Stolz
+ *
+ *      ADDI-DATA GmbH
+ *      Dieselstrasse 3
+ *      D-77833 Ottersweier
+ *      Tel: +19(0)7223/9493-0
+ *      Fax: +49(0)7223/9493-92
+ *      http://www.addi-data.com
+ *      info@addi-data.com
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * 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
+ *
+ * You should also find the complete GPL in the COPYING file accompanying
+ * this source code.
+ */
 
-#define ADDIDATA_DRIVER_NAME    "addi_apci_1516"
+#include "../comedidev.h"
+#include "comedi_fc.h"
 
-#include "addi-data/addi_common.c"
+/*
+ * PCI device ids supported by this driver
+ */
+#define PCI_DEVICE_ID_APCI1016          0x1000
+#define PCI_DEVICE_ID_APCI1516          0x1001
+#define PCI_DEVICE_ID_APCI2016          0x1002
 
+/*
+ * PCI bar 1 I/O Register map - Digital input/output
+ */
+#define APCI1516_DI_REG                 0x00
+#define APCI1516_DO_REG                 0x04
+
+/*
+ * PCI bar 2 I/O Register map - Watchdog (APCI-1516 and APCI-2016)
+ */
+#define APCI1516_WDOG_REG               0x00
+#define APCI1516_WDOG_RELOAD_REG        0x04
+#define APCI1516_WDOG_CTRL_REG          0x0c
+#define APCI1516_WDOG_CTRL_ENABLE       (1 << 0)
+#define APCI1516_WDOG_CTRL_SW_TRIG      (1 << 9)
+#define APCI1516_WDOG_STATUS_REG        0x10
+#define APCI1516_WDOG_STATUS_ENABLED    (1 << 0)
+#define APCI1516_WDOG_STATUS_SW_TRIG    (1 << 1)
+
+struct apci1516_boardinfo {
+        const char *name;
+        unsigned short device;
+        int di_nchan;
+        int do_nchan;
+        int has_wdog;
+};
+
+static const struct apci1516_boardinfo apci1516_boardtypes[] = {
+        {
+                .name           = "apci1016",
+                .device         = PCI_DEVICE_ID_APCI1016,
+                .di_nchan       = 16,
+        }, {
+                .name           = "apci1516",
+                .device         = PCI_DEVICE_ID_APCI1516,
+                .di_nchan       = 8,
+                .do_nchan       = 8,
+                .has_wdog       = 1,
+        }, {
+                .name           = "apci2016",
+                .device         = PCI_DEVICE_ID_APCI2016,
+                .do_nchan       = 16,
+                .has_wdog       = 1,
+        },
+};
+
+struct apci1516_private {
+        unsigned long wdog_iobase;
+        unsigned int ctrl;
+};
+
+static int apci1516_di_insn_bits(struct comedi_device *dev,
+                                 struct comedi_subdevice *s,
+                                 struct comedi_insn *insn,
+                                 unsigned int *data)
+{
+        data[1] = inw(dev->iobase + APCI1516_DI_REG);
+
+        return insn->n;
+}
+
+static int apci1516_do_insn_bits(struct comedi_device *dev,
+                                 struct comedi_subdevice *s,
+                                 struct comedi_insn *insn,
+                                 unsigned int *data)
+{
+        unsigned int mask = data[0];
+        unsigned int bits = data[1];
+
+        s->state = inw(dev->iobase + APCI1516_DO_REG);
+        if (mask) {
+                s->state &= ~mask;
+                s->state |= (bits & mask);
+
+                outw(s->state, dev->iobase + APCI1516_DO_REG);
+        }
+
+        data[1] = s->state;
+
+        return insn->n;
+}
+
+/*
+ * The watchdog subdevice is configured with two INSN_CONFIG instructions:
+ *
+ * Enable the watchdog and set the reload timeout:
+ *      data[0] = INSN_CONFIG_ARM
+ *      data[1] = timeout reload value
+ *
+ * Disable the watchdog:
+ *      data[0] = INSN_CONFIG_DISARM
+ */
+static int apci1516_wdog_insn_config(struct comedi_device *dev,
+                                     struct comedi_subdevice *s,
+                                     struct comedi_insn *insn,
+                                     unsigned int *data)
+{
+        struct apci1516_private *devpriv = dev->private;
+        unsigned int reload;
+
+        switch (data[0]) {
+        case INSN_CONFIG_ARM:
+                devpriv->ctrl = APCI1516_WDOG_CTRL_ENABLE;
+                reload = data[1] & s->maxdata;
+                outw(reload, devpriv->wdog_iobase + APCI1516_WDOG_RELOAD_REG);
+
+                /* Time base is 20ms, let the user know the timeout */
+                dev_info(dev->class_dev, "watchdog enabled, timeout:%dms\n",
+                        20 * reload + 20);
+                break;
+        case INSN_CONFIG_DISARM:
+                devpriv->ctrl = 0;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        outw(devpriv->ctrl, devpriv->wdog_iobase + APCI1516_WDOG_CTRL_REG);
+
+        return insn->n;
+}
+
+static int apci1516_wdog_insn_write(struct comedi_device *dev,
+                                    struct comedi_subdevice *s,
+                                    struct comedi_insn *insn,
+                                    unsigned int *data)
+{
+        struct apci1516_private *devpriv = dev->private;
+        int i;
+
+        if (devpriv->ctrl == 0) {
+                dev_warn(dev->class_dev, "watchdog is disabled\n");
+                return -EINVAL;
+        }
+
+        /* "ping" the watchdog */
+        for (i = 0; i < insn->n; i++) {
+                outw(devpriv->ctrl | APCI1516_WDOG_CTRL_SW_TRIG,
+                        devpriv->wdog_iobase + APCI1516_WDOG_CTRL_REG);
+        }
+
+        return insn->n;
+}
+
+static int apci1516_wdog_insn_read(struct comedi_device *dev,
+                                   struct comedi_subdevice *s,
+                                   struct comedi_insn *insn,
+                                   unsigned int *data)
+{
+        struct apci1516_private *devpriv = dev->private;
+        int i;
+
+        for (i = 0; i < insn->n; i++)
+                data[i] = inw(devpriv->wdog_iobase + APCI1516_WDOG_STATUS_REG);
+
+        return insn->n;
+}
+
+static int apci1516_reset(struct comedi_device *dev)
+{
+        const struct apci1516_boardinfo *this_board = comedi_board(dev);
+        struct apci1516_private *devpriv = dev->private;
+
+        if (!this_board->has_wdog)
+                return 0;
+
+        outw(0x0, dev->iobase + APCI1516_DO_REG);
+        outw(0x0, devpriv->wdog_iobase + APCI1516_WDOG_CTRL_REG);
+        outw(0x0, devpriv->wdog_iobase + APCI1516_WDOG_RELOAD_REG);
+
+        return 0;
+}
+
+static const void *apci1516_find_boardinfo(struct comedi_device *dev,
+                                           struct pci_dev *pcidev)
+{
+        const struct apci1516_boardinfo *this_board;
+        int i;
+
+        for (i = 0; i < dev->driver->num_names; i++) {
+                this_board = &apci1516_boardtypes[i];
+                if (this_board->device == pcidev->device)
+                        return this_board;
+        }
+        return NULL;
+}
+
+static int apci1516_auto_attach(struct comedi_device *dev,
+                                          unsigned long context_unused)
+{
+        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
+        const struct apci1516_boardinfo *this_board;
+        struct apci1516_private *devpriv;
+        struct comedi_subdevice *s;
+        int ret;
+
+        this_board = apci1516_find_boardinfo(dev, pcidev);
+        if (!this_board)
+                return -ENODEV;
+        dev->board_ptr = this_board;
+        dev->board_name = this_board->name;
+
+        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
+        if (!devpriv)
+                return -ENOMEM;
+        dev->private = devpriv;
+
+        ret = comedi_pci_enable(pcidev, dev->board_name);
+        if (ret)
+                return ret;
+
+        dev->iobase = pci_resource_start(pcidev, 1);
+        devpriv->wdog_iobase = pci_resource_start(pcidev, 2);
+
+        ret = comedi_alloc_subdevices(dev, 3);
+        if (ret)
+                return ret;
+
+        /* Initialize the digital input subdevice */
+        s = &dev->subdevices[0];
+        if (this_board->di_nchan) {
+                s->type         = COMEDI_SUBD_DI;
+                s->subdev_flags = SDF_READABLE;
+                s->n_chan       = this_board->di_nchan;
+                s->maxdata      = 1;
+                s->range_table  = &range_digital;
+                s->insn_bits    = apci1516_di_insn_bits;
+        } else {
+                s->type         = COMEDI_SUBD_UNUSED;
+        }
+
+        /* Initialize the digital output subdevice */
+        s = &dev->subdevices[1];
+        if (this_board->do_nchan) {
+                s->type         = COMEDI_SUBD_DO;
+                s->subdev_flags = SDF_WRITEABLE;
+                s->n_chan       = this_board->do_nchan;
+                s->maxdata      = 1;
+                s->range_table  = &range_digital;
+                s->insn_bits    = apci1516_do_insn_bits;
+        } else {
+                s->type         = COMEDI_SUBD_UNUSED;
+        }
+
+        /* Initialize the watchdog subdevice */
+        s = &dev->subdevices[2];
+        if (this_board->has_wdog) {
+                s->type         = COMEDI_SUBD_TIMER;
+                s->subdev_flags = SDF_WRITEABLE;
+                s->n_chan       = 1;
+                s->maxdata      = 0xff;
+                s->insn_write   = apci1516_wdog_insn_write;
+                s->insn_read    = apci1516_wdog_insn_read;
+                s->insn_config  = apci1516_wdog_insn_config;
+        } else {
+                s->type         = COMEDI_SUBD_UNUSED;
+        }
+
+        apci1516_reset(dev);
+        return 0;
+}
+
+static void apci1516_detach(struct comedi_device *dev)
+{
+        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
+
+        if (dev->iobase) {
+                apci1516_reset(dev);
+                comedi_pci_disable(pcidev);
+        }
+}
+
+static struct comedi_driver apci1516_driver = {
+        .driver_name    = "addi_apci_1516",
+        .module         = THIS_MODULE,
+        .auto_attach    = apci1516_auto_attach,
+        .detach         = apci1516_detach,
+};
+
+static int apci1516_pci_probe(struct pci_dev *dev,
+                                        const struct pci_device_id *ent)
+{
+        return comedi_pci_auto_config(dev, &apci1516_driver);
+}
+
+static void apci1516_pci_remove(struct pci_dev *dev)
+{
+        comedi_pci_auto_unconfig(dev);
+}
+
+static DEFINE_PCI_DEVICE_TABLE(apci1516_pci_table) = {
+        { PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, PCI_DEVICE_ID_APCI1016) },
+        { PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, PCI_DEVICE_ID_APCI1516) },
+        { PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, PCI_DEVICE_ID_APCI2016) },
+        { 0 }
+};
+MODULE_DEVICE_TABLE(pci, apci1516_pci_table);
+
+static struct pci_driver apci1516_pci_driver = {
+        .name           = "addi_apci_1516",
+        .id_table       = apci1516_pci_table,
+        .probe          = apci1516_pci_probe,
+        .remove         = apci1516_pci_remove,
+};
+module_comedi_pci_driver(apci1516_driver, apci1516_pci_driver);
+
+MODULE_DESCRIPTION("ADDI-DATA APCI-1016/1516/2016, 16 channel DIO boards");
 MODULE_AUTHOR("Comedi http://www.comedi.org");
-MODULE_DESCRIPTION("Comedi low-level driver");
 MODULE_LICENSE("GPL");
diff --git a/drivers/staging/comedi/drivers/addi_apci_1564.c b/drivers/staging/comedi/drivers/addi_apci_1564.c
index 1b9d598fb6ca..513e536f292f 100644
--- a/drivers/staging/comedi/drivers/addi_apci_1564.c
+++ b/drivers/staging/comedi/drivers/addi_apci_1564.c
@@ -1,9 +1,74 @@
-#define CONFIG_APCI_1564 1
+#include "../comedidev.h"
+#include "comedi_fc.h"
+#include "amcc_s5933.h"
 
-#define ADDIDATA_DRIVER_NAME    "addi_apci_1564"
+#include "addi-data/addi_common.h"
 
+#include "addi-data/addi_eeprom.c"
+#include "addi-data/hwdrv_apci1564.c"
 #include "addi-data/addi_common.c"
 
+static const struct addi_board apci1564_boardtypes[] = {
+        {
+                .pc_DriverName          = "apci1564",
+                .i_VendorId             = PCI_VENDOR_ID_ADDIDATA,
+                .i_DeviceId             = 0x1006,
+                .i_IorangeBase0         = 128,
+                .i_IorangeBase1         = APCI1564_ADDRESS_RANGE,
+                .i_PCIEeprom            = ADDIDATA_EEPROM,
+                .pc_EepromChip          = ADDIDATA_93C76,
+                .i_NbrDiChannel         = 32,
+                .i_NbrDoChannel         = 32,
+                .i_DoMaxdata            = 0xffffffff,
+                .i_Timer                = 1,
+                .interrupt              = v_APCI1564_Interrupt,
+                .reset                  = i_APCI1564_Reset,
+                .di_config              = i_APCI1564_ConfigDigitalInput,
+                .di_bits                = apci1564_di_insn_bits,
+                .do_config              = i_APCI1564_ConfigDigitalOutput,
+                .do_bits                = apci1564_do_insn_bits,
+                .do_read                = i_APCI1564_ReadInterruptStatus,
+                .timer_config           = i_APCI1564_ConfigTimerCounterWatchdog,
+                .timer_write            = i_APCI1564_StartStopWriteTimerCounterWatchdog,
+                .timer_read             = i_APCI1564_ReadTimerCounterWatchdog,
+        },
+};
+
+static struct comedi_driver apci1564_driver = {
+        .driver_name    = "addi_apci_1564",
+        .module         = THIS_MODULE,
+        .auto_attach    = addi_auto_attach,
+        .detach         = i_ADDI_Detach,
+        .num_names      = ARRAY_SIZE(apci1564_boardtypes),
+        .board_name     = &apci1564_boardtypes[0].pc_DriverName,
+        .offset         = sizeof(struct addi_board),
+};
+
+static int apci1564_pci_probe(struct pci_dev *dev,
+                                        const struct pci_device_id *ent)
+{
+        return comedi_pci_auto_config(dev, &apci1564_driver);
+}
+
+static void apci1564_pci_remove(struct pci_dev *dev)
+{
+        comedi_pci_auto_unconfig(dev);
+}
+
+static DEFINE_PCI_DEVICE_TABLE(apci1564_pci_table) = {
+        { PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x1006) },
+        { 0 }
+};
+MODULE_DEVICE_TABLE(pci, apci1564_pci_table);
+
+static struct pci_driver apci1564_pci_driver = {
+        .name           = "addi_apci_1564",
+        .id_table       = apci1564_pci_table,
+        .probe          = apci1564_pci_probe,
+        .remove         = apci1564_pci_remove,
+};
+module_comedi_pci_driver(apci1564_driver, apci1564_pci_driver);
+
 MODULE_AUTHOR("Comedi http://www.comedi.org");
 MODULE_DESCRIPTION("Comedi low-level driver");
 MODULE_LICENSE("GPL");
diff --git a/drivers/staging/comedi/drivers/addi_apci_16xx.c b/drivers/staging/comedi/drivers/addi_apci_16xx.c
index d54218d59c58..ab9a96ac8180 100644
--- a/drivers/staging/comedi/drivers/addi_apci_16xx.c
+++ b/drivers/staging/comedi/drivers/addi_apci_16xx.c
@@ -1,9 +1,77 @@
-#define CONFIG_APCI_16XX 1
+#include "../comedidev.h"
+#include "comedi_fc.h"
+#include "amcc_s5933.h"
 
-#define ADDIDATA_DRIVER_NAME    "addi_apci_16xx"
+#include "addi-data/addi_common.h"
 
+#include "addi-data/addi_eeprom.c"
+#include "addi-data/hwdrv_apci16xx.c"
 #include "addi-data/addi_common.c"
 
+static const struct addi_board apci16xx_boardtypes[] = {
+        {
+                .pc_DriverName          = "apci1648",
+                .i_VendorId             = PCI_VENDOR_ID_ADDIDATA,
+                .i_DeviceId             = 0x1009,
+                .i_IorangeBase0         = 128,
+                .i_PCIEeprom            = ADDIDATA_NO_EEPROM,
+                .i_NbrTTLChannel        = 48,
+                .reset                  = i_APCI16XX_Reset,
+                .ttl_config             = i_APCI16XX_InsnConfigInitTTLIO,
+                .ttl_bits               = i_APCI16XX_InsnBitsReadTTLIO,
+                .ttl_read               = i_APCI16XX_InsnReadTTLIOAllPortValue,
+                .ttl_write              = i_APCI16XX_InsnBitsWriteTTLIO,
+        }, {
+                .pc_DriverName          = "apci1696",
+                .i_VendorId             = PCI_VENDOR_ID_ADDIDATA,
+                .i_DeviceId             = 0x100A,
+                .i_IorangeBase0         = 128,
+                .i_PCIEeprom            = ADDIDATA_NO_EEPROM,
+                .i_NbrTTLChannel        = 96,
+                .reset                  = i_APCI16XX_Reset,
+                .ttl_config             = i_APCI16XX_InsnConfigInitTTLIO,
+                .ttl_bits               = i_APCI16XX_InsnBitsReadTTLIO,
+                .ttl_read               = i_APCI16XX_InsnReadTTLIOAllPortValue,
+                .ttl_write              = i_APCI16XX_InsnBitsWriteTTLIO,
+        },
+};
+
+static struct comedi_driver apci16xx_driver = {
+        .driver_name    = "addi_apci_16xx",
+        .module         = THIS_MODULE,
+        .auto_attach    = addi_auto_attach,
+        .detach         = i_ADDI_Detach,
+        .num_names      = ARRAY_SIZE(apci16xx_boardtypes),
+        .board_name     = &apci16xx_boardtypes[0].pc_DriverName,
+        .offset         = sizeof(struct addi_board),
+};
+
+static int apci16xx_pci_probe(struct pci_dev *dev,
+                                        const struct pci_device_id *ent)
+{
+        return comedi_pci_auto_config(dev, &apci16xx_driver);
+}
+
+static void apci16xx_pci_remove(struct pci_dev *dev)
+{
+        comedi_pci_auto_unconfig(dev);
+}
+
+static DEFINE_PCI_DEVICE_TABLE(apci16xx_pci_table) = {
+        { PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x1009) },
+        { PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x100a) },
+        { 0 }
+};
+MODULE_DEVICE_TABLE(pci, apci16xx_pci_table);
+
+static struct pci_driver apci16xx_pci_driver = {
+        .name           = "addi_apci_16xx",
+        .id_table       = apci16xx_pci_table,
+        .probe          = apci16xx_pci_probe,
+        .remove         = apci16xx_pci_remove,
+};
+module_comedi_pci_driver(apci16xx_driver, apci16xx_pci_driver);
+
 MODULE_AUTHOR("Comedi http://www.comedi.org");
 MODULE_DESCRIPTION("Comedi low-level driver");
 MODULE_LICENSE("GPL");
diff --git a/drivers/staging/comedi/drivers/addi_apci_1710.c b/drivers/staging/comedi/drivers/addi_apci_1710.c
index df6ba8ccf56f..152e7ef9b17b 100644
--- a/drivers/staging/comedi/drivers/addi_apci_1710.c
+++ b/drivers/staging/comedi/drivers/addi_apci_1710.c
@@ -1,5 +1,152 @@
-#define CONFIG_APCI_1710 1
+#include <asm/i387.h>
 
-#define ADDIDATA_DRIVER_NAME    "addi_apci_1710"
+#include "../comedidev.h"
+#include "comedi_fc.h"
+#include "amcc_s5933.h"
 
-#include "addi-data/addi_common.c"
+#include "addi-data/addi_common.h"
+
+static void fpu_begin(void)
+{
+        kernel_fpu_begin();
+}
+
+static void fpu_end(void)
+{
+        kernel_fpu_end();
+}
+
+#include "addi-data/addi_eeprom.c"
+#include "addi-data/hwdrv_APCI1710.c"
+
+static const struct addi_board apci1710_boardtypes[] = {
+        {
+                .pc_DriverName          = "apci1710",
+                .i_VendorId             = PCI_VENDOR_ID_ADDIDATA_OLD,
+                .i_DeviceId             = APCI1710_BOARD_DEVICE_ID,
+                .interrupt              = v_APCI1710_Interrupt,
+        },
+};
+
+static irqreturn_t v_ADDI_Interrupt(int irq, void *d)
+{
+        struct comedi_device *dev = d;
+        const struct addi_board *this_board = comedi_board(dev);
+
+        this_board->interrupt(irq, d);
+        return IRQ_RETVAL(1);
+}
+
+static const void *apci1710_find_boardinfo(struct comedi_device *dev,
+                                           struct pci_dev *pcidev)
+{
+        const struct addi_board *this_board;
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(apci1710_boardtypes); i++) {
+                this_board = &apci1710_boardtypes[i];
+                if (this_board->i_VendorId == pcidev->vendor &&
+                    this_board->i_DeviceId == pcidev->device)
+                        return this_board;
+        }
+        return NULL;
+}
+
+static int apci1710_auto_attach(struct comedi_device *dev,
+                                          unsigned long context_unused)
+{
+        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
+        const struct addi_board *this_board;
+        struct addi_private *devpriv;
+        struct comedi_subdevice *s;
+        int ret;
+
+        this_board = apci1710_find_boardinfo(dev, pcidev);
+        if (!this_board)
+                return -ENODEV;
+        dev->board_ptr = this_board;
+        dev->board_name = this_board->pc_DriverName;
+
+        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
+        if (!devpriv)
+                return -ENOMEM;
+        dev->private = devpriv;
+
+        ret = comedi_pci_enable(pcidev, dev->board_name);
+        if (ret)
+                return ret;
+
+        if (this_board->i_IorangeBase1)
+                dev->iobase = pci_resource_start(pcidev, 1);
+        else
+                dev->iobase = pci_resource_start(pcidev, 0);
+
+        devpriv->iobase = dev->iobase;
+        devpriv->i_IobaseAmcc = pci_resource_start(pcidev, 0);
+        devpriv->i_IobaseAddon = pci_resource_start(pcidev, 2);
+        devpriv->i_IobaseReserved = pci_resource_start(pcidev, 3);
+
+        if (pcidev->irq > 0) {
+                ret = request_irq(pcidev->irq, v_ADDI_Interrupt, IRQF_SHARED,
+                                  dev->board_name, dev);
+                if (ret == 0)
+                        dev->irq = pcidev->irq;
+        }
+
+        i_ADDI_AttachPCI1710(dev);
+
+        devpriv->s_BoardInfos.ui_Address = pci_resource_start(pcidev, 2);
+
+        i_APCI1710_Reset(dev);
+        return 0;
+}
+
+static void apci1710_detach(struct comedi_device *dev)
+{
+        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
+
+        if (dev->iobase)
+                i_APCI1710_Reset(dev);
+        if (dev->irq)
+                free_irq(dev->irq, dev);
+        if (pcidev) {
+                if (dev->iobase)
+                        comedi_pci_disable(pcidev);
+        }
+}
+
+static struct comedi_driver apci1710_driver = {
+        .driver_name    = "addi_apci_1710",
+        .module         = THIS_MODULE,
+        .auto_attach    = apci1710_auto_attach,
+        .detach         = apci1710_detach,
+};
+
+static int apci1710_pci_probe(struct pci_dev *dev,
+                                        const struct pci_device_id *ent)
+{
+        return comedi_pci_auto_config(dev, &apci1710_driver);
+}
+
+static void apci1710_pci_remove(struct pci_dev *dev)
+{
+        comedi_pci_auto_unconfig(dev);
+}
+
+static DEFINE_PCI_DEVICE_TABLE(apci1710_pci_table) = {
+        { PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA_OLD, APCI1710_BOARD_DEVICE_ID) },
+        { 0 }
+};
+MODULE_DEVICE_TABLE(pci, apci1710_pci_table);
+
+static struct pci_driver apci1710_pci_driver = {
+        .name           = "addi_apci_1710",
+        .id_table       = apci1710_pci_table,
+        .probe          = apci1710_pci_probe,
+        .remove         = apci1710_pci_remove,
+};
+module_comedi_pci_driver(apci1710_driver, apci1710_pci_driver);
+
+MODULE_AUTHOR("Comedi http://www.comedi.org");
+MODULE_DESCRIPTION("Comedi low-level driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/staging/comedi/drivers/addi_apci_2016.c b/drivers/staging/comedi/drivers/addi_apci_2016.c
deleted file mode 100644
index fa50c7bb7ade..000000000000
--- a/drivers/staging/comedi/drivers/addi_apci_2016.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#define CONFIG_APCI_2016 1
-
-#define ADDIDATA_DRIVER_NAME    "addi_apci_2016"
-
-#include "addi-data/addi_common.c"
-
-MODULE_AUTHOR("Comedi http://www.comedi.org");
-MODULE_DESCRIPTION("Comedi low-level driver");
-MODULE_LICENSE("GPL");
diff --git a/drivers/staging/comedi/drivers/addi_apci_2032.c b/drivers/staging/comedi/drivers/addi_apci_2032.c
index 073a8a56dbe4..8f8d3e95fc78 100644
--- a/drivers/staging/comedi/drivers/addi_apci_2032.c
+++ b/drivers/staging/comedi/drivers/addi_apci_2032.c
@@ -1,8 +1,383 @@
-#define CONFIG_APCI_2032 1
+/*
+ * addi_apci_2032.c
+ * Copyright (C) 2004,2005  ADDI-DATA GmbH for the source code of this module.
+ * Project manager: Eric Stolz
+ *
+ *      ADDI-DATA GmbH
+ *      Dieselstrasse 3
+ *      D-77833 Ottersweier
+ *      Tel: +19(0)7223/9493-0
+ *      Fax: +49(0)7223/9493-92
+ *      http://www.addi-data.com
+ *      info@addi-data.com
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * 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
+ *
+ * You should also find the complete GPL in the COPYING file accompanying
+ * this source code.
+ */
 
-#define ADDIDATA_DRIVER_NAME    "addi_apci_2032"
+#include "../comedidev.h"
+#include "comedi_fc.h"
 
-#include "addi-data/addi_common.c"
+/*
+ * PCI bar 1 I/O Register map
+ */
+#define APCI2032_DO_REG                 0x00
+#define APCI2032_INT_CTRL_REG           0x04
+#define APCI2032_INT_CTRL_VCC_ENA       (1 << 0)
+#define APCI2032_INT_CTRL_CC_ENA        (1 << 1)
+#define APCI2032_INT_STATUS_REG         0x08
+#define APCI2032_INT_STATUS_VCC         (1 << 0)
+#define APCI2032_INT_STATUS_CC          (1 << 1)
+#define APCI2032_STATUS_REG             0x0c
+#define APCI2032_STATUS_IRQ             (1 << 0)
+#define APCI2032_WDOG_REG               0x10
+#define APCI2032_WDOG_RELOAD_REG        0x14
+#define APCI2032_WDOG_TIMEBASE          0x18
+#define APCI2032_WDOG_CTRL_REG          0x1c
+#define APCI2032_WDOG_CTRL_ENABLE       (1 << 0)
+#define APCI2032_WDOG_CTRL_SW_TRIG      (1 << 9)
+#define APCI2032_WDOG_STATUS_REG        0x20
+#define APCI2032_WDOG_STATUS_ENABLED    (1 << 0)
+#define APCI2032_WDOG_STATUS_SW_TRIG    (1 << 1)
+
+struct apci2032_private {
+        unsigned int wdog_ctrl;
+};
+
+static int apci2032_do_insn_bits(struct comedi_device *dev,
+                                 struct comedi_subdevice *s,
+                                 struct comedi_insn *insn,
+                                 unsigned int *data)
+{
+        unsigned int mask = data[0];
+        unsigned int bits = data[1];
+
+        s->state = inl(dev->iobase + APCI2032_DO_REG);
+        if (mask) {
+                s->state &= ~mask;
+                s->state |= (bits & mask);
+
+                outl(s->state, dev->iobase + APCI2032_DO_REG);
+        }
+
+        data[1] = s->state;
+
+        return insn->n;
+}
+
+/*
+ * The watchdog subdevice is configured with two INSN_CONFIG instructions:
+ *
+ * Enable the watchdog and set the reload timeout:
+ *      data[0] = INSN_CONFIG_ARM
+ *      data[1] = timeout reload value
+ *
+ * Disable the watchdog:
+ *      data[0] = INSN_CONFIG_DISARM
+ */
+static int apci2032_wdog_insn_config(struct comedi_device *dev,
+                                     struct comedi_subdevice *s,
+                                     struct comedi_insn *insn,
+                                     unsigned int *data)
+{
+        struct apci2032_private *devpriv = dev->private;
+        unsigned int reload;
+
+        switch (data[0]) {
+        case INSN_CONFIG_ARM:
+                devpriv->wdog_ctrl = APCI2032_WDOG_CTRL_ENABLE;
+                reload = data[1] & s->maxdata;
+                outw(reload, dev->iobase + APCI2032_WDOG_RELOAD_REG);
+
+                /* Time base is 20ms, let the user know the timeout */
+                dev_info(dev->class_dev, "watchdog enabled, timeout:%dms\n",
+                        20 * reload + 20);
+                break;
+        case INSN_CONFIG_DISARM:
+                devpriv->wdog_ctrl = 0;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        outw(devpriv->wdog_ctrl, dev->iobase + APCI2032_WDOG_CTRL_REG);
+
+        return insn->n;
+}
+
+static int apci2032_wdog_insn_write(struct comedi_device *dev,
+                                    struct comedi_subdevice *s,
+                                    struct comedi_insn *insn,
+                                    unsigned int *data)
+{
+        struct apci2032_private *devpriv = dev->private;
+        int i;
+
+        if (devpriv->wdog_ctrl == 0) {
+                dev_warn(dev->class_dev, "watchdog is disabled\n");
+                return -EINVAL;
+        }
+
+        /* "ping" the watchdog */
+        for (i = 0; i < insn->n; i++) {
+                outw(devpriv->wdog_ctrl | APCI2032_WDOG_CTRL_SW_TRIG,
+                        dev->iobase + APCI2032_WDOG_CTRL_REG);
+        }
+
+        return insn->n;
+}
+
+static int apci2032_wdog_insn_read(struct comedi_device *dev,
+                                   struct comedi_subdevice *s,
+                                   struct comedi_insn *insn,
+                                   unsigned int *data)
+{
+        int i;
+
+        for (i = 0; i < insn->n; i++)
+                data[i] = inl(dev->iobase + APCI2032_WDOG_STATUS_REG);
+
+        return insn->n;
+}
+
+static int apci2032_int_insn_bits(struct comedi_device *dev,
+                                  struct comedi_subdevice *s,
+                                  struct comedi_insn *insn,
+                                  unsigned int *data)
+{
+        data[1] = s->state;
+        return insn->n;
+}
+
+static int apci2032_int_cmdtest(struct comedi_device *dev,
+                                struct comedi_subdevice *s,
+                                struct comedi_cmd *cmd)
+{
+        int err = 0;
+
+        /* Step 1 : check if triggers are trivially valid */
+
+        err |= cfc_check_trigger_src(&cmd->start_src, TRIG_NOW);
+        err |= cfc_check_trigger_src(&cmd->scan_begin_src, TRIG_OTHER);
+        err |= cfc_check_trigger_src(&cmd->convert_src, TRIG_FOLLOW);
+        err |= cfc_check_trigger_src(&cmd->scan_end_src, TRIG_COUNT);
+        err |= cfc_check_trigger_src(&cmd->stop_src, TRIG_NONE);
+
+        if (err)
+                return 1;
+
+        /* Step 2a : make sure trigger sources are unique */
+        /* Step 2b : and mutually compatible */
+
+        if (err)
+                return 2;
+
+        /* Step 3: check if arguments are trivially valid */
+
+        err |= cfc_check_trigger_arg_is(&cmd->start_arg, 0);
+
+        /*
+         * 0 == no trigger
+         * 1 == trigger on VCC interrupt
+         * 2 == trigger on CC interrupt
+         * 3 == trigger on either VCC or CC interrupt
+         */
+        err |= cfc_check_trigger_arg_max(&cmd->scan_begin_arg, 3);
+
+        err |= cfc_check_trigger_arg_is(&cmd->convert_arg, 0);
+        err |= cfc_check_trigger_arg_is(&cmd->scan_end_arg, 1);
+        err |= cfc_check_trigger_arg_is(&cmd->stop_arg, 0);
+
+        if (err)
+                return 3;
+
+        /* step 4: ignored */
+
+        if (err)
+                return 4;
+
+        return 0;
+}
+
+static int apci2032_int_cmd(struct comedi_device *dev,
+                            struct comedi_subdevice *s)
+{
+        struct comedi_cmd *cmd = &s->async->cmd;
+
+        outl(cmd->scan_begin_arg, dev->iobase + APCI2032_INT_CTRL_REG);
+
+        return 0;
+}
+
+static int apci2032_int_cancel(struct comedi_device *dev,
+                               struct comedi_subdevice *s)
+{
+        outl(0x0, dev->iobase + APCI2032_INT_CTRL_REG);
+
+        return 0;
+}
+
+static irqreturn_t apci2032_interrupt(int irq, void *d)
+{
+        struct comedi_device *dev = d;
+        struct comedi_subdevice *s = dev->read_subdev;
+        unsigned int val;
+
+        /* Check if VCC OR CC interrupt has occurred */
+        val = inl(dev->iobase + APCI2032_STATUS_REG) & APCI2032_STATUS_IRQ;
+        if (!val)
+                return IRQ_NONE;
+
+        s->state = inl(dev->iobase + APCI2032_INT_STATUS_REG);
+        outl(0x0, dev->iobase + APCI2032_INT_CTRL_REG);
+
+        comedi_buf_put(s->async, s->state);
+        s->async->events |= COMEDI_CB_BLOCK | COMEDI_CB_EOS;
+        comedi_event(dev, s);
+
+        return IRQ_HANDLED;
+}
+
+static int apci2032_reset(struct comedi_device *dev)
+{
+        outl(0x0, dev->iobase + APCI2032_DO_REG);
+        outl(0x0, dev->iobase + APCI2032_INT_CTRL_REG);
+        outl(0x0, dev->iobase + APCI2032_WDOG_CTRL_REG);
+        outl(0x0, dev->iobase + APCI2032_WDOG_RELOAD_REG);
+
+        return 0;
+}
+
+static int apci2032_auto_attach(struct comedi_device *dev,
+                                unsigned long context_unused)
+{
+        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
+        struct apci2032_private *devpriv;
+        struct comedi_subdevice *s;
+        int ret;
+
+        dev->board_name = dev->driver->driver_name;
+
+        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
+        if (!devpriv)
+                return -ENOMEM;
+        dev->private = devpriv;
+
+        ret = comedi_pci_enable(pcidev, dev->board_name);
+        if (ret)
+                return ret;
+        dev->iobase = pci_resource_start(pcidev, 1);
+
+        if (pcidev->irq > 0) {
+                ret = request_irq(pcidev->irq, apci2032_interrupt,
+                                  IRQF_SHARED, dev->board_name, dev);
+                if (ret == 0)
+                        dev->irq = pcidev->irq;
+        }
+
+        ret = comedi_alloc_subdevices(dev, 3);
+        if (ret)
+                return ret;
+
+        /* Initialize the digital output subdevice */
+        s = &dev->subdevices[0];
+        s->type         = COMEDI_SUBD_DO;
+        s->subdev_flags = SDF_WRITEABLE;
+        s->n_chan       = 32;
+        s->maxdata      = 1;
+        s->range_table  = &range_digital;
+        s->insn_bits    = apci2032_do_insn_bits;
+
+        /* Initialize the watchdog subdevice */
+        s = &dev->subdevices[1];
+        s->type         = COMEDI_SUBD_TIMER;
+        s->subdev_flags = SDF_WRITEABLE;
+        s->n_chan       = 1;
+        s->maxdata      = 0xff;
+        s->insn_write   = apci2032_wdog_insn_write;
+        s->insn_read    = apci2032_wdog_insn_read;
+        s->insn_config  = apci2032_wdog_insn_config;
+
+        /* Initialize the interrupt subdevice */
+        s = &dev->subdevices[2];
+        if (dev->irq) {
+                dev->read_subdev = s;
+                s->type         = COMEDI_SUBD_DI | SDF_CMD_READ;
+                s->subdev_flags = SDF_READABLE;
+                s->n_chan       = 1;
+                s->maxdata      = 1;
+                s->range_table  = &range_digital;
+                s->insn_bits    = apci2032_int_insn_bits;
+                s->do_cmdtest   = apci2032_int_cmdtest;
+                s->do_cmd       = apci2032_int_cmd;
+                s->cancel       = apci2032_int_cancel;
+        } else {
+                s->type         = COMEDI_SUBD_UNUSED;
+        }
+
+        apci2032_reset(dev);
+        return 0;
+}
+
+static void apci2032_detach(struct comedi_device *dev)
+{
+        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
+
+        if (dev->iobase)
+                apci2032_reset(dev);
+        if (dev->irq)
+                free_irq(dev->irq, dev);
+        if (pcidev) {
+                if (dev->iobase)
+                        comedi_pci_disable(pcidev);
+        }
+}
+
+static struct comedi_driver apci2032_driver = {
+        .driver_name    = "addi_apci_2032",
+        .module         = THIS_MODULE,
+        .auto_attach    = apci2032_auto_attach,
+        .detach         = apci2032_detach,
+};
+
+static int apci2032_pci_probe(struct pci_dev *dev,
+                                        const struct pci_device_id *ent)
+{
+        return comedi_pci_auto_config(dev, &apci2032_driver);
+}
+
+static void apci2032_pci_remove(struct pci_dev *dev)
+{
+        comedi_pci_auto_unconfig(dev);
+}
+
+static DEFINE_PCI_DEVICE_TABLE(apci2032_pci_table) = {
+        { PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x1004) },
+        { 0 }
+};
+MODULE_DEVICE_TABLE(pci, apci2032_pci_table);
+
+static struct pci_driver apci2032_pci_driver = {
+        .name           = "addi_apci_2032",
+        .id_table       = apci2032_pci_table,
+        .probe          = apci2032_pci_probe,
+        .remove         = apci2032_pci_remove,
+};
+module_comedi_pci_driver(apci2032_driver, apci2032_pci_driver);
 
 MODULE_AUTHOR("Comedi http://www.comedi.org");
 MODULE_DESCRIPTION("Comedi low-level driver");
diff --git a/drivers/staging/comedi/drivers/addi_apci_2200.c b/drivers/staging/comedi/drivers/addi_apci_2200.c
index adfbb5d410ef..7c2c5db01218 100644
--- a/drivers/staging/comedi/drivers/addi_apci_2200.c
+++ b/drivers/staging/comedi/drivers/addi_apci_2200.c
@@ -1,9 +1,69 @@
-#define CONFIG_APCI_2200 1
+#include "../comedidev.h"
+#include "comedi_fc.h"
+#include "amcc_s5933.h"
 
-#define ADDIDATA_DRIVER_NAME    "addi_apci_2200"
+#include "addi-data/addi_common.h"
 
+#include "addi-data/addi_eeprom.c"
+#include "addi-data/hwdrv_apci2200.c"
 #include "addi-data/addi_common.c"
 
+static const struct addi_board apci2200_boardtypes[] = {
+        {
+                .pc_DriverName          = "apci2200",
+                .i_VendorId             = PCI_VENDOR_ID_ADDIDATA,
+                .i_DeviceId             = 0x1005,
+                .i_IorangeBase0         = 4,
+                .i_IorangeBase1         = APCI2200_ADDRESS_RANGE,
+                .i_PCIEeprom            = ADDIDATA_EEPROM,
+                .pc_EepromChip          = ADDIDATA_93C76,
+                .i_NbrDiChannel         = 8,
+                .i_NbrDoChannel         = 16,
+                .i_Timer                = 1,
+                .reset                  = i_APCI2200_Reset,
+                .di_bits                = apci2200_di_insn_bits,
+                .do_bits                = apci2200_do_insn_bits,
+                .timer_config           = i_APCI2200_ConfigWatchdog,
+                .timer_write            = i_APCI2200_StartStopWriteWatchdog,
+                .timer_read             = i_APCI2200_ReadWatchdog,
+        },
+};
+
+static struct comedi_driver apci2200_driver = {
+        .driver_name    = "addi_apci_2200",
+        .module         = THIS_MODULE,
+        .auto_attach    = addi_auto_attach,
+        .detach         = i_ADDI_Detach,
+        .num_names      = ARRAY_SIZE(apci2200_boardtypes),
+        .board_name     = &apci2200_boardtypes[0].pc_DriverName,
+        .offset         = sizeof(struct addi_board),
+};
+
+static int apci2200_pci_probe(struct pci_dev *dev,
+                                        const struct pci_device_id *ent)
+{
+        return comedi_pci_auto_config(dev, &apci2200_driver);
+}
+
+static void apci2200_pci_remove(struct pci_dev *dev)
+{
+        comedi_pci_auto_unconfig(dev);
+}
+
+static DEFINE_PCI_DEVICE_TABLE(apci2200_pci_table) = {
+        { PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x1005) },
+        { 0 }
+};
+MODULE_DEVICE_TABLE(pci, apci2200_pci_table);
+
+static struct pci_driver apci2200_pci_driver = {
+        .name           = "addi_apci_2200",
+        .id_table       = apci2200_pci_table,
+        .probe          = apci2200_pci_probe,
+        .remove         = apci2200_pci_remove,
+};
+module_comedi_pci_driver(apci2200_driver, apci2200_pci_driver);
+
 MODULE_AUTHOR("Comedi http://www.comedi.org");
 MODULE_DESCRIPTION("Comedi low-level driver");
 MODULE_LICENSE("GPL");
diff --git a/drivers/staging/comedi/drivers/addi_apci_3001.c b/drivers/staging/comedi/drivers/addi_apci_3001.c
deleted file mode 100644
index 00ac762965c1..000000000000
--- a/drivers/staging/comedi/drivers/addi_apci_3001.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#define CONFIG_APCI_3001 1
-
-#define ADDIDATA_DRIVER_NAME    "addi_apci_3001"
-
-#include "addi-data/addi_common.c"
-
-MODULE_AUTHOR("Comedi http://www.comedi.org");
-MODULE_DESCRIPTION("Comedi low-level driver");
-MODULE_LICENSE("GPL");
diff --git a/drivers/staging/comedi/drivers/addi_apci_3120.c b/drivers/staging/comedi/drivers/addi_apci_3120.c
index c35515845cf3..fec2962affc7 100644
--- a/drivers/staging/comedi/drivers/addi_apci_3120.c
+++ b/drivers/staging/comedi/drivers/addi_apci_3120.c
@@ -1,8 +1,275 @@
-#define CONFIG_APCI_3120 1
+#include "../comedidev.h"
+#include "comedi_fc.h"
+#include "amcc_s5933.h"
 
-#define ADDIDATA_DRIVER_NAME    "addi_apci_3120"
+#include "addi-data/addi_common.h"
 
-#include "addi-data/addi_common.c"
+#include "addi-data/hwdrv_apci3120.c"
+
+static const struct addi_board apci3120_boardtypes[] = {
+        {
+                .pc_DriverName          = "apci3120",
+                .i_VendorId             = PCI_VENDOR_ID_ADDIDATA_OLD,
+                .i_DeviceId             = 0x818D,
+                .i_NbrAiChannel         = 16,
+                .i_NbrAiChannelDiff     = 8,
+                .i_AiChannelList        = 16,
+                .i_NbrAoChannel         = 8,
+                .i_AiMaxdata            = 0xffff,
+                .i_AoMaxdata            = 0x3fff,
+                .i_NbrDiChannel         = 4,
+                .i_NbrDoChannel         = 4,
+                .i_DoMaxdata            = 0x0f,
+                .interrupt              = v_APCI3120_Interrupt,
+        }, {
+                .pc_DriverName          = "apci3001",
+                .i_VendorId             = PCI_VENDOR_ID_ADDIDATA_OLD,
+                .i_DeviceId             = 0x828D,
+                .i_NbrAiChannel         = 16,
+                .i_NbrAiChannelDiff     = 8,
+                .i_AiChannelList        = 16,
+                .i_AiMaxdata            = 0xfff,
+                .i_NbrDiChannel         = 4,
+                .i_NbrDoChannel         = 4,
+                .i_DoMaxdata            = 0x0f,
+                .interrupt              = v_APCI3120_Interrupt,
+        },
+};
+
+static irqreturn_t v_ADDI_Interrupt(int irq, void *d)
+{
+        struct comedi_device *dev = d;
+        const struct addi_board *this_board = comedi_board(dev);
+
+        this_board->interrupt(irq, d);
+        return IRQ_RETVAL(1);
+}
+
+static const void *apci3120_find_boardinfo(struct comedi_device *dev,
+                                           struct pci_dev *pcidev)
+{
+        const struct addi_board *this_board;
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(apci3120_boardtypes); i++) {
+                this_board = &apci3120_boardtypes[i];
+                if (this_board->i_VendorId == pcidev->vendor &&
+                    this_board->i_DeviceId == pcidev->device)
+                        return this_board;
+        }
+        return NULL;
+}
+
+static int apci3120_auto_attach(struct comedi_device *dev,
+                                          unsigned long context_unused)
+{
+        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
+        const struct addi_board *this_board;
+        struct addi_private *devpriv;
+        struct comedi_subdevice *s;
+        int ret, pages, i;
+
+        this_board = apci3120_find_boardinfo(dev, pcidev);
+        if (!this_board)
+                return -ENODEV;
+        dev->board_ptr = this_board;
+        dev->board_name = this_board->pc_DriverName;
+
+        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
+        if (!devpriv)
+                return -ENOMEM;
+        dev->private = devpriv;
+
+        ret = comedi_pci_enable(pcidev, dev->board_name);
+        if (ret)
+                return ret;
+        pci_set_master(pcidev);
+
+        dev->iobase = pci_resource_start(pcidev, 1);
+        devpriv->iobase = dev->iobase;
+        devpriv->i_IobaseAmcc = pci_resource_start(pcidev, 0);
+        devpriv->i_IobaseAddon = pci_resource_start(pcidev, 2);
+        devpriv->i_IobaseReserved = pci_resource_start(pcidev, 3);
+
+        if (pcidev->irq > 0) {
+                ret = request_irq(pcidev->irq, v_ADDI_Interrupt, IRQF_SHARED,
+                                  dev->board_name, dev);
+                if (ret == 0)
+                        dev->irq = pcidev->irq;
+        }
+
+        devpriv->us_UseDma = ADDI_ENABLE;
+
+        /* Allocate DMA buffers */
+        devpriv->b_DmaDoubleBuffer = 0;
+        for (i = 0; i < 2; i++) {
+                for (pages = 4; pages >= 0; pages--) {
+                        devpriv->ul_DmaBufferVirtual[i] =
+                                (void *) __get_free_pages(GFP_KERNEL, pages);
+
+                        if (devpriv->ul_DmaBufferVirtual[i])
+                                break;
+                }
+                if (devpriv->ul_DmaBufferVirtual[i]) {
+                        devpriv->ui_DmaBufferPages[i] = pages;
+                        devpriv->ui_DmaBufferSize[i] = PAGE_SIZE * pages;
+                        devpriv->ui_DmaBufferSamples[i] =
+                                devpriv->ui_DmaBufferSize[i] >> 1;
+                        devpriv->ul_DmaBufferHw[i] =
+                                virt_to_bus((void *)devpriv->
+                                ul_DmaBufferVirtual[i]);
+                }
+        }
+        if (!devpriv->ul_DmaBufferVirtual[0])
+                devpriv->us_UseDma = ADDI_DISABLE;
+
+        if (devpriv->ul_DmaBufferVirtual[1])
+                devpriv->b_DmaDoubleBuffer = 1;
+
+        ret = comedi_alloc_subdevices(dev, 5);
+        if (ret)
+                return ret;
+
+        /*  Allocate and Initialise AI Subdevice Structures */
+        s = &dev->subdevices[0];
+        dev->read_subdev = s;
+        s->type = COMEDI_SUBD_AI;
+        s->subdev_flags =
+                SDF_READABLE | SDF_COMMON | SDF_GROUND
+                | SDF_DIFF;
+        if (this_board->i_NbrAiChannel) {
+                s->n_chan = this_board->i_NbrAiChannel;
+                devpriv->b_SingelDiff = 0;
+        } else {
+                s->n_chan = this_board->i_NbrAiChannelDiff;
+                devpriv->b_SingelDiff = 1;
+        }
+        s->maxdata = this_board->i_AiMaxdata;
+        s->len_chanlist = this_board->i_AiChannelList;
+        s->range_table = &range_apci3120_ai;
+
+        /* Set the initialisation flag */
+        devpriv->b_AiInitialisation = 1;
+
+        s->insn_config = i_APCI3120_InsnConfigAnalogInput;
+        s->insn_read = i_APCI3120_InsnReadAnalogInput;
+        s->do_cmdtest = i_APCI3120_CommandTestAnalogInput;
+        s->do_cmd = i_APCI3120_CommandAnalogInput;
+        s->cancel = i_APCI3120_StopCyclicAcquisition;
+
+        /*  Allocate and Initialise AO Subdevice Structures */
+        s = &dev->subdevices[1];
+        if (this_board->i_NbrAoChannel) {
+                s->type = COMEDI_SUBD_AO;
+                s->subdev_flags = SDF_WRITEABLE | SDF_GROUND | SDF_COMMON;
+                s->n_chan = this_board->i_NbrAoChannel;
+                s->maxdata = this_board->i_AoMaxdata;
+                s->len_chanlist = this_board->i_NbrAoChannel;
+                s->range_table = &range_apci3120_ao;
+                s->insn_write = i_APCI3120_InsnWriteAnalogOutput;
+        } else {
+                s->type = COMEDI_SUBD_UNUSED;
+        }
+
+        /*  Allocate and Initialise DI Subdevice Structures */
+        s = &dev->subdevices[2];
+        s->type = COMEDI_SUBD_DI;
+        s->subdev_flags = SDF_READABLE | SDF_GROUND | SDF_COMMON;
+        s->n_chan = this_board->i_NbrDiChannel;
+        s->maxdata = 1;
+        s->len_chanlist = this_board->i_NbrDiChannel;
+        s->range_table = &range_digital;
+        s->io_bits = 0; /* all bits input */
+        s->insn_bits = apci3120_di_insn_bits;
+
+        /*  Allocate and Initialise DO Subdevice Structures */
+        s = &dev->subdevices[3];
+        s->type = COMEDI_SUBD_DO;
+        s->subdev_flags =
+                SDF_READABLE | SDF_WRITEABLE | SDF_GROUND | SDF_COMMON;
+        s->n_chan = this_board->i_NbrDoChannel;
+        s->maxdata = this_board->i_DoMaxdata;
+        s->len_chanlist = this_board->i_NbrDoChannel;
+        s->range_table = &range_digital;
+        s->io_bits = 0xf;       /* all bits output */
+        s->insn_bits = apci3120_do_insn_bits;
+
+        /*  Allocate and Initialise Timer Subdevice Structures */
+        s = &dev->subdevices[4];
+        s->type = COMEDI_SUBD_TIMER;
+        s->subdev_flags = SDF_WRITEABLE | SDF_GROUND | SDF_COMMON;
+        s->n_chan = 1;
+        s->maxdata = 0;
+        s->len_chanlist = 1;
+        s->range_table = &range_digital;
+
+        s->insn_write = i_APCI3120_InsnWriteTimer;
+        s->insn_read = i_APCI3120_InsnReadTimer;
+        s->insn_config = i_APCI3120_InsnConfigTimer;
+
+        i_APCI3120_Reset(dev);
+        return 0;
+}
+
+static void apci3120_detach(struct comedi_device *dev)
+{
+        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
+        struct addi_private *devpriv = dev->private;
+
+        if (devpriv) {
+                if (dev->iobase)
+                        i_APCI3120_Reset(dev);
+                if (dev->irq)
+                        free_irq(dev->irq, dev);
+                if (devpriv->ul_DmaBufferVirtual[0]) {
+                        free_pages((unsigned long)devpriv->
+                                ul_DmaBufferVirtual[0],
+                                devpriv->ui_DmaBufferPages[0]);
+                }
+                if (devpriv->ul_DmaBufferVirtual[1]) {
+                        free_pages((unsigned long)devpriv->
+                                ul_DmaBufferVirtual[1],
+                                devpriv->ui_DmaBufferPages[1]);
+                }
+        }
+        if (pcidev) {
+                if (dev->iobase)
+                        comedi_pci_disable(pcidev);
+        }
+}
+
+static struct comedi_driver apci3120_driver = {
+        .driver_name    = "addi_apci_3120",
+        .module         = THIS_MODULE,
+        .auto_attach    = apci3120_auto_attach,
+        .detach         = apci3120_detach,
+};
+
+static int apci3120_pci_probe(struct pci_dev *dev,
+                                        const struct pci_device_id *ent)
+{
+        return comedi_pci_auto_config(dev, &apci3120_driver);
+}
+
+static void apci3120_pci_remove(struct pci_dev *dev)
+{
+        comedi_pci_auto_unconfig(dev);
+}
+
+static DEFINE_PCI_DEVICE_TABLE(apci3120_pci_table) = {
+        { PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA_OLD, 0x818d) },
+        { PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA_OLD, 0x828d) },
+        { 0 }
+};
+MODULE_DEVICE_TABLE(pci, apci3120_pci_table);
+
+static struct pci_driver apci3120_pci_driver = {
+        .name           = "addi_apci_3120",
+        .id_table       = apci3120_pci_table,
+        .probe          = apci3120_pci_probe,
+        .remove         = apci3120_pci_remove,
+};
+module_comedi_pci_driver(apci3120_driver, apci3120_pci_driver);
 
 MODULE_AUTHOR("Comedi http://www.comedi.org");
 MODULE_DESCRIPTION("Comedi low-level driver");
diff --git a/drivers/staging/comedi/drivers/addi_apci_3200.c b/drivers/staging/comedi/drivers/addi_apci_3200.c
index 159313997dcf..9085b774b48d 100644
--- a/drivers/staging/comedi/drivers/addi_apci_3200.c
+++ b/drivers/staging/comedi/drivers/addi_apci_3200.c
@@ -1,5 +1,120 @@
-#define CONFIG_APCI_3200 1
+#include <asm/i387.h>
 
-#define ADDIDATA_DRIVER_NAME    "addi_apci_3200"
+#include "../comedidev.h"
+#include "comedi_fc.h"
+#include "amcc_s5933.h"
 
+#include "addi-data/addi_common.h"
+
+static void fpu_begin(void)
+{
+        kernel_fpu_begin();
+}
+
+static void fpu_end(void)
+{
+        kernel_fpu_end();
+}
+
+#include "addi-data/addi_eeprom.c"
+#include "addi-data/hwdrv_apci3200.c"
 #include "addi-data/addi_common.c"
+
+static const struct addi_board apci3200_boardtypes[] = {
+        {
+                .pc_DriverName          = "apci3200",
+                .i_VendorId             = PCI_VENDOR_ID_ADDIDATA,
+                .i_DeviceId             = 0x3000,
+                .i_IorangeBase0         = 128,
+                .i_IorangeBase1         = 256,
+                .i_IorangeBase2         = 4,
+                .i_IorangeBase3         = 4,
+                .i_PCIEeprom            = ADDIDATA_EEPROM,
+                .pc_EepromChip          = ADDIDATA_S5920,
+                .i_NbrAiChannel         = 16,
+                .i_NbrAiChannelDiff     = 8,
+                .i_AiChannelList        = 16,
+                .i_AiMaxdata            = 0x3ffff,
+                .pr_AiRangelist         = &range_apci3200_ai,
+                .i_NbrDiChannel         = 4,
+                .i_NbrDoChannel         = 4,
+                .ui_MinAcquisitiontimeNs = 10000,
+                .ui_MinDelaytimeNs      = 100000,
+                .interrupt              = v_APCI3200_Interrupt,
+                .reset                  = i_APCI3200_Reset,
+                .ai_config              = i_APCI3200_ConfigAnalogInput,
+                .ai_read                = i_APCI3200_ReadAnalogInput,
+                .ai_write               = i_APCI3200_InsnWriteReleaseAnalogInput,
+                .ai_bits                = i_APCI3200_InsnBits_AnalogInput_Test,
+                .ai_cmdtest             = i_APCI3200_CommandTestAnalogInput,
+                .ai_cmd                 = i_APCI3200_CommandAnalogInput,
+                .ai_cancel              = i_APCI3200_StopCyclicAcquisition,
+                .di_bits                = apci3200_di_insn_bits,
+                .do_bits                = apci3200_do_insn_bits,
+        }, {
+                .pc_DriverName          = "apci3300",
+                .i_VendorId             = PCI_VENDOR_ID_ADDIDATA,
+                .i_DeviceId             = 0x3007,
+                .i_IorangeBase0         = 128,
+                .i_IorangeBase1         = 256,
+                .i_IorangeBase2         = 4,
+                .i_IorangeBase3         = 4,
+                .i_PCIEeprom            = ADDIDATA_EEPROM,
+                .pc_EepromChip          = ADDIDATA_S5920,
+                .i_NbrAiChannelDiff     = 8,
+                .i_AiChannelList        = 8,
+                .i_AiMaxdata            = 0x3ffff,
+                .pr_AiRangelist         = &range_apci3300_ai,
+                .i_NbrDiChannel         = 4,
+                .i_NbrDoChannel         = 4,
+                .ui_MinAcquisitiontimeNs = 10000,
+                .ui_MinDelaytimeNs      = 100000,
+                .interrupt              = v_APCI3200_Interrupt,
+                .reset                  = i_APCI3200_Reset,
+                .ai_config              = i_APCI3200_ConfigAnalogInput,
+                .ai_read                = i_APCI3200_ReadAnalogInput,
+                .ai_write               = i_APCI3200_InsnWriteReleaseAnalogInput,
+                .ai_bits                = i_APCI3200_InsnBits_AnalogInput_Test,
+                .ai_cmdtest             = i_APCI3200_CommandTestAnalogInput,
+                .ai_cmd                 = i_APCI3200_CommandAnalogInput,
+                .ai_cancel              = i_APCI3200_StopCyclicAcquisition,
+                .di_bits                = apci3200_di_insn_bits,
+                .do_bits                = apci3200_do_insn_bits,
+        },
+};
+
+static DEFINE_PCI_DEVICE_TABLE(apci3200_pci_table) = {
+        { PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3000) },
+        { PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3007) },
+        { 0 }
+};
+MODULE_DEVICE_TABLE(pci, apci3200_pci_table);
+
+static struct comedi_driver apci3200_driver = {
+        .driver_name    = "addi_apci_3200",
+        .module         = THIS_MODULE,
+        .auto_attach    = addi_auto_attach,
+        .detach         = i_ADDI_Detach,
+        .num_names      = ARRAY_SIZE(apci3200_boardtypes),
+        .board_name     = &apci3200_boardtypes[0].pc_DriverName,
+        .offset         = sizeof(struct addi_board),
+};
+
+static int apci3200_pci_probe(struct pci_dev *dev,
+                                        const struct pci_device_id *ent)
+{
+        return comedi_pci_auto_config(dev, &apci3200_driver);
+}
+
+static void apci3200_pci_remove(struct pci_dev *dev)
+{
+        comedi_pci_auto_unconfig(dev);
+}
+
+static struct pci_driver apci3200_pci_driver = {
+        .name           = "addi_apci_3200",
+        .id_table       = apci3200_pci_table,
+        .probe          = apci3200_pci_probe,
+        .remove         = apci3200_pci_remove,
+};
+module_comedi_pci_driver(apci3200_driver, apci3200_pci_driver);
diff --git a/drivers/staging/comedi/drivers/addi_apci_3300.c b/drivers/staging/comedi/drivers/addi_apci_3300.c
deleted file mode 100644
index 733c69abc43a..000000000000
--- a/drivers/staging/comedi/drivers/addi_apci_3300.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#define CONFIG_APCI_3300 1
-
-#define ADDIDATA_DRIVER_NAME    "addi_apci_3300"
-
-#include "addi-data/addi_common.c"
diff --git a/drivers/staging/comedi/drivers/addi_apci_3501.c b/drivers/staging/comedi/drivers/addi_apci_3501.c
index dd2c1d3bc18b..ed297deb8634 100644
--- a/drivers/staging/comedi/drivers/addi_apci_3501.c
+++ b/drivers/staging/comedi/drivers/addi_apci_3501.c
@@ -1,9 +1,75 @@
-#define CONFIG_APCI_3501 1
+#include "../comedidev.h"
+#include "comedi_fc.h"
+#include "amcc_s5933.h"
 
-#define ADDIDATA_DRIVER_NAME    "addi_apci_3501"
+#include "addi-data/addi_common.h"
 
+#include "addi-data/addi_eeprom.c"
+#include "addi-data/hwdrv_apci3501.c"
 #include "addi-data/addi_common.c"
 
+static const struct addi_board apci3501_boardtypes[] = {
+        {
+                .pc_DriverName          = "apci3501",
+                .i_VendorId             = PCI_VENDOR_ID_ADDIDATA,
+                .i_DeviceId             = 0x3001,
+                .i_IorangeBase0         = 64,
+                .i_IorangeBase1         = APCI3501_ADDRESS_RANGE,
+                .i_PCIEeprom            = ADDIDATA_EEPROM,
+                .pc_EepromChip          = ADDIDATA_S5933,
+                .i_AoMaxdata            = 16383,
+                .pr_AoRangelist         = &range_apci3501_ao,
+                .i_NbrDiChannel         = 2,
+                .i_NbrDoChannel         = 2,
+                .i_DoMaxdata            = 0x3,
+                .i_Timer                = 1,
+                .interrupt              = v_APCI3501_Interrupt,
+                .reset                  = i_APCI3501_Reset,
+                .ao_config              = i_APCI3501_ConfigAnalogOutput,
+                .ao_write               = i_APCI3501_WriteAnalogOutput,
+                .di_bits                = apci3501_di_insn_bits,
+                .do_bits                = apci3501_do_insn_bits,
+                .timer_config           = i_APCI3501_ConfigTimerCounterWatchdog,
+                .timer_write            = i_APCI3501_StartStopWriteTimerCounterWatchdog,
+                .timer_read             = i_APCI3501_ReadTimerCounterWatchdog,
+        },
+};
+
+static DEFINE_PCI_DEVICE_TABLE(apci3501_pci_table) = {
+        { PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3001) },
+        { 0 }
+};
+MODULE_DEVICE_TABLE(pci, apci3501_pci_table);
+
+static struct comedi_driver apci3501_driver = {
+        .driver_name    = "addi_apci_3501",
+        .module         = THIS_MODULE,
+        .auto_attach    = addi_auto_attach,
+        .detach         = i_ADDI_Detach,
+        .num_names      = ARRAY_SIZE(apci3501_boardtypes),
+        .board_name     = &apci3501_boardtypes[0].pc_DriverName,
+        .offset         = sizeof(struct addi_board),
+};
+
+static int apci3501_pci_probe(struct pci_dev *dev,
+                                        const struct pci_device_id *ent)
+{
+        return comedi_pci_auto_config(dev, &apci3501_driver);
+}
+
+static void apci3501_pci_remove(struct pci_dev *dev)
+{
+        comedi_pci_auto_unconfig(dev);
+}
+
+static struct pci_driver apci3501_pci_driver = {
+        .name           = "addi_apci_3501",
+        .id_table       = apci3501_pci_table,
+        .probe          = apci3501_pci_probe,
+        .remove         = apci3501_pci_remove,
+};
+module_comedi_pci_driver(apci3501_driver, apci3501_pci_driver);
+
 MODULE_AUTHOR("Comedi http://www.comedi.org");
 MODULE_DESCRIPTION("Comedi low-level driver");
 MODULE_LICENSE("GPL");
diff --git a/drivers/staging/comedi/drivers/addi_apci_3xxx.c b/drivers/staging/comedi/drivers/addi_apci_3xxx.c
index 03161c88eac2..1562347ed64b 100644
--- a/drivers/staging/comedi/drivers/addi_apci_3xxx.c
+++ b/drivers/staging/comedi/drivers/addi_apci_3xxx.c
@@ -1,9 +1,799 @@
-#define CONFIG_APCI_3XXX 1
+#include "../comedidev.h"
+#include "comedi_fc.h"
+#include "amcc_s5933.h"
 
-#define ADDIDATA_DRIVER_NAME    "addi_apci_3xxx"
+#include "addi-data/addi_common.h"
 
+#include "addi-data/addi_eeprom.c"
+#include "addi-data/hwdrv_apci3xxx.c"
 #include "addi-data/addi_common.c"
 
+static const struct addi_board apci3xxx_boardtypes[] = {
+        {
+                .pc_DriverName          = "apci3000-16",
+                .i_VendorId             = PCI_VENDOR_ID_ADDIDATA,
+                .i_DeviceId             = 0x3010,
+                .i_IorangeBase0         = 256,
+                .i_IorangeBase1         = 256,
+                .i_IorangeBase2         = 256,
+                .i_IorangeBase3         = 256,
+                .i_PCIEeprom            = ADDIDATA_NO_EEPROM,
+                .pc_EepromChip          = ADDIDATA_9054,
+                .i_NbrAiChannel         = 16,
+                .i_NbrAiChannelDiff     = 8,
+                .i_AiChannelList        = 16,
+                .i_AiMaxdata            = 4095,
+                .pr_AiRangelist         = &range_apci3XXX_ai,
+                .i_NbrTTLChannel        = 24,
+                .b_AvailableConvertUnit = 6,
+                .ui_MinAcquisitiontimeNs = 10000,
+                .interrupt              = v_APCI3XXX_Interrupt,
+                .reset                  = i_APCI3XXX_Reset,
+                .ai_config              = i_APCI3XXX_InsnConfigAnalogInput,
+                .ai_read                = i_APCI3XXX_InsnReadAnalogInput,
+                .ttl_config             = i_APCI3XXX_InsnConfigInitTTLIO,
+                .ttl_bits               = i_APCI3XXX_InsnBitsTTLIO,
+                .ttl_read               = i_APCI3XXX_InsnReadTTLIO,
+                .ttl_write              = i_APCI3XXX_InsnWriteTTLIO,
+        }, {
+                .pc_DriverName          = "apci3000-8",
+                .i_VendorId             = PCI_VENDOR_ID_ADDIDATA,
+                .i_DeviceId             = 0x300F,
+                .i_IorangeBase0         = 256,
+                .i_IorangeBase1         = 256,
+                .i_IorangeBase2         = 256,
+                .i_IorangeBase3         = 256,
+                .i_PCIEeprom            = ADDIDATA_NO_EEPROM,
+                .pc_EepromChip          = ADDIDATA_9054,
+                .i_NbrAiChannel         = 8,
+                .i_NbrAiChannelDiff     = 4,
+                .i_AiChannelList        = 8,
+                .i_AiMaxdata            = 4095,
+                .pr_AiRangelist         = &range_apci3XXX_ai,
+                .i_NbrTTLChannel        = 24,
+                .b_AvailableConvertUnit = 6,
+                .ui_MinAcquisitiontimeNs = 10000,
+                .interrupt              = v_APCI3XXX_Interrupt,
+                .reset                  = i_APCI3XXX_Reset,
+                .ai_config              = i_APCI3XXX_InsnConfigAnalogInput,
+                .ai_read                = i_APCI3XXX_InsnReadAnalogInput,
+                .ttl_config             = i_APCI3XXX_InsnConfigInitTTLIO,
+                .ttl_bits               = i_APCI3XXX_InsnBitsTTLIO,
+                .ttl_read               = i_APCI3XXX_InsnReadTTLIO,
+                .ttl_write              = i_APCI3XXX_InsnWriteTTLIO,
+        }, {
+                .pc_DriverName          = "apci3000-4",
+                .i_VendorId             = PCI_VENDOR_ID_ADDIDATA,
+                .i_DeviceId             = 0x300E,
+                .i_IorangeBase0         = 256,
+                .i_IorangeBase1         = 256,
+                .i_IorangeBase2         = 256,
+                .i_IorangeBase3         = 256,
+                .i_PCIEeprom            = ADDIDATA_NO_EEPROM,
+                .pc_EepromChip          = ADDIDATA_9054,
+                .i_NbrAiChannel         = 4,
+                .i_NbrAiChannelDiff     = 2,
+                .i_AiChannelList        = 4,
+                .i_AiMaxdata            = 4095,
+                .pr_AiRangelist         = &range_apci3XXX_ai,
+                .i_NbrTTLChannel        = 24,
+                .b_AvailableConvertUnit = 6,
+                .ui_MinAcquisitiontimeNs = 10000,
+                .interrupt              = v_APCI3XXX_Interrupt,
+                .reset                  = i_APCI3XXX_Reset,
+                .ai_config              = i_APCI3XXX_InsnConfigAnalogInput,
+                .ai_read                = i_APCI3XXX_InsnReadAnalogInput,
+                .ttl_config             = i_APCI3XXX_InsnConfigInitTTLIO,
+                .ttl_bits               = i_APCI3XXX_InsnBitsTTLIO,
+                .ttl_read               = i_APCI3XXX_InsnReadTTLIO,
+                .ttl_write              = i_APCI3XXX_InsnWriteTTLIO,
+        }, {
+                .pc_DriverName          = "apci3006-16",
+                .i_VendorId             = PCI_VENDOR_ID_ADDIDATA,
+                .i_DeviceId             = 0x3013,
+                .i_IorangeBase0         = 256,
+                .i_IorangeBase1         = 256,
+                .i_IorangeBase2         = 256,
+                .i_IorangeBase3         = 256,
+                .i_PCIEeprom            = ADDIDATA_NO_EEPROM,
+                .pc_EepromChip          = ADDIDATA_9054,
+                .i_NbrAiChannel         = 16,
+                .i_NbrAiChannelDiff     = 8,
+                .i_AiChannelList        = 16,
+                .i_AiMaxdata            = 65535,
+                .pr_AiRangelist         = &range_apci3XXX_ai,
+                .i_NbrTTLChannel        = 24,
+                .b_AvailableConvertUnit = 6,
+                .ui_MinAcquisitiontimeNs = 10000,
+                .interrupt              = v_APCI3XXX_Interrupt,
+                .reset                  = i_APCI3XXX_Reset,
+                .ai_config              = i_APCI3XXX_InsnConfigAnalogInput,
+                .ai_read                = i_APCI3XXX_InsnReadAnalogInput,
+                .ttl_config             = i_APCI3XXX_InsnConfigInitTTLIO,
+                .ttl_bits               = i_APCI3XXX_InsnBitsTTLIO,
+                .ttl_read               = i_APCI3XXX_InsnReadTTLIO,
+                .ttl_write              = i_APCI3XXX_InsnWriteTTLIO,
+        }, {
+                .pc_DriverName          = "apci3006-8",
+                .i_VendorId             = PCI_VENDOR_ID_ADDIDATA,
+                .i_DeviceId             = 0x3014,
+                .i_IorangeBase0         = 256,
+                .i_IorangeBase1         = 256,
+                .i_IorangeBase2         = 256,
+                .i_IorangeBase3         = 256,
+                .i_PCIEeprom            = ADDIDATA_NO_EEPROM,
+                .pc_EepromChip          = ADDIDATA_9054,
+                .i_NbrAiChannel         = 8,
+                .i_NbrAiChannelDiff     = 4,
+                .i_AiChannelList        = 8,
+                .i_AiMaxdata            = 65535,
+                .pr_AiRangelist         = &range_apci3XXX_ai,
+                .i_NbrTTLChannel        = 24,
+                .b_AvailableConvertUnit = 6,
+                .ui_MinAcquisitiontimeNs = 10000,
+                .interrupt              = v_APCI3XXX_Interrupt,
+                .reset                  = i_APCI3XXX_Reset,
+                .ai_config              = i_APCI3XXX_InsnConfigAnalogInput,
+                .ai_read                = i_APCI3XXX_InsnReadAnalogInput,
+                .ttl_config             = i_APCI3XXX_InsnConfigInitTTLIO,
+                .ttl_bits               = i_APCI3XXX_InsnBitsTTLIO,
+                .ttl_read               = i_APCI3XXX_InsnReadTTLIO,
+                .ttl_write              = i_APCI3XXX_InsnWriteTTLIO,
+        }, {
+                .pc_DriverName          = "apci3006-4",
+                .i_VendorId             = PCI_VENDOR_ID_ADDIDATA,
+                .i_DeviceId             = 0x3015,
+                .i_IorangeBase0         = 256,
+                .i_IorangeBase1         = 256,
+                .i_IorangeBase2         = 256,
+                .i_IorangeBase3         = 256,
+                .i_PCIEeprom            = ADDIDATA_NO_EEPROM,
+                .pc_EepromChip          = ADDIDATA_9054,
+                .i_NbrAiChannel         = 4,
+                .i_NbrAiChannelDiff     = 2,
+                .i_AiChannelList        = 4,
+                .i_AiMaxdata            = 65535,
+                .pr_AiRangelist         = &range_apci3XXX_ai,
+                .i_NbrTTLChannel        = 24,
+                .b_AvailableConvertUnit = 6,
+                .ui_MinAcquisitiontimeNs = 10000,
+                .interrupt              = v_APCI3XXX_Interrupt,
+                .reset                  = i_APCI3XXX_Reset,
+                .ai_config              = i_APCI3XXX_InsnConfigAnalogInput,
+                .ai_read                = i_APCI3XXX_InsnReadAnalogInput,
+                .ttl_config             = i_APCI3XXX_InsnConfigInitTTLIO,
+                .ttl_bits               = i_APCI3XXX_InsnBitsTTLIO,
+                .ttl_read               = i_APCI3XXX_InsnReadTTLIO,
+                .ttl_write              = i_APCI3XXX_InsnWriteTTLIO,
+        }, {
+                .pc_DriverName          = "apci3010-16",
+                .i_VendorId             = PCI_VENDOR_ID_ADDIDATA,
+                .i_DeviceId             = 0x3016,
+                .i_IorangeBase0         = 256,
+                .i_IorangeBase1         = 256,
+                .i_IorangeBase2         = 256,
+                .i_IorangeBase3         = 256,
+                .i_PCIEeprom            = ADDIDATA_NO_EEPROM,
+                .pc_EepromChip          = ADDIDATA_9054,
+                .i_NbrAiChannel         = 16,
+                .i_NbrAiChannelDiff     = 8,
+                .i_AiChannelList        = 16,
+                .i_AiMaxdata            = 4095,
+                .pr_AiRangelist         = &range_apci3XXX_ai,
+                .i_NbrDiChannel         = 4,
+                .i_NbrDoChannel         = 4,
+                .i_DoMaxdata            = 1,
+                .i_NbrTTLChannel        = 24,
+                .b_AvailableConvertUnit = 6,
+                .ui_MinAcquisitiontimeNs = 5000,
+                .interrupt              = v_APCI3XXX_Interrupt,
+                .reset                  = i_APCI3XXX_Reset,
+                .ai_config              = i_APCI3XXX_InsnConfigAnalogInput,
+                .ai_read                = i_APCI3XXX_InsnReadAnalogInput,
+                .di_bits                = apci3xxx_di_insn_bits,
+                .do_bits                = apci3xxx_do_insn_bits,
+                .ttl_config             = i_APCI3XXX_InsnConfigInitTTLIO,
+                .ttl_bits               = i_APCI3XXX_InsnBitsTTLIO,
+                .ttl_read               = i_APCI3XXX_InsnReadTTLIO,
+                .ttl_write              = i_APCI3XXX_InsnWriteTTLIO,
+        }, {
+                .pc_DriverName          = "apci3010-8",
+                .i_VendorId             = PCI_VENDOR_ID_ADDIDATA,
+                .i_DeviceId             = 0x3017,
+                .i_IorangeBase0         = 256,
+                .i_IorangeBase1         = 256,
+                .i_IorangeBase2         = 256,
+                .i_IorangeBase3         = 256,
+                .i_PCIEeprom            = ADDIDATA_NO_EEPROM,
+                .pc_EepromChip          = ADDIDATA_9054,
+                .i_NbrAiChannel         = 8,
+                .i_NbrAiChannelDiff     = 4,
+                .i_AiChannelList        = 8,
+                .i_AiMaxdata            = 4095,
+                .pr_AiRangelist         = &range_apci3XXX_ai,
+                .i_NbrDiChannel         = 4,
+                .i_NbrDoChannel         = 4,
+                .i_DoMaxdata            = 1,
+                .i_NbrTTLChannel        = 24,
+                .b_AvailableConvertUnit = 6,
+                .ui_MinAcquisitiontimeNs = 5000,
+                .interrupt              = v_APCI3XXX_Interrupt,
+                .reset                  = i_APCI3XXX_Reset,
+                .ai_config              = i_APCI3XXX_InsnConfigAnalogInput,
+                .ai_read                = i_APCI3XXX_InsnReadAnalogInput,
+                .di_bits                = apci3xxx_di_insn_bits,
+                .do_bits                = apci3xxx_do_insn_bits,
+                .ttl_config             = i_APCI3XXX_InsnConfigInitTTLIO,
+                .ttl_bits               = i_APCI3XXX_InsnBitsTTLIO,
+                .ttl_read               = i_APCI3XXX_InsnReadTTLIO,
+                .ttl_write              = i_APCI3XXX_InsnWriteTTLIO,
+        }, {
+                .pc_DriverName          = "apci3010-4",
+                .i_VendorId             = PCI_VENDOR_ID_ADDIDATA,
+                .i_DeviceId             = 0x3018,
+                .i_IorangeBase0         = 256,
+                .i_IorangeBase1         = 256,
+                .i_IorangeBase2         = 256,
+                .i_IorangeBase3         = 256,
+                .i_PCIEeprom            = ADDIDATA_NO_EEPROM,
+                .pc_EepromChip          = ADDIDATA_9054,
+                .i_NbrAiChannel         = 4,
+                .i_NbrAiChannelDiff     = 2,
+                .i_AiChannelList        = 4,
+                .i_AiMaxdata            = 4095,
+                .pr_AiRangelist         = &range_apci3XXX_ai,
+                .i_NbrDiChannel         = 4,
+                .i_NbrDoChannel         = 4,
+                .i_DoMaxdata            = 1,
+                .i_NbrTTLChannel        = 24,
+                .b_AvailableConvertUnit = 6,
+                .ui_MinAcquisitiontimeNs = 5000,
+                .interrupt              = v_APCI3XXX_Interrupt,
+                .reset                  = i_APCI3XXX_Reset,
+                .ai_config              = i_APCI3XXX_InsnConfigAnalogInput,
+                .ai_read                = i_APCI3XXX_InsnReadAnalogInput,
+                .di_bits                = apci3xxx_di_insn_bits,
+                .do_bits                = apci3xxx_do_insn_bits,
+                .ttl_config             = i_APCI3XXX_InsnConfigInitTTLIO,
+                .ttl_bits               = i_APCI3XXX_InsnBitsTTLIO,
+                .ttl_read               = i_APCI3XXX_InsnReadTTLIO,
+                .ttl_write              = i_APCI3XXX_InsnWriteTTLIO,
+        }, {
+                .pc_DriverName          = "apci3016-16",
+                .i_VendorId             = PCI_VENDOR_ID_ADDIDATA,
+                .i_DeviceId             = 0x3019,
+                .i_IorangeBase0         = 256,
+                .i_IorangeBase1         = 256,
+                .i_IorangeBase2         = 256,
+                .i_IorangeBase3         = 256,
+                .i_PCIEeprom            = ADDIDATA_NO_EEPROM,
+                .pc_EepromChip          = ADDIDATA_9054,
+                .i_NbrAiChannel         = 16,
+                .i_NbrAiChannelDiff     = 8,
+                .i_AiChannelList        = 16,
+                .i_AiMaxdata            = 65535,
+                .pr_AiRangelist         = &range_apci3XXX_ai,
+                .i_NbrDiChannel         = 4,
+                .i_NbrDoChannel         = 4,
+                .i_DoMaxdata            = 1,
+                .i_NbrTTLChannel        = 24,
+                .b_AvailableConvertUnit = 6,
+                .ui_MinAcquisitiontimeNs = 5000,
+                .interrupt              = v_APCI3XXX_Interrupt,
+                .reset                  = i_APCI3XXX_Reset,
+                .ai_config              = i_APCI3XXX_InsnConfigAnalogInput,
+                .ai_read                = i_APCI3XXX_InsnReadAnalogInput,
+                .di_bits                = apci3xxx_di_insn_bits,
+                .do_bits                = apci3xxx_do_insn_bits,
+                .ttl_config             = i_APCI3XXX_InsnConfigInitTTLIO,
+                .ttl_bits               = i_APCI3XXX_InsnBitsTTLIO,
+                .ttl_read               = i_APCI3XXX_InsnReadTTLIO,
+                .ttl_write              = i_APCI3XXX_InsnWriteTTLIO,
+        }, {
+                .pc_DriverName          = "apci3016-8",
+                .i_VendorId             = PCI_VENDOR_ID_ADDIDATA,
+                .i_DeviceId             = 0x301A,
+                .i_IorangeBase0         = 256,
+                .i_IorangeBase1         = 256,
+                .i_IorangeBase2         = 256,
+                .i_IorangeBase3         = 256,
+                .i_PCIEeprom            = ADDIDATA_NO_EEPROM,
+                .pc_EepromChip          = ADDIDATA_9054,
+                .i_NbrAiChannel         = 8,
+                .i_NbrAiChannelDiff     = 4,
+                .i_AiChannelList        = 8,
+                .i_AiMaxdata            = 65535,
+                .pr_AiRangelist         = &range_apci3XXX_ai,
+                .i_NbrDiChannel         = 4,
+                .i_NbrDoChannel         = 4,
+                .i_DoMaxdata            = 1,
+                .i_NbrTTLChannel        = 24,
+                .b_AvailableConvertUnit = 6,
+                .ui_MinAcquisitiontimeNs = 5000,
+                .interrupt              = v_APCI3XXX_Interrupt,
+                .reset                  = i_APCI3XXX_Reset,
+                .ai_config              = i_APCI3XXX_InsnConfigAnalogInput,
+                .ai_read                = i_APCI3XXX_InsnReadAnalogInput,
+                .di_bits                = apci3xxx_di_insn_bits,
+                .do_bits                = apci3xxx_do_insn_bits,
+                .ttl_config             = i_APCI3XXX_InsnConfigInitTTLIO,
+                .ttl_bits               = i_APCI3XXX_InsnBitsTTLIO,
+                .ttl_read               = i_APCI3XXX_InsnReadTTLIO,
+                .ttl_write              = i_APCI3XXX_InsnWriteTTLIO,
+        }, {
+                .pc_DriverName          = "apci3016-4",
+                .i_VendorId             = PCI_VENDOR_ID_ADDIDATA,
+                .i_DeviceId             = 0x301B,
+                .i_IorangeBase0         = 256,
+                .i_IorangeBase1         = 256,
+                .i_IorangeBase2         = 256,
+                .i_IorangeBase3         = 256,
+                .i_PCIEeprom            = ADDIDATA_NO_EEPROM,
+                .pc_EepromChip          = ADDIDATA_9054,
+                .i_NbrAiChannel         = 4,
+                .i_NbrAiChannelDiff     = 2,
+                .i_AiChannelList        = 4,
+                .i_AiMaxdata            = 65535,
+                .pr_AiRangelist         = &range_apci3XXX_ai,
+                .i_NbrDiChannel         = 4,
+                .i_NbrDoChannel         = 4,
+                .i_DoMaxdata            = 1,
+                .i_NbrTTLChannel        = 24,
+                .b_AvailableConvertUnit = 6,
+                .ui_MinAcquisitiontimeNs = 5000,
+                .interrupt              = v_APCI3XXX_Interrupt,
+                .reset                  = i_APCI3XXX_Reset,
+                .ai_config              = i_APCI3XXX_InsnConfigAnalogInput,
+                .ai_read                = i_APCI3XXX_InsnReadAnalogInput,
+                .di_bits                = apci3xxx_di_insn_bits,
+                .do_bits                = apci3xxx_do_insn_bits,
+                .ttl_config             = i_APCI3XXX_InsnConfigInitTTLIO,
+                .ttl_bits               = i_APCI3XXX_InsnBitsTTLIO,
+                .ttl_read               = i_APCI3XXX_InsnReadTTLIO,
+                .ttl_write              = i_APCI3XXX_InsnWriteTTLIO,
+        }, {
+                .pc_DriverName          = "apci3100-16-4",
+                .i_VendorId             = PCI_VENDOR_ID_ADDIDATA,
+                .i_DeviceId             = 0x301C,
+                .i_IorangeBase0         = 256,
+                .i_IorangeBase1         = 256,
+                .i_IorangeBase2         = 256,
+                .i_IorangeBase3         = 256,
+                .i_PCIEeprom            = ADDIDATA_NO_EEPROM,
+                .pc_EepromChip          = ADDIDATA_9054,
+                .i_NbrAiChannel         = 16,
+                .i_NbrAiChannelDiff     = 8,
+                .i_AiChannelList        = 16,
+                .i_NbrAoChannel         = 4,
+                .i_AiMaxdata            = 4095,
+                .i_AoMaxdata            = 4095,
+                .pr_AiRangelist         = &range_apci3XXX_ai,
+                .pr_AoRangelist         = &range_apci3XXX_ao,
+                .i_NbrTTLChannel        = 24,
+                .b_AvailableConvertUnit = 6,
+                .ui_MinAcquisitiontimeNs = 10000,
+                .interrupt              = v_APCI3XXX_Interrupt,
+                .reset                  = i_APCI3XXX_Reset,
+                .ai_config              = i_APCI3XXX_InsnConfigAnalogInput,
+                .ai_read                = i_APCI3XXX_InsnReadAnalogInput,
+                .ao_write               = i_APCI3XXX_InsnWriteAnalogOutput,
+                .ttl_config             = i_APCI3XXX_InsnConfigInitTTLIO,
+                .ttl_bits               = i_APCI3XXX_InsnBitsTTLIO,
+                .ttl_read               = i_APCI3XXX_InsnReadTTLIO,
+                .ttl_write              = i_APCI3XXX_InsnWriteTTLIO,
+        }, {
+                .pc_DriverName          = "apci3100-8-4",
+                .i_VendorId             = PCI_VENDOR_ID_ADDIDATA,
+                .i_DeviceId             = 0x301D,
+                .i_IorangeBase0         = 256,
+                .i_IorangeBase1         = 256,
+                .i_IorangeBase2         = 256,
+                .i_IorangeBase3         = 256,
+                .i_PCIEeprom            = ADDIDATA_NO_EEPROM,
+                .pc_EepromChip          = ADDIDATA_9054,
+                .i_NbrAiChannel         = 8,
+                .i_NbrAiChannelDiff     = 4,
+                .i_AiChannelList        = 8,
+                .i_NbrAoChannel         = 4,
+                .i_AiMaxdata            = 4095,
+                .i_AoMaxdata            = 4095,
+                .pr_AiRangelist         = &range_apci3XXX_ai,
+                .pr_AoRangelist         = &range_apci3XXX_ao,
+                .i_NbrTTLChannel        = 24,
+                .b_AvailableConvertUnit = 6,
+                .ui_MinAcquisitiontimeNs = 10000,
+                .interrupt              = v_APCI3XXX_Interrupt,
+                .reset                  = i_APCI3XXX_Reset,
+                .ai_config              = i_APCI3XXX_InsnConfigAnalogInput,
+                .ai_read                = i_APCI3XXX_InsnReadAnalogInput,
+                .ao_write               = i_APCI3XXX_InsnWriteAnalogOutput,
+                .ttl_config             = i_APCI3XXX_InsnConfigInitTTLIO,
+                .ttl_bits               = i_APCI3XXX_InsnBitsTTLIO,
+                .ttl_read               = i_APCI3XXX_InsnReadTTLIO,
+                .ttl_write              = i_APCI3XXX_InsnWriteTTLIO,
+        }, {
+                .pc_DriverName          = "apci3106-16-4",
+                .i_VendorId             = PCI_VENDOR_ID_ADDIDATA,
+                .i_DeviceId             = 0x301E,
+                .i_IorangeBase0         = 256,
+                .i_IorangeBase1         = 256,
+                .i_IorangeBase2         = 256,
+                .i_IorangeBase3         = 256,
+                .i_PCIEeprom            = ADDIDATA_NO_EEPROM,
+                .pc_EepromChip          = ADDIDATA_9054,
+                .i_NbrAiChannel         = 16,
+                .i_NbrAiChannelDiff     = 8,
+                .i_AiChannelList        = 16,
+                .i_NbrAoChannel         = 4,
+                .i_AiMaxdata            = 65535,
+                .i_AoMaxdata            = 4095,
+                .pr_AiRangelist         = &range_apci3XXX_ai,
+                .pr_AoRangelist         = &range_apci3XXX_ao,
+                .i_NbrTTLChannel        = 24,
+                .b_AvailableConvertUnit = 6,
+                .ui_MinAcquisitiontimeNs = 10000,
+                .interrupt              = v_APCI3XXX_Interrupt,
+                .reset                  = i_APCI3XXX_Reset,
+                .ai_config              = i_APCI3XXX_InsnConfigAnalogInput,
+                .ai_read                = i_APCI3XXX_InsnReadAnalogInput,
+                .ao_write               = i_APCI3XXX_InsnWriteAnalogOutput,
+                .ttl_config             = i_APCI3XXX_InsnConfigInitTTLIO,
+                .ttl_bits               = i_APCI3XXX_InsnBitsTTLIO,
+                .ttl_read               = i_APCI3XXX_InsnReadTTLIO,
+                .ttl_write              = i_APCI3XXX_InsnWriteTTLIO,
+        }, {
+                .pc_DriverName          = "apci3106-8-4",
+                .i_VendorId             = PCI_VENDOR_ID_ADDIDATA,
+                .i_DeviceId             = 0x301F,
+                .i_IorangeBase0         = 256,
+                .i_IorangeBase1         = 256,
+                .i_IorangeBase2         = 256,
+                .i_IorangeBase3         = 256,
+                .i_PCIEeprom            = ADDIDATA_NO_EEPROM,
+                .pc_EepromChip          = ADDIDATA_9054,
+                .i_NbrAiChannel         = 8,
+                .i_NbrAiChannelDiff     = 4,
+                .i_AiChannelList        = 8,
+                .i_NbrAoChannel         = 4,
+                .i_AiMaxdata            = 65535,
+                .i_AoMaxdata            = 4095,
+                .pr_AiRangelist         = &range_apci3XXX_ai,
+                .pr_AoRangelist         = &range_apci3XXX_ao,
+                .i_NbrTTLChannel        = 24,
+                .b_AvailableConvertUnit = 6,
+                .ui_MinAcquisitiontimeNs = 10000,
+                .interrupt              = v_APCI3XXX_Interrupt,
+                .reset                  = i_APCI3XXX_Reset,
+                .ai_config              = i_APCI3XXX_InsnConfigAnalogInput,
+                .ai_read                = i_APCI3XXX_InsnReadAnalogInput,
+                .ao_write               = i_APCI3XXX_InsnWriteAnalogOutput,
+                .ttl_config             = i_APCI3XXX_InsnConfigInitTTLIO,
+                .ttl_bits               = i_APCI3XXX_InsnBitsTTLIO,
+                .ttl_read               = i_APCI3XXX_InsnReadTTLIO,
+                .ttl_write              = i_APCI3XXX_InsnWriteTTLIO,
+        }, {
+                .pc_DriverName          = "apci3110-16-4",
+                .i_VendorId             = PCI_VENDOR_ID_ADDIDATA,
+                .i_DeviceId             = 0x3020,
+                .i_IorangeBase0         = 256,
+                .i_IorangeBase1         = 256,
+                .i_IorangeBase2         = 256,
+                .i_IorangeBase3         = 256,
+                .i_PCIEeprom            = ADDIDATA_NO_EEPROM,
+                .pc_EepromChip          = ADDIDATA_9054,
+                .i_NbrAiChannel         = 16,
+                .i_NbrAiChannelDiff     = 8,
+                .i_AiChannelList        = 16,
+                .i_NbrAoChannel         = 4,
+                .i_AiMaxdata            = 4095,
+                .i_AoMaxdata            = 4095,
+                .pr_AiRangelist         = &range_apci3XXX_ai,
+                .pr_AoRangelist         = &range_apci3XXX_ao,
+                .i_NbrDiChannel         = 4,
+                .i_NbrDoChannel         = 4,
+                .i_DoMaxdata            = 1,
+                .i_NbrTTLChannel        = 24,
+                .b_AvailableConvertUnit = 6,
+                .ui_MinAcquisitiontimeNs = 5000,
+                .interrupt              = v_APCI3XXX_Interrupt,
+                .reset                  = i_APCI3XXX_Reset,
+                .ai_config              = i_APCI3XXX_InsnConfigAnalogInput,
+                .ai_read                = i_APCI3XXX_InsnReadAnalogInput,
+                .ao_write               = i_APCI3XXX_InsnWriteAnalogOutput,
+                .di_bits                = apci3xxx_di_insn_bits,
+                .do_bits                = apci3xxx_do_insn_bits,
+                .ttl_config             = i_APCI3XXX_InsnConfigInitTTLIO,
+                .ttl_bits               = i_APCI3XXX_InsnBitsTTLIO,
+                .ttl_read               = i_APCI3XXX_InsnReadTTLIO,
+                .ttl_write              = i_APCI3XXX_InsnWriteTTLIO,
+        }, {
+                .pc_DriverName          = "apci3110-8-4",
+                .i_VendorId             = PCI_VENDOR_ID_ADDIDATA,
+                .i_DeviceId             = 0x3021,
+                .i_IorangeBase0         = 256,
+                .i_IorangeBase1         = 256,
+                .i_IorangeBase2         = 256,
+                .i_IorangeBase3         = 256,
+                .i_PCIEeprom            = ADDIDATA_NO_EEPROM,
+                .pc_EepromChip          = ADDIDATA_9054,
+                .i_NbrAiChannel         = 8,
+                .i_NbrAiChannelDiff     = 4,
+                .i_AiChannelList        = 8,
+                .i_NbrAoChannel         = 4,
+                .i_AiMaxdata            = 4095,
+                .i_AoMaxdata            = 4095,
+                .pr_AiRangelist         = &range_apci3XXX_ai,
+                .pr_AoRangelist         = &range_apci3XXX_ao,
+                .i_NbrDiChannel         = 4,
+                .i_NbrDoChannel         = 4,
+                .i_DoMaxdata            = 1,
+                .i_NbrTTLChannel        = 24,
+                .b_AvailableConvertUnit = 6,
+                .ui_MinAcquisitiontimeNs = 5000,
+                .interrupt              = v_APCI3XXX_Interrupt,
+                .reset                  = i_APCI3XXX_Reset,
+                .ai_config              = i_APCI3XXX_InsnConfigAnalogInput,
+                .ai_read                = i_APCI3XXX_InsnReadAnalogInput,
+                .ao_write               = i_APCI3XXX_InsnWriteAnalogOutput,
+                .di_bits                = apci3xxx_di_insn_bits,
+                .do_bits                = apci3xxx_do_insn_bits,
+                .ttl_config             = i_APCI3XXX_InsnConfigInitTTLIO,
+                .ttl_bits               = i_APCI3XXX_InsnBitsTTLIO,
+                .ttl_read               = i_APCI3XXX_InsnReadTTLIO,
+                .ttl_write              = i_APCI3XXX_InsnWriteTTLIO,
+        }, {
+                .pc_DriverName          = "apci3116-16-4",
+                .i_VendorId             = PCI_VENDOR_ID_ADDIDATA,
+                .i_DeviceId             = 0x3022,
+                .i_IorangeBase0         = 256,
+                .i_IorangeBase1         = 256,
+                .i_IorangeBase2         = 256,
+                .i_IorangeBase3         = 256,
+                .i_PCIEeprom            = ADDIDATA_NO_EEPROM,
+                .pc_EepromChip          = ADDIDATA_9054,
+                .i_NbrAiChannel         = 16,
+                .i_NbrAiChannelDiff     = 8,
+                .i_AiChannelList        = 16,
+                .i_NbrAoChannel         = 4,
+                .i_AiMaxdata            = 65535,
+                .i_AoMaxdata            = 4095,
+                .pr_AiRangelist         = &range_apci3XXX_ai,
+                .pr_AoRangelist         = &range_apci3XXX_ao,
+                .i_NbrDiChannel         = 4,
+                .i_NbrDoChannel         = 4,
+                .i_DoMaxdata            = 1,
+                .i_NbrTTLChannel        = 24,
+                .b_AvailableConvertUnit = 6,
+                .ui_MinAcquisitiontimeNs = 5000,
+                .interrupt              = v_APCI3XXX_Interrupt,
+                .reset                  = i_APCI3XXX_Reset,
+                .ai_config              = i_APCI3XXX_InsnConfigAnalogInput,
+                .ai_read                = i_APCI3XXX_InsnReadAnalogInput,
+                .ao_write               = i_APCI3XXX_InsnWriteAnalogOutput,
+                .di_bits                = apci3xxx_di_insn_bits,
+                .do_bits                = apci3xxx_do_insn_bits,
+                .ttl_config             = i_APCI3XXX_InsnConfigInitTTLIO,
+                .ttl_bits               = i_APCI3XXX_InsnBitsTTLIO,
+                .ttl_read               = i_APCI3XXX_InsnReadTTLIO,
+                .ttl_write              = i_APCI3XXX_InsnWriteTTLIO,
+        }, {
+                .pc_DriverName          = "apci3116-8-4",
+                .i_VendorId             = PCI_VENDOR_ID_ADDIDATA,
+                .i_DeviceId             = 0x3023,
+                .i_IorangeBase0         = 256,
+                .i_IorangeBase1         = 256,
+                .i_IorangeBase2         = 256,
+                .i_IorangeBase3         = 256,
+                .i_PCIEeprom            = ADDIDATA_NO_EEPROM,
+                .pc_EepromChip          = ADDIDATA_9054,
+                .i_NbrAiChannel         = 8,
+                .i_NbrAiChannelDiff     = 4,
+                .i_AiChannelList        = 8,
+                .i_NbrAoChannel         = 4,
+                .i_AiMaxdata            = 65535,
+                .i_AoMaxdata            = 4095,
+                .pr_AiRangelist         = &range_apci3XXX_ai,
+                .pr_AoRangelist         = &range_apci3XXX_ao,
+                .i_NbrDiChannel         = 4,
+                .i_NbrDoChannel         = 4,
+                .i_DoMaxdata            = 1,
+                .i_NbrTTLChannel        = 24,
+                .b_AvailableConvertUnit = 6,
+                .ui_MinAcquisitiontimeNs = 5000,
+                .interrupt              = v_APCI3XXX_Interrupt,
+                .reset                  = i_APCI3XXX_Reset,
+                .ai_config              = i_APCI3XXX_InsnConfigAnalogInput,
+                .ai_read                = i_APCI3XXX_InsnReadAnalogInput,
+                .ao_write               = i_APCI3XXX_InsnWriteAnalogOutput,
+                .di_bits                = apci3xxx_di_insn_bits,
+                .do_bits                = apci3xxx_do_insn_bits,
+                .ttl_config             = i_APCI3XXX_InsnConfigInitTTLIO,
+                .ttl_bits               = i_APCI3XXX_InsnBitsTTLIO,
+                .ttl_read               = i_APCI3XXX_InsnReadTTLIO,
+                .ttl_write              = i_APCI3XXX_InsnWriteTTLIO,
+        }, {
+                .pc_DriverName          = "apci3003",
+                .i_VendorId             = PCI_VENDOR_ID_ADDIDATA,
+                .i_DeviceId             = 0x300B,
+                .i_IorangeBase0         = 256,
+                .i_IorangeBase1         = 256,
+                .i_IorangeBase2         = 256,
+                .i_IorangeBase3         = 256,
+                .i_PCIEeprom            = ADDIDATA_NO_EEPROM,
+                .pc_EepromChip          = ADDIDATA_9054,
+                .i_NbrAiChannelDiff     = 4,
+                .i_AiChannelList        = 4,
+                .i_AiMaxdata            = 65535,
+                .pr_AiRangelist         = &range_apci3XXX_ai,
+                .i_NbrDiChannel         = 4,
+                .i_NbrDoChannel         = 4,
+                .i_DoMaxdata            = 1,
+                .b_AvailableConvertUnit = 7,
+                .ui_MinAcquisitiontimeNs = 2500,
+                .interrupt              = v_APCI3XXX_Interrupt,
+                .reset                  = i_APCI3XXX_Reset,
+                .ai_config              = i_APCI3XXX_InsnConfigAnalogInput,
+                .ai_read                = i_APCI3XXX_InsnReadAnalogInput,
+                .di_bits                = apci3xxx_di_insn_bits,
+                .do_bits                = apci3xxx_do_insn_bits,
+        }, {
+                .pc_DriverName          = "apci3002-16",
+                .i_VendorId             = PCI_VENDOR_ID_ADDIDATA,
+                .i_DeviceId             = 0x3002,
+                .i_IorangeBase0         = 256,
+                .i_IorangeBase1         = 256,
+                .i_IorangeBase2         = 256,
+                .i_IorangeBase3         = 256,
+                .i_PCIEeprom            = ADDIDATA_NO_EEPROM,
+                .pc_EepromChip          = ADDIDATA_9054,
+                .i_NbrAiChannelDiff     = 16,
+                .i_AiChannelList        = 16,
+                .i_AiMaxdata            = 65535,
+                .pr_AiRangelist         = &range_apci3XXX_ai,
+                .i_NbrDiChannel         = 4,
+                .i_NbrDoChannel         = 4,
+                .i_DoMaxdata            = 1,
+                .b_AvailableConvertUnit = 6,
+                .ui_MinAcquisitiontimeNs = 5000,
+                .interrupt              = v_APCI3XXX_Interrupt,
+                .reset                  = i_APCI3XXX_Reset,
+                .ai_config              = i_APCI3XXX_InsnConfigAnalogInput,
+                .ai_read                = i_APCI3XXX_InsnReadAnalogInput,
+                .di_bits                = apci3xxx_di_insn_bits,
+                .do_bits                = apci3xxx_do_insn_bits,
+        }, {
+                .pc_DriverName          = "apci3002-8",
+                .i_VendorId             = PCI_VENDOR_ID_ADDIDATA,
+                .i_DeviceId             = 0x3003,
+                .i_IorangeBase0         = 256,
+                .i_IorangeBase1         = 256,
+                .i_IorangeBase2         = 256,
+                .i_IorangeBase3         = 256,
+                .i_PCIEeprom            = ADDIDATA_NO_EEPROM,
+                .pc_EepromChip          = ADDIDATA_9054,
+                .i_NbrAiChannelDiff     = 8,
+                .i_AiChannelList        = 8,
+                .i_AiMaxdata            = 65535,
+                .pr_AiRangelist         = &range_apci3XXX_ai,
+                .i_NbrDiChannel         = 4,
+                .i_NbrDoChannel         = 4,
+                .i_DoMaxdata            = 1,
+                .b_AvailableConvertUnit = 6,
+                .ui_MinAcquisitiontimeNs = 5000,
+                .interrupt              = v_APCI3XXX_Interrupt,
+                .reset                  = i_APCI3XXX_Reset,
+                .ai_config              = i_APCI3XXX_InsnConfigAnalogInput,
+                .ai_read                = i_APCI3XXX_InsnReadAnalogInput,
+                .di_bits                = apci3xxx_di_insn_bits,
+                .do_bits                = apci3xxx_do_insn_bits,
+        }, {
+                .pc_DriverName          = "apci3002-4",
+                .i_VendorId             = PCI_VENDOR_ID_ADDIDATA,
+                .i_DeviceId             = 0x3004,
+                .i_IorangeBase0         = 256,
+                .i_IorangeBase1         = 256,
+                .i_IorangeBase2         = 256,
+                .i_IorangeBase3         = 256,
+                .i_PCIEeprom            = ADDIDATA_NO_EEPROM,
+                .pc_EepromChip          = ADDIDATA_9054,
+                .i_NbrAiChannelDiff     = 4,
+                .i_AiChannelList        = 4,
+                .i_AiMaxdata            = 65535,
+                .pr_AiRangelist         = &range_apci3XXX_ai,
+                .i_NbrDiChannel         = 4,
+                .i_NbrDoChannel         = 4,
+                .i_DoMaxdata            = 1,
+                .b_AvailableConvertUnit = 6,
+                .ui_MinAcquisitiontimeNs = 5000,
+                .interrupt              = v_APCI3XXX_Interrupt,
+                .reset                  = i_APCI3XXX_Reset,
+                .ai_config              = i_APCI3XXX_InsnConfigAnalogInput,
+                .ai_read                = i_APCI3XXX_InsnReadAnalogInput,
+                .di_bits                = apci3xxx_di_insn_bits,
+                .do_bits                = apci3xxx_do_insn_bits,
+        }, {
+                .pc_DriverName          = "apci3500",
+                .i_VendorId             = PCI_VENDOR_ID_ADDIDATA,
+                .i_DeviceId             = 0x3024,
+                .i_IorangeBase0         = 256,
+                .i_IorangeBase1         = 256,
+                .i_IorangeBase2         = 256,
+                .i_IorangeBase3         = 256,
+                .i_PCIEeprom            = ADDIDATA_NO_EEPROM,
+                .pc_EepromChip          = ADDIDATA_9054,
+                .i_NbrAoChannel         = 4,
+                .i_AoMaxdata            = 4095,
+                .pr_AoRangelist         = &range_apci3XXX_ao,
+                .i_NbrTTLChannel        = 24,
+                .interrupt              = v_APCI3XXX_Interrupt,
+                .reset                  = i_APCI3XXX_Reset,
+                .ao_write               = i_APCI3XXX_InsnWriteAnalogOutput,
+                .ttl_config             = i_APCI3XXX_InsnConfigInitTTLIO,
+                .ttl_bits               = i_APCI3XXX_InsnBitsTTLIO,
+                .ttl_read               = i_APCI3XXX_InsnReadTTLIO,
+                .ttl_write              = i_APCI3XXX_InsnWriteTTLIO,
+        },
+};
+
+static struct comedi_driver apci3xxx_driver = {
+        .driver_name    = "addi_apci_3xxx",
+        .module         = THIS_MODULE,
+        .auto_attach    = addi_auto_attach,
+        .detach         = i_ADDI_Detach,
+        .num_names      = ARRAY_SIZE(apci3xxx_boardtypes),
+        .board_name     = &apci3xxx_boardtypes[0].pc_DriverName,
+        .offset         = sizeof(struct addi_board),
+};
+
+static int apci3xxx_pci_probe(struct pci_dev *dev,
+                                        const struct pci_device_id *ent)
+{
+        return comedi_pci_auto_config(dev, &apci3xxx_driver);
+}
+
+static void apci3xxx_pci_remove(struct pci_dev *dev)
+{
+        comedi_pci_auto_unconfig(dev);
+}
+
+static DEFINE_PCI_DEVICE_TABLE(apci3xxx_pci_table) = {
+        { PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3010) },
+        { PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x300f) },
+        { PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x300e) },
+        { PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3013) },
+        { PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3014) },
+        { PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3015) },
+        { PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3016) },
+        { PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3017) },
+        { PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3018) },
+        { PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3019) },
+        { PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x301a) },
+        { PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x301b) },
+        { PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x301c) },
+        { PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x301d) },
+        { PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x301e) },
+        { PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x301f) },
+        { PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3020) },
+        { PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3021) },
+        { PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3022) },
+        { PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3023) },
+        { PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x300B) },
+        { PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3002) },
+        { PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3003) },
+        { PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3004) },
+        { PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3024) },
+        { 0 }
+};
+MODULE_DEVICE_TABLE(pci, apci3xxx_pci_table);
+
+static struct pci_driver apci3xxx_pci_driver = {
+        .name           = "addi_apci_3xxx",
+        .id_table       = apci3xxx_pci_table,
+        .probe          = apci3xxx_pci_probe,
+        .remove         = apci3xxx_pci_remove,
+};
+module_comedi_pci_driver(apci3xxx_driver, apci3xxx_pci_driver);
+
 MODULE_AUTHOR("Comedi http://www.comedi.org");
 MODULE_DESCRIPTION("Comedi low-level driver");
 MODULE_LICENSE("GPL");
diff --git a/drivers/staging/comedi/drivers/adl_pci6208.c b/drivers/staging/comedi/drivers/adl_pci6208.c
index 3492ce1156e0..9a56eed3910f 100644
--- a/drivers/staging/comedi/drivers/adl_pci6208.c
+++ b/drivers/staging/comedi/drivers/adl_pci6208.c
@@ -174,27 +174,26 @@ static const void *pci6208_find_boardinfo(struct comedi_device *dev,
         return NULL;
 }
 
-static int pci6208_attach_pci(struct comedi_device *dev,
-                              struct pci_dev *pcidev)
+static int pci6208_auto_attach(struct comedi_device *dev,
+                                         unsigned long context_unused)
 {
+        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
         const struct pci6208_board *boardinfo;
         struct pci6208_private *devpriv;
         struct comedi_subdevice *s;
         unsigned int val;
         int ret;
 
-        comedi_set_hw_dev(dev, &pcidev->dev);
-
         boardinfo = pci6208_find_boardinfo(dev, pcidev);
         if (!boardinfo)
                 return -ENODEV;
         dev->board_ptr = boardinfo;
         dev->board_name = boardinfo->name;
 
-        ret = alloc_private(dev, sizeof(*devpriv));
-        if (ret < 0)
-                return ret;
-        devpriv = dev->private;
+        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
+        if (!devpriv)
+                return -ENOMEM;
+        dev->private = devpriv;
 
         ret = comedi_pci_enable(pcidev, dev->board_name);
         if (ret)
@@ -261,17 +260,17 @@ static void pci6208_detach(struct comedi_device *dev)
 static struct comedi_driver adl_pci6208_driver = {
         .driver_name    = "adl_pci6208",
         .module         = THIS_MODULE,
-        .attach_pci     = pci6208_attach_pci,
+        .auto_attach    = pci6208_auto_attach,
         .detach         = pci6208_detach,
 };
 
-static int __devinit adl_pci6208_pci_probe(struct pci_dev *dev,
+static int adl_pci6208_pci_probe(struct pci_dev *dev,
                                            const struct pci_device_id *ent)
 {
         return comedi_pci_auto_config(dev, &adl_pci6208_driver);
 }
 
-static void __devexit adl_pci6208_pci_remove(struct pci_dev *dev)
+static void adl_pci6208_pci_remove(struct pci_dev *dev)
 {
         comedi_pci_auto_unconfig(dev);
 }
@@ -287,7 +286,7 @@ static struct pci_driver adl_pci6208_pci_driver = {
         .name           = "adl_pci6208",
         .id_table       = adl_pci6208_pci_table,
         .probe          = adl_pci6208_pci_probe,
-        .remove         = __devexit_p(adl_pci6208_pci_remove),
+        .remove         = adl_pci6208_pci_remove,
 };
 module_comedi_pci_driver(adl_pci6208_driver, adl_pci6208_pci_driver);
 
diff --git a/drivers/staging/comedi/drivers/adl_pci7x3x.c b/drivers/staging/comedi/drivers/adl_pci7x3x.c
index 599714e978b5..772edc02f5ce 100644
--- a/drivers/staging/comedi/drivers/adl_pci7x3x.c
+++ b/drivers/staging/comedi/drivers/adl_pci7x3x.c
@@ -168,17 +168,16 @@ static const void *adl_pci7x3x_find_boardinfo(struct comedi_device *dev,
         return NULL;
 }
 
-static int adl_pci7x3x_attach_pci(struct comedi_device *dev,
-                                  struct pci_dev *pcidev)
+static int adl_pci7x3x_auto_attach(struct comedi_device *dev,
+                                             unsigned long context_unused)
 {
+        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
         const struct adl_pci7x3x_boardinfo *board;
         struct comedi_subdevice *s;
         int subdev;
         int nchan;
         int ret;
 
-        comedi_set_hw_dev(dev, &pcidev->dev);
-
         board = adl_pci7x3x_find_boardinfo(dev, pcidev);
         if (!board)
                 return -ENODEV;
@@ -293,17 +292,17 @@ static void adl_pci7x3x_detach(struct comedi_device *dev)
 static struct comedi_driver adl_pci7x3x_driver = {
         .driver_name    = "adl_pci7x3x",
         .module         = THIS_MODULE,
-        .attach_pci     = adl_pci7x3x_attach_pci,
+        .auto_attach    = adl_pci7x3x_auto_attach,
         .detach         = adl_pci7x3x_detach,
 };
 
-static int __devinit adl_pci7x3x_pci_probe(struct pci_dev *dev,
+static int adl_pci7x3x_pci_probe(struct pci_dev *dev,
                                            const struct pci_device_id *ent)
 {
         return comedi_pci_auto_config(dev, &adl_pci7x3x_driver);
 }
 
-static void __devexit adl_pci7x3x_pci_remove(struct pci_dev *dev)
+static void adl_pci7x3x_pci_remove(struct pci_dev *dev)
 {
         comedi_pci_auto_unconfig(dev);
 }
@@ -323,7 +322,7 @@ static struct pci_driver adl_pci7x3x_pci_driver = {
         .name           = "adl_pci7x3x",
         .id_table       = adl_pci7x3x_pci_table,
         .probe          = adl_pci7x3x_pci_probe,
-        .remove         = __devexit_p(adl_pci7x3x_pci_remove),
+        .remove         = adl_pci7x3x_pci_remove,
 };
 module_comedi_pci_driver(adl_pci7x3x_driver, adl_pci7x3x_pci_driver);
 
diff --git a/drivers/staging/comedi/drivers/adl_pci8164.c b/drivers/staging/comedi/drivers/adl_pci8164.c
index 05e06e7ba9f7..4dd9d707a79d 100644
--- a/drivers/staging/comedi/drivers/adl_pci8164.c
+++ b/drivers/staging/comedi/drivers/adl_pci8164.c
@@ -89,9 +89,9 @@ static void adl_pci8164_insn_read(struct comedi_device *dev,
         }
 
         data[0] = inw(dev->iobase + axis_reg + offset);
-        printk(KERN_DEBUG "comedi: pci8164 %s read -> "
-                                                  "%04X:%04X on axis %s\n",
-                                action, data[0], data[1], axisname);
+        dev_dbg(dev->class_dev,
+                "pci8164 %s read -> %04X:%04X on axis %s\n",
+                action, data[0], data[1], axisname);
 }
 
 static int adl_pci8164_insn_read_msts(struct comedi_device *dev,
@@ -170,9 +170,9 @@ static void adl_pci8164_insn_out(struct comedi_device *dev,
 
         outw(data[0], dev->iobase + axis_reg + offset);
 
-        printk(KERN_DEBUG "comedi: pci8164 %s write -> "
-                                                "%04X:%04X on axis %s\n",
-                                action, data[0], data[1], axisname);
+        dev_dbg(dev->class_dev,
+                "pci8164 %s write -> %04X:%04X on axis %s\n",
+                action, data[0], data[1], axisname);
 
 }
 
@@ -212,14 +212,13 @@ static int adl_pci8164_insn_write_buf1(struct comedi_device *dev,
         return 2;
 }
 
-static int adl_pci8164_attach_pci(struct comedi_device *dev,
-                                  struct pci_dev *pcidev)
+static int adl_pci8164_auto_attach(struct comedi_device *dev,
+                                             unsigned long context_unused)
 {
+        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
         struct comedi_subdevice *s;
         int ret;
 
-        comedi_set_hw_dev(dev, &pcidev->dev);
-
         dev->board_name = dev->driver->driver_name;
 
         ret = comedi_pci_enable(pcidev, dev->board_name);
@@ -289,17 +288,17 @@ static void adl_pci8164_detach(struct comedi_device *dev)
 static struct comedi_driver adl_pci8164_driver = {
         .driver_name    = "adl_pci8164",
         .module         = THIS_MODULE,
-        .attach_pci     = adl_pci8164_attach_pci,
+        .auto_attach    = adl_pci8164_auto_attach,
         .detach         = adl_pci8164_detach,
 };
 
-static int __devinit adl_pci8164_pci_probe(struct pci_dev *dev,
+static int adl_pci8164_pci_probe(struct pci_dev *dev,
                                            const struct pci_device_id *ent)
 {
         return comedi_pci_auto_config(dev, &adl_pci8164_driver);
 }
 
-static void __devexit adl_pci8164_pci_remove(struct pci_dev *dev)
+static void adl_pci8164_pci_remove(struct pci_dev *dev)
 {
         comedi_pci_auto_unconfig(dev);
 }
@@ -314,7 +313,7 @@ static struct pci_driver adl_pci8164_pci_driver = {
         .name           = "adl_pci8164",
         .id_table       = adl_pci8164_pci_table,
         .probe          = adl_pci8164_pci_probe,
-        .remove         = __devexit_p(adl_pci8164_pci_remove),
+        .remove         = adl_pci8164_pci_remove,
 };
 module_comedi_pci_driver(adl_pci8164_driver, adl_pci8164_pci_driver);
 
diff --git a/drivers/staging/comedi/drivers/adl_pci9111.c b/drivers/staging/comedi/drivers/adl_pci9111.c
index a87192ac2846..a339b9dd27cf 100644
--- a/drivers/staging/comedi/drivers/adl_pci9111.c
+++ b/drivers/staging/comedi/drivers/adl_pci9111.c
@@ -366,52 +366,29 @@ static int pci9111_ai_do_cmd_test(struct comedi_device *dev,
         if (error)
                 return 2;
 
-        /*  Step 3 : make sure arguments are trivialy compatible */
+        /* Step 3: check if arguments are trivially valid */
 
-        if ((cmd->start_src == TRIG_NOW) && (cmd->start_arg != 0)) {
-                cmd->start_arg = 0;
-                error++;
-        }
+        error |= cfc_check_trigger_arg_is(&cmd->start_arg, 0);
 
-        if ((cmd->convert_src == TRIG_TIMER) &&
-            (cmd->convert_arg < PCI9111_AI_ACQUISITION_PERIOD_MIN_NS)) {
-                cmd->convert_arg = PCI9111_AI_ACQUISITION_PERIOD_MIN_NS;
-                error++;
-        }
-        if ((cmd->convert_src == TRIG_EXT) && (cmd->convert_arg != 0)) {
-                cmd->convert_arg = 0;
-                error++;
-        }
+        if (cmd->convert_src == TRIG_TIMER)
+                error |= cfc_check_trigger_arg_min(&cmd->convert_arg,
+                                        PCI9111_AI_ACQUISITION_PERIOD_MIN_NS);
+        else    /* TRIG_EXT */
+                error |= cfc_check_trigger_arg_is(&cmd->convert_arg, 0);
 
-        if ((cmd->scan_begin_src == TRIG_TIMER) &&
-            (cmd->scan_begin_arg < PCI9111_AI_ACQUISITION_PERIOD_MIN_NS)) {
-                cmd->scan_begin_arg = PCI9111_AI_ACQUISITION_PERIOD_MIN_NS;
-                error++;
-        }
-        if ((cmd->scan_begin_src == TRIG_FOLLOW)
-            && (cmd->scan_begin_arg != 0)) {
-                cmd->scan_begin_arg = 0;
-                error++;
-        }
-        if ((cmd->scan_begin_src == TRIG_EXT) && (cmd->scan_begin_arg != 0)) {
-                cmd->scan_begin_arg = 0;
-                error++;
-        }
+        if (cmd->scan_begin_src == TRIG_TIMER)
+                error |= cfc_check_trigger_arg_min(&cmd->scan_begin_arg,
+                                        PCI9111_AI_ACQUISITION_PERIOD_MIN_NS);
+        else    /* TRIG_FOLLOW || TRIG_EXT */
+                error |= cfc_check_trigger_arg_is(&cmd->scan_begin_arg, 0);
 
-        if ((cmd->scan_end_src == TRIG_COUNT) &&
-            (cmd->scan_end_arg != cmd->chanlist_len)) {
-                cmd->scan_end_arg = cmd->chanlist_len;
-                error++;
-        }
+        error |= cfc_check_trigger_arg_is(&cmd->scan_end_arg,
+                                          cmd->chanlist_len);
 
-        if ((cmd->stop_src == TRIG_COUNT) && (cmd->stop_arg < 1)) {
-                cmd->stop_arg = 1;
-                error++;
-        }
-        if ((cmd->stop_src == TRIG_NONE) && (cmd->stop_arg != 0)) {
-                cmd->stop_arg = 0;
-                error++;
-        }
+        if (cmd->stop_src == TRIG_COUNT)
+                error |= cfc_check_trigger_arg_min(&cmd->stop_arg, 1);
+        else    /* TRIG_NONE */
+                error |= cfc_check_trigger_arg_is(&cmd->stop_arg, 0);
 
         if (error)
                 return 3;
@@ -879,20 +856,20 @@ static int pci9111_reset(struct comedi_device *dev)
         return 0;
 }
 
-static int pci9111_attach_pci(struct comedi_device *dev,
-                              struct pci_dev *pcidev)
+static int pci9111_auto_attach(struct comedi_device *dev,
+                                         unsigned long context_unused)
 {
+        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
         struct pci9111_private_data *dev_private;
         struct comedi_subdevice *s;
         int ret;
 
-        comedi_set_hw_dev(dev, &pcidev->dev);
         dev->board_name = dev->driver->driver_name;
 
-        ret = alloc_private(dev, sizeof(*dev_private));
-        if (ret)
-                return ret;
-        dev_private = dev->private;
+        dev_private = kzalloc(sizeof(*dev_private), GFP_KERNEL);
+        if (!dev_private)
+                return -ENOMEM;
+        dev->private = dev_private;
 
         ret = comedi_pci_enable(pcidev, dev->board_name);
         if (ret)
@@ -976,17 +953,17 @@ static void pci9111_detach(struct comedi_device *dev)
 static struct comedi_driver adl_pci9111_driver = {
         .driver_name    = "adl_pci9111",
         .module         = THIS_MODULE,
-        .attach_pci     = pci9111_attach_pci,
+        .auto_attach    = pci9111_auto_attach,
         .detach         = pci9111_detach,
 };
 
-static int __devinit pci9111_pci_probe(struct pci_dev *dev,
+static int pci9111_pci_probe(struct pci_dev *dev,
                                        const struct pci_device_id *ent)
 {
         return comedi_pci_auto_config(dev, &adl_pci9111_driver);
 }
 
-static void __devexit pci9111_pci_remove(struct pci_dev *dev)
+static void pci9111_pci_remove(struct pci_dev *dev)
 {
         comedi_pci_auto_unconfig(dev);
 }
@@ -1002,7 +979,7 @@ static struct pci_driver adl_pci9111_pci_driver = {
         .name           = "adl_pci9111",
         .id_table       = pci9111_pci_table,
         .probe          = pci9111_pci_probe,
-        .remove         = __devexit_p(pci9111_pci_remove),
+        .remove         = pci9111_pci_remove,
 };
 module_comedi_pci_driver(adl_pci9111_driver, adl_pci9111_pci_driver);
 
diff --git a/drivers/staging/comedi/drivers/adl_pci9118.c b/drivers/staging/comedi/drivers/adl_pci9118.c
index 06ff65c85c9f..b6dda809bd13 100644
--- a/drivers/staging/comedi/drivers/adl_pci9118.c
+++ b/drivers/staging/comedi/drivers/adl_pci9118.c
@@ -62,6 +62,20 @@ Configuration options:
         256|=ignore nFull - A/D FIFO Full status
 
 */
+
+/*
+ * FIXME
+ *
+ * All the supported boards have the same PCI vendor and device IDs, so
+ * auto-attachment of PCI devices will always find the first board type.
+ *
+ * Perhaps the boards have different subdevice IDs that we could use to
+ * distinguish them?
+ *
+ * Need some device attributes so the board type can be corrected after
+ * attachment if necessary, and possibly to set other options supported by
+ * manual attachment.
+ */
 #include "../comedidev.h"
 
 #include <linux/delay.h>
@@ -73,8 +87,6 @@ Configuration options:
 #include "8253.h"
 #include "comedi_fc.h"
 
-#define PCI_VENDOR_ID_AMCC      0x10e8
-
 /* paranoid checks are broken */
 #undef PCI9118_PARANOIDCHECK    /*
                                  * if defined, then is used code which control
@@ -210,8 +222,7 @@ static const struct comedi_lrange range_pci9118hg = { 8, {
 
 struct boardtype {
         const char *name;               /* board name */
-        int vendor_id;                  /* PCI vendor a device ID of card */
-        int device_id;
+        int device_id;                  /* PCI device ID of card */
         int iorange_amcc;               /* iorange for own S5933 region */
         int iorange_9118;               /* pass thru card region size */
         int n_aichan;                   /* num of A/D chans */
@@ -235,6 +246,61 @@ struct boardtype {
 
 };
 
+static const struct boardtype boardtypes[] = {
+        {
+                .name           = "pci9118dg",
+                .device_id      = 0x80d9,
+                .iorange_amcc   = AMCC_OP_REG_SIZE,
+                .iorange_9118   = IORANGE_9118,
+                .n_aichan       = 16,
+                .n_aichand      = 8,
+                .mux_aichan     = 256,
+                .n_aichanlist   = PCI9118_CHANLEN,
+                .n_aochan       = 2,
+                .ai_maxdata     = 0x0fff,
+                .ao_maxdata     = 0x0fff,
+                .rangelist_ai   = &range_pci9118dg_hr,
+                .rangelist_ao   = &range_bipolar10,
+                .ai_ns_min      = 3000,
+                .ai_pacer_min   = 12,
+                .half_fifo_size = 512,
+        }, {
+                .name           = "pci9118hg",
+                .device_id      = 0x80d9,
+                .iorange_amcc   = AMCC_OP_REG_SIZE,
+                .iorange_9118   = IORANGE_9118,
+                .n_aichan       = 16,
+                .n_aichand      = 8,
+                .mux_aichan     = 256,
+                .n_aichanlist   = PCI9118_CHANLEN,
+                .n_aochan       = 2,
+                .ai_maxdata     = 0x0fff,
+                .ao_maxdata     = 0x0fff,
+                .rangelist_ai   = &range_pci9118hg,
+                .rangelist_ao   = &range_bipolar10,
+                .ai_ns_min      = 3000,
+                .ai_pacer_min   = 12,
+                .half_fifo_size = 512,
+        }, {
+                .name           = "pci9118hr",
+                .device_id      = 0x80d9,
+                .iorange_amcc   = AMCC_OP_REG_SIZE,
+                .iorange_9118   = IORANGE_9118,
+                .n_aichan       = 16,
+                .n_aichand      = 8,
+                .mux_aichan     = 256,
+                .n_aichanlist   = PCI9118_CHANLEN,
+                .n_aochan       = 2,
+                .ai_maxdata     = 0xffff,
+                .ao_maxdata     = 0x0fff,
+                .rangelist_ai   = &range_pci9118dg_hr,
+                .rangelist_ao   = &range_bipolar10,
+                .ai_ns_min      = 10000,
+                .ai_pacer_min   = 40,
+                .half_fifo_size = 512,
+        },
+};
+
 struct pci9118_private {
         unsigned long iobase_a; /* base+size for AMCC chip */
         unsigned int master;    /* master capable */
@@ -358,10 +424,8 @@ static int check_channel_list(struct comedi_device *dev,
                 return 0;
         }
         if ((frontadd + n_chan + backadd) > s->len_chanlist) {
-                printk
-                    ("comedi%d: range/channel list is too long for "
-                                                "actual configuration (%d>%d)!",
-                     dev->minor, n_chan, s->len_chanlist - frontadd - backadd);
+                comedi_error(dev,
+                            "range/channel list is too long for actual configuration!\n");
                 return 0;
         }
 
@@ -892,11 +956,10 @@ static void interrupt_pci9118_ai_onesample(struct comedi_device *dev,
         if (devpriv->ai16bits == 0) {
                 if ((sampl & 0x000f) != devpriv->chanlist[s->async->cur_chan]) {
                                                         /* data dropout! */
-                        printk
-                            ("comedi: A/D  SAMPL - data dropout: "
-                                "received channel %d, expected %d!\n",
-                                sampl & 0x000f,
-                                devpriv->chanlist[s->async->cur_chan]);
+                        dev_info(dev->class_dev,
+                                 "A/D  SAMPL - data dropout: received channel %d, expected %d!\n",
+                                 sampl & 0x000f,
+                                 devpriv->chanlist[s->async->cur_chan]);
                         s->async->events |= COMEDI_CB_ERROR | COMEDI_CB_EOA;
                         pci9118_ai_cancel(dev, s);
                         comedi_event(dev, s);
@@ -1153,19 +1216,13 @@ static int pci9118_ai_cmdtest(struct comedi_device *dev,
         if (err)
                 return 2;
 
-        /* step 3: make sure arguments are trivially compatible */
+        /* Step 3: check if arguments are trivially valid */
 
         if (cmd->start_src & (TRIG_NOW | TRIG_EXT))
-                if (cmd->start_arg != 0) {
-                        cmd->start_arg = 0;
-                        err++;
-                }
+                err |= cfc_check_trigger_arg_is(&cmd->start_arg, 0);
 
         if (cmd->scan_begin_src & (TRIG_FOLLOW | TRIG_EXT))
-                if (cmd->scan_begin_arg != 0) {
-                        cmd->scan_begin_arg = 0;
-                        err++;
-                }
+                err |= cfc_check_trigger_arg_is(&cmd->scan_begin_arg, 0);
 
         if ((cmd->scan_begin_src == TRIG_TIMER) &&
             (cmd->convert_src == TRIG_TIMER) && (cmd->scan_end_arg == 1)) {
@@ -1175,64 +1232,40 @@ static int pci9118_ai_cmdtest(struct comedi_device *dev,
         }
 
         if (cmd->scan_begin_src == TRIG_TIMER)
-                if (cmd->scan_begin_arg < this_board->ai_ns_min) {
-                        cmd->scan_begin_arg = this_board->ai_ns_min;
-                        err++;
-                }
+                err |= cfc_check_trigger_arg_min(&cmd->scan_begin_arg,
+                                                 this_board->ai_ns_min);
 
         if (cmd->scan_begin_src == TRIG_EXT)
                 if (cmd->scan_begin_arg) {
                         cmd->scan_begin_arg = 0;
-                        err++;
-                        if (cmd->scan_end_arg > 65535) {
-                                cmd->scan_end_arg = 65535;
-                                err++;
-                        }
+                        err |= -EINVAL;
+                        err |= cfc_check_trigger_arg_max(&cmd->scan_end_arg,
+                                                         65535);
                 }
 
         if (cmd->convert_src & (TRIG_TIMER | TRIG_NOW))
-                if (cmd->convert_arg < this_board->ai_ns_min) {
-                        cmd->convert_arg = this_board->ai_ns_min;
-                        err++;
-                }
+                err |= cfc_check_trigger_arg_min(&cmd->convert_arg,
+                                                 this_board->ai_ns_min);
 
         if (cmd->convert_src == TRIG_EXT)
-                if (cmd->convert_arg) {
-                        cmd->convert_arg = 0;
-                        err++;
-                }
+                err |= cfc_check_trigger_arg_is(&cmd->convert_arg, 0);
 
-        if (cmd->stop_src == TRIG_COUNT) {
-                if (!cmd->stop_arg) {
-                        cmd->stop_arg = 1;
-                        err++;
-                }
-        } else {                /* TRIG_NONE */
-                if (cmd->stop_arg != 0) {
-                        cmd->stop_arg = 0;
-                        err++;
-                }
-        }
+        if (cmd->stop_src == TRIG_COUNT)
+                err |= cfc_check_trigger_arg_min(&cmd->stop_arg, 1);
+        else    /* TRIG_NONE */
+                err |= cfc_check_trigger_arg_is(&cmd->stop_arg, 0);
 
-        if (!cmd->chanlist_len) {
-                cmd->chanlist_len = 1;
-                err++;
-        }
+        err |= cfc_check_trigger_arg_min(&cmd->chanlist_len, 1);
+        err |= cfc_check_trigger_arg_max(&cmd->chanlist_len,
+                                         this_board->n_aichanlist);
 
-        if (cmd->chanlist_len > this_board->n_aichanlist) {
-                cmd->chanlist_len = this_board->n_aichanlist;
-                err++;
-        }
-
-        if (cmd->scan_end_arg < cmd->chanlist_len) {
-                cmd->scan_end_arg = cmd->chanlist_len;
-                err++;
-        }
+        err |= cfc_check_trigger_arg_min(&cmd->scan_end_arg,
+                                         cmd->chanlist_len);
 
         if ((cmd->scan_end_arg % cmd->chanlist_len)) {
                 cmd->scan_end_arg =
                     cmd->chanlist_len * (cmd->scan_end_arg / cmd->chanlist_len);
-                err++;
+                err |= -EINVAL;
         }
 
         if (err)
@@ -1318,21 +1351,18 @@ static int Compute_and_setup_dma(struct comedi_device *dev)
                 if (dmalen0 < (devpriv->ai_n_realscanlen << 1)) {
                         /* uff, too short DMA buffer, disable EOS support! */
                         devpriv->ai_flags &= (~TRIG_WAKE_EOS);
-                        printk
-                            ("comedi%d: WAR: DMA0 buf too short, can't "
-                                        "support TRIG_WAKE_EOS (%d<%d)\n",
-                             dev->minor, dmalen0,
-                             devpriv->ai_n_realscanlen << 1);
+                        dev_info(dev->class_dev,
+                                 "WAR: DMA0 buf too short, can't support TRIG_WAKE_EOS (%d<%d)\n",
+                                  dmalen0, devpriv->ai_n_realscanlen << 1);
                 } else {
                         /* short first DMA buffer to one scan */
                         dmalen0 = devpriv->ai_n_realscanlen << 1;
                         if (devpriv->useeoshandle)
                                 dmalen0 += 2;
                         if (dmalen0 < 4) {
-                                printk
-                                        ("comedi%d: ERR: DMA0 buf len bug? "
-                                                                "(%d<4)\n",
-                                        dev->minor, dmalen0);
+                                dev_info(dev->class_dev,
+                                         "ERR: DMA0 buf len bug? (%d<4)\n",
+                                         dmalen0);
                                 dmalen0 = 4;
                         }
                 }
@@ -1341,21 +1371,18 @@ static int Compute_and_setup_dma(struct comedi_device *dev)
                 if (dmalen1 < (devpriv->ai_n_realscanlen << 1)) {
                         /* uff, too short DMA buffer, disable EOS support! */
                         devpriv->ai_flags &= (~TRIG_WAKE_EOS);
-                        printk
-                            ("comedi%d: WAR: DMA1 buf too short, "
-                                        "can't support TRIG_WAKE_EOS (%d<%d)\n",
-                             dev->minor, dmalen1,
-                             devpriv->ai_n_realscanlen << 1);
+                        dev_info(dev->class_dev,
+                                 "WAR: DMA1 buf too short, can't support TRIG_WAKE_EOS (%d<%d)\n",
+                                 dmalen1, devpriv->ai_n_realscanlen << 1);
                 } else {
                         /* short second DMA buffer to one scan */
                         dmalen1 = devpriv->ai_n_realscanlen << 1;
                         if (devpriv->useeoshandle)
                                 dmalen1 -= 2;
                         if (dmalen1 < 4) {
-                                printk
-                                        ("comedi%d: ERR: DMA1 buf len bug? "
-                                                                "(%d<4)\n",
-                                        dev->minor, dmalen1);
+                                dev_info(dev->class_dev,
+                                         "ERR: DMA1 buf len bug? (%d<4)\n",
+                                         dmalen1);
                                 dmalen1 = 4;
                         }
                 }
@@ -1865,6 +1892,20 @@ static int pci9118_reset(struct comedi_device *dev)
         return 0;
 }
 
+/*
+ * FIXME - this is pretty ineffective because all the supported board types
+ * have the same device ID!
+ */
+static const struct boardtype *pci9118_find_boardinfo(struct pci_dev *pcidev)
+{
+        unsigned int i;
+
+        for (i = 0; i < ARRAY_SIZE(boardtypes); i++)
+                if (pcidev->device == boardtypes[i].device_id)
+                        return &boardtypes[i];
+        return NULL;
+}
+
 static struct pci_dev *pci9118_find_pci(struct comedi_device *dev,
                                         struct comedi_devconfig *it)
 {
@@ -1884,85 +1925,63 @@ static struct pci_dev *pci9118_find_pci(struct comedi_device *dev,
                             PCI_SLOT(pcidev->devfn) != slot)
                                 continue;
                 }
-                /*
-                 * Look for device that isn't in use.
-                 * Enable PCI device and request regions.
-                 */
-                if (comedi_pci_enable(pcidev, "adl_pci9118"))
-                        continue;
-                printk(KERN_ERR ", b:s:f=%d:%d:%d, io=0x%4lx, 0x%4lx",
-                        pcidev->bus->number,
-                        PCI_SLOT(pcidev->devfn),
-                        PCI_FUNC(pcidev->devfn),
-                        (unsigned long)pci_resource_start(pcidev, 2),
-                        (unsigned long)pci_resource_start(pcidev, 0));
                 return pcidev;
         }
-        printk(KERN_ERR
-                "comedi%d: no supported board found! (req. bus/slot : %d/%d)\n",
-                dev->minor, bus, slot);
+        dev_err(dev->class_dev,
+                "no supported board found! (req. bus/slot : %d/%d)\n",
+                bus, slot);
         return NULL;
 }
 
-static int pci9118_attach(struct comedi_device *dev,
-                          struct comedi_devconfig *it)
+static void pci9118_report_attach(struct comedi_device *dev, unsigned int irq)
+{
+        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
+        struct pci9118_private *devpriv = dev->private;
+        char irqbuf[30];
+        char muxbuf[30];
+
+        if (irq)
+                snprintf(irqbuf, sizeof(irqbuf), "irq %u%s", irq,
+                         (dev->irq ? "" : " UNAVAILABLE"));
+        else
+                snprintf(irqbuf, sizeof(irqbuf), "irq DISABLED");
+        if (devpriv->usemux)
+                snprintf(muxbuf, sizeof(muxbuf), "ext mux %u chans",
+                         devpriv->usemux);
+        else
+                snprintf(muxbuf, sizeof(muxbuf), "no ext mux");
+        dev_info(dev->class_dev, "%s (pci %s, %s, %sbus master, %s) attached\n",
+                 dev->board_name, pci_name(pcidev), irqbuf,
+                 (devpriv->master ? "" : "no "), muxbuf);
+}
+
+static int pci9118_common_attach(struct comedi_device *dev, int disable_irq,
+                                 int master, int ext_mux, int softsshdelay,
+                                 int hw_err_mask)
 {
         const struct boardtype *this_board = comedi_board(dev);
-        struct pci9118_private *devpriv;
-        struct pci_dev *pcidev;
+        struct pci9118_private *devpriv = dev->private;
+        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
         struct comedi_subdevice *s;
         int ret, pages, i;
-        unsigned short master;
         unsigned int irq;
         u16 u16w;
 
-        printk("comedi%d: adl_pci9118: board=%s", dev->minor, this_board->name);
-
-        if (it->options[3] & 1)
-                master = 0;     /* user don't want use bus master */
-        else
-                master = 1;
-
-        ret = alloc_private(dev, sizeof(*devpriv));
-        if (ret < 0) {
-                printk(" - Allocation failed!\n");
-                return -ENOMEM;
+        dev->board_name = this_board->name;
+        ret = comedi_pci_enable(pcidev, dev->board_name);
+        if (ret) {
+                dev_err(dev->class_dev,
+                        "cannot enable PCI device %s\n", pci_name(pcidev));
+                return ret;
         }
-        devpriv = dev->private;
-
-        pcidev = pci9118_find_pci(dev, it);
-        if (!pcidev)
-                return -EIO;
-        comedi_set_hw_dev(dev, &pcidev->dev);
-
         if (master)
                 pci_set_master(pcidev);
 
-        irq = pcidev->irq;
         devpriv->iobase_a = pci_resource_start(pcidev, 0);
         dev->iobase = pci_resource_start(pcidev, 2);
 
-        dev->board_name = this_board->name;
-
         pci9118_reset(dev);
 
-        if (it->options[3] & 2)
-                irq = 0;        /* user don't want use IRQ */
-        if (irq > 0) {
-                if (request_irq(irq, interrupt_pci9118, IRQF_SHARED,
-                                "ADLink PCI-9118", dev)) {
-                        printk(", unable to allocate IRQ %d, DISABLING IT",
-                               irq);
-                        irq = 0;        /* Can't use IRQ */
-                } else {
-                        printk(", irq=%u", irq);
-                }
-        } else {
-                printk(", IRQ disabled");
-        }
-
-        dev->irq = irq;
-
         if (master) {           /* alloc DMA buffers */
                 devpriv->dma_doublebuf = 0;
                 for (i = 0; i < 2; i++) {
@@ -1984,47 +2003,37 @@ static int pci9118_attach(struct comedi_device *dev,
                         }
                 }
                 if (!devpriv->dmabuf_virt[0]) {
-                        printk(", Can't allocate DMA buffer, DMA disabled!");
+                        dev_warn(dev->class_dev,
+                                 "Can't allocate DMA buffer, DMA disabled!\n");
                         master = 0;
                 }
-
                 if (devpriv->dmabuf_virt[1])
                         devpriv->dma_doublebuf = 1;
-
         }
-
         devpriv->master = master;
-        if (devpriv->master)
-                printk(", bus master");
-        else
-                printk(", no bus master");
-
-        devpriv->usemux = 0;
-        if (it->options[2] > 0) {
-                devpriv->usemux = it->options[2];
-                if (devpriv->usemux > 256)
-                        devpriv->usemux = 256;  /* max 256 channels! */
-                if (it->options[4] > 0)
-                        if (devpriv->usemux > 128) {
-                                devpriv->usemux = 128;
-                                        /* max 128 channels with softare S&H! */
-                        }
-                printk(", ext. mux %d channels", devpriv->usemux);
+
+        if (ext_mux > 0) {
+                if (ext_mux > 256)
+                        ext_mux = 256;  /* max 256 channels! */
+                if (softsshdelay > 0)
+                        if (ext_mux > 128)
+                                ext_mux = 128;
+                devpriv->usemux = ext_mux;
+        } else {
+                devpriv->usemux = 0;
         }
 
-        devpriv->softsshdelay = it->options[4];
-        if (devpriv->softsshdelay < 0) {
-                                        /* select sample&hold signal polarity */
-                devpriv->softsshdelay = -devpriv->softsshdelay;
+        if (softsshdelay < 0) {
+                /* select sample&hold signal polarity */
+                devpriv->softsshdelay = -softsshdelay;
                 devpriv->softsshsample = 0x80;
                 devpriv->softsshhold = 0x00;
         } else {
+                devpriv->softsshdelay = softsshdelay;
                 devpriv->softsshsample = 0x00;
                 devpriv->softsshhold = 0x80;
         }
 
-        printk(".\n");
-
         pci_read_config_word(pcidev, PCI_COMMAND, &u16w);
         pci_write_config_word(pcidev, PCI_COMMAND, u16w | 64);
                                 /* Enable parity check for parity error */
@@ -2047,12 +2056,7 @@ static int pci9118_attach(struct comedi_device *dev,
         s->range_table = this_board->rangelist_ai;
         s->cancel = pci9118_ai_cancel;
         s->insn_read = pci9118_insn_read_ai;
-        if (dev->irq) {
-                s->subdev_flags |= SDF_CMD_READ;
-                s->do_cmdtest = pci9118_ai_cmdtest;
-                s->do_cmd = pci9118_ai_cmd;
-                s->munge = pci9118_ai_munge;
-        }
+        s->munge = pci9118_ai_munge;
 
         s = &dev->subdevices[1];
         s->type = COMEDI_SUBD_AO;
@@ -2088,8 +2092,8 @@ static int pci9118_attach(struct comedi_device *dev,
         devpriv->i8254_osc_base = 250;  /* 250ns=4MHz */
         devpriv->ai_maskharderr = 0x10a;
                                         /* default measure crash condition */
-        if (it->options[5])             /* disable some requested */
-                devpriv->ai_maskharderr &= ~it->options[5];
+        if (hw_err_mask)                /* disable some requested */
+                devpriv->ai_maskharderr &= ~hw_err_mask;
 
         switch (this_board->ai_maxdata) {
         case 0xffff:
@@ -2099,9 +2103,86 @@ static int pci9118_attach(struct comedi_device *dev,
                 devpriv->ai16bits = 0;
                 break;
         }
+
+        if (disable_irq)
+                irq = 0;
+        else
+                irq = pcidev->irq;
+        if (irq > 0) {
+                if (request_irq(irq, interrupt_pci9118, IRQF_SHARED,
+                                dev->board_name, dev)) {
+                        dev_warn(dev->class_dev,
+                                 "unable to allocate IRQ %u, DISABLING IT\n",
+                                 irq);
+                } else {
+                        dev->irq = irq;
+                        /* Enable AI commands */
+                        s = &dev->subdevices[0];
+                        s->subdev_flags |= SDF_CMD_READ;
+                        s->do_cmdtest = pci9118_ai_cmdtest;
+                        s->do_cmd = pci9118_ai_cmd;
+                }
+        }
+
+        pci9118_report_attach(dev, irq);
         return 0;
 }
 
+static int pci9118_attach(struct comedi_device *dev,
+                          struct comedi_devconfig *it)
+{
+        struct pci9118_private *devpriv;
+        struct pci_dev *pcidev;
+        int ext_mux, disable_irq, master, softsshdelay, hw_err_mask;
+
+        ext_mux = it->options[2];
+        master = ((it->options[3] & 1) == 0);
+        disable_irq = ((it->options[3] & 2) != 0);
+        softsshdelay = it->options[4];
+        hw_err_mask = it->options[5];
+
+        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
+        if (!devpriv)
+                return -ENOMEM;
+        dev->private = devpriv;
+
+        pcidev = pci9118_find_pci(dev, it);
+        if (!pcidev)
+                return -EIO;
+        comedi_set_hw_dev(dev, &pcidev->dev);
+
+        return pci9118_common_attach(dev, disable_irq, master, ext_mux,
+                                     softsshdelay, hw_err_mask);
+}
+
+static int pci9118_auto_attach(struct comedi_device *dev,
+                                         unsigned long context_unused)
+{
+        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
+        struct pci9118_private *devpriv;
+
+        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
+        if (!devpriv)
+                return -ENOMEM;
+        dev->private = devpriv;
+
+        dev->board_ptr = pci9118_find_boardinfo(pcidev);
+        if (dev->board_ptr == NULL) {
+                dev_err(dev->class_dev,
+                        "adl_pci9118: cannot determine board type for pci %s\n",
+                        pci_name(pcidev));
+                return -EINVAL;
+        }
+        /*
+         * Need to 'get' the PCI device to match the 'put' in pci9118_detach().
+         * (The 'put' also matches the implicit 'get' by pci9118_find_pci().)
+         */
+        pci_dev_get(pcidev);
+        /* Don't disable irq, use bus master, no external mux,
+         * no sample-hold delay, no error mask. */
+        return pci9118_common_attach(dev, 0, 1, 0, 0, 0);
+}
+
 static void pci9118_detach(struct comedi_device *dev)
 {
         struct pci_dev *pcidev = comedi_to_pci_dev(dev);
@@ -2127,81 +2208,24 @@ static void pci9118_detach(struct comedi_device *dev)
         }
 }
 
-static const struct boardtype boardtypes[] = {
-        {
-                .name           = "pci9118dg",
-                .vendor_id      = PCI_VENDOR_ID_AMCC,
-                .device_id      = 0x80d9,
-                .iorange_amcc   = AMCC_OP_REG_SIZE,
-                .iorange_9118   = IORANGE_9118,
-                .n_aichan       = 16,
-                .n_aichand      = 8,
-                .mux_aichan     = 256,
-                .n_aichanlist   = PCI9118_CHANLEN,
-                .n_aochan       = 2,
-                .ai_maxdata     = 0x0fff,
-                .ao_maxdata     = 0x0fff,
-                .rangelist_ai   = &range_pci9118dg_hr,
-                .rangelist_ao   = &range_bipolar10,
-                .ai_ns_min      = 3000,
-                .ai_pacer_min   = 12,
-                .half_fifo_size = 512,
-        }, {
-                .name           = "pci9118hg",
-                .vendor_id      = PCI_VENDOR_ID_AMCC,
-                .device_id      = 0x80d9,
-                .iorange_amcc   = AMCC_OP_REG_SIZE,
-                .iorange_9118   = IORANGE_9118,
-                .n_aichan       = 16,
-                .n_aichand      = 8,
-                .mux_aichan     = 256,
-                .n_aichanlist   = PCI9118_CHANLEN,
-                .n_aochan       = 2,
-                .ai_maxdata     = 0x0fff,
-                .ao_maxdata     = 0x0fff,
-                .rangelist_ai   = &range_pci9118hg,
-                .rangelist_ao   = &range_bipolar10,
-                .ai_ns_min      = 3000,
-                .ai_pacer_min   = 12,
-                .half_fifo_size = 512,
-        }, {
-                .name           = "pci9118hr",
-                .vendor_id      = PCI_VENDOR_ID_AMCC,
-                .device_id      = 0x80d9,
-                .iorange_amcc   = AMCC_OP_REG_SIZE,
-                .iorange_9118   = IORANGE_9118,
-                .n_aichan       = 16,
-                .n_aichand      = 8,
-                .mux_aichan     = 256,
-                .n_aichanlist   = PCI9118_CHANLEN,
-                .n_aochan       = 2,
-                .ai_maxdata     = 0xffff,
-                .ao_maxdata     = 0x0fff,
-                .rangelist_ai   = &range_pci9118dg_hr,
-                .rangelist_ao   = &range_bipolar10,
-                .ai_ns_min      = 10000,
-                .ai_pacer_min   = 40,
-                .half_fifo_size = 512,
-        },
-};
-
 static struct comedi_driver adl_pci9118_driver = {
         .driver_name    = "adl_pci9118",
         .module         = THIS_MODULE,
         .attach         = pci9118_attach,
+        .auto_attach    = pci9118_auto_attach,
         .detach         = pci9118_detach,
         .num_names      = ARRAY_SIZE(boardtypes),
         .board_name     = &boardtypes[0].name,
         .offset         = sizeof(struct boardtype),
 };
 
-static int __devinit adl_pci9118_pci_probe(struct pci_dev *dev,
+static int adl_pci9118_pci_probe(struct pci_dev *dev,
                                            const struct pci_device_id *ent)
 {
         return comedi_pci_auto_config(dev, &adl_pci9118_driver);
 }
 
-static void __devexit adl_pci9118_pci_remove(struct pci_dev *dev)
+static void adl_pci9118_pci_remove(struct pci_dev *dev)
 {
         comedi_pci_auto_unconfig(dev);
 }
@@ -2216,7 +2240,7 @@ static struct pci_driver adl_pci9118_pci_driver = {
         .name           = "adl_pci9118",
         .id_table       = adl_pci9118_pci_table,
         .probe          = adl_pci9118_pci_probe,
-        .remove         = __devexit_p(adl_pci9118_pci_remove),
+        .remove         = adl_pci9118_pci_remove,
 };
 module_comedi_pci_driver(adl_pci9118_driver, adl_pci9118_pci_driver);
 
diff --git a/drivers/staging/comedi/drivers/adq12b.c b/drivers/staging/comedi/drivers/adq12b.c
index 3a2aa5628be3..f7950dfe2ddb 100644
--- a/drivers/staging/comedi/drivers/adq12b.c
+++ b/drivers/staging/comedi/drivers/adq12b.c
@@ -116,15 +116,6 @@ static const struct comedi_lrange range_adq12b_ai_unipolar = { 4, {
                                                                    }
 };
 
-struct adq12b_board {
-        const char *name;
-        int ai_se_chans;
-        int ai_diff_chans;
-        int ai_bits;
-        int di_chans;
-        int do_chans;
-};
-
 struct adq12b_private {
         int unipolar;           /* option 2 of comedi_config (1 is iobase) */
         int differential;       /* option 3 of comedi_config */
@@ -220,13 +211,14 @@ static int adq12b_do_insn_bits(struct comedi_device *dev,
 
 static int adq12b_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 {
-        const struct adq12b_board *board = comedi_board(dev);
         struct adq12b_private *devpriv;
         struct comedi_subdevice *s;
         unsigned long iobase;
         int unipolar, differential;
         int ret;
 
+        dev->board_name = dev->driver->driver_name;
+
         iobase = it->options[0];
         unipolar = it->options[1];
         differential = it->options[2];
@@ -251,12 +243,10 @@ static int adq12b_attach(struct comedi_device *dev, struct comedi_devconfig *it)
         }
         dev->iobase = iobase;
 
-        dev->board_name = board->name;
-
-        ret = alloc_private(dev, sizeof(*devpriv));
-        if (ret)
-                return ret;
-        devpriv = dev->private;
+        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
+        if (!devpriv)
+                return -ENOMEM;
+        dev->private = devpriv;
 
         devpriv->unipolar = unipolar;
         devpriv->differential = differential;
@@ -277,10 +267,10 @@ static int adq12b_attach(struct comedi_device *dev, struct comedi_devconfig *it)
         s->type = COMEDI_SUBD_AI;
         if (differential) {
                 s->subdev_flags = SDF_READABLE | SDF_GROUND | SDF_DIFF;
-                s->n_chan = board->ai_diff_chans;
+                s->n_chan = 8;
         } else {
                 s->subdev_flags = SDF_READABLE | SDF_GROUND;
-                s->n_chan = board->ai_se_chans;
+                s->n_chan = 16;
         }
 
         if (unipolar)
@@ -288,7 +278,7 @@ static int adq12b_attach(struct comedi_device *dev, struct comedi_devconfig *it)
         else
                 s->range_table = &range_adq12b_ai_bipolar;
 
-        s->maxdata = (1 << board->ai_bits) - 1;
+        s->maxdata = 0xfff;
 
         s->len_chanlist = 4;    /* This is the maximum chanlist length that
                                    the board can handle */
@@ -298,7 +288,7 @@ static int adq12b_attach(struct comedi_device *dev, struct comedi_devconfig *it)
         /* digital input subdevice */
         s->type = COMEDI_SUBD_DI;
         s->subdev_flags = SDF_READABLE;
-        s->n_chan = board->di_chans;
+        s->n_chan = 5;
         s->maxdata = 1;
         s->range_table = &range_digital;
         s->insn_bits = adq12b_di_insn_bits;
@@ -307,7 +297,7 @@ static int adq12b_attach(struct comedi_device *dev, struct comedi_devconfig *it)
         /* digital output subdevice */
         s->type = COMEDI_SUBD_DO;
         s->subdev_flags = SDF_WRITABLE;
-        s->n_chan = board->do_chans;
+        s->n_chan = 8;
         s->maxdata = 1;
         s->range_table = &range_digital;
         s->insn_bits = adq12b_do_insn_bits;
@@ -323,25 +313,11 @@ static void adq12b_detach(struct comedi_device *dev)
                 release_region(dev->iobase, ADQ12B_SIZE);
 }
 
-static const struct adq12b_board adq12b_boards[] = {
-        {
-                .name           = "adq12b",
-                .ai_se_chans    = 16,
-                .ai_diff_chans  = 8,
-                .ai_bits        = 12,
-                .di_chans       = 5,
-                .do_chans       = 8,
-        },
-};
-
 static struct comedi_driver adq12b_driver = {
         .driver_name    = "adq12b",
         .module         = THIS_MODULE,
         .attach         = adq12b_attach,
         .detach         = adq12b_detach,
-        .board_name     = &adq12b_boards[0].name,
-        .offset         = sizeof(struct adq12b_board),
-        .num_names      = ARRAY_SIZE(adq12b_boards),
 };
 module_comedi_driver(adq12b_driver);
 
diff --git a/drivers/staging/comedi/drivers/adv_pci1710.c b/drivers/staging/comedi/drivers/adv_pci1710.c
index def37bcc2a66..a6fd8c2c16ca 100644
--- a/drivers/staging/comedi/drivers/adv_pci1710.c
+++ b/drivers/staging/comedi/drivers/adv_pci1710.c
@@ -53,8 +53,6 @@ Configuration options:
                                  * correct channel number on every 12 bit
                                  * sample */
 
-#define PCI_VENDOR_ID_ADVANTECH         0x13fe
-
 /* hardware types of the cards */
 #define TYPE_PCI171X    0
 #define TYPE_PCI1713    2
@@ -1068,45 +1066,23 @@ static int pci171x_ai_cmdtest(struct comedi_device *dev,
         if (err)
                 return 2;
 
-        /* step 3: make sure arguments are trivially compatible */
+        /* Step 3: check if arguments are trivially valid */
 
-        if (cmd->start_arg != 0) {
-                cmd->start_arg = 0;
-                err++;
-        }
+        err |= cfc_check_trigger_arg_is(&cmd->start_arg, 0);
+        err |= cfc_check_trigger_arg_is(&cmd->scan_begin_arg, 0);
 
-        if (cmd->scan_begin_arg != 0) {
-                cmd->scan_begin_arg = 0;
-                err++;
-        }
+        if (cmd->convert_src == TRIG_TIMER)
+                err |= cfc_check_trigger_arg_min(&cmd->convert_arg,
+                                                 this_board->ai_ns_min);
+        else    /* TRIG_FOLLOW */
+                err |= cfc_check_trigger_arg_is(&cmd->convert_arg, 0);
 
-        if (cmd->convert_src == TRIG_TIMER) {
-                if (cmd->convert_arg < this_board->ai_ns_min) {
-                        cmd->convert_arg = this_board->ai_ns_min;
-                        err++;
-                }
-        } else {                /* TRIG_FOLLOW */
-                if (cmd->convert_arg != 0) {
-                        cmd->convert_arg = 0;
-                        err++;
-                }
-        }
+        err |= cfc_check_trigger_arg_is(&cmd->scan_end_arg, cmd->chanlist_len);
 
-        if (cmd->scan_end_arg != cmd->chanlist_len) {
-                cmd->scan_end_arg = cmd->chanlist_len;
-                err++;
-        }
-        if (cmd->stop_src == TRIG_COUNT) {
-                if (!cmd->stop_arg) {
-                        cmd->stop_arg = 1;
-                        err++;
-                }
-        } else {                /* TRIG_NONE */
-                if (cmd->stop_arg != 0) {
-                        cmd->stop_arg = 0;
-                        err++;
-                }
-        }
+        if (cmd->stop_src == TRIG_COUNT)
+                err |= cfc_check_trigger_arg_min(&cmd->stop_arg, 1);
+        else    /* TRIG_NONE */
+                err |= cfc_check_trigger_arg_is(&cmd->stop_arg, 0);
 
         if (err)
                 return 3;
@@ -1257,26 +1233,25 @@ static const void *pci1710_find_boardinfo(struct comedi_device *dev,
         return NULL;
 }
 
-static int pci1710_attach_pci(struct comedi_device *dev,
-                              struct pci_dev *pcidev)
+static int pci1710_auto_attach(struct comedi_device *dev,
+                                         unsigned long context_unused)
 {
+        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
         const struct boardtype *this_board;
         struct pci1710_private *devpriv;
         struct comedi_subdevice *s;
         int ret, subdev, n_subdevices;
 
-        comedi_set_hw_dev(dev, &pcidev->dev);
-
         this_board = pci1710_find_boardinfo(dev, pcidev);
         if (!this_board)
                 return -ENODEV;
         dev->board_ptr = this_board;
         dev->board_name = this_board->name;
 
-        ret = alloc_private(dev, sizeof(*devpriv));
-        if (ret < 0)
-                return ret;
-        devpriv = dev->private;
+        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
+        if (!devpriv)
+                return -ENOMEM;
+        dev->private = devpriv;
 
         ret = comedi_pci_enable(pcidev, dev->board_name);
         if (ret)
@@ -1417,17 +1392,17 @@ static void pci1710_detach(struct comedi_device *dev)
 static struct comedi_driver adv_pci1710_driver = {
         .driver_name    = "adv_pci1710",
         .module         = THIS_MODULE,
-        .attach_pci     = pci1710_attach_pci,
+        .auto_attach    = pci1710_auto_attach,
         .detach         = pci1710_detach,
 };
 
-static int __devinit adv_pci1710_pci_probe(struct pci_dev *dev,
+static int adv_pci1710_pci_probe(struct pci_dev *dev,
                                            const struct pci_device_id *ent)
 {
         return comedi_pci_auto_config(dev, &adv_pci1710_driver);
 }
 
-static void __devexit adv_pci1710_pci_remove(struct pci_dev *dev)
+static void adv_pci1710_pci_remove(struct pci_dev *dev)
 {
         comedi_pci_auto_unconfig(dev);
 }
@@ -1446,7 +1421,7 @@ static struct pci_driver adv_pci1710_pci_driver = {
         .name           = "adv_pci1710",
         .id_table       = adv_pci1710_pci_table,
         .probe          = adv_pci1710_pci_probe,
-        .remove         = __devexit_p(adv_pci1710_pci_remove),
+        .remove         = adv_pci1710_pci_remove,
 };
 module_comedi_pci_driver(adv_pci1710_driver, adv_pci1710_pci_driver);
 
diff --git a/drivers/staging/comedi/drivers/adv_pci1723.c b/drivers/staging/comedi/drivers/adv_pci1723.c
index df4efc0606de..5af73146dd85 100644
--- a/drivers/staging/comedi/drivers/adv_pci1723.c
+++ b/drivers/staging/comedi/drivers/adv_pci1723.c
@@ -50,8 +50,6 @@ TODO:
 
 #include "../comedidev.h"
 
-#define PCI_VENDOR_ID_ADVANTECH         0x13fe  /* Advantech PCI vendor ID */
-
 /* all the registers for the pci1723 board */
 #define PCI1723_DA(N)   ((N)<<1)        /* W: D/A register N (0 to 7) */
 
@@ -234,20 +232,20 @@ static int pci1723_dio_insn_bits(struct comedi_device *dev,
         return insn->n;
 }
 
-static int pci1723_attach_pci(struct comedi_device *dev,
-                              struct pci_dev *pcidev)
+static int pci1723_auto_attach(struct comedi_device *dev,
+                                         unsigned long context_unused)
 {
+        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
         struct pci1723_private *devpriv;
         struct comedi_subdevice *s;
         int ret;
 
-        comedi_set_hw_dev(dev, &pcidev->dev);
         dev->board_name = dev->driver->driver_name;
 
-        ret = alloc_private(dev, sizeof(*devpriv));
-        if (ret < 0)
-                return ret;
-        devpriv = dev->private;
+        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
+        if (!devpriv)
+                return -ENOMEM;
+        dev->private = devpriv;
 
         ret = comedi_pci_enable(pcidev, dev->board_name);
         if (ret)
@@ -319,17 +317,17 @@ static void pci1723_detach(struct comedi_device *dev)
 static struct comedi_driver adv_pci1723_driver = {
         .driver_name    = "adv_pci1723",
         .module         = THIS_MODULE,
-        .attach_pci     = pci1723_attach_pci,
+        .auto_attach    = pci1723_auto_attach,
         .detach         = pci1723_detach,
 };
 
-static int __devinit adv_pci1723_pci_probe(struct pci_dev *dev,
+static int adv_pci1723_pci_probe(struct pci_dev *dev,
                                            const struct pci_device_id *ent)
 {
         return comedi_pci_auto_config(dev, &adv_pci1723_driver);
 }
 
-static void __devexit adv_pci1723_pci_remove(struct pci_dev *dev)
+static void adv_pci1723_pci_remove(struct pci_dev *dev)
 {
         comedi_pci_auto_unconfig(dev);
 }
@@ -344,7 +342,7 @@ static struct pci_driver adv_pci1723_pci_driver = {
         .name           = "adv_pci1723",
         .id_table       = adv_pci1723_pci_table,
         .probe          = adv_pci1723_pci_probe,
-        .remove         = __devexit_p(adv_pci1723_pci_remove),
+        .remove         = adv_pci1723_pci_remove,
 };
 module_comedi_pci_driver(adv_pci1723_driver, adv_pci1723_pci_driver);
 
diff --git a/drivers/staging/comedi/drivers/adv_pci_dio.c b/drivers/staging/comedi/drivers/adv_pci_dio.c
index a3c22419cd5f..05a663e970c6 100644
--- a/drivers/staging/comedi/drivers/adv_pci_dio.c
+++ b/drivers/staging/comedi/drivers/adv_pci_dio.c
@@ -36,8 +36,6 @@ Configuration options:
 #include "8255.h"
 #include "8253.h"
 
-#define PCI_VENDOR_ID_ADVANTECH         0x13fe
-
 /* hardware types of the cards */
 enum hw_cards_id {
         TYPE_PCI1730, TYPE_PCI1733, TYPE_PCI1734, TYPE_PCI1735, TYPE_PCI1736,
@@ -1092,26 +1090,25 @@ static const void *pci_dio_find_boardinfo(struct comedi_device *dev,
         return NULL;
 }
 
-static int pci_dio_attach_pci(struct comedi_device *dev,
-                              struct pci_dev *pcidev)
+static int pci_dio_auto_attach(struct comedi_device *dev,
+                                         unsigned long context_unused)
 {
+        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
         const struct dio_boardtype *this_board;
         struct pci_dio_private *devpriv;
         struct comedi_subdevice *s;
         int ret, subdev, i, j;
 
-        comedi_set_hw_dev(dev, &pcidev->dev);
-
         this_board = pci_dio_find_boardinfo(dev, pcidev);
         if (!this_board)
                 return -ENODEV;
         dev->board_ptr = this_board;
         dev->board_name = this_board->name;
 
-        ret = alloc_private(dev, sizeof(*devpriv));
-        if (ret < 0)
-                return ret;
-        devpriv = dev->private;
+        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
+        if (!devpriv)
+                return -ENOMEM;
+        dev->private = devpriv;
 
         ret = comedi_pci_enable(pcidev, dev->board_name);
         if (ret)
@@ -1199,17 +1196,17 @@ static void pci_dio_detach(struct comedi_device *dev)
 static struct comedi_driver adv_pci_dio_driver = {
         .driver_name    = "adv_pci_dio",
         .module         = THIS_MODULE,
-        .attach_pci     = pci_dio_attach_pci,
+        .auto_attach    = pci_dio_auto_attach,
         .detach         = pci_dio_detach,
 };
 
-static int __devinit adv_pci_dio_pci_probe(struct pci_dev *dev,
+static int adv_pci_dio_pci_probe(struct pci_dev *dev,
                                            const struct pci_device_id *ent)
 {
         return comedi_pci_auto_config(dev, &adv_pci_dio_driver);
 }
 
-static void __devexit adv_pci_dio_pci_remove(struct pci_dev *dev)
+static void adv_pci_dio_pci_remove(struct pci_dev *dev)
 {
         comedi_pci_auto_unconfig(dev);
 }
@@ -1237,7 +1234,7 @@ static struct pci_driver adv_pci_dio_pci_driver = {
         .name           = "adv_pci_dio",
         .id_table       = adv_pci_dio_pci_table,
         .probe          = adv_pci_dio_pci_probe,
-        .remove         = __devexit_p(adv_pci_dio_pci_remove),
+        .remove         = adv_pci_dio_pci_remove,
 };
 module_comedi_pci_driver(adv_pci_dio_driver, adv_pci_dio_pci_driver);
 
diff --git a/drivers/staging/comedi/drivers/aio_aio12_8.c b/drivers/staging/comedi/drivers/aio_aio12_8.c
index 8acf60d0f20d..601f03d5897f 100644
--- a/drivers/staging/comedi/drivers/aio_aio12_8.c
+++ b/drivers/staging/comedi/drivers/aio_aio12_8.c
@@ -212,10 +212,10 @@ static int aio_aio12_8_attach(struct comedi_device *dev,
         }
         dev->iobase = iobase;
 
-        ret = alloc_private(dev, sizeof(*devpriv));
-        if (ret)
-                return ret;
-        devpriv = dev->private;
+        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
+        if (!devpriv)
+                return -ENOMEM;
+        dev->private = devpriv;
 
         ret = comedi_alloc_subdevices(dev, 4);
         if (ret)
diff --git a/drivers/staging/comedi/drivers/aio_iiro_16.c b/drivers/staging/comedi/drivers/aio_iiro_16.c
index b2cb8b02b2a1..64c1ae58ce7f 100644
--- a/drivers/staging/comedi/drivers/aio_iiro_16.c
+++ b/drivers/staging/comedi/drivers/aio_iiro_16.c
@@ -44,19 +44,6 @@ Configuration Options:
 #define AIO_IIRO_16_RELAY_8_15  0x04
 #define AIO_IIRO_16_INPUT_8_15  0x05
 
-struct aio_iiro_16_board {
-        const char *name;
-        int do_;
-        int di;
-};
-
-static const struct aio_iiro_16_board aio_iiro_16_boards[] = {
-        {
-         .name = "aio_iiro_16",
-         .di = 16,
-         .do_ = 16},
-};
-
 static int aio_iiro_16_dio_insn_bits_write(struct comedi_device *dev,
                                            struct comedi_subdevice *s,
                                            struct comedi_insn *insn,
@@ -90,14 +77,13 @@ static int aio_iiro_16_dio_insn_bits_read(struct comedi_device *dev,
 static int aio_iiro_16_attach(struct comedi_device *dev,
                               struct comedi_devconfig *it)
 {
-        const struct aio_iiro_16_board *board = comedi_board(dev);
         int iobase;
         struct comedi_subdevice *s;
         int ret;
 
         printk(KERN_INFO "comedi%d: aio_iiro_16: ", dev->minor);
 
-        dev->board_name = board->name;
+        dev->board_name = dev->driver->driver_name;
 
         iobase = it->options[0];
 
@@ -144,9 +130,6 @@ static struct comedi_driver aio_iiro_16_driver = {
         .module         = THIS_MODULE,
         .attach         = aio_iiro_16_attach,
         .detach         = aio_iiro_16_detach,
-        .board_name     = &aio_iiro_16_boards[0].name,
-        .offset         = sizeof(struct aio_iiro_16_board),
-        .num_names      = ARRAY_SIZE(aio_iiro_16_boards),
 };
 module_comedi_driver(aio_iiro_16_driver);
 
diff --git a/drivers/staging/comedi/drivers/amplc_dio200.c b/drivers/staging/comedi/drivers/amplc_dio200.c
index 29eb52d11d2f..5f309ba88a1a 100644
--- a/drivers/staging/comedi/drivers/amplc_dio200.c
+++ b/drivers/staging/comedi/drivers/amplc_dio200.c
@@ -25,185 +25,238 @@
 
 */
 /*
-Driver: amplc_dio200
-Description: Amplicon 200 Series Digital I/O
-Author: Ian Abbott <abbotti@mev.co.uk>
-Devices: [Amplicon] PC212E (pc212e), PC214E (pc214e), PC215E (pc215e),
-  PCI215 (pci215 or amplc_dio200), PC218E (pc218e), PC272E (pc272e),
-  PCI272 (pci272 or amplc_dio200)
-Updated: Wed, 22 Oct 2008 13:36:02 +0100
-Status: works
-
-Configuration options - PC212E, PC214E, PC215E, PC218E, PC272E:
-  [0] - I/O port base address
-  [1] - IRQ (optional, but commands won't work without it)
-
-Configuration options - PCI215, PCI272:
-  [0] - PCI bus of device (optional)
-  [1] - PCI slot of device (optional)
-  If bus/slot is not specified, the first available PCI device will
-  be used.
-
-Passing a zero for an option is the same as leaving it unspecified.
-
-SUBDEVICES
-
-                    PC218E         PC212E      PC215E/PCI215
-                 -------------  -------------  -------------
-  Subdevices           7              6              5
-   0                 CTR-X1         PPI-X          PPI-X
-   1                 CTR-X2         CTR-Y1         PPI-Y
-   2                 CTR-Y1         CTR-Y2         CTR-Z1
-   3                 CTR-Y2         CTR-Z1         CTR-Z2
-   4                 CTR-Z1         CTR-Z2       INTERRUPT
-   5                 CTR-Z2       INTERRUPT
-   6               INTERRUPT
-
-                    PC214E      PC272E/PCI272
-                 -------------  -------------
-  Subdevices           4              4
-   0                 PPI-X          PPI-X
-   1                 PPI-Y          PPI-Y
-   2                 CTR-Z1*        PPI-Z
-   3               INTERRUPT*     INTERRUPT
-
-Each PPI is a 8255 chip providing 24 DIO channels.  The DIO channels
-are configurable as inputs or outputs in four groups:
-
-  Port A  - channels  0 to  7
-  Port B  - channels  8 to 15
-  Port CL - channels 16 to 19
-  Port CH - channels 20 to 23
-
-Only mode 0 of the 8255 chips is supported.
-
-Each CTR is a 8254 chip providing 3 16-bit counter channels.  Each
-channel is configured individually with INSN_CONFIG instructions.  The
-specific type of configuration instruction is specified in data[0].
-Some configuration instructions expect an additional parameter in
-data[1]; others return a value in data[1].  The following configuration
-instructions are supported:
-
-  INSN_CONFIG_SET_COUNTER_MODE.  Sets the counter channel's mode and
-    BCD/binary setting specified in data[1].
-
-  INSN_CONFIG_8254_READ_STATUS.  Reads the status register value for the
-    counter channel into data[1].
-
-  INSN_CONFIG_SET_CLOCK_SRC.  Sets the counter channel's clock source as
-    specified in data[1] (this is a hardware-specific value).  Not
-    supported on PC214E.  For the other boards, valid clock sources are
-    0 to 7 as follows:
-
-      0.  CLK n, the counter channel's dedicated CLK input from the SK1
-        connector.  (N.B. for other values, the counter channel's CLKn
-        pin on the SK1 connector is an output!)
-      1.  Internal 10 MHz clock.
-      2.  Internal 1 MHz clock.
-      3.  Internal 100 kHz clock.
-      4.  Internal 10 kHz clock.
-      5.  Internal 1 kHz clock.
-      6.  OUT n-1, the output of counter channel n-1 (see note 1 below).
-      7.  Ext Clock, the counter chip's dedicated Ext Clock input from
-        the SK1 connector.  This pin is shared by all three counter
-        channels on the chip.
-
-  INSN_CONFIG_GET_CLOCK_SRC.  Returns the counter channel's current
-    clock source in data[1].  For internal clock sources, data[2] is set
-    to the period in ns.
-
-  INSN_CONFIG_SET_GATE_SRC.  Sets the counter channel's gate source as
-    specified in data[2] (this is a hardware-specific value).  Not
-    supported on PC214E.  For the other boards, valid gate sources are 0
-    to 7 as follows:
-
-      0.  VCC (internal +5V d.c.), i.e. gate permanently enabled.
-      1.  GND (internal 0V d.c.), i.e. gate permanently disabled.
-      2.  GAT n, the counter channel's dedicated GAT input from the SK1
-        connector.  (N.B. for other values, the counter channel's GATn
-        pin on the SK1 connector is an output!)
-      3.  /OUT n-2, the inverted output of counter channel n-2 (see note
-        2 below).
-      4.  Reserved.
-      5.  Reserved.
-      6.  Reserved.
-      7.  Reserved.
-
-  INSN_CONFIG_GET_GATE_SRC.  Returns the counter channel's current gate
-    source in data[2].
-
-Clock and gate interconnection notes:
-
-  1.  Clock source OUT n-1 is the output of the preceding channel on the
-  same counter subdevice if n > 0, or the output of channel 2 on the
-  preceding counter subdevice (see note 3) if n = 0.
-
-  2.  Gate source /OUT n-2 is the inverted output of channel 0 on the
-  same counter subdevice if n = 2, or the inverted output of channel n+1
-  on the preceding counter subdevice (see note 3) if n < 2.
-
-  3.  The counter subdevices are connected in a ring, so the highest
-  counter subdevice precedes the lowest.
-
-The 'INTERRUPT' subdevice pretends to be a digital input subdevice.  The
-digital inputs come from the interrupt status register.  The number of
-channels matches the number of interrupt sources.  The PC214E does not
-have an interrupt status register; see notes on 'INTERRUPT SOURCES'
-below.
-
-INTERRUPT SOURCES
-
-                    PC218E         PC212E      PC215E/PCI215
-                 -------------  -------------  -------------
-  Sources              6              6              6
-   0              CTR-X1-OUT      PPI-X-C0       PPI-X-C0
-   1              CTR-X2-OUT      PPI-X-C3       PPI-X-C3
-   2              CTR-Y1-OUT     CTR-Y1-OUT      PPI-Y-C0
-   3              CTR-Y2-OUT     CTR-Y2-OUT      PPI-Y-C3
-   4              CTR-Z1-OUT     CTR-Z1-OUT     CTR-Z1-OUT
-   5              CTR-Z2-OUT     CTR-Z2-OUT     CTR-Z2-OUT
-
-                    PC214E      PC272E/PCI272
-                 -------------  -------------
-  Sources              1              6
-   0               JUMPER-J5      PPI-X-C0
-   1                              PPI-X-C3
-   2                              PPI-Y-C0
-   3                              PPI-Y-C3
-   4                              PPI-Z-C0
-   5                              PPI-Z-C3
-
-When an interrupt source is enabled in the interrupt source enable
-register, a rising edge on the source signal latches the corresponding
-bit to 1 in the interrupt status register.
-
-When the interrupt status register value as a whole (actually, just the
-6 least significant bits) goes from zero to non-zero, the board will
-generate an interrupt.  For level-triggered hardware interrupts (PCI
-card), the interrupt will remain asserted until the interrupt status
-register is cleared to zero.  For edge-triggered hardware interrupts
-(ISA card), no further interrupts will occur until the interrupt status
-register is cleared to zero.  To clear a bit to zero in the interrupt
-status register, the corresponding interrupt source must be disabled
-in the interrupt source enable register (there is no separate interrupt
-clear register).
-
-The PC214E does not have an interrupt source enable register or an
-interrupt status register; its 'INTERRUPT' subdevice has a single
-channel and its interrupt source is selected by the position of jumper
-J5.
-
-COMMANDS
-
-The driver supports a read streaming acquisition command on the
-'INTERRUPT' subdevice.  The channel list selects the interrupt sources
-to be enabled.  All channels will be sampled together (convert_src ==
-TRIG_NOW).  The scan begins a short time after the hardware interrupt
-occurs, subject to interrupt latencies (scan_begin_src == TRIG_EXT,
-scan_begin_arg == 0).  The value read from the interrupt status register
-is packed into a short value, one bit per requested channel, in the
-order they appear in the channel list.
-*/
+ * Driver: amplc_dio200
+ * Description: Amplicon 200 Series Digital I/O
+ * Author: Ian Abbott <abbotti@mev.co.uk>
+ * Devices: [Amplicon] PC212E (pc212e), PC214E (pc214e), PC215E (pc215e),
+ *   PCI215 (pci215), PCIe215 (pcie215), PC218E (pc218e), PCIe236 (pcie236),
+ *   PC272E (pc272e), PCI272 (pci272), PCIe296 (pcie296)
+ * Updated: Wed, 24 Oct 2012 16:22:34 +0100
+ * Status: works
+ *
+ * Configuration options - PC212E, PC214E, PC215E, PC218E, PC272E:
+ *   [0] - I/O port base address
+ *   [1] - IRQ (optional, but commands won't work without it)
+ *
+ * Manual configuration of PCI(e) cards is not supported; they are configured
+ * automatically.
+ *
+ * Passing a zero for an option is the same as leaving it unspecified.
+ *
+ * SUBDEVICES
+ *
+ *                     PC212E         PC214E      PC215E/PCI215
+ *                  -------------  -------------  -------------
+ *   Subdevices           6              4              5
+ *    0                 PPI-X          PPI-X          PPI-X
+ *    1                 CTR-Y1         PPI-Y          PPI-Y
+ *    2                 CTR-Y2         CTR-Z1*        CTR-Z1
+ *    3                 CTR-Z1       INTERRUPT*       CTR-Z2
+ *    4                 CTR-Z2                      INTERRUPT
+ *    5               INTERRUPT
+ *
+ *                     PCIe215        PC218E         PCIe236
+ *                  -------------  -------------  -------------
+ *   Subdevices           8              7              8
+ *    0                 PPI-X          CTR-X1         PPI-X
+ *    1                 UNUSED         CTR-X2         UNUSED
+ *    2                 PPI-Y          CTR-Y1         UNUSED
+ *    3                 UNUSED         CTR-Y2         UNUSED
+ *    4                 CTR-Z1         CTR-Z1         CTR-Z1
+ *    5                 CTR-Z2         CTR-Z2         CTR-Z2
+ *    6                 TIMER        INTERRUPT        TIMER
+ *    7               INTERRUPT                     INTERRUPT
+ *
+ *                  PC272E/PCI272     PCIe296
+ *                  -------------  -------------
+ *   Subdevices           4              8
+ *    0                 PPI-X          PPI-X1
+ *    1                 PPI-Y          PPI-X2
+ *    2                 PPI-Z          PPI-Y1
+ *    3               INTERRUPT        PPI-Y2
+ *    4                                CTR-Z1
+ *    5                                CTR-Z2
+ *    6                                TIMER
+ *    7                              INTERRUPT
+ *
+ * Each PPI is a 8255 chip providing 24 DIO channels.  The DIO channels
+ * are configurable as inputs or outputs in four groups:
+ *
+ *   Port A  - channels  0 to  7
+ *   Port B  - channels  8 to 15
+ *   Port CL - channels 16 to 19
+ *   Port CH - channels 20 to 23
+ *
+ * Only mode 0 of the 8255 chips is supported.
+ *
+ * Each CTR is a 8254 chip providing 3 16-bit counter channels.  Each
+ * channel is configured individually with INSN_CONFIG instructions.  The
+ * specific type of configuration instruction is specified in data[0].
+ * Some configuration instructions expect an additional parameter in
+ * data[1]; others return a value in data[1].  The following configuration
+ * instructions are supported:
+ *
+ *   INSN_CONFIG_SET_COUNTER_MODE.  Sets the counter channel's mode and
+ *     BCD/binary setting specified in data[1].
+ *
+ *   INSN_CONFIG_8254_READ_STATUS.  Reads the status register value for the
+ *     counter channel into data[1].
+ *
+ *   INSN_CONFIG_SET_CLOCK_SRC.  Sets the counter channel's clock source as
+ *     specified in data[1] (this is a hardware-specific value).  Not
+ *     supported on PC214E.  For the other boards, valid clock sources are
+ *     0 to 7 as follows:
+ *
+ *       0.  CLK n, the counter channel's dedicated CLK input from the SK1
+ *         connector.  (N.B. for other values, the counter channel's CLKn
+ *         pin on the SK1 connector is an output!)
+ *       1.  Internal 10 MHz clock.
+ *       2.  Internal 1 MHz clock.
+ *       3.  Internal 100 kHz clock.
+ *       4.  Internal 10 kHz clock.
+ *       5.  Internal 1 kHz clock.
+ *       6.  OUT n-1, the output of counter channel n-1 (see note 1 below).
+ *       7.  Ext Clock, the counter chip's dedicated Ext Clock input from
+ *         the SK1 connector.  This pin is shared by all three counter
+ *         channels on the chip.
+ *
+ *     For the PCIe boards, clock sources in the range 0 to 31 are allowed
+ *     and the following additional clock sources are defined:
+ *
+ *       8.  HIGH logic level.
+ *       9.  LOW logic level.
+ *      10.  "Pattern present" signal.
+ *      11.  Internal 20 MHz clock.
+ *
+ *   INSN_CONFIG_GET_CLOCK_SRC.  Returns the counter channel's current
+ *     clock source in data[1].  For internal clock sources, data[2] is set
+ *     to the period in ns.
+ *
+ *   INSN_CONFIG_SET_GATE_SRC.  Sets the counter channel's gate source as
+ *     specified in data[2] (this is a hardware-specific value).  Not
+ *     supported on PC214E.  For the other boards, valid gate sources are 0
+ *     to 7 as follows:
+ *
+ *       0.  VCC (internal +5V d.c.), i.e. gate permanently enabled.
+ *       1.  GND (internal 0V d.c.), i.e. gate permanently disabled.
+ *       2.  GAT n, the counter channel's dedicated GAT input from the SK1
+ *         connector.  (N.B. for other values, the counter channel's GATn
+ *         pin on the SK1 connector is an output!)
+ *       3.  /OUT n-2, the inverted output of counter channel n-2 (see note
+ *         2 below).
+ *       4.  Reserved.
+ *       5.  Reserved.
+ *       6.  Reserved.
+ *       7.  Reserved.
+ *
+ *     For the PCIe boards, gate sources in the range 0 to 31 are allowed;
+ *     the following additional clock sources and clock sources 6 and 7 are
+ *     (re)defined:
+ *
+ *       6.  /GAT n, negated version of the counter channel's dedicated
+ *         GAT input (negated version of gate source 2).
+ *       7.  OUT n-2, the non-inverted output of counter channel n-2
+ *         (negated version of gate source 3).
+ *       8.  "Pattern present" signal, HIGH while pattern present.
+ *       9.  "Pattern occurred" latched signal, latches HIGH when pattern
+ *         occurs.
+ *      10.  "Pattern gone away" latched signal, latches LOW when pattern
+ *         goes away after it occurred.
+ *      11.  Negated "pattern present" signal, LOW while pattern present
+ *         (negated version of gate source 8).
+ *      12.  Negated "pattern occurred" latched signal, latches LOW when
+ *         pattern occurs (negated version of gate source 9).
+ *      13.  Negated "pattern gone away" latched signal, latches LOW when
+ *         pattern goes away after it occurred (negated version of gate
+ *         source 10).
+ *
+ *   INSN_CONFIG_GET_GATE_SRC.  Returns the counter channel's current gate
+ *     source in data[2].
+ *
+ * Clock and gate interconnection notes:
+ *
+ *   1.  Clock source OUT n-1 is the output of the preceding channel on the
+ *   same counter subdevice if n > 0, or the output of channel 2 on the
+ *   preceding counter subdevice (see note 3) if n = 0.
+ *
+ *   2.  Gate source /OUT n-2 is the inverted output of channel 0 on the
+ *   same counter subdevice if n = 2, or the inverted output of channel n+1
+ *   on the preceding counter subdevice (see note 3) if n < 2.
+ *
+ *   3.  The counter subdevices are connected in a ring, so the highest
+ *   counter subdevice precedes the lowest.
+ *
+ * The 'TIMER' subdevice is a free-running 32-bit timer subdevice.
+ *
+ * The 'INTERRUPT' subdevice pretends to be a digital input subdevice.  The
+ * digital inputs come from the interrupt status register.  The number of
+ * channels matches the number of interrupt sources.  The PC214E does not
+ * have an interrupt status register; see notes on 'INTERRUPT SOURCES'
+ * below.
+ *
+ * INTERRUPT SOURCES
+ *
+ *                     PC212E         PC214E      PC215E/PCI215
+ *                  -------------  -------------  -------------
+ *   Sources              6              1              6
+ *    0               PPI-X-C0       JUMPER-J5      PPI-X-C0
+ *    1               PPI-X-C3                      PPI-X-C3
+ *    2              CTR-Y1-OUT1                    PPI-Y-C0
+ *    3              CTR-Y2-OUT1                    PPI-Y-C3
+ *    4              CTR-Z1-OUT1                   CTR-Z1-OUT1
+ *    5              CTR-Z2-OUT1                   CTR-Z2-OUT1
+ *
+ *                     PCIe215        PC218E         PCIe236
+ *                  -------------  -------------  -------------
+ *   Sources              6              6              6
+ *    0               PPI-X-C0      CTR-X1-OUT1     PPI-X-C0
+ *    1               PPI-X-C3      CTR-X2-OUT1     PPI-X-C3
+ *    2               PPI-Y-C0      CTR-Y1-OUT1      unused
+ *    3               PPI-Y-C3      CTR-Y2-OUT1      unused
+ *    4              CTR-Z1-OUT1    CTR-Z1-OUT1    CTR-Z1-OUT1
+ *    5              CTR-Z2-OUT1    CTR-Z2-OUT1    CTR-Z2-OUT1
+ *
+ *                  PC272E/PCI272     PCIe296
+ *                  -------------  -------------
+ *   Sources              6              6
+ *    0               PPI-X-C0       PPI-X1-C0
+ *    1               PPI-X-C3       PPI-X1-C3
+ *    2               PPI-Y-C0       PPI-Y1-C0
+ *    3               PPI-Y-C3       PPI-Y1-C3
+ *    4               PPI-Z-C0      CTR-Z1-OUT1
+ *    5               PPI-Z-C3      CTR-Z2-OUT1
+ *
+ * When an interrupt source is enabled in the interrupt source enable
+ * register, a rising edge on the source signal latches the corresponding
+ * bit to 1 in the interrupt status register.
+ *
+ * When the interrupt status register value as a whole (actually, just the
+ * 6 least significant bits) goes from zero to non-zero, the board will
+ * generate an interrupt.  For level-triggered hardware interrupts (PCI
+ * card), the interrupt will remain asserted until the interrupt status
+ * register is cleared to zero.  For edge-triggered hardware interrupts
+ * (ISA card), no further interrupts will occur until the interrupt status
+ * register is cleared to zero.  To clear a bit to zero in the interrupt
+ * status register, the corresponding interrupt source must be disabled
+ * in the interrupt source enable register (there is no separate interrupt
+ * clear register).
+ *
+ * The PC214E does not have an interrupt source enable register or an
+ * interrupt status register; its 'INTERRUPT' subdevice has a single
+ * channel and its interrupt source is selected by the position of jumper
+ * J5.
+ *
+ * COMMANDS
+ *
+ * The driver supports a read streaming acquisition command on the
+ * 'INTERRUPT' subdevice.  The channel list selects the interrupt sources
+ * to be enabled.  All channels will be sampled together (convert_src ==
+ * TRIG_NOW).  The scan begins a short time after the hardware interrupt
+ * occurs, subject to interrupt latencies (scan_begin_src == TRIG_EXT,
+ * scan_begin_arg == 0).  The value read from the interrupt status register
+ * is packed into a short value, one bit per requested channel, in the
+ * order they appear in the channel list.
+ */
 
 #include <linux/interrupt.h>
 #include <linux/slab.h>
@@ -211,7 +264,6 @@ order they appear in the channel list.
 #include "../comedidev.h"
 
 #include "comedi_fc.h"
-#include "8255.h"
 #include "8253.h"
 
 #define DIO200_DRIVER_NAME      "amplc_dio200"
@@ -220,13 +272,24 @@ order they appear in the channel list.
 #define DO_PCI  IS_ENABLED(CONFIG_COMEDI_AMPLC_DIO200_PCI)
 
 /* PCI IDs */
-#define PCI_VENDOR_ID_AMPLICON 0x14dc
 #define PCI_DEVICE_ID_AMPLICON_PCI272 0x000a
 #define PCI_DEVICE_ID_AMPLICON_PCI215 0x000b
-#define PCI_DEVICE_ID_INVALID 0xffff
+#define PCI_DEVICE_ID_AMPLICON_PCIE236 0x0011
+#define PCI_DEVICE_ID_AMPLICON_PCIE215 0x0012
+#define PCI_DEVICE_ID_AMPLICON_PCIE296 0x0014
+
+/* 8255 control register bits */
+#define CR_C_LO_IO      0x01
+#define CR_B_IO         0x02
+#define CR_B_MODE       0x04
+#define CR_C_HI_IO      0x08
+#define CR_A_IO         0x10
+#define CR_A_MODE(a)    ((a)<<5)
+#define CR_CW           0x80
 
 /* 200 series registers */
 #define DIO200_IO_SIZE          0x20
+#define DIO200_PCIE_IO_SIZE     0x4000
 #define DIO200_XCLK_SCE         0x18    /* Group X clock selection register */
 #define DIO200_YCLK_SCE         0x19    /* Group Y clock selection register */
 #define DIO200_ZCLK_SCE         0x1a    /* Group Z clock selection register */
@@ -234,30 +297,78 @@ order they appear in the channel list.
 #define DIO200_YGAT_SCE         0x1c    /* Group Y gate selection register */
 #define DIO200_ZGAT_SCE         0x1d    /* Group Z gate selection register */
 #define DIO200_INT_SCE          0x1e    /* Interrupt enable/status register */
+/* Extra registers for new PCIe boards */
+#define DIO200_ENHANCE          0x20    /* 1 to enable enhanced features */
+#define DIO200_VERSION          0x24    /* Hardware version register */
+#define DIO200_TS_CONFIG        0x600   /* Timestamp timer config register */
+#define DIO200_TS_COUNT         0x602   /* Timestamp timer count register */
 
 /*
- * Macros for constructing value for DIO_200_?CLK_SCE and
+ * Functions for constructing value for DIO_200_?CLK_SCE and
  * DIO_200_?GAT_SCE registers:
  *
  * 'which' is: 0 for CTR-X1, CTR-Y1, CTR-Z1; 1 for CTR-X2, CTR-Y2 or CTR-Z2.
  * 'chan' is the channel: 0, 1 or 2.
- * 'source' is the signal source: 0 to 7.
+ * 'source' is the signal source: 0 to 7, or 0 to 31 for "enhanced" boards.
  */
-#define CLK_SCE(which, chan, source) (((which) << 5) | ((chan) << 3) | (source))
-#define GAT_SCE(which, chan, source) (((which) << 5) | ((chan) << 3) | (source))
+static unsigned char clk_gat_sce(unsigned int which, unsigned int chan,
+                                 unsigned int source)
+{
+        return (which << 5) | (chan << 3) |
+               ((source & 030) << 3) | (source & 007);
+}
+
+static unsigned char clk_sce(unsigned int which, unsigned int chan,
+                             unsigned int source)
+{
+        return clk_gat_sce(which, chan, source);
+}
+
+static unsigned char gat_sce(unsigned int which, unsigned int chan,
+                             unsigned int source)
+{
+        return clk_gat_sce(which, chan, source);
+}
 
 /*
  * Periods of the internal clock sources in nanoseconds.
  */
-static const unsigned clock_period[8] = {
-        0,                      /* dedicated clock input/output pin */
-        100,                    /* 10 MHz */
-        1000,                   /* 1 MHz */
-        10000,                  /* 100 kHz */
-        100000,                 /* 10 kHz */
-        1000000,                /* 1 kHz */
-        0,                      /* OUT N-1 */
-        0                       /* group clock input pin */
+static const unsigned int clock_period[32] = {
+        [1] = 100,              /* 10 MHz */
+        [2] = 1000,             /* 1 MHz */
+        [3] = 10000,            /* 100 kHz */
+        [4] = 100000,           /* 10 kHz */
+        [5] = 1000000,          /* 1 kHz */
+        [11] = 50,              /* 20 MHz (enhanced boards) */
+        /* clock sources 12 and later reserved for enhanced boards */
+};
+
+/*
+ * Timestamp timer configuration register (for new PCIe boards).
+ */
+#define TS_CONFIG_RESET         0x100   /* Reset counter to zero. */
+#define TS_CONFIG_CLK_SRC_MASK  0x0FF   /* Clock source. */
+#define TS_CONFIG_MAX_CLK_SRC   2       /* Maximum clock source value. */
+
+/*
+ * Periods of the timestamp timer clock sources in nanoseconds.
+ */
+static const unsigned int ts_clock_period[TS_CONFIG_MAX_CLK_SRC + 1] = {
+        1,                      /* 1 nanosecond (but with 20 ns granularity). */
+        1000,                   /* 1 microsecond. */
+        1000000,                /* 1 millisecond. */
+};
+
+/*
+ * Register region.
+ */
+enum dio200_regtype { no_regtype = 0, io_regtype, mmio_regtype };
+struct dio200_region {
+        union {
+                unsigned long iobase;           /* I/O base address */
+                unsigned char __iomem *membase; /* mapped MMIO base address */
+        } u;
+        enum dio200_regtype regtype;
 };
 
 /*
@@ -269,13 +380,14 @@ enum dio200_bustype { isa_bustype, pci_bustype };
 enum dio200_model {
         pc212e_model,
         pc214e_model,
-        pc215e_model, pci215_model,
+        pc215e_model, pci215_model, pcie215_model,
         pc218e_model,
+        pcie236_model,
         pc272e_model, pci272_model,
-        anypci_model
+        pcie296_model,
 };
 
-enum dio200_layout {
+enum dio200_layout_idx {
 #if DO_ISA
         pc212_layout,
         pc214_layout,
@@ -284,7 +396,12 @@ enum dio200_layout {
 #if DO_ISA
         pc218_layout,
 #endif
-        pc272_layout
+        pc272_layout,
+#if DO_PCI
+        pcie215_layout,
+        pcie236_layout,
+        pcie296_layout,
+#endif
 };
 
 struct dio200_board {
@@ -292,7 +409,10 @@ struct dio200_board {
         unsigned short devid;
         enum dio200_bustype bustype;
         enum dio200_model model;
-        enum dio200_layout layout;
+        enum dio200_layout_idx layout;
+        unsigned char mainbar;
+        unsigned char mainshift;
+        unsigned int mainsize;
 };
 
 static const struct dio200_board dio200_boards[] = {
@@ -302,30 +422,35 @@ static const struct dio200_board dio200_boards[] = {
          .bustype = isa_bustype,
          .model = pc212e_model,
          .layout = pc212_layout,
+         .mainsize = DIO200_IO_SIZE,
          },
         {
          .name = "pc214e",
          .bustype = isa_bustype,
          .model = pc214e_model,
          .layout = pc214_layout,
+         .mainsize = DIO200_IO_SIZE,
          },
         {
          .name = "pc215e",
          .bustype = isa_bustype,
          .model = pc215e_model,
          .layout = pc215_layout,
+         .mainsize = DIO200_IO_SIZE,
          },
         {
          .name = "pc218e",
          .bustype = isa_bustype,
          .model = pc218e_model,
          .layout = pc218_layout,
+         .mainsize = DIO200_IO_SIZE,
          },
         {
          .name = "pc272e",
          .bustype = isa_bustype,
          .model = pc272e_model,
          .layout = pc272_layout,
+         .mainsize = DIO200_IO_SIZE,
          },
 #endif
 #if DO_PCI
@@ -335,6 +460,8 @@ static const struct dio200_board dio200_boards[] = {
          .bustype = pci_bustype,
          .model = pci215_model,
          .layout = pc215_layout,
+         .mainbar = 2,
+         .mainsize = DIO200_IO_SIZE,
          },
         {
          .name = "pci272",
@@ -342,12 +469,38 @@ static const struct dio200_board dio200_boards[] = {
          .bustype = pci_bustype,
          .model = pci272_model,
          .layout = pc272_layout,
+         .mainbar = 2,
+         .mainsize = DIO200_IO_SIZE,
+         },
+        {
+         .name = "pcie215",
+         .devid = PCI_DEVICE_ID_AMPLICON_PCIE215,
+         .bustype = pci_bustype,
+         .model = pcie215_model,
+         .layout = pcie215_layout,
+         .mainbar = 1,
+         .mainshift = 3,
+         .mainsize = DIO200_PCIE_IO_SIZE,
          },
         {
-         .name = DIO200_DRIVER_NAME,
-         .devid = PCI_DEVICE_ID_INVALID,
+         .name = "pcie236",
+         .devid = PCI_DEVICE_ID_AMPLICON_PCIE236,
          .bustype = pci_bustype,
-         .model = anypci_model, /* wildcard */
+         .model = pcie236_model,
+         .layout = pcie236_layout,
+         .mainbar = 1,
+         .mainshift = 3,
+         .mainsize = DIO200_PCIE_IO_SIZE,
+         },
+        {
+         .name = "pcie296",
+         .devid = PCI_DEVICE_ID_AMPLICON_PCIE296,
+         .bustype = pci_bustype,
+         .model = pcie296_model,
+         .layout = pcie296_layout,
+         .mainbar = 1,
+         .mainshift = 3,
+         .mainsize = DIO200_PCIE_IO_SIZE,
          },
 #endif
 };
@@ -357,20 +510,21 @@ static const struct dio200_board dio200_boards[] = {
  * layout.
  */
 
-enum dio200_sdtype { sd_none, sd_intr, sd_8255, sd_8254 };
+enum dio200_sdtype { sd_none, sd_intr, sd_8255, sd_8254, sd_timer };
 
-#define DIO200_MAX_SUBDEVS      7
+#define DIO200_MAX_SUBDEVS      8
 #define DIO200_MAX_ISNS         6
 
-struct dio200_layout_struct {
+struct dio200_layout {
         unsigned short n_subdevs;       /* number of subdevices */
         unsigned char sdtype[DIO200_MAX_SUBDEVS];       /* enum dio200_sdtype */
         unsigned char sdinfo[DIO200_MAX_SUBDEVS];       /* depends on sdtype */
         char has_int_sce;       /* has interrupt enable/status register */
         char has_clk_gat_sce;   /* has clock/gate selection registers */
+        char has_enhancements;  /* has enhanced features */
 };
 
-static const struct dio200_layout_struct dio200_layouts[] = {
+static const struct dio200_layout dio200_layouts[] = {
 #if DO_ISA
         [pc212_layout] = {
                           .n_subdevs = 6,
@@ -421,6 +575,38 @@ static const struct dio200_layout_struct dio200_layouts[] = {
                           .has_int_sce = 1,
                           .has_clk_gat_sce = 0,
                           },
+#if DO_PCI
+        [pcie215_layout] = {
+                          .n_subdevs = 8,
+                          .sdtype = {sd_8255, sd_none, sd_8255, sd_none,
+                                     sd_8254, sd_8254, sd_timer, sd_intr},
+                          .sdinfo = {0x00, 0x00, 0x08, 0x00,
+                                     0x10, 0x14, 0x00, 0x3F},
+                          .has_int_sce = 1,
+                          .has_clk_gat_sce = 1,
+                          .has_enhancements = 1,
+                          },
+        [pcie236_layout] = {
+                          .n_subdevs = 8,
+                          .sdtype = {sd_8255, sd_none, sd_none, sd_none,
+                                     sd_8254, sd_8254, sd_timer, sd_intr},
+                          .sdinfo = {0x00, 0x00, 0x00, 0x00,
+                                     0x10, 0x14, 0x00, 0x3F},
+                          .has_int_sce = 1,
+                          .has_clk_gat_sce = 1,
+                          .has_enhancements = 1,
+                          },
+        [pcie296_layout] = {
+                          .n_subdevs = 8,
+                          .sdtype = {sd_8255, sd_8255, sd_8255, sd_8255,
+                                     sd_8254, sd_8254, sd_timer, sd_intr},
+                          .sdinfo = {0x00, 0x04, 0x08, 0x0C,
+                                     0x10, 0x14, 0x00, 0x3F},
+                          .has_int_sce = 1,
+                          .has_clk_gat_sce = 1,
+                          .has_enhancements = 1,
+                          },
+#endif
 };
 
 /* this structure is for data unique to this hardware driver.  If
@@ -428,31 +614,46 @@ static const struct dio200_layout_struct dio200_layouts[] = {
    feel free to suggest moving the variable to the struct comedi_device struct.
  */
 struct dio200_private {
+        struct dio200_region io;        /* Register region */
         int intr_sd;
 };
 
 struct dio200_subdev_8254 {
-        unsigned long iobase;   /* Counter base address */
-        unsigned long clk_sce_iobase;   /* CLK_SCE base address */
-        unsigned long gat_sce_iobase;   /* GAT_SCE base address */
-        int which;              /* Bit 5 of CLK_SCE or GAT_SCE */
-        int has_clk_gat_sce;
-        unsigned clock_src[3];  /* Current clock sources */
-        unsigned gate_src[3];   /* Current gate sources */
+        unsigned int ofs;               /* Counter base offset */
+        unsigned int clk_sce_ofs;       /* CLK_SCE base address */
+        unsigned int gat_sce_ofs;       /* GAT_SCE base address */
+        int which;                      /* Bit 5 of CLK_SCE or GAT_SCE */
+        unsigned int clock_src[3];      /* Current clock sources */
+        unsigned int gate_src[3];       /* Current gate sources */
         spinlock_t spinlock;
 };
 
+struct dio200_subdev_8255 {
+        unsigned int ofs;               /* DIO base offset */
+};
+
 struct dio200_subdev_intr {
-        unsigned long iobase;
+        unsigned int ofs;
         spinlock_t spinlock;
         int active;
-        int has_int_sce;
         unsigned int valid_isns;
         unsigned int enabled_isns;
         unsigned int stopcount;
         int continuous;
 };
 
+static inline const struct dio200_layout *
+dio200_board_layout(const struct dio200_board *board)
+{
+        return &dio200_layouts[board->layout];
+}
+
+static inline const struct dio200_layout *
+dio200_dev_layout(struct comedi_device *dev)
+{
+        return dio200_board_layout(comedi_board(dev));
+}
+
 static inline bool is_pci_board(const struct dio200_board *board)
 {
         return DO_PCI && board->bustype == pci_bustype;
@@ -464,6 +665,70 @@ static inline bool is_isa_board(const struct dio200_board *board)
 }
 
 /*
+ * Read 8-bit register.
+ */
+static unsigned char dio200_read8(struct comedi_device *dev,
+                                  unsigned int offset)
+{
+        const struct dio200_board *thisboard = comedi_board(dev);
+        struct dio200_private *devpriv = dev->private;
+
+        offset <<= thisboard->mainshift;
+        if (devpriv->io.regtype == io_regtype)
+                return inb(devpriv->io.u.iobase + offset);
+        else
+                return readb(devpriv->io.u.membase + offset);
+}
+
+/*
+ * Write 8-bit register.
+ */
+static void dio200_write8(struct comedi_device *dev, unsigned int offset,
+                          unsigned char val)
+{
+        const struct dio200_board *thisboard = comedi_board(dev);
+        struct dio200_private *devpriv = dev->private;
+
+        offset <<= thisboard->mainshift;
+        if (devpriv->io.regtype == io_regtype)
+                outb(val, devpriv->io.u.iobase + offset);
+        else
+                writeb(val, devpriv->io.u.membase + offset);
+}
+
+/*
+ * Read 32-bit register.
+ */
+static unsigned int dio200_read32(struct comedi_device *dev,
+                                  unsigned int offset)
+{
+        const struct dio200_board *thisboard = comedi_board(dev);
+        struct dio200_private *devpriv = dev->private;
+
+        offset <<= thisboard->mainshift;
+        if (devpriv->io.regtype == io_regtype)
+                return inl(devpriv->io.u.iobase + offset);
+        else
+                return readl(devpriv->io.u.membase + offset);
+}
+
+/*
+ * Write 32-bit register.
+ */
+static void dio200_write32(struct comedi_device *dev, unsigned int offset,
+                           unsigned int val)
+{
+        const struct dio200_board *thisboard = comedi_board(dev);
+        struct dio200_private *devpriv = dev->private;
+
+        offset <<= thisboard->mainshift;
+        if (devpriv->io.regtype == io_regtype)
+                outl(val, devpriv->io.u.iobase + offset);
+        else
+                writel(val, devpriv->io.u.membase + offset);
+}
+
+/*
  * This function looks for a board matching the supplied PCI device.
  */
 static const struct dio200_board *
@@ -479,49 +744,6 @@ dio200_find_pci_board(struct pci_dev *pci_dev)
 }
 
 /*
- * This function looks for a PCI device matching the requested board name,
- * bus and slot.
- */
-static struct pci_dev *dio200_find_pci_dev(struct comedi_device *dev,
-                                           struct comedi_devconfig *it)
-{
-        const struct dio200_board *thisboard = comedi_board(dev);
-        struct pci_dev *pci_dev = NULL;
-        int bus = it->options[0];
-        int slot = it->options[1];
-
-        for_each_pci_dev(pci_dev) {
-                if (bus || slot) {
-                        if (bus != pci_dev->bus->number ||
-                            slot != PCI_SLOT(pci_dev->devfn))
-                                continue;
-                }
-                if (pci_dev->vendor != PCI_VENDOR_ID_AMPLICON)
-                        continue;
-
-                if (thisboard->model == anypci_model) {
-                        /* Wildcard board matches any supported PCI board. */
-                        const struct dio200_board *foundboard;
-
-                        foundboard = dio200_find_pci_board(pci_dev);
-                        if (foundboard == NULL)
-                                continue;
-                        /* Replace wildcard board_ptr. */
-                        dev->board_ptr = foundboard;
-                } else {
-                        /* Match specific model name. */
-                        if (pci_dev->device != thisboard->devid)
-                                continue;
-                }
-                return pci_dev;
-        }
-        dev_err(dev->class_dev,
-                "No supported board found! (req. bus %d, slot %d)\n",
-                bus, slot);
-        return NULL;
-}
-
-/*
  * This function checks and requests an I/O region, reporting an error
  * if there is a conflict.
  */
@@ -545,11 +767,12 @@ dio200_subdev_intr_insn_bits(struct comedi_device *dev,
                              struct comedi_subdevice *s,
                              struct comedi_insn *insn, unsigned int *data)
 {
+        const struct dio200_layout *layout = dio200_dev_layout(dev);
         struct dio200_subdev_intr *subpriv = s->private;
 
-        if (subpriv->has_int_sce) {
+        if (layout->has_int_sce) {
                 /* Just read the interrupt status register.  */
-                data[1] = inb(subpriv->iobase) & subpriv->valid_isns;
+                data[1] = dio200_read8(dev, subpriv->ofs) & subpriv->valid_isns;
         } else {
                 /* No interrupt status register. */
                 data[0] = 0;
@@ -564,12 +787,13 @@ dio200_subdev_intr_insn_bits(struct comedi_device *dev,
 static void dio200_stop_intr(struct comedi_device *dev,
                              struct comedi_subdevice *s)
 {
+        const struct dio200_layout *layout = dio200_dev_layout(dev);
         struct dio200_subdev_intr *subpriv = s->private;
 
         subpriv->active = 0;
         subpriv->enabled_isns = 0;
-        if (subpriv->has_int_sce)
-                outb(0, subpriv->iobase);
+        if (layout->has_int_sce)
+                dio200_write8(dev, subpriv->ofs, 0);
 }
 
 /*
@@ -580,6 +804,7 @@ static int dio200_start_intr(struct comedi_device *dev,
 {
         unsigned int n;
         unsigned isn_bits;
+        const struct dio200_layout *layout = dio200_dev_layout(dev);
         struct dio200_subdev_intr *subpriv = s->private;
         struct comedi_cmd *cmd = &s->async->cmd;
         int retval = 0;
@@ -599,8 +824,8 @@ static int dio200_start_intr(struct comedi_device *dev,
                 isn_bits &= subpriv->valid_isns;
                 /* Enable interrupt sources. */
                 subpriv->enabled_isns = isn_bits;
-                if (subpriv->has_int_sce)
-                        outb(isn_bits, subpriv->iobase);
+                if (layout->has_int_sce)
+                        dio200_write8(dev, subpriv->ofs, isn_bits);
         }
 
         return retval;
@@ -642,6 +867,7 @@ dio200_inttrig_start_intr(struct comedi_device *dev, struct comedi_subdevice *s,
 static int dio200_handle_read_intr(struct comedi_device *dev,
                                    struct comedi_subdevice *s)
 {
+        const struct dio200_layout *layout = dio200_dev_layout(dev);
         struct dio200_subdev_intr *subpriv = s->private;
         unsigned triggered;
         unsigned intstat;
@@ -653,7 +879,7 @@ static int dio200_handle_read_intr(struct comedi_device *dev,
 
         spin_lock_irqsave(&subpriv->spinlock, flags);
         oldevents = s->async->events;
-        if (subpriv->has_int_sce) {
+        if (layout->has_int_sce) {
                 /*
                  * Collect interrupt sources that have triggered and disable
                  * them temporarily.  Loop around until no extra interrupt
@@ -665,11 +891,11 @@ static int dio200_handle_read_intr(struct comedi_device *dev,
                  * loop in case of misconfiguration.
                  */
                 cur_enabled = subpriv->enabled_isns;
-                while ((intstat = (inb(subpriv->iobase) & subpriv->valid_isns
-                                   & ~triggered)) != 0) {
+                while ((intstat = (dio200_read8(dev, subpriv->ofs) &
+                                   subpriv->valid_isns & ~triggered)) != 0) {
                         triggered |= intstat;
                         cur_enabled &= ~triggered;
-                        outb(cur_enabled, subpriv->iobase);
+                        dio200_write8(dev, subpriv->ofs, cur_enabled);
                 }
         } else {
                 /*
@@ -687,8 +913,8 @@ static int dio200_handle_read_intr(struct comedi_device *dev,
                  * Reenable them NOW to minimize the time they are disabled.
                  */
                 cur_enabled = subpriv->enabled_isns;
-                if (subpriv->has_int_sce)
-                        outb(cur_enabled, subpriv->iobase);
+                if (layout->has_int_sce)
+                        dio200_write8(dev, subpriv->ofs, cur_enabled);
 
                 if (subpriv->active) {
                         /*
@@ -794,41 +1020,19 @@ dio200_subdev_intr_cmdtest(struct comedi_device *dev,
         if (err)
                 return 2;
 
-        /* step 3: make sure arguments are trivially compatible */
+        /* Step 3: check if arguments are trivially valid */
 
-        /* cmd->start_src == TRIG_NOW || cmd->start_src == TRIG_INT */
-        if (cmd->start_arg != 0) {
-                cmd->start_arg = 0;
-                err++;
-        }
-
-        /* cmd->scan_begin_src == TRIG_EXT */
-        if (cmd->scan_begin_arg != 0) {
-                cmd->scan_begin_arg = 0;
-                err++;
-        }
-
-        /* cmd->convert_src == TRIG_NOW */
-        if (cmd->convert_arg != 0) {
-                cmd->convert_arg = 0;
-                err++;
-        }
-
-        /* cmd->scan_end_src == TRIG_COUNT */
-        if (cmd->scan_end_arg != cmd->chanlist_len) {
-                cmd->scan_end_arg = cmd->chanlist_len;
-                err++;
-        }
+        err |= cfc_check_trigger_arg_is(&cmd->start_arg, 0);
+        err |= cfc_check_trigger_arg_is(&cmd->scan_begin_arg, 0);
+        err |= cfc_check_trigger_arg_is(&cmd->convert_arg, 0);
+        err |= cfc_check_trigger_arg_is(&cmd->scan_end_arg, cmd->chanlist_len);
 
         switch (cmd->stop_src) {
         case TRIG_COUNT:
                 /* any count allowed */
                 break;
         case TRIG_NONE:
-                if (cmd->stop_arg != 0) {
-                        cmd->stop_arg = 0;
-                        err++;
-                }
+                err |= cfc_check_trigger_arg_is(&cmd->stop_arg, 0);
                 break;
         default:
                 break;
@@ -894,9 +1098,9 @@ static int dio200_subdev_intr_cmd(struct comedi_device *dev,
  */
 static int
 dio200_subdev_intr_init(struct comedi_device *dev, struct comedi_subdevice *s,
-                        unsigned long iobase, unsigned valid_isns,
-                        int has_int_sce)
+                        unsigned int offset, unsigned valid_isns)
 {
+        const struct dio200_layout *layout = dio200_dev_layout(dev);
         struct dio200_subdev_intr *subpriv;
 
         subpriv = kzalloc(sizeof(*subpriv), GFP_KERNEL);
@@ -904,18 +1108,18 @@ dio200_subdev_intr_init(struct comedi_device *dev, struct comedi_subdevice *s,
                 dev_err(dev->class_dev, "error! out of memory!\n");
                 return -ENOMEM;
         }
-        subpriv->iobase = iobase;
-        subpriv->has_int_sce = has_int_sce;
+        subpriv->ofs = offset;
         subpriv->valid_isns = valid_isns;
         spin_lock_init(&subpriv->spinlock);
 
-        if (has_int_sce)
-                outb(0, subpriv->iobase);       /* Disable interrupt sources. */
+        if (layout->has_int_sce)
+                /* Disable interrupt sources. */
+                dio200_write8(dev, subpriv->ofs, 0);
 
         s->private = subpriv;
         s->type = COMEDI_SUBD_DI;
         s->subdev_flags = SDF_READABLE | SDF_CMD_READ;
-        if (has_int_sce) {
+        if (layout->has_int_sce) {
                 s->n_chan = DIO200_MAX_ISNS;
                 s->len_chanlist = DIO200_MAX_ISNS;
         } else {
@@ -968,6 +1172,73 @@ static irqreturn_t dio200_interrupt(int irq, void *d)
 }
 
 /*
+ * Read an '8254' counter subdevice channel.
+ */
+static unsigned int
+dio200_subdev_8254_read_chan(struct comedi_device *dev,
+                             struct comedi_subdevice *s, unsigned int chan)
+{
+        struct dio200_subdev_8254 *subpriv = s->private;
+        unsigned int val;
+
+        /* latch counter */
+        val = chan << 6;
+        dio200_write8(dev, subpriv->ofs + i8254_control_reg, val);
+        /* read lsb, msb */
+        val = dio200_read8(dev, subpriv->ofs + chan);
+        val += dio200_read8(dev, subpriv->ofs + chan) << 8;
+        return val;
+}
+
+/*
+ * Write an '8254' subdevice channel.
+ */
+static void
+dio200_subdev_8254_write_chan(struct comedi_device *dev,
+                              struct comedi_subdevice *s, unsigned int chan,
+                              unsigned int count)
+{
+        struct dio200_subdev_8254 *subpriv = s->private;
+
+        /* write lsb, msb */
+        dio200_write8(dev, subpriv->ofs + chan, count & 0xff);
+        dio200_write8(dev, subpriv->ofs + chan, (count >> 8) & 0xff);
+}
+
+/*
+ * Set mode of an '8254' subdevice channel.
+ */
+static void
+dio200_subdev_8254_set_mode(struct comedi_device *dev,
+                            struct comedi_subdevice *s, unsigned int chan,
+                            unsigned int mode)
+{
+        struct dio200_subdev_8254 *subpriv = s->private;
+        unsigned int byte;
+
+        byte = chan << 6;
+        byte |= 0x30;           /* access order: lsb, msb */
+        byte |= (mode & 0xf);   /* counter mode and BCD|binary */
+        dio200_write8(dev, subpriv->ofs + i8254_control_reg, byte);
+}
+
+/*
+ * Read status byte of an '8254' counter subdevice channel.
+ */
+static unsigned int
+dio200_subdev_8254_status(struct comedi_device *dev,
+                          struct comedi_subdevice *s, unsigned int chan)
+{
+        struct dio200_subdev_8254 *subpriv = s->private;
+
+        /* latch status */
+        dio200_write8(dev, subpriv->ofs + i8254_control_reg,
+                      0xe0 | (2 << chan));
+        /* read status */
+        return dio200_read8(dev, subpriv->ofs + chan);
+}
+
+/*
  * Handle 'insn_read' for an '8254' counter subdevice.
  */
 static int
@@ -976,13 +1247,15 @@ dio200_subdev_8254_read(struct comedi_device *dev, struct comedi_subdevice *s,
 {
         struct dio200_subdev_8254 *subpriv = s->private;
         int chan = CR_CHAN(insn->chanspec);
+        unsigned int n;
         unsigned long flags;
 
-        spin_lock_irqsave(&subpriv->spinlock, flags);
-        data[0] = i8254_read(subpriv->iobase, 0, chan);
-        spin_unlock_irqrestore(&subpriv->spinlock, flags);
-
-        return 1;
+        for (n = 0; n < insn->n; n++) {
+                spin_lock_irqsave(&subpriv->spinlock, flags);
+                data[n] = dio200_subdev_8254_read_chan(dev, s, chan);
+                spin_unlock_irqrestore(&subpriv->spinlock, flags);
+        }
+        return insn->n;
 }
 
 /*
@@ -994,34 +1267,40 @@ dio200_subdev_8254_write(struct comedi_device *dev, struct comedi_subdevice *s,
 {
         struct dio200_subdev_8254 *subpriv = s->private;
         int chan = CR_CHAN(insn->chanspec);
+        unsigned int n;
         unsigned long flags;
 
-        spin_lock_irqsave(&subpriv->spinlock, flags);
-        i8254_write(subpriv->iobase, 0, chan, data[0]);
-        spin_unlock_irqrestore(&subpriv->spinlock, flags);
-
-        return 1;
+        for (n = 0; n < insn->n; n++) {
+                spin_lock_irqsave(&subpriv->spinlock, flags);
+                dio200_subdev_8254_write_chan(dev, s, chan, data[n]);
+                spin_unlock_irqrestore(&subpriv->spinlock, flags);
+        }
+        return insn->n;
 }
 
 /*
  * Set gate source for an '8254' counter subdevice channel.
  */
 static int
-dio200_set_gate_src(struct dio200_subdev_8254 *subpriv,
-                    unsigned int counter_number, unsigned int gate_src)
+dio200_subdev_8254_set_gate_src(struct comedi_device *dev,
+                                struct comedi_subdevice *s,
+                                unsigned int counter_number,
+                                unsigned int gate_src)
 {
+        const struct dio200_layout *layout = dio200_dev_layout(dev);
+        struct dio200_subdev_8254 *subpriv = s->private;
         unsigned char byte;
 
-        if (!subpriv->has_clk_gat_sce)
+        if (!layout->has_clk_gat_sce)
                 return -1;
         if (counter_number > 2)
                 return -1;
-        if (gate_src > 7)
+        if (gate_src > (layout->has_enhancements ? 31 : 7))
                 return -1;
 
         subpriv->gate_src[counter_number] = gate_src;
-        byte = GAT_SCE(subpriv->which, counter_number, gate_src);
-        outb(byte, subpriv->gat_sce_iobase);
+        byte = gat_sce(subpriv->which, counter_number, gate_src);
+        dio200_write8(dev, subpriv->gat_sce_ofs, byte);
 
         return 0;
 }
@@ -1030,10 +1309,14 @@ dio200_set_gate_src(struct dio200_subdev_8254 *subpriv,
  * Get gate source for an '8254' counter subdevice channel.
  */
 static int
-dio200_get_gate_src(struct dio200_subdev_8254 *subpriv,
-                    unsigned int counter_number)
+dio200_subdev_8254_get_gate_src(struct comedi_device *dev,
+                                struct comedi_subdevice *s,
+                                unsigned int counter_number)
 {
-        if (!subpriv->has_clk_gat_sce)
+        const struct dio200_layout *layout = dio200_dev_layout(dev);
+        struct dio200_subdev_8254 *subpriv = s->private;
+
+        if (!layout->has_clk_gat_sce)
                 return -1;
         if (counter_number > 2)
                 return -1;
@@ -1045,21 +1328,25 @@ dio200_get_gate_src(struct dio200_subdev_8254 *subpriv,
  * Set clock source for an '8254' counter subdevice channel.
  */
 static int
-dio200_set_clock_src(struct dio200_subdev_8254 *subpriv,
-                     unsigned int counter_number, unsigned int clock_src)
+dio200_subdev_8254_set_clock_src(struct comedi_device *dev,
+                                 struct comedi_subdevice *s,
+                                 unsigned int counter_number,
+                                 unsigned int clock_src)
 {
+        const struct dio200_layout *layout = dio200_dev_layout(dev);
+        struct dio200_subdev_8254 *subpriv = s->private;
         unsigned char byte;
 
-        if (!subpriv->has_clk_gat_sce)
+        if (!layout->has_clk_gat_sce)
                 return -1;
         if (counter_number > 2)
                 return -1;
-        if (clock_src > 7)
+        if (clock_src > (layout->has_enhancements ? 31 : 7))
                 return -1;
 
         subpriv->clock_src[counter_number] = clock_src;
-        byte = CLK_SCE(subpriv->which, counter_number, clock_src);
-        outb(byte, subpriv->clk_sce_iobase);
+        byte = clk_sce(subpriv->which, counter_number, clock_src);
+        dio200_write8(dev, subpriv->clk_sce_ofs, byte);
 
         return 0;
 }
@@ -1068,12 +1355,16 @@ dio200_set_clock_src(struct dio200_subdev_8254 *subpriv,
  * Get clock source for an '8254' counter subdevice channel.
  */
 static int
-dio200_get_clock_src(struct dio200_subdev_8254 *subpriv,
-                     unsigned int counter_number, unsigned int *period_ns)
+dio200_subdev_8254_get_clock_src(struct comedi_device *dev,
+                                 struct comedi_subdevice *s,
+                                 unsigned int counter_number,
+                                 unsigned int *period_ns)
 {
+        const struct dio200_layout *layout = dio200_dev_layout(dev);
+        struct dio200_subdev_8254 *subpriv = s->private;
         unsigned clock_src;
 
-        if (!subpriv->has_clk_gat_sce)
+        if (!layout->has_clk_gat_sce)
                 return -1;
         if (counter_number > 2)
                 return -1;
@@ -1098,20 +1389,21 @@ dio200_subdev_8254_config(struct comedi_device *dev, struct comedi_subdevice *s,
         spin_lock_irqsave(&subpriv->spinlock, flags);
         switch (data[0]) {
         case INSN_CONFIG_SET_COUNTER_MODE:
-                ret = i8254_set_mode(subpriv->iobase, 0, chan, data[1]);
-                if (ret < 0)
+                if (data[1] > (I8254_MODE5 | I8254_BINARY))
                         ret = -EINVAL;
+                else
+                        dio200_subdev_8254_set_mode(dev, s, chan, data[1]);
                 break;
         case INSN_CONFIG_8254_READ_STATUS:
-                data[1] = i8254_status(subpriv->iobase, 0, chan);
+                data[1] = dio200_subdev_8254_status(dev, s, chan);
                 break;
         case INSN_CONFIG_SET_GATE_SRC:
-                ret = dio200_set_gate_src(subpriv, chan, data[2]);
+                ret = dio200_subdev_8254_set_gate_src(dev, s, chan, data[2]);
                 if (ret < 0)
                         ret = -EINVAL;
                 break;
         case INSN_CONFIG_GET_GATE_SRC:
-                ret = dio200_get_gate_src(subpriv, chan);
+                ret = dio200_subdev_8254_get_gate_src(dev, s, chan);
                 if (ret < 0) {
                         ret = -EINVAL;
                         break;
@@ -1119,12 +1411,12 @@ dio200_subdev_8254_config(struct comedi_device *dev, struct comedi_subdevice *s,
                 data[2] = ret;
                 break;
         case INSN_CONFIG_SET_CLOCK_SRC:
-                ret = dio200_set_clock_src(subpriv, chan, data[1]);
+                ret = dio200_subdev_8254_set_clock_src(dev, s, chan, data[1]);
                 if (ret < 0)
                         ret = -EINVAL;
                 break;
         case INSN_CONFIG_GET_CLOCK_SRC:
-                ret = dio200_get_clock_src(subpriv, chan, &data[2]);
+                ret = dio200_subdev_8254_get_clock_src(dev, s, chan, &data[2]);
                 if (ret < 0) {
                         ret = -EINVAL;
                         break;
@@ -1141,15 +1433,12 @@ dio200_subdev_8254_config(struct comedi_device *dev, struct comedi_subdevice *s,
 
 /*
  * This function initializes an '8254' counter subdevice.
- *
- * Note: iobase is the base address of the board, not the subdevice;
- * offset is the offset to the 8254 chip.
  */
 static int
 dio200_subdev_8254_init(struct comedi_device *dev, struct comedi_subdevice *s,
-                        unsigned long iobase, unsigned offset,
-                        int has_clk_gat_sce)
+                        unsigned int offset)
 {
+        const struct dio200_layout *layout = dio200_dev_layout(dev);
         struct dio200_subdev_8254 *subpriv;
         unsigned int chan;
 
@@ -1169,27 +1458,24 @@ dio200_subdev_8254_init(struct comedi_device *dev, struct comedi_subdevice *s,
         s->insn_config = dio200_subdev_8254_config;
 
         spin_lock_init(&subpriv->spinlock);
-        subpriv->iobase = offset + iobase;
-        subpriv->has_clk_gat_sce = has_clk_gat_sce;
-        if (has_clk_gat_sce) {
+        subpriv->ofs = offset;
+        if (layout->has_clk_gat_sce) {
                 /* Derive CLK_SCE and GAT_SCE register offsets from
                  * 8254 offset. */
-                subpriv->clk_sce_iobase =
-                    DIO200_XCLK_SCE + (offset >> 3) + iobase;
-                subpriv->gat_sce_iobase =
-                    DIO200_XGAT_SCE + (offset >> 3) + iobase;
+                subpriv->clk_sce_ofs = DIO200_XCLK_SCE + (offset >> 3);
+                subpriv->gat_sce_ofs = DIO200_XGAT_SCE + (offset >> 3);
                 subpriv->which = (offset >> 2) & 1;
         }
 
         /* Initialize channels. */
         for (chan = 0; chan < 3; chan++) {
-                i8254_set_mode(subpriv->iobase, 0, chan,
-                               I8254_MODE0 | I8254_BINARY);
-                if (subpriv->has_clk_gat_sce) {
+                dio200_subdev_8254_set_mode(dev, s, chan,
+                                            I8254_MODE0 | I8254_BINARY);
+                if (layout->has_clk_gat_sce) {
                         /* Gate source 0 is VCC (logic 1). */
-                        dio200_set_gate_src(subpriv, chan, 0);
+                        dio200_subdev_8254_set_gate_src(dev, s, chan, 0);
                         /* Clock source 0 is the dedicated clock input. */
-                        dio200_set_clock_src(subpriv, chan, 0);
+                        dio200_subdev_8254_set_clock_src(dev, s, chan, 0);
                 }
         }
 
@@ -1207,16 +1493,294 @@ dio200_subdev_8254_cleanup(struct comedi_device *dev,
         kfree(subpriv);
 }
 
+/*
+ * This function sets I/O directions for an '8255' DIO subdevice.
+ */
+static void dio200_subdev_8255_set_dir(struct comedi_device *dev,
+                                       struct comedi_subdevice *s)
+{
+        struct dio200_subdev_8255 *subpriv = s->private;
+        int config;
+
+        config = CR_CW;
+        /* 1 in io_bits indicates output, 1 in config indicates input */
+        if (!(s->io_bits & 0x0000ff))
+                config |= CR_A_IO;
+        if (!(s->io_bits & 0x00ff00))
+                config |= CR_B_IO;
+        if (!(s->io_bits & 0x0f0000))
+                config |= CR_C_LO_IO;
+        if (!(s->io_bits & 0xf00000))
+                config |= CR_C_HI_IO;
+        dio200_write8(dev, subpriv->ofs + 3, config);
+}
+
+/*
+ * Handle 'insn_bits' for an '8255' DIO subdevice.
+ */
+static int dio200_subdev_8255_bits(struct comedi_device *dev,
+                                   struct comedi_subdevice *s,
+                                   struct comedi_insn *insn, unsigned int *data)
+{
+        struct dio200_subdev_8255 *subpriv = s->private;
+
+        if (data[0]) {
+                s->state &= ~data[0];
+                s->state |= (data[0] & data[1]);
+                if (data[0] & 0xff)
+                        dio200_write8(dev, subpriv->ofs, s->state & 0xff);
+                if (data[0] & 0xff00)
+                        dio200_write8(dev, subpriv->ofs + 1,
+                                      (s->state >> 8) & 0xff);
+                if (data[0] & 0xff0000)
+                        dio200_write8(dev, subpriv->ofs + 2,
+                                      (s->state >> 16) & 0xff);
+        }
+        data[1] = dio200_read8(dev, subpriv->ofs);
+        data[1] |= dio200_read8(dev, subpriv->ofs + 1) << 8;
+        data[1] |= dio200_read8(dev, subpriv->ofs + 2) << 16;
+        return 2;
+}
+
+/*
+ * Handle 'insn_config' for an '8255' DIO subdevice.
+ */
+static int dio200_subdev_8255_config(struct comedi_device *dev,
+                                     struct comedi_subdevice *s,
+                                     struct comedi_insn *insn,
+                                     unsigned int *data)
+{
+        unsigned int mask;
+        unsigned int bits;
+
+        mask = 1 << CR_CHAN(insn->chanspec);
+        if (mask & 0x0000ff)
+                bits = 0x0000ff;
+        else if (mask & 0x00ff00)
+                bits = 0x00ff00;
+        else if (mask & 0x0f0000)
+                bits = 0x0f0000;
+        else
+                bits = 0xf00000;
+        switch (data[0]) {
+        case INSN_CONFIG_DIO_INPUT:
+                s->io_bits &= ~bits;
+                break;
+        case INSN_CONFIG_DIO_OUTPUT:
+                s->io_bits |= bits;
+                break;
+        case INSN_CONFIG_DIO_QUERY:
+                data[1] = (s->io_bits & bits) ? COMEDI_OUTPUT : COMEDI_INPUT;
+                return insn->n;
+                break;
+        default:
+                return -EINVAL;
+        }
+        dio200_subdev_8255_set_dir(dev, s);
+        return 1;
+}
+
+/*
+ * This function initializes an '8255' DIO subdevice.
+ *
+ * offset is the offset to the 8255 chip.
+ */
+static int dio200_subdev_8255_init(struct comedi_device *dev,
+                                   struct comedi_subdevice *s,
+                                   unsigned int offset)
+{
+        struct dio200_subdev_8255 *subpriv;
+
+        subpriv = kzalloc(sizeof(*subpriv), GFP_KERNEL);
+        if (!subpriv)
+                return -ENOMEM;
+        subpriv->ofs = offset;
+        s->private = subpriv;
+        s->type = COMEDI_SUBD_DIO;
+        s->subdev_flags = SDF_READABLE | SDF_WRITABLE;
+        s->n_chan = 24;
+        s->range_table = &range_digital;
+        s->maxdata = 1;
+        s->insn_bits = dio200_subdev_8255_bits;
+        s->insn_config = dio200_subdev_8255_config;
+        s->state = 0;
+        s->io_bits = 0;
+        dio200_subdev_8255_set_dir(dev, s);
+        return 0;
+}
+
+/*
+ * This function cleans up an '8255' DIO subdevice.
+ */
+static void dio200_subdev_8255_cleanup(struct comedi_device *dev,
+                                       struct comedi_subdevice *s)
+{
+        struct dio200_subdev_8255 *subpriv = s->private;
+
+        kfree(subpriv);
+}
+
+/*
+ * Handle 'insn_read' for a timer subdevice.
+ */
+static int dio200_subdev_timer_read(struct comedi_device *dev,
+                                    struct comedi_subdevice *s,
+                                    struct comedi_insn *insn,
+                                    unsigned int *data)
+{
+        unsigned int n;
+
+        for (n = 0; n < insn->n; n++)
+                data[n] = dio200_read32(dev, DIO200_TS_COUNT);
+        return n;
+}
+
+/*
+ * Reset timer subdevice.
+ */
+static void dio200_subdev_timer_reset(struct comedi_device *dev,
+                                      struct comedi_subdevice *s)
+{
+        unsigned int clock;
+
+        clock = dio200_read32(dev, DIO200_TS_CONFIG) & TS_CONFIG_CLK_SRC_MASK;
+        dio200_write32(dev, DIO200_TS_CONFIG, clock | TS_CONFIG_RESET);
+        dio200_write32(dev, DIO200_TS_CONFIG, clock);
+}
+
+/*
+ * Get timer subdevice clock source and period.
+ */
+static void dio200_subdev_timer_get_clock_src(struct comedi_device *dev,
+                                              struct comedi_subdevice *s,
+                                              unsigned int *src,
+                                              unsigned int *period)
+{
+        unsigned int clk;
+
+        clk = dio200_read32(dev, DIO200_TS_CONFIG) & TS_CONFIG_CLK_SRC_MASK;
+        *src = clk;
+        *period = (clk < ARRAY_SIZE(ts_clock_period)) ?
+                  ts_clock_period[clk] : 0;
+}
+
+/*
+ * Set timer subdevice clock source.
+ */
+static int dio200_subdev_timer_set_clock_src(struct comedi_device *dev,
+                                             struct comedi_subdevice *s,
+                                             unsigned int src)
+{
+        if (src > TS_CONFIG_MAX_CLK_SRC)
+                return -EINVAL;
+        dio200_write32(dev, DIO200_TS_CONFIG, src);
+        return 0;
+}
+
+/*
+ * Handle 'insn_config' for a timer subdevice.
+ */
+static int dio200_subdev_timer_config(struct comedi_device *dev,
+                                      struct comedi_subdevice *s,
+                                      struct comedi_insn *insn,
+                                      unsigned int *data)
+{
+        int ret = 0;
+
+        switch (data[0]) {
+        case INSN_CONFIG_RESET:
+                dio200_subdev_timer_reset(dev, s);
+                break;
+        case INSN_CONFIG_SET_CLOCK_SRC:
+                ret = dio200_subdev_timer_set_clock_src(dev, s, data[1]);
+                if (ret < 0)
+                        ret = -EINVAL;
+                break;
+        case INSN_CONFIG_GET_CLOCK_SRC:
+                dio200_subdev_timer_get_clock_src(dev, s, &data[1], &data[2]);
+                break;
+        default:
+                ret = -EINVAL;
+                break;
+        }
+        return ret < 0 ? ret : insn->n;
+}
+
+/*
+ * This function initializes a timer subdevice.
+ *
+ * Uses the timestamp timer registers.  There is only one timestamp timer.
+ */
+static int dio200_subdev_timer_init(struct comedi_device *dev,
+                                    struct comedi_subdevice *s)
+{
+        s->type = COMEDI_SUBD_TIMER;
+        s->subdev_flags = SDF_READABLE | SDF_LSAMPL;
+        s->n_chan = 1;
+        s->maxdata = 0xFFFFFFFF;
+        s->insn_read = dio200_subdev_timer_read;
+        s->insn_config = dio200_subdev_timer_config;
+        return 0;
+}
+
+/*
+ * This function cleans up a timer subdevice.
+ */
+static void dio200_subdev_timer_cleanup(struct comedi_device *dev,
+                                        struct comedi_subdevice *s)
+{
+        /* Nothing to do. */
+}
+
+/*
+ * This function does some special set-up for the PCIe boards
+ * PCIe215, PCIe236, PCIe296.
+ */
+static int dio200_pcie_board_setup(struct comedi_device *dev)
+{
+        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
+        void __iomem *brbase;
+        resource_size_t brlen;
+
+        /*
+         * The board uses Altera Cyclone IV with PCI-Express hard IP.
+         * The FPGA configuration has the PCI-Express Avalon-MM Bridge
+         * Control registers in PCI BAR 0, offset 0, and the length of
+         * these registers is 0x4000.
+         *
+         * We need to write 0x80 to the "Avalon-MM to PCI-Express Interrupt
+         * Enable" register at offset 0x50 to allow generation of PCIe
+         * interrupts when RXmlrq_i is asserted in the SOPC Builder system.
+         */
+        brlen = pci_resource_len(pcidev, 0);
+        if (brlen < 0x4000 ||
+                        !(pci_resource_flags(pcidev, 0) & IORESOURCE_MEM)) {
+                dev_err(dev->class_dev, "error! bad PCI region!\n");
+                return -EINVAL;
+        }
+        brbase = ioremap_nocache(pci_resource_start(pcidev, 0), brlen);
+        if (!brbase) {
+                dev_err(dev->class_dev, "error! failed to map registers!\n");
+                return -ENOMEM;
+        }
+        writel(0x80, brbase + 0x50);
+        iounmap(brbase);
+        /* Enable "enhanced" features of board. */
+        dio200_write8(dev, DIO200_ENHANCE, 1);
+        return 0;
+}
+
 static void dio200_report_attach(struct comedi_device *dev, unsigned int irq)
 {
         const struct dio200_board *thisboard = comedi_board(dev);
+        struct dio200_private *devpriv = dev->private;
         struct pci_dev *pcidev = comedi_to_pci_dev(dev);
         char tmpbuf[60];
         int tmplen;
 
         if (is_isa_board(thisboard))
                 tmplen = scnprintf(tmpbuf, sizeof(tmpbuf),
-                                   "(base %#lx) ", dev->iobase);
+                                   "(base %#lx) ", devpriv->io.u.iobase);
         else if (is_pci_board(thisboard))
                 tmplen = scnprintf(tmpbuf, sizeof(tmpbuf),
                                    "(pci %s) ", pci_name(pcidev));
@@ -1232,20 +1796,18 @@ static void dio200_report_attach(struct comedi_device *dev, unsigned int irq)
         dev_info(dev->class_dev, "%s %sattached\n", dev->board_name, tmpbuf);
 }
 
-static int dio200_common_attach(struct comedi_device *dev, unsigned long iobase,
-                                unsigned int irq, unsigned long req_irq_flags)
+static int dio200_common_attach(struct comedi_device *dev, unsigned int irq,
+                                unsigned long req_irq_flags)
 {
         const struct dio200_board *thisboard = comedi_board(dev);
         struct dio200_private *devpriv = dev->private;
-        const struct dio200_layout_struct *layout =
-                &dio200_layouts[thisboard->layout];
+        const struct dio200_layout *layout = dio200_board_layout(thisboard);
         struct comedi_subdevice *s;
         int sdx;
         unsigned int n;
         int ret;
 
         devpriv->intr_sd = -1;
-        dev->iobase = iobase;
         dev->board_name = thisboard->name;
 
         ret = comedi_alloc_subdevices(dev, layout->n_subdevs);
@@ -1257,16 +1819,15 @@ static int dio200_common_attach(struct comedi_device *dev, unsigned long iobase,
                 switch (layout->sdtype[n]) {
                 case sd_8254:
                         /* counter subdevice (8254) */
-                        ret = dio200_subdev_8254_init(dev, s, iobase,
-                                                      layout->sdinfo[n],
-                                                      layout->has_clk_gat_sce);
+                        ret = dio200_subdev_8254_init(dev, s,
+                                                      layout->sdinfo[n]);
                         if (ret < 0)
                                 return ret;
                         break;
                 case sd_8255:
                         /* digital i/o subdevice (8255) */
-                        ret = subdev_8255_init(dev, s, NULL,
-                                               iobase + layout->sdinfo[n]);
+                        ret = dio200_subdev_8255_init(dev, s,
+                                                      layout->sdinfo[n]);
                         if (ret < 0)
                                 return ret;
                         break;
@@ -1274,11 +1835,9 @@ static int dio200_common_attach(struct comedi_device *dev, unsigned long iobase,
                         /* 'INTERRUPT' subdevice */
                         if (irq) {
                                 ret = dio200_subdev_intr_init(dev, s,
-                                                              iobase +
                                                               DIO200_INT_SCE,
-                                                              layout->sdinfo[n],
-                                                              layout->
-                                                              has_int_sce);
+                                                              layout->sdinfo[n]
+                                                             );
                                 if (ret < 0)
                                         return ret;
                                 devpriv->intr_sd = n;
@@ -1286,6 +1845,16 @@ static int dio200_common_attach(struct comedi_device *dev, unsigned long iobase,
                                 s->type = COMEDI_SUBD_UNUSED;
                         }
                         break;
+                case sd_timer:
+                        /* Only on PCIe boards. */
+                        if (DO_PCI) {
+                                ret = dio200_subdev_timer_init(dev, s);
+                                if (ret < 0)
+                                        return ret;
+                        } else {
+                                s->type = COMEDI_SUBD_UNUSED;
+                        }
+                        break;
                 default:
                         s->type = COMEDI_SUBD_UNUSED;
                         break;
@@ -1307,24 +1876,6 @@ static int dio200_common_attach(struct comedi_device *dev, unsigned long iobase,
         return 1;
 }
 
-static int dio200_pci_common_attach(struct comedi_device *dev,
-                                    struct pci_dev *pci_dev)
-{
-        unsigned long iobase;
-        int ret;
-
-        comedi_set_hw_dev(dev, &pci_dev->dev);
-
-        ret = comedi_pci_enable(pci_dev, DIO200_DRIVER_NAME);
-        if (ret < 0) {
-                dev_err(dev->class_dev,
-                        "error! cannot enable PCI device and request regions!\n");
-                return ret;
-        }
-        iobase = pci_resource_start(pci_dev, 2);
-        return dio200_common_attach(dev, iobase, pci_dev->irq, IRQF_SHARED);
-}
-
 /*
  * Attach is called by the Comedi core to configure the driver
  * for a particular board.  If you specified a board_name array
@@ -1334,15 +1885,15 @@ static int dio200_pci_common_attach(struct comedi_device *dev,
 static int dio200_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 {
         const struct dio200_board *thisboard = comedi_board(dev);
+        struct dio200_private *devpriv;
         int ret;
 
         dev_info(dev->class_dev, DIO200_DRIVER_NAME ": attach\n");
 
-        ret = alloc_private(dev, sizeof(struct dio200_private));
-        if (ret < 0) {
-                dev_err(dev->class_dev, "error! out of memory!\n");
-                return ret;
-        }
+        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
+        if (!devpriv)
+                return -ENOMEM;
+        dev->private = devpriv;
 
         /* Process options and reserve resources according to bus type. */
         if (is_isa_board(thisboard)) {
@@ -1351,17 +1902,17 @@ static int dio200_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 
                 iobase = it->options[0];
                 irq = it->options[1];
-                ret = dio200_request_region(dev, iobase, DIO200_IO_SIZE);
+                ret = dio200_request_region(dev, iobase, thisboard->mainsize);
                 if (ret < 0)
                         return ret;
-                return dio200_common_attach(dev, iobase, irq, 0);
+                devpriv->io.u.iobase = iobase;
+                devpriv->io.regtype = io_regtype;
+                return dio200_common_attach(dev, irq, 0);
         } else if (is_pci_board(thisboard)) {
-                struct pci_dev *pci_dev;
-
-                pci_dev = dio200_find_pci_dev(dev, it);
-                if (!pci_dev)
-                        return -EIO;
-                return dio200_pci_common_attach(dev, pci_dev);
+                dev_err(dev->class_dev,
+                        "Manual configuration of PCI board '%s' is not supported\n",
+                        thisboard->name);
+                return -EIO;
         } else {
                 dev_err(dev->class_dev, DIO200_DRIVER_NAME
                         ": BUG! cannot determine board type!\n");
@@ -1370,13 +1921,18 @@ static int dio200_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 }
 
 /*
- * The attach_pci hook (if non-NULL) is called at PCI probe time in preference
- * to the "manual" attach hook.  dev->board_ptr is NULL on entry.  There should
- * be a board entry matching the supplied PCI device.
+ * The auto_attach hook is called at PCI probe time via
+ * comedi_pci_auto_config().  dev->board_ptr is NULL on entry.
+ * There should be a board entry matching the supplied PCI device.
  */
-static int __devinit dio200_attach_pci(struct comedi_device *dev,
-                                       struct pci_dev *pci_dev)
+static int dio200_auto_attach(struct comedi_device *dev,
+                                        unsigned long context_unused)
 {
+        struct pci_dev *pci_dev = comedi_to_pci_dev(dev);
+        const struct dio200_board *thisboard;
+        struct dio200_private *devpriv;
+        resource_size_t base, len;
+        unsigned int bar;
         int ret;
 
         if (!DO_PCI)
@@ -1384,38 +1940,71 @@ static int __devinit dio200_attach_pci(struct comedi_device *dev,
 
         dev_info(dev->class_dev, DIO200_DRIVER_NAME ": attach pci %s\n",
                  pci_name(pci_dev));
-        ret = alloc_private(dev, sizeof(struct dio200_private));
-        if (ret < 0) {
-                dev_err(dev->class_dev, "error! out of memory!\n");
-                return ret;
-        }
+
+        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
+        if (!devpriv)
+                return -ENOMEM;
+        dev->private = devpriv;
+
         dev->board_ptr = dio200_find_pci_board(pci_dev);
         if (dev->board_ptr == NULL) {
                 dev_err(dev->class_dev, "BUG! cannot determine board type!\n");
                 return -EINVAL;
         }
-        /*
-         * Need to 'get' the PCI device to match the 'put' in dio200_detach().
-         * TODO: Remove the pci_dev_get() and matching pci_dev_put() once
-         * support for manual attachment of PCI devices via dio200_attach()
-         * has been removed.
-         */
-        pci_dev_get(pci_dev);
-        return dio200_pci_common_attach(dev, pci_dev);
+        thisboard = comedi_board(dev);
+        ret = comedi_pci_enable(pci_dev, DIO200_DRIVER_NAME);
+        if (ret < 0) {
+                dev_err(dev->class_dev,
+                        "error! cannot enable PCI device and request regions!\n");
+                return ret;
+        }
+        bar = thisboard->mainbar;
+        base = pci_resource_start(pci_dev, bar);
+        len = pci_resource_len(pci_dev, bar);
+        if (len < thisboard->mainsize) {
+                dev_err(dev->class_dev, "error! PCI region size too small!\n");
+                return -EINVAL;
+        }
+        if ((pci_resource_flags(pci_dev, bar) & IORESOURCE_MEM) != 0) {
+                devpriv->io.u.membase = ioremap_nocache(base, len);
+                if (!devpriv->io.u.membase) {
+                        dev_err(dev->class_dev,
+                                "error! cannot remap registers\n");
+                        return -ENOMEM;
+                }
+                devpriv->io.regtype = mmio_regtype;
+        } else {
+                devpriv->io.u.iobase = (unsigned long)base;
+                devpriv->io.regtype = io_regtype;
+        }
+        switch (thisboard->model)
+        {
+        case pcie215_model:
+        case pcie236_model:
+        case pcie296_model:
+                ret = dio200_pcie_board_setup(dev);
+                if (ret < 0)
+                        return ret;
+                break;
+        default:
+                break;
+        }
+        return dio200_common_attach(dev, pci_dev->irq, IRQF_SHARED);
 }
 
 static void dio200_detach(struct comedi_device *dev)
 {
         const struct dio200_board *thisboard = comedi_board(dev);
-        const struct dio200_layout_struct *layout;
+        struct dio200_private *devpriv = dev->private;
+        const struct dio200_layout *layout;
         unsigned n;
 
-        if (!thisboard)
+        if (!thisboard || !devpriv)
                 return;
         if (dev->irq)
                 free_irq(dev->irq, dev);
         if (dev->subdevices) {
-                layout = &dio200_layouts[thisboard->layout];
+                layout = dio200_board_layout(thisboard);
                 for (n = 0; n < dev->n_subdevices; n++) {
                         struct comedi_subdevice *s = &dev->subdevices[n];
                         switch (layout->sdtype[n]) {
@@ -1423,25 +2012,33 @@ static void dio200_detach(struct comedi_device *dev)
                                 dio200_subdev_8254_cleanup(dev, s);
                                 break;
                         case sd_8255:
-                                subdev_8255_cleanup(dev, s);
+                                dio200_subdev_8255_cleanup(dev, s);
                                 break;
                         case sd_intr:
                                 dio200_subdev_intr_cleanup(dev, s);
                                 break;
+                        case sd_timer:
+                                /* Only on PCIe boards. */
+                                if (DO_PCI)
+                                        dio200_subdev_timer_cleanup(dev, s);
+                                break;
                         default:
                                 break;
                         }
                 }
         }
         if (is_isa_board(thisboard)) {
-                if (dev->iobase)
-                        release_region(dev->iobase, DIO200_IO_SIZE);
+                if (devpriv->io.regtype == io_regtype)
+                        release_region(devpriv->io.u.iobase,
+                                       thisboard->mainsize);
         } else if (is_pci_board(thisboard)) {
                 struct pci_dev *pcidev = comedi_to_pci_dev(dev);
                 if (pcidev) {
-                        if (dev->iobase)
+                        if (devpriv->io.regtype != no_regtype) {
+                                if (devpriv->io.regtype == mmio_regtype)
+                                        iounmap(devpriv->io.u.membase);
                                 comedi_pci_disable(pcidev);
-                        pci_dev_put(pcidev);
+                        }
                 }
         }
 }
@@ -1456,7 +2053,7 @@ static struct comedi_driver amplc_dio200_driver = {
         .driver_name = DIO200_DRIVER_NAME,
         .module = THIS_MODULE,
         .attach = dio200_attach,
-        .attach_pci = dio200_attach_pci,
+        .auto_attach = dio200_auto_attach,
         .detach = dio200_detach,
         .board_name = &dio200_boards[0].name,
         .offset = sizeof(struct dio200_board),
@@ -1467,19 +2064,22 @@ static struct comedi_driver amplc_dio200_driver = {
 static DEFINE_PCI_DEVICE_TABLE(dio200_pci_table) = {
         { PCI_DEVICE(PCI_VENDOR_ID_AMPLICON, PCI_DEVICE_ID_AMPLICON_PCI215) },
         { PCI_DEVICE(PCI_VENDOR_ID_AMPLICON, PCI_DEVICE_ID_AMPLICON_PCI272) },
+        { PCI_DEVICE(PCI_VENDOR_ID_AMPLICON, PCI_DEVICE_ID_AMPLICON_PCIE236) },
+        { PCI_DEVICE(PCI_VENDOR_ID_AMPLICON, PCI_DEVICE_ID_AMPLICON_PCIE215) },
+        { PCI_DEVICE(PCI_VENDOR_ID_AMPLICON, PCI_DEVICE_ID_AMPLICON_PCIE296) },
         {0}
 };
 
 MODULE_DEVICE_TABLE(pci, dio200_pci_table);
 
-static int __devinit amplc_dio200_pci_probe(struct pci_dev *dev,
+static int amplc_dio200_pci_probe(struct pci_dev *dev,
                                                    const struct pci_device_id
                                                    *ent)
 {
         return comedi_pci_auto_config(dev, &amplc_dio200_driver);
 }
 
-static void __devexit amplc_dio200_pci_remove(struct pci_dev *dev)
+static void amplc_dio200_pci_remove(struct pci_dev *dev)
 {
         comedi_pci_auto_unconfig(dev);
 }
@@ -1488,7 +2088,7 @@ static struct pci_driver amplc_dio200_pci_driver = {
         .name = DIO200_DRIVER_NAME,
         .id_table = dio200_pci_table,
         .probe = &amplc_dio200_pci_probe,
-        .remove = __devexit_p(&amplc_dio200_pci_remove)
+        .remove = &amplc_dio200_pci_remove
 };
 module_comedi_pci_driver(amplc_dio200_driver, amplc_dio200_pci_driver);
 #else
diff --git a/drivers/staging/comedi/drivers/amplc_pc236.c b/drivers/staging/comedi/drivers/amplc_pc236.c
index 4e4f3c15df87..289835419577 100644
--- a/drivers/staging/comedi/drivers/amplc_pc236.c
+++ b/drivers/staging/comedi/drivers/amplc_pc236.c
@@ -66,7 +66,6 @@ unused.
 #define DO_PCI  IS_ENABLED(CONFIG_COMEDI_AMPLC_PC236_PCI)
 
 /* PCI236 PCI configuration register information */
-#define PCI_VENDOR_ID_AMPLICON 0x14dc
 #define PCI_DEVICE_ID_AMPLICON_PCI236 0x0009
 #define PCI_DEVICE_ID_INVALID 0xffff
 
@@ -332,28 +331,13 @@ static int pc236_intr_cmdtest(struct comedi_device *dev,
         if (err)
                 return 2;
 
-        /* step 3: */
+        /* Step 3: check it arguments are trivially valid */
 
-        if (cmd->start_arg != 0) {
-                cmd->start_arg = 0;
-                err++;
-        }
-        if (cmd->scan_begin_arg != 0) {
-                cmd->scan_begin_arg = 0;
-                err++;
-        }
-        if (cmd->convert_arg != 0) {
-                cmd->convert_arg = 0;
-                err++;
-        }
-        if (cmd->scan_end_arg != 1) {
-                cmd->scan_end_arg = 1;
-                err++;
-        }
-        if (cmd->stop_arg != 0) {
-                cmd->stop_arg = 0;
-                err++;
-        }
+        err |= cfc_check_trigger_arg_is(&cmd->start_arg, 0);
+        err |= cfc_check_trigger_arg_is(&cmd->scan_begin_arg, 0);
+        err |= cfc_check_trigger_arg_is(&cmd->convert_arg, 0);
+        err |= cfc_check_trigger_arg_is(&cmd->scan_end_arg, 1);
+        err |= cfc_check_trigger_arg_is(&cmd->stop_arg, 0);
 
         if (err)
                 return 3;
@@ -505,14 +489,16 @@ static int pc236_pci_common_attach(struct comedi_device *dev,
 static int pc236_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 {
         const struct pc236_board *thisboard = comedi_board(dev);
+        struct pc236_private *devpriv;
         int ret;
 
         dev_info(dev->class_dev, PC236_DRIVER_NAME ": attach\n");
-        ret = alloc_private(dev, sizeof(struct pc236_private));
-        if (ret < 0) {
-                dev_err(dev->class_dev, "error! out of memory!\n");
-                return ret;
-        }
+
+        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
+        if (!devpriv)
+                return -ENOMEM;
+        dev->private = devpriv;
+
         /* Process options according to bus type. */
         if (is_isa_board(thisboard)) {
                 unsigned long iobase = it->options[0];
@@ -536,25 +522,27 @@ static int pc236_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 }
 
 /*
- * The attach_pci hook (if non-NULL) is called at PCI probe time in preference
- * to the "manual" attach hook.  dev->board_ptr is NULL on entry.  There should
- * be a board entry matching the supplied PCI device.
+ * The auto_attach hook is called at PCI probe time via
+ * comedi_pci_auto_config().  dev->board_ptr is NULL on entry.
+ * There should be a board entry matching the supplied PCI device.
  */
-static int __devinit pc236_attach_pci(struct comedi_device *dev,
-                                      struct pci_dev *pci_dev)
+static int pc236_auto_attach(struct comedi_device *dev,
+                                       unsigned long context_unused)
 {
-        int ret;
+        struct pci_dev *pci_dev = comedi_to_pci_dev(dev);
+        struct pc236_private *devpriv;
 
         if (!DO_PCI)
                 return -EINVAL;
 
         dev_info(dev->class_dev, PC236_DRIVER_NAME ": attach pci %s\n",
                  pci_name(pci_dev));
-        ret = alloc_private(dev, sizeof(struct pc236_private));
-        if (ret < 0) {
-                dev_err(dev->class_dev, "error! out of memory!\n");
-                return ret;
-        }
+
+        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
+        if (!devpriv)
+                return -ENOMEM;
+        dev->private = devpriv;
+
         dev->board_ptr = pc236_find_pci_board(pci_dev);
         if (dev->board_ptr == NULL) {
                 dev_err(dev->class_dev, "BUG! cannot determine board type!\n");
@@ -605,7 +593,7 @@ static struct comedi_driver amplc_pc236_driver = {
         .driver_name = PC236_DRIVER_NAME,
         .module = THIS_MODULE,
         .attach = pc236_attach,
-        .attach_pci = pc236_attach_pci,
+        .auto_attach = pc236_auto_attach,
         .detach = pc236_detach,
         .board_name = &pc236_boards[0].name,
         .offset = sizeof(struct pc236_board),
@@ -620,13 +608,13 @@ static DEFINE_PCI_DEVICE_TABLE(pc236_pci_table) = {
 
 MODULE_DEVICE_TABLE(pci, pc236_pci_table);
 
-static int __devinit amplc_pc236_pci_probe(struct pci_dev *dev,
+static int amplc_pc236_pci_probe(struct pci_dev *dev,
                                            const struct pci_device_id *ent)
 {
         return comedi_pci_auto_config(dev, &amplc_pc236_driver);
 }
 
-static void __devexit amplc_pc236_pci_remove(struct pci_dev *dev)
+static void amplc_pc236_pci_remove(struct pci_dev *dev)
 {
         comedi_pci_auto_unconfig(dev);
 }
@@ -635,7 +623,7 @@ static struct pci_driver amplc_pc236_pci_driver = {
         .name = PC236_DRIVER_NAME,
         .id_table = pc236_pci_table,
         .probe = &amplc_pc236_pci_probe,
-        .remove = __devexit_p(&amplc_pc236_pci_remove)
+        .remove = &amplc_pc236_pci_remove
 };
 
 module_comedi_pci_driver(amplc_pc236_driver, amplc_pc236_pci_driver);
diff --git a/drivers/staging/comedi/drivers/amplc_pc263.c b/drivers/staging/comedi/drivers/amplc_pc263.c
index d0a4c441228b..dfbff77cd795 100644
--- a/drivers/staging/comedi/drivers/amplc_pc263.c
+++ b/drivers/staging/comedi/drivers/amplc_pc263.c
@@ -52,7 +52,6 @@ The state of the outputs can be read.
 #define DO_PCI  IS_ENABLED(CONFIG_COMEDI_AMPLC_PC263_PCI)
 
 /* PCI263 PCI configuration register information */
-#define PCI_VENDOR_ID_AMPLICON 0x14dc
 #define PCI_DEVICE_ID_AMPLICON_PCI263 0x000c
 #define PCI_DEVICE_ID_INVALID 0xffff
 
@@ -291,17 +290,21 @@ static int pc263_attach(struct comedi_device *dev, struct comedi_devconfig *it)
                 return -EINVAL;
         }
 }
+
 /*
- * The attach_pci hook (if non-NULL) is called at PCI probe time in preference
- * to the "manual" attach hook.  dev->board_ptr is NULL on entry.  There should
- * be a board entry matching the supplied PCI device.
+ * The auto_attach hook is called at PCI probe time via
+ * comedi_pci_auto_config().  dev->board_ptr is NULL on entry.
+ * There should be a board entry matching the supplied PCI device.
  */
-static int __devinit pc263_attach_pci(struct comedi_device *dev,
-                                      struct pci_dev *pci_dev)
+static int pc263_auto_attach(struct comedi_device *dev,
+                                       unsigned long context_unused)
 {
+        struct pci_dev *pci_dev;
+
         if (!DO_PCI)
                 return -EINVAL;
 
+        pci_dev = comedi_to_pci_dev(dev);
         dev_info(dev->class_dev, PC263_DRIVER_NAME ": attach pci %s\n",
                  pci_name(pci_dev));
         dev->board_ptr = pc263_find_pci_board(pci_dev);
@@ -348,7 +351,7 @@ static struct comedi_driver amplc_pc263_driver = {
         .driver_name = PC263_DRIVER_NAME,
         .module = THIS_MODULE,
         .attach = pc263_attach,
-        .attach_pci = pc263_attach_pci,
+        .auto_attach = pc263_auto_attach,
         .detach = pc263_detach,
         .board_name = &pc263_boards[0].name,
         .offset = sizeof(struct pc263_board),
@@ -362,14 +365,14 @@ static DEFINE_PCI_DEVICE_TABLE(pc263_pci_table) = {
 };
 MODULE_DEVICE_TABLE(pci, pc263_pci_table);
 
-static int __devinit amplc_pc263_pci_probe(struct pci_dev *dev,
+static int amplc_pc263_pci_probe(struct pci_dev *dev,
                                                   const struct pci_device_id
                                                   *ent)
 {
         return comedi_pci_auto_config(dev, &amplc_pc263_driver);
 }
 
-static void __devexit amplc_pc263_pci_remove(struct pci_dev *dev)
+static void amplc_pc263_pci_remove(struct pci_dev *dev)
 {
         comedi_pci_auto_unconfig(dev);
 }
@@ -378,7 +381,7 @@ static struct pci_driver amplc_pc263_pci_driver = {
         .name = PC263_DRIVER_NAME,
         .id_table = pc263_pci_table,
         .probe = &amplc_pc263_pci_probe,
-        .remove = __devexit_p(&amplc_pc263_pci_remove)
+        .remove = &amplc_pc263_pci_remove
 };
 module_comedi_pci_driver(amplc_pc263_driver, amplc_pc263_pci_driver);
 #else
diff --git a/drivers/staging/comedi/drivers/amplc_pci224.c b/drivers/staging/comedi/drivers/amplc_pci224.c
index 1f65ec4d261e..6e2566a2dd57 100644
--- a/drivers/staging/comedi/drivers/amplc_pci224.c
+++ b/drivers/staging/comedi/drivers/amplc_pci224.c
@@ -116,7 +116,6 @@ Caveats:
 /*
  * PCI IDs.
  */
-#define PCI_VENDOR_ID_AMPLICON 0x14dc
 #define PCI_DEVICE_ID_AMPLICON_PCI224 0x0007
 #define PCI_DEVICE_ID_AMPLICON_PCI234 0x0008
 #define PCI_DEVICE_ID_INVALID 0xffff
@@ -758,76 +757,58 @@ pci224_ao_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s,
         if (err)
                 return 2;
 
-        /* Step 3: make sure arguments are trivially compatible. */
+        /* Step 3: check if arguments are trivially valid */
 
         switch (cmd->start_src) {
         case TRIG_INT:
-                if (cmd->start_arg != 0) {
-                        cmd->start_arg = 0;
-                        err++;
-                }
+                err |= cfc_check_trigger_arg_is(&cmd->start_arg, 0);
                 break;
         case TRIG_EXT:
                 /* Force to external trigger 0. */
                 if ((cmd->start_arg & ~CR_FLAGS_MASK) != 0) {
                         cmd->start_arg = COMBINE(cmd->start_arg, 0,
                                                  ~CR_FLAGS_MASK);
-                        err++;
+                        err |= -EINVAL;
                 }
                 /* The only flag allowed is CR_EDGE, which is ignored. */
                 if ((cmd->start_arg & CR_FLAGS_MASK & ~CR_EDGE) != 0) {
                         cmd->start_arg = COMBINE(cmd->start_arg, 0,
                                                  CR_FLAGS_MASK & ~CR_EDGE);
-                        err++;
+                        err |= -EINVAL;
                 }
                 break;
         }
 
         switch (cmd->scan_begin_src) {
         case TRIG_TIMER:
-                if (cmd->scan_begin_arg > MAX_SCAN_PERIOD) {
-                        cmd->scan_begin_arg = MAX_SCAN_PERIOD;
-                        err++;
-                }
+                err |= cfc_check_trigger_arg_max(&cmd->scan_begin_arg,
+                                                 MAX_SCAN_PERIOD);
+
                 tmp = cmd->chanlist_len * CONVERT_PERIOD;
                 if (tmp < MIN_SCAN_PERIOD)
                         tmp = MIN_SCAN_PERIOD;
-
-                if (cmd->scan_begin_arg < tmp) {
-                        cmd->scan_begin_arg = tmp;
-                        err++;
-                }
+                err |= cfc_check_trigger_arg_min(&cmd->scan_begin_arg, tmp);
                 break;
         case TRIG_EXT:
                 /* Force to external trigger 0. */
                 if ((cmd->scan_begin_arg & ~CR_FLAGS_MASK) != 0) {
                         cmd->scan_begin_arg = COMBINE(cmd->scan_begin_arg, 0,
                                                       ~CR_FLAGS_MASK);
-                        err++;
+                        err |= -EINVAL;
                 }
                 /* Only allow flags CR_EDGE and CR_INVERT.  Ignore CR_EDGE. */
                 if ((cmd->scan_begin_arg & CR_FLAGS_MASK &
                      ~(CR_EDGE | CR_INVERT)) != 0) {
                         cmd->scan_begin_arg = COMBINE(cmd->scan_begin_arg, 0,
-                                                      CR_FLAGS_MASK & ~(CR_EDGE
-                                                                        |
-                                                                        CR_INVERT));
-                        err++;
+                                                      CR_FLAGS_MASK &
+                                                      ~(CR_EDGE | CR_INVERT));
+                        err |= -EINVAL;
                 }
                 break;
         }
 
-        /* cmd->convert_src == TRIG_NOW */
-        if (cmd->convert_arg != 0) {
-                cmd->convert_arg = 0;
-                err++;
-        }
-
-        /* cmd->scan_end_arg == TRIG_COUNT */
-        if (cmd->scan_end_arg != cmd->chanlist_len) {
-                cmd->scan_end_arg = cmd->chanlist_len;
-                err++;
-        }
+        err |= cfc_check_trigger_arg_is(&cmd->convert_arg, 0);
+        err |= cfc_check_trigger_arg_is(&cmd->scan_end_arg, cmd->chanlist_len);
 
         switch (cmd->stop_src) {
         case TRIG_COUNT:
@@ -838,7 +819,7 @@ pci224_ao_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s,
                 if ((cmd->stop_arg & ~CR_FLAGS_MASK) != 0) {
                         cmd->stop_arg = COMBINE(cmd->stop_arg, 0,
                                                 ~CR_FLAGS_MASK);
-                        err++;
+                        err |= -EINVAL;
                 }
                 /* The only flag allowed is CR_EDGE, which is ignored. */
                 if ((cmd->stop_arg & CR_FLAGS_MASK & ~CR_EDGE) != 0) {
@@ -847,10 +828,7 @@ pci224_ao_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s,
                 }
                 break;
         case TRIG_NONE:
-                if (cmd->stop_arg != 0) {
-                        cmd->stop_arg = 0;
-                        err++;
-                }
+                err |= cfc_check_trigger_arg_is(&cmd->stop_arg, 0);
                 break;
         }
 
@@ -1287,7 +1265,7 @@ static void pci224_report_attach(struct comedi_device *dev, unsigned int irq)
 }
 
 /*
- * Common part of attach and attach_pci.
+ * Common part of attach and auto_attach.
  */
 static int pci224_attach_common(struct comedi_device *dev,
                                 struct pci_dev *pci_dev, int *options)
@@ -1443,16 +1421,15 @@ static int pci224_attach_common(struct comedi_device *dev,
 
 static int pci224_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 {
+        struct pci224_private *devpriv;
         struct pci_dev *pci_dev;
-        int ret;
 
         dev_info(dev->class_dev, DRIVER_NAME ": attach\n");
 
-        ret = alloc_private(dev, sizeof(struct pci224_private));
-        if (ret < 0) {
-                dev_err(dev->class_dev, "error! out of memory!\n");
-                return ret;
-        }
+        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
+        if (!devpriv)
+                return -ENOMEM;
+        dev->private = devpriv;
 
         pci_dev = pci224_find_pci_dev(dev, it);
         if (!pci_dev)
@@ -1461,19 +1438,19 @@ static int pci224_attach(struct comedi_device *dev, struct comedi_devconfig *it)
         return pci224_attach_common(dev, pci_dev, it->options);
 }
 
-static int __devinit
-pci224_attach_pci(struct comedi_device *dev, struct pci_dev *pci_dev)
+static int
+pci224_auto_attach(struct comedi_device *dev, unsigned long context_unused)
 {
-        int ret;
+        struct pci_dev *pci_dev = comedi_to_pci_dev(dev);
+        struct pci224_private *devpriv;
 
-        dev_info(dev->class_dev, DRIVER_NAME ": attach_pci %s\n",
+        dev_info(dev->class_dev, DRIVER_NAME ": attach pci %s\n",
                  pci_name(pci_dev));
 
-        ret = alloc_private(dev, sizeof(struct pci224_private));
-        if (ret < 0) {
-                dev_err(dev->class_dev, "error! out of memory!\n");
-                return ret;
-        }
+        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
+        if (!devpriv)
+                return -ENOMEM;
+        dev->private = devpriv;
 
         dev->board_ptr = pci224_find_pci_board(pci_dev);
         if (dev->board_ptr == NULL) {
@@ -1522,20 +1499,20 @@ static struct comedi_driver amplc_pci224_driver = {
         .module         = THIS_MODULE,
         .attach         = pci224_attach,
         .detach         = pci224_detach,
-        .attach_pci     = pci224_attach_pci,
+        .auto_attach    = pci224_auto_attach,
         .board_name     = &pci224_boards[0].name,
         .offset         = sizeof(struct pci224_board),
         .num_names      = ARRAY_SIZE(pci224_boards),
 };
 
-static int __devinit amplc_pci224_pci_probe(struct pci_dev *dev,
+static int amplc_pci224_pci_probe(struct pci_dev *dev,
                                                    const struct pci_device_id
                                                    *ent)
 {
         return comedi_pci_auto_config(dev, &amplc_pci224_driver);
 }
 
-static void __devexit amplc_pci224_pci_remove(struct pci_dev *dev)
+static void amplc_pci224_pci_remove(struct pci_dev *dev)
 {
         comedi_pci_auto_unconfig(dev);
 }
@@ -1551,7 +1528,7 @@ static struct pci_driver amplc_pci224_pci_driver = {
         .name           = "amplc_pci224",
         .id_table       = amplc_pci224_pci_table,
         .probe          = amplc_pci224_pci_probe,
-        .remove         = __devexit_p(amplc_pci224_pci_remove),
+        .remove         = amplc_pci224_pci_remove,
 };
 module_comedi_pci_driver(amplc_pci224_driver, amplc_pci224_pci_driver);
 
diff --git a/drivers/staging/comedi/drivers/amplc_pci230.c b/drivers/staging/comedi/drivers/amplc_pci230.c
index bd8fb876ce2e..366c68be56bd 100644
--- a/drivers/staging/comedi/drivers/amplc_pci230.c
+++ b/drivers/staging/comedi/drivers/amplc_pci230.c
@@ -198,7 +198,6 @@ for (or detection of) various hardware problems added by Ian Abbott.
 #include "8255.h"
 
 /* PCI230 PCI configuration register information */
-#define PCI_VENDOR_ID_AMPLICON 0x14dc
 #define PCI_DEVICE_ID_PCI230 0x0000
 #define PCI_DEVICE_ID_PCI260 0x0006
 #define PCI_DEVICE_ID_INVALID 0xffff
@@ -1000,14 +999,10 @@ static int pci230_ao_cmdtest(struct comedi_device *dev,
         if (err)
                 return 2;
 
-        /* Step 3: make sure arguments are trivially compatible.
-         * "invalid argument" returned by comedilib to user mode process
-         * if this fails. */
+        /* Step 3: check if arguments are trivially valid */
+
+        err |= cfc_check_trigger_arg_is(&cmd->start_arg, 0);
 
-        if (cmd->start_arg != 0) {
-                cmd->start_arg = 0;
-                err++;
-        }
 #define MAX_SPEED_AO    8000    /* 8000 ns => 125 kHz */
 #define MIN_SPEED_AO    4294967295u     /* 4294967295ns = 4.29s */
                         /*- Comedi limit due to unsigned int cmd.  Driver limit
@@ -1016,14 +1011,10 @@ static int pci230_ao_cmdtest(struct comedi_device *dev,
 
         switch (cmd->scan_begin_src) {
         case TRIG_TIMER:
-                if (cmd->scan_begin_arg < MAX_SPEED_AO) {
-                        cmd->scan_begin_arg = MAX_SPEED_AO;
-                        err++;
-                }
-                if (cmd->scan_begin_arg > MIN_SPEED_AO) {
-                        cmd->scan_begin_arg = MIN_SPEED_AO;
-                        err++;
-                }
+                err |= cfc_check_trigger_arg_min(&cmd->scan_begin_arg,
+                                                 MAX_SPEED_AO);
+                err |= cfc_check_trigger_arg_max(&cmd->scan_begin_arg,
+                                                 MIN_SPEED_AO);
                 break;
         case TRIG_EXT:
                 /* External trigger - for PCI230+ hardware version 2 onwards. */
@@ -1031,37 +1022,27 @@ static int pci230_ao_cmdtest(struct comedi_device *dev,
                 if ((cmd->scan_begin_arg & ~CR_FLAGS_MASK) != 0) {
                         cmd->scan_begin_arg = COMBINE(cmd->scan_begin_arg, 0,
                                                       ~CR_FLAGS_MASK);
-                        err++;
+                        err |= -EINVAL;
                 }
                 /* The only flags allowed are CR_EDGE and CR_INVERT.  The
                  * CR_EDGE flag is ignored. */
                 if ((cmd->scan_begin_arg
                      & (CR_FLAGS_MASK & ~(CR_EDGE | CR_INVERT))) != 0) {
-                        cmd->scan_begin_arg =
-                            COMBINE(cmd->scan_begin_arg, 0,
-                                    CR_FLAGS_MASK & ~(CR_EDGE | CR_INVERT));
-                        err++;
+                        cmd->scan_begin_arg = COMBINE(cmd->scan_begin_arg, 0,
+                                                      CR_FLAGS_MASK &
+                                                      ~(CR_EDGE | CR_INVERT));
+                        err |= -EINVAL;
                 }
                 break;
         default:
-                if (cmd->scan_begin_arg != 0) {
-                        cmd->scan_begin_arg = 0;
-                        err++;
-                }
+                err |= cfc_check_trigger_arg_is(&cmd->scan_begin_arg, 0);
                 break;
         }
 
-        if (cmd->scan_end_arg != cmd->chanlist_len) {
-                cmd->scan_end_arg = cmd->chanlist_len;
-                err++;
-        }
-        if (cmd->stop_src == TRIG_NONE) {
-                /* TRIG_NONE */
-                if (cmd->stop_arg != 0) {
-                        cmd->stop_arg = 0;
-                        err++;
-                }
-        }
+        err |= cfc_check_trigger_arg_is(&cmd->scan_end_arg, cmd->chanlist_len);
+
+        if (cmd->stop_src == TRIG_NONE)
+                err |= cfc_check_trigger_arg_is(&cmd->stop_arg, 0);
 
         if (err)
                 return 3;
@@ -1619,14 +1600,10 @@ static int pci230_ai_cmdtest(struct comedi_device *dev,
         if (err)
                 return 2;
 
-        /* Step 3: make sure arguments are trivially compatible.
-         * "invalid argument" returned by comedilib to user mode process
-         * if this fails. */
+        /* Step 3: check if arguments are trivially valid */
+
+        err |= cfc_check_trigger_arg_is(&cmd->start_arg, 0);
 
-        if (cmd->start_arg != 0) {
-                cmd->start_arg = 0;
-                err++;
-        }
 #define MAX_SPEED_AI_SE         3200    /* PCI230 SE:   3200 ns => 312.5 kHz */
 #define MAX_SPEED_AI_DIFF       8000    /* PCI230 DIFF: 8000 ns => 125 kHz */
 #define MAX_SPEED_AI_PLUS       4000    /* PCI230+:     4000 ns => 250 kHz */
@@ -1657,14 +1634,10 @@ static int pci230_ai_cmdtest(struct comedi_device *dev,
                         max_speed_ai = MAX_SPEED_AI_PLUS;
                 }
 
-                if (cmd->convert_arg < max_speed_ai) {
-                        cmd->convert_arg = max_speed_ai;
-                        err++;
-                }
-                if (cmd->convert_arg > MIN_SPEED_AI) {
-                        cmd->convert_arg = MIN_SPEED_AI;
-                        err++;
-                }
+                err |= cfc_check_trigger_arg_min(&cmd->convert_arg,
+                                                 max_speed_ai);
+                err |= cfc_check_trigger_arg_max(&cmd->convert_arg,
+                                                 MIN_SPEED_AI);
         } else if (cmd->convert_src == TRIG_EXT) {
                 /*
                  * external trigger
@@ -1679,46 +1652,33 @@ static int pci230_ai_cmdtest(struct comedi_device *dev,
                         if ((cmd->convert_arg & ~CR_FLAGS_MASK) != 0) {
                                 cmd->convert_arg = COMBINE(cmd->convert_arg, 0,
                                                            ~CR_FLAGS_MASK);
-                                err++;
+                                err |= -EINVAL;
                         }
                         /* The only flags allowed are CR_INVERT and CR_EDGE.
                          * CR_EDGE is required. */
                         if ((cmd->convert_arg & (CR_FLAGS_MASK & ~CR_INVERT))
                             != CR_EDGE) {
                                 /* Set CR_EDGE, preserve CR_INVERT. */
-                                cmd->convert_arg =
-                                    COMBINE(cmd->start_arg, (CR_EDGE | 0),
-                                            CR_FLAGS_MASK & ~CR_INVERT);
-                                err++;
+                                cmd->convert_arg = COMBINE(cmd->start_arg,
+                                                           (CR_EDGE | 0),
+                                                           CR_FLAGS_MASK &
+                                                           ~CR_INVERT);
+                                err |= -EINVAL;
                         }
                 } else {
                         /* Backwards compatibility with previous versions. */
                         /* convert_arg == 0 => trigger on -ve edge. */
                         /* convert_arg == 1 => trigger on +ve edge. */
-                        if (cmd->convert_arg > 1) {
-                                /* Default to trigger on +ve edge. */
-                                cmd->convert_arg = 1;
-                                err++;
-                        }
+                        err |= cfc_check_trigger_arg_max(&cmd->convert_arg, 1);
                 }
         } else {
-                if (cmd->convert_arg != 0) {
-                        cmd->convert_arg = 0;
-                        err++;
-                }
+                err |= cfc_check_trigger_arg_is(&cmd->convert_arg, 0);
         }
 
-        if (cmd->scan_end_arg != cmd->chanlist_len) {
-                cmd->scan_end_arg = cmd->chanlist_len;
-                err++;
-        }
+        err |= cfc_check_trigger_arg_is(&cmd->scan_end_arg, cmd->chanlist_len);
 
-        if (cmd->stop_src == TRIG_NONE) {
-                if (cmd->stop_arg != 0) {
-                        cmd->stop_arg = 0;
-                        err++;
-                }
-        }
+        if (cmd->stop_src == TRIG_NONE)
+                err |= cfc_check_trigger_arg_is(&cmd->stop_arg, 0);
 
         if (cmd->scan_begin_src == TRIG_EXT) {
                 /* external "trigger" to begin each scan
@@ -1727,24 +1687,21 @@ static int pci230_ai_cmdtest(struct comedi_device *dev,
                 if ((cmd->scan_begin_arg & ~CR_FLAGS_MASK) != 0) {
                         cmd->scan_begin_arg = COMBINE(cmd->scan_begin_arg, 0,
                                                       ~CR_FLAGS_MASK);
-                        err++;
+                        err |= -EINVAL;
                 }
                 /* The only flag allowed is CR_EDGE, which is ignored. */
                 if ((cmd->scan_begin_arg & CR_FLAGS_MASK & ~CR_EDGE) != 0) {
                         cmd->scan_begin_arg = COMBINE(cmd->scan_begin_arg, 0,
                                                       CR_FLAGS_MASK & ~CR_EDGE);
-                        err++;
+                        err |= -EINVAL;
                 }
         } else if (cmd->scan_begin_src == TRIG_TIMER) {
                 /* N.B. cmd->convert_arg is also TRIG_TIMER */
                 if (!pci230_ai_check_scan_period(cmd))
-                        err++;
+                        err |= -EINVAL;
 
         } else {
-                if (cmd->scan_begin_arg != 0) {
-                        cmd->scan_begin_arg = 0;
-                        err++;
-                }
+                err |= cfc_check_trigger_arg_is(&cmd->scan_begin_arg, 0);
         }
 
         if (err)
@@ -2660,15 +2617,12 @@ static struct pci_dev *pci230_find_pci_dev(struct comedi_device *dev,
 static int pci230_alloc_private(struct comedi_device *dev)
 {
         struct pci230_private *devpriv;
-        int err;
 
-        /* sets dev->private to allocated memory */
-        err = alloc_private(dev, sizeof(struct pci230_private));
-        if (err) {
-                dev_err(dev->class_dev, "error! out of memory!\n");
-                return err;
-        }
-        devpriv = dev->private;
+        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
+        if (!devpriv)
+                return -ENOMEM;
+        dev->private = devpriv;
+
         spin_lock_init(&devpriv->isr_spinlock);
         spin_lock_init(&devpriv->res_spinlock);
         spin_lock_init(&devpriv->ai_stop_spinlock);
@@ -2676,7 +2630,7 @@ static int pci230_alloc_private(struct comedi_device *dev)
         return 0;
 }
 
-/* Common part of attach and attach_pci. */
+/* Common part of attach and auto_attach. */
 static int pci230_attach_common(struct comedi_device *dev,
                                 struct pci_dev *pci_dev)
 {
@@ -2836,25 +2790,30 @@ static int pci230_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 
         dev_info(dev->class_dev, "amplc_pci230: attach %s %d,%d\n",
                  thisboard->name, it->options[0], it->options[1]);
-        rc = pci230_alloc_private(dev); /* sets dev->private */
+
+        rc = pci230_alloc_private(dev);
         if (rc)
                 return rc;
+
         pci_dev = pci230_find_pci_dev(dev, it);
         if (!pci_dev)
                 return -EIO;
         return pci230_attach_common(dev, pci_dev);
 }
 
-static int __devinit pci230_attach_pci(struct comedi_device *dev,
-                                       struct pci_dev *pci_dev)
+static int pci230_auto_attach(struct comedi_device *dev,
+                                        unsigned long context_unused)
 {
+        struct pci_dev *pci_dev = comedi_to_pci_dev(dev);
         int rc;
 
         dev_info(dev->class_dev, "amplc_pci230: attach pci %s\n",
                  pci_name(pci_dev));
-        rc = pci230_alloc_private(dev); /* sets dev->private */
+
+        rc = pci230_alloc_private(dev);
         if (rc)
                 return rc;
+
         dev->board_ptr = pci230_find_pci_board(pci_dev);
         if (dev->board_ptr == NULL) {
                 dev_err(dev->class_dev,
@@ -2891,20 +2850,20 @@ static struct comedi_driver amplc_pci230_driver = {
         .driver_name    = "amplc_pci230",
         .module         = THIS_MODULE,
         .attach         = pci230_attach,
-        .attach_pci     = pci230_attach_pci,
+        .auto_attach    = pci230_auto_attach,
         .detach         = pci230_detach,
         .board_name     = &pci230_boards[0].name,
         .offset         = sizeof(pci230_boards[0]),
         .num_names      = ARRAY_SIZE(pci230_boards),
 };
 
-static int __devinit amplc_pci230_pci_probe(struct pci_dev *dev,
+static int amplc_pci230_pci_probe(struct pci_dev *dev,
                                             const struct pci_device_id *ent)
 {
         return comedi_pci_auto_config(dev, &amplc_pci230_driver);
 }
 
-static void __devexit amplc_pci230_pci_remove(struct pci_dev *dev)
+static void amplc_pci230_pci_remove(struct pci_dev *dev)
 {
         comedi_pci_auto_unconfig(dev);
 }
@@ -2920,7 +2879,7 @@ static struct pci_driver amplc_pci230_pci_driver = {
         .name           = "amplc_pci230",
         .id_table       = amplc_pci230_pci_table,
         .probe          = amplc_pci230_pci_probe,
-        .remove         = __devexit_p(amplc_pci230_pci_remove)
+        .remove         = amplc_pci230_pci_remove
 };
 module_comedi_pci_driver(amplc_pci230_driver, amplc_pci230_pci_driver);
 
diff --git a/drivers/staging/comedi/drivers/cb_das16_cs.c b/drivers/staging/comedi/drivers/cb_das16_cs.c
index 6d81d8b40ccc..93731de1f2b1 100644
--- a/drivers/staging/comedi/drivers/cb_das16_cs.c
+++ b/drivers/staging/comedi/drivers/cb_das16_cs.c
@@ -194,67 +194,41 @@ static int das16cs_ai_cmdtest(struct comedi_device *dev,
         if (err)
                 return 2;
 
-        /* step 3: make sure arguments are trivially compatible */
+        /* Step 3: check if arguments are trivially valid */
+
+        err |= cfc_check_trigger_arg_is(&cmd->start_arg, 0);
 
-        if (cmd->start_arg != 0) {
-                cmd->start_arg = 0;
-                err++;
-        }
 #define MAX_SPEED       10000   /* in nanoseconds */
 #define MIN_SPEED       1000000000      /* in nanoseconds */
 
         if (cmd->scan_begin_src == TRIG_TIMER) {
-                if (cmd->scan_begin_arg < MAX_SPEED) {
-                        cmd->scan_begin_arg = MAX_SPEED;
-                        err++;
-                }
-                if (cmd->scan_begin_arg > MIN_SPEED) {
-                        cmd->scan_begin_arg = MIN_SPEED;
-                        err++;
-                }
+                err |= cfc_check_trigger_arg_min(&cmd->scan_begin_arg,
+                                                 MAX_SPEED);
+                err |= cfc_check_trigger_arg_max(&cmd->scan_begin_arg,
+                                                 MIN_SPEED);
         } else {
                 /* external trigger */
                 /* should be level/edge, hi/lo specification here */
                 /* should specify multiple external triggers */
-                if (cmd->scan_begin_arg > 9) {
-                        cmd->scan_begin_arg = 9;
-                        err++;
-                }
+                err |= cfc_check_trigger_arg_max(&cmd->scan_begin_arg, 9);
         }
         if (cmd->convert_src == TRIG_TIMER) {
-                if (cmd->convert_arg < MAX_SPEED) {
-                        cmd->convert_arg = MAX_SPEED;
-                        err++;
-                }
-                if (cmd->convert_arg > MIN_SPEED) {
-                        cmd->convert_arg = MIN_SPEED;
-                        err++;
-                }
+                err |= cfc_check_trigger_arg_min(&cmd->convert_arg,
+                                                 MAX_SPEED);
+                err |= cfc_check_trigger_arg_max(&cmd->convert_arg,
+                                                 MIN_SPEED);
         } else {
                 /* external trigger */
                 /* see above */
-                if (cmd->convert_arg > 9) {
-                        cmd->convert_arg = 9;
-                        err++;
-                }
+                err |= cfc_check_trigger_arg_max(&cmd->convert_arg, 9);
         }
 
-        if (cmd->scan_end_arg != cmd->chanlist_len) {
-                cmd->scan_end_arg = cmd->chanlist_len;
-                err++;
-        }
-        if (cmd->stop_src == TRIG_COUNT) {
-                if (cmd->stop_arg > 0x00ffffff) {
-                        cmd->stop_arg = 0x00ffffff;
-                        err++;
-                }
-        } else {
-                /* TRIG_NONE */
-                if (cmd->stop_arg != 0) {
-                        cmd->stop_arg = 0;
-                        err++;
-                }
-        }
+        err |= cfc_check_trigger_arg_is(&cmd->scan_end_arg, cmd->chanlist_len);
+
+        if (cmd->stop_src == TRIG_COUNT)
+                err |= cfc_check_trigger_arg_max(&cmd->stop_arg, 0x00ffffff);
+        else    /* TRIG_NONE */
+                err |= cfc_check_trigger_arg_is(&cmd->stop_arg, 0);
 
         if (err)
                 return 3;
@@ -428,6 +402,7 @@ static int das16cs_attach(struct comedi_device *dev,
                           struct comedi_devconfig *it)
 {
         const struct das16cs_board *thisboard;
+        struct das16cs_private *devpriv;
         struct pcmcia_device *link;
         struct comedi_subdevice *s;
         int ret;
@@ -451,8 +426,10 @@ static int das16cs_attach(struct comedi_device *dev,
                 return ret;
         dev->irq = link->irq;
 
-        if (alloc_private(dev, sizeof(struct das16cs_private)) < 0)
+        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
+        if (!devpriv)
                 return -ENOMEM;
+        dev->private = devpriv;
 
         ret = comedi_alloc_subdevices(dev, 3);
         if (ret)
diff --git a/drivers/staging/comedi/drivers/cb_pcidas.c b/drivers/staging/comedi/drivers/cb_pcidas.c
index de21a261ff45..aed68639cc9a 100644
--- a/drivers/staging/comedi/drivers/cb_pcidas.c
+++ b/drivers/staging/comedi/drivers/cb_pcidas.c
@@ -76,9 +76,6 @@ analog triggering on 1602 series
 #include "amcc_s5933.h"
 #include "comedi_fc.h"
 
-/* PCI vendor number of ComputerBoards/MeasurementComputing */
-#define PCI_VENDOR_ID_CB        0x1307
-
 #define TIMER_BASE              100     /* 10MHz master clock */
 #define AI_BUFFER_SIZE          1024    /* max ai fifo size */
 #define AO_BUFFER_SIZE          1024    /* max ao fifo size */
@@ -843,49 +840,32 @@ static int cb_pcidas_ai_cmdtest(struct comedi_device *dev,
                 /* External trigger, only CR_EDGE and CR_INVERT flags allowed */
                 if ((cmd->start_arg
                      & (CR_FLAGS_MASK & ~(CR_EDGE | CR_INVERT))) != 0) {
-                        cmd->start_arg &=
-                            ~(CR_FLAGS_MASK & ~(CR_EDGE | CR_INVERT));
-                        err++;
+                        cmd->start_arg &= ~(CR_FLAGS_MASK &
+                                                ~(CR_EDGE | CR_INVERT));
+                        err |= -EINVAL;
                 }
                 if (!thisboard->is_1602 && (cmd->start_arg & CR_INVERT)) {
                         cmd->start_arg &= (CR_FLAGS_MASK & ~CR_INVERT);
-                        err++;
+                        err |= -EINVAL;
                 }
                 break;
         default:
-                if (cmd->start_arg != 0) {
-                        cmd->start_arg = 0;
-                        err++;
-                }
+                err |= cfc_check_trigger_arg_is(&cmd->start_arg, 0);
                 break;
         }
 
-        if (cmd->scan_begin_src == TRIG_TIMER) {
-                if (cmd->scan_begin_arg <
-                    thisboard->ai_speed * cmd->chanlist_len) {
-                        cmd->scan_begin_arg =
-                            thisboard->ai_speed * cmd->chanlist_len;
-                        err++;
-                }
-        }
-        if (cmd->convert_src == TRIG_TIMER) {
-                if (cmd->convert_arg < thisboard->ai_speed) {
-                        cmd->convert_arg = thisboard->ai_speed;
-                        err++;
-                }
-        }
+        if (cmd->scan_begin_src == TRIG_TIMER)
+                err |= cfc_check_trigger_arg_min(&cmd->scan_begin_arg,
+                                thisboard->ai_speed * cmd->chanlist_len);
 
-        if (cmd->scan_end_arg != cmd->chanlist_len) {
-                cmd->scan_end_arg = cmd->chanlist_len;
-                err++;
-        }
-        if (cmd->stop_src == TRIG_NONE) {
-                /* TRIG_NONE */
-                if (cmd->stop_arg != 0) {
-                        cmd->stop_arg = 0;
-                        err++;
-                }
-        }
+        if (cmd->convert_src == TRIG_TIMER)
+                err |= cfc_check_trigger_arg_min(&cmd->convert_arg,
+                                                 thisboard->ai_speed);
+
+        err |= cfc_check_trigger_arg_is(&cmd->scan_end_arg, cmd->chanlist_len);
+
+        if (cmd->stop_src == TRIG_NONE)
+                err |= cfc_check_trigger_arg_is(&cmd->stop_arg, 0);
 
         if (err)
                 return 3;
@@ -1078,31 +1058,18 @@ static int cb_pcidas_ao_cmdtest(struct comedi_device *dev,
         if (err)
                 return 2;
 
-        /* step 3: arguments are trivially compatible */
+        /* Step 3: check if arguments are trivially valid */
 
-        if (cmd->start_arg != 0) {
-                cmd->start_arg = 0;
-                err++;
-        }
+        err |= cfc_check_trigger_arg_is(&cmd->start_arg, 0);
 
-        if (cmd->scan_begin_src == TRIG_TIMER) {
-                if (cmd->scan_begin_arg < thisboard->ao_scan_speed) {
-                        cmd->scan_begin_arg = thisboard->ao_scan_speed;
-                        err++;
-                }
-        }
+        if (cmd->scan_begin_src == TRIG_TIMER)
+                err |= cfc_check_trigger_arg_min(&cmd->scan_begin_arg,
+                                                 thisboard->ao_scan_speed);
 
-        if (cmd->scan_end_arg != cmd->chanlist_len) {
-                cmd->scan_end_arg = cmd->chanlist_len;
-                err++;
-        }
-        if (cmd->stop_src == TRIG_NONE) {
-                /* TRIG_NONE */
-                if (cmd->stop_arg != 0) {
-                        cmd->stop_arg = 0;
-                        err++;
-                }
-        }
+        err |= cfc_check_trigger_arg_is(&cmd->scan_end_arg, cmd->chanlist_len);
+
+        if (cmd->stop_src == TRIG_NONE)
+                err |= cfc_check_trigger_arg_is(&cmd->stop_arg, 0);
 
         if (err)
                 return 3;
@@ -1469,27 +1436,26 @@ static const void *cb_pcidas_find_boardinfo(struct comedi_device *dev,
         return NULL;
 }
 
-static int cb_pcidas_attach_pci(struct comedi_device *dev,
-                                struct pci_dev *pcidev)
+static int cb_pcidas_auto_attach(struct comedi_device *dev,
+                                           unsigned long context_unused)
 {
+        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
         const struct cb_pcidas_board *thisboard;
         struct cb_pcidas_private *devpriv;
         struct comedi_subdevice *s;
         int i;
         int ret;
 
-        comedi_set_hw_dev(dev, &pcidev->dev);
-
         thisboard = cb_pcidas_find_boardinfo(dev, pcidev);
         if (!thisboard)
                 return -ENODEV;
         dev->board_ptr  = thisboard;
         dev->board_name = thisboard->name;
 
-        ret = alloc_private(dev, sizeof(*devpriv));
-        if (ret)
-                return ret;
-        devpriv = dev->private;
+        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
+        if (!devpriv)
+                return -ENOMEM;
+        dev->private = devpriv;
 
         ret = comedi_pci_enable(pcidev, dev->board_name);
         if (ret)
@@ -1656,17 +1622,17 @@ static void cb_pcidas_detach(struct comedi_device *dev)
 static struct comedi_driver cb_pcidas_driver = {
         .driver_name    = "cb_pcidas",
         .module         = THIS_MODULE,
-        .attach_pci     = cb_pcidas_attach_pci,
+        .auto_attach    = cb_pcidas_auto_attach,
         .detach         = cb_pcidas_detach,
 };
 
-static int __devinit cb_pcidas_pci_probe(struct pci_dev *dev,
+static int cb_pcidas_pci_probe(struct pci_dev *dev,
                                          const struct pci_device_id *ent)
 {
         return comedi_pci_auto_config(dev, &cb_pcidas_driver);
 }
 
-static void __devexit cb_pcidas_pci_remove(struct pci_dev *dev)
+static void cb_pcidas_pci_remove(struct pci_dev *dev)
 {
         comedi_pci_auto_unconfig(dev);
 }
@@ -1688,7 +1654,7 @@ static struct pci_driver cb_pcidas_pci_driver = {
         .name           = "cb_pcidas",
         .id_table       = cb_pcidas_pci_table,
         .probe          = cb_pcidas_pci_probe,
-        .remove         = __devexit_p(cb_pcidas_pci_remove)
+        .remove         = cb_pcidas_pci_remove
 };
 module_comedi_pci_driver(cb_pcidas_driver, cb_pcidas_pci_driver);
 
diff --git a/drivers/staging/comedi/drivers/cb_pcidas64.c b/drivers/staging/comedi/drivers/cb_pcidas64.c
index 0472a9088abe..d72b46cc06bc 100644
--- a/drivers/staging/comedi/drivers/cb_pcidas64.c
+++ b/drivers/staging/comedi/drivers/cb_pcidas64.c
@@ -36,53 +36,57 @@
 ************************************************************************/
 
 /*
-
-Driver: cb_pcidas64
-Description: MeasurementComputing PCI-DAS64xx, 60XX, and 4020 series with the PLX 9080 PCI controller
-Author: Frank Mori Hess <fmhess@users.sourceforge.net>
-Status: works
-Updated: 2002-10-09
-Devices: [Measurement Computing] PCI-DAS6402/16 (cb_pcidas64),
-  PCI-DAS6402/12, PCI-DAS64/M1/16, PCI-DAS64/M2/16,
-  PCI-DAS64/M3/16, PCI-DAS6402/16/JR, PCI-DAS64/M1/16/JR,
-  PCI-DAS64/M2/16/JR, PCI-DAS64/M3/16/JR, PCI-DAS64/M1/14,
-  PCI-DAS64/M2/14, PCI-DAS64/M3/14, PCI-DAS6013, PCI-DAS6014,
-  PCI-DAS6023, PCI-DAS6025, PCI-DAS6030,
-  PCI-DAS6031, PCI-DAS6032, PCI-DAS6033, PCI-DAS6034,
-  PCI-DAS6035, PCI-DAS6036, PCI-DAS6040, PCI-DAS6052,
-  PCI-DAS6070, PCI-DAS6071, PCI-DAS4020/12
-
-Configuration options:
-   [0] - PCI bus of device (optional)
-   [1] - PCI slot of device (optional)
-
-These boards may be autocalibrated with the comedi_calibrate utility.
-
-To select the bnc trigger input on the 4020 (instead of the dio input),
-specify a nonzero channel in the chanspec.  If you wish to use an external
-master clock on the 4020, you may do so by setting the scan_begin_src
-to TRIG_OTHER, and using an INSN_CONFIG_TIMER_1 configuration insn
-to configure the divisor to use for the external clock.
-
-Some devices are not identified because the PCI device IDs are not yet
-known. If you have such a board, please file a bug report at
-https://bugs.comedi.org.
-
-*/
+ * Driver: cb_pcidas64
+ * Description: MeasurementComputing PCI-DAS64xx, 60XX, and 4020 series
+ *   with the PLX 9080 PCI controller
+ * Author: Frank Mori Hess <fmhess@users.sourceforge.net>
+ * Status: works
+ * Updated: Fri, 02 Nov 2012 18:58:55 +0000
+ * Devices: [Measurement Computing] PCI-DAS6402/16 (cb_pcidas64),
+ *   PCI-DAS6402/12, PCI-DAS64/M1/16, PCI-DAS64/M2/16,
+ *   PCI-DAS64/M3/16, PCI-DAS6402/16/JR, PCI-DAS64/M1/16/JR,
+ *   PCI-DAS64/M2/16/JR, PCI-DAS64/M3/16/JR, PCI-DAS64/M1/14,
+ *   PCI-DAS64/M2/14, PCI-DAS64/M3/14, PCI-DAS6013, PCI-DAS6014,
+ *   PCI-DAS6023, PCI-DAS6025, PCI-DAS6030,
+ *   PCI-DAS6031, PCI-DAS6032, PCI-DAS6033, PCI-DAS6034,
+ *   PCI-DAS6035, PCI-DAS6036, PCI-DAS6040, PCI-DAS6052,
+ *   PCI-DAS6070, PCI-DAS6071, PCI-DAS4020/12
+ *
+ * Configuration options:
+ *   None.
+ *
+ * Manual attachment of PCI cards with the comedi_config utility is not
+ * supported by this driver; they are attached automatically.
+ *
+ * These boards may be autocalibrated with the comedi_calibrate utility.
+ *
+ * To select the bnc trigger input on the 4020 (instead of the dio input),
+ * specify a nonzero channel in the chanspec.  If you wish to use an external
+ * master clock on the 4020, you may do so by setting the scan_begin_src
+ * to TRIG_OTHER, and using an INSN_CONFIG_TIMER_1 configuration insn
+ * to configure the divisor to use for the external clock.
+ *
+ * Some devices are not identified because the PCI device IDs are not yet
+ * known. If you have such a board, please let the maintainers know.
+ */
 
 /*
 
 TODO:
         make it return error if user attempts an ai command that uses the
-                external queue, and an ao command simultaneously
-        user counter subdevice
+        external queue, and an ao command simultaneously user counter subdevice
         there are a number of boards this driver will support when they are
-                fully released, but does not yet since the pci device id numbers
-                are not yet available.
-        support prescaled 100khz clock for slow pacing (not available on 6000 series?)
+        fully released, but does not yet since the pci device id numbers
+        are not yet available.
+
+        support prescaled 100khz clock for slow pacing (not available on 6000
+        series?)
+
         make ao fifo size adjustable like ai fifo
 */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include "../comedidev.h"
 #include <linux/delay.h>
 #include <linux/interrupt.h>
@@ -96,17 +100,17 @@ TODO:
 /* #define PCIDAS64_DEBUG         enable debugging code */
 
 #ifdef PCIDAS64_DEBUG
-#define DEBUG_PRINT(format, args...)  printk(format , ## args)
+#define DEBUG_PRINT(format, args...)  pr_debug(format, ## args)
 #else
-#define DEBUG_PRINT(format, args...)
+#define DEBUG_PRINT(format, args...)  no_printk(format, ## args)
 #endif
 
 #define TIMER_BASE 25           /*  40MHz master clock */
-#define PRESCALED_TIMER_BASE    10000   /*  100kHz 'prescaled' clock for slow acquisition, maybe I'll support this someday */
+/* 100kHz 'prescaled' clock for slow acquisition,
+ * maybe I'll support this someday */
+#define PRESCALED_TIMER_BASE    10000
 #define DMA_BUFFER_SIZE 0x1000
 
-#define PCI_VENDOR_ID_COMPUTERBOARDS    0x1307
-
 /* maximum value that can be loaded into board's 24-bit counters*/
 static const int max_counter_value = 0xffffff;
 
@@ -119,7 +123,7 @@ enum base_address_regions {
         DIO_COUNTER_BADDRINDEX = 3,
 };
 
-/* priv(dev)->main_iobase registers */
+/* devpriv->main_iobase registers */
 enum write_only_registers {
         INTR_ENABLE_REG = 0x0,  /*  interrupt enable register */
         HW_CONFIG_REG = 0x2,    /*  hardware config register */
@@ -128,26 +132,36 @@ enum write_only_registers {
         ADC_CONTROL0_REG = 0x10,        /*  adc control register 0 */
         ADC_CONTROL1_REG = 0x12,        /*  adc control register 1 */
         CALIBRATION_REG = 0x14,
-        ADC_SAMPLE_INTERVAL_LOWER_REG = 0x16,   /*  lower 16 bits of adc sample interval counter */
-        ADC_SAMPLE_INTERVAL_UPPER_REG = 0x18,   /*  upper 8 bits of adc sample interval counter */
-        ADC_DELAY_INTERVAL_LOWER_REG = 0x1a,    /*  lower 16 bits of delay interval counter */
-        ADC_DELAY_INTERVAL_UPPER_REG = 0x1c,    /*  upper 8 bits of delay interval counter */
-        ADC_COUNT_LOWER_REG = 0x1e,     /*  lower 16 bits of hardware conversion/scan counter */
-        ADC_COUNT_UPPER_REG = 0x20,     /*  upper 8 bits of hardware conversion/scan counter */
+        /*  lower 16 bits of adc sample interval counter */
+        ADC_SAMPLE_INTERVAL_LOWER_REG = 0x16,
+        /*  upper 8 bits of adc sample interval counter */
+        ADC_SAMPLE_INTERVAL_UPPER_REG = 0x18,
+        /*  lower 16 bits of delay interval counter */
+        ADC_DELAY_INTERVAL_LOWER_REG = 0x1a,
+        /*  upper 8 bits of delay interval counter */
+        ADC_DELAY_INTERVAL_UPPER_REG = 0x1c,
+        /*  lower 16 bits of hardware conversion/scan counter */
+        ADC_COUNT_LOWER_REG = 0x1e,
+        /*  upper 8 bits of hardware conversion/scan counter */
+        ADC_COUNT_UPPER_REG = 0x20,
         ADC_START_REG = 0x22,   /*  software trigger to start acquisition */
         ADC_CONVERT_REG = 0x24, /*  initiates single conversion */
         ADC_QUEUE_CLEAR_REG = 0x26,     /*  clears adc queue */
         ADC_QUEUE_LOAD_REG = 0x28,      /*  loads adc queue */
         ADC_BUFFER_CLEAR_REG = 0x2a,
-        ADC_QUEUE_HIGH_REG = 0x2c,      /*  high channel for internal queue, use adc_chan_bits() inline above */
+        /*  high channel for internal queue, use adc_chan_bits() inline above */
+        ADC_QUEUE_HIGH_REG = 0x2c,
         DAC_CONTROL0_REG = 0x50,        /*  dac control register 0 */
         DAC_CONTROL1_REG = 0x52,        /*  dac control register 0 */
-        DAC_SAMPLE_INTERVAL_LOWER_REG = 0x54,   /*  lower 16 bits of dac sample interval counter */
-        DAC_SAMPLE_INTERVAL_UPPER_REG = 0x56,   /*  upper 8 bits of dac sample interval counter */
+        /*  lower 16 bits of dac sample interval counter */
+        DAC_SAMPLE_INTERVAL_LOWER_REG = 0x54,
+        /*  upper 8 bits of dac sample interval counter */
+        DAC_SAMPLE_INTERVAL_UPPER_REG = 0x56,
         DAC_SELECT_REG = 0x60,
         DAC_START_REG = 0x64,
         DAC_BUFFER_CLEAR_REG = 0x66,    /*  clear dac buffer */
 };
+
 static inline unsigned int dac_convert_reg(unsigned int channel)
 {
         return 0x70 + (2 * (channel & 0x1));
@@ -164,7 +178,9 @@ static inline unsigned int dac_msb_4020_reg(unsigned int channel)
 }
 
 enum read_only_registers {
-        HW_STATUS_REG = 0x0,    /*  hardware status register, reading this apparently clears pending interrupts as well */
+        /*  hardware status register,
+         *  reading this apparently clears pending interrupts as well */
+        HW_STATUS_REG = 0x0,
         PIPE1_READ_REG = 0x4,
         ADC_READ_PNTR_REG = 0x8,
         LOWER_XFER_REG = 0x10,
@@ -174,12 +190,14 @@ enum read_only_registers {
 
 enum read_write_registers {
         I8255_4020_REG = 0x48,  /*  8255 offset, for 4020 only */
-        ADC_QUEUE_FIFO_REG = 0x100,     /*  external channel/gain queue, uses same bits as ADC_QUEUE_LOAD_REG */
+        /*  external channel/gain queue, uses same bits as ADC_QUEUE_LOAD_REG */
+        ADC_QUEUE_FIFO_REG = 0x100,
         ADC_FIFO_REG = 0x200,   /* adc data fifo */
-        DAC_FIFO_REG = 0x300,   /* dac data fifo, has weird interactions with external channel queue */
+        /* dac data fifo, has weird interactions with external channel queue */
+        DAC_FIFO_REG = 0x300,
 };
 
-/* priv(dev)->dio_counter_iobase registers */
+/* devpriv->dio_counter_iobase registers */
 enum dio_counter_registers {
         DIO_8255_OFFSET = 0x0,
         DO_REG = 0x20,
@@ -191,13 +209,13 @@ enum dio_counter_registers {
 /* bit definitions for write-only registers */
 
 enum intr_enable_contents {
-        ADC_INTR_SRC_MASK = 0x3,        /*  bits that set adc interrupt source */
-        ADC_INTR_QFULL_BITS = 0x0,      /*  interrupt fifo quater full */
+        ADC_INTR_SRC_MASK = 0x3,        /*  adc interrupt source mask */
+        ADC_INTR_QFULL_BITS = 0x0,      /*  interrupt fifo quarter full */
         ADC_INTR_EOC_BITS = 0x1,        /*  interrupt end of conversion */
         ADC_INTR_EOSCAN_BITS = 0x2,     /*  interrupt end of scan */
-        ADC_INTR_EOSEQ_BITS = 0x3,      /*  interrupt end of sequence (probably wont use this it's pretty fancy) */
+        ADC_INTR_EOSEQ_BITS = 0x3,      /*  interrupt end of sequence mask */
         EN_ADC_INTR_SRC_BIT = 0x4,      /*  enable adc interrupt source */
-        EN_ADC_DONE_INTR_BIT = 0x8,     /*  enable adc acquisition done interrupt */
+        EN_ADC_DONE_INTR_BIT = 0x8,     /*  enable adc acquisition done intr */
         DAC_INTR_SRC_MASK = 0x30,
         DAC_INTR_QEMPTY_BITS = 0x0,
         DAC_INTR_HIGH_CHAN_BITS = 0x10,
@@ -211,25 +229,33 @@ enum intr_enable_contents {
 };
 
 enum hw_config_contents {
-        MASTER_CLOCK_4020_MASK = 0x3,   /*  bits that specify master clock source for 4020 */
-        INTERNAL_CLOCK_4020_BITS = 0x1, /*  use 40 MHz internal master clock for 4020 */
+        MASTER_CLOCK_4020_MASK = 0x3,   /*  master clock source mask for 4020 */
+        INTERNAL_CLOCK_4020_BITS = 0x1, /*  use 40 MHz internal master clock */
         BNC_CLOCK_4020_BITS = 0x2,      /*  use BNC input for master clock */
         EXT_CLOCK_4020_BITS = 0x3,      /*  use dio input for master clock */
-        EXT_QUEUE_BIT = 0x200,  /*  use external channel/gain queue (more versatile than internal queue) */
-        SLOW_DAC_BIT = 0x400,   /*  use 225 nanosec strobe when loading dac instead of 50 nanosec */
-        HW_CONFIG_DUMMY_BITS = 0x2000,  /*  bit with unknown function yet given as default value in pci-das64 manual */
-        DMA_CH_SELECT_BIT = 0x8000,     /*  bit selects channels 1/0 for analog input/output, otherwise 0/1 */
-        FIFO_SIZE_REG = 0x4,    /*  allows adjustment of fifo sizes */
+        EXT_QUEUE_BIT = 0x200,          /*  use external channel/gain queue */
+        /*  use 225 nanosec strobe when loading dac instead of 50 nanosec */
+        SLOW_DAC_BIT = 0x400,
+        /*  bit with unknown function yet given as default value in pci-das64
+         *  manual */
+        HW_CONFIG_DUMMY_BITS = 0x2000,
+        /*  bit selects channels 1/0 for analog input/output, otherwise 0/1 */
+        DMA_CH_SELECT_BIT = 0x8000,
+        FIFO_SIZE_REG = 0x4,            /*  allows adjustment of fifo sizes */
         DAC_FIFO_SIZE_MASK = 0xff00,    /*  bits that set dac fifo size */
-        DAC_FIFO_BITS = 0xf800, /* 8k sample ao fifo */
+        DAC_FIFO_BITS = 0xf800,         /*  8k sample ao fifo */
 };
 #define DAC_FIFO_SIZE 0x2000
 
 enum daq_atrig_low_4020_contents {
-        EXT_AGATE_BNC_BIT = 0x8000,     /*  use trig/ext clk bnc input for analog gate signal */
-        EXT_STOP_TRIG_BNC_BIT = 0x4000, /*  use trig/ext clk bnc input for external stop trigger signal */
-        EXT_START_TRIG_BNC_BIT = 0x2000,        /*  use trig/ext clk bnc input for external start trigger signal */
+        /*  use trig/ext clk bnc input for analog gate signal */
+        EXT_AGATE_BNC_BIT = 0x8000,
+        /*  use trig/ext clk bnc input for external stop trigger signal */
+        EXT_STOP_TRIG_BNC_BIT = 0x4000,
+        /*  use trig/ext clk bnc input for external start trigger signal */
+        EXT_START_TRIG_BNC_BIT = 0x2000,
 };
+
 static inline uint16_t analog_trig_low_threshold_bits(uint16_t threshold)
 {
         return threshold & 0xfff;
@@ -247,14 +273,17 @@ enum adc_control0_contents {
         ADC_START_TRIG_ANALOG_BITS = 0x30,
         ADC_START_TRIG_MASK = 0x30,
         ADC_START_TRIG_FALLING_BIT = 0x40,      /*  trig 1 uses falling edge */
-        ADC_EXT_CONV_FALLING_BIT = 0x800,       /*  external pacing uses falling edge */
-        ADC_SAMPLE_COUNTER_EN_BIT = 0x1000,     /*  enable hardware scan counter */
+        /*  external pacing uses falling edge */
+        ADC_EXT_CONV_FALLING_BIT = 0x800,
+        /*  enable hardware scan counter */
+        ADC_SAMPLE_COUNTER_EN_BIT = 0x1000,
         ADC_DMA_DISABLE_BIT = 0x4000,   /*  disables dma */
         ADC_ENABLE_BIT = 0x8000,        /*  master adc enable */
 };
 
 enum adc_control1_contents {
-        ADC_QUEUE_CONFIG_BIT = 0x1,     /*  should be set for boards with > 16 channels */
+        /*  should be set for boards with > 16 channels */
+        ADC_QUEUE_CONFIG_BIT = 0x1,
         CONVERT_POLARITY_BIT = 0x10,
         EOC_POLARITY_BIT = 0x20,
         ADC_SW_GATE_BIT = 0x40, /*  software gate of adc */
@@ -263,10 +292,11 @@ enum adc_control1_contents {
         ADC_LO_CHANNEL_4020_MASK = 0x300,
         ADC_HI_CHANNEL_4020_MASK = 0xc00,
         TWO_CHANNEL_4020_BITS = 0x1000, /*  two channel mode for 4020 */
-        FOUR_CHANNEL_4020_BITS = 0x2000,        /*  four channel mode for 4020 */
+        FOUR_CHANNEL_4020_BITS = 0x2000, /*  four channel mode for 4020 */
         CHANNEL_MODE_4020_MASK = 0x3000,
         ADC_MODE_MASK = 0xf000,
 };
+
 static inline uint16_t adc_lo_chan_4020_bits(unsigned int channel)
 {
         return (channel & 0x3) << 8;
@@ -289,9 +319,10 @@ enum calibration_contents {
         CAL_EN_64XX_BIT = 0x40, /*  calibration enable for 64xx series */
         SERIAL_DATA_IN_BIT = 0x80,
         SERIAL_CLOCK_BIT = 0x100,
-        CAL_EN_60XX_BIT = 0x200,        /*  calibration enable for 60xx series */
+        CAL_EN_60XX_BIT = 0x200, /*  calibration enable for 60xx series */
         CAL_GAIN_BIT = 0x800,
 };
+
 /* calibration sources for 6025 are:
  *  0 : ground
  *  1 : 10V
@@ -302,6 +333,7 @@ enum calibration_contents {
  *  6 : dac channel 0
  *  7 : dac channel 1
  */
+
 static inline uint16_t adc_src_bits(unsigned int source)
 {
         return (source & 0xf) << 3;
@@ -315,10 +347,12 @@ static inline uint16_t adc_convert_chan_4020_bits(unsigned int channel)
 enum adc_queue_load_contents {
         UNIP_BIT = 0x800,       /*  unipolar/bipolar bit */
         ADC_SE_DIFF_BIT = 0x1000,       /*  single-ended/ differential bit */
-        ADC_COMMON_BIT = 0x2000,        /*  non-referenced single-ended (common-mode input) */
+        /*  non-referenced single-ended (common-mode input) */
+        ADC_COMMON_BIT = 0x2000,
         QUEUE_EOSEQ_BIT = 0x4000,       /*  queue end of sequence */
         QUEUE_EOSCAN_BIT = 0x8000,      /*  queue end of scan */
 };
+
 static inline uint16_t adc_chan_bits(unsigned int channel)
 {
         return channel & 0x3f;
@@ -365,6 +399,7 @@ enum hw_status_contents {
         EXT_INTR_PENDING_BIT = 0x100,
         ADC_STOP_BIT = 0x200,
 };
+
 static inline uint16_t pipe_full_bits(uint16_t hw_status_bits)
 {
         return (hw_status_bits >> 10) & 0x3;
@@ -393,9 +428,12 @@ enum i2c_addresses {
 };
 
 enum range_cal_i2c_contents {
-        ADC_SRC_4020_MASK = 0x70,       /*  bits that set what source the adc converter measures */
-        BNC_TRIG_THRESHOLD_0V_BIT = 0x80,       /*  make bnc trig/ext clock threshold 0V instead of 2.5V */
+        /*  bits that set what source the adc converter measures */
+        ADC_SRC_4020_MASK = 0x70,
+        /*  make bnc trig/ext clock threshold 0V instead of 2.5V */
+        BNC_TRIG_THRESHOLD_0V_BIT = 0x80,
 };
+
 static inline uint8_t adc_src_4020_bits(unsigned int source)
 {
         return (source << 4) & ADC_SRC_4020_MASK;
@@ -562,11 +600,12 @@ struct pcidas64_board {
         const struct comedi_lrange *ai_range_table;
         int ao_nchan;           /*  number of analog out channels */
         int ao_bits;            /*  analog output resolution */
-        int ao_scan_speed;      /*  analog output speed (for a scan, not conversion) */
+        int ao_scan_speed;      /*  analog output scan speed */
         const struct comedi_lrange *ao_range_table;
         const int *ao_range_code;
         const struct hw_fifo_info *const ai_fifo;
-        enum register_layout layout;    /*  different board families have slightly different registers */
+        /*  different board families have slightly different registers */
+        enum register_layout layout;
         unsigned has_8255:1;
 };
 
@@ -596,7 +635,7 @@ static const struct hw_fifo_info ai_fifo_60xx = {
 #define MAX_AI_DMA_RING_COUNT (0x80000 / DMA_BUFFER_SIZE)
 #define MIN_AI_DMA_RING_COUNT (0x10000 / DMA_BUFFER_SIZE)
 #define AO_DMA_RING_COUNT (0x10000 / DMA_BUFFER_SIZE)
-static inline unsigned int ai_dma_ring_count(struct pcidas64_board *board)
+static inline unsigned int ai_dma_ring_count(const struct pcidas64_board *board)
 {
         if (board->layout == LAYOUT_4020)
                 return MAX_AI_DMA_RING_COUNT;
@@ -1025,24 +1064,23 @@ static const struct pcidas64_board pcidas64_boards[] = {
 #endif
 };
 
-static inline struct pcidas64_board *board(const struct comedi_device *dev)
-{
-        return (struct pcidas64_board *)dev->board_ptr;
-}
-
 static inline unsigned short se_diff_bit_6xxx(struct comedi_device *dev,
                                               int use_differential)
 {
-        if ((board(dev)->layout == LAYOUT_64XX && !use_differential) ||
-            (board(dev)->layout == LAYOUT_60XX && use_differential))
+        const struct pcidas64_board *thisboard = comedi_board(dev);
+
+        if ((thisboard->layout == LAYOUT_64XX && !use_differential) ||
+            (thisboard->layout == LAYOUT_60XX && use_differential))
                 return ADC_SE_DIFF_BIT;
         else
                 return 0;
 };
 
 struct ext_clock_info {
-        unsigned int divisor;   /*  master clock divisor to use for scans with external master clock */
-        unsigned int chanspec;  /*  chanspec for master clock input when used as scan begin src */
+        /*  master clock divisor to use for scans with external master clock */
+        unsigned int divisor;
+        /*  chanspec for master clock input when used as scan begin src */
+        unsigned int chanspec;
 };
 
 /* this structure is for data unique to this hardware driver. */
@@ -1058,30 +1096,52 @@ struct pcidas64_private {
         /*  local address (used by dma controller) */
         uint32_t local0_iobase;
         uint32_t local1_iobase;
-        volatile unsigned int ai_count; /*  number of analog input samples remaining */
-        uint16_t *ai_buffer[MAX_AI_DMA_RING_COUNT];     /*  dma buffers for analog input */
-        dma_addr_t ai_buffer_bus_addr[MAX_AI_DMA_RING_COUNT];   /*  physical addresses of ai dma buffers */
-        struct plx_dma_desc *ai_dma_desc;       /*  array of ai dma descriptors read by plx9080, allocated to get proper alignment */
-        dma_addr_t ai_dma_desc_bus_addr;        /*  physical address of ai dma descriptor array */
-        volatile unsigned int ai_dma_index;     /*  index of the ai dma descriptor/buffer that is currently being used */
-        uint16_t *ao_buffer[AO_DMA_RING_COUNT]; /*  dma buffers for analog output */
-        dma_addr_t ao_buffer_bus_addr[AO_DMA_RING_COUNT];       /*  physical addresses of ao dma buffers */
+        /*  number of analog input samples remaining */
+        volatile unsigned int ai_count;
+        /*  dma buffers for analog input */
+        uint16_t *ai_buffer[MAX_AI_DMA_RING_COUNT];
+        /*  physical addresses of ai dma buffers */
+        dma_addr_t ai_buffer_bus_addr[MAX_AI_DMA_RING_COUNT];
+        /*  array of ai dma descriptors read by plx9080,
+         *  allocated to get proper alignment */
+        struct plx_dma_desc *ai_dma_desc;
+        /*  physical address of ai dma descriptor array */
+        dma_addr_t ai_dma_desc_bus_addr;
+        /*  index of the ai dma descriptor/buffer
+         *  that is currently being used */
+        volatile unsigned int ai_dma_index;
+        /*  dma buffers for analog output */
+        uint16_t *ao_buffer[AO_DMA_RING_COUNT];
+        /*  physical addresses of ao dma buffers */
+        dma_addr_t ao_buffer_bus_addr[AO_DMA_RING_COUNT];
         struct plx_dma_desc *ao_dma_desc;
         dma_addr_t ao_dma_desc_bus_addr;
-        volatile unsigned int ao_dma_index;     /*  keeps track of buffer where the next ao sample should go */
-        volatile unsigned long ao_count;        /*  number of analog output samples remaining */
-        volatile unsigned int ao_value[2];      /*  remember what the analog outputs are set to, to allow readback */
+        /*  keeps track of buffer where the next ao sample should go */
+        volatile unsigned int ao_dma_index;
+        /*  number of analog output samples remaining */
+        volatile unsigned long ao_count;
+        /*  remember what the analog outputs are set to, to allow readback */
+        volatile unsigned int ao_value[2];
         unsigned int hw_revision;       /*  stc chip hardware revision number */
-        volatile unsigned int intr_enable_bits; /*  last bits sent to INTR_ENABLE_REG register */
-        volatile uint16_t adc_control1_bits;    /*  last bits sent to ADC_CONTROL1_REG register */
-        volatile uint16_t fifo_size_bits;       /*  last bits sent to FIFO_SIZE_REG register */
-        volatile uint16_t hw_config_bits;       /*  last bits sent to HW_CONFIG_REG register */
+        /*  last bits sent to INTR_ENABLE_REG register */
+        volatile unsigned int intr_enable_bits;
+        /*  last bits sent to ADC_CONTROL1_REG register */
+        volatile uint16_t adc_control1_bits;
+        /*  last bits sent to FIFO_SIZE_REG register */
+        volatile uint16_t fifo_size_bits;
+        /*  last bits sent to HW_CONFIG_REG register */
+        volatile uint16_t hw_config_bits;
         volatile uint16_t dac_control1_bits;
-        volatile uint32_t plx_control_bits;     /*  last bits written to plx9080 control register */
-        volatile uint32_t plx_intcsr_bits;      /*  last bits written to plx interrupt control and status register */
-        volatile int calibration_source;        /*  index of calibration source readable through ai ch0 */
-        volatile uint8_t i2c_cal_range_bits;    /*  bits written to i2c calibration/range register */
-        volatile unsigned int ext_trig_falling; /*  configure digital triggers to trigger on falling edge */
+        /*  last bits written to plx9080 control register */
+        volatile uint32_t plx_control_bits;
+        /*  last bits written to plx interrupt control and status register */
+        volatile uint32_t plx_intcsr_bits;
+        /*  index of calibration source readable through ai ch0 */
+        volatile int calibration_source;
+        /*  bits written to i2c calibration/range register */
+        volatile uint8_t i2c_cal_range_bits;
+        /*  configure digital triggers to trigger on falling edge */
+        volatile unsigned int ext_trig_falling;
         /*  states of various devices stored to enable read-back */
         unsigned int ad8402_state[2];
         unsigned int caldac_state[8];
@@ -1091,93 +1151,12 @@ struct pcidas64_private {
         short ao_bounce_buffer[DAC_FIFO_SIZE];
 };
 
-/* inline function that makes it easier to
- * access the private structure.
- */
-static inline struct pcidas64_private *priv(struct comedi_device *dev)
-{
-        return dev->private;
-}
-
-static int ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s,
-                    struct comedi_insn *insn, unsigned int *data);
-static int ai_config_insn(struct comedi_device *dev, struct comedi_subdevice *s,
-                          struct comedi_insn *insn, unsigned int *data);
-static int ao_winsn(struct comedi_device *dev, struct comedi_subdevice *s,
-                    struct comedi_insn *insn, unsigned int *data);
-static int ao_readback_insn(struct comedi_device *dev,
-                            struct comedi_subdevice *s,
-                            struct comedi_insn *insn, unsigned int *data);
-static int ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s);
-static int ai_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s,
-                      struct comedi_cmd *cmd);
-static int ao_cmd(struct comedi_device *dev, struct comedi_subdevice *s);
-static int ao_inttrig(struct comedi_device *dev,
-                      struct comedi_subdevice *subdev, unsigned int trig_num);
-static int ao_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s,
-                      struct comedi_cmd *cmd);
-static irqreturn_t handle_interrupt(int irq, void *d);
-static int ai_cancel(struct comedi_device *dev, struct comedi_subdevice *s);
-static int ao_cancel(struct comedi_device *dev, struct comedi_subdevice *s);
-static int dio_callback(int dir, int port, int data, unsigned long arg);
-static int dio_callback_4020(int dir, int port, int data, unsigned long arg);
-static int di_rbits(struct comedi_device *dev, struct comedi_subdevice *s,
-                    struct comedi_insn *insn, unsigned int *data);
-static int do_wbits(struct comedi_device *dev, struct comedi_subdevice *s,
-                    struct comedi_insn *insn, unsigned int *data);
-static int dio_60xx_config_insn(struct comedi_device *dev,
-                                struct comedi_subdevice *s,
-                                struct comedi_insn *insn, unsigned int *data);
-static int dio_60xx_wbits(struct comedi_device *dev, struct comedi_subdevice *s,
-                          struct comedi_insn *insn, unsigned int *data);
-static int calib_read_insn(struct comedi_device *dev,
-                           struct comedi_subdevice *s, struct comedi_insn *insn,
-                           unsigned int *data);
-static int calib_write_insn(struct comedi_device *dev,
-                            struct comedi_subdevice *s,
-                            struct comedi_insn *insn, unsigned int *data);
-static int ad8402_read_insn(struct comedi_device *dev,
-                            struct comedi_subdevice *s,
-                            struct comedi_insn *insn, unsigned int *data);
-static void ad8402_write(struct comedi_device *dev, unsigned int channel,
-                         unsigned int value);
-static int ad8402_write_insn(struct comedi_device *dev,
-                             struct comedi_subdevice *s,
-                             struct comedi_insn *insn, unsigned int *data);
-static int eeprom_read_insn(struct comedi_device *dev,
-                            struct comedi_subdevice *s,
-                            struct comedi_insn *insn, unsigned int *data);
-static void check_adc_timing(struct comedi_device *dev, struct comedi_cmd *cmd);
-static unsigned int get_divisor(unsigned int ns, unsigned int flags);
-static void i2c_write(struct comedi_device *dev, unsigned int address,
-                      const uint8_t *data, unsigned int length);
-static void caldac_write(struct comedi_device *dev, unsigned int channel,
-                         unsigned int value);
-static int caldac_8800_write(struct comedi_device *dev, unsigned int address,
-                             uint8_t value);
-/* static int dac_1590_write(struct comedi_device *dev, unsigned int dac_a, unsigned int dac_b); */
-static int caldac_i2c_write(struct comedi_device *dev,
-                            unsigned int caldac_channel, unsigned int value);
-static void abort_dma(struct comedi_device *dev, unsigned int channel);
-static void disable_plx_interrupts(struct comedi_device *dev);
-static int set_ai_fifo_size(struct comedi_device *dev,
-                            unsigned int num_samples);
-static unsigned int ai_fifo_size(struct comedi_device *dev);
-static int set_ai_fifo_segment_length(struct comedi_device *dev,
-                                      unsigned int num_entries);
-static void disable_ai_pacing(struct comedi_device *dev);
-static void disable_ai_interrupts(struct comedi_device *dev);
-static void enable_ai_interrupts(struct comedi_device *dev,
-                                 const struct comedi_cmd *cmd);
-static unsigned int get_ao_divisor(unsigned int ns, unsigned int flags);
-static void load_ao_dma(struct comedi_device *dev,
-                        const struct comedi_cmd *cmd);
-
 static unsigned int ai_range_bits_6xxx(const struct comedi_device *dev,
                                        unsigned int range_index)
 {
+        const struct pcidas64_board *thisboard = comedi_board(dev);
         const struct comedi_krange *range =
-            &board(dev)->ai_range_table->range[range_index];
+                &thisboard->ai_range_table->range[range_index];
         unsigned int bits = 0;
 
         switch (range->max) {
@@ -1220,7 +1199,9 @@ static unsigned int ai_range_bits_6xxx(const struct comedi_device *dev,
 static unsigned int hw_revision(const struct comedi_device *dev,
                                 uint16_t hw_status_bits)
 {
-        if (board(dev)->layout == LAYOUT_4020)
+        const struct pcidas64_board *thisboard = comedi_board(dev);
+
+        if (thisboard->layout == LAYOUT_4020)
                 return (hw_status_bits >> 13) & 0x7;
 
         return (hw_status_bits >> 12) & 0xf;
@@ -1230,7 +1211,8 @@ static void set_dac_range_bits(struct comedi_device *dev,
                                volatile uint16_t *bits, unsigned int channel,
                                unsigned int range)
 {
-        unsigned int code = board(dev)->ao_range_code[range];
+        const struct pcidas64_board *thisboard = comedi_board(dev);
+        unsigned int code = thisboard->ao_range_code[range];
 
         if (channel > 1)
                 comedi_error(dev, "bug! bad channel?");
@@ -1246,20 +1228,86 @@ static inline int ao_cmd_is_supported(const struct pcidas64_board *board)
         return board->ao_nchan && board->layout != LAYOUT_4020;
 }
 
+static void abort_dma(struct comedi_device *dev, unsigned int channel)
+{
+        struct pcidas64_private *devpriv = dev->private;
+        unsigned long flags;
+
+        /*  spinlock for plx dma control/status reg */
+        spin_lock_irqsave(&dev->spinlock, flags);
+
+        plx9080_abort_dma(devpriv->plx9080_iobase, channel);
+
+        spin_unlock_irqrestore(&dev->spinlock, flags);
+}
+
+static void disable_plx_interrupts(struct comedi_device *dev)
+{
+        struct pcidas64_private *devpriv = dev->private;
+
+        devpriv->plx_intcsr_bits = 0;
+        writel(devpriv->plx_intcsr_bits,
+               devpriv->plx9080_iobase + PLX_INTRCS_REG);
+}
+
+static void disable_ai_interrupts(struct comedi_device *dev)
+{
+        struct pcidas64_private *devpriv = dev->private;
+        unsigned long flags;
+
+        spin_lock_irqsave(&dev->spinlock, flags);
+        devpriv->intr_enable_bits &=
+                ~EN_ADC_INTR_SRC_BIT & ~EN_ADC_DONE_INTR_BIT &
+                ~EN_ADC_ACTIVE_INTR_BIT & ~EN_ADC_STOP_INTR_BIT &
+                ~EN_ADC_OVERRUN_BIT & ~ADC_INTR_SRC_MASK;
+        writew(devpriv->intr_enable_bits,
+               devpriv->main_iobase + INTR_ENABLE_REG);
+        spin_unlock_irqrestore(&dev->spinlock, flags);
+
+        DEBUG_PRINT("intr enable bits 0x%x\n", devpriv->intr_enable_bits);
+}
+
+static void enable_ai_interrupts(struct comedi_device *dev,
+                                 const struct comedi_cmd *cmd)
+{
+        const struct pcidas64_board *thisboard = comedi_board(dev);
+        struct pcidas64_private *devpriv = dev->private;
+        uint32_t bits;
+        unsigned long flags;
+
+        bits = EN_ADC_OVERRUN_BIT | EN_ADC_DONE_INTR_BIT |
+               EN_ADC_ACTIVE_INTR_BIT | EN_ADC_STOP_INTR_BIT;
+        /*  Use pio transfer and interrupt on end of conversion
+         *  if TRIG_WAKE_EOS flag is set. */
+        if (cmd->flags & TRIG_WAKE_EOS) {
+                /*  4020 doesn't support pio transfers except for fifo dregs */
+                if (thisboard->layout != LAYOUT_4020)
+                        bits |= ADC_INTR_EOSCAN_BITS | EN_ADC_INTR_SRC_BIT;
+        }
+        spin_lock_irqsave(&dev->spinlock, flags);
+        devpriv->intr_enable_bits |= bits;
+        writew(devpriv->intr_enable_bits,
+               devpriv->main_iobase + INTR_ENABLE_REG);
+        DEBUG_PRINT("intr enable bits 0x%x\n", devpriv->intr_enable_bits);
+        spin_unlock_irqrestore(&dev->spinlock, flags);
+}
+
 /* initialize plx9080 chip */
 static void init_plx9080(struct comedi_device *dev)
 {
+        const struct pcidas64_board *thisboard = comedi_board(dev);
+        struct pcidas64_private *devpriv = dev->private;
         uint32_t bits;
-        void __iomem *plx_iobase = priv(dev)->plx9080_iobase;
+        void __iomem *plx_iobase = devpriv->plx9080_iobase;
 
-        priv(dev)->plx_control_bits =
-            readl(priv(dev)->plx9080_iobase + PLX_CONTROL_REG);
+        devpriv->plx_control_bits =
+                readl(devpriv->plx9080_iobase + PLX_CONTROL_REG);
 
         /*  plx9080 dump */
         DEBUG_PRINT(" plx interrupt status 0x%x\n",
                     readl(plx_iobase + PLX_INTRCS_REG));
         DEBUG_PRINT(" plx id bits 0x%x\n", readl(plx_iobase + PLX_ID_REG));
-        DEBUG_PRINT(" plx control reg 0x%x\n", priv(dev)->plx_control_bits);
+        DEBUG_PRINT(" plx control reg 0x%x\n", devpriv->plx_control_bits);
         DEBUG_PRINT(" plx mode/arbitration reg 0x%x\n",
                     readl(plx_iobase + PLX_MARB_REG));
         DEBUG_PRINT(" plx region0 reg 0x%x\n",
@@ -1292,7 +1340,7 @@ static void init_plx9080(struct comedi_device *dev)
 #else
         bits = 0;
 #endif
-        writel(bits, priv(dev)->plx9080_iobase + PLX_BIGEND_REG);
+        writel(bits, devpriv->plx9080_iobase + PLX_BIGEND_REG);
 
         disable_plx_interrupts(dev);
 
@@ -1307,9 +1355,11 @@ static void init_plx9080(struct comedi_device *dev)
         bits |= PLX_EN_BTERM_BIT;
         /*  enable dma chaining */
         bits |= PLX_EN_CHAIN_BIT;
-        /*  enable interrupt on dma done (probably don't need this, since chain never finishes) */
+        /*  enable interrupt on dma done
+         *  (probably don't need this, since chain never finishes) */
         bits |= PLX_EN_DMA_DONE_INTR_BIT;
-        /*  don't increment local address during transfers (we are transferring from a fixed fifo register) */
+        /*  don't increment local address during transfers
+         *  (we are transferring from a fixed fifo register) */
         bits |= PLX_LOCAL_ADDR_CONST_BIT;
         /*  route dma interrupt to pci bus */
         bits |= PLX_DMA_INTR_PCI_BIT;
@@ -1318,324 +1368,235 @@ static void init_plx9080(struct comedi_device *dev)
         /*  enable local burst mode */
         bits |= PLX_DMA_LOCAL_BURST_EN_BIT;
         /*  4020 uses 32 bit dma */
-        if (board(dev)->layout == LAYOUT_4020) {
+        if (thisboard->layout == LAYOUT_4020)
                 bits |= PLX_LOCAL_BUS_32_WIDE_BITS;
-        } else {                /*  localspace0 bus is 16 bits wide */
+        else            /*  localspace0 bus is 16 bits wide */
                 bits |= PLX_LOCAL_BUS_16_WIDE_BITS;
-        }
         writel(bits, plx_iobase + PLX_DMA1_MODE_REG);
-        if (ao_cmd_is_supported(board(dev)))
+        if (ao_cmd_is_supported(thisboard))
                 writel(bits, plx_iobase + PLX_DMA0_MODE_REG);
 
         /*  enable interrupts on plx 9080 */
-        priv(dev)->plx_intcsr_bits |=
+        devpriv->plx_intcsr_bits |=
             ICS_AERR | ICS_PERR | ICS_PIE | ICS_PLIE | ICS_PAIE | ICS_LIE |
             ICS_DMA0_E | ICS_DMA1_E;
-        writel(priv(dev)->plx_intcsr_bits,
-               priv(dev)->plx9080_iobase + PLX_INTRCS_REG);
+        writel(devpriv->plx_intcsr_bits,
+               devpriv->plx9080_iobase + PLX_INTRCS_REG);
 }
 
-/* Allocate and initialize the subdevice structures.
- */
-static int setup_subdevices(struct comedi_device *dev)
+static void disable_ai_pacing(struct comedi_device *dev)
 {
-        struct comedi_subdevice *s;
-        void __iomem *dio_8255_iobase;
-        int i;
-        int ret;
+        struct pcidas64_private *devpriv = dev->private;
+        unsigned long flags;
 
-        ret = comedi_alloc_subdevices(dev, 10);
-        if (ret)
-                return ret;
+        disable_ai_interrupts(dev);
 
-        s = &dev->subdevices[0];
-        /* analog input subdevice */
-        dev->read_subdev = s;
-        s->type = COMEDI_SUBD_AI;
-        s->subdev_flags = SDF_READABLE | SDF_GROUND | SDF_DITHER | SDF_CMD_READ;
-        if (board(dev)->layout == LAYOUT_60XX)
-                s->subdev_flags |= SDF_COMMON | SDF_DIFF;
-        else if (board(dev)->layout == LAYOUT_64XX)
-                s->subdev_flags |= SDF_DIFF;
-        /* XXX Number of inputs in differential mode is ignored */
-        s->n_chan = board(dev)->ai_se_chans;
-        s->len_chanlist = 0x2000;
-        s->maxdata = (1 << board(dev)->ai_bits) - 1;
-        s->range_table = board(dev)->ai_range_table;
-        s->insn_read = ai_rinsn;
-        s->insn_config = ai_config_insn;
-        s->do_cmd = ai_cmd;
-        s->do_cmdtest = ai_cmdtest;
-        s->cancel = ai_cancel;
-        if (board(dev)->layout == LAYOUT_4020) {
-                uint8_t data;
-                /*  set adc to read from inputs (not internal calibration sources) */
-                priv(dev)->i2c_cal_range_bits = adc_src_4020_bits(4);
-                /*  set channels to +-5 volt input ranges */
-                for (i = 0; i < s->n_chan; i++)
-                        priv(dev)->i2c_cal_range_bits |= attenuate_bit(i);
-                data = priv(dev)->i2c_cal_range_bits;
-                i2c_write(dev, RANGE_CAL_I2C_ADDR, &data, sizeof(data));
-        }
+        spin_lock_irqsave(&dev->spinlock, flags);
+        devpriv->adc_control1_bits &= ~ADC_SW_GATE_BIT;
+        writew(devpriv->adc_control1_bits,
+               devpriv->main_iobase + ADC_CONTROL1_REG);
+        spin_unlock_irqrestore(&dev->spinlock, flags);
 
-        /* analog output subdevice */
-        s = &dev->subdevices[1];
-        if (board(dev)->ao_nchan) {
-                s->type = COMEDI_SUBD_AO;
-                s->subdev_flags =
-                    SDF_READABLE | SDF_WRITABLE | SDF_GROUND | SDF_CMD_WRITE;
-                s->n_chan = board(dev)->ao_nchan;
-                s->maxdata = (1 << board(dev)->ao_bits) - 1;
-                s->range_table = board(dev)->ao_range_table;
-                s->insn_read = ao_readback_insn;
-                s->insn_write = ao_winsn;
-                if (ao_cmd_is_supported(board(dev))) {
-                        dev->write_subdev = s;
-                        s->do_cmdtest = ao_cmdtest;
-                        s->do_cmd = ao_cmd;
-                        s->len_chanlist = board(dev)->ao_nchan;
-                        s->cancel = ao_cancel;
-                }
-        } else {
-                s->type = COMEDI_SUBD_UNUSED;
-        }
+        /* disable pacing, triggering, etc */
+        writew(ADC_DMA_DISABLE_BIT | ADC_SOFT_GATE_BITS | ADC_GATE_LEVEL_BIT,
+               devpriv->main_iobase + ADC_CONTROL0_REG);
+}
 
-        /*  digital input */
-        s = &dev->subdevices[2];
-        if (board(dev)->layout == LAYOUT_64XX) {
-                s->type = COMEDI_SUBD_DI;
-                s->subdev_flags = SDF_READABLE;
-                s->n_chan = 4;
-                s->maxdata = 1;
-                s->range_table = &range_digital;
-                s->insn_bits = di_rbits;
-        } else
-                s->type = COMEDI_SUBD_UNUSED;
+static int set_ai_fifo_segment_length(struct comedi_device *dev,
+                                      unsigned int num_entries)
+{
+        const struct pcidas64_board *thisboard = comedi_board(dev);
+        struct pcidas64_private *devpriv = dev->private;
+        static const int increment_size = 0x100;
+        const struct hw_fifo_info *const fifo = thisboard->ai_fifo;
+        unsigned int num_increments;
+        uint16_t bits;
 
-        /*  digital output */
-        if (board(dev)->layout == LAYOUT_64XX) {
-                s = &dev->subdevices[3];
-                s->type = COMEDI_SUBD_DO;
-                s->subdev_flags = SDF_WRITABLE | SDF_READABLE;
-                s->n_chan = 4;
-                s->maxdata = 1;
-                s->range_table = &range_digital;
-                s->insn_bits = do_wbits;
-        } else
-                s->type = COMEDI_SUBD_UNUSED;
+        if (num_entries < increment_size)
+                num_entries = increment_size;
+        if (num_entries > fifo->max_segment_length)
+                num_entries = fifo->max_segment_length;
 
-        /* 8255 */
-        s = &dev->subdevices[4];
-        if (board(dev)->has_8255) {
-                if (board(dev)->layout == LAYOUT_4020) {
-                        dio_8255_iobase =
-                            priv(dev)->main_iobase + I8255_4020_REG;
-                        subdev_8255_init(dev, s, dio_callback_4020,
-                                         (unsigned long)dio_8255_iobase);
-                } else {
-                        dio_8255_iobase =
-                            priv(dev)->dio_counter_iobase + DIO_8255_OFFSET;
-                        subdev_8255_init(dev, s, dio_callback,
-                                         (unsigned long)dio_8255_iobase);
-                }
-        } else
-                s->type = COMEDI_SUBD_UNUSED;
+        /*  1 == 256 entries, 2 == 512 entries, etc */
+        num_increments = (num_entries + increment_size / 2) / increment_size;
 
-        /*  8 channel dio for 60xx */
-        s = &dev->subdevices[5];
-        if (board(dev)->layout == LAYOUT_60XX) {
-                s->type = COMEDI_SUBD_DIO;
-                s->subdev_flags = SDF_WRITABLE | SDF_READABLE;
-                s->n_chan = 8;
-                s->maxdata = 1;
-                s->range_table = &range_digital;
-                s->insn_config = dio_60xx_config_insn;
-                s->insn_bits = dio_60xx_wbits;
-        } else
-                s->type = COMEDI_SUBD_UNUSED;
+        bits = (~(num_increments - 1)) & fifo->fifo_size_reg_mask;
+        devpriv->fifo_size_bits &= ~fifo->fifo_size_reg_mask;
+        devpriv->fifo_size_bits |= bits;
+        writew(devpriv->fifo_size_bits,
+               devpriv->main_iobase + FIFO_SIZE_REG);
 
-        /*  caldac */
-        s = &dev->subdevices[6];
-        s->type = COMEDI_SUBD_CALIB;
-        s->subdev_flags = SDF_READABLE | SDF_WRITABLE | SDF_INTERNAL;
-        s->n_chan = 8;
-        if (board(dev)->layout == LAYOUT_4020)
-                s->maxdata = 0xfff;
-        else
-                s->maxdata = 0xff;
-        s->insn_read = calib_read_insn;
-        s->insn_write = calib_write_insn;
-        for (i = 0; i < s->n_chan; i++)
-                caldac_write(dev, i, s->maxdata / 2);
+        devpriv->ai_fifo_segment_length = num_increments * increment_size;
 
-        /*  2 channel ad8402 potentiometer */
-        s = &dev->subdevices[7];
-        if (board(dev)->layout == LAYOUT_64XX) {
-                s->type = COMEDI_SUBD_CALIB;
-                s->subdev_flags = SDF_READABLE | SDF_WRITABLE | SDF_INTERNAL;
-                s->n_chan = 2;
-                s->insn_read = ad8402_read_insn;
-                s->insn_write = ad8402_write_insn;
-                s->maxdata = 0xff;
-                for (i = 0; i < s->n_chan; i++)
-                        ad8402_write(dev, i, s->maxdata / 2);
-        } else
-                s->type = COMEDI_SUBD_UNUSED;
+        DEBUG_PRINT("set hardware fifo segment length to %i\n",
+                    devpriv->ai_fifo_segment_length);
 
-        /* serial EEPROM, if present */
-        s = &dev->subdevices[8];
-        if (readl(priv(dev)->plx9080_iobase + PLX_CONTROL_REG) & CTL_EECHK) {
-                s->type = COMEDI_SUBD_MEMORY;
-                s->subdev_flags = SDF_READABLE | SDF_INTERNAL;
-                s->n_chan = 128;
-                s->maxdata = 0xffff;
-                s->insn_read = eeprom_read_insn;
-        } else
-                s->type = COMEDI_SUBD_UNUSED;
+        return devpriv->ai_fifo_segment_length;
+}
 
-        /*  user counter subd XXX */
-        s = &dev->subdevices[9];
-        s->type = COMEDI_SUBD_UNUSED;
+/* adjusts the size of hardware fifo (which determines block size for dma xfers) */
+static int set_ai_fifo_size(struct comedi_device *dev, unsigned int num_samples)
+{
+        const struct pcidas64_board *thisboard = comedi_board(dev);
+        unsigned int num_fifo_entries;
+        int retval;
+        const struct hw_fifo_info *const fifo = thisboard->ai_fifo;
 
-        return 0;
+        num_fifo_entries = num_samples / fifo->sample_packing_ratio;
+
+        retval = set_ai_fifo_segment_length(dev,
+                                            num_fifo_entries /
+                                            fifo->num_segments);
+        if (retval < 0)
+                return retval;
+
+        num_samples = retval * fifo->num_segments * fifo->sample_packing_ratio;
+
+        DEBUG_PRINT("set hardware fifo size to %i\n", num_samples);
+
+        return num_samples;
 }
 
-static void disable_plx_interrupts(struct comedi_device *dev)
+/* query length of fifo */
+static unsigned int ai_fifo_size(struct comedi_device *dev)
 {
-        priv(dev)->plx_intcsr_bits = 0;
-        writel(priv(dev)->plx_intcsr_bits,
-               priv(dev)->plx9080_iobase + PLX_INTRCS_REG);
+        const struct pcidas64_board *thisboard = comedi_board(dev);
+        struct pcidas64_private *devpriv = dev->private;
+
+        return devpriv->ai_fifo_segment_length *
+               thisboard->ai_fifo->num_segments *
+               thisboard->ai_fifo->sample_packing_ratio;
 }
 
 static void init_stc_registers(struct comedi_device *dev)
 {
+        const struct pcidas64_board *thisboard = comedi_board(dev);
+        struct pcidas64_private *devpriv = dev->private;
         uint16_t bits;
         unsigned long flags;
 
         spin_lock_irqsave(&dev->spinlock, flags);
 
-        /*  bit should be set for 6025, although docs say boards with <= 16 chans should be cleared XXX */
+        /*  bit should be set for 6025,
+         *  although docs say boards with <= 16 chans should be cleared XXX */
         if (1)
-                priv(dev)->adc_control1_bits |= ADC_QUEUE_CONFIG_BIT;
-        writew(priv(dev)->adc_control1_bits,
-               priv(dev)->main_iobase + ADC_CONTROL1_REG);
+                devpriv->adc_control1_bits |= ADC_QUEUE_CONFIG_BIT;
+        writew(devpriv->adc_control1_bits,
+               devpriv->main_iobase + ADC_CONTROL1_REG);
 
         /*  6402/16 manual says this register must be initialized to 0xff? */
-        writew(0xff, priv(dev)->main_iobase + ADC_SAMPLE_INTERVAL_UPPER_REG);
+        writew(0xff, devpriv->main_iobase + ADC_SAMPLE_INTERVAL_UPPER_REG);
 
         bits = SLOW_DAC_BIT | DMA_CH_SELECT_BIT;
-        if (board(dev)->layout == LAYOUT_4020)
+        if (thisboard->layout == LAYOUT_4020)
                 bits |= INTERNAL_CLOCK_4020_BITS;
-        priv(dev)->hw_config_bits |= bits;
-        writew(priv(dev)->hw_config_bits,
-               priv(dev)->main_iobase + HW_CONFIG_REG);
+        devpriv->hw_config_bits |= bits;
+        writew(devpriv->hw_config_bits,
+               devpriv->main_iobase + HW_CONFIG_REG);
 
-        writew(0, priv(dev)->main_iobase + DAQ_SYNC_REG);
-        writew(0, priv(dev)->main_iobase + CALIBRATION_REG);
+        writew(0, devpriv->main_iobase + DAQ_SYNC_REG);
+        writew(0, devpriv->main_iobase + CALIBRATION_REG);
 
         spin_unlock_irqrestore(&dev->spinlock, flags);
 
         /*  set fifos to maximum size */
-        priv(dev)->fifo_size_bits |= DAC_FIFO_BITS;
+        devpriv->fifo_size_bits |= DAC_FIFO_BITS;
         set_ai_fifo_segment_length(dev,
-                                   board(dev)->ai_fifo->max_segment_length);
+                                   thisboard->ai_fifo->max_segment_length);
 
-        priv(dev)->dac_control1_bits = DAC_OUTPUT_ENABLE_BIT;
-        priv(dev)->intr_enable_bits =   /* EN_DAC_INTR_SRC_BIT | DAC_INTR_QEMPTY_BITS | */
-            EN_DAC_DONE_INTR_BIT | EN_DAC_UNDERRUN_BIT;
-        writew(priv(dev)->intr_enable_bits,
-               priv(dev)->main_iobase + INTR_ENABLE_REG);
+        devpriv->dac_control1_bits = DAC_OUTPUT_ENABLE_BIT;
+        devpriv->intr_enable_bits =
+                /* EN_DAC_INTR_SRC_BIT | DAC_INTR_QEMPTY_BITS | */
+                EN_DAC_DONE_INTR_BIT | EN_DAC_UNDERRUN_BIT;
+        writew(devpriv->intr_enable_bits,
+               devpriv->main_iobase + INTR_ENABLE_REG);
 
         disable_ai_pacing(dev);
 };
 
 static int alloc_and_init_dma_members(struct comedi_device *dev)
 {
+        const struct pcidas64_board *thisboard = comedi_board(dev);
         struct pci_dev *pcidev = comedi_to_pci_dev(dev);
+        struct pcidas64_private *devpriv = dev->private;
         int i;
 
         /*  alocate pci dma buffers */
-        for (i = 0; i < ai_dma_ring_count(board(dev)); i++) {
-                priv(dev)->ai_buffer[i] =
-                    pci_alloc_consistent(pcidev, DMA_BUFFER_SIZE,
-                                         &priv(dev)->ai_buffer_bus_addr[i]);
-                if (priv(dev)->ai_buffer[i] == NULL)
+        for (i = 0; i < ai_dma_ring_count(thisboard); i++) {
+                devpriv->ai_buffer[i] =
+                        pci_alloc_consistent(pcidev, DMA_BUFFER_SIZE,
+                                             &devpriv->ai_buffer_bus_addr[i]);
+                if (devpriv->ai_buffer[i] == NULL)
                         return -ENOMEM;
 
         }
         for (i = 0; i < AO_DMA_RING_COUNT; i++) {
-                if (ao_cmd_is_supported(board(dev))) {
-                        priv(dev)->ao_buffer[i] =
-                            pci_alloc_consistent(pcidev,
-                                                 DMA_BUFFER_SIZE,
-                                                 &priv(dev)->
-                                                 ao_buffer_bus_addr[i]);
-                        if (priv(dev)->ao_buffer[i] == NULL)
+                if (ao_cmd_is_supported(thisboard)) {
+                        devpriv->ao_buffer[i] =
+                                pci_alloc_consistent(pcidev, DMA_BUFFER_SIZE,
+                                                     &devpriv->
+                                                      ao_buffer_bus_addr[i]);
+                        if (devpriv->ao_buffer[i] == NULL)
                                 return -ENOMEM;
 
                 }
         }
         /*  allocate dma descriptors */
-        priv(dev)->ai_dma_desc =
-            pci_alloc_consistent(pcidev,
-                                 sizeof(struct plx_dma_desc) *
-                                 ai_dma_ring_count(board(dev)),
-                                 &priv(dev)->ai_dma_desc_bus_addr);
-        if (priv(dev)->ai_dma_desc == NULL)
+        devpriv->ai_dma_desc =
+                pci_alloc_consistent(pcidev, sizeof(struct plx_dma_desc) *
+                                     ai_dma_ring_count(thisboard),
+                                     &devpriv->ai_dma_desc_bus_addr);
+        if (devpriv->ai_dma_desc == NULL)
                 return -ENOMEM;
 
-        DEBUG_PRINT("ai dma descriptors start at bus addr 0x%x\n",
-                    priv(dev)->ai_dma_desc_bus_addr);
-        if (ao_cmd_is_supported(board(dev))) {
-                priv(dev)->ao_dma_desc =
-                    pci_alloc_consistent(pcidev,
-                                         sizeof(struct plx_dma_desc) *
-                                         AO_DMA_RING_COUNT,
-                                         &priv(dev)->ao_dma_desc_bus_addr);
-                if (priv(dev)->ao_dma_desc == NULL)
+        DEBUG_PRINT("ai dma descriptors start at bus addr 0x%llx\n",
+                    (unsigned long long)devpriv->ai_dma_desc_bus_addr);
+        if (ao_cmd_is_supported(thisboard)) {
+                devpriv->ao_dma_desc =
+                        pci_alloc_consistent(pcidev,
+                                             sizeof(struct plx_dma_desc) *
+                                             AO_DMA_RING_COUNT,
+                                             &devpriv->ao_dma_desc_bus_addr);
+                if (devpriv->ao_dma_desc == NULL)
                         return -ENOMEM;
 
-                DEBUG_PRINT("ao dma descriptors start at bus addr 0x%x\n",
-                            priv(dev)->ao_dma_desc_bus_addr);
+                DEBUG_PRINT("ao dma descriptors start at bus addr 0x%llx\n",
+                            (unsigned long long)devpriv->ao_dma_desc_bus_addr);
         }
         /*  initialize dma descriptors */
-        for (i = 0; i < ai_dma_ring_count(board(dev)); i++) {
-                priv(dev)->ai_dma_desc[i].pci_start_addr =
-                    cpu_to_le32(priv(dev)->ai_buffer_bus_addr[i]);
-                if (board(dev)->layout == LAYOUT_4020)
-                        priv(dev)->ai_dma_desc[i].local_start_addr =
-                            cpu_to_le32(priv(dev)->local1_iobase +
-                                        ADC_FIFO_REG);
+        for (i = 0; i < ai_dma_ring_count(thisboard); i++) {
+                devpriv->ai_dma_desc[i].pci_start_addr =
+                        cpu_to_le32(devpriv->ai_buffer_bus_addr[i]);
+                if (thisboard->layout == LAYOUT_4020)
+                        devpriv->ai_dma_desc[i].local_start_addr =
+                                cpu_to_le32(devpriv->local1_iobase +
+                                            ADC_FIFO_REG);
                 else
-                        priv(dev)->ai_dma_desc[i].local_start_addr =
-                            cpu_to_le32(priv(dev)->local0_iobase +
-                                        ADC_FIFO_REG);
-                priv(dev)->ai_dma_desc[i].transfer_size = cpu_to_le32(0);
-                priv(dev)->ai_dma_desc[i].next =
-                    cpu_to_le32((priv(dev)->ai_dma_desc_bus_addr + ((i +
-                                                                     1) %
-                                                                    ai_dma_ring_count
-                                                                    (board
-                                                                     (dev))) *
-                                 sizeof(priv(dev)->ai_dma_desc[0])) |
-                                PLX_DESC_IN_PCI_BIT | PLX_INTR_TERM_COUNT |
-                                PLX_XFER_LOCAL_TO_PCI);
+                        devpriv->ai_dma_desc[i].local_start_addr =
+                                cpu_to_le32(devpriv->local0_iobase +
+                                            ADC_FIFO_REG);
+                devpriv->ai_dma_desc[i].transfer_size = cpu_to_le32(0);
+                devpriv->ai_dma_desc[i].next =
+                        cpu_to_le32((devpriv->ai_dma_desc_bus_addr +
+                                     ((i + 1) % ai_dma_ring_count(thisboard)) *
+                                     sizeof(devpriv->ai_dma_desc[0])) |
+                                    PLX_DESC_IN_PCI_BIT | PLX_INTR_TERM_COUNT |
+                                    PLX_XFER_LOCAL_TO_PCI);
         }
-        if (ao_cmd_is_supported(board(dev))) {
+        if (ao_cmd_is_supported(thisboard)) {
                 for (i = 0; i < AO_DMA_RING_COUNT; i++) {
-                        priv(dev)->ao_dma_desc[i].pci_start_addr =
-                            cpu_to_le32(priv(dev)->ao_buffer_bus_addr[i]);
-                        priv(dev)->ao_dma_desc[i].local_start_addr =
-                            cpu_to_le32(priv(dev)->local0_iobase +
-                                        DAC_FIFO_REG);
-                        priv(dev)->ao_dma_desc[i].transfer_size =
-                            cpu_to_le32(0);
-                        priv(dev)->ao_dma_desc[i].next =
-                            cpu_to_le32((priv(dev)->ao_dma_desc_bus_addr +
-                                         ((i + 1) % (AO_DMA_RING_COUNT)) *
-                                         sizeof(priv(dev)->ao_dma_desc[0])) |
-                                        PLX_DESC_IN_PCI_BIT |
-                                        PLX_INTR_TERM_COUNT);
+                        devpriv->ao_dma_desc[i].pci_start_addr =
+                                cpu_to_le32(devpriv->ao_buffer_bus_addr[i]);
+                        devpriv->ao_dma_desc[i].local_start_addr =
+                                cpu_to_le32(devpriv->local0_iobase +
+                                            DAC_FIFO_REG);
+                        devpriv->ao_dma_desc[i].transfer_size = cpu_to_le32(0);
+                        devpriv->ao_dma_desc[i].next =
+                                cpu_to_le32((devpriv->ao_dma_desc_bus_addr +
+                                             ((i + 1) % (AO_DMA_RING_COUNT)) *
+                                             sizeof(devpriv->ao_dma_desc[0])) |
+                                            PLX_DESC_IN_PCI_BIT |
+                                            PLX_INTR_TERM_COUNT);
                 }
         }
         return 0;
@@ -1649,216 +1610,140 @@ static inline void warn_external_queue(struct comedi_device *dev)
                      "Use internal AI channel queue (channels must be consecutive and use same range/aref)");
 }
 
-static struct pci_dev *cb_pcidas64_find_pci_dev(struct comedi_device *dev,
-                                                struct comedi_devconfig *it)
+/* Their i2c requires a huge delay on setting clock or data high for some reason */
+static const int i2c_high_udelay = 1000;
+static const int i2c_low_udelay = 10;
+
+/* set i2c data line high or low */
+static void i2c_set_sda(struct comedi_device *dev, int state)
 {
-        struct pci_dev *pcidev = NULL;
-        int bus = it->options[0];
-        int slot = it->options[1];
-        int i;
+        struct pcidas64_private *devpriv = dev->private;
+        static const int data_bit = CTL_EE_W;
+        void __iomem *plx_control_addr = devpriv->plx9080_iobase +
+                                         PLX_CONTROL_REG;
 
-        for_each_pci_dev(pcidev) {
-                if (bus || slot) {
-                        if (bus != pcidev->bus->number ||
-                            slot != PCI_SLOT(pcidev->devfn))
-                                continue;
-                }
-                if (pcidev->vendor != PCI_VENDOR_ID_COMPUTERBOARDS)
-                        continue;
-
-                for (i = 0; i < ARRAY_SIZE(pcidas64_boards); i++) {
-                        if (pcidas64_boards[i].device_id != pcidev->device)
-                                continue;
-                        dev->board_ptr = pcidas64_boards + i;
-                        return pcidev;
-                }
+        if (state) {
+                /*  set data line high */
+                devpriv->plx_control_bits &= ~data_bit;
+                writel(devpriv->plx_control_bits, plx_control_addr);
+                udelay(i2c_high_udelay);
+        } else {                /*  set data line low */
+
+                devpriv->plx_control_bits |= data_bit;
+                writel(devpriv->plx_control_bits, plx_control_addr);
+                udelay(i2c_low_udelay);
         }
-        dev_err(dev->class_dev,
-                "No supported board found! (req. bus %d, slot %d)\n",
-                bus, slot);
-        return NULL;
 }
 
-/*
- * Attach is called by the Comedi core to configure the driver
- * for a particular board.
- */
-static int attach(struct comedi_device *dev, struct comedi_devconfig *it)
+/* set i2c clock line high or low */
+static void i2c_set_scl(struct comedi_device *dev, int state)
 {
-        struct pci_dev *pcidev;
-        uint32_t local_range, local_decode;
-        int retval;
-
-/*
- * Allocate the private structure area.
- */
-        if (alloc_private(dev, sizeof(struct pcidas64_private)) < 0)
-                return -ENOMEM;
+        struct pcidas64_private *devpriv = dev->private;
+        static const int clock_bit = CTL_USERO;
+        void __iomem *plx_control_addr = devpriv->plx9080_iobase +
+                                         PLX_CONTROL_REG;
 
-        pcidev = cb_pcidas64_find_pci_dev(dev, it);
-        if (!pcidev)
-                return -EIO;
-        comedi_set_hw_dev(dev, &pcidev->dev);
+        if (state) {
+                /*  set clock line high */
+                devpriv->plx_control_bits &= ~clock_bit;
+                writel(devpriv->plx_control_bits, plx_control_addr);
+                udelay(i2c_high_udelay);
+        } else {                /*  set clock line low */
 
-        if (comedi_pci_enable(pcidev, dev->driver->driver_name)) {
-                dev_warn(dev->class_dev,
-                         "failed to enable PCI device and request regions\n");
-                return -EIO;
+                devpriv->plx_control_bits |= clock_bit;
+                writel(devpriv->plx_control_bits, plx_control_addr);
+                udelay(i2c_low_udelay);
         }
-        pci_set_master(pcidev);
-
-        /* Initialize dev->board_name */
-        dev->board_name = board(dev)->name;
+}
 
-        dev->iobase = pci_resource_start(pcidev, MAIN_BADDRINDEX);
+static void i2c_write_byte(struct comedi_device *dev, uint8_t byte)
+{
+        uint8_t bit;
+        unsigned int num_bits = 8;
 
-        priv(dev)->plx9080_phys_iobase =
-            pci_resource_start(pcidev, PLX9080_BADDRINDEX);
-        priv(dev)->main_phys_iobase = dev->iobase;
-        priv(dev)->dio_counter_phys_iobase =
-            pci_resource_start(pcidev, DIO_COUNTER_BADDRINDEX);
+        DEBUG_PRINT("writing to i2c byte 0x%x\n", byte);
 
-        /*  remap, won't work with 2.0 kernels but who cares */
-        priv(dev)->plx9080_iobase = ioremap(priv(dev)->plx9080_phys_iobase,
-                                            pci_resource_len(pcidev,
-                                                             PLX9080_BADDRINDEX));
-        priv(dev)->main_iobase =
-            ioremap(priv(dev)->main_phys_iobase,
-                    pci_resource_len(pcidev, MAIN_BADDRINDEX));
-        priv(dev)->dio_counter_iobase =
-            ioremap(priv(dev)->dio_counter_phys_iobase,
-                    pci_resource_len(pcidev, DIO_COUNTER_BADDRINDEX));
-
-        if (!priv(dev)->plx9080_iobase || !priv(dev)->main_iobase
-            || !priv(dev)->dio_counter_iobase) {
-                dev_warn(dev->class_dev, "failed to remap io memory\n");
-                return -ENOMEM;
+        for (bit = 1 << (num_bits - 1); bit; bit >>= 1) {
+                i2c_set_scl(dev, 0);
+                if ((byte & bit))
+                        i2c_set_sda(dev, 1);
+                else
+                        i2c_set_sda(dev, 0);
+                i2c_set_scl(dev, 1);
         }
+}
 
-        DEBUG_PRINT(" plx9080 remapped to 0x%p\n", priv(dev)->plx9080_iobase);
-        DEBUG_PRINT(" main remapped to 0x%p\n", priv(dev)->main_iobase);
-        DEBUG_PRINT(" diocounter remapped to 0x%p\n",
-                    priv(dev)->dio_counter_iobase);
-
-        /*  figure out what local addresses are */
-        local_range =
-            readl(priv(dev)->plx9080_iobase + PLX_LAS0RNG_REG) & LRNG_MEM_MASK;
-        local_decode =
-            readl(priv(dev)->plx9080_iobase +
-                  PLX_LAS0MAP_REG) & local_range & LMAP_MEM_MASK;
-        priv(dev)->local0_iobase =
-            ((uint32_t) priv(dev)->main_phys_iobase & ~local_range) |
-            local_decode;
-        local_range =
-            readl(priv(dev)->plx9080_iobase + PLX_LAS1RNG_REG) & LRNG_MEM_MASK;
-        local_decode =
-            readl(priv(dev)->plx9080_iobase +
-                  PLX_LAS1MAP_REG) & local_range & LMAP_MEM_MASK;
-        priv(dev)->local1_iobase =
-            ((uint32_t) priv(dev)->dio_counter_phys_iobase & ~local_range) |
-            local_decode;
-
-        DEBUG_PRINT(" local 0 io addr 0x%x\n", priv(dev)->local0_iobase);
-        DEBUG_PRINT(" local 1 io addr 0x%x\n", priv(dev)->local1_iobase);
-
-        retval = alloc_and_init_dma_members(dev);
-        if (retval < 0)
-                return retval;
-
-        priv(dev)->hw_revision =
-            hw_revision(dev, readw(priv(dev)->main_iobase + HW_STATUS_REG));
-        dev_dbg(dev->class_dev, "stc hardware revision %i\n",
-                priv(dev)->hw_revision);
-        init_plx9080(dev);
-        init_stc_registers(dev);
-        /*  get irq */
-        if (request_irq(pcidev->irq, handle_interrupt, IRQF_SHARED,
-                        "cb_pcidas64", dev)) {
-                dev_dbg(dev->class_dev, "unable to allocate irq %u\n",
-                        pcidev->irq);
-                return -EINVAL;
-        }
-        dev->irq = pcidev->irq;
-        dev_dbg(dev->class_dev, "irq %u\n", dev->irq);
+/* we can't really read the lines, so fake it */
+static int i2c_read_ack(struct comedi_device *dev)
+{
+        i2c_set_scl(dev, 0);
+        i2c_set_sda(dev, 1);
+        i2c_set_scl(dev, 1);
 
-        retval = setup_subdevices(dev);
-        if (retval < 0)
-                return retval;
+        return 0;               /*  return fake acknowledge bit */
+}
 
+/* send start bit */
+static void i2c_start(struct comedi_device *dev)
+{
+        i2c_set_scl(dev, 1);
+        i2c_set_sda(dev, 1);
+        i2c_set_sda(dev, 0);
+}
 
-        return 0;
+/* send stop bit */
+static void i2c_stop(struct comedi_device *dev)
+{
+        i2c_set_scl(dev, 0);
+        i2c_set_sda(dev, 0);
+        i2c_set_scl(dev, 1);
+        i2c_set_sda(dev, 1);
 }
 
-static void detach(struct comedi_device *dev)
+static void i2c_write(struct comedi_device *dev, unsigned int address,
+                      const uint8_t *data, unsigned int length)
 {
-        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
+        struct pcidas64_private *devpriv = dev->private;
         unsigned int i;
+        uint8_t bitstream;
+        static const int read_bit = 0x1;
 
-        if (dev->irq)
-                free_irq(dev->irq, dev);
-        if (priv(dev)) {
-                if (pcidev) {
-                        if (priv(dev)->plx9080_iobase) {
-                                disable_plx_interrupts(dev);
-                                iounmap(priv(dev)->plx9080_iobase);
-                        }
-                        if (priv(dev)->main_iobase)
-                                iounmap(priv(dev)->main_iobase);
-                        if (priv(dev)->dio_counter_iobase)
-                                iounmap(priv(dev)->dio_counter_iobase);
-                        /*  free pci dma buffers */
-                        for (i = 0; i < ai_dma_ring_count(board(dev)); i++) {
-                                if (priv(dev)->ai_buffer[i])
-                                        pci_free_consistent(pcidev,
-                                                            DMA_BUFFER_SIZE,
-                                                            priv(dev)->
-                                                            ai_buffer[i],
-                                                            priv
-                                                            (dev)->ai_buffer_bus_addr
-                                                            [i]);
-                        }
-                        for (i = 0; i < AO_DMA_RING_COUNT; i++) {
-                                if (priv(dev)->ao_buffer[i])
-                                        pci_free_consistent(pcidev,
-                                                            DMA_BUFFER_SIZE,
-                                                            priv(dev)->
-                                                            ao_buffer[i],
-                                                            priv
-                                                            (dev)->ao_buffer_bus_addr
-                                                            [i]);
-                        }
-                        /*  free dma descriptors */
-                        if (priv(dev)->ai_dma_desc)
-                                pci_free_consistent(pcidev,
-                                                    sizeof(struct plx_dma_desc)
-                                                    *
-                                                    ai_dma_ring_count(board
-                                                                      (dev)),
-                                                    priv(dev)->ai_dma_desc,
-                                                    priv(dev)->
-                                                    ai_dma_desc_bus_addr);
-                        if (priv(dev)->ao_dma_desc)
-                                pci_free_consistent(pcidev,
-                                                    sizeof(struct plx_dma_desc)
-                                                    * AO_DMA_RING_COUNT,
-                                                    priv(dev)->ao_dma_desc,
-                                                    priv(dev)->
-                                                    ao_dma_desc_bus_addr);
-                }
-        }
-        if (dev->subdevices)
-                subdev_8255_cleanup(dev, &dev->subdevices[4]);
-        if (pcidev) {
-                if (dev->iobase)
-                        comedi_pci_disable(pcidev);
+        /* XXX need mutex to prevent simultaneous attempts to access
+         * eeprom and i2c bus */
+
+        /*  make sure we dont send anything to eeprom */
+        devpriv->plx_control_bits &= ~CTL_EE_CS;
+
+        i2c_stop(dev);
+        i2c_start(dev);
+
+        /*  send address and write bit */
+        bitstream = (address << 1) & ~read_bit;
+        i2c_write_byte(dev, bitstream);
 
-                pci_dev_put(pcidev);
+        /*  get acknowledge */
+        if (i2c_read_ack(dev) != 0) {
+                comedi_error(dev, "i2c write failed: no acknowledge");
+                i2c_stop(dev);
+                return;
         }
+        /*  write data bytes */
+        for (i = 0; i < length; i++) {
+                i2c_write_byte(dev, data[i]);
+                if (i2c_read_ack(dev) != 0) {
+                        comedi_error(dev, "i2c write failed: no acknowledge");
+                        i2c_stop(dev);
+                        return;
+                }
+        }
+        i2c_stop(dev);
 }
 
 static int ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s,
                     struct comedi_insn *insn, unsigned int *data)
 {
+        const struct pcidas64_board *thisboard = comedi_board(dev);
+        struct pcidas64_private *devpriv = dev->private;
         unsigned int bits = 0, n, i;
         unsigned int channel, range, aref;
         unsigned long flags;
@@ -1875,35 +1760,37 @@ static int ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s,
 
         spin_lock_irqsave(&dev->spinlock, flags);
         if (insn->chanspec & CR_ALT_FILTER)
-                priv(dev)->adc_control1_bits |= ADC_DITHER_BIT;
+                devpriv->adc_control1_bits |= ADC_DITHER_BIT;
         else
-                priv(dev)->adc_control1_bits &= ~ADC_DITHER_BIT;
-        writew(priv(dev)->adc_control1_bits,
-               priv(dev)->main_iobase + ADC_CONTROL1_REG);
+                devpriv->adc_control1_bits &= ~ADC_DITHER_BIT;
+        writew(devpriv->adc_control1_bits,
+               devpriv->main_iobase + ADC_CONTROL1_REG);
         spin_unlock_irqrestore(&dev->spinlock, flags);
 
-        if (board(dev)->layout != LAYOUT_4020) {
+        if (thisboard->layout != LAYOUT_4020) {
                 /*  use internal queue */
-                priv(dev)->hw_config_bits &= ~EXT_QUEUE_BIT;
-                writew(priv(dev)->hw_config_bits,
-                       priv(dev)->main_iobase + HW_CONFIG_REG);
+                devpriv->hw_config_bits &= ~EXT_QUEUE_BIT;
+                writew(devpriv->hw_config_bits,
+                       devpriv->main_iobase + HW_CONFIG_REG);
 
                 /*  ALT_SOURCE is internal calibration reference */
                 if (insn->chanspec & CR_ALT_SOURCE) {
                         unsigned int cal_en_bit;
 
                         DEBUG_PRINT("reading calibration source\n");
-                        if (board(dev)->layout == LAYOUT_60XX)
+                        if (thisboard->layout == LAYOUT_60XX)
                                 cal_en_bit = CAL_EN_60XX_BIT;
                         else
                                 cal_en_bit = CAL_EN_64XX_BIT;
-                        /*  select internal reference source to connect to channel 0 */
+                        /*  select internal reference source to connect
+                         *  to channel 0 */
                         writew(cal_en_bit |
-                               adc_src_bits(priv(dev)->calibration_source),
-                               priv(dev)->main_iobase + CALIBRATION_REG);
+                               adc_src_bits(devpriv->calibration_source),
+                               devpriv->main_iobase + CALIBRATION_REG);
                 } else {
-                        /*  make sure internal calibration source is turned off */
-                        writew(0, priv(dev)->main_iobase + CALIBRATION_REG);
+                        /*  make sure internal calibration source
+                         *  is turned off */
+                        writew(0, devpriv->main_iobase + CALIBRATION_REG);
                 }
                 /*  load internal queue */
                 bits = 0;
@@ -1916,56 +1803,56 @@ static int ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s,
                 bits |= adc_chan_bits(channel);
                 /*  set stop channel */
                 writew(adc_chan_bits(channel),
-                       priv(dev)->main_iobase + ADC_QUEUE_HIGH_REG);
+                       devpriv->main_iobase + ADC_QUEUE_HIGH_REG);
                 /*  set start channel, and rest of settings */
-                writew(bits, priv(dev)->main_iobase + ADC_QUEUE_LOAD_REG);
+                writew(bits, devpriv->main_iobase + ADC_QUEUE_LOAD_REG);
         } else {
-                uint8_t old_cal_range_bits = priv(dev)->i2c_cal_range_bits;
+                uint8_t old_cal_range_bits = devpriv->i2c_cal_range_bits;
 
-                priv(dev)->i2c_cal_range_bits &= ~ADC_SRC_4020_MASK;
+                devpriv->i2c_cal_range_bits &= ~ADC_SRC_4020_MASK;
                 if (insn->chanspec & CR_ALT_SOURCE) {
                         DEBUG_PRINT("reading calibration source\n");
-                        priv(dev)->i2c_cal_range_bits |=
-                            adc_src_4020_bits(priv(dev)->calibration_source);
+                        devpriv->i2c_cal_range_bits |=
+                                adc_src_4020_bits(devpriv->calibration_source);
                 } else {        /* select BNC inputs */
-                        priv(dev)->i2c_cal_range_bits |= adc_src_4020_bits(4);
+                        devpriv->i2c_cal_range_bits |= adc_src_4020_bits(4);
                 }
                 /*  select range */
                 if (range == 0)
-                        priv(dev)->i2c_cal_range_bits |= attenuate_bit(channel);
+                        devpriv->i2c_cal_range_bits |= attenuate_bit(channel);
                 else
-                        priv(dev)->i2c_cal_range_bits &=
-                            ~attenuate_bit(channel);
-                /*  update calibration/range i2c register only if necessary, as it is very slow */
-                if (old_cal_range_bits != priv(dev)->i2c_cal_range_bits) {
-                        uint8_t i2c_data = priv(dev)->i2c_cal_range_bits;
+                        devpriv->i2c_cal_range_bits &= ~attenuate_bit(channel);
+                /*  update calibration/range i2c register only if necessary,
+                 *  as it is very slow */
+                if (old_cal_range_bits != devpriv->i2c_cal_range_bits) {
+                        uint8_t i2c_data = devpriv->i2c_cal_range_bits;
                         i2c_write(dev, RANGE_CAL_I2C_ADDR, &i2c_data,
                                   sizeof(i2c_data));
                 }
 
-                /* 4020 manual asks that sample interval register to be set before writing to convert register.
-                 * Using somewhat arbitrary setting of 4 master clock ticks = 0.1 usec */
-                writew(0,
-                       priv(dev)->main_iobase + ADC_SAMPLE_INTERVAL_UPPER_REG);
-                writew(2,
-                       priv(dev)->main_iobase + ADC_SAMPLE_INTERVAL_LOWER_REG);
+                /* 4020 manual asks that sample interval register to be set
+                 * before writing to convert register.
+                 * Using somewhat arbitrary setting of 4 master clock ticks
+                 * = 0.1 usec */
+                writew(0, devpriv->main_iobase + ADC_SAMPLE_INTERVAL_UPPER_REG);
+                writew(2, devpriv->main_iobase + ADC_SAMPLE_INTERVAL_LOWER_REG);
         }
 
         for (n = 0; n < insn->n; n++) {
 
                 /*  clear adc buffer (inside loop for 4020 sake) */
-                writew(0, priv(dev)->main_iobase + ADC_BUFFER_CLEAR_REG);
+                writew(0, devpriv->main_iobase + ADC_BUFFER_CLEAR_REG);
 
                 /* trigger conversion, bits sent only matter for 4020 */
                 writew(adc_convert_chan_4020_bits(CR_CHAN(insn->chanspec)),
-                       priv(dev)->main_iobase + ADC_CONVERT_REG);
+                       devpriv->main_iobase + ADC_CONVERT_REG);
 
                 /*  wait for data */
                 for (i = 0; i < timeout; i++) {
-                        bits = readw(priv(dev)->main_iobase + HW_STATUS_REG);
+                        bits = readw(devpriv->main_iobase + HW_STATUS_REG);
                         DEBUG_PRINT(" pipe bits 0x%x\n", pipe_full_bits(bits));
-                        if (board(dev)->layout == LAYOUT_4020) {
-                                if (readw(priv(dev)->main_iobase +
+                        if (thisboard->layout == LAYOUT_4020) {
+                                if (readw(devpriv->main_iobase +
                                           ADC_WRITE_PNTR_REG))
                                         break;
                         } else {
@@ -1977,16 +1864,14 @@ static int ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s,
                 DEBUG_PRINT(" looped %i times waiting for data\n", i);
                 if (i == timeout) {
                         comedi_error(dev, " analog input read insn timed out");
-                        printk(" status 0x%x\n", bits);
+                        dev_info(dev->class_dev, "status 0x%x\n", bits);
                         return -ETIME;
                 }
-                if (board(dev)->layout == LAYOUT_4020)
-                        data[n] =
-                            readl(priv(dev)->dio_counter_iobase +
-                                  ADC_FIFO_REG) & 0xffff;
+                if (thisboard->layout == LAYOUT_4020)
+                        data[n] = readl(devpriv->dio_counter_iobase +
+                                        ADC_FIFO_REG) & 0xffff;
                 else
-                        data[n] =
-                            readw(priv(dev)->main_iobase + PIPE1_READ_REG);
+                        data[n] = readw(devpriv->main_iobase + PIPE1_READ_REG);
         }
 
         return n;
@@ -1995,10 +1880,12 @@ static int ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s,
 static int ai_config_calibration_source(struct comedi_device *dev,
                                         unsigned int *data)
 {
+        const struct pcidas64_board *thisboard = comedi_board(dev);
+        struct pcidas64_private *devpriv = dev->private;
         unsigned int source = data[1];
         int num_calibration_sources;
 
-        if (board(dev)->layout == LAYOUT_60XX)
+        if (thisboard->layout == LAYOUT_60XX)
                 num_calibration_sources = 16;
         else
                 num_calibration_sources = 8;
@@ -2009,23 +1896,24 @@ static int ai_config_calibration_source(struct comedi_device *dev,
         }
 
         DEBUG_PRINT("setting calibration source to %i\n", source);
-        priv(dev)->calibration_source = source;
+        devpriv->calibration_source = source;
 
         return 2;
 }
 
 static int ai_config_block_size(struct comedi_device *dev, unsigned int *data)
 {
+        const struct pcidas64_board *thisboard = comedi_board(dev);
         int fifo_size;
-        const struct hw_fifo_info *const fifo = board(dev)->ai_fifo;
+        const struct hw_fifo_info *const fifo = thisboard->ai_fifo;
         unsigned int block_size, requested_block_size;
         int retval;
 
         requested_block_size = data[1];
 
         if (requested_block_size) {
-                fifo_size =
-                    requested_block_size * fifo->num_segments / bytes_in_sample;
+                fifo_size = requested_block_size * fifo->num_segments /
+                            bytes_in_sample;
 
                 retval = set_ai_fifo_size(dev, fifo_size);
                 if (retval < 0)
@@ -2043,6 +1931,7 @@ static int ai_config_block_size(struct comedi_device *dev, unsigned int *data)
 static int ai_config_master_clock_4020(struct comedi_device *dev,
                                        unsigned int *data)
 {
+        struct pcidas64_private *devpriv = dev->private;
         unsigned int divisor = data[4];
         int retval = 0;
 
@@ -2053,8 +1942,8 @@ static int ai_config_master_clock_4020(struct comedi_device *dev,
 
         switch (data[1]) {
         case COMEDI_EV_SCAN_BEGIN:
-                priv(dev)->ext_clock.divisor = divisor;
-                priv(dev)->ext_clock.chanspec = data[2];
+                devpriv->ext_clock.divisor = divisor;
+                devpriv->ext_clock.chanspec = data[2];
                 break;
         default:
                 return -EINVAL;
@@ -2069,8 +1958,9 @@ static int ai_config_master_clock_4020(struct comedi_device *dev,
 /* XXX could add support for 60xx series */
 static int ai_config_master_clock(struct comedi_device *dev, unsigned int *data)
 {
+        const struct pcidas64_board *thisboard = comedi_board(dev);
 
-        switch (board(dev)->layout) {
+        switch (thisboard->layout) {
         case LAYOUT_4020:
                 return ai_config_master_clock_4020(dev, data);
                 break;
@@ -2104,9 +1994,84 @@ static int ai_config_insn(struct comedi_device *dev, struct comedi_subdevice *s,
         return -EINVAL;
 }
 
+/* Gets nearest achievable timing given master clock speed, does not
+ * take into account possible minimum/maximum divisor values.  Used
+ * by other timing checking functions. */
+static unsigned int get_divisor(unsigned int ns, unsigned int flags)
+{
+        unsigned int divisor;
+
+        switch (flags & TRIG_ROUND_MASK) {
+        case TRIG_ROUND_UP:
+                divisor = (ns + TIMER_BASE - 1) / TIMER_BASE;
+                break;
+        case TRIG_ROUND_DOWN:
+                divisor = ns / TIMER_BASE;
+                break;
+        case TRIG_ROUND_NEAREST:
+        default:
+                divisor = (ns + TIMER_BASE / 2) / TIMER_BASE;
+                break;
+        }
+        return divisor;
+}
+
+/* utility function that rounds desired timing to an achievable time, and
+ * sets cmd members appropriately.
+ * adc paces conversions from master clock by dividing by (x + 3) where x is 24 bit number
+ */
+static void check_adc_timing(struct comedi_device *dev, struct comedi_cmd *cmd)
+{
+        const struct pcidas64_board *thisboard = comedi_board(dev);
+        unsigned int convert_divisor = 0, scan_divisor;
+        static const int min_convert_divisor = 3;
+        static const int max_convert_divisor =
+                max_counter_value + min_convert_divisor;
+        static const int min_scan_divisor_4020 = 2;
+        unsigned long long max_scan_divisor, min_scan_divisor;
+
+        if (cmd->convert_src == TRIG_TIMER) {
+                if (thisboard->layout == LAYOUT_4020) {
+                        cmd->convert_arg = 0;
+                } else {
+                        convert_divisor = get_divisor(cmd->convert_arg,
+                                                      cmd->flags);
+                        if (convert_divisor > max_convert_divisor)
+                                convert_divisor = max_convert_divisor;
+                        if (convert_divisor < min_convert_divisor)
+                                convert_divisor = min_convert_divisor;
+                        cmd->convert_arg = convert_divisor * TIMER_BASE;
+                }
+        } else if (cmd->convert_src == TRIG_NOW) {
+                cmd->convert_arg = 0;
+        }
+
+        if (cmd->scan_begin_src == TRIG_TIMER) {
+                scan_divisor = get_divisor(cmd->scan_begin_arg, cmd->flags);
+                if (cmd->convert_src == TRIG_TIMER) {
+                        /*  XXX check for integer overflows */
+                        min_scan_divisor = convert_divisor * cmd->chanlist_len;
+                        max_scan_divisor =
+                                (convert_divisor * cmd->chanlist_len - 1) +
+                                max_counter_value;
+                } else {
+                        min_scan_divisor = min_scan_divisor_4020;
+                        max_scan_divisor = max_counter_value + min_scan_divisor;
+                }
+                if (scan_divisor > max_scan_divisor)
+                        scan_divisor = max_scan_divisor;
+                if (scan_divisor < min_scan_divisor)
+                        scan_divisor = min_scan_divisor;
+                cmd->scan_begin_arg = scan_divisor * TIMER_BASE;
+        }
+
+        return;
+}
+
 static int ai_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s,
                       struct comedi_cmd *cmd)
 {
+        const struct pcidas64_board *thisboard = comedi_board(dev);
         int err = 0;
         unsigned int tmp_arg, tmp_arg2;
         int i;
@@ -2118,22 +2083,21 @@ static int ai_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s,
         err |= cfc_check_trigger_src(&cmd->start_src, TRIG_NOW | TRIG_EXT);
 
         triggers = TRIG_TIMER;
-        if (board(dev)->layout == LAYOUT_4020)
+        if (thisboard->layout == LAYOUT_4020)
                 triggers |= TRIG_OTHER;
         else
                 triggers |= TRIG_FOLLOW;
         err |= cfc_check_trigger_src(&cmd->scan_begin_src, triggers);
 
         triggers = TRIG_TIMER;
-        if (board(dev)->layout == LAYOUT_4020)
+        if (thisboard->layout == LAYOUT_4020)
                 triggers |= TRIG_NOW;
         else
                 triggers |= TRIG_EXT;
         err |= cfc_check_trigger_src(&cmd->convert_src, triggers);
-
         err |= cfc_check_trigger_src(&cmd->scan_end_src, TRIG_COUNT);
         err |= cfc_check_trigger_src(&cmd->stop_src,
-                                        TRIG_COUNT | TRIG_EXT | TRIG_NONE);
+                                     TRIG_COUNT | TRIG_EXT | TRIG_NONE);
 
         if (err)
                 return 1;
@@ -2156,55 +2120,34 @@ static int ai_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s,
         if (err)
                 return 2;
 
-        /* step 3: make sure arguments are trivially compatible */
+        /* Step 3: check if arguments are trivially valid */
 
         if (cmd->convert_src == TRIG_TIMER) {
-                if (board(dev)->layout == LAYOUT_4020) {
-                        if (cmd->convert_arg) {
-                                cmd->convert_arg = 0;
-                                err++;
-                        }
+                if (thisboard->layout == LAYOUT_4020) {
+                        err |= cfc_check_trigger_arg_is(&cmd->convert_arg, 0);
                 } else {
-                        if (cmd->convert_arg < board(dev)->ai_speed) {
-                                cmd->convert_arg = board(dev)->ai_speed;
-                                err++;
-                        }
-                        if (cmd->scan_begin_src == TRIG_TIMER) {
-                                /*  if scans are timed faster than conversion rate allows */
-                                if (cmd->convert_arg * cmd->chanlist_len >
-                                    cmd->scan_begin_arg) {
-                                        cmd->scan_begin_arg =
-                                            cmd->convert_arg *
-                                            cmd->chanlist_len;
-                                        err++;
-                                }
-                        }
+                        err |= cfc_check_trigger_arg_min(&cmd->convert_arg,
+                                                         thisboard->ai_speed);
+                        /* if scans are timed faster than conversion rate allows */
+                        if (cmd->scan_begin_src == TRIG_TIMER)
+                                err |= cfc_check_trigger_arg_min(
+                                                &cmd->scan_begin_arg,
+                                                cmd->convert_arg *
+                                                cmd->chanlist_len);
                 }
         }
 
-        if (!cmd->chanlist_len) {
-                cmd->chanlist_len = 1;
-                err++;
-        }
-        if (cmd->scan_end_arg != cmd->chanlist_len) {
-                cmd->scan_end_arg = cmd->chanlist_len;
-                err++;
-        }
+        err |= cfc_check_trigger_arg_min(&cmd->chanlist_len, 1);
+        err |= cfc_check_trigger_arg_is(&cmd->scan_end_arg, cmd->chanlist_len);
 
         switch (cmd->stop_src) {
         case TRIG_EXT:
                 break;
         case TRIG_COUNT:
-                if (!cmd->stop_arg) {
-                        cmd->stop_arg = 1;
-                        err++;
-                }
+                err |= cfc_check_trigger_arg_min(&cmd->stop_arg, 1);
                 break;
         case TRIG_NONE:
-                if (cmd->stop_arg != 0) {
-                        cmd->stop_arg = 0;
-                        err++;
-                }
+                err |= cfc_check_trigger_arg_is(&cmd->stop_arg, 0);
                 break;
         default:
                 break;
@@ -2240,7 +2183,7 @@ static int ai_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s,
                         }
                 }
                 /*  check 4020 chanlist */
-                if (board(dev)->layout == LAYOUT_4020) {
+                if (thisboard->layout == LAYOUT_4020) {
                         unsigned int first_channel = CR_CHAN(cmd->chanlist[0]);
                         for (i = 1; i < cmd->chanlist_len; i++) {
                                 if (CR_CHAN(cmd->chanlist[i]) !=
@@ -2279,89 +2222,37 @@ static int use_hw_sample_counter(struct comedi_cmd *cmd)
 static void setup_sample_counters(struct comedi_device *dev,
                                   struct comedi_cmd *cmd)
 {
+        struct pcidas64_private *devpriv = dev->private;
+
         if (cmd->stop_src == TRIG_COUNT) {
                 /*  set software count */
-                priv(dev)->ai_count = cmd->stop_arg * cmd->chanlist_len;
+                devpriv->ai_count = cmd->stop_arg * cmd->chanlist_len;
         }
         /*  load hardware conversion counter */
         if (use_hw_sample_counter(cmd)) {
                 writew(cmd->stop_arg & 0xffff,
-                       priv(dev)->main_iobase + ADC_COUNT_LOWER_REG);
+                       devpriv->main_iobase + ADC_COUNT_LOWER_REG);
                 writew((cmd->stop_arg >> 16) & 0xff,
-                       priv(dev)->main_iobase + ADC_COUNT_UPPER_REG);
+                       devpriv->main_iobase + ADC_COUNT_UPPER_REG);
         } else {
-                writew(1, priv(dev)->main_iobase + ADC_COUNT_LOWER_REG);
+                writew(1, devpriv->main_iobase + ADC_COUNT_LOWER_REG);
         }
 }
 
 static inline unsigned int dma_transfer_size(struct comedi_device *dev)
 {
+        const struct pcidas64_board *thisboard = comedi_board(dev);
+        struct pcidas64_private *devpriv = dev->private;
         unsigned int num_samples;
 
-        num_samples =
-            priv(dev)->ai_fifo_segment_length *
-            board(dev)->ai_fifo->sample_packing_ratio;
+        num_samples = devpriv->ai_fifo_segment_length *
+                      thisboard->ai_fifo->sample_packing_ratio;
         if (num_samples > DMA_BUFFER_SIZE / sizeof(uint16_t))
                 num_samples = DMA_BUFFER_SIZE / sizeof(uint16_t);
 
         return num_samples;
 }
 
-static void disable_ai_pacing(struct comedi_device *dev)
-{
-        unsigned long flags;
-
-        disable_ai_interrupts(dev);
-
-        spin_lock_irqsave(&dev->spinlock, flags);
-        priv(dev)->adc_control1_bits &= ~ADC_SW_GATE_BIT;
-        writew(priv(dev)->adc_control1_bits,
-               priv(dev)->main_iobase + ADC_CONTROL1_REG);
-        spin_unlock_irqrestore(&dev->spinlock, flags);
-
-        /* disable pacing, triggering, etc */
-        writew(ADC_DMA_DISABLE_BIT | ADC_SOFT_GATE_BITS | ADC_GATE_LEVEL_BIT,
-               priv(dev)->main_iobase + ADC_CONTROL0_REG);
-}
-
-static void disable_ai_interrupts(struct comedi_device *dev)
-{
-        unsigned long flags;
-
-        spin_lock_irqsave(&dev->spinlock, flags);
-        priv(dev)->intr_enable_bits &=
-            ~EN_ADC_INTR_SRC_BIT & ~EN_ADC_DONE_INTR_BIT &
-            ~EN_ADC_ACTIVE_INTR_BIT & ~EN_ADC_STOP_INTR_BIT &
-            ~EN_ADC_OVERRUN_BIT & ~ADC_INTR_SRC_MASK;
-        writew(priv(dev)->intr_enable_bits,
-               priv(dev)->main_iobase + INTR_ENABLE_REG);
-        spin_unlock_irqrestore(&dev->spinlock, flags);
-
-        DEBUG_PRINT("intr enable bits 0x%x\n", priv(dev)->intr_enable_bits);
-}
-
-static void enable_ai_interrupts(struct comedi_device *dev,
-                                 const struct comedi_cmd *cmd)
-{
-        uint32_t bits;
-        unsigned long flags;
-
-        bits = EN_ADC_OVERRUN_BIT | EN_ADC_DONE_INTR_BIT |
-            EN_ADC_ACTIVE_INTR_BIT | EN_ADC_STOP_INTR_BIT;
-        /*  Use pio transfer and interrupt on end of conversion if TRIG_WAKE_EOS flag is set. */
-        if (cmd->flags & TRIG_WAKE_EOS) {
-                /*  4020 doesn't support pio transfers except for fifo dregs */
-                if (board(dev)->layout != LAYOUT_4020)
-                        bits |= ADC_INTR_EOSCAN_BITS | EN_ADC_INTR_SRC_BIT;
-        }
-        spin_lock_irqsave(&dev->spinlock, flags);
-        priv(dev)->intr_enable_bits |= bits;
-        writew(priv(dev)->intr_enable_bits,
-               priv(dev)->main_iobase + INTR_ENABLE_REG);
-        DEBUG_PRINT("intr enable bits 0x%x\n", priv(dev)->intr_enable_bits);
-        spin_unlock_irqrestore(&dev->spinlock, flags);
-}
-
 static uint32_t ai_convert_counter_6xxx(const struct comedi_device *dev,
                                         const struct comedi_cmd *cmd)
 {
@@ -2373,12 +2264,13 @@ static uint32_t ai_scan_counter_6xxx(struct comedi_device *dev,
                                      struct comedi_cmd *cmd)
 {
         uint32_t count;
+
         /*  figure out how long we need to delay at end of scan */
         switch (cmd->scan_begin_src) {
         case TRIG_TIMER:
                 count = (cmd->scan_begin_arg -
-                         (cmd->convert_arg * (cmd->chanlist_len - 1)))
-                    / TIMER_BASE;
+                         (cmd->convert_arg * (cmd->chanlist_len - 1))) /
+                        TIMER_BASE;
                 break;
         case TRIG_FOLLOW:
                 count = cmd->convert_arg / TIMER_BASE;
@@ -2393,6 +2285,7 @@ static uint32_t ai_scan_counter_6xxx(struct comedi_device *dev,
 static uint32_t ai_convert_counter_4020(struct comedi_device *dev,
                                         struct comedi_cmd *cmd)
 {
+        struct pcidas64_private *devpriv = dev->private;
         unsigned int divisor;
 
         switch (cmd->scan_begin_src) {
@@ -2400,7 +2293,7 @@ static uint32_t ai_convert_counter_4020(struct comedi_device *dev,
                 divisor = cmd->scan_begin_arg / TIMER_BASE;
                 break;
         case TRIG_OTHER:
-                divisor = priv(dev)->ext_clock.divisor;
+                divisor = devpriv->ext_clock.divisor;
                 break;
         default:                /*  should never happen */
                 comedi_error(dev, "bug! failed to set ai pacing!");
@@ -2415,26 +2308,30 @@ static uint32_t ai_convert_counter_4020(struct comedi_device *dev,
 static void select_master_clock_4020(struct comedi_device *dev,
                                      const struct comedi_cmd *cmd)
 {
+        struct pcidas64_private *devpriv = dev->private;
+
         /*  select internal/external master clock */
-        priv(dev)->hw_config_bits &= ~MASTER_CLOCK_4020_MASK;
+        devpriv->hw_config_bits &= ~MASTER_CLOCK_4020_MASK;
         if (cmd->scan_begin_src == TRIG_OTHER) {
-                int chanspec = priv(dev)->ext_clock.chanspec;
+                int chanspec = devpriv->ext_clock.chanspec;
 
                 if (CR_CHAN(chanspec))
-                        priv(dev)->hw_config_bits |= BNC_CLOCK_4020_BITS;
+                        devpriv->hw_config_bits |= BNC_CLOCK_4020_BITS;
                 else
-                        priv(dev)->hw_config_bits |= EXT_CLOCK_4020_BITS;
+                        devpriv->hw_config_bits |= EXT_CLOCK_4020_BITS;
         } else {
-                priv(dev)->hw_config_bits |= INTERNAL_CLOCK_4020_BITS;
+                devpriv->hw_config_bits |= INTERNAL_CLOCK_4020_BITS;
         }
-        writew(priv(dev)->hw_config_bits,
-               priv(dev)->main_iobase + HW_CONFIG_REG);
+        writew(devpriv->hw_config_bits,
+               devpriv->main_iobase + HW_CONFIG_REG);
 }
 
 static void select_master_clock(struct comedi_device *dev,
                                 const struct comedi_cmd *cmd)
 {
-        switch (board(dev)->layout) {
+        const struct pcidas64_board *thisboard = comedi_board(dev);
+
+        switch (thisboard->layout) {
         case LAYOUT_4020:
                 select_master_clock_4020(dev, cmd);
                 break;
@@ -2446,6 +2343,7 @@ static void select_master_clock(struct comedi_device *dev,
 static inline void dma_start_sync(struct comedi_device *dev,
                                   unsigned int channel)
 {
+        struct pcidas64_private *devpriv = dev->private;
         unsigned long flags;
 
         /*  spinlock for plx dma control/status reg */
@@ -2453,23 +2351,25 @@ static inline void dma_start_sync(struct comedi_device *dev,
         if (channel)
                 writeb(PLX_DMA_EN_BIT | PLX_DMA_START_BIT |
                        PLX_CLEAR_DMA_INTR_BIT,
-                       priv(dev)->plx9080_iobase + PLX_DMA1_CS_REG);
+                       devpriv->plx9080_iobase + PLX_DMA1_CS_REG);
         else
                 writeb(PLX_DMA_EN_BIT | PLX_DMA_START_BIT |
                        PLX_CLEAR_DMA_INTR_BIT,
-                       priv(dev)->plx9080_iobase + PLX_DMA0_CS_REG);
+                       devpriv->plx9080_iobase + PLX_DMA0_CS_REG);
         spin_unlock_irqrestore(&dev->spinlock, flags);
 }
 
 static void set_ai_pacing(struct comedi_device *dev, struct comedi_cmd *cmd)
 {
+        const struct pcidas64_board *thisboard = comedi_board(dev);
+        struct pcidas64_private *devpriv = dev->private;
         uint32_t convert_counter = 0, scan_counter = 0;
 
         check_adc_timing(dev, cmd);
 
         select_master_clock(dev, cmd);
 
-        if (board(dev)->layout == LAYOUT_4020) {
+        if (thisboard->layout == LAYOUT_4020) {
                 convert_counter = ai_convert_counter_4020(dev, cmd);
         } else {
                 convert_counter = ai_convert_counter_6xxx(dev, cmd);
@@ -2478,23 +2378,24 @@ static void set_ai_pacing(struct comedi_device *dev, struct comedi_cmd *cmd)
 
         /*  load lower 16 bits of convert interval */
         writew(convert_counter & 0xffff,
-               priv(dev)->main_iobase + ADC_SAMPLE_INTERVAL_LOWER_REG);
+               devpriv->main_iobase + ADC_SAMPLE_INTERVAL_LOWER_REG);
         DEBUG_PRINT("convert counter 0x%x\n", convert_counter);
         /*  load upper 8 bits of convert interval */
         writew((convert_counter >> 16) & 0xff,
-               priv(dev)->main_iobase + ADC_SAMPLE_INTERVAL_UPPER_REG);
+               devpriv->main_iobase + ADC_SAMPLE_INTERVAL_UPPER_REG);
         /*  load lower 16 bits of scan delay */
         writew(scan_counter & 0xffff,
-               priv(dev)->main_iobase + ADC_DELAY_INTERVAL_LOWER_REG);
+               devpriv->main_iobase + ADC_DELAY_INTERVAL_LOWER_REG);
         /*  load upper 8 bits of scan delay */
         writew((scan_counter >> 16) & 0xff,
-               priv(dev)->main_iobase + ADC_DELAY_INTERVAL_UPPER_REG);
+               devpriv->main_iobase + ADC_DELAY_INTERVAL_UPPER_REG);
         DEBUG_PRINT("scan counter 0x%x\n", scan_counter);
 }
 
 static int use_internal_queue_6xxx(const struct comedi_cmd *cmd)
 {
         int i;
+
         for (i = 0; i + 1 < cmd->chanlist_len; i++) {
                 if (CR_CHAN(cmd->chanlist[i + 1]) !=
                     CR_CHAN(cmd->chanlist[i]) + 1)
@@ -2511,14 +2412,16 @@ static int use_internal_queue_6xxx(const struct comedi_cmd *cmd)
 static int setup_channel_queue(struct comedi_device *dev,
                                const struct comedi_cmd *cmd)
 {
+        const struct pcidas64_board *thisboard = comedi_board(dev);
+        struct pcidas64_private *devpriv = dev->private;
         unsigned short bits;
         int i;
 
-        if (board(dev)->layout != LAYOUT_4020) {
+        if (thisboard->layout != LAYOUT_4020) {
                 if (use_internal_queue_6xxx(cmd)) {
-                        priv(dev)->hw_config_bits &= ~EXT_QUEUE_BIT;
-                        writew(priv(dev)->hw_config_bits,
-                               priv(dev)->main_iobase + HW_CONFIG_REG);
+                        devpriv->hw_config_bits &= ~EXT_QUEUE_BIT;
+                        writew(devpriv->hw_config_bits,
+                               devpriv->main_iobase + HW_CONFIG_REG);
                         bits = 0;
                         /*  set channel */
                         bits |= adc_chan_bits(CR_CHAN(cmd->chanlist[0]));
@@ -2534,30 +2437,30 @@ static int setup_channel_queue(struct comedi_device *dev,
                         /*  set stop channel */
                         writew(adc_chan_bits
                                (CR_CHAN(cmd->chanlist[cmd->chanlist_len - 1])),
-                               priv(dev)->main_iobase + ADC_QUEUE_HIGH_REG);
+                               devpriv->main_iobase + ADC_QUEUE_HIGH_REG);
                         /*  set start channel, and rest of settings */
                         writew(bits,
-                               priv(dev)->main_iobase + ADC_QUEUE_LOAD_REG);
+                               devpriv->main_iobase + ADC_QUEUE_LOAD_REG);
                 } else {
                         /*  use external queue */
                         if (dev->write_subdev && dev->write_subdev->busy) {
                                 warn_external_queue(dev);
                                 return -EBUSY;
                         }
-                        priv(dev)->hw_config_bits |= EXT_QUEUE_BIT;
-                        writew(priv(dev)->hw_config_bits,
-                               priv(dev)->main_iobase + HW_CONFIG_REG);
+                        devpriv->hw_config_bits |= EXT_QUEUE_BIT;
+                        writew(devpriv->hw_config_bits,
+                               devpriv->main_iobase + HW_CONFIG_REG);
                         /*  clear DAC buffer to prevent weird interactions */
                         writew(0,
-                               priv(dev)->main_iobase + DAC_BUFFER_CLEAR_REG);
+                               devpriv->main_iobase + DAC_BUFFER_CLEAR_REG);
                         /*  clear queue pointer */
-                        writew(0, priv(dev)->main_iobase + ADC_QUEUE_CLEAR_REG);
+                        writew(0, devpriv->main_iobase + ADC_QUEUE_CLEAR_REG);
                         /*  load external queue */
                         for (i = 0; i < cmd->chanlist_len; i++) {
                                 bits = 0;
                                 /*  set channel */
-                                bits |=
-                                    adc_chan_bits(CR_CHAN(cmd->chanlist[i]));
+                                bits |= adc_chan_bits(CR_CHAN(cmd->
+                                                              chanlist[i]));
                                 /*  set gain */
                                 bits |= ai_range_bits_6xxx(dev,
                                                            CR_RANGE(cmd->
@@ -2573,42 +2476,42 @@ static int setup_channel_queue(struct comedi_device *dev,
                                 /*  mark end of queue */
                                 if (i == cmd->chanlist_len - 1)
                                         bits |= QUEUE_EOSCAN_BIT |
-                                            QUEUE_EOSEQ_BIT;
+                                                QUEUE_EOSEQ_BIT;
                                 writew(bits,
-                                       priv(dev)->main_iobase +
+                                       devpriv->main_iobase +
                                        ADC_QUEUE_FIFO_REG);
-                                DEBUG_PRINT
-                                    ("wrote 0x%x to external channel queue\n",
-                                     bits);
+                                DEBUG_PRINT(
+                                            "wrote 0x%x to external channel queue\n",
+                                            bits);
                         }
                         /* doing a queue clear is not specified in board docs,
                          * but required for reliable operation */
-                        writew(0, priv(dev)->main_iobase + ADC_QUEUE_CLEAR_REG);
+                        writew(0, devpriv->main_iobase + ADC_QUEUE_CLEAR_REG);
                         /*  prime queue holding register */
-                        writew(0, priv(dev)->main_iobase + ADC_QUEUE_LOAD_REG);
+                        writew(0, devpriv->main_iobase + ADC_QUEUE_LOAD_REG);
                 }
         } else {
-                unsigned short old_cal_range_bits =
-                    priv(dev)->i2c_cal_range_bits;
+                unsigned short old_cal_range_bits = devpriv->i2c_cal_range_bits;
 
-                priv(dev)->i2c_cal_range_bits &= ~ADC_SRC_4020_MASK;
+                devpriv->i2c_cal_range_bits &= ~ADC_SRC_4020_MASK;
                 /* select BNC inputs */
-                priv(dev)->i2c_cal_range_bits |= adc_src_4020_bits(4);
+                devpriv->i2c_cal_range_bits |= adc_src_4020_bits(4);
                 /*  select ranges */
                 for (i = 0; i < cmd->chanlist_len; i++) {
                         unsigned int channel = CR_CHAN(cmd->chanlist[i]);
                         unsigned int range = CR_RANGE(cmd->chanlist[i]);
 
                         if (range == 0)
-                                priv(dev)->i2c_cal_range_bits |=
-                                    attenuate_bit(channel);
+                                devpriv->i2c_cal_range_bits |=
+                                        attenuate_bit(channel);
                         else
-                                priv(dev)->i2c_cal_range_bits &=
-                                    ~attenuate_bit(channel);
+                                devpriv->i2c_cal_range_bits &=
+                                        ~attenuate_bit(channel);
                 }
-                /*  update calibration/range i2c register only if necessary, as it is very slow */
-                if (old_cal_range_bits != priv(dev)->i2c_cal_range_bits) {
-                        uint8_t i2c_data = priv(dev)->i2c_cal_range_bits;
+                /*  update calibration/range i2c register only if necessary,
+                 *  as it is very slow */
+                if (old_cal_range_bits != devpriv->i2c_cal_range_bits) {
+                        uint8_t i2c_data = devpriv->i2c_cal_range_bits;
                         i2c_write(dev, RANGE_CAL_I2C_ADDR, &i2c_data,
                                   sizeof(i2c_data));
                 }
@@ -2620,6 +2523,8 @@ static inline void load_first_dma_descriptor(struct comedi_device *dev,
                                              unsigned int dma_channel,
                                              unsigned int descriptor_bits)
 {
+        struct pcidas64_private *devpriv = dev->private;
+
         /* The transfer size, pci address, and local address registers
          * are supposedly unused during chained dma,
          * but I have found that left over values from last operation
@@ -2627,25 +2532,27 @@ static inline void load_first_dma_descriptor(struct comedi_device *dev,
          * block.  Initializing them to zero seems to fix the problem. */
         if (dma_channel) {
                 writel(0,
-                       priv(dev)->plx9080_iobase + PLX_DMA1_TRANSFER_SIZE_REG);
-                writel(0, priv(dev)->plx9080_iobase + PLX_DMA1_PCI_ADDRESS_REG);
+                       devpriv->plx9080_iobase + PLX_DMA1_TRANSFER_SIZE_REG);
+                writel(0, devpriv->plx9080_iobase + PLX_DMA1_PCI_ADDRESS_REG);
                 writel(0,
-                       priv(dev)->plx9080_iobase + PLX_DMA1_LOCAL_ADDRESS_REG);
+                       devpriv->plx9080_iobase + PLX_DMA1_LOCAL_ADDRESS_REG);
                 writel(descriptor_bits,
-                       priv(dev)->plx9080_iobase + PLX_DMA1_DESCRIPTOR_REG);
+                       devpriv->plx9080_iobase + PLX_DMA1_DESCRIPTOR_REG);
         } else {
                 writel(0,
-                       priv(dev)->plx9080_iobase + PLX_DMA0_TRANSFER_SIZE_REG);
-                writel(0, priv(dev)->plx9080_iobase + PLX_DMA0_PCI_ADDRESS_REG);
+                       devpriv->plx9080_iobase + PLX_DMA0_TRANSFER_SIZE_REG);
+                writel(0, devpriv->plx9080_iobase + PLX_DMA0_PCI_ADDRESS_REG);
                 writel(0,
-                       priv(dev)->plx9080_iobase + PLX_DMA0_LOCAL_ADDRESS_REG);
+                       devpriv->plx9080_iobase + PLX_DMA0_LOCAL_ADDRESS_REG);
                 writel(descriptor_bits,
-                       priv(dev)->plx9080_iobase + PLX_DMA0_DESCRIPTOR_REG);
+                       devpriv->plx9080_iobase + PLX_DMA0_DESCRIPTOR_REG);
         }
 }
 
 static int ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
 {
+        const struct pcidas64_board *thisboard = comedi_board(dev);
+        struct pcidas64_private *devpriv = dev->private;
         struct comedi_async *async = s->async;
         struct comedi_cmd *cmd = &async->cmd;
         uint32_t bits;
@@ -2661,7 +2568,7 @@ static int ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
                 return retval;
 
         /*  make sure internal calibration source is turned off */
-        writew(0, priv(dev)->main_iobase + CALIBRATION_REG);
+        writew(0, devpriv->main_iobase + CALIBRATION_REG);
 
         set_ai_pacing(dev, cmd);
 
@@ -2671,50 +2578,51 @@ static int ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
 
         spin_lock_irqsave(&dev->spinlock, flags);
         /* set mode, allow conversions through software gate */
-        priv(dev)->adc_control1_bits |= ADC_SW_GATE_BIT;
-        priv(dev)->adc_control1_bits &= ~ADC_DITHER_BIT;
-        if (board(dev)->layout != LAYOUT_4020) {
-                priv(dev)->adc_control1_bits &= ~ADC_MODE_MASK;
+        devpriv->adc_control1_bits |= ADC_SW_GATE_BIT;
+        devpriv->adc_control1_bits &= ~ADC_DITHER_BIT;
+        if (thisboard->layout != LAYOUT_4020) {
+                devpriv->adc_control1_bits &= ~ADC_MODE_MASK;
                 if (cmd->convert_src == TRIG_EXT)
-                        priv(dev)->adc_control1_bits |= adc_mode_bits(13);      /*  good old mode 13 */
+                        /*  good old mode 13 */
+                        devpriv->adc_control1_bits |= adc_mode_bits(13);
                 else
-                        priv(dev)->adc_control1_bits |= adc_mode_bits(8);       /*  mode 8.  What else could you need? */
+                        /*  mode 8.  What else could you need? */
+                        devpriv->adc_control1_bits |= adc_mode_bits(8);
         } else {
-                priv(dev)->adc_control1_bits &= ~CHANNEL_MODE_4020_MASK;
+                devpriv->adc_control1_bits &= ~CHANNEL_MODE_4020_MASK;
                 if (cmd->chanlist_len == 4)
-                        priv(dev)->adc_control1_bits |= FOUR_CHANNEL_4020_BITS;
+                        devpriv->adc_control1_bits |= FOUR_CHANNEL_4020_BITS;
                 else if (cmd->chanlist_len == 2)
-                        priv(dev)->adc_control1_bits |= TWO_CHANNEL_4020_BITS;
-                priv(dev)->adc_control1_bits &= ~ADC_LO_CHANNEL_4020_MASK;
-                priv(dev)->adc_control1_bits |=
-                    adc_lo_chan_4020_bits(CR_CHAN(cmd->chanlist[0]));
-                priv(dev)->adc_control1_bits &= ~ADC_HI_CHANNEL_4020_MASK;
-                priv(dev)->adc_control1_bits |=
-                    adc_hi_chan_4020_bits(CR_CHAN
-                                          (cmd->
-                                           chanlist[cmd->chanlist_len - 1]));
+                        devpriv->adc_control1_bits |= TWO_CHANNEL_4020_BITS;
+                devpriv->adc_control1_bits &= ~ADC_LO_CHANNEL_4020_MASK;
+                devpriv->adc_control1_bits |=
+                        adc_lo_chan_4020_bits(CR_CHAN(cmd->chanlist[0]));
+                devpriv->adc_control1_bits &= ~ADC_HI_CHANNEL_4020_MASK;
+                devpriv->adc_control1_bits |=
+                        adc_hi_chan_4020_bits(CR_CHAN(cmd->chanlist
+                                                      [cmd->chanlist_len - 1]));
         }
-        writew(priv(dev)->adc_control1_bits,
-               priv(dev)->main_iobase + ADC_CONTROL1_REG);
-        DEBUG_PRINT("control1 bits 0x%x\n", priv(dev)->adc_control1_bits);
+        writew(devpriv->adc_control1_bits,
+               devpriv->main_iobase + ADC_CONTROL1_REG);
+        DEBUG_PRINT("control1 bits 0x%x\n", devpriv->adc_control1_bits);
         spin_unlock_irqrestore(&dev->spinlock, flags);
 
         /*  clear adc buffer */
-        writew(0, priv(dev)->main_iobase + ADC_BUFFER_CLEAR_REG);
+        writew(0, devpriv->main_iobase + ADC_BUFFER_CLEAR_REG);
 
         if ((cmd->flags & TRIG_WAKE_EOS) == 0 ||
-            board(dev)->layout == LAYOUT_4020) {
-                priv(dev)->ai_dma_index = 0;
+            thisboard->layout == LAYOUT_4020) {
+                devpriv->ai_dma_index = 0;
 
                 /*  set dma transfer size */
-                for (i = 0; i < ai_dma_ring_count(board(dev)); i++)
-                        priv(dev)->ai_dma_desc[i].transfer_size =
-                            cpu_to_le32(dma_transfer_size(dev) *
-                                        sizeof(uint16_t));
+                for (i = 0; i < ai_dma_ring_count(thisboard); i++)
+                        devpriv->ai_dma_desc[i].transfer_size =
+                                cpu_to_le32(dma_transfer_size(dev) *
+                                            sizeof(uint16_t));
 
                 /*  give location of first dma descriptor */
                 load_first_dma_descriptor(dev, 1,
-                                          priv(dev)->ai_dma_desc_bus_addr |
+                                          devpriv->ai_dma_desc_bus_addr |
                                           PLX_DESC_IN_PCI_BIT |
                                           PLX_INTR_TERM_COUNT |
                                           PLX_XFER_LOCAL_TO_PCI);
@@ -2722,14 +2630,14 @@ static int ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
                 dma_start_sync(dev, 1);
         }
 
-        if (board(dev)->layout == LAYOUT_4020) {
+        if (thisboard->layout == LAYOUT_4020) {
                 /* set source for external triggers */
                 bits = 0;
                 if (cmd->start_src == TRIG_EXT && CR_CHAN(cmd->start_arg))
                         bits |= EXT_START_TRIG_BNC_BIT;
                 if (cmd->stop_src == TRIG_EXT && CR_CHAN(cmd->stop_arg))
                         bits |= EXT_STOP_TRIG_BNC_BIT;
-                writew(bits, priv(dev)->main_iobase + DAQ_ATRIG_LOW_4020_REG);
+                writew(bits, devpriv->main_iobase + DAQ_ATRIG_LOW_4020_REG);
         }
 
         spin_lock_irqsave(&dev->spinlock, flags);
@@ -2747,16 +2655,16 @@ static int ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
                 bits |= ADC_START_TRIG_SOFT_BITS;
         if (use_hw_sample_counter(cmd))
                 bits |= ADC_SAMPLE_COUNTER_EN_BIT;
-        writew(bits, priv(dev)->main_iobase + ADC_CONTROL0_REG);
+        writew(bits, devpriv->main_iobase + ADC_CONTROL0_REG);
         DEBUG_PRINT("control0 bits 0x%x\n", bits);
 
-        priv(dev)->ai_cmd_running = 1;
+        devpriv->ai_cmd_running = 1;
 
         spin_unlock_irqrestore(&dev->spinlock, flags);
 
         /*  start acquisition */
         if (cmd->start_src == TRIG_NOW) {
-                writew(0, priv(dev)->main_iobase + ADC_START_REG);
+                writew(0, devpriv->main_iobase + ADC_START_REG);
                 DEBUG_PRINT("soft trig\n");
         }
 
@@ -2766,6 +2674,7 @@ static int ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
 /* read num_samples from 16 bit wide ai fifo */
 static void pio_drain_ai_fifo_16(struct comedi_device *dev)
 {
+        struct pcidas64_private *devpriv = dev->private;
         struct comedi_subdevice *s = dev->read_subdev;
         struct comedi_async *async = s->async;
         struct comedi_cmd *cmd = &async->cmd;
@@ -2776,18 +2685,19 @@ static void pio_drain_ai_fifo_16(struct comedi_device *dev)
 
         do {
                 /*  get least significant 15 bits */
-                read_index =
-                    readw(priv(dev)->main_iobase + ADC_READ_PNTR_REG) & 0x7fff;
-                write_index =
-                    readw(priv(dev)->main_iobase + ADC_WRITE_PNTR_REG) & 0x7fff;
-                /* Get most significant bits (grey code).  Different boards use different code
-                 * so use a scheme that doesn't depend on encoding.  This read must
+                read_index = readw(devpriv->main_iobase + ADC_READ_PNTR_REG) &
+                             0x7fff;
+                write_index = readw(devpriv->main_iobase + ADC_WRITE_PNTR_REG) &
+                              0x7fff;
+                /* Get most significant bits (grey code).
+                 * Different boards use different code so use a scheme
+                 * that doesn't depend on encoding.  This read must
                  * occur after reading least significant 15 bits to avoid race
                  * with fifo switching to next segment. */
-                prepost_bits = readw(priv(dev)->main_iobase + PREPOST_REG);
+                prepost_bits = readw(devpriv->main_iobase + PREPOST_REG);
 
-                /* if read and write pointers are not on the same fifo segment, read to the
-                 * end of the read segment */
+                /* if read and write pointers are not on the same fifo segment,
+                 * read to the end of the read segment */
                 read_segment = adc_upper_read_ptr_code(prepost_bits);
                 write_segment = adc_upper_write_ptr_code(prepost_bits);
 
@@ -2797,17 +2707,17 @@ static void pio_drain_ai_fifo_16(struct comedi_device *dev)
 
                 if (read_segment != write_segment)
                         num_samples =
-                            priv(dev)->ai_fifo_segment_length - read_index;
+                                devpriv->ai_fifo_segment_length - read_index;
                 else
                         num_samples = write_index - read_index;
 
                 if (cmd->stop_src == TRIG_COUNT) {
-                        if (priv(dev)->ai_count == 0)
+                        if (devpriv->ai_count == 0)
                                 break;
-                        if (num_samples > priv(dev)->ai_count)
-                                num_samples = priv(dev)->ai_count;
+                        if (num_samples > devpriv->ai_count)
+                                num_samples = devpriv->ai_count;
 
-                        priv(dev)->ai_count -= num_samples;
+                        devpriv->ai_count -= num_samples;
                 }
 
                 if (num_samples < 0) {
@@ -2820,20 +2730,21 @@ static void pio_drain_ai_fifo_16(struct comedi_device *dev)
 
                 for (i = 0; i < num_samples; i++) {
                         cfc_write_to_buffer(s,
-                                            readw(priv(dev)->main_iobase +
+                                            readw(devpriv->main_iobase +
                                                   ADC_FIFO_REG));
                 }
 
         } while (read_segment != write_segment);
 }
 
-/* Read from 32 bit wide ai fifo of 4020 - deal with insane grey coding of pointers.
- * The pci-4020 hardware only supports
- * dma transfers (it only supports the use of pio for draining the last remaining
- * points from the fifo when a data acquisition operation has completed).
+/* Read from 32 bit wide ai fifo of 4020 - deal with insane grey coding of
+ * pointers.  The pci-4020 hardware only supports dma transfers (it only
+ * supports the use of pio for draining the last remaining points from the
+ * fifo when a data acquisition operation has completed).
  */
 static void pio_drain_ai_fifo_32(struct comedi_device *dev)
 {
+        struct pcidas64_private *devpriv = dev->private;
         struct comedi_subdevice *s = dev->read_subdev;
         struct comedi_async *async = s->async;
         struct comedi_cmd *cmd = &async->cmd;
@@ -2841,33 +2752,35 @@ static void pio_drain_ai_fifo_32(struct comedi_device *dev)
         unsigned int max_transfer = 100000;
         uint32_t fifo_data;
         int write_code =
-            readw(priv(dev)->main_iobase + ADC_WRITE_PNTR_REG) & 0x7fff;
+                readw(devpriv->main_iobase + ADC_WRITE_PNTR_REG) & 0x7fff;
         int read_code =
-            readw(priv(dev)->main_iobase + ADC_READ_PNTR_REG) & 0x7fff;
+                readw(devpriv->main_iobase + ADC_READ_PNTR_REG) & 0x7fff;
 
         if (cmd->stop_src == TRIG_COUNT) {
-                if (max_transfer > priv(dev)->ai_count)
-                        max_transfer = priv(dev)->ai_count;
+                if (max_transfer > devpriv->ai_count)
+                        max_transfer = devpriv->ai_count;
 
         }
         for (i = 0; read_code != write_code && i < max_transfer;) {
-                fifo_data = readl(priv(dev)->dio_counter_iobase + ADC_FIFO_REG);
+                fifo_data = readl(devpriv->dio_counter_iobase + ADC_FIFO_REG);
                 cfc_write_to_buffer(s, fifo_data & 0xffff);
                 i++;
                 if (i < max_transfer) {
                         cfc_write_to_buffer(s, (fifo_data >> 16) & 0xffff);
                         i++;
                 }
-                read_code =
-                    readw(priv(dev)->main_iobase + ADC_READ_PNTR_REG) & 0x7fff;
+                read_code = readw(devpriv->main_iobase + ADC_READ_PNTR_REG) &
+                            0x7fff;
         }
-        priv(dev)->ai_count -= i;
+        devpriv->ai_count -= i;
 }
 
 /* empty fifo */
 static void pio_drain_ai_fifo(struct comedi_device *dev)
 {
-        if (board(dev)->layout == LAYOUT_4020)
+        const struct pcidas64_board *thisboard = comedi_board(dev);
+
+        if (thisboard->layout == LAYOUT_4020)
                 pio_drain_ai_fifo_32(dev);
         else
                 pio_drain_ai_fifo_16(dev);
@@ -2875,6 +2788,8 @@ static void pio_drain_ai_fifo(struct comedi_device *dev)
 
 static void drain_dma_buffers(struct comedi_device *dev, unsigned int channel)
 {
+        const struct pcidas64_board *thisboard = comedi_board(dev);
+        struct pcidas64_private *devpriv = dev->private;
         struct comedi_async *async = dev->read_subdev->async;
         uint32_t next_transfer_addr;
         int j;
@@ -2883,46 +2798,47 @@ static void drain_dma_buffers(struct comedi_device *dev, unsigned int channel)
 
         if (channel)
                 pci_addr_reg =
-                    priv(dev)->plx9080_iobase + PLX_DMA1_PCI_ADDRESS_REG;
+                    devpriv->plx9080_iobase + PLX_DMA1_PCI_ADDRESS_REG;
         else
                 pci_addr_reg =
-                    priv(dev)->plx9080_iobase + PLX_DMA0_PCI_ADDRESS_REG;
+                    devpriv->plx9080_iobase + PLX_DMA0_PCI_ADDRESS_REG;
 
         /*  loop until we have read all the full buffers */
         for (j = 0, next_transfer_addr = readl(pci_addr_reg);
              (next_transfer_addr <
-              priv(dev)->ai_buffer_bus_addr[priv(dev)->ai_dma_index]
-              || next_transfer_addr >=
-              priv(dev)->ai_buffer_bus_addr[priv(dev)->ai_dma_index] +
-              DMA_BUFFER_SIZE) && j < ai_dma_ring_count(board(dev)); j++) {
+              devpriv->ai_buffer_bus_addr[devpriv->ai_dma_index] ||
+              next_transfer_addr >=
+              devpriv->ai_buffer_bus_addr[devpriv->ai_dma_index] +
+              DMA_BUFFER_SIZE) && j < ai_dma_ring_count(thisboard); j++) {
                 /*  transfer data from dma buffer to comedi buffer */
                 num_samples = dma_transfer_size(dev);
                 if (async->cmd.stop_src == TRIG_COUNT) {
-                        if (num_samples > priv(dev)->ai_count)
-                                num_samples = priv(dev)->ai_count;
-                        priv(dev)->ai_count -= num_samples;
+                        if (num_samples > devpriv->ai_count)
+                                num_samples = devpriv->ai_count;
+                        devpriv->ai_count -= num_samples;
                 }
                 cfc_write_array_to_buffer(dev->read_subdev,
-                                          priv(dev)->ai_buffer[priv(dev)->
-                                                               ai_dma_index],
+                                          devpriv->ai_buffer[devpriv->
+                                                             ai_dma_index],
                                           num_samples * sizeof(uint16_t));
-                priv(dev)->ai_dma_index =
-                    (priv(dev)->ai_dma_index +
-                     1) % ai_dma_ring_count(board(dev));
+                devpriv->ai_dma_index = (devpriv->ai_dma_index + 1) %
+                                        ai_dma_ring_count(thisboard);
 
                 DEBUG_PRINT("next buffer addr 0x%lx\n",
-                            (unsigned long)priv(dev)->
-                            ai_buffer_bus_addr[priv(dev)->ai_dma_index]);
+                            (unsigned long)devpriv->
+                            ai_buffer_bus_addr[devpriv->ai_dma_index]);
                 DEBUG_PRINT("pci addr reg 0x%x\n", next_transfer_addr);
         }
-        /* XXX check for dma ring buffer overrun (use end-of-chain bit to mark last
-         * unused buffer) */
+        /* XXX check for dma ring buffer overrun
+         * (use end-of-chain bit to mark last unused buffer) */
 }
 
 static void handle_ai_interrupt(struct comedi_device *dev,
                                 unsigned short status,
                                 unsigned int plx_status)
 {
+        const struct pcidas64_board *thisboard = comedi_board(dev);
+        struct pcidas64_private *devpriv = dev->private;
         struct comedi_subdevice *s = dev->read_subdev;
         struct comedi_async *async = s->async;
         struct comedi_cmd *cmd = &async->cmd;
@@ -2936,10 +2852,10 @@ static void handle_ai_interrupt(struct comedi_device *dev,
         }
         /*  spin lock makes sure no one else changes plx dma control reg */
         spin_lock_irqsave(&dev->spinlock, flags);
-        dma1_status = readb(priv(dev)->plx9080_iobase + PLX_DMA1_CS_REG);
+        dma1_status = readb(devpriv->plx9080_iobase + PLX_DMA1_CS_REG);
         if (plx_status & ICS_DMA1_A) {  /*  dma chan 1 interrupt */
                 writeb((dma1_status & PLX_DMA_EN_BIT) | PLX_CLEAR_DMA_INTR_BIT,
-                       priv(dev)->plx9080_iobase + PLX_DMA1_CS_REG);
+                       devpriv->plx9080_iobase + PLX_DMA1_CS_REG);
                 DEBUG_PRINT("dma1 status 0x%x\n", dma1_status);
 
                 if (dma1_status & PLX_DMA_EN_BIT)
@@ -2956,17 +2872,17 @@ static void handle_ai_interrupt(struct comedi_device *dev,
         if ((status & ADC_DONE_BIT) ||
             ((cmd->flags & TRIG_WAKE_EOS) &&
              (status & ADC_INTR_PENDING_BIT) &&
-             (board(dev)->layout != LAYOUT_4020))) {
+             (thisboard->layout != LAYOUT_4020))) {
                 DEBUG_PRINT("pio fifo drain\n");
                 spin_lock_irqsave(&dev->spinlock, flags);
-                if (priv(dev)->ai_cmd_running) {
+                if (devpriv->ai_cmd_running) {
                         spin_unlock_irqrestore(&dev->spinlock, flags);
                         pio_drain_ai_fifo(dev);
                 } else
                         spin_unlock_irqrestore(&dev->spinlock, flags);
         }
         /*  if we are have all the data, then quit */
-        if ((cmd->stop_src == TRIG_COUNT && (int)priv(dev)->ai_count <= 0) ||
+        if ((cmd->stop_src == TRIG_COUNT && (int)devpriv->ai_count <= 0) ||
             (cmd->stop_src == TRIG_EXT && (status & ADC_STOP_BIT))) {
                 async->events |= COMEDI_CB_EOA;
         }
@@ -2976,29 +2892,31 @@ static void handle_ai_interrupt(struct comedi_device *dev,
 
 static inline unsigned int prev_ao_dma_index(struct comedi_device *dev)
 {
+        struct pcidas64_private *devpriv = dev->private;
         unsigned int buffer_index;
 
-        if (priv(dev)->ao_dma_index == 0)
+        if (devpriv->ao_dma_index == 0)
                 buffer_index = AO_DMA_RING_COUNT - 1;
         else
-                buffer_index = priv(dev)->ao_dma_index - 1;
+                buffer_index = devpriv->ao_dma_index - 1;
         return buffer_index;
 }
 
 static int last_ao_dma_load_completed(struct comedi_device *dev)
 {
+        struct pcidas64_private *devpriv = dev->private;
         unsigned int buffer_index;
         unsigned int transfer_address;
         unsigned short dma_status;
 
         buffer_index = prev_ao_dma_index(dev);
-        dma_status = readb(priv(dev)->plx9080_iobase + PLX_DMA0_CS_REG);
+        dma_status = readb(devpriv->plx9080_iobase + PLX_DMA0_CS_REG);
         if ((dma_status & PLX_DMA_DONE_BIT) == 0)
                 return 0;
 
         transfer_address =
-            readl(priv(dev)->plx9080_iobase + PLX_DMA0_PCI_ADDRESS_REG);
-        if (transfer_address != priv(dev)->ao_buffer_bus_addr[buffer_index])
+                readl(devpriv->plx9080_iobase + PLX_DMA0_PCI_ADDRESS_REG);
+        if (transfer_address != devpriv->ao_buffer_bus_addr[buffer_index])
                 return 0;
 
         return 1;
@@ -3007,10 +2925,12 @@ static int last_ao_dma_load_completed(struct comedi_device *dev)
 static int ao_stopped_by_error(struct comedi_device *dev,
                                const struct comedi_cmd *cmd)
 {
+        struct pcidas64_private *devpriv = dev->private;
+
         if (cmd->stop_src == TRIG_NONE)
                 return 1;
         if (cmd->stop_src == TRIG_COUNT) {
-                if (priv(dev)->ao_count)
+                if (devpriv->ao_count)
                         return 1;
                 if (last_ao_dma_load_completed(dev) == 0)
                         return 1;
@@ -3032,10 +2952,11 @@ static inline int ao_dma_needs_restart(struct comedi_device *dev,
 
 static void restart_ao_dma(struct comedi_device *dev)
 {
+        struct pcidas64_private *devpriv = dev->private;
         unsigned int dma_desc_bits;
 
         dma_desc_bits =
-            readl(priv(dev)->plx9080_iobase + PLX_DMA0_DESCRIPTOR_REG);
+                readl(devpriv->plx9080_iobase + PLX_DMA0_DESCRIPTOR_REG);
         dma_desc_bits &= ~PLX_END_OF_CHAIN_BIT;
         DEBUG_PRINT("restarting ao dma, descriptor reg 0x%x\n", dma_desc_bits);
         load_first_dma_descriptor(dev, 0, dma_desc_bits);
@@ -3043,9 +2964,81 @@ static void restart_ao_dma(struct comedi_device *dev)
         dma_start_sync(dev, 0);
 }
 
+static unsigned int load_ao_dma_buffer(struct comedi_device *dev,
+                                       const struct comedi_cmd *cmd)
+{
+        struct pcidas64_private *devpriv = dev->private;
+        unsigned int num_bytes, buffer_index, prev_buffer_index;
+        unsigned int next_bits;
+
+        buffer_index = devpriv->ao_dma_index;
+        prev_buffer_index = prev_ao_dma_index(dev);
+
+        DEBUG_PRINT("attempting to load ao buffer %i (0x%llx)\n", buffer_index,
+                    (unsigned long long)devpriv->ao_buffer_bus_addr[
+                                                                buffer_index]);
+
+        num_bytes = comedi_buf_read_n_available(dev->write_subdev->async);
+        if (num_bytes > DMA_BUFFER_SIZE)
+                num_bytes = DMA_BUFFER_SIZE;
+        if (cmd->stop_src == TRIG_COUNT && num_bytes > devpriv->ao_count)
+                num_bytes = devpriv->ao_count;
+        num_bytes -= num_bytes % bytes_in_sample;
+
+        if (num_bytes == 0)
+                return 0;
+
+        DEBUG_PRINT("loading %i bytes\n", num_bytes);
+
+        num_bytes = cfc_read_array_from_buffer(dev->write_subdev,
+                                               devpriv->
+                                               ao_buffer[buffer_index],
+                                               num_bytes);
+        devpriv->ao_dma_desc[buffer_index].transfer_size =
+                cpu_to_le32(num_bytes);
+        /* set end of chain bit so we catch underruns */
+        next_bits = le32_to_cpu(devpriv->ao_dma_desc[buffer_index].next);
+        next_bits |= PLX_END_OF_CHAIN_BIT;
+        devpriv->ao_dma_desc[buffer_index].next = cpu_to_le32(next_bits);
+        /* clear end of chain bit on previous buffer now that we have set it
+         * for the last buffer */
+        next_bits = le32_to_cpu(devpriv->ao_dma_desc[prev_buffer_index].next);
+        next_bits &= ~PLX_END_OF_CHAIN_BIT;
+        devpriv->ao_dma_desc[prev_buffer_index].next = cpu_to_le32(next_bits);
+
+        devpriv->ao_dma_index = (buffer_index + 1) % AO_DMA_RING_COUNT;
+        devpriv->ao_count -= num_bytes;
+
+        return num_bytes;
+}
+
+static void load_ao_dma(struct comedi_device *dev, const struct comedi_cmd *cmd)
+{
+        struct pcidas64_private *devpriv = dev->private;
+        unsigned int num_bytes;
+        unsigned int next_transfer_addr;
+        void __iomem *pci_addr_reg =
+                devpriv->plx9080_iobase + PLX_DMA0_PCI_ADDRESS_REG;
+        unsigned int buffer_index;
+
+        do {
+                buffer_index = devpriv->ao_dma_index;
+                /* don't overwrite data that hasn't been transferred yet */
+                next_transfer_addr = readl(pci_addr_reg);
+                if (next_transfer_addr >=
+                    devpriv->ao_buffer_bus_addr[buffer_index] &&
+                    next_transfer_addr <
+                    devpriv->ao_buffer_bus_addr[buffer_index] +
+                    DMA_BUFFER_SIZE)
+                        return;
+                num_bytes = load_ao_dma_buffer(dev, cmd);
+        } while (num_bytes >= DMA_BUFFER_SIZE);
+}
+
 static void handle_ao_interrupt(struct comedi_device *dev,
                                 unsigned short status, unsigned int plx_status)
 {
+        struct pcidas64_private *devpriv = dev->private;
         struct comedi_subdevice *s = dev->write_subdev;
         struct comedi_async *async;
         struct comedi_cmd *cmd;
@@ -3060,15 +3053,15 @@ static void handle_ao_interrupt(struct comedi_device *dev,
 
         /*  spin lock makes sure no one else changes plx dma control reg */
         spin_lock_irqsave(&dev->spinlock, flags);
-        dma0_status = readb(priv(dev)->plx9080_iobase + PLX_DMA0_CS_REG);
+        dma0_status = readb(devpriv->plx9080_iobase + PLX_DMA0_CS_REG);
         if (plx_status & ICS_DMA0_A) {  /*  dma chan 0 interrupt */
-                if ((dma0_status & PLX_DMA_EN_BIT)
-                    && !(dma0_status & PLX_DMA_DONE_BIT))
+                if ((dma0_status & PLX_DMA_EN_BIT) &&
+                    !(dma0_status & PLX_DMA_DONE_BIT))
                         writeb(PLX_DMA_EN_BIT | PLX_CLEAR_DMA_INTR_BIT,
-                               priv(dev)->plx9080_iobase + PLX_DMA0_CS_REG);
+                               devpriv->plx9080_iobase + PLX_DMA0_CS_REG);
                 else
                         writeb(PLX_CLEAR_DMA_INTR_BIT,
-                               priv(dev)->plx9080_iobase + PLX_DMA0_CS_REG);
+                               devpriv->plx9080_iobase + PLX_DMA0_CS_REG);
                 spin_unlock_irqrestore(&dev->spinlock, flags);
                 DEBUG_PRINT("dma0 status 0x%x\n", dma0_status);
                 if (dma0_status & PLX_DMA_EN_BIT) {
@@ -3078,18 +3071,19 @@ static void handle_ao_interrupt(struct comedi_device *dev,
                                 restart_ao_dma(dev);
                 }
                 DEBUG_PRINT(" cleared dma ch0 interrupt\n");
-        } else
+        } else {
                 spin_unlock_irqrestore(&dev->spinlock, flags);
+        }
 
         if ((status & DAC_DONE_BIT)) {
                 async->events |= COMEDI_CB_EOA;
                 if (ao_stopped_by_error(dev, cmd))
                         async->events |= COMEDI_CB_ERROR;
                 DEBUG_PRINT("plx dma0 desc reg 0x%x\n",
-                            readl(priv(dev)->plx9080_iobase +
+                            readl(devpriv->plx9080_iobase +
                                   PLX_DMA0_DESCRIPTOR_REG));
                 DEBUG_PRINT("plx dma0 address reg 0x%x\n",
-                            readl(priv(dev)->plx9080_iobase +
+                            readl(devpriv->plx9080_iobase +
                                   PLX_DMA0_PCI_ADDRESS_REG));
         }
         cfc_handle_events(dev, s);
@@ -3098,22 +3092,21 @@ static void handle_ao_interrupt(struct comedi_device *dev,
 static irqreturn_t handle_interrupt(int irq, void *d)
 {
         struct comedi_device *dev = d;
+        struct pcidas64_private *devpriv = dev->private;
         unsigned short status;
         uint32_t plx_status;
         uint32_t plx_bits;
 
-        plx_status = readl(priv(dev)->plx9080_iobase + PLX_INTRCS_REG);
-        status = readw(priv(dev)->main_iobase + HW_STATUS_REG);
+        plx_status = readl(devpriv->plx9080_iobase + PLX_INTRCS_REG);
+        status = readw(devpriv->main_iobase + HW_STATUS_REG);
 
-        DEBUG_PRINT("cb_pcidas64: hw status 0x%x ", status);
-        DEBUG_PRINT("plx status 0x%x\n", plx_status);
+        DEBUG_PRINT("hw status 0x%x, plx status 0x%x\n", status, plx_status);
 
         /* an interrupt before all the postconfig stuff gets done could
          * cause a NULL dereference if we continue through the
          * interrupt handler */
         if (dev->attached == 0) {
-                DEBUG_PRINT("cb_pcidas64: premature interrupt, ignoring",
-                            status);
+                DEBUG_PRINT("premature interrupt, ignoring\n");
                 return IRQ_HANDLED;
         }
         handle_ai_interrupt(dev, status, plx_status);
@@ -3121,8 +3114,8 @@ static irqreturn_t handle_interrupt(int irq, void *d)
 
         /*  clear possible plx9080 interrupt sources */
         if (plx_status & ICS_LDIA) {    /*  clear local doorbell interrupt */
-                plx_bits = readl(priv(dev)->plx9080_iobase + PLX_DBR_OUT_REG);
-                writel(plx_bits, priv(dev)->plx9080_iobase + PLX_DBR_OUT_REG);
+                plx_bits = readl(devpriv->plx9080_iobase + PLX_DBR_OUT_REG);
+                writel(plx_bits, devpriv->plx9080_iobase + PLX_DBR_OUT_REG);
                 DEBUG_PRINT(" cleared local doorbell bits 0x%x\n", plx_bits);
         }
 
@@ -3131,28 +3124,17 @@ static irqreturn_t handle_interrupt(int irq, void *d)
         return IRQ_HANDLED;
 }
 
-static void abort_dma(struct comedi_device *dev, unsigned int channel)
-{
-        unsigned long flags;
-
-        /*  spinlock for plx dma control/status reg */
-        spin_lock_irqsave(&dev->spinlock, flags);
-
-        plx9080_abort_dma(priv(dev)->plx9080_iobase, channel);
-
-        spin_unlock_irqrestore(&dev->spinlock, flags);
-}
-
 static int ai_cancel(struct comedi_device *dev, struct comedi_subdevice *s)
 {
+        struct pcidas64_private *devpriv = dev->private;
         unsigned long flags;
 
         spin_lock_irqsave(&dev->spinlock, flags);
-        if (priv(dev)->ai_cmd_running == 0) {
+        if (devpriv->ai_cmd_running == 0) {
                 spin_unlock_irqrestore(&dev->spinlock, flags);
                 return 0;
         }
-        priv(dev)->ai_cmd_running = 0;
+        devpriv->ai_cmd_running = 0;
         spin_unlock_irqrestore(&dev->spinlock, flags);
 
         disable_ai_pacing(dev);
@@ -3166,29 +3148,31 @@ static int ai_cancel(struct comedi_device *dev, struct comedi_subdevice *s)
 static int ao_winsn(struct comedi_device *dev, struct comedi_subdevice *s,
                     struct comedi_insn *insn, unsigned int *data)
 {
+        const struct pcidas64_board *thisboard = comedi_board(dev);
+        struct pcidas64_private *devpriv = dev->private;
         int chan = CR_CHAN(insn->chanspec);
         int range = CR_RANGE(insn->chanspec);
 
         /*  do some initializing */
-        writew(0, priv(dev)->main_iobase + DAC_CONTROL0_REG);
+        writew(0, devpriv->main_iobase + DAC_CONTROL0_REG);
 
         /*  set range */
-        set_dac_range_bits(dev, &priv(dev)->dac_control1_bits, chan, range);
-        writew(priv(dev)->dac_control1_bits,
-               priv(dev)->main_iobase + DAC_CONTROL1_REG);
+        set_dac_range_bits(dev, &devpriv->dac_control1_bits, chan, range);
+        writew(devpriv->dac_control1_bits,
+               devpriv->main_iobase + DAC_CONTROL1_REG);
 
         /*  write to channel */
-        if (board(dev)->layout == LAYOUT_4020) {
+        if (thisboard->layout == LAYOUT_4020) {
                 writew(data[0] & 0xff,
-                       priv(dev)->main_iobase + dac_lsb_4020_reg(chan));
+                       devpriv->main_iobase + dac_lsb_4020_reg(chan));
                 writew((data[0] >> 8) & 0xf,
-                       priv(dev)->main_iobase + dac_msb_4020_reg(chan));
+                       devpriv->main_iobase + dac_msb_4020_reg(chan));
         } else {
-                writew(data[0], priv(dev)->main_iobase + dac_convert_reg(chan));
+                writew(data[0], devpriv->main_iobase + dac_convert_reg(chan));
         }
 
         /*  remember output value */
-        priv(dev)->ao_value[chan] = data[0];
+        devpriv->ao_value[chan] = data[0];
 
         return 1;
 }
@@ -3197,7 +3181,9 @@ static int ao_readback_insn(struct comedi_device *dev,
                             struct comedi_subdevice *s,
                             struct comedi_insn *insn, unsigned int *data)
 {
-        data[0] = priv(dev)->ao_value[CR_CHAN(insn->chanspec)];
+        struct pcidas64_private *devpriv = dev->private;
+
+        data[0] = devpriv->ao_value[CR_CHAN(insn->chanspec)];
 
         return 1;
 }
@@ -3205,8 +3191,9 @@ static int ao_readback_insn(struct comedi_device *dev,
 static void set_dac_control0_reg(struct comedi_device *dev,
                                  const struct comedi_cmd *cmd)
 {
+        struct pcidas64_private *devpriv = dev->private;
         unsigned int bits = DAC_ENABLE_BIT | WAVEFORM_GATE_LEVEL_BIT |
-            WAVEFORM_GATE_ENABLE_BIT | WAVEFORM_GATE_SELECT_BIT;
+                            WAVEFORM_GATE_ENABLE_BIT | WAVEFORM_GATE_SELECT_BIT;
 
         if (cmd->start_src == TRIG_EXT) {
                 bits |= WAVEFORM_TRIG_EXT_BITS;
@@ -3220,12 +3207,13 @@ static void set_dac_control0_reg(struct comedi_device *dev,
                 if (cmd->scan_begin_arg & CR_INVERT)
                         bits |= DAC_EXT_UPDATE_FALLING_BIT;
         }
-        writew(bits, priv(dev)->main_iobase + DAC_CONTROL0_REG);
+        writew(bits, devpriv->main_iobase + DAC_CONTROL0_REG);
 }
 
 static void set_dac_control1_reg(struct comedi_device *dev,
                                  const struct comedi_cmd *cmd)
 {
+        struct pcidas64_private *devpriv = dev->private;
         int i;
 
         for (i = 0; i < cmd->chanlist_len; i++) {
@@ -3233,17 +3221,18 @@ static void set_dac_control1_reg(struct comedi_device *dev,
 
                 channel = CR_CHAN(cmd->chanlist[i]);
                 range = CR_RANGE(cmd->chanlist[i]);
-                set_dac_range_bits(dev, &priv(dev)->dac_control1_bits, channel,
+                set_dac_range_bits(dev, &devpriv->dac_control1_bits, channel,
                                    range);
         }
-        priv(dev)->dac_control1_bits |= DAC_SW_GATE_BIT;
-        writew(priv(dev)->dac_control1_bits,
-               priv(dev)->main_iobase + DAC_CONTROL1_REG);
+        devpriv->dac_control1_bits |= DAC_SW_GATE_BIT;
+        writew(devpriv->dac_control1_bits,
+               devpriv->main_iobase + DAC_CONTROL1_REG);
 }
 
 static void set_dac_select_reg(struct comedi_device *dev,
                                const struct comedi_cmd *cmd)
 {
+        struct pcidas64_private *devpriv = dev->private;
         uint16_t bits;
         unsigned int first_channel, last_channel;
 
@@ -3254,12 +3243,18 @@ static void set_dac_select_reg(struct comedi_device *dev,
 
         bits = (first_channel & 0x7) | (last_channel & 0x7) << 3;
 
-        writew(bits, priv(dev)->main_iobase + DAC_SELECT_REG);
+        writew(bits, devpriv->main_iobase + DAC_SELECT_REG);
+}
+
+static unsigned int get_ao_divisor(unsigned int ns, unsigned int flags)
+{
+        return get_divisor(ns, flags) - 2;
 }
 
 static void set_dac_interval_regs(struct comedi_device *dev,
                                   const struct comedi_cmd *cmd)
 {
+        struct pcidas64_private *devpriv = dev->private;
         unsigned int divisor;
 
         if (cmd->scan_begin_src != TRIG_TIMER)
@@ -3271,102 +3266,35 @@ static void set_dac_interval_regs(struct comedi_device *dev,
                 divisor = max_counter_value;
         }
         writew(divisor & 0xffff,
-               priv(dev)->main_iobase + DAC_SAMPLE_INTERVAL_LOWER_REG);
+               devpriv->main_iobase + DAC_SAMPLE_INTERVAL_LOWER_REG);
         writew((divisor >> 16) & 0xff,
-               priv(dev)->main_iobase + DAC_SAMPLE_INTERVAL_UPPER_REG);
-}
-
-static unsigned int load_ao_dma_buffer(struct comedi_device *dev,
-                                       const struct comedi_cmd *cmd)
-{
-        unsigned int num_bytes, buffer_index, prev_buffer_index;
-        unsigned int next_bits;
-
-        buffer_index = priv(dev)->ao_dma_index;
-        prev_buffer_index = prev_ao_dma_index(dev);
-
-        DEBUG_PRINT("attempting to load ao buffer %i (0x%x)\n", buffer_index,
-                    priv(dev)->ao_buffer_bus_addr[buffer_index]);
-
-        num_bytes = comedi_buf_read_n_available(dev->write_subdev->async);
-        if (num_bytes > DMA_BUFFER_SIZE)
-                num_bytes = DMA_BUFFER_SIZE;
-        if (cmd->stop_src == TRIG_COUNT && num_bytes > priv(dev)->ao_count)
-                num_bytes = priv(dev)->ao_count;
-        num_bytes -= num_bytes % bytes_in_sample;
-
-        if (num_bytes == 0)
-                return 0;
-
-        DEBUG_PRINT("loading %i bytes\n", num_bytes);
-
-        num_bytes = cfc_read_array_from_buffer(dev->write_subdev,
-                                               priv(dev)->
-                                               ao_buffer[buffer_index],
-                                               num_bytes);
-        priv(dev)->ao_dma_desc[buffer_index].transfer_size =
-            cpu_to_le32(num_bytes);
-        /* set end of chain bit so we catch underruns */
-        next_bits = le32_to_cpu(priv(dev)->ao_dma_desc[buffer_index].next);
-        next_bits |= PLX_END_OF_CHAIN_BIT;
-        priv(dev)->ao_dma_desc[buffer_index].next = cpu_to_le32(next_bits);
-        /* clear end of chain bit on previous buffer now that we have set it
-         * for the last buffer */
-        next_bits = le32_to_cpu(priv(dev)->ao_dma_desc[prev_buffer_index].next);
-        next_bits &= ~PLX_END_OF_CHAIN_BIT;
-        priv(dev)->ao_dma_desc[prev_buffer_index].next = cpu_to_le32(next_bits);
-
-        priv(dev)->ao_dma_index = (buffer_index + 1) % AO_DMA_RING_COUNT;
-        priv(dev)->ao_count -= num_bytes;
-
-        return num_bytes;
-}
-
-static void load_ao_dma(struct comedi_device *dev, const struct comedi_cmd *cmd)
-{
-        unsigned int num_bytes;
-        unsigned int next_transfer_addr;
-        void __iomem *pci_addr_reg =
-            priv(dev)->plx9080_iobase + PLX_DMA0_PCI_ADDRESS_REG;
-        unsigned int buffer_index;
-
-        do {
-                buffer_index = priv(dev)->ao_dma_index;
-                /* don't overwrite data that hasn't been transferred yet */
-                next_transfer_addr = readl(pci_addr_reg);
-                if (next_transfer_addr >=
-                    priv(dev)->ao_buffer_bus_addr[buffer_index]
-                    && next_transfer_addr <
-                    priv(dev)->ao_buffer_bus_addr[buffer_index] +
-                    DMA_BUFFER_SIZE)
-                        return;
-                num_bytes = load_ao_dma_buffer(dev, cmd);
-        } while (num_bytes >= DMA_BUFFER_SIZE);
+               devpriv->main_iobase + DAC_SAMPLE_INTERVAL_UPPER_REG);
 }
 
 static int prep_ao_dma(struct comedi_device *dev, const struct comedi_cmd *cmd)
 {
+        struct pcidas64_private *devpriv = dev->private;
         unsigned int num_bytes;
         int i;
 
         /* clear queue pointer too, since external queue has
          * weird interactions with ao fifo */
-        writew(0, priv(dev)->main_iobase + ADC_QUEUE_CLEAR_REG);
-        writew(0, priv(dev)->main_iobase + DAC_BUFFER_CLEAR_REG);
+        writew(0, devpriv->main_iobase + ADC_QUEUE_CLEAR_REG);
+        writew(0, devpriv->main_iobase + DAC_BUFFER_CLEAR_REG);
 
         num_bytes = (DAC_FIFO_SIZE / 2) * bytes_in_sample;
         if (cmd->stop_src == TRIG_COUNT &&
-            num_bytes / bytes_in_sample > priv(dev)->ao_count)
-                num_bytes = priv(dev)->ao_count * bytes_in_sample;
+            num_bytes / bytes_in_sample > devpriv->ao_count)
+                num_bytes = devpriv->ao_count * bytes_in_sample;
         num_bytes = cfc_read_array_from_buffer(dev->write_subdev,
-                                               priv(dev)->ao_bounce_buffer,
+                                               devpriv->ao_bounce_buffer,
                                                num_bytes);
         for (i = 0; i < num_bytes / bytes_in_sample; i++) {
-                writew(priv(dev)->ao_bounce_buffer[i],
-                       priv(dev)->main_iobase + DAC_FIFO_REG);
+                writew(devpriv->ao_bounce_buffer[i],
+                       devpriv->main_iobase + DAC_FIFO_REG);
         }
-        priv(dev)->ao_count -= num_bytes / bytes_in_sample;
-        if (cmd->stop_src == TRIG_COUNT && priv(dev)->ao_count == 0)
+        devpriv->ao_count -= num_bytes / bytes_in_sample;
+        if (cmd->stop_src == TRIG_COUNT && devpriv->ao_count == 0)
                 return 0;
         num_bytes = load_ao_dma_buffer(dev, cmd);
         if (num_bytes == 0)
@@ -3381,43 +3309,21 @@ static int prep_ao_dma(struct comedi_device *dev, const struct comedi_cmd *cmd)
 
 static inline int external_ai_queue_in_use(struct comedi_device *dev)
 {
+        const struct pcidas64_board *thisboard = comedi_board(dev);
+
         if (dev->read_subdev->busy)
                 return 0;
-        if (board(dev)->layout == LAYOUT_4020)
+        if (thisboard->layout == LAYOUT_4020)
                 return 0;
         else if (use_internal_queue_6xxx(&dev->read_subdev->async->cmd))
                 return 0;
         return 1;
 }
 
-static int ao_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
-{
-        struct comedi_cmd *cmd = &s->async->cmd;
-
-        if (external_ai_queue_in_use(dev)) {
-                warn_external_queue(dev);
-                return -EBUSY;
-        }
-        /* disable analog output system during setup */
-        writew(0x0, priv(dev)->main_iobase + DAC_CONTROL0_REG);
-
-        priv(dev)->ao_dma_index = 0;
-        priv(dev)->ao_count = cmd->stop_arg * cmd->chanlist_len;
-
-        set_dac_select_reg(dev, cmd);
-        set_dac_interval_regs(dev, cmd);
-        load_first_dma_descriptor(dev, 0, priv(dev)->ao_dma_desc_bus_addr |
-                                  PLX_DESC_IN_PCI_BIT | PLX_INTR_TERM_COUNT);
-
-        set_dac_control1_reg(dev, cmd);
-        s->async->inttrig = ao_inttrig;
-
-        return 0;
-}
-
 static int ao_inttrig(struct comedi_device *dev, struct comedi_subdevice *s,
                       unsigned int trig_num)
 {
+        struct pcidas64_private *devpriv = dev->private;
         struct comedi_cmd *cmd = &s->async->cmd;
         int retval;
 
@@ -3431,16 +3337,43 @@ static int ao_inttrig(struct comedi_device *dev, struct comedi_subdevice *s,
         set_dac_control0_reg(dev, cmd);
 
         if (cmd->start_src == TRIG_INT)
-                writew(0, priv(dev)->main_iobase + DAC_START_REG);
+                writew(0, devpriv->main_iobase + DAC_START_REG);
 
         s->async->inttrig = NULL;
 
         return 0;
 }
 
+static int ao_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
+{
+        struct pcidas64_private *devpriv = dev->private;
+        struct comedi_cmd *cmd = &s->async->cmd;
+
+        if (external_ai_queue_in_use(dev)) {
+                warn_external_queue(dev);
+                return -EBUSY;
+        }
+        /* disable analog output system during setup */
+        writew(0x0, devpriv->main_iobase + DAC_CONTROL0_REG);
+
+        devpriv->ao_dma_index = 0;
+        devpriv->ao_count = cmd->stop_arg * cmd->chanlist_len;
+
+        set_dac_select_reg(dev, cmd);
+        set_dac_interval_regs(dev, cmd);
+        load_first_dma_descriptor(dev, 0, devpriv->ao_dma_desc_bus_addr |
+                                  PLX_DESC_IN_PCI_BIT | PLX_INTR_TERM_COUNT);
+
+        set_dac_control1_reg(dev, cmd);
+        s->async->inttrig = ao_inttrig;
+
+        return 0;
+}
+
 static int ao_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s,
                       struct comedi_cmd *cmd)
 {
+        const struct pcidas64_board *thisboard = comedi_board(dev);
         int err = 0;
         unsigned int tmp_arg;
         int i;
@@ -3449,7 +3382,7 @@ static int ao_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s,
 
         err |= cfc_check_trigger_src(&cmd->start_src, TRIG_INT | TRIG_EXT);
         err |= cfc_check_trigger_src(&cmd->scan_begin_src,
-                                        TRIG_TIMER | TRIG_EXT);
+                                     TRIG_TIMER | TRIG_EXT);
         err |= cfc_check_trigger_src(&cmd->convert_src, TRIG_NOW);
         err |= cfc_check_trigger_src(&cmd->scan_end_src, TRIG_COUNT);
         err |= cfc_check_trigger_src(&cmd->stop_src, TRIG_NONE);
@@ -3473,29 +3406,21 @@ static int ao_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s,
         if (err)
                 return 2;
 
-        /* step 3: make sure arguments are trivially compatible */
+        /* Step 3: check if arguments are trivially valid */
 
         if (cmd->scan_begin_src == TRIG_TIMER) {
-                if (cmd->scan_begin_arg < board(dev)->ao_scan_speed) {
-                        cmd->scan_begin_arg = board(dev)->ao_scan_speed;
-                        err++;
-                }
-                if (get_ao_divisor(cmd->scan_begin_arg,
-                                   cmd->flags) > max_counter_value) {
-                        cmd->scan_begin_arg =
-                            (max_counter_value + 2) * TIMER_BASE;
-                        err++;
+                err |= cfc_check_trigger_arg_min(&cmd->scan_begin_arg,
+                                                 thisboard->ao_scan_speed);
+                if (get_ao_divisor(cmd->scan_begin_arg, cmd->flags) >
+                    max_counter_value) {
+                        cmd->scan_begin_arg = (max_counter_value + 2) *
+                                              TIMER_BASE;
+                        err |= -EINVAL;
                 }
         }
 
-        if (!cmd->chanlist_len) {
-                cmd->chanlist_len = 1;
-                err++;
-        }
-        if (cmd->scan_end_arg != cmd->chanlist_len) {
-                cmd->scan_end_arg = cmd->chanlist_len;
-                err++;
-        }
+        err |= cfc_check_trigger_arg_min(&cmd->chanlist_len, 1);
+        err |= cfc_check_trigger_arg_is(&cmd->scan_end_arg, cmd->chanlist_len);
 
         if (err)
                 return 3;
@@ -3504,8 +3429,8 @@ static int ao_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s,
 
         if (cmd->scan_begin_src == TRIG_TIMER) {
                 tmp_arg = cmd->scan_begin_arg;
-                cmd->scan_begin_arg =
-                    get_divisor(cmd->scan_begin_arg, cmd->flags) * TIMER_BASE;
+                cmd->scan_begin_arg = get_divisor(cmd->scan_begin_arg,
+                                                  cmd->flags) * TIMER_BASE;
                 if (tmp_arg != cmd->scan_begin_arg)
                         err++;
         }
@@ -3533,7 +3458,9 @@ static int ao_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s,
 
 static int ao_cancel(struct comedi_device *dev, struct comedi_subdevice *s)
 {
-        writew(0x0, priv(dev)->main_iobase + DAC_CONTROL0_REG);
+        struct pcidas64_private *devpriv = dev->private;
+
+        writew(0x0, devpriv->main_iobase + DAC_CONTROL0_REG);
         abort_dma(dev, 0);
         return 0;
 }
@@ -3564,9 +3491,10 @@ static int dio_callback_4020(int dir, int port, int data, unsigned long arg)
 static int di_rbits(struct comedi_device *dev, struct comedi_subdevice *s,
                     struct comedi_insn *insn, unsigned int *data)
 {
+        struct pcidas64_private *devpriv = dev->private;
         unsigned int bits;
 
-        bits = readb(priv(dev)->dio_counter_iobase + DI_REG);
+        bits = readb(devpriv->dio_counter_iobase + DI_REG);
         bits &= 0xf;
         data[1] = bits;
         data[0] = 0;
@@ -3577,13 +3505,15 @@ static int di_rbits(struct comedi_device *dev, struct comedi_subdevice *s,
 static int do_wbits(struct comedi_device *dev, struct comedi_subdevice *s,
                     struct comedi_insn *insn, unsigned int *data)
 {
+        struct pcidas64_private *devpriv = dev->private;
+
         data[0] &= 0xf;
         /*  zero bits we are going to change */
         s->state &= ~data[0];
         /*  set new bits */
         s->state |= data[0] & data[1];
 
-        writeb(s->state, priv(dev)->dio_counter_iobase + DO_REG);
+        writeb(s->state, devpriv->dio_counter_iobase + DO_REG);
 
         data[1] = s->state;
 
@@ -3594,6 +3524,7 @@ static int dio_60xx_config_insn(struct comedi_device *dev,
                                 struct comedi_subdevice *s,
                                 struct comedi_insn *insn, unsigned int *data)
 {
+        struct pcidas64_private *devpriv = dev->private;
         unsigned int mask;
 
         mask = 1 << CR_CHAN(insn->chanspec);
@@ -3613,7 +3544,7 @@ static int dio_60xx_config_insn(struct comedi_device *dev,
         }
 
         writeb(s->io_bits,
-               priv(dev)->dio_counter_iobase + DIO_DIRECTION_60XX_REG);
+               devpriv->dio_counter_iobase + DIO_DIRECTION_60XX_REG);
 
         return 1;
 }
@@ -3621,24 +3552,143 @@ static int dio_60xx_config_insn(struct comedi_device *dev,
 static int dio_60xx_wbits(struct comedi_device *dev, struct comedi_subdevice *s,
                           struct comedi_insn *insn, unsigned int *data)
 {
+        struct pcidas64_private *devpriv = dev->private;
+
         if (data[0]) {
                 s->state &= ~data[0];
                 s->state |= (data[0] & data[1]);
                 writeb(s->state,
-                       priv(dev)->dio_counter_iobase + DIO_DATA_60XX_REG);
+                       devpriv->dio_counter_iobase + DIO_DATA_60XX_REG);
         }
 
-        data[1] = readb(priv(dev)->dio_counter_iobase + DIO_DATA_60XX_REG);
+        data[1] = readb(devpriv->dio_counter_iobase + DIO_DATA_60XX_REG);
 
         return insn->n;
 }
 
+/* pci-6025 8800 caldac:
+ * address 0 == dac channel 0 offset
+ * address 1 == dac channel 0 gain
+ * address 2 == dac channel 1 offset
+ * address 3 == dac channel 1 gain
+ * address 4 == fine adc offset
+ * address 5 == coarse adc offset
+ * address 6 == coarse adc gain
+ * address 7 == fine adc gain
+ */
+/* pci-6402/16 uses all 8 channels for dac:
+ * address 0 == dac channel 0 fine gain
+ * address 1 == dac channel 0 coarse gain
+ * address 2 == dac channel 0 coarse offset
+ * address 3 == dac channel 1 coarse offset
+ * address 4 == dac channel 1 fine gain
+ * address 5 == dac channel 1 coarse gain
+ * address 6 == dac channel 0 fine offset
+ * address 7 == dac channel 1 fine offset
+*/
+
+static int caldac_8800_write(struct comedi_device *dev, unsigned int address,
+                             uint8_t value)
+{
+        struct pcidas64_private *devpriv = dev->private;
+        static const int num_caldac_channels = 8;
+        static const int bitstream_length = 11;
+        unsigned int bitstream = ((address & 0x7) << 8) | value;
+        unsigned int bit, register_bits;
+        static const int caldac_8800_udelay = 1;
+
+        if (address >= num_caldac_channels) {
+                comedi_error(dev, "illegal caldac channel");
+                return -1;
+        }
+        for (bit = 1 << (bitstream_length - 1); bit; bit >>= 1) {
+                register_bits = 0;
+                if (bitstream & bit)
+                        register_bits |= SERIAL_DATA_IN_BIT;
+                udelay(caldac_8800_udelay);
+                writew(register_bits, devpriv->main_iobase + CALIBRATION_REG);
+                register_bits |= SERIAL_CLOCK_BIT;
+                udelay(caldac_8800_udelay);
+                writew(register_bits, devpriv->main_iobase + CALIBRATION_REG);
+        }
+        udelay(caldac_8800_udelay);
+        writew(SELECT_8800_BIT, devpriv->main_iobase + CALIBRATION_REG);
+        udelay(caldac_8800_udelay);
+        writew(0, devpriv->main_iobase + CALIBRATION_REG);
+        udelay(caldac_8800_udelay);
+        return 0;
+}
+
+/* 4020 caldacs */
+static int caldac_i2c_write(struct comedi_device *dev,
+                            unsigned int caldac_channel, unsigned int value)
+{
+        uint8_t serial_bytes[3];
+        uint8_t i2c_addr;
+        enum pointer_bits {
+                /*  manual has gain and offset bits switched */
+                OFFSET_0_2 = 0x1,
+                GAIN_0_2 = 0x2,
+                OFFSET_1_3 = 0x4,
+                GAIN_1_3 = 0x8,
+        };
+        enum data_bits {
+                NOT_CLEAR_REGISTERS = 0x20,
+        };
+
+        switch (caldac_channel) {
+        case 0:         /*  chan 0 offset */
+                i2c_addr = CALDAC0_I2C_ADDR;
+                serial_bytes[0] = OFFSET_0_2;
+                break;
+        case 1:         /*  chan 1 offset */
+                i2c_addr = CALDAC0_I2C_ADDR;
+                serial_bytes[0] = OFFSET_1_3;
+                break;
+        case 2:         /*  chan 2 offset */
+                i2c_addr = CALDAC1_I2C_ADDR;
+                serial_bytes[0] = OFFSET_0_2;
+                break;
+        case 3:         /*  chan 3 offset */
+                i2c_addr = CALDAC1_I2C_ADDR;
+                serial_bytes[0] = OFFSET_1_3;
+                break;
+        case 4:         /*  chan 0 gain */
+                i2c_addr = CALDAC0_I2C_ADDR;
+                serial_bytes[0] = GAIN_0_2;
+                break;
+        case 5:         /*  chan 1 gain */
+                i2c_addr = CALDAC0_I2C_ADDR;
+                serial_bytes[0] = GAIN_1_3;
+                break;
+        case 6:         /*  chan 2 gain */
+                i2c_addr = CALDAC1_I2C_ADDR;
+                serial_bytes[0] = GAIN_0_2;
+                break;
+        case 7:         /*  chan 3 gain */
+                i2c_addr = CALDAC1_I2C_ADDR;
+                serial_bytes[0] = GAIN_1_3;
+                break;
+        default:
+                comedi_error(dev, "invalid caldac channel\n");
+                return -1;
+                break;
+        }
+        serial_bytes[1] = NOT_CLEAR_REGISTERS | ((value >> 8) & 0xf);
+        serial_bytes[2] = value & 0xff;
+        i2c_write(dev, i2c_addr, serial_bytes, 3);
+        return 0;
+}
+
 static void caldac_write(struct comedi_device *dev, unsigned int channel,
                          unsigned int value)
 {
-        priv(dev)->caldac_state[channel] = value;
+        const struct pcidas64_board *thisboard = comedi_board(dev);
+        struct pcidas64_private *devpriv = dev->private;
+
+        devpriv->caldac_state[channel] = value;
 
-        switch (board(dev)->layout) {
+        switch (thisboard->layout) {
         case LAYOUT_60XX:
         case LAYOUT_64XX:
                 caldac_8800_write(dev, channel, value);
@@ -3655,11 +3705,12 @@ static int calib_write_insn(struct comedi_device *dev,
                             struct comedi_subdevice *s,
                             struct comedi_insn *insn, unsigned int *data)
 {
+        struct pcidas64_private *devpriv = dev->private;
         int channel = CR_CHAN(insn->chanspec);
 
         /* return immediately if setting hasn't changed, since
          * programming these things is slow */
-        if (priv(dev)->caldac_state[channel] == data[0])
+        if (devpriv->caldac_state[channel] == data[0])
                 return 1;
 
         caldac_write(dev, channel, data[0]);
@@ -3671,9 +3722,10 @@ static int calib_read_insn(struct comedi_device *dev,
                            struct comedi_subdevice *s, struct comedi_insn *insn,
                            unsigned int *data)
 {
+        struct pcidas64_private *devpriv = dev->private;
         unsigned int channel = CR_CHAN(insn->chanspec);
 
-        data[0] = priv(dev)->caldac_state[channel];
+        data[0] = devpriv->caldac_state[channel];
 
         return 1;
 }
@@ -3681,16 +3733,17 @@ static int calib_read_insn(struct comedi_device *dev,
 static void ad8402_write(struct comedi_device *dev, unsigned int channel,
                          unsigned int value)
 {
+        struct pcidas64_private *devpriv = dev->private;
         static const int bitstream_length = 10;
         unsigned int bit, register_bits;
         unsigned int bitstream = ((channel & 0x3) << 8) | (value & 0xff);
         static const int ad8402_udelay = 1;
 
-        priv(dev)->ad8402_state[channel] = value;
+        devpriv->ad8402_state[channel] = value;
 
         register_bits = SELECT_8402_64XX_BIT;
         udelay(ad8402_udelay);
-        writew(register_bits, priv(dev)->main_iobase + CALIBRATION_REG);
+        writew(register_bits, devpriv->main_iobase + CALIBRATION_REG);
 
         for (bit = 1 << (bitstream_length - 1); bit; bit >>= 1) {
                 if (bitstream & bit)
@@ -3698,14 +3751,14 @@ static void ad8402_write(struct comedi_device *dev, unsigned int channel,
                 else
                         register_bits &= ~SERIAL_DATA_IN_BIT;
                 udelay(ad8402_udelay);
-                writew(register_bits, priv(dev)->main_iobase + CALIBRATION_REG);
+                writew(register_bits, devpriv->main_iobase + CALIBRATION_REG);
                 udelay(ad8402_udelay);
                 writew(register_bits | SERIAL_CLOCK_BIT,
-                       priv(dev)->main_iobase + CALIBRATION_REG);
+                       devpriv->main_iobase + CALIBRATION_REG);
         }
 
         udelay(ad8402_udelay);
-        writew(0, priv(dev)->main_iobase + CALIBRATION_REG);
+        writew(0, devpriv->main_iobase + CALIBRATION_REG);
 }
 
 /* for pci-das6402/16, channel 0 is analog input gain and channel 1 is offset */
@@ -3713,14 +3766,15 @@ static int ad8402_write_insn(struct comedi_device *dev,
                              struct comedi_subdevice *s,
                              struct comedi_insn *insn, unsigned int *data)
 {
+        struct pcidas64_private *devpriv = dev->private;
         int channel = CR_CHAN(insn->chanspec);
 
         /* return immediately if setting hasn't changed, since
          * programming these things is slow */
-        if (priv(dev)->ad8402_state[channel] == data[0])
+        if (devpriv->ad8402_state[channel] == data[0])
                 return 1;
 
-        priv(dev)->ad8402_state[channel] = data[0];
+        devpriv->ad8402_state[channel] = data[0];
 
         ad8402_write(dev, channel, data[0]);
 
@@ -3731,62 +3785,64 @@ static int ad8402_read_insn(struct comedi_device *dev,
                             struct comedi_subdevice *s,
                             struct comedi_insn *insn, unsigned int *data)
 {
+        struct pcidas64_private *devpriv = dev->private;
         unsigned int channel = CR_CHAN(insn->chanspec);
 
-        data[0] = priv(dev)->ad8402_state[channel];
+        data[0] = devpriv->ad8402_state[channel];
 
         return 1;
 }
 
 static uint16_t read_eeprom(struct comedi_device *dev, uint8_t address)
 {
+        struct pcidas64_private *devpriv = dev->private;
         static const int bitstream_length = 11;
         static const int read_command = 0x6;
         unsigned int bitstream = (read_command << 8) | address;
         unsigned int bit;
         void __iomem * const plx_control_addr =
-            priv(dev)->plx9080_iobase + PLX_CONTROL_REG;
+                devpriv->plx9080_iobase + PLX_CONTROL_REG;
         uint16_t value;
         static const int value_length = 16;
         static const int eeprom_udelay = 1;
 
         udelay(eeprom_udelay);
-        priv(dev)->plx_control_bits &= ~CTL_EE_CLK & ~CTL_EE_CS;
+        devpriv->plx_control_bits &= ~CTL_EE_CLK & ~CTL_EE_CS;
         /*  make sure we don't send anything to the i2c bus on 4020 */
-        priv(dev)->plx_control_bits |= CTL_USERO;
-        writel(priv(dev)->plx_control_bits, plx_control_addr);
+        devpriv->plx_control_bits |= CTL_USERO;
+        writel(devpriv->plx_control_bits, plx_control_addr);
         /*  activate serial eeprom */
         udelay(eeprom_udelay);
-        priv(dev)->plx_control_bits |= CTL_EE_CS;
-        writel(priv(dev)->plx_control_bits, plx_control_addr);
+        devpriv->plx_control_bits |= CTL_EE_CS;
+        writel(devpriv->plx_control_bits, plx_control_addr);
 
         /*  write read command and desired memory address */
         for (bit = 1 << (bitstream_length - 1); bit; bit >>= 1) {
                 /*  set bit to be written */
                 udelay(eeprom_udelay);
                 if (bitstream & bit)
-                        priv(dev)->plx_control_bits |= CTL_EE_W;
+                        devpriv->plx_control_bits |= CTL_EE_W;
                 else
-                        priv(dev)->plx_control_bits &= ~CTL_EE_W;
-                writel(priv(dev)->plx_control_bits, plx_control_addr);
+                        devpriv->plx_control_bits &= ~CTL_EE_W;
+                writel(devpriv->plx_control_bits, plx_control_addr);
                 /*  clock in bit */
                 udelay(eeprom_udelay);
-                priv(dev)->plx_control_bits |= CTL_EE_CLK;
-                writel(priv(dev)->plx_control_bits, plx_control_addr);
+                devpriv->plx_control_bits |= CTL_EE_CLK;
+                writel(devpriv->plx_control_bits, plx_control_addr);
                 udelay(eeprom_udelay);
-                priv(dev)->plx_control_bits &= ~CTL_EE_CLK;
-                writel(priv(dev)->plx_control_bits, plx_control_addr);
+                devpriv->plx_control_bits &= ~CTL_EE_CLK;
+                writel(devpriv->plx_control_bits, plx_control_addr);
         }
         /*  read back value from eeprom memory location */
         value = 0;
         for (bit = 1 << (value_length - 1); bit; bit >>= 1) {
                 /*  clock out bit */
                 udelay(eeprom_udelay);
-                priv(dev)->plx_control_bits |= CTL_EE_CLK;
-                writel(priv(dev)->plx_control_bits, plx_control_addr);
+                devpriv->plx_control_bits |= CTL_EE_CLK;
+                writel(devpriv->plx_control_bits, plx_control_addr);
                 udelay(eeprom_udelay);
-                priv(dev)->plx_control_bits &= ~CTL_EE_CLK;
-                writel(priv(dev)->plx_control_bits, plx_control_addr);
+                devpriv->plx_control_bits &= ~CTL_EE_CLK;
+                writel(devpriv->plx_control_bits, plx_control_addr);
                 udelay(eeprom_udelay);
                 if (readl(plx_control_addr) & CTL_EE_R)
                         value |= bit;
@@ -3794,8 +3850,8 @@ static uint16_t read_eeprom(struct comedi_device *dev, uint8_t address)
 
         /*  deactivate eeprom serial input */
         udelay(eeprom_udelay);
-        priv(dev)->plx_control_bits &= ~CTL_EE_CS;
-        writel(priv(dev)->plx_control_bits, plx_control_addr);
+        devpriv->plx_control_bits &= ~CTL_EE_CS;
+        writel(devpriv->plx_control_bits, plx_control_addr);
 
         return value;
 }
@@ -3809,419 +3865,386 @@ static int eeprom_read_insn(struct comedi_device *dev,
         return 1;
 }
 
-/* utility function that rounds desired timing to an achievable time, and
- * sets cmd members appropriately.
- * adc paces conversions from master clock by dividing by (x + 3) where x is 24 bit number
+/* Allocate and initialize the subdevice structures.
  */
-static void check_adc_timing(struct comedi_device *dev, struct comedi_cmd *cmd)
+static int setup_subdevices(struct comedi_device *dev)
 {
-        unsigned int convert_divisor = 0, scan_divisor;
-        static const int min_convert_divisor = 3;
-        static const int max_convert_divisor =
-            max_counter_value + min_convert_divisor;
-        static const int min_scan_divisor_4020 = 2;
-        unsigned long long max_scan_divisor, min_scan_divisor;
+        const struct pcidas64_board *thisboard = comedi_board(dev);
+        struct pcidas64_private *devpriv = dev->private;
+        struct comedi_subdevice *s;
+        void __iomem *dio_8255_iobase;
+        int i;
+        int ret;
 
-        if (cmd->convert_src == TRIG_TIMER) {
-                if (board(dev)->layout == LAYOUT_4020) {
-                        cmd->convert_arg = 0;
-                } else {
-                        convert_divisor =
-                            get_divisor(cmd->convert_arg, cmd->flags);
-                        if (convert_divisor > max_convert_divisor)
-                                convert_divisor = max_convert_divisor;
-                        if (convert_divisor < min_convert_divisor)
-                                convert_divisor = min_convert_divisor;
-                        cmd->convert_arg = convert_divisor * TIMER_BASE;
-                }
-        } else if (cmd->convert_src == TRIG_NOW)
-                cmd->convert_arg = 0;
+        ret = comedi_alloc_subdevices(dev, 10);
+        if (ret)
+                return ret;
 
-        if (cmd->scan_begin_src == TRIG_TIMER) {
-                scan_divisor = get_divisor(cmd->scan_begin_arg, cmd->flags);
-                if (cmd->convert_src == TRIG_TIMER) {
-                        /*  XXX check for integer overflows */
-                        min_scan_divisor = convert_divisor * cmd->chanlist_len;
-                        max_scan_divisor =
-                            (convert_divisor * cmd->chanlist_len - 1) +
-                            max_counter_value;
-                } else {
-                        min_scan_divisor = min_scan_divisor_4020;
-                        max_scan_divisor = max_counter_value + min_scan_divisor;
-                }
-                if (scan_divisor > max_scan_divisor)
-                        scan_divisor = max_scan_divisor;
-                if (scan_divisor < min_scan_divisor)
-                        scan_divisor = min_scan_divisor;
-                cmd->scan_begin_arg = scan_divisor * TIMER_BASE;
+        s = &dev->subdevices[0];
+        /* analog input subdevice */
+        dev->read_subdev = s;
+        s->type = COMEDI_SUBD_AI;
+        s->subdev_flags = SDF_READABLE | SDF_GROUND | SDF_DITHER | SDF_CMD_READ;
+        if (thisboard->layout == LAYOUT_60XX)
+                s->subdev_flags |= SDF_COMMON | SDF_DIFF;
+        else if (thisboard->layout == LAYOUT_64XX)
+                s->subdev_flags |= SDF_DIFF;
+        /* XXX Number of inputs in differential mode is ignored */
+        s->n_chan = thisboard->ai_se_chans;
+        s->len_chanlist = 0x2000;
+        s->maxdata = (1 << thisboard->ai_bits) - 1;
+        s->range_table = thisboard->ai_range_table;
+        s->insn_read = ai_rinsn;
+        s->insn_config = ai_config_insn;
+        s->do_cmd = ai_cmd;
+        s->do_cmdtest = ai_cmdtest;
+        s->cancel = ai_cancel;
+        if (thisboard->layout == LAYOUT_4020) {
+                uint8_t data;
+                /*  set adc to read from inputs
+                 *  (not internal calibration sources) */
+                devpriv->i2c_cal_range_bits = adc_src_4020_bits(4);
+                /*  set channels to +-5 volt input ranges */
+                for (i = 0; i < s->n_chan; i++)
+                        devpriv->i2c_cal_range_bits |= attenuate_bit(i);
+                data = devpriv->i2c_cal_range_bits;
+                i2c_write(dev, RANGE_CAL_I2C_ADDR, &data, sizeof(data));
         }
 
-        return;
-}
-
-/* Gets nearest achievable timing given master clock speed, does not
- * take into account possible minimum/maximum divisor values.  Used
- * by other timing checking functions. */
-static unsigned int get_divisor(unsigned int ns, unsigned int flags)
-{
-        unsigned int divisor;
-
-        switch (flags & TRIG_ROUND_MASK) {
-        case TRIG_ROUND_UP:
-                divisor = (ns + TIMER_BASE - 1) / TIMER_BASE;
-                break;
-        case TRIG_ROUND_DOWN:
-                divisor = ns / TIMER_BASE;
-                break;
-        case TRIG_ROUND_NEAREST:
-        default:
-                divisor = (ns + TIMER_BASE / 2) / TIMER_BASE;
-                break;
+        /* analog output subdevice */
+        s = &dev->subdevices[1];
+        if (thisboard->ao_nchan) {
+                s->type = COMEDI_SUBD_AO;
+                s->subdev_flags = SDF_READABLE | SDF_WRITABLE |
+                                  SDF_GROUND | SDF_CMD_WRITE;
+                s->n_chan = thisboard->ao_nchan;
+                s->maxdata = (1 << thisboard->ao_bits) - 1;
+                s->range_table = thisboard->ao_range_table;
+                s->insn_read = ao_readback_insn;
+                s->insn_write = ao_winsn;
+                if (ao_cmd_is_supported(thisboard)) {
+                        dev->write_subdev = s;
+                        s->do_cmdtest = ao_cmdtest;
+                        s->do_cmd = ao_cmd;
+                        s->len_chanlist = thisboard->ao_nchan;
+                        s->cancel = ao_cancel;
+                }
+        } else {
+                s->type = COMEDI_SUBD_UNUSED;
         }
-        return divisor;
-}
 
-static unsigned int get_ao_divisor(unsigned int ns, unsigned int flags)
-{
-        return get_divisor(ns, flags) - 2;
-}
+        /*  digital input */
+        s = &dev->subdevices[2];
+        if (thisboard->layout == LAYOUT_64XX) {
+                s->type = COMEDI_SUBD_DI;
+                s->subdev_flags = SDF_READABLE;
+                s->n_chan = 4;
+                s->maxdata = 1;
+                s->range_table = &range_digital;
+                s->insn_bits = di_rbits;
+        } else
+                s->type = COMEDI_SUBD_UNUSED;
 
-/* adjusts the size of hardware fifo (which determines block size for dma xfers) */
-static int set_ai_fifo_size(struct comedi_device *dev, unsigned int num_samples)
-{
-        unsigned int num_fifo_entries;
-        int retval;
-        const struct hw_fifo_info *const fifo = board(dev)->ai_fifo;
+        /*  digital output */
+        if (thisboard->layout == LAYOUT_64XX) {
+                s = &dev->subdevices[3];
+                s->type = COMEDI_SUBD_DO;
+                s->subdev_flags = SDF_WRITABLE | SDF_READABLE;
+                s->n_chan = 4;
+                s->maxdata = 1;
+                s->range_table = &range_digital;
+                s->insn_bits = do_wbits;
+        } else
+                s->type = COMEDI_SUBD_UNUSED;
 
-        num_fifo_entries = num_samples / fifo->sample_packing_ratio;
+        /* 8255 */
+        s = &dev->subdevices[4];
+        if (thisboard->has_8255) {
+                if (thisboard->layout == LAYOUT_4020) {
+                        dio_8255_iobase = devpriv->main_iobase + I8255_4020_REG;
+                        subdev_8255_init(dev, s, dio_callback_4020,
+                                         (unsigned long)dio_8255_iobase);
+                } else {
+                        dio_8255_iobase =
+                                devpriv->dio_counter_iobase + DIO_8255_OFFSET;
+                        subdev_8255_init(dev, s, dio_callback,
+                                         (unsigned long)dio_8255_iobase);
+                }
+        } else
+                s->type = COMEDI_SUBD_UNUSED;
 
-        retval = set_ai_fifo_segment_length(dev,
-                                            num_fifo_entries /
-                                            fifo->num_segments);
-        if (retval < 0)
-                return retval;
+        /*  8 channel dio for 60xx */
+        s = &dev->subdevices[5];
+        if (thisboard->layout == LAYOUT_60XX) {
+                s->type = COMEDI_SUBD_DIO;
+                s->subdev_flags = SDF_WRITABLE | SDF_READABLE;
+                s->n_chan = 8;
+                s->maxdata = 1;
+                s->range_table = &range_digital;
+                s->insn_config = dio_60xx_config_insn;
+                s->insn_bits = dio_60xx_wbits;
+        } else
+                s->type = COMEDI_SUBD_UNUSED;
 
-        num_samples = retval * fifo->num_segments * fifo->sample_packing_ratio;
+        /*  caldac */
+        s = &dev->subdevices[6];
+        s->type = COMEDI_SUBD_CALIB;
+        s->subdev_flags = SDF_READABLE | SDF_WRITABLE | SDF_INTERNAL;
+        s->n_chan = 8;
+        if (thisboard->layout == LAYOUT_4020)
+                s->maxdata = 0xfff;
+        else
+                s->maxdata = 0xff;
+        s->insn_read = calib_read_insn;
+        s->insn_write = calib_write_insn;
+        for (i = 0; i < s->n_chan; i++)
+                caldac_write(dev, i, s->maxdata / 2);
 
-        DEBUG_PRINT("set hardware fifo size to %i\n", num_samples);
+        /*  2 channel ad8402 potentiometer */
+        s = &dev->subdevices[7];
+        if (thisboard->layout == LAYOUT_64XX) {
+                s->type = COMEDI_SUBD_CALIB;
+                s->subdev_flags = SDF_READABLE | SDF_WRITABLE | SDF_INTERNAL;
+                s->n_chan = 2;
+                s->insn_read = ad8402_read_insn;
+                s->insn_write = ad8402_write_insn;
+                s->maxdata = 0xff;
+                for (i = 0; i < s->n_chan; i++)
+                        ad8402_write(dev, i, s->maxdata / 2);
+        } else
+                s->type = COMEDI_SUBD_UNUSED;
 
-        return num_samples;
-}
+        /* serial EEPROM, if present */
+        s = &dev->subdevices[8];
+        if (readl(devpriv->plx9080_iobase + PLX_CONTROL_REG) & CTL_EECHK) {
+                s->type = COMEDI_SUBD_MEMORY;
+                s->subdev_flags = SDF_READABLE | SDF_INTERNAL;
+                s->n_chan = 128;
+                s->maxdata = 0xffff;
+                s->insn_read = eeprom_read_insn;
+        } else
+                s->type = COMEDI_SUBD_UNUSED;
 
-/* query length of fifo */
-static unsigned int ai_fifo_size(struct comedi_device *dev)
-{
-        return priv(dev)->ai_fifo_segment_length *
-            board(dev)->ai_fifo->num_segments *
-            board(dev)->ai_fifo->sample_packing_ratio;
+        /*  user counter subd XXX */
+        s = &dev->subdevices[9];
+        s->type = COMEDI_SUBD_UNUSED;
+
+        return 0;
 }
 
-static int set_ai_fifo_segment_length(struct comedi_device *dev,
-                                      unsigned int num_entries)
+static const struct pcidas64_board
+*cb_pcidas64_find_pci_board(struct pci_dev *pcidev)
 {
-        static const int increment_size = 0x100;
-        const struct hw_fifo_info *const fifo = board(dev)->ai_fifo;
-        unsigned int num_increments;
-        uint16_t bits;
-
-        if (num_entries < increment_size)
-                num_entries = increment_size;
-        if (num_entries > fifo->max_segment_length)
-                num_entries = fifo->max_segment_length;
-
-        /*  1 == 256 entries, 2 == 512 entries, etc */
-        num_increments = (num_entries + increment_size / 2) / increment_size;
-
-        bits = (~(num_increments - 1)) & fifo->fifo_size_reg_mask;
-        priv(dev)->fifo_size_bits &= ~fifo->fifo_size_reg_mask;
-        priv(dev)->fifo_size_bits |= bits;
-        writew(priv(dev)->fifo_size_bits,
-               priv(dev)->main_iobase + FIFO_SIZE_REG);
-
-        priv(dev)->ai_fifo_segment_length = num_increments * increment_size;
-
-        DEBUG_PRINT("set hardware fifo segment length to %i\n",
-                    priv(dev)->ai_fifo_segment_length);
+        unsigned int i;
 
-        return priv(dev)->ai_fifo_segment_length;
+        for (i = 0; i < ARRAY_SIZE(pcidas64_boards); i++)
+                if (pcidev->device == pcidas64_boards[i].device_id)
+                        return &pcidas64_boards[i];
+        return NULL;
 }
 
-/* pci-6025 8800 caldac:
- * address 0 == dac channel 0 offset
- * address 1 == dac channel 0 gain
- * address 2 == dac channel 1 offset
- * address 3 == dac channel 1 gain
- * address 4 == fine adc offset
- * address 5 == coarse adc offset
- * address 6 == coarse adc gain
- * address 7 == fine adc gain
- */
-/* pci-6402/16 uses all 8 channels for dac:
- * address 0 == dac channel 0 fine gain
- * address 1 == dac channel 0 coarse gain
- * address 2 == dac channel 0 coarse offset
- * address 3 == dac channel 1 coarse offset
- * address 4 == dac channel 1 fine gain
- * address 5 == dac channel 1 coarse gain
- * address 6 == dac channel 0 fine offset
- * address 7 == dac channel 1 fine offset
-*/
-
-static int caldac_8800_write(struct comedi_device *dev, unsigned int address,
-                             uint8_t value)
+static int auto_attach(struct comedi_device *dev,
+                                 unsigned long context_unused)
 {
-        static const int num_caldac_channels = 8;
-        static const int bitstream_length = 11;
-        unsigned int bitstream = ((address & 0x7) << 8) | value;
-        unsigned int bit, register_bits;
-        static const int caldac_8800_udelay = 1;
+        const struct pcidas64_board *thisboard;
+        struct pcidas64_private *devpriv;
+        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
+        uint32_t local_range, local_decode;
+        int retval;
 
-        if (address >= num_caldac_channels) {
-                comedi_error(dev, "illegal caldac channel");
-                return -1;
-        }
-        for (bit = 1 << (bitstream_length - 1); bit; bit >>= 1) {
-                register_bits = 0;
-                if (bitstream & bit)
-                        register_bits |= SERIAL_DATA_IN_BIT;
-                udelay(caldac_8800_udelay);
-                writew(register_bits, priv(dev)->main_iobase + CALIBRATION_REG);
-                register_bits |= SERIAL_CLOCK_BIT;
-                udelay(caldac_8800_udelay);
-                writew(register_bits, priv(dev)->main_iobase + CALIBRATION_REG);
+        dev->board_ptr = cb_pcidas64_find_pci_board(pcidev);
+        if (!dev->board_ptr) {
+                dev_err(dev->class_dev,
+                        "cb_pcidas64: does not support pci %s\n",
+                        pci_name(pcidev));
+                return -EINVAL;
         }
-        udelay(caldac_8800_udelay);
-        writew(SELECT_8800_BIT, priv(dev)->main_iobase + CALIBRATION_REG);
-        udelay(caldac_8800_udelay);
-        writew(0, priv(dev)->main_iobase + CALIBRATION_REG);
-        udelay(caldac_8800_udelay);
-        return 0;
-}
+        thisboard = comedi_board(dev);
 
-/* 4020 caldacs */
-static int caldac_i2c_write(struct comedi_device *dev,
-                            unsigned int caldac_channel, unsigned int value)
-{
-        uint8_t serial_bytes[3];
-        uint8_t i2c_addr;
-        enum pointer_bits {
-                /*  manual has gain and offset bits switched */
-                OFFSET_0_2 = 0x1,
-                GAIN_0_2 = 0x2,
-                OFFSET_1_3 = 0x4,
-                GAIN_1_3 = 0x8,
-        };
-        enum data_bits {
-                NOT_CLEAR_REGISTERS = 0x20,
-        };
+        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
+        if (!devpriv)
+                return -ENOMEM;
+        dev->private = devpriv;
 
-        switch (caldac_channel) {
-        case 0:         /*  chan 0 offset */
-                i2c_addr = CALDAC0_I2C_ADDR;
-                serial_bytes[0] = OFFSET_0_2;
-                break;
-        case 1:         /*  chan 1 offset */
-                i2c_addr = CALDAC0_I2C_ADDR;
-                serial_bytes[0] = OFFSET_1_3;
-                break;
-        case 2:         /*  chan 2 offset */
-                i2c_addr = CALDAC1_I2C_ADDR;
-                serial_bytes[0] = OFFSET_0_2;
-                break;
-        case 3:         /*  chan 3 offset */
-                i2c_addr = CALDAC1_I2C_ADDR;
-                serial_bytes[0] = OFFSET_1_3;
-                break;
-        case 4:         /*  chan 0 gain */
-                i2c_addr = CALDAC0_I2C_ADDR;
-                serial_bytes[0] = GAIN_0_2;
-                break;
-        case 5:         /*  chan 1 gain */
-                i2c_addr = CALDAC0_I2C_ADDR;
-                serial_bytes[0] = GAIN_1_3;
-                break;
-        case 6:         /*  chan 2 gain */
-                i2c_addr = CALDAC1_I2C_ADDR;
-                serial_bytes[0] = GAIN_0_2;
-                break;
-        case 7:         /*  chan 3 gain */
-                i2c_addr = CALDAC1_I2C_ADDR;
-                serial_bytes[0] = GAIN_1_3;
-                break;
-        default:
-                comedi_error(dev, "invalid caldac channel\n");
-                return -1;
-                break;
+        if (comedi_pci_enable(pcidev, dev->driver->driver_name)) {
+                dev_warn(dev->class_dev,
+                         "failed to enable PCI device and request regions\n");
+                return -EIO;
         }
-        serial_bytes[1] = NOT_CLEAR_REGISTERS | ((value >> 8) & 0xf);
-        serial_bytes[2] = value & 0xff;
-        i2c_write(dev, i2c_addr, serial_bytes, 3);
-        return 0;
-}
+        pci_set_master(pcidev);
 
-/* Their i2c requires a huge delay on setting clock or data high for some reason */
-static const int i2c_high_udelay = 1000;
-static const int i2c_low_udelay = 10;
+        /* Initialize dev->board_name */
+        dev->board_name = thisboard->name;
 
-/* set i2c data line high or low */
-static void i2c_set_sda(struct comedi_device *dev, int state)
-{
-        static const int data_bit = CTL_EE_W;
-        void __iomem *plx_control_addr = priv(dev)->plx9080_iobase +
-                                         PLX_CONTROL_REG;
+        dev->iobase = pci_resource_start(pcidev, MAIN_BADDRINDEX);
 
-        if (state) {
-                /*  set data line high */
-                priv(dev)->plx_control_bits &= ~data_bit;
-                writel(priv(dev)->plx_control_bits, plx_control_addr);
-                udelay(i2c_high_udelay);
-        } else {                /*  set data line low */
+        devpriv->plx9080_phys_iobase =
+                pci_resource_start(pcidev, PLX9080_BADDRINDEX);
+        devpriv->main_phys_iobase = dev->iobase;
+        devpriv->dio_counter_phys_iobase =
+                pci_resource_start(pcidev, DIO_COUNTER_BADDRINDEX);
 
-                priv(dev)->plx_control_bits |= data_bit;
-                writel(priv(dev)->plx_control_bits, plx_control_addr);
-                udelay(i2c_low_udelay);
+        /*  remap, won't work with 2.0 kernels but who cares */
+        devpriv->plx9080_iobase =
+                ioremap(devpriv->plx9080_phys_iobase,
+                        pci_resource_len(pcidev, PLX9080_BADDRINDEX));
+        devpriv->main_iobase =
+                ioremap(devpriv->main_phys_iobase,
+                        pci_resource_len(pcidev, MAIN_BADDRINDEX));
+        devpriv->dio_counter_iobase =
+                ioremap(devpriv->dio_counter_phys_iobase,
+                        pci_resource_len(pcidev, DIO_COUNTER_BADDRINDEX));
+
+        if (!devpriv->plx9080_iobase || !devpriv->main_iobase
+            || !devpriv->dio_counter_iobase) {
+                dev_warn(dev->class_dev, "failed to remap io memory\n");
+                return -ENOMEM;
         }
-}
 
-/* set i2c clock line high or low */
-static void i2c_set_scl(struct comedi_device *dev, int state)
-{
-        static const int clock_bit = CTL_USERO;
-        void __iomem *plx_control_addr = priv(dev)->plx9080_iobase +
-                                         PLX_CONTROL_REG;
-
-        if (state) {
-                /*  set clock line high */
-                priv(dev)->plx_control_bits &= ~clock_bit;
-                writel(priv(dev)->plx_control_bits, plx_control_addr);
-                udelay(i2c_high_udelay);
-        } else {                /*  set clock line low */
-
-                priv(dev)->plx_control_bits |= clock_bit;
-                writel(priv(dev)->plx_control_bits, plx_control_addr);
-                udelay(i2c_low_udelay);
-        }
-}
+        DEBUG_PRINT(" plx9080 remapped to 0x%p\n", devpriv->plx9080_iobase);
+        DEBUG_PRINT(" main remapped to 0x%p\n", devpriv->main_iobase);
+        DEBUG_PRINT(" diocounter remapped to 0x%p\n",
+                    devpriv->dio_counter_iobase);
 
-static void i2c_write_byte(struct comedi_device *dev, uint8_t byte)
-{
-        uint8_t bit;
-        unsigned int num_bits = 8;
+        /*  figure out what local addresses are */
+        local_range = readl(devpriv->plx9080_iobase + PLX_LAS0RNG_REG) &
+                      LRNG_MEM_MASK;
+        local_decode = readl(devpriv->plx9080_iobase + PLX_LAS0MAP_REG) &
+                       local_range & LMAP_MEM_MASK;
+        devpriv->local0_iobase = ((uint32_t)devpriv->main_phys_iobase &
+                                  ~local_range) | local_decode;
+        local_range = readl(devpriv->plx9080_iobase + PLX_LAS1RNG_REG) &
+                      LRNG_MEM_MASK;
+        local_decode = readl(devpriv->plx9080_iobase + PLX_LAS1MAP_REG) &
+                       local_range & LMAP_MEM_MASK;
+        devpriv->local1_iobase = ((uint32_t)devpriv->dio_counter_phys_iobase &
+                                  ~local_range) | local_decode;
+
+        DEBUG_PRINT(" local 0 io addr 0x%x\n", devpriv->local0_iobase);
+        DEBUG_PRINT(" local 1 io addr 0x%x\n", devpriv->local1_iobase);
 
-        DEBUG_PRINT("writing to i2c byte 0x%x\n", byte);
+        retval = alloc_and_init_dma_members(dev);
+        if (retval < 0)
+                return retval;
 
-        for (bit = 1 << (num_bits - 1); bit; bit >>= 1) {
-                i2c_set_scl(dev, 0);
-                if ((byte & bit))
-                        i2c_set_sda(dev, 1);
-                else
-                        i2c_set_sda(dev, 0);
-                i2c_set_scl(dev, 1);
+        devpriv->hw_revision =
+                hw_revision(dev, readw(devpriv->main_iobase + HW_STATUS_REG));
+        dev_dbg(dev->class_dev, "stc hardware revision %i\n",
+                devpriv->hw_revision);
+        init_plx9080(dev);
+        init_stc_registers(dev);
+        /*  get irq */
+        if (request_irq(pcidev->irq, handle_interrupt, IRQF_SHARED,
+                        "cb_pcidas64", dev)) {
+                dev_dbg(dev->class_dev, "unable to allocate irq %u\n",
+                        pcidev->irq);
+                return -EINVAL;
         }
-}
-
-/* we can't really read the lines, so fake it */
-static int i2c_read_ack(struct comedi_device *dev)
-{
-        i2c_set_scl(dev, 0);
-        i2c_set_sda(dev, 1);
-        i2c_set_scl(dev, 1);
-
-        return 0;               /*  return fake acknowledge bit */
-}
+        dev->irq = pcidev->irq;
+        dev_dbg(dev->class_dev, "irq %u\n", dev->irq);
 
-/* send start bit */
-static void i2c_start(struct comedi_device *dev)
-{
-        i2c_set_scl(dev, 1);
-        i2c_set_sda(dev, 1);
-        i2c_set_sda(dev, 0);
-}
+        retval = setup_subdevices(dev);
+        if (retval < 0)
+                return retval;
 
-/* send stop bit */
-static void i2c_stop(struct comedi_device *dev)
-{
-        i2c_set_scl(dev, 0);
-        i2c_set_sda(dev, 0);
-        i2c_set_scl(dev, 1);
-        i2c_set_sda(dev, 1);
+        return 0;
 }
 
-static void i2c_write(struct comedi_device *dev, unsigned int address,
-                      const uint8_t *data, unsigned int length)
+static void detach(struct comedi_device *dev)
 {
+        const struct pcidas64_board *thisboard = comedi_board(dev);
+        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
+        struct pcidas64_private *devpriv = dev->private;
         unsigned int i;
-        uint8_t bitstream;
-        static const int read_bit = 0x1;
-
-/* XXX need mutex to prevent simultaneous attempts to access eeprom and i2c bus */
 
-        /*  make sure we dont send anything to eeprom */
-        priv(dev)->plx_control_bits &= ~CTL_EE_CS;
-
-        i2c_stop(dev);
-        i2c_start(dev);
-
-        /*  send address and write bit */
-        bitstream = (address << 1) & ~read_bit;
-        i2c_write_byte(dev, bitstream);
-
-        /*  get acknowledge */
-        if (i2c_read_ack(dev) != 0) {
-                comedi_error(dev, "i2c write failed: no acknowledge");
-                i2c_stop(dev);
-                return;
-        }
-        /*  write data bytes */
-        for (i = 0; i < length; i++) {
-                i2c_write_byte(dev, data[i]);
-                if (i2c_read_ack(dev) != 0) {
-                        comedi_error(dev, "i2c write failed: no acknowledge");
-                        i2c_stop(dev);
-                        return;
+        if (dev->irq)
+                free_irq(dev->irq, dev);
+        if (devpriv) {
+                if (pcidev) {
+                        if (devpriv->plx9080_iobase) {
+                                disable_plx_interrupts(dev);
+                                iounmap(devpriv->plx9080_iobase);
+                        }
+                        if (devpriv->main_iobase)
+                                iounmap(devpriv->main_iobase);
+                        if (devpriv->dio_counter_iobase)
+                                iounmap(devpriv->dio_counter_iobase);
+                        /*  free pci dma buffers */
+                        for (i = 0; i < ai_dma_ring_count(thisboard); i++) {
+                                if (devpriv->ai_buffer[i])
+                                        pci_free_consistent(pcidev,
+                                                DMA_BUFFER_SIZE,
+                                                devpriv->ai_buffer[i],
+                                                devpriv->ai_buffer_bus_addr[i]);
+                        }
+                        for (i = 0; i < AO_DMA_RING_COUNT; i++) {
+                                if (devpriv->ao_buffer[i])
+                                        pci_free_consistent(pcidev,
+                                                DMA_BUFFER_SIZE,
+                                                devpriv->ao_buffer[i],
+                                                devpriv->ao_buffer_bus_addr[i]);
+                        }
+                        /*  free dma descriptors */
+                        if (devpriv->ai_dma_desc)
+                                pci_free_consistent(pcidev,
+                                        sizeof(struct plx_dma_desc) *
+                                        ai_dma_ring_count(thisboard),
+                                        devpriv->ai_dma_desc,
+                                        devpriv->ai_dma_desc_bus_addr);
+                        if (devpriv->ao_dma_desc)
+                                pci_free_consistent(pcidev,
+                                        sizeof(struct plx_dma_desc) *
+                                        AO_DMA_RING_COUNT,
+                                        devpriv->ao_dma_desc,
+                                        devpriv->ao_dma_desc_bus_addr);
                 }
         }
-        i2c_stop(dev);
+        if (dev->subdevices)
+                subdev_8255_cleanup(dev, &dev->subdevices[4]);
+        if (pcidev) {
+                if (dev->iobase)
+                        comedi_pci_disable(pcidev);
+        }
 }
 
 static struct comedi_driver cb_pcidas64_driver = {
         .driver_name    = "cb_pcidas64",
         .module         = THIS_MODULE,
-        .attach         = attach,
+        .auto_attach    = auto_attach,
         .detach         = detach,
 };
 
-static int __devinit cb_pcidas64_pci_probe(struct pci_dev *dev,
+static int cb_pcidas64_pci_probe(struct pci_dev *dev,
                                            const struct pci_device_id *ent)
 {
         return comedi_pci_auto_config(dev, &cb_pcidas64_driver);
 }
 
-static void __devexit cb_pcidas64_pci_remove(struct pci_dev *dev)
+static void cb_pcidas64_pci_remove(struct pci_dev *dev)
 {
         comedi_pci_auto_unconfig(dev);
 }
 
 static DEFINE_PCI_DEVICE_TABLE(cb_pcidas64_pci_table) = {
-        { PCI_DEVICE(PCI_VENDOR_ID_COMPUTERBOARDS, 0x001d) },
-        { PCI_DEVICE(PCI_VENDOR_ID_COMPUTERBOARDS, 0x001e) },
-        { PCI_DEVICE(PCI_VENDOR_ID_COMPUTERBOARDS, 0x0035) },
-        { PCI_DEVICE(PCI_VENDOR_ID_COMPUTERBOARDS, 0x0036) },
-        { PCI_DEVICE(PCI_VENDOR_ID_COMPUTERBOARDS, 0x0037) },
-        { PCI_DEVICE(PCI_VENDOR_ID_COMPUTERBOARDS, 0x0052) },
-        { PCI_DEVICE(PCI_VENDOR_ID_COMPUTERBOARDS, 0x005d) },
-        { PCI_DEVICE(PCI_VENDOR_ID_COMPUTERBOARDS, 0x005e) },
-        { PCI_DEVICE(PCI_VENDOR_ID_COMPUTERBOARDS, 0x005f) },
-        { PCI_DEVICE(PCI_VENDOR_ID_COMPUTERBOARDS, 0x0061) },
-        { PCI_DEVICE(PCI_VENDOR_ID_COMPUTERBOARDS, 0x0062) },
-        { PCI_DEVICE(PCI_VENDOR_ID_COMPUTERBOARDS, 0x0063) },
-        { PCI_DEVICE(PCI_VENDOR_ID_COMPUTERBOARDS, 0x0064) },
-        { PCI_DEVICE(PCI_VENDOR_ID_COMPUTERBOARDS, 0x0066) },
-        { PCI_DEVICE(PCI_VENDOR_ID_COMPUTERBOARDS, 0x0067) },
-        { PCI_DEVICE(PCI_VENDOR_ID_COMPUTERBOARDS, 0x0068) },
-        { PCI_DEVICE(PCI_VENDOR_ID_COMPUTERBOARDS, 0x006f) },
-        { PCI_DEVICE(PCI_VENDOR_ID_COMPUTERBOARDS, 0x0078) },
-        { PCI_DEVICE(PCI_VENDOR_ID_COMPUTERBOARDS, 0x0079) },
+        { PCI_DEVICE(PCI_VENDOR_ID_CB, 0x001d) },
+        { PCI_DEVICE(PCI_VENDOR_ID_CB, 0x001e) },
+        { PCI_DEVICE(PCI_VENDOR_ID_CB, 0x0035) },
+        { PCI_DEVICE(PCI_VENDOR_ID_CB, 0x0036) },
+        { PCI_DEVICE(PCI_VENDOR_ID_CB, 0x0037) },
+        { PCI_DEVICE(PCI_VENDOR_ID_CB, 0x0052) },
+        { PCI_DEVICE(PCI_VENDOR_ID_CB, 0x005d) },
+        { PCI_DEVICE(PCI_VENDOR_ID_CB, 0x005e) },
+        { PCI_DEVICE(PCI_VENDOR_ID_CB, 0x005f) },
+        { PCI_DEVICE(PCI_VENDOR_ID_CB, 0x0061) },
+        { PCI_DEVICE(PCI_VENDOR_ID_CB, 0x0062) },
+        { PCI_DEVICE(PCI_VENDOR_ID_CB, 0x0063) },
+        { PCI_DEVICE(PCI_VENDOR_ID_CB, 0x0064) },
+        { PCI_DEVICE(PCI_VENDOR_ID_CB, 0x0066) },
+        { PCI_DEVICE(PCI_VENDOR_ID_CB, 0x0067) },
+        { PCI_DEVICE(PCI_VENDOR_ID_CB, 0x0068) },
+        { PCI_DEVICE(PCI_VENDOR_ID_CB, 0x006f) },
+        { PCI_DEVICE(PCI_VENDOR_ID_CB, 0x0078) },
+        { PCI_DEVICE(PCI_VENDOR_ID_CB, 0x0079) },
         { 0 }
 };
 MODULE_DEVICE_TABLE(pci, cb_pcidas64_pci_table);
@@ -4230,7 +4253,7 @@ static struct pci_driver cb_pcidas64_pci_driver = {
         .name           = "cb_pcidas64",
         .id_table       = cb_pcidas64_pci_table,
         .probe          = cb_pcidas64_pci_probe,
-        .remove         = __devexit_p(cb_pcidas64_pci_remove),
+        .remove         = cb_pcidas64_pci_remove,
 };
 module_comedi_pci_driver(cb_pcidas64_driver, cb_pcidas64_pci_driver);
 
diff --git a/drivers/staging/comedi/drivers/cb_pcidda.c b/drivers/staging/comedi/drivers/cb_pcidda.c
index aef946df27e2..7c6029a8c3e1 100644
--- a/drivers/staging/comedi/drivers/cb_pcidda.c
+++ b/drivers/staging/comedi/drivers/cb_pcidda.c
@@ -1,90 +1,78 @@
 /*
-    comedi/drivers/cb_pcidda.c
-    This intends to be a driver for the ComputerBoards / MeasurementComputing
-    PCI-DDA series.
-
-         Copyright (C) 2001 Ivan Martinez <ivanmr@altavista.com>
-    Copyright (C) 2001 Frank Mori Hess <fmhess@users.sourceforge.net>
-
-    COMEDI - Linux Control and Measurement Device Interface
-    Copyright (C) 1997-8 David A. Schleef <ds@schleef.org>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * comedi/drivers/cb_pcidda.c
+ * Driver for the ComputerBoards / MeasurementComputing PCI-DDA series.
+ *
+ * Copyright (C) 2001 Ivan Martinez <ivanmr@altavista.com>
+ * Copyright (C) 2001 Frank Mori Hess <fmhess@users.sourceforge.net>
+ *
+ * COMEDI - Linux Control and Measurement Device Interface
+ * Copyright (C) 1997-8 David A. Schleef <ds@schleef.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
 
-*/
 /*
-Driver: cb_pcidda
-Description: MeasurementComputing PCI-DDA series
-Author: Ivan Martinez <ivanmr@altavista.com>, Frank Mori Hess <fmhess@users.sourceforge.net>
-Status: Supports 08/16, 04/16, 02/16, 08/12, 04/12, and 02/12
-Devices: [Measurement Computing] PCI-DDA08/12 (cb_pcidda), PCI-DDA04/12,
-  PCI-DDA02/12, PCI-DDA08/16, PCI-DDA04/16, PCI-DDA02/16
-
-Configuration options:
-  [0] - PCI bus of device (optional)
-  [1] - PCI slot of device (optional)
-  If bus/slot is not specified, the first available PCI
-  device will be used.
-
-Only simple analog output writing is supported.
-
-So far it has only been tested with:
-  - PCI-DDA08/12
-Please report success/failure with other different cards to
-<comedi@comedi.org>.
-*/
+ * Driver: cb_pcidda
+ * Description: MeasurementComputing PCI-DDA series
+ * Devices: (Measurement Computing) PCI-DDA08/12 [pci-dda08/12]
+ *          (Measurement Computing) PCI-DDA04/12 [pci-dda04/12]
+ *          (Measurement Computing) PCI-DDA02/12 [pci-dda02/12]
+ *          (Measurement Computing) PCI-DDA08/16 [pci-dda08/16]
+ *          (Measurement Computing) PCI-DDA04/16 [pci-dda04/16]
+ *          (Measurement Computing) PCI-DDA02/16 [pci-dda02/16]
+ * Author: Ivan Martinez <ivanmr@altavista.com>
+ *         Frank Mori Hess <fmhess@users.sourceforge.net>
+ * Status: works
+ *
+ * Configuration options: not applicable, uses PCI auto config
+ *
+ * Only simple analog output writing is supported.
+ */
 
 #include "../comedidev.h"
 
 #include "comedi_fc.h"
 #include "8255.h"
 
-/* PCI vendor number of ComputerBoards */
-#define PCI_VENDOR_ID_CB        0x1307
+/*
+ * ComputerBoards PCI Device ID's supported by this driver
+ */
+#define PCI_DEVICE_ID_DDA02_12          0x0020
+#define PCI_DEVICE_ID_DDA04_12          0x0021
+#define PCI_DEVICE_ID_DDA08_12          0x0022
+#define PCI_DEVICE_ID_DDA02_16          0x0023
+#define PCI_DEVICE_ID_DDA04_16          0x0024
+#define PCI_DEVICE_ID_DDA08_16          0x0025
+
 #define EEPROM_SIZE     128     /*  number of entries in eeprom */
 /* maximum number of ao channels for supported boards */
 #define MAX_AO_CHANNELS 8
 
 /* Digital I/O registers */
-#define PORT1A 0                /*  PORT 1A DATA */
-
-#define PORT1B 1                /*  PORT 1B DATA */
-
-#define PORT1C 2                /*  PORT 1C DATA */
-
-#define CONTROL1 3              /*  CONTROL REGISTER 1 */
-
-#define PORT2A 4                /*  PORT 2A DATA */
-
-#define PORT2B 5                /*  PORT 2B DATA */
-
-#define PORT2C 6                /*  PORT 2C DATA */
-
-#define CONTROL2 7              /*  CONTROL REGISTER 2 */
+#define CB_DDA_DIO0_8255_BASE           0x00
+#define CB_DDA_DIO1_8255_BASE           0x04
 
 /* DAC registers */
-#define DACONTROL       0       /*  D/A CONTROL REGISTER */
-#define SU      0000001         /*  Simultaneous update enabled */
-#define NOSU    0000000         /*  Simultaneous update disabled */
-#define ENABLEDAC       0000002 /*  Enable specified DAC */
-#define DISABLEDAC      0000000 /*  Disable specified DAC */
-#define RANGE2V5        0000000 /*  2.5V */
-#define RANGE5V 0000200         /*  5V */
-#define RANGE10V        0000300 /*  10V */
-#define UNIP    0000400         /*  Unipolar outputs */
-#define BIP     0000000         /*  Bipolar outputs */
+#define CB_DDA_DA_CTRL_REG              0x00       /* D/A Control Register  */
+#define CB_DDA_DA_CTRL_SU               (1 << 0)   /*  Simultaneous update  */
+#define CB_DDA_DA_CTRL_EN               (1 << 1)   /*  Enable specified DAC */
+#define CB_DDA_DA_CTRL_DAC(x)           ((x) << 2) /*  Specify DAC channel  */
+#define CB_DDA_DA_CTRL_RANGE2V5         (0 << 6)   /*  2.5V range           */
+#define CB_DDA_DA_CTRL_RANGE5V          (2 << 6)   /*  5V range             */
+#define CB_DDA_DA_CTRL_RANGE10V         (3 << 6)   /*  10V range            */
+#define CB_DDA_DA_CTRL_UNIP             (1 << 8)   /*  Unipolar range       */
 
 #define DACALIBRATION1  4       /*  D/A CALIBRATION REGISTER 1 */
 /* write bits */
@@ -109,107 +97,67 @@ Please report success/failure with other different cards to
 /* manual says to set this bit with no explanation */
 #define DUMMY_BIT       0x40
 
-#define DADATA  8               /*  FIRST D/A DATA REGISTER (0) */
+#define CB_DDA_DA_DATA_REG(x)           (0x08 + ((x) * 2))
+
+/* Offsets for the caldac channels */
+#define CB_DDA_CALDAC_FINE_GAIN         0
+#define CB_DDA_CALDAC_COURSE_GAIN       1
+#define CB_DDA_CALDAC_COURSE_OFFSET     2
+#define CB_DDA_CALDAC_FINE_OFFSET       3
 
 static const struct comedi_lrange cb_pcidda_ranges = {
-        6,
-        {
-         BIP_RANGE(10),
-         BIP_RANGE(5),
-         BIP_RANGE(2.5),
-         UNI_RANGE(10),
-         UNI_RANGE(5),
-         UNI_RANGE(2.5),
-         }
+        6, {
+                BIP_RANGE(10),
+                BIP_RANGE(5),
+                BIP_RANGE(2.5),
+                UNI_RANGE(10),
+                UNI_RANGE(5),
+                UNI_RANGE(2.5)
+        }
 };
 
-/*
- * Board descriptions for two imaginary boards.  Describing the
- * boards in this way is optional, and completely driver-dependent.
- * Some drivers use arrays such as this, other do not.
- */
 struct cb_pcidda_board {
         const char *name;
-        char status;            /*  Driver status: */
-
-        /*
-         * 0 - tested
-         * 1 - manual read, not tested
-         * 2 - manual not read
-         */
-
         unsigned short device_id;
         int ao_chans;
         int ao_bits;
-        const struct comedi_lrange *ranges;
 };
 
 static const struct cb_pcidda_board cb_pcidda_boards[] = {
         {
-         .name = "pci-dda02/12",
-         .status = 1,
-         .device_id = 0x20,
-         .ao_chans = 2,
-         .ao_bits = 12,
-         .ranges = &cb_pcidda_ranges,
-         },
-        {
-         .name = "pci-dda04/12",
-         .status = 1,
-         .device_id = 0x21,
-         .ao_chans = 4,
-         .ao_bits = 12,
-         .ranges = &cb_pcidda_ranges,
-         },
-        {
-         .name = "pci-dda08/12",
-         .status = 0,
-         .device_id = 0x22,
-         .ao_chans = 8,
-         .ao_bits = 12,
-         .ranges = &cb_pcidda_ranges,
-         },
-        {
-         .name = "pci-dda02/16",
-         .status = 2,
-         .device_id = 0x23,
-         .ao_chans = 2,
-         .ao_bits = 16,
-         .ranges = &cb_pcidda_ranges,
-         },
-        {
-         .name = "pci-dda04/16",
-         .status = 2,
-         .device_id = 0x24,
-         .ao_chans = 4,
-         .ao_bits = 16,
-         .ranges = &cb_pcidda_ranges,
-         },
-        {
-         .name = "pci-dda08/16",
-         .status = 0,
-         .device_id = 0x25,
-         .ao_chans = 8,
-         .ao_bits = 16,
-         .ranges = &cb_pcidda_ranges,
-         },
+                .name           = "pci-dda02/12",
+                .device_id      = PCI_DEVICE_ID_DDA02_12,
+                .ao_chans       = 2,
+                .ao_bits        = 12,
+        }, {
+                .name           = "pci-dda04/12",
+                .device_id      = PCI_DEVICE_ID_DDA04_12,
+                .ao_chans       = 4,
+                .ao_bits        = 12,
+        }, {
+                .name           = "pci-dda08/12",
+                .device_id      = PCI_DEVICE_ID_DDA08_12,
+                .ao_chans       = 8,
+                .ao_bits        = 12,
+        }, {
+                .name           = "pci-dda02/16",
+                .device_id      = PCI_DEVICE_ID_DDA02_16,
+                .ao_chans       = 2,
+                .ao_bits        = 16,
+        }, {
+                .name           = "pci-dda04/16",
+                .device_id      = PCI_DEVICE_ID_DDA04_16,
+                .ao_chans       = 4,
+                .ao_bits        = 16,
+        }, {
+                .name           = "pci-dda08/16",
+                .device_id      = PCI_DEVICE_ID_DDA08_16,
+                .ao_chans       = 8,
+                .ao_bits        = 16,
+        },
 };
 
-/*
- * 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.
- */
 struct cb_pcidda_private {
-        int data;
-
-        unsigned long digitalio;
-        unsigned long dac;
-
-        /* unsigned long control_status; */
-        /* unsigned long adc_fifo; */
-
         /* bits last written to da calibration register 1 */
         unsigned int dac_cal1_bits;
         /* current range settings for output channels */
@@ -217,181 +165,16 @@ struct cb_pcidda_private {
         u16 eeprom_data[EEPROM_SIZE];   /*  software copy of board's eeprom */
 };
 
-/*
- * I will program this later... ;-)
- */
-#if 0
-static int cb_pcidda_ai_cmd(struct comedi_device *dev,
-                            struct comedi_subdevice *s)
-{
-        printk("cb_pcidda_ai_cmd\n");
-        printk("subdev: %d\n", cmd->subdev);
-        printk("flags: %d\n", cmd->flags);
-        printk("start_src: %d\n", cmd->start_src);
-        printk("start_arg: %d\n", cmd->start_arg);
-        printk("scan_begin_src: %d\n", cmd->scan_begin_src);
-        printk("convert_src: %d\n", cmd->convert_src);
-        printk("convert_arg: %d\n", cmd->convert_arg);
-        printk("scan_end_src: %d\n", cmd->scan_end_src);
-        printk("scan_end_arg: %d\n", cmd->scan_end_arg);
-        printk("stop_src: %d\n", cmd->stop_src);
-        printk("stop_arg: %d\n", cmd->stop_arg);
-        printk("chanlist_len: %d\n", cmd->chanlist_len);
-}
-#endif
-
-#if 0
-static int cb_pcidda_ai_cmdtest(struct comedi_device *dev,
-                                struct comedi_subdevice *s,
-                                struct comedi_cmd *cmd)
-{
-        int err = 0;
-        int tmp;
-
-        /* Step 1 : check if triggers are trivially valid */
-
-        err |= cfc_check_trigger_src(&cmd->start_src, TRIG_NOW);
-        err |= cfc_check_trigger_src(&cmd->scan_begin_src,
-                                        TRIG_TIMER | TRIG_EXT);
-        err |= cfc_check_trigger_src(&cmd->convert_src,
-                                        TRIG_TIMER | TRIG_EXT);
-        err |= cfc_check_trigger_src(&cmd->scan_end_src, TRIG_COUNT);
-        err |= cfc_check_trigger_src(&cmd->stop_src, TRIG_COUNT | TRIG_NONE);
-
-        if (err)
-                return 1;
-
-        /* Step 2a : make sure trigger sources are unique */
-
-        err |= cfc_check_trigger_is_unique(cmd->scan_begin_src);
-        err |= cfc_check_trigger_is_unique(cmd->convert_src);
-        err |= cfc_check_trigger_is_unique(cmd->stop_src);
-
-        /* Step 2b : and mutually compatible */
-
-        if (err)
-                return 2;
-
-        /* step 3: make sure arguments are trivially compatible */
-
-        if (cmd->start_arg != 0) {
-                cmd->start_arg = 0;
-                err++;
-        }
-#define MAX_SPEED       10000   /* in nanoseconds */
-#define MIN_SPEED       1000000000      /* in nanoseconds */
-
-        if (cmd->scan_begin_src == TRIG_TIMER) {
-                if (cmd->scan_begin_arg < MAX_SPEED) {
-                        cmd->scan_begin_arg = MAX_SPEED;
-                        err++;
-                }
-                if (cmd->scan_begin_arg > MIN_SPEED) {
-                        cmd->scan_begin_arg = MIN_SPEED;
-                        err++;
-                }
-        } else {
-                /* external trigger */
-                /* should be level/edge, hi/lo specification here */
-                /* should specify multiple external triggers */
-                if (cmd->scan_begin_arg > 9) {
-                        cmd->scan_begin_arg = 9;
-                        err++;
-                }
-        }
-        if (cmd->convert_src == TRIG_TIMER) {
-                if (cmd->convert_arg < MAX_SPEED) {
-                        cmd->convert_arg = MAX_SPEED;
-                        err++;
-                }
-                if (cmd->convert_arg > MIN_SPEED) {
-                        cmd->convert_arg = MIN_SPEED;
-                        err++;
-                }
-        } else {
-                /* external trigger */
-                /* see above */
-                if (cmd->convert_arg > 9) {
-                        cmd->convert_arg = 9;
-                        err++;
-                }
-        }
-
-        if (cmd->scan_end_arg != cmd->chanlist_len) {
-                cmd->scan_end_arg = cmd->chanlist_len;
-                err++;
-        }
-        if (cmd->stop_src == TRIG_COUNT) {
-                if (cmd->stop_arg > 0x00ffffff) {
-                        cmd->stop_arg = 0x00ffffff;
-                        err++;
-                }
-        } else {
-                /* TRIG_NONE */
-                if (cmd->stop_arg != 0) {
-                        cmd->stop_arg = 0;
-                        err++;
-                }
-        }
-
-        if (err)
-                return 3;
-
-        /* step 4: fix up any arguments */
-
-        if (cmd->scan_begin_src == TRIG_TIMER) {
-                tmp = cmd->scan_begin_arg;
-                cb_pcidda_ns_to_timer(&cmd->scan_begin_arg,
-                                      cmd->flags & TRIG_ROUND_MASK);
-                if (tmp != cmd->scan_begin_arg)
-                        err++;
-        }
-        if (cmd->convert_src == TRIG_TIMER) {
-                tmp = cmd->convert_arg;
-                cb_pcidda_ns_to_timer(&cmd->convert_arg,
-                                      cmd->flags & TRIG_ROUND_MASK);
-                if (tmp != cmd->convert_arg)
-                        err++;
-                if (cmd->scan_begin_src == TRIG_TIMER &&
-                    cmd->scan_begin_arg <
-                    cmd->convert_arg * cmd->scan_end_arg) {
-                        cmd->scan_begin_arg =
-                            cmd->convert_arg * cmd->scan_end_arg;
-                        err++;
-                }
-        }
-
-        if (err)
-                return 4;
-
-        return 0;
-}
-#endif
-
-/* This function doesn't require a particular form, this is just
- * what happens to be used in some of the drivers.  It should
- * convert ns nanoseconds to a counter value suitable for programming
- * the device.  Also, it should adjust ns so that it cooresponds to
- * the actual time that the device will use. */
-#if 0
-static int cb_pcidda_ns_to_timer(unsigned int *ns, int round)
-{
-        /* trivial timer */
-        return *ns;
-}
-#endif
-
 /* lowlevel read from eeprom */
 static unsigned int cb_pcidda_serial_in(struct comedi_device *dev)
 {
-        struct cb_pcidda_private *devpriv = dev->private;
         unsigned int value = 0;
         int i;
         const int value_width = 16;     /*  number of bits wide values are */
 
         for (i = 1; i <= value_width; i++) {
                 /*  read bits most significant bit first */
-                if (inw_p(devpriv->dac + DACALIBRATION1) & SERIAL_OUT_BIT)
+                if (inw_p(dev->iobase + DACALIBRATION1) & SERIAL_OUT_BIT)
                         value |= 1 << (value_width - i);
         }
 
@@ -411,7 +194,7 @@ static void cb_pcidda_serial_out(struct comedi_device *dev, unsigned int value,
                         devpriv->dac_cal1_bits |= SERIAL_IN_BIT;
                 else
                         devpriv->dac_cal1_bits &= ~SERIAL_IN_BIT;
-                outw_p(devpriv->dac_cal1_bits, devpriv->dac + DACALIBRATION1);
+                outw_p(devpriv->dac_cal1_bits, dev->iobase + DACALIBRATION1);
         }
 }
 
@@ -419,7 +202,6 @@ static void cb_pcidda_serial_out(struct comedi_device *dev, unsigned int value,
 static unsigned int cb_pcidda_read_eeprom(struct comedi_device *dev,
                                           unsigned int address)
 {
-        struct cb_pcidda_private *devpriv = dev->private;
         unsigned int i;
         unsigned int cal2_bits;
         unsigned int value;
@@ -435,7 +217,7 @@ static unsigned int cb_pcidda_read_eeprom(struct comedi_device *dev,
         /*  deactivate caldacs (one caldac for every two channels) */
         for (i = 0; i < max_num_caldacs; i++)
                 cal2_bits |= DESELECT_CALDAC_BIT(i);
-        outw_p(cal2_bits, devpriv->dac + DACALIBRATION2);
+        outw_p(cal2_bits, dev->iobase + DACALIBRATION2);
 
         /*  tell eeprom we want to read */
         cb_pcidda_serial_out(dev, read_instruction, instruction_length);
@@ -446,7 +228,7 @@ static unsigned int cb_pcidda_read_eeprom(struct comedi_device *dev,
 
         /*  deactivate eeprom */
         cal2_bits &= ~SELECT_EEPROM_BIT;
-        outw_p(cal2_bits, devpriv->dac + DACALIBRATION2);
+        outw_p(cal2_bits, dev->iobase + DACALIBRATION2);
 
         return value;
 }
@@ -456,7 +238,6 @@ static void cb_pcidda_write_caldac(struct comedi_device *dev,
                                    unsigned int caldac, unsigned int channel,
                                    unsigned int value)
 {
-        struct cb_pcidda_private *devpriv = dev->private;
         unsigned int cal2_bits;
         unsigned int i;
         /* caldacs use 3 bit channel specification */
@@ -479,72 +260,10 @@ static void cb_pcidda_write_caldac(struct comedi_device *dev,
                 cal2_bits |= DESELECT_CALDAC_BIT(i);
         /*  activate the caldac we want */
         cal2_bits &= ~DESELECT_CALDAC_BIT(caldac);
-        outw_p(cal2_bits, devpriv->dac + DACALIBRATION2);
+        outw_p(cal2_bits, dev->iobase + DACALIBRATION2);
         /*  deactivate caldac */
         cal2_bits |= DESELECT_CALDAC_BIT(caldac);
-        outw_p(cal2_bits, devpriv->dac + DACALIBRATION2);
-}
-
-/* returns caldac that calibrates given analog out channel */
-static unsigned int caldac_number(unsigned int channel)
-{
-        return channel / 2;
-}
-
-/* returns caldac channel that provides fine gain for given ao channel */
-static unsigned int fine_gain_channel(unsigned int ao_channel)
-{
-        return 4 * (ao_channel % 2);
-}
-
-/* returns caldac channel that provides coarse gain for given ao channel */
-static unsigned int coarse_gain_channel(unsigned int ao_channel)
-{
-        return 1 + 4 * (ao_channel % 2);
-}
-
-/* returns caldac channel that provides coarse offset for given ao channel */
-static unsigned int coarse_offset_channel(unsigned int ao_channel)
-{
-        return 2 + 4 * (ao_channel % 2);
-}
-
-/* returns caldac channel that provides fine offset for given ao channel */
-static unsigned int fine_offset_channel(unsigned int ao_channel)
-{
-        return 3 + 4 * (ao_channel % 2);
-}
-
-/* returns eeprom address that provides offset for given ao channel and range */
-static unsigned int offset_eeprom_address(unsigned int ao_channel,
-                                          unsigned int range)
-{
-        return 0x7 + 2 * range + 12 * ao_channel;
-}
-
-/*
- * returns eeprom address that provides gain calibration for given ao
- * channel and range
- */
-static unsigned int gain_eeprom_address(unsigned int ao_channel,
-                                        unsigned int range)
-{
-        return 0x8 + 2 * range + 12 * ao_channel;
-}
-
-/*
- * returns upper byte of eeprom entry, which gives the coarse adjustment
- * values
- */
-static unsigned int eeprom_coarse_byte(unsigned int word)
-{
-        return (word >> 8) & 0xff;
-}
-
-/* returns lower byte of eeprom entry, which gives the fine adjustment values */
-static unsigned int eeprom_fine_byte(unsigned int word)
-{
-        return word & 0xff;
+        outw_p(cal2_bits, dev->iobase + DACALIBRATION2);
 }
 
 /* set caldacs to eeprom values for given channel and range */
@@ -552,85 +271,68 @@ static void cb_pcidda_calibrate(struct comedi_device *dev, unsigned int channel,
                                 unsigned int range)
 {
         struct cb_pcidda_private *devpriv = dev->private;
-        unsigned int coarse_offset, fine_offset, coarse_gain, fine_gain;
+        unsigned int caldac = channel / 2;      /* two caldacs per channel */
+        unsigned int chan = 4 * (channel % 2);  /* caldac channel base */
+        unsigned int index = 2 * range + 12 * channel;
+        unsigned int offset;
+        unsigned int gain;
 
-        /* remember range so we can tell when we need to readjust calibration */
+        /* save range so we can tell when we need to readjust calibration */
         devpriv->ao_range[channel] = range;
 
-        /*  get values from eeprom data */
-        coarse_offset =
-            eeprom_coarse_byte(devpriv->eeprom_data
-                               [offset_eeprom_address(channel, range)]);
-        fine_offset =
-            eeprom_fine_byte(devpriv->eeprom_data
-                             [offset_eeprom_address(channel, range)]);
-        coarse_gain =
-            eeprom_coarse_byte(devpriv->eeprom_data
-                               [gain_eeprom_address(channel, range)]);
-        fine_gain =
-            eeprom_fine_byte(devpriv->eeprom_data
-                             [gain_eeprom_address(channel, range)]);
-
-        /*  set caldacs */
-        cb_pcidda_write_caldac(dev, caldac_number(channel),
-                               coarse_offset_channel(channel), coarse_offset);
-        cb_pcidda_write_caldac(dev, caldac_number(channel),
-                               fine_offset_channel(channel), fine_offset);
-        cb_pcidda_write_caldac(dev, caldac_number(channel),
-                               coarse_gain_channel(channel), coarse_gain);
-        cb_pcidda_write_caldac(dev, caldac_number(channel),
-                               fine_gain_channel(channel), fine_gain);
+        /* get values from eeprom data */
+        offset = devpriv->eeprom_data[0x7 + index];
+        gain = devpriv->eeprom_data[0x8 + index];
+
+        /* set caldacs */
+        cb_pcidda_write_caldac(dev, caldac, chan + CB_DDA_CALDAC_COURSE_OFFSET,
+                               (offset >> 8) & 0xff);
+        cb_pcidda_write_caldac(dev, caldac, chan + CB_DDA_CALDAC_FINE_OFFSET,
+                               offset & 0xff);
+        cb_pcidda_write_caldac(dev, caldac, chan + CB_DDA_CALDAC_COURSE_GAIN,
+                               (gain >> 8) & 0xff);
+        cb_pcidda_write_caldac(dev, caldac, chan + CB_DDA_CALDAC_FINE_GAIN,
+                               gain & 0xff);
 }
 
-static int cb_pcidda_ao_winsn(struct comedi_device *dev,
-                              struct comedi_subdevice *s,
-                              struct comedi_insn *insn, unsigned int *data)
+static int cb_pcidda_ao_insn_write(struct comedi_device *dev,
+                                   struct comedi_subdevice *s,
+                                   struct comedi_insn *insn,
+                                   unsigned int *data)
 {
         struct cb_pcidda_private *devpriv = dev->private;
-        unsigned int command;
-        unsigned int channel, range;
-
-        channel = CR_CHAN(insn->chanspec);
-        range = CR_RANGE(insn->chanspec);
+        unsigned int channel = CR_CHAN(insn->chanspec);
+        unsigned int range = CR_RANGE(insn->chanspec);
+        unsigned int ctrl;
 
-        /*  adjust calibration dacs if range has changed */
         if (range != devpriv->ao_range[channel])
                 cb_pcidda_calibrate(dev, channel, range);
 
-        /* output channel configuration */
-        command = NOSU | ENABLEDAC;
+        ctrl = CB_DDA_DA_CTRL_EN | CB_DDA_DA_CTRL_DAC(channel);
 
-        /* output channel range */
         switch (range) {
         case 0:
-                command |= BIP | RANGE10V;
-                break;
-        case 1:
-                command |= BIP | RANGE5V;
-                break;
-        case 2:
-                command |= BIP | RANGE2V5;
-                break;
         case 3:
-                command |= UNIP | RANGE10V;
+                ctrl |= CB_DDA_DA_CTRL_RANGE10V;
                 break;
+        case 1:
         case 4:
-                command |= UNIP | RANGE5V;
+                ctrl |= CB_DDA_DA_CTRL_RANGE5V;
                 break;
+        case 2:
         case 5:
-                command |= UNIP | RANGE2V5;
+                ctrl |= CB_DDA_DA_CTRL_RANGE2V5;
                 break;
         }
 
-        /* output channel specification */
-        command |= channel << 2;
-        outw(command, devpriv->dac + DACONTROL);
+        if (range > 2)
+                ctrl |= CB_DDA_DA_CTRL_UNIP;
 
-        /* write data */
-        outw(data[0], devpriv->dac + DADATA + channel * 2);
+        outw(ctrl, dev->iobase + CB_DDA_DA_CTRL_REG);
 
-        /* return the number of samples read/written */
-        return 1;
+        outw(data[0], dev->iobase + CB_DDA_DA_DATA_REG(channel));
+
+        return insn->n;
 }
 
 static const void *cb_pcidda_find_boardinfo(struct comedi_device *dev,
@@ -647,41 +349,33 @@ static const void *cb_pcidda_find_boardinfo(struct comedi_device *dev,
         return NULL;
 }
 
-static int cb_pcidda_attach_pci(struct comedi_device *dev,
-                                struct pci_dev *pcidev)
+static int cb_pcidda_auto_attach(struct comedi_device *dev,
+                                           unsigned long context_unused)
 {
+        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
         const struct cb_pcidda_board *thisboard;
         struct cb_pcidda_private *devpriv;
         struct comedi_subdevice *s;
-        int index;
+        unsigned long iobase_8255;
+        int i;
         int ret;
 
-        comedi_set_hw_dev(dev, &pcidev->dev);
-
         thisboard = cb_pcidda_find_boardinfo(dev, pcidev);
-        if (!pcidev)
+        if (!thisboard)
                 return -ENODEV;
         dev->board_ptr = thisboard;
         dev->board_name = thisboard->name;
 
-        ret = alloc_private(dev, sizeof(*devpriv));
-        if (ret)
-                return ret;
-        devpriv = dev->private;
+        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
+        if (!devpriv)
+                return -ENOMEM;
+        dev->private = devpriv;
 
         ret = comedi_pci_enable(pcidev, dev->board_name);
         if (ret)
                 return ret;
-
-        devpriv->digitalio = pci_resource_start(pcidev, 2);
-        devpriv->dac = pci_resource_start(pcidev, 3);
-        dev->iobase = devpriv->dac;
-
-        if (thisboard->status == 2)
-                printk
-                    ("WARNING: DRIVER FOR THIS BOARD NOT CHECKED WITH MANUAL. "
-                     "WORKS ASSUMING FULL COMPATIBILITY WITH PCI-DDA08/12. "
-                     "PLEASE REPORT USAGE TO <ivanmr@altavista.com>.\n");
+        dev->iobase = pci_resource_start(pcidev, 3);
+        iobase_8255 = pci_resource_start(pcidev, 2);
 
         ret = comedi_alloc_subdevices(dev, 3);
         if (ret)
@@ -693,29 +387,24 @@ static int cb_pcidda_attach_pci(struct comedi_device *dev,
         s->subdev_flags = SDF_WRITABLE;
         s->n_chan = thisboard->ao_chans;
         s->maxdata = (1 << thisboard->ao_bits) - 1;
-        s->range_table = thisboard->ranges;
-        s->insn_write = cb_pcidda_ao_winsn;
-
-        /* s->subdev_flags |= SDF_CMD_READ; */
-        /* s->do_cmd = cb_pcidda_ai_cmd; */
-        /* s->do_cmdtest = cb_pcidda_ai_cmdtest; */
-
-        /*  two 8255 digital io subdevices */
-        s = &dev->subdevices[1];
-        subdev_8255_init(dev, s, NULL, devpriv->digitalio);
-        s = &dev->subdevices[2];
-        subdev_8255_init(dev, s, NULL, devpriv->digitalio + PORT2A);
-
-        dev_dbg(dev->class_dev, "eeprom:\n");
-        for (index = 0; index < EEPROM_SIZE; index++) {
-                devpriv->eeprom_data[index] = cb_pcidda_read_eeprom(dev, index);
-                dev_dbg(dev->class_dev, "%i:0x%x\n", index,
-                        devpriv->eeprom_data[index]);
+        s->range_table = &cb_pcidda_ranges;
+        s->insn_write = cb_pcidda_ao_insn_write;
+
+        /* two 8255 digital io subdevices */
+        for (i = 0; i < 2; i++) {
+                s = &dev->subdevices[1 + i];
+                ret = subdev_8255_init(dev, s, NULL, iobase_8255 + (i * 4));
+                if (ret)
+                        return ret;
         }
 
+        /* Read the caldac eeprom data */
+        for (i = 0; i < EEPROM_SIZE; i++)
+                devpriv->eeprom_data[i] = cb_pcidda_read_eeprom(dev, i);
+
         /*  set calibrations dacs */
-        for (index = 0; index < thisboard->ao_chans; index++)
-                cb_pcidda_calibrate(dev, index, devpriv->ao_range[index]);
+        for (i = 0; i < thisboard->ao_chans; i++)
+                cb_pcidda_calibrate(dev, i, devpriv->ao_range[i]);
 
         dev_info(dev->class_dev, "%s attached\n", dev->board_name);
 
@@ -739,28 +428,28 @@ static void cb_pcidda_detach(struct comedi_device *dev)
 static struct comedi_driver cb_pcidda_driver = {
         .driver_name    = "cb_pcidda",
         .module         = THIS_MODULE,
-        .attach_pci     = cb_pcidda_attach_pci,
+        .auto_attach    = cb_pcidda_auto_attach,
         .detach         = cb_pcidda_detach,
 };
 
-static int __devinit cb_pcidda_pci_probe(struct pci_dev *dev,
+static int cb_pcidda_pci_probe(struct pci_dev *dev,
                                          const struct pci_device_id *ent)
 {
         return comedi_pci_auto_config(dev, &cb_pcidda_driver);
 }
 
-static void __devexit cb_pcidda_pci_remove(struct pci_dev *dev)
+static void cb_pcidda_pci_remove(struct pci_dev *dev)
 {
         comedi_pci_auto_unconfig(dev);
 }
 
 static DEFINE_PCI_DEVICE_TABLE(cb_pcidda_pci_table) = {
-        { PCI_DEVICE(PCI_VENDOR_ID_CB, 0x0020) },
-        { PCI_DEVICE(PCI_VENDOR_ID_CB, 0x0021) },
-        { PCI_DEVICE(PCI_VENDOR_ID_CB, 0x0022) },
-        { PCI_DEVICE(PCI_VENDOR_ID_CB, 0x0023) },
-        { PCI_DEVICE(PCI_VENDOR_ID_CB, 0x0024) },
-        { PCI_DEVICE(PCI_VENDOR_ID_CB, 0x0025) },
+        { PCI_DEVICE(PCI_VENDOR_ID_CB, PCI_DEVICE_ID_DDA02_12) },
+        { PCI_DEVICE(PCI_VENDOR_ID_CB, PCI_DEVICE_ID_DDA04_12) },
+        { PCI_DEVICE(PCI_VENDOR_ID_CB, PCI_DEVICE_ID_DDA08_12) },
+        { PCI_DEVICE(PCI_VENDOR_ID_CB, PCI_DEVICE_ID_DDA02_16) },
+        { PCI_DEVICE(PCI_VENDOR_ID_CB, PCI_DEVICE_ID_DDA04_16) },
+        { PCI_DEVICE(PCI_VENDOR_ID_CB, PCI_DEVICE_ID_DDA08_16) },
         { 0 }
 };
 MODULE_DEVICE_TABLE(pci, cb_pcidda_pci_table);
@@ -769,7 +458,7 @@ static struct pci_driver cb_pcidda_pci_driver = {
         .name           = "cb_pcidda",
         .id_table       = cb_pcidda_pci_table,
         .probe          = cb_pcidda_pci_probe,
-        .remove         = __devexit_p(cb_pcidda_pci_remove),
+        .remove         = cb_pcidda_pci_remove,
 };
 module_comedi_pci_driver(cb_pcidda_driver, cb_pcidda_pci_driver);
 
diff --git a/drivers/staging/comedi/drivers/cb_pcimdas.c b/drivers/staging/comedi/drivers/cb_pcimdas.c
index 9515b6926662..b43a5f80ac26 100644
--- a/drivers/staging/comedi/drivers/cb_pcimdas.c
+++ b/drivers/staging/comedi/drivers/cb_pcimdas.c
@@ -51,8 +51,6 @@ See http://www.mccdaq.com/PDFs/Manuals/pcim-das1602-16.pdf for more details.
 /* #define CBPCIMDAS_DEBUG */
 #undef CBPCIMDAS_DEBUG
 
-#define PCI_VENDOR_ID_COMPUTERBOARDS    0x1307
-
 /* Registers for the PCIM-DAS1602/16 */
 
 /* sizes of io regions (bytes) */
@@ -80,44 +78,6 @@ See http://www.mccdaq.com/PDFs/Manuals/pcim-das1602-16.pdf for more details.
 #define RESID_COUNT_H 13
 #define RESID_COUNT_L 14
 
-/* Board description */
-struct cb_pcimdas_board {
-        const char *name;
-        unsigned short device_id;
-        int ai_se_chans;        /*  Inputs in single-ended mode */
-        int ai_diff_chans;      /*  Inputs in differential mode */
-        int ai_bits;            /*  analog input resolution */
-        int ai_speed;           /*  fastest conversion period in ns */
-        int ao_nchan;           /*  number of analog out channels */
-        int ao_bits;            /*  analogue output resolution */
-        int has_ao_fifo;        /*  analog output has fifo */
-        int ao_scan_speed;      /*  analog output speed for 1602 series (for a scan, not conversion) */
-        int fifo_size;          /*  number of samples fifo can hold */
-        int dio_bits;           /*  number of dio bits */
-        int has_dio;            /*  has DIO */
-        const struct comedi_lrange *ranges;
-};
-
-static const struct cb_pcimdas_board cb_pcimdas_boards[] = {
-        {
-         .name = "PCIM-DAS1602/16",
-         .device_id = 0x56,
-         .ai_se_chans = 16,
-         .ai_diff_chans = 8,
-         .ai_bits = 16,
-         .ai_speed = 10000,     /* ?? */
-         .ao_nchan = 2,
-         .ao_bits = 12,
-         .has_ao_fifo = 0,      /* ?? */
-         .ao_scan_speed = 10000,
-         /* ?? */
-         .fifo_size = 1024,
-         .dio_bits = 24,
-         .has_dio = 1,
-/*      .ranges = &cb_pcimdas_ranges, */
-         },
-};
-
 /*
  * this structure is for data unique to this hardware driver.  If
  * several hardware drivers keep similar information in this structure,
@@ -140,7 +100,6 @@ static int cb_pcimdas_ai_rinsn(struct comedi_device *dev,
                                struct comedi_subdevice *s,
                                struct comedi_insn *insn, unsigned int *data)
 {
-        const struct cb_pcimdas_board *thisboard = comedi_board(dev);
         struct cb_pcimdas_private *devpriv = dev->private;
         int n, i;
         unsigned int d;
@@ -153,9 +112,9 @@ static int cb_pcimdas_ai_rinsn(struct comedi_device *dev,
 
         /* check channel number */
         if ((inb(devpriv->BADR3 + 2) & 0x20) == 0)      /* differential mode */
-                maxchans = thisboard->ai_diff_chans;
+                maxchans = s->n_chan / 2;
         else
-                maxchans = thisboard->ai_se_chans;
+                maxchans = s->n_chan;
 
         if (chan > (maxchans - 1))
                 return -ETIMEDOUT;      /* *** Wrong error code. Fixme. */
@@ -195,12 +154,7 @@ static int cb_pcimdas_ai_rinsn(struct comedi_device *dev,
                         return -ETIMEDOUT;
                 }
                 /* read data */
-                d = inw(dev->iobase + 0);
-
-                /* mangle the data as necessary */
-                /* d ^= 1<<(thisboard->ai_bits-1); // 16 bit data from ADC, so no mangle needed. */
-
-                data[n] = d;
+                data[n] = inw(dev->iobase + 0);
         }
 
         /* return the number of samples read/written */
@@ -251,51 +205,21 @@ static int cb_pcimdas_ao_rinsn(struct comedi_device *dev,
         return i;
 }
 
-static const void *cb_pcimdas_find_boardinfo(struct comedi_device *dev,
-                                             struct pci_dev *pcidev)
+static int cb_pcimdas_auto_attach(struct comedi_device *dev,
+                                            unsigned long context_unused)
 {
-        const struct cb_pcimdas_board *thisboard;
-        int i;
-
-        for (i = 0; i < ARRAY_SIZE(cb_pcimdas_boards); i++) {
-                thisboard = &cb_pcimdas_boards[i];
-                if (thisboard->device_id == pcidev->device)
-                        return thisboard;
-        }
-        return NULL;
-}
-
-static int cb_pcimdas_attach_pci(struct comedi_device *dev,
-                                 struct pci_dev *pcidev)
-{
-        const struct cb_pcimdas_board *thisboard;
+        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
         struct cb_pcimdas_private *devpriv;
         struct comedi_subdevice *s;
         unsigned long iobase_8255;
         int ret;
 
-        comedi_set_hw_dev(dev, &pcidev->dev);
+        dev->board_name = dev->driver->driver_name;
 
-        thisboard = cb_pcimdas_find_boardinfo(dev, pcidev);
-        if (!thisboard)
-                return -ENODEV;
-        dev->board_ptr = thisboard;
-        dev->board_name = thisboard->name;
-
-        ret = alloc_private(dev, sizeof(*devpriv));
-        if (ret)
-                return ret;
-        devpriv = dev->private;
-
-        /*  Warn about non-tested features */
-        switch (thisboard->device_id) {
-        case 0x56:
-                break;
-        default:
-                dev_dbg(dev->class_dev, "THIS CARD IS UNSUPPORTED.\n");
-                dev_dbg(dev->class_dev,
-                        "PLEASE REPORT USAGE TO <mocelet@sucs.org>\n");
-        }
+        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
+        if (!devpriv)
+                return -ENOMEM;
+        dev->private = devpriv;
 
         ret = comedi_pci_enable(pcidev, dev->board_name);
         if (ret)
@@ -323,8 +247,8 @@ static int cb_pcimdas_attach_pci(struct comedi_device *dev,
         /*  analog input subdevice */
         s->type = COMEDI_SUBD_AI;
         s->subdev_flags = SDF_READABLE | SDF_GROUND;
-        s->n_chan = thisboard->ai_se_chans;
-        s->maxdata = (1 << thisboard->ai_bits) - 1;
+        s->n_chan = 16;
+        s->maxdata = 0xffff;
         s->range_table = &range_unknown;
         s->len_chanlist = 1;    /*  This is the maximum chanlist length that */
         /*  the board can handle */
@@ -334,8 +258,8 @@ static int cb_pcimdas_attach_pci(struct comedi_device *dev,
         /*  analog output subdevice */
         s->type = COMEDI_SUBD_AO;
         s->subdev_flags = SDF_WRITABLE;
-        s->n_chan = thisboard->ao_nchan;
-        s->maxdata = 1 << thisboard->ao_bits;
+        s->n_chan = 2;
+        s->maxdata = 0xfff;
         /* ranges are hardware settable, but not software readable. */
         s->range_table = &range_unknown;
         s->insn_write = &cb_pcimdas_ao_winsn;
@@ -343,10 +267,7 @@ static int cb_pcimdas_attach_pci(struct comedi_device *dev,
 
         s = &dev->subdevices[2];
         /* digital i/o subdevice */
-        if (thisboard->has_dio)
-                subdev_8255_init(dev, s, NULL, iobase_8255);
-        else
-                s->type = COMEDI_SUBD_UNUSED;
+        subdev_8255_init(dev, s, NULL, iobase_8255);
 
         dev_info(dev->class_dev, "%s attached\n", dev->board_name);
 
@@ -368,23 +289,23 @@ static void cb_pcimdas_detach(struct comedi_device *dev)
 static struct comedi_driver cb_pcimdas_driver = {
         .driver_name    = "cb_pcimdas",
         .module         = THIS_MODULE,
-        .attach_pci     = cb_pcimdas_attach_pci,
+        .auto_attach    = cb_pcimdas_auto_attach,
         .detach         = cb_pcimdas_detach,
 };
 
-static int __devinit cb_pcimdas_pci_probe(struct pci_dev *dev,
+static int cb_pcimdas_pci_probe(struct pci_dev *dev,
                                           const struct pci_device_id *ent)
 {
         return comedi_pci_auto_config(dev, &cb_pcimdas_driver);
 }
 
-static void __devexit cb_pcimdas_pci_remove(struct pci_dev *dev)
+static void cb_pcimdas_pci_remove(struct pci_dev *dev)
 {
         comedi_pci_auto_unconfig(dev);
 }
 
 static DEFINE_PCI_DEVICE_TABLE(cb_pcimdas_pci_table) = {
-        { PCI_DEVICE(PCI_VENDOR_ID_COMPUTERBOARDS, 0x0056) },
+        { PCI_DEVICE(PCI_VENDOR_ID_CB, 0x0056) },
         { 0 }
 };
 MODULE_DEVICE_TABLE(pci, cb_pcimdas_pci_table);
@@ -393,7 +314,7 @@ static struct pci_driver cb_pcimdas_pci_driver = {
         .name           = "cb_pcimdas",
         .id_table       = cb_pcimdas_pci_table,
         .probe          = cb_pcimdas_pci_probe,
-        .remove         = __devexit_p(cb_pcimdas_pci_remove),
+        .remove         = cb_pcimdas_pci_remove,
 };
 module_comedi_pci_driver(cb_pcimdas_driver, cb_pcimdas_pci_driver);
 
diff --git a/drivers/staging/comedi/drivers/cb_pcimdda.c b/drivers/staging/comedi/drivers/cb_pcimdda.c
index ba9f0599be28..699b84f54cc7 100644
--- a/drivers/staging/comedi/drivers/cb_pcimdda.c
+++ b/drivers/staging/comedi/drivers/cb_pcimdda.c
@@ -84,7 +84,6 @@ Configuration Options: not applicable, uses PCI auto config
 #include "8255.h"
 
 /* device ids of the cards we support -- currently only 1 card supported */
-#define PCI_VENDOR_ID_COMPUTERBOARDS    0x1307
 #define PCI_ID_PCIM_DDA06_16            0x0053
 
 /*
@@ -152,20 +151,20 @@ static int cb_pcimdda_ao_rinsn(struct comedi_device *dev,
         return insn->n;
 }
 
-static int cb_pcimdda_attach_pci(struct comedi_device *dev,
-                                 struct pci_dev *pcidev)
+static int cb_pcimdda_auto_attach(struct comedi_device *dev,
+                                            unsigned long context_unused)
 {
+        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
         struct cb_pcimdda_private *devpriv;
         struct comedi_subdevice *s;
         int ret;
 
-        comedi_set_hw_dev(dev, &pcidev->dev);
         dev->board_name = dev->driver->driver_name;
 
-        ret = alloc_private(dev, sizeof(*devpriv));
-        if (ret)
-                return ret;
-        devpriv = dev->private;
+        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
+        if (!devpriv)
+                return -ENOMEM;
+        dev->private = devpriv;
 
         ret = comedi_pci_enable(pcidev, dev->board_name);
         if (ret)
@@ -213,23 +212,23 @@ static void cb_pcimdda_detach(struct comedi_device *dev)
 static struct comedi_driver cb_pcimdda_driver = {
         .driver_name    = "cb_pcimdda",
         .module         = THIS_MODULE,
-        .attach_pci     = cb_pcimdda_attach_pci,
+        .auto_attach    = cb_pcimdda_auto_attach,
         .detach         = cb_pcimdda_detach,
 };
 
-static int __devinit cb_pcimdda_pci_probe(struct pci_dev *dev,
+static int cb_pcimdda_pci_probe(struct pci_dev *dev,
                                           const struct pci_device_id *ent)
 {
         return comedi_pci_auto_config(dev, &cb_pcimdda_driver);
 }
 
-static void __devexit cb_pcimdda_pci_remove(struct pci_dev *dev)
+static void cb_pcimdda_pci_remove(struct pci_dev *dev)
 {
         comedi_pci_auto_unconfig(dev);
 }
 
 static DEFINE_PCI_DEVICE_TABLE(cb_pcimdda_pci_table) = {
-        { PCI_DEVICE(PCI_VENDOR_ID_COMPUTERBOARDS, PCI_ID_PCIM_DDA06_16) },
+        { PCI_DEVICE(PCI_VENDOR_ID_CB, PCI_ID_PCIM_DDA06_16) },
         { 0 }
 };
 MODULE_DEVICE_TABLE(pci, cb_pcimdda_pci_table);
@@ -238,7 +237,7 @@ static struct pci_driver cb_pcimdda_driver_pci_driver = {
         .name           = "cb_pcimdda",
         .id_table       = cb_pcimdda_pci_table,
         .probe          = cb_pcimdda_pci_probe,
-        .remove         = __devexit_p(cb_pcimdda_pci_remove),
+        .remove         = cb_pcimdda_pci_remove,
 };
 module_comedi_pci_driver(cb_pcimdda_driver, cb_pcimdda_driver_pci_driver);
 
diff --git a/drivers/staging/comedi/drivers/comedi_bond.c b/drivers/staging/comedi/drivers/comedi_bond.c
index 5c768bc76eb1..31515999bb97 100644
--- a/drivers/staging/comedi/drivers/comedi_bond.c
+++ b/drivers/staging/comedi/drivers/comedi_bond.c
@@ -304,10 +304,10 @@ static int bonding_attach(struct comedi_device *dev,
         struct comedi_subdevice *s;
         int ret;
 
-        ret = alloc_private(dev, sizeof(*devpriv));
-        if (ret)
-                return ret;
-        devpriv = dev->private;
+        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
+        if (!devpriv)
+                return -ENOMEM;
+        dev->private = devpriv;
 
         /*
          * Setup our bonding from config params.. sets up our private struct..
diff --git a/drivers/staging/comedi/drivers/comedi_fc.c b/drivers/staging/comedi/drivers/comedi_fc.c
index 63be619dd606..83728298eefb 100644
--- a/drivers/staging/comedi/drivers/comedi_fc.c
+++ b/drivers/staging/comedi/drivers/comedi_fc.c
@@ -53,7 +53,7 @@ unsigned int cfc_write_array_to_buffer(struct comedi_subdevice *subd,
 
         retval = comedi_buf_write_alloc(async, num_bytes);
         if (retval != num_bytes) {
-                printk(KERN_WARNING "comedi: buffer overrun\n");
+                dev_warn(subd->device->class_dev, "comedi: buffer overrun\n");
                 async->events |= COMEDI_CB_OVERFLOW;
                 return 0;
         }
diff --git a/drivers/staging/comedi/drivers/comedi_fc.h b/drivers/staging/comedi/drivers/comedi_fc.h
index 94481c637a0a..31afab79f39a 100644
--- a/drivers/staging/comedi/drivers/comedi_fc.h
+++ b/drivers/staging/comedi/drivers/comedi_fc.h
@@ -105,4 +105,48 @@ static inline int cfc_check_trigger_is_unique(unsigned int src)
         return 0;
 }
 
+/**
+ * cfc_check_trigger_arg_is() - trivially validate a trigger argument
+ * @arg: pointer to the trigger arg to validate
+ * @val: the value the argument should be
+ */
+static inline int cfc_check_trigger_arg_is(unsigned int *arg, unsigned int val)
+{
+        if (*arg != val) {
+                *arg = val;
+                return -EINVAL;
+        }
+        return 0;
+}
+
+/**
+ * cfc_check_trigger_arg_min() - trivially validate a trigger argument
+ * @arg: pointer to the trigger arg to validate
+ * @val: the minimum value the argument should be
+ */
+static inline int cfc_check_trigger_arg_min(unsigned int *arg,
+                                            unsigned int val)
+{
+        if (*arg < val) {
+                *arg = val;
+                return -EINVAL;
+        }
+        return 0;
+}
+
+/**
+ * cfc_check_trigger_arg_max() - trivially validate a trigger argument
+ * @arg: pointer to the trigger arg to validate
+ * @val: the maximum value the argument should be
+ */
+static inline int cfc_check_trigger_arg_max(unsigned int *arg,
+                                            unsigned int val)
+{
+        if (*arg > val) {
+                *arg = val;
+                return -EINVAL;
+        }
+        return 0;
+}
+
 #endif /* _COMEDI_FC_H */
diff --git a/drivers/staging/comedi/drivers/comedi_parport.c b/drivers/staging/comedi/drivers/comedi_parport.c
index 22ef94242590..76d59dcbea07 100644
--- a/drivers/staging/comedi/drivers/comedi_parport.c
+++ b/drivers/staging/comedi/drivers/comedi_parport.c
@@ -196,28 +196,13 @@ static int parport_intr_cmdtest(struct comedi_device *dev,
         if (err)
                 return 2;
 
-        /* step 3: */
+        /* Step 3: check if arguments are trivially valid */
 
-        if (cmd->start_arg != 0) {
-                cmd->start_arg = 0;
-                err++;
-        }
-        if (cmd->scan_begin_arg != 0) {
-                cmd->scan_begin_arg = 0;
-                err++;
-        }
-        if (cmd->convert_arg != 0) {
-                cmd->convert_arg = 0;
-                err++;
-        }
-        if (cmd->scan_end_arg != 1) {
-                cmd->scan_end_arg = 1;
-                err++;
-        }
-        if (cmd->stop_arg != 0) {
-                cmd->stop_arg = 0;
-                err++;
-        }
+        err |= cfc_check_trigger_arg_is(&cmd->start_arg, 0);
+        err |= cfc_check_trigger_arg_is(&cmd->scan_begin_arg, 0);
+        err |= cfc_check_trigger_arg_is(&cmd->convert_arg, 0);
+        err |= cfc_check_trigger_arg_is(&cmd->scan_end_arg, 1);
+        err |= cfc_check_trigger_arg_is(&cmd->stop_arg, 0);
 
         if (err)
                 return 3;
@@ -305,10 +290,10 @@ static int parport_attach(struct comedi_device *dev,
         if (ret)
                 return ret;
 
-        ret = alloc_private(dev, sizeof(*devpriv));
-        if (ret < 0)
-                return ret;
-        devpriv = dev->private;
+        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
+        if (!devpriv)
+                return -ENOMEM;
+        dev->private = devpriv;
 
         s = &dev->subdevices[0];
         s->type = COMEDI_SUBD_DIO;
diff --git a/drivers/staging/comedi/drivers/comedi_test.c b/drivers/staging/comedi/drivers/comedi_test.c
index 7817def1556c..fb3d09323ba1 100644
--- a/drivers/staging/comedi/drivers/comedi_test.c
+++ b/drivers/staging/comedi/drivers/comedi_test.c
@@ -252,55 +252,28 @@ static int waveform_ai_cmdtest(struct comedi_device *dev,
         if (err)
                 return 2;
 
-        /* step 3: make sure arguments are trivially compatible */
+        /* Step 3: check if arguments are trivially valid */
+
+        err |= cfc_check_trigger_arg_is(&cmd->start_arg, 0);
+
+        if (cmd->convert_src == TRIG_NOW)
+                err |= cfc_check_trigger_arg_is(&cmd->convert_arg, 0);
 
-        if (cmd->start_arg != 0) {
-                cmd->start_arg = 0;
-                err++;
-        }
-        if (cmd->convert_src == TRIG_NOW) {
-                if (cmd->convert_arg != 0) {
-                        cmd->convert_arg = 0;
-                        err++;
-                }
-        }
         if (cmd->scan_begin_src == TRIG_TIMER) {
-                if (cmd->scan_begin_arg < nano_per_micro) {
-                        cmd->scan_begin_arg = nano_per_micro;
-                        err++;
-                }
-                if (cmd->convert_src == TRIG_TIMER &&
-                    cmd->scan_begin_arg <
-                    cmd->convert_arg * cmd->chanlist_len) {
-                        cmd->scan_begin_arg =
-                            cmd->convert_arg * cmd->chanlist_len;
-                        err++;
-                }
-        }
-        /*
-         * XXX these checks are generic and should go in core if not there
-         * already
-         */
-        if (!cmd->chanlist_len) {
-                cmd->chanlist_len = 1;
-                err++;
-        }
-        if (cmd->scan_end_arg != cmd->chanlist_len) {
-                cmd->scan_end_arg = cmd->chanlist_len;
-                err++;
+                err |= cfc_check_trigger_arg_min(&cmd->scan_begin_arg,
+                                                 nano_per_micro);
+                if (cmd->convert_src == TRIG_TIMER)
+                        err |= cfc_check_trigger_arg_min(&cmd->scan_begin_arg,
+                                        cmd->convert_arg * cmd->chanlist_len);
         }
 
-        if (cmd->stop_src == TRIG_COUNT) {
-                if (!cmd->stop_arg) {
-                        cmd->stop_arg = 1;
-                        err++;
-                }
-        } else {                /* TRIG_NONE */
-                if (cmd->stop_arg != 0) {
-                        cmd->stop_arg = 0;
-                        err++;
-                }
-        }
+        err |= cfc_check_trigger_arg_min(&cmd->chanlist_len, 1);
+        err |= cfc_check_trigger_arg_is(&cmd->scan_end_arg, cmd->chanlist_len);
+
+        if (cmd->stop_src == TRIG_COUNT)
+                err |= cfc_check_trigger_arg_min(&cmd->stop_arg, 1);
+        else    /* TRIG_NONE */
+                err |= cfc_check_trigger_arg_is(&cmd->stop_arg, 0);
 
         if (err)
                 return 3;
@@ -414,10 +387,10 @@ static int waveform_attach(struct comedi_device *dev,
 
         dev->board_name = dev->driver->driver_name;
 
-        ret = alloc_private(dev, sizeof(*devpriv));
-        if (ret < 0)
-                return ret;
-        devpriv = dev->private;
+        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
+        if (!devpriv)
+                return -ENOMEM;
+        dev->private = devpriv;
 
         /* set default amplitude and period */
         if (amplitude <= 0)
diff --git a/drivers/staging/comedi/drivers/contec_pci_dio.c b/drivers/staging/comedi/drivers/contec_pci_dio.c
index 178a6a4bb7d5..1a18fa37bfd0 100644
--- a/drivers/staging/comedi/drivers/contec_pci_dio.c
+++ b/drivers/staging/comedi/drivers/contec_pci_dio.c
@@ -68,14 +68,13 @@ static int contec_di_insn_bits(struct comedi_device *dev,
         return insn->n;
 }
 
-static int contec_attach_pci(struct comedi_device *dev,
-                             struct pci_dev *pcidev)
+static int contec_auto_attach(struct comedi_device *dev,
+                                        unsigned long context_unused)
 {
+        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
         struct comedi_subdevice *s;
         int ret;
 
-        comedi_set_hw_dev(dev, &pcidev->dev);
-
         dev->board_name = dev->driver->driver_name;
 
         ret = comedi_pci_enable(pcidev, dev->board_name);
@@ -121,17 +120,17 @@ static void contec_detach(struct comedi_device *dev)
 static struct comedi_driver contec_pci_dio_driver = {
         .driver_name    = "contec_pci_dio",
         .module         = THIS_MODULE,
-        .attach_pci     = contec_attach_pci,
+        .auto_attach    = contec_auto_attach,
         .detach         = contec_detach,
 };
 
-static int __devinit contec_pci_dio_pci_probe(struct pci_dev *dev,
+static int contec_pci_dio_pci_probe(struct pci_dev *dev,
                                               const struct pci_device_id *ent)
 {
         return comedi_pci_auto_config(dev, &contec_pci_dio_driver);
 }
 
-static void __devexit contec_pci_dio_pci_remove(struct pci_dev *dev)
+static void contec_pci_dio_pci_remove(struct pci_dev *dev)
 {
         comedi_pci_auto_unconfig(dev);
 }
@@ -146,7 +145,7 @@ static struct pci_driver contec_pci_dio_pci_driver = {
         .name           = "contec_pci_dio",
         .id_table       = contec_pci_dio_pci_table,
         .probe          = contec_pci_dio_pci_probe,
-        .remove         = __devexit_p(contec_pci_dio_pci_remove),
+        .remove         = contec_pci_dio_pci_remove,
 };
 module_comedi_pci_driver(contec_pci_dio_driver, contec_pci_dio_pci_driver);
 
diff --git a/drivers/staging/comedi/drivers/daqboard2000.c b/drivers/staging/comedi/drivers/daqboard2000.c
index d13c8c5822bf..992e557e6ae1 100644
--- a/drivers/staging/comedi/drivers/daqboard2000.c
+++ b/drivers/staging/comedi/drivers/daqboard2000.c
@@ -117,8 +117,6 @@ Configuration options: not applicable, uses PCI auto config
 
 #define DAQBOARD2000_FIRMWARE           "daqboard2000_firmware.bin"
 
-#define PCI_VENDOR_ID_IOTECH            0x1616
-
 #define DAQBOARD2000_SUBSYSTEM_IDS2     0x0002  /* Daqboard/2000 - 2 Dacs */
 #define DAQBOARD2000_SUBSYSTEM_IDS4     0x0004  /* Daqboard/2000 - 4 Dacs */
 
@@ -690,26 +688,25 @@ static const void *daqboard2000_find_boardinfo(struct comedi_device *dev,
         return NULL;
 }
 
-static int daqboard2000_attach_pci(struct comedi_device *dev,
-                                   struct pci_dev *pcidev)
+static int daqboard2000_auto_attach(struct comedi_device *dev,
+                                              unsigned long context_unused)
 {
+        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
         const struct daq200_boardtype *board;
         struct daqboard2000_private *devpriv;
         struct comedi_subdevice *s;
         int result;
 
-        comedi_set_hw_dev(dev, &pcidev->dev);
-
         board = daqboard2000_find_boardinfo(dev, pcidev);
         if (!board)
                 return -ENODEV;
         dev->board_ptr = board;
         dev->board_name = board->name;
 
-        result = alloc_private(dev, sizeof(*devpriv));
-        if (result < 0)
+        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
+        if (!devpriv)
                 return -ENOMEM;
-        devpriv = dev->private;
+        dev->private = devpriv;
 
         result = comedi_pci_enable(pcidev, dev->driver->driver_name);
         if (result < 0)
@@ -792,17 +789,17 @@ static void daqboard2000_detach(struct comedi_device *dev)
 static struct comedi_driver daqboard2000_driver = {
         .driver_name    = "daqboard2000",
         .module         = THIS_MODULE,
-        .attach_pci     = daqboard2000_attach_pci,
+        .auto_attach    = daqboard2000_auto_attach,
         .detach         = daqboard2000_detach,
 };
 
-static int __devinit daqboard2000_pci_probe(struct pci_dev *dev,
+static int daqboard2000_pci_probe(struct pci_dev *dev,
                                             const struct pci_device_id *ent)
 {
         return comedi_pci_auto_config(dev, &daqboard2000_driver);
 }
 
-static void __devexit daqboard2000_pci_remove(struct pci_dev *dev)
+static void daqboard2000_pci_remove(struct pci_dev *dev)
 {
         comedi_pci_auto_unconfig(dev);
 }
@@ -817,7 +814,7 @@ static struct pci_driver daqboard2000_pci_driver = {
         .name           = "daqboard2000",
         .id_table       = daqboard2000_pci_table,
         .probe          = daqboard2000_pci_probe,
-        .remove         = __devexit_p(daqboard2000_pci_remove),
+        .remove         = daqboard2000_pci_remove,
 };
 module_comedi_pci_driver(daqboard2000_driver, daqboard2000_pci_driver);
 
diff --git a/drivers/staging/comedi/drivers/das08.c b/drivers/staging/comedi/drivers/das08.c
index c304528cfb13..b15e05808cb0 100644
--- a/drivers/staging/comedi/drivers/das08.c
+++ b/drivers/staging/comedi/drivers/das08.c
@@ -65,7 +65,6 @@
 #define DO_PCI IS_ENABLED(CONFIG_COMEDI_DAS08_PCI)
 #define DO_COMEDI_DRIVER_REGISTER (DO_ISA || DO_PCI)
 
-#define PCI_VENDOR_ID_COMPUTERBOARDS 0x1307
 #define PCI_DEVICE_ID_PCIDAS08 0x29
 #define PCIDAS08_SIZE 0x54
 
@@ -775,24 +774,29 @@ das08_find_pci_board(struct pci_dev *pdev)
 }
 
 /* only called in the PCI probe path, via comedi_pci_auto_config() */
-static int __devinit __maybe_unused
-das08_attach_pci(struct comedi_device *dev, struct pci_dev *pdev)
+static int __maybe_unused
+das08_auto_attach(struct comedi_device *dev, unsigned long context_unused)
 {
+        struct pci_dev *pdev;
+        struct das08_private_struct *devpriv;
         unsigned long iobase;
-        int ret;
 
         if (!DO_PCI)
                 return -EINVAL;
-        ret = alloc_private(dev, sizeof(struct das08_private_struct));
-        if (ret < 0)
-                return ret;
+
+        pdev = comedi_to_pci_dev(dev);
+        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
+        if (!devpriv)
+                return -ENOMEM;
+        dev->private = devpriv;
+
         dev_info(dev->class_dev, "attach pci %s\n", pci_name(pdev));
         dev->board_ptr = das08_find_pci_board(pdev);
         if (dev->board_ptr == NULL) {
                 dev_err(dev->class_dev, "BUG! cannot determine board type!\n");
                 return -EINVAL;
         }
-        comedi_set_hw_dev(dev, &pdev->dev);
+
         /*  enable PCI device and reserve I/O spaces */
         if (comedi_pci_enable(pdev, dev->driver->driver_name)) {
                 dev_err(dev->class_dev,
@@ -809,13 +813,12 @@ das08_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 {
         const struct das08_board_struct *thisboard = comedi_board(dev);
         struct das08_private_struct *devpriv;
-        int ret;
         unsigned long iobase;
 
-        ret = alloc_private(dev, sizeof(struct das08_private_struct));
-        if (ret < 0)
-                return ret;
-        devpriv = dev->private;
+        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
+        if (!devpriv)
+                return -ENOMEM;
+        dev->private = devpriv;
 
         dev_info(dev->class_dev, "attach\n");
         if (is_pci_board(thisboard)) {
@@ -866,7 +869,7 @@ static struct comedi_driver das08_driver = {
         .driver_name = DRV_NAME,
         .module = THIS_MODULE,
         .attach = das08_attach,
-        .attach_pci = das08_attach_pci,
+        .auto_attach = das08_auto_attach,
         .detach = das08_detach,
         .board_name = &das08_boards[0].name,
         .num_names = sizeof(das08_boards) / sizeof(struct das08_board_struct),
@@ -876,19 +879,19 @@ static struct comedi_driver das08_driver = {
 
 #if DO_PCI
 static DEFINE_PCI_DEVICE_TABLE(das08_pci_table) = {
-        { PCI_DEVICE(PCI_VENDOR_ID_COMPUTERBOARDS, PCI_DEVICE_ID_PCIDAS08) },
+        { PCI_DEVICE(PCI_VENDOR_ID_CB, PCI_DEVICE_ID_PCIDAS08) },
         {0}
 };
 
 MODULE_DEVICE_TABLE(pci, das08_pci_table);
 
-static int __devinit das08_pci_probe(struct pci_dev *dev,
+static int das08_pci_probe(struct pci_dev *dev,
                                             const struct pci_device_id *ent)
 {
         return comedi_pci_auto_config(dev, &das08_driver);
 }
 
-static void __devexit das08_pci_remove(struct pci_dev *dev)
+static void das08_pci_remove(struct pci_dev *dev)
 {
         comedi_pci_auto_unconfig(dev);
 }
@@ -897,7 +900,7 @@ static struct pci_driver das08_pci_driver = {
         .id_table = das08_pci_table,
         .name =  DRV_NAME,
         .probe = &das08_pci_probe,
-        .remove = __devexit_p(&das08_pci_remove)
+        .remove = &das08_pci_remove
 };
 #endif /* DO_PCI */
 
diff --git a/drivers/staging/comedi/drivers/das08_cs.c b/drivers/staging/comedi/drivers/das08_cs.c
index e4c91e675379..024262375e3c 100644
--- a/drivers/staging/comedi/drivers/das08_cs.c
+++ b/drivers/staging/comedi/drivers/das08_cs.c
@@ -90,13 +90,14 @@ static int das08_cs_attach(struct comedi_device *dev,
                            struct comedi_devconfig *it)
 {
         const struct das08_board_struct *thisboard = comedi_board(dev);
-        int ret;
+        struct das08_private_struct *devpriv;
         unsigned long iobase;
         struct pcmcia_device *link = cur_dev;   /*  XXX hack */
 
-        ret = alloc_private(dev, sizeof(struct das08_private_struct));
-        if (ret < 0)
-                return ret;
+        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
+        if (!devpriv)
+                return -ENOMEM;
+        dev->private = devpriv;
 
         dev_info(dev->class_dev, "das08_cs: attach\n");
         /*  deal with a pci board */
diff --git a/drivers/staging/comedi/drivers/das16.c b/drivers/staging/comedi/drivers/das16.c
index fcb8a32adb2f..b159f44d694f 100644
--- a/drivers/staging/comedi/drivers/das16.c
+++ b/drivers/staging/comedi/drivers/das16.c
@@ -392,12 +392,12 @@ struct das16_private_struct {
         volatile short timer_running;
         volatile short timer_mode;      /*  true if using timer mode */
 };
-#define devpriv ((struct das16_private_struct *)(dev->private))
 
 static int das16_cmd_test(struct comedi_device *dev, struct comedi_subdevice *s,
                           struct comedi_cmd *cmd)
 {
         const struct das16_board *board = comedi_board(dev);
+        struct das16_private_struct *devpriv = dev->private;
         int err = 0, tmp;
         int gain, start_chan, i;
         int mask;
@@ -442,46 +442,27 @@ static int das16_cmd_test(struct comedi_device *dev, struct comedi_subdevice *s,
         if (err)
                 return 2;
 
-        /* step 3: make sure arguments are trivially compatible */
-        if (cmd->start_arg != 0) {
-                cmd->start_arg = 0;
-                err++;
-        }
+        /* Step 3: check if arguments are trivially valid */
 
-        if (cmd->scan_begin_src == TRIG_FOLLOW) {
-                /* internal trigger */
-                if (cmd->scan_begin_arg != 0) {
-                        cmd->scan_begin_arg = 0;
-                        err++;
-                }
-        }
+        err |= cfc_check_trigger_arg_is(&cmd->start_arg, 0);
 
-        if (cmd->scan_end_arg != cmd->chanlist_len) {
-                cmd->scan_end_arg = cmd->chanlist_len;
-                err++;
-        }
-        /*  check against maximum frequency */
-        if (cmd->scan_begin_src == TRIG_TIMER) {
-                if (cmd->scan_begin_arg <
-                    board->ai_speed * cmd->chanlist_len) {
-                        cmd->scan_begin_arg =
-                            board->ai_speed * cmd->chanlist_len;
-                        err++;
-                }
-        }
-        if (cmd->convert_src == TRIG_TIMER) {
-                if (cmd->convert_arg < board->ai_speed) {
-                        cmd->convert_arg = board->ai_speed;
-                        err++;
-                }
-        }
+        if (cmd->scan_begin_src == TRIG_FOLLOW) /* internal trigger */
+                err |= cfc_check_trigger_arg_is(&cmd->scan_begin_arg, 0);
+
+        err |= cfc_check_trigger_arg_is(&cmd->scan_end_arg, cmd->chanlist_len);
+
+        /* check against maximum frequency */
+        if (cmd->scan_begin_src == TRIG_TIMER)
+                err |= cfc_check_trigger_arg_min(&cmd->scan_begin_arg,
+                                        board->ai_speed * cmd->chanlist_len);
+
+        if (cmd->convert_src == TRIG_TIMER)
+                err |= cfc_check_trigger_arg_min(&cmd->convert_arg,
+                                                 board->ai_speed);
+
+        if (cmd->stop_src == TRIG_NONE)
+                err |= cfc_check_trigger_arg_is(&cmd->stop_arg, 0);
 
-        if (cmd->stop_src == TRIG_NONE) {
-                if (cmd->stop_arg != 0) {
-                        cmd->stop_arg = 0;
-                        err++;
-                }
-        }
         if (err)
                 return 3;
 
@@ -540,6 +521,7 @@ static int das16_cmd_test(struct comedi_device *dev, struct comedi_subdevice *s,
 static unsigned int das16_suggest_transfer_size(struct comedi_device *dev,
                                                 const struct comedi_cmd *cmd)
 {
+        struct das16_private_struct *devpriv = dev->private;
         unsigned int size;
         unsigned int freq;
 
@@ -581,6 +563,8 @@ static unsigned int das16_suggest_transfer_size(struct comedi_device *dev,
 static unsigned int das16_set_pacer(struct comedi_device *dev, unsigned int ns,
                                     int rounding_flags)
 {
+        struct das16_private_struct *devpriv = dev->private;
+
         i8253_cascade_ns_to_timer_2div(devpriv->clockbase, &(devpriv->divisor1),
                                        &(devpriv->divisor2), &ns,
                                        rounding_flags & TRIG_ROUND_MASK);
@@ -595,6 +579,7 @@ static unsigned int das16_set_pacer(struct comedi_device *dev, unsigned int ns,
 static int das16_cmd_exec(struct comedi_device *dev, struct comedi_subdevice *s)
 {
         const struct das16_board *board = comedi_board(dev);
+        struct das16_private_struct *devpriv = dev->private;
         struct comedi_async *async = s->async;
         struct comedi_cmd *cmd = &async->cmd;
         unsigned int byte;
@@ -701,6 +686,7 @@ static int das16_cmd_exec(struct comedi_device *dev, struct comedi_subdevice *s)
 static int das16_cancel(struct comedi_device *dev, struct comedi_subdevice *s)
 {
         const struct das16_board *board = comedi_board(dev);
+        struct das16_private_struct *devpriv = dev->private;
         unsigned long flags;
 
         spin_lock_irqsave(&dev->spinlock, flags);
@@ -738,6 +724,7 @@ static int das16_ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s,
                           struct comedi_insn *insn, unsigned int *data)
 {
         const struct das16_board *board = comedi_board(dev);
+        struct das16_private_struct *devpriv = dev->private;
         int i, n;
         int range;
         int chan;
@@ -848,10 +835,12 @@ static int das16_ao_winsn(struct comedi_device *dev, struct comedi_subdevice *s,
 */
 static int disable_dma_on_even(struct comedi_device *dev)
 {
+        struct das16_private_struct *devpriv = dev->private;
         int residue;
         int i;
         static const int disable_limit = 100;
         static const int enable_timeout = 100;
+
         disable_dma(devpriv->dma_chan);
         residue = get_dma_residue(devpriv->dma_chan);
         for (i = 0; i < disable_limit && (residue % 2); ++i) {
@@ -877,6 +866,7 @@ static int disable_dma_on_even(struct comedi_device *dev)
 static void das16_interrupt(struct comedi_device *dev)
 {
         const struct das16_board *board = comedi_board(dev);
+        struct das16_private_struct *devpriv = dev->private;
         unsigned long dma_flags, spin_flags;
         struct comedi_subdevice *s = dev->read_subdev;
         struct comedi_async *async;
@@ -973,6 +963,7 @@ static irqreturn_t das16_dma_interrupt(int irq, void *d)
 static void das16_timer_interrupt(unsigned long arg)
 {
         struct comedi_device *dev = (struct comedi_device *)arg;
+        struct das16_private_struct *devpriv = dev->private;
 
         das16_interrupt(dev);
 
@@ -1001,6 +992,7 @@ static void reg_dump(struct comedi_device *dev)
 static int das16_probe(struct comedi_device *dev, struct comedi_devconfig *it)
 {
         const struct das16_board *board = comedi_board(dev);
+        struct das16_private_struct *devpriv = dev->private;
         int status;
         int diobits;
 
@@ -1035,6 +1027,7 @@ static int das16_probe(struct comedi_device *dev, struct comedi_devconfig *it)
 
 static int das1600_mode_detect(struct comedi_device *dev)
 {
+        struct das16_private_struct *devpriv = dev->private;
         int status = 0;
 
         status = inb(dev->iobase + DAS1600_STATUS_B);
@@ -1080,6 +1073,7 @@ static void das16_ai_munge(struct comedi_device *dev,
 static int das16_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 {
         const struct das16_board *board = comedi_board(dev);
+        struct das16_private_struct *devpriv;
         struct comedi_subdevice *s;
         int ret;
         unsigned int irq;
@@ -1114,9 +1108,10 @@ static int das16_attach(struct comedi_device *dev, struct comedi_devconfig *it)
                 }
         }
 
-        ret = alloc_private(dev, sizeof(struct das16_private_struct));
-        if (ret < 0)
-                return ret;
+        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
+        if (!devpriv)
+                return -ENOMEM;
+        dev->private = devpriv;
 
         if (board->size < 0x400) {
                 printk(" 0x%04lx-0x%04lx\n", iobase, iobase + board->size);
@@ -1353,6 +1348,7 @@ static int das16_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 static void das16_detach(struct comedi_device *dev)
 {
         const struct das16_board *board = comedi_board(dev);
+        struct das16_private_struct *devpriv = dev->private;
 
         das16_reset(dev);
         if (dev->subdevices)
diff --git a/drivers/staging/comedi/drivers/das16m1.c b/drivers/staging/comedi/drivers/das16m1.c
index 3f87d7598e5b..b0a861a779bd 100644
--- a/drivers/staging/comedi/drivers/das16m1.c
+++ b/drivers/staging/comedi/drivers/das16m1.c
@@ -28,7 +28,7 @@
 Driver: das16m1
 Description: CIO-DAS16/M1
 Author: Frank Mori Hess <fmhess@users.sourceforge.net>
-Devices: [Measurement Computing] CIO-DAS16/M1 (cio-das16/m1)
+Devices: [Measurement Computing] CIO-DAS16/M1 (das16m1)
 Status: works
 
 This driver supports a single board - the CIO-DAS16/M1.
@@ -132,11 +132,6 @@ static const struct comedi_lrange range_das16m1 = { 9,
          }
 };
 
-struct das16m1_board {
-        const char *name;
-        unsigned int ai_speed;
-};
-
 struct das16m1_private_struct {
         unsigned int control_state;
         volatile unsigned int adc_count;        /*  number of samples completed */
@@ -149,7 +144,6 @@ struct das16m1_private_struct {
         unsigned int divisor1;  /*  divides master clock to obtain conversion speed */
         unsigned int divisor2;  /*  divides master clock to obtain conversion speed */
 };
-#define devpriv ((struct das16m1_private_struct *)(dev->private))
 
 static inline short munge_sample(short data)
 {
@@ -167,7 +161,7 @@ static void munge_sample_array(short *array, unsigned int num_elements)
 static int das16m1_cmd_test(struct comedi_device *dev,
                             struct comedi_subdevice *s, struct comedi_cmd *cmd)
 {
-        const struct das16m1_board *board = comedi_board(dev);
+        struct das16m1_private_struct *devpriv = dev->private;
         unsigned int err = 0, tmp, i;
 
         /* Step 1 : check if triggers are trivially valid */
@@ -192,40 +186,23 @@ static int das16m1_cmd_test(struct comedi_device *dev,
         if (err)
                 return 2;
 
-        /* step 3: make sure arguments are trivially compatible */
-        if (cmd->start_arg != 0) {
-                cmd->start_arg = 0;
-                err++;
-        }
+        /* Step 3: check if arguments are trivially valid */
 
-        if (cmd->scan_begin_src == TRIG_FOLLOW) {
-                /* internal trigger */
-                if (cmd->scan_begin_arg != 0) {
-                        cmd->scan_begin_arg = 0;
-                        err++;
-                }
-        }
+        err |= cfc_check_trigger_arg_is(&cmd->start_arg, 0);
 
-        if (cmd->convert_src == TRIG_TIMER) {
-                if (cmd->convert_arg < board->ai_speed) {
-                        cmd->convert_arg = board->ai_speed;
-                        err++;
-                }
-        }
+        if (cmd->scan_begin_src == TRIG_FOLLOW) /* internal trigger */
+                err |= cfc_check_trigger_arg_is(&cmd->scan_begin_arg, 0);
 
-        if (cmd->scan_end_arg != cmd->chanlist_len) {
-                cmd->scan_end_arg = cmd->chanlist_len;
-                err++;
-        }
+        if (cmd->convert_src == TRIG_TIMER)
+                err |= cfc_check_trigger_arg_min(&cmd->convert_arg, 1000);
+
+        err |= cfc_check_trigger_arg_is(&cmd->scan_end_arg, cmd->chanlist_len);
 
         if (cmd->stop_src == TRIG_COUNT) {
                 /* any count is allowed */
         } else {
                 /* TRIG_NONE */
-                if (cmd->stop_arg != 0) {
-                        cmd->stop_arg = 0;
-                        err++;
-                }
+                err |= cfc_check_trigger_arg_is(&cmd->stop_arg, 0);
         }
 
         if (err)
@@ -277,6 +254,8 @@ static int das16m1_cmd_test(struct comedi_device *dev,
 static unsigned int das16m1_set_pacer(struct comedi_device *dev,
                                       unsigned int ns, int rounding_flags)
 {
+        struct das16m1_private_struct *devpriv = dev->private;
+
         i8253_cascade_ns_to_timer_2div(DAS16M1_XTAL, &(devpriv->divisor1),
                                        &(devpriv->divisor2), &ns,
                                        rounding_flags & TRIG_ROUND_MASK);
@@ -293,6 +272,7 @@ static unsigned int das16m1_set_pacer(struct comedi_device *dev,
 static int das16m1_cmd_exec(struct comedi_device *dev,
                             struct comedi_subdevice *s)
 {
+        struct das16m1_private_struct *devpriv = dev->private;
         struct comedi_async *async = s->async;
         struct comedi_cmd *cmd = &async->cmd;
         unsigned int byte, i;
@@ -356,6 +336,8 @@ static int das16m1_cmd_exec(struct comedi_device *dev,
 
 static int das16m1_cancel(struct comedi_device *dev, struct comedi_subdevice *s)
 {
+        struct das16m1_private_struct *devpriv = dev->private;
+
         devpriv->control_state &= ~INTE & ~PACER_MASK;
         outb(devpriv->control_state, dev->iobase + DAS16M1_INTR_CONTROL);
 
@@ -366,6 +348,7 @@ static int das16m1_ai_rinsn(struct comedi_device *dev,
                             struct comedi_subdevice *s,
                             struct comedi_insn *insn, unsigned int *data)
 {
+        struct das16m1_private_struct *devpriv = dev->private;
         int i, n;
         int byte;
         const int timeout = 1000;
@@ -417,6 +400,7 @@ static int das16m1_do_wbits(struct comedi_device *dev,
                             struct comedi_subdevice *s,
                             struct comedi_insn *insn, unsigned int *data)
 {
+        struct das16m1_private_struct *devpriv = dev->private;
         unsigned int wbits;
 
         /*  only set bits that have been masked */
@@ -436,6 +420,7 @@ static int das16m1_do_wbits(struct comedi_device *dev,
 
 static void das16m1_handler(struct comedi_device *dev, unsigned int status)
 {
+        struct das16m1_private_struct *devpriv = dev->private;
         struct comedi_subdevice *s;
         struct comedi_async *async;
         struct comedi_cmd *cmd;
@@ -582,26 +567,27 @@ static int das16m1_irq_bits(unsigned int irq)
 static int das16m1_attach(struct comedi_device *dev,
                           struct comedi_devconfig *it)
 {
-        const struct das16m1_board *board = comedi_board(dev);
+        struct das16m1_private_struct *devpriv;
         struct comedi_subdevice *s;
         int ret;
         unsigned int irq;
         unsigned long iobase;
 
-        iobase = it->options[0];
+        dev->board_name = dev->driver->driver_name;
 
-        ret = alloc_private(dev, sizeof(struct das16m1_private_struct));
-        if (ret < 0)
-                return ret;
+        iobase = it->options[0];
 
-        dev->board_name = board->name;
+        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
+        if (!devpriv)
+                return -ENOMEM;
+        dev->private = devpriv;
 
-        if (!request_region(iobase, DAS16M1_SIZE, dev->driver->driver_name)) {
+        if (!request_region(iobase, DAS16M1_SIZE, dev->board_name)) {
                 comedi_error(dev, "I/O port conflict\n");
                 return -EIO;
         }
         if (!request_region(iobase + DAS16M1_82C55, DAS16M1_SIZE2,
-                            dev->driver->driver_name)) {
+                            dev->board_name)) {
                 release_region(iobase, DAS16M1_SIZE);
                 comedi_error(dev, "I/O port conflict\n");
                 return -EIO;
@@ -698,21 +684,11 @@ static void das16m1_detach(struct comedi_device *dev)
         }
 }
 
-static const struct das16m1_board das16m1_boards[] = {
-        {
-                .name           = "cio-das16/m1",       /*  CIO-DAS16_M1.pdf */
-                .ai_speed       = 1000,                 /*  1MHz max speed */
-        },
-};
-
 static struct comedi_driver das16m1_driver = {
         .driver_name    = "das16m1",
         .module         = THIS_MODULE,
         .attach         = das16m1_attach,
         .detach         = das16m1_detach,
-        .board_name     = &das16m1_boards[0].name,
-        .num_names      = ARRAY_SIZE(das16m1_boards),
-        .offset         = sizeof(das16m1_boards[0]),
 };
 module_comedi_driver(das16m1_driver);
 
diff --git a/drivers/staging/comedi/drivers/das1800.c b/drivers/staging/comedi/drivers/das1800.c
index 2555f3297d7b..7900f959555d 100644
--- a/drivers/staging/comedi/drivers/das1800.c
+++ b/drivers/staging/comedi/drivers/das1800.c
@@ -454,8 +454,6 @@ struct das1800_private {
         short ao_update_bits;   /* remembers the last write to the 'update' dac */
 };
 
-#define devpriv ((struct das1800_private *)dev->private)
-
 /* analog out range for boards with basic analog out */
 static const struct comedi_lrange range_ao_1 = {
         1,
@@ -501,6 +499,7 @@ static void munge_data(struct comedi_device *dev, uint16_t * array,
 static void das1800_handle_fifo_half_full(struct comedi_device *dev,
                                           struct comedi_subdevice *s)
 {
+        struct das1800_private *devpriv = dev->private;
         int numPoints = 0;      /* number of points to read */
         struct comedi_cmd *cmd = &s->async->cmd;
 
@@ -520,6 +519,7 @@ static void das1800_handle_fifo_half_full(struct comedi_device *dev,
 static void das1800_handle_fifo_not_empty(struct comedi_device *dev,
                                           struct comedi_subdevice *s)
 {
+        struct das1800_private *devpriv = dev->private;
         short dpnt;
         int unipolar;
         struct comedi_cmd *cmd = &s->async->cmd;
@@ -548,6 +548,7 @@ static void das1800_flush_dma_channel(struct comedi_device *dev,
                                       struct comedi_subdevice *s,
                                       unsigned int channel, uint16_t *buffer)
 {
+        struct das1800_private *devpriv = dev->private;
         unsigned int num_bytes, num_samples;
         struct comedi_cmd *cmd = &s->async->cmd;
 
@@ -578,6 +579,7 @@ static void das1800_flush_dma_channel(struct comedi_device *dev,
 static void das1800_flush_dma(struct comedi_device *dev,
                               struct comedi_subdevice *s)
 {
+        struct das1800_private *devpriv = dev->private;
         unsigned long flags;
         const int dual_dma = devpriv->irq_dma_bits & DMA_DUAL;
 
@@ -609,6 +611,7 @@ static void das1800_flush_dma(struct comedi_device *dev,
 static void das1800_handle_dma(struct comedi_device *dev,
                                struct comedi_subdevice *s, unsigned int status)
 {
+        struct das1800_private *devpriv = dev->private;
         unsigned long flags;
         const int dual_dma = devpriv->irq_dma_bits & DMA_DUAL;
 
@@ -643,6 +646,8 @@ static void das1800_handle_dma(struct comedi_device *dev,
 
 static int das1800_cancel(struct comedi_device *dev, struct comedi_subdevice *s)
 {
+        struct das1800_private *devpriv = dev->private;
+
         outb(0x0, dev->iobase + DAS1800_STATUS);        /* disable conversions */
         outb(0x0, dev->iobase + DAS1800_CONTROL_B);     /* disable interrupts and dma */
         outb(0x0, dev->iobase + DAS1800_CONTROL_A);     /* disable and clear fifo and stop triggering */
@@ -656,6 +661,7 @@ static int das1800_cancel(struct comedi_device *dev, struct comedi_subdevice *s)
 /* the guts of the interrupt handler, that is shared with das1800_ai_poll */
 static void das1800_ai_handler(struct comedi_device *dev)
 {
+        struct das1800_private *devpriv = dev->private;
         struct comedi_subdevice *s = &dev->subdevices[0];
         struct comedi_async *async = s->async;
         struct comedi_cmd *cmd = &async->cmd;
@@ -783,6 +789,7 @@ static int das1800_ai_do_cmdtest(struct comedi_device *dev,
                                  struct comedi_subdevice *s,
                                  struct comedi_cmd *cmd)
 {
+        struct das1800_private *devpriv = dev->private;
         int err = 0;
         unsigned int tmp_arg;
         int i;
@@ -817,39 +824,23 @@ static int das1800_ai_do_cmdtest(struct comedi_device *dev,
         if (err)
                 return 2;
 
-        /* step 3: make sure arguments are trivially compatible */
+        /* Step 3: check if arguments are trivially valid */
 
-        if (cmd->start_arg != 0) {
-                cmd->start_arg = 0;
-                err++;
-        }
-        if (cmd->convert_src == TRIG_TIMER) {
-                if (cmd->convert_arg < thisboard->ai_speed) {
-                        cmd->convert_arg = thisboard->ai_speed;
-                        err++;
-                }
-        }
-        if (!cmd->chanlist_len) {
-                cmd->chanlist_len = 1;
-                err++;
-        }
-        if (cmd->scan_end_arg != cmd->chanlist_len) {
-                cmd->scan_end_arg = cmd->chanlist_len;
-                err++;
-        }
+        err |= cfc_check_trigger_arg_is(&cmd->start_arg, 0);
+
+        if (cmd->convert_src == TRIG_TIMER)
+                err |= cfc_check_trigger_arg_min(&cmd->convert_arg,
+                                                 thisboard->ai_speed);
+
+        err |= cfc_check_trigger_arg_min(&cmd->chanlist_len, 1);
+        err |= cfc_check_trigger_arg_is(&cmd->scan_end_arg, cmd->chanlist_len);
 
         switch (cmd->stop_src) {
         case TRIG_COUNT:
-                if (!cmd->stop_arg) {
-                        cmd->stop_arg = 1;
-                        err++;
-                }
+                err |= cfc_check_trigger_arg_min(&cmd->stop_arg, 1);
                 break;
         case TRIG_NONE:
-                if (cmd->stop_arg != 0) {
-                        cmd->stop_arg = 0;
-                        err++;
-                }
+                err |= cfc_check_trigger_arg_is(&cmd->stop_arg, 0);
                 break;
         default:
                 break;
@@ -1006,6 +997,7 @@ static int control_c_bits(const struct comedi_cmd *cmd)
 /* loads counters with divisor1, divisor2 from private structure */
 static int das1800_set_frequency(struct comedi_device *dev)
 {
+        struct das1800_private *devpriv = dev->private;
         int err = 0;
 
         /*  counter 1, mode 2 */
@@ -1026,6 +1018,7 @@ static int das1800_set_frequency(struct comedi_device *dev)
 static int setup_counters(struct comedi_device *dev,
                           const struct comedi_cmd *cmd)
 {
+        struct das1800_private *devpriv = dev->private;
         unsigned int period;
 
         /*  setup cascaded counters for conversion/scan frequency */
@@ -1107,6 +1100,7 @@ static unsigned int suggest_transfer_size(const struct comedi_cmd *cmd)
 /* sets up dma */
 static void setup_dma(struct comedi_device *dev, const struct comedi_cmd *cmd)
 {
+        struct das1800_private *devpriv = dev->private;
         unsigned long lock_flags;
         const int dual_dma = devpriv->irq_dma_bits & DMA_DUAL;
 
@@ -1174,6 +1168,7 @@ static void program_chanlist(struct comedi_device *dev,
 static int das1800_ai_do_cmd(struct comedi_device *dev,
                              struct comedi_subdevice *s)
 {
+        struct das1800_private *devpriv = dev->private;
         int ret;
         int control_a, control_c;
         struct comedi_async *async = s->async;
@@ -1300,6 +1295,7 @@ static int das1800_ao_winsn(struct comedi_device *dev,
                             struct comedi_subdevice *s,
                             struct comedi_insn *insn, unsigned int *data)
 {
+        struct das1800_private *devpriv = dev->private;
         int chan = CR_CHAN(insn->chanspec);
 /* int range = CR_RANGE(insn->chanspec); */
         int update_chan = thisboard->ao_n_chan - 1;
@@ -1342,6 +1338,7 @@ static int das1800_do_wbits(struct comedi_device *dev,
                             struct comedi_subdevice *s,
                             struct comedi_insn *insn, unsigned int *data)
 {
+        struct das1800_private *devpriv = dev->private;
         unsigned int wbits;
 
         /*  only set bits that have been masked */
@@ -1361,6 +1358,7 @@ static int das1800_do_wbits(struct comedi_device *dev,
 static int das1800_init_dma(struct comedi_device *dev, unsigned int dma0,
                             unsigned int dma1)
 {
+        struct das1800_private *devpriv = dev->private;
         unsigned long flags;
 
         /*  need an irq to do dma */
@@ -1518,6 +1516,7 @@ static int das1800_probe(struct comedi_device *dev)
 static int das1800_attach(struct comedi_device *dev,
                           struct comedi_devconfig *it)
 {
+        struct das1800_private *devpriv;
         struct comedi_subdevice *s;
         unsigned long iobase = it->options[0];
         unsigned int irq = it->options[1];
@@ -1527,9 +1526,10 @@ static int das1800_attach(struct comedi_device *dev,
         int board;
         int retval;
 
-        /* allocate and initialize dev->private */
-        if (alloc_private(dev, sizeof(struct das1800_private)) < 0)
+        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
+        if (!devpriv)
                 return -ENOMEM;
+        dev->private = devpriv;
 
         printk(KERN_DEBUG "comedi%d: %s: io 0x%lx", dev->minor,
                dev->driver->driver_name, iobase);
@@ -1699,11 +1699,13 @@ static int das1800_attach(struct comedi_device *dev,
 
 static void das1800_detach(struct comedi_device *dev)
 {
+        struct das1800_private *devpriv = dev->private;
+
         if (dev->iobase)
                 release_region(dev->iobase, DAS1800_SIZE);
         if (dev->irq)
                 free_irq(dev->irq, dev);
-        if (dev->private) {
+        if (devpriv) {
                 if (devpriv->iobase2)
                         release_region(devpriv->iobase2, DAS1800_SIZE);
                 if (devpriv->dma0)
diff --git a/drivers/staging/comedi/drivers/das6402.c b/drivers/staging/comedi/drivers/das6402.c
index e134c46dedff..2efddb89bbcb 100644
--- a/drivers/staging/comedi/drivers/das6402.c
+++ b/drivers/staging/comedi/drivers/das6402.c
@@ -104,7 +104,6 @@ struct das6402_private {
 
         int das6402_ignoreirq;
 };
-#define devpriv ((struct das6402_private *)dev->private)
 
 static void das6402_ai_fifo_dregs(struct comedi_device *dev,
                                   struct comedi_subdevice *s)
@@ -152,6 +151,7 @@ static void das6402_setcounter(struct comedi_device *dev)
 static irqreturn_t intr_handler(int irq, void *d)
 {
         struct comedi_device *dev = d;
+        struct das6402_private *devpriv = dev->private;
         struct comedi_subdevice *s = &dev->subdevices[0];
 
         if (!dev->attached || devpriv->das6402_ignoreirq) {
@@ -196,6 +196,8 @@ static void das6402_ai_fifo_read(struct comedi_device *dev, short *data, int n)
 static int das6402_ai_cancel(struct comedi_device *dev,
                              struct comedi_subdevice *s)
 {
+        struct das6402_private *devpriv = dev->private;
+
         /*
          *  This function should reset the board from whatever condition it
          *  is in (i.e., acquiring data), to a non-active state.
@@ -217,6 +219,8 @@ static int das6402_ai_cancel(struct comedi_device *dev,
 static int das6402_ai_mode2(struct comedi_device *dev,
                             struct comedi_subdevice *s, comedi_trig * it)
 {
+        struct das6402_private *devpriv = dev->private;
+
         devpriv->das6402_ignoreirq = 1;
         dev_dbg(dev->class_dev, "Starting acquisition\n");
         outb_p(0x03, dev->iobase + 10); /* enable external trigging */
@@ -236,6 +240,7 @@ static int das6402_ai_mode2(struct comedi_device *dev,
 
 static int board_init(struct comedi_device *dev)
 {
+        struct das6402_private *devpriv = dev->private;
         BYTE b;
 
         devpriv->das6402_ignoreirq = 1;
@@ -277,6 +282,7 @@ static int board_init(struct comedi_device *dev)
 static int das6402_attach(struct comedi_device *dev,
                           struct comedi_devconfig *it)
 {
+        struct das6402_private *devpriv;
         unsigned int irq;
         unsigned long iobase;
         int ret;
@@ -303,9 +309,11 @@ static int das6402_attach(struct comedi_device *dev,
                 return ret;
 
         dev->irq = irq;
-        ret = alloc_private(dev, sizeof(struct das6402_private));
-        if (ret < 0)
-                return ret;
+
+        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
+        if (!devpriv)
+                return -ENOMEM;
+        dev->private = devpriv;
 
         ret = comedi_alloc_subdevices(dev, 1);
         if (ret)
diff --git a/drivers/staging/comedi/drivers/das800.c b/drivers/staging/comedi/drivers/das800.c
index 215deac0a396..38f625be812a 100644
--- a/drivers/staging/comedi/drivers/das800.c
+++ b/drivers/staging/comedi/drivers/das800.c
@@ -241,8 +241,6 @@ struct das800_private {
         volatile int do_bits;   /* digital output bits */
 };
 
-#define devpriv ((struct das800_private *)dev->private)
-
 static int das800_attach(struct comedi_device *dev,
                          struct comedi_devconfig *it);
 static void das800_detach(struct comedi_device *dev);
@@ -344,22 +342,7 @@ static int das800_probe(struct comedi_device *dev)
         return -1;
 }
 
-/*
- * A convenient macro that defines init_module() and cleanup_module(),
- * as necessary.
- */
-static int __init driver_das800_init_module(void)
-{
-        return comedi_driver_register(&driver_das800);
-}
-
-static void __exit driver_das800_cleanup_module(void)
-{
-        comedi_driver_unregister(&driver_das800);
-}
-
-module_init(driver_das800_init_module);
-module_exit(driver_das800_cleanup_module);
+module_comedi_driver(driver_das800);
 
 /* interrupt service routine */
 static irqreturn_t das800_interrupt(int irq, void *d)
@@ -367,6 +350,7 @@ static irqreturn_t das800_interrupt(int irq, void *d)
         short i;                /* loop index */
         short dataPoint = 0;
         struct comedi_device *dev = d;
+        struct das800_private *devpriv = dev->private;
         struct comedi_subdevice *s = dev->read_subdev;  /* analog input subdevice */
         struct comedi_async *async;
         int status;
@@ -461,6 +445,7 @@ static irqreturn_t das800_interrupt(int irq, void *d)
 
 static int das800_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 {
+        struct das800_private *devpriv;
         struct comedi_subdevice *s;
         unsigned long iobase = it->options[0];
         unsigned int irq = it->options[1];
@@ -472,9 +457,10 @@ static int das800_attach(struct comedi_device *dev, struct comedi_devconfig *it)
         if (irq)
                 dev_dbg(dev->class_dev, "irq %u\n", irq);
 
-        /* allocate and initialize dev->private */
-        if (alloc_private(dev, sizeof(struct das800_private)) < 0)
+        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
+        if (!devpriv)
                 return -ENOMEM;
+        dev->private = devpriv;
 
         if (iobase == 0) {
                 dev_err(dev->class_dev,
@@ -569,6 +555,8 @@ static void das800_detach(struct comedi_device *dev)
 
 static int das800_cancel(struct comedi_device *dev, struct comedi_subdevice *s)
 {
+        struct das800_private *devpriv = dev->private;
+
         devpriv->forever = 0;
         devpriv->count = 0;
         disable_das800(dev);
@@ -578,7 +566,9 @@ static int das800_cancel(struct comedi_device *dev, struct comedi_subdevice *s)
 /* enable_das800 makes the card start taking hardware triggered conversions */
 static void enable_das800(struct comedi_device *dev)
 {
+        struct das800_private *devpriv = dev->private;
         unsigned long irq_flags;
+
         spin_lock_irqsave(&dev->spinlock, irq_flags);
         /*  enable fifo-half full interrupts for cio-das802/16 */
         if (thisboard->resolution == 16)
@@ -604,6 +594,7 @@ static int das800_ai_do_cmdtest(struct comedi_device *dev,
                                 struct comedi_subdevice *s,
                                 struct comedi_cmd *cmd)
 {
+        struct das800_private *devpriv = dev->private;
         int err = 0;
         int tmp;
         int gain, startChan;
@@ -631,37 +622,21 @@ static int das800_ai_do_cmdtest(struct comedi_device *dev,
         if (err)
                 return 2;
 
-        /* step 3: make sure arguments are trivially compatible */
+        /* Step 3: check if arguments are trivially valid */
 
-        if (cmd->start_arg != 0) {
-                cmd->start_arg = 0;
-                err++;
-        }
-        if (cmd->convert_src == TRIG_TIMER) {
-                if (cmd->convert_arg < thisboard->ai_speed) {
-                        cmd->convert_arg = thisboard->ai_speed;
-                        err++;
-                }
-        }
-        if (!cmd->chanlist_len) {
-                cmd->chanlist_len = 1;
-                err++;
-        }
-        if (cmd->scan_end_arg != cmd->chanlist_len) {
-                cmd->scan_end_arg = cmd->chanlist_len;
-                err++;
-        }
-        if (cmd->stop_src == TRIG_COUNT) {
-                if (!cmd->stop_arg) {
-                        cmd->stop_arg = 1;
-                        err++;
-                }
-        } else {                /* TRIG_NONE */
-                if (cmd->stop_arg != 0) {
-                        cmd->stop_arg = 0;
-                        err++;
-                }
-        }
+        err |= cfc_check_trigger_arg_is(&cmd->start_arg, 0);
+
+        if (cmd->convert_src == TRIG_TIMER)
+                err |= cfc_check_trigger_arg_min(&cmd->convert_arg,
+                                                 thisboard->ai_speed);
+
+        err |= cfc_check_trigger_arg_min(&cmd->chanlist_len, 1);
+        err |= cfc_check_trigger_arg_is(&cmd->scan_end_arg, cmd->chanlist_len);
+
+        if (cmd->stop_src == TRIG_COUNT)
+                err |= cfc_check_trigger_arg_min(&cmd->stop_arg, 1);
+        else    /* TRIG_NONE */
+                err |= cfc_check_trigger_arg_is(&cmd->stop_arg, 0);
 
         if (err)
                 return 3;
@@ -710,6 +685,7 @@ static int das800_ai_do_cmdtest(struct comedi_device *dev,
 static int das800_ai_do_cmd(struct comedi_device *dev,
                             struct comedi_subdevice *s)
 {
+        struct das800_private *devpriv = dev->private;
         int startChan, endChan, scan, gain;
         int conv_bits;
         unsigned long irq_flags;
@@ -793,6 +769,7 @@ static int das800_ai_rinsn(struct comedi_device *dev,
                            struct comedi_subdevice *s, struct comedi_insn *insn,
                            unsigned int *data)
 {
+        struct das800_private *devpriv = dev->private;
         int i, n;
         int chan;
         int range;
@@ -862,6 +839,7 @@ static int das800_do_wbits(struct comedi_device *dev,
                            struct comedi_subdevice *s, struct comedi_insn *insn,
                            unsigned int *data)
 {
+        struct das800_private *devpriv = dev->private;
         int wbits;
         unsigned long irq_flags;
 
@@ -885,6 +863,7 @@ static int das800_do_wbits(struct comedi_device *dev,
 /* loads counters with divisor1, divisor2 from private structure */
 static int das800_set_frequency(struct comedi_device *dev)
 {
+        struct das800_private *devpriv = dev->private;
         int err = 0;
 
         if (i8254_load(dev->iobase + DAS800_8254, 0, 1, devpriv->divisor1, 2))
diff --git a/drivers/staging/comedi/drivers/dmm32at.c b/drivers/staging/comedi/drivers/dmm32at.c
index 4d5c33c4750f..9e2124179a0c 100644
--- a/drivers/staging/comedi/drivers/dmm32at.c
+++ b/drivers/staging/comedi/drivers/dmm32at.c
@@ -158,10 +158,6 @@ static const struct comedi_lrange dmm32at_aoranges = {
          }
 };
 
-struct dmm32at_board {
-        const char *name;
-};
-
 struct dmm32at_private {
 
         int data;
@@ -284,33 +280,25 @@ static int dmm32at_ai_cmdtest(struct comedi_device *dev,
         if (err)
                 return 2;
 
-        /* step 3: make sure arguments are trivially compatible */
+        /* Step 3: check if arguments are trivially valid */
+
+        err |= cfc_check_trigger_arg_is(&cmd->start_arg, 0);
 
-        if (cmd->start_arg != 0) {
-                cmd->start_arg = 0;
-                err++;
-        }
 #define MAX_SCAN_SPEED  1000000 /* in nanoseconds */
 #define MIN_SCAN_SPEED  1000000000      /* in nanoseconds */
 
         if (cmd->scan_begin_src == TRIG_TIMER) {
-                if (cmd->scan_begin_arg < MAX_SCAN_SPEED) {
-                        cmd->scan_begin_arg = MAX_SCAN_SPEED;
-                        err++;
-                }
-                if (cmd->scan_begin_arg > MIN_SCAN_SPEED) {
-                        cmd->scan_begin_arg = MIN_SCAN_SPEED;
-                        err++;
-                }
+                err |= cfc_check_trigger_arg_min(&cmd->scan_begin_arg,
+                                                 MAX_SCAN_SPEED);
+                err |= cfc_check_trigger_arg_max(&cmd->scan_begin_arg,
+                                                 MIN_SCAN_SPEED);
         } else {
                 /* external trigger */
                 /* should be level/edge, hi/lo specification here */
                 /* should specify multiple external triggers */
-                if (cmd->scan_begin_arg > 9) {
-                        cmd->scan_begin_arg = 9;
-                        err++;
-                }
+                err |= cfc_check_trigger_arg_max(&cmd->scan_begin_arg, 9);
         }
+
         if (cmd->convert_src == TRIG_TIMER) {
                 if (cmd->convert_arg >= 17500)
                         cmd->convert_arg = 20000;
@@ -320,35 +308,20 @@ static int dmm32at_ai_cmdtest(struct comedi_device *dev,
                         cmd->convert_arg = 10000;
                 else
                         cmd->convert_arg = 5000;
-
         } else {
                 /* external trigger */
                 /* see above */
-                if (cmd->convert_arg > 9) {
-                        cmd->convert_arg = 9;
-                        err++;
-                }
+                err |= cfc_check_trigger_arg_max(&cmd->convert_arg, 9);
         }
 
-        if (cmd->scan_end_arg != cmd->chanlist_len) {
-                cmd->scan_end_arg = cmd->chanlist_len;
-                err++;
-        }
+        err |= cfc_check_trigger_arg_is(&cmd->scan_end_arg, cmd->chanlist_len);
+
         if (cmd->stop_src == TRIG_COUNT) {
-                if (cmd->stop_arg > 0xfffffff0) {
-                        cmd->stop_arg = 0xfffffff0;
-                        err++;
-                }
-                if (cmd->stop_arg == 0) {
-                        cmd->stop_arg = 1;
-                        err++;
-                }
+                err |= cfc_check_trigger_arg_max(&cmd->stop_arg, 0xfffffff0);
+                err |= cfc_check_trigger_arg_min(&cmd->stop_arg, 1);
         } else {
                 /* TRIG_NONE */
-                if (cmd->stop_arg != 0) {
-                        cmd->stop_arg = 0;
-                        err++;
-                }
+                err |= cfc_check_trigger_arg_is(&cmd->stop_arg, 0);
         }
 
         if (err)
@@ -718,7 +691,6 @@ static int dmm32at_dio_insn_config(struct comedi_device *dev,
 static int dmm32at_attach(struct comedi_device *dev,
                           struct comedi_devconfig *it)
 {
-        const struct dmm32at_board *board = comedi_board(dev);
         struct dmm32at_private *devpriv;
         int ret;
         struct comedi_subdevice *s;
@@ -726,6 +698,8 @@ static int dmm32at_attach(struct comedi_device *dev,
         unsigned long iobase;
         unsigned int irq;
 
+        dev->board_name = dev->driver->driver_name;
+
         iobase = it->options[0];
         irq = it->options[1];
 
@@ -734,7 +708,7 @@ static int dmm32at_attach(struct comedi_device *dev,
                iobase, irq);
 
         /* register address space */
-        if (!request_region(iobase, DMM32AT_MEMSIZE, board->name)) {
+        if (!request_region(iobase, DMM32AT_MEMSIZE, dev->board_name)) {
                 printk(KERN_ERR "comedi%d: dmm32at: I/O port conflict\n",
                        dev->minor);
                 return -EIO;
@@ -788,7 +762,7 @@ static int dmm32at_attach(struct comedi_device *dev,
 
         /* board is there, register interrupt */
         if (irq) {
-                ret = request_irq(irq, dmm32at_isr, 0, board->name, dev);
+                ret = request_irq(irq, dmm32at_isr, 0, dev->board_name, dev);
                 if (ret < 0) {
                         printk(KERN_ERR "dmm32at: irq conflict\n");
                         return ret;
@@ -796,11 +770,10 @@ static int dmm32at_attach(struct comedi_device *dev,
                 dev->irq = irq;
         }
 
-        dev->board_name = board->name;
-
-        if (alloc_private(dev, sizeof(*devpriv)) < 0)
+        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
+        if (!devpriv)
                 return -ENOMEM;
-        devpriv = dev->private;
+        dev->private = devpriv;
 
         ret = comedi_alloc_subdevices(dev, 3);
         if (ret)
@@ -867,20 +840,11 @@ static void dmm32at_detach(struct comedi_device *dev)
                 release_region(dev->iobase, DMM32AT_MEMSIZE);
 }
 
-static const struct dmm32at_board dmm32at_boards[] = {
-        {
-                .name           = "dmm32at",
-        },
-};
-
 static struct comedi_driver dmm32at_driver = {
         .driver_name    = "dmm32at",
         .module         = THIS_MODULE,
         .attach         = dmm32at_attach,
         .detach         = dmm32at_detach,
-        .board_name     = &dmm32at_boards[0].name,
-        .offset         = sizeof(struct dmm32at_board),
-        .num_names      = ARRAY_SIZE(dmm32at_boards),
 };
 module_comedi_driver(dmm32at_driver);
 
diff --git a/drivers/staging/comedi/drivers/dt2801.c b/drivers/staging/comedi/drivers/dt2801.c
index c59a652a1194..f6942aaf0ecd 100644
--- a/drivers/staging/comedi/drivers/dt2801.c
+++ b/drivers/staging/comedi/drivers/dt2801.c
@@ -233,8 +233,6 @@ struct dt2801_private {
         unsigned int ao_readback[2];
 };
 
-#define devpriv ((struct dt2801_private *)dev->private)
-
 /* These are the low-level routines:
    writecommand: write a command to the board
    writedata: write data byte
@@ -508,6 +506,8 @@ static int dt2801_ao_insn_read(struct comedi_device *dev,
                                struct comedi_subdevice *s,
                                struct comedi_insn *insn, unsigned int *data)
 {
+        struct dt2801_private *devpriv = dev->private;
+
         data[0] = devpriv->ao_readback[CR_CHAN(insn->chanspec)];
 
         return 1;
@@ -517,6 +517,8 @@ static int dt2801_ao_insn_write(struct comedi_device *dev,
                                 struct comedi_subdevice *s,
                                 struct comedi_insn *insn, unsigned int *data)
 {
+        struct dt2801_private *devpriv = dev->private;
+
         dt2801_writecmd(dev, DT_C_WRITE_DAIM);
         dt2801_writedata(dev, CR_CHAN(insn->chanspec));
         dt2801_writedata2(dev, data[0]);
@@ -590,6 +592,7 @@ static int dt2801_dio_insn_config(struct comedi_device *dev,
 */
 static int dt2801_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 {
+        struct dt2801_private *devpriv;
         struct comedi_subdevice *s;
         unsigned long iobase;
         int board_code, type;
@@ -630,9 +633,10 @@ havetype:
         if (ret)
                 goto out;
 
-        ret = alloc_private(dev, sizeof(struct dt2801_private));
-        if (ret < 0)
-                return ret;
+        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
+        if (!devpriv)
+                return -ENOMEM;
+        dev->private = devpriv;
 
         dev->board_name = boardtype.name;
 
diff --git a/drivers/staging/comedi/drivers/dt2811.c b/drivers/staging/comedi/drivers/dt2811.c
index d3a8c1aec9d6..f90ecf494aaf 100644
--- a/drivers/staging/comedi/drivers/dt2811.c
+++ b/drivers/staging/comedi/drivers/dt2811.c
@@ -226,8 +226,6 @@ struct dt2811_private {
         unsigned int ao_readback[2];
 };
 
-#define devpriv ((struct dt2811_private *)dev->private)
-
 static const struct comedi_lrange *dac_range_types[] = {
         &range_bipolar5,
         &range_bipolar2_5,
@@ -242,6 +240,7 @@ static irqreturn_t dt2811_interrupt(int irq, void *d)
         int lo, hi;
         int data;
         struct comedi_device *dev = d;
+        struct dt2811_private *devpriv = dev->private;
 
         if (!dev->attached) {
                 comedi_error(dev, "spurious interrupt");
@@ -318,6 +317,7 @@ int dt2811_adtrig(kdev_t minor, comedi_adtrig *adtrig)
 static int dt2811_ao_insn(struct comedi_device *dev, struct comedi_subdevice *s,
                           struct comedi_insn *insn, unsigned int *data)
 {
+        struct dt2811_private *devpriv = dev->private;
         int i;
         int chan;
 
@@ -337,6 +337,7 @@ static int dt2811_ao_insn_read(struct comedi_device *dev,
                                struct comedi_subdevice *s,
                                struct comedi_insn *insn, unsigned int *data)
 {
+        struct dt2811_private *devpriv = dev->private;
         int i;
         int chan;
 
@@ -397,6 +398,7 @@ static int dt2811_attach(struct comedi_device *dev, struct comedi_devconfig *it)
         /* long flags; */
 
         const struct dt2811_board *board = comedi_board(dev);
+        struct dt2811_private *devpriv;
         int ret;
         struct comedi_subdevice *s;
         unsigned long iobase;
@@ -463,9 +465,10 @@ static int dt2811_attach(struct comedi_device *dev, struct comedi_devconfig *it)
         if (ret)
                 return ret;
 
-        ret = alloc_private(dev, sizeof(struct dt2811_private));
-        if (ret < 0)
-                return ret;
+        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
+        if (!devpriv)
+                return -ENOMEM;
+        dev->private = devpriv;
 
         switch (it->options[2]) {
         case 0:
diff --git a/drivers/staging/comedi/drivers/dt2814.c b/drivers/staging/comedi/drivers/dt2814.c
index 064a8f215e4d..e520dbaaa194 100644
--- a/drivers/staging/comedi/drivers/dt2814.c
+++ b/drivers/staging/comedi/drivers/dt2814.c
@@ -68,8 +68,6 @@ struct dt2814_private {
         int curadchan;
 };
 
-#define devpriv ((struct dt2814_private *)dev->private)
-
 #define DT2814_TIMEOUT 10
 #define DT2814_MAX_SPEED 100000 /* Arbitrary 10 khz limit */
 
@@ -151,36 +149,20 @@ static int dt2814_ai_cmdtest(struct comedi_device *dev,
         if (err)
                 return 2;
 
-        /* step 3: make sure arguments are trivially compatible */
+        /* Step 3: check if arguments are trivially valid */
 
-        if (cmd->start_arg != 0) {
-                cmd->start_arg = 0;
-                err++;
-        }
-        if (cmd->scan_begin_arg > 1000000000) {
-                cmd->scan_begin_arg = 1000000000;
-                err++;
-        }
-        if (cmd->scan_begin_arg < DT2814_MAX_SPEED) {
-                cmd->scan_begin_arg = DT2814_MAX_SPEED;
-                err++;
-        }
-        if (cmd->scan_end_arg != cmd->chanlist_len) {
-                cmd->scan_end_arg = cmd->chanlist_len;
-                err++;
-        }
-        if (cmd->stop_src == TRIG_COUNT) {
-                if (cmd->stop_arg < 2) {
-                        cmd->stop_arg = 2;
-                        err++;
-                }
-        } else {
-                /* TRIG_NONE */
-                if (cmd->stop_arg != 0) {
-                        cmd->stop_arg = 0;
-                        err++;
-                }
-        }
+        err |= cfc_check_trigger_arg_is(&cmd->start_arg, 0);
+
+        err |= cfc_check_trigger_arg_max(&cmd->scan_begin_arg, 1000000000);
+        err |= cfc_check_trigger_arg_min(&cmd->scan_begin_arg,
+                                         DT2814_MAX_SPEED);
+
+        err |= cfc_check_trigger_arg_is(&cmd->scan_end_arg, cmd->chanlist_len);
+
+        if (cmd->stop_src == TRIG_COUNT)
+                err |= cfc_check_trigger_arg_min(&cmd->stop_arg, 2);
+        else    /* TRIG_NONE */
+                err |= cfc_check_trigger_arg_is(&cmd->stop_arg, 0);
 
         if (err)
                 return 3;
@@ -200,6 +182,7 @@ static int dt2814_ai_cmdtest(struct comedi_device *dev,
 
 static int dt2814_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
 {
+        struct dt2814_private *devpriv = dev->private;
         struct comedi_cmd *cmd = &s->async->cmd;
         int chan;
         int trigvar;
@@ -221,6 +204,7 @@ static irqreturn_t dt2814_interrupt(int irq, void *d)
 {
         int lo, hi;
         struct comedi_device *dev = d;
+        struct dt2814_private *devpriv = dev->private;
         struct comedi_subdevice *s;
         int data;
 
@@ -258,6 +242,7 @@ static irqreturn_t dt2814_interrupt(int irq, void *d)
 
 static int dt2814_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 {
+        struct dt2814_private *devpriv;
         int i, irq;
         int ret;
         struct comedi_subdevice *s;
@@ -324,9 +309,10 @@ static int dt2814_attach(struct comedi_device *dev, struct comedi_devconfig *it)
         if (ret)
                 return ret;
 
-        ret = alloc_private(dev, sizeof(struct dt2814_private));
-        if (ret < 0)
-                return ret;
+        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
+        if (!devpriv)
+                return -ENOMEM;
+        dev->private = devpriv;
 
         s = &dev->subdevices[0];
         dev->read_subdev = s;
diff --git a/drivers/staging/comedi/drivers/dt2815.c b/drivers/staging/comedi/drivers/dt2815.c
index b9692ef64c41..1e0cfe4972a6 100644
--- a/drivers/staging/comedi/drivers/dt2815.c
+++ b/drivers/staging/comedi/drivers/dt2815.c
@@ -78,8 +78,6 @@ struct dt2815_private {
         unsigned int ao_readback[8];
 };
 
-#define devpriv ((struct dt2815_private *)dev->private)
-
 static int dt2815_wait_for_status(struct comedi_device *dev, int status)
 {
         int i;
@@ -95,6 +93,7 @@ static int dt2815_ao_insn_read(struct comedi_device *dev,
                                struct comedi_subdevice *s,
                                struct comedi_insn *insn, unsigned int *data)
 {
+        struct dt2815_private *devpriv = dev->private;
         int i;
         int chan = CR_CHAN(insn->chanspec);
 
@@ -107,6 +106,7 @@ static int dt2815_ao_insn_read(struct comedi_device *dev,
 static int dt2815_ao_insn(struct comedi_device *dev, struct comedi_subdevice *s,
                           struct comedi_insn *insn, unsigned int *data)
 {
+        struct dt2815_private *devpriv = dev->private;
         int i;
         int chan = CR_CHAN(insn->chanspec);
         unsigned int status;
@@ -162,6 +162,7 @@ static int dt2815_ao_insn(struct comedi_device *dev, struct comedi_subdevice *s,
 
 static int dt2815_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 {
+        struct dt2815_private *devpriv;
         struct comedi_subdevice *s;
         int i;
         const struct comedi_lrange *current_range_type, *voltage_range_type;
@@ -182,8 +183,10 @@ static int dt2815_attach(struct comedi_device *dev, struct comedi_devconfig *it)
         if (ret)
                 return ret;
 
-        if (alloc_private(dev, sizeof(struct dt2815_private)) < 0)
+        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
+        if (!devpriv)
                 return -ENOMEM;
+        dev->private = devpriv;
 
         s = &dev->subdevices[0];
         /* ao subdevice */
diff --git a/drivers/staging/comedi/drivers/dt282x.c b/drivers/staging/comedi/drivers/dt282x.c
index 78d340716d1e..122d980a95a0 100644
--- a/drivers/staging/comedi/drivers/dt282x.c
+++ b/drivers/staging/comedi/drivers/dt282x.c
@@ -248,7 +248,6 @@ struct dt282x_private {
         int dma_dir;
 };
 
-#define devpriv ((struct dt282x_private *)dev->private)
 #define boardtype (*(const struct dt282x_board *)dev->board_ptr)
 
 /*
@@ -290,6 +289,7 @@ static int dt282x_grab_dma(struct comedi_device *dev, int dma1, int dma2);
 static void dt282x_munge(struct comedi_device *dev, short *buf,
                          unsigned int nbytes)
 {
+        struct dt282x_private *devpriv = dev->private;
         unsigned int i;
         unsigned short mask = (1 << boardtype.adbits) - 1;
         unsigned short sign = 1 << (boardtype.adbits - 1);
@@ -309,6 +309,7 @@ static void dt282x_munge(struct comedi_device *dev, short *buf,
 
 static void dt282x_ao_dma_interrupt(struct comedi_device *dev)
 {
+        struct dt282x_private *devpriv = dev->private;
         void *ptr;
         int size;
         int i;
@@ -341,6 +342,7 @@ static void dt282x_ao_dma_interrupt(struct comedi_device *dev)
 
 static void dt282x_ai_dma_interrupt(struct comedi_device *dev)
 {
+        struct dt282x_private *devpriv = dev->private;
         void *ptr;
         int size;
         int i;
@@ -393,6 +395,7 @@ static void dt282x_ai_dma_interrupt(struct comedi_device *dev)
 
 static int prep_ai_dma(struct comedi_device *dev, int dma_index, int n)
 {
+        struct dt282x_private *devpriv = dev->private;
         int dma_chan;
         unsigned long dma_ptr;
         unsigned long flags;
@@ -424,6 +427,7 @@ static int prep_ai_dma(struct comedi_device *dev, int dma_index, int n)
 
 static int prep_ao_dma(struct comedi_device *dev, int dma_index, int n)
 {
+        struct dt282x_private *devpriv = dev->private;
         int dma_chan;
         unsigned long dma_ptr;
         unsigned long flags;
@@ -447,6 +451,7 @@ static int prep_ao_dma(struct comedi_device *dev, int dma_index, int n)
 static irqreturn_t dt282x_interrupt(int irq, void *d)
 {
         struct comedi_device *dev = d;
+        struct dt282x_private *devpriv = dev->private;
         struct comedi_subdevice *s;
         struct comedi_subdevice *s_ao;
         unsigned int supcsr, adcsr, dacsr;
@@ -525,6 +530,7 @@ static irqreturn_t dt282x_interrupt(int irq, void *d)
 static void dt282x_load_changain(struct comedi_device *dev, int n,
                                  unsigned int *chanlist)
 {
+        struct dt282x_private *devpriv = dev->private;
         unsigned int i;
         unsigned int chan, range;
 
@@ -548,6 +554,7 @@ static int dt282x_ai_insn_read(struct comedi_device *dev,
                                struct comedi_subdevice *s,
                                struct comedi_insn *insn, unsigned int *data)
 {
+        struct dt282x_private *devpriv = dev->private;
         int i;
 
         /* XXX should we really be enabling the ad clock here? */
@@ -604,52 +611,30 @@ static int dt282x_ai_cmdtest(struct comedi_device *dev,
         if (err)
                 return 2;
 
-        /* step 3: make sure arguments are trivially compatible */
+        /* Step 3: check if arguments are trivially valid */
+
+        err |= cfc_check_trigger_arg_is(&cmd->start_arg, 0);
 
-        if (cmd->start_arg != 0) {
-                cmd->start_arg = 0;
-                err++;
-        }
         if (cmd->scan_begin_src == TRIG_FOLLOW) {
                 /* internal trigger */
-                if (cmd->scan_begin_arg != 0) {
-                        cmd->scan_begin_arg = 0;
-                        err++;
-                }
+                err |= cfc_check_trigger_arg_is(&cmd->scan_begin_arg, 0);
         } else {
                 /* external trigger */
                 /* should be level/edge, hi/lo specification here */
-                if (cmd->scan_begin_arg != 0) {
-                        cmd->scan_begin_arg = 0;
-                        err++;
-                }
-        }
-        if (cmd->convert_arg < 4000) {
-                /* XXX board dependent */
-                cmd->convert_arg = 4000;
-                err++;
+                err |= cfc_check_trigger_arg_is(&cmd->scan_begin_arg, 0);
         }
+
+        err |= cfc_check_trigger_arg_min(&cmd->convert_arg, 4000);
+
 #define SLOWEST_TIMER   (250*(1<<15)*255)
-        if (cmd->convert_arg > SLOWEST_TIMER) {
-                cmd->convert_arg = SLOWEST_TIMER;
-                err++;
-        }
-        if (cmd->convert_arg < board->ai_speed) {
-                cmd->convert_arg = board->ai_speed;
-                err++;
-        }
-        if (cmd->scan_end_arg != cmd->chanlist_len) {
-                cmd->scan_end_arg = cmd->chanlist_len;
-                err++;
-        }
+        err |= cfc_check_trigger_arg_max(&cmd->convert_arg, SLOWEST_TIMER);
+        err |= cfc_check_trigger_arg_min(&cmd->convert_arg, board->ai_speed);
+        err |= cfc_check_trigger_arg_is(&cmd->scan_end_arg, cmd->chanlist_len);
+
         if (cmd->stop_src == TRIG_COUNT) {
                 /* any count is allowed */
-        } else {
-                /* TRIG_NONE */
-                if (cmd->stop_arg != 0) {
-                        cmd->stop_arg = 0;
-                        err++;
-                }
+        } else {        /* TRIG_NONE */
+                err |= cfc_check_trigger_arg_is(&cmd->stop_arg, 0);
         }
 
         if (err)
@@ -671,6 +656,7 @@ static int dt282x_ai_cmdtest(struct comedi_device *dev,
 static int dt282x_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
 {
         const struct dt282x_board *board = comedi_board(dev);
+        struct dt282x_private *devpriv = dev->private;
         struct comedi_cmd *cmd = &s->async->cmd;
         int timer;
 
@@ -733,6 +719,8 @@ static int dt282x_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
 
 static void dt282x_disable_dma(struct comedi_device *dev)
 {
+        struct dt282x_private *devpriv = dev->private;
+
         if (devpriv->usedma) {
                 disable_dma(devpriv->dma[0].chan);
                 disable_dma(devpriv->dma[1].chan);
@@ -742,6 +730,8 @@ static void dt282x_disable_dma(struct comedi_device *dev)
 static int dt282x_ai_cancel(struct comedi_device *dev,
                             struct comedi_subdevice *s)
 {
+        struct dt282x_private *devpriv = dev->private;
+
         dt282x_disable_dma(dev);
 
         devpriv->adcsr = 0;
@@ -794,6 +784,8 @@ static int dt282x_ao_insn_read(struct comedi_device *dev,
                                struct comedi_subdevice *s,
                                struct comedi_insn *insn, unsigned int *data)
 {
+        struct dt282x_private *devpriv = dev->private;
+
         data[0] = devpriv->ao[CR_CHAN(insn->chanspec)];
 
         return 1;
@@ -803,6 +795,7 @@ static int dt282x_ao_insn_write(struct comedi_device *dev,
                                 struct comedi_subdevice *s,
                                 struct comedi_insn *insn, unsigned int *data)
 {
+        struct dt282x_private *devpriv = dev->private;
         short d;
         unsigned int chan;
 
@@ -859,33 +852,17 @@ static int dt282x_ao_cmdtest(struct comedi_device *dev,
         if (err)
                 return 2;
 
-        /* step 3: make sure arguments are trivially compatible */
+        /* Step 3: check if arguments are trivially valid */
+
+        err |= cfc_check_trigger_arg_is(&cmd->start_arg, 0);
+        err |= cfc_check_trigger_arg_min(&cmd->scan_begin_arg, 5000);
+        err |= cfc_check_trigger_arg_is(&cmd->convert_arg, 0);
+        err |= cfc_check_trigger_arg_max(&cmd->scan_end_arg, 2);
 
-        if (cmd->start_arg != 0) {
-                cmd->start_arg = 0;
-                err++;
-        }
-        if (cmd->scan_begin_arg < 5000 /* XXX unknown */) {
-                cmd->scan_begin_arg = 5000;
-                err++;
-        }
-        if (cmd->convert_arg != 0) {
-                cmd->convert_arg = 0;
-                err++;
-        }
-        if (cmd->scan_end_arg > 2) {
-                /* XXX chanlist stuff? */
-                cmd->scan_end_arg = 2;
-                err++;
-        }
         if (cmd->stop_src == TRIG_COUNT) {
                 /* any count is allowed */
-        } else {
-                /* TRIG_NONE */
-                if (cmd->stop_arg != 0) {
-                        cmd->stop_arg = 0;
-                        err++;
-                }
+        } else {        /* TRIG_NONE */
+                err |= cfc_check_trigger_arg_is(&cmd->stop_arg, 0);
         }
 
         if (err)
@@ -908,6 +885,7 @@ static int dt282x_ao_cmdtest(struct comedi_device *dev,
 static int dt282x_ao_inttrig(struct comedi_device *dev,
                              struct comedi_subdevice *s, unsigned int x)
 {
+        struct dt282x_private *devpriv = dev->private;
         int size;
 
         if (x != 0)
@@ -937,6 +915,7 @@ static int dt282x_ao_inttrig(struct comedi_device *dev,
 
 static int dt282x_ao_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
 {
+        struct dt282x_private *devpriv = dev->private;
         int timer;
         struct comedi_cmd *cmd = &s->async->cmd;
 
@@ -973,6 +952,8 @@ static int dt282x_ao_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
 static int dt282x_ao_cancel(struct comedi_device *dev,
                             struct comedi_subdevice *s)
 {
+        struct dt282x_private *devpriv = dev->private;
+
         dt282x_disable_dma(dev);
 
         devpriv->dacsr = 0;
@@ -1003,6 +984,7 @@ static int dt282x_dio_insn_config(struct comedi_device *dev,
                                   struct comedi_subdevice *s,
                                   struct comedi_insn *insn, unsigned int *data)
 {
+        struct dt282x_private *devpriv = dev->private;
         int mask;
 
         mask = (CR_CHAN(insn->chanspec) < 8) ? 0x00ff : 0xff00;
@@ -1074,6 +1056,7 @@ enum {  /* i/o base, irq, dma channels */
 
 static int dt282x_grab_dma(struct comedi_device *dev, int dma1, int dma2)
 {
+        struct dt282x_private *devpriv = dev->private;
         int ret;
 
         devpriv->usedma = 0;
@@ -1135,6 +1118,7 @@ static int dt282x_grab_dma(struct comedi_device *dev, int dma1, int dma2)
 static int dt282x_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 {
         const struct dt282x_board *board = comedi_board(dev);
+        struct dt282x_private *devpriv;
         int i, irq;
         int ret;
         struct comedi_subdevice *s;
@@ -1217,9 +1201,10 @@ static int dt282x_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 #endif
         }
 
-        ret = alloc_private(dev, sizeof(struct dt282x_private));
-        if (ret < 0)
-                return ret;
+        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
+        if (!devpriv)
+                return -ENOMEM;
+        dev->private = devpriv;
 
         ret = dt282x_grab_dma(dev, it->options[opt_dma1],
                               it->options[opt_dma2]);
@@ -1292,6 +1277,8 @@ static int dt282x_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 
 static void dt282x_detach(struct comedi_device *dev)
 {
+        struct dt282x_private *devpriv = dev->private;
+
         if (dev->irq)
                 free_irq(dev->irq, dev);
         if (dev->iobase)
diff --git a/drivers/staging/comedi/drivers/dt3000.c b/drivers/staging/comedi/drivers/dt3000.c
index 43d05ef97157..960da8debe17 100644
--- a/drivers/staging/comedi/drivers/dt3000.c
+++ b/drivers/staging/comedi/drivers/dt3000.c
@@ -29,11 +29,7 @@ Devices: [Data Translation] DT3001 (dt3000), DT3001-PGL, DT3002, DT3003,
 Updated: Mon, 14 Apr 2008 15:41:24 +0100
 Status: works
 
-Configuration Options:
-  [0] - PCI bus of device (optional)
-  [1] - PCI slot of device (optional)
-  If bus/slot is not specified, the first supported
-  PCI device found will be used.
+Configuration Options: not applicable, uses PCI auto config
 
 There is code to support AI commands, but it may not work.
 
@@ -65,26 +61,36 @@ AO commands are not supported.
 
 #include "comedi_fc.h"
 
-#define PCI_VENDOR_ID_DT        0x1116
-
-static const struct comedi_lrange range_dt3000_ai = { 4, {
-                                                          RANGE(-10, 10),
-                                                          RANGE(-5, 5),
-                                                          RANGE(-2.5, 2.5),
-                                                          RANGE(-1.25, 1.25)
-                                                          }
+/*
+ * PCI device id's supported by this driver
+ */
+#define PCI_DEVICE_ID_DT3001            0x0022
+#define PCI_DEVICE_ID_DT3002            0x0023
+#define PCI_DEVICE_ID_DT3003            0x0024
+#define PCI_DEVICE_ID_DT3004            0x0025
+#define PCI_DEVICE_ID_DT3005            0x0026
+#define PCI_DEVICE_ID_DT3001_PGL        0x0027
+#define PCI_DEVICE_ID_DT3003_PGL        0x0028
+
+static const struct comedi_lrange range_dt3000_ai = {
+        4, {
+                BIP_RANGE(10),
+                BIP_RANGE(5),
+                BIP_RANGE(2.5),
+                BIP_RANGE(1.25)
+        }
 };
 
-static const struct comedi_lrange range_dt3000_ai_pgl = { 4, {
-                                                              RANGE(-10, 10),
-                                                              RANGE(-1, 1),
-                                                              RANGE(-0.1, 0.1),
-                                                              RANGE(-0.02, 0.02)
-                                                              }
+static const struct comedi_lrange range_dt3000_ai_pgl = {
+        4, {
+                BIP_RANGE(10),
+                BIP_RANGE(1),
+                BIP_RANGE(0.1),
+                BIP_RANGE(0.02)
+        }
 };
 
 struct dt3k_boardtype {
-
         const char *name;
         unsigned int device_id;
         int adchan;
@@ -96,73 +102,70 @@ struct dt3k_boardtype {
 };
 
 static const struct dt3k_boardtype dt3k_boardtypes[] = {
-        {.name = "dt3001",
-         .device_id = 0x22,
-         .adchan = 16,
-         .adbits = 12,
-         .adrange = &range_dt3000_ai,
-         .ai_speed = 3000,
-         .dachan = 2,
-         .dabits = 12,
-         },
-        {.name = "dt3001-pgl",
-         .device_id = 0x27,
-         .adchan = 16,
-         .adbits = 12,
-         .adrange = &range_dt3000_ai_pgl,
-         .ai_speed = 3000,
-         .dachan = 2,
-         .dabits = 12,
-         },
-        {.name = "dt3002",
-         .device_id = 0x23,
-         .adchan = 32,
-         .adbits = 12,
-         .adrange = &range_dt3000_ai,
-         .ai_speed = 3000,
-         .dachan = 0,
-         .dabits = 0,
-         },
-        {.name = "dt3003",
-         .device_id = 0x24,
-         .adchan = 64,
-         .adbits = 12,
-         .adrange = &range_dt3000_ai,
-         .ai_speed = 3000,
-         .dachan = 2,
-         .dabits = 12,
-         },
-        {.name = "dt3003-pgl",
-         .device_id = 0x28,
-         .adchan = 64,
-         .adbits = 12,
-         .adrange = &range_dt3000_ai_pgl,
-         .ai_speed = 3000,
-         .dachan = 2,
-         .dabits = 12,
-         },
-        {.name = "dt3004",
-         .device_id = 0x25,
-         .adchan = 16,
-         .adbits = 16,
-         .adrange = &range_dt3000_ai,
-         .ai_speed = 10000,
-         .dachan = 2,
-         .dabits = 12,
-         },
-        {.name = "dt3005",      /* a.k.a. 3004-200 */
-         .device_id = 0x26,
-         .adchan = 16,
-         .adbits = 16,
-         .adrange = &range_dt3000_ai,
-         .ai_speed = 5000,
-         .dachan = 2,
-         .dabits = 12,
-         },
+        {
+                .name           = "dt3001",
+                .device_id      = PCI_DEVICE_ID_DT3001,
+                .adchan         = 16,
+                .adbits         = 12,
+                .adrange        = &range_dt3000_ai,
+                .ai_speed       = 3000,
+                .dachan         = 2,
+                .dabits         = 12,
+        }, {
+                .name           = "dt3001-pgl",
+                .device_id      = PCI_DEVICE_ID_DT3001_PGL,
+                .adchan         = 16,
+                .adbits         = 12,
+                .adrange        = &range_dt3000_ai_pgl,
+                .ai_speed       = 3000,
+                .dachan         = 2,
+                .dabits         = 12,
+        }, {
+                .name           = "dt3002",
+                .device_id      = PCI_DEVICE_ID_DT3002,
+                .adchan         = 32,
+                .adbits         = 12,
+                .adrange        = &range_dt3000_ai,
+                .ai_speed       = 3000,
+        }, {
+                .name           = "dt3003",
+                .device_id      = PCI_DEVICE_ID_DT3003,
+                .adchan         = 64,
+                .adbits         = 12,
+                .adrange        = &range_dt3000_ai,
+                .ai_speed       = 3000,
+                .dachan         = 2,
+                .dabits         = 12,
+        }, {
+                .name           = "dt3003-pgl",
+                .device_id      = PCI_DEVICE_ID_DT3003_PGL,
+                .adchan         = 64,
+                .adbits         = 12,
+                .adrange        = &range_dt3000_ai_pgl,
+                .ai_speed       = 3000,
+                .dachan         = 2,
+                .dabits         = 12,
+        }, {
+                .name           = "dt3004",
+                .device_id      = PCI_DEVICE_ID_DT3004,
+                .adchan         = 16,
+                .adbits         = 16,
+                .adrange        = &range_dt3000_ai,
+                .ai_speed       = 10000,
+                .dachan         = 2,
+                .dabits         = 12,
+        }, {
+                .name           = "dt3005",     /* a.k.a. 3004-200 */
+                .device_id      = PCI_DEVICE_ID_DT3005,
+                .adchan         = 16,
+                .adbits         = 16,
+                .adrange        = &range_dt3000_ai,
+                .ai_speed       = 5000,
+                .dachan         = 2,
+                .dabits         = 12,
+        },
 };
 
-#define this_board ((const struct dt3k_boardtype *)dev->board_ptr)
-
 #define DT3000_SIZE             (4*0x1000)
 
 /* dual-ported RAM location definitions */
@@ -257,22 +260,29 @@ struct dt3k_private {
         unsigned int ai_rear;
 };
 
-#define devpriv ((struct dt3k_private *)dev->private)
-
-static void dt3k_ai_empty_fifo(struct comedi_device *dev,
-                               struct comedi_subdevice *s);
-static int dt3k_ns_to_timer(unsigned int timer_base, unsigned int *arg,
-                            unsigned int round_mode);
-static int dt3k_ai_cancel(struct comedi_device *dev,
-                          struct comedi_subdevice *s);
 #ifdef DEBUG
-static void debug_intr_flags(unsigned int flags);
+static char *intr_flags[] = {
+        "AdFull", "AdSwError", "AdHwError", "DaEmpty",
+        "DaSwError", "DaHwError", "CtDone", "CmDone",
+};
+
+static void debug_intr_flags(unsigned int flags)
+{
+        int i;
+        printk(KERN_DEBUG "dt3k: intr_flags:");
+        for (i = 0; i < 8; i++) {
+                if (flags & (1 << i))
+                        printk(KERN_CONT " %s", intr_flags[i]);
+        }
+        printk(KERN_CONT "\n");
+}
 #endif
 
 #define TIMEOUT 100
 
-static int dt3k_send_cmd(struct comedi_device *dev, unsigned int cmd)
+static void dt3k_send_cmd(struct comedi_device *dev, unsigned int cmd)
 {
+        struct dt3k_private *devpriv = dev->private;
         int i;
         unsigned int status = 0;
 
@@ -284,19 +294,18 @@ static int dt3k_send_cmd(struct comedi_device *dev, unsigned int cmd)
                         break;
                 udelay(1);
         }
-        if ((status & DT3000_COMPLETION_MASK) == DT3000_NOERROR)
-                return 0;
-
-        dev_dbg(dev->class_dev, "dt3k_send_cmd() timeout/error status=0x%04x\n",
-                status);
 
-        return -ETIME;
+        if ((status & DT3000_COMPLETION_MASK) != DT3000_NOERROR)
+                dev_dbg(dev->class_dev, "%s: timeout/error status=0x%04x\n",
+                        __func__, status);
 }
 
 static unsigned int dt3k_readsingle(struct comedi_device *dev,
                                     unsigned int subsys, unsigned int chan,
                                     unsigned int gain)
 {
+        struct dt3k_private *devpriv = dev->private;
+
         writew(subsys, devpriv->io_addr + DPR_SubSys);
 
         writew(chan, devpriv->io_addr + DPR_Params(0));
@@ -310,6 +319,8 @@ static unsigned int dt3k_readsingle(struct comedi_device *dev,
 static void dt3k_writesingle(struct comedi_device *dev, unsigned int subsys,
                              unsigned int chan, unsigned int data)
 {
+        struct dt3k_private *devpriv = dev->private;
+
         writew(subsys, devpriv->io_addr + DPR_SubSys);
 
         writew(chan, devpriv->io_addr + DPR_Params(0));
@@ -319,6 +330,47 @@ static void dt3k_writesingle(struct comedi_device *dev, unsigned int subsys,
         dt3k_send_cmd(dev, CMD_WRITESINGLE);
 }
 
+static void dt3k_ai_empty_fifo(struct comedi_device *dev,
+                               struct comedi_subdevice *s)
+{
+        struct dt3k_private *devpriv = dev->private;
+        int front;
+        int rear;
+        int count;
+        int i;
+        short data;
+
+        front = readw(devpriv->io_addr + DPR_AD_Buf_Front);
+        count = front - devpriv->ai_front;
+        if (count < 0)
+                count += AI_FIFO_DEPTH;
+
+        rear = devpriv->ai_rear;
+
+        for (i = 0; i < count; i++) {
+                data = readw(devpriv->io_addr + DPR_ADC_buffer + rear);
+                comedi_buf_put(s->async, data);
+                rear++;
+                if (rear >= AI_FIFO_DEPTH)
+                        rear = 0;
+        }
+
+        devpriv->ai_rear = rear;
+        writew(rear, devpriv->io_addr + DPR_AD_Buf_Rear);
+}
+
+static int dt3k_ai_cancel(struct comedi_device *dev, struct comedi_subdevice *s)
+{
+        struct dt3k_private *devpriv = dev->private;
+
+        writew(SUBS_AI, devpriv->io_addr + DPR_SubSys);
+        dt3k_send_cmd(dev, CMD_STOP);
+
+        writew(0, devpriv->io_addr + DPR_Int_Mask);
+
+        return 0;
+}
+
 static int debug_n_ints;
 
 /* FIXME! Assumes shared interrupt is for this card. */
@@ -326,6 +378,7 @@ static int debug_n_ints;
 static irqreturn_t dt3k_interrupt(int irq, void *d)
 {
         struct comedi_device *dev = d;
+        struct dt3k_private *devpriv = dev->private;
         struct comedi_subdevice *s;
         unsigned int status;
 
@@ -356,57 +409,45 @@ static irqreturn_t dt3k_interrupt(int irq, void *d)
         return IRQ_HANDLED;
 }
 
-#ifdef DEBUG
-static char *intr_flags[] = {
-        "AdFull", "AdSwError", "AdHwError", "DaEmpty",
-        "DaSwError", "DaHwError", "CtDone", "CmDone",
-};
-
-static void debug_intr_flags(unsigned int flags)
-{
-        int i;
-        printk(KERN_DEBUG "dt3k: intr_flags:");
-        for (i = 0; i < 8; i++) {
-                if (flags & (1 << i))
-                        printk(KERN_CONT " %s", intr_flags[i]);
-        }
-        printk(KERN_CONT "\n");
-}
-#endif
-
-static void dt3k_ai_empty_fifo(struct comedi_device *dev,
-                               struct comedi_subdevice *s)
+static int dt3k_ns_to_timer(unsigned int timer_base, unsigned int *nanosec,
+                            unsigned int round_mode)
 {
-        int front;
-        int rear;
-        int count;
-        int i;
-        short data;
-
-        front = readw(devpriv->io_addr + DPR_AD_Buf_Front);
-        count = front - devpriv->ai_front;
-        if (count < 0)
-                count += AI_FIFO_DEPTH;
-
-        dev_dbg(dev->class_dev, "reading %d samples\n", count);
+        int divider, base, prescale;
 
-        rear = devpriv->ai_rear;
+        /* This function needs improvment */
+        /* Don't know if divider==0 works. */
 
-        for (i = 0; i < count; i++) {
-                data = readw(devpriv->io_addr + DPR_ADC_buffer + rear);
-                comedi_buf_put(s->async, data);
-                rear++;
-                if (rear >= AI_FIFO_DEPTH)
-                        rear = 0;
+        for (prescale = 0; prescale < 16; prescale++) {
+                base = timer_base * (prescale + 1);
+                switch (round_mode) {
+                case TRIG_ROUND_NEAREST:
+                default:
+                        divider = (*nanosec + base / 2) / base;
+                        break;
+                case TRIG_ROUND_DOWN:
+                        divider = (*nanosec) / base;
+                        break;
+                case TRIG_ROUND_UP:
+                        divider = (*nanosec) / base;
+                        break;
+                }
+                if (divider < 65536) {
+                        *nanosec = divider * base;
+                        return (prescale << 16) | (divider);
+                }
         }
 
-        devpriv->ai_rear = rear;
-        writew(rear, devpriv->io_addr + DPR_AD_Buf_Rear);
+        prescale = 15;
+        base = timer_base * (1 << prescale);
+        divider = 65535;
+        *nanosec = divider * base;
+        return (prescale << 16) | (divider);
 }
 
 static int dt3k_ai_cmdtest(struct comedi_device *dev,
                            struct comedi_subdevice *s, struct comedi_cmd *cmd)
 {
+        const struct dt3k_boardtype *this_board = comedi_board(dev);
         int err = 0;
         int tmp;
 
@@ -427,54 +468,30 @@ static int dt3k_ai_cmdtest(struct comedi_device *dev,
         if (err)
                 return 2;
 
-        /* step 3: make sure arguments are trivially compatible */
+        /* Step 3: check if arguments are trivially valid */
 
-        if (cmd->start_arg != 0) {
-                cmd->start_arg = 0;
-                err++;
-        }
+        err |= cfc_check_trigger_arg_is(&cmd->start_arg, 0);
 
         if (cmd->scan_begin_src == TRIG_TIMER) {
-                if (cmd->scan_begin_arg < this_board->ai_speed) {
-                        cmd->scan_begin_arg = this_board->ai_speed;
-                        err++;
-                }
-                if (cmd->scan_begin_arg > 100 * 16 * 65535) {
-                        cmd->scan_begin_arg = 100 * 16 * 65535;
-                        err++;
-                }
-        } else {
-                /* not supported */
+                err |= cfc_check_trigger_arg_min(&cmd->scan_begin_arg,
+                                                 this_board->ai_speed);
+                err |= cfc_check_trigger_arg_max(&cmd->scan_begin_arg,
+                                                 100 * 16 * 65535);
         }
+
         if (cmd->convert_src == TRIG_TIMER) {
-                if (cmd->convert_arg < this_board->ai_speed) {
-                        cmd->convert_arg = this_board->ai_speed;
-                        err++;
-                }
-                if (cmd->convert_arg > 50 * 16 * 65535) {
-                        cmd->convert_arg = 50 * 16 * 65535;
-                        err++;
-                }
-        } else {
-                /* not supported */
+                err |= cfc_check_trigger_arg_min(&cmd->convert_arg,
+                                                 this_board->ai_speed);
+                err |= cfc_check_trigger_arg_max(&cmd->convert_arg,
+                                                 50 * 16 * 65535);
         }
 
-        if (cmd->scan_end_arg != cmd->chanlist_len) {
-                cmd->scan_end_arg = cmd->chanlist_len;
-                err++;
-        }
-        if (cmd->stop_src == TRIG_COUNT) {
-                if (cmd->stop_arg > 0x00ffffff) {
-                        cmd->stop_arg = 0x00ffffff;
-                        err++;
-                }
-        } else {
-                /* TRIG_NONE */
-                if (cmd->stop_arg != 0) {
-                        cmd->stop_arg = 0;
-                        err++;
-                }
-        }
+        err |= cfc_check_trigger_arg_is(&cmd->scan_end_arg, cmd->chanlist_len);
+
+        if (cmd->stop_src == TRIG_COUNT)
+                err |= cfc_check_trigger_arg_max(&cmd->stop_arg, 0x00ffffff);
+        else    /* TRIG_NONE */
+                err |= cfc_check_trigger_arg_is(&cmd->stop_arg, 0);
 
         if (err)
                 return 3;
@@ -487,9 +504,8 @@ static int dt3k_ai_cmdtest(struct comedi_device *dev,
                                  cmd->flags & TRIG_ROUND_MASK);
                 if (tmp != cmd->scan_begin_arg)
                         err++;
-        } else {
-                /* not supported */
         }
+
         if (cmd->convert_src == TRIG_TIMER) {
                 tmp = cmd->convert_arg;
                 dt3k_ns_to_timer(50, &cmd->convert_arg,
@@ -503,8 +519,6 @@ static int dt3k_ai_cmdtest(struct comedi_device *dev,
                             cmd->convert_arg * cmd->scan_end_arg;
                         err++;
                 }
-        } else {
-                /* not supported */
         }
 
         if (err)
@@ -513,52 +527,16 @@ static int dt3k_ai_cmdtest(struct comedi_device *dev,
         return 0;
 }
 
-static int dt3k_ns_to_timer(unsigned int timer_base, unsigned int *nanosec,
-                            unsigned int round_mode)
-{
-        int divider, base, prescale;
-
-        /* This function needs improvment */
-        /* Don't know if divider==0 works. */
-
-        for (prescale = 0; prescale < 16; prescale++) {
-                base = timer_base * (prescale + 1);
-                switch (round_mode) {
-                case TRIG_ROUND_NEAREST:
-                default:
-                        divider = (*nanosec + base / 2) / base;
-                        break;
-                case TRIG_ROUND_DOWN:
-                        divider = (*nanosec) / base;
-                        break;
-                case TRIG_ROUND_UP:
-                        divider = (*nanosec) / base;
-                        break;
-                }
-                if (divider < 65536) {
-                        *nanosec = divider * base;
-                        return (prescale << 16) | (divider);
-                }
-        }
-
-        prescale = 15;
-        base = timer_base * (1 << prescale);
-        divider = 65535;
-        *nanosec = divider * base;
-        return (prescale << 16) | (divider);
-}
-
 static int dt3k_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
 {
+        struct dt3k_private *devpriv = dev->private;
         struct comedi_cmd *cmd = &s->async->cmd;
         int i;
         unsigned int chan, range, aref;
         unsigned int divider;
         unsigned int tscandiv;
-        int ret;
         unsigned int mode;
 
-        dev_dbg(dev->class_dev, "dt3k_ai_cmd:\n");
         for (i = 0; i < cmd->chanlist_len; i++) {
                 chan = CR_CHAN(cmd->chanlist[i]);
                 range = CR_RANGE(cmd->chanlist[i]);
@@ -569,41 +547,29 @@ static int dt3k_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
         aref = CR_AREF(cmd->chanlist[0]);
 
         writew(cmd->scan_end_arg, devpriv->io_addr + DPR_Params(0));
-        dev_dbg(dev->class_dev, "param[0]=0x%04x\n", cmd->scan_end_arg);
 
         if (cmd->convert_src == TRIG_TIMER) {
                 divider = dt3k_ns_to_timer(50, &cmd->convert_arg,
                                            cmd->flags & TRIG_ROUND_MASK);
                 writew((divider >> 16), devpriv->io_addr + DPR_Params(1));
-                dev_dbg(dev->class_dev, "param[1]=0x%04x\n", divider >> 16);
                 writew((divider & 0xffff), devpriv->io_addr + DPR_Params(2));
-                dev_dbg(dev->class_dev, "param[2]=0x%04x\n", divider & 0xffff);
-        } else {
-                /* not supported */
         }
 
         if (cmd->scan_begin_src == TRIG_TIMER) {
                 tscandiv = dt3k_ns_to_timer(100, &cmd->scan_begin_arg,
                                             cmd->flags & TRIG_ROUND_MASK);
                 writew((tscandiv >> 16), devpriv->io_addr + DPR_Params(3));
-                dev_dbg(dev->class_dev, "param[3]=0x%04x\n", tscandiv >> 16);
                 writew((tscandiv & 0xffff), devpriv->io_addr + DPR_Params(4));
-                dev_dbg(dev->class_dev, "param[4]=0x%04x\n", tscandiv & 0xffff);
-        } else {
-                /* not supported */
         }
 
         mode = DT3000_AD_RETRIG_INTERNAL | 0 | 0;
         writew(mode, devpriv->io_addr + DPR_Params(5));
-        dev_dbg(dev->class_dev, "param[5]=0x%04x\n", mode);
         writew(aref == AREF_DIFF, devpriv->io_addr + DPR_Params(6));
-        dev_dbg(dev->class_dev, "param[6]=0x%04x\n", aref == AREF_DIFF);
 
         writew(AI_FIFO_DEPTH / 2, devpriv->io_addr + DPR_Params(7));
-        dev_dbg(dev->class_dev, "param[7]=0x%04x\n", AI_FIFO_DEPTH / 2);
 
         writew(SUBS_AI, devpriv->io_addr + DPR_SubSys);
-        ret = dt3k_send_cmd(dev, CMD_CONFIG);
+        dt3k_send_cmd(dev, CMD_CONFIG);
 
         writew(DT3000_ADFULL | DT3000_ADSWERR | DT3000_ADHWERR,
                devpriv->io_addr + DPR_Int_Mask);
@@ -611,19 +577,7 @@ static int dt3k_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
         debug_n_ints = 0;
 
         writew(SUBS_AI, devpriv->io_addr + DPR_SubSys);
-        ret = dt3k_send_cmd(dev, CMD_START);
-
-        return 0;
-}
-
-static int dt3k_ai_cancel(struct comedi_device *dev, struct comedi_subdevice *s)
-{
-        int ret;
-
-        writew(SUBS_AI, devpriv->io_addr + DPR_SubSys);
-        ret = dt3k_send_cmd(dev, CMD_STOP);
-
-        writew(0, devpriv->io_addr + DPR_Int_Mask);
+        dt3k_send_cmd(dev, CMD_START);
 
         return 0;
 }
@@ -648,6 +602,7 @@ static int dt3k_ai_insn(struct comedi_device *dev, struct comedi_subdevice *s,
 static int dt3k_ao_insn(struct comedi_device *dev, struct comedi_subdevice *s,
                         struct comedi_insn *insn, unsigned int *data)
 {
+        struct dt3k_private *devpriv = dev->private;
         int i;
         unsigned int chan;
 
@@ -664,6 +619,7 @@ static int dt3k_ao_insn_read(struct comedi_device *dev,
                              struct comedi_subdevice *s,
                              struct comedi_insn *insn, unsigned int *data)
 {
+        struct dt3k_private *devpriv = dev->private;
         int i;
         unsigned int chan;
 
@@ -676,6 +632,8 @@ static int dt3k_ao_insn_read(struct comedi_device *dev,
 
 static void dt3k_dio_config(struct comedi_device *dev, int bits)
 {
+        struct dt3k_private *devpriv = dev->private;
+
         /* XXX */
         writew(SUBS_DOUT, devpriv->io_addr + DPR_SubSys);
 
@@ -739,6 +697,7 @@ static int dt3k_mem_insn_read(struct comedi_device *dev,
                               struct comedi_subdevice *s,
                               struct comedi_insn *insn, unsigned int *data)
 {
+        struct dt3k_private *devpriv = dev->private;
         unsigned int addr = CR_CHAN(insn->chanspec);
         int i;
 
@@ -755,54 +714,42 @@ static int dt3k_mem_insn_read(struct comedi_device *dev,
         return i;
 }
 
-static struct pci_dev *dt3000_find_pci_dev(struct comedi_device *dev,
-                                           struct comedi_devconfig *it)
+static const void *dt3000_find_boardinfo(struct comedi_device *dev,
+                                         struct pci_dev *pcidev)
 {
-        struct pci_dev *pcidev = NULL;
-        int bus = it->options[0];
-        int slot = it->options[1];
+        const struct dt3k_boardtype *this_board;
         int i;
 
-        for_each_pci_dev(pcidev) {
-                if (bus || slot) {
-                        if (bus != pcidev->bus->number ||
-                            slot != PCI_SLOT(pcidev->devfn))
-                                continue;
-                }
-                if (pcidev->vendor != PCI_VENDOR_ID_DT)
-                        continue;
-                for (i = 0; i < ARRAY_SIZE(dt3k_boardtypes); i++) {
-                        if (dt3k_boardtypes[i].device_id != pcidev->device)
-                                continue;
-                        dev->board_ptr = dt3k_boardtypes + i;
-                        return pcidev;
-                }
+        for (i = 0; i < ARRAY_SIZE(dt3k_boardtypes); i++) {
+                this_board = &dt3k_boardtypes[i];
+                if (this_board->device_id == pcidev->device)
+                        return this_board;
         }
-        dev_err(dev->class_dev,
-                "No supported board found! (req. bus %d, slot %d)\n",
-                bus, slot);
         return NULL;
 }
 
-static int dt3000_attach(struct comedi_device *dev, struct comedi_devconfig *it)
+static int dt3000_auto_attach(struct comedi_device *dev,
+                                        unsigned long context_unused)
 {
-        struct pci_dev *pcidev;
+        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
+        const struct dt3k_boardtype *this_board;
+        struct dt3k_private *devpriv;
         struct comedi_subdevice *s;
         resource_size_t pci_base;
         int ret = 0;
 
-        dev_dbg(dev->class_dev, "dt3000:\n");
-
-        ret = alloc_private(dev, sizeof(struct dt3k_private));
-        if (ret < 0)
-                return ret;
+        this_board = dt3000_find_boardinfo(dev, pcidev);
+        if (!this_board)
+                return -ENODEV;
+        dev->board_ptr = this_board;
+        dev->board_name = this_board->name;
 
-        pcidev = dt3000_find_pci_dev(dev, it);
-        if (!pcidev)
-                return -EIO;
-        comedi_set_hw_dev(dev, &pcidev->dev);
+        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
+        if (!devpriv)
+                return -ENOMEM;
+        dev->private = devpriv;
 
-        ret = comedi_pci_enable(pcidev, "dt3000");
+        ret = comedi_pci_enable(pcidev, dev->board_name);
         if (ret < 0)
                 return ret;
         dev->iobase = 1;        /* the "detach" needs this */
@@ -812,14 +759,10 @@ static int dt3000_attach(struct comedi_device *dev, struct comedi_devconfig *it)
         if (!devpriv->io_addr)
                 return -ENOMEM;
 
-        dev->board_name = this_board->name;
-
-        if (request_irq(pcidev->irq, dt3k_interrupt, IRQF_SHARED,
-                        "dt3000", dev)) {
-                dev_err(dev->class_dev, "unable to allocate IRQ %u\n",
-                        pcidev->irq);
-                return -EINVAL;
-        }
+        ret = request_irq(pcidev->irq, dt3k_interrupt, IRQF_SHARED,
+                          dev->board_name, dev);
+        if (ret)
+                return ret;
         dev->irq = pcidev->irq;
 
         ret = comedi_alloc_subdevices(dev, 4);
@@ -828,50 +771,49 @@ static int dt3000_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 
         s = &dev->subdevices[0];
         dev->read_subdev = s;
-
         /* ai subdevice */
-        s->type = COMEDI_SUBD_AI;
-        s->subdev_flags = SDF_READABLE | SDF_GROUND | SDF_DIFF | SDF_CMD_READ;
-        s->n_chan = this_board->adchan;
-        s->insn_read = dt3k_ai_insn;
-        s->maxdata = (1 << this_board->adbits) - 1;
-        s->len_chanlist = 512;
-        s->range_table = &range_dt3000_ai;      /* XXX */
-        s->do_cmd = dt3k_ai_cmd;
-        s->do_cmdtest = dt3k_ai_cmdtest;
-        s->cancel = dt3k_ai_cancel;
+        s->type         = COMEDI_SUBD_AI;
+        s->subdev_flags = SDF_READABLE | SDF_GROUND | SDF_DIFF | SDF_CMD_READ;
+        s->n_chan       = this_board->adchan;
+        s->insn_read    = dt3k_ai_insn;
+        s->maxdata      = (1 << this_board->adbits) - 1;
+        s->len_chanlist = 512;
+        s->range_table  = &range_dt3000_ai;     /* XXX */
+        s->do_cmd       = dt3k_ai_cmd;
+        s->do_cmdtest   = dt3k_ai_cmdtest;
+        s->cancel       = dt3k_ai_cancel;
 
         s = &dev->subdevices[1];
         /* ao subsystem */
-        s->type = COMEDI_SUBD_AO;
-        s->subdev_flags = SDF_WRITABLE;
-        s->n_chan = 2;
-        s->insn_read = dt3k_ao_insn_read;
-        s->insn_write = dt3k_ao_insn;
-        s->maxdata = (1 << this_board->dabits) - 1;
-        s->len_chanlist = 1;
-        s->range_table = &range_bipolar10;
+        s->type         = COMEDI_SUBD_AO;
+        s->subdev_flags = SDF_WRITABLE;
+        s->n_chan       = 2;
+        s->insn_read    = dt3k_ao_insn_read;
+        s->insn_write   = dt3k_ao_insn;
+        s->maxdata      = (1 << this_board->dabits) - 1;
+        s->len_chanlist = 1;
+        s->range_table  = &range_bipolar10;
 
         s = &dev->subdevices[2];
         /* dio subsystem */
-        s->type = COMEDI_SUBD_DIO;
-        s->subdev_flags = SDF_READABLE | SDF_WRITABLE;
-        s->n_chan = 8;
-        s->insn_config = dt3k_dio_insn_config;
-        s->insn_bits = dt3k_dio_insn_bits;
-        s->maxdata = 1;
-        s->len_chanlist = 8;
-        s->range_table = &range_digital;
+        s->type         = COMEDI_SUBD_DIO;
+        s->subdev_flags = SDF_READABLE | SDF_WRITABLE;
+        s->n_chan       = 8;
+        s->insn_config  = dt3k_dio_insn_config;
+        s->insn_bits    = dt3k_dio_insn_bits;
+        s->maxdata      = 1;
+        s->len_chanlist = 8;
+        s->range_table  = &range_digital;
 
         s = &dev->subdevices[3];
         /* mem subsystem */
-        s->type = COMEDI_SUBD_MEMORY;
-        s->subdev_flags = SDF_READABLE;
-        s->n_chan = 0x1000;
-        s->insn_read = dt3k_mem_insn_read;
-        s->maxdata = 0xff;
-        s->len_chanlist = 1;
-        s->range_table = &range_unknown;
+        s->type         = COMEDI_SUBD_MEMORY;
+        s->subdev_flags = SDF_READABLE;
+        s->n_chan       = 0x1000;
+        s->insn_read    = dt3k_mem_insn_read;
+        s->maxdata      = 0xff;
+        s->len_chanlist = 1;
+        s->range_table  = &range_unknown;
 
 #if 0
         s = &dev->subdevices[4];
@@ -879,12 +821,15 @@ static int dt3000_attach(struct comedi_device *dev, struct comedi_devconfig *it)
         s->type = COMEDI_SUBD_PROC;
 #endif
 
+        dev_info(dev->class_dev, "%s attached\n", dev->board_name);
+
         return 0;
 }
 
 static void dt3000_detach(struct comedi_device *dev)
 {
         struct pci_dev *pcidev = comedi_to_pci_dev(dev);
+        struct dt3k_private *devpriv = dev->private;
 
         if (dev->irq)
                 free_irq(dev->irq, dev);
@@ -895,36 +840,35 @@ static void dt3000_detach(struct comedi_device *dev)
         if (pcidev) {
                 if (dev->iobase)
                         comedi_pci_disable(pcidev);
-                pci_dev_put(pcidev);
         }
 }
 
 static struct comedi_driver dt3000_driver = {
         .driver_name    = "dt3000",
         .module         = THIS_MODULE,
-        .attach         = dt3000_attach,
+        .auto_attach    = dt3000_auto_attach,
         .detach         = dt3000_detach,
 };
 
-static int __devinit dt3000_pci_probe(struct pci_dev *dev,
+static int dt3000_pci_probe(struct pci_dev *dev,
                                       const struct pci_device_id *ent)
 {
         return comedi_pci_auto_config(dev, &dt3000_driver);
 }
 
-static void __devexit dt3000_pci_remove(struct pci_dev *dev)
+static void dt3000_pci_remove(struct pci_dev *dev)
 {
         comedi_pci_auto_unconfig(dev);
 }
 
 static DEFINE_PCI_DEVICE_TABLE(dt3000_pci_table) = {
-        { PCI_DEVICE(PCI_VENDOR_ID_DT, 0x0022) },
-        { PCI_DEVICE(PCI_VENDOR_ID_DT, 0x0027) },
-        { PCI_DEVICE(PCI_VENDOR_ID_DT, 0x0023) },
-        { PCI_DEVICE(PCI_VENDOR_ID_DT, 0x0024) },
-        { PCI_DEVICE(PCI_VENDOR_ID_DT, 0x0028) },
-        { PCI_DEVICE(PCI_VENDOR_ID_DT, 0x0025) },
-        { PCI_DEVICE(PCI_VENDOR_ID_DT, 0x0026) },
+        { PCI_DEVICE(PCI_VENDOR_ID_DT, PCI_DEVICE_ID_DT3001) },
+        { PCI_DEVICE(PCI_VENDOR_ID_DT, PCI_DEVICE_ID_DT3001_PGL) },
+        { PCI_DEVICE(PCI_VENDOR_ID_DT, PCI_DEVICE_ID_DT3002) },
+        { PCI_DEVICE(PCI_VENDOR_ID_DT, PCI_DEVICE_ID_DT3003) },
+        { PCI_DEVICE(PCI_VENDOR_ID_DT, PCI_DEVICE_ID_DT3003_PGL) },
+        { PCI_DEVICE(PCI_VENDOR_ID_DT, PCI_DEVICE_ID_DT3004) },
+        { PCI_DEVICE(PCI_VENDOR_ID_DT, PCI_DEVICE_ID_DT3005) },
         { 0 }
 };
 MODULE_DEVICE_TABLE(pci, dt3000_pci_table);
@@ -933,7 +877,7 @@ static struct pci_driver dt3000_pci_driver = {
         .name           = "dt3000",
         .id_table       = dt3000_pci_table,
         .probe          = dt3000_pci_probe,
-        .remove         = __devexit_p(dt3000_pci_remove),
+        .remove         = dt3000_pci_remove,
 };
 module_comedi_pci_driver(dt3000_driver, dt3000_pci_driver);
 
diff --git a/drivers/staging/comedi/drivers/dt9812.c b/drivers/staging/comedi/drivers/dt9812.c
index bc6f409b7e19..176799849d20 100644
--- a/drivers/staging/comedi/drivers/dt9812.c
+++ b/drivers/staging/comedi/drivers/dt9812.c
@@ -43,6 +43,8 @@ for my needs.
  *      says P1).
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/init.h>
@@ -323,9 +325,6 @@ static const struct comedi_lrange dt9812_2pt5_aout_range = { 1, {
 
 static struct slot_dt9812 dt9812[DT9812_NUM_SLOTS];
 
-/* Useful shorthand access to private data */
-#define devpriv ((struct comedi_dt9812 *)dev->private)
-
 static inline struct usb_dt9812 *to_dt9812_dev(struct kref *d)
 {
         return container_of(d, struct usb_dt9812, kref);
@@ -893,6 +892,7 @@ static struct usb_driver dt9812_usb_driver = {
 
 static int dt9812_comedi_open(struct comedi_device *dev)
 {
+        struct comedi_dt9812 *devpriv = dev->private;
         int result = -ENODEV;
 
         down(&devpriv->slot->mutex);
@@ -947,6 +947,7 @@ static int dt9812_di_rinsn(struct comedi_device *dev,
                            struct comedi_subdevice *s, struct comedi_insn *insn,
                            unsigned int *data)
 {
+        struct comedi_dt9812 *devpriv = dev->private;
         int n;
         u8 bits = 0;
 
@@ -960,6 +961,7 @@ static int dt9812_do_winsn(struct comedi_device *dev,
                            struct comedi_subdevice *s, struct comedi_insn *insn,
                            unsigned int *data)
 {
+        struct comedi_dt9812 *devpriv = dev->private;
         int n;
         u8 bits = 0;
 
@@ -979,6 +981,7 @@ static int dt9812_ai_rinsn(struct comedi_device *dev,
                            struct comedi_subdevice *s, struct comedi_insn *insn,
                            unsigned int *data)
 {
+        struct comedi_dt9812 *devpriv = dev->private;
         int n;
 
         for (n = 0; n < insn->n; n++) {
@@ -995,6 +998,7 @@ static int dt9812_ao_rinsn(struct comedi_device *dev,
                            struct comedi_subdevice *s, struct comedi_insn *insn,
                            unsigned int *data)
 {
+        struct comedi_dt9812 *devpriv = dev->private;
         int n;
         u16 value;
 
@@ -1010,6 +1014,7 @@ static int dt9812_ao_winsn(struct comedi_device *dev,
                            struct comedi_subdevice *s, struct comedi_insn *insn,
                            unsigned int *data)
 {
+        struct comedi_dt9812 *devpriv = dev->private;
         int n;
 
         for (n = 0; n < insn->n; n++)
@@ -1019,14 +1024,17 @@ static int dt9812_ao_winsn(struct comedi_device *dev,
 
 static int dt9812_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 {
+        struct comedi_dt9812 *devpriv;
         int i;
         struct comedi_subdevice *s;
         int ret;
 
         dev->board_name = "dt9812";
 
-        if (alloc_private(dev, sizeof(struct comedi_dt9812)) < 0)
+        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
+        if (!devpriv)
                 return -ENOMEM;
+        dev->private = devpriv;
 
         /*
          * Special open routine, since USB unit may be unattached at
@@ -1077,8 +1085,7 @@ static int dt9812_attach(struct comedi_device *dev, struct comedi_devconfig *it)
         s->insn_write = &dt9812_ao_winsn;
         s->insn_read = &dt9812_ao_rinsn;
 
-        printk(KERN_INFO "comedi%d: successfully attached to dt9812.\n",
-               dev->minor);
+        dev_info(dev->class_dev, "successfully attached to dt9812.\n");
 
         down(&dt9812_mutex);
         /* Find a slot for the comedi device */
@@ -1140,17 +1147,15 @@ static int __init usb_dt9812_init(void)
         /* register with the USB subsystem */
         result = usb_register(&dt9812_usb_driver);
         if (result) {
-                printk(KERN_ERR KBUILD_MODNAME
-                       ": usb_register failed. Error number %d\n", result);
+                pr_err("usb_register failed. Error number %d\n", result);
                 return result;
         }
         /* register with comedi */
         result = comedi_driver_register(&dt9812_comedi_driver);
         if (result) {
                 usb_deregister(&dt9812_usb_driver);
-                printk(KERN_ERR KBUILD_MODNAME
-                        ": comedi_driver_register failed. Error number %d\n",
-                        result);
+                pr_err("comedi_driver_register failed. Error number %d\n",
+                       result);
         }
 
         return result;
diff --git a/drivers/staging/comedi/drivers/dyna_pci10xx.c b/drivers/staging/comedi/drivers/dyna_pci10xx.c
index 6f612be1b0a5..8497a36db7db 100644
--- a/drivers/staging/comedi/drivers/dyna_pci10xx.c
+++ b/drivers/staging/comedi/drivers/dyna_pci10xx.c
@@ -40,8 +40,6 @@
 #include "../comedidev.h"
 #include <linux/mutex.h>
 
-#define PCI_VENDOR_ID_DYNALOG           0x10b5
-
 #define READ_TIMEOUT 50
 
 static const struct comedi_lrange range_pci1050_ai = { 3, {
@@ -179,21 +177,20 @@ static int dyna_pci10xx_do_insn_bits(struct comedi_device *dev,
         return insn->n;
 }
 
-static int dyna_pci10xx_attach_pci(struct comedi_device *dev,
-                                   struct pci_dev *pcidev)
+static int dyna_pci10xx_auto_attach(struct comedi_device *dev,
+                                              unsigned long context_unused)
 {
+        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
         struct dyna_pci10xx_private *devpriv;
         struct comedi_subdevice *s;
         int ret;
 
-        comedi_set_hw_dev(dev, &pcidev->dev);
-
         dev->board_name = dev->driver->driver_name;
 
-        ret = alloc_private(dev, sizeof(*devpriv));
-        if (ret)
-                return ret;
-        devpriv = dev->private;
+        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
+        if (!devpriv)
+                return -ENOMEM;
+        dev->private = devpriv;
 
         ret = comedi_pci_enable(pcidev, dev->board_name);
         if (ret)
@@ -269,23 +266,23 @@ static void dyna_pci10xx_detach(struct comedi_device *dev)
 static struct comedi_driver dyna_pci10xx_driver = {
         .driver_name    = "dyna_pci10xx",
         .module         = THIS_MODULE,
-        .attach_pci     = dyna_pci10xx_attach_pci,
+        .auto_attach    = dyna_pci10xx_auto_attach,
         .detach         = dyna_pci10xx_detach,
 };
 
-static int __devinit dyna_pci10xx_pci_probe(struct pci_dev *dev,
+static int dyna_pci10xx_pci_probe(struct pci_dev *dev,
                                             const struct pci_device_id *ent)
 {
         return comedi_pci_auto_config(dev, &dyna_pci10xx_driver);
 }
 
-static void __devexit dyna_pci10xx_pci_remove(struct pci_dev *dev)
+static void dyna_pci10xx_pci_remove(struct pci_dev *dev)
 {
         comedi_pci_auto_unconfig(dev);
 }
 
 static DEFINE_PCI_DEVICE_TABLE(dyna_pci10xx_pci_table) = {
-        { PCI_DEVICE(PCI_VENDOR_ID_DYNALOG, 0x1050) },
+        { PCI_DEVICE(PCI_VENDOR_ID_PLX, 0x1050) },
         { 0 }
 };
 MODULE_DEVICE_TABLE(pci, dyna_pci10xx_pci_table);
@@ -294,7 +291,7 @@ static struct pci_driver dyna_pci10xx_pci_driver = {
         .name           = "dyna_pci10xx",
         .id_table       = dyna_pci10xx_pci_table,
         .probe          = dyna_pci10xx_pci_probe,
-        .remove         = __devexit_p(dyna_pci10xx_pci_remove),
+        .remove         = dyna_pci10xx_pci_remove,
 };
 module_comedi_pci_driver(dyna_pci10xx_driver, dyna_pci10xx_pci_driver);
 
diff --git a/drivers/staging/comedi/drivers/fl512.c b/drivers/staging/comedi/drivers/fl512.c
index ae8e8f460295..019c96eda6fd 100644
--- a/drivers/staging/comedi/drivers/fl512.c
+++ b/drivers/staging/comedi/drivers/fl512.c
@@ -29,8 +29,6 @@ struct fl512_private {
         short ao_readback[2];
 };
 
-#define devpriv ((struct fl512_private *) dev->private)
-
 static const struct comedi_lrange range_fl512 = { 4, {
                                                       BIP_RANGE(0.5),
                                                       BIP_RANGE(1),
@@ -75,6 +73,7 @@ static int fl512_ao_insn(struct comedi_device *dev,
                          struct comedi_subdevice *s, struct comedi_insn *insn,
                          unsigned int *data)
 {
+        struct fl512_private *devpriv = dev->private;
         int n;
         int chan = CR_CHAN(insn->chanspec);     /* get chan to write */
         unsigned long iobase = dev->iobase;     /* get base address  */
@@ -99,6 +98,7 @@ static int fl512_ao_insn_readback(struct comedi_device *dev,
                                   struct comedi_subdevice *s,
                                   struct comedi_insn *insn, unsigned int *data)
 {
+        struct fl512_private *devpriv = dev->private;
         int n;
         int chan = CR_CHAN(insn->chanspec);
 
@@ -110,6 +110,7 @@ static int fl512_ao_insn_readback(struct comedi_device *dev,
 
 static int fl512_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 {
+        struct fl512_private *devpriv;
         unsigned long iobase;
         int ret;
 
@@ -125,8 +126,11 @@ static int fl512_attach(struct comedi_device *dev, struct comedi_devconfig *it)
         }
         dev->iobase = iobase;
         dev->board_name = "fl512";
-        if (alloc_private(dev, sizeof(struct fl512_private)) < 0)
+
+        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
+        if (!devpriv)
                 return -ENOMEM;
+        dev->private = devpriv;
 
 #if DEBUG
         printk(KERN_DEBUG "malloc ok\n");
diff --git a/drivers/staging/comedi/drivers/gsc_hpdi.c b/drivers/staging/comedi/drivers/gsc_hpdi.c
index abff6603952a..154598f6d5e3 100644
--- a/drivers/staging/comedi/drivers/gsc_hpdi.c
+++ b/drivers/staging/comedi/drivers/gsc_hpdi.c
@@ -26,24 +26,26 @@
 ************************************************************************/
 
 /*
+ * Driver: gsc_hpdi
+ * Description: General Standards Corporation High
+ *    Speed Parallel Digital Interface rs485 boards
+ * Author: Frank Mori Hess <fmhess@users.sourceforge.net>
+ * Status: only receive mode works, transmit not supported
+ * Updated: Thu, 01 Nov 2012 16:17:38 +0000
+ * Devices: [General Standards Corporation] PCI-HPDI32 (gsc_hpdi),
+ *   PMC-HPDI32
+ *
+ * Configuration options:
+ *    None.
+ *
+ * Manual configuration of supported devices is not supported; they are
+ * configured automatically.
+ *
+ * There are some additional hpdi models available from GSC for which
+ * support could be added to this driver.
+ */
 
-Driver: gsc_hpdi
-Description: General Standards Corporation High
-    Speed Parallel Digital Interface rs485 boards
-Author: Frank Mori Hess <fmhess@users.sourceforge.net>
-Status: only receive mode works, transmit not supported
-Updated: 2003-02-20
-Devices: [General Standards Corporation] PCI-HPDI32 (gsc_hpdi),
-  PMC-HPDI32
-
-Configuration options:
-   [0] - PCI bus of device (optional)
-   [1] - PCI slot of device (optional)
-
-There are some additional hpdi models available from GSC for which
-support could be added to this driver.
-
-*/
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
 #include <linux/interrupt.h>
 #include "../comedidev.h"
@@ -64,9 +66,9 @@ static int dio_config_block_size(struct comedi_device *dev, unsigned int *data);
 /* #define HPDI_DEBUG      enable debugging code */
 
 #ifdef HPDI_DEBUG
-#define DEBUG_PRINT(format, args...)  printk(format , ## args)
+#define DEBUG_PRINT(format, args...)  pr_debug(format , ## args)
 #else
-#define DEBUG_PRINT(format, args...)
+#define DEBUG_PRINT(format, args...)  no_printk(pr_fmt(format), ## args)
 #endif
 
 #define TIMER_BASE 50           /*  20MHz master clock */
@@ -104,35 +106,11 @@ enum hpdi_registers {
         INTERRUPT_POLARITY_REG = 0x54,
 };
 
-int command_channel_valid(unsigned int channel)
-{
-        if (channel == 0 || channel > 6) {
-                printk(KERN_WARNING
-                       "gsc_hpdi: bug! invalid cable command channel\n");
-                return 0;
-        }
-        return 1;
-}
-
 /* bit definitions */
 
 enum firmware_revision_bits {
         FEATURES_REG_PRESENT_BIT = 0x8000,
 };
-int firmware_revision(uint32_t fwr_bits)
-{
-        return fwr_bits & 0xff;
-}
-
-int pcb_revision(uint32_t fwr_bits)
-{
-        return (fwr_bits >> 8) & 0xff;
-}
-
-int hpdi_subid(uint32_t fwr_bits)
-{
-        return (fwr_bits >> 16) & 0xff;
-}
 
 enum board_control_bits {
         BOARD_RESET_BIT = 0x1,  /* wait 10usec before accessing fifos */
@@ -147,22 +125,6 @@ enum board_control_bits {
         CABLE_THROTTLE_ENABLE_BIT = 0x20,
         TEST_MODE_ENABLE_BIT = 0x80000000,
 };
-uint32_t command_discrete_output_bits(unsigned int channel, int output,
-                                      int output_value)
-{
-        uint32_t bits = 0;
-
-        if (command_channel_valid(channel) == 0)
-                return 0;
-        if (output) {
-                bits |= 0x1 << (16 + channel);
-                if (output_value)
-                        bits |= 0x1 << (24 + channel);
-        } else
-                bits |= 0x1 << (24 + channel);
-
-        return bits;
-}
 
 enum board_status_bits {
         COMMAND_LINE_STATUS_MASK = 0x7f,
@@ -182,28 +144,17 @@ enum board_status_bits {
         RX_OVERRUN_BIT = 0x800000,
 };
 
-uint32_t almost_full_bits(unsigned int num_words)
+static uint32_t almost_full_bits(unsigned int num_words)
 {
-/* XXX need to add or subtract one? */
+        /* XXX need to add or subtract one? */
         return (num_words << 16) & 0xff0000;
 }
 
-uint32_t almost_empty_bits(unsigned int num_words)
+static uint32_t almost_empty_bits(unsigned int num_words)
 {
         return num_words & 0xffff;
 }
 
-unsigned int almost_full_num_words(uint32_t bits)
-{
-/* XXX need to add or subtract one? */
-        return (bits >> 16) & 0xffff;
-}
-
-unsigned int almost_empty_num_words(uint32_t bits)
-{
-        return bits & 0xffff;
-}
-
 enum features_bits {
         FIFO_SIZE_PRESENT_BIT = 0x1,
         FIFO_WORDS_PRESENT_BIT = 0x2,
@@ -225,46 +176,19 @@ enum interrupt_sources {
         RX_ALMOST_FULL_INTR = 14,
         RX_FULL_INTR = 15,
 };
-int command_intr_source(unsigned int channel)
-{
-        if (command_channel_valid(channel) == 0)
-                channel = 1;
-        return channel + 1;
-}
 
-uint32_t intr_bit(int interrupt_source)
+static uint32_t intr_bit(int interrupt_source)
 {
         return 0x1 << interrupt_source;
 }
 
-uint32_t tx_clock_divisor_bits(unsigned int divisor)
-{
-        return divisor & 0xff;
-}
-
-unsigned int fifo_size(uint32_t fifo_size_bits)
+static unsigned int fifo_size(uint32_t fifo_size_bits)
 {
         return fifo_size_bits & 0xfffff;
 }
 
-unsigned int fifo_words(uint32_t fifo_words_bits)
-{
-        return fifo_words_bits & 0xfffff;
-}
-
-uint32_t intr_edge_bit(int interrupt_source)
-{
-        return 0x1 << interrupt_source;
-}
-
-uint32_t intr_active_high_bit(int interrupt_source)
-{
-        return 0x1 << interrupt_source;
-}
-
 struct hpdi_board {
-
-        char *name;
+        const char *name;       /*  board name */
         int device_id;          /*  pci device id */
         int subdevice_id;       /*  pci subdevice id */
 };
@@ -284,17 +208,7 @@ static const struct hpdi_board hpdi_boards[] = {
 #endif
 };
 
-static inline struct hpdi_board *board(const struct comedi_device *dev)
-{
-        return (struct hpdi_board *)dev->board_ptr;
-}
-
 struct hpdi_private {
-
-        struct pci_dev *hw_dev; /*  pointer to board's pci_dev struct */
-        /*  base addresses (physical) */
-        resource_size_t plx9080_phys_iobase;
-        resource_size_t hpdi_phys_iobase;
         /*  base addresses (ioremapped) */
         void __iomem *plx9080_iobase;
         void __iomem *hpdi_iobase;
@@ -321,27 +235,24 @@ struct hpdi_private {
         unsigned dio_config_output:1;
 };
 
-static inline struct hpdi_private *priv(struct comedi_device *dev)
-{
-        return dev->private;
-}
-
 static int dio_config_insn(struct comedi_device *dev,
                            struct comedi_subdevice *s, struct comedi_insn *insn,
                            unsigned int *data)
 {
+        struct hpdi_private *devpriv = dev->private;
+
         switch (data[0]) {
         case INSN_CONFIG_DIO_OUTPUT:
-                priv(dev)->dio_config_output = 1;
+                devpriv->dio_config_output = 1;
                 return insn->n;
                 break;
         case INSN_CONFIG_DIO_INPUT:
-                priv(dev)->dio_config_output = 0;
+                devpriv->dio_config_output = 0;
                 return insn->n;
                 break;
         case INSN_CONFIG_DIO_QUERY:
                 data[1] =
-                    priv(dev)->dio_config_output ? COMEDI_OUTPUT : COMEDI_INPUT;
+                    devpriv->dio_config_output ? COMEDI_OUTPUT : COMEDI_INPUT;
                 return insn->n;
                 break;
         case INSN_CONFIG_BLOCK_SIZE:
@@ -356,21 +267,24 @@ static int dio_config_insn(struct comedi_device *dev,
 
 static void disable_plx_interrupts(struct comedi_device *dev)
 {
-        writel(0, priv(dev)->plx9080_iobase + PLX_INTRCS_REG);
+        struct hpdi_private *devpriv = dev->private;
+
+        writel(0, devpriv->plx9080_iobase + PLX_INTRCS_REG);
 }
 
 /* initialize plx9080 chip */
 static void init_plx9080(struct comedi_device *dev)
 {
+        struct hpdi_private *devpriv = dev->private;
         uint32_t bits;
-        void __iomem *plx_iobase = priv(dev)->plx9080_iobase;
+        void __iomem *plx_iobase = devpriv->plx9080_iobase;
 
         /*  plx9080 dump */
         DEBUG_PRINT(" plx interrupt status 0x%x\n",
                     readl(plx_iobase + PLX_INTRCS_REG));
         DEBUG_PRINT(" plx id bits 0x%x\n", readl(plx_iobase + PLX_ID_REG));
         DEBUG_PRINT(" plx control reg 0x%x\n",
-                    readl(priv(dev)->plx9080_iobase + PLX_CONTROL_REG));
+                    readl(devpriv->plx9080_iobase + PLX_CONTROL_REG));
 
         DEBUG_PRINT(" plx revision 0x%x\n",
                     readl(plx_iobase + PLX_REVISION_REG));
@@ -396,7 +310,7 @@ static void init_plx9080(struct comedi_device *dev)
 #else
         bits = 0;
 #endif
-        writel(bits, priv(dev)->plx9080_iobase + PLX_BIGEND_REG);
+        writel(bits, devpriv->plx9080_iobase + PLX_BIGEND_REG);
 
         disable_plx_interrupts(dev);
 
@@ -457,28 +371,29 @@ static int setup_subdevices(struct comedi_device *dev)
 
 static int init_hpdi(struct comedi_device *dev)
 {
+        struct hpdi_private *devpriv = dev->private;
         uint32_t plx_intcsr_bits;
 
-        writel(BOARD_RESET_BIT, priv(dev)->hpdi_iobase + BOARD_CONTROL_REG);
+        writel(BOARD_RESET_BIT, devpriv->hpdi_iobase + BOARD_CONTROL_REG);
         udelay(10);
 
         writel(almost_empty_bits(32) | almost_full_bits(32),
-               priv(dev)->hpdi_iobase + RX_PROG_ALMOST_REG);
+               devpriv->hpdi_iobase + RX_PROG_ALMOST_REG);
         writel(almost_empty_bits(32) | almost_full_bits(32),
-               priv(dev)->hpdi_iobase + TX_PROG_ALMOST_REG);
+               devpriv->hpdi_iobase + TX_PROG_ALMOST_REG);
 
-        priv(dev)->tx_fifo_size = fifo_size(readl(priv(dev)->hpdi_iobase +
+        devpriv->tx_fifo_size = fifo_size(readl(devpriv->hpdi_iobase +
                                                   TX_FIFO_SIZE_REG));
-        priv(dev)->rx_fifo_size = fifo_size(readl(priv(dev)->hpdi_iobase +
+        devpriv->rx_fifo_size = fifo_size(readl(devpriv->hpdi_iobase +
                                                   RX_FIFO_SIZE_REG));
 
-        writel(0, priv(dev)->hpdi_iobase + INTERRUPT_CONTROL_REG);
+        writel(0, devpriv->hpdi_iobase + INTERRUPT_CONTROL_REG);
 
         /*  enable interrupts */
         plx_intcsr_bits =
             ICS_AERR | ICS_PERR | ICS_PIE | ICS_PLIE | ICS_PAIE | ICS_LIE |
             ICS_DMA0_E;
-        writel(plx_intcsr_bits, priv(dev)->plx9080_iobase + PLX_INTRCS_REG);
+        writel(plx_intcsr_bits, devpriv->plx9080_iobase + PLX_INTRCS_REG);
 
         return 0;
 }
@@ -487,6 +402,7 @@ static int init_hpdi(struct comedi_device *dev)
 static int setup_dma_descriptors(struct comedi_device *dev,
                                  unsigned int transfer_size)
 {
+        struct hpdi_private *devpriv = dev->private;
         unsigned int buffer_index, buffer_offset;
         uint32_t next_bits = PLX_DESC_IN_PCI_BIT | PLX_INTR_TERM_COUNT |
             PLX_XFER_LOCAL_TO_PCI;
@@ -500,25 +416,25 @@ static int setup_dma_descriptors(struct comedi_device *dev,
 
         DEBUG_PRINT(" transfer_size %i\n", transfer_size);
         DEBUG_PRINT(" descriptors at 0x%lx\n",
-                    (unsigned long)priv(dev)->dma_desc_phys_addr);
+                    (unsigned long)devpriv->dma_desc_phys_addr);
 
         buffer_offset = 0;
         buffer_index = 0;
         for (i = 0; i < NUM_DMA_DESCRIPTORS &&
              buffer_index < NUM_DMA_BUFFERS; i++) {
-                priv(dev)->dma_desc[i].pci_start_addr =
-                    cpu_to_le32(priv(dev)->dio_buffer_phys_addr[buffer_index] +
+                devpriv->dma_desc[i].pci_start_addr =
+                    cpu_to_le32(devpriv->dio_buffer_phys_addr[buffer_index] +
                                 buffer_offset);
-                priv(dev)->dma_desc[i].local_start_addr = cpu_to_le32(FIFO_REG);
-                priv(dev)->dma_desc[i].transfer_size =
+                devpriv->dma_desc[i].local_start_addr = cpu_to_le32(FIFO_REG);
+                devpriv->dma_desc[i].transfer_size =
                     cpu_to_le32(transfer_size);
-                priv(dev)->dma_desc[i].next =
-                    cpu_to_le32((priv(dev)->dma_desc_phys_addr + (i +
+                devpriv->dma_desc[i].next =
+                    cpu_to_le32((devpriv->dma_desc_phys_addr + (i +
                                                                   1) *
-                                 sizeof(priv(dev)->dma_desc[0])) | next_bits);
+                                 sizeof(devpriv->dma_desc[0])) | next_bits);
 
-                priv(dev)->desc_dio_buffer[i] =
-                    priv(dev)->dio_buffer[buffer_index] +
+                devpriv->desc_dio_buffer[i] =
+                    devpriv->dio_buffer[buffer_index] +
                     (buffer_offset / sizeof(uint32_t));
 
                 buffer_offset += transfer_size;
@@ -529,128 +445,110 @@ static int setup_dma_descriptors(struct comedi_device *dev,
 
                 DEBUG_PRINT(" desc %i\n", i);
                 DEBUG_PRINT(" start addr virt 0x%p, phys 0x%lx\n",
-                            priv(dev)->desc_dio_buffer[i],
-                            (unsigned long)priv(dev)->dma_desc[i].
+                            devpriv->desc_dio_buffer[i],
+                            (unsigned long)devpriv->dma_desc[i].
                             pci_start_addr);
                 DEBUG_PRINT(" next 0x%lx\n",
-                            (unsigned long)priv(dev)->dma_desc[i].next);
+                            (unsigned long)devpriv->dma_desc[i].next);
         }
-        priv(dev)->num_dma_descriptors = i;
+        devpriv->num_dma_descriptors = i;
         /*  fix last descriptor to point back to first */
-        priv(dev)->dma_desc[i - 1].next =
-            cpu_to_le32(priv(dev)->dma_desc_phys_addr | next_bits);
+        devpriv->dma_desc[i - 1].next =
+            cpu_to_le32(devpriv->dma_desc_phys_addr | next_bits);
         DEBUG_PRINT(" desc %i next fixup 0x%lx\n", i - 1,
-                    (unsigned long)priv(dev)->dma_desc[i - 1].next);
+                    (unsigned long)devpriv->dma_desc[i - 1].next);
 
-        priv(dev)->block_size = transfer_size;
+        devpriv->block_size = transfer_size;
 
         return transfer_size;
 }
 
-static int hpdi_attach(struct comedi_device *dev, struct comedi_devconfig *it)
+static const struct hpdi_board *hpdi_find_board(struct pci_dev *pcidev)
 {
-        struct pci_dev *pcidev;
-        int i;
-        int retval;
+        unsigned int i;
 
-        printk(KERN_WARNING "comedi%d: gsc_hpdi\n", dev->minor);
+        for (i = 0; i < ARRAY_SIZE(hpdi_boards); i++)
+                if (pcidev->device == hpdi_boards[i].device_id &&
+                    pcidev->subsystem_device == hpdi_boards[i].subdevice_id)
+                        return &hpdi_boards[i];
+        return NULL;
+}
 
-        if (alloc_private(dev, sizeof(struct hpdi_private)) < 0)
-                return -ENOMEM;
+static int hpdi_auto_attach(struct comedi_device *dev,
+                                      unsigned long context_unused)
+{
+        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
+        const struct hpdi_board *thisboard;
+        struct hpdi_private *devpriv;
+        int i;
+        int retval;
 
-        pcidev = NULL;
-        for (i = 0; i < ARRAY_SIZE(hpdi_boards) &&
-                    dev->board_ptr == NULL; i++) {
-                do {
-                        pcidev = pci_get_subsys(PCI_VENDOR_ID_PLX,
-                                                hpdi_boards[i].device_id,
-                                                PCI_VENDOR_ID_PLX,
-                                                hpdi_boards[i].subdevice_id,
-                                                pcidev);
-                        /*  was a particular bus/slot requested? */
-                        if (it->options[0] || it->options[1]) {
-                                /*  are we on the wrong bus/slot? */
-                                if (pcidev->bus->number != it->options[0] ||
-                                    PCI_SLOT(pcidev->devfn) != it->options[1])
-                                        continue;
-                        }
-                        if (pcidev) {
-                                priv(dev)->hw_dev = pcidev;
-                                dev->board_ptr = hpdi_boards + i;
-                                break;
-                        }
-                } while (pcidev != NULL);
-        }
-        if (dev->board_ptr == NULL) {
-                printk(KERN_WARNING "gsc_hpdi: no hpdi card found\n");
-                return -EIO;
+        thisboard = hpdi_find_board(pcidev);
+        if (!thisboard) {
+                dev_err(dev->class_dev, "gsc_hpdi: pci %s not supported\n",
+                        pci_name(pcidev));
+                return -EINVAL;
         }
+        dev->board_ptr = thisboard;
+        dev->board_name = thisboard->name;
 
-        printk(KERN_WARNING
-               "gsc_hpdi: found %s on bus %i, slot %i\n", board(dev)->name,
-               pcidev->bus->number, PCI_SLOT(pcidev->devfn));
+        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
+        if (!devpriv)
+                return -ENOMEM;
+        dev->private = devpriv;
 
-        if (comedi_pci_enable(pcidev, dev->driver->driver_name)) {
-                printk(KERN_WARNING
-                       " failed enable PCI device and request regions\n");
+        if (comedi_pci_enable(pcidev, dev->board_name)) {
+                dev_warn(dev->class_dev,
+                         "failed enable PCI device and request regions\n");
                 return -EIO;
         }
+        dev->iobase = 1;        /* the "detach" needs this */
         pci_set_master(pcidev);
 
-        /* Initialize dev->board_name */
-        dev->board_name = board(dev)->name;
-
-        priv(dev)->plx9080_phys_iobase =
-            pci_resource_start(pcidev, PLX9080_BADDRINDEX);
-        priv(dev)->hpdi_phys_iobase =
-            pci_resource_start(pcidev, HPDI_BADDRINDEX);
-
-        /*  remap, won't work with 2.0 kernels but who cares */
-        priv(dev)->plx9080_iobase = ioremap(priv(dev)->plx9080_phys_iobase,
-                                            pci_resource_len(pcidev,
-                                            PLX9080_BADDRINDEX));
-        priv(dev)->hpdi_iobase =
-            ioremap(priv(dev)->hpdi_phys_iobase,
-                    pci_resource_len(pcidev, HPDI_BADDRINDEX));
-        if (!priv(dev)->plx9080_iobase || !priv(dev)->hpdi_iobase) {
-                printk(KERN_WARNING " failed to remap io memory\n");
+        devpriv->plx9080_iobase =
+                ioremap(pci_resource_start(pcidev, PLX9080_BADDRINDEX),
+                        pci_resource_len(pcidev, PLX9080_BADDRINDEX));
+        devpriv->hpdi_iobase =
+                ioremap(pci_resource_start(pcidev, HPDI_BADDRINDEX),
+                        pci_resource_len(pcidev, HPDI_BADDRINDEX));
+        if (!devpriv->plx9080_iobase || !devpriv->hpdi_iobase) {
+                dev_warn(dev->class_dev, "failed to remap io memory\n");
                 return -ENOMEM;
         }
 
-        DEBUG_PRINT(" plx9080 remapped to 0x%p\n", priv(dev)->plx9080_iobase);
-        DEBUG_PRINT(" hpdi remapped to 0x%p\n", priv(dev)->hpdi_iobase);
+        DEBUG_PRINT(" plx9080 remapped to 0x%p\n", devpriv->plx9080_iobase);
+        DEBUG_PRINT(" hpdi remapped to 0x%p\n", devpriv->hpdi_iobase);
 
         init_plx9080(dev);
 
         /*  get irq */
         if (request_irq(pcidev->irq, handle_interrupt, IRQF_SHARED,
-                        dev->driver->driver_name, dev)) {
-                printk(KERN_WARNING
-                       " unable to allocate irq %u\n", pcidev->irq);
+                        dev->board_name, dev)) {
+                dev_warn(dev->class_dev,
+                         "unable to allocate irq %u\n", pcidev->irq);
                 return -EINVAL;
         }
         dev->irq = pcidev->irq;
 
-        printk(KERN_WARNING " irq %u\n", dev->irq);
+        dev_dbg(dev->class_dev, " irq %u\n", dev->irq);
 
         /*  allocate pci dma buffers */
         for (i = 0; i < NUM_DMA_BUFFERS; i++) {
-                priv(dev)->dio_buffer[i] =
-                    pci_alloc_consistent(priv(dev)->hw_dev, DMA_BUFFER_SIZE,
-                                         &priv(dev)->dio_buffer_phys_addr[i]);
+                devpriv->dio_buffer[i] =
+                    pci_alloc_consistent(pcidev, DMA_BUFFER_SIZE,
+                                         &devpriv->dio_buffer_phys_addr[i]);
                 DEBUG_PRINT("dio_buffer at virt 0x%p, phys 0x%lx\n",
-                            priv(dev)->dio_buffer[i],
-                            (unsigned long)priv(dev)->dio_buffer_phys_addr[i]);
+                            devpriv->dio_buffer[i],
+                            (unsigned long)devpriv->dio_buffer_phys_addr[i]);
         }
         /*  allocate dma descriptors */
-        priv(dev)->dma_desc = pci_alloc_consistent(priv(dev)->hw_dev,
-                                                   sizeof(struct plx_dma_desc) *
-                                                   NUM_DMA_DESCRIPTORS,
-                                                   &priv(dev)->
-                                                   dma_desc_phys_addr);
-        if (priv(dev)->dma_desc_phys_addr & 0xf) {
-                printk(KERN_WARNING
-                       " dma descriptors not quad-word aligned (bug)\n");
+        devpriv->dma_desc = pci_alloc_consistent(pcidev,
+                                                 sizeof(struct plx_dma_desc) *
+                                                 NUM_DMA_DESCRIPTORS,
+                                                 &devpriv->dma_desc_phys_addr);
+        if (devpriv->dma_desc_phys_addr & 0xf) {
+                dev_warn(dev->class_dev,
+                         " dma descriptors not quad-word aligned (bug)\n");
                 return -EIO;
         }
 
@@ -667,39 +565,37 @@ static int hpdi_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 
 static void hpdi_detach(struct comedi_device *dev)
 {
+        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
+        struct hpdi_private *devpriv = dev->private;
         unsigned int i;
 
         if (dev->irq)
                 free_irq(dev->irq, dev);
-        if ((priv(dev)) && (priv(dev)->hw_dev)) {
-                if (priv(dev)->plx9080_iobase) {
+        if (devpriv) {
+                if (devpriv->plx9080_iobase) {
                         disable_plx_interrupts(dev);
-                        iounmap(priv(dev)->plx9080_iobase);
+                        iounmap(devpriv->plx9080_iobase);
                 }
-                if (priv(dev)->hpdi_iobase)
-                        iounmap(priv(dev)->hpdi_iobase);
+                if (devpriv->hpdi_iobase)
+                        iounmap(devpriv->hpdi_iobase);
                 /*  free pci dma buffers */
                 for (i = 0; i < NUM_DMA_BUFFERS; i++) {
-                        if (priv(dev)->dio_buffer[i])
-                                pci_free_consistent(priv(dev)->hw_dev,
+                        if (devpriv->dio_buffer[i])
+                                pci_free_consistent(pcidev,
                                                     DMA_BUFFER_SIZE,
-                                                    priv(dev)->
-                                                    dio_buffer[i],
-                                                    priv
-                                                    (dev)->dio_buffer_phys_addr
-                                                    [i]);
+                                                    devpriv->dio_buffer[i],
+                                                    devpriv->
+                                                    dio_buffer_phys_addr[i]);
                 }
                 /*  free dma descriptors */
-                if (priv(dev)->dma_desc)
-                        pci_free_consistent(priv(dev)->hw_dev,
-                                            sizeof(struct plx_dma_desc)
-                                            * NUM_DMA_DESCRIPTORS,
-                                            priv(dev)->dma_desc,
-                                            priv(dev)->
-                                            dma_desc_phys_addr);
-                if (priv(dev)->hpdi_phys_iobase)
-                        comedi_pci_disable(priv(dev)->hw_dev);
-                pci_dev_put(priv(dev)->hw_dev);
+                if (devpriv->dma_desc)
+                        pci_free_consistent(pcidev,
+                                            sizeof(struct plx_dma_desc) *
+                                            NUM_DMA_DESCRIPTORS,
+                                            devpriv->dma_desc,
+                                            devpriv->dma_desc_phys_addr);
+                if (dev->iobase)
+                        comedi_pci_disable(pcidev);
         }
 }
 
@@ -745,29 +641,20 @@ static int di_cmd_test(struct comedi_device *dev, struct comedi_subdevice *s,
         if (err)
                 return 2;
 
-        /* step 3: make sure arguments are trivially compatible */
+        /* Step 3: check if arguments are trivially valid */
 
         if (!cmd->chanlist_len) {
                 cmd->chanlist_len = 32;
-                err++;
-        }
-        if (cmd->scan_end_arg != cmd->chanlist_len) {
-                cmd->scan_end_arg = cmd->chanlist_len;
-                err++;
+                err |= -EINVAL;
         }
+        err |= cfc_check_trigger_arg_is(&cmd->scan_end_arg, cmd->chanlist_len);
 
         switch (cmd->stop_src) {
         case TRIG_COUNT:
-                if (!cmd->stop_arg) {
-                        cmd->stop_arg = 1;
-                        err++;
-                }
+                err |= cfc_check_trigger_arg_min(&cmd->stop_arg, 1);
                 break;
         case TRIG_NONE:
-                if (cmd->stop_arg != 0) {
-                        cmd->stop_arg = 0;
-                        err++;
-                }
+                err |= cfc_check_trigger_arg_is(&cmd->stop_arg, 0);
                 break;
         default:
                 break;
@@ -803,7 +690,9 @@ static int di_cmd_test(struct comedi_device *dev, struct comedi_subdevice *s,
 static int hpdi_cmd_test(struct comedi_device *dev, struct comedi_subdevice *s,
                          struct comedi_cmd *cmd)
 {
-        if (priv(dev)->dio_config_output)
+        struct hpdi_private *devpriv = dev->private;
+
+        if (devpriv->dio_config_output)
                 return -EINVAL;
         else
                 return di_cmd_test(dev, s, cmd);
@@ -812,12 +701,15 @@ static int hpdi_cmd_test(struct comedi_device *dev, struct comedi_subdevice *s,
 static inline void hpdi_writel(struct comedi_device *dev, uint32_t bits,
                                unsigned int offset)
 {
-        writel(bits | priv(dev)->bits[offset / sizeof(uint32_t)],
-               priv(dev)->hpdi_iobase + offset);
+        struct hpdi_private *devpriv = dev->private;
+
+        writel(bits | devpriv->bits[offset / sizeof(uint32_t)],
+               devpriv->hpdi_iobase + offset);
 }
 
 static int di_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
 {
+        struct hpdi_private *devpriv = dev->private;
         uint32_t bits;
         unsigned long flags;
         struct comedi_async *async = s->async;
@@ -829,39 +721,39 @@ static int di_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
 
         abort_dma(dev, 0);
 
-        priv(dev)->dma_desc_index = 0;
+        devpriv->dma_desc_index = 0;
 
         /* These register are supposedly unused during chained dma,
          * but I have found that left over values from last operation
          * occasionally cause problems with transfer of first dma
          * block.  Initializing them to zero seems to fix the problem. */
-        writel(0, priv(dev)->plx9080_iobase + PLX_DMA0_TRANSFER_SIZE_REG);
-        writel(0, priv(dev)->plx9080_iobase + PLX_DMA0_PCI_ADDRESS_REG);
-        writel(0, priv(dev)->plx9080_iobase + PLX_DMA0_LOCAL_ADDRESS_REG);
+        writel(0, devpriv->plx9080_iobase + PLX_DMA0_TRANSFER_SIZE_REG);
+        writel(0, devpriv->plx9080_iobase + PLX_DMA0_PCI_ADDRESS_REG);
+        writel(0, devpriv->plx9080_iobase + PLX_DMA0_LOCAL_ADDRESS_REG);
         /*  give location of first dma descriptor */
         bits =
-            priv(dev)->dma_desc_phys_addr | PLX_DESC_IN_PCI_BIT |
+            devpriv->dma_desc_phys_addr | PLX_DESC_IN_PCI_BIT |
             PLX_INTR_TERM_COUNT | PLX_XFER_LOCAL_TO_PCI;
-        writel(bits, priv(dev)->plx9080_iobase + PLX_DMA0_DESCRIPTOR_REG);
+        writel(bits, devpriv->plx9080_iobase + PLX_DMA0_DESCRIPTOR_REG);
 
         /*  spinlock for plx dma control/status reg */
         spin_lock_irqsave(&dev->spinlock, flags);
         /*  enable dma transfer */
         writeb(PLX_DMA_EN_BIT | PLX_DMA_START_BIT | PLX_CLEAR_DMA_INTR_BIT,
-               priv(dev)->plx9080_iobase + PLX_DMA0_CS_REG);
+               devpriv->plx9080_iobase + PLX_DMA0_CS_REG);
         spin_unlock_irqrestore(&dev->spinlock, flags);
 
         if (cmd->stop_src == TRIG_COUNT)
-                priv(dev)->dio_count = cmd->stop_arg;
+                devpriv->dio_count = cmd->stop_arg;
         else
-                priv(dev)->dio_count = 1;
+                devpriv->dio_count = 1;
 
         /*  clear over/under run status flags */
         writel(RX_UNDERRUN_BIT | RX_OVERRUN_BIT,
-               priv(dev)->hpdi_iobase + BOARD_STATUS_REG);
+               devpriv->hpdi_iobase + BOARD_STATUS_REG);
         /*  enable interrupts */
         writel(intr_bit(RX_FULL_INTR),
-               priv(dev)->hpdi_iobase + INTERRUPT_CONTROL_REG);
+               devpriv->hpdi_iobase + INTERRUPT_CONTROL_REG);
 
         DEBUG_PRINT("hpdi: starting rx\n");
         hpdi_writel(dev, RX_ENABLE_BIT, BOARD_CONTROL_REG);
@@ -871,7 +763,9 @@ static int di_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
 
 static int hpdi_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
 {
-        if (priv(dev)->dio_config_output)
+        struct hpdi_private *devpriv = dev->private;
+
+        if (devpriv->dio_config_output)
                 return -EINVAL;
         else
                 return di_cmd(dev, s);
@@ -879,6 +773,7 @@ static int hpdi_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
 
 static void drain_dma_buffers(struct comedi_device *dev, unsigned int channel)
 {
+        struct hpdi_private *devpriv = dev->private;
         struct comedi_async *async = dev->read_subdev->async;
         uint32_t next_transfer_addr;
         int j;
@@ -887,37 +782,37 @@ static void drain_dma_buffers(struct comedi_device *dev, unsigned int channel)
 
         if (channel)
                 pci_addr_reg =
-                    priv(dev)->plx9080_iobase + PLX_DMA1_PCI_ADDRESS_REG;
+                    devpriv->plx9080_iobase + PLX_DMA1_PCI_ADDRESS_REG;
         else
                 pci_addr_reg =
-                    priv(dev)->plx9080_iobase + PLX_DMA0_PCI_ADDRESS_REG;
+                    devpriv->plx9080_iobase + PLX_DMA0_PCI_ADDRESS_REG;
 
         /*  loop until we have read all the full buffers */
         j = 0;
         for (next_transfer_addr = readl(pci_addr_reg);
              (next_transfer_addr <
-              le32_to_cpu(priv(dev)->dma_desc[priv(dev)->dma_desc_index].
+              le32_to_cpu(devpriv->dma_desc[devpriv->dma_desc_index].
                           pci_start_addr)
               || next_transfer_addr >=
-              le32_to_cpu(priv(dev)->dma_desc[priv(dev)->dma_desc_index].
-                          pci_start_addr) + priv(dev)->block_size)
-             && j < priv(dev)->num_dma_descriptors; j++) {
+              le32_to_cpu(devpriv->dma_desc[devpriv->dma_desc_index].
+                          pci_start_addr) + devpriv->block_size)
+             && j < devpriv->num_dma_descriptors; j++) {
                 /*  transfer data from dma buffer to comedi buffer */
-                num_samples = priv(dev)->block_size / sizeof(uint32_t);
+                num_samples = devpriv->block_size / sizeof(uint32_t);
                 if (async->cmd.stop_src == TRIG_COUNT) {
-                        if (num_samples > priv(dev)->dio_count)
-                                num_samples = priv(dev)->dio_count;
-                        priv(dev)->dio_count -= num_samples;
+                        if (num_samples > devpriv->dio_count)
+                                num_samples = devpriv->dio_count;
+                        devpriv->dio_count -= num_samples;
                 }
                 cfc_write_array_to_buffer(dev->read_subdev,
-                                          priv(dev)->desc_dio_buffer[priv(dev)->
+                                          devpriv->desc_dio_buffer[devpriv->
                                                                      dma_desc_index],
                                           num_samples * sizeof(uint32_t));
-                priv(dev)->dma_desc_index++;
-                priv(dev)->dma_desc_index %= priv(dev)->num_dma_descriptors;
+                devpriv->dma_desc_index++;
+                devpriv->dma_desc_index %= devpriv->num_dma_descriptors;
 
                 DEBUG_PRINT("next desc addr 0x%lx\n", (unsigned long)
-                            priv(dev)->dma_desc[priv(dev)->dma_desc_index].
+                            devpriv->dma_desc[devpriv->dma_desc_index].
                             next);
                 DEBUG_PRINT("pci addr reg 0x%x\n", next_transfer_addr);
         }
@@ -927,6 +822,7 @@ static void drain_dma_buffers(struct comedi_device *dev, unsigned int channel)
 static irqreturn_t handle_interrupt(int irq, void *d)
 {
         struct comedi_device *dev = d;
+        struct hpdi_private *devpriv = dev->private;
         struct comedi_subdevice *s = dev->read_subdev;
         struct comedi_async *async = s->async;
         uint32_t hpdi_intr_status, hpdi_board_status;
@@ -938,26 +834,26 @@ static irqreturn_t handle_interrupt(int irq, void *d)
         if (!dev->attached)
                 return IRQ_NONE;
 
-        plx_status = readl(priv(dev)->plx9080_iobase + PLX_INTRCS_REG);
+        plx_status = readl(devpriv->plx9080_iobase + PLX_INTRCS_REG);
         if ((plx_status & (ICS_DMA0_A | ICS_DMA1_A | ICS_LIA)) == 0)
                 return IRQ_NONE;
 
-        hpdi_intr_status = readl(priv(dev)->hpdi_iobase + INTERRUPT_STATUS_REG);
-        hpdi_board_status = readl(priv(dev)->hpdi_iobase + BOARD_STATUS_REG);
+        hpdi_intr_status = readl(devpriv->hpdi_iobase + INTERRUPT_STATUS_REG);
+        hpdi_board_status = readl(devpriv->hpdi_iobase + BOARD_STATUS_REG);
 
         async->events = 0;
 
         if (hpdi_intr_status) {
                 DEBUG_PRINT("hpdi: intr status 0x%x, ", hpdi_intr_status);
                 writel(hpdi_intr_status,
-                       priv(dev)->hpdi_iobase + INTERRUPT_STATUS_REG);
+                       devpriv->hpdi_iobase + INTERRUPT_STATUS_REG);
         }
         /*  spin lock makes sure no one else changes plx dma control reg */
         spin_lock_irqsave(&dev->spinlock, flags);
-        dma0_status = readb(priv(dev)->plx9080_iobase + PLX_DMA0_CS_REG);
+        dma0_status = readb(devpriv->plx9080_iobase + PLX_DMA0_CS_REG);
         if (plx_status & ICS_DMA0_A) {  /*  dma chan 0 interrupt */
                 writeb((dma0_status & PLX_DMA_EN_BIT) | PLX_CLEAR_DMA_INTR_BIT,
-                       priv(dev)->plx9080_iobase + PLX_DMA0_CS_REG);
+                       devpriv->plx9080_iobase + PLX_DMA0_CS_REG);
 
                 DEBUG_PRINT("dma0 status 0x%x\n", dma0_status);
                 if (dma0_status & PLX_DMA_EN_BIT)
@@ -968,10 +864,10 @@ static irqreturn_t handle_interrupt(int irq, void *d)
 
         /*  spin lock makes sure no one else changes plx dma control reg */
         spin_lock_irqsave(&dev->spinlock, flags);
-        dma1_status = readb(priv(dev)->plx9080_iobase + PLX_DMA1_CS_REG);
+        dma1_status = readb(devpriv->plx9080_iobase + PLX_DMA1_CS_REG);
         if (plx_status & ICS_DMA1_A) {  /*  XXX *//*  dma chan 1 interrupt */
                 writeb((dma1_status & PLX_DMA_EN_BIT) | PLX_CLEAR_DMA_INTR_BIT,
-                       priv(dev)->plx9080_iobase + PLX_DMA1_CS_REG);
+                       devpriv->plx9080_iobase + PLX_DMA1_CS_REG);
                 DEBUG_PRINT("dma1 status 0x%x\n", dma1_status);
 
                 DEBUG_PRINT(" cleared dma ch1 interrupt\n");
@@ -980,8 +876,8 @@ static irqreturn_t handle_interrupt(int irq, void *d)
 
         /*  clear possible plx9080 interrupt sources */
         if (plx_status & ICS_LDIA) {    /*  clear local doorbell interrupt */
-                plx_bits = readl(priv(dev)->plx9080_iobase + PLX_DBR_OUT_REG);
-                writel(plx_bits, priv(dev)->plx9080_iobase + PLX_DBR_OUT_REG);
+                plx_bits = readl(devpriv->plx9080_iobase + PLX_DBR_OUT_REG);
+                writel(plx_bits, devpriv->plx9080_iobase + PLX_DBR_OUT_REG);
                 DEBUG_PRINT(" cleared local doorbell bits 0x%x\n", plx_bits);
         }
 
@@ -989,7 +885,7 @@ static irqreturn_t handle_interrupt(int irq, void *d)
                 comedi_error(dev, "rx fifo overrun");
                 async->events |= COMEDI_CB_EOA | COMEDI_CB_ERROR;
                 DEBUG_PRINT("dma0_status 0x%x\n",
-                            (int)readb(priv(dev)->plx9080_iobase +
+                            (int)readb(devpriv->plx9080_iobase +
                                        PLX_DMA0_CS_REG));
         }
 
@@ -998,7 +894,7 @@ static irqreturn_t handle_interrupt(int irq, void *d)
                 async->events |= COMEDI_CB_EOA | COMEDI_CB_ERROR;
         }
 
-        if (priv(dev)->dio_count == 0)
+        if (devpriv->dio_count == 0)
                 async->events |= COMEDI_CB_EOA;
 
         DEBUG_PRINT("board status 0x%x, ", hpdi_board_status);
@@ -1013,21 +909,24 @@ static irqreturn_t handle_interrupt(int irq, void *d)
 
 static void abort_dma(struct comedi_device *dev, unsigned int channel)
 {
+        struct hpdi_private *devpriv = dev->private;
         unsigned long flags;
 
         /*  spinlock for plx dma control/status reg */
         spin_lock_irqsave(&dev->spinlock, flags);
 
-        plx9080_abort_dma(priv(dev)->plx9080_iobase, channel);
+        plx9080_abort_dma(devpriv->plx9080_iobase, channel);
 
         spin_unlock_irqrestore(&dev->spinlock, flags);
 }
 
 static int hpdi_cancel(struct comedi_device *dev, struct comedi_subdevice *s)
 {
+        struct hpdi_private *devpriv = dev->private;
+
         hpdi_writel(dev, 0, BOARD_CONTROL_REG);
 
-        writel(0, priv(dev)->hpdi_iobase + INTERRUPT_CONTROL_REG);
+        writel(0, devpriv->hpdi_iobase + INTERRUPT_CONTROL_REG);
 
         abort_dma(dev, 0);
 
@@ -1037,17 +936,17 @@ static int hpdi_cancel(struct comedi_device *dev, struct comedi_subdevice *s)
 static struct comedi_driver gsc_hpdi_driver = {
         .driver_name    = "gsc_hpdi",
         .module         = THIS_MODULE,
-        .attach         = hpdi_attach,
+        .auto_attach    = hpdi_auto_attach,
         .detach         = hpdi_detach,
 };
 
-static int __devinit gsc_hpdi_pci_probe(struct pci_dev *dev,
+static int gsc_hpdi_pci_probe(struct pci_dev *dev,
                                         const struct pci_device_id *ent)
 {
         return comedi_pci_auto_config(dev, &gsc_hpdi_driver);
 }
 
-static void __devexit gsc_hpdi_pci_remove(struct pci_dev *dev)
+static void gsc_hpdi_pci_remove(struct pci_dev *dev)
 {
         comedi_pci_auto_unconfig(dev);
 }
@@ -1063,7 +962,7 @@ static struct pci_driver gsc_hpdi_pci_driver = {
         .name           = "gsc_hpdi",
         .id_table       = gsc_hpdi_pci_table,
         .probe          = gsc_hpdi_pci_probe,
-        .remove         = __devexit_p(gsc_hpdi_pci_remove)
+        .remove         = gsc_hpdi_pci_remove
 };
 module_comedi_pci_driver(gsc_hpdi_driver, gsc_hpdi_pci_driver);
 
diff --git a/drivers/staging/comedi/drivers/icp_multi.c b/drivers/staging/comedi/drivers/icp_multi.c
index d696d4d51e28..a91a448ba0f0 100644
--- a/drivers/staging/comedi/drivers/icp_multi.c
+++ b/drivers/staging/comedi/drivers/icp_multi.c
@@ -494,21 +494,21 @@ static int icp_multi_reset(struct comedi_device *dev)
         return 0;
 }
 
-static int icp_multi_attach_pci(struct comedi_device *dev,
-                                struct pci_dev *pcidev)
+static int icp_multi_auto_attach(struct comedi_device *dev,
+                                           unsigned long context_unused)
 {
+        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
         struct icp_multi_private *devpriv;
         struct comedi_subdevice *s;
         resource_size_t iobase;
         int ret;
 
-        comedi_set_hw_dev(dev, &pcidev->dev);
         dev->board_name = dev->driver->driver_name;
 
-        ret = alloc_private(dev, sizeof(*devpriv));
-        if (ret < 0)
-                return ret;
-        devpriv = dev->private;
+        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
+        if (!devpriv)
+                return -ENOMEM;
+        dev->private = devpriv;
 
         ret = comedi_pci_enable(pcidev, dev->board_name);
         if (ret)
@@ -613,17 +613,17 @@ static void icp_multi_detach(struct comedi_device *dev)
 static struct comedi_driver icp_multi_driver = {
         .driver_name    = "icp_multi",
         .module         = THIS_MODULE,
-        .attach_pci     = icp_multi_attach_pci,
+        .auto_attach    = icp_multi_auto_attach,
         .detach         = icp_multi_detach,
 };
 
-static int __devinit icp_multi_pci_probe(struct pci_dev *dev,
+static int icp_multi_pci_probe(struct pci_dev *dev,
                                            const struct pci_device_id *ent)
 {
         return comedi_pci_auto_config(dev, &icp_multi_driver);
 }
 
-static void __devexit icp_multi_pci_remove(struct pci_dev *dev)
+static void icp_multi_pci_remove(struct pci_dev *dev)
 {
         comedi_pci_auto_unconfig(dev);
 }
@@ -638,7 +638,7 @@ static struct pci_driver icp_multi_pci_driver = {
         .name           = "icp_multi",
         .id_table       = icp_multi_pci_table,
         .probe          = icp_multi_pci_probe,
-        .remove         = __devexit_p(icp_multi_pci_remove),
+        .remove         = icp_multi_pci_remove,
 };
 module_comedi_pci_driver(icp_multi_driver, icp_multi_pci_driver);
 
diff --git a/drivers/staging/comedi/drivers/ii_pci20kc.c b/drivers/staging/comedi/drivers/ii_pci20kc.c
index 65ff1c9b973c..93584e2be35a 100644
--- a/drivers/staging/comedi/drivers/ii_pci20kc.c
+++ b/drivers/staging/comedi/drivers/ii_pci20kc.c
@@ -156,7 +156,6 @@ struct pci20xxx_private {
         union pci20xxx_subdev_private subdev_private[PCI20000_MODULES];
 };
 
-#define devpriv ((struct pci20xxx_private *)dev->private)
 #define CHAN (CR_CHAN(it->chanlist[0]))
 
 static int pci20006_init(struct comedi_device *dev, struct comedi_subdevice *s,
@@ -196,6 +195,7 @@ static int pci20xxx_dio_init(struct comedi_device *dev,
 static int pci20xxx_attach(struct comedi_device *dev,
                            struct comedi_devconfig *it)
 {
+        struct pci20xxx_private *devpriv;
         unsigned char i;
         int ret;
         int id;
@@ -206,22 +206,23 @@ static int pci20xxx_attach(struct comedi_device *dev,
         if (ret)
                 return ret;
 
-        ret = alloc_private(dev, sizeof(struct pci20xxx_private));
-        if (ret < 0)
-                return ret;
+        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
+        if (!devpriv)
+                return -ENOMEM;
+        dev->private = devpriv;
 
         devpriv->ioaddr = (void __iomem *)(unsigned long)it->options[0];
         dev->board_name = "pci20kc";
 
         /* Check PCI-20001 C-2A Carrier Board ID */
         if ((readb(devpriv->ioaddr) & PCI20000_ID) != PCI20000_ID) {
-                printk(KERN_WARNING "comedi%d: ii_pci20kc PCI-20001"
-                       " C-2A Carrier Board at base=0x%p not found !\n",
-                       dev->minor, devpriv->ioaddr);
+                dev_warn(dev->class_dev,
+                         "PCI-20001 C-2A Carrier Board at base=0x%p not found !\n",
+                         devpriv->ioaddr);
                 return -EINVAL;
         }
-        printk(KERN_INFO "comedi%d: ii_pci20kc: PCI-20001 C-2A at base=0x%p\n",
-               dev->minor, devpriv->ioaddr);
+        dev_info(dev->class_dev, "PCI-20001 C-2A at base=0x%p\n",
+                 devpriv->ioaddr);
 
         for (i = 0; i < PCI20000_MODULES; i++) {
                 s = &dev->subdevices[i];
@@ -234,23 +235,21 @@ static int pci20xxx_attach(struct comedi_device *dev,
                             devpriv->ioaddr + (i + 1) * PCI20000_OFFSET;
                         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",
-                               dev->minor, i + 1);
+                        dev_info(dev->class_dev,
+                                 "PCI-20006 module in slot %d\n", i + 1);
                         break;
                 case PCI20341_ID:
                         sdp->pci20341.iobase =
                             devpriv->ioaddr + (i + 1) * PCI20000_OFFSET;
                         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",
-                               dev->minor, i + 1);
+                        dev_info(dev->class_dev,
+                                 "PCI-20341 module in slot %d\n", i + 1);
                         break;
                 default:
-                        printk(KERN_WARNING "ii_pci20kc: unknown module "
-                               "code 0x%02x in slot %d: module disabled\n",
-                               id, i); /* XXX this looks like a bug! i + 1 ?? */
+                        dev_warn(dev->class_dev,
+                                 "unknown module code 0x%02x in slot %d: module disabled\n",
+                                 id, i); /* XXX this looks like a bug! i + 1 ?? */
                         /* fall through */
                 case PCI20xxx_EMPTY_ID:
                         s->type = COMEDI_SUBD_UNUSED;
@@ -346,8 +345,7 @@ static int pci20006_insn_write(struct comedi_device *dev,
                 writeb(0x00, sdp->iobase + PCI20006_STROBE1);
                 break;
         default:
-                printk(KERN_WARNING
-                       " comedi%d: pci20xxx: ao channel Error!\n", dev->minor);
+                dev_warn(dev->class_dev, "ao channel Error!\n");
                 return -EINVAL;
         }
 
@@ -462,10 +460,8 @@ static int pci20341_insn_read(struct comedi_device *dev,
                         eoc = readb(sdp->iobase + PCI20341_STATUS_REG);
                 }
                 if (j >= 100) {
-                        printk(KERN_WARNING
-                               "comedi%d:  pci20xxx: "
-                               "AI interrupt channel %i polling exit !\n",
-                               dev->minor, i);
+                        dev_warn(dev->class_dev,
+                                 "AI interrupt channel %i polling exit !\n", i);
                         return -EINVAL;
                 }
                 lo = readb(sdp->iobase + PCI20341_LDATA);
@@ -541,6 +537,7 @@ static int pci20xxx_dio_insn_bits(struct comedi_device *dev,
                                   struct comedi_subdevice *s,
                                   struct comedi_insn *insn, unsigned int *data)
 {
+        struct pci20xxx_private *devpriv = dev->private;
         unsigned int mask = data[0];
 
         s->state &= ~mask;
@@ -571,6 +568,7 @@ static int pci20xxx_dio_insn_bits(struct comedi_device *dev,
 static void pci20xxx_dio_config(struct comedi_device *dev,
                                 struct comedi_subdevice *s)
 {
+        struct pci20xxx_private *devpriv = dev->private;
         unsigned char control_01;
         unsigned char control_23;
         unsigned char buffer;
@@ -627,6 +625,8 @@ static void pci20xxx_dio_config(struct comedi_device *dev,
 #if 0
 static void pci20xxx_do(struct comedi_device *dev, struct comedi_subdevice *s)
 {
+        struct pci20xxx_private *devpriv = dev->private;
+
         /* XXX if the channel is configured for input, does this
            do bad things? */
         /* XXX it would be a good idea to only update the registers
@@ -641,9 +641,10 @@ static void pci20xxx_do(struct comedi_device *dev, struct comedi_subdevice *s)
 static unsigned int pci20xxx_di(struct comedi_device *dev,
                                 struct comedi_subdevice *s)
 {
-        /* XXX same note as above */
+        struct pci20xxx_private *devpriv = dev->private;
         unsigned int bits;
 
+        /* XXX same note as above */
         bits = readb(devpriv->ioaddr + PCI20000_DIO_0);
         bits |= readb(devpriv->ioaddr + PCI20000_DIO_1) << 8;
         bits |= readb(devpriv->ioaddr + PCI20000_DIO_2) << 16;
diff --git a/drivers/staging/comedi/drivers/jr3_pci.c b/drivers/staging/comedi/drivers/jr3_pci.c
index 4a108ea8a9aa..c756a35ce31a 100644
--- a/drivers/staging/comedi/drivers/jr3_pci.c
+++ b/drivers/staging/comedi/drivers/jr3_pci.c
@@ -21,24 +21,26 @@
 
 */
 /*
-Driver: jr3_pci
-Description: JR3/PCI force sensor board
-Author: Anders Blomdell <anders.blomdell@control.lth.se>
-Status: works
-Devices: [JR3] PCI force sensor board (jr3_pci)
-
-  The DSP on the board requires initialization code, which can
-  be loaded by placing it in /lib/firmware/comedi.
-  The initialization code should be somewhere on the media you got
-  with your card. One version is available from http://www.comedi.org
-  in the comedi_nonfree_firmware tarball.
-
-  Configuration options:
-  [0] - PCI bus number - if bus number and slot number are 0,
-                         then driver search for first unused card
-  [1] - PCI slot number
-
-*/
+ * Driver: jr3_pci
+ * Description: JR3/PCI force sensor board
+ * Author: Anders Blomdell <anders.blomdell@control.lth.se>
+ * Updated: Thu, 01 Nov 2012 17:34:55 +0000
+ * Status: works
+ * Devices: [JR3] PCI force sensor board (jr3_pci)
+ *
+ * Configuration options:
+ *   None
+ *
+ * Manual configuration of comedi devices is not supported by this
+ * driver; supported PCI devices are configured as comedi devices
+ * automatically.
+ *
+ * The DSP on the board requires initialization code, which can be
+ * loaded by placing it in /lib/firmware/comedi.  The initialization
+ * code should be somewhere on the media you got with your card.  One
+ * version is available from http://www.comedi.org in the
+ * comedi_nonfree_firmware tarball.  The file is called "jr3pci.idm".
+ */
 
 #include "../comedidev.h"
 
@@ -59,22 +61,18 @@ Devices: [JR3] PCI force sensor board (jr3_pci)
 #define PCI_DEVICE_ID_JR3_4_CHANNEL 0x3114
 
 struct jr3_pci_dev_private {
-
-        struct pci_dev *pci_dev;
-        int pci_enabled;
-        volatile struct jr3_t *iobase;
+        struct jr3_t __iomem *iobase;
         int n_channels;
         struct timer_list timer;
 };
 
 struct poll_delay_t {
-
         int min;
         int max;
 };
 
 struct jr3_pci_subdev_private {
-        volatile struct jr3_channel *channel;
+        struct jr3_channel __iomem *channel;
         unsigned long next_time_min;
         unsigned long next_time_max;
         enum { state_jr3_poll,
@@ -98,15 +96,15 @@ struct jr3_pci_subdev_private {
 };
 
 /* Hotplug firmware loading stuff */
-static int comedi_load_firmware(struct comedi_device *dev, char *name,
+static int comedi_load_firmware(struct comedi_device *dev, const char *name,
                                 int (*cb)(struct comedi_device *dev,
                                         const u8 *data, size_t size))
 {
+        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
         int result = 0;
         const struct firmware *fw;
         char *firmware_path;
         static const char *prefix = "comedi/";
-        struct jr3_pci_dev_private *devpriv = dev->private;
 
         firmware_path = kmalloc(strlen(prefix) + strlen(name) + 1, GFP_KERNEL);
         if (!firmware_path) {
@@ -115,8 +113,7 @@ static int comedi_load_firmware(struct comedi_device *dev, char *name,
                 firmware_path[0] = '\0';
                 strcat(firmware_path, prefix);
                 strcat(firmware_path, name);
-                result = request_firmware(&fw, firmware_path,
-                                          &devpriv->pci_dev->dev);
+                result = request_firmware(&fw, firmware_path, &pcidev->dev);
                 if (result == 0) {
                         if (!cb)
                                 result = -EINVAL;
@@ -138,7 +135,7 @@ static struct poll_delay_t poll_delay_min_max(int min, int max)
         return result;
 }
 
-static int is_complete(volatile struct jr3_channel *channel)
+static int is_complete(struct jr3_channel __iomem *channel)
 {
         return get_s16(&channel->command_word0) == 0;
 }
@@ -150,14 +147,13 @@ struct transform_t {
         } link[8];
 };
 
-static void set_transforms(volatile struct jr3_channel *channel,
+static void set_transforms(struct jr3_channel __iomem *channel,
                            struct transform_t transf, short num)
 {
         int i;
 
         num &= 0x000f;          /*  Make sure that 0 <= num <= 15 */
         for (i = 0; i < 8; i++) {
-
                 set_u16(&channel->transforms[num].link[i].link_type,
                         transf.link[i].link_type);
                 udelay(1);
@@ -169,18 +165,18 @@ static void set_transforms(volatile struct jr3_channel *channel,
         }
 }
 
-static void use_transform(volatile struct jr3_channel *channel,
+static void use_transform(struct jr3_channel __iomem *channel,
                           short transf_num)
 {
         set_s16(&channel->command_word0, 0x0500 + (transf_num & 0x000f));
 }
 
-static void use_offset(volatile struct jr3_channel *channel, short offset_num)
+static void use_offset(struct jr3_channel __iomem *channel, short offset_num)
 {
         set_s16(&channel->command_word0, 0x0600 + (offset_num & 0x000f));
 }
 
-static void set_offset(volatile struct jr3_channel *channel)
+static void set_offset(struct jr3_channel __iomem *channel)
 {
         set_s16(&channel->command_word0, 0x0700);
 }
@@ -194,13 +190,9 @@ struct six_axis_t {
         s16 mz;
 };
 
-static void set_full_scales(volatile struct jr3_channel *channel,
+static void set_full_scales(struct jr3_channel __iomem *channel,
                             struct six_axis_t full_scale)
 {
-        printk("%d %d %d %d %d %d\n",
-               full_scale.fx,
-               full_scale.fy,
-               full_scale.fz, full_scale.mx, full_scale.my, full_scale.mz);
         set_s16(&channel->full_scale.fx, full_scale.fx);
         set_s16(&channel->full_scale.fy, full_scale.fy);
         set_s16(&channel->full_scale.fz, full_scale.fz);
@@ -210,7 +202,7 @@ static void set_full_scales(volatile struct jr3_channel *channel,
         set_s16(&channel->command_word0, 0x0a00);
 }
 
-static struct six_axis_t get_min_full_scales(volatile struct jr3_channel
+static struct six_axis_t get_min_full_scales(struct jr3_channel __iomem
                                              *channel)
 {
         struct six_axis_t result;
@@ -223,7 +215,7 @@ static struct six_axis_t get_min_full_scales(volatile struct jr3_channel
         return result;
 }
 
-static struct six_axis_t get_max_full_scales(volatile struct jr3_channel
+static struct six_axis_t get_max_full_scales(struct jr3_channel __iomem
                                              *channel)
 {
         struct six_axis_t result;
@@ -273,71 +265,53 @@ static int jr3_pci_ai_insn_read(struct comedi_device *dev,
                                 } else {
                                         int F = 0;
                                         switch (axis) {
-                                        case 0:{
-                                                        F = get_s16
-                                                            (&p->channel->filter
-                                                             [filter].fx);
-                                                }
+                                        case 0:
+                                                F = get_s16(&p->channel->
+                                                            filter[filter].fx);
                                                 break;
-                                        case 1:{
-                                                        F = get_s16
-                                                            (&p->channel->filter
-                                                             [filter].fy);
-                                                }
+                                        case 1:
+                                                F = get_s16(&p->channel->
+                                                            filter[filter].fy);
                                                 break;
-                                        case 2:{
-                                                        F = get_s16
-                                                            (&p->channel->filter
-                                                             [filter].fz);
-                                                }
+                                        case 2:
+                                                F = get_s16(&p->channel->
+                                                            filter[filter].fz);
                                                 break;
-                                        case 3:{
-                                                        F = get_s16
-                                                            (&p->channel->filter
-                                                             [filter].mx);
-                                                }
+                                        case 3:
+                                                F = get_s16(&p->channel->
+                                                            filter[filter].mx);
                                                 break;
-                                        case 4:{
-                                                        F = get_s16
-                                                            (&p->channel->filter
-                                                             [filter].my);
-                                                }
+                                        case 4:
+                                                F = get_s16(&p->channel->
+                                                            filter[filter].my);
                                                 break;
-                                        case 5:{
-                                                        F = get_s16
-                                                            (&p->channel->filter
-                                                             [filter].mz);
-                                                }
+                                        case 5:
+                                                F = get_s16(&p->channel->
+                                                            filter[filter].mz);
                                                 break;
-                                        case 6:{
-                                                        F = get_s16
-                                                            (&p->channel->filter
-                                                             [filter].v1);
-                                                }
+                                        case 6:
+                                                F = get_s16(&p->channel->
+                                                            filter[filter].v1);
                                                 break;
-                                        case 7:{
-                                                        F = get_s16
-                                                            (&p->channel->filter
-                                                             [filter].v2);
-                                                }
+                                        case 7:
+                                                F = get_s16(&p->channel->
+                                                            filter[filter].v2);
                                                 break;
                                         }
                                         data[i] = F + 0x4000;
                                 }
                         } else if (channel == 56) {
-                                if (p->state != state_jr3_done) {
+                                if (p->state != state_jr3_done)
                                         data[i] = 0;
-                                } else {
+                                else
                                         data[i] =
-                                            get_u16(&p->channel->model_no);
-                                }
+                                        get_u16(&p->channel->model_no);
                         } else if (channel == 57) {
-                                if (p->state != state_jr3_done) {
+                                if (p->state != state_jr3_done)
                                         data[i] = 0;
-                                } else {
+                                else
                                         data[i] =
-                                            get_u16(&p->channel->serial_no);
-                                }
+                                        get_u16(&p->channel->serial_no);
                         }
                 }
         }
@@ -368,8 +342,8 @@ static int read_idm_word(const u8 *data, size_t size, int *pos,
         int result = 0;
         if (pos && val) {
                 /*  Skip over non hex */
-                for (; *pos < size && !isxdigit(data[*pos]); (*pos)++) {
-                }
+                for (; *pos < size && !isxdigit(data[*pos]); (*pos)++)
+                        ;
                 /*  Collect value */
                 *val = 0;
                 for (; *pos < size; (*pos)++) {
@@ -378,14 +352,15 @@ static int read_idm_word(const u8 *data, size_t size, int *pos,
                         if (value >= 0) {
                                 result = 1;
                                 *val = (*val << 4) + value;
-                        } else
+                        } else {
                                 break;
+                        }
                 }
         }
         return result;
 }
 
-static int jr3_download_firmware(struct comedi_device *dev, const u8 * data,
+static int jr3_download_firmware(struct comedi_device *dev, const u8 *data,
                                  size_t size)
 {
         /*
@@ -429,37 +404,38 @@ static int jr3_download_firmware(struct comedi_device *dev, const u8 * data,
                         pos = 0;
                         while (more) {
                                 unsigned int count, addr;
-                                more = more
-                                    && read_idm_word(data, size, &pos, &count);
+                                more = more &&
+                                       read_idm_word(data, size, &pos, &count);
                                 if (more && count == 0xffff)
                                         break;
-                                more = more
-                                    && read_idm_word(data, size, &pos, &addr);
+                                more = more &&
+                                       read_idm_word(data, size, &pos, &addr);
                                 dev_dbg(dev->class_dev,
                                         "Loading#%d %4.4x bytes at %4.4x\n",
                                         i, count, addr);
                                 while (more && count > 0) {
                                         if (addr & 0x4000) {
-                                                /*  16 bit data, never seen in real life!! */
+                                                /*  16 bit data, never seen
+                                                 *  in real life!! */
                                                 unsigned int data1;
 
-                                                more = more
-                                                    && read_idm_word(data,
+                                                more = more &&
+                                                       read_idm_word(data,
                                                                      size, &pos,
                                                                      &data1);
                                                 count--;
-                                                /* printk("jr3_data, not tested\n"); */
-                                                /* jr3[addr + 0x20000 * pnum] = data1; */
+                                                /* jr3[addr + 0x20000 * pnum] =
+                                                   data1; */
                                         } else {
                                                 /*   Download 24 bit program */
                                                 unsigned int data1, data2;
 
-                                                more = more
-                                                    && read_idm_word(data,
+                                                more = more &&
+                                                       read_idm_word(data,
                                                                      size, &pos,
                                                                      &data1);
-                                                more = more
-                                                    && read_idm_word(data, size,
+                                                more = more &&
+                                                       read_idm_word(data, size,
                                                                      &pos,
                                                                      &data2);
                                                 count -= 2;
@@ -474,7 +450,6 @@ static int jr3_download_firmware(struct comedi_device *dev, const u8 * data,
                                                                 [i].program_high
                                                                 [addr], data2);
                                                         udelay(1);
-
                                                 }
                                         }
                                         addr++;
@@ -492,213 +467,152 @@ static struct poll_delay_t jr3_pci_poll_subdevice(struct comedi_subdevice *s)
         int i;
 
         if (p) {
-                volatile struct jr3_channel *channel = p->channel;
+                struct jr3_channel __iomem *channel = p->channel;
                 int errors = get_u16(&channel->errors);
 
-                if (errors != p->errors) {
-                        printk("Errors: %x -> %x\n", p->errors, errors);
+                if (errors != p->errors)
                         p->errors = errors;
-                }
-                if (errors & (watch_dog | watch_dog2 | sensor_change)) {
+
+                if (errors & (watch_dog | watch_dog2 | sensor_change))
                         /*  Sensor communication lost, force poll mode */
                         p->state = state_jr3_poll;
 
-                }
                 switch (p->state) {
-                case state_jr3_poll:{
+                case state_jr3_poll: {
                                 u16 model_no = get_u16(&channel->model_no);
                                 u16 serial_no = get_u16(&channel->serial_no);
                                 if ((errors & (watch_dog | watch_dog2)) ||
                                     model_no == 0 || serial_no == 0) {
-/*
- * Still no sensor, keep on polling. Since it takes up to 10 seconds
- * for offsets to stabilize, polling each second should suffice.
- */
+                                        /*
+                                         * Still no sensor, keep on polling.
+                                         * Since it takes up to 10 seconds
+                                         * for offsets to stabilize, polling
+                                         * each second should suffice.
+                                         */
                                         result = poll_delay_min_max(1000, 2000);
                                 } else {
                                         p->retries = 0;
                                         p->state =
-                                            state_jr3_init_wait_for_offset;
+                                                state_jr3_init_wait_for_offset;
                                         result = poll_delay_min_max(1000, 2000);
                                 }
                         }
                         break;
-                case state_jr3_init_wait_for_offset:{
-                                p->retries++;
-                                if (p->retries < 10) {
-                                        /*  Wait for offeset to stabilize (< 10 s according to manual) */
-                                        result = poll_delay_min_max(1000, 2000);
-                                } else {
-                                        struct transform_t transf;
-
-                                        p->model_no =
-                                            get_u16(&channel->model_no);
-                                        p->serial_no =
-                                            get_u16(&channel->serial_no);
-
-                                        printk
-                                            ("Setting transform for channel %d\n",
-                                             p->channel_no);
-                                        printk("Sensor Model     = %i\n",
-                                               p->model_no);
-                                        printk("Sensor Serial    = %i\n",
-                                               p->serial_no);
-
-                                        /*  Transformation all zeros */
-                                        for (i = 0; i < ARRAY_SIZE(transf.link); i++) {
-                                                transf.link[i].link_type =
-                                                        (enum link_types)0;
-                                                transf.link[i].link_amount = 0;
-                                        }
-
-                                        set_transforms(channel, transf, 0);
-                                        use_transform(channel, 0);
-                                        p->state =
-                                            state_jr3_init_transform_complete;
-                                        result = poll_delay_min_max(20, 100);   /*  Allow 20 ms for completion */
+                case state_jr3_init_wait_for_offset:
+                        p->retries++;
+                        if (p->retries < 10) {
+                                /*  Wait for offeset to stabilize
+                                 *  (< 10 s according to manual) */
+                                result = poll_delay_min_max(1000, 2000);
+                        } else {
+                                struct transform_t transf;
+
+                                p->model_no = get_u16(&channel->model_no);
+                                p->serial_no = get_u16(&channel->serial_no);
+
+                                /*  Transformation all zeros */
+                                for (i = 0; i < ARRAY_SIZE(transf.link); i++) {
+                                        transf.link[i].link_type =
+                                                (enum link_types)0;
+                                        transf.link[i].link_amount = 0;
                                 }
-                        } break;
-                case state_jr3_init_transform_complete:{
-                                if (!is_complete(channel)) {
-                                        printk
-                                            ("state_jr3_init_transform_complete complete = %d\n",
-                                             is_complete(channel));
-                                        result = poll_delay_min_max(20, 100);
-                                } else {
-                                        /*  Set full scale */
-                                        struct six_axis_t min_full_scale;
-                                        struct six_axis_t max_full_scale;
-
-                                        min_full_scale =
-                                            get_min_full_scales(channel);
-                                        printk("Obtained Min. Full Scales:\n");
-                                        printk(KERN_DEBUG "%i ", (min_full_scale).fx);
-                                        printk(KERN_CONT "%i ", (min_full_scale).fy);
-                                        printk(KERN_CONT "%i ", (min_full_scale).fz);
-                                        printk(KERN_CONT "%i ", (min_full_scale).mx);
-                                        printk(KERN_CONT "%i ", (min_full_scale).my);
-                                        printk(KERN_CONT "%i ", (min_full_scale).mz);
-                                        printk(KERN_CONT "\n");
-
-                                        max_full_scale =
-                                            get_max_full_scales(channel);
-                                        printk("Obtained Max. Full Scales:\n");
-                                        printk(KERN_DEBUG "%i ", (max_full_scale).fx);
-                                        printk(KERN_CONT "%i ", (max_full_scale).fy);
-                                        printk(KERN_CONT "%i ", (max_full_scale).fz);
-                                        printk(KERN_CONT "%i ", (max_full_scale).mx);
-                                        printk(KERN_CONT "%i ", (max_full_scale).my);
-                                        printk(KERN_CONT "%i ", (max_full_scale).mz);
-                                        printk(KERN_CONT "\n");
-
-                                        set_full_scales(channel,
-                                                        max_full_scale);
 
-                                        p->state =
-                                            state_jr3_init_set_full_scale_complete;
-                                        result = poll_delay_min_max(20, 100);   /*  Allow 20 ms for completion */
-                                }
+                                set_transforms(channel, transf, 0);
+                                use_transform(channel, 0);
+                                p->state = state_jr3_init_transform_complete;
+                                /*  Allow 20 ms for completion */
+                                result = poll_delay_min_max(20, 100);
                         }
                         break;
-                case state_jr3_init_set_full_scale_complete:{
-                                if (!is_complete(channel)) {
-                                        printk
-                                            ("state_jr3_init_set_full_scale_complete complete = %d\n",
-                                             is_complete(channel));
-                                        result = poll_delay_min_max(20, 100);
-                                } else {
-                                        volatile struct force_array *full_scale;
-
-                                        /*  Use ranges in kN or we will overflow arount 2000N! */
-                                        full_scale = &channel->full_scale;
-                                        p->range[0].range.min =
-                                            -get_s16(&full_scale->fx) * 1000;
-                                        p->range[0].range.max =
-                                            get_s16(&full_scale->fx) * 1000;
-                                        p->range[1].range.min =
-                                            -get_s16(&full_scale->fy) * 1000;
-                                        p->range[1].range.max =
-                                            get_s16(&full_scale->fy) * 1000;
-                                        p->range[2].range.min =
-                                            -get_s16(&full_scale->fz) * 1000;
-                                        p->range[2].range.max =
-                                            get_s16(&full_scale->fz) * 1000;
-                                        p->range[3].range.min =
-                                            -get_s16(&full_scale->mx) * 100;
-                                        p->range[3].range.max =
-                                            get_s16(&full_scale->mx) * 100;
-                                        p->range[4].range.min =
-                                            -get_s16(&full_scale->my) * 100;
-                                        p->range[4].range.max =
-                                            get_s16(&full_scale->my) * 100;
-                                        p->range[5].range.min =
-                                            -get_s16(&full_scale->mz) * 100;
-                                        p->range[5].range.max =
-                                            get_s16(&full_scale->mz) * 100;
-                                        p->range[6].range.min = -get_s16(&full_scale->v1) * 100;        /*  ?? */
-                                        p->range[6].range.max = get_s16(&full_scale->v1) * 100; /*  ?? */
-                                        p->range[7].range.min = -get_s16(&full_scale->v2) * 100;        /*  ?? */
-                                        p->range[7].range.max = get_s16(&full_scale->v2) * 100; /*  ?? */
-                                        p->range[8].range.min = 0;
-                                        p->range[8].range.max = 65535;
-
-                                        {
-                                                int i;
-                                                for (i = 0; i < 9; i++) {
-                                                        printk("%d %d - %d\n",
-                                                               i,
-                                                               p->
-                                                               range[i].range.
-                                                               min,
-                                                               p->
-                                                               range[i].range.
-                                                               max);
-                                                }
-                                        }
-
-                                        use_offset(channel, 0);
-                                        p->state =
-                                            state_jr3_init_use_offset_complete;
-                                        result = poll_delay_min_max(40, 100);   /*  Allow 40 ms for completion */
-                                }
+                case state_jr3_init_transform_complete:
+                        if (!is_complete(channel)) {
+                                result = poll_delay_min_max(20, 100);
+                        } else {
+                                /*  Set full scale */
+                                struct six_axis_t min_full_scale;
+                                struct six_axis_t max_full_scale;
+
+                                min_full_scale = get_min_full_scales(channel);
+                                max_full_scale = get_max_full_scales(channel);
+                                set_full_scales(channel, max_full_scale);
+
+                                p->state =
+                                        state_jr3_init_set_full_scale_complete;
+                                /*  Allow 20 ms for completion */
+                                result = poll_delay_min_max(20, 100);
                         }
                         break;
-                case state_jr3_init_use_offset_complete:{
-                                if (!is_complete(channel)) {
-                                        printk
-                                            ("state_jr3_init_use_offset_complete complete = %d\n",
-                                             is_complete(channel));
-                                        result = poll_delay_min_max(20, 100);
-                                } else {
-                                        printk
-                                            ("Default offsets %d %d %d %d %d %d\n",
-                                             get_s16(&channel->offsets.fx),
-                                             get_s16(&channel->offsets.fy),
-                                             get_s16(&channel->offsets.fz),
-                                             get_s16(&channel->offsets.mx),
-                                             get_s16(&channel->offsets.my),
-                                             get_s16(&channel->offsets.mz));
-
-                                        set_s16(&channel->offsets.fx, 0);
-                                        set_s16(&channel->offsets.fy, 0);
-                                        set_s16(&channel->offsets.fz, 0);
-                                        set_s16(&channel->offsets.mx, 0);
-                                        set_s16(&channel->offsets.my, 0);
-                                        set_s16(&channel->offsets.mz, 0);
-
-                                        set_offset(channel);
-
-                                        p->state = state_jr3_done;
-                                }
+                case state_jr3_init_set_full_scale_complete:
+                        if (!is_complete(channel)) {
+                                result = poll_delay_min_max(20, 100);
+                        } else {
+                                struct force_array __iomem *full_scale;
+
+                                /*  Use ranges in kN or we will
+                                 *  overflow around 2000N! */
+                                full_scale = &channel->full_scale;
+                                p->range[0].range.min =
+                                        -get_s16(&full_scale->fx) * 1000;
+                                p->range[0].range.max =
+                                        get_s16(&full_scale->fx) * 1000;
+                                p->range[1].range.min =
+                                        -get_s16(&full_scale->fy) * 1000;
+                                p->range[1].range.max =
+                                        get_s16(&full_scale->fy) * 1000;
+                                p->range[2].range.min =
+                                        -get_s16(&full_scale->fz) * 1000;
+                                p->range[2].range.max =
+                                        get_s16(&full_scale->fz) * 1000;
+                                p->range[3].range.min =
+                                        -get_s16(&full_scale->mx) * 100;
+                                p->range[3].range.max =
+                                        get_s16(&full_scale->mx) * 100;
+                                p->range[4].range.min =
+                                        -get_s16(&full_scale->my) * 100;
+                                p->range[4].range.max =
+                                        get_s16(&full_scale->my) * 100;
+                                p->range[5].range.min =
+                                        -get_s16(&full_scale->mz) * 100;
+                                p->range[5].range.max =
+                                        get_s16(&full_scale->mz) * 100; /* ?? */
+                                p->range[6].range.min =
+                                        -get_s16(&full_scale->v1) * 100;/* ?? */
+                                p->range[6].range.max =
+                                        get_s16(&full_scale->v1) * 100; /* ?? */
+                                p->range[7].range.min =
+                                        -get_s16(&full_scale->v2) * 100;/* ?? */
+                                p->range[7].range.max =
+                                        get_s16(&full_scale->v2) * 100; /* ?? */
+                                p->range[8].range.min = 0;
+                                p->range[8].range.max = 65535;
+
+                                use_offset(channel, 0);
+                                p->state = state_jr3_init_use_offset_complete;
+                                /*  Allow 40 ms for completion */
+                                result = poll_delay_min_max(40, 100);
                         }
                         break;
-                case state_jr3_done:{
-                                poll_delay_min_max(10000, 20000);
+                case state_jr3_init_use_offset_complete:
+                        if (!is_complete(channel)) {
+                                result = poll_delay_min_max(20, 100);
+                        } else {
+                                set_s16(&channel->offsets.fx, 0);
+                                set_s16(&channel->offsets.fy, 0);
+                                set_s16(&channel->offsets.fz, 0);
+                                set_s16(&channel->offsets.mx, 0);
+                                set_s16(&channel->offsets.my, 0);
+                                set_s16(&channel->offsets.mz, 0);
+
+                                set_offset(channel);
+
+                                p->state = state_jr3_done;
                         }
                         break;
-                default:{
-                                poll_delay_min_max(1000, 2000);
-                        }
+                case state_jr3_done:
+                        poll_delay_min_max(10000, 20000);
+                        break;
+                default:
+                        poll_delay_min_max(1000, 2000);
                         break;
                 }
         }
@@ -720,22 +634,21 @@ static void jr3_pci_poll_dev(unsigned long data)
         /*  Poll all channels that are ready to be polled */
         for (i = 0; i < devpriv->n_channels; i++) {
                 struct jr3_pci_subdev_private *subdevpriv =
-                    dev->subdevices[i].private;
+                        dev->subdevices[i].private;
                 if (now > subdevpriv->next_time_min) {
                         struct poll_delay_t sub_delay;
 
                         sub_delay = jr3_pci_poll_subdevice(&dev->subdevices[i]);
                         subdevpriv->next_time_min =
-                            jiffies + msecs_to_jiffies(sub_delay.min);
+                                jiffies + msecs_to_jiffies(sub_delay.min);
                         subdevpriv->next_time_max =
-                            jiffies + msecs_to_jiffies(sub_delay.max);
-                        if (sub_delay.max && sub_delay.max < delay) {
-/*
-* Wake up as late as possible -> poll as many channels as possible
-* at once
-*/
+                                jiffies + msecs_to_jiffies(sub_delay.max);
+                        if (sub_delay.max && sub_delay.max < delay)
+                                /*
+                                 * Wake up as late as possible ->
+                                 * poll as many channels as possible at once.
+                                 */
                                 delay = sub_delay.max;
-                        }
                 }
         }
         spin_unlock_irqrestore(&dev->spinlock, flags);
@@ -744,17 +657,14 @@ static void jr3_pci_poll_dev(unsigned long data)
         add_timer(&devpriv->timer);
 }
 
-static int jr3_pci_attach(struct comedi_device *dev,
-                          struct comedi_devconfig *it)
+static int jr3_pci_auto_attach(struct comedi_device *dev,
+                                         unsigned long context_unused)
 {
-        int result = 0;
-        struct pci_dev *card = NULL;
-        int opt_bus, opt_slot, i;
+        int result;
+        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
+        int i;
         struct jr3_pci_dev_private *devpriv;
 
-        opt_bus = it->options[0];
-        opt_slot = it->options[1];
-
         if (sizeof(struct jr3_channel) != 0xc00) {
                 dev_err(dev->class_dev,
                         "sizeof(struct jr3_channel) = %x [expected %x]\n",
@@ -762,70 +672,42 @@ static int jr3_pci_attach(struct comedi_device *dev,
                 return -EINVAL;
         }
 
-        result = alloc_private(dev, sizeof(struct jr3_pci_dev_private));
-        if (result < 0)
+        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
+        if (!devpriv)
                 return -ENOMEM;
-        card = NULL;
-        devpriv = dev->private;
+        dev->private = devpriv;
+
         init_timer(&devpriv->timer);
-        while (1) {
-                card = pci_get_device(PCI_VENDOR_ID_JR3, PCI_ANY_ID, card);
-                if (card == NULL) {
-                        /* No card found */
-                        break;
-                } else {
-                        switch (card->device) {
-                        case PCI_DEVICE_ID_JR3_1_CHANNEL:{
-                                        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;
-                                }
-                                break;
-                        case PCI_DEVICE_ID_JR3_3_CHANNEL:{
-                                        devpriv->n_channels = 3;
-                                }
-                                break;
-                        case PCI_DEVICE_ID_JR3_4_CHANNEL:{
-                                        devpriv->n_channels = 4;
-                                }
-                                break;
-                        default:{
-                                        devpriv->n_channels = 0;
-                                }
-                        }
-                        if (devpriv->n_channels >= 1) {
-                                if (opt_bus == 0 && opt_slot == 0) {
-                                        /* Take first available card */
-                                        break;
-                                } else if (opt_bus == card->bus->number &&
-                                           opt_slot == PCI_SLOT(card->devfn)) {
-                                        /* Take requested card */
-                                        break;
-                                }
-                        }
-                }
-        }
-        if (!card) {
-                dev_err(dev->class_dev, "no jr3_pci found\n");
-                return -EIO;
-        } else {
-                devpriv->pci_dev = card;
-                dev->board_name = "jr3_pci";
+        switch (pcidev->device) {
+        case PCI_DEVICE_ID_JR3_1_CHANNEL:
+        case PCI_DEVICE_ID_JR3_1_CHANNEL_NEW:
+                devpriv->n_channels = 1;
+                break;
+        case PCI_DEVICE_ID_JR3_2_CHANNEL:
+                devpriv->n_channels = 2;
+                break;
+        case PCI_DEVICE_ID_JR3_3_CHANNEL:
+                devpriv->n_channels = 3;
+                break;
+        case PCI_DEVICE_ID_JR3_4_CHANNEL:
+                devpriv->n_channels = 4;
+                break;
+        default:
+                dev_err(dev->class_dev, "jr3_pci: pci %s not supported\n",
+                        pci_name(pcidev));
+                return -EINVAL;
+                break;
         }
+        dev->board_name = "jr3_pci";
 
-        result = comedi_pci_enable(card, "jr3_pci");
+        result = comedi_pci_enable(pcidev, "jr3_pci");
         if (result < 0)
-                return -EIO;
+                return result;
 
-        devpriv->pci_enabled = 1;
-        devpriv->iobase = ioremap(pci_resource_start(card, 0),
-                        offsetof(struct jr3_t, channel[devpriv->n_channels]));
+        dev->iobase = 1;        /* the "detach" needs this */
+        devpriv->iobase = ioremap(pci_resource_start(pcidev, 0),
+                                  offsetof(struct jr3_t,
+                                           channel[devpriv->n_channels]));
         if (!devpriv->iobase)
                 return -ENOMEM;
 
@@ -840,7 +722,8 @@ static int jr3_pci_attach(struct comedi_device *dev,
                 dev->subdevices[i].n_chan = 8 * 7 + 2;
                 dev->subdevices[i].insn_read = jr3_pci_ai_insn_read;
                 dev->subdevices[i].private =
-                    kzalloc(sizeof(struct jr3_pci_subdev_private), GFP_KERNEL);
+                        kzalloc(sizeof(struct jr3_pci_subdev_private),
+                                GFP_KERNEL);
                 if (dev->subdevices[i].private) {
                         struct jr3_pci_subdev_private *p;
                         int j;
@@ -849,8 +732,8 @@ static int jr3_pci_attach(struct comedi_device *dev,
                         p->channel = &devpriv->iobase->channel[i].data;
                         dev_dbg(dev->class_dev, "p->channel %p %p (%tx)\n",
                                 p->channel, devpriv->iobase,
-                                ((char *)(p->channel) -
-                                 (char *)(devpriv->iobase)));
+                                ((char __iomem *)p->channel -
+                                 (char __iomem *)devpriv->iobase));
                         p->channel_no = i;
                         for (j = 0; j < 8; j++) {
                                 int k;
@@ -870,15 +753,15 @@ static int jr3_pci_attach(struct comedi_device *dev,
                         p->range[8].range.max = 65536;
 
                         p->range_table_list[56] =
-                            (struct comedi_lrange *)&p->range[8];
+                                (struct comedi_lrange *)&p->range[8];
                         p->range_table_list[57] =
-                            (struct comedi_lrange *)&p->range[8];
+                                (struct comedi_lrange *)&p->range[8];
                         p->maxdata_list[56] = 0xffff;
                         p->maxdata_list[57] = 0xffff;
                         /*  Channel specific range and maxdata */
                         dev->subdevices[i].range_table = NULL;
                         dev->subdevices[i].range_table_list =
-                            p->range_table_list;
+                                p->range_table_list;
                         dev->subdevices[i].maxdata = 0;
                         dev->subdevices[i].maxdata_list = p->maxdata_list;
                 }
@@ -891,19 +774,20 @@ static int jr3_pci_attach(struct comedi_device *dev,
         dev_dbg(dev->class_dev, "Firmare load %d\n", result);
 
         if (result < 0)
-                goto out;
-/*
- * TODO: use firmware to load preferred offset tables. Suggested
- * format:
- *     model serial Fx Fy Fz Mx My Mz\n
- *
- *     comedi_load_firmware(dev, "jr3_offsets_table", jr3_download_firmware);
- */
+                return result;
+        /*
+         * TODO: use firmware to load preferred offset tables. Suggested
+         * format:
+         *     model serial Fx Fy Fz Mx My Mz\n
+         *
+         *     comedi_load_firmware(dev, "jr3_offsets_table",
+         *                          jr3_download_firmware);
+         */
 
-/*
- * It takes a few milliseconds for software to settle as much as we
- * can read firmware version
- */
+        /*
+         * It takes a few milliseconds for software to settle as much as we
+         * can read firmware version
+         */
         msleep_interruptible(25);
         for (i = 0; i < 0x18; i++) {
                 dev_dbg(dev->class_dev, "%c\n",
@@ -924,13 +808,13 @@ static int jr3_pci_attach(struct comedi_device *dev,
         devpriv->timer.expires = jiffies + msecs_to_jiffies(1000);
         add_timer(&devpriv->timer);
 
-out:
         return result;
 }
 
 static void jr3_pci_detach(struct comedi_device *dev)
 {
         int i;
+        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
         struct jr3_pci_dev_private *devpriv = dev->private;
 
         if (devpriv) {
@@ -941,28 +825,26 @@ static void jr3_pci_detach(struct comedi_device *dev)
                                 kfree(dev->subdevices[i].private);
                 }
                 if (devpriv->iobase)
-                        iounmap((void *)devpriv->iobase);
-                if (devpriv->pci_enabled)
-                        comedi_pci_disable(devpriv->pci_dev);
-                if (devpriv->pci_dev)
-                        pci_dev_put(devpriv->pci_dev);
+                        iounmap(devpriv->iobase);
+                if (dev->iobase)
+                        comedi_pci_disable(pcidev);
         }
 }
 
 static struct comedi_driver jr3_pci_driver = {
         .driver_name    = "jr3_pci",
         .module         = THIS_MODULE,
-        .attach         = jr3_pci_attach,
+        .auto_attach    = jr3_pci_auto_attach,
         .detach         = jr3_pci_detach,
 };
 
-static int __devinit jr3_pci_pci_probe(struct pci_dev *dev,
+static int jr3_pci_pci_probe(struct pci_dev *dev,
                                        const struct pci_device_id *ent)
 {
         return comedi_pci_auto_config(dev, &jr3_pci_driver);
 }
 
-static void __devexit jr3_pci_pci_remove(struct pci_dev *dev)
+static void jr3_pci_pci_remove(struct pci_dev *dev)
 {
         comedi_pci_auto_unconfig(dev);
 }
@@ -981,7 +863,7 @@ static struct pci_driver jr3_pci_pci_driver = {
         .name           = "jr3_pci",
         .id_table       = jr3_pci_pci_table,
         .probe          = jr3_pci_pci_probe,
-        .remove         = __devexit_p(jr3_pci_pci_remove),
+        .remove         = jr3_pci_pci_remove,
 };
 module_comedi_pci_driver(jr3_pci_driver, jr3_pci_pci_driver);
 
diff --git a/drivers/staging/comedi/drivers/jr3_pci.h b/drivers/staging/comedi/drivers/jr3_pci.h
index 9c42653d8f18..3317f7a04c48 100644
--- a/drivers/staging/comedi/drivers/jr3_pci.h
+++ b/drivers/staging/comedi/drivers/jr3_pci.h
@@ -2,22 +2,22 @@
  * is 16 bits, but aligned on a 32 bit PCI boundary
  */
 
-static inline u16 get_u16(volatile const u32 * p)
+static inline u16 get_u16(const u32 __iomem *p)
 {
-        return (u16) readl(p);
+        return (u16)readl(p);
 }
 
-static inline void set_u16(volatile u32 * p, u16 val)
+static inline void set_u16(u32 __iomem *p, u16 val)
 {
         writel(val, p);
 }
 
-static inline s16 get_s16(volatile const s32 * p)
+static inline s16 get_s16(const s32 __iomem *p)
 {
-        return (s16) readl(p);
+        return (s16)readl(p);
 }
 
-static inline void set_s16(volatile s32 * p, s16 val)
+static inline void set_s16(s32 __iomem *p, s16 val)
 {
         writel(val, p);
 }
diff --git a/drivers/staging/comedi/drivers/ke_counter.c b/drivers/staging/comedi/drivers/ke_counter.c
index e867b720f666..19c94282ac3f 100644
--- a/drivers/staging/comedi/drivers/ke_counter.c
+++ b/drivers/staging/comedi/drivers/ke_counter.c
@@ -36,28 +36,8 @@ Kolter Electronic PCI Counter Card.
 
 #include "../comedidev.h"
 
-#define CNT_DRIVER_NAME         "ke_counter"
-#define PCI_VENDOR_ID_KOLTER    0x1001
 #define CNT_CARD_DEVICE_ID      0x0014
 
-/*-- board specification structure ------------------------------------------*/
-
-struct cnt_board_struct {
-
-        const char *name;
-        int device_id;
-        int cnt_channel_nbr;
-        int cnt_bits;
-};
-
-static const struct cnt_board_struct cnt_boards[] = {
-        {
-         .name = CNT_DRIVER_NAME,
-         .device_id = CNT_CARD_DEVICE_ID,
-         .cnt_channel_nbr = 3,
-         .cnt_bits = 24}
-};
-
 /*-- counter write ----------------------------------------------------------*/
 
 /* This should be used only for resetting the counters; maybe it is better
@@ -107,34 +87,14 @@ static int cnt_rinsn(struct comedi_device *dev,
         return 1;
 }
 
-static const void *cnt_find_boardinfo(struct comedi_device *dev,
-                                      struct pci_dev *pcidev)
+static int cnt_auto_attach(struct comedi_device *dev,
+                                     unsigned long context_unused)
 {
-        const struct cnt_board_struct *board;
-        int i;
-
-        for (i = 0; i < ARRAY_SIZE(cnt_boards); i++) {
-                board = &cnt_boards[i];
-                if (board->device_id == pcidev->device)
-                        return board;
-        }
-        return NULL;
-}
-
-static int cnt_attach_pci(struct comedi_device *dev,
-                          struct pci_dev *pcidev)
-{
-        const struct cnt_board_struct *board;
+        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
         struct comedi_subdevice *s;
         int ret;
 
-        comedi_set_hw_dev(dev, &pcidev->dev);
-
-        board = cnt_find_boardinfo(dev, pcidev);
-        if (!board)
-                return -ENODEV;
-        dev->board_ptr = board;
-        dev->board_name = board->name;
+        dev->board_name = dev->driver->driver_name;
 
         ret = comedi_pci_enable(pcidev, dev->board_name);
         if (ret)
@@ -150,8 +110,8 @@ static int cnt_attach_pci(struct comedi_device *dev,
 
         s->type = COMEDI_SUBD_COUNTER;
         s->subdev_flags = SDF_READABLE /* | SDF_COMMON */ ;
-        s->n_chan = board->cnt_channel_nbr;
-        s->maxdata = (1 << board->cnt_bits) - 1;
+        s->n_chan = 3;
+        s->maxdata = 0x00ffffff;
         s->insn_read = cnt_rinsn;
         s->insn_write = cnt_winsn;
 
@@ -182,17 +142,17 @@ static void cnt_detach(struct comedi_device *dev)
 static struct comedi_driver ke_counter_driver = {
         .driver_name    = "ke_counter",
         .module         = THIS_MODULE,
-        .attach_pci     = cnt_attach_pci,
+        .auto_attach    = cnt_auto_attach,
         .detach         = cnt_detach,
 };
 
-static int __devinit ke_counter_pci_probe(struct pci_dev *dev,
+static int ke_counter_pci_probe(struct pci_dev *dev,
                                           const struct pci_device_id *ent)
 {
         return comedi_pci_auto_config(dev, &ke_counter_driver);
 }
 
-static void __devexit ke_counter_pci_remove(struct pci_dev *dev)
+static void ke_counter_pci_remove(struct pci_dev *dev)
 {
         comedi_pci_auto_unconfig(dev);
 }
@@ -207,7 +167,7 @@ static struct pci_driver ke_counter_pci_driver = {
         .name           = "ke_counter",
         .id_table       = ke_counter_pci_table,
         .probe          = ke_counter_pci_probe,
-        .remove         = __devexit_p(ke_counter_pci_remove),
+        .remove         = ke_counter_pci_remove,
 };
 module_comedi_pci_driver(ke_counter_driver, ke_counter_pci_driver);
 
diff --git a/drivers/staging/comedi/drivers/me4000.c b/drivers/staging/comedi/drivers/me4000.c
index 22db35d091f8..3c4b0228e8dc 100644
--- a/drivers/staging/comedi/drivers/me4000.c
+++ b/drivers/staging/comedi/drivers/me4000.c
@@ -60,8 +60,6 @@ broken.
 #include "me4000_fw.h"
 #endif
 
-#define PCI_VENDOR_ID_MEILHAUS          0x1402
-
 #define PCI_DEVICE_ID_MEILHAUS_ME4650   0x4650
 #define PCI_DEVICE_ID_MEILHAUS_ME4660   0x4660
 #define PCI_DEVICE_ID_MEILHAUS_ME4660I  0x4661
@@ -971,28 +969,23 @@ static int me4000_ai_do_cmd_test(struct comedi_device *dev,
         if (err)
                 return 2;
 
-        /*
-         * Stage 3. Check if arguments are generally valid.
-         */
+        /* Step 3: check if arguments are trivially valid */
+
         if (cmd->chanlist_len < 1) {
-                dev_err(dev->class_dev, "No channel list\n");
                 cmd->chanlist_len = 1;
-                err++;
+                err |= -EINVAL;
         }
         if (init_ticks < 66) {
-                dev_err(dev->class_dev, "Start arg to low\n");
                 cmd->start_arg = 2000;
-                err++;
+                err |= -EINVAL;
         }
         if (scan_ticks && scan_ticks < 67) {
-                dev_err(dev->class_dev, "Scan begin arg to low\n");
                 cmd->scan_begin_arg = 2031;
-                err++;
+                err |= -EINVAL;
         }
         if (chan_ticks < 66) {
-                dev_err(dev->class_dev, "Convert arg to low\n");
                 cmd->convert_arg = 2000;
-                err++;
+                err |= -EINVAL;
         }
 
         if (err)
@@ -1570,26 +1563,25 @@ static const void *me4000_find_boardinfo(struct comedi_device *dev,
         return NULL;
 }
 
-static int me4000_attach_pci(struct comedi_device *dev,
-                             struct pci_dev *pcidev)
+static int me4000_auto_attach(struct comedi_device *dev,
+                                        unsigned long context_unused)
 {
+        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
         const struct me4000_board *thisboard;
         struct me4000_info *info;
         struct comedi_subdevice *s;
         int result;
 
-        comedi_set_hw_dev(dev, &pcidev->dev);
-
         thisboard = me4000_find_boardinfo(dev, pcidev);
         if (!thisboard)
                 return -ENODEV;
         dev->board_ptr = thisboard;
         dev->board_name = thisboard->name;
 
-        result = alloc_private(dev, sizeof(*info));
-        if (result)
-                return result;
-        info = dev->private;
+        info = kzalloc(sizeof(*info), GFP_KERNEL);
+        if (!info)
+                return -ENOMEM;
+        dev->private = info;
 
         result = comedi_pci_enable(pcidev, dev->board_name);
         if (result)
@@ -1732,17 +1724,17 @@ static void me4000_detach(struct comedi_device *dev)
 static struct comedi_driver me4000_driver = {
         .driver_name    = "me4000",
         .module         = THIS_MODULE,
-        .attach_pci     = me4000_attach_pci,
+        .auto_attach    = me4000_auto_attach,
         .detach         = me4000_detach,
 };
 
-static int __devinit me4000_pci_probe(struct pci_dev *dev,
+static int me4000_pci_probe(struct pci_dev *dev,
                                       const struct pci_device_id *ent)
 {
         return comedi_pci_auto_config(dev, &me4000_driver);
 }
 
-static void __devexit me4000_pci_remove(struct pci_dev *dev)
+static void me4000_pci_remove(struct pci_dev *dev)
 {
         comedi_pci_auto_unconfig(dev);
 }
@@ -1769,7 +1761,7 @@ static struct pci_driver me4000_pci_driver = {
         .name           = "me4000",
         .id_table       = me4000_pci_table,
         .probe          = me4000_pci_probe,
-        .remove         = __devexit_p(me4000_pci_remove),
+        .remove         = me4000_pci_remove,
 };
 module_comedi_pci_driver(me4000_driver, me4000_pci_driver);
 
diff --git a/drivers/staging/comedi/drivers/me_daq.c b/drivers/staging/comedi/drivers/me_daq.c
index 2ce0b14af589..ce8e3d3f135c 100644
--- a/drivers/staging/comedi/drivers/me_daq.c
+++ b/drivers/staging/comedi/drivers/me_daq.c
@@ -1,47 +1,38 @@
 /*
-
-   comedi/drivers/me_daq.c
-
-   Hardware driver for Meilhaus data acquisition cards:
-
-     ME-2000i, ME-2600i, ME-3000vm1
-
-   Copyright (C) 2002 Michael Hillmann <hillmann@syscongroup.de>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
+ * comedi/drivers/me_daq.c
+ * Hardware driver for Meilhaus data acquisition cards:
+ *   ME-2000i, ME-2600i, ME-3000vm1
+ *
+ * Copyright (C) 2002 Michael Hillmann <hillmann@syscongroup.de>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
 
 /*
-Driver: me_daq
-Description: Meilhaus PCI data acquisition cards
-Author: Michael Hillmann <hillmann@syscongroup.de>
-Devices: [Meilhaus] ME-2600i (me_daq), ME-2000i
-Status: experimental
-
-Supports:
-
-    Analog Output
-
-Configuration options:
-
-    [0] - PCI bus number (optional)
-    [1] - PCI slot number (optional)
-
-    If bus/slot is not specified, the first available PCI
-    device will be used.
-*/
+ * Driver: me_daq
+ * Description: Meilhaus PCI data acquisition cards
+ * Devices: (Meilhaus) ME-2600i [me-2600i]
+ *          (Meilhaus) ME-2000i [me-2000i]
+ * Author: Michael Hillmann <hillmann@syscongroup.de>
+ * Status: experimental
+ *
+ * Configuration options: not applicable, uses PCI auto config
+ *
+ * Supports:
+ *    Analog Input, Analog Output, Digital I/O
+ */
 
 #include <linux/interrupt.h>
 #include <linux/sched.h>
@@ -50,7 +41,6 @@ Configuration options:
 
 #define ME2600_FIRMWARE         "me2600_firmware.bin"
 
-#define PCI_VENDOR_ID_MEILHAUS  0x1402
 #define ME2000_DEVICE_ID        0x2000
 #define ME2600_DEVICE_ID        0x2600
 
@@ -136,97 +126,47 @@ Configuration options:
 #define ME_COUNTER_STARTDATA_B          0x0022  /* - | W */
 #define ME_COUNTER_VALUE_B              0x0022  /* R | - */
 
-static const struct comedi_lrange me2000_ai_range = {
-        8,
-        {
-         BIP_RANGE(10),
-         BIP_RANGE(5),
-         BIP_RANGE(2.5),
-         BIP_RANGE(1.25),
-         UNI_RANGE(10),
-         UNI_RANGE(5),
-         UNI_RANGE(2.5),
-         UNI_RANGE(1.25)
-         }
-};
-
-static const struct comedi_lrange me2600_ai_range = {
-        8,
-        {
-         BIP_RANGE(10),
-         BIP_RANGE(5),
-         BIP_RANGE(2.5),
-         BIP_RANGE(1.25),
-         UNI_RANGE(10),
-         UNI_RANGE(5),
-         UNI_RANGE(2.5),
-         UNI_RANGE(1.25)
-         }
+static const struct comedi_lrange me_ai_range = {
+        8, {
+                BIP_RANGE(10),
+                BIP_RANGE(5),
+                BIP_RANGE(2.5),
+                BIP_RANGE(1.25),
+                UNI_RANGE(10),
+                UNI_RANGE(5),
+                UNI_RANGE(2.5),
+                UNI_RANGE(1.25)
+        }
 };
 
-static const struct comedi_lrange me2600_ao_range = {
-        3,
-        {
-         BIP_RANGE(10),
-         BIP_RANGE(5),
-         UNI_RANGE(10)
-         }
+static const struct comedi_lrange me_ao_range = {
+        3, {
+                BIP_RANGE(10),
+                BIP_RANGE(5),
+                UNI_RANGE(10)
+        }
 };
 
-/* Board specification structure */
 struct me_board {
-        const char *name;       /* driver name */
+        const char *name;
         int device_id;
-        int ao_channel_nbr;     /* DA config */
-        int ao_resolution;
-        int ao_resolution_mask;
-        const struct comedi_lrange *ao_range_list;
-        int ai_channel_nbr;     /* AD config */
-        int ai_resolution;
-        int ai_resolution_mask;
-        const struct comedi_lrange *ai_range_list;
-        int dio_channel_nbr;    /* DIO config */
+        int has_ao;
 };
 
 static const struct me_board me_boards[] = {
         {
-         .name = "me-2600i",
-         .device_id = ME2600_DEVICE_ID,
-         /* Analog Output */
-         .ao_channel_nbr = 4,
-         .ao_resolution = 12,
-         .ao_resolution_mask = 0x0fff,
-         .ao_range_list = &me2600_ao_range,
-         .ai_channel_nbr = 16,
-         /* Analog Input */
-         .ai_resolution = 12,
-         .ai_resolution_mask = 0x0fff,
-         .ai_range_list = &me2600_ai_range,
-         .dio_channel_nbr = 32,
-         },
-        {
-         .name = "me-2000i",
-         .device_id = ME2000_DEVICE_ID,
-         /* Analog Output */
-         .ao_channel_nbr = 0,
-         .ao_resolution = 0,
-         .ao_resolution_mask = 0,
-         .ao_range_list = NULL,
-         .ai_channel_nbr = 16,
-         /* Analog Input */
-         .ai_resolution = 12,
-         .ai_resolution_mask = 0x0fff,
-         .ai_range_list = &me2000_ai_range,
-         .dio_channel_nbr = 32,
-         }
+                .name           = "me-2600i",
+                .device_id      = ME2600_DEVICE_ID,
+                .has_ao         = 1,
+        }, {
+                .name           = "me-2000i",
+                .device_id      = ME2000_DEVICE_ID,
+        }
 };
 
-/* Private data structure */
 struct me_private_data {
         void __iomem *plx_regbase;      /* PLX configuration base address */
         void __iomem *me_regbase;       /* Base address of the Meilhaus card */
-        unsigned long plx_regbase_size; /* Size of PLX configuration space */
-        unsigned long me_regbase_size;  /* Size of Meilhaus space */
 
         unsigned short control_1;       /* Mirror of CONTROL_1 register */
         unsigned short control_2;       /* Mirror of CONTROL_2 register */
@@ -234,110 +174,101 @@ struct me_private_data {
         int ao_readback[4];     /* Mirror of analog output data */
 };
 
-#define dev_private ((struct me_private_data *)dev->private)
-
-/*
- * ------------------------------------------------------------------
- *
- * Helpful functions
- *
- * ------------------------------------------------------------------
- */
 static inline void sleep(unsigned sec)
 {
         current->state = TASK_INTERRUPTIBLE;
         schedule_timeout(sec * HZ);
 }
 
-/*
- * ------------------------------------------------------------------
- *
- * DIGITAL INPUT/OUTPUT SECTION
- *
- * ------------------------------------------------------------------
- */
 static int me_dio_insn_config(struct comedi_device *dev,
                               struct comedi_subdevice *s,
-                              struct comedi_insn *insn, unsigned int *data)
+                              struct comedi_insn *insn,
+                              unsigned int *data)
 {
-        int bits;
-        int mask = 1 << CR_CHAN(insn->chanspec);
+        struct me_private_data *dev_private = dev->private;
+        unsigned int mask = 1 << CR_CHAN(insn->chanspec);
+        unsigned int bits;
+        unsigned int port;
 
-        /* calculate port */
-        if (mask & 0x0000ffff) {        /* Port A in use */
+        if (mask & 0x0000ffff) {
                 bits = 0x0000ffff;
-
-                /* Enable Port A */
-                dev_private->control_2 |= ENABLE_PORT_A;
-                writew(dev_private->control_2,
-                       dev_private->me_regbase + ME_CONTROL_2);
-        } else {                /* Port B in use */
-
+                port = ENABLE_PORT_A;
+        } else {
                 bits = 0xffff0000;
-
-                /* Enable Port B */
-                dev_private->control_2 |= ENABLE_PORT_B;
-                writew(dev_private->control_2,
-                       dev_private->me_regbase + ME_CONTROL_2);
+                port = ENABLE_PORT_B;
         }
 
-        if (data[0]) {
-                /* Config port as output */
-                s->io_bits |= bits;
-        } else {
-                /* Config port as input */
+        switch (data[0]) {
+        case INSN_CONFIG_DIO_INPUT:
                 s->io_bits &= ~bits;
+                dev_private->control_2 &= ~port;
+                break;
+        case INSN_CONFIG_DIO_OUTPUT:
+                s->io_bits |= bits;
+                dev_private->control_2 |= port;
+                break;
+        case INSN_CONFIG_DIO_QUERY:
+                data[1] = (s->io_bits & bits) ? COMEDI_OUTPUT : COMEDI_INPUT;
+                return insn->n;
+                break;
+        default:
+                return -EINVAL;
         }
 
-        return 1;
+        /* Update the port configuration */
+        writew(dev_private->control_2, dev_private->me_regbase + ME_CONTROL_2);
+
+        return insn->n;
 }
 
-/* Digital instant input/outputs */
 static int me_dio_insn_bits(struct comedi_device *dev,
                             struct comedi_subdevice *s,
-                            struct comedi_insn *insn, unsigned int *data)
+                            struct comedi_insn *insn,
+                            unsigned int *data)
 {
+        struct me_private_data *dev_private = dev->private;
+        void __iomem *mmio_porta = dev_private->me_regbase + ME_DIO_PORT_A;
+        void __iomem *mmio_portb = dev_private->me_regbase + ME_DIO_PORT_B;
         unsigned int mask = data[0];
-        s->state &= ~mask;
-        s->state |= (mask & data[1]);
-
-        mask &= s->io_bits;
-        if (mask & 0x0000ffff) {        /* Port A */
-                writew((s->state & 0xffff),
-                       dev_private->me_regbase + ME_DIO_PORT_A);
-        } else {
-                data[1] &= ~0x0000ffff;
-                data[1] |= readw(dev_private->me_regbase + ME_DIO_PORT_A);
+        unsigned int bits = data[1];
+        unsigned int val;
+
+        mask &= s->io_bits;     /* only update the COMEDI_OUTPUT channels */
+        if (mask) {
+                s->state &= ~mask;
+                s->state |= (bits & mask);
+
+                if (mask & 0x0000ffff)
+                        writew((s->state & 0xffff), mmio_porta);
+                if (mask & 0xffff0000)
+                        writew(((s->state >> 16) & 0xffff), mmio_portb);
         }
 
-        if (mask & 0xffff0000) {        /* Port B */
-                writew(((s->state >> 16) & 0xffff),
-                       dev_private->me_regbase + ME_DIO_PORT_B);
-        } else {
-                data[1] &= ~0xffff0000;
-                data[1] |= readw(dev_private->me_regbase + ME_DIO_PORT_B) << 16;
-        }
+        if (s->io_bits & 0x0000ffff)
+                val = s->state & 0xffff;
+        else
+                val = readw(mmio_porta);
+
+        if (s->io_bits & 0xffff0000)
+                val |= (s->state & 0xffff0000);
+        else
+                val |= (readw(mmio_portb) << 16);
+
+        data[1] = val;
 
         return insn->n;
 }
 
-/*
- * ------------------------------------------------------------------
- *
- * ANALOG INPUT SECTION
- *
- * ------------------------------------------------------------------
- */
-
-/* Analog instant input */
 static int me_ai_insn_read(struct comedi_device *dev,
                            struct comedi_subdevice *s,
-                           struct comedi_insn *insn, unsigned int *data)
+                           struct comedi_insn *insn,
+                           unsigned int *data)
 {
-        unsigned short value;
-        int chan = CR_CHAN((&insn->chanspec)[0]);
-        int rang = CR_RANGE((&insn->chanspec)[0]);
-        int aref = CR_AREF((&insn->chanspec)[0]);
+        struct me_private_data *dev_private = dev->private;
+        unsigned int chan = CR_CHAN(insn->chanspec);
+        unsigned int rang = CR_RANGE(insn->chanspec);
+        unsigned int aref = CR_AREF(insn->chanspec);
+        unsigned short val;
         int i;
 
         /* stop any running conversion */
@@ -356,15 +287,11 @@ static int me_ai_insn_read(struct comedi_device *dev,
         writew(dev_private->control_2, dev_private->me_regbase + ME_CONTROL_2);
 
         /* write to channel list fifo */
-        /* b3:b0 are the channel number */
-        value = chan & 0x0f;
-        /* b5:b4 are the channel gain */
-        value |= (rang & 0x03) << 4;
-        /* b6 channel polarity */
-        value |= (rang & 0x04) << 4;
-        /* b7 single or differential */
-        value |= ((aref & AREF_DIFF) ? 0x80 : 0);
-        writew(value & 0xff, dev_private->me_regbase + ME_CHANNEL_LIST);
+        val = chan & 0x0f;                      /* b3:b0 channel */
+        val |= (rang & 0x03) << 4;              /* b5:b4 gain */
+        val |= (rang & 0x04) << 4;              /* b6 polarity */
+        val |= ((aref & AREF_DIFF) ? 0x80 : 0); /* b7 differential */
+        writew(val & 0xff, dev_private->me_regbase + ME_CHANNEL_LIST);
 
         /* set ADC mode to software trigger */
         dev_private->control_1 |= SOFTWARE_TRIGGERED_ADC;
@@ -380,12 +307,11 @@ static int me_ai_insn_read(struct comedi_device *dev,
 
         /* get value from ADC fifo */
         if (i) {
-                data[0] =
-                    (readw(dev_private->me_regbase +
-                           ME_READ_AD_FIFO) ^ 0x800) & 0x0FFF;
+                val = readw(dev_private->me_regbase + ME_READ_AD_FIFO);
+                val = (val ^ 0x800) & 0x0fff;
+                data[0] = val;
         } else {
-                printk(KERN_ERR "comedi%d: Cannot get single value\n",
-                       dev->minor);
+                dev_err(dev->class_dev, "Cannot get single value\n");
                 return -EIO;
         }
 
@@ -396,55 +322,14 @@ static int me_ai_insn_read(struct comedi_device *dev,
         return 1;
 }
 
-/*
- * ------------------------------------------------------------------
- *
- * HARDWARE TRIGGERED ANALOG INPUT SECTION
- *
- * ------------------------------------------------------------------
- */
-
-/* Cancel analog input autoscan */
-static int me_ai_cancel(struct comedi_device *dev, struct comedi_subdevice *s)
-{
-        /* disable interrupts */
-
-        /* stop any running conversion */
-        dev_private->control_1 &= 0xFFFC;
-        writew(dev_private->control_1, dev_private->me_regbase + ME_CONTROL_1);
-
-        return 0;
-}
-
-/* Test analog input command */
-static int me_ai_do_cmd_test(struct comedi_device *dev,
-                             struct comedi_subdevice *s, struct comedi_cmd *cmd)
-{
-        return 0;
-}
-
-/* Analog input command */
-static int me_ai_do_cmd(struct comedi_device *dev,
-                        struct comedi_subdevice *s)
-{
-        return 0;
-}
-
-/*
- * ------------------------------------------------------------------
- *
- * ANALOG OUTPUT SECTION
- *
- * ------------------------------------------------------------------
- */
-
-/* Analog instant output */
 static int me_ao_insn_write(struct comedi_device *dev,
                             struct comedi_subdevice *s,
-                            struct comedi_insn *insn, unsigned int *data)
+                            struct comedi_insn *insn,
+                            unsigned int *data)
 {
-        int chan;
-        int rang;
+        struct me_private_data *dev_private = dev->private;
+        unsigned int chan = CR_CHAN(insn->chanspec);
+        unsigned int rang = CR_RANGE(insn->chanspec);
         int i;
 
         /* Enable all DAC */
@@ -457,9 +342,6 @@ static int me_ao_insn_write(struct comedi_device *dev,
 
         /* Set dac-control register */
         for (i = 0; i < insn->n; i++) {
-                chan = CR_CHAN((&insn->chanspec)[i]);
-                rang = CR_RANGE((&insn->chanspec)[i]);
-
                 /* clear bits for this channel */
                 dev_private->dac_control &= ~(0x0880 >> chan);
                 if (rang == 0)
@@ -477,7 +359,6 @@ static int me_ao_insn_write(struct comedi_device *dev,
 
         /* Set data register */
         for (i = 0; i < insn->n; i++) {
-                chan = CR_CHAN((&insn->chanspec)[i]);
                 writew((data[0] & s->maxdata),
                        dev_private->me_regbase + ME_DAC_DATA_A + (chan << 1));
                 dev_private->ao_readback[chan] = (data[0] & s->maxdata);
@@ -486,36 +367,28 @@ static int me_ao_insn_write(struct comedi_device *dev,
         /* Update dac with data registers */
         readw(dev_private->me_regbase + ME_DAC_UPDATE);
 
-        return i;
+        return insn->n;
 }
 
-/* Analog output readback */
 static int me_ao_insn_read(struct comedi_device *dev,
-                           struct comedi_subdevice *s, struct comedi_insn *insn,
+                           struct comedi_subdevice *s,
+                           struct comedi_insn *insn,
                            unsigned int *data)
 {
+        struct me_private_data *dev_private = dev->private;
+        unsigned int chan = CR_CHAN(insn->chanspec);
         int i;
 
-        for (i = 0; i < insn->n; i++) {
-                data[i] =
-                    dev_private->ao_readback[CR_CHAN((&insn->chanspec)[i])];
-        }
+        for (i = 0; i < insn->n; i++)
+                data[i] = dev_private->ao_readback[chan];
 
-        return 1;
+        return insn->n;
 }
 
-/*
- * ------------------------------------------------------------------
- *
- * INITIALISATION SECTION
- *
- * ------------------------------------------------------------------
- */
-
-/* Xilinx firmware download for card: ME-2600i */
 static int me2600_xilinx_download(struct comedi_device *dev,
                                   const u8 *data, size_t size)
 {
+        struct me_private_data *dev_private = dev->private;
         unsigned int value;
         unsigned int file_length;
         unsigned int i;
@@ -566,8 +439,7 @@ static int me2600_xilinx_download(struct comedi_device *dev,
         if (value & 0x20) {
                 /* Disable interrupt */
                 writel(0x00, dev_private->plx_regbase + PLX_INTCSR);
-                printk(KERN_ERR "comedi%d: Xilinx download failed\n",
-                       dev->minor);
+                dev_err(dev->class_dev, "Xilinx download failed\n");
                 return -EIO;
         }
 
@@ -596,9 +468,10 @@ static int me2600_upload_firmware(struct comedi_device *dev)
         return ret;
 }
 
-/* Reset device */
 static int me_reset(struct comedi_device *dev)
 {
+        struct me_private_data *dev_private = dev->private;
+
         /* Reset board */
         writew(0x00, dev_private->me_regbase + ME_CONTROL_1);
         writew(0x00, dev_private->me_regbase + ME_CONTROL_2);
@@ -627,20 +500,14 @@ static const void *me_find_boardinfo(struct comedi_device *dev,
         return NULL;
 }
 
-static int me_attach_pci(struct comedi_device *dev, struct pci_dev *pcidev)
+static int me_auto_attach(struct comedi_device *dev,
+                                    unsigned long context_unused)
 {
+        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
         const struct me_board *board;
+        struct me_private_data *dev_private;
         struct comedi_subdevice *s;
-        resource_size_t plx_regbase_tmp;
-        unsigned long plx_regbase_size_tmp;
-        resource_size_t me_regbase_tmp;
-        unsigned long me_regbase_size_tmp;
-        resource_size_t swap_regbase_tmp;
-        unsigned long swap_regbase_size_tmp;
-        resource_size_t regbase_tmp;
-        int result, error;
-
-        comedi_set_hw_dev(dev, &pcidev->dev);
+        int ret;
 
         board = me_find_boardinfo(dev, pcidev);
         if (!board)
@@ -648,123 +515,71 @@ static int me_attach_pci(struct comedi_device *dev, struct pci_dev *pcidev)
         dev->board_ptr = board;
         dev->board_name = board->name;
 
-        /* Allocate private memory */
-        if (alloc_private(dev, sizeof(struct me_private_data)) < 0)
+        dev_private = kzalloc(sizeof(*dev_private), GFP_KERNEL);
+        if (!dev_private)
                 return -ENOMEM;
+        dev->private = dev_private;
 
-        /* Enable PCI device and request PCI regions */
-        if (comedi_pci_enable(pcidev, dev->board_name) < 0) {
-                printk(KERN_ERR "comedi%d: Failed to enable PCI device and "
-                       "request regions\n", dev->minor);
-                return -EIO;
-        }
+        ret = comedi_pci_enable(pcidev, dev->board_name);
+        if (ret)
+                return ret;
+        dev->iobase = 1;        /* detach needs this */
 
-        /* Read PLX register base address [PCI_BASE_ADDRESS #0]. */
-        plx_regbase_tmp = pci_resource_start(pcidev, 0);
-        plx_regbase_size_tmp = pci_resource_len(pcidev, 0);
-        dev_private->plx_regbase =
-            ioremap(plx_regbase_tmp, plx_regbase_size_tmp);
-        dev_private->plx_regbase_size = plx_regbase_size_tmp;
-        if (!dev_private->plx_regbase) {
-                printk("comedi%d: Failed to remap I/O memory\n", dev->minor);
+        dev_private->plx_regbase = ioremap(pci_resource_start(pcidev, 0),
+                                           pci_resource_len(pcidev, 0));
+        if (!dev_private->plx_regbase)
                 return -ENOMEM;
-        }
-
-        /* Read Swap base address [PCI_BASE_ADDRESS #5]. */
-
-        swap_regbase_tmp = pci_resource_start(pcidev, 5);
-        swap_regbase_size_tmp = pci_resource_len(pcidev, 5);
-
-        if (!swap_regbase_tmp)
-                printk(KERN_ERR "comedi%d: Swap not present\n", dev->minor);
-
-        /*---------------------------------------------- Workaround start ---*/
-        if (plx_regbase_tmp & 0x0080) {
-                printk(KERN_ERR "comedi%d: PLX-Bug detected\n", dev->minor);
-
-                if (swap_regbase_tmp) {
-                        regbase_tmp = plx_regbase_tmp;
-                        plx_regbase_tmp = swap_regbase_tmp;
-                        swap_regbase_tmp = regbase_tmp;
-
-                        result = pci_write_config_dword(pcidev,
-                                                        PCI_BASE_ADDRESS_0,
-                                                        plx_regbase_tmp);
-                        if (result != PCIBIOS_SUCCESSFUL)
-                                return -EIO;
-
-                        result = pci_write_config_dword(pcidev,
-                                                        PCI_BASE_ADDRESS_5,
-                                                        swap_regbase_tmp);
-                        if (result != PCIBIOS_SUCCESSFUL)
-                                return -EIO;
-                } else {
-                        plx_regbase_tmp -= 0x80;
-                        result = pci_write_config_dword(pcidev,
-                                                        PCI_BASE_ADDRESS_0,
-                                                        plx_regbase_tmp);
-                        if (result != PCIBIOS_SUCCESSFUL)
-                                return -EIO;
-                }
-        }
-        /*--------------------------------------------- Workaround end -----*/
-
-        /* Read Meilhaus register base address [PCI_BASE_ADDRESS #2]. */
 
-        me_regbase_tmp = pci_resource_start(pcidev, 2);
-        me_regbase_size_tmp = pci_resource_len(pcidev, 2);
-        dev_private->me_regbase_size = me_regbase_size_tmp;
-        dev_private->me_regbase = ioremap(me_regbase_tmp, me_regbase_size_tmp);
-        if (!dev_private->me_regbase) {
-                printk(KERN_ERR "comedi%d: Failed to remap I/O memory\n",
-                       dev->minor);
+        dev_private->me_regbase = ioremap(pci_resource_start(pcidev, 2),
+                                          pci_resource_len(pcidev, 2));
+        if (!dev_private->me_regbase)
                 return -ENOMEM;
-        }
 
         /* Download firmware and reset card */
         if (board->device_id == ME2600_DEVICE_ID) {
-                result = me2600_upload_firmware(dev);
-                if (result < 0)
-                        return result;
+                ret = me2600_upload_firmware(dev);
+                if (ret < 0)
+                        return ret;
         }
         me_reset(dev);
 
-        error = comedi_alloc_subdevices(dev, 3);
-        if (error)
-                return error;
+        ret = comedi_alloc_subdevices(dev, 3);
+        if (ret)
+                return ret;
 
         s = &dev->subdevices[0];
-        s->type = COMEDI_SUBD_AI;
-        s->subdev_flags = SDF_READABLE | SDF_COMMON | SDF_CMD_READ;
-        s->n_chan = board->ai_channel_nbr;
-        s->maxdata = board->ai_resolution_mask;
-        s->len_chanlist = board->ai_channel_nbr;
-        s->range_table = board->ai_range_list;
-        s->cancel = me_ai_cancel;
-        s->insn_read = me_ai_insn_read;
-        s->do_cmdtest = me_ai_do_cmd_test;
-        s->do_cmd = me_ai_do_cmd;
+        s->type         = COMEDI_SUBD_AI;
+        s->subdev_flags = SDF_READABLE | SDF_COMMON;
+        s->n_chan       = 16;
+        s->maxdata      = 0x0fff;
+        s->len_chanlist = 16;
+        s->range_table  = &me_ai_range;
+        s->insn_read    = me_ai_insn_read;
 
         s = &dev->subdevices[1];
-        s->type = COMEDI_SUBD_AO;
-        s->subdev_flags = SDF_WRITEABLE | SDF_COMMON;
-        s->n_chan = board->ao_channel_nbr;
-        s->maxdata = board->ao_resolution_mask;
-        s->len_chanlist = board->ao_channel_nbr;
-        s->range_table = board->ao_range_list;
-        s->insn_read = me_ao_insn_read;
-        s->insn_write = me_ao_insn_write;
+        if (board->has_ao) {
+                s->type         = COMEDI_SUBD_AO;
+                s->subdev_flags = SDF_WRITEABLE | SDF_COMMON;
+                s->n_chan       = 4;
+                s->maxdata      = 0x0fff;
+                s->len_chanlist = 4;
+                s->range_table  = &me_ao_range;
+                s->insn_read    = me_ao_insn_read;
+                s->insn_write   = me_ao_insn_write;
+        } else {
+                s->type = COMEDI_SUBD_UNUSED;
+        }
 
         s = &dev->subdevices[2];
-        s->type = COMEDI_SUBD_DIO;
-        s->subdev_flags = SDF_READABLE | SDF_WRITEABLE;
-        s->n_chan = board->dio_channel_nbr;
-        s->maxdata = 1;
-        s->len_chanlist = board->dio_channel_nbr;
-        s->range_table = &range_digital;
-        s->insn_bits = me_dio_insn_bits;
-        s->insn_config = me_dio_insn_config;
-        s->io_bits = 0;
+        s->type         = COMEDI_SUBD_DIO;
+        s->subdev_flags = SDF_READABLE | SDF_WRITEABLE;
+        s->n_chan       = 32;
+        s->maxdata      = 1;
+        s->len_chanlist = 32;
+        s->range_table  = &range_digital;
+        s->insn_bits    = me_dio_insn_bits;
+        s->insn_config  = me_dio_insn_config;
+        s->io_bits      = 0;
 
         dev_info(dev->class_dev, "%s: %s attached\n",
                 dev->driver->driver_name, dev->board_name);
@@ -775,6 +590,7 @@ static int me_attach_pci(struct comedi_device *dev, struct pci_dev *pcidev)
 static void me_detach(struct comedi_device *dev)
 {
         struct pci_dev *pcidev = comedi_to_pci_dev(dev);
+        struct me_private_data *dev_private = dev->private;
 
         if (dev_private) {
                 if (dev_private->me_regbase) {
@@ -785,26 +601,25 @@ static void me_detach(struct comedi_device *dev)
                         iounmap(dev_private->plx_regbase);
         }
         if (pcidev) {
-                if (dev_private->plx_regbase_size)
+                if (dev->iobase)
                         comedi_pci_disable(pcidev);
-                pci_dev_put(pcidev);
         }
 }
 
 static struct comedi_driver me_daq_driver = {
         .driver_name    = "me_daq",
         .module         = THIS_MODULE,
-        .attach_pci     = me_attach_pci,
+        .auto_attach    = me_auto_attach,
         .detach         = me_detach,
 };
 
-static int __devinit me_daq_pci_probe(struct pci_dev *dev,
+static int me_daq_pci_probe(struct pci_dev *dev,
                                       const struct pci_device_id *ent)
 {
         return comedi_pci_auto_config(dev, &me_daq_driver);
 }
 
-static void __devexit me_daq_pci_remove(struct pci_dev *dev)
+static void me_daq_pci_remove(struct pci_dev *dev)
 {
         comedi_pci_auto_unconfig(dev);
 }
@@ -820,7 +635,7 @@ static struct pci_driver me_daq_pci_driver = {
         .name           = "me_daq",
         .id_table       = me_daq_pci_table,
         .probe          = me_daq_pci_probe,
-        .remove         = __devexit_p(me_daq_pci_remove),
+        .remove         = me_daq_pci_remove,
 };
 module_comedi_pci_driver(me_daq_driver, me_daq_pci_driver);
 
diff --git a/drivers/staging/comedi/drivers/mpc624.c b/drivers/staging/comedi/drivers/mpc624.c
index f8b7faefc961..67dc5ad81b0d 100644
--- a/drivers/staging/comedi/drivers/mpc624.c
+++ b/drivers/staging/comedi/drivers/mpc624.c
@@ -122,13 +122,12 @@ Configuration Options:
 #define MPC624_SPEED_6_875_Hz \
         (MPC624_OSR4 | MPC624_OSR3 | MPC624_OSR2 | MPC624_OSR1 | MPC624_OSR0)
 /* -------------------------------------------------------------------------- */
-struct skel_private {
+struct mpc624_private {
 
         /*  set by mpc624_attach() from driver's parameters */
         unsigned long int ulConvertionRate;
 };
 
-#define devpriv ((struct skel_private *)dev->private)
 /* -------------------------------------------------------------------------- */
 static const struct comedi_lrange range_mpc624_bipolar1 = {
         1,
@@ -155,6 +154,7 @@ static int mpc624_ai_rinsn(struct comedi_device *dev,
                            struct comedi_subdevice *s, struct comedi_insn *insn,
                            unsigned int *data)
 {
+        struct mpc624_private *devpriv = dev->private;
         int n, i;
         unsigned long int data_in, data_out;
         unsigned char ucPort;
@@ -283,6 +283,7 @@ static int mpc624_ai_rinsn(struct comedi_device *dev,
 
 static int mpc624_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 {
+        struct mpc624_private *devpriv;
         struct comedi_subdevice *s;
         unsigned long iobase;
         int ret;
@@ -297,9 +298,10 @@ static int mpc624_attach(struct comedi_device *dev, struct comedi_devconfig *it)
         dev->iobase = iobase;
         dev->board_name = "mpc624";
 
-        /*  Private structure initialization */
-        if (alloc_private(dev, sizeof(struct skel_private)) < 0)
+        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
+        if (!devpriv)
                 return -ENOMEM;
+        dev->private = devpriv;
 
         switch (it->options[1]) {
         case 0:
diff --git a/drivers/staging/comedi/drivers/mpc8260cpm.c b/drivers/staging/comedi/drivers/mpc8260cpm.c
deleted file mode 100644
index c0c33299b7f1..000000000000
--- a/drivers/staging/comedi/drivers/mpc8260cpm.c
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
-    comedi/drivers/mpc8260.c
-    driver for digital I/O pins on the MPC 8260 CPM module
-
-    COMEDI - Linux Control and Measurement Device Interface
-    Copyright (C) 2000,2001 David A. Schleef <ds@schleef.org>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
-/*
-Driver: mpc8260cpm
-Description: MPC8260 CPM module generic digital I/O lines
-Devices: [Motorola] MPC8260 CPM (mpc8260cpm)
-Author: ds
-Status: experimental
-Updated: Sat, 16 Mar 2002 17:34:48 -0800
-
-This driver is specific to the Motorola MPC8260 processor, allowing
-you to access the processor's generic digital I/O lines.
-
-It is apparently missing some code.
-*/
-
-#include "../comedidev.h"
-
-extern unsigned long mpc8260_dio_reserved[4];
-
-struct mpc8260cpm_private {
-
-        int data;
-
-};
-
-#define devpriv ((struct mpc8260cpm_private *)dev->private)
-
-static unsigned long *cpm_pdat(int port)
-{
-        switch (port) {
-        case 0:
-                return &io->iop_pdata;
-        case 1:
-                return &io->iop_pdatb;
-        case 2:
-                return &io->iop_pdatc;
-        case 3:
-                return &io->iop_pdatd;
-        }
-}
-
-static int mpc8260cpm_dio_config(struct comedi_device *dev,
-                                 struct comedi_subdevice *s,
-                                 struct comedi_insn *insn, unsigned int *data)
-{
-        int n;
-        unsigned int d;
-        unsigned int mask;
-        int port;
-
-        port = (int)s->private;
-        mask = 1 << CR_CHAN(insn->chanspec);
-        if (mask & cpm_reserved_bits[port]) {
-                return -EINVAL;
-        }
-
-        switch (data[0]) {
-        case INSN_CONFIG_DIO_OUTPUT:
-                s->io_bits |= mask;
-                break;
-        case INSN_CONFIG_DIO_INPUT:
-                s->io_bits &= ~mask;
-                break;
-        case INSN_CONFIG_DIO_QUERY:
-                data[1] = (s->io_bits & mask) ? COMEDI_OUTPUT : COMEDI_INPUT;
-                return insn->n;
-                break;
-        default:
-                return -EINVAL;
-        }
-
-        switch (port) {
-        case 0:
-                return &io->iop_pdira;
-        case 1:
-                return &io->iop_pdirb;
-        case 2:
-                return &io->iop_pdirc;
-        case 3:
-                return &io->iop_pdird;
-        }
-
-        return 1;
-}
-
-static int mpc8260cpm_dio_bits(struct comedi_device *dev,
-                               struct comedi_subdevice *s,
-                               struct comedi_insn *insn, unsigned int *data)
-{
-        int port;
-        unsigned long *p;
-
-        p = cpm_pdat((int)s->private);
-
-        return insn->n;
-}
-
-static int mpc8260cpm_attach(struct comedi_device *dev,
-                             struct comedi_devconfig *it)
-{
-        struct comedi_subdevice *s;
-        int i;
-        int ret;
-
-        printk("comedi%d: mpc8260cpm: ", dev->minor);
-
-        dev->board_ptr = mpc8260cpm_boards + dev->board;
-
-        dev->board_name = thisboard->name;
-
-        if (alloc_private(dev, sizeof(struct mpc8260cpm_private)) < 0)
-                return -ENOMEM;
-
-        ret =comedi_alloc_subdevices(dev, 4);
-        if (ret)
-                return ret;
-
-        for (i = 0; i < 4; i++) {
-                s = &dev->subdevices[i];
-                s->type = COMEDI_SUBD_DIO;
-                s->subdev_flags = SDF_READABLE | SDF_WRITABLE;
-                s->n_chan = 32;
-                s->maxdata = 1;
-                s->range_table = &range_digital;
-                s->insn_config = mpc8260cpm_dio_config;
-                s->insn_bits = mpc8260cpm_dio_bits;
-        }
-
-        return 1;
-}
-
-static void mpc8260cpm_detach(struct comedi_device *dev)
-{
-        /* Nothing to cleanup */
-}
-
-static struct comedi_driver mpc8260cpm_driver = {
-        .driver_name    = "mpc8260cpm",
-        .module         = THIS_MODULE,
-        .attach         = mpc8260cpm_attach,
-        .detach         = mpc8260cpm_detach,
-};
-module_comedi_driver(mpc8260cpm_driver);
diff --git a/drivers/staging/comedi/drivers/multiq3.c b/drivers/staging/comedi/drivers/multiq3.c
index 4625cb4d07c6..1f5f402f3d17 100644
--- a/drivers/staging/comedi/drivers/multiq3.c
+++ b/drivers/staging/comedi/drivers/multiq3.c
@@ -86,7 +86,6 @@ Devices: [Quanser Consulting] MultiQ-3 (multiq3)
 struct multiq3_private {
         unsigned int ao_readback[2];
 };
-#define devpriv ((struct multiq3_private *)dev->private)
 
 static int multiq3_ai_insn_read(struct comedi_device *dev,
                                 struct comedi_subdevice *s,
@@ -129,6 +128,7 @@ static int multiq3_ao_insn_read(struct comedi_device *dev,
                                 struct comedi_subdevice *s,
                                 struct comedi_insn *insn, unsigned int *data)
 {
+        struct multiq3_private *devpriv = dev->private;
         int i;
         int chan = CR_CHAN(insn->chanspec);
 
@@ -142,6 +142,7 @@ static int multiq3_ao_insn_write(struct comedi_device *dev,
                                  struct comedi_subdevice *s,
                                  struct comedi_insn *insn, unsigned int *data)
 {
+        struct multiq3_private *devpriv = dev->private;
         int i;
         int chan = CR_CHAN(insn->chanspec);
 
@@ -230,6 +231,7 @@ static void encoder_reset(struct comedi_device *dev)
 static int multiq3_attach(struct comedi_device *dev,
                           struct comedi_devconfig *it)
 {
+        struct multiq3_private *devpriv;
         int result = 0;
         unsigned long iobase;
         unsigned int irq;
@@ -256,9 +258,10 @@ static int multiq3_attach(struct comedi_device *dev,
         if (result)
                 return result;
 
-        result = alloc_private(dev, sizeof(struct multiq3_private));
-        if (result < 0)
-                return result;
+        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
+        if (!devpriv)
+                return -ENOMEM;
+        dev->private = devpriv;
 
         s = &dev->subdevices[0];
         /* ai subdevice */
diff --git a/drivers/staging/comedi/drivers/ni_6527.c b/drivers/staging/comedi/drivers/ni_6527.c
index 51295f32ee89..5196b460ce11 100644
--- a/drivers/staging/comedi/drivers/ni_6527.c
+++ b/drivers/staging/comedi/drivers/ni_6527.c
@@ -112,12 +112,11 @@ struct ni6527_private {
         unsigned int filter_enable;
 };
 
-#define devpriv ((struct ni6527_private *)dev->private)
-
 static int ni6527_di_insn_config(struct comedi_device *dev,
                                  struct comedi_subdevice *s,
                                  struct comedi_insn *insn, unsigned int *data)
 {
+        struct ni6527_private *devpriv = dev->private;
         int chan = CR_CHAN(insn->chanspec);
         unsigned int interval;
 
@@ -164,6 +163,8 @@ static int ni6527_di_insn_bits(struct comedi_device *dev,
                                struct comedi_subdevice *s,
                                struct comedi_insn *insn, unsigned int *data)
 {
+        struct ni6527_private *devpriv = dev->private;
+
         data[1] = readb(devpriv->mite->daq_io_addr + Port_Register(0));
         data[1] |= readb(devpriv->mite->daq_io_addr + Port_Register(1)) << 8;
         data[1] |= readb(devpriv->mite->daq_io_addr + Port_Register(2)) << 16;
@@ -175,6 +176,8 @@ static int ni6527_do_insn_bits(struct comedi_device *dev,
                                struct comedi_subdevice *s,
                                struct comedi_insn *insn, unsigned int *data)
 {
+        struct ni6527_private *devpriv = dev->private;
+
         if (data[0]) {
                 s->state &= ~data[0];
                 s->state |= (data[0] & data[1]);
@@ -202,6 +205,7 @@ static int ni6527_do_insn_bits(struct comedi_device *dev,
 static irqreturn_t ni6527_interrupt(int irq, void *d)
 {
         struct comedi_device *dev = d;
+        struct ni6527_private *devpriv = dev->private;
         struct comedi_subdevice *s = &dev->subdevices[2];
         unsigned int status;
 
@@ -243,29 +247,13 @@ static int ni6527_intr_cmdtest(struct comedi_device *dev,
         if (err)
                 return 2;
 
-        /* step 3: make sure arguments are trivially compatible */
+        /* Step 3: check if arguments are trivially valid */
 
-        if (cmd->start_arg != 0) {
-                cmd->start_arg = 0;
-                err++;
-        }
-        if (cmd->scan_begin_arg != 0) {
-                cmd->scan_begin_arg = 0;
-                err++;
-        }
-        if (cmd->convert_arg != 0) {
-                cmd->convert_arg = 0;
-                err++;
-        }
-
-        if (cmd->scan_end_arg != 1) {
-                cmd->scan_end_arg = 1;
-                err++;
-        }
-        if (cmd->stop_arg != 0) {
-                cmd->stop_arg = 0;
-                err++;
-        }
+        err |= cfc_check_trigger_arg_is(&cmd->start_arg, 0);
+        err |= cfc_check_trigger_arg_is(&cmd->scan_begin_arg, 0);
+        err |= cfc_check_trigger_arg_is(&cmd->convert_arg, 0);
+        err |= cfc_check_trigger_arg_is(&cmd->scan_end_arg, 1);
+        err |= cfc_check_trigger_arg_is(&cmd->stop_arg, 0);
 
         if (err)
                 return 3;
@@ -281,6 +269,7 @@ static int ni6527_intr_cmdtest(struct comedi_device *dev,
 static int ni6527_intr_cmd(struct comedi_device *dev,
                            struct comedi_subdevice *s)
 {
+        struct ni6527_private *devpriv = dev->private;
         /* struct comedi_cmd *cmd = &s->async->cmd; */
 
         writeb(ClrEdge | ClrOverflow,
@@ -295,6 +284,8 @@ static int ni6527_intr_cmd(struct comedi_device *dev,
 static int ni6527_intr_cancel(struct comedi_device *dev,
                               struct comedi_subdevice *s)
 {
+        struct ni6527_private *devpriv = dev->private;
+
         writeb(0x00, devpriv->mite->daq_io_addr + Master_Interrupt_Control);
 
         return 0;
@@ -312,6 +303,8 @@ static int ni6527_intr_insn_config(struct comedi_device *dev,
                                    struct comedi_subdevice *s,
                                    struct comedi_insn *insn, unsigned int *data)
 {
+        struct ni6527_private *devpriv = dev->private;
+
         if (insn->n < 1)
                 return -EINVAL;
         if (data[0] != INSN_CONFIG_CHANGE_NOTIFY)
@@ -348,15 +341,18 @@ ni6527_find_boardinfo(struct pci_dev *pcidev)
         return NULL;
 }
 
-static int __devinit ni6527_attach_pci(struct comedi_device *dev,
-                                       struct pci_dev *pcidev)
+static int ni6527_auto_attach(struct comedi_device *dev,
+                                        unsigned long context_unused)
 {
+        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
+        struct ni6527_private *devpriv;
         struct comedi_subdevice *s;
         int ret;
 
-        ret = alloc_private(dev, sizeof(struct ni6527_private));
-        if (ret < 0)
-                return ret;
+        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
+        if (!devpriv)
+                return -ENOMEM;
+        dev->private = devpriv;
 
         dev->board_ptr = ni6527_find_boardinfo(pcidev);
         if (!dev->board_ptr)
@@ -430,6 +426,8 @@ static int __devinit ni6527_attach_pci(struct comedi_device *dev,
 
 static void ni6527_detach(struct comedi_device *dev)
 {
+        struct ni6527_private *devpriv = dev->private;
+
         if (devpriv && devpriv->mite && devpriv->mite->daq_io_addr)
                 writeb(0x00,
                        devpriv->mite->daq_io_addr + Master_Interrupt_Control);
@@ -444,17 +442,17 @@ static void ni6527_detach(struct comedi_device *dev)
 static struct comedi_driver ni6527_driver = {
         .driver_name = DRIVER_NAME,
         .module = THIS_MODULE,
-        .attach_pci = ni6527_attach_pci,
+        .auto_attach = ni6527_auto_attach,
         .detach = ni6527_detach,
 };
 
-static int __devinit ni6527_pci_probe(struct pci_dev *dev,
+static int ni6527_pci_probe(struct pci_dev *dev,
                                       const struct pci_device_id *ent)
 {
         return comedi_pci_auto_config(dev, &ni6527_driver);
 }
 
-static void __devexit ni6527_pci_remove(struct pci_dev *dev)
+static void ni6527_pci_remove(struct pci_dev *dev)
 {
         comedi_pci_auto_unconfig(dev);
 }
@@ -463,7 +461,7 @@ static struct pci_driver ni6527_pci_driver = {
         .name = DRIVER_NAME,
         .id_table = ni6527_pci_table,
         .probe = ni6527_pci_probe,
-        .remove = __devexit_p(ni6527_pci_remove)
+        .remove = ni6527_pci_remove
 };
 module_comedi_pci_driver(ni6527_driver, ni6527_pci_driver);
 
diff --git a/drivers/staging/comedi/drivers/ni_65xx.c b/drivers/staging/comedi/drivers/ni_65xx.c
index 2a73ff57a2fb..2fb4b7790aeb 100644
--- a/drivers/staging/comedi/drivers/ni_65xx.c
+++ b/drivers/staging/comedi/drivers/ni_65xx.c
@@ -48,7 +48,6 @@ except maybe the 6514.
 
  */
 
-#define _GNU_SOURCE
 #define DEBUG 1
 #define DEBUG_FLAGS
 #include <linux/interrupt.h>
@@ -291,11 +290,6 @@ struct ni_65xx_private {
         unsigned short dio_direction[NI_65XX_MAX_NUM_PORTS];
 };
 
-static inline struct ni_65xx_private *private(struct comedi_device *dev)
-{
-        return dev->private;
-}
-
 struct ni_65xx_subdevice_private {
         unsigned base_port;
 };
@@ -319,6 +313,7 @@ static int ni_65xx_config_filter(struct comedi_device *dev,
                                  struct comedi_subdevice *s,
                                  struct comedi_insn *insn, unsigned int *data)
 {
+        struct ni_65xx_private *devpriv = dev->private;
         const unsigned chan = CR_CHAN(insn->chanspec);
         const unsigned port =
             sprivate(s)->base_port + ni_65xx_port_by_channel(chan);
@@ -335,22 +330,22 @@ static int ni_65xx_config_filter(struct comedi_device *dev,
                         interval = max_filter_interval;
                 data[1] = interval * filter_resolution_ns;
 
-                if (interval != private(dev)->filter_interval) {
+                if (interval != devpriv->filter_interval) {
                         writeb(interval,
-                               private(dev)->mite->daq_io_addr +
+                               devpriv->mite->daq_io_addr +
                                Filter_Interval);
-                        private(dev)->filter_interval = interval;
+                        devpriv->filter_interval = interval;
                 }
 
-                private(dev)->filter_enable[port] |=
+                devpriv->filter_enable[port] |=
                     1 << (chan % ni_65xx_channels_per_port);
         } else {
-                private(dev)->filter_enable[port] &=
+                devpriv->filter_enable[port] &=
                     ~(1 << (chan % ni_65xx_channels_per_port));
         }
 
-        writeb(private(dev)->filter_enable[port],
-               private(dev)->mite->daq_io_addr + Filter_Enable(port));
+        writeb(devpriv->filter_enable[port],
+               devpriv->mite->daq_io_addr + Filter_Enable(port));
 
         return 2;
 }
@@ -359,6 +354,7 @@ static int ni_65xx_dio_insn_config(struct comedi_device *dev,
                                    struct comedi_subdevice *s,
                                    struct comedi_insn *insn, unsigned int *data)
 {
+        struct ni_65xx_private *devpriv = dev->private;
         unsigned port;
 
         if (insn->n < 1)
@@ -372,21 +368,21 @@ static int ni_65xx_dio_insn_config(struct comedi_device *dev,
         case INSN_CONFIG_DIO_OUTPUT:
                 if (s->type != COMEDI_SUBD_DIO)
                         return -EINVAL;
-                private(dev)->dio_direction[port] = COMEDI_OUTPUT;
-                writeb(0, private(dev)->mite->daq_io_addr + Port_Select(port));
+                devpriv->dio_direction[port] = COMEDI_OUTPUT;
+                writeb(0, devpriv->mite->daq_io_addr + Port_Select(port));
                 return 1;
                 break;
         case INSN_CONFIG_DIO_INPUT:
                 if (s->type != COMEDI_SUBD_DIO)
                         return -EINVAL;
-                private(dev)->dio_direction[port] = COMEDI_INPUT;
-                writeb(1, private(dev)->mite->daq_io_addr + Port_Select(port));
+                devpriv->dio_direction[port] = COMEDI_INPUT;
+                writeb(1, devpriv->mite->daq_io_addr + Port_Select(port));
                 return 1;
                 break;
         case INSN_CONFIG_DIO_QUERY:
                 if (s->type != COMEDI_SUBD_DIO)
                         return -EINVAL;
-                data[1] = private(dev)->dio_direction[port];
+                data[1] = devpriv->dio_direction[port];
                 return insn->n;
                 break;
         default:
@@ -399,6 +395,7 @@ static int ni_65xx_dio_insn_bits(struct comedi_device *dev,
                                  struct comedi_subdevice *s,
                                  struct comedi_insn *insn, unsigned int *data)
 {
+        struct ni_65xx_private *devpriv = dev->private;
         unsigned base_bitfield_channel;
         const unsigned max_ports_per_bitfield = 5;
         unsigned read_bits = 0;
@@ -432,18 +429,18 @@ static int ni_65xx_dio_insn_bits(struct comedi_device *dev,
                 port_data &= 0xff;
                 if (port_mask) {
                         unsigned bits;
-                        private(dev)->output_bits[port] &= ~port_mask;
-                        private(dev)->output_bits[port] |=
+                        devpriv->output_bits[port] &= ~port_mask;
+                        devpriv->output_bits[port] |=
                             port_data & port_mask;
-                        bits = private(dev)->output_bits[port];
+                        bits = devpriv->output_bits[port];
                         if (board(dev)->invert_outputs)
                                 bits = ~bits;
                         writeb(bits,
-                               private(dev)->mite->daq_io_addr +
+                               devpriv->mite->daq_io_addr +
                                Port_Data(port));
                 }
                 port_read_bits =
-                    readb(private(dev)->mite->daq_io_addr + Port_Data(port));
+                    readb(devpriv->mite->daq_io_addr + Port_Data(port));
                 if (s->type == COMEDI_SUBD_DO && board(dev)->invert_outputs) {
                         /* Outputs inverted, so invert value read back from
                          * DO subdevice.  (Does not apply to boards with DIO
@@ -464,17 +461,18 @@ static int ni_65xx_dio_insn_bits(struct comedi_device *dev,
 static irqreturn_t ni_65xx_interrupt(int irq, void *d)
 {
         struct comedi_device *dev = d;
+        struct ni_65xx_private *devpriv = dev->private;
         struct comedi_subdevice *s = &dev->subdevices[2];
         unsigned int status;
 
-        status = readb(private(dev)->mite->daq_io_addr + Change_Status);
+        status = readb(devpriv->mite->daq_io_addr + Change_Status);
         if ((status & MasterInterruptStatus) == 0)
                 return IRQ_NONE;
         if ((status & EdgeStatus) == 0)
                 return IRQ_NONE;
 
         writeb(ClrEdge | ClrOverflow,
-               private(dev)->mite->daq_io_addr + Clear_Register);
+               devpriv->mite->daq_io_addr + Clear_Register);
 
         comedi_buf_put(s->async, 0);
         s->async->events |= COMEDI_CB_EOS;
@@ -505,29 +503,13 @@ static int ni_65xx_intr_cmdtest(struct comedi_device *dev,
         if (err)
                 return 2;
 
-        /* step 3: make sure arguments are trivially compatible */
+        /* Step 3: check if arguments are trivially valid */
 
-        if (cmd->start_arg != 0) {
-                cmd->start_arg = 0;
-                err++;
-        }
-        if (cmd->scan_begin_arg != 0) {
-                cmd->scan_begin_arg = 0;
-                err++;
-        }
-        if (cmd->convert_arg != 0) {
-                cmd->convert_arg = 0;
-                err++;
-        }
-
-        if (cmd->scan_end_arg != 1) {
-                cmd->scan_end_arg = 1;
-                err++;
-        }
-        if (cmd->stop_arg != 0) {
-                cmd->stop_arg = 0;
-                err++;
-        }
+        err |= cfc_check_trigger_arg_is(&cmd->start_arg, 0);
+        err |= cfc_check_trigger_arg_is(&cmd->scan_begin_arg, 0);
+        err |= cfc_check_trigger_arg_is(&cmd->convert_arg, 0);
+        err |= cfc_check_trigger_arg_is(&cmd->scan_end_arg, 1);
+        err |= cfc_check_trigger_arg_is(&cmd->stop_arg, 0);
 
         if (err)
                 return 3;
@@ -543,13 +525,14 @@ static int ni_65xx_intr_cmdtest(struct comedi_device *dev,
 static int ni_65xx_intr_cmd(struct comedi_device *dev,
                             struct comedi_subdevice *s)
 {
+        struct ni_65xx_private *devpriv = dev->private;
         /* struct comedi_cmd *cmd = &s->async->cmd; */
 
         writeb(ClrEdge | ClrOverflow,
-               private(dev)->mite->daq_io_addr + Clear_Register);
+               devpriv->mite->daq_io_addr + Clear_Register);
         writeb(FallingEdgeIntEnable | RisingEdgeIntEnable |
                MasterInterruptEnable | EdgeIntEnable,
-               private(dev)->mite->daq_io_addr + Master_Interrupt_Control);
+               devpriv->mite->daq_io_addr + Master_Interrupt_Control);
 
         return 0;
 }
@@ -557,8 +540,9 @@ static int ni_65xx_intr_cmd(struct comedi_device *dev,
 static int ni_65xx_intr_cancel(struct comedi_device *dev,
                                struct comedi_subdevice *s)
 {
-        writeb(0x00,
-               private(dev)->mite->daq_io_addr + Master_Interrupt_Control);
+        struct ni_65xx_private *devpriv = dev->private;
+
+        writeb(0x00, devpriv->mite->daq_io_addr + Master_Interrupt_Control);
 
         return 0;
 }
@@ -576,35 +560,37 @@ static int ni_65xx_intr_insn_config(struct comedi_device *dev,
                                     struct comedi_insn *insn,
                                     unsigned int *data)
 {
+        struct ni_65xx_private *devpriv = dev->private;
+
         if (insn->n < 1)
                 return -EINVAL;
         if (data[0] != INSN_CONFIG_CHANGE_NOTIFY)
                 return -EINVAL;
 
         writeb(data[1],
-               private(dev)->mite->daq_io_addr +
+               devpriv->mite->daq_io_addr +
                Rising_Edge_Detection_Enable(0));
         writeb(data[1] >> 8,
-               private(dev)->mite->daq_io_addr +
+               devpriv->mite->daq_io_addr +
                Rising_Edge_Detection_Enable(0x10));
         writeb(data[1] >> 16,
-               private(dev)->mite->daq_io_addr +
+               devpriv->mite->daq_io_addr +
                Rising_Edge_Detection_Enable(0x20));
         writeb(data[1] >> 24,
-               private(dev)->mite->daq_io_addr +
+               devpriv->mite->daq_io_addr +
                Rising_Edge_Detection_Enable(0x30));
 
         writeb(data[2],
-               private(dev)->mite->daq_io_addr +
+               devpriv->mite->daq_io_addr +
                Falling_Edge_Detection_Enable(0));
         writeb(data[2] >> 8,
-               private(dev)->mite->daq_io_addr +
+               devpriv->mite->daq_io_addr +
                Falling_Edge_Detection_Enable(0x10));
         writeb(data[2] >> 16,
-               private(dev)->mite->daq_io_addr +
+               devpriv->mite->daq_io_addr +
                Falling_Edge_Detection_Enable(0x20));
         writeb(data[2] >> 24,
-               private(dev)->mite->daq_io_addr +
+               devpriv->mite->daq_io_addr +
                Falling_Edge_Detection_Enable(0x30));
 
         return 2;
@@ -624,35 +610,38 @@ ni_65xx_find_boardinfo(struct pci_dev *pcidev)
         return NULL;
 }
 
-static int __devinit ni_65xx_attach_pci(struct comedi_device *dev,
-                                        struct pci_dev *pcidev)
+static int ni_65xx_auto_attach(struct comedi_device *dev,
+                                         unsigned long context_unused)
 {
+        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
+        struct ni_65xx_private *devpriv;
         struct comedi_subdevice *s;
         unsigned i;
         int ret;
 
-        ret = alloc_private(dev, sizeof(struct ni_65xx_private));
-        if (ret < 0)
-                return ret;
+        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
+        if (!devpriv)
+                return -ENOMEM;
+        dev->private = devpriv;
 
         dev->board_ptr = ni_65xx_find_boardinfo(pcidev);
         if (!dev->board_ptr)
                 return -ENODEV;
 
-        private(dev)->mite = mite_alloc(pcidev);
-        if (!private(dev)->mite)
+        devpriv->mite = mite_alloc(pcidev);
+        if (!devpriv->mite)
                 return -ENOMEM;
 
-        ret = mite_setup(private(dev)->mite);
+        ret = mite_setup(devpriv->mite);
         if (ret < 0) {
                 dev_warn(dev->class_dev, "error setting up mite\n");
                 return ret;
         }
 
         dev->board_name = board(dev)->name;
-        dev->irq = mite_irq(private(dev)->mite);
+        dev->irq = mite_irq(devpriv->mite);
         dev_info(dev->class_dev, "board: %s, ID=0x%02x", dev->board_name,
-               readb(private(dev)->mite->daq_io_addr + ID_Register));
+               readb(devpriv->mite->daq_io_addr + ID_Register));
 
         ret = comedi_alloc_subdevices(dev, 4);
         if (ret)
@@ -710,7 +699,7 @@ static int __devinit ni_65xx_attach_pci(struct comedi_device *dev,
                 for (i = 0; i < board(dev)->num_dio_ports; ++i) {
                         /*  configure all ports for input */
                         writeb(0x1,
-                               private(dev)->mite->daq_io_addr +
+                               devpriv->mite->daq_io_addr +
                                Port_Select(i));
                 }
         } else {
@@ -732,21 +721,21 @@ static int __devinit ni_65xx_attach_pci(struct comedi_device *dev,
 
         for (i = 0; i < ni_65xx_total_num_ports(board(dev)); ++i) {
                 writeb(0x00,
-                       private(dev)->mite->daq_io_addr + Filter_Enable(i));
+                       devpriv->mite->daq_io_addr + Filter_Enable(i));
                 if (board(dev)->invert_outputs)
                         writeb(0x01,
-                               private(dev)->mite->daq_io_addr + Port_Data(i));
+                               devpriv->mite->daq_io_addr + Port_Data(i));
                 else
                         writeb(0x00,
-                               private(dev)->mite->daq_io_addr + Port_Data(i));
+                               devpriv->mite->daq_io_addr + Port_Data(i));
         }
         writeb(ClrEdge | ClrOverflow,
-               private(dev)->mite->daq_io_addr + Clear_Register);
+               devpriv->mite->daq_io_addr + Clear_Register);
         writeb(0x00,
-               private(dev)->mite->daq_io_addr + Master_Interrupt_Control);
+               devpriv->mite->daq_io_addr + Master_Interrupt_Control);
 
         /* Set filter interval to 0  (32bit reg) */
-        writeb(0x00000000, private(dev)->mite->daq_io_addr + Filter_Interval);
+        writeb(0x00000000, devpriv->mite->daq_io_addr + Filter_Interval);
 
         ret = request_irq(dev->irq, ni_65xx_interrupt, IRQF_SHARED,
                           "ni_65xx", dev);
@@ -760,15 +749,16 @@ static int __devinit ni_65xx_attach_pci(struct comedi_device *dev,
 
 static void ni_65xx_detach(struct comedi_device *dev)
 {
-        if (private(dev) && private(dev)->mite
-            && private(dev)->mite->daq_io_addr) {
+        struct ni_65xx_private *devpriv = dev->private;
+
+        if (devpriv && devpriv->mite && devpriv->mite->daq_io_addr) {
                 writeb(0x00,
-                       private(dev)->mite->daq_io_addr +
+                       devpriv->mite->daq_io_addr +
                        Master_Interrupt_Control);
         }
         if (dev->irq)
                 free_irq(dev->irq, dev);
-        if (private(dev)) {
+        if (devpriv) {
                 struct comedi_subdevice *s;
                 unsigned i;
 
@@ -777,9 +767,9 @@ static void ni_65xx_detach(struct comedi_device *dev)
                         kfree(s->private);
                         s->private = NULL;
                 }
-                if (private(dev)->mite) {
-                        mite_unsetup(private(dev)->mite);
-                        mite_free(private(dev)->mite);
+                if (devpriv->mite) {
+                        mite_unsetup(devpriv->mite);
+                        mite_free(devpriv->mite);
                 }
         }
 }
@@ -787,17 +777,17 @@ static void ni_65xx_detach(struct comedi_device *dev)
 static struct comedi_driver ni_65xx_driver = {
         .driver_name = "ni_65xx",
         .module = THIS_MODULE,
-        .attach_pci = ni_65xx_attach_pci,
+        .auto_attach = ni_65xx_auto_attach,
         .detach = ni_65xx_detach,
 };
 
-static int __devinit ni_65xx_pci_probe(struct pci_dev *dev,
+static int ni_65xx_pci_probe(struct pci_dev *dev,
                                        const struct pci_device_id *ent)
 {
         return comedi_pci_auto_config(dev, &ni_65xx_driver);
 }
 
-static void __devexit ni_65xx_pci_remove(struct pci_dev *dev)
+static void ni_65xx_pci_remove(struct pci_dev *dev)
 {
         comedi_pci_auto_unconfig(dev);
 }
@@ -806,7 +796,7 @@ static struct pci_driver ni_65xx_pci_driver = {
         .name = "ni_65xx",
         .id_table = ni_65xx_pci_table,
         .probe = ni_65xx_pci_probe,
-        .remove = __devexit_p(ni_65xx_pci_remove)
+        .remove = ni_65xx_pci_remove
 };
 module_comedi_pci_driver(ni_65xx_driver, ni_65xx_pci_driver);
 
diff --git a/drivers/staging/comedi/drivers/ni_660x.c b/drivers/staging/comedi/drivers/ni_660x.c
index df2f3b0bab48..26baf9c96fff 100644
--- a/drivers/staging/comedi/drivers/ni_660x.c
+++ b/drivers/staging/comedi/drivers/ni_660x.c
@@ -419,16 +419,6 @@ static const struct ni_660x_board ni_660x_boards[] = {
 #define NI_660X_MAX_NUM_CHIPS 2
 #define NI_660X_MAX_NUM_COUNTERS (NI_660X_MAX_NUM_CHIPS * counters_per_chip)
 
-static DEFINE_PCI_DEVICE_TABLE(ni_660x_pci_table) = {
-        {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x2c60)},
-        {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x1310)},
-        {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x1360)},
-        {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x2cc0)},
-        {0}
-};
-
-MODULE_DEVICE_TABLE(pci, ni_660x_pci_table);
-
 struct ni_660x_private {
         struct mite_struct *mite;
         struct ni_gpct_device *counter_dev;
@@ -443,78 +433,11 @@ struct ni_660x_private {
         unsigned short pfi_output_selects[NUM_PFI_CHANNELS];
 };
 
-static inline struct ni_660x_private *private(struct comedi_device *dev)
-{
-        return dev->private;
-}
-
-/* initialized in ni_660x_attach_pci() */
-static inline const struct ni_660x_board *board(struct comedi_device *dev)
-{
-        return dev->board_ptr;
-}
-
-static int ni_660x_attach_pci(struct comedi_device *dev,
-                              struct pci_dev *pcidev);
-static void ni_660x_detach(struct comedi_device *dev);
-static void init_tio_chip(struct comedi_device *dev, int chipset);
-static void ni_660x_select_pfi_output(struct comedi_device *dev,
-                                      unsigned pfi_channel,
-                                      unsigned output_select);
-
-static struct comedi_driver ni_660x_driver = {
-        .driver_name = "ni_660x",
-        .module = THIS_MODULE,
-        .attach_pci = ni_660x_attach_pci,
-        .detach = ni_660x_detach,
-};
-
-static int __devinit ni_660x_pci_probe(struct pci_dev *dev,
-                                       const struct pci_device_id *ent)
-{
-        return comedi_pci_auto_config(dev, &ni_660x_driver);
-}
-
-static void __devexit ni_660x_pci_remove(struct pci_dev *dev)
-{
-        comedi_pci_auto_unconfig(dev);
-}
-
-static struct pci_driver ni_660x_pci_driver = {
-        .name = "ni_660x",
-        .id_table = ni_660x_pci_table,
-        .probe = ni_660x_pci_probe,
-        .remove = __devexit_p(ni_660x_pci_remove)
-};
-module_comedi_pci_driver(ni_660x_driver, ni_660x_pci_driver);
-
-static int ni_660x_set_pfi_routing(struct comedi_device *dev, unsigned chan,
-                                   unsigned source);
-
-/* Possible instructions for a GPCT */
-static int ni_660x_GPCT_rinsn(struct comedi_device *dev,
-                              struct comedi_subdevice *s,
-                              struct comedi_insn *insn, unsigned int *data);
-static int ni_660x_GPCT_insn_config(struct comedi_device *dev,
-                                    struct comedi_subdevice *s,
-                                    struct comedi_insn *insn,
-                                    unsigned int *data);
-static int ni_660x_GPCT_winsn(struct comedi_device *dev,
-                              struct comedi_subdevice *s,
-                              struct comedi_insn *insn, unsigned int *data);
-
-/* Possible instructions for Digital IO */
-static int ni_660x_dio_insn_config(struct comedi_device *dev,
-                                   struct comedi_subdevice *s,
-                                   struct comedi_insn *insn,
-                                   unsigned int *data);
-static int ni_660x_dio_insn_bits(struct comedi_device *dev,
-                                 struct comedi_subdevice *s,
-                                 struct comedi_insn *insn, unsigned int *data);
-
 static inline unsigned ni_660x_num_counters(struct comedi_device *dev)
 {
-        return board(dev)->n_chips * counters_per_chip;
+        const struct ni_660x_board *board = comedi_board(dev);
+
+        return board->n_chips * counters_per_chip;
 }
 
 static enum NI_660x_Register ni_gpct_to_660x_register(enum ni_gpct_register reg)
@@ -737,8 +660,9 @@ static inline void ni_660x_write_register(struct comedi_device *dev,
                                           unsigned chip_index, unsigned bits,
                                           enum NI_660x_Register reg)
 {
+        struct ni_660x_private *devpriv = dev->private;
         void __iomem *write_address =
-            private(dev)->mite->daq_io_addr + GPCT_OFFSET[chip_index] +
+            devpriv->mite->daq_io_addr + GPCT_OFFSET[chip_index] +
             registerData[reg].offset;
 
         switch (registerData[reg].size) {
@@ -758,8 +682,9 @@ static inline unsigned ni_660x_read_register(struct comedi_device *dev,
                                              unsigned chip_index,
                                              enum NI_660x_Register reg)
 {
+        struct ni_660x_private *devpriv = dev->private;
         void __iomem *read_address =
-            private(dev)->mite->daq_io_addr + GPCT_OFFSET[chip_index] +
+            devpriv->mite->daq_io_addr + GPCT_OFFSET[chip_index] +
             registerData[reg].offset;
 
         switch (registerData[reg].size) {
@@ -806,54 +731,56 @@ static inline void ni_660x_set_dma_channel(struct comedi_device *dev,
                                            unsigned mite_channel,
                                            struct ni_gpct *counter)
 {
+        struct ni_660x_private *devpriv = dev->private;
         unsigned long flags;
-        spin_lock_irqsave(&private(dev)->soft_reg_copy_lock, flags);
-        private(dev)->dma_configuration_soft_copies[counter->chip_index] &=
+
+        spin_lock_irqsave(&devpriv->soft_reg_copy_lock, flags);
+        devpriv->dma_configuration_soft_copies[counter->chip_index] &=
             ~dma_select_mask(mite_channel);
-        private(dev)->dma_configuration_soft_copies[counter->chip_index] |=
+        devpriv->dma_configuration_soft_copies[counter->chip_index] |=
             dma_select_bits(mite_channel,
                             dma_selection_counter(counter->counter_index));
         ni_660x_write_register(dev, counter->chip_index,
-                               private(dev)->
-                               dma_configuration_soft_copies
+                               devpriv->dma_configuration_soft_copies
                                [counter->chip_index] |
                                dma_reset_bit(mite_channel), DMAConfigRegister);
         mmiowb();
-        spin_unlock_irqrestore(&private(dev)->soft_reg_copy_lock, flags);
+        spin_unlock_irqrestore(&devpriv->soft_reg_copy_lock, flags);
 }
 
 static inline void ni_660x_unset_dma_channel(struct comedi_device *dev,
                                              unsigned mite_channel,
                                              struct ni_gpct *counter)
 {
+        struct ni_660x_private *devpriv = dev->private;
         unsigned long flags;
-        spin_lock_irqsave(&private(dev)->soft_reg_copy_lock, flags);
-        private(dev)->dma_configuration_soft_copies[counter->chip_index] &=
+
+        spin_lock_irqsave(&devpriv->soft_reg_copy_lock, flags);
+        devpriv->dma_configuration_soft_copies[counter->chip_index] &=
             ~dma_select_mask(mite_channel);
-        private(dev)->dma_configuration_soft_copies[counter->chip_index] |=
+        devpriv->dma_configuration_soft_copies[counter->chip_index] |=
             dma_select_bits(mite_channel, dma_selection_none);
         ni_660x_write_register(dev, counter->chip_index,
-                               private(dev)->
-                               dma_configuration_soft_copies
+                               devpriv->dma_configuration_soft_copies
                                [counter->chip_index], DMAConfigRegister);
         mmiowb();
-        spin_unlock_irqrestore(&private(dev)->soft_reg_copy_lock, flags);
+        spin_unlock_irqrestore(&devpriv->soft_reg_copy_lock, flags);
 }
 
 static int ni_660x_request_mite_channel(struct comedi_device *dev,
                                         struct ni_gpct *counter,
                                         enum comedi_io_direction direction)
 {
+        struct ni_660x_private *devpriv = dev->private;
         unsigned long flags;
         struct mite_channel *mite_chan;
 
-        spin_lock_irqsave(&private(dev)->mite_channel_lock, flags);
+        spin_lock_irqsave(&devpriv->mite_channel_lock, flags);
         BUG_ON(counter->mite_chan);
-        mite_chan =
-            mite_request_channel(private(dev)->mite, mite_ring(private(dev),
-                                                               counter));
+        mite_chan = mite_request_channel(devpriv->mite,
+                                         mite_ring(devpriv, counter));
         if (mite_chan == NULL) {
-                spin_unlock_irqrestore(&private(dev)->mite_channel_lock, flags);
+                spin_unlock_irqrestore(&devpriv->mite_channel_lock, flags);
                 comedi_error(dev,
                              "failed to reserve mite dma channel for counter.");
                 return -EBUSY;
@@ -861,16 +788,17 @@ static int ni_660x_request_mite_channel(struct comedi_device *dev,
         mite_chan->dir = direction;
         ni_tio_set_mite_channel(counter, mite_chan);
         ni_660x_set_dma_channel(dev, mite_chan->channel, counter);
-        spin_unlock_irqrestore(&private(dev)->mite_channel_lock, flags);
+        spin_unlock_irqrestore(&devpriv->mite_channel_lock, flags);
         return 0;
 }
 
 static void ni_660x_release_mite_channel(struct comedi_device *dev,
                                          struct ni_gpct *counter)
 {
+        struct ni_660x_private *devpriv = dev->private;
         unsigned long flags;
 
-        spin_lock_irqsave(&private(dev)->mite_channel_lock, flags);
+        spin_lock_irqsave(&devpriv->mite_channel_lock, flags);
         if (counter->mite_chan) {
                 struct mite_channel *mite_chan = counter->mite_chan;
 
@@ -878,7 +806,7 @@ static void ni_660x_release_mite_channel(struct comedi_device *dev,
                 ni_tio_set_mite_channel(counter, NULL);
                 mite_release_channel(mite_chan);
         }
-        spin_unlock_irqrestore(&private(dev)->mite_channel_lock, flags);
+        spin_unlock_irqrestore(&devpriv->mite_channel_lock, flags);
 }
 
 static int ni_660x_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
@@ -947,6 +875,7 @@ static void ni_660x_handle_gpct_interrupt(struct comedi_device *dev,
 static irqreturn_t ni_660x_interrupt(int irq, void *d)
 {
         struct comedi_device *dev = d;
+        struct ni_660x_private *devpriv = dev->private;
         struct comedi_subdevice *s;
         unsigned i;
         unsigned long flags;
@@ -954,24 +883,26 @@ static irqreturn_t ni_660x_interrupt(int irq, void *d)
         if (dev->attached == 0)
                 return IRQ_NONE;
         /* lock to avoid race with comedi_poll */
-        spin_lock_irqsave(&private(dev)->interrupt_lock, flags);
+        spin_lock_irqsave(&devpriv->interrupt_lock, flags);
         smp_mb();
         for (i = 0; i < ni_660x_num_counters(dev); ++i) {
                 s = &dev->subdevices[NI_660X_GPCT_SUBDEV(i)];
                 ni_660x_handle_gpct_interrupt(dev, s);
         }
-        spin_unlock_irqrestore(&private(dev)->interrupt_lock, flags);
+        spin_unlock_irqrestore(&devpriv->interrupt_lock, flags);
         return IRQ_HANDLED;
 }
 
 static int ni_660x_input_poll(struct comedi_device *dev,
                               struct comedi_subdevice *s)
 {
+        struct ni_660x_private *devpriv = dev->private;
         unsigned long flags;
+
         /* lock to avoid race with comedi_poll */
-        spin_lock_irqsave(&private(dev)->interrupt_lock, flags);
+        spin_lock_irqsave(&devpriv->interrupt_lock, flags);
         mite_sync_input_dma(subdev_to_counter(s)->mite_chan, s->async);
-        spin_unlock_irqrestore(&private(dev)->interrupt_lock, flags);
+        spin_unlock_irqrestore(&devpriv->interrupt_lock, flags);
         return comedi_buf_read_n_available(s->async);
 }
 
@@ -979,9 +910,10 @@ static int ni_660x_buf_change(struct comedi_device *dev,
                               struct comedi_subdevice *s,
                               unsigned long new_size)
 {
+        struct ni_660x_private *devpriv = dev->private;
         int ret;
 
-        ret = mite_buf_change(mite_ring(private(dev), subdev_to_counter(s)),
+        ret = mite_buf_change(mite_ring(devpriv, subdev_to_counter(s)),
                               s->async);
         if (ret < 0)
                 return ret;
@@ -991,32 +923,35 @@ static int ni_660x_buf_change(struct comedi_device *dev,
 
 static int ni_660x_allocate_private(struct comedi_device *dev)
 {
-        int retval;
+        struct ni_660x_private *devpriv;
         unsigned i;
 
-        retval = alloc_private(dev, sizeof(struct ni_660x_private));
-        if (retval < 0)
-                return retval;
+        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
+        if (!devpriv)
+                return -ENOMEM;
+        dev->private = devpriv;
 
-        spin_lock_init(&private(dev)->mite_channel_lock);
-        spin_lock_init(&private(dev)->interrupt_lock);
-        spin_lock_init(&private(dev)->soft_reg_copy_lock);
+        spin_lock_init(&devpriv->mite_channel_lock);
+        spin_lock_init(&devpriv->interrupt_lock);
+        spin_lock_init(&devpriv->soft_reg_copy_lock);
         for (i = 0; i < NUM_PFI_CHANNELS; ++i)
-                private(dev)->pfi_output_selects[i] = pfi_output_select_counter;
+                devpriv->pfi_output_selects[i] = pfi_output_select_counter;
 
         return 0;
 }
 
 static int ni_660x_alloc_mite_rings(struct comedi_device *dev)
 {
+        const struct ni_660x_board *board = comedi_board(dev);
+        struct ni_660x_private *devpriv = dev->private;
         unsigned i;
         unsigned j;
 
-        for (i = 0; i < board(dev)->n_chips; ++i) {
+        for (i = 0; i < board->n_chips; ++i) {
                 for (j = 0; j < counters_per_chip; ++j) {
-                        private(dev)->mite_rings[i][j] =
-                            mite_alloc_ring(private(dev)->mite);
-                        if (private(dev)->mite_rings[i][j] == NULL)
+                        devpriv->mite_rings[i][j] =
+                            mite_alloc_ring(devpriv->mite);
+                        if (devpriv->mite_rings[i][j] == NULL)
                                 return -ENOMEM;
                 }
         }
@@ -1025,12 +960,14 @@ static int ni_660x_alloc_mite_rings(struct comedi_device *dev)
 
 static void ni_660x_free_mite_rings(struct comedi_device *dev)
 {
+        const struct ni_660x_board *board = comedi_board(dev);
+        struct ni_660x_private *devpriv = dev->private;
         unsigned i;
         unsigned j;
 
-        for (i = 0; i < board(dev)->n_chips; ++i) {
+        for (i = 0; i < board->n_chips; ++i) {
                 for (j = 0; j < counters_per_chip; ++j)
-                        mite_free_ring(private(dev)->mite_rings[i][j]);
+                        mite_free_ring(devpriv->mite_rings[i][j]);
         }
 }
 
@@ -1048,145 +985,6 @@ ni_660x_find_boardinfo(struct pci_dev *pcidev)
         return NULL;
 }
 
-static int __devinit ni_660x_attach_pci(struct comedi_device *dev,
-                                        struct pci_dev *pcidev)
-{
-        struct comedi_subdevice *s;
-        int ret;
-        unsigned i;
-        unsigned global_interrupt_config_bits;
-
-        ret = ni_660x_allocate_private(dev);
-        if (ret < 0)
-                return ret;
-        dev->board_ptr = ni_660x_find_boardinfo(pcidev);
-        if (!dev->board_ptr)
-                return -ENODEV;
-        private(dev)->mite = mite_alloc(pcidev);
-        if (!private(dev)->mite)
-                return -ENOMEM;
-
-        dev->board_name = board(dev)->name;
-
-        ret = mite_setup2(private(dev)->mite, 1);
-        if (ret < 0) {
-                dev_warn(dev->class_dev, "error setting up mite\n");
-                return ret;
-        }
-        comedi_set_hw_dev(dev, &private(dev)->mite->pcidev->dev);
-        ret = ni_660x_alloc_mite_rings(dev);
-        if (ret < 0)
-                return ret;
-
-        ret = comedi_alloc_subdevices(dev, 2 + NI_660X_MAX_NUM_COUNTERS);
-        if (ret)
-                return ret;
-
-        s = &dev->subdevices[0];
-        /* Old GENERAL-PURPOSE COUNTER/TIME (GPCT) subdevice, no longer used */
-        s->type = COMEDI_SUBD_UNUSED;
-
-        s = &dev->subdevices[NI_660X_DIO_SUBDEV];
-        /* DIGITAL I/O SUBDEVICE */
-        s->type = COMEDI_SUBD_DIO;
-        s->subdev_flags = SDF_READABLE | SDF_WRITABLE;
-        s->n_chan = NUM_PFI_CHANNELS;
-        s->maxdata = 1;
-        s->range_table = &range_digital;
-        s->insn_bits = ni_660x_dio_insn_bits;
-        s->insn_config = ni_660x_dio_insn_config;
-        s->io_bits = 0;         /* all bits default to input */
-        /*  we use the ioconfig registers to control dio direction, so zero
-        output enables in stc dio control reg */
-        ni_660x_write_register(dev, 0, 0, STCDIOControl);
-
-        private(dev)->counter_dev = ni_gpct_device_construct(dev,
-                                                     &ni_gpct_write_register,
-                                                     &ni_gpct_read_register,
-                                                     ni_gpct_variant_660x,
-                                                     ni_660x_num_counters
-                                                     (dev));
-        if (private(dev)->counter_dev == NULL)
-                return -ENOMEM;
-        for (i = 0; i < NI_660X_MAX_NUM_COUNTERS; ++i) {
-                s = &dev->subdevices[NI_660X_GPCT_SUBDEV(i)];
-                if (i < ni_660x_num_counters(dev)) {
-                        s->type = COMEDI_SUBD_COUNTER;
-                        s->subdev_flags =
-                            SDF_READABLE | SDF_WRITABLE | SDF_LSAMPL |
-                            SDF_CMD_READ /* | SDF_CMD_WRITE */ ;
-                        s->n_chan = 3;
-                        s->maxdata = 0xffffffff;
-                        s->insn_read = ni_660x_GPCT_rinsn;
-                        s->insn_write = ni_660x_GPCT_winsn;
-                        s->insn_config = ni_660x_GPCT_insn_config;
-                        s->do_cmd = &ni_660x_cmd;
-                        s->len_chanlist = 1;
-                        s->do_cmdtest = &ni_660x_cmdtest;
-                        s->cancel = &ni_660x_cancel;
-                        s->poll = &ni_660x_input_poll;
-                        s->async_dma_dir = DMA_BIDIRECTIONAL;
-                        s->buf_change = &ni_660x_buf_change;
-                        s->private = &private(dev)->counter_dev->counters[i];
-
-                        private(dev)->counter_dev->counters[i].chip_index =
-                            i / counters_per_chip;
-                        private(dev)->counter_dev->counters[i].counter_index =
-                            i % counters_per_chip;
-                } else {
-                        s->type = COMEDI_SUBD_UNUSED;
-                }
-        }
-        for (i = 0; i < board(dev)->n_chips; ++i)
-                init_tio_chip(dev, i);
-
-        for (i = 0; i < ni_660x_num_counters(dev); ++i)
-                ni_tio_init_counter(&private(dev)->counter_dev->counters[i]);
-
-        for (i = 0; i < NUM_PFI_CHANNELS; ++i) {
-                if (i < min_counter_pfi_chan)
-                        ni_660x_set_pfi_routing(dev, i, pfi_output_select_do);
-                else
-                        ni_660x_set_pfi_routing(dev, i,
-                                                pfi_output_select_counter);
-                ni_660x_select_pfi_output(dev, i, pfi_output_select_high_Z);
-        }
-        /* to be safe, set counterswap bits on tio chips after all the counter
-           outputs have been set to high impedance mode */
-        for (i = 0; i < board(dev)->n_chips; ++i)
-                set_tio_counterswap(dev, i);
-
-        ret = request_irq(mite_irq(private(dev)->mite), ni_660x_interrupt,
-                          IRQF_SHARED, "ni_660x", dev);
-        if (ret < 0) {
-                dev_warn(dev->class_dev, " irq not available\n");
-                return ret;
-        }
-        dev->irq = mite_irq(private(dev)->mite);
-        global_interrupt_config_bits = Global_Int_Enable_Bit;
-        if (board(dev)->n_chips > 1)
-                global_interrupt_config_bits |= Cascade_Int_Enable_Bit;
-        ni_660x_write_register(dev, 0, global_interrupt_config_bits,
-                               GlobalInterruptConfigRegister);
-        dev_info(dev->class_dev, "ni_660x: %s attached\n", dev->board_name);
-        return 0;
-}
-
-static void ni_660x_detach(struct comedi_device *dev)
-{
-        if (dev->irq)
-                free_irq(dev->irq, dev);
-        if (dev->private) {
-                if (private(dev)->counter_dev)
-                        ni_gpct_device_destroy(private(dev)->counter_dev);
-                if (private(dev)->mite) {
-                        ni_660x_free_mite_rings(dev);
-                        mite_unsetup(private(dev)->mite);
-                        mite_free(private(dev)->mite);
-                }
-        }
-}
-
 static int
 ni_660x_GPCT_rinsn(struct comedi_device *dev, struct comedi_subdevice *s,
                    struct comedi_insn *insn, unsigned int *data)
@@ -1196,17 +994,17 @@ ni_660x_GPCT_rinsn(struct comedi_device *dev, struct comedi_subdevice *s,
 
 static void init_tio_chip(struct comedi_device *dev, int chipset)
 {
+        struct ni_660x_private *devpriv = dev->private;
         unsigned i;
 
         /*  init dma configuration register */
-        private(dev)->dma_configuration_soft_copies[chipset] = 0;
+        devpriv->dma_configuration_soft_copies[chipset] = 0;
         for (i = 0; i < MAX_DMA_CHANNEL; ++i) {
-                private(dev)->dma_configuration_soft_copies[chipset] |=
+                devpriv->dma_configuration_soft_copies[chipset] |=
                     dma_select_bits(i, dma_selection_none) & dma_select_mask(i);
         }
         ni_660x_write_register(dev, chipset,
-                               private(dev)->
-                               dma_configuration_soft_copies[chipset],
+                               devpriv->dma_configuration_soft_copies[chipset],
                                DMAConfigRegister);
         for (i = 0; i < NUM_PFI_CHANNELS; ++i)
                 ni_660x_write_register(dev, chipset, 0, IOConfigReg(i));
@@ -1251,6 +1049,7 @@ static void ni_660x_select_pfi_output(struct comedi_device *dev,
                                       unsigned pfi_channel,
                                       unsigned output_select)
 {
+        const struct ni_660x_board *board = comedi_board(dev);
         static const unsigned counter_4_7_first_pfi = 8;
         static const unsigned counter_4_7_last_pfi = 23;
         unsigned active_chipset = 0;
@@ -1258,7 +1057,7 @@ static void ni_660x_select_pfi_output(struct comedi_device *dev,
         unsigned active_bits;
         unsigned idle_bits;
 
-        if (board(dev)->n_chips > 1) {
+        if (board->n_chips > 1) {
                 if (output_select == pfi_output_select_counter &&
                     pfi_channel >= counter_4_7_first_pfi &&
                     pfi_channel <= counter_4_7_last_pfi) {
@@ -1294,6 +1093,8 @@ static void ni_660x_select_pfi_output(struct comedi_device *dev,
 static int ni_660x_set_pfi_routing(struct comedi_device *dev, unsigned chan,
                                    unsigned source)
 {
+        struct ni_660x_private *devpriv = dev->private;
+
         if (source > num_pfi_output_selects)
                 return -EINVAL;
         if (source == pfi_output_select_high_Z)
@@ -1305,76 +1106,249 @@ static int ni_660x_set_pfi_routing(struct comedi_device *dev, unsigned chan,
                 if (source == pfi_output_select_do)
                         return -EINVAL;
         }
-        BUG_ON(chan >= NUM_PFI_CHANNELS);
 
-        private(dev)->pfi_output_selects[chan] = source;
-        if (private(dev)->pfi_direction_bits & (((uint64_t) 1) << chan))
+        devpriv->pfi_output_selects[chan] = source;
+        if (devpriv->pfi_direction_bits & (((uint64_t) 1) << chan))
                 ni_660x_select_pfi_output(dev, chan,
-                                          private(dev)->
-                                          pfi_output_selects[chan]);
+                                          devpriv->pfi_output_selects[chan]);
         return 0;
 }
 
-static unsigned ni_660x_get_pfi_routing(struct comedi_device *dev,
-                                        unsigned chan)
-{
-        BUG_ON(chan >= NUM_PFI_CHANNELS);
-        return private(dev)->pfi_output_selects[chan];
-}
-
-static void ni660x_config_filter(struct comedi_device *dev,
-                                 unsigned pfi_channel,
-                                 enum ni_gpct_filter_select filter)
-{
-        unsigned bits = ni_660x_read_register(dev, 0, IOConfigReg(pfi_channel));
-        bits &= ~pfi_input_select_mask(pfi_channel);
-        bits |= pfi_input_select_bits(pfi_channel, filter);
-        ni_660x_write_register(dev, 0, bits, IOConfigReg(pfi_channel));
-}
-
 static int ni_660x_dio_insn_config(struct comedi_device *dev,
                                    struct comedi_subdevice *s,
-                                   struct comedi_insn *insn, unsigned int *data)
+                                   struct comedi_insn *insn,
+                                   unsigned int *data)
 {
-        int chan = CR_CHAN(insn->chanspec);
-
-        /* The input or output configuration of each digital line is
-         * configured by a special insn_config instruction.  chanspec
-         * contains the channel to be changed, and data[0] contains the
-         * value COMEDI_INPUT or COMEDI_OUTPUT. */
+        struct ni_660x_private *devpriv = dev->private;
+        unsigned int chan = CR_CHAN(insn->chanspec);
+        uint64_t bit = 1ULL << chan;
+        unsigned int val;
+        int ret;
 
         switch (data[0]) {
         case INSN_CONFIG_DIO_OUTPUT:
-                private(dev)->pfi_direction_bits |= ((uint64_t) 1) << chan;
+                devpriv->pfi_direction_bits |= bit;
                 ni_660x_select_pfi_output(dev, chan,
-                                          private(dev)->
-                                          pfi_output_selects[chan]);
+                                          devpriv->pfi_output_selects[chan]);
                 break;
+
         case INSN_CONFIG_DIO_INPUT:
-                private(dev)->pfi_direction_bits &= ~(((uint64_t) 1) << chan);
+                devpriv->pfi_direction_bits &= ~bit;
                 ni_660x_select_pfi_output(dev, chan, pfi_output_select_high_Z);
                 break;
+
         case INSN_CONFIG_DIO_QUERY:
-                data[1] =
-                    (private(dev)->pfi_direction_bits &
-                     (((uint64_t) 1) << chan)) ? COMEDI_OUTPUT : COMEDI_INPUT;
-                return 0;
+                data[1] = (devpriv->pfi_direction_bits & bit) ? COMEDI_OUTPUT
+                                                              : COMEDI_INPUT;
+                break;
+
         case INSN_CONFIG_SET_ROUTING:
-                return ni_660x_set_pfi_routing(dev, chan, data[1]);
+                ret = ni_660x_set_pfi_routing(dev, chan, data[1]);
+                if (ret)
+                        return ret;
                 break;
+
         case INSN_CONFIG_GET_ROUTING:
-                data[1] = ni_660x_get_pfi_routing(dev, chan);
+                data[1] = devpriv->pfi_output_selects[chan];
                 break;
+
         case INSN_CONFIG_FILTER:
-                ni660x_config_filter(dev, chan, data[1]);
+                val = ni_660x_read_register(dev, 0, IOConfigReg(chan));
+                val &= ~pfi_input_select_mask(chan);
+                val |= pfi_input_select_bits(chan, data[1]);
+                ni_660x_write_register(dev, 0, val, IOConfigReg(chan));
                 break;
+
         default:
                 return -EINVAL;
-                break;
         }
+
+        return insn->n;
+}
+
+static int ni_660x_auto_attach(struct comedi_device *dev,
+                                         unsigned long context_unused)
+{
+        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
+        const struct ni_660x_board *board;
+        struct ni_660x_private *devpriv;
+        struct comedi_subdevice *s;
+        int ret;
+        unsigned i;
+        unsigned global_interrupt_config_bits;
+
+        ret = ni_660x_allocate_private(dev);
+        if (ret < 0)
+                return ret;
+        devpriv = dev->private;
+
+        dev->board_ptr = ni_660x_find_boardinfo(pcidev);
+        if (!dev->board_ptr)
+                return -ENODEV;
+        board = comedi_board(dev);
+
+        devpriv->mite = mite_alloc(pcidev);
+        if (!devpriv->mite)
+                return -ENOMEM;
+
+        dev->board_name = board->name;
+
+        ret = mite_setup2(devpriv->mite, 1);
+        if (ret < 0) {
+                dev_warn(dev->class_dev, "error setting up mite\n");
+                return ret;
+        }
+
+        ret = ni_660x_alloc_mite_rings(dev);
+        if (ret < 0)
+                return ret;
+
+        ret = comedi_alloc_subdevices(dev, 2 + NI_660X_MAX_NUM_COUNTERS);
+        if (ret)
+                return ret;
+
+        s = &dev->subdevices[0];
+        /* Old GENERAL-PURPOSE COUNTER/TIME (GPCT) subdevice, no longer used */
+        s->type = COMEDI_SUBD_UNUSED;
+
+        s = &dev->subdevices[NI_660X_DIO_SUBDEV];
+        /* DIGITAL I/O SUBDEVICE */
+        s->type = COMEDI_SUBD_DIO;
+        s->subdev_flags = SDF_READABLE | SDF_WRITABLE;
+        s->n_chan = NUM_PFI_CHANNELS;
+        s->maxdata = 1;
+        s->range_table = &range_digital;
+        s->insn_bits = ni_660x_dio_insn_bits;
+        s->insn_config = ni_660x_dio_insn_config;
+        s->io_bits = 0;         /* all bits default to input */
+        /*  we use the ioconfig registers to control dio direction, so zero
+        output enables in stc dio control reg */
+        ni_660x_write_register(dev, 0, 0, STCDIOControl);
+
+        devpriv->counter_dev = ni_gpct_device_construct(dev,
+                                                     &ni_gpct_write_register,
+                                                     &ni_gpct_read_register,
+                                                     ni_gpct_variant_660x,
+                                                     ni_660x_num_counters
+                                                     (dev));
+        if (devpriv->counter_dev == NULL)
+                return -ENOMEM;
+        for (i = 0; i < NI_660X_MAX_NUM_COUNTERS; ++i) {
+                s = &dev->subdevices[NI_660X_GPCT_SUBDEV(i)];
+                if (i < ni_660x_num_counters(dev)) {
+                        s->type = COMEDI_SUBD_COUNTER;
+                        s->subdev_flags =
+                            SDF_READABLE | SDF_WRITABLE | SDF_LSAMPL |
+                            SDF_CMD_READ /* | SDF_CMD_WRITE */ ;
+                        s->n_chan = 3;
+                        s->maxdata = 0xffffffff;
+                        s->insn_read = ni_660x_GPCT_rinsn;
+                        s->insn_write = ni_660x_GPCT_winsn;
+                        s->insn_config = ni_660x_GPCT_insn_config;
+                        s->do_cmd = &ni_660x_cmd;
+                        s->len_chanlist = 1;
+                        s->do_cmdtest = &ni_660x_cmdtest;
+                        s->cancel = &ni_660x_cancel;
+                        s->poll = &ni_660x_input_poll;
+                        s->async_dma_dir = DMA_BIDIRECTIONAL;
+                        s->buf_change = &ni_660x_buf_change;
+                        s->private = &devpriv->counter_dev->counters[i];
+
+                        devpriv->counter_dev->counters[i].chip_index =
+                            i / counters_per_chip;
+                        devpriv->counter_dev->counters[i].counter_index =
+                            i % counters_per_chip;
+                } else {
+                        s->type = COMEDI_SUBD_UNUSED;
+                }
+        }
+        for (i = 0; i < board->n_chips; ++i)
+                init_tio_chip(dev, i);
+
+        for (i = 0; i < ni_660x_num_counters(dev); ++i)
+                ni_tio_init_counter(&devpriv->counter_dev->counters[i]);
+
+        for (i = 0; i < NUM_PFI_CHANNELS; ++i) {
+                if (i < min_counter_pfi_chan)
+                        ni_660x_set_pfi_routing(dev, i, pfi_output_select_do);
+                else
+                        ni_660x_set_pfi_routing(dev, i,
+                                                pfi_output_select_counter);
+                ni_660x_select_pfi_output(dev, i, pfi_output_select_high_Z);
+        }
+        /* to be safe, set counterswap bits on tio chips after all the counter
+           outputs have been set to high impedance mode */
+        for (i = 0; i < board->n_chips; ++i)
+                set_tio_counterswap(dev, i);
+
+        ret = request_irq(mite_irq(devpriv->mite), ni_660x_interrupt,
+                          IRQF_SHARED, "ni_660x", dev);
+        if (ret < 0) {
+                dev_warn(dev->class_dev, " irq not available\n");
+                return ret;
+        }
+        dev->irq = mite_irq(devpriv->mite);
+        global_interrupt_config_bits = Global_Int_Enable_Bit;
+        if (board->n_chips > 1)
+                global_interrupt_config_bits |= Cascade_Int_Enable_Bit;
+        ni_660x_write_register(dev, 0, global_interrupt_config_bits,
+                               GlobalInterruptConfigRegister);
+        dev_info(dev->class_dev, "ni_660x: %s attached\n", dev->board_name);
         return 0;
 }
 
+static void ni_660x_detach(struct comedi_device *dev)
+{
+        struct ni_660x_private *devpriv = dev->private;
+
+        if (dev->irq)
+                free_irq(dev->irq, dev);
+        if (devpriv) {
+                if (devpriv->counter_dev)
+                        ni_gpct_device_destroy(devpriv->counter_dev);
+                if (devpriv->mite) {
+                        ni_660x_free_mite_rings(dev);
+                        mite_unsetup(devpriv->mite);
+                        mite_free(devpriv->mite);
+                }
+        }
+}
+
+static struct comedi_driver ni_660x_driver = {
+        .driver_name    = "ni_660x",
+        .module         = THIS_MODULE,
+        .auto_attach    = ni_660x_auto_attach,
+        .detach         = ni_660x_detach,
+};
+
+static int ni_660x_pci_probe(struct pci_dev *dev,
+                                       const struct pci_device_id *ent)
+{
+        return comedi_pci_auto_config(dev, &ni_660x_driver);
+}
+
+static void ni_660x_pci_remove(struct pci_dev *dev)
+{
+        comedi_pci_auto_unconfig(dev);
+}
+
+static DEFINE_PCI_DEVICE_TABLE(ni_660x_pci_table) = {
+        {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x2c60)},
+        {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x1310)},
+        {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x1360)},
+        {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x2cc0)},
+        {0}
+};
+MODULE_DEVICE_TABLE(pci, ni_660x_pci_table);
+
+static struct pci_driver ni_660x_pci_driver = {
+        .name           = "ni_660x",
+        .id_table       = ni_660x_pci_table,
+        .probe          = ni_660x_pci_probe,
+        .remove         = ni_660x_pci_remove,
+};
+module_comedi_pci_driver(ni_660x_driver, ni_660x_pci_driver);
+
 MODULE_AUTHOR("Comedi http://www.comedi.org");
 MODULE_DESCRIPTION("Comedi low-level driver");
 MODULE_LICENSE("GPL");
diff --git a/drivers/staging/comedi/drivers/ni_670x.c b/drivers/staging/comedi/drivers/ni_670x.c
index eac6dc047bb0..272caeb6ecee 100644
--- a/drivers/staging/comedi/drivers/ni_670x.c
+++ b/drivers/staging/comedi/drivers/ni_670x.c
@@ -201,19 +201,21 @@ ni_670x_find_boardinfo(struct pci_dev *pcidev)
         return NULL;
 }
 
-static int __devinit ni_670x_attach_pci(struct comedi_device *dev,
-                                        struct pci_dev *pcidev)
+static int ni_670x_auto_attach(struct comedi_device *dev,
+                                         unsigned long context_unused)
 {
+        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
         const struct ni_670x_board *thisboard;
         struct ni_670x_private *devpriv;
         struct comedi_subdevice *s;
         int ret;
         int i;
 
-        ret = alloc_private(dev, sizeof(*devpriv));
-        if (ret < 0)
-                return ret;
-        devpriv = dev->private;
+        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
+        if (!devpriv)
+                return -ENOMEM;
+        dev->private = devpriv;
+
         dev->board_ptr = ni_670x_find_boardinfo(pcidev);
         if (!dev->board_ptr)
                 return -ENODEV;
@@ -297,17 +299,17 @@ static void ni_670x_detach(struct comedi_device *dev)
 static struct comedi_driver ni_670x_driver = {
         .driver_name    = "ni_670x",
         .module         = THIS_MODULE,
-        .attach_pci     = ni_670x_attach_pci,
+        .auto_attach    = ni_670x_auto_attach,
         .detach         = ni_670x_detach,
 };
 
-static int __devinit ni_670x_pci_probe(struct pci_dev *dev,
+static int ni_670x_pci_probe(struct pci_dev *dev,
                                        const struct pci_device_id *ent)
 {
         return comedi_pci_auto_config(dev, &ni_670x_driver);
 }
 
-static void __devexit ni_670x_pci_remove(struct pci_dev *dev)
+static void ni_670x_pci_remove(struct pci_dev *dev)
 {
         comedi_pci_auto_unconfig(dev);
 }
@@ -320,10 +322,10 @@ static DEFINE_PCI_DEVICE_TABLE(ni_670x_pci_table) = {
 MODULE_DEVICE_TABLE(pci, ni_670x_pci_table);
 
 static struct pci_driver ni_670x_pci_driver = {
-        .name           ="ni_670x",
+        .name           = "ni_670x",
         .id_table       = ni_670x_pci_table,
         .probe          = ni_670x_pci_probe,
-        .remove         = __devexit_p(ni_670x_pci_remove),
+        .remove         = ni_670x_pci_remove,
 };
 module_comedi_pci_driver(ni_670x_driver, ni_670x_pci_driver);
 
diff --git a/drivers/staging/comedi/drivers/ni_at_a2150.c b/drivers/staging/comedi/drivers/ni_at_a2150.c
index 83950807b672..06de25bb2f56 100644
--- a/drivers/staging/comedi/drivers/ni_at_a2150.c
+++ b/drivers/staging/comedi/drivers/ni_at_a2150.c
@@ -169,8 +169,6 @@ struct a2150_private {
         int config_bits;        /*  config register bits */
 };
 
-#define devpriv ((struct a2150_private *)dev->private)
-
 static int a2150_cancel(struct comedi_device *dev, struct comedi_subdevice *s);
 
 static int a2150_get_timing(struct comedi_device *dev, unsigned int *period,
@@ -182,6 +180,8 @@ static int a2150_set_chanlist(struct comedi_device *dev,
 
 static void ni_dump_regs(struct comedi_device *dev)
 {
+        struct a2150_private *devpriv = dev->private;
+
         printk("config bits 0x%x\n", devpriv->config_bits);
         printk("irq dma bits 0x%x\n", devpriv->irq_dma_bits);
         printk("status bits 0x%x\n", inw(dev->iobase + STATUS_REG));
@@ -196,6 +196,7 @@ static irqreturn_t a2150_interrupt(int irq, void *d)
         int status;
         unsigned long flags;
         struct comedi_device *dev = d;
+        struct a2150_private *devpriv = dev->private;
         struct comedi_subdevice *s = dev->read_subdev;
         struct comedi_async *async;
         struct comedi_cmd *cmd;
@@ -300,6 +301,8 @@ static irqreturn_t a2150_interrupt(int irq, void *d)
 
 static int a2150_cancel(struct comedi_device *dev, struct comedi_subdevice *s)
 {
+        struct a2150_private *devpriv = dev->private;
+
         /*  disable dma on card */
         devpriv->irq_dma_bits &= ~DMA_INTR_EN_BIT & ~DMA_EN_BIT;
         outw(devpriv->irq_dma_bits, dev->iobase + IRQ_DMA_CNTRL_REG);
@@ -342,37 +345,21 @@ static int a2150_ai_cmdtest(struct comedi_device *dev,
         if (err)
                 return 2;
 
-        /* step 3: make sure arguments are trivially compatible */
+        /* Step 3: check if arguments are trivially valid */
 
-        if (cmd->start_arg != 0) {
-                cmd->start_arg = 0;
-                err++;
-        }
-        if (cmd->convert_src == TRIG_TIMER) {
-                if (cmd->convert_arg < thisboard->ai_speed) {
-                        cmd->convert_arg = thisboard->ai_speed;
-                        err++;
-                }
-        }
-        if (!cmd->chanlist_len) {
-                cmd->chanlist_len = 1;
-                err++;
-        }
-        if (cmd->scan_end_arg != cmd->chanlist_len) {
-                cmd->scan_end_arg = cmd->chanlist_len;
-                err++;
-        }
-        if (cmd->stop_src == TRIG_COUNT) {
-                if (!cmd->stop_arg) {
-                        cmd->stop_arg = 1;
-                        err++;
-                }
-        } else {                /* TRIG_NONE */
-                if (cmd->stop_arg != 0) {
-                        cmd->stop_arg = 0;
-                        err++;
-                }
-        }
+        err |= cfc_check_trigger_arg_is(&cmd->start_arg, 0);
+
+        if (cmd->convert_src == TRIG_TIMER)
+                err |= cfc_check_trigger_arg_min(&cmd->convert_arg,
+                                                 thisboard->ai_speed);
+
+        err |= cfc_check_trigger_arg_min(&cmd->chanlist_len, 1);
+        err |= cfc_check_trigger_arg_is(&cmd->scan_end_arg, cmd->chanlist_len);
+
+        if (cmd->stop_src == TRIG_COUNT)
+                err |= cfc_check_trigger_arg_min(&cmd->stop_arg, 1);
+        else    /* TRIG_NONE */
+                err |= cfc_check_trigger_arg_is(&cmd->stop_arg, 0);
 
         if (err)
                 return 3;
@@ -425,6 +412,7 @@ static int a2150_ai_cmdtest(struct comedi_device *dev,
 
 static int a2150_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
 {
+        struct a2150_private *devpriv = dev->private;
         struct comedi_async *async = s->async;
         struct comedi_cmd *cmd = &async->cmd;
         unsigned long lock_flags;
@@ -536,6 +524,7 @@ static int a2150_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
 static int a2150_ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s,
                           struct comedi_insn *insn, unsigned int *data)
 {
+        struct a2150_private *devpriv = dev->private;
         unsigned int i, n;
         static const int timeout = 100000;
         static const int filter_delay = 36;
@@ -615,6 +604,7 @@ static int a2150_ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s,
 static int a2150_get_timing(struct comedi_device *dev, unsigned int *period,
                             int flags)
 {
+        struct a2150_private *devpriv = dev->private;
         int lub, glb, temp;
         int lub_divisor_shift, lub_index, glb_divisor_shift, glb_index;
         int i, j;
@@ -689,6 +679,8 @@ static int a2150_set_chanlist(struct comedi_device *dev,
                               unsigned int start_channel,
                               unsigned int num_channels)
 {
+        struct a2150_private *devpriv = dev->private;
+
         if (start_channel + num_channels > 4)
                 return -1;
 
@@ -727,6 +719,7 @@ static int a2150_probe(struct comedi_device *dev)
 
 static int a2150_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 {
+        struct a2150_private *devpriv;
         struct comedi_subdevice *s;
         unsigned long iobase = it->options[0];
         unsigned int irq = it->options[1];
@@ -749,9 +742,10 @@ static int a2150_attach(struct comedi_device *dev, struct comedi_devconfig *it)
         }
         printk("\n");
 
-        /* allocate and initialize dev->private */
-        if (alloc_private(dev, sizeof(struct a2150_private)) < 0)
+        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
+        if (!devpriv)
                 return -ENOMEM;
+        dev->private = devpriv;
 
         if (iobase == 0) {
                 printk(" io base address required\n");
@@ -855,6 +849,8 @@ static int a2150_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 
 static void a2150_detach(struct comedi_device *dev)
 {
+        struct a2150_private *devpriv = dev->private;
+
         if (dev->iobase) {
                 outw(APD_BIT | DPD_BIT, dev->iobase + CONFIG_REG);
                 release_region(dev->iobase, A2150_SIZE);
diff --git a/drivers/staging/comedi/drivers/ni_at_ao.c b/drivers/staging/comedi/drivers/ni_at_ao.c
index 93938cec93e7..907f65cdbdc0 100644
--- a/drivers/staging/comedi/drivers/ni_at_ao.c
+++ b/drivers/staging/comedi/drivers/ni_at_ao.c
@@ -167,10 +167,10 @@ struct atao_private {
         unsigned int ao_readback[10];
 };
 
-#define devpriv ((struct atao_private *)dev->private)
-
 static void atao_reset(struct comedi_device *dev)
 {
+        struct atao_private *devpriv = dev->private;
+
         /* This is the reset sequence described in the manual */
 
         devpriv->cfg1 = 0;
@@ -202,6 +202,7 @@ static void atao_reset(struct comedi_device *dev)
 static int atao_ao_winsn(struct comedi_device *dev, struct comedi_subdevice *s,
                          struct comedi_insn *insn, unsigned int *data)
 {
+        struct atao_private *devpriv = dev->private;
         int i;
         int chan = CR_CHAN(insn->chanspec);
         short bits;
@@ -226,6 +227,7 @@ static int atao_ao_winsn(struct comedi_device *dev, struct comedi_subdevice *s,
 static int atao_ao_rinsn(struct comedi_device *dev, struct comedi_subdevice *s,
                          struct comedi_insn *insn, unsigned int *data)
 {
+        struct atao_private *devpriv = dev->private;
         int i;
         int chan = CR_CHAN(insn->chanspec);
 
@@ -254,6 +256,7 @@ static int atao_dio_insn_config(struct comedi_device *dev,
                                 struct comedi_subdevice *s,
                                 struct comedi_insn *insn, unsigned int *data)
 {
+        struct atao_private *devpriv = dev->private;
         int chan = CR_CHAN(insn->chanspec);
         unsigned int mask, bit;
 
@@ -309,6 +312,7 @@ static int atao_calib_insn_write(struct comedi_device *dev,
                                  struct comedi_subdevice *s,
                                  struct comedi_insn *insn, unsigned int *data)
 {
+        struct atao_private *devpriv = dev->private;
         unsigned int bitstring, bit;
         unsigned int chan = CR_CHAN(insn->chanspec);
 
@@ -331,6 +335,7 @@ static int atao_calib_insn_write(struct comedi_device *dev,
 static int atao_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 {
         const struct atao_board *board = comedi_board(dev);
+        struct atao_private *devpriv;
         struct comedi_subdevice *s;
         unsigned long iobase;
         int ao_unipolar;
@@ -351,8 +356,10 @@ static int atao_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 
         dev->board_name = board->name;
 
-        if (alloc_private(dev, sizeof(struct atao_private)) < 0)
+        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
+        if (!devpriv)
                 return -ENOMEM;
+        dev->private = devpriv;
 
         ret = comedi_alloc_subdevices(dev, 4);
         if (ret)
diff --git a/drivers/staging/comedi/drivers/ni_atmio.c b/drivers/staging/comedi/drivers/ni_atmio.c
index cac25572f6bb..2cc29965e157 100644
--- a/drivers/staging/comedi/drivers/ni_atmio.c
+++ b/drivers/staging/comedi/drivers/ni_atmio.c
@@ -284,8 +284,6 @@ struct ni_private {
 
 };
 
-#define devpriv ((struct ni_private *)dev->private)
-
 /* How we access registers */
 
 #define ni_writel(a, b)         (outl((a), (b)+dev->iobase))
@@ -303,6 +301,7 @@ struct ni_private {
 
 static void ni_atmio_win_out(struct comedi_device *dev, uint16_t data, int addr)
 {
+        struct ni_private *devpriv = dev->private;
         unsigned long flags;
 
         spin_lock_irqsave(&devpriv->window_lock, flags);
@@ -317,6 +316,7 @@ static void ni_atmio_win_out(struct comedi_device *dev, uint16_t data, int addr)
 
 static uint16_t ni_atmio_win_in(struct comedi_device *dev, int addr)
 {
+        struct ni_private *devpriv = dev->private;
         unsigned long flags;
         uint16_t ret;
 
@@ -406,16 +406,17 @@ static int ni_getboardtype(struct comedi_device *dev)
 static int ni_atmio_attach(struct comedi_device *dev,
                            struct comedi_devconfig *it)
 {
+        struct ni_private *devpriv;
         struct pnp_dev *isapnp_dev;
         int ret;
         unsigned long iobase;
         int board;
         unsigned int irq;
 
-        /* allocate private area */
         ret = ni_alloc_private(dev);
-        if (ret < 0)
+        if (ret)
                 return ret;
+        devpriv = dev->private;
 
         devpriv->stc_writew = &ni_atmio_win_out;
         devpriv->stc_readw = &ni_atmio_win_in;
@@ -499,6 +500,8 @@ static int ni_atmio_attach(struct comedi_device *dev,
 
 static void ni_atmio_detach(struct comedi_device *dev)
 {
+        struct ni_private *devpriv = dev->private;
+
         mio_common_detach(dev);
         if (dev->iobase)
                 release_region(dev->iobase, NI_SIZE);
diff --git a/drivers/staging/comedi/drivers/ni_atmio16d.c b/drivers/staging/comedi/drivers/ni_atmio16d.c
index e91a620f9db3..4a17494f55ed 100644
--- a/drivers/staging/comedi/drivers/ni_atmio16d.c
+++ b/drivers/staging/comedi/drivers/ni_atmio16d.c
@@ -102,7 +102,6 @@ Devices: [National Instruments] AT-MIO-16 (atmio16), AT-MIO-16D (atmio16d)
 #define CLOCK_100_HZ    0x8F25
 /* Other miscellaneous defines */
 #define ATMIO16D_SIZE   32      /* bus address range */
-#define devpriv ((struct atmio16d_private *)dev->private)
 #define ATMIO16D_TIMEOUT 10
 
 struct atmio16_board_t {
@@ -202,6 +201,7 @@ static void reset_counters(struct comedi_device *dev)
 
 static void reset_atmio16d(struct comedi_device *dev)
 {
+        struct atmio16d_private *devpriv = dev->private;
         int i;
 
         /* now we need to initialize the board */
@@ -271,51 +271,32 @@ static int atmio16d_ai_cmdtest(struct comedi_device *dev,
         if (err)
                 return 2;
 
-        /* step 3: make sure arguments are trivially compatible */
+        /* Step 3: check if arguments are trivially valid */
+
+        err |= cfc_check_trigger_arg_is(&cmd->start_arg, 0);
 
-        if (cmd->start_arg != 0) {
-                cmd->start_arg = 0;
-                err++;
-        }
         if (cmd->scan_begin_src == TRIG_FOLLOW) {
                 /* internal trigger */
-                if (cmd->scan_begin_arg != 0) {
-                        cmd->scan_begin_arg = 0;
-                        err++;
-                }
+                err |= cfc_check_trigger_arg_is(&cmd->scan_begin_arg, 0);
         } else {
 #if 0
                 /* external trigger */
                 /* should be level/edge, hi/lo specification here */
-                if (cmd->scan_begin_arg != 0) {
-                        cmd->scan_begin_arg = 0;
-                        err++;
-                }
+                err |= cfc_check_trigger_arg_is(&cmd->scan_begin_arg, 0);
 #endif
         }
 
-        if (cmd->convert_arg < 10000) {
-                cmd->convert_arg = 10000;
-                err++;
-        }
+        err |= cfc_check_trigger_arg_min(&cmd->convert_arg, 10000);
 #if 0
-        if (cmd->convert_arg > SLOWEST_TIMER) {
-                cmd->convert_arg = SLOWEST_TIMER;
-                err++;
-        }
+        err |= cfc_check_trigger_arg_max(&cmd->convert_arg, SLOWEST_TIMER);
 #endif
-        if (cmd->scan_end_arg != cmd->chanlist_len) {
-                cmd->scan_end_arg = cmd->chanlist_len;
-                err++;
-        }
+
+        err |= cfc_check_trigger_arg_is(&cmd->scan_end_arg, cmd->chanlist_len);
+
         if (cmd->stop_src == TRIG_COUNT) {
                 /* any count is allowed */
-        } else {
-                /* TRIG_NONE */
-                if (cmd->stop_arg != 0) {
-                        cmd->stop_arg = 0;
-                        err++;
-                }
+        } else {        /* TRIG_NONE */
+                err |= cfc_check_trigger_arg_is(&cmd->stop_arg, 0);
         }
 
         if (err)
@@ -327,6 +308,7 @@ static int atmio16d_ai_cmdtest(struct comedi_device *dev,
 static int atmio16d_ai_cmd(struct comedi_device *dev,
                            struct comedi_subdevice *s)
 {
+        struct atmio16d_private *devpriv = dev->private;
         struct comedi_cmd *cmd = &s->async->cmd;
         unsigned int timer, base_clock;
         unsigned int sample_count, tmp, chan, gain;
@@ -486,6 +468,7 @@ static int atmio16d_ai_insn_read(struct comedi_device *dev,
                                  struct comedi_subdevice *s,
                                  struct comedi_insn *insn, unsigned int *data)
 {
+        struct atmio16d_private *devpriv = dev->private;
         int i, t;
         int chan;
         int gain;
@@ -539,6 +522,7 @@ static int atmio16d_ao_insn_read(struct comedi_device *dev,
                                  struct comedi_subdevice *s,
                                  struct comedi_insn *insn, unsigned int *data)
 {
+        struct atmio16d_private *devpriv = dev->private;
         int i;
 
         for (i = 0; i < insn->n; i++)
@@ -550,6 +534,7 @@ static int atmio16d_ao_insn_write(struct comedi_device *dev,
                                   struct comedi_subdevice *s,
                                   struct comedi_insn *insn, unsigned int *data)
 {
+        struct atmio16d_private *devpriv = dev->private;
         int i;
         int chan;
         int d;
@@ -596,6 +581,7 @@ static int atmio16d_dio_insn_config(struct comedi_device *dev,
                                     struct comedi_insn *insn,
                                     unsigned int *data)
 {
+        struct atmio16d_private *devpriv = dev->private;
         int i;
         int mask;
 
@@ -651,6 +637,7 @@ static int atmio16d_attach(struct comedi_device *dev,
                            struct comedi_devconfig *it)
 {
         const struct atmio16_board_t *board = comedi_board(dev);
+        struct atmio16d_private *devpriv;
         unsigned int irq;
         unsigned long iobase;
         int ret;
@@ -672,9 +659,10 @@ static int atmio16d_attach(struct comedi_device *dev,
         if (ret)
                 return ret;
 
-        ret = alloc_private(dev, sizeof(struct atmio16d_private));
-        if (ret < 0)
-                return ret;
+        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
+        if (!devpriv)
+                return -ENOMEM;
+        dev->private = devpriv;
 
         /* reset the atmio16d hardware */
         reset_atmio16d(dev);
diff --git a/drivers/staging/comedi/drivers/ni_daq_dio24.c b/drivers/staging/comedi/drivers/ni_daq_dio24.c
index 0ca222bbcbe6..7b333353c5d9 100644
--- a/drivers/staging/comedi/drivers/ni_daq_dio24.c
+++ b/drivers/staging/comedi/drivers/ni_daq_dio24.c
@@ -96,8 +96,6 @@ struct dio24_private {
         int data;               /* number of data points left to be taken */
 };
 
-#define devpriv ((struct dio24_private *)dev->private)
-
 static struct comedi_driver driver_dio24 = {
         .driver_name = "ni_daq_dio24",
         .module = THIS_MODULE,
@@ -110,6 +108,7 @@ static struct comedi_driver driver_dio24 = {
 
 static int dio24_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 {
+        struct dio24_private *devpriv;
         struct comedi_subdevice *s;
         unsigned long iobase = 0;
 #ifdef incomplete
@@ -118,9 +117,10 @@ static int dio24_attach(struct comedi_device *dev, struct comedi_devconfig *it)
         struct pcmcia_device *link;
         int ret;
 
-        /* allocate and initialize dev->private */
-        if (alloc_private(dev, sizeof(struct dio24_private)) < 0)
+        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
+        if (!devpriv)
                 return -ENOMEM;
+        dev->private = devpriv;
 
         /*  get base address, irq etc. based on bustype */
         switch (thisboard->bustype) {
@@ -202,7 +202,7 @@ static int dio24_cs_attach(struct pcmcia_device *link)
 {
         struct local_info_t *local;
 
-        printk(KERN_INFO "ni_daq_dio24: HOLA SOY YO - CS-attach!\n");
+        dev_info(&link->dev, "ni_daq_dio24: HOLA SOY YO - CS-attach!\n");
 
         dev_dbg(&link->dev, "dio24_cs_attach()\n");
 
@@ -242,7 +242,7 @@ static void dio24_config(struct pcmcia_device *link)
 {
         int ret;
 
-        printk(KERN_INFO "ni_daq_dio24: HOLA SOY YO! - config\n");
+        dev_info(&link->dev, "ni_daq_dio24: HOLA SOY YO! - config\n");
 
         dev_dbg(&link->dev, "dio24_config\n");
 
@@ -265,7 +265,7 @@ static void dio24_config(struct pcmcia_device *link)
         return;
 
 failed:
-        printk(KERN_INFO "Fallo");
+        dev_info(&link->dev, "Fallo");
         dio24_release(link);
 
 }                               /* dio24_config */
diff --git a/drivers/staging/comedi/drivers/ni_labpc.c b/drivers/staging/comedi/drivers/ni_labpc.c
index b5a19a0863fb..d29c4d761bac 100644
--- a/drivers/staging/comedi/drivers/ni_labpc.c
+++ b/drivers/staging/comedi/drivers/ni_labpc.c
@@ -487,8 +487,6 @@ static const int dma_buffer_size = 0xff00;
 /* 2 bytes per sample */
 static const int sample_size = 2;
 
-#define devpriv ((struct labpc_private *)dev->private)
-
 static inline int labpc_counter_load(struct comedi_device *dev,
                                      unsigned long base_address,
                                      unsigned int counter_number,
@@ -504,6 +502,7 @@ static inline int labpc_counter_load(struct comedi_device *dev,
 int labpc_common_attach(struct comedi_device *dev, unsigned long iobase,
                         unsigned int irq, unsigned int dma_chan)
 {
+        struct labpc_private *devpriv = dev->private;
         struct comedi_subdevice *s;
         int i;
         unsigned long isr_flags;
@@ -697,18 +696,23 @@ labpc_pci_find_boardinfo(struct pci_dev *pcidev)
         return NULL;
 }
 
-static int __devinit labpc_attach_pci(struct comedi_device *dev,
-                                      struct pci_dev *pcidev)
+static int labpc_auto_attach(struct comedi_device *dev,
+                                       unsigned long context_unused)
 {
+        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
+        struct labpc_private *devpriv;
         unsigned long iobase;
         unsigned int irq;
         int ret;
 
         if (!IS_ENABLED(CONFIG_COMEDI_PCI_DRIVERS))
                 return -ENODEV;
-        ret = alloc_private(dev, sizeof(struct labpc_private));
-        if (ret < 0)
-                return ret;
+
+        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
+        if (!devpriv)
+                return -ENOMEM;
+        dev->private = devpriv;
+
         dev->board_ptr = labpc_pci_find_boardinfo(pcidev);
         if (!dev->board_ptr)
                 return -ENODEV;
@@ -725,13 +729,15 @@ static int __devinit labpc_attach_pci(struct comedi_device *dev,
 
 static int labpc_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 {
+        struct labpc_private *devpriv;
         unsigned long iobase = 0;
         unsigned int irq = 0;
         unsigned int dma_chan = 0;
 
-        /* allocate and initialize dev->private */
-        if (alloc_private(dev, sizeof(struct labpc_private)) < 0)
+        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
+        if (!devpriv)
                 return -ENOMEM;
+        dev->private = devpriv;
 
         /* get base address, irq etc. based on bustype */
         switch (thisboard->bustype) {
@@ -770,6 +776,7 @@ static int labpc_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 
 void labpc_common_detach(struct comedi_device *dev)
 {
+        struct labpc_private *devpriv = dev->private;
         struct comedi_subdevice *s;
 
         if (!thisboard)
@@ -799,6 +806,8 @@ EXPORT_SYMBOL_GPL(labpc_common_detach);
 
 static void labpc_clear_adc_fifo(const struct comedi_device *dev)
 {
+        struct labpc_private *devpriv = dev->private;
+
         devpriv->write_byte(0x1, dev->iobase + ADC_CLEAR_REG);
         devpriv->read_byte(dev->iobase + ADC_FIFO_REG);
         devpriv->read_byte(dev->iobase + ADC_FIFO_REG);
@@ -806,6 +815,7 @@ static void labpc_clear_adc_fifo(const struct comedi_device *dev)
 
 static int labpc_cancel(struct comedi_device *dev, struct comedi_subdevice *s)
 {
+        struct labpc_private *devpriv = dev->private;
         unsigned long flags;
 
         spin_lock_irqsave(&dev->spinlock, flags);
@@ -1016,56 +1026,34 @@ static int labpc_ai_cmdtest(struct comedi_device *dev,
         if (err)
                 return 2;
 
-        /* step 3: make sure arguments are trivially compatible */
+        /* Step 3: check if arguments are trivially valid */
 
-        if (cmd->start_arg == TRIG_NOW && cmd->start_arg != 0) {
-                cmd->start_arg = 0;
-                err++;
-        }
+        if (cmd->start_arg == TRIG_NOW)
+                err |= cfc_check_trigger_arg_is(&cmd->start_arg, 0);
 
         if (!cmd->chanlist_len)
-                err++;
+                err |= -EINVAL;
+        err |= cfc_check_trigger_arg_is(&cmd->scan_end_arg, cmd->chanlist_len);
 
-        if (cmd->scan_end_arg != cmd->chanlist_len) {
-                cmd->scan_end_arg = cmd->chanlist_len;
-                err++;
-        }
+        if (cmd->convert_src == TRIG_TIMER)
+                err |= cfc_check_trigger_arg_min(&cmd->convert_arg,
+                                                 thisboard->ai_speed);
 
-        if (cmd->convert_src == TRIG_TIMER) {
-                if (cmd->convert_arg < thisboard->ai_speed) {
-                        cmd->convert_arg = thisboard->ai_speed;
-                        err++;
-                }
-        }
         /* make sure scan timing is not too fast */
         if (cmd->scan_begin_src == TRIG_TIMER) {
-                if (cmd->convert_src == TRIG_TIMER &&
-                    cmd->scan_begin_arg <
-                    cmd->convert_arg * cmd->chanlist_len) {
-                        cmd->scan_begin_arg =
-                            cmd->convert_arg * cmd->chanlist_len;
-                        err++;
-                }
-                if (cmd->scan_begin_arg <
-                    thisboard->ai_speed * cmd->chanlist_len) {
-                        cmd->scan_begin_arg =
-                            thisboard->ai_speed * cmd->chanlist_len;
-                        err++;
-                }
+                if (cmd->convert_src == TRIG_TIMER)
+                        err |= cfc_check_trigger_arg_min(&cmd->scan_begin_arg,
+                                        cmd->convert_arg * cmd->chanlist_len);
+                err |= cfc_check_trigger_arg_min(&cmd->scan_begin_arg,
+                                thisboard->ai_speed * cmd->chanlist_len);
         }
-        /* stop source */
+
         switch (cmd->stop_src) {
         case TRIG_COUNT:
-                if (!cmd->stop_arg) {
-                        cmd->stop_arg = 1;
-                        err++;
-                }
+                err |= cfc_check_trigger_arg_min(&cmd->stop_arg, 1);
                 break;
         case TRIG_NONE:
-                if (cmd->stop_arg != 0) {
-                        cmd->stop_arg = 0;
-                        err++;
-                }
+                err |= cfc_check_trigger_arg_is(&cmd->stop_arg, 0);
                 break;
                 /*
                  * TRIG_EXT doesn't care since it doesn't
@@ -1098,6 +1086,7 @@ static int labpc_ai_cmdtest(struct comedi_device *dev,
 
 static int labpc_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
 {
+        struct labpc_private *devpriv = dev->private;
         int channel, range, aref;
 #ifdef CONFIG_ISA_DMA_API
         unsigned long irq_flags;
@@ -1365,6 +1354,7 @@ static int labpc_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
 static irqreturn_t labpc_interrupt(int irq, void *d)
 {
         struct comedi_device *dev = d;
+        struct labpc_private *devpriv = dev->private;
         struct comedi_subdevice *s = dev->read_subdev;
         struct comedi_async *async;
         struct comedi_cmd *cmd;
@@ -1453,6 +1443,7 @@ static irqreturn_t labpc_interrupt(int irq, void *d)
 /* read all available samples from ai fifo */
 static int labpc_drain_fifo(struct comedi_device *dev)
 {
+        struct labpc_private *devpriv = dev->private;
         unsigned int lsb, msb;
         short data;
         struct comedi_async *async = dev->read_subdev->async;
@@ -1488,6 +1479,7 @@ static int labpc_drain_fifo(struct comedi_device *dev)
 #ifdef CONFIG_ISA_DMA_API
 static void labpc_drain_dma(struct comedi_device *dev)
 {
+        struct labpc_private *devpriv = dev->private;
         struct comedi_subdevice *s = dev->read_subdev;
         struct comedi_async *async = s->async;
         int status;
@@ -1541,6 +1533,8 @@ static void labpc_drain_dma(struct comedi_device *dev)
 
 static void handle_isa_dma(struct comedi_device *dev)
 {
+        struct labpc_private *devpriv = dev->private;
+
         labpc_drain_dma(dev);
 
         enable_dma(devpriv->dma_chan);
@@ -1555,6 +1549,8 @@ static void handle_isa_dma(struct comedi_device *dev)
 static void labpc_drain_dregs(struct comedi_device *dev)
 {
 #ifdef CONFIG_ISA_DMA_API
+        struct labpc_private *devpriv = dev->private;
+
         if (devpriv->current_transfer == isa_dma_transfer)
                 labpc_drain_dma(dev);
 #endif
@@ -1565,6 +1561,7 @@ static void labpc_drain_dregs(struct comedi_device *dev)
 static int labpc_ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s,
                           struct comedi_insn *insn, unsigned int *data)
 {
+        struct labpc_private *devpriv = dev->private;
         int i, n;
         int chan, range;
         int lsb, msb;
@@ -1654,6 +1651,7 @@ static int labpc_ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s,
 static int labpc_ao_winsn(struct comedi_device *dev, struct comedi_subdevice *s,
                           struct comedi_insn *insn, unsigned int *data)
 {
+        struct labpc_private *devpriv = dev->private;
         int channel, range;
         unsigned long flags;
         int lsb, msb;
@@ -1695,6 +1693,8 @@ static int labpc_ao_winsn(struct comedi_device *dev, struct comedi_subdevice *s,
 static int labpc_ao_rinsn(struct comedi_device *dev, struct comedi_subdevice *s,
                           struct comedi_insn *insn, unsigned int *data)
 {
+        struct labpc_private *devpriv = dev->private;
+
         data[0] = devpriv->ao_value[CR_CHAN(insn->chanspec)];
 
         return 1;
@@ -1704,6 +1704,8 @@ static int labpc_calib_read_insn(struct comedi_device *dev,
                                  struct comedi_subdevice *s,
                                  struct comedi_insn *insn, unsigned int *data)
 {
+        struct labpc_private *devpriv = dev->private;
+
         data[0] = devpriv->caldac[CR_CHAN(insn->chanspec)];
 
         return 1;
@@ -1723,6 +1725,8 @@ static int labpc_eeprom_read_insn(struct comedi_device *dev,
                                   struct comedi_subdevice *s,
                                   struct comedi_insn *insn, unsigned int *data)
 {
+        struct labpc_private *devpriv = dev->private;
+
         data[0] = devpriv->eeprom_data[CR_CHAN(insn->chanspec)];
 
         return 1;
@@ -1779,6 +1783,7 @@ static unsigned int labpc_suggest_transfer_size(const struct comedi_cmd *cmd)
 static void labpc_adc_timing(struct comedi_device *dev, struct comedi_cmd *cmd,
                              enum scan_mode mode)
 {
+        struct labpc_private *devpriv = dev->private;
         /* max value for 16 bit counter in mode 2 */
         const int max_counter_value = 0x10000;
         /* min value for 16 bit counter in mode 2 */
@@ -1885,6 +1890,7 @@ static int labpc_dio_mem_callback(int dir, int port, int data,
 static void labpc_serial_out(struct comedi_device *dev, unsigned int value,
                              unsigned int value_width)
 {
+        struct labpc_private *devpriv = dev->private;
         int i;
 
         for (i = 1; i <= value_width; i++) {
@@ -1909,6 +1915,7 @@ static void labpc_serial_out(struct comedi_device *dev, unsigned int value,
 /* lowlevel read from eeprom */
 static unsigned int labpc_serial_in(struct comedi_device *dev)
 {
+        struct labpc_private *devpriv = dev->private;
         unsigned int value = 0;
         int i;
         const int value_width = 8;      /*  number of bits wide values are */
@@ -1938,6 +1945,7 @@ static unsigned int labpc_serial_in(struct comedi_device *dev)
 static unsigned int labpc_eeprom_read(struct comedi_device *dev,
                                       unsigned int address)
 {
+        struct labpc_private *devpriv = dev->private;
         unsigned int value;
         /*  bits to tell eeprom to expect a read */
         const int read_instruction = 0x3;
@@ -1970,6 +1978,7 @@ static unsigned int labpc_eeprom_read(struct comedi_device *dev,
 static int labpc_eeprom_write(struct comedi_device *dev,
                                 unsigned int address, unsigned int value)
 {
+        struct labpc_private *devpriv = dev->private;
         const int write_enable_instruction = 0x6;
         const int write_instruction = 0x2;
         const int write_length = 8;     /*  8 bit write lengths to eeprom */
@@ -2027,6 +2036,7 @@ static int labpc_eeprom_write(struct comedi_device *dev,
 
 static unsigned int labpc_eeprom_read_status(struct comedi_device *dev)
 {
+        struct labpc_private *devpriv = dev->private;
         unsigned int value;
         const int read_status_instruction = 0x5;
         const int write_length = 8;     /*  8 bit write lengths to eeprom */
@@ -2056,6 +2066,8 @@ static unsigned int labpc_eeprom_read_status(struct comedi_device *dev)
 static void write_caldac(struct comedi_device *dev, unsigned int channel,
                          unsigned int value)
 {
+        struct labpc_private *devpriv = dev->private;
+
         if (value == devpriv->caldac[channel])
                 return;
         devpriv->caldac[channel] = value;
@@ -2084,7 +2096,7 @@ static struct comedi_driver labpc_driver = {
         .driver_name = DRV_NAME,
         .module = THIS_MODULE,
         .attach = labpc_attach,
-        .attach_pci = labpc_attach_pci,
+        .auto_attach = labpc_auto_attach,
         .detach = labpc_common_detach,
         .num_names = ARRAY_SIZE(labpc_boards),
         .board_name = &labpc_boards[0].name,
@@ -2098,13 +2110,13 @@ static DEFINE_PCI_DEVICE_TABLE(labpc_pci_table) = {
 };
 MODULE_DEVICE_TABLE(pci, labpc_pci_table);
 
-static int __devinit labpc_pci_probe(struct pci_dev *dev,
+static int labpc_pci_probe(struct pci_dev *dev,
                                      const struct pci_device_id *ent)
 {
         return comedi_pci_auto_config(dev, &labpc_driver);
 }
 
-static void __devexit labpc_pci_remove(struct pci_dev *dev)
+static void labpc_pci_remove(struct pci_dev *dev)
 {
         comedi_pci_auto_unconfig(dev);
 }
@@ -2113,7 +2125,7 @@ static struct pci_driver labpc_pci_driver = {
         .name = DRV_NAME,
         .id_table = labpc_pci_table,
         .probe = labpc_pci_probe,
-        .remove = __devexit_p(labpc_pci_remove)
+        .remove = labpc_pci_remove
 };
 module_comedi_pci_driver(labpc_driver, labpc_pci_driver);
 #else
diff --git a/drivers/staging/comedi/drivers/ni_labpc_cs.c b/drivers/staging/comedi/drivers/ni_labpc_cs.c
index eb0417eb6d7d..bfe19fa7d66f 100644
--- a/drivers/staging/comedi/drivers/ni_labpc_cs.c
+++ b/drivers/staging/comedi/drivers/ni_labpc_cs.c
@@ -127,13 +127,15 @@ static struct comedi_driver driver_labpc_cs = {
 
 static int labpc_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 {
+        struct labpc_private *devpriv;
         unsigned long iobase = 0;
         unsigned int irq = 0;
         struct pcmcia_device *link;
 
-        /* allocate and initialize dev->private */
-        if (alloc_private(dev, sizeof(struct labpc_private)) < 0)
+        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
+        if (!devpriv)
                 return -ENOMEM;
+        dev->private = devpriv;
 
         /*  get base address, irq etc. based on bustype */
         switch (thisboard->bustype) {
diff --git a/drivers/staging/comedi/drivers/ni_mio_common.c b/drivers/staging/comedi/drivers/ni_mio_common.c
index 3e5fdae93163..56dc59908d36 100644
--- a/drivers/staging/comedi/drivers/ni_mio_common.c
+++ b/drivers/staging/comedi/drivers/ni_mio_common.c
@@ -410,6 +410,7 @@ static void get_last_sample_6143(struct comedi_device *dev);
 static inline void ni_set_bitfield(struct comedi_device *dev, int reg,
                                    unsigned bit_mask, unsigned bit_values)
 {
+        struct ni_private *devpriv = dev->private;
         unsigned long flags;
 
         spin_lock_irqsave(&devpriv->soft_reg_copy_lock, flags);
@@ -506,6 +507,7 @@ static inline void ni_set_gpct_dma_channel(struct comedi_device *dev,
 static inline void ni_set_cdo_dma_channel(struct comedi_device *dev,
                                           int mite_channel)
 {
+        struct ni_private *devpriv = dev->private;
         unsigned long flags;
 
         spin_lock_irqsave(&devpriv->soft_reg_copy_lock, flags);
@@ -525,6 +527,7 @@ static inline void ni_set_cdo_dma_channel(struct comedi_device *dev,
 
 static int ni_request_ai_mite_channel(struct comedi_device *dev)
 {
+        struct ni_private *devpriv = dev->private;
         unsigned long flags;
 
         spin_lock_irqsave(&devpriv->mite_channel_lock, flags);
@@ -545,6 +548,7 @@ static int ni_request_ai_mite_channel(struct comedi_device *dev)
 
 static int ni_request_ao_mite_channel(struct comedi_device *dev)
 {
+        struct ni_private *devpriv = dev->private;
         unsigned long flags;
 
         spin_lock_irqsave(&devpriv->mite_channel_lock, flags);
@@ -567,6 +571,7 @@ static int ni_request_gpct_mite_channel(struct comedi_device *dev,
                                         unsigned gpct_index,
                                         enum comedi_io_direction direction)
 {
+        struct ni_private *devpriv = dev->private;
         unsigned long flags;
         struct mite_channel *mite_chan;
 
@@ -595,6 +600,7 @@ static int ni_request_gpct_mite_channel(struct comedi_device *dev,
 static int ni_request_cdo_mite_channel(struct comedi_device *dev)
 {
 #ifdef PCIDMA
+        struct ni_private *devpriv = dev->private;
         unsigned long flags;
 
         spin_lock_irqsave(&devpriv->mite_channel_lock, flags);
@@ -617,6 +623,7 @@ static int ni_request_cdo_mite_channel(struct comedi_device *dev)
 static void ni_release_ai_mite_channel(struct comedi_device *dev)
 {
 #ifdef PCIDMA
+        struct ni_private *devpriv = dev->private;
         unsigned long flags;
 
         spin_lock_irqsave(&devpriv->mite_channel_lock, flags);
@@ -632,6 +639,7 @@ static void ni_release_ai_mite_channel(struct comedi_device *dev)
 static void ni_release_ao_mite_channel(struct comedi_device *dev)
 {
 #ifdef PCIDMA
+        struct ni_private *devpriv = dev->private;
         unsigned long flags;
 
         spin_lock_irqsave(&devpriv->mite_channel_lock, flags);
@@ -648,6 +656,7 @@ static void ni_release_ao_mite_channel(struct comedi_device *dev)
 static void ni_release_gpct_mite_channel(struct comedi_device *dev,
                                          unsigned gpct_index)
 {
+        struct ni_private *devpriv = dev->private;
         unsigned long flags;
 
         BUG_ON(gpct_index >= NUM_GPCT);
@@ -669,6 +678,7 @@ static void ni_release_gpct_mite_channel(struct comedi_device *dev,
 static void ni_release_cdo_mite_channel(struct comedi_device *dev)
 {
 #ifdef PCIDMA
+        struct ni_private *devpriv = dev->private;
         unsigned long flags;
 
         spin_lock_irqsave(&devpriv->mite_channel_lock, flags);
@@ -686,6 +696,8 @@ static void ni_release_cdo_mite_channel(struct comedi_device *dev)
 static void ni_e_series_enable_second_irq(struct comedi_device *dev,
                                           unsigned gpct_index, short enable)
 {
+        struct ni_private *devpriv = dev->private;
+
         if (boardtype.reg_type & ni_reg_m_series_mask)
                 return;
         switch (gpct_index) {
@@ -716,6 +728,8 @@ static void ni_e_series_enable_second_irq(struct comedi_device *dev,
 
 static void ni_clear_ai_fifo(struct comedi_device *dev)
 {
+        struct ni_private *devpriv = dev->private;
+
         if (boardtype.reg_type == ni_reg_6143) {
                 /*  Flush the 6143 data FIFO */
                 ni_writel(0x10, AIFIFO_Control_6143);   /*  Flush fifo */
@@ -742,13 +756,17 @@ static void ni_clear_ai_fifo(struct comedi_device *dev)
 
 static void win_out2(struct comedi_device *dev, uint32_t data, int reg)
 {
+        struct ni_private *devpriv = dev->private;
+
         devpriv->stc_writew(dev, data >> 16, reg);
         devpriv->stc_writew(dev, data & 0xffff, reg + 1);
 }
 
 static uint32_t win_in2(struct comedi_device *dev, int reg)
 {
+        struct ni_private *devpriv = dev->private;
         uint32_t bits;
+
         bits = devpriv->stc_readw(dev, reg) << 16;
         bits |= devpriv->stc_readw(dev, reg + 1);
         return bits;
@@ -758,6 +776,7 @@ static uint32_t win_in2(struct comedi_device *dev, int reg)
 static inline void ni_ao_win_outw(struct comedi_device *dev, uint16_t data,
                                   int addr)
 {
+        struct ni_private *devpriv = dev->private;
         unsigned long flags;
 
         spin_lock_irqsave(&devpriv->window_lock, flags);
@@ -769,6 +788,7 @@ static inline void ni_ao_win_outw(struct comedi_device *dev, uint16_t data,
 static inline void ni_ao_win_outl(struct comedi_device *dev, uint32_t data,
                                   int addr)
 {
+        struct ni_private *devpriv = dev->private;
         unsigned long flags;
 
         spin_lock_irqsave(&devpriv->window_lock, flags);
@@ -779,6 +799,7 @@ static inline void ni_ao_win_outl(struct comedi_device *dev, uint32_t data,
 
 static inline unsigned short ni_ao_win_inw(struct comedi_device *dev, int addr)
 {
+        struct ni_private *devpriv = dev->private;
         unsigned long flags;
         unsigned short data;
 
@@ -814,6 +835,7 @@ static inline void ni_set_bits(struct comedi_device *dev, int reg,
 static irqreturn_t ni_E_interrupt(int irq, void *d)
 {
         struct comedi_device *dev = d;
+        struct ni_private *devpriv = dev->private;
         unsigned short a_status;
         unsigned short b_status;
         unsigned int ai_mite_status = 0;
@@ -872,6 +894,7 @@ static irqreturn_t ni_E_interrupt(int irq, void *d)
 #ifdef PCIDMA
 static void ni_sync_ai_dma(struct comedi_device *dev)
 {
+        struct ni_private *devpriv = dev->private;
         struct comedi_subdevice *s = &dev->subdevices[NI_AI_SUBDEV];
         unsigned long flags;
 
@@ -884,6 +907,7 @@ static void ni_sync_ai_dma(struct comedi_device *dev)
 static void mite_handle_b_linkc(struct mite_struct *mite,
                                 struct comedi_device *dev)
 {
+        struct ni_private *devpriv = dev->private;
         struct comedi_subdevice *s = &dev->subdevices[NI_AO_SUBDEV];
         unsigned long flags;
 
@@ -896,6 +920,7 @@ static void mite_handle_b_linkc(struct mite_struct *mite,
 
 static int ni_ao_wait_for_dma_load(struct comedi_device *dev)
 {
+        struct ni_private *devpriv = dev->private;
         static const int timeout = 10000;
         int i;
         for (i = 0; i < timeout; i++) {
@@ -918,6 +943,8 @@ static int ni_ao_wait_for_dma_load(struct comedi_device *dev)
 #endif /* PCIDMA */
 static void ni_handle_eos(struct comedi_device *dev, struct comedi_subdevice *s)
 {
+        struct ni_private *devpriv = dev->private;
+
         if (devpriv->aimode == AIMODE_SCAN) {
 #ifdef PCIDMA
                 static const int timeout = 10;
@@ -984,6 +1011,7 @@ static void handle_gpct_interrupt(struct comedi_device *dev,
                                   unsigned short counter_index)
 {
 #ifdef PCIDMA
+        struct ni_private *devpriv = dev->private;
         struct comedi_subdevice *s;
 
         s = &dev->subdevices[NI_GPCT_SUBDEV(counter_index)];
@@ -997,6 +1025,7 @@ static void handle_gpct_interrupt(struct comedi_device *dev,
 
 static void ack_a_interrupt(struct comedi_device *dev, unsigned short a_status)
 {
+        struct ni_private *devpriv = dev->private;
         unsigned short ack = 0;
 
         if (a_status & AI_SC_TC_St) {
@@ -1019,6 +1048,7 @@ static void ack_a_interrupt(struct comedi_device *dev, unsigned short a_status)
 static void handle_a_interrupt(struct comedi_device *dev, unsigned short status,
                                unsigned ai_mite_status)
 {
+        struct ni_private *devpriv = dev->private;
         struct comedi_subdevice *s = &dev->subdevices[NI_AI_SUBDEV];
 
         /* 67xx boards don't have ai subdevice, but their gpct0 might generate an a interrupt */
@@ -1122,7 +1152,9 @@ static void handle_a_interrupt(struct comedi_device *dev, unsigned short status,
 
 static void ack_b_interrupt(struct comedi_device *dev, unsigned short b_status)
 {
+        struct ni_private *devpriv = dev->private;
         unsigned short ack = 0;
+
         if (b_status & AO_BC_TC_St) {
                 ack |= AO_BC_TC_Interrupt_Ack;
         }
@@ -1151,8 +1183,10 @@ static void ack_b_interrupt(struct comedi_device *dev, unsigned short b_status)
 static void handle_b_interrupt(struct comedi_device *dev,
                                unsigned short b_status, unsigned ao_mite_status)
 {
+        struct ni_private *devpriv = dev->private;
         struct comedi_subdevice *s = &dev->subdevices[NI_AO_SUBDEV];
         /* unsigned short ack=0; */
+
 #ifdef DEBUG_INTERRUPT
         printk("ni_mio_common: interrupt: b_status=%04x m1_status=%08x\n",
                b_status, ao_mite_status);
@@ -1340,6 +1374,7 @@ static int ni_ao_fifo_half_empty(struct comedi_device *dev,
 static int ni_ao_prep_fifo(struct comedi_device *dev,
                            struct comedi_subdevice *s)
 {
+        struct ni_private *devpriv = dev->private;
         int n;
 
         /* reset fifo */
@@ -1364,6 +1399,7 @@ static int ni_ao_prep_fifo(struct comedi_device *dev,
 static void ni_ai_fifo_read(struct comedi_device *dev,
                             struct comedi_subdevice *s, int n)
 {
+        struct ni_private *devpriv = dev->private;
         struct comedi_async *async = s->async;
         int i;
 
@@ -1434,6 +1470,7 @@ static void ni_handle_fifo_half_full(struct comedi_device *dev)
 #ifdef PCIDMA
 static int ni_ai_drain_dma(struct comedi_device *dev)
 {
+        struct ni_private *devpriv = dev->private;
         int i;
         static const int timeout = 10000;
         unsigned long flags;
@@ -1471,6 +1508,7 @@ static int ni_ai_drain_dma(struct comedi_device *dev)
 */
 static void ni_handle_fifo_dregs(struct comedi_device *dev)
 {
+        struct ni_private *devpriv = dev->private;
         struct comedi_subdevice *s = &dev->subdevices[NI_AI_SUBDEV];
         short data[2];
         u32 dl;
@@ -1535,6 +1573,7 @@ static void ni_handle_fifo_dregs(struct comedi_device *dev)
 
 static void get_last_sample_611x(struct comedi_device *dev)
 {
+        struct ni_private *devpriv __maybe_unused = dev->private;
         struct comedi_subdevice *s = &dev->subdevices[NI_AI_SUBDEV];
         short data;
         u32 dl;
@@ -1552,6 +1591,7 @@ static void get_last_sample_611x(struct comedi_device *dev)
 
 static void get_last_sample_6143(struct comedi_device *dev)
 {
+        struct ni_private *devpriv __maybe_unused = dev->private;
         struct comedi_subdevice *s = &dev->subdevices[NI_AI_SUBDEV];
         short data;
         u32 dl;
@@ -1574,11 +1614,13 @@ static void ni_ai_munge(struct comedi_device *dev, struct comedi_subdevice *s,
                         void *data, unsigned int num_bytes,
                         unsigned int chan_index)
 {
+        struct ni_private *devpriv = dev->private;
         struct comedi_async *async = s->async;
         unsigned int i;
         unsigned int length = num_bytes / bytes_per_sample(s);
         short *array = data;
         unsigned int *larray = data;
+
         for (i = 0; i < length; i++) {
 #ifdef PCIDMA
                 if (s->subdev_flags & SDF_LSAMPL)
@@ -1599,6 +1641,7 @@ static void ni_ai_munge(struct comedi_device *dev, struct comedi_subdevice *s,
 
 static int ni_ai_setup_MITE_dma(struct comedi_device *dev)
 {
+        struct ni_private *devpriv = dev->private;
         struct comedi_subdevice *s = &dev->subdevices[NI_AI_SUBDEV];
         int retval;
         unsigned long flags;
@@ -1638,6 +1681,7 @@ static int ni_ai_setup_MITE_dma(struct comedi_device *dev)
 
 static int ni_ao_setup_MITE_dma(struct comedi_device *dev)
 {
+        struct ni_private *devpriv = dev->private;
         struct comedi_subdevice *s = &dev->subdevices[NI_AO_SUBDEV];
         int retval;
         unsigned long flags;
@@ -1676,6 +1720,8 @@ static int ni_ao_setup_MITE_dma(struct comedi_device *dev)
 
 static int ni_ai_reset(struct comedi_device *dev, struct comedi_subdevice *s)
 {
+        struct ni_private *devpriv = dev->private;
+
         ni_release_ai_mite_channel(dev);
         /* ai configuration */
         devpriv->stc_writew(dev, AI_Configuration_Start | AI_Reset,
@@ -1786,6 +1832,7 @@ static int ni_ai_insn_read(struct comedi_device *dev,
                            struct comedi_subdevice *s, struct comedi_insn *insn,
                            unsigned int *data)
 {
+        struct ni_private *devpriv = dev->private;
         int i, n;
         const unsigned int mask = (1 << boardtype.adbits) - 1;
         unsigned signbits;
@@ -1881,7 +1928,9 @@ static int ni_ai_insn_read(struct comedi_device *dev,
 
 static void ni_prime_channelgain_list(struct comedi_device *dev)
 {
+        struct ni_private *devpriv = dev->private;
         int i;
+
         devpriv->stc_writew(dev, AI_CONVERT_Pulse, AI_Command_1_Register);
         for (i = 0; i < NI_TIMEOUT; ++i) {
                 if (!(devpriv->stc_readw(dev,
@@ -1899,6 +1948,7 @@ static void ni_m_series_load_channelgain_list(struct comedi_device *dev,
                                               unsigned int n_chan,
                                               unsigned int *list)
 {
+        struct ni_private *devpriv = dev->private;
         unsigned int chan, range, aref;
         unsigned int i;
         unsigned offset;
@@ -2004,6 +2054,7 @@ static void ni_m_series_load_channelgain_list(struct comedi_device *dev,
 static void ni_load_channelgain_list(struct comedi_device *dev,
                                      unsigned int n_chan, unsigned int *list)
 {
+        struct ni_private *devpriv = dev->private;
         unsigned int chan, range, aref;
         unsigned int i;
         unsigned int hi, lo;
@@ -2122,7 +2173,9 @@ static void ni_load_channelgain_list(struct comedi_device *dev,
 static int ni_ns_to_timer(const struct comedi_device *dev, unsigned nanosec,
                           int round_mode)
 {
+        struct ni_private *devpriv = dev->private;
         int divider;
+
         switch (round_mode) {
         case TRIG_ROUND_NEAREST:
         default:
@@ -2140,6 +2193,8 @@ static int ni_ns_to_timer(const struct comedi_device *dev, unsigned nanosec,
 
 static unsigned ni_timer_to_ns(const struct comedi_device *dev, int timer)
 {
+        struct ni_private *devpriv = dev->private;
+
         return devpriv->clock_ns * (timer + 1);
 }
 
@@ -2162,6 +2217,7 @@ static unsigned ni_min_ai_scan_period_ns(struct comedi_device *dev,
 static int ni_ai_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s,
                          struct comedi_cmd *cmd)
 {
+        struct ni_private *devpriv = dev->private;
         int err = 0;
         int tmp;
         unsigned int sources;
@@ -2200,7 +2256,7 @@ static int ni_ai_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s,
         if (err)
                 return 2;
 
-        /* step 3: make sure arguments are trivially compatible */
+        /* Step 3: check if arguments are trivially valid */
 
         if (cmd->start_src == TRIG_EXT) {
                 /* external trigger */
@@ -2209,30 +2265,17 @@ static int ni_ai_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s,
                 if (tmp > 16)
                         tmp = 16;
                 tmp |= (cmd->start_arg & (CR_INVERT | CR_EDGE));
-                if (cmd->start_arg != tmp) {
-                        cmd->start_arg = tmp;
-                        err++;
-                }
+                err |= cfc_check_trigger_arg_is(&cmd->start_arg, tmp);
         } else {
-                if (cmd->start_arg != 0) {
-                        /* true for both TRIG_NOW and TRIG_INT */
-                        cmd->start_arg = 0;
-                        err++;
-                }
+                /* true for both TRIG_NOW and TRIG_INT */
+                err |= cfc_check_trigger_arg_is(&cmd->start_arg, 0);
         }
+
         if (cmd->scan_begin_src == TRIG_TIMER) {
-                if (cmd->scan_begin_arg < ni_min_ai_scan_period_ns(dev,
-                                                                   cmd->
-                                                                   chanlist_len))
-                {
-                        cmd->scan_begin_arg =
-                            ni_min_ai_scan_period_ns(dev, cmd->chanlist_len);
-                        err++;
-                }
-                if (cmd->scan_begin_arg > devpriv->clock_ns * 0xffffff) {
-                        cmd->scan_begin_arg = devpriv->clock_ns * 0xffffff;
-                        err++;
-                }
+                err |= cfc_check_trigger_arg_min(&cmd->scan_begin_arg,
+                        ni_min_ai_scan_period_ns(dev, cmd->chanlist_len));
+                err |= cfc_check_trigger_arg_max(&cmd->scan_begin_arg,
+                                                 devpriv->clock_ns * 0xffffff);
         } else if (cmd->scan_begin_src == TRIG_EXT) {
                 /* external trigger */
                 unsigned int tmp = CR_CHAN(cmd->scan_begin_arg);
@@ -2240,32 +2283,20 @@ static int ni_ai_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s,
                 if (tmp > 16)
                         tmp = 16;
                 tmp |= (cmd->scan_begin_arg & (CR_INVERT | CR_EDGE));
-                if (cmd->scan_begin_arg != tmp) {
-                        cmd->scan_begin_arg = tmp;
-                        err++;
-                }
+                err |= cfc_check_trigger_arg_is(&cmd->scan_begin_arg, tmp);
         } else {                /* TRIG_OTHER */
-                if (cmd->scan_begin_arg) {
-                        cmd->scan_begin_arg = 0;
-                        err++;
-                }
+                err |= cfc_check_trigger_arg_is(&cmd->scan_begin_arg, 0);
         }
+
         if (cmd->convert_src == TRIG_TIMER) {
                 if ((boardtype.reg_type == ni_reg_611x)
                     || (boardtype.reg_type == ni_reg_6143)) {
-                        if (cmd->convert_arg != 0) {
-                                cmd->convert_arg = 0;
-                                err++;
-                        }
+                        err |= cfc_check_trigger_arg_is(&cmd->convert_arg, 0);
                 } else {
-                        if (cmd->convert_arg < boardtype.ai_speed) {
-                                cmd->convert_arg = boardtype.ai_speed;
-                                err++;
-                        }
-                        if (cmd->convert_arg > devpriv->clock_ns * 0xffff) {
-                                cmd->convert_arg = devpriv->clock_ns * 0xffff;
-                                err++;
-                        }
+                        err |= cfc_check_trigger_arg_min(&cmd->convert_arg,
+                                                         boardtype.ai_speed);
+                        err |= cfc_check_trigger_arg_max(&cmd->convert_arg,
+                                                devpriv->clock_ns * 0xffff);
                 }
         } else if (cmd->convert_src == TRIG_EXT) {
                 /* external trigger */
@@ -2274,40 +2305,23 @@ static int ni_ai_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s,
                 if (tmp > 16)
                         tmp = 16;
                 tmp |= (cmd->convert_arg & (CR_ALT_FILTER | CR_INVERT));
-                if (cmd->convert_arg != tmp) {
-                        cmd->convert_arg = tmp;
-                        err++;
-                }
+                err |= cfc_check_trigger_arg_is(&cmd->convert_arg, tmp);
         } else if (cmd->convert_src == TRIG_NOW) {
-                if (cmd->convert_arg != 0) {
-                        cmd->convert_arg = 0;
-                        err++;
-                }
+                err |= cfc_check_trigger_arg_is(&cmd->convert_arg, 0);
         }
 
-        if (cmd->scan_end_arg != cmd->chanlist_len) {
-                cmd->scan_end_arg = cmd->chanlist_len;
-                err++;
-        }
+        err |= cfc_check_trigger_arg_is(&cmd->scan_end_arg, cmd->chanlist_len);
+
         if (cmd->stop_src == TRIG_COUNT) {
                 unsigned int max_count = 0x01000000;
 
                 if (boardtype.reg_type == ni_reg_611x)
                         max_count -= num_adc_stages_611x;
-                if (cmd->stop_arg > max_count) {
-                        cmd->stop_arg = max_count;
-                        err++;
-                }
-                if (cmd->stop_arg < 1) {
-                        cmd->stop_arg = 1;
-                        err++;
-                }
+                err |= cfc_check_trigger_arg_max(&cmd->stop_arg, max_count);
+                err |= cfc_check_trigger_arg_min(&cmd->stop_arg, 1);
         } else {
                 /* TRIG_NONE */
-                if (cmd->stop_arg != 0) {
-                        cmd->stop_arg = 0;
-                        err++;
-                }
+                err |= cfc_check_trigger_arg_is(&cmd->stop_arg, 0);
         }
 
         if (err)
@@ -2356,6 +2370,7 @@ static int ni_ai_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s,
 
 static int ni_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
 {
+        struct ni_private *devpriv = dev->private;
         const struct comedi_cmd *cmd = &s->async->cmd;
         int timer;
         int mode1 = 0;          /* mode1 is needed for both stop and convert */
@@ -2662,6 +2677,8 @@ static int ni_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
 static int ni_ai_inttrig(struct comedi_device *dev, struct comedi_subdevice *s,
                          unsigned int trignum)
 {
+        struct ni_private *devpriv = dev->private;
+
         if (trignum != 0)
                 return -EINVAL;
 
@@ -2681,6 +2698,8 @@ static int ni_ai_insn_config(struct comedi_device *dev,
                              struct comedi_subdevice *s,
                              struct comedi_insn *insn, unsigned int *data)
 {
+        struct ni_private *devpriv = dev->private;
+
         if (insn->n < 1)
                 return -EINVAL;
 
@@ -2734,6 +2753,7 @@ static int ni_ai_config_analog_trig(struct comedi_device *dev,
                                     struct comedi_insn *insn,
                                     unsigned int *data)
 {
+        struct ni_private *devpriv = dev->private;
         unsigned int a, b, modebits;
         int err = 0;
 
@@ -2857,6 +2877,7 @@ static int ni_m_series_ao_config_chanlist(struct comedi_device *dev,
                                           unsigned int chanspec[],
                                           unsigned int n_chans, int timed)
 {
+        struct ni_private *devpriv = dev->private;
         unsigned int range;
         unsigned int chan;
         unsigned int conf;
@@ -2928,6 +2949,7 @@ static int ni_old_ao_config_chanlist(struct comedi_device *dev,
                                      unsigned int chanspec[],
                                      unsigned int n_chans)
 {
+        struct ni_private *devpriv = dev->private;
         unsigned int range;
         unsigned int chan;
         unsigned int conf;
@@ -2984,6 +3006,8 @@ static int ni_ao_insn_read(struct comedi_device *dev,
                            struct comedi_subdevice *s, struct comedi_insn *insn,
                            unsigned int *data)
 {
+        struct ni_private *devpriv = dev->private;
+
         data[0] = devpriv->ao[CR_CHAN(insn->chanspec)];
 
         return 1;
@@ -2993,6 +3017,7 @@ static int ni_ao_insn_write(struct comedi_device *dev,
                             struct comedi_subdevice *s,
                             struct comedi_insn *insn, unsigned int *data)
 {
+        struct ni_private *devpriv = dev->private;
         unsigned int chan = CR_CHAN(insn->chanspec);
         unsigned int invert;
 
@@ -3013,6 +3038,7 @@ static int ni_ao_insn_write_671x(struct comedi_device *dev,
                                  struct comedi_subdevice *s,
                                  struct comedi_insn *insn, unsigned int *data)
 {
+        struct ni_private *devpriv = dev->private;
         unsigned int chan = CR_CHAN(insn->chanspec);
         unsigned int invert;
 
@@ -3031,6 +3057,8 @@ static int ni_ao_insn_config(struct comedi_device *dev,
                              struct comedi_subdevice *s,
                              struct comedi_insn *insn, unsigned int *data)
 {
+        struct ni_private *devpriv = dev->private;
+
         switch (data[0]) {
         case INSN_CONFIG_GET_HARDWARE_BUFFER_SIZE:
                 switch (data[1]) {
@@ -3057,6 +3085,7 @@ static int ni_ao_insn_config(struct comedi_device *dev,
 static int ni_ao_inttrig(struct comedi_device *dev, struct comedi_subdevice *s,
                          unsigned int trignum)
 {
+        struct ni_private *devpriv = dev->private;
         int ret;
         int interrupt_b_bits;
         int i;
@@ -3126,6 +3155,7 @@ static int ni_ao_inttrig(struct comedi_device *dev, struct comedi_subdevice *s,
 
 static int ni_ao_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
 {
+        struct ni_private *devpriv = dev->private;
         const struct comedi_cmd *cmd = &s->async->cmd;
         int bits;
         int i;
@@ -3330,6 +3360,7 @@ static int ni_ao_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
 static int ni_ao_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s,
                          struct comedi_cmd *cmd)
 {
+        struct ni_private *devpriv = dev->private;
         int err = 0;
         int tmp;
 
@@ -3359,7 +3390,7 @@ static int ni_ao_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s,
         if (err)
                 return 2;
 
-        /* step 3: make sure arguments are trivially compatible */
+        /* Step 3: check if arguments are trivially valid */
 
         if (cmd->start_src == TRIG_EXT) {
                 /* external trigger */
@@ -3368,48 +3399,27 @@ static int ni_ao_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s,
                 if (tmp > 18)
                         tmp = 18;
                 tmp |= (cmd->start_arg & (CR_INVERT | CR_EDGE));
-                if (cmd->start_arg != tmp) {
-                        cmd->start_arg = tmp;
-                        err++;
-                }
+                err |= cfc_check_trigger_arg_is(&cmd->start_arg, tmp);
         } else {
-                if (cmd->start_arg != 0) {
-                        /* true for both TRIG_NOW and TRIG_INT */
-                        cmd->start_arg = 0;
-                        err++;
-                }
+                /* true for both TRIG_NOW and TRIG_INT */
+                err |= cfc_check_trigger_arg_is(&cmd->start_arg, 0);
         }
+
         if (cmd->scan_begin_src == TRIG_TIMER) {
-                if (cmd->scan_begin_arg < boardtype.ao_speed) {
-                        cmd->scan_begin_arg = boardtype.ao_speed;
-                        err++;
-                }
-                if (cmd->scan_begin_arg > devpriv->clock_ns * 0xffffff) {       /* XXX check */
-                        cmd->scan_begin_arg = devpriv->clock_ns * 0xffffff;
-                        err++;
-                }
-        }
-        if (cmd->convert_arg != 0) {
-                cmd->convert_arg = 0;
-                err++;
-        }
-        if (cmd->scan_end_arg != cmd->chanlist_len) {
-                cmd->scan_end_arg = cmd->chanlist_len;
-                err++;
-        }
-        if (cmd->stop_src == TRIG_COUNT) {      /* XXX check */
-                if (cmd->stop_arg > 0x00ffffff) {
-                        cmd->stop_arg = 0x00ffffff;
-                        err++;
-                }
-        } else {
-                /* TRIG_NONE */
-                if (cmd->stop_arg != 0) {
-                        cmd->stop_arg = 0;
-                        err++;
-                }
+                err |= cfc_check_trigger_arg_min(&cmd->scan_begin_arg,
+                                                 boardtype.ao_speed);
+                err |= cfc_check_trigger_arg_max(&cmd->scan_begin_arg,
+                                                 devpriv->clock_ns * 0xffffff);
         }
 
+        err |= cfc_check_trigger_arg_is(&cmd->convert_arg, 0);
+        err |= cfc_check_trigger_arg_is(&cmd->scan_end_arg, cmd->chanlist_len);
+
+        if (cmd->stop_src == TRIG_COUNT)
+                err |= cfc_check_trigger_arg_max(&cmd->stop_arg, 0x00ffffff);
+        else    /* TRIG_NONE */
+                err |= cfc_check_trigger_arg_is(&cmd->stop_arg, 0);
+
         if (err)
                 return 3;
 
@@ -3438,6 +3448,8 @@ static int ni_ao_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s,
 
 static int ni_ao_reset(struct comedi_device *dev, struct comedi_subdevice *s)
 {
+        struct ni_private *devpriv = dev->private;
+
         /* devpriv->ao0p=0x0000; */
         /* ni_writew(devpriv->ao0p,AO_Configuration); */
 
@@ -3491,6 +3503,8 @@ static int ni_dio_insn_config(struct comedi_device *dev,
                               struct comedi_subdevice *s,
                               struct comedi_insn *insn, unsigned int *data)
 {
+        struct ni_private *devpriv = dev->private;
+
 #ifdef DEBUG_DIO
         printk("ni_dio_insn_config() chan=%d io=%d\n",
                CR_CHAN(insn->chanspec), data[0]);
@@ -3524,6 +3538,8 @@ static int ni_dio_insn_bits(struct comedi_device *dev,
                             struct comedi_subdevice *s,
                             struct comedi_insn *insn, unsigned int *data)
 {
+        struct ni_private *devpriv = dev->private;
+
 #ifdef DEBUG_DIO
         printk("ni_dio_insn_bits() mask=0x%x bits=0x%x\n", data[0], data[1]);
 #endif
@@ -3552,6 +3568,8 @@ static int ni_m_series_dio_insn_config(struct comedi_device *dev,
                                        struct comedi_insn *insn,
                                        unsigned int *data)
 {
+        struct ni_private *devpriv __maybe_unused = dev->private;
+
 #ifdef DEBUG_DIO
         printk("ni_m_series_dio_insn_config() chan=%d io=%d\n",
                CR_CHAN(insn->chanspec), data[0]);
@@ -3584,6 +3602,8 @@ static int ni_m_series_dio_insn_bits(struct comedi_device *dev,
                                      struct comedi_insn *insn,
                                      unsigned int *data)
 {
+        struct ni_private *devpriv __maybe_unused = dev->private;
+
 #ifdef DEBUG_DIO
         printk("ni_m_series_dio_insn_bits() mask=0x%x bits=0x%x\n", data[0],
                data[1]);
@@ -3623,39 +3643,18 @@ static int ni_cdio_cmdtest(struct comedi_device *dev,
         if (err)
                 return 2;
 
-        /* step 3: make sure arguments are trivially compatible */
-        if (cmd->start_src == TRIG_INT) {
-                if (cmd->start_arg != 0) {
-                        cmd->start_arg = 0;
-                        err++;
-                }
-        }
-        if (cmd->scan_begin_src == TRIG_EXT) {
-                tmp = cmd->scan_begin_arg;
-                tmp &= CR_PACK_FLAGS(CDO_Sample_Source_Select_Mask, 0, 0,
-                                     CR_INVERT);
-                if (tmp != cmd->scan_begin_arg) {
-                        err++;
-                }
-        }
-        if (cmd->convert_src == TRIG_NOW) {
-                if (cmd->convert_arg) {
-                        cmd->convert_arg = 0;
-                        err++;
-                }
-        }
+        /* Step 3: check if arguments are trivially valid */
 
-        if (cmd->scan_end_arg != cmd->chanlist_len) {
-                cmd->scan_end_arg = cmd->chanlist_len;
-                err++;
-        }
+        err |= cfc_check_trigger_arg_is(&cmd->start_arg, 0);
 
-        if (cmd->stop_src == TRIG_NONE) {
-                if (cmd->stop_arg != 0) {
-                        cmd->stop_arg = 0;
-                        err++;
-                }
-        }
+        tmp = cmd->scan_begin_arg;
+        tmp &= CR_PACK_FLAGS(CDO_Sample_Source_Select_Mask, 0, 0, CR_INVERT);
+        if (tmp != cmd->scan_begin_arg)
+                err |= -EINVAL;
+
+        err |= cfc_check_trigger_arg_is(&cmd->convert_arg, 0);
+        err |= cfc_check_trigger_arg_is(&cmd->scan_end_arg, cmd->chanlist_len);
+        err |= cfc_check_trigger_arg_is(&cmd->stop_arg, 0);
 
         if (err)
                 return 3;
@@ -3680,6 +3679,7 @@ static int ni_cdio_cmdtest(struct comedi_device *dev,
 
 static int ni_cdio_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
 {
+        struct ni_private *devpriv __maybe_unused = dev->private;
         const struct comedi_cmd *cmd = &s->async->cmd;
         unsigned cdo_mode_bits = CDO_FIFO_Mode_Bit | CDO_Halt_On_Error_Bit;
         int retval;
@@ -3719,6 +3719,7 @@ static int ni_cdo_inttrig(struct comedi_device *dev, struct comedi_subdevice *s,
                           unsigned int trignum)
 {
 #ifdef PCIDMA
+        struct ni_private *devpriv = dev->private;
         unsigned long flags;
 #endif
         int retval = 0;
@@ -3766,6 +3767,8 @@ static int ni_cdo_inttrig(struct comedi_device *dev, struct comedi_subdevice *s,
 
 static int ni_cdio_cancel(struct comedi_device *dev, struct comedi_subdevice *s)
 {
+        struct ni_private *devpriv __maybe_unused = dev->private;
+
         ni_writel(CDO_Disarm_Bit | CDO_Error_Interrupt_Enable_Clear_Bit |
                   CDO_Empty_FIFO_Interrupt_Enable_Clear_Bit |
                   CDO_FIFO_Request_Interrupt_Enable_Clear_Bit,
@@ -3781,6 +3784,7 @@ static int ni_cdio_cancel(struct comedi_device *dev, struct comedi_subdevice *s)
 
 static void handle_cdio_interrupt(struct comedi_device *dev)
 {
+        struct ni_private *devpriv __maybe_unused = dev->private;
         unsigned cdio_status;
         struct comedi_subdevice *s = &dev->subdevices[NI_DIO_SUBDEV];
 #ifdef PCIDMA
@@ -3824,6 +3828,7 @@ static int ni_serial_insn_config(struct comedi_device *dev,
                                  struct comedi_subdevice *s,
                                  struct comedi_insn *insn, unsigned int *data)
 {
+        struct ni_private *devpriv = dev->private;
         int err = insn->n;
         unsigned char byte_out, byte_in = 0;
 
@@ -3920,6 +3925,7 @@ static int ni_serial_hw_readwrite8(struct comedi_device *dev,
                                    unsigned char data_out,
                                    unsigned char *data_in)
 {
+        struct ni_private *devpriv = dev->private;
         unsigned int status1;
         int err = 0, count = 20;
 
@@ -3978,6 +3984,7 @@ static int ni_serial_sw_readwrite8(struct comedi_device *dev,
                                    unsigned char data_out,
                                    unsigned char *data_in)
 {
+        struct ni_private *devpriv = dev->private;
         unsigned char mask, input = 0;
 
 #ifdef DEBUG_DIO
@@ -4031,9 +4038,10 @@ static int ni_serial_sw_readwrite8(struct comedi_device *dev,
 
 static void mio_common_detach(struct comedi_device *dev)
 {
+        struct ni_private *devpriv = dev->private;
         struct comedi_subdevice *s;
 
-        if (dev->private) {
+        if (devpriv) {
                 if (devpriv->counter_dev) {
                         ni_gpct_device_destroy(devpriv->counter_dev);
                 }
@@ -4151,6 +4159,7 @@ static void ni_gpct_write_register(struct ni_gpct *counter, unsigned bits,
                                    enum ni_gpct_register reg)
 {
         struct comedi_device *dev = counter->counter_dev->dev;
+        struct ni_private *devpriv = dev->private;
         unsigned stc_register;
         /* bits in the join reset register which are relevant to counters */
         static const unsigned gpct_joint_reset_mask = G0_Reset | G1_Reset;
@@ -4219,7 +4228,9 @@ static unsigned ni_gpct_read_register(struct ni_gpct *counter,
                                       enum ni_gpct_register reg)
 {
         struct comedi_device *dev = counter->counter_dev->dev;
+        struct ni_private *devpriv = dev->private;
         unsigned stc_register;
+
         switch (reg) {
                 /* m-series only registers */
         case NITIO_G0_DMA_Status_Reg:
@@ -4251,6 +4262,8 @@ static int ni_freq_out_insn_read(struct comedi_device *dev,
                                  struct comedi_subdevice *s,
                                  struct comedi_insn *insn, unsigned int *data)
 {
+        struct ni_private *devpriv = dev->private;
+
         data[0] = devpriv->clock_and_fout & FOUT_Divider_mask;
         return 1;
 }
@@ -4259,6 +4272,8 @@ static int ni_freq_out_insn_write(struct comedi_device *dev,
                                   struct comedi_subdevice *s,
                                   struct comedi_insn *insn, unsigned int *data)
 {
+        struct ni_private *devpriv = dev->private;
+
         devpriv->clock_and_fout &= ~FOUT_Enable;
         devpriv->stc_writew(dev, devpriv->clock_and_fout,
                             Clock_and_FOUT_Register);
@@ -4273,6 +4288,8 @@ static int ni_freq_out_insn_write(struct comedi_device *dev,
 static int ni_set_freq_out_clock(struct comedi_device *dev,
                                  unsigned int clock_source)
 {
+        struct ni_private *devpriv = dev->private;
+
         switch (clock_source) {
         case NI_FREQ_OUT_TIMEBASE_1_DIV_2_CLOCK_SRC:
                 devpriv->clock_and_fout &= ~FOUT_Timebase_Select;
@@ -4292,6 +4309,8 @@ static void ni_get_freq_out_clock(struct comedi_device *dev,
                                   unsigned int *clock_source,
                                   unsigned int *clock_period_ns)
 {
+        struct ni_private *devpriv = dev->private;
+
         if (devpriv->clock_and_fout & FOUT_Timebase_Select) {
                 *clock_source = NI_FREQ_OUT_TIMEBASE_2_CLOCK_SRC;
                 *clock_period_ns = TIMEBASE_2_NS;
@@ -4320,11 +4339,12 @@ static int ni_freq_out_insn_config(struct comedi_device *dev,
 
 static int ni_alloc_private(struct comedi_device *dev)
 {
-        int ret;
+        struct ni_private *devpriv;
 
-        ret = alloc_private(dev, sizeof(struct ni_private));
-        if (ret < 0)
-                return ret;
+        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
+        if (!devpriv)
+                return -ENOMEM;
+        dev->private = devpriv;
 
         spin_lock_init(&devpriv->window_lock);
         spin_lock_init(&devpriv->soft_reg_copy_lock);
@@ -4335,6 +4355,7 @@ static int ni_alloc_private(struct comedi_device *dev)
 
 static int ni_E_init(struct comedi_device *dev)
 {
+        struct ni_private *devpriv = dev->private;
         struct comedi_subdevice *s;
         unsigned j;
         enum ni_gpct_variant counter_variant;
@@ -4661,6 +4682,7 @@ static int ni_E_init(struct comedi_device *dev)
 static int ni_8255_callback(int dir, int port, int data, unsigned long arg)
 {
         struct comedi_device *dev = (struct comedi_device *)arg;
+        struct ni_private *devpriv __maybe_unused = dev->private;
 
         if (dir) {
                 ni_writeb(data, Port_A + 2 * port);
@@ -4689,6 +4711,7 @@ static int ni_eeprom_insn_read(struct comedi_device *dev,
 
 static int ni_read_eeprom(struct comedi_device *dev, int addr)
 {
+        struct ni_private *devpriv __maybe_unused = dev->private;
         int bit;
         int bitstring;
 
@@ -4716,6 +4739,8 @@ static int ni_m_series_eeprom_insn_read(struct comedi_device *dev,
                                         struct comedi_insn *insn,
                                         unsigned int *data)
 {
+        struct ni_private *devpriv = dev->private;
+
         data[0] = devpriv->eeprom_buffer[CR_CHAN(insn->chanspec)];
 
         return 1;
@@ -4723,6 +4748,8 @@ static int ni_m_series_eeprom_insn_read(struct comedi_device *dev,
 
 static int ni_get_pwm_config(struct comedi_device *dev, unsigned int *data)
 {
+        struct ni_private *devpriv = dev->private;
+
         data[1] = devpriv->pwm_up_count * devpriv->clock_ns;
         data[2] = devpriv->pwm_down_count * devpriv->clock_ns;
         return 3;
@@ -4732,7 +4759,9 @@ static int ni_m_series_pwm_config(struct comedi_device *dev,
                                   struct comedi_subdevice *s,
                                   struct comedi_insn *insn, unsigned int *data)
 {
+        struct ni_private *devpriv = dev->private;
         unsigned up_count, down_count;
+
         switch (data[0]) {
         case INSN_CONFIG_PWM_OUTPUT:
                 switch (data[1]) {
@@ -4798,7 +4827,9 @@ static int ni_6143_pwm_config(struct comedi_device *dev,
                               struct comedi_subdevice *s,
                               struct comedi_insn *insn, unsigned int *data)
 {
+        struct ni_private *devpriv = dev->private;
         unsigned up_count, down_count;
+
         switch (data[0]) {
         case INSN_CONFIG_PWM_OUTPUT:
                 switch (data[1]) {
@@ -4875,6 +4906,8 @@ static int ni_calib_insn_read(struct comedi_device *dev,
                               struct comedi_subdevice *s,
                               struct comedi_insn *insn, unsigned int *data)
 {
+        struct ni_private *devpriv = dev->private;
+
         data[0] = devpriv->caldacs[CR_CHAN(insn->chanspec)];
 
         return 1;
@@ -4905,6 +4938,7 @@ static struct caldac_struct caldacs[] = {
 
 static void caldac_setup(struct comedi_device *dev, struct comedi_subdevice *s)
 {
+        struct ni_private *devpriv = dev->private;
         int i, j;
         int n_dacs;
         int n_chans = 0;
@@ -4958,6 +4992,7 @@ static void caldac_setup(struct comedi_device *dev, struct comedi_subdevice *s)
 
 static void ni_write_caldac(struct comedi_device *dev, int addr, int val)
 {
+        struct ni_private *devpriv = dev->private;
         unsigned int loadbit = 0, bits = 0, bit, bitstring = 0;
         int i;
         int type;
@@ -5211,8 +5246,10 @@ static int ni_gpct_cancel(struct comedi_device *dev, struct comedi_subdevice *s)
 static int ni_m_series_set_pfi_routing(struct comedi_device *dev, unsigned chan,
                                        unsigned source)
 {
+        struct ni_private *devpriv = dev->private;
         unsigned pfi_reg_index;
         unsigned array_offset;
+
         if ((source & 0x1f) != source)
                 return -EINVAL;
         pfi_reg_index = 1 + chan / 3;
@@ -5247,7 +5284,9 @@ static int ni_set_pfi_routing(struct comedi_device *dev, unsigned chan,
 static unsigned ni_m_series_get_pfi_routing(struct comedi_device *dev,
                                             unsigned chan)
 {
+        struct ni_private *devpriv = dev->private;
         const unsigned array_offset = chan / 3;
+
         return MSeries_PFI_Output_Select_Source(chan,
                                                 devpriv->
                                                 pfi_output_select_reg
@@ -5306,7 +5345,9 @@ static unsigned ni_get_pfi_routing(struct comedi_device *dev, unsigned chan)
 static int ni_config_filter(struct comedi_device *dev, unsigned pfi_channel,
                             enum ni_pfi_filter_select filter)
 {
+        struct ni_private *devpriv __maybe_unused = dev->private;
         unsigned bits;
+
         if ((boardtype.reg_type & ni_reg_m_series_mask) == 0) {
                 return -ENOTSUPP;
         }
@@ -5321,6 +5362,8 @@ static int ni_pfi_insn_bits(struct comedi_device *dev,
                             struct comedi_subdevice *s,
                             struct comedi_insn *insn, unsigned int *data)
 {
+        struct ni_private *devpriv __maybe_unused = dev->private;
+
         if ((boardtype.reg_type & ni_reg_m_series_mask) == 0) {
                 return -ENOTSUPP;
         }
@@ -5337,6 +5380,7 @@ static int ni_pfi_insn_config(struct comedi_device *dev,
                               struct comedi_subdevice *s,
                               struct comedi_insn *insn, unsigned int *data)
 {
+        struct ni_private *devpriv = dev->private;
         unsigned int chan;
 
         if (insn->n < 1)
@@ -5379,6 +5423,8 @@ static int ni_pfi_insn_config(struct comedi_device *dev,
  */
 static void ni_rtsi_init(struct comedi_device *dev)
 {
+        struct ni_private *devpriv = dev->private;
+
         /*  Initialises the RTSI bus signal switch to a default state */
 
         /*  Set clock mode to internal */
@@ -5480,6 +5526,7 @@ static inline unsigned num_configurable_rtsi_channels(struct comedi_device *dev)
 static int ni_mseries_set_pll_master_clock(struct comedi_device *dev,
                                            unsigned source, unsigned period_ns)
 {
+        struct ni_private *devpriv = dev->private;
         static const unsigned min_period_ns = 50;
         static const unsigned max_period_ns = 1000;
         static const unsigned timeout = 1000;
@@ -5488,6 +5535,7 @@ static int ni_mseries_set_pll_master_clock(struct comedi_device *dev,
         unsigned freq_multiplier;
         unsigned i;
         int retval;
+
         if (source == NI_MIO_PLL_PXI10_CLOCK)
                 period_ns = 100;
         /*  these limits are somewhat arbitrary, but NI advertises 1 to 20MHz range so we'll use that */
@@ -5581,6 +5629,8 @@ static int ni_mseries_set_pll_master_clock(struct comedi_device *dev,
 static int ni_set_master_clock(struct comedi_device *dev, unsigned source,
                                unsigned period_ns)
 {
+        struct ni_private *devpriv = dev->private;
+
         if (source == NI_MIO_INTERNAL_CLOCK) {
                 devpriv->rtsi_trig_direction_reg &= ~Use_RTSI_Clock_Bit;
                 devpriv->stc_writew(dev, devpriv->rtsi_trig_direction_reg,
@@ -5666,6 +5716,8 @@ static int ni_valid_rtsi_output_source(struct comedi_device *dev, unsigned chan,
 static int ni_set_rtsi_routing(struct comedi_device *dev, unsigned chan,
                                unsigned source)
 {
+        struct ni_private *devpriv = dev->private;
+
         if (ni_valid_rtsi_output_source(dev, chan, source) == 0)
                 return -EINVAL;
         if (chan < 4) {
@@ -5686,6 +5738,8 @@ static int ni_set_rtsi_routing(struct comedi_device *dev, unsigned chan,
 
 static unsigned ni_get_rtsi_routing(struct comedi_device *dev, unsigned chan)
 {
+        struct ni_private *devpriv = dev->private;
+
         if (chan < 4) {
                 return RTSI_Trig_Output_Source(chan,
                                                devpriv->rtsi_trig_a_output_reg);
@@ -5704,7 +5758,9 @@ static int ni_rtsi_insn_config(struct comedi_device *dev,
                                struct comedi_subdevice *s,
                                struct comedi_insn *insn, unsigned int *data)
 {
+        struct ni_private *devpriv = dev->private;
         unsigned int chan = CR_CHAN(insn->chanspec);
+
         switch (data[0]) {
         case INSN_CONFIG_DIO_OUTPUT:
                 if (chan < num_configurable_rtsi_channels(dev)) {
diff --git a/drivers/staging/comedi/drivers/ni_mio_cs.c b/drivers/staging/comedi/drivers/ni_mio_cs.c
index ca4f8e06e75b..76c6a13ea9d6 100644
--- a/drivers/staging/comedi/drivers/ni_mio_cs.c
+++ b/drivers/staging/comedi/drivers/ni_mio_cs.c
@@ -175,9 +175,7 @@ struct ni_private {
 
         struct pcmcia_device *link;
 
- NI_PRIVATE_COMMON};
-
-#define devpriv ((struct ni_private *)dev->private)
+NI_PRIVATE_COMMON};
 
 /* How we access registers */
 
@@ -196,6 +194,7 @@ struct ni_private {
 
 static void mio_cs_win_out(struct comedi_device *dev, uint16_t data, int addr)
 {
+        struct ni_private *devpriv = dev->private;
         unsigned long flags;
 
         spin_lock_irqsave(&devpriv->window_lock, flags);
@@ -210,6 +209,7 @@ static void mio_cs_win_out(struct comedi_device *dev, uint16_t data, int addr)
 
 static uint16_t mio_cs_win_in(struct comedi_device *dev, int addr)
 {
+        struct ni_private *devpriv = dev->private;
         unsigned long flags;
         uint16_t ret;
 
@@ -251,7 +251,7 @@ static void mio_cs_config(struct pcmcia_device *link);
 static void cs_release(struct pcmcia_device *link);
 static void cs_detach(struct pcmcia_device *);
 
-static struct pcmcia_device *cur_dev = NULL;
+static struct pcmcia_device *cur_dev;
 
 static int cs_attach(struct pcmcia_device *link)
 {
@@ -324,6 +324,7 @@ static void mio_cs_config(struct pcmcia_device *link)
 
 static int mio_cs_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 {
+        struct ni_private *devpriv;
         struct pcmcia_device *link;
         unsigned int irq;
         int ret;
@@ -339,13 +340,15 @@ static int mio_cs_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 
         irq = link->irq;
 
-        printk("comedi%d: %s: DAQCard: io 0x%04lx, irq %u, ",
-               dev->minor, dev->driver->driver_name, dev->iobase, irq);
+        dev->board_ptr = ni_boards + ni_getboardtype(dev, link);
 
 #if 0
         {
                 int i;
 
+                printk("comedi%d: %s: DAQCard: io 0x%04lx, irq %u, ",
+                       dev->minor, dev->driver->driver_name, dev->iobase, irq);
+
                 printk(" board fingerprint:");
                 for (i = 0; i < 32; i += 2) {
                         printk(" %04x %02x", inw(dev->iobase + i),
@@ -356,26 +359,25 @@ static int mio_cs_attach(struct comedi_device *dev, struct comedi_devconfig *it)
                 for (i = 0; i < 10; i++)
                         printk(" 0x%04x", win_in(i));
                 printk("\n");
+
+                printk("boardtype.name: %s\n", boardtype.name);
         }
 #endif
 
-        dev->board_ptr = ni_boards + ni_getboardtype(dev, link);
-
-        printk(" %s", boardtype.name);
         dev->board_name = boardtype.name;
 
         ret = request_irq(irq, ni_E_interrupt, NI_E_IRQ_FLAGS,
                           "ni_mio_cs", dev);
         if (ret < 0) {
-                printk(" irq not available\n");
+                dev_err(dev->class_dev, "irq not available\n");
                 return -EINVAL;
         }
         dev->irq = irq;
 
-        /* allocate private area */
         ret = ni_alloc_private(dev);
-        if (ret < 0)
+        if (ret)
                 return ret;
+        devpriv = dev->private;
 
         devpriv->stc_writew = &mio_cs_win_out;
         devpriv->stc_readw = &mio_cs_win_in;
@@ -400,7 +402,8 @@ static int ni_getboardtype(struct comedi_device *dev,
                         return i;
         }
 
-        printk("unknown board 0x%04x -- pretend it is a ", link->card_id);
+        dev_err(dev->class_dev,
+                "unknown board 0x%04x -- pretend it is a ", link->card_id);
 
         return 0;
 }
diff --git a/drivers/staging/comedi/drivers/ni_pcidio.c b/drivers/staging/comedi/drivers/ni_pcidio.c
index bc9313ec985c..084ebea33ab9 100644
--- a/drivers/staging/comedi/drivers/ni_pcidio.c
+++ b/drivers/staging/comedi/drivers/ni_pcidio.c
@@ -310,7 +310,6 @@ struct nidio96_private {
         struct mite_dma_descriptor_ring *di_mite_ring;
         spinlock_t mite_channel_lock;
 };
-#define devpriv ((struct nidio96_private *)dev->private)
 
 static int ni_pcidio_cmdtest(struct comedi_device *dev,
                              struct comedi_subdevice *s,
@@ -332,6 +331,7 @@ static void ni_pcidio_print_status(unsigned int status);
 
 static int ni_pcidio_request_di_mite_channel(struct comedi_device *dev)
 {
+        struct nidio96_private *devpriv = dev->private;
         unsigned long flags;
 
         spin_lock_irqsave(&devpriv->mite_channel_lock, flags);
@@ -355,6 +355,7 @@ static int ni_pcidio_request_di_mite_channel(struct comedi_device *dev)
 
 static void ni_pcidio_release_di_mite_channel(struct comedi_device *dev)
 {
+        struct nidio96_private *devpriv = dev->private;
         unsigned long flags;
 
         spin_lock_irqsave(&devpriv->mite_channel_lock, flags);
@@ -384,6 +385,7 @@ static void ni_pcidio_event(struct comedi_device *dev,
 
 static int ni_pcidio_poll(struct comedi_device *dev, struct comedi_subdevice *s)
 {
+        struct nidio96_private *devpriv = dev->private;
         unsigned long irq_flags;
         int count;
 
@@ -400,6 +402,7 @@ static int ni_pcidio_poll(struct comedi_device *dev, struct comedi_subdevice *s)
 static irqreturn_t nidio_interrupt(int irq, void *d)
 {
         struct comedi_device *dev = d;
+        struct nidio96_private *devpriv = dev->private;
         struct comedi_subdevice *s = &dev->subdevices[0];
         struct comedi_async *async = s->async;
         struct mite_struct *mite = devpriv->mite;
@@ -609,6 +612,7 @@ static void ni_pcidio_print_status(unsigned int flags)
 #ifdef unused
 static void debug_int(struct comedi_device *dev)
 {
+        struct nidio96_private *devpriv = dev->private;
         int a, b;
         static int n_int;
         struct timeval tv;
@@ -640,6 +644,8 @@ static int ni_pcidio_insn_config(struct comedi_device *dev,
                                  struct comedi_subdevice *s,
                                  struct comedi_insn *insn, unsigned int *data)
 {
+        struct nidio96_private *devpriv = dev->private;
+
         if (insn->n != 1)
                 return -EINVAL;
         switch (data[0]) {
@@ -668,6 +674,8 @@ static int ni_pcidio_insn_bits(struct comedi_device *dev,
                                struct comedi_subdevice *s,
                                struct comedi_insn *insn, unsigned int *data)
 {
+        struct nidio96_private *devpriv = dev->private;
+
         if (data[0]) {
                 s->state &= ~data[0];
                 s->state |= (data[0] & data[1]);
@@ -707,46 +715,32 @@ static int ni_pcidio_cmdtest(struct comedi_device *dev,
         if (err)
                 return 2;
 
-        /* step 3: make sure arguments are trivially compatible */
+        /* Step 3: check if arguments are trivially valid */
+
+        err |= cfc_check_trigger_arg_is(&cmd->start_arg, 0);
 
-        if (cmd->start_arg != 0) {
-                /* same for both TRIG_INT and TRIG_NOW */
-                cmd->start_arg = 0;
-                err++;
-        }
 #define MAX_SPEED       (TIMER_BASE)    /* in nanoseconds */
 
         if (cmd->scan_begin_src == TRIG_TIMER) {
-                if (cmd->scan_begin_arg < MAX_SPEED) {
-                        cmd->scan_begin_arg = MAX_SPEED;
-                        err++;
-                }
+                err |= cfc_check_trigger_arg_min(&cmd->scan_begin_arg,
+                                                 MAX_SPEED);
                 /* no minimum speed */
         } else {
                 /* TRIG_EXT */
                 /* should be level/edge, hi/lo specification here */
                 if ((cmd->scan_begin_arg & ~(CR_EDGE | CR_INVERT)) != 0) {
                         cmd->scan_begin_arg &= (CR_EDGE | CR_INVERT);
-                        err++;
+                        err |= -EINVAL;
                 }
         }
-        if (cmd->convert_arg != 0) {
-                cmd->convert_arg = 0;
-                err++;
-        }
 
-        if (cmd->scan_end_arg != cmd->chanlist_len) {
-                cmd->scan_end_arg = cmd->chanlist_len;
-                err++;
-        }
+        err |= cfc_check_trigger_arg_is(&cmd->convert_arg, 0);
+        err |= cfc_check_trigger_arg_is(&cmd->scan_end_arg, cmd->chanlist_len);
+
         if (cmd->stop_src == TRIG_COUNT) {
                 /* no limit */
-        } else {
-                /* TRIG_NONE */
-                if (cmd->stop_arg != 0) {
-                        cmd->stop_arg = 0;
-                        err++;
-                }
+        } else {        /* TRIG_NONE */
+                err |= cfc_check_trigger_arg_is(&cmd->stop_arg, 0);
         }
 
         if (err)
@@ -793,6 +787,7 @@ static int ni_pcidio_ns_to_timer(int *nanosec, int round_mode)
 
 static int ni_pcidio_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
 {
+        struct nidio96_private *devpriv = dev->private;
         struct comedi_cmd *cmd = &s->async->cmd;
 
         /* XXX configure ports for input */
@@ -910,6 +905,7 @@ static int ni_pcidio_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
 
 static int setup_mite_dma(struct comedi_device *dev, struct comedi_subdevice *s)
 {
+        struct nidio96_private *devpriv = dev->private;
         int retval;
         unsigned long flags;
 
@@ -934,6 +930,8 @@ static int setup_mite_dma(struct comedi_device *dev, struct comedi_subdevice *s)
 static int ni_pcidio_inttrig(struct comedi_device *dev,
                              struct comedi_subdevice *s, unsigned int trignum)
 {
+        struct nidio96_private *devpriv = dev->private;
+
         if (trignum != 0)
                 return -EINVAL;
 
@@ -946,6 +944,8 @@ static int ni_pcidio_inttrig(struct comedi_device *dev,
 static int ni_pcidio_cancel(struct comedi_device *dev,
                             struct comedi_subdevice *s)
 {
+        struct nidio96_private *devpriv = dev->private;
+
         writeb(0x00,
                devpriv->mite->daq_io_addr + Master_DMA_And_Interrupt_Control);
         ni_pcidio_release_di_mite_channel(dev);
@@ -956,6 +956,7 @@ static int ni_pcidio_cancel(struct comedi_device *dev,
 static int ni_pcidio_change(struct comedi_device *dev,
                             struct comedi_subdevice *s, unsigned long new_size)
 {
+        struct nidio96_private *devpriv = dev->private;
         int ret;
 
         ret = mite_buf_change(devpriv->di_mite_ring, s->async);
@@ -970,6 +971,7 @@ static int ni_pcidio_change(struct comedi_device *dev,
 static int pci_6534_load_fpga(struct comedi_device *dev, int fpga_index,
                               const u8 *data, size_t data_len)
 {
+        struct nidio96_private *devpriv = dev->private;
         static const int timeout = 1000;
         int i;
         size_t j;
@@ -1033,8 +1035,10 @@ static int pci_6534_reset_fpga(struct comedi_device *dev, int fpga_index)
 
 static int pci_6534_reset_fpgas(struct comedi_device *dev)
 {
+        struct nidio96_private *devpriv = dev->private;
         int ret;
         int i;
+
         writew(0x0, devpriv->mite->daq_io_addr + Firmware_Control_Register);
         for (i = 0; i < 3; ++i) {
                 ret = pci_6534_reset_fpga(dev, i);
@@ -1047,6 +1051,8 @@ static int pci_6534_reset_fpgas(struct comedi_device *dev)
 
 static void pci_6534_init_main_fpga(struct comedi_device *dev)
 {
+        struct nidio96_private *devpriv = dev->private;
+
         writel(0, devpriv->mite->daq_io_addr + FPGA_Control1_Register);
         writel(0, devpriv->mite->daq_io_addr + FPGA_Control2_Register);
         writel(0, devpriv->mite->daq_io_addr + FPGA_SCALS_Counter_Register);
@@ -1057,6 +1063,7 @@ static void pci_6534_init_main_fpga(struct comedi_device *dev)
 
 static int pci_6534_upload_firmware(struct comedi_device *dev)
 {
+        struct nidio96_private *devpriv = dev->private;
         int ret;
         const struct firmware *fw;
         static const char *const fw_file[3] = {
@@ -1099,16 +1106,20 @@ nidio_find_boardinfo(struct pci_dev *pcidev)
         return NULL;
 }
 
-static int __devinit nidio_attach_pci(struct comedi_device *dev,
-                                      struct pci_dev *pcidev)
+static int nidio_auto_attach(struct comedi_device *dev,
+                                       unsigned long context_unused)
 {
+        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
+        struct nidio96_private *devpriv;
         struct comedi_subdevice *s;
         int ret;
         unsigned int irq;
 
-        ret = alloc_private(dev, sizeof(struct nidio96_private));
-        if (ret < 0)
-                return ret;
+        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
+        if (!devpriv)
+                return -ENOMEM;
+        dev->private = devpriv;
+
         spin_lock_init(&devpriv->mite_channel_lock);
 
         dev->board_ptr = nidio_find_boardinfo(pcidev);
@@ -1123,7 +1134,7 @@ static int __devinit nidio_attach_pci(struct comedi_device *dev,
                 dev_warn(dev->class_dev, "error setting up mite\n");
                 return ret;
         }
-        comedi_set_hw_dev(dev, &devpriv->mite->pcidev->dev);
+
         devpriv->di_mite_ring = mite_alloc_ring(devpriv->mite);
         if (devpriv->di_mite_ring == NULL)
                 return -ENOMEM;
@@ -1184,6 +1195,8 @@ static int __devinit nidio_attach_pci(struct comedi_device *dev,
 
 static void nidio_detach(struct comedi_device *dev)
 {
+        struct nidio96_private *devpriv = dev->private;
+
         if (dev->irq)
                 free_irq(dev->irq, dev);
         if (devpriv) {
@@ -1201,17 +1214,17 @@ static void nidio_detach(struct comedi_device *dev)
 static struct comedi_driver ni_pcidio_driver = {
         .driver_name    = "ni_pcidio",
         .module         = THIS_MODULE,
-        .attach_pci     = nidio_attach_pci,
+        .auto_attach    = nidio_auto_attach,
         .detach         = nidio_detach,
 };
 
-static int __devinit ni_pcidio_pci_probe(struct pci_dev *dev,
+static int ni_pcidio_pci_probe(struct pci_dev *dev,
                                          const struct pci_device_id *ent)
 {
         return comedi_pci_auto_config(dev, &ni_pcidio_driver);
 }
 
-static void __devexit ni_pcidio_pci_remove(struct pci_dev *dev)
+static void ni_pcidio_pci_remove(struct pci_dev *dev)
 {
         comedi_pci_auto_unconfig(dev);
 }
@@ -1228,7 +1241,7 @@ static struct pci_driver ni_pcidio_pci_driver = {
         .name           = "ni_pcidio",
         .id_table       = ni_pcidio_pci_table,
         .probe          = ni_pcidio_pci_probe,
-        .remove         = __devexit_p(ni_pcidio_pci_remove),
+        .remove         = ni_pcidio_pci_remove,
 };
 module_comedi_pci_driver(ni_pcidio_driver, ni_pcidio_pci_driver);
 
diff --git a/drivers/staging/comedi/drivers/ni_pcimio.c b/drivers/staging/comedi/drivers/ni_pcimio.c
index f284a90720ec..aaac0b2cc9eb 100644
--- a/drivers/staging/comedi/drivers/ni_pcimio.c
+++ b/drivers/staging/comedi/drivers/ni_pcimio.c
@@ -1190,7 +1190,6 @@ static const struct ni_board_struct ni_boards[] = {
 
 struct ni_private {
 NI_PRIVATE_COMMON};
-#define devpriv ((struct ni_private *)dev->private)
 
 /* How we access registers */
 
@@ -1213,6 +1212,7 @@ NI_PRIVATE_COMMON};
 
 static void e_series_win_out(struct comedi_device *dev, uint16_t data, int reg)
 {
+        struct ni_private *devpriv = dev->private;
         unsigned long flags;
 
         spin_lock_irqsave(&devpriv->window_lock, flags);
@@ -1223,6 +1223,7 @@ static void e_series_win_out(struct comedi_device *dev, uint16_t data, int reg)
 
 static uint16_t e_series_win_in(struct comedi_device *dev, int reg)
 {
+        struct ni_private *devpriv = dev->private;
         unsigned long flags;
         uint16_t ret;
 
@@ -1237,7 +1238,9 @@ static uint16_t e_series_win_in(struct comedi_device *dev, int reg)
 static void m_series_stc_writew(struct comedi_device *dev, uint16_t data,
                                 int reg)
 {
+        struct ni_private *devpriv = dev->private;
         unsigned offset;
+
         switch (reg) {
         case ADC_FIFO_Clear:
                 offset = M_Offset_AI_FIFO_Clear;
@@ -1381,8 +1384,9 @@ static void m_series_stc_writew(struct comedi_device *dev, uint16_t data,
                 /* FIXME: DIO_Output_Register (16 bit reg) is replaced by M_Offset_Static_Digital_Output (32 bit)
                    and M_Offset_SCXI_Serial_Data_Out (8 bit) */
         default:
-                printk(KERN_WARNING "%s: bug! unhandled register=0x%x in switch.\n",
-                       __func__, reg);
+                dev_warn(dev->class_dev,
+                         "%s: bug! unhandled register=0x%x in switch.\n",
+                         __func__, reg);
                 BUG();
                 return;
                 break;
@@ -1392,7 +1396,9 @@ static void m_series_stc_writew(struct comedi_device *dev, uint16_t data,
 
 static uint16_t m_series_stc_readw(struct comedi_device *dev, int reg)
 {
+        struct ni_private *devpriv = dev->private;
         unsigned offset;
+
         switch (reg) {
         case AI_Status_1_Register:
                 offset = M_Offset_AI_Status_1;
@@ -1416,8 +1422,9 @@ static uint16_t m_series_stc_readw(struct comedi_device *dev, int reg)
                 offset = M_Offset_G01_Status;
                 break;
         default:
-                printk(KERN_WARNING "%s: bug! unhandled register=0x%x in switch.\n",
-                       __func__, reg);
+                dev_warn(dev->class_dev,
+                         "%s: bug! unhandled register=0x%x in switch.\n",
+                         __func__, reg);
                 BUG();
                 return 0;
                 break;
@@ -1428,7 +1435,9 @@ static uint16_t m_series_stc_readw(struct comedi_device *dev, int reg)
 static void m_series_stc_writel(struct comedi_device *dev, uint32_t data,
                                 int reg)
 {
+        struct ni_private *devpriv = dev->private;
         unsigned offset;
+
         switch (reg) {
         case AI_SC_Load_A_Registers:
                 offset = M_Offset_AI_SC_Load_A;
@@ -1458,8 +1467,9 @@ static void m_series_stc_writel(struct comedi_device *dev, uint32_t data,
                 offset = M_Offset_G1_Load_B;
                 break;
         default:
-                printk(KERN_WARNING "%s: bug! unhandled register=0x%x in switch.\n",
-                       __func__, reg);
+                dev_warn(dev->class_dev,
+                         "%s: bug! unhandled register=0x%x in switch.\n",
+                         __func__, reg);
                 BUG();
                 return;
                 break;
@@ -1469,7 +1479,9 @@ static void m_series_stc_writel(struct comedi_device *dev, uint32_t data,
 
 static uint32_t m_series_stc_readl(struct comedi_device *dev, int reg)
 {
+        struct ni_private *devpriv = dev->private;
         unsigned offset;
+
         switch (reg) {
         case G_HW_Save_Register(0):
                 offset = M_Offset_G0_HW_Save;
@@ -1484,8 +1496,9 @@ static uint32_t m_series_stc_readl(struct comedi_device *dev, int reg)
                 offset = M_Offset_G1_Save;
                 break;
         default:
-                printk(KERN_WARNING "%s: bug! unhandled register=0x%x in switch.\n",
-                       __func__, reg);
+                dev_warn(dev->class_dev,
+                         "%s: bug! unhandled register=0x%x in switch.\n",
+                         __func__, reg);
                 BUG();
                 return 0;
                 break;
@@ -1516,6 +1529,7 @@ static int pcimio_dio_change(struct comedi_device *dev,
 
 static void m_series_init_eeprom_buffer(struct comedi_device *dev)
 {
+        struct ni_private *devpriv = dev->private;
         static const int Start_Cal_EEPROM = 0x400;
         static const unsigned window_size = 10;
         static const int serial_number_eeprom_offset = 0x4;
@@ -1553,6 +1567,8 @@ static void m_series_init_eeprom_buffer(struct comedi_device *dev)
 
 static void init_6143(struct comedi_device *dev)
 {
+        struct ni_private *devpriv = dev->private;
+
         /*  Disable interrupts */
         devpriv->stc_writew(dev, 0, Interrupt_Control_Register);
 
@@ -1572,10 +1588,12 @@ static void init_6143(struct comedi_device *dev)
 
 static void pcimio_detach(struct comedi_device *dev)
 {
+        struct ni_private *devpriv = dev->private;
+
         mio_common_detach(dev);
         if (dev->irq)
                 free_irq(dev->irq, dev);
-        if (dev->private) {
+        if (devpriv) {
                 mite_free_ring(devpriv->ai_mite_ring);
                 mite_free_ring(devpriv->ao_mite_ring);
                 mite_free_ring(devpriv->cdo_mite_ring);
@@ -1602,16 +1620,19 @@ pcimio_find_boardinfo(struct pci_dev *pcidev)
         return NULL;
 }
 
-static int __devinit pcimio_attach_pci(struct comedi_device *dev,
-                                       struct pci_dev *pcidev)
+static int pcimio_auto_attach(struct comedi_device *dev,
+                                        unsigned long context_unused)
 {
+        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
+        struct ni_private *devpriv;
         int ret;
 
         dev_info(dev->class_dev, "ni_pcimio: attach %s\n", pci_name(pcidev));
 
         ret = ni_alloc_private(dev);
-        if (ret < 0)
+        if (ret)
                 return ret;
+        devpriv = dev->private;
 
         dev->board_ptr = pcimio_find_boardinfo(pcidev);
         if (!dev->board_ptr)
@@ -1641,7 +1662,7 @@ static int __devinit pcimio_attach_pci(struct comedi_device *dev,
                 pr_warn("error setting up mite\n");
                 return ret;
         }
-        comedi_set_hw_dev(dev, &devpriv->mite->pcidev->dev);
+
         devpriv->ai_mite_ring = mite_alloc_ring(devpriv->mite);
         if (devpriv->ai_mite_ring == NULL)
                 return -ENOMEM;
@@ -1693,6 +1714,7 @@ static int __devinit pcimio_attach_pci(struct comedi_device *dev,
 static int pcimio_ai_change(struct comedi_device *dev,
                             struct comedi_subdevice *s, unsigned long new_size)
 {
+        struct ni_private *devpriv = dev->private;
         int ret;
 
         ret = mite_buf_change(devpriv->ai_mite_ring, s->async);
@@ -1705,6 +1727,7 @@ static int pcimio_ai_change(struct comedi_device *dev,
 static int pcimio_ao_change(struct comedi_device *dev,
                             struct comedi_subdevice *s, unsigned long new_size)
 {
+        struct ni_private *devpriv = dev->private;
         int ret;
 
         ret = mite_buf_change(devpriv->ao_mite_ring, s->async);
@@ -1718,6 +1741,7 @@ static int pcimio_gpct0_change(struct comedi_device *dev,
                                struct comedi_subdevice *s,
                                unsigned long new_size)
 {
+        struct ni_private *devpriv = dev->private;
         int ret;
 
         ret = mite_buf_change(devpriv->gpct_mite_ring[0], s->async);
@@ -1731,6 +1755,7 @@ static int pcimio_gpct1_change(struct comedi_device *dev,
                                struct comedi_subdevice *s,
                                unsigned long new_size)
 {
+        struct ni_private *devpriv = dev->private;
         int ret;
 
         ret = mite_buf_change(devpriv->gpct_mite_ring[1], s->async);
@@ -1743,6 +1768,7 @@ static int pcimio_gpct1_change(struct comedi_device *dev,
 static int pcimio_dio_change(struct comedi_device *dev,
                              struct comedi_subdevice *s, unsigned long new_size)
 {
+        struct ni_private *devpriv = dev->private;
         int ret;
 
         ret = mite_buf_change(devpriv->cdo_mite_ring, s->async);
@@ -1755,17 +1781,17 @@ static int pcimio_dio_change(struct comedi_device *dev,
 static struct comedi_driver ni_pcimio_driver = {
         .driver_name    = "ni_pcimio",
         .module         = THIS_MODULE,
-        .attach_pci     = pcimio_attach_pci,
+        .auto_attach    = pcimio_auto_attach,
         .detach         = pcimio_detach,
 };
 
-static int __devinit ni_pcimio_pci_probe(struct pci_dev *dev,
+static int ni_pcimio_pci_probe(struct pci_dev *dev,
                                          const struct pci_device_id *ent)
 {
         return comedi_pci_auto_config(dev, &ni_pcimio_driver);
 }
 
-static void __devexit ni_pcimio_pci_remove(struct pci_dev *dev)
+static void ni_pcimio_pci_remove(struct pci_dev *dev)
 {
         comedi_pci_auto_unconfig(dev);
 }
@@ -1832,7 +1858,7 @@ static struct pci_driver ni_pcimio_pci_driver = {
         .name           = "ni_pcimio",
         .id_table       = ni_pcimio_pci_table,
         .probe          = ni_pcimio_pci_probe,
-        .remove         = __devexit_p(ni_pcimio_pci_remove)
+        .remove         = ni_pcimio_pci_remove
 };
 module_comedi_pci_driver(ni_pcimio_driver, ni_pcimio_pci_driver);
 
diff --git a/drivers/staging/comedi/drivers/ni_tio.h b/drivers/staging/comedi/drivers/ni_tio.h
index b0588202e5ac..8572996539fa 100644
--- a/drivers/staging/comedi/drivers/ni_tio.h
+++ b/drivers/staging/comedi/drivers/ni_tio.h
@@ -120,9 +120,9 @@ struct ni_gpct {
 
 struct ni_gpct_device {
         struct comedi_device *dev;
-        void (*write_register) (struct ni_gpct * counter, unsigned bits,
+        void (*write_register) (struct ni_gpct *counter, unsigned bits,
                                 enum ni_gpct_register reg);
-        unsigned (*read_register) (struct ni_gpct * counter,
+        unsigned (*read_register) (struct ni_gpct *counter,
                                    enum ni_gpct_register reg);
         enum ni_gpct_variant variant;
         struct ni_gpct *counters;
diff --git a/drivers/staging/comedi/drivers/ni_tiocmd.c b/drivers/staging/comedi/drivers/ni_tiocmd.c
index 8ee93d359bed..0c991b99da13 100644
--- a/drivers/staging/comedi/drivers/ni_tiocmd.c
+++ b/drivers/staging/comedi/drivers/ni_tiocmd.c
@@ -173,7 +173,8 @@ 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(KERN_ERR "ni_tio: output commands not yet implemented.\n");
+        dev_err(counter->counter_dev->dev->class_dev,
+                "output commands not yet implemented.\n");
         return -ENOTSUPP;
 
         counter->mite_chan->dir = COMEDI_OUTPUT;
@@ -219,7 +220,10 @@ int ni_tio_cmd(struct ni_gpct *counter, struct comedi_async *async)
 
         spin_lock_irqsave(&counter->lock, flags);
         if (counter->mite_chan == NULL) {
-                printk(KERN_ERR "ni_tio: commands only supported with DMA.  Interrupt-driven commands not yet implemented.\n");
+                dev_err(counter->counter_dev->dev->class_dev,
+                        "commands only supported with DMA.  ");
+                dev_err(counter->counter_dev->dev->class_dev,
+                        "Interrupt-driven commands not yet implemented.\n");
                 retval = -EIO;
         } else {
                 retval = ni_tio_cmd_setup(counter, async);
@@ -271,37 +275,19 @@ int ni_tio_cmdtest(struct ni_gpct *counter, struct comedi_cmd *cmd)
         if (err)
                 return 2;
 
-        /* step 3: make sure arguments are trivially compatible */
-        if (cmd->start_src != TRIG_EXT) {
-                if (cmd->start_arg != 0) {
-                        cmd->start_arg = 0;
-                        err++;
-                }
-        }
-        if (cmd->scan_begin_src != TRIG_EXT) {
-                if (cmd->scan_begin_arg) {
-                        cmd->scan_begin_arg = 0;
-                        err++;
-                }
-        }
-        if (cmd->convert_src != TRIG_EXT) {
-                if (cmd->convert_arg) {
-                        cmd->convert_arg = 0;
-                        err++;
-                }
-        }
+        /* Step 3: check if arguments are trivially valid */
 
-        if (cmd->scan_end_arg != cmd->chanlist_len) {
-                cmd->scan_end_arg = cmd->chanlist_len;
-                err++;
-        }
+        if (cmd->start_src != TRIG_EXT)
+                err |= cfc_check_trigger_arg_is(&cmd->start_arg, 0);
 
-        if (cmd->stop_src == TRIG_NONE) {
-                if (cmd->stop_arg != 0) {
-                        cmd->stop_arg = 0;
-                        err++;
-                }
-        }
+        if (cmd->scan_begin_src != TRIG_EXT)
+                err |= cfc_check_trigger_arg_is(&cmd->scan_begin_arg, 0);
+
+        if (cmd->convert_src != TRIG_EXT)
+                err |= cfc_check_trigger_arg_is(&cmd->convert_arg, 0);
+
+        err |= cfc_check_trigger_arg_is(&cmd->scan_end_arg, cmd->chanlist_len);
+        err |= cfc_check_trigger_arg_is(&cmd->stop_arg, 0);
 
         if (err)
                 return 3;
@@ -427,8 +413,9 @@ 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(KERN_INFO "%s: Gi_Permanent_Stale_Data detected.\n",
-                               __func__);
+                        dev_info(counter->counter_dev->dev->class_dev,
+                                 "%s: Gi_Permanent_Stale_Data detected.\n",
+                                 __func__);
                         if (perm_stale_data)
                                 *perm_stale_data = 1;
                 }
@@ -448,7 +435,8 @@ 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(KERN_NOTICE "%s: Gi_Gate_Error detected.\n", __func__);
+                dev_notice(counter->counter_dev->dev->class_dev,
+                           "%s: Gi_Gate_Error detected.\n", __func__);
                 s->async->events |= COMEDI_CB_OVERFLOW;
         }
         if (perm_stale_data)
@@ -459,8 +447,8 @@ void ni_tio_handle_interrupt(struct ni_gpct *counter,
                 if (read_register(counter,
                                 NITIO_Gi_DMA_Status_Reg
                                 (counter->counter_index)) & Gi_DRQ_Error_Bit) {
-                        printk(KERN_NOTICE "%s: Gi_DRQ_Error detected.\n",
-                                                        __func__);
+                        dev_notice(counter->counter_dev->dev->class_dev,
+                                   "%s: Gi_DRQ_Error detected.\n", __func__);
                         s->async->events |= COMEDI_CB_OVERFLOW;
                 }
                 break;
diff --git a/drivers/staging/comedi/drivers/pcl711.c b/drivers/staging/comedi/drivers/pcl711.c
index 89305a14eb5c..6ee5da24a961 100644
--- a/drivers/staging/comedi/drivers/pcl711.c
+++ b/drivers/staging/comedi/drivers/pcl711.c
@@ -161,14 +161,13 @@ struct pcl711_private {
         unsigned int divisor2;
 };
 
-#define devpriv ((struct pcl711_private *)dev->private)
-
 static irqreturn_t pcl711_interrupt(int irq, void *d)
 {
         int lo, hi;
         int data;
         struct comedi_device *dev = d;
         const struct pcl711_board *board = comedi_board(dev);
+        struct pcl711_private *devpriv = dev->private;
         struct comedi_subdevice *s = &dev->subdevices[0];
 
         if (!dev->attached) {
@@ -264,6 +263,7 @@ ok:
 static int pcl711_ai_cmdtest(struct comedi_device *dev,
                              struct comedi_subdevice *s, struct comedi_cmd *cmd)
 {
+        struct pcl711_private *devpriv = dev->private;
         int tmp;
         int err = 0;
 
@@ -289,38 +289,24 @@ static int pcl711_ai_cmdtest(struct comedi_device *dev,
         if (err)
                 return 2;
 
-        /* step 3 */
+        /* Step 3: check if arguments are trivially valid */
+
+        err |= cfc_check_trigger_arg_is(&cmd->start_arg, 0);
 
-        if (cmd->start_arg != 0) {
-                cmd->start_arg = 0;
-                err++;
-        }
         if (cmd->scan_begin_src == TRIG_EXT) {
-                if (cmd->scan_begin_arg != 0) {
-                        cmd->scan_begin_arg = 0;
-                        err++;
-                }
+                err |= cfc_check_trigger_arg_is(&cmd->scan_begin_arg, 0);
         } else {
 #define MAX_SPEED 1000
 #define TIMER_BASE 100
-                if (cmd->scan_begin_arg < MAX_SPEED) {
-                        cmd->scan_begin_arg = MAX_SPEED;
-                        err++;
-                }
-        }
-        if (cmd->convert_arg != 0) {
-                cmd->convert_arg = 0;
-                err++;
-        }
-        if (cmd->scan_end_arg != cmd->chanlist_len) {
-                cmd->scan_end_arg = cmd->chanlist_len;
-                err++;
+                err |= cfc_check_trigger_arg_min(&cmd->scan_begin_arg,
+                                                 MAX_SPEED);
         }
+
+        err |= cfc_check_trigger_arg_is(&cmd->convert_arg, 0);
+        err |= cfc_check_trigger_arg_is(&cmd->scan_end_arg, cmd->chanlist_len);
+
         if (cmd->stop_src == TRIG_NONE) {
-                if (cmd->stop_arg != 0) {
-                        cmd->stop_arg = 0;
-                        err++;
-                }
+                err |= cfc_check_trigger_arg_is(&cmd->stop_arg, 0);
         } else {
                 /* ignore */
         }
@@ -349,6 +335,7 @@ static int pcl711_ai_cmdtest(struct comedi_device *dev,
 
 static int pcl711_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
 {
+        struct pcl711_private *devpriv = dev->private;
         int timer1, timer2;
         struct comedi_cmd *cmd = &s->async->cmd;
 
@@ -398,6 +385,7 @@ static int pcl711_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
 static int pcl711_ao_insn(struct comedi_device *dev, struct comedi_subdevice *s,
                           struct comedi_insn *insn, unsigned int *data)
 {
+        struct pcl711_private *devpriv = dev->private;
         int n;
         int chan = CR_CHAN(insn->chanspec);
 
@@ -417,6 +405,7 @@ static int pcl711_ao_insn_read(struct comedi_device *dev,
                                struct comedi_subdevice *s,
                                struct comedi_insn *insn, unsigned int *data)
 {
+        struct pcl711_private *devpriv = dev->private;
         int n;
         int chan = CR_CHAN(insn->chanspec);
 
@@ -460,6 +449,7 @@ static int pcl711_do_insn_bits(struct comedi_device *dev,
 static int pcl711_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 {
         const struct pcl711_board *board = comedi_board(dev);
+        struct pcl711_private *devpriv;
         int ret;
         unsigned long iobase;
         unsigned int irq;
@@ -499,9 +489,10 @@ static int pcl711_attach(struct comedi_device *dev, struct comedi_devconfig *it)
         if (ret)
                 return ret;
 
-        ret = alloc_private(dev, sizeof(struct pcl711_private));
-        if (ret < 0)
-                return ret;
+        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
+        if (!devpriv)
+                return -ENOMEM;
+        dev->private = devpriv;
 
         s = &dev->subdevices[0];
         /* AI subdevice */
diff --git a/drivers/staging/comedi/drivers/pcl726.c b/drivers/staging/comedi/drivers/pcl726.c
index 07e72de982ac..50e01968f19c 100644
--- a/drivers/staging/comedi/drivers/pcl726.c
+++ b/drivers/staging/comedi/drivers/pcl726.c
@@ -152,11 +152,10 @@ struct pcl726_private {
         unsigned int ao_readback[12];
 };
 
-#define devpriv ((struct pcl726_private *)dev->private)
-
 static int pcl726_ao_insn(struct comedi_device *dev, struct comedi_subdevice *s,
                           struct comedi_insn *insn, unsigned int *data)
 {
+        struct pcl726_private *devpriv = dev->private;
         int hi, lo;
         int n;
         int chan = CR_CHAN(insn->chanspec);
@@ -183,6 +182,7 @@ static int pcl726_ao_insn_read(struct comedi_device *dev,
                                struct comedi_subdevice *s,
                                struct comedi_insn *insn, unsigned int *data)
 {
+        struct pcl726_private *devpriv = dev->private;
         int chan = CR_CHAN(insn->chanspec);
         int n;
 
@@ -226,6 +226,7 @@ static int pcl726_do_insn_bits(struct comedi_device *dev,
 static int pcl726_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 {
         const struct pcl726_board *board = comedi_board(dev);
+        struct pcl726_private *devpriv;
         struct comedi_subdevice *s;
         unsigned long iobase;
         unsigned int iorange;
@@ -247,9 +248,10 @@ static int pcl726_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 
         dev->board_name = board->name;
 
-        ret = alloc_private(dev, sizeof(struct pcl726_private));
-        if (ret < 0)
+        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
+        if (!devpriv)
                 return -ENOMEM;
+        dev->private = devpriv;
 
         for (i = 0; i < 12; i++) {
                 devpriv->bipolar[i] = 0;
diff --git a/drivers/staging/comedi/drivers/pcl812.c b/drivers/staging/comedi/drivers/pcl812.c
index 3cf55ff93083..560930e6a8e9 100644
--- a/drivers/staging/comedi/drivers/pcl812.c
+++ b/drivers/staging/comedi/drivers/pcl812.c
@@ -369,8 +369,6 @@ struct pcl812_private {
         unsigned int ao_readback[2];    /*  data for AO readback */
 };
 
-#define devpriv ((struct pcl812_private *)dev->private)
-
 /*
 ==============================================================================
 */
@@ -388,6 +386,7 @@ static int pcl812_ai_insn_read(struct comedi_device *dev,
                                struct comedi_subdevice *s,
                                struct comedi_insn *insn, unsigned int *data)
 {
+        struct pcl812_private *devpriv = dev->private;
         int n;
         int timeout, hi;
 
@@ -465,6 +464,7 @@ static int pcl812_ao_insn_write(struct comedi_device *dev,
                                 struct comedi_subdevice *s,
                                 struct comedi_insn *insn, unsigned int *data)
 {
+        struct pcl812_private *devpriv = dev->private;
         int chan = CR_CHAN(insn->chanspec);
         int i;
 
@@ -486,6 +486,7 @@ static int pcl812_ao_insn_read(struct comedi_device *dev,
                                struct comedi_subdevice *s,
                                struct comedi_insn *insn, unsigned int *data)
 {
+        struct pcl812_private *devpriv = dev->private;
         int chan = CR_CHAN(insn->chanspec);
         int i;
 
@@ -533,6 +534,7 @@ static int pcl812_ai_cmdtest(struct comedi_device *dev,
                              struct comedi_subdevice *s, struct comedi_cmd *cmd)
 {
         const struct pcl812_board *board = comedi_board(dev);
+        struct pcl812_private *devpriv = dev->private;
         int err = 0;
         unsigned int flags;
         int tmp, divisor1, divisor2;
@@ -563,53 +565,25 @@ static int pcl812_ai_cmdtest(struct comedi_device *dev,
         if (err)
                 return 2;
 
-        /* step 3: make sure arguments are trivially compatible */
+        /* Step 3: check if arguments are trivially valid */
 
-        if (cmd->start_arg != 0) {
-                cmd->start_arg = 0;
-                err++;
-        }
+        err |= cfc_check_trigger_arg_is(&cmd->start_arg, 0);
+        err |= cfc_check_trigger_arg_is(&cmd->scan_begin_arg, 0);
 
-        if (cmd->scan_begin_arg != 0) {
-                cmd->scan_begin_arg = 0;
-                err++;
-        }
+        if (cmd->convert_src == TRIG_TIMER)
+                err |= cfc_check_trigger_arg_min(&cmd->convert_arg,
+                                                 board->ai_ns_min);
+        else    /* TRIG_EXT */
+                err |= cfc_check_trigger_arg_is(&cmd->convert_arg, 0);
 
-        if (cmd->convert_src == TRIG_TIMER) {
-                if (cmd->convert_arg < board->ai_ns_min) {
-                        cmd->convert_arg = board->ai_ns_min;
-                        err++;
-                }
-        } else {                /* TRIG_EXT */
-                if (cmd->convert_arg != 0) {
-                        cmd->convert_arg = 0;
-                        err++;
-                }
-        }
+        err |= cfc_check_trigger_arg_min(&cmd->chanlist_len, 1);
+        err |= cfc_check_trigger_arg_max(&cmd->chanlist_len, MAX_CHANLIST_LEN);
+        err |= cfc_check_trigger_arg_is(&cmd->scan_end_arg, cmd->chanlist_len);
 
-        if (!cmd->chanlist_len) {
-                cmd->chanlist_len = 1;
-                err++;
-        }
-        if (cmd->chanlist_len > MAX_CHANLIST_LEN) {
-                cmd->chanlist_len = board->n_aichan;
-                err++;
-        }
-        if (cmd->scan_end_arg != cmd->chanlist_len) {
-                cmd->scan_end_arg = cmd->chanlist_len;
-                err++;
-        }
-        if (cmd->stop_src == TRIG_COUNT) {
-                if (!cmd->stop_arg) {
-                        cmd->stop_arg = 1;
-                        err++;
-                }
-        } else {                /* TRIG_NONE */
-                if (cmd->stop_arg != 0) {
-                        cmd->stop_arg = 0;
-                        err++;
-                }
-        }
+        if (cmd->stop_src == TRIG_COUNT)
+                err |= cfc_check_trigger_arg_min(&cmd->stop_arg, 1);
+        else    /* TRIG_NONE */
+                err |= cfc_check_trigger_arg_is(&cmd->stop_arg, 0);
 
         if (err)
                 return 3;
@@ -639,6 +613,7 @@ static int pcl812_ai_cmdtest(struct comedi_device *dev,
 static int pcl812_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
 {
         const struct pcl812_board *board = comedi_board(dev);
+        struct pcl812_private *devpriv = dev->private;
         unsigned int divisor1 = 0, divisor2 = 0, i, dma_flags, bytes;
         struct comedi_cmd *cmd = &s->async->cmd;
 
@@ -789,6 +764,7 @@ static irqreturn_t interrupt_pcl812_ai_int(int irq, void *d)
         char err = 1;
         unsigned int mask, timeout;
         struct comedi_device *dev = d;
+        struct pcl812_private *devpriv = dev->private;
         struct comedi_subdevice *s = &dev->subdevices[0];
         unsigned int next_chan;
 
@@ -862,6 +838,7 @@ static void transfer_from_dma_buf(struct comedi_device *dev,
                                   struct comedi_subdevice *s, short *ptr,
                                   unsigned int bufptr, unsigned int len)
 {
+        struct pcl812_private *devpriv = dev->private;
         unsigned int i;
 
         s->async->events = 0;
@@ -892,6 +869,7 @@ static void transfer_from_dma_buf(struct comedi_device *dev,
 static irqreturn_t interrupt_pcl812_ai_dma(int irq, void *d)
 {
         struct comedi_device *dev = d;
+        struct pcl812_private *devpriv = dev->private;
         struct comedi_subdevice *s = &dev->subdevices[0];
         unsigned long dma_flags;
         int len, bufptr;
@@ -938,6 +916,7 @@ static irqreturn_t interrupt_pcl812_ai_dma(int irq, void *d)
 static irqreturn_t interrupt_pcl812(int irq, void *d)
 {
         struct comedi_device *dev = d;
+        struct pcl812_private *devpriv = dev->private;
 
         if (!dev->attached) {
                 comedi_error(dev, "spurious interrupt");
@@ -954,6 +933,7 @@ static irqreturn_t interrupt_pcl812(int irq, void *d)
 */
 static int pcl812_ai_poll(struct comedi_device *dev, struct comedi_subdevice *s)
 {
+        struct pcl812_private *devpriv = dev->private;
         unsigned long flags;
         unsigned int top1, top2, i;
 
@@ -1002,6 +982,7 @@ static void setup_range_channel(struct comedi_device *dev,
                                 struct comedi_subdevice *s,
                                 unsigned int rangechan, char wait)
 {
+        struct pcl812_private *devpriv = dev->private;
         unsigned char chan_reg = CR_CHAN(rangechan);    /*  normal board */
                                                         /*  gain index */
         unsigned char gain_reg = CR_RANGE(rangechan) +
@@ -1063,8 +1044,9 @@ static void start_pacer(struct comedi_device *dev, int mode,
 static void free_resources(struct comedi_device *dev)
 {
         const struct pcl812_board *board = comedi_board(dev);
+        struct pcl812_private *devpriv = dev->private;
 
-        if (dev->private) {
+        if (devpriv) {
                 if (devpriv->dmabuf[0])
                         free_pages(devpriv->dmabuf[0], devpriv->dmapages[0]);
                 if (devpriv->dmabuf[1])
@@ -1084,6 +1066,8 @@ static void free_resources(struct comedi_device *dev)
 static int pcl812_ai_cancel(struct comedi_device *dev,
                             struct comedi_subdevice *s)
 {
+        struct pcl812_private *devpriv = dev->private;
+
         if (devpriv->ai_dma)
                 disable_dma(devpriv->dma);
         outb(0, dev->iobase + PCL812_CLRINT);   /* clear INT request */
@@ -1100,6 +1084,7 @@ static int pcl812_ai_cancel(struct comedi_device *dev,
 static void pcl812_reset(struct comedi_device *dev)
 {
         const struct pcl812_board *board = comedi_board(dev);
+        struct pcl812_private *devpriv = dev->private;
 
         outb(0, dev->iobase + PCL812_MUX);
         outb(0 + devpriv->range_correction, dev->iobase + PCL812_GAIN);
@@ -1135,6 +1120,7 @@ static void pcl812_reset(struct comedi_device *dev)
 static int pcl812_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 {
         const struct pcl812_board *board = comedi_board(dev);
+        struct pcl812_private *devpriv;
         int ret, subdev;
         unsigned long iobase;
         unsigned int irq;
@@ -1153,11 +1139,12 @@ static int pcl812_attach(struct comedi_device *dev, struct comedi_devconfig *it)
         }
         dev->iobase = iobase;
 
-        ret = alloc_private(dev, sizeof(struct pcl812_private));
-        if (ret < 0) {
+        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
+        if (!devpriv) {
                 free_resources(dev);
-                return ret;     /* Can't alloc mem */
+                return -ENOMEM;
         }
+        dev->private = devpriv;
 
         dev->board_name = board->name;
 
diff --git a/drivers/staging/comedi/drivers/pcl816.c b/drivers/staging/comedi/drivers/pcl816.c
index 0822de058e4d..f625fdab335c 100644
--- a/drivers/staging/comedi/drivers/pcl816.c
+++ b/drivers/staging/comedi/drivers/pcl816.c
@@ -126,8 +126,6 @@ struct pcl816_board {
         int i8254_osc_base;     /*  1/frequency of on board oscilator in ns */
 };
 
-#define devpriv ((struct pcl816_private *)dev->private)
-
 #ifdef unused
 static int RTC_lock;    /* RTC lock */
 static int RTC_timer_lock;      /* RTC int lock */
@@ -259,6 +257,7 @@ static int pcl816_ai_insn_read(struct comedi_device *dev,
 static irqreturn_t interrupt_pcl816_ai_mode13_int(int irq, void *d)
 {
         struct comedi_device *dev = d;
+        struct pcl816_private *devpriv = dev->private;
         struct comedi_subdevice *s = &dev->subdevices[0];
         int low, hi;
         int timeout = 50;       /* wait max 50us */
@@ -315,6 +314,7 @@ static void transfer_from_dma_buf(struct comedi_device *dev,
                                   struct comedi_subdevice *s, short *ptr,
                                   unsigned int bufptr, unsigned int len)
 {
+        struct pcl816_private *devpriv = dev->private;
         int i;
 
         s->async->events = 0;
@@ -350,6 +350,7 @@ static void transfer_from_dma_buf(struct comedi_device *dev,
 static irqreturn_t interrupt_pcl816_ai_mode13_dma(int irq, void *d)
 {
         struct comedi_device *dev = d;
+        struct pcl816_private *devpriv = dev->private;
         struct comedi_subdevice *s = &dev->subdevices[0];
         int len, bufptr, this_dma_buf;
         unsigned long dma_flags;
@@ -398,6 +399,8 @@ static irqreturn_t interrupt_pcl816_ai_mode13_dma(int irq, void *d)
 static irqreturn_t interrupt_pcl816(int irq, void *d)
 {
         struct comedi_device *dev = d;
+        struct pcl816_private *devpriv = dev->private;
+
         DPRINTK("<I>");
 
         if (!dev->attached) {
@@ -481,43 +484,23 @@ static int pcl816_ai_cmdtest(struct comedi_device *dev,
                 return 2;
 
 
-        /* step 3: make sure arguments are trivially compatible */
-        if (cmd->start_arg != 0) {
-                cmd->start_arg = 0;
-                err++;
-        }
+        /* Step 3: check if arguments are trivially valid */
 
-        if (cmd->scan_begin_arg != 0) {
-                cmd->scan_begin_arg = 0;
-                err++;
-        }
-        if (cmd->convert_src == TRIG_TIMER) {
-                if (cmd->convert_arg < board->ai_ns_min) {
-                        cmd->convert_arg = board->ai_ns_min;
-                        err++;
-                }
-        } else {                /* TRIG_EXT */
-                if (cmd->convert_arg != 0) {
-                        cmd->convert_arg = 0;
-                        err++;
-                }
-        }
+        err |= cfc_check_trigger_arg_is(&cmd->start_arg, 0);
+        err |= cfc_check_trigger_arg_is(&cmd->scan_begin_arg, 0);
 
-        if (cmd->scan_end_arg != cmd->chanlist_len) {
-                cmd->scan_end_arg = cmd->chanlist_len;
-                err++;
-        }
-        if (cmd->stop_src == TRIG_COUNT) {
-                if (!cmd->stop_arg) {
-                        cmd->stop_arg = 1;
-                        err++;
-                }
-        } else {                /* TRIG_NONE */
-                if (cmd->stop_arg != 0) {
-                        cmd->stop_arg = 0;
-                        err++;
-                }
-        }
+        if (cmd->convert_src == TRIG_TIMER)
+                err |= cfc_check_trigger_arg_min(&cmd->convert_arg,
+                                                 board->ai_ns_min);
+        else    /* TRIG_EXT */
+                err |= cfc_check_trigger_arg_is(&cmd->convert_arg, 0);
+
+        err |= cfc_check_trigger_arg_is(&cmd->scan_end_arg, cmd->chanlist_len);
+
+        if (cmd->stop_src == TRIG_COUNT)
+                err |= cfc_check_trigger_arg_min(&cmd->stop_arg, 1);
+        else    /* TRIG_NONE */
+                err |= cfc_check_trigger_arg_is(&cmd->stop_arg, 0);
 
         if (err)
                 return 3;
@@ -554,6 +537,7 @@ static int pcl816_ai_cmdtest(struct comedi_device *dev,
 static int pcl816_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
 {
         const struct pcl816_board *board = comedi_board(dev);
+        struct pcl816_private *devpriv = dev->private;
         unsigned int divisor1 = 0, divisor2 = 0, dma_flags, bytes, dmairq;
         struct comedi_cmd *cmd = &s->async->cmd;
         unsigned int seglen;
@@ -682,6 +666,7 @@ static int pcl816_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
 
 static int pcl816_ai_poll(struct comedi_device *dev, struct comedi_subdevice *s)
 {
+        struct pcl816_private *devpriv = dev->private;
         unsigned long flags;
         unsigned int top1, top2, i;
 
@@ -727,6 +712,8 @@ static int pcl816_ai_poll(struct comedi_device *dev, struct comedi_subdevice *s)
 static int pcl816_ai_cancel(struct comedi_device *dev,
                             struct comedi_subdevice *s)
 {
+        struct pcl816_private *devpriv = dev->private;
+
 /* DEBUG(printk("pcl816_ai_cancel()\n");) */
 
         if (devpriv->irq_blocked > 0) {
@@ -932,6 +919,7 @@ setup_channel_list(struct comedi_device *dev,
                    struct comedi_subdevice *s, unsigned int *chanlist,
                    unsigned int seglen)
 {
+        struct pcl816_private *devpriv = dev->private;
         unsigned int i;
 
         devpriv->ai_act_chanlist_len = seglen;
@@ -991,6 +979,7 @@ static int set_rtc_irq_bit(unsigned char bit)
 static int pcl816_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 {
         const struct pcl816_board *board = comedi_board(dev);
+        struct pcl816_private *devpriv;
         int ret;
         unsigned long iobase;
         unsigned int irq, dma;
@@ -1015,9 +1004,10 @@ static int pcl816_attach(struct comedi_device *dev, struct comedi_devconfig *it)
                 return -EIO;
         }
 
-        ret = alloc_private(dev, sizeof(struct pcl816_private));
-        if (ret < 0)
-                return ret;     /* Can't alloc mem */
+        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
+        if (!devpriv)
+                return -ENOMEM;
+        dev->private = devpriv;
 
         dev->board_name = board->name;
 
@@ -1216,6 +1206,7 @@ case COMEDI_SUBD_DO:
 static void pcl816_detach(struct comedi_device *dev)
 {
         const struct pcl816_board *board = comedi_board(dev);
+        struct pcl816_private *devpriv = dev->private;
 
         if (dev->private) {
                 pcl816_ai_cancel(dev, devpriv->sub_ai);
diff --git a/drivers/staging/comedi/drivers/pcl818.c b/drivers/staging/comedi/drivers/pcl818.c
index d4b0859d81f2..06127a5f62a0 100644
--- a/drivers/staging/comedi/drivers/pcl818.c
+++ b/drivers/staging/comedi/drivers/pcl818.c
@@ -326,8 +326,6 @@ static const unsigned int muxonechan[] = { 0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0
         0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff
 };
 
-#define devpriv ((struct pcl818_private *)dev->private)
-
 /*
 ==============================================================================
 */
@@ -406,6 +404,7 @@ static int pcl818_ao_insn_read(struct comedi_device *dev,
                                struct comedi_subdevice *s,
                                struct comedi_insn *insn, unsigned int *data)
 {
+        struct pcl818_private *devpriv = dev->private;
         int n;
         int chan = CR_CHAN(insn->chanspec);
 
@@ -419,6 +418,7 @@ static int pcl818_ao_insn_write(struct comedi_device *dev,
                                 struct comedi_subdevice *s,
                                 struct comedi_insn *insn, unsigned int *data)
 {
+        struct pcl818_private *devpriv = dev->private;
         int n;
         int chan = CR_CHAN(insn->chanspec);
 
@@ -478,6 +478,7 @@ static int pcl818_do_insn_bits(struct comedi_device *dev,
 static irqreturn_t interrupt_pcl818_ai_mode13_int(int irq, void *d)
 {
         struct comedi_device *dev = d;
+        struct pcl818_private *devpriv = dev->private;
         struct comedi_subdevice *s = &dev->subdevices[0];
         int low;
         int timeout = 50;       /* wait max 50us */
@@ -537,6 +538,7 @@ conv_finish:
 static irqreturn_t interrupt_pcl818_ai_mode13_dma(int irq, void *d)
 {
         struct comedi_device *dev = d;
+        struct pcl818_private *devpriv = dev->private;
         struct comedi_subdevice *s = &dev->subdevices[0];
         int i, len, bufptr;
         unsigned long flags;
@@ -616,6 +618,7 @@ static irqreturn_t interrupt_pcl818_ai_mode13_dma(int irq, void *d)
 static irqreturn_t interrupt_pcl818_ai_mode13_dma_rtc(int irq, void *d)
 {
         struct comedi_device *dev = d;
+        struct pcl818_private *devpriv = dev->private;
         struct comedi_subdevice *s = &dev->subdevices[0];
         unsigned long tmp;
         unsigned int top1, top2, i, bufptr;
@@ -721,6 +724,7 @@ static irqreturn_t interrupt_pcl818_ai_mode13_dma_rtc(int irq, void *d)
 static irqreturn_t interrupt_pcl818_ai_mode13_fifo(int irq, void *d)
 {
         struct comedi_device *dev = d;
+        struct pcl818_private *devpriv = dev->private;
         struct comedi_subdevice *s = &dev->subdevices[0];
         int i, len, lo;
 
@@ -795,6 +799,7 @@ static irqreturn_t interrupt_pcl818_ai_mode13_fifo(int irq, void *d)
 static irqreturn_t interrupt_pcl818(int irq, void *d)
 {
         struct comedi_device *dev = d;
+        struct pcl818_private *devpriv = dev->private;
 
         if (!dev->attached) {
                 comedi_error(dev, "premature interrupt");
@@ -861,6 +866,7 @@ static irqreturn_t interrupt_pcl818(int irq, void *d)
 static void pcl818_ai_mode13dma_int(int mode, struct comedi_device *dev,
                                     struct comedi_subdevice *s)
 {
+        struct pcl818_private *devpriv = dev->private;
         unsigned int flags;
         unsigned int bytes;
 
@@ -902,6 +908,7 @@ static void pcl818_ai_mode13dma_int(int mode, struct comedi_device *dev,
 static void pcl818_ai_mode13dma_rtc(int mode, struct comedi_device *dev,
                                     struct comedi_subdevice *s)
 {
+        struct pcl818_private *devpriv = dev->private;
         unsigned int flags;
         short *pole;
 
@@ -943,6 +950,7 @@ static void pcl818_ai_mode13dma_rtc(int mode, struct comedi_device *dev,
 static int pcl818_ai_cmd_mode(int mode, struct comedi_device *dev,
                               struct comedi_subdevice *s)
 {
+        struct pcl818_private *devpriv = dev->private;
         struct comedi_cmd *cmd = &s->async->cmd;
         int divisor1 = 0, divisor2 = 0;
         unsigned int seglen;
@@ -1063,6 +1071,7 @@ static int pcl818_ai_cmd_mode(int mode, struct comedi_device *dev,
 static int pcl818_ao_mode13(int mode, struct comedi_device *dev,
                             struct comedi_subdevice *s, comedi_trig * it)
 {
+        struct pcl818_private *devpriv = dev->private;
         int divisor1 = 0, divisor2 = 0;
 
         if (!dev->irq) {
@@ -1222,6 +1231,7 @@ static void setup_channel_list(struct comedi_device *dev,
                                unsigned int *chanlist, unsigned int n_chan,
                                unsigned int seglen)
 {
+        struct pcl818_private *devpriv = dev->private;
         int i;
 
         devpriv->act_chanlist_len = seglen;
@@ -1259,6 +1269,7 @@ static int ai_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s,
                       struct comedi_cmd *cmd)
 {
         const struct pcl818_board *board = comedi_board(dev);
+        struct pcl818_private *devpriv = dev->private;
         int err = 0;
         int tmp, divisor1 = 0, divisor2 = 0;
 
@@ -1283,45 +1294,23 @@ static int ai_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s,
         if (err)
                 return 2;
 
-        /* step 3: make sure arguments are trivially compatible */
+        /* Step 3: check if arguments are trivially valid */
 
-        if (cmd->start_arg != 0) {
-                cmd->start_arg = 0;
-                err++;
-        }
+        err |= cfc_check_trigger_arg_is(&cmd->start_arg, 0);
+        err |= cfc_check_trigger_arg_is(&cmd->scan_begin_arg, 0);
 
-        if (cmd->scan_begin_arg != 0) {
-                cmd->scan_begin_arg = 0;
-                err++;
-        }
+        if (cmd->convert_src == TRIG_TIMER)
+                err |= cfc_check_trigger_arg_min(&cmd->convert_arg,
+                                                 board->ns_min);
+        else    /* TRIG_EXT */
+                err |= cfc_check_trigger_arg_is(&cmd->convert_arg, 0);
 
-        if (cmd->convert_src == TRIG_TIMER) {
-                if (cmd->convert_arg < board->ns_min) {
-                        cmd->convert_arg = board->ns_min;
-                        err++;
-                }
-        } else {                /* TRIG_EXT */
-                if (cmd->convert_arg != 0) {
-                        cmd->convert_arg = 0;
-                        err++;
-                }
-        }
+        err |= cfc_check_trigger_arg_is(&cmd->scan_end_arg, cmd->chanlist_len);
 
-        if (cmd->scan_end_arg != cmd->chanlist_len) {
-                cmd->scan_end_arg = cmd->chanlist_len;
-                err++;
-        }
-        if (cmd->stop_src == TRIG_COUNT) {
-                if (!cmd->stop_arg) {
-                        cmd->stop_arg = 1;
-                        err++;
-                }
-        } else {                /* TRIG_NONE */
-                if (cmd->stop_arg != 0) {
-                        cmd->stop_arg = 0;
-                        err++;
-                }
-        }
+        if (cmd->stop_src == TRIG_COUNT)
+                err |= cfc_check_trigger_arg_min(&cmd->stop_arg, 1);
+        else    /* TRIG_NONE */
+                err |= cfc_check_trigger_arg_is(&cmd->stop_arg, 0);
 
         if (err)
                 return 3;
@@ -1358,6 +1347,7 @@ static int ai_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s,
 */
 static int ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
 {
+        struct pcl818_private *devpriv = dev->private;
         struct comedi_cmd *cmd = &s->async->cmd;
         int retval;
 
@@ -1397,6 +1387,8 @@ static int ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
 static int pcl818_ai_cancel(struct comedi_device *dev,
                             struct comedi_subdevice *s)
 {
+        struct pcl818_private *devpriv = dev->private;
+
         if (devpriv->irq_blocked > 0) {
                 dev_dbg(dev->class_dev, "pcl818_ai_cancel()\n");
                 devpriv->irq_was_now_closed = 1;
@@ -1482,6 +1474,7 @@ static int pcl818_check(unsigned long iobase)
 static void pcl818_reset(struct comedi_device *dev)
 {
         const struct pcl818_board *board = comedi_board(dev);
+        struct pcl818_private *devpriv = dev->private;
 
         if (devpriv->usefifo) { /*  FIFO shutdown */
                 outb(0, dev->iobase + PCL818_FI_INTCLR);
@@ -1552,6 +1545,7 @@ static int set_rtc_irq_bit(unsigned char bit)
 static void rtc_dropped_irq(unsigned long data)
 {
         struct comedi_device *dev = (void *)data;
+        struct pcl818_private *devpriv = dev->private;
         unsigned long flags, tmp;
 
         switch (devpriv->int818_mode) {
@@ -1601,6 +1595,7 @@ static int rtc_setfreq_irq(int freq)
 static int pcl818_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 {
         const struct pcl818_board *board = comedi_board(dev);
+        struct pcl818_private *devpriv;
         int ret;
         unsigned long iobase;
         unsigned int irq;
@@ -1608,9 +1603,10 @@ static int pcl818_attach(struct comedi_device *dev, struct comedi_devconfig *it)
         unsigned long pages;
         struct comedi_subdevice *s;
 
-        ret = alloc_private(dev, sizeof(struct pcl818_private));
-        if (ret < 0)
-                return ret;     /* Can't alloc mem */
+        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
+        if (!devpriv)
+                return -ENOMEM;
+        dev->private = devpriv;
 
         /* claim our I/O space */
         iobase = it->options[0];
@@ -1892,7 +1888,9 @@ no_dma:
 
 static void pcl818_detach(struct comedi_device *dev)
 {
-        if (dev->private) {
+        struct pcl818_private *devpriv = dev->private;
+
+        if (devpriv) {
                 pcl818_ai_cancel(dev, devpriv->sub_ai);
                 pcl818_reset(dev);
                 if (devpriv->dma)
diff --git a/drivers/staging/comedi/drivers/pcm3724.c b/drivers/staging/comedi/drivers/pcm3724.c
index 4102547dc6a8..5f062df1ead4 100644
--- a/drivers/staging/comedi/drivers/pcm3724.c
+++ b/drivers/staging/comedi/drivers/pcm3724.c
@@ -62,14 +62,6 @@ Copy/pasted/hacked from pcm724.c
 #define CR_A_MODE(a)    ((a)<<5)
 #define CR_CW           0x80
 
-struct pcm3724_board {
-        const char *name;       /*  driver name */
-        int dio;                /*  num of DIO */
-        int numofports;         /*  num of 8255 subdevices */
-        unsigned int IRQbits;   /*  allowed interrupts */
-        unsigned int io_range;  /*  len of IO space */
-};
-
 /* used to track configured dios */
 struct priv_pcm3724 {
         int dio_1;
@@ -156,13 +148,12 @@ static void do_3724_config(struct comedi_device *dev,
 static void enable_chan(struct comedi_device *dev, struct comedi_subdevice *s,
                         int chanspec)
 {
+        struct priv_pcm3724 *priv = dev->private;
         struct comedi_subdevice *s_dio1 = &dev->subdevices[0];
         unsigned int mask;
         int gatecfg;
-        struct priv_pcm3724 *priv;
 
         gatecfg = 0;
-        priv = dev->private;
 
         mask = 1 << CR_CHAN(chanspec);
         if (s == s_dio1)
@@ -233,36 +224,33 @@ static int subdev_3724_insn_config(struct comedi_device *dev,
 static int pcm3724_attach(struct comedi_device *dev,
                           struct comedi_devconfig *it)
 {
-        const struct pcm3724_board *board = comedi_board(dev);
+        struct priv_pcm3724 *priv;
         struct comedi_subdevice *s;
         unsigned long iobase;
         unsigned int iorange;
-        int ret, i, n_subdevices;
+        int ret, i;
+
+        dev->board_name = dev->driver->driver_name;
 
         iobase = it->options[0];
-        iorange = board->io_range;
+        iorange = PCM3724_SIZE;
 
-        ret = alloc_private(dev, sizeof(struct priv_pcm3724));
-        if (ret < 0)
+        priv = kzalloc(sizeof(*priv), GFP_KERNEL);
+        if (!priv)
                 return -ENOMEM;
-
-        ((struct priv_pcm3724 *)(dev->private))->dio_1 = 0;
-        ((struct priv_pcm3724 *)(dev->private))->dio_2 = 0;
+        dev->private = priv;
 
         printk(KERN_INFO "comedi%d: pcm3724: board=%s, 0x%03lx ", dev->minor,
-               board->name, iobase);
+               dev->board_name, iobase);
         if (!iobase || !request_region(iobase, iorange, "pcm3724")) {
                 printk("I/O port conflict\n");
                 return -EIO;
         }
 
         dev->iobase = iobase;
-        dev->board_name = board->name;
         printk(KERN_INFO "\n");
 
-        n_subdevices = board->numofports;
-
-        ret = comedi_alloc_subdevices(dev, n_subdevices);
+        ret = comedi_alloc_subdevices(dev, 2);
         if (ret)
                 return ret;
 
@@ -277,7 +265,6 @@ static int pcm3724_attach(struct comedi_device *dev,
 
 static void pcm3724_detach(struct comedi_device *dev)
 {
-        const struct pcm3724_board *board = comedi_board(dev);
         struct comedi_subdevice *s;
         int i;
 
@@ -288,21 +275,14 @@ static void pcm3724_detach(struct comedi_device *dev)
                 }
         }
         if (dev->iobase)
-                release_region(dev->iobase, board->io_range);
+                release_region(dev->iobase, PCM3724_SIZE);
 }
 
-static const struct pcm3724_board boardtypes[] = {
-        { "pcm3724", 48, 2, 0x00fc, PCM3724_SIZE, },
-};
-
 static struct comedi_driver pcm3724_driver = {
         .driver_name    = "pcm3724",
         .module         = THIS_MODULE,
         .attach         = pcm3724_attach,
         .detach         = pcm3724_detach,
-        .board_name     = &boardtypes[0].name,
-        .num_names      = ARRAY_SIZE(boardtypes),
-        .offset         = sizeof(struct pcm3724_board),
 };
 module_comedi_driver(pcm3724_driver);
 
diff --git a/drivers/staging/comedi/drivers/pcm_common.c b/drivers/staging/comedi/drivers/pcm_common.c
index 85ee05ece9c8..8a718aea6f3c 100644
--- a/drivers/staging/comedi/drivers/pcm_common.c
+++ b/drivers/staging/comedi/drivers/pcm_common.c
@@ -29,41 +29,19 @@ int comedi_pcm_cmdtest(struct comedi_device *dev,
         if (err)
                 return 2;
 
-        /* step 3: make sure arguments are trivially compatible */
+        /* Step 3: check if arguments are trivially valid */
 
-        /* cmd->start_src == TRIG_NOW || cmd->start_src == TRIG_INT */
-        if (cmd->start_arg != 0) {
-                cmd->start_arg = 0;
-                err++;
-        }
-
-        /* cmd->scan_begin_src == TRIG_EXT */
-        if (cmd->scan_begin_arg != 0) {
-                cmd->scan_begin_arg = 0;
-                err++;
-        }
-
-        /* cmd->convert_src == TRIG_NOW */
-        if (cmd->convert_arg != 0) {
-                cmd->convert_arg = 0;
-                err++;
-        }
-
-        /* cmd->scan_end_src == TRIG_COUNT */
-        if (cmd->scan_end_arg != cmd->chanlist_len) {
-                cmd->scan_end_arg = cmd->chanlist_len;
-                err++;
-        }
+        err |= cfc_check_trigger_arg_is(&cmd->start_arg, 0);
+        err |= cfc_check_trigger_arg_is(&cmd->scan_begin_arg, 0);
+        err |= cfc_check_trigger_arg_is(&cmd->convert_arg, 0);
+        err |= cfc_check_trigger_arg_is(&cmd->scan_end_arg, cmd->chanlist_len);
 
         switch (cmd->stop_src) {
         case TRIG_COUNT:
                 /* any count allowed */
                 break;
         case TRIG_NONE:
-                if (cmd->stop_arg != 0) {
-                        cmd->stop_arg = 0;
-                        err++;
-                }
+                err |= cfc_check_trigger_arg_is(&cmd->stop_arg, 0);
                 break;
         default:
                 break;
diff --git a/drivers/staging/comedi/drivers/pcmad.c b/drivers/staging/comedi/drivers/pcmad.c
index 5efeb9205c2e..13e84215fac3 100644
--- a/drivers/staging/comedi/drivers/pcmad.c
+++ b/drivers/staging/comedi/drivers/pcmad.c
@@ -62,7 +62,6 @@ struct pcmad_priv_struct {
         int differential;
         int twos_comp;
 };
-#define devpriv ((struct pcmad_priv_struct *)dev->private)
 
 #define TIMEOUT 100
 
@@ -71,6 +70,7 @@ static int pcmad_ai_insn_read(struct comedi_device *dev,
                               struct comedi_insn *insn, unsigned int *data)
 {
         const struct pcmad_board_struct *board = comedi_board(dev);
+        struct pcmad_priv_struct *devpriv = dev->private;
         int i;
         int chan;
         int n;
@@ -104,6 +104,7 @@ static int pcmad_ai_insn_read(struct comedi_device *dev,
 static int pcmad_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 {
         const struct pcmad_board_struct *board = comedi_board(dev);
+        struct pcmad_priv_struct *devpriv;
         int ret;
         struct comedi_subdevice *s;
         unsigned long iobase;
@@ -121,9 +122,10 @@ static int pcmad_attach(struct comedi_device *dev, struct comedi_devconfig *it)
         if (ret)
                 return ret;
 
-        ret = alloc_private(dev, sizeof(struct pcmad_priv_struct));
-        if (ret < 0)
-                return ret;
+        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
+        if (!devpriv)
+                return -ENOMEM;
+        dev->private = devpriv;
 
         dev->board_name = board->name;
 
diff --git a/drivers/staging/comedi/drivers/pcmda12.c b/drivers/staging/comedi/drivers/pcmda12.c
index 28af8f6873eb..0882dafaf57b 100644
--- a/drivers/staging/comedi/drivers/pcmda12.c
+++ b/drivers/staging/comedi/drivers/pcmda12.c
@@ -64,13 +64,6 @@ Configuration Options:
 #define MSB_PORT(chan) (LSB_PORT(chan)+1)
 #define BITS 12
 
-/*
- * Bords
- */
-struct pcmda12_board {
-        const char *name;
-};
-
 /* note these have no effect and are merely here for reference..
    these are configured by jumpering the board! */
 static const struct comedi_lrange pcmda12_ranges = {
@@ -86,8 +79,6 @@ struct pcmda12_private {
         int simultaneous_xfer_mode;
 };
 
-#define devpriv ((struct pcmda12_private *)(dev->private))
-
 static void zero_chans(struct comedi_device *dev)
 {                               /* sets up an
                                    ASIC chip to defaults */
@@ -104,6 +95,7 @@ static void zero_chans(struct comedi_device *dev)
 static int ao_winsn(struct comedi_device *dev, struct comedi_subdevice *s,
                     struct comedi_insn *insn, unsigned int *data)
 {
+        struct pcmda12_private *devpriv = dev->private;
         int i;
         int chan = CR_CHAN(insn->chanspec);
 
@@ -146,6 +138,7 @@ static int ao_winsn(struct comedi_device *dev, struct comedi_subdevice *s,
 static int ao_rinsn(struct comedi_device *dev, struct comedi_subdevice *s,
                     struct comedi_insn *insn, unsigned int *data)
 {
+        struct pcmda12_private *devpriv = dev->private;
         int i;
         int chan = CR_CHAN(insn->chanspec);
 
@@ -162,7 +155,7 @@ static int ao_rinsn(struct comedi_device *dev, struct comedi_subdevice *s,
 static int pcmda12_attach(struct comedi_device *dev,
                           struct comedi_devconfig *it)
 {
-        const struct pcmda12_board *board = comedi_board(dev);
+        struct pcmda12_private *devpriv;
         struct comedi_subdevice *s;
         unsigned long iobase;
         int ret;
@@ -178,16 +171,12 @@ static int pcmda12_attach(struct comedi_device *dev,
         }
         dev->iobase = iobase;
 
-        dev->board_name = board->name;
+        dev->board_name = dev->driver->driver_name;
 
-/*
- * Allocate the private structure area.  alloc_private() is a
- * convenient macro defined in comedidev.h.
- */
-        if (alloc_private(dev, sizeof(struct pcmda12_private)) < 0) {
-                printk(KERN_ERR "cannot allocate private data structure\n");
+        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
+        if (!devpriv)
                 return -ENOMEM;
-        }
+        dev->private = devpriv;
 
         devpriv->simultaneous_xfer_mode = it->options[1];
 
@@ -218,20 +207,11 @@ static void pcmda12_detach(struct comedi_device *dev)
                 release_region(dev->iobase, IOSIZE);
 }
 
-static const struct pcmda12_board pcmda12_boards[] = {
-        {
-                .name   = "pcmda12",
-        },
-};
-
 static struct comedi_driver pcmda12_driver = {
         .driver_name    = "pcmda12",
         .module         = THIS_MODULE,
         .attach         = pcmda12_attach,
         .detach         = pcmda12_detach,
-        .board_name     = &pcmda12_boards[0].name,
-        .offset         = sizeof(struct pcmda12_board),
-        .num_names      = ARRAY_SIZE(pcmda12_boards),
 };
 module_comedi_driver(pcmda12_driver);
 
diff --git a/drivers/staging/comedi/drivers/pcmmio.c b/drivers/staging/comedi/drivers/pcmmio.c
index a10bf0a2987f..7522bfb6db08 100644
--- a/drivers/staging/comedi/drivers/pcmmio.c
+++ b/drivers/staging/comedi/drivers/pcmmio.c
@@ -145,35 +145,6 @@ Configuration Options:
 #define PAGE_ENAB 2
 #define PAGE_INT_ID 3
 
-/*
- * Board descriptions for two imaginary boards.  Describing the
- * boards in this way is optional, and completely driver-dependent.
- * Some drivers use arrays such as this, other do not.
- */
-struct pcmmio_board {
-        const char *name;
-        const int dio_num_asics;
-        const int dio_num_ports;
-        const int total_iosize;
-        const int ai_bits;
-        const int ao_bits;
-        const int n_ai_chans;
-        const int n_ao_chans;
-        const struct comedi_lrange *ai_range_table, *ao_range_table;
-        int (*ai_rinsn) (struct comedi_device *dev,
-                        struct comedi_subdevice *s,
-                        struct comedi_insn *insn,
-                        unsigned int *data);
-        int (*ao_rinsn) (struct comedi_device *dev,
-                        struct comedi_subdevice *s,
-                        struct comedi_insn *insn,
-                        unsigned int *data);
-        int (*ao_winsn) (struct comedi_device *dev,
-                        struct comedi_subdevice *s,
-                        struct comedi_insn *insn,
-                        unsigned int *data);
-};
-
 static const struct comedi_lrange ranges_ai = {
         4, {RANGE(-5., 5.), RANGE(-10., 10.), RANGE(0., 5.), RANGE(0., 10.)}
 };
@@ -258,11 +229,6 @@ struct pcmmio_private {
         struct pcmmio_subdev_private *sprivs;
 };
 
-/*
- * most drivers define the following macro to make it easy to
- * access the private structure.
- */
-#define devpriv ((struct pcmmio_private *)dev->private)
 #define subpriv ((struct pcmmio_subdev_private *)s->private)
 
 /* DIO devices are slightly special.  Although it is possible to
@@ -416,9 +382,9 @@ static int pcmmio_dio_insn_config(struct comedi_device *dev,
 
 static void switch_page(struct comedi_device *dev, int asic, int page)
 {
-        const struct pcmmio_board *board = comedi_board(dev);
+        struct pcmmio_private *devpriv = dev->private;
 
-        if (asic < 0 || asic >= board->dio_num_asics)
+        if (asic < 0 || asic >= 1)
                 return;         /* paranoia */
         if (page < 0 || page >= NUM_PAGES)
                 return;         /* more paranoia */
@@ -434,10 +400,10 @@ static void switch_page(struct comedi_device *dev, int asic, int page)
 static void init_asics(struct comedi_device *dev)
 {                               /* sets up an
                                    ASIC chip to defaults */
-        const struct pcmmio_board *board = comedi_board(dev);
+        struct pcmmio_private *devpriv = dev->private;
         int asic;
 
-        for (asic = 0; asic < board->dio_num_asics; ++asic) {
+        for (asic = 0; asic < 1; ++asic) {
                 int port, page;
                 unsigned long baseaddr = devpriv->asics[asic].iobase;
 
@@ -472,9 +438,9 @@ static void init_asics(struct comedi_device *dev)
 #ifdef notused
 static void lock_port(struct comedi_device *dev, int asic, int port)
 {
-        const struct pcmmio_board *board = comedi_board(dev);
+        struct pcmmio_private *devpriv = dev->private;
 
-        if (asic < 0 || asic >= board->dio_num_asics)
+        if (asic < 0 || asic >= 1)
                 return;         /* paranoia */
         if (port < 0 || port >= PORTS_PER_ASIC)
                 return;         /* more paranoia */
@@ -488,9 +454,9 @@ static void lock_port(struct comedi_device *dev, int asic, int port)
 
 static void unlock_port(struct comedi_device *dev, int asic, int port)
 {
-        const struct pcmmio_board *board = comedi_board(dev);
+        struct pcmmio_private *devpriv = dev->private;
 
-        if (asic < 0 || asic >= board->dio_num_asics)
+        if (asic < 0 || asic >= 1)
                 return;         /* paranoia */
         if (port < 0 || port >= PORTS_PER_ASIC)
                 return;         /* more paranoia */
@@ -504,6 +470,7 @@ static void unlock_port(struct comedi_device *dev, int asic, int port)
 static void pcmmio_stop_intr(struct comedi_device *dev,
                              struct comedi_subdevice *s)
 {
+        struct pcmmio_private *devpriv = dev->private;
         int nports, firstport, asic, port;
 
         asic = subpriv->dio.intr.asic;
@@ -526,6 +493,7 @@ static irqreturn_t interrupt_pcmmio(int irq, void *d)
 {
         int asic, got1 = 0;
         struct comedi_device *dev = (struct comedi_device *)d;
+        struct pcmmio_private *devpriv = dev->private;
         int i;
 
         for (asic = 0; asic < MAX_ASICS; ++asic) {
@@ -685,6 +653,8 @@ static irqreturn_t interrupt_pcmmio(int irq, void *d)
 static int pcmmio_start_intr(struct comedi_device *dev,
                              struct comedi_subdevice *s)
 {
+        struct pcmmio_private *devpriv = dev->private;
+
         if (!subpriv->dio.intr.continuous && subpriv->dio.intr.stop_count == 0) {
                 /* An empty acquisition! */
                 s->async->events |= COMEDI_CB_EOA;
@@ -1012,7 +982,7 @@ static int ao_winsn(struct comedi_device *dev, struct comedi_subdevice *s,
 
 static int pcmmio_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 {
-        const struct pcmmio_board *board = comedi_board(dev);
+        struct pcmmio_private *devpriv;
         struct comedi_subdevice *s;
         int sdev_no, chans_left, n_dio_subdevs, n_subdevs, port, asic,
             thisasic_chanct = 0;
@@ -1020,32 +990,25 @@ static int pcmmio_attach(struct comedi_device *dev, struct comedi_devconfig *it)
         unsigned int irq[MAX_ASICS];
         int ret;
 
+        dev->board_name = dev->driver->driver_name;
+
         iobase = it->options[0];
         irq[0] = it->options[1];
 
         printk(KERN_INFO "comedi%d: %s: io: %lx attaching...\n", dev->minor,
-                        dev->driver->driver_name, iobase);
+                        dev->board_name, iobase);
 
         dev->iobase = iobase;
 
-        if (!iobase || !request_region(iobase,
-                                       board->total_iosize,
-                                       dev->driver->driver_name)) {
+        if (!iobase || !request_region(iobase, 32, dev->board_name)) {
                 printk(KERN_ERR "comedi%d: I/O port conflict\n", dev->minor);
                 return -EIO;
         }
 
-        dev->board_name = board->name;
-
-/*
- * Allocate the private structure area.  alloc_private() is a
- * convenient macro defined in comedidev.h.
- */
-        if (alloc_private(dev, sizeof(struct pcmmio_private)) < 0) {
-                printk(KERN_ERR "comedi%d: cannot allocate private data structure\n",
-                                dev->minor);
+        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
+        if (!devpriv)
                 return -ENOMEM;
-        }
+        dev->private = devpriv;
 
         for (asic = 0; asic < MAX_ASICS; ++asic) {
                 devpriv->asics[asic].num = asic;
@@ -1059,7 +1022,7 @@ static int pcmmio_attach(struct comedi_device *dev, struct comedi_devconfig *it)
                 spin_lock_init(&devpriv->asics[asic].spinlock);
         }
 
-        chans_left = CHANS_PER_ASIC * board->dio_num_asics;
+        chans_left = CHANS_PER_ASIC * 1;
         n_dio_subdevs = CALC_N_DIO_SUBDEVS(chans_left);
         n_subdevs = n_dio_subdevs + 2;
         devpriv->sprivs =
@@ -1078,13 +1041,13 @@ static int pcmmio_attach(struct comedi_device *dev, struct comedi_devconfig *it)
         /* First, AI */
         s = &dev->subdevices[0];
         s->private = &devpriv->sprivs[0];
-        s->maxdata = (1 << board->ai_bits) - 1;
-        s->range_table = board->ai_range_table;
+        s->maxdata = 0xffff;
+        s->range_table = &ranges_ai;
         s->subdev_flags = SDF_READABLE | SDF_GROUND | SDF_DIFF;
         s->type = COMEDI_SUBD_AI;
-        s->n_chan = board->n_ai_chans;
+        s->n_chan = 16;
         s->len_chanlist = s->n_chan;
-        s->insn_read = board->ai_rinsn;
+        s->insn_read = ai_rinsn;
         subpriv->iobase = dev->iobase + 0;
         /* initialize the resource enable register by clearing it */
         outb(0, subpriv->iobase + 3);
@@ -1093,14 +1056,14 @@ static int pcmmio_attach(struct comedi_device *dev, struct comedi_devconfig *it)
         /* Next, AO */
         s = &dev->subdevices[1];
         s->private = &devpriv->sprivs[1];
-        s->maxdata = (1 << board->ao_bits) - 1;
-        s->range_table = board->ao_range_table;
+        s->maxdata = 0xffff;
+        s->range_table = &ranges_ao;
         s->subdev_flags = SDF_READABLE;
         s->type = COMEDI_SUBD_AO;
-        s->n_chan = board->n_ao_chans;
+        s->n_chan = 8;
         s->len_chanlist = s->n_chan;
-        s->insn_read = board->ao_rinsn;
-        s->insn_write = board->ao_winsn;
+        s->insn_read = ao_rinsn;
+        s->insn_write = ao_winsn;
         subpriv->iobase = dev->iobase + 8;
         /* initialize the resource enable register by clearing it */
         outb(0, subpriv->iobase + 3);
@@ -1180,7 +1143,7 @@ static int pcmmio_attach(struct comedi_device *dev, struct comedi_devconfig *it)
         for (asic = 0; irq[0] && asic < MAX_ASICS; ++asic) {
                 if (irq[asic]
                     && request_irq(irq[asic], interrupt_pcmmio,
-                                   IRQF_SHARED, board->name, dev)) {
+                                   IRQF_SHARED, dev->board_name, dev)) {
                         int i;
                         /* unroll the allocated irqs.. */
                         for (i = asic - 1; i >= 0; --i) {
@@ -1204,11 +1167,11 @@ static int pcmmio_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 
 static void pcmmio_detach(struct comedi_device *dev)
 {
-        const struct pcmmio_board *board = comedi_board(dev);
+        struct pcmmio_private *devpriv = dev->private;
         int i;
 
         if (dev->iobase)
-                release_region(dev->iobase, board->total_iosize);
+                release_region(dev->iobase, 32);
         for (i = 0; i < MAX_ASICS; ++i) {
                 if (devpriv && devpriv->asics[i].irq)
                         free_irq(devpriv->asics[i].irq, dev);
@@ -1217,32 +1180,11 @@ static void pcmmio_detach(struct comedi_device *dev)
                 kfree(devpriv->sprivs);
 }
 
-static const struct pcmmio_board pcmmio_boards[] = {
-        {
-                .name           = "pcmmio",
-                .dio_num_asics  = 1,
-                .dio_num_ports  = 6,
-                .total_iosize   = 32,
-                .ai_bits        = 16,
-                .ao_bits        = 16,
-                .n_ai_chans     = 16,
-                .n_ao_chans     = 8,
-                .ai_range_table = &ranges_ai,
-                .ao_range_table = &ranges_ao,
-                .ai_rinsn       = ai_rinsn,
-                .ao_rinsn       = ao_rinsn,
-                .ao_winsn       = ao_winsn
-        },
-};
-
 static struct comedi_driver pcmmio_driver = {
         .driver_name    = "pcmmio",
         .module         = THIS_MODULE,
         .attach         = pcmmio_attach,
         .detach         = pcmmio_detach,
-        .board_name     = &pcmmio_boards[0].name,
-        .offset         = sizeof(struct pcmmio_board),
-        .num_names      = ARRAY_SIZE(pcmmio_boards),
 };
 module_comedi_driver(pcmmio_driver);
 
diff --git a/drivers/staging/comedi/drivers/pcmuio.c b/drivers/staging/comedi/drivers/pcmuio.c
index 0e32119bc3f9..31ea20c2d39e 100644
--- a/drivers/staging/comedi/drivers/pcmuio.c
+++ b/drivers/staging/comedi/drivers/pcmuio.c
@@ -194,11 +194,6 @@ struct pcmuio_private {
         struct pcmuio_subdev_private *sprivs;
 };
 
-/*
- * most drivers define the following macro to make it easy to
- * access the private structure.
- */
-#define devpriv ((struct pcmuio_private *)dev->private)
 #define subpriv ((struct pcmuio_subdev_private *)s->private)
 
 /* DIO devices are slightly special.  Although it is possible to
@@ -348,6 +343,7 @@ static int pcmuio_dio_insn_config(struct comedi_device *dev,
 static void switch_page(struct comedi_device *dev, int asic, int page)
 {
         const struct pcmuio_board *board = comedi_board(dev);
+        struct pcmuio_private *devpriv = dev->private;
 
         if (asic < 0 || asic >= board->num_asics)
                 return;         /* paranoia */
@@ -404,6 +400,7 @@ static void init_asics(struct comedi_device *dev)
 static void lock_port(struct comedi_device *dev, int asic, int port)
 {
         const struct pcmuio_board *board = comedi_board(dev);
+        struct pcmuio_private *devpriv = dev->private;
 
         if (asic < 0 || asic >= board->num_asics)
                 return;         /* paranoia */
@@ -419,6 +416,7 @@ static void lock_port(struct comedi_device *dev, int asic, int port)
 static void unlock_port(struct comedi_device *dev, int asic, int port)
 {
         const struct pcmuio_board *board = comedi_board(dev);
+        struct pcmuio_private *devpriv = dev->private;
 
         if (asic < 0 || asic >= board->num_asics)
                 return;         /* paranoia */
@@ -435,6 +433,7 @@ static void pcmuio_stop_intr(struct comedi_device *dev,
                              struct comedi_subdevice *s)
 {
         int nports, firstport, asic, port;
+        struct pcmuio_private *devpriv = dev->private;
 
         asic = subpriv->intr.asic;
         if (asic < 0)
@@ -456,6 +455,7 @@ static irqreturn_t interrupt_pcmuio(int irq, void *d)
 {
         int asic, got1 = 0;
         struct comedi_device *dev = (struct comedi_device *)d;
+        struct pcmuio_private *devpriv = dev->private;
         int i;
 
         for (asic = 0; asic < MAX_ASICS; ++asic) {
@@ -607,6 +607,8 @@ static irqreturn_t interrupt_pcmuio(int irq, void *d)
 static int pcmuio_start_intr(struct comedi_device *dev,
                              struct comedi_subdevice *s)
 {
+        struct pcmuio_private *devpriv = dev->private;
+
         if (!subpriv->intr.continuous && subpriv->intr.stop_count == 0) {
                 /* An empty acquisition! */
                 s->async->events |= COMEDI_CB_EOA;
@@ -748,6 +750,7 @@ pcmuio_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s,
 static int pcmuio_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 {
         const struct pcmuio_board *board = comedi_board(dev);
+        struct pcmuio_private *devpriv;
         struct comedi_subdevice *s;
         int sdev_no, chans_left, n_subdevs, port, asic, thisasic_chanct = 0;
         unsigned long iobase;
@@ -772,15 +775,10 @@ static int pcmuio_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 
         dev->board_name = board->name;
 
-/*
- * Allocate the private structure area.  alloc_private() is a
- * convenient macro defined in comedidev.h.
- */
-        if (alloc_private(dev, sizeof(struct pcmuio_private)) < 0) {
-                dev_warn(dev->class_dev,
-                         "cannot allocate private data structure\n");
+        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
+        if (!devpriv)
                 return -ENOMEM;
-        }
+        dev->private = devpriv;
 
         for (asic = 0; asic < MAX_ASICS; ++asic) {
                 devpriv->asics[asic].num = asic;
@@ -905,6 +903,7 @@ static int pcmuio_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 static void pcmuio_detach(struct comedi_device *dev)
 {
         const struct pcmuio_board *board = comedi_board(dev);
+        struct pcmuio_private *devpriv = dev->private;
         int i;
 
         if (dev->iobase)
diff --git a/drivers/staging/comedi/drivers/poc.c b/drivers/staging/comedi/drivers/poc.c
index 78dfe167b147..d7842c95d982 100644
--- a/drivers/staging/comedi/drivers/poc.c
+++ b/drivers/staging/comedi/drivers/poc.c
@@ -57,13 +57,18 @@ struct boarddef_struct {
         const struct comedi_lrange *range;
 };
 
+struct poc_private {
+        unsigned int ao_readback[32];
+};
+
 static int readback_insn(struct comedi_device *dev, struct comedi_subdevice *s,
                          struct comedi_insn *insn, unsigned int *data)
 {
+        struct poc_private *devpriv = dev->private;
         int chan;
 
         chan = CR_CHAN(insn->chanspec);
-        data[0] = ((unsigned int *)dev->private)[chan];
+        data[0] = devpriv->ao_readback[chan];
 
         return 1;
 }
@@ -75,12 +80,13 @@ static int readback_insn(struct comedi_device *dev, struct comedi_subdevice *s,
 static int dac02_ao_winsn(struct comedi_device *dev, struct comedi_subdevice *s,
                           struct comedi_insn *insn, unsigned int *data)
 {
+        struct poc_private *devpriv = dev->private;
         int temp;
         int chan;
         int output;
 
         chan = CR_CHAN(insn->chanspec);
-        ((unsigned int *)dev->private)[chan] = data[0];
+        devpriv->ao_readback[chan] = data[0];
         output = data[0];
 #ifdef wrong
         /*  convert to complementary binary if range is bipolar */
@@ -131,6 +137,7 @@ static int pcl734_insn_bits(struct comedi_device *dev,
 static int poc_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 {
         const struct boarddef_struct *board = comedi_board(dev);
+        struct poc_private *devpriv;
         struct comedi_subdevice *s;
         unsigned long iobase;
         unsigned int iosize;
@@ -160,8 +167,10 @@ static int poc_attach(struct comedi_device *dev, struct comedi_devconfig *it)
         if (ret)
                 return ret;
 
-        if (alloc_private(dev, sizeof(unsigned int) * board->n_chan) < 0)
+        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
+        if (!devpriv)
                 return -ENOMEM;
+        dev->private = devpriv;
 
         /* analog output subdevice */
         s = &dev->subdevices[0];
diff --git a/drivers/staging/comedi/drivers/quatech_daqp_cs.c b/drivers/staging/comedi/drivers/quatech_daqp_cs.c
index 3e276f7a3380..ef0cdaa7f02e 100644
--- a/drivers/staging/comedi/drivers/quatech_daqp_cs.c
+++ b/drivers/staging/comedi/drivers/quatech_daqp_cs.c
@@ -47,6 +47,8 @@ Status: works
 Devices: [Quatech] DAQP-208 (daqp), DAQP-308
 */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include "../comedidev.h"
 #include <linux/semaphore.h>
 
@@ -195,8 +197,8 @@ static struct comedi_driver driver_daqp = {
 
 static void daqp_dump(struct comedi_device *dev)
 {
-        printk(KERN_INFO "DAQP: status %02x; aux status %02x\n",
-               inb(dev->iobase + DAQP_STATUS), inb(dev->iobase + DAQP_AUX));
+        dev_info(dev->class_dev, "status %02x; aux status %02x\n",
+                 inb(dev->iobase + DAQP_STATUS), inb(dev->iobase + DAQP_AUX));
 }
 
 static void hex_dump(char *str, void *ptr, int len)
@@ -255,33 +257,29 @@ static enum irqreturn daqp_interrupt(int irq, void *dev_id)
         int status;
 
         if (local == NULL) {
-                printk(KERN_WARNING
-                       "daqp_interrupt(): irq %d for unknown device.\n", irq);
+                pr_warn("irq %d for unknown device.\n", irq);
                 return IRQ_NONE;
         }
 
         dev = local->dev;
         if (dev == NULL) {
-                printk(KERN_WARNING "daqp_interrupt(): NULL comedi_device.\n");
+                pr_warn("NULL comedi_device.\n");
                 return IRQ_NONE;
         }
 
         if (!dev->attached) {
-                printk(KERN_WARNING
-                       "daqp_interrupt(): struct comedi_device not yet attached.\n");
+                pr_warn("struct comedi_device not yet attached.\n");
                 return IRQ_NONE;
         }
 
         s = local->s;
         if (s == NULL) {
-                printk(KERN_WARNING
-                       "daqp_interrupt(): NULL comedi_subdevice.\n");
+                pr_warn("NULL comedi_subdevice.\n");
                 return IRQ_NONE;
         }
 
         if ((struct local_info_t *)s->private != local) {
-                printk(KERN_WARNING
-                       "daqp_interrupt(): invalid comedi_subdevice.\n");
+                pr_warn("invalid comedi_subdevice.\n");
                 return IRQ_NONE;
         }
 
@@ -302,7 +300,7 @@ static enum irqreturn daqp_interrupt(int irq, void *dev_id)
                         if (status & DAQP_STATUS_DATA_LOST) {
                                 s->async->events |=
                                     COMEDI_CB_EOA | COMEDI_CB_OVERFLOW;
-                                printk("daqp: data lost\n");
+                                dev_warn(dev->class_dev, "data lost\n");
                                 daqp_ai_cancel(dev, s);
                                 break;
                         }
@@ -331,8 +329,8 @@ static enum irqreturn daqp_interrupt(int irq, void *dev_id)
                 }
 
                 if (loop_limit <= 0) {
-                        printk(KERN_WARNING
-                               "loop_limit reached in daqp_interrupt()\n");
+                        dev_warn(dev->class_dev,
+                                 "loop_limit reached in daqp_interrupt()\n");
                         daqp_ai_cancel(dev, s);
                         s->async->events |= COMEDI_CB_EOA | COMEDI_CB_ERROR;
                 }
@@ -397,9 +395,11 @@ static int daqp_ai_insn_read(struct comedi_device *dev,
          */
 
         while (--counter
-               && (inb(dev->iobase + DAQP_STATUS) & DAQP_STATUS_EVENTS)) ;
+               && (inb(dev->iobase + DAQP_STATUS) & DAQP_STATUS_EVENTS))
+                ;
         if (!counter) {
-                printk("daqp: couldn't clear interrupts in status register\n");
+                dev_err(dev->class_dev,
+                        "couldn't clear interrupts in status register\n");
                 return -1;
         }
 
@@ -482,19 +482,15 @@ static int daqp_ai_cmdtest(struct comedi_device *dev,
         if (err)
                 return 2;
 
-        /* step 3: make sure arguments are trivially compatible */
+        /* Step 3: check if arguments are trivially valid */
+
+        err |= cfc_check_trigger_arg_is(&cmd->start_arg, 0);
 
-        if (cmd->start_arg != 0) {
-                cmd->start_arg = 0;
-                err++;
-        }
 #define MAX_SPEED       10000   /* 100 kHz - in nanoseconds */
 
-        if (cmd->scan_begin_src == TRIG_TIMER
-            && cmd->scan_begin_arg < MAX_SPEED) {
-                cmd->scan_begin_arg = MAX_SPEED;
-                err++;
-        }
+        if (cmd->scan_begin_src == TRIG_TIMER)
+                err |= cfc_check_trigger_arg_min(&cmd->scan_begin_arg,
+                                                 MAX_SPEED);
 
         /* If both scan_begin and convert are both timer values, the only
          * way that can make sense is if the scan time is the number of
@@ -503,30 +499,18 @@ static int daqp_ai_cmdtest(struct comedi_device *dev,
 
         if (cmd->scan_begin_src == TRIG_TIMER && cmd->convert_src == TRIG_TIMER
             && cmd->scan_begin_arg != cmd->convert_arg * cmd->scan_end_arg) {
-                err++;
+                err |= -EINVAL;
         }
 
-        if (cmd->convert_src == TRIG_TIMER && cmd->convert_arg < MAX_SPEED) {
-                cmd->convert_arg = MAX_SPEED;
-                err++;
-        }
+        if (cmd->convert_src == TRIG_TIMER)
+                err |= cfc_check_trigger_arg_min(&cmd->convert_arg, MAX_SPEED);
 
-        if (cmd->scan_end_arg != cmd->chanlist_len) {
-                cmd->scan_end_arg = cmd->chanlist_len;
-                err++;
-        }
-        if (cmd->stop_src == TRIG_COUNT) {
-                if (cmd->stop_arg > 0x00ffffff) {
-                        cmd->stop_arg = 0x00ffffff;
-                        err++;
-                }
-        } else {
-                /* TRIG_NONE */
-                if (cmd->stop_arg != 0) {
-                        cmd->stop_arg = 0;
-                        err++;
-                }
-        }
+        err |= cfc_check_trigger_arg_is(&cmd->scan_end_arg, cmd->chanlist_len);
+
+        if (cmd->stop_src == TRIG_COUNT)
+                err |= cfc_check_trigger_arg_max(&cmd->stop_arg, 0x00ffffff);
+        else    /* TRIG_NONE */
+                err |= cfc_check_trigger_arg_is(&cmd->stop_arg, 0);
 
         if (err)
                 return 3;
@@ -734,10 +718,11 @@ static int daqp_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
          */
         counter = 100;
         while (--counter
-               && (inb(dev->iobase + DAQP_STATUS) & DAQP_STATUS_EVENTS)) ;
+               && (inb(dev->iobase + DAQP_STATUS) & DAQP_STATUS_EVENTS))
+                ;
         if (!counter) {
-                printk(KERN_ERR
-                       "daqp: couldn't clear interrupts in status register\n");
+                dev_err(dev->class_dev,
+                        "couldn't clear interrupts in status register\n");
                 return -1;
         }
 
@@ -824,8 +809,8 @@ static int daqp_attach(struct comedi_device *dev, struct comedi_devconfig *it)
         struct comedi_subdevice *s;
 
         if (it->options[0] < 0 || it->options[0] >= MAX_DEV || !local) {
-                printk("comedi%d: No such daqp device %d\n",
-                       dev->minor, it->options[0]);
+                dev_err(dev->class_dev, "No such daqp device %d\n",
+                        it->options[0]);
                 return -EIO;
         }
 
@@ -852,8 +837,8 @@ static int daqp_attach(struct comedi_device *dev, struct comedi_devconfig *it)
         if (ret)
                 return ret;
 
-        printk(KERN_INFO "comedi%d: attaching daqp%d (io 0x%04lx)\n",
-               dev->minor, it->options[0], dev->iobase);
+        dev_info(dev->class_dev, "attaching daqp%d (io 0x%04lx)\n",
+                 it->options[0], dev->iobase);
 
         s = &dev->subdevices[0];
         dev->read_subdev = s;
@@ -958,7 +943,7 @@ static int daqp_cs_attach(struct pcmcia_device *link)
                 if (dev_table[i] == NULL)
                         break;
         if (i == MAX_DEV) {
-                printk(KERN_NOTICE "daqp_cs: no devices available\n");
+                dev_notice(&link->dev, "no devices available\n");
                 return -ENODEV;
         }
 
diff --git a/drivers/staging/comedi/drivers/rtd520.c b/drivers/staging/comedi/drivers/rtd520.c
index 41d24b08913b..8d7c948a919c 100644
--- a/drivers/staging/comedi/drivers/rtd520.c
+++ b/drivers/staging/comedi/drivers/rtd520.c
@@ -107,14 +107,12 @@ Configuration options:
 #include "../comedidev.h"
 
 #include "comedi_fc.h"
-
-#define DRV_NAME "rtd520"
+#include "rtd520.h"
+#include "plx9080.h"
 
 /*======================================================================
   Driver specific stuff (tunable)
 ======================================================================*/
-/* Enable this to test the new DMA support. You may get hard lock ups */
-/*#define USE_DMA*/
 
 /* We really only need 2 buffers.  More than that means being much
    smarter about knowing which ones are full. */
@@ -147,20 +145,6 @@ Configuration options:
   Board specific stuff
 ======================================================================*/
 
-/* registers  */
-#define PCI_VENDOR_ID_RTD       0x1435
-/*
-  The board has three memory windows: las0, las1, and lcfg (the PCI chip)
-  Las1 has the data and can be burst DMAed 32bits at a time.
-*/
-#define LCFG_PCIINDEX   0
-/* PCI region 1 is a 256 byte IO space mapping.  Use??? */
-#define LAS0_PCIINDEX   2       /* PCI memory resources */
-#define LAS1_PCIINDEX   3
-#define LCFG_PCISIZE    0x100
-#define LAS0_PCISIZE    0x200
-#define LAS1_PCISIZE    0x10
-
 #define RTD_CLOCK_RATE  8000000 /* 8Mhz onboard clock */
 #define RTD_CLOCK_BASE  125     /* clock period in ns */
 
@@ -173,9 +157,6 @@ Configuration options:
 /* min speed when only 1 channel (no burst counter) */
 #define RTD_MIN_SPEED_1 5000000 /* 200Hz, in nanoseconds */
 
-#include "rtd520.h"
-#include "plx9080.h"
-
 /* Setup continuous ring of 1/2 FIFO transfers.  See RTD manual p91 */
 #define DMA_MODE_BITS (\
                        PLX_LOCAL_BUS_16_WIDE_BITS \
@@ -270,30 +251,24 @@ static const struct comedi_lrange rtd_ao_range = {
 struct rtdBoard {
         const char *name;
         int device_id;
-        int aiChans;
-        int aiBits;
-        int aiMaxGain;
         int range10Start;       /* start of +-10V range */
         int rangeUniStart;      /* start of +10V range */
+        const struct comedi_lrange *ai_range;
 };
 
 static const struct rtdBoard rtd520Boards[] = {
         {
                 .name           = "DM7520",
                 .device_id      = 0x7520,
-                .aiChans        = 16,
-                .aiBits         = 12,
-                .aiMaxGain      = 32,
                 .range10Start   = 6,
                 .rangeUniStart  = 12,
+                .ai_range       = &rtd_ai_7520_range,
         }, {
                 .name           = "PCI4520",
                 .device_id      = 0x4520,
-                .aiChans        = 16,
-                .aiBits         = 12,
-                .aiMaxGain      = 128,
                 .range10Start   = 8,
                 .rangeUniStart  = 16,
+                .ai_range       = &rtd_ai_4520_range,
         },
 };
 
@@ -307,7 +282,6 @@ struct rtdPrivate {
         void __iomem *las1;
         void __iomem *lcfg;
 
-        unsigned long intCount; /* interrupt count */
         long aiCount;           /* total transfer size (samples) */
         int transCount;         /* # to transfer data. 0->1/2FIFO */
         int flags;              /* flag event modes */
@@ -328,21 +302,6 @@ struct rtdPrivate {
         u16 intClearMask;       /* interrupt clear mask */
         u8 utcCtrl[4];          /* crtl mode for 3 utc + read back */
         u8 dioStatus;           /* could be read back (dio0Ctrl) */
-#ifdef USE_DMA
-        /*
-         * Always DMA 1/2 FIFO.  Buffer (dmaBuff?) is (at least) twice that
-         * size.  After transferring, interrupt processes 1/2 FIFO and
-         * passes to comedi
-         */
-        s16 dma0Offset;         /* current processing offset (0, 1/2) */
-        uint16_t *dma0Buff[DMA_CHAIN_COUNT];    /* DMA buffers (for ADC) */
-        dma_addr_t dma0BuffPhysAddr[DMA_CHAIN_COUNT];   /* physical addresses */
-        struct plx_dma_desc *dma0Chain; /* DMA descriptor ring for dmaBuff */
-        dma_addr_t dma0ChainPhysAddr;   /* physical addresses */
-        /* shadow registers */
-        u8 dma0Control;
-        u8 dma1Control;
-#endif                          /* USE_DMA */
         unsigned fifoLen;
 };
 
@@ -365,9 +324,9 @@ struct rtdPrivate {
   Sets the original period to be the true value.
   Note: you have to check if the value is larger than the counter range!
 */
-static int rtd_ns_to_timer_base(unsigned int *nanosec,  /* desired period (in ns) */
+static int rtd_ns_to_timer_base(unsigned int *nanosec,
                                 int round_mode, int base)
-{                               /* clock period (in ns) */
+{
         int divider;
 
         switch (round_mode) {
@@ -420,18 +379,19 @@ static unsigned short rtdConvertChanGain(struct comedi_device *dev,
         r |= chan & 0xf;
 
         /* Note: we also setup the channel list bipolar flag array */
-        if (range < thisboard->range10Start) {  /* first batch are +-5 */
-                r |= 0x000;     /* +-5 range */
-                r |= (range & 0x7) << 4;        /* gain */
+        if (range < thisboard->range10Start) {
+                /* +-5 range */
+                r |= 0x000;
+                r |= (range & 0x7) << 4;
                 CHAN_ARRAY_SET(devpriv->chanBipolar, chanIndex);
-        } else if (range < thisboard->rangeUniStart) {  /* second batch are +-10 */
-                r |= 0x100;     /* +-10 range */
-                /* gain */
+        } else if (range < thisboard->rangeUniStart) {
+                /* +-10 range */
+                r |= 0x100;
                 r |= ((range - thisboard->range10Start) & 0x7) << 4;
                 CHAN_ARRAY_SET(devpriv->chanBipolar, chanIndex);
-        } else {                /* last batch is +10 */
-                r |= 0x200;     /* +10 range */
-                /* gain */
+        } else {
+                /* +10 range */
+                r |= 0x200;
                 r |= ((range - thisboard->rangeUniStart) & 0x7) << 4;
                 CHAN_ARRAY_CLEAR(devpriv->chanBipolar, chanIndex);
         }
@@ -507,15 +467,14 @@ static int rtd520_probe_fifo_depth(struct comedi_device *dev)
                 }
         }
         if (i == limit) {
-                printk(KERN_INFO "\ncomedi: %s: failed to probe fifo size.\n",
-                       DRV_NAME);
+                dev_info(dev->class_dev, "failed to probe fifo size.\n");
                 return -EIO;
         }
         writel(0, devpriv->las0 + LAS0_ADC_FIFO_CLEAR);
         if (fifo_size != 0x400 && fifo_size != 0x2000) {
-                printk
-                    (KERN_INFO "\ncomedi: %s: unexpected fifo size of %i, expected 1024 or 8192.\n",
-                     DRV_NAME, fifo_size);
+                dev_info(dev->class_dev,
+                         "unexpected fifo size of %i, expected 1024 or 8192.\n",
+                         fifo_size);
                 return -EIO;
         }
         return fifo_size;
@@ -558,12 +517,8 @@ static int rtd_ai_rinsn(struct comedi_device *dev,
                                 break;
                         WAIT_QUIETLY;
                 }
-                if (ii >= RTD_ADC_TIMEOUT) {
-                        DPRINTK
-                            ("rtd520: Error: ADC never finished! FifoStatus=0x%x\n",
-                             stat ^ 0x6666);
+                if (ii >= RTD_ADC_TIMEOUT)
                         return -ETIMEDOUT;
-                }
 
                 /* read data */
                 d = readw(devpriv->las1 + LAS1_ADC_FIFO);
@@ -600,15 +555,8 @@ static int ai_read_n(struct comedi_device *dev, struct comedi_subdevice *s,
                         d = readw(devpriv->las1 + LAS1_ADC_FIFO);
                         continue;
                 }
-#if 0
-                if (!(readl(devpriv->las0 + LAS0_ADC) & FS_ADC_NOT_EMPTY)) {
-                        DPRINTK("comedi: READ OOPS on %d of %d\n", ii + 1,
-                                count);
-                        break;
-                }
-#endif
-                d = readw(devpriv->las1 + LAS1_ADC_FIFO);
 
+                d = readw(devpriv->las1 + LAS1_ADC_FIFO);
                 d = d >> 3;     /* low 3 bits are marker lines */
                 if (CHAN_ARRAY_TEST(devpriv->chanBipolar, s->async->cur_chan)) {
                         /* convert to comedi unsigned data */
@@ -656,125 +604,6 @@ static int ai_read_dregs(struct comedi_device *dev, struct comedi_subdevice *s)
         return 0;
 }
 
-#ifdef USE_DMA
-/*
-  Terminate a DMA transfer and wait for everything to quiet down
-*/
-void abort_dma(struct comedi_device *dev, unsigned int channel)
-{                               /* DMA channel 0, 1 */
-        struct rtdPrivate *devpriv = dev->private;
-        unsigned long dma_cs_addr;      /* the control/status register */
-        uint8_t status;
-        unsigned int ii;
-        /* unsigned long flags; */
-
-        dma_cs_addr = (unsigned long)devpriv->lcfg
-            + ((channel == 0) ? LCFG_DMACSR0 : LCFG_DMACSR1);
-
-        /*  spinlock for plx dma control/status reg */
-        /* spin_lock_irqsave( &dev->spinlock, flags ); */
-
-        /*  abort dma transfer if necessary */
-        status = readb(dma_cs_addr);
-        if ((status & PLX_DMA_EN_BIT) == 0) {   /* not enabled (Error?) */
-                DPRINTK("rtd520: AbortDma on non-active channel %d (0x%x)\n",
-                        channel, status);
-                goto abortDmaExit;
-        }
-
-        /* wait to make sure done bit is zero (needed?) */
-        for (ii = 0; (status & PLX_DMA_DONE_BIT) && ii < RTD_DMA_TIMEOUT; ii++) {
-                WAIT_QUIETLY;
-                status = readb(dma_cs_addr);
-        }
-        if (status & PLX_DMA_DONE_BIT) {
-                printk("rtd520: Timeout waiting for dma %i done clear\n",
-                       channel);
-                goto abortDmaExit;
-        }
-
-        /* disable channel (required) */
-        writeb(0, dma_cs_addr);
-        udelay(1);              /* needed?? */
-        /* set abort bit for channel */
-        writeb(PLX_DMA_ABORT_BIT, dma_cs_addr);
-
-        /*  wait for dma done bit to be set */
-        status = readb(dma_cs_addr);
-        for (ii = 0;
-             (status & PLX_DMA_DONE_BIT) == 0 && ii < RTD_DMA_TIMEOUT; ii++) {
-                status = readb(dma_cs_addr);
-                WAIT_QUIETLY;
-        }
-        if ((status & PLX_DMA_DONE_BIT) == 0) {
-                printk("rtd520: Timeout waiting for dma %i done set\n",
-                       channel);
-        }
-
-abortDmaExit:
-        /* spin_unlock_irqrestore( &dev->spinlock, flags ); */
-}
-
-/*
-  Process what is in the DMA transfer buffer and pass to comedi
-  Note: this is not re-entrant
-*/
-static int ai_process_dma(struct comedi_device *dev, struct comedi_subdevice *s)
-{
-        struct rtdPrivate *devpriv = dev->private;
-        int ii, n;
-        s16 *dp;
-
-        if (devpriv->aiCount == 0)      /* transfer already complete */
-                return 0;
-
-        dp = devpriv->dma0Buff[devpriv->dma0Offset];
-        for (ii = 0; ii < devpriv->fifoLen / 2;) {      /* convert samples */
-                short sample;
-
-                if (CHAN_ARRAY_TEST(devpriv->chanBipolar, s->async->cur_chan)) {
-                        sample = (*dp >> 3) + 2048;     /* convert to comedi unsigned data */
-                else
-                        sample = *dp >> 3;      /* low 3 bits are marker lines */
-
-                *dp++ = sample; /* put processed value back */
-
-                if (++s->async->cur_chan >= s->async->cmd.chanlist_len)
-                        s->async->cur_chan = 0;
-
-                ++ii;           /* number ready to transfer */
-                if (devpriv->aiCount > 0) {     /* < 0, means read forever */
-                        if (--devpriv->aiCount == 0) {  /* done */
-                                /*DPRINTK ("rtd520: Final %d samples\n", ii); */
-                                break;
-                        }
-                }
-        }
-
-        /* now pass the whole array to the comedi buffer */
-        dp = devpriv->dma0Buff[devpriv->dma0Offset];
-        n = comedi_buf_write_alloc(s->async, ii * sizeof(s16));
-        if (n < (ii * sizeof(s16))) {   /* any residual is an error */
-                DPRINTK("rtd520:ai_process_dma buffer overflow %d samples!\n",
-                        ii - (n / sizeof(s16)));
-                s->async->events |= COMEDI_CB_ERROR;
-                return -1;
-        }
-        comedi_buf_memcpy_to(s->async, 0, dp, n);
-        comedi_buf_write_free(s->async, n);
-
-        /*
-         * always at least 1 scan -- 1/2 FIFO is larger than our max scan list
-         */
-        s->async->events |= COMEDI_CB_BLOCK | COMEDI_CB_EOS;
-
-        if (++devpriv->dma0Offset >= DMA_CHAIN_COUNT) { /* next buffer */
-                devpriv->dma0Offset = 0;
-        }
-        return 0;
-}
-#endif /* USE_DMA */
-
 /*
   Handle all rtd520 interrupts.
   Runs atomically and is never re-entered.
@@ -794,47 +623,10 @@ static irqreturn_t rtd_interrupt(int irq,	/* interrupt number (ignored) */
         if (!dev->attached)
                 return IRQ_NONE;
 
-        devpriv->intCount++;    /* DEBUG statistics */
-
         fifoStatus = readl(devpriv->las0 + LAS0_ADC);
         /* check for FIFO full, this automatically halts the ADC! */
-        if (!(fifoStatus & FS_ADC_NOT_FULL)) {  /* 0 -> full */
-                DPRINTK("rtd520: FIFO full! fifo_status=0x%x\n", (fifoStatus ^ 0x6666) & 0x7777);       /* should be all 0s */
+        if (!(fifoStatus & FS_ADC_NOT_FULL))    /* 0 -> full */
                 goto abortTransfer;
-        }
-#ifdef USE_DMA
-        if (devpriv->flags & DMA0_ACTIVE) {     /* Check DMA */
-                u32 istatus = readl(devpriv->lcfg + LCFG_ITCSR);
-
-                if (istatus & ICS_DMA0_A) {
-                        if (ai_process_dma(dev, s) < 0) {
-                                DPRINTK
-                                    ("rtd520: comedi read buffer overflow (DMA) with %ld to go!\n",
-                                     devpriv->aiCount);
-                                devpriv->dma0Control &= ~PLX_DMA_START_BIT;
-                                devpriv->dma0Control |= PLX_CLEAR_DMA_INTR_BIT;
-                                writeb(devpriv->dma0Control,
-                                        devpriv->lcfg + LCFG_DMACSR0);
-                                goto abortTransfer;
-                        }
-
-                        /*DPRINTK ("rtd520: DMA transfer: %ld to go, istatus %x\n",
-                           devpriv->aiCount, istatus); */
-                        devpriv->dma0Control &= ~PLX_DMA_START_BIT;
-                        devpriv->dma0Control |= PLX_CLEAR_DMA_INTR_BIT;
-                        writeb(devpriv->dma0Control,
-                                devpriv->lcfg + LCFG_DMACSR0);
-                        if (0 == devpriv->aiCount) {    /* counted down */
-                                DPRINTK("rtd520: Samples Done (DMA).\n");
-                                goto transferDone;
-                        }
-                        comedi_event(dev, s);
-                } else {
-                        /*DPRINTK ("rtd520: No DMA ready: istatus %x\n", istatus); */
-                }
-        }
-        /* Fall through and check for other interrupt sources */
-#endif /* USE_DMA */
 
         status = readw(devpriv->las0 + LAS0_IT);
         /* if interrupt was not caused by our board, or handled above */
@@ -842,57 +634,38 @@ static irqreturn_t rtd_interrupt(int irq,	/* interrupt number (ignored) */
                 return IRQ_HANDLED;
 
         if (status & IRQM_ADC_ABOUT_CNT) {      /* sample count -> read FIFO */
-                /* since the priority interrupt controller may have queued a sample
-                   counter interrupt, even though we have already finished,
-                   we must handle the possibility that there is no data here */
-                if (!(fifoStatus & FS_ADC_HEMPTY)) {    /* 0 -> 1/2 full */
-                        /*DPRINTK("rtd520: Sample int, reading 1/2FIFO.  fifo_status 0x%x\n",
-                           (fifoStatus ^ 0x6666) & 0x7777); */
-                        if (ai_read_n(dev, s, devpriv->fifoLen / 2) < 0) {
-                                DPRINTK
-                                    ("rtd520: comedi read buffer overflow (1/2FIFO) with %ld to go!\n",
-                                     devpriv->aiCount);
+                /*
+                 * since the priority interrupt controller may have queued
+                 * a sample counter interrupt, even though we have already
+                 * finished, we must handle the possibility that there is
+                 * no data here
+                 */
+                if (!(fifoStatus & FS_ADC_HEMPTY)) {
+                        /* FIFO half full */
+                        if (ai_read_n(dev, s, devpriv->fifoLen / 2) < 0)
                                 goto abortTransfer;
-                        }
-                        if (0 == devpriv->aiCount) {    /* counted down */
-                                DPRINTK("rtd520: Samples Done (1/2). fifo_status was 0x%x\n", (fifoStatus ^ 0x6666) & 0x7777);  /* should be all 0s */
+
+                        if (0 == devpriv->aiCount)
                                 goto transferDone;
-                        }
+
                         comedi_event(dev, s);
-                } else if (devpriv->transCount > 0) {   /* read often */
-                        /*DPRINTK("rtd520: Sample int, reading %d  fifo_status 0x%x\n",
-                           devpriv->transCount, (fifoStatus ^ 0x6666) & 0x7777); */
-                        if (fifoStatus & FS_ADC_NOT_EMPTY) {    /* 1 -> not empty */
-                                if (ai_read_n(dev, s, devpriv->transCount) < 0) {
-                                        DPRINTK
-                                            ("rtd520: comedi read buffer overflow (N) with %ld to go!\n",
-                                             devpriv->aiCount);
+                } else if (devpriv->transCount > 0) {
+                        if (fifoStatus & FS_ADC_NOT_EMPTY) {
+                                /* FIFO not empty */
+                                if (ai_read_n(dev, s, devpriv->transCount) < 0)
                                         goto abortTransfer;
-                                }
-                                if (0 == devpriv->aiCount) {    /* counted down */
-                                        DPRINTK
-                                            ("rtd520: Samples Done (N). fifo_status was 0x%x\n",
-                                             (fifoStatus ^ 0x6666) & 0x7777);
+
+                                if (0 == devpriv->aiCount)
                                         goto transferDone;
-                                }
+
                                 comedi_event(dev, s);
                         }
-                } else {        /* wait for 1/2 FIFO (old) */
-                        DPRINTK
-                            ("rtd520: Sample int.  Wait for 1/2. fifo_status 0x%x\n",
-                             (fifoStatus ^ 0x6666) & 0x7777);
                 }
-        } else {
-                DPRINTK("rtd520: unknown interrupt source!\n");
         }
 
         overrun = readl(devpriv->las0 + LAS0_OVERRUN) & 0xffff;
-        if (overrun) {
-                DPRINTK
-                    ("rtd520: Interrupt overrun with %ld to go! over_status=0x%x\n",
-                     devpriv->aiCount, overrun);
+        if (overrun)
                 goto abortTransfer;
-        }
 
         /* clear the interrupt */
         devpriv->intClearMask = status;
@@ -913,23 +686,9 @@ transferDone:
         writel(0, devpriv->las0 + LAS0_ADC_CONVERSION);
         devpriv->intMask = 0;
         writew(devpriv->intMask, devpriv->las0 + LAS0_IT);
-#ifdef USE_DMA
-        if (devpriv->flags & DMA0_ACTIVE) {
-                writel(readl(devpriv->lcfg + LCFG_ITCSR) & ~ICS_DMA0_E,
-                        devpriv->lcfg + LCFG_ITCSR);
-                abort_dma(dev, 0);
-                devpriv->flags &= ~DMA0_ACTIVE;
-                /* if Using DMA, then we should have read everything by now */
-                if (devpriv->aiCount > 0) {
-                        DPRINTK("rtd520: Lost DMA data! %ld remain\n",
-                                devpriv->aiCount);
-                }
-        }
-#endif /* USE_DMA */
 
         if (devpriv->aiCount > 0) {     /* there shouldn't be anything left */
                 fifoStatus = readl(devpriv->las0 + LAS0_ADC);
-                DPRINTK("rtd520: Finishing up. %ld remain, fifoStat=%x\n", devpriv->aiCount, (fifoStatus ^ 0x6666) & 0x7777);   /* should read all 0s */
                 ai_read_dregs(dev, s);  /* read anything left in FIFO */
         }
 
@@ -944,25 +703,10 @@ transferDone:
 
         fifoStatus = readl(devpriv->las0 + LAS0_ADC);
         overrun = readl(devpriv->las0 + LAS0_OVERRUN) & 0xffff;
-        DPRINTK
-            ("rtd520: Acquisition complete. %ld ints, intStat=%x, overStat=%x\n",
-             devpriv->intCount, status, overrun);
 
         return IRQ_HANDLED;
 }
 
-#if 0
-/*
-  return the number of samples available
-*/
-static int rtd_ai_poll(struct comedi_device *dev, struct comedi_subdevice *s)
-{
-        /* TODO: This needs to mask interrupts, read_dregs, and then re-enable */
-        /* Not sure what to do if DMA is active */
-        return s->async->buf_write_count - s->async->buf_read_count;
-}
-#endif
-
 /*
   cmdtest tests a particular command to see if it is valid.
   Using the cmdtest ioctl, a user can create a valid cmd
@@ -1001,103 +745,85 @@ static int rtd_ai_cmdtest(struct comedi_device *dev,
         if (err)
                 return 2;
 
-        /* step 3: make sure arguments are trivially compatible */
+        /* Step 3: check if arguments are trivially valid */
 
-        if (cmd->start_arg != 0) {
-                cmd->start_arg = 0;
-                err++;
-        }
+        err |= cfc_check_trigger_arg_is(&cmd->start_arg, 0);
 
         if (cmd->scan_begin_src == TRIG_TIMER) {
                 /* Note: these are time periods, not actual rates */
                 if (1 == cmd->chanlist_len) {   /* no scanning */
-                        if (cmd->scan_begin_arg < RTD_MAX_SPEED_1) {
-                                cmd->scan_begin_arg = RTD_MAX_SPEED_1;
+                        if (cfc_check_trigger_arg_min(&cmd->scan_begin_arg,
+                                                      RTD_MAX_SPEED_1)) {
                                 rtd_ns_to_timer(&cmd->scan_begin_arg,
                                                 TRIG_ROUND_UP);
-                                err++;
+                                err |= -EINVAL;
                         }
-                        if (cmd->scan_begin_arg > RTD_MIN_SPEED_1) {
-                                cmd->scan_begin_arg = RTD_MIN_SPEED_1;
+                        if (cfc_check_trigger_arg_max(&cmd->scan_begin_arg,
+                                                      RTD_MIN_SPEED_1)) {
                                 rtd_ns_to_timer(&cmd->scan_begin_arg,
                                                 TRIG_ROUND_DOWN);
-                                err++;
+                                err |= -EINVAL;
                         }
                 } else {
-                        if (cmd->scan_begin_arg < RTD_MAX_SPEED) {
-                                cmd->scan_begin_arg = RTD_MAX_SPEED;
+                        if (cfc_check_trigger_arg_min(&cmd->scan_begin_arg,
+                                                      RTD_MAX_SPEED)) {
                                 rtd_ns_to_timer(&cmd->scan_begin_arg,
                                                 TRIG_ROUND_UP);
-                                err++;
+                                err |= -EINVAL;
                         }
-                        if (cmd->scan_begin_arg > RTD_MIN_SPEED) {
-                                cmd->scan_begin_arg = RTD_MIN_SPEED;
+                        if (cfc_check_trigger_arg_max(&cmd->scan_begin_arg,
+                                                      RTD_MIN_SPEED)) {
                                 rtd_ns_to_timer(&cmd->scan_begin_arg,
                                                 TRIG_ROUND_DOWN);
-                                err++;
+                                err |= -EINVAL;
                         }
                 }
         } else {
                 /* external trigger */
                 /* should be level/edge, hi/lo specification here */
                 /* should specify multiple external triggers */
-                if (cmd->scan_begin_arg > 9) {
-                        cmd->scan_begin_arg = 9;
-                        err++;
-                }
+                err |= cfc_check_trigger_arg_max(&cmd->scan_begin_arg, 9);
         }
+
         if (cmd->convert_src == TRIG_TIMER) {
                 if (1 == cmd->chanlist_len) {   /* no scanning */
-                        if (cmd->convert_arg < RTD_MAX_SPEED_1) {
-                                cmd->convert_arg = RTD_MAX_SPEED_1;
+                        if (cfc_check_trigger_arg_min(&cmd->convert_arg,
+                                                      RTD_MAX_SPEED_1)) {
                                 rtd_ns_to_timer(&cmd->convert_arg,
                                                 TRIG_ROUND_UP);
-                                err++;
+                                err |= -EINVAL;
                         }
-                        if (cmd->convert_arg > RTD_MIN_SPEED_1) {
-                                cmd->convert_arg = RTD_MIN_SPEED_1;
+                        if (cfc_check_trigger_arg_max(&cmd->convert_arg,
+                                                      RTD_MIN_SPEED_1)) {
                                 rtd_ns_to_timer(&cmd->convert_arg,
                                                 TRIG_ROUND_DOWN);
-                                err++;
+                                err |= -EINVAL;
                         }
                 } else {
-                        if (cmd->convert_arg < RTD_MAX_SPEED) {
-                                cmd->convert_arg = RTD_MAX_SPEED;
+                        if (cfc_check_trigger_arg_min(&cmd->convert_arg,
+                                                      RTD_MAX_SPEED)) {
                                 rtd_ns_to_timer(&cmd->convert_arg,
                                                 TRIG_ROUND_UP);
-                                err++;
+                                err |= -EINVAL;
                         }
-                        if (cmd->convert_arg > RTD_MIN_SPEED) {
-                                cmd->convert_arg = RTD_MIN_SPEED;
+                        if (cfc_check_trigger_arg_max(&cmd->convert_arg,
+                                                      RTD_MIN_SPEED)) {
                                 rtd_ns_to_timer(&cmd->convert_arg,
                                                 TRIG_ROUND_DOWN);
-                                err++;
+                                err |= -EINVAL;
                         }
                 }
         } else {
                 /* external trigger */
                 /* see above */
-                if (cmd->convert_arg > 9) {
-                        cmd->convert_arg = 9;
-                        err++;
-                }
+                err |= cfc_check_trigger_arg_max(&cmd->convert_arg, 9);
         }
 
-#if 0
-        if (cmd->scan_end_arg != cmd->chanlist_len) {
-                cmd->scan_end_arg = cmd->chanlist_len;
-                err++;
-        }
-#endif
         if (cmd->stop_src == TRIG_COUNT) {
                 /* TODO check for rounding error due to counter wrap */
-
         } else {
                 /* TRIG_NONE */
-                if (cmd->stop_arg != 0) {
-                        cmd->stop_arg = 0;
-                        err++;
-                }
+                err |= cfc_check_trigger_arg_is(&cmd->stop_arg, 0);
         }
 
         if (err)
@@ -1159,28 +885,8 @@ static int rtd_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
         writel(0, devpriv->las0 + LAS0_ADC_CONVERSION);
         devpriv->intMask = 0;
         writew(devpriv->intMask, devpriv->las0 + LAS0_IT);
-#ifdef USE_DMA
-        if (devpriv->flags & DMA0_ACTIVE) {     /* cancel anything running */
-                writel(readl(devpriv->lcfg + LCFG_ITCSR) & ~ICS_DMA0_E,
-                        devpriv->lcfg + LCFG_ITCSR);
-                abort_dma(dev, 0);
-                devpriv->flags &= ~DMA0_ACTIVE;
-                if (readl(devpriv->lcfg + LCFG_ITCSR) & ICS_DMA0_A) {
-                        devpriv->dma0Control = PLX_CLEAR_DMA_INTR_BIT;
-                        writeb(devpriv->dma0Control,
-                                devpriv->lcfg + LCFG_DMACSR0);
-                }
-        }
-        writel(0, devpriv->las0 + LAS0_DMA0_RESET);
-#endif /* USE_DMA */
         writel(0, devpriv->las0 + LAS0_ADC_FIFO_CLEAR);
         writel(0, devpriv->las0 + LAS0_OVERRUN);
-        devpriv->intCount = 0;
-
-        if (!dev->irq) {        /* we need interrupts for this */
-                DPRINTK("rtd520: ERROR! No interrupt available!\n");
-                return -ENXIO;
-        }
 
         /* start configuration */
         /* load channel list and reset CGT */
@@ -1188,7 +894,6 @@ static int rtd_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
 
         /* setup the common case and override if needed */
         if (cmd->chanlist_len > 1) {
-                /*DPRINTK ("rtd520: Multi channel setup\n"); */
                 /* pacer start source: SOFTWARE */
                 writel(0, devpriv->las0 + LAS0_PACER_START);
                 /* burst trigger source: PACER */
@@ -1196,7 +901,6 @@ static int rtd_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
                 /* ADC conversion trigger source: BURST */
                 writel(2, devpriv->las0 + LAS0_ADC_CONVERSION);
         } else {                /* single channel */
-                /*DPRINTK ("rtd520: single channel setup\n"); */
                 /* pacer start source: SOFTWARE */
                 writel(0, devpriv->las0 + LAS0_PACER_START);
                 /* ADC conversion trigger source: PACER */
@@ -1208,8 +912,11 @@ static int rtd_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
                 /* scan_begin_arg is in nanoseconds */
                 /* find out how many samples to wait before transferring */
                 if (cmd->flags & TRIG_WAKE_EOS) {
-                        /* this may generate un-sustainable interrupt rates */
-                        /* the application is responsible for doing the right thing */
+                        /*
+                         * this may generate un-sustainable interrupt rates
+                         * the application is responsible for doing the
+                         * right thing
+                         */
                         devpriv->transCount = cmd->chanlist_len;
                         devpriv->flags |= SEND_EOS;
                 } else {
@@ -1239,11 +946,6 @@ static int rtd_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
                         writel((devpriv->transCount - 1) & 0xffff,
                                 devpriv->las0 + LAS0_ACNT);
                 }
-
-                DPRINTK
-                    ("rtd520: scanLen=%d transferCount=%d fifoLen=%d\n  scanTime(ns)=%d flags=0x%x\n",
-                     cmd->chanlist_len, devpriv->transCount, devpriv->fifoLen,
-                     cmd->scan_begin_arg, devpriv->flags);
         } else {                /* unknown timing, just use 1/2 FIFO */
                 devpriv->transCount = 0;
                 devpriv->flags &= ~SEND_EOS;
@@ -1268,10 +970,6 @@ static int rtd_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
         case TRIG_NONE: /* stop when cancel is called */
                 devpriv->aiCount = -1;  /* read forever */
                 break;
-
-        default:
-                DPRINTK("rtd520: Warning! ignoring stop_src mode %d\n",
-                        cmd->stop_src);
         }
 
         /* Scan timing */
@@ -1280,7 +978,6 @@ static int rtd_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
                 timer = rtd_ns_to_timer(&cmd->scan_begin_arg,
                                         TRIG_ROUND_NEAREST);
                 /* set PACER clock */
-                /*DPRINTK ("rtd520: loading %d into pacer\n", timer); */
                 writel(timer & 0xffffff, devpriv->las0 + LAS0_PCLK);
 
                 break;
@@ -1289,20 +986,16 @@ static int rtd_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
                 /* pacer start source: EXTERNAL */
                 writel(1, devpriv->las0 + LAS0_PACER_START);
                 break;
-
-        default:
-                DPRINTK("rtd520: Warning! ignoring scan_begin_src mode %d\n",
-                        cmd->scan_begin_src);
         }
 
         /* Sample timing within a scan */
         switch (cmd->convert_src) {
         case TRIG_TIMER:        /* periodic */
-                if (cmd->chanlist_len > 1) {    /* only needed for multi-channel */
+                if (cmd->chanlist_len > 1) {
+                        /* only needed for multi-channel */
                         timer = rtd_ns_to_timer(&cmd->convert_arg,
                                                 TRIG_ROUND_NEAREST);
                         /* setup BURST clock */
-                        /*DPRINTK ("rtd520: loading %d into burst\n", timer); */
                         writel(timer & 0x3ff, devpriv->las0 + LAS0_BCLK);
                 }
 
@@ -1312,10 +1005,6 @@ static int rtd_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
                 /* burst trigger source: EXTERNAL */
                 writel(2, devpriv->las0 + LAS0_BURST_START);
                 break;
-
-        default:
-                DPRINTK("rtd520: Warning! ignoring convert_src mode %d\n",
-                        cmd->convert_src);
         }
         /* end configuration */
 
@@ -1329,34 +1018,9 @@ static int rtd_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
         if (devpriv->transCount > 0) {  /* transfer every N samples */
                 devpriv->intMask = IRQM_ADC_ABOUT_CNT;
                 writew(devpriv->intMask, devpriv->las0 + LAS0_IT);
-                DPRINTK("rtd520: Transferring every %d\n", devpriv->transCount);
         } else {                /* 1/2 FIFO transfers */
-#ifdef USE_DMA
-                devpriv->flags |= DMA0_ACTIVE;
-
-                /* point to first transfer in ring */
-                devpriv->dma0Offset = 0;
-                writel(DMA_MODE_BITS, devpriv->lcfg + LCFG_DMAMODE0);
-                /* point to first block */
-                writel(devpriv->dma0Chain[DMA_CHAIN_COUNT - 1].next,
-                        devpriv->lcfg + LCFG_DMADPR0);
-                writel(DMAS_ADFIFO_HALF_FULL, devpriv->las0 + LAS0_DMA0_SRC);
-                writel(readl(devpriv->lcfg + LCFG_ITCSR) | ICS_DMA0_E,
-                        devpriv->lcfg + LCFG_ITCSR);
-                /* Must be 2 steps.  See PLX app note about "Starting a DMA transfer" */
-                devpriv->dma0Control = PLX_DMA_EN_BIT;
-                writeb(devpriv->dma0Control,
-                        devpriv->lcfg + LCFG_DMACSR0);
-                devpriv->dma0Control |= PLX_DMA_START_BIT;
-                writeb(devpriv->dma0Control,
-                        devpriv->lcfg + LCFG_DMACSR0);
-                DPRINTK("rtd520: Using DMA0 transfers. plxInt %x RtdInt %x\n",
-                        readl(devpriv->lcfg + LCFG_ITCSR), devpriv->intMask);
-#else /* USE_DMA */
                 devpriv->intMask = IRQM_ADC_ABOUT_CNT;
                 writew(devpriv->intMask, devpriv->las0 + LAS0_IT);
-                DPRINTK("rtd520: Transferring every 1/2 FIFO\n");
-#endif /* USE_DMA */
         }
 
         /* BUG: start_src is ASSUMED to be TRIG_NOW */
@@ -1381,19 +1045,8 @@ static int rtd_ai_cancel(struct comedi_device *dev, struct comedi_subdevice *s)
         devpriv->intMask = 0;
         writew(devpriv->intMask, devpriv->las0 + LAS0_IT);
         devpriv->aiCount = 0;   /* stop and don't transfer any more */
-#ifdef USE_DMA
-        if (devpriv->flags & DMA0_ACTIVE) {
-                writel(readl(devpriv->lcfg + LCFG_ITCSR) & ~ICS_DMA0_E,
-                        devpriv->lcfg + LCFG_ITCSR);
-                abort_dma(dev, 0);
-                devpriv->flags &= ~DMA0_ACTIVE;
-        }
-#endif /* USE_DMA */
         status = readw(devpriv->las0 + LAS0_IT);
         overrun = readl(devpriv->las0 + LAS0_OVERRUN) & 0xffff;
-        DPRINTK
-            ("rtd520: Acquisition canceled. %ld ints, intStat=%x, overStat=%x\n",
-             devpriv->intCount, status, overrun);
         return 0;
 }
 
@@ -1430,14 +1083,11 @@ static int rtd_ao_winsn(struct comedi_device *dev,
                         val = data[i] << 3;
                 }
 
-                DPRINTK
-                    ("comedi: rtd520 DAC chan=%d range=%d writing %d as 0x%x\n",
-                     chan, range, data[i], val);
-
                 /* a typical programming sequence */
                 writew(val, devpriv->las1 +
                         ((chan == 0) ? LAS1_DAC1_FIFO : LAS1_DAC2_FIFO));
-                writew(0, devpriv->las0 + ((chan == 0) ? LAS0_DAC1 : LAS0_DAC2));
+                writew(0, devpriv->las0 +
+                        ((chan == 0) ? LAS0_DAC1 : LAS0_DAC2));
 
                 devpriv->aoValue[chan] = data[i];       /* save for read back */
 
@@ -1449,12 +1099,8 @@ static int rtd_ao_winsn(struct comedi_device *dev,
                                 break;
                         WAIT_QUIETLY;
                 }
-                if (ii >= RTD_DAC_TIMEOUT) {
-                        DPRINTK
-                            ("rtd520: Error: DAC never finished! FifoStatus=0x%x\n",
-                             stat ^ 0x6666);
+                if (ii >= RTD_DAC_TIMEOUT)
                         return -ETIMEDOUT;
-                }
         }
 
         /* return the number of samples read/written */
@@ -1507,8 +1153,6 @@ static int rtd_dio_insn_bits(struct comedi_device *dev,
          * input lines. */
         data[1] = readw(devpriv->las0 + LAS0_DIO0) & 0xff;
 
-        /*DPRINTK("rtd520:port_0 wrote: 0x%x read: 0x%x\n", s->state, data[1]); */
-
         return insn->n;
 }
 
@@ -1542,7 +1186,6 @@ static int rtd_dio_insn_config(struct comedi_device *dev,
                 return -EINVAL;
         }
 
-        DPRINTK("rtd520: port_0_direction=0x%x (1 means out)\n", s->io_bits);
         /* TODO support digital match interrupts and strobes */
         devpriv->dioStatus = 0x01;      /* set direction */
         writew(devpriv->dioStatus, devpriv->las0 + LAS0_DIO_STATUS);
@@ -1557,356 +1200,194 @@ static int rtd_dio_insn_config(struct comedi_device *dev,
         return 1;
 }
 
-static struct pci_dev *rtd_find_pci(struct comedi_device *dev,
-                                    struct comedi_devconfig *it)
+static void rtd_reset(struct comedi_device *dev)
+{
+        struct rtdPrivate *devpriv = dev->private;
+
+        writel(0, devpriv->las0 + LAS0_BOARD_RESET);
+        udelay(100);            /* needed? */
+        writel(0, devpriv->lcfg + LCFG_ITCSR);
+        devpriv->intMask = 0;
+        writew(devpriv->intMask, devpriv->las0 + LAS0_IT);
+        devpriv->intClearMask = ~0;
+        writew(devpriv->intClearMask, devpriv->las0 + LAS0_CLEAR);
+        readw(devpriv->las0 + LAS0_CLEAR);
+}
+
+/*
+ * initialize board, per RTD spec
+ * also, initialize shadow registers
+ */
+static void rtd_init_board(struct comedi_device *dev)
+{
+        struct rtdPrivate *devpriv = dev->private;
+
+        rtd_reset(dev);
+
+        writel(0, devpriv->las0 + LAS0_OVERRUN);
+        writel(0, devpriv->las0 + LAS0_CGT_CLEAR);
+        writel(0, devpriv->las0 + LAS0_ADC_FIFO_CLEAR);
+        writel(0, devpriv->las0 + LAS0_DAC1_RESET);
+        writel(0, devpriv->las0 + LAS0_DAC2_RESET);
+        /* clear digital IO fifo */
+        devpriv->dioStatus = 0;
+        writew(devpriv->dioStatus, devpriv->las0 + LAS0_DIO_STATUS);
+        devpriv->utcCtrl[0] = (0 << 6) | 0x30;
+        devpriv->utcCtrl[1] = (1 << 6) | 0x30;
+        devpriv->utcCtrl[2] = (2 << 6) | 0x30;
+        devpriv->utcCtrl[3] = (3 << 6) | 0x00;
+        writeb(devpriv->utcCtrl[0], devpriv->las0 + LAS0_UTC_CTRL);
+        writeb(devpriv->utcCtrl[1], devpriv->las0 + LAS0_UTC_CTRL);
+        writeb(devpriv->utcCtrl[2], devpriv->las0 + LAS0_UTC_CTRL);
+        writeb(devpriv->utcCtrl[3], devpriv->las0 + LAS0_UTC_CTRL);
+        /* TODO: set user out source ??? */
+}
+
+/* The RTD driver does this */
+static void rtd_pci_latency_quirk(struct comedi_device *dev,
+                                  struct pci_dev *pcidev)
+{
+        unsigned char pci_latency;
+
+        pci_read_config_byte(pcidev, PCI_LATENCY_TIMER, &pci_latency);
+        if (pci_latency < 32) {
+                dev_info(dev->class_dev,
+                        "PCI latency changed from %d to %d\n",
+                        pci_latency, 32);
+                pci_write_config_byte(pcidev, PCI_LATENCY_TIMER, 32);
+        }
+}
+
+static const void *rtd_find_boardinfo(struct comedi_device *dev,
+                                      struct pci_dev *pcidev)
 {
         const struct rtdBoard *thisboard;
-        struct pci_dev *pcidev = NULL;
-        int bus = it->options[0];
-        int slot = it->options[1];
         int i;
 
-        for_each_pci_dev(pcidev) {
-                if (pcidev->vendor != PCI_VENDOR_ID_RTD)
-                        continue;
-                if (bus || slot) {
-                        if (pcidev->bus->number != bus ||
-                            PCI_SLOT(pcidev->devfn) != slot)
-                                continue;
-                }
-                for (i = 0; i < ARRAY_SIZE(rtd520Boards); i++) {
-                        thisboard = &rtd520Boards[i];
-                        if (pcidev->device == thisboard->device_id) {
-                                dev->board_ptr = thisboard;
-                                return pcidev;
-                        }
-                }
+        for (i = 0; i < ARRAY_SIZE(rtd520Boards); i++) {
+                thisboard = &rtd520Boards[i];
+                if (pcidev->device == thisboard->device_id)
+                        return thisboard;
         }
-        dev_warn(dev->class_dev,
-                "no supported board found! (req. bus/slot: %d/%d)\n",
-                bus, slot);
         return NULL;
 }
 
-static int rtd_attach(struct comedi_device *dev, struct comedi_devconfig *it)
-{                               /* board name and options flags */
+static int rtd_auto_attach(struct comedi_device *dev,
+                                     unsigned long context_unused)
+{
+        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
         const struct rtdBoard *thisboard;
         struct rtdPrivate *devpriv;
-        struct pci_dev *pcidev;
         struct comedi_subdevice *s;
-        resource_size_t pci_base;
         int ret;
-#ifdef USE_DMA
-        int index;
-#endif
 
-        printk(KERN_INFO "comedi%d: rtd520 attaching.\n", dev->minor);
-
-#if defined(CONFIG_COMEDI_DEBUG) && defined(USE_DMA)
-        /* You can set this a load time: modprobe comedi comedi_debug=1 */
-        if (0 == comedi_debug)  /* force DMA debug printks */
-                comedi_debug = 1;
-#endif
+        thisboard = rtd_find_boardinfo(dev, pcidev);
+        if (!thisboard)
+                return -ENODEV;
+        dev->board_ptr = thisboard;
+        dev->board_name = thisboard->name;
 
-        /*
-         * Allocate the private structure area.  alloc_private() is a
-         * convenient macro defined in comedidev.h.
-         */
-        if (alloc_private(dev, sizeof(struct rtdPrivate)) < 0)
+        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
+        if (!devpriv)
                 return -ENOMEM;
-        devpriv = dev->private;
+        dev->private = devpriv;
 
-        pcidev = rtd_find_pci(dev, it);
-        if (!pcidev)
-                return -EIO;
-        comedi_set_hw_dev(dev, &pcidev->dev);
-        thisboard = comedi_board(dev);
-
-        dev->board_name = thisboard->name;
-
-        ret = comedi_pci_enable(pcidev, DRV_NAME);
-        if (ret < 0) {
-                printk(KERN_INFO "Failed to enable PCI device and request regions.\n");
+        ret = comedi_pci_enable(pcidev, dev->board_name);
+        if (ret)
                 return ret;
-        }
         dev->iobase = 1;        /* the "detach" needs this */
 
-        /* Initialize the base addresses */
-        pci_base = pci_resource_start(pcidev, LAS0_PCIINDEX);
-        devpriv->las0 = ioremap_nocache(pci_base, LAS0_PCISIZE);
-        pci_base = pci_resource_start(pcidev, LAS1_PCIINDEX);
-        devpriv->las1 = ioremap_nocache(pci_base, LAS1_PCISIZE);
-        pci_base = pci_resource_start(pcidev, LCFG_PCIINDEX);
-        devpriv->lcfg = ioremap_nocache(pci_base, LCFG_PCISIZE);
+        devpriv->las0 = ioremap_nocache(pci_resource_start(pcidev, 2),
+                                        pci_resource_len(pcidev, 2));
+        devpriv->las1 = ioremap_nocache(pci_resource_start(pcidev, 3),
+                                        pci_resource_len(pcidev, 3));
+        devpriv->lcfg = ioremap_nocache(pci_resource_start(pcidev, 0),
+                                        pci_resource_len(pcidev, 0));
         if (!devpriv->las0 || !devpriv->las1 || !devpriv->lcfg)
                 return -ENOMEM;
 
-        {                       /* The RTD driver does this */
-                unsigned char pci_latency;
-                u16 revision;
-                /*uint32_t epld_version; */
-
-                pci_read_config_word(pcidev, PCI_REVISION_ID,
-                                     &revision);
-                DPRINTK("%s: PCI revision %d.\n", dev->board_name, revision);
-
-                pci_read_config_byte(pcidev,
-                                     PCI_LATENCY_TIMER, &pci_latency);
-                if (pci_latency < 32) {
-                        printk(KERN_INFO "%s: PCI latency changed from %d to %d\n",
-                               dev->board_name, pci_latency, 32);
-                        pci_write_config_byte(pcidev,
-                                              PCI_LATENCY_TIMER, 32);
-                } else {
-                        DPRINTK("rtd520: PCI latency = %d\n", pci_latency);
-                }
+        rtd_pci_latency_quirk(dev, pcidev);
 
-                /*
-                 * Undocumented EPLD version (doesn't match RTD driver results)
-                 */
-                /*DPRINTK ("rtd520: Reading epld from %p\n",
-                   devpriv->las0+0);
-                   epld_version = readl (devpriv->las0+0);
-                   if ((epld_version & 0xF0) >> 4 == 0x0F) {
-                   DPRINTK("rtd520: pre-v8 EPLD. (%x)\n", epld_version);
-                   } else {
-                   DPRINTK("rtd520: EPLD version %x.\n", epld_version >> 4);
-                   } */
+        if (pcidev->irq) {
+                ret = request_irq(pcidev->irq, rtd_interrupt, IRQF_SHARED,
+                                  dev->board_name, dev);
+                if (ret == 0)
+                        dev->irq = pcidev->irq;
         }
 
-        /* Show board configuration */
-        printk(KERN_INFO "%s:", dev->board_name);
-
         ret = comedi_alloc_subdevices(dev, 4);
         if (ret)
                 return ret;
 
         s = &dev->subdevices[0];
-        dev->read_subdev = s;
         /* analog input subdevice */
-        s->type = COMEDI_SUBD_AI;
-        s->subdev_flags =
-            SDF_READABLE | SDF_GROUND | SDF_COMMON | SDF_DIFF | SDF_CMD_READ;
-        s->n_chan = thisboard->aiChans;
-        s->maxdata = (1 << thisboard->aiBits) - 1;
-        if (thisboard->aiMaxGain <= 32)
-                s->range_table = &rtd_ai_7520_range;
-        else
-                s->range_table = &rtd_ai_4520_range;
-
-        s->len_chanlist = RTD_MAX_CHANLIST;     /* devpriv->fifoLen */
-        s->insn_read = rtd_ai_rinsn;
-        s->do_cmd = rtd_ai_cmd;
-        s->do_cmdtest = rtd_ai_cmdtest;
-        s->cancel = rtd_ai_cancel;
-        /* s->poll = rtd_ai_poll; *//* not ready yet */
+        s->type         = COMEDI_SUBD_AI;
+        s->subdev_flags = SDF_READABLE | SDF_GROUND | SDF_COMMON | SDF_DIFF;
+        s->n_chan       = 16;
+        s->maxdata      = 0x0fff;
+        s->range_table  = thisboard->ai_range;
+        s->len_chanlist = RTD_MAX_CHANLIST;
+        s->insn_read    = rtd_ai_rinsn;
+        if (dev->irq) {
+                dev->read_subdev = s;
+                s->subdev_flags |= SDF_CMD_READ;
+                s->do_cmd       = rtd_ai_cmd;
+                s->do_cmdtest   = rtd_ai_cmdtest;
+                s->cancel       = rtd_ai_cancel;
+        }
 
         s = &dev->subdevices[1];
         /* analog output subdevice */
-        s->type = COMEDI_SUBD_AO;
-        s->subdev_flags = SDF_WRITABLE;
-        s->n_chan = 2;
-        s->maxdata = (1 << thisboard->aiBits) - 1;
-        s->range_table = &rtd_ao_range;
-        s->insn_write = rtd_ao_winsn;
-        s->insn_read = rtd_ao_rinsn;
+        s->type         = COMEDI_SUBD_AO;
+        s->subdev_flags = SDF_WRITABLE;
+        s->n_chan       = 2;
+        s->maxdata      = 0x0fff;
+        s->range_table  = &rtd_ao_range;
+        s->insn_write   = rtd_ao_winsn;
+        s->insn_read    = rtd_ao_rinsn;
 
         s = &dev->subdevices[2];
         /* digital i/o subdevice */
-        s->type = COMEDI_SUBD_DIO;
-        s->subdev_flags = SDF_READABLE | SDF_WRITABLE;
+        s->type         = COMEDI_SUBD_DIO;
+        s->subdev_flags = SDF_READABLE | SDF_WRITABLE;
         /* we only support port 0 right now.  Ignoring port 1 and user IO */
-        s->n_chan = 8;
-        s->maxdata = 1;
-        s->range_table = &range_digital;
-        s->insn_bits = rtd_dio_insn_bits;
-        s->insn_config = rtd_dio_insn_config;
+        s->n_chan       = 8;
+        s->maxdata      = 1;
+        s->range_table  = &range_digital;
+        s->insn_bits    = rtd_dio_insn_bits;
+        s->insn_config  = rtd_dio_insn_config;
 
         /* timer/counter subdevices (not currently supported) */
         s = &dev->subdevices[3];
-        s->type = COMEDI_SUBD_COUNTER;
-        s->subdev_flags = SDF_READABLE | SDF_WRITABLE;
-        s->n_chan = 3;
-        s->maxdata = 0xffff;
+        s->type         = COMEDI_SUBD_COUNTER;
+        s->subdev_flags = SDF_READABLE | SDF_WRITABLE;
+        s->n_chan       = 3;
+        s->maxdata      = 0xffff;
 
-        /* initialize board, per RTD spec */
-        /* also, initialize shadow registers */
-        writel(0, devpriv->las0 + LAS0_BOARD_RESET);
-        udelay(100);            /* needed? */
-        writel(0, devpriv->lcfg + LCFG_ITCSR);
-        devpriv->intMask = 0;
-        writew(devpriv->intMask, devpriv->las0 + LAS0_IT);
-        devpriv->intClearMask = ~0;
-        writew(devpriv->intClearMask, devpriv->las0 + LAS0_CLEAR);
-        readw(devpriv->las0 + LAS0_CLEAR);
-        writel(0, devpriv->las0 + LAS0_OVERRUN);
-        writel(0, devpriv->las0 + LAS0_CGT_CLEAR);
-        writel(0, devpriv->las0 + LAS0_ADC_FIFO_CLEAR);
-        writel(0, devpriv->las0 + LAS0_DAC1_RESET);
-        writel(0, devpriv->las0 + LAS0_DAC2_RESET);
-        /* clear digital IO fifo */
-        devpriv->dioStatus = 0;
-        writew(devpriv->dioStatus, devpriv->las0 + LAS0_DIO_STATUS);
-        devpriv->utcCtrl[0] = (0 << 6) | 0x30;
-        devpriv->utcCtrl[1] = (1 << 6) | 0x30;
-        devpriv->utcCtrl[2] = (2 << 6) | 0x30;
-        devpriv->utcCtrl[3] = (3 << 6) | 0x00;
-        writeb(devpriv->utcCtrl[0], devpriv->las0 + LAS0_UTC_CTRL);
-        writeb(devpriv->utcCtrl[1], devpriv->las0 + LAS0_UTC_CTRL);
-        writeb(devpriv->utcCtrl[2], devpriv->las0 + LAS0_UTC_CTRL);
-        writeb(devpriv->utcCtrl[3], devpriv->las0 + LAS0_UTC_CTRL);
-        /* TODO: set user out source ??? */
-
-        /* check if our interrupt is available and get it */
-        ret = request_irq(pcidev->irq, rtd_interrupt,
-                          IRQF_SHARED, DRV_NAME, dev);
-
-        if (ret < 0) {
-                printk("Could not get interrupt! (%u)\n",
-                       pcidev->irq);
-                return ret;
-        }
-        dev->irq = pcidev->irq;
-        printk(KERN_INFO "( irq=%u )", dev->irq);
+        rtd_init_board(dev);
 
         ret = rtd520_probe_fifo_depth(dev);
         if (ret < 0)
                 return ret;
-
         devpriv->fifoLen = ret;
-        printk("( fifoLen=%d )", devpriv->fifoLen);
-
-#ifdef USE_DMA
-        if (dev->irq > 0) {
-                printk("( DMA buff=%d )\n", DMA_CHAIN_COUNT);
-                /*
-                 * The PLX9080 has 2 DMA controllers, but there could be
-                 * 4 sources: ADC, digital, DAC1, and DAC2.  Since only the
-                 * ADC supports cmd mode right now, this isn't an issue (yet)
-                 */
-                devpriv->dma0Offset = 0;
-
-                for (index = 0; index < DMA_CHAIN_COUNT; index++) {
-                        devpriv->dma0Buff[index] =
-                            pci_alloc_consistent(pcidev,
-                                                 sizeof(u16) *
-                                                 devpriv->fifoLen / 2,
-                                                 &devpriv->
-                                                 dma0BuffPhysAddr[index]);
-                        if (devpriv->dma0Buff[index] == NULL) {
-                                ret = -ENOMEM;
-                                goto rtd_attach_die_error;
-                        }
-                        /*DPRINTK ("buff[%d] @ %p virtual, %x PCI\n",
-                           index,
-                           devpriv->dma0Buff[index],
-                           devpriv->dma0BuffPhysAddr[index]); */
-                }
-
-                /*
-                 * setup DMA descriptor ring (use cpu_to_le32 for byte
-                 * ordering?)
-                 */
-                devpriv->dma0Chain =
-                    pci_alloc_consistent(pcidev,
-                                         sizeof(struct plx_dma_desc) *
-                                         DMA_CHAIN_COUNT,
-                                         &devpriv->dma0ChainPhysAddr);
-                for (index = 0; index < DMA_CHAIN_COUNT; index++) {
-                        devpriv->dma0Chain[index].pci_start_addr =
-                            devpriv->dma0BuffPhysAddr[index];
-                        devpriv->dma0Chain[index].local_start_addr =
-                            DMALADDR_ADC;
-                        devpriv->dma0Chain[index].transfer_size =
-                            sizeof(u16) * devpriv->fifoLen / 2;
-                        devpriv->dma0Chain[index].next =
-                            (devpriv->dma0ChainPhysAddr + ((index +
-                                                            1) %
-                                                           (DMA_CHAIN_COUNT))
-                             * sizeof(devpriv->dma0Chain[0]))
-                            | DMA_TRANSFER_BITS;
-                        /*DPRINTK ("ring[%d] @%lx PCI: %x, local: %x, N: 0x%x, next: %x\n",
-                           index,
-                           ((long)devpriv->dma0ChainPhysAddr
-                           + (index * sizeof(devpriv->dma0Chain[0]))),
-                           devpriv->dma0Chain[index].pci_start_addr,
-                           devpriv->dma0Chain[index].local_start_addr,
-                           devpriv->dma0Chain[index].transfer_size,
-                           devpriv->dma0Chain[index].next); */
-                }
-
-                if (devpriv->dma0Chain == NULL) {
-                        ret = -ENOMEM;
-                        goto rtd_attach_die_error;
-                }
-
-                writel(DMA_MODE_BITS, devpriv->lcfg + LCFG_DMAMODE0);
-                /* set DMA trigger source */
-                writel(DMAS_ADFIFO_HALF_FULL, devpriv->las0 + LAS0_DMA0_SRC);
-        } else {
-                printk(KERN_INFO "( no IRQ->no DMA )");
-        }
-#endif /* USE_DMA */
 
         if (dev->irq)
                 writel(ICS_PIE | ICS_PLIE, devpriv->lcfg + LCFG_ITCSR);
 
-        printk("\ncomedi%d: rtd520 driver attached.\n", dev->minor);
+        dev_info(dev->class_dev, "%s attached\n", dev->board_name);
 
-        return 1;
+        return 0;
 }
 
 static void rtd_detach(struct comedi_device *dev)
 {
         struct rtdPrivate *devpriv = dev->private;
         struct pci_dev *pcidev = comedi_to_pci_dev(dev);
-#ifdef USE_DMA
-        int index;
-#endif
 
         if (devpriv) {
                 /* Shut down any board ops by resetting it */
-#ifdef USE_DMA
-                if (devpriv->lcfg) {
-                        devpriv->dma0Control = 0;
-                        devpriv->dma1Control = 0;
-                        writeb(devpriv->dma0Control,
-                                devpriv->lcfg + LCFG_DMACSR0);
-                        writeb(devpriv->dma1Control,
-                                devpriv->lcfg + LCFG_DMACSR1);
-                        writel(ICS_PIE | ICS_PLIE, devpriv->lcfg + LCFG_ITCSR);
-                }
-#endif /* USE_DMA */
-                if (devpriv->las0) {
-                        writel(0, devpriv->las0 + LAS0_BOARD_RESET);
-                        devpriv->intMask = 0;
-                        writew(devpriv->intMask, devpriv->las0 + LAS0_IT);
-                        devpriv->intClearMask = ~0;
-                        writew(devpriv->intClearMask,
-                                devpriv->las0 + LAS0_CLEAR);
-                        readw(devpriv->las0 + LAS0_CLEAR);
-                }
-#ifdef USE_DMA
-                /* release DMA */
-                for (index = 0; index < DMA_CHAIN_COUNT; index++) {
-                        if (NULL != devpriv->dma0Buff[index]) {
-                                pci_free_consistent(pcidev,
-                                                    sizeof(u16) *
-                                                    devpriv->fifoLen / 2,
-                                                    devpriv->dma0Buff[index],
-                                                    devpriv->
-                                                    dma0BuffPhysAddr[index]);
-                                devpriv->dma0Buff[index] = NULL;
-                        }
-                }
-                if (NULL != devpriv->dma0Chain) {
-                        pci_free_consistent(pcidev,
-                                            sizeof(struct plx_dma_desc) *
-                                            DMA_CHAIN_COUNT, devpriv->dma0Chain,
-                                            devpriv->dma0ChainPhysAddr);
-                        devpriv->dma0Chain = NULL;
-                }
-#endif /* USE_DMA */
+                if (devpriv->las0 && devpriv->lcfg)
+                        rtd_reset(dev);
                 if (dev->irq) {
                         writel(readl(devpriv->lcfg + LCFG_ITCSR) &
                                 ~(ICS_PLIE | ICS_DMA0_E | ICS_DMA1_E),
@@ -1923,24 +1404,23 @@ static void rtd_detach(struct comedi_device *dev)
         if (pcidev) {
                 if (dev->iobase)
                         comedi_pci_disable(pcidev);
-                pci_dev_put(pcidev);
         }
 }
 
 static struct comedi_driver rtd520_driver = {
         .driver_name    = "rtd520",
         .module         = THIS_MODULE,
-        .attach         = rtd_attach,
+        .auto_attach    = rtd_auto_attach,
         .detach         = rtd_detach,
 };
 
-static int __devinit rtd520_pci_probe(struct pci_dev *dev,
+static int rtd520_pci_probe(struct pci_dev *dev,
                                       const struct pci_device_id *ent)
 {
         return comedi_pci_auto_config(dev, &rtd520_driver);
 }
 
-static void __devexit rtd520_pci_remove(struct pci_dev *dev)
+static void rtd520_pci_remove(struct pci_dev *dev)
 {
         comedi_pci_auto_unconfig(dev);
 }
@@ -1956,7 +1436,7 @@ static struct pci_driver rtd520_pci_driver = {
         .name           = "rtd520",
         .id_table       = rtd520_pci_table,
         .probe          = rtd520_pci_probe,
-        .remove         = __devexit_p(rtd520_pci_remove),
+        .remove         = rtd520_pci_remove,
 };
 module_comedi_pci_driver(rtd520_driver, rtd520_pci_driver);
 
diff --git a/drivers/staging/comedi/drivers/rtd520.h b/drivers/staging/comedi/drivers/rtd520.h
index a3ec2599c4b8..25188a581455 100644
--- a/drivers/staging/comedi/drivers/rtd520.h
+++ b/drivers/staging/comedi/drivers/rtd520.h
@@ -26,163 +26,132 @@
 */
 
 /*
-  LAS0 Runtime Area
-  Local Address Space 0 Offset          Read Function   Write Function
-*/
-#define LAS0_SPARE_00    0x0000 /*  -                               - */
-#define LAS0_SPARE_04    0x0004 /*  -                               - */
-#define LAS0_USER_IO     0x0008 /*  Read User Inputs                Write User Outputs */
-#define LAS0_SPARE_0C    0x000C /*  -                               - */
-#define LAS0_ADC         0x0010 /*  Read FIFO Status                Software A/D Start */
-#define LAS0_DAC1        0x0014 /*  -                               Software D/A1 Update */
-#define LAS0_DAC2        0x0018 /*  -                               Software D/A2 Update */
-#define LAS0_SPARE_1C    0x001C /*  -                               - */
-#define LAS0_SPARE_20    0x0020 /*  -                               - */
-#define LAS0_DAC         0x0024 /*  -                               Software Simultaneous D/A1 and D/A2 Update */
-#define LAS0_PACER       0x0028 /*  Software Pacer Start            Software Pacer Stop */
-#define LAS0_TIMER       0x002C /*  Read Timer Counters Status      HDIN Software Trigger */
-#define LAS0_IT          0x0030 /*  Read Interrupt Status           Write Interrupt Enable Mask Register */
-#define LAS0_CLEAR       0x0034 /*  Clear ITs set by Clear Mask     Set Interrupt Clear Mask */
-#define LAS0_OVERRUN     0x0038 /*  Read pending interrupts         Clear Overrun Register */
-#define LAS0_SPARE_3C    0x003C /*  -                               - */
+ * Local Address Space 0 Offsets
+ */
+#define LAS0_USER_IO            0x0008  /* User I/O */
+#define LAS0_ADC                0x0010  /* FIFO Status/Software A/D Start */
+#define LAS0_DAC1               0x0014  /* Software D/A1 Update (w) */
+#define LAS0_DAC2               0x0018  /* Software D/A2 Update (w) */
+#define LAS0_DAC                0x0024  /* Software Simultaneous Update (w) */
+#define LAS0_PACER              0x0028  /* Software Pacer Start/Stop */
+#define LAS0_TIMER              0x002c  /* Timer Status/HDIN Software Trig. */
+#define LAS0_IT                 0x0030  /* Interrupt Status/Enable */
+#define LAS0_CLEAR              0x0034  /* Clear/Set Interrupt Clear Mask */
+#define LAS0_OVERRUN            0x0038  /* Pending interrupts/Clear Overrun */
+#define LAS0_PCLK               0x0040  /* Pacer Clock (24bit) */
+#define LAS0_BCLK               0x0044  /* Burst Clock (10bit) */
+#define LAS0_ADC_SCNT           0x0048  /* A/D Sample counter (10bit) */
+#define LAS0_DAC1_UCNT          0x004c  /* D/A1 Update counter (10 bit) */
+#define LAS0_DAC2_UCNT          0x0050  /* D/A2 Update counter (10 bit) */
+#define LAS0_DCNT               0x0054  /* Delay counter (16 bit) */
+#define LAS0_ACNT               0x0058  /* About counter (16 bit) */
+#define LAS0_DAC_CLK            0x005c  /* DAC clock (16bit) */
+#define LAS0_UTC0               0x0060  /* 8254 TC Counter 0 */
+#define LAS0_UTC1               0x0064  /* 8254 TC Counter 1 */
+#define LAS0_UTC2               0x0068  /* 8254 TC Counter 2 */
+#define LAS0_UTC_CTRL           0x006c  /* 8254 TC Control */
+#define LAS0_DIO0               0x0070  /* Digital I/O Port 0 */
+#define LAS0_DIO1               0x0074  /* Digital I/O Port 1 */
+#define LAS0_DIO0_CTRL          0x0078  /* Digital I/O Control */
+#define LAS0_DIO_STATUS         0x007c  /* Digital I/O Status */
+#define LAS0_BOARD_RESET        0x0100  /* Board reset */
+#define LAS0_DMA0_SRC           0x0104  /* DMA 0 Sources select */
+#define LAS0_DMA1_SRC           0x0108  /* DMA 1 Sources select */
+#define LAS0_ADC_CONVERSION     0x010c  /* A/D Conversion Signal select */
+#define LAS0_BURST_START        0x0110  /* Burst Clock Start Trigger select */
+#define LAS0_PACER_START        0x0114  /* Pacer Clock Start Trigger select */
+#define LAS0_PACER_STOP         0x0118  /* Pacer Clock Stop Trigger select */
+#define LAS0_ACNT_STOP_ENABLE   0x011c  /* About Counter Stop Enable */
+#define LAS0_PACER_REPEAT       0x0120  /* Pacer Start Trigger Mode select */
+#define LAS0_DIN_START          0x0124  /* HiSpd DI Sampling Signal select */
+#define LAS0_DIN_FIFO_CLEAR     0x0128  /* Digital Input FIFO Clear */
+#define LAS0_ADC_FIFO_CLEAR     0x012c  /* A/D FIFO Clear */
+#define LAS0_CGT_WRITE          0x0130  /* Channel Gain Table Write */
+#define LAS0_CGL_WRITE          0x0134  /* Channel Gain Latch Write */
+#define LAS0_CG_DATA            0x0138  /* Digital Table Write */
+#define LAS0_CGT_ENABLE         0x013c  /* Channel Gain Table Enable */
+#define LAS0_CG_ENABLE          0x0140  /* Digital Table Enable */
+#define LAS0_CGT_PAUSE          0x0144  /* Table Pause Enable */
+#define LAS0_CGT_RESET          0x0148  /* Reset Channel Gain Table */
+#define LAS0_CGT_CLEAR          0x014c  /* Clear Channel Gain Table */
+#define LAS0_DAC1_CTRL          0x0150  /* D/A1 output type/range */
+#define LAS0_DAC1_SRC           0x0154  /* D/A1 update source */
+#define LAS0_DAC1_CYCLE         0x0158  /* D/A1 cycle mode */
+#define LAS0_DAC1_RESET         0x015c  /* D/A1 FIFO reset */
+#define LAS0_DAC1_FIFO_CLEAR    0x0160  /* D/A1 FIFO clear */
+#define LAS0_DAC2_CTRL          0x0164  /* D/A2 output type/range */
+#define LAS0_DAC2_SRC           0x0168  /* D/A2 update source */
+#define LAS0_DAC2_CYCLE         0x016c  /* D/A2 cycle mode */
+#define LAS0_DAC2_RESET         0x0170  /* D/A2 FIFO reset */
+#define LAS0_DAC2_FIFO_CLEAR    0x0174  /* D/A2 FIFO clear */
+#define LAS0_ADC_SCNT_SRC       0x0178  /* A/D Sample Counter Source select */
+#define LAS0_PACER_SELECT       0x0180  /* Pacer Clock select */
+#define LAS0_SBUS0_SRC          0x0184  /* SyncBus 0 Source select */
+#define LAS0_SBUS0_ENABLE       0x0188  /* SyncBus 0 enable */
+#define LAS0_SBUS1_SRC          0x018c  /* SyncBus 1 Source select */
+#define LAS0_SBUS1_ENABLE       0x0190  /* SyncBus 1 enable */
+#define LAS0_SBUS2_SRC          0x0198  /* SyncBus 2 Source select */
+#define LAS0_SBUS2_ENABLE       0x019c  /* SyncBus 2 enable */
+#define LAS0_ETRG_POLARITY      0x01a4  /* Ext. Trigger polarity select */
+#define LAS0_EINT_POLARITY      0x01a8  /* Ext. Interrupt polarity select */
+#define LAS0_UTC0_CLOCK         0x01ac  /* UTC0 Clock select */
+#define LAS0_UTC0_GATE          0x01b0  /* UTC0 Gate select */
+#define LAS0_UTC1_CLOCK         0x01b4  /* UTC1 Clock select */
+#define LAS0_UTC1_GATE          0x01b8  /* UTC1 Gate select */
+#define LAS0_UTC2_CLOCK         0x01bc  /* UTC2 Clock select */
+#define LAS0_UTC2_GATE          0x01c0  /* UTC2 Gate select */
+#define LAS0_UOUT0_SELECT       0x01c4  /* User Output 0 source select */
+#define LAS0_UOUT1_SELECT       0x01c8  /* User Output 1 source select */
+#define LAS0_DMA0_RESET         0x01cc  /* DMA0 Request state machine reset */
+#define LAS0_DMA1_RESET         0x01d0  /* DMA1 Request state machine reset */
 
 /*
-  LAS0 Runtime Area Timer/Counter,Dig.IO
-  Name                  Local Address                   Function
-*/
-#define LAS0_PCLK        0x0040 /*  Pacer Clock value (24bit)             Pacer Clock load (24bit) */
-#define LAS0_BCLK        0x0044 /*  Burst Clock value (10bit)             Burst Clock load (10bit) */
-#define LAS0_ADC_SCNT    0x0048 /*  A/D Sample counter value (10bit)      A/D Sample counter load (10bit) */
-#define LAS0_DAC1_UCNT   0x004C /*  D/A1 Update counter value (10 bit)    D/A1 Update counter load (10bit) */
-#define LAS0_DAC2_UCNT   0x0050 /*  D/A2 Update counter value (10 bit)    D/A2 Update counter load (10bit) */
-#define LAS0_DCNT        0x0054 /*  Delay counter value (16 bit)          Delay counter load (16bit) */
-#define LAS0_ACNT        0x0058 /*  About counter value (16 bit)          About counter load (16bit) */
-#define LAS0_DAC_CLK     0x005C /*  DAC clock value (16bit)               DAC clock load (16bit) */
-#define LAS0_UTC0        0x0060 /*  8254 TC Counter 0 User TC 0 value     Load count in TC Counter 0 */
-#define LAS0_UTC1        0x0064 /*  8254 TC Counter 1 User TC 1 value     Load count in TC Counter 1 */
-#define LAS0_UTC2        0x0068 /*  8254 TC Counter 2 User TC 2 value     Load count in TC Counter 2 */
-#define LAS0_UTC_CTRL    0x006C /*  8254 TC Control Word                  Program counter mode for TC */
-#define LAS0_DIO0        0x0070 /*  Digital I/O Port 0 Read Port          Digital I/O Port 0 Write Port */
-#define LAS0_DIO1        0x0074 /*  Digital I/O Port 1 Read Port          Digital I/O Port 1 Write Port */
-#define LAS0_DIO0_CTRL   0x0078 /*  Clear digital IRQ status flag/read    Clear digital chip/program Port 0 */
-#define LAS0_DIO_STATUS  0x007C /*  Read Digital I/O Status word          Program digital control register & */
-
-/*
-  LAS0 Setup Area
-  Name                  Local Address                   Function
-*/
-#define LAS0_BOARD_RESET        0x0100  /*  Board reset */
-#define LAS0_DMA0_SRC           0x0104  /*  DMA 0 Sources select */
-#define LAS0_DMA1_SRC           0x0108  /*  DMA 1 Sources select */
-#define LAS0_ADC_CONVERSION     0x010C  /*  A/D Conversion Signal select */
-#define LAS0_BURST_START        0x0110  /*  Burst Clock Start Trigger select */
-#define LAS0_PACER_START        0x0114  /*  Pacer Clock Start Trigger select */
-#define LAS0_PACER_STOP         0x0118  /*  Pacer Clock Stop Trigger select */
-#define LAS0_ACNT_STOP_ENABLE   0x011C  /*  About Counter Stop Enable */
-#define LAS0_PACER_REPEAT       0x0120  /*  Pacer Start Trigger Mode select */
-#define LAS0_DIN_START          0x0124  /*  High Speed Digital Input Sampling Signal select */
-#define LAS0_DIN_FIFO_CLEAR     0x0128  /*  Digital Input FIFO Clear */
-#define LAS0_ADC_FIFO_CLEAR     0x012C  /*  A/D FIFO Clear */
-#define LAS0_CGT_WRITE          0x0130  /*  Channel Gain Table Write */
-#define LAS0_CGL_WRITE          0x0134  /*  Channel Gain Latch Write */
-#define LAS0_CG_DATA            0x0138  /*  Digital Table Write */
-#define LAS0_CGT_ENABLE         0x013C  /*  Channel Gain Table Enable */
-#define LAS0_CG_ENABLE          0x0140  /*  Digital Table Enable */
-#define LAS0_CGT_PAUSE          0x0144  /*  Table Pause Enable */
-#define LAS0_CGT_RESET          0x0148  /*  Reset Channel Gain Table */
-#define LAS0_CGT_CLEAR          0x014C  /*  Clear Channel Gain Table */
-#define LAS0_DAC1_CTRL          0x0150  /*  D/A1 output type/range */
-#define LAS0_DAC1_SRC           0x0154  /*  D/A1 update source */
-#define LAS0_DAC1_CYCLE         0x0158  /*  D/A1 cycle mode */
-#define LAS0_DAC1_RESET         0x015C  /*  D/A1 FIFO reset */
-#define LAS0_DAC1_FIFO_CLEAR    0x0160  /*  D/A1 FIFO clear */
-#define LAS0_DAC2_CTRL          0x0164  /*  D/A2 output type/range */
-#define LAS0_DAC2_SRC           0x0168  /*  D/A2 update source */
-#define LAS0_DAC2_CYCLE         0x016C  /*  D/A2 cycle mode */
-#define LAS0_DAC2_RESET         0x0170  /*  D/A2 FIFO reset */
-#define LAS0_DAC2_FIFO_CLEAR    0x0174  /*  D/A2 FIFO clear */
-#define LAS0_ADC_SCNT_SRC       0x0178  /*  A/D Sample Counter Source select */
-#define LAS0_PACER_SELECT       0x0180  /*  Pacer Clock select */
-#define LAS0_SBUS0_SRC          0x0184  /*  SyncBus 0 Source select */
-#define LAS0_SBUS0_ENABLE       0x0188  /*  SyncBus 0 enable */
-#define LAS0_SBUS1_SRC          0x018C  /*  SyncBus 1 Source select */
-#define LAS0_SBUS1_ENABLE       0x0190  /*  SyncBus 1 enable */
-#define LAS0_SBUS2_SRC          0x0198  /*  SyncBus 2 Source select */
-#define LAS0_SBUS2_ENABLE       0x019C  /*  SyncBus 2 enable */
-#define LAS0_ETRG_POLARITY      0x01A4  /*  External Trigger polarity select */
-#define LAS0_EINT_POLARITY      0x01A8  /*  External Interrupt polarity select */
-#define LAS0_UTC0_CLOCK         0x01AC  /*  UTC0 Clock select */
-#define LAS0_UTC0_GATE          0x01B0  /*  UTC0 Gate select */
-#define LAS0_UTC1_CLOCK         0x01B4  /*  UTC1 Clock select */
-#define LAS0_UTC1_GATE          0x01B8  /*  UTC1 Gate select */
-#define LAS0_UTC2_CLOCK         0x01BC  /*  UTC2 Clock select */
-#define LAS0_UTC2_GATE          0x01C0  /*  UTC2 Gate select */
-#define LAS0_UOUT0_SELECT       0x01C4  /*  User Output 0 source select */
-#define LAS0_UOUT1_SELECT       0x01C8  /*  User Output 1 source select */
-#define LAS0_DMA0_RESET         0x01CC  /*  DMA0 Request state machine reset */
-#define LAS0_DMA1_RESET         0x01D0  /*  DMA1 Request state machine reset */
+ * Local Address Space 1 Offsets
+ */
+#define LAS1_ADC_FIFO           0x0000  /* A/D FIFO (16bit) */
+#define LAS1_HDIO_FIFO          0x0004  /* HiSpd DI FIFO (16bit) */
+#define LAS1_DAC1_FIFO          0x0008  /* D/A1 FIFO (16bit) */
+#define LAS1_DAC2_FIFO          0x000c  /* D/A2 FIFO (16bit) */
 
 /*
-  LAS1
-  Name                  Local Address                   Function
-*/
-#define LAS1_ADC_FIFO            0x0000 /*  Read A/D FIFO (16bit) - */
-#define LAS1_HDIO_FIFO           0x0004 /*  Read High Speed Digital Input FIFO (16bit) - */
-#define LAS1_DAC1_FIFO           0x0008 /*  - Write D/A1 FIFO (16bit) */
-#define LAS1_DAC2_FIFO           0x000C /*  - Write D/A2 FIFO (16bit) */
-
-/*
-  LCFG: PLX 9080 local config & runtime registers
-  Name                  Local Address                   Function
-*/
-#define LCFG_ITCSR              0x0068  /*  INTCSR, Interrupt Control/Status Register */
-#define LCFG_DMAMODE0           0x0080  /*  DMA Channel 0 Mode Register */
-#define LCFG_DMAPADR0           0x0084  /*  DMA Channel 0 PCI Address Register */
-#define LCFG_DMALADR0           0x0088  /*  DMA Channel 0 Local Address Reg */
-#define LCFG_DMASIZ0            0x008C  /*  DMA Channel 0 Transfer Size (Bytes) Register */
-#define LCFG_DMADPR0            0x0090  /*  DMA Channel 0 Descriptor Pointer Register */
-#define LCFG_DMAMODE1           0x0094  /*  DMA Channel 1 Mode Register */
-#define LCFG_DMAPADR1           0x0098  /*  DMA Channel 1 PCI Address Register */
-#define LCFG_DMALADR1           0x009C  /*  DMA Channel 1 Local Address Register */
-#define LCFG_DMASIZ1            0x00A0  /*  DMA Channel 1 Transfer Size (Bytes) Register */
-#define LCFG_DMADPR1            0x00A4  /*  DMA Channel 1 Descriptor Pointer Register */
-#define LCFG_DMACSR0            0x00A8  /*  DMA Channel 0 Command/Status Register */
-#define LCFG_DMACSR1            0x00A9  /*  DMA Channel 0 Command/Status Register */
-#define LCFG_DMAARB             0x00AC  /*  DMA Arbitration Register */
-#define LCFG_DMATHR             0x00B0  /*  DMA Threshold Register */
-
-/*======================================================================
-  Resister bit definitions
-======================================================================*/
+ * PLX 9080 local config & runtime registers
+ */
+#define LCFG_ITCSR              0x0068  /* Interrupt Control/Status */
+#define LCFG_DMAMODE0           0x0080  /* DMA0 Mode */
+#define LCFG_DMAPADR0           0x0084  /* DMA0 PCI Address */
+#define LCFG_DMALADR0           0x0088  /* DMA0 Local Address */
+#define LCFG_DMASIZ0            0x008c  /* DMA0 Transfer Size (Bytes) */
+#define LCFG_DMADPR0            0x0090  /* DMA0 Descriptor Pointer */
+#define LCFG_DMAMODE1           0x0094  /* DMA1 Mode */
+#define LCFG_DMAPADR1           0x0098  /* DMA1 PCI Address */
+#define LCFG_DMALADR1           0x009c  /* DMA1 Local Address */
+#define LCFG_DMASIZ1            0x00a0  /* DMA1 Transfer Size (Bytes) */
+#define LCFG_DMADPR1            0x00a4  /* DMA1 Descriptor Pointer */
+#define LCFG_DMACSR0            0x00a8  /* DMA0 Command/Status */
+#define LCFG_DMACSR1            0x00a9  /* DMA0 Command/Status */
+#define LCFG_DMAARB             0x00ac  /* DMA Arbitration */
+#define LCFG_DMATHR             0x00b0  /* DMA Threshold */
 
 /*  FIFO Status Word Bits (RtdFifoStatus) */
-#define FS_DAC1_NOT_EMPTY    0x0001     /*  D0  - DAC1 FIFO not empty */
-#define FS_DAC1_HEMPTY   0x0002 /*  D1  - DAC1 FIFO half empty */
-#define FS_DAC1_NOT_FULL     0x0004     /*  D2  - DAC1 FIFO not full */
-#define FS_DAC2_NOT_EMPTY    0x0010     /*  D4  - DAC2 FIFO not empty */
-#define FS_DAC2_HEMPTY   0x0020 /*  D5  - DAC2 FIFO half empty */
-#define FS_DAC2_NOT_FULL     0x0040     /*  D6  - DAC2 FIFO not full */
-#define FS_ADC_NOT_EMPTY     0x0100     /*  D8  - ADC FIFO not empty */
-#define FS_ADC_HEMPTY    0x0200 /*  D9  - ADC FIFO half empty */
-#define FS_ADC_NOT_FULL      0x0400     /*  D10 - ADC FIFO not full */
-#define FS_DIN_NOT_EMPTY     0x1000     /*  D12 - DIN FIFO not empty */
-#define FS_DIN_HEMPTY    0x2000 /*  D13 - DIN FIFO half empty */
-#define FS_DIN_NOT_FULL      0x4000     /*  D14 - DIN FIFO not full */
+#define FS_DAC1_NOT_EMPTY       (1 << 0)  /* DAC1 FIFO not empty */
+#define FS_DAC1_HEMPTY          (1 << 1)  /* DAC1 FIFO half empty */
+#define FS_DAC1_NOT_FULL        (1 << 2)  /* DAC1 FIFO not full */
+#define FS_DAC2_NOT_EMPTY       (1 << 4)  /* DAC2 FIFO not empty */
+#define FS_DAC2_HEMPTY          (1 << 5)  /* DAC2 FIFO half empty */
+#define FS_DAC2_NOT_FULL        (1 << 6)  /* DAC2 FIFO not full */
+#define FS_ADC_NOT_EMPTY        (1 << 8)  /* ADC FIFO not empty */
+#define FS_ADC_HEMPTY           (1 << 9)  /* ADC FIFO half empty */
+#define FS_ADC_NOT_FULL         (1 << 10) /* ADC FIFO not full */
+#define FS_DIN_NOT_EMPTY        (1 << 12) /* DIN FIFO not empty */
+#define FS_DIN_HEMPTY           (1 << 13) /* DIN FIFO half empty */
+#define FS_DIN_NOT_FULL         (1 << 14) /* DIN FIFO not full */
 
 /*  Timer Status Word Bits (GetTimerStatus) */
-#define TS_PCLK_GATE   0x0001
-/*  D0 - Pacer Clock Gate [0 - gated, 1 - enabled] */
-#define TS_BCLK_GATE   0x0002
-/*  D1 - Burst Clock Gate [0 - disabled, 1 - running] */
-#define TS_DCNT_GATE   0x0004
-/*  D2 - Pacer Clock Delayed Start Trigger [0 - delay over, 1 - delay in */
-/*  progress] */
-#define TS_ACNT_GATE   0x0008
-/*  D3 - Pacer Clock About Trigger [0 - completed, 1 - in progress] */
-#define TS_PCLK_RUN    0x0010
-/*  D4 - Pacer Clock Shutdown Flag [0 - Pacer Clock cannot be start */
-/*  triggered only by Software Pacer Start Command, 1 - Pacer Clock can */
-/*  be start triggered] */
+#define TS_PCLK_GATE            (1 << 0)  /* Pacer Clock Gate enabled */
+#define TS_BCLK_GATE            (1 << 1)  /* Burst Clock Gate running */
+#define TS_DCNT_GATE            (1 << 2)  /* Pacer Clock Delayed Start Trig. */
+#define TS_ACNT_GATE            (1 << 3)  /* Pacer Clock About Trig. */
+#define TS_PCLK_RUN             (1 << 4)  /* Pacer Clock Shutdown Flag */
 
 /*  External Trigger polarity select */
 /*  External Interrupt polarity select */
diff --git a/drivers/staging/comedi/drivers/rti800.c b/drivers/staging/comedi/drivers/rti800.c
index 137885b1681a..7e577e444909 100644
--- a/drivers/staging/comedi/drivers/rti800.c
+++ b/drivers/staging/comedi/drivers/rti800.c
@@ -161,8 +161,6 @@ struct rti800_private {
         int muxgain_bits;
 };
 
-#define devpriv ((struct rti800_private *)dev->private)
-
 #define RTI800_TIMEOUT 100
 
 static irqreturn_t rti800_interrupt(int irq, void *dev)
@@ -177,6 +175,7 @@ static int rti800_ai_insn_read(struct comedi_device *dev,
                                struct comedi_subdevice *s,
                                struct comedi_insn *insn, unsigned int *data)
 {
+        struct rti800_private *devpriv = dev->private;
         int i, t;
         int status;
         int chan = CR_CHAN(insn->chanspec);
@@ -229,6 +228,7 @@ static int rti800_ao_insn_read(struct comedi_device *dev,
                                struct comedi_subdevice *s,
                                struct comedi_insn *insn, unsigned int *data)
 {
+        struct rti800_private *devpriv = dev->private;
         int i;
         int chan = CR_CHAN(insn->chanspec);
 
@@ -242,6 +242,7 @@ static int rti800_ao_insn_write(struct comedi_device *dev,
                                 struct comedi_subdevice *s,
                                 struct comedi_insn *insn, unsigned int *data)
 {
+        struct rti800_private *devpriv = dev->private;
         int chan = CR_CHAN(insn->chanspec);
         int d;
         int i;
@@ -303,6 +304,7 @@ static int rti800_do_insn_bits(struct comedi_device *dev,
 static int rti800_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 {
         const struct rti800_board *board = comedi_board(dev);
+        struct rti800_private *devpriv;
         unsigned int irq;
         unsigned long iobase;
         int ret;
@@ -347,9 +349,10 @@ static int rti800_attach(struct comedi_device *dev, struct comedi_devconfig *it)
         if (ret)
                 return ret;
 
-        ret = alloc_private(dev, sizeof(struct rti800_private));
-        if (ret < 0)
-                return ret;
+        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
+        if (!devpriv)
+                return -ENOMEM;
+        dev->private = devpriv;
 
         devpriv->adc_mux = it->options[2];
         devpriv->adc_range = it->options[3];
diff --git a/drivers/staging/comedi/drivers/rti802.c b/drivers/staging/comedi/drivers/rti802.c
index 3f9d0278be50..2185ca1bcf02 100644
--- a/drivers/staging/comedi/drivers/rti802.c
+++ b/drivers/staging/comedi/drivers/rti802.c
@@ -55,12 +55,11 @@ struct rti802_private {
         unsigned int ao_readback[8];
 };
 
-#define devpriv ((struct rti802_private *)dev->private)
-
 static int rti802_ao_insn_read(struct comedi_device *dev,
                                struct comedi_subdevice *s,
                                struct comedi_insn *insn, unsigned int *data)
 {
+        struct rti802_private *devpriv = dev->private;
         int i;
 
         for (i = 0; i < insn->n; i++)
@@ -73,6 +72,7 @@ static int rti802_ao_insn_write(struct comedi_device *dev,
                                 struct comedi_subdevice *s,
                                 struct comedi_insn *insn, unsigned int *data)
 {
+        struct rti802_private *devpriv = dev->private;
         int i, d;
         int chan = CR_CHAN(insn->chanspec);
 
@@ -89,6 +89,7 @@ static int rti802_ao_insn_write(struct comedi_device *dev,
 
 static int rti802_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 {
+        struct rti802_private *devpriv;
         struct comedi_subdevice *s;
         int i;
         unsigned long iobase;
@@ -104,8 +105,10 @@ static int rti802_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 
         dev->board_name = "rti802";
 
-        if (alloc_private(dev, sizeof(struct rti802_private)))
+        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
+        if (!devpriv)
                 return -ENOMEM;
+        dev->private = devpriv;
 
         ret = comedi_alloc_subdevices(dev, 1);
         if (ret)
diff --git a/drivers/staging/comedi/drivers/s526.c b/drivers/staging/comedi/drivers/s526.c
index a1e256293bd6..39232b359453 100644
--- a/drivers/staging/comedi/drivers/s526.c
+++ b/drivers/staging/comedi/drivers/s526.c
@@ -564,10 +564,10 @@ static int s526_attach(struct comedi_device *dev, struct comedi_devconfig *it)
         }
         dev->iobase = iobase;
 
-        ret = alloc_private(dev, sizeof(*devpriv));
-        if (ret)
-                return ret;
-        devpriv = dev->private;
+        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
+        if (!devpriv)
+                return -ENOMEM;
+        dev->private = devpriv;
 
         ret = comedi_alloc_subdevices(dev, 4);
         if (ret)
diff --git a/drivers/staging/comedi/drivers/s626.c b/drivers/staging/comedi/drivers/s626.c
index 551d68b7837c..6dc1d2812865 100644
--- a/drivers/staging/comedi/drivers/s626.c
+++ b/drivers/staging/comedi/drivers/s626.c
@@ -161,7 +161,6 @@ static struct dio_private *dio_private_word[]={
 };
 */
 
-#define devpriv ((struct s626_private *)dev->private)
 #define diopriv ((struct dio_private *)s->private)
 
 /*  COUNTER OBJECT ------------------------------------------------ */
@@ -232,6 +231,8 @@ static const struct comedi_lrange s626_range_table = { 2, {
 /*  critical section. */
 static void DEBItransfer(struct comedi_device *dev)
 {
+        struct s626_private *devpriv = dev->private;
+
         /*  Initiate upload of shadow RAM to DEBI control register. */
         MC_ENABLE(P_MC2, MC2_UPLD_DEBI);
 
@@ -249,6 +250,7 @@ static void DEBItransfer(struct comedi_device *dev)
 
 static uint16_t DEBIread(struct comedi_device *dev, uint16_t addr)
 {
+        struct s626_private *devpriv = dev->private;
         uint16_t retval;
 
         /*  Set up DEBI control register value in shadow RAM. */
@@ -267,6 +269,7 @@ static uint16_t DEBIread(struct comedi_device *dev, uint16_t addr)
 /*  Write a value to a gate array register. */
 static void DEBIwrite(struct comedi_device *dev, uint16_t addr, uint16_t wdata)
 {
+        struct s626_private *devpriv = dev->private;
 
         /*  Set up DEBI control register value in shadow RAM. */
         WR7146(P_DEBICMD, DEBI_CMD_WRWORD | addr);
@@ -283,6 +286,7 @@ static void DEBIwrite(struct comedi_device *dev, uint16_t addr, uint16_t wdata)
 static void DEBIreplace(struct comedi_device *dev, uint16_t addr, uint16_t mask,
                         uint16_t wdata)
 {
+        struct s626_private *devpriv = dev->private;
 
         /*  Copy target gate array register into P_DEBIAD register. */
         WR7146(P_DEBICMD, DEBI_CMD_RDWORD | addr);
@@ -302,6 +306,8 @@ static void DEBIreplace(struct comedi_device *dev, uint16_t addr, uint16_t mask,
 
 static uint32_t I2Chandshake(struct comedi_device *dev, uint32_t val)
 {
+        struct s626_private *devpriv = dev->private;
+
         /*  Write I2C command to I2C Transfer Control shadow register. */
         WR7146(P_I2CCTRL, val);
 
@@ -324,6 +330,7 @@ static uint32_t I2Chandshake(struct comedi_device *dev, uint32_t val)
 /*  Read uint8_t from EEPROM. */
 static uint8_t I2Cread(struct comedi_device *dev, uint8_t addr)
 {
+        struct s626_private *devpriv = dev->private;
         uint8_t rtnval;
 
         /*  Send EEPROM target address. */
@@ -375,6 +382,7 @@ static uint8_t trimadrs[] = { 0x40, 0x41, 0x42, 0x50, 0x51, 0x52, 0x53, 0x60, 0x
  */
 static void SendDAC(struct comedi_device *dev, uint32_t val)
 {
+        struct s626_private *devpriv = dev->private;
 
         /* START THE SERIAL CLOCK RUNNING ------------- */
 
@@ -496,6 +504,7 @@ static void SendDAC(struct comedi_device *dev, uint32_t val)
 /*  Private helper function: Write setpoint to an application DAC channel. */
 static void SetDAC(struct comedi_device *dev, uint16_t chan, short dacdata)
 {
+        struct s626_private *devpriv = dev->private;
         register uint16_t signmask;
         register uint32_t WSImage;
 
@@ -553,6 +562,7 @@ static void SetDAC(struct comedi_device *dev, uint16_t chan, short dacdata)
 static void WriteTrimDAC(struct comedi_device *dev, uint8_t LogicalChan,
                          uint8_t DacData)
 {
+        struct s626_private *devpriv = dev->private;
         uint32_t chan;
 
         /*  Save the new setpoint in case the application needs to read it back later. */
@@ -735,6 +745,7 @@ static int s626_dio_clear_irq(struct comedi_device *dev)
 static irqreturn_t s626_irq_handler(int irq, void *d)
 {
         struct comedi_device *dev = d;
+        struct s626_private *devpriv = dev->private;
         struct comedi_subdevice *s;
         struct comedi_cmd *cmd;
         struct enc_private *k;
@@ -968,6 +979,7 @@ static irqreturn_t s626_irq_handler(int irq, void *d)
  */
 static void ResetADC(struct comedi_device *dev, uint8_t *ppl)
 {
+        struct s626_private *devpriv = dev->private;
         register uint32_t *pRPS;
         uint32_t JmpAdrs;
         uint16_t i;
@@ -1163,6 +1175,7 @@ static int s626_ai_insn_config(struct comedi_device *dev,
 
 /* static int s626_ai_rinsn(struct comedi_device *dev,struct comedi_subdevice *s,struct comedi_insn *insn,unsigned int *data) */
 /* { */
+/*   struct s626_private *devpriv = dev->private; */
 /*   register uint8_t   i; */
 /*   register int32_t   *readaddr; */
 
@@ -1191,6 +1204,7 @@ static int s626_ai_insn_read(struct comedi_device *dev,
                              struct comedi_subdevice *s,
                              struct comedi_insn *insn, unsigned int *data)
 {
+        struct s626_private *devpriv = dev->private;
         uint16_t chan = CR_CHAN(insn->chanspec);
         uint16_t range = CR_RANGE(insn->chanspec);
         uint16_t AdcSpec = 0;
@@ -1302,6 +1316,8 @@ static int s626_ai_load_polllist(uint8_t *ppl, struct comedi_cmd *cmd)
 static int s626_ai_inttrig(struct comedi_device *dev,
                            struct comedi_subdevice *s, unsigned int trignum)
 {
+        struct s626_private *devpriv = dev->private;
+
         if (trignum != 0)
                 return -EINVAL;
 
@@ -1378,7 +1394,7 @@ static void s626_timer_load(struct comedi_device *dev, struct enc_private *k,
 /*  TO COMPLETE  */
 static int s626_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
 {
-
+        struct s626_private *devpriv = dev->private;
         uint8_t ppl[16];
         struct comedi_cmd *cmd = &s->async->cmd;
         struct enc_private *k;
@@ -1533,80 +1549,46 @@ static int s626_ai_cmdtest(struct comedi_device *dev,
 
         /* step 3: make sure arguments are trivially compatible */
 
-        if (cmd->start_src != TRIG_EXT && cmd->start_arg != 0) {
-                cmd->start_arg = 0;
-                err++;
-        }
+        if (cmd->start_src != TRIG_EXT)
+                err |= cfc_check_trigger_arg_is(&cmd->start_arg, 0);
+        if (cmd->start_src == TRIG_EXT)
+                err |= cfc_check_trigger_arg_max(&cmd->start_arg, 39);
 
-        if (cmd->start_src == TRIG_EXT && cmd->start_arg > 39) {
-                cmd->start_arg = 39;
-                err++;
-        }
+        if (cmd->scan_begin_src == TRIG_EXT)
+                err |= cfc_check_trigger_arg_max(&cmd->scan_begin_arg, 39);
 
-        if (cmd->scan_begin_src == TRIG_EXT && cmd->scan_begin_arg > 39) {
-                cmd->scan_begin_arg = 39;
-                err++;
-        }
+        if (cmd->convert_src == TRIG_EXT)
+                err |= cfc_check_trigger_arg_max(&cmd->convert_arg, 39);
 
-        if (cmd->convert_src == TRIG_EXT && cmd->convert_arg > 39) {
-                cmd->convert_arg = 39;
-                err++;
-        }
 #define MAX_SPEED       200000  /* in nanoseconds */
 #define MIN_SPEED       2000000000      /* in nanoseconds */
 
         if (cmd->scan_begin_src == TRIG_TIMER) {
-                if (cmd->scan_begin_arg < MAX_SPEED) {
-                        cmd->scan_begin_arg = MAX_SPEED;
-                        err++;
-                }
-                if (cmd->scan_begin_arg > MIN_SPEED) {
-                        cmd->scan_begin_arg = MIN_SPEED;
-                        err++;
-                }
+                err |= cfc_check_trigger_arg_min(&cmd->scan_begin_arg,
+                                                 MAX_SPEED);
+                err |= cfc_check_trigger_arg_max(&cmd->scan_begin_arg,
+                                                 MIN_SPEED);
         } else {
                 /* external trigger */
                 /* should be level/edge, hi/lo specification here */
                 /* should specify multiple external triggers */
-/*     if(cmd->scan_begin_arg>9){ */
-/*       cmd->scan_begin_arg=9; */
-/*       err++; */
-/*     } */
+/*              err |= cfc_check_trigger_arg_max(&cmd->scan_begin_arg, 9); */
         }
         if (cmd->convert_src == TRIG_TIMER) {
-                if (cmd->convert_arg < MAX_SPEED) {
-                        cmd->convert_arg = MAX_SPEED;
-                        err++;
-                }
-                if (cmd->convert_arg > MIN_SPEED) {
-                        cmd->convert_arg = MIN_SPEED;
-                        err++;
-                }
+                err |= cfc_check_trigger_arg_min(&cmd->convert_arg, MAX_SPEED);
+                err |= cfc_check_trigger_arg_max(&cmd->convert_arg, MIN_SPEED);
         } else {
                 /* external trigger */
                 /* see above */
-/*     if(cmd->convert_arg>9){ */
-/*       cmd->convert_arg=9; */
-/*       err++; */
-/*     } */
+/*              err |= cfc_check_trigger_arg_max(&cmd->scan_begin_arg, 9); */
         }
 
-        if (cmd->scan_end_arg != cmd->chanlist_len) {
-                cmd->scan_end_arg = cmd->chanlist_len;
-                err++;
-        }
-        if (cmd->stop_src == TRIG_COUNT) {
-                if (cmd->stop_arg > 0x00ffffff) {
-                        cmd->stop_arg = 0x00ffffff;
-                        err++;
-                }
-        } else {
-                /* TRIG_NONE */
-                if (cmd->stop_arg != 0) {
-                        cmd->stop_arg = 0;
-                        err++;
-                }
-        }
+        err |= cfc_check_trigger_arg_is(&cmd->scan_end_arg, cmd->chanlist_len);
+
+        if (cmd->stop_src == TRIG_COUNT)
+                err |= cfc_check_trigger_arg_max(&cmd->stop_arg, 0x00ffffff);
+        else    /* TRIG_NONE */
+                err |= cfc_check_trigger_arg_is(&cmd->stop_arg, 0);
 
         if (err)
                 return 3;
@@ -1643,6 +1625,8 @@ static int s626_ai_cmdtest(struct comedi_device *dev,
 
 static int s626_ai_cancel(struct comedi_device *dev, struct comedi_subdevice *s)
 {
+        struct s626_private *devpriv = dev->private;
+
         /*  Stop RPS program in case it is currently running. */
         MC_DISABLE(P_MC1, MC1_ERPS1);
 
@@ -1657,7 +1641,7 @@ static int s626_ai_cancel(struct comedi_device *dev, struct comedi_subdevice *s)
 static int s626_ao_winsn(struct comedi_device *dev, struct comedi_subdevice *s,
                          struct comedi_insn *insn, unsigned int *data)
 {
-
+        struct s626_private *devpriv = dev->private;
         int i;
         uint16_t chan = CR_CHAN(insn->chanspec);
         int16_t dacdata;
@@ -1676,6 +1660,7 @@ static int s626_ao_winsn(struct comedi_device *dev, struct comedi_subdevice *s,
 static int s626_ao_rinsn(struct comedi_device *dev, struct comedi_subdevice *s,
                          struct comedi_insn *insn, unsigned int *data)
 {
+        struct s626_private *devpriv = dev->private;
         int i;
 
         for (i = 0; i < insn->n; i++)
@@ -1974,6 +1959,7 @@ static uint16_t GetMode_B(struct comedi_device *dev, struct enc_private *k)
 static void SetMode_A(struct comedi_device *dev, struct enc_private *k,
                       uint16_t Setup, uint16_t DisableIntSrc)
 {
+        struct s626_private *devpriv = dev->private;
         register uint16_t cra;
         register uint16_t crb;
         register uint16_t setup = Setup;        /*  Cache the Standard Setup. */
@@ -2032,6 +2018,7 @@ static void SetMode_A(struct comedi_device *dev, struct enc_private *k,
 static void SetMode_B(struct comedi_device *dev, struct enc_private *k,
                       uint16_t Setup, uint16_t DisableIntSrc)
 {
+        struct s626_private *devpriv = dev->private;
         register uint16_t cra;
         register uint16_t crb;
         register uint16_t setup = Setup;        /*  Cache the Standard Setup. */
@@ -2165,6 +2152,8 @@ static uint16_t GetLoadTrig_B(struct comedi_device *dev, struct enc_private *k)
 static void SetIntSrc_A(struct comedi_device *dev, struct enc_private *k,
                         uint16_t IntSource)
 {
+        struct s626_private *devpriv = dev->private;
+
         /*  Reset any pending counter overflow or index captures. */
         DEBIreplace(dev, k->MyCRB, (uint16_t) (~CRBMSK_INTCTRL),
                     CRBMSK_INTRESETCMD | CRBMSK_INTRESET_A);
@@ -2182,6 +2171,7 @@ static void SetIntSrc_A(struct comedi_device *dev, struct enc_private *k,
 static void SetIntSrc_B(struct comedi_device *dev, struct enc_private *k,
                         uint16_t IntSource)
 {
+        struct s626_private *devpriv = dev->private;
         uint16_t crb;
 
         /*  Cache writeable CRB register image. */
@@ -2412,6 +2402,7 @@ static void CountersInit(struct comedi_device *dev)
 static int s626_allocate_dma_buffers(struct comedi_device *dev)
 {
         struct pci_dev *pcidev = comedi_to_pci_dev(dev);
+        struct s626_private *devpriv = dev->private;
         void *addr;
         dma_addr_t appdma;
 
@@ -2432,6 +2423,7 @@ static int s626_allocate_dma_buffers(struct comedi_device *dev)
 
 static void s626_initialize(struct comedi_device *dev)
 {
+        struct s626_private *devpriv = dev->private;
         dma_addr_t pPhysBuf;
         uint16_t chan;
         int i;
@@ -2665,16 +2657,20 @@ static void s626_initialize(struct comedi_device *dev)
         /* writel(IRQ_GPIO3 | IRQ_RPS1, devpriv->base_addr + P_IER); */
 }
 
-static int s626_attach_pci(struct comedi_device *dev, struct pci_dev *pcidev)
+static int s626_auto_attach(struct comedi_device *dev,
+                                      unsigned long context_unused)
 {
+        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
+        struct s626_private *devpriv;
         struct comedi_subdevice *s;
         int ret;
 
-        comedi_set_hw_dev(dev, &pcidev->dev);
         dev->board_name = dev->driver->driver_name;
 
-        if (alloc_private(dev, sizeof(struct s626_private)) < 0)
+        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
+        if (!devpriv)
                 return -ENOMEM;
+        dev->private = devpriv;
 
         ret = comedi_pci_enable(pcidev, dev->board_name);
         if (ret)
@@ -2794,6 +2790,7 @@ static int s626_attach_pci(struct comedi_device *dev, struct pci_dev *pcidev)
 static void s626_detach(struct comedi_device *dev)
 {
         struct pci_dev *pcidev = comedi_to_pci_dev(dev);
+        struct s626_private *devpriv = dev->private;
 
         if (devpriv) {
                 /* stop ai_command */
@@ -2829,17 +2826,17 @@ static void s626_detach(struct comedi_device *dev)
 static struct comedi_driver s626_driver = {
         .driver_name    = "s626",
         .module         = THIS_MODULE,
-        .attach_pci     = s626_attach_pci,
+        .auto_attach    = s626_auto_attach,
         .detach         = s626_detach,
 };
 
-static int __devinit s626_pci_probe(struct pci_dev *dev,
+static int s626_pci_probe(struct pci_dev *dev,
                                     const struct pci_device_id *ent)
 {
         return comedi_pci_auto_config(dev, &s626_driver);
 }
 
-static void __devexit s626_pci_remove(struct pci_dev *dev)
+static void s626_pci_remove(struct pci_dev *dev)
 {
         comedi_pci_auto_unconfig(dev);
 }
@@ -2860,7 +2857,7 @@ static struct pci_driver s626_pci_driver = {
         .name           = "s626",
         .id_table       = s626_pci_table,
         .probe          = s626_pci_probe,
-        .remove         = __devexit_p(s626_pci_remove),
+        .remove         = s626_pci_remove,
 };
 module_comedi_pci_driver(s626_driver, s626_pci_driver);
 
diff --git a/drivers/staging/comedi/drivers/serial2002.c b/drivers/staging/comedi/drivers/serial2002.c
index 5bf84cfbdceb..e6177b48ccaf 100644
--- a/drivers/staging/comedi/drivers/serial2002.c
+++ b/drivers/staging/comedi/drivers/serial2002.c
@@ -31,6 +31,8 @@ Status: in development
 
 */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include "../comedidev.h"
 
 #include <linux/delay.h>
@@ -43,10 +45,6 @@ Status: in development
 #include <linux/serial.h>
 #include <linux/poll.h>
 
-struct serial2002_board {
-        const char *name;
-};
-
 struct serial2002_range_table_t {
 
         /*  HACK... */
@@ -68,12 +66,6 @@ struct serial2002_private {
         struct serial2002_range_table_t in_range[32], out_range[32];
 };
 
-/*
- * most drivers define the following macro to make it easy to
- * access the private structure.
- */
-#define devpriv ((struct serial2002_private *)dev->private)
-
 struct serial_data {
         enum { is_invalid, is_digital, is_channel } kind;
         int index;
@@ -282,7 +274,7 @@ static struct serial_data serial_read(struct file *f, int timeout)
 
                 length++;
                 if (data < 0) {
-                        printk(KERN_ERR "serial2002 error\n");
+                        pr_err("Failed to read serial.\n");
                         break;
                 } else if (data & 0x80) {
                         result.value = (result.value << 7) | (data & 0x7f);
@@ -348,6 +340,7 @@ static void serial_write(struct file *f, struct serial_data data)
 
 static int serial_2002_open(struct comedi_device *dev)
 {
+        struct serial2002_private *devpriv = dev->private;
         int result;
         char port[20];
 
@@ -355,7 +348,7 @@ static int serial_2002_open(struct comedi_device *dev)
         devpriv->tty = filp_open(port, O_RDWR, 0);
         if (IS_ERR(devpriv->tty)) {
                 result = (int)PTR_ERR(devpriv->tty);
-                printk(KERN_ERR "serial_2002: file open error = %d\n", result);
+                dev_err(dev->class_dev, "file open error = %d\n", result);
         } else {
                 struct config_t {
 
@@ -655,6 +648,8 @@ err_alloc_configs:
 
 static void serial_2002_close(struct comedi_device *dev)
 {
+        struct serial2002_private *devpriv = dev->private;
+
         if (!IS_ERR(devpriv->tty) && devpriv->tty)
                 filp_close(devpriv->tty, NULL);
 }
@@ -663,6 +658,7 @@ static int serial2002_di_rinsn(struct comedi_device *dev,
                                struct comedi_subdevice *s,
                                struct comedi_insn *insn, unsigned int *data)
 {
+        struct serial2002_private *devpriv = dev->private;
         int n;
         int chan;
 
@@ -685,6 +681,7 @@ static int serial2002_do_winsn(struct comedi_device *dev,
                                struct comedi_subdevice *s,
                                struct comedi_insn *insn, unsigned int *data)
 {
+        struct serial2002_private *devpriv = dev->private;
         int n;
         int chan;
 
@@ -704,6 +701,7 @@ static int serial2002_ai_rinsn(struct comedi_device *dev,
                                struct comedi_subdevice *s,
                                struct comedi_insn *insn, unsigned int *data)
 {
+        struct serial2002_private *devpriv = dev->private;
         int n;
         int chan;
 
@@ -726,6 +724,7 @@ static int serial2002_ao_winsn(struct comedi_device *dev,
                                struct comedi_subdevice *s,
                                struct comedi_insn *insn, unsigned int *data)
 {
+        struct serial2002_private *devpriv = dev->private;
         int n;
         int chan;
 
@@ -746,6 +745,7 @@ static int serial2002_ao_rinsn(struct comedi_device *dev,
                                struct comedi_subdevice *s,
                                struct comedi_insn *insn, unsigned int *data)
 {
+        struct serial2002_private *devpriv = dev->private;
         int n;
         int chan = CR_CHAN(insn->chanspec);
 
@@ -759,6 +759,7 @@ static int serial2002_ei_rinsn(struct comedi_device *dev,
                                struct comedi_subdevice *s,
                                struct comedi_insn *insn, unsigned int *data)
 {
+        struct serial2002_private *devpriv = dev->private;
         int n;
         int chan;
 
@@ -780,14 +781,18 @@ static int serial2002_ei_rinsn(struct comedi_device *dev,
 static int serial2002_attach(struct comedi_device *dev,
                              struct comedi_devconfig *it)
 {
-        const struct serial2002_board *board = comedi_board(dev);
+        struct serial2002_private *devpriv;
         struct comedi_subdevice *s;
         int ret;
 
         dev_dbg(dev->class_dev, "serial2002: attach\n");
-        dev->board_name = board->name;
-        if (alloc_private(dev, sizeof(struct serial2002_private)) < 0)
+        dev->board_name = dev->driver->driver_name;
+
+        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
+        if (!devpriv)
                 return -ENOMEM;
+        dev->private = devpriv;
+
         dev->open = serial_2002_open;
         dev->close = serial_2002_close;
         devpriv->port = it->options[0];
@@ -860,20 +865,11 @@ static void serial2002_detach(struct comedi_device *dev)
         }
 }
 
-static const struct serial2002_board serial2002_boards[] = {
-        {
-                .name   = "serial2002"
-        },
-};
-
 static struct comedi_driver serial2002_driver = {
         .driver_name    = "serial2002",
         .module         = THIS_MODULE,
         .attach         = serial2002_attach,
         .detach         = serial2002_detach,
-        .board_name     = &serial2002_boards[0].name,
-        .offset         = sizeof(struct serial2002_board),
-        .num_names      = ARRAY_SIZE(serial2002_boards),
 };
 module_comedi_driver(serial2002_driver);
 
diff --git a/drivers/staging/comedi/drivers/skel.c b/drivers/staging/comedi/drivers/skel.c
index b70cdf300bbd..e2d79700a615 100644
--- a/drivers/staging/comedi/drivers/skel.c
+++ b/drivers/staging/comedi/drivers/skel.c
@@ -92,6 +92,7 @@ Configuration Options:
  */
 struct skel_board {
         const char *name;
+        unsigned int devid;
         int ai_chans;
         int ai_bits;
         int have_dio;
@@ -100,36 +101,20 @@ struct skel_board {
 static const struct skel_board skel_boards[] = {
         {
          .name = "skel-100",
+         .devid = 0x100,
          .ai_chans = 16,
          .ai_bits = 12,
          .have_dio = 1,
          },
         {
          .name = "skel-200",
+         .devid = 0x200,
          .ai_chans = 8,
          .ai_bits = 16,
          .have_dio = 0,
          },
 };
 
-/* This is used by modprobe to translate PCI IDs to drivers.  Should
- * only be used for PCI and ISA-PnP devices */
-/* Please add your PCI vendor ID to comedidev.h, and it will be forwarded
- * upstream. */
-#define PCI_VENDOR_ID_SKEL 0xdafe
-static DEFINE_PCI_DEVICE_TABLE(skel_pci_table) = {
-        { PCI_DEVICE(PCI_VENDOR_ID_SKEL, 0x0100) },
-        { PCI_DEVICE(PCI_VENDOR_ID_SKEL, 0x0200) },
-        { 0 }
-};
-
-MODULE_DEVICE_TABLE(pci, skel_pci_table);
-
-/*
- * Useful for shorthand access to the particular board structure
- */
-#define thisboard ((const struct skel_board *)dev->board_ptr)
-
 /* 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.
@@ -138,165 +123,25 @@ struct skel_private {
 
         int data;
 
-        /* would be useful for a PCI device */
-        struct pci_dev *pci_dev;
-
         /* Used for AO readback */
         unsigned int ao_readback[2];
 };
 
-/*
- * most drivers define the following macro to make it easy to
- * access the private structure.
- */
-#define devpriv ((struct skel_private *)dev->private)
-
-/*
- * The struct comedi_driver structure tells the Comedi core module
- * which functions to call to configure/deconfigure (attach/detach)
- * the board, and also about the kernel module that contains
- * the device code.
- */
-static int skel_attach(struct comedi_device *dev, struct comedi_devconfig *it);
-static void skel_detach(struct comedi_device *dev);
-static struct comedi_driver driver_skel = {
-        .driver_name = "dummy",
-        .module = THIS_MODULE,
-        .attach = skel_attach,
-        .detach = skel_detach,
-/* It is not necessary to implement the following members if you are
- * writing a driver for a ISA PnP or PCI card */
-        /* Most drivers will support multiple types of boards by
-         * having an array of board structures.  These were defined
-         * in skel_boards[] above.  Note that the element 'name'
-         * was first in the structure -- Comedi uses this fact to
-         * extract the name of the board without knowing any details
-         * about the structure except for its length.
-         * When a device is attached (by comedi_config), the name
-         * of the device is given to Comedi, and Comedi tries to
-         * match it by going through the list of board names.  If
-         * there is a match, the address of the pointer is put
-         * into dev->board_ptr and driver->attach() is called.
-         *
-         * Note that these are not necessary if you can determine
-         * the type of board in software.  ISA PnP, PCI, and PCMCIA
-         * devices are such boards.
-         */
-        .board_name = &skel_boards[0].name,
-        .offset = sizeof(struct skel_board),
-        .num_names = ARRAY_SIZE(skel_boards),
-};
-
-static int skel_ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s,
-                         struct comedi_insn *insn, unsigned int *data);
-static int skel_ao_winsn(struct comedi_device *dev, struct comedi_subdevice *s,
-                         struct comedi_insn *insn, unsigned int *data);
-static int skel_ao_rinsn(struct comedi_device *dev, struct comedi_subdevice *s,
-                         struct comedi_insn *insn, unsigned int *data);
-static int skel_dio_insn_bits(struct comedi_device *dev,
-                              struct comedi_subdevice *s,
-                              struct comedi_insn *insn, unsigned int *data);
-static int skel_dio_insn_config(struct comedi_device *dev,
-                                struct comedi_subdevice *s,
-                                struct comedi_insn *insn, unsigned int *data);
-static int skel_ai_cmdtest(struct comedi_device *dev,
-                           struct comedi_subdevice *s, struct comedi_cmd *cmd);
-static int skel_ns_to_timer(unsigned int *ns, int round);
-
-/*
- * Attach is called by the Comedi core to configure the driver
- * for a particular board.  If you specified a board_name array
- * in the driver structure, dev->board_ptr contains that
- * address.
- */
-static int skel_attach(struct comedi_device *dev, struct comedi_devconfig *it)
+/* This function doesn't require a particular form, this is just
+ * what happens to be used in some of the drivers.  It should
+ * convert ns nanoseconds to a counter value suitable for programming
+ * the device.  Also, it should adjust ns so that it cooresponds to
+ * the actual time that the device will use. */
+static int skel_ns_to_timer(unsigned int *ns, int round)
 {
-        struct comedi_subdevice *s;
-        int ret;
-
-        pr_info("comedi%d: skel: ", dev->minor);
-
-/*
- * If you can probe the device to determine what device in a series
- * it is, this is the place to do it.  Otherwise, dev->board_ptr
- * should already be initialized.
- */
-        /* dev->board_ptr = skel_probe(dev, it); */
-
-/*
- * Initialize dev->board_name.  Note that we can use the "thisboard"
- * macro now, since we just initialized it in the last line.
- */
-        dev->board_name = thisboard->name;
-
-/*
- * Allocate the private structure area.  alloc_private() is a
- * convenient macro defined in comedidev.h.
- */
-        if (alloc_private(dev, sizeof(struct skel_private)) < 0)
-                return -ENOMEM;
-
-        ret = comedi_alloc_subdevices(dev, 3);
-        if (ret)
-                return ret;
-
-        s = &dev->subdevices[0];
-        /* dev->read_subdev=s; */
-        /* analog input subdevice */
-        s->type = COMEDI_SUBD_AI;
-        /* we support single-ended (ground) and differential */
-        s->subdev_flags = SDF_READABLE | SDF_GROUND | SDF_DIFF;
-        s->n_chan = thisboard->ai_chans;
-        s->maxdata = (1 << thisboard->ai_bits) - 1;
-        s->range_table = &range_bipolar10;
-        s->len_chanlist = 16;   /* This is the maximum chanlist length that
-                                   the board can handle */
-        s->insn_read = skel_ai_rinsn;
-/*
-*       s->subdev_flags |= SDF_CMD_READ;
-*       s->do_cmd = skel_ai_cmd;
-*/
-        s->do_cmdtest = skel_ai_cmdtest;
-
-        s = &dev->subdevices[1];
-        /* analog output subdevice */
-        s->type = COMEDI_SUBD_AO;
-        s->subdev_flags = SDF_WRITABLE;
-        s->n_chan = 1;
-        s->maxdata = 0xffff;
-        s->range_table = &range_bipolar5;
-        s->insn_write = skel_ao_winsn;
-        s->insn_read = skel_ao_rinsn;
-
-        s = &dev->subdevices[2];
-        /* digital i/o subdevice */
-        if (thisboard->have_dio) {
-                s->type = COMEDI_SUBD_DIO;
-                s->subdev_flags = SDF_READABLE | SDF_WRITABLE;
-                s->n_chan = 16;
-                s->maxdata = 1;
-                s->range_table = &range_digital;
-                s->insn_bits = skel_dio_insn_bits;
-                s->insn_config = skel_dio_insn_config;
-        } else {
-                s->type = COMEDI_SUBD_UNUSED;
-        }
-
-        pr_info("attached\n");
-
-        return 0;
-}
+        /* trivial timer */
+        /* if your timing is done through two cascaded timers, the
+         * i8253_cascade_ns_to_timer() function in 8253.h can be
+         * very helpful.  There are also i8254_load() and i8254_mm_load()
+         * which can be used to load values into the ubiquitous 8254 counters
+         */
 
-/*
- * _detach is called to deconfigure a device.  It should deallocate
- * resources.
- * This function is also called when _attach() fails, so it should be
- * careful not to release resources that were not necessarily
- * allocated by _attach().  dev->private and dev->subdevices are
- * deallocated automatically by the core.
- */
-static void skel_detach(struct comedi_device *dev)
-{
+        return *ns;
 }
 
 /*
@@ -306,6 +151,7 @@ static void skel_detach(struct comedi_device *dev)
 static int skel_ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s,
                          struct comedi_insn *insn, unsigned int *data)
 {
+        const struct skel_board *thisboard = comedi_board(dev);
         int n, i;
         unsigned int d;
         unsigned int status;
@@ -331,9 +177,7 @@ static int skel_ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s,
                                 break;
                 }
                 if (i == TIMEOUT) {
-                        /* printk() should be used instead of printk()
-                         * whenever the code can be called from real-time. */
-                        pr_info("timeout\n");
+                        dev_warn(dev->class_dev, "ai timeout\n");
                         return -ETIMEDOUT;
                 }
 
@@ -389,67 +233,40 @@ static int skel_ai_cmdtest(struct comedi_device *dev,
         if (err)
                 return 2;
 
-        /* step 3: make sure arguments are trivially compatible */
+        /* Step 3: check if arguments are trivially valid */
+
+        err |= cfc_check_trigger_arg_is(&cmd->start_arg, 0);
 
-        if (cmd->start_arg != 0) {
-                cmd->start_arg = 0;
-                err++;
-        }
 #define MAX_SPEED       10000   /* in nanoseconds */
 #define MIN_SPEED       1000000000      /* in nanoseconds */
 
         if (cmd->scan_begin_src == TRIG_TIMER) {
-                if (cmd->scan_begin_arg < MAX_SPEED) {
-                        cmd->scan_begin_arg = MAX_SPEED;
-                        err++;
-                }
-                if (cmd->scan_begin_arg > MIN_SPEED) {
-                        cmd->scan_begin_arg = MIN_SPEED;
-                        err++;
-                }
+                err |= cfc_check_trigger_arg_min(&cmd->scan_begin_arg,
+                                                 MAX_SPEED);
+                err |= cfc_check_trigger_arg_max(&cmd->scan_begin_arg,
+                                                 MIN_SPEED);
         } else {
                 /* external trigger */
                 /* should be level/edge, hi/lo specification here */
                 /* should specify multiple external triggers */
-                if (cmd->scan_begin_arg > 9) {
-                        cmd->scan_begin_arg = 9;
-                        err++;
-                }
+                err |= cfc_check_trigger_arg_max(&cmd->scan_begin_arg, 9);
         }
+
         if (cmd->convert_src == TRIG_TIMER) {
-                if (cmd->convert_arg < MAX_SPEED) {
-                        cmd->convert_arg = MAX_SPEED;
-                        err++;
-                }
-                if (cmd->convert_arg > MIN_SPEED) {
-                        cmd->convert_arg = MIN_SPEED;
-                        err++;
-                }
+                err |= cfc_check_trigger_arg_min(&cmd->convert_arg, MAX_SPEED);
+                err |= cfc_check_trigger_arg_max(&cmd->convert_arg, MIN_SPEED);
         } else {
                 /* external trigger */
                 /* see above */
-                if (cmd->convert_arg > 9) {
-                        cmd->convert_arg = 9;
-                        err++;
-                }
+                err |= cfc_check_trigger_arg_max(&cmd->scan_begin_arg, 9);
         }
 
-        if (cmd->scan_end_arg != cmd->chanlist_len) {
-                cmd->scan_end_arg = cmd->chanlist_len;
-                err++;
-        }
-        if (cmd->stop_src == TRIG_COUNT) {
-                if (cmd->stop_arg > 0x00ffffff) {
-                        cmd->stop_arg = 0x00ffffff;
-                        err++;
-                }
-        } else {
-                /* TRIG_NONE */
-                if (cmd->stop_arg != 0) {
-                        cmd->stop_arg = 0;
-                        err++;
-                }
-        }
+        err |= cfc_check_trigger_arg_is(&cmd->scan_end_arg, cmd->chanlist_len);
+
+        if (cmd->stop_src == TRIG_COUNT)
+                err |= cfc_check_trigger_arg_max(&cmd->stop_arg, 0x00ffffff);
+        else    /* TRIG_NONE */
+                err |= cfc_check_trigger_arg_is(&cmd->stop_arg, 0);
 
         if (err)
                 return 3;
@@ -484,30 +301,13 @@ static int skel_ai_cmdtest(struct comedi_device *dev,
         return 0;
 }
 
-/* This function doesn't require a particular form, this is just
- * what happens to be used in some of the drivers.  It should
- * convert ns nanoseconds to a counter value suitable for programming
- * the device.  Also, it should adjust ns so that it cooresponds to
- * the actual time that the device will use. */
-static int skel_ns_to_timer(unsigned int *ns, int round)
-{
-        /* trivial timer */
-        /* if your timing is done through two cascaded timers, the
-         * i8253_cascade_ns_to_timer() function in 8253.h can be
-         * very helpful.  There are also i8254_load() and i8254_mm_load()
-         * which can be used to load values into the ubiquitous 8254 counters
-         */
-
-        return *ns;
-}
-
 static int skel_ao_winsn(struct comedi_device *dev, struct comedi_subdevice *s,
                          struct comedi_insn *insn, unsigned int *data)
 {
+        struct skel_private *devpriv = dev->private;
         int i;
         int chan = CR_CHAN(insn->chanspec);
 
-        pr_info("skel_ao_winsn\n");
         /* Writing a list of values to an AO channel is probably not
          * very useful, but that's how the interface is defined. */
         for (i = 0; i < insn->n; i++) {
@@ -525,6 +325,7 @@ static int skel_ao_winsn(struct comedi_device *dev, struct comedi_subdevice *s,
 static int skel_ao_rinsn(struct comedi_device *dev, struct comedi_subdevice *s,
                          struct comedi_insn *insn, unsigned int *data)
 {
+        struct skel_private *devpriv = dev->private;
         int i;
         int chan = CR_CHAN(insn->chanspec);
 
@@ -593,57 +394,332 @@ static int skel_dio_insn_config(struct comedi_device *dev,
         return insn->n;
 }
 
-#ifdef CONFIG_COMEDI_PCI_DRIVERS
-static int __devinit driver_skel_pci_probe(struct pci_dev *dev,
-                                           const struct pci_device_id *ent)
+static const struct skel_board *skel_find_pci_board(struct pci_dev *pcidev)
 {
-        return comedi_pci_auto_config(dev, &driver_skel);
+        unsigned int i;
+
+/*
+ * This example code assumes all the entries in skel_boards[] are PCI boards
+ * and all use the same PCI vendor ID.  If skel_boards[] contains a mixture
+ * of PCI and non-PCI boards, this loop should skip over the non-PCI boards.
+ */
+        for (i = 0; i < ARRAY_SIZE(skel_boards); i++)
+                if (/* skel_boards[i].bustype == pci_bustype && */
+                    pcidev->device == skel_boards[i].devid)
+                        return &skel_boards[i];
+        return NULL;
 }
 
-static void __devexit driver_skel_pci_remove(struct pci_dev *dev)
+/*
+ * Handle common part of skel_attach() and skel_auto_attach().
+ */
+static int skel_common_attach(struct comedi_device *dev)
 {
-        comedi_pci_auto_unconfig(dev);
+        const struct skel_board *thisboard = comedi_board(dev);
+        struct comedi_subdevice *s;
+        int ret;
+
+        ret = comedi_alloc_subdevices(dev, 3);
+        if (ret)
+                return ret;
+
+        s = &dev->subdevices[0];
+        /* dev->read_subdev=s; */
+        /* analog input subdevice */
+        s->type = COMEDI_SUBD_AI;
+        /* we support single-ended (ground) and differential */
+        s->subdev_flags = SDF_READABLE | SDF_GROUND | SDF_DIFF;
+        s->n_chan = thisboard->ai_chans;
+        s->maxdata = (1 << thisboard->ai_bits) - 1;
+        s->range_table = &range_bipolar10;
+        s->len_chanlist = 16;   /* This is the maximum chanlist length that
+                                   the board can handle */
+        s->insn_read = skel_ai_rinsn;
+/*
+*       s->subdev_flags |= SDF_CMD_READ;
+*       s->do_cmd = skel_ai_cmd;
+*/
+        s->do_cmdtest = skel_ai_cmdtest;
+
+        s = &dev->subdevices[1];
+        /* analog output subdevice */
+        s->type = COMEDI_SUBD_AO;
+        s->subdev_flags = SDF_WRITABLE;
+        s->n_chan = 1;
+        s->maxdata = 0xffff;
+        s->range_table = &range_bipolar5;
+        s->insn_write = skel_ao_winsn;
+        s->insn_read = skel_ao_rinsn;
+
+        s = &dev->subdevices[2];
+        /* digital i/o subdevice */
+        if (thisboard->have_dio) {
+                s->type = COMEDI_SUBD_DIO;
+                s->subdev_flags = SDF_READABLE | SDF_WRITABLE;
+                s->n_chan = 16;
+                s->maxdata = 1;
+                s->range_table = &range_digital;
+                s->insn_bits = skel_dio_insn_bits;
+                s->insn_config = skel_dio_insn_config;
+        } else {
+                s->type = COMEDI_SUBD_UNUSED;
+        }
+
+        dev_info(dev->class_dev, "skel: attached\n");
+
+        return 0;
 }
 
-static struct pci_driver driver_skel_pci_driver = {
-        .id_table = skel_pci_table,
-        .probe = &driver_skel_pci_probe,
-        .remove = __devexit_p(&driver_skel_pci_remove)
-};
+/*
+ * _attach is called by the Comedi core to configure the driver
+ * for a particular board in response to the COMEDI_DEVCONFIG ioctl for
+ * a matching board or driver name.  If you specified a board_name array
+ * in the driver structure, dev->board_ptr contains that address.
+ *
+ * Drivers that handle only PCI or USB devices do not usually support
+ * manual attachment of those devices via the COMEDI_DEVCONFIG ioctl, so
+ * those drivers do not have an _attach function; they just have an
+ * _auto_attach function instead.  (See skel_auto_attach() for an example
+ * of such a function.)
+ */
+static int skel_attach(struct comedi_device *dev, struct comedi_devconfig *it)
+{
+        const struct skel_board *thisboard;
+        struct skel_private *devpriv;
+
+/*
+ * If you can probe the device to determine what device in a series
+ * it is, this is the place to do it.  Otherwise, dev->board_ptr
+ * should already be initialized.
+ */
+        /* dev->board_ptr = skel_probe(dev, it); */
+
+        thisboard = comedi_board(dev);
+
+/*
+ * Initialize dev->board_name.
+ */
+        dev->board_name = thisboard->name;
+
+        /* Allocate the private data */
+        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
+        if (!devpriv)
+                return -ENOMEM;
+        dev->private = devpriv;
+
+/*
+ * Supported boards are usually either auto-attached via the
+ * Comedi driver's _auto_attach routine, or manually attached via the
+ * Comedi driver's _attach routine.  In most cases, attempts to
+ * manual attach boards that are usually auto-attached should be
+ * rejected by this function.
+ */
+/*
+ *      if (thisboard->bustype == pci_bustype) {
+ *              dev_err(dev->class_dev,
+ *                      "Manual attachment of PCI board '%s' not supported\n",
+ *                      thisboard->name);
+ *      }
+ */
+
+/*
+ * For ISA boards, get the i/o base address from it->options[],
+ * request the i/o region and set dev->iobase * from it->options[].
+ * If using interrupts, get the IRQ number from it->options[].
+ */
+
+        /*
+         * Call a common function to handle the remaining things to do for
+         * attaching ISA or PCI boards.  (Extra parameters could be added
+         * to pass additional information such as IRQ number.)
+         */
+        return skel_common_attach(dev);
+}
 
-static int __init driver_skel_init_module(void)
+/*
+ * _auto_attach is called via comedi_pci_auto_config() (or
+ * comedi_usb_auto_config(), etc.) to handle devices that can be attached
+ * to the Comedi core automatically without the COMEDI_DEVCONFIG ioctl.
+ *
+ * The context parameter is usually unused, but if the driver called
+ * comedi_auto_config() directly instead of the comedi_pci_auto_config()
+ * wrapper function, this will be a copy of the context passed to
+ * comedi_auto_config().
+ */
+static int skel_auto_attach(struct comedi_device *dev,
+                                      unsigned long context)
 {
-        int retval;
+        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
+        const struct skel_board *thisboard;
+        struct skel_private *devpriv;
+        int ret;
+
+        /* Hack to allow unused code to be optimized out. */
+        if (!IS_ENABLED(CONFIG_COMEDI_PCI_DRIVERS))
+                return -EINVAL;
+
+        /* Find a matching board in skel_boards[]. */
+        thisboard = skel_find_pci_board(pcidev);
+        if (!thisboard) {
+                dev_err(dev->class_dev, "BUG! cannot determine board type!\n");
+                return -EINVAL;
+        }
+
+        /*
+         * Point the struct comedi_device to the matching board info
+         * and set the board name.
+         */
+        dev->board_ptr = thisboard;
+        dev->board_name = thisboard->name;
+
+        /* Allocate the private data */
+        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
+        if (!devpriv)
+                return -ENOMEM;
+        dev->private = devpriv;
 
-        retval = comedi_driver_register(&driver_skel);
-        if (retval < 0)
-                return retval;
+        /* Enable the PCI device. */
+        ret = comedi_pci_enable(pcidev, dev->board_name);
+        if (ret)
+                return ret;
+
+        /*
+         * Record the fact that the PCI device is enabled so that it can
+         * be disabled during _detach().
+         *
+         * For this example driver, we assume PCI BAR 0 is the main I/O
+         * region for the board registers and use dev->iobase to hold the
+         * I/O base address and to indicate that the PCI device has been
+         * enabled.
+         *
+         * (For boards with memory-mapped registers, dev->iobase is not
+         * usually needed for register access, so can just be set to 1
+         * to indicate that the PCI device has been enabled.)
+         */
+        dev->iobase = pci_resource_start(pcidev, 0);
 
-        driver_skel_pci_driver.name = (char *)driver_skel.driver_name;
-        return pci_register_driver(&driver_skel_pci_driver);
+        /*
+         * Call a common function to handle the remaining things to do for
+         * attaching ISA or PCI boards.  (Extra parameters could be added
+         * to pass additional information such as IRQ number.)
+         */
+        return skel_common_attach(dev);
 }
 
-static void __exit driver_skel_cleanup_module(void)
+/*
+ * _detach is called to deconfigure a device.  It should deallocate
+ * resources.
+ * This function is also called when _attach() fails, so it should be
+ * careful not to release resources that were not necessarily
+ * allocated by _attach().  dev->private and dev->subdevices are
+ * deallocated automatically by the core.
+ */
+static void skel_detach(struct comedi_device *dev)
 {
-        pci_unregister_driver(&driver_skel_pci_driver);
-        comedi_driver_unregister(&driver_skel);
+        const struct skel_board *thisboard = comedi_board(dev);
+        struct skel_private *devpriv = dev->private;
+        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
+
+        if (!thisboard || !devpriv)
+                return;
+
+/*
+ * Do common stuff such as freeing IRQ, unmapping remapped memory
+ * regions, etc., being careful to check that the stuff is valid given
+ * that _detach() is called even when _attach() or _auto_attach() return
+ * an error.
+ */
+
+        if (IS_ENABLED(CONFIG_COMEDI_PCI_DRIVERS) /* &&
+            thisboard->bustype == pci_bustype */) {
+                /*
+                 * PCI board
+                 *
+                 * If PCI device enabled by _auto_attach() (or _attach()),
+                 * disable it here.
+                 */
+                if (pcidev && dev->iobase)
+                        comedi_pci_disable(pcidev);
+        } else {
+                /*
+                 * ISA board
+                 *
+                 * If I/O regions successfully requested by _attach(),
+                 * release them here.
+                 */
+                if (dev->iobase)
+                        release_region(dev->iobase, SKEL_SIZE);
+        }
 }
 
-module_init(driver_skel_init_module);
-module_exit(driver_skel_cleanup_module);
-#else
-static int __init driver_skel_init_module(void)
+/*
+ * The struct comedi_driver structure tells the Comedi core module
+ * which functions to call to configure/deconfigure (attach/detach)
+ * the board, and also about the kernel module that contains
+ * the device code.
+ */
+static struct comedi_driver skel_driver = {
+        .driver_name = "dummy",
+        .module = THIS_MODULE,
+        .attach = skel_attach,
+        .auto_attach = skel_auto_attach,
+        .detach = skel_detach,
+/* It is not necessary to implement the following members if you are
+ * writing a driver for a ISA PnP or PCI card */
+        /* Most drivers will support multiple types of boards by
+         * having an array of board structures.  These were defined
+         * in skel_boards[] above.  Note that the element 'name'
+         * was first in the structure -- Comedi uses this fact to
+         * extract the name of the board without knowing any details
+         * about the structure except for its length.
+         * When a device is attached (by comedi_config), the name
+         * of the device is given to Comedi, and Comedi tries to
+         * match it by going through the list of board names.  If
+         * there is a match, the address of the pointer is put
+         * into dev->board_ptr and driver->attach() is called.
+         *
+         * Note that these are not necessary if you can determine
+         * the type of board in software.  ISA PnP, PCI, and PCMCIA
+         * devices are such boards.
+         */
+        .board_name = &skel_boards[0].name,
+        .offset = sizeof(struct skel_board),
+        .num_names = ARRAY_SIZE(skel_boards),
+};
+
+#ifdef CONFIG_COMEDI_PCI_DRIVERS
+
+/* This is used by modprobe to translate PCI IDs to drivers.  Should
+ * only be used for PCI and ISA-PnP devices */
+/* Please add your PCI vendor ID to comedidev.h, and it will be forwarded
+ * upstream. */
+#define PCI_VENDOR_ID_SKEL 0xdafe
+static DEFINE_PCI_DEVICE_TABLE(skel_pci_table) = {
+        { PCI_DEVICE(PCI_VENDOR_ID_SKEL, 0x0100) },
+        { PCI_DEVICE(PCI_VENDOR_ID_SKEL, 0x0200) },
+        { 0 }
+};
+MODULE_DEVICE_TABLE(pci, skel_pci_table);
+
+static int skel_pci_probe(struct pci_dev *dev,
+                                           const struct pci_device_id *ent)
 {
-        return comedi_driver_register(&driver_skel);
+        return comedi_pci_auto_config(dev, &skel_driver);
 }
 
-static void __exit driver_skel_cleanup_module(void)
+static void skel_pci_remove(struct pci_dev *dev)
 {
-        comedi_driver_unregister(&driver_skel);
+        comedi_pci_auto_unconfig(dev);
 }
 
-module_init(driver_skel_init_module);
-module_exit(driver_skel_cleanup_module);
+static struct pci_driver skel_pci_driver = {
+        .id_table = skel_pci_table,
+        .probe = &skel_pci_probe,
+        .remove = &skel_pci_remove
+};
+module_comedi_pci_driver(skel_driver, skel_pci_driver);
+#else
+module_comedi_driver(skel_driver);
 #endif
 
 MODULE_AUTHOR("Comedi http://www.comedi.org");
diff --git a/drivers/staging/comedi/drivers/ssv_dnp.c b/drivers/staging/comedi/drivers/ssv_dnp.c
index ae3aa1c5caef..afa4016f906a 100644
--- a/drivers/staging/comedi/drivers/ssv_dnp.c
+++ b/drivers/staging/comedi/drivers/ssv_dnp.c
@@ -50,15 +50,6 @@ Status: unknown
 #define PCMR  0xa3              /* Port C Mode Register                      */
 #define PCDR  0xa7              /* Port C Data Register                      */
 
-/* This data structure holds information about the supported boards -------- */
-
-struct dnp_board {
-        const char *name;
-        int ai_chans;
-        int ai_bits;
-        int have_dio;
-};
-
 /* ------------------------------------------------------------------------- */
 /* The insn_bits interface allows packed reading/writing of DIO channels.    */
 /* The comedi core can convert between insn_bits and insn_read/write, so you */
@@ -173,11 +164,10 @@ static int dnp_dio_insn_config(struct comedi_device *dev,
 
 static int dnp_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 {
-        const struct dnp_board *board = comedi_board(dev);
         struct comedi_subdevice *s;
         int ret;
 
-        dev->board_name = board->name;
+        dev->board_name = dev->driver->driver_name;
 
         ret = comedi_alloc_subdevices(dev, 1);
         if (ret)
@@ -219,23 +209,11 @@ static void dnp_detach(struct comedi_device *dev)
         outb((inb(CSCDR) & 0xAA), CSCDR);
 }
 
-static const struct dnp_board dnp_boards[] = {
-        {
-                .name           = "dnp-1486",
-                .ai_chans       = 16,
-                .ai_bits        = 12,
-                .have_dio       = 1,
-        },
-};
-
 static struct comedi_driver dnp_driver = {
-        .driver_name    = "ssv_dnp",
+        .driver_name    = "dnp-1486",
         .module         = THIS_MODULE,
         .attach         = dnp_attach,
         .detach         = dnp_detach,
-        .board_name     = &dnp_boards[0].name,
-        .offset         = sizeof(struct dnp_board),
-        .num_names      = ARRAY_SIZE(dnp_boards),
 };
 module_comedi_driver(dnp_driver);
 
diff --git a/drivers/staging/comedi/drivers/unioxx5.c b/drivers/staging/comedi/drivers/unioxx5.c
index 9f1fdec62dcb..c9ded938314f 100644
--- a/drivers/staging/comedi/drivers/unioxx5.c
+++ b/drivers/staging/comedi/drivers/unioxx5.c
@@ -42,6 +42,8 @@ Devices: [Fastwel] UNIOxx-5 (unioxx5),
 
 */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include "../comedidev.h"
 #include <linux/ioport.h>
 #include <linux/slab.h>
@@ -144,8 +146,7 @@ static int __unioxx5_digital_read(struct unioxx5_subd_priv *usp,
 
         channel_offset = __unioxx5_define_chan_offset(channel);
         if (channel_offset < 0) {
-                printk(KERN_ERR
-                       "comedi%d: undefined channel %d. channel range is 0 .. 23\n",
+                pr_err("comedi%d: undefined channel %d. channel range is 0 .. 23\n",
                        minor, channel);
                 return 0;
         }
@@ -171,8 +172,7 @@ static int __unioxx5_analog_read(struct unioxx5_subd_priv *usp,
 
         /* defining if given module can work on input */
         if (usp->usp_module_type[module_no] & MODULE_OUTPUT_MASK) {
-                printk(KERN_ERR
-                       "comedi%d: module in position %d with id 0x%02x is for output only",
+                pr_err("comedi%d: module in position %d with id 0x%02x is for output only",
                        minor, module_no, usp->usp_module_type[module_no]);
                 return 0;
         }
@@ -209,8 +209,7 @@ static int __unioxx5_digital_write(struct unioxx5_subd_priv *usp,
 
         channel_offset = __unioxx5_define_chan_offset(channel);
         if (channel_offset < 0) {
-                printk(KERN_ERR
-                       "comedi%d: undefined channel %d. channel range is 0 .. 23\n",
+                pr_err("comedi%d: undefined channel %d. channel range is 0 .. 23\n",
                        minor, channel);
                 return 0;
         }
@@ -240,8 +239,7 @@ static int __unioxx5_analog_write(struct unioxx5_subd_priv *usp,
 
         /* defining if given module can work on output */
         if (!(usp->usp_module_type[module] & MODULE_OUTPUT_MASK)) {
-                printk(KERN_ERR
-                       "comedi%d: module in position %d with id 0x%0x is for input only!\n",
+                pr_err("comedi%d: module in position %d with id 0x%0x is for input only!\n",
                        minor, module, usp->usp_module_type[module]);
                 return 0;
         }
@@ -323,17 +321,17 @@ static int unioxx5_insn_config(struct comedi_device *dev,
         type = usp->usp_module_type[channel / 2];
 
         if (type != MODULE_DIGITAL) {
-                printk(KERN_ERR
-                       "comedi%d: channel configuration accessible only for digital modules\n",
-                       dev->minor);
+                dev_err(dev->class_dev,
+                        "comedi%d: channel configuration accessible only for digital modules\n",
+                        dev->minor);
                 return -1;
         }
 
         channel_offset = __unioxx5_define_chan_offset(channel);
         if (channel_offset < 0) {
-                printk(KERN_ERR
-                       "comedi%d: undefined channel %d. channel range is 0 .. 23\n",
-                       dev->minor, channel);
+                dev_err(dev->class_dev,
+                        "comedi%d: undefined channel %d. channel range is 0 .. 23\n",
+                        dev->minor, channel);
                 return -1;
         }
 
@@ -348,7 +346,8 @@ static int unioxx5_insn_config(struct comedi_device *dev,
                 flags |= mask;
                 break;
         default:
-                printk(KERN_ERR "comedi%d: unknown flag\n", dev->minor);
+                dev_err(dev->class_dev,
+                        "comedi%d: unknown flag\n", dev->minor);
                 return -1;
         }
 
@@ -375,19 +374,21 @@ static int __unioxx5_subdev_init(struct comedi_subdevice *subdev,
         int i, to, ndef_flag = 0;
 
         if (!request_region(subdev_iobase, UNIOXX5_SIZE, DRIVER_NAME)) {
-                printk(KERN_ERR "comedi%d: I/O port conflict\n", minor);
+                dev_err(subdev->class_dev,
+                        "comedi%d: I/O port conflict\n", minor);
                 return -EIO;
         }
 
         usp = kzalloc(sizeof(*usp), GFP_KERNEL);
 
         if (usp == NULL) {
-                printk(KERN_ERR "comedi%d: error! --> out of memory!\n", minor);
+                dev_err(subdev->class_dev,
+                        "comedi%d: error! --> out of memory!\n", minor);
                 return -1;
         }
 
         usp->usp_iobase = subdev_iobase;
-        printk(KERN_INFO "comedi%d: |", minor);
+        dev_info(subdev->class_dev, "comedi%d: |", minor);
 
         /* defining modules types */
         for (i = 0; i < 12; i++) {
@@ -433,8 +434,6 @@ static int __unioxx5_subdev_init(struct comedi_subdevice *subdev,
         /* for digital modules only!!! */
         subdev->insn_config = unioxx5_insn_config;
 
-        printk(KERN_INFO "subdevice configured\n");
-
         return 0;
 }
 
@@ -464,8 +463,8 @@ static int unioxx5_attach(struct comedi_device *dev,
 
         /* unioxx5 can has from two to four subdevices */
         if (n_subd < 2) {
-                printk(KERN_ERR
-                       "your card must has at least 2 'g01' subdevices\n");
+                dev_err(dev->class_dev,
+                        "your card must has at least 2 'g01' subdevices\n");
                 return -1;
         }
 
@@ -480,7 +479,6 @@ static int unioxx5_attach(struct comedi_device *dev,
                         return -1;
         }
 
-        printk(KERN_INFO "attached\n");
         return 0;
 }
 
diff --git a/drivers/staging/comedi/drivers/usbdux.c b/drivers/staging/comedi/drivers/usbdux.c
index b536bba74351..78f3a2e013c4 100644
--- a/drivers/staging/comedi/drivers/usbdux.c
+++ b/drivers/staging/comedi/drivers/usbdux.c
@@ -938,9 +938,6 @@ static int usbdux_ai_cmdtest(struct comedi_device *dev,
         if (!(this_usbduxsub->probed))
                 return -ENODEV;
 
-        dev_dbg(&this_usbduxsub->interface->dev,
-                "comedi%d: usbdux_ai_cmdtest\n", dev->minor);
-
         /* Step 1 : check if triggers are trivially valid */
 
         err |= cfc_check_trigger_src(&cmd->start_src, TRIG_NOW | TRIG_INT);
@@ -962,19 +959,12 @@ static int usbdux_ai_cmdtest(struct comedi_device *dev,
         if (err)
                 return 2;
 
-        /* step 3: make sure arguments are trivially compatible */
-        if (cmd->start_arg != 0) {
-                cmd->start_arg = 0;
-                err++;
-        }
+        /* Step 3: check if arguments are trivially valid */
 
-        if (cmd->scan_begin_src == TRIG_FOLLOW) {
-                /* internal trigger */
-                if (cmd->scan_begin_arg != 0) {
-                        cmd->scan_begin_arg = 0;
-                        err++;
-                }
-        }
+        err |= cfc_check_trigger_arg_is(&cmd->start_arg, 0);
+
+        if (cmd->scan_begin_src == TRIG_FOLLOW) /* internal trigger */
+                err |= cfc_check_trigger_arg_is(&cmd->scan_begin_arg, 0);
 
         if (cmd->scan_begin_src == TRIG_TIMER) {
                 if (this_usbduxsub->high_speed) {
@@ -989,51 +979,35 @@ static int usbdux_ai_cmdtest(struct comedi_device *dev,
                         while (i < (cmd->chanlist_len))
                                 i = i * 2;
 
-                        if (cmd->scan_begin_arg < (1000000 / 8 * i)) {
-                                cmd->scan_begin_arg = 1000000 / 8 * i;
-                                err++;
-                        }
+                        err |= cfc_check_trigger_arg_min(&cmd->scan_begin_arg,
+                                                         1000000 / 8 * i);
                         /* now calc the real sampling rate with all the
                          * rounding errors */
                         tmpTimer =
                             ((unsigned int)(cmd->scan_begin_arg / 125000)) *
                             125000;
-                        if (cmd->scan_begin_arg != tmpTimer) {
-                                cmd->scan_begin_arg = tmpTimer;
-                                err++;
-                        }
                 } else {
                         /* full speed */
                         /* 1kHz scans every USB frame */
-                        if (cmd->scan_begin_arg < 1000000) {
-                                cmd->scan_begin_arg = 1000000;
-                                err++;
-                        }
+                        err |= cfc_check_trigger_arg_min(&cmd->scan_begin_arg,
+                                                         1000000);
                         /*
                          * calc the real sampling rate with the rounding errors
                          */
                         tmpTimer = ((unsigned int)(cmd->scan_begin_arg /
                                                    1000000)) * 1000000;
-                        if (cmd->scan_begin_arg != tmpTimer) {
-                                cmd->scan_begin_arg = tmpTimer;
-                                err++;
-                        }
                 }
-        }
-        /* the same argument */
-        if (cmd->scan_end_arg != cmd->chanlist_len) {
-                cmd->scan_end_arg = cmd->chanlist_len;
-                err++;
+                err |= cfc_check_trigger_arg_is(&cmd->scan_begin_arg,
+                                                tmpTimer);
         }
 
+        err |= cfc_check_trigger_arg_is(&cmd->scan_end_arg, cmd->chanlist_len);
+
         if (cmd->stop_src == TRIG_COUNT) {
                 /* any count is allowed */
         } else {
                 /* TRIG_NONE */
-                if (cmd->stop_arg != 0) {
-                        cmd->stop_arg = 0;
-                        err++;
-                }
+                err |= cfc_check_trigger_arg_is(&cmd->stop_arg, 0);
         }
 
         if (err)
@@ -1472,9 +1446,6 @@ static int usbdux_ao_cmdtest(struct comedi_device *dev,
         if (!(this_usbduxsub->probed))
                 return -ENODEV;
 
-        dev_dbg(&this_usbduxsub->interface->dev,
-                "comedi%d: usbdux_ao_cmdtest\n", dev->minor);
-
         /* Step 1 : check if triggers are trivially valid */
 
         err |= cfc_check_trigger_src(&cmd->start_src, TRIG_NOW | TRIG_INT);
@@ -1519,57 +1490,30 @@ static int usbdux_ao_cmdtest(struct comedi_device *dev,
         if (err)
                 return 2;
 
-        /* step 3: make sure arguments are trivially compatible */
+        /* Step 3: check if arguments are trivially valid */
 
-        if (cmd->start_arg != 0) {
-                cmd->start_arg = 0;
-                err++;
-        }
+        err |= cfc_check_trigger_arg_is(&cmd->start_arg, 0);
 
-        if (cmd->scan_begin_src == TRIG_FOLLOW) {
-                /* internal trigger */
-                if (cmd->scan_begin_arg != 0) {
-                        cmd->scan_begin_arg = 0;
-                        err++;
-                }
-        }
+        if (cmd->scan_begin_src == TRIG_FOLLOW) /* internal trigger */
+                err |= cfc_check_trigger_arg_is(&cmd->scan_begin_arg, 0);
+
+        if (cmd->scan_begin_src == TRIG_TIMER)
+                err |= cfc_check_trigger_arg_min(&cmd->scan_begin_arg,
+                                                 1000000);
 
-        if (cmd->scan_begin_src == TRIG_TIMER) {
-                /* timer */
-                if (cmd->scan_begin_arg < 1000000) {
-                        cmd->scan_begin_arg = 1000000;
-                        err++;
-                }
-        }
         /* not used now, is for later use */
-        if (cmd->convert_src == TRIG_TIMER) {
-                if (cmd->convert_arg < 125000) {
-                        cmd->convert_arg = 125000;
-                        err++;
-                }
-        }
+        if (cmd->convert_src == TRIG_TIMER)
+                err |= cfc_check_trigger_arg_min(&cmd->convert_arg, 125000);
 
-        /* the same argument */
-        if (cmd->scan_end_arg != cmd->chanlist_len) {
-                cmd->scan_end_arg = cmd->chanlist_len;
-                err++;
-        }
+        err |= cfc_check_trigger_arg_is(&cmd->scan_end_arg, cmd->chanlist_len);
 
         if (cmd->stop_src == TRIG_COUNT) {
                 /* any count is allowed */
         } else {
                 /* TRIG_NONE */
-                if (cmd->stop_arg != 0) {
-                        cmd->stop_arg = 0;
-                        err++;
-                }
+                err |= cfc_check_trigger_arg_is(&cmd->stop_arg, 0);
         }
 
-        dev_dbg(&this_usbduxsub->interface->dev, "comedi%d: err=%d, "
-                "scan_begin_src=%d, scan_begin_arg=%d, convert_src=%d, "
-                "convert_arg=%d\n", dev->minor, err, cmd->scan_begin_src,
-                cmd->scan_begin_arg, cmd->convert_src, cmd->convert_arg);
-
         if (err)
                 return 3;
 
@@ -2375,9 +2319,10 @@ static int usbdux_attach_common(struct comedi_device *dev,
         return 0;
 }
 
-static int usbdux_attach_usb(struct comedi_device *dev,
-                             struct usb_interface *uinterf)
+static int usbdux_auto_attach(struct comedi_device *dev,
+                              unsigned long context_unused)
 {
+        struct usb_interface *uinterf = comedi_to_usb_interface(dev);
         int ret;
         struct usbduxsub *this_usbduxsub;
 
@@ -2386,14 +2331,12 @@ static int usbdux_attach_usb(struct comedi_device *dev,
         down(&start_stop_sem);
         this_usbduxsub = usb_get_intfdata(uinterf);
         if (!this_usbduxsub || !this_usbduxsub->probed) {
-                printk(KERN_ERR
-                       "comedi%d: usbdux: error: attach_usb failed, not connected\n",
-                       dev->minor);
+                dev_err(dev->class_dev,
+                        "usbdux: error: auto_attach failed, not connected\n");
                 ret = -ENODEV;
         } else if (this_usbduxsub->attached) {
-                printk(KERN_ERR
-                       "comedi%d: usbdux: error: attach_usb failed, already attached\n",
-                       dev->minor);
+                dev_err(dev->class_dev,
+                        "error: auto_attach failed, already attached\n");
                 ret = -ENODEV;
         } else
                 ret = usbdux_attach_common(dev, this_usbduxsub);
@@ -2417,7 +2360,7 @@ static void usbdux_detach(struct comedi_device *dev)
 static struct comedi_driver usbdux_driver = {
         .driver_name    = "usbdux",
         .module         = THIS_MODULE,
-        .attach_usb     = usbdux_attach_usb,
+        .auto_attach    = usbdux_auto_attach,
         .detach         = usbdux_detach,
 };
 
diff --git a/drivers/staging/comedi/drivers/usbduxfast.c b/drivers/staging/comedi/drivers/usbduxfast.c
index 1154a7e2895d..4e19f6186f28 100644
--- a/drivers/staging/comedi/drivers/usbduxfast.c
+++ b/drivers/staging/comedi/drivers/usbduxfast.c
@@ -37,6 +37,8 @@
  *       udev coldplug problem
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/kernel.h>
 #include <linux/firmware.h>
 #include <linux/module.h>
@@ -216,8 +218,9 @@ static int send_dux_commands(struct usbduxfastsub_s *udfs, int cmd_type)
                            usb_sndbulkpipe(udfs->usbdev, CHANNELLISTEP),
                            udfs->dux_commands, SIZEOFDUXBUFFER, &nsent, 10000);
         if (tmp < 0)
-                printk(KERN_ERR "comedi%d: could not transmit dux_commands to"
-                       "the usb-device, err=%d\n", udfs->comedidev->minor, tmp);
+                dev_err(&udfs->interface->dev,
+                        "could not transmit dux_commands to the usb-device, err=%d\n",
+                        tmp);
         return tmp;
 }
 
@@ -252,7 +255,7 @@ static int usbduxfast_ai_stop(struct usbduxfastsub_s *udfs, int do_unlink)
         int ret = 0;
 
         if (!udfs) {
-                printk(KERN_ERR "comedi?: usbduxfast_ai_stop: udfs=NULL!\n");
+                pr_err("%s: udfs=NULL!\n", __func__);
                 return -EFAULT;
         }
 #ifdef CONFIG_COMEDI_DEBUG
@@ -284,7 +287,7 @@ static int usbduxfast_ai_cancel(struct comedi_device *dev,
 #endif
         udfs = dev->private;
         if (!udfs) {
-                printk(KERN_ERR "comedi: usbduxfast_ai_cancel: udfs=NULL\n");
+                dev_err(dev->class_dev, "%s: udfs=NULL\n", __func__);
                 return -EFAULT;
         }
         down(&udfs->sem);
@@ -309,26 +312,22 @@ static void usbduxfastsub_ai_Irq(struct urb *urb)
         struct usbduxfastsub_s *udfs;
         struct comedi_device *this_comedidev;
         struct comedi_subdevice *s;
-        uint16_t *p;
 
         /* sanity checks - is the urb there? */
         if (!urb) {
-                printk(KERN_ERR "comedi_: usbduxfast_: ao int-handler called "
-                       "with urb=NULL!\n");
+                pr_err("ao int-handler called with urb=NULL!\n");
                 return;
         }
         /* the context variable points to the subdevice */
         this_comedidev = urb->context;
         if (!this_comedidev) {
-                printk(KERN_ERR "comedi_: usbduxfast_: urb context is a NULL "
-                       "pointer!\n");
+                pr_err("urb context is a NULL pointer!\n");
                 return;
         }
         /* the private structure of the subdevice is usbduxfastsub_s */
         udfs = this_comedidev->private;
         if (!udfs) {
-                printk(KERN_ERR "comedi_: usbduxfast_: private of comedi "
-                       "subdev is a NULL pointer!\n");
+                pr_err("private of comedi subdev is a NULL pointer!\n");
                 return;
         }
         /* are we running a command? */
@@ -370,9 +369,8 @@ static void usbduxfastsub_ai_Irq(struct urb *urb)
                 return;
 
         default:
-                printk("comedi%d: usbduxfast: non-zero urb status received in "
-                       "ai intr context: %d\n",
-                       udfs->comedidev->minor, urb->status);
+                pr_err("non-zero urb status received in ai intr context: %d\n",
+                       urb->status);
                 s->async->events |= COMEDI_CB_EOA;
                 s->async->events |= COMEDI_CB_ERROR;
                 comedi_event(udfs->comedidev, s);
@@ -380,7 +378,6 @@ static void usbduxfastsub_ai_Irq(struct urb *urb)
                 return;
         }
 
-        p = urb->transfer_buffer;
         if (!udfs->ignore) {
                 if (!udfs->ai_continous) {
                         /* not continuous, fixed number of samples */
@@ -427,8 +424,8 @@ static void usbduxfastsub_ai_Irq(struct urb *urb)
         urb->status = 0;
         err = usb_submit_urb(urb, GFP_ATOMIC);
         if (err < 0) {
-                printk(KERN_ERR "comedi%d: usbduxfast: urb resubm failed: %d",
-                       udfs->comedidev->minor, err);
+                dev_err(&urb->dev->dev,
+                        "urb resubm failed: %d", err);
                 s->async->events |= COMEDI_CB_EOA;
                 s->async->events |= COMEDI_CB_ERROR;
                 comedi_event(udfs->comedidev, s);
@@ -454,7 +451,8 @@ static int usbduxfastsub_start(struct usbduxfastsub_s *udfs)
                               1,      /* Length */
                               EZTIMEOUT);    /* Timeout */
         if (ret < 0) {
-                printk("comedi_: usbduxfast_: control msg failed (start)\n");
+                dev_err(&udfs->interface->dev,
+                        "control msg failed (start)\n");
                 return ret;
         }
 
@@ -477,8 +475,8 @@ static int usbduxfastsub_stop(struct usbduxfastsub_s *udfs)
                               local_transfer_buffer, 1, /* Length */
                               EZTIMEOUT);       /* Timeout */
         if (ret < 0) {
-                printk(KERN_ERR "comedi_: usbduxfast: control msg failed "
-                       "(stop)\n");
+                dev_err(&udfs->interface->dev,
+                        "control msg failed (stop)\n");
                 return ret;
         }
 
@@ -512,7 +510,7 @@ static int usbduxfastsub_upload(struct usbduxfastsub_s *udfs,
 #endif
 
         if (ret < 0) {
-                printk(KERN_ERR "comedi_: usbduxfast: uppload failed\n");
+                dev_err(&udfs->interface->dev, "uppload failed\n");
                 return ret;
         }
 
@@ -538,8 +536,8 @@ static int usbduxfastsub_submit_InURBs(struct usbduxfastsub_s *udfs)
 #endif
         ret = usb_submit_urb(udfs->urbIn, GFP_ATOMIC);
         if (ret) {
-                printk(KERN_ERR "comedi_: usbduxfast: ai: usb_submit_urb error"
-                       " %d\n", ret);
+                dev_err(&udfs->interface->dev,
+                        "ai: usb_submit_urb error %d\n", ret);
                 return ret;
         }
         return 0;
@@ -557,12 +555,6 @@ static int usbduxfast_ai_cmdtest(struct comedi_device *dev,
         if (!udfs->probed)
                 return -ENODEV;
 
-#ifdef CONFIG_COMEDI_DEBUG
-        printk(KERN_DEBUG "comedi%d: usbduxfast_ai_cmdtest\n", dev->minor);
-        printk(KERN_DEBUG "comedi%d: usbduxfast: convert_arg=%u "
-               "scan_begin_arg=%u\n",
-               dev->minor, cmd->convert_arg, cmd->scan_begin_arg);
-#endif
         /* Step 1 : check if triggers are trivially valid */
 
         err |= cfc_check_trigger_src(&cmd->start_src,
@@ -592,20 +584,15 @@ static int usbduxfast_ai_cmdtest(struct comedi_device *dev,
         if (err)
                 return 2;
 
-        /* step 3: make sure arguments are trivially compatible */
+        /* Step 3: check if arguments are trivially valid */
 
-        if (cmd->start_src == TRIG_NOW && cmd->start_arg != 0) {
-                cmd->start_arg = 0;
-                err++;
-        }
+        if (cmd->start_src == TRIG_NOW)
+                err |= cfc_check_trigger_arg_is(&cmd->start_arg, 0);
 
         if (!cmd->chanlist_len)
-                err++;
+                err |= -EINVAL;
 
-        if (cmd->scan_end_arg != cmd->chanlist_len) {
-                cmd->scan_end_arg = cmd->chanlist_len;
-                err++;
-        }
+        err |= cfc_check_trigger_arg_is(&cmd->scan_end_arg, cmd->chanlist_len);
 
         if (cmd->chanlist_len == 1)
                 minSamplPer = 1;
@@ -622,28 +609,19 @@ static int usbduxfast_ai_cmdtest(struct comedi_device *dev,
 
                 /* calc arg again */
                 tmp = steps / 30;
-                if (cmd->convert_arg != tmp) {
-                        cmd->convert_arg = tmp;
-                        err++;
-                }
+                err |= cfc_check_trigger_arg_is(&cmd->convert_arg, tmp);
         }
 
         if (cmd->scan_begin_src == TRIG_TIMER)
-                err++;
+                err |= -EINVAL;
 
         /* stop source */
         switch (cmd->stop_src) {
         case TRIG_COUNT:
-                if (!cmd->stop_arg) {
-                        cmd->stop_arg = 1;
-                        err++;
-                }
+                err |= cfc_check_trigger_arg_min(&cmd->stop_arg, 1);
                 break;
         case TRIG_NONE:
-                if (cmd->stop_arg != 0) {
-                        cmd->stop_arg = 0;
-                        err++;
-                }
+                err |= cfc_check_trigger_arg_is(&cmd->stop_arg, 0);
                 break;
                 /*
                  * TRIG_EXT doesn't care since it doesn't trigger
@@ -682,8 +660,7 @@ static int usbduxfast_ai_inttrig(struct comedi_device *dev,
 #endif
 
         if (trignum != 0) {
-                printk(KERN_ERR "comedi%d: usbduxfast_ai_inttrig: invalid"
-                       " trignum\n", dev->minor);
+                dev_err(dev->class_dev, "%s: invalid trignum\n", __func__);
                 up(&udfs->sem);
                 return -EINVAL;
         }
@@ -691,16 +668,16 @@ static int usbduxfast_ai_inttrig(struct comedi_device *dev,
                 udfs->ai_cmd_running = 1;
                 ret = usbduxfastsub_submit_InURBs(udfs);
                 if (ret < 0) {
-                        printk(KERN_ERR "comedi%d: usbduxfast_ai_inttrig: "
-                               "urbSubmit: err=%d\n", dev->minor, ret);
+                        dev_err(dev->class_dev,
+                                "%s: urbSubmit: err=%d\n", __func__, ret);
                         udfs->ai_cmd_running = 0;
                         up(&udfs->sem);
                         return ret;
                 }
                 s->async->inttrig = NULL;
         } else {
-                printk(KERN_ERR "comedi%d: ai_inttrig but acqu is already"
-                       " running\n", dev->minor);
+                dev_err(dev->class_dev,
+                        "ai_inttrig but acqu is already running\n");
         }
         up(&udfs->sem);
         return 1;
@@ -738,8 +715,8 @@ static int usbduxfast_ai_cmd(struct comedi_device *dev,
                 return -ENODEV;
         }
         if (udfs->ai_cmd_running) {
-                printk(KERN_ERR "comedi%d: ai_cmd not possible. Another ai_cmd"
-                       " is running.\n", dev->minor);
+                dev_err(dev->class_dev,
+                        "ai_cmd not possible. Another ai_cmd is running.\n");
                 up(&udfs->sem);
                 return -EBUSY;
         }
@@ -757,31 +734,29 @@ static int usbduxfast_ai_cmd(struct comedi_device *dev,
                 for (i = 0; i < cmd->chanlist_len; ++i) {
                         chan = CR_CHAN(cmd->chanlist[i]);
                         if (chan != i) {
-                                printk(KERN_ERR "comedi%d: cmd is accepting "
-                                       "only consecutive channels.\n",
-                                       dev->minor);
+                                dev_err(dev->class_dev,
+                                        "cmd is accepting only consecutive channels.\n");
                                 up(&udfs->sem);
                                 return -EINVAL;
                         }
                         if ((gain != CR_RANGE(cmd->chanlist[i]))
                             && (cmd->chanlist_len > 3)) {
-                                printk(KERN_ERR "comedi%d: the gain must be"
-                                       " the same for all channels.\n",
-                                       dev->minor);
+                                dev_err(dev->class_dev,
+                                        "the gain must be the same for all channels.\n");
                                 up(&udfs->sem);
                                 return -EINVAL;
                         }
                         if (i >= NUMCHANNELS) {
-                                printk(KERN_ERR "comedi%d: channel list too"
-                                       " long\n", dev->minor);
+                                dev_err(dev->class_dev,
+                                        "channel list too long\n");
                                 break;
                         }
                 }
         }
         steps = 0;
         if (cmd->scan_begin_src == TRIG_TIMER) {
-                printk(KERN_ERR "comedi%d: usbduxfast: "
-                       "scan_begin_src==TRIG_TIMER not valid.\n", dev->minor);
+                dev_err(dev->class_dev,
+                        "scan_begin_src==TRIG_TIMER not valid.\n");
                 up(&udfs->sem);
                 return -EINVAL;
         }
@@ -789,22 +764,21 @@ static int usbduxfast_ai_cmd(struct comedi_device *dev,
                 steps = (cmd->convert_arg * 30) / 1000;
 
         if ((steps < MIN_SAMPLING_PERIOD) && (cmd->chanlist_len != 1)) {
-                printk(KERN_ERR "comedi%d: usbduxfast: ai_cmd: steps=%ld, "
-                       "scan_begin_arg=%d. Not properly tested by cmdtest?\n",
-                       dev->minor, steps, cmd->scan_begin_arg);
+                dev_err(dev->class_dev,
+                        "ai_cmd: steps=%ld, scan_begin_arg=%d. Not properly tested by cmdtest?\n",
+                        steps, cmd->scan_begin_arg);
                 up(&udfs->sem);
                 return -EINVAL;
         }
         if (steps > MAX_SAMPLING_PERIOD) {
-                printk(KERN_ERR "comedi%d: usbduxfast: ai_cmd: sampling rate "
-                       "too low.\n", dev->minor);
+                dev_err(dev->class_dev, "ai_cmd: sampling rate too low.\n");
                 up(&udfs->sem);
                 return -EINVAL;
         }
         if ((cmd->start_src == TRIG_EXT) && (cmd->chanlist_len != 1)
             && (cmd->chanlist_len != 16)) {
-                printk(KERN_ERR "comedi%d: usbduxfast: ai_cmd: TRIG_EXT only"
-                       " with 1 or 16 channels possible.\n", dev->minor);
+                dev_err(dev->class_dev,
+                        "ai_cmd: TRIG_EXT only with 1 or 16 channels possible.\n");
                 up(&udfs->sem);
                 return -EINVAL;
         }
@@ -1121,8 +1095,7 @@ static int usbduxfast_ai_cmd(struct comedi_device *dev,
                 break;
 
         default:
-                printk(KERN_ERR "comedi %d: unsupported combination of "
-                       "channels\n", dev->minor);
+                dev_err(dev->class_dev, "unsupported combination of channels\n");
                 up(&udfs->sem);
                 return -EFAULT;
         }
@@ -1134,17 +1107,16 @@ static int usbduxfast_ai_cmd(struct comedi_device *dev,
         /* 0 means that the AD commands are sent */
         result = send_dux_commands(udfs, SENDADCOMMANDS);
         if (result < 0) {
-                printk(KERN_ERR "comedi%d: adc command could not be submitted."
-                       "Aborting...\n", dev->minor);
+                dev_err(dev->class_dev,
+                        "adc command could not be submitted. Aborting...\n");
                 up(&udfs->sem);
                 return result;
         }
         if (cmd->stop_src == TRIG_COUNT) {
                 udfs->ai_sample_count = cmd->stop_arg * cmd->scan_end_arg;
                 if (udfs->ai_sample_count < 1) {
-                        printk(KERN_ERR "comedi%d: "
-                               "(cmd->stop_arg)*(cmd->scan_end_arg)<1, "
-                               "aborting.\n", dev->minor);
+                        dev_err(dev->class_dev,
+                                "(cmd->stop_arg)*(cmd->scan_end_arg)<1, aborting.\n");
                         up(&udfs->sem);
                         return -EFAULT;
                 }
@@ -1193,8 +1165,7 @@ static int usbduxfast_ai_insn_read(struct comedi_device *dev,
 
         udfs = dev->private;
         if (!udfs) {
-                printk(KERN_ERR "comedi%d: ai_insn_read: no usb dev.\n",
-                       dev->minor);
+                dev_err(dev->class_dev, "%s: no usb dev.\n", __func__);
                 return -ENODEV;
         }
 #ifdef CONFIG_COMEDI_DEBUG
@@ -1207,8 +1178,8 @@ static int usbduxfast_ai_insn_read(struct comedi_device *dev,
                 return -ENODEV;
         }
         if (udfs->ai_cmd_running) {
-                printk(KERN_ERR "comedi%d: ai_insn_read not possible. Async "
-                       "Command is running.\n", dev->minor);
+                dev_err(dev->class_dev,
+                        "ai_insn_read not possible. Async Command is running.\n");
                 up(&udfs->sem);
                 return -EBUSY;
         }
@@ -1268,8 +1239,8 @@ static int usbduxfast_ai_insn_read(struct comedi_device *dev,
         /* 0 means that the AD commands are sent */
         err = send_dux_commands(udfs, SENDADCOMMANDS);
         if (err < 0) {
-                printk(KERN_ERR "comedi%d: adc command could not be submitted."
-                       "Aborting...\n", dev->minor);
+                dev_err(dev->class_dev,
+                        "adc command could not be submitted. Aborting...\n");
                 up(&udfs->sem);
                 return err;
         }
@@ -1284,8 +1255,7 @@ static int usbduxfast_ai_insn_read(struct comedi_device *dev,
                                    udfs->transfer_buffer, SIZEINBUF,
                                    &actual_length, 10000);
                 if (err < 0) {
-                        printk(KERN_ERR "comedi%d: insn timeout. No data.\n",
-                               dev->minor);
+                        dev_err(dev->class_dev, "insn timeout. No data.\n");
                         up(&udfs->sem);
                         return err;
                 }
@@ -1297,15 +1267,13 @@ static int usbduxfast_ai_insn_read(struct comedi_device *dev,
                                    udfs->transfer_buffer, SIZEINBUF,
                                    &actual_length, 10000);
                 if (err < 0) {
-                        printk(KERN_ERR "comedi%d: insn data error: %d\n",
-                               dev->minor, err);
+                        dev_err(dev->class_dev, "insn data error: %d\n", err);
                         up(&udfs->sem);
                         return err;
                 }
                 n = actual_length / sizeof(uint16_t);
                 if ((n % 16) != 0) {
-                        printk(KERN_ERR "comedi%d: insn data packet "
-                               "corrupted.\n", dev->minor);
+                        dev_err(dev->class_dev, "insn data packet corrupted.\n");
                         up(&udfs->sem);
                         return -EINVAL;
                 }
@@ -1454,9 +1422,10 @@ static int usbduxfast_attach_common(struct comedi_device *dev,
         return 0;
 }
 
-static int usbduxfast_attach_usb(struct comedi_device *dev,
-                                 struct usb_interface *uinterf)
+static int usbduxfast_auto_attach(struct comedi_device *dev,
+                                  unsigned long context_unused)
 {
+        struct usb_interface *uinterf = comedi_to_usb_interface(dev);
         int ret;
         struct usbduxfastsub_s *udfs;
 
@@ -1465,11 +1434,11 @@ static int usbduxfast_attach_usb(struct comedi_device *dev,
         udfs = usb_get_intfdata(uinterf);
         if (!udfs || !udfs->probed) {
                 dev_err(dev->class_dev,
-                        "usbduxfast: error: attach_usb failed, not connected\n");
+                        "usbduxfast: error: auto_attach failed, not connected\n");
                 ret = -ENODEV;
         } else if (udfs->attached) {
                 dev_err(dev->class_dev,
-                       "usbduxfast: error: attach_usb failed, already attached\n");
+                       "usbduxfast: error: auto_attach failed, already attached\n");
                 ret = -ENODEV;
         } else
                 ret = usbduxfast_attach_common(dev, udfs);
@@ -1495,7 +1464,7 @@ static void usbduxfast_detach(struct comedi_device *dev)
 static struct comedi_driver usbduxfast_driver = {
         .driver_name    = "usbduxfast",
         .module         = THIS_MODULE,
-        .attach_usb     = usbduxfast_attach_usb,
+        .auto_attach    = usbduxfast_auto_attach,
         .detach         = usbduxfast_detach,
 };
 
@@ -1535,8 +1504,8 @@ static int usbduxfast_usb_probe(struct usb_interface *uinterf,
         int ret;
 
         if (udev->speed != USB_SPEED_HIGH) {
-                printk(KERN_ERR "comedi_: usbduxfast_: This driver needs"
-                       "USB 2.0 to operate. Aborting...\n");
+                dev_err(&uinterf->dev,
+                        "This driver needs USB 2.0 to operate. Aborting...\n");
                 return -ENODEV;
         }
 #ifdef CONFIG_COMEDI_DEBUG
@@ -1555,7 +1524,8 @@ static int usbduxfast_usb_probe(struct usb_interface *uinterf,
 
         /* no more space */
         if (index == -1) {
-                printk(KERN_ERR "Too many usbduxfast-devices connected.\n");
+                dev_err(&uinterf->dev,
+                        "Too many usbduxfast-devices connected.\n");
                 up(&start_stop_sem);
                 return -EMFILE;
         }
@@ -1586,8 +1556,8 @@ static int usbduxfast_usb_probe(struct usb_interface *uinterf,
         usbduxfastsub[index].dux_commands = kmalloc(SIZEOFDUXBUFFER,
                                                     GFP_KERNEL);
         if (!usbduxfastsub[index].dux_commands) {
-                printk(KERN_ERR "comedi_: usbduxfast: error alloc space for "
-                       "dac commands\n");
+                dev_err(&uinterf->dev,
+                        "error alloc space for dac commands\n");
                 tidy_up(&(usbduxfastsub[index]));
                 up(&start_stop_sem);
                 return -ENOMEM;
@@ -1595,8 +1565,8 @@ static int usbduxfast_usb_probe(struct usb_interface *uinterf,
         /* create space of the instruction buffer */
         usbduxfastsub[index].insnBuffer = kmalloc(SIZEINSNBUF, GFP_KERNEL);
         if (!usbduxfastsub[index].insnBuffer) {
-                printk(KERN_ERR "comedi_: usbduxfast: could not alloc space "
-                       "for insnBuffer\n");
+                dev_err(&uinterf->dev,
+                        "could not alloc space for insnBuffer\n");
                 tidy_up(&(usbduxfastsub[index]));
                 up(&start_stop_sem);
                 return -ENOMEM;
@@ -1605,24 +1575,25 @@ static int usbduxfast_usb_probe(struct usb_interface *uinterf,
         i = usb_set_interface(usbduxfastsub[index].usbdev,
                               usbduxfastsub[index].ifnum, 1);
         if (i < 0) {
-                printk(KERN_ERR "comedi_: usbduxfast%d: could not switch to "
-                       "alternate setting 1.\n", index);
+                dev_err(&uinterf->dev,
+                        "usbduxfast%d: could not switch to alternate setting 1.\n",
+                        index);
                 tidy_up(&(usbduxfastsub[index]));
                 up(&start_stop_sem);
                 return -ENODEV;
         }
         usbduxfastsub[index].urbIn = usb_alloc_urb(0, GFP_KERNEL);
         if (!usbduxfastsub[index].urbIn) {
-                printk(KERN_ERR "comedi_: usbduxfast%d: Could not alloc."
-                       "urb\n", index);
+                dev_err(&uinterf->dev,
+                        "usbduxfast%d: Could not alloc. urb\n", index);
                 tidy_up(&(usbduxfastsub[index]));
                 up(&start_stop_sem);
                 return -ENOMEM;
         }
         usbduxfastsub[index].transfer_buffer = kmalloc(SIZEINBUF, GFP_KERNEL);
         if (!usbduxfastsub[index].transfer_buffer) {
-                printk(KERN_ERR "comedi_: usbduxfast%d: could not alloc. "
-                       "transb.\n", index);
+                dev_err(&uinterf->dev,
+                        "usbduxfast%d: could not alloc. transb.\n", index);
                 tidy_up(&(usbduxfastsub[index]));
                 up(&start_stop_sem);
                 return -ENOMEM;
@@ -1640,12 +1611,12 @@ static int usbduxfast_usb_probe(struct usb_interface *uinterf,
                                       usbduxfast_firmware_request_complete_handler);
 
         if (ret) {
-                dev_err(&udev->dev, "could not load firmware (err=%d)\n", ret);
+                dev_err(&uinterf->dev, "could not load firmware (err=%d)\n", ret);
                 return ret;
         }
 
-        printk(KERN_INFO "comedi_: usbduxfast%d has been successfully "
-               "initialized.\n", index);
+        dev_info(&uinterf->dev,
+                 "usbduxfast%d has been successfully initialized.\n", index);
         /* success */
         return 0;
 }
@@ -1656,13 +1627,11 @@ static void usbduxfast_usb_disconnect(struct usb_interface *intf)
         struct usb_device *udev = interface_to_usbdev(intf);
 
         if (!udfs) {
-                printk(KERN_ERR "comedi_: usbduxfast: disconnect called with "
-                       "null pointer.\n");
+                dev_err(&intf->dev, "disconnect called with null pointer.\n");
                 return;
         }
         if (udfs->usbdev != udev) {
-                printk(KERN_ERR "comedi_: usbduxfast: BUG! called with wrong "
-                       "ptr!!!\n");
+                dev_err(&intf->dev, "BUG! called with wrong ptr!!!\n");
                 return;
         }
 
diff --git a/drivers/staging/comedi/drivers/usbduxsigma.c b/drivers/staging/comedi/drivers/usbduxsigma.c
index b1694121f845..cdd279b1f61e 100644
--- a/drivers/staging/comedi/drivers/usbduxsigma.c
+++ b/drivers/staging/comedi/drivers/usbduxsigma.c
@@ -904,9 +904,6 @@ static int usbdux_ai_cmdtest(struct comedi_device *dev,
         if (!(this_usbduxsub->probed))
                 return -ENODEV;
 
-        dev_dbg(&this_usbduxsub->interface->dev,
-                "comedi%d: usbdux_ai_cmdtest\n", dev->minor);
-
         /* Step 1 : check if triggers are trivially valid */
 
         err |= cfc_check_trigger_src(&cmd->start_src, TRIG_NOW | TRIG_INT);
@@ -928,19 +925,12 @@ static int usbdux_ai_cmdtest(struct comedi_device *dev,
         if (err)
                 return 2;
 
-        /* step 3: make sure arguments are trivially compatible */
-        if (cmd->start_arg != 0) {
-                cmd->start_arg = 0;
-                err++;
-        }
+        /* Step 3: check if arguments are trivially valid */
 
-        if (cmd->scan_begin_src == TRIG_FOLLOW) {
-                /* internal trigger */
-                if (cmd->scan_begin_arg != 0) {
-                        cmd->scan_begin_arg = 0;
-                        err++;
-                }
-        }
+        err |= cfc_check_trigger_arg_is(&cmd->start_arg, 0);
+
+        if (cmd->scan_begin_src == TRIG_FOLLOW) /* internal trigger */
+                err |= cfc_check_trigger_arg_is(&cmd->scan_begin_arg, 0);
 
         if (cmd->scan_begin_src == TRIG_TIMER) {
                 if (this_usbduxsub->high_speed) {
@@ -951,51 +941,35 @@ static int usbdux_ai_cmdtest(struct comedi_device *dev,
                          * are in the channel list the more time we need.
                          */
                         i = chanToInterval(cmd->chanlist_len);
-                        if (cmd->scan_begin_arg < (1000000 / 8 * i)) {
-                                cmd->scan_begin_arg = 1000000 / 8 * i;
-                                err++;
-                        }
+                        err |= cfc_check_trigger_arg_min(&cmd->scan_begin_arg,
+                                                         (1000000 / 8 * i));
                         /* now calc the real sampling rate with all the
                          * rounding errors */
                         tmpTimer =
                             ((unsigned int)(cmd->scan_begin_arg / 125000)) *
                             125000;
-                        if (cmd->scan_begin_arg != tmpTimer) {
-                                cmd->scan_begin_arg = tmpTimer;
-                                err++;
-                        }
                 } else {
                         /* full speed */
                         /* 1kHz scans every USB frame */
-                        if (cmd->scan_begin_arg < 1000000) {
-                                cmd->scan_begin_arg = 1000000;
-                                err++;
-                        }
+                        err |= cfc_check_trigger_arg_min(&cmd->scan_begin_arg,
+                                                         1000000);
                         /*
                          * calc the real sampling rate with the rounding errors
                          */
                         tmpTimer = ((unsigned int)(cmd->scan_begin_arg /
                                                    1000000)) * 1000000;
-                        if (cmd->scan_begin_arg != tmpTimer) {
-                                cmd->scan_begin_arg = tmpTimer;
-                                err++;
-                        }
                 }
+                err |= cfc_check_trigger_arg_is(&cmd->scan_begin_arg,
+                                                tmpTimer);
         }
-        /* the same argument */
-        if (cmd->scan_end_arg != cmd->chanlist_len) {
-                cmd->scan_end_arg = cmd->chanlist_len;
-                err++;
-        }
+
+        err |= cfc_check_trigger_arg_is(&cmd->scan_end_arg, cmd->chanlist_len);
 
         if (cmd->stop_src == TRIG_COUNT) {
                 /* any count is allowed */
         } else {
                 /* TRIG_NONE */
-                if (cmd->stop_arg != 0) {
-                        cmd->stop_arg = 0;
-                        err++;
-                }
+                err |= cfc_check_trigger_arg_is(&cmd->stop_arg, 0);
         }
 
         if (err)
@@ -1576,57 +1550,30 @@ static int usbdux_ao_cmdtest(struct comedi_device *dev,
         if (err)
                 return 2;
 
-        /* step 3: make sure arguments are trivially compatible */
+        /* Step 3: check if arguments are trivially valid */
 
-        if (cmd->start_arg != 0) {
-                cmd->start_arg = 0;
-                err++;
-        }
+        err |= cfc_check_trigger_arg_is(&cmd->start_arg, 0);
 
-        if (cmd->scan_begin_src == TRIG_FOLLOW) {
-                /* internal trigger */
-                if (cmd->scan_begin_arg != 0) {
-                        cmd->scan_begin_arg = 0;
-                        err++;
-                }
-        }
+        if (cmd->scan_begin_src == TRIG_FOLLOW) /* internal trigger */
+                err |= cfc_check_trigger_arg_is(&cmd->scan_begin_arg, 0);
+
+        if (cmd->scan_begin_src == TRIG_TIMER)
+                err |= cfc_check_trigger_arg_min(&cmd->scan_begin_arg,
+                                                 1000000);
 
-        if (cmd->scan_begin_src == TRIG_TIMER) {
-                /* timer */
-                if (cmd->scan_begin_arg < 1000000) {
-                        cmd->scan_begin_arg = 1000000;
-                        err++;
-                }
-        }
         /* not used now, is for later use */
-        if (cmd->convert_src == TRIG_TIMER) {
-                if (cmd->convert_arg < 125000) {
-                        cmd->convert_arg = 125000;
-                        err++;
-                }
-        }
+        if (cmd->convert_src == TRIG_TIMER)
+                err |= cfc_check_trigger_arg_min(&cmd->convert_arg, 125000);
 
-        /* the same argument */
-        if (cmd->scan_end_arg != cmd->chanlist_len) {
-                cmd->scan_end_arg = cmd->chanlist_len;
-                err++;
-        }
+        err |= cfc_check_trigger_arg_is(&cmd->scan_end_arg, cmd->chanlist_len);
 
         if (cmd->stop_src == TRIG_COUNT) {
                 /* any count is allowed */
         } else {
                 /* TRIG_NONE */
-                if (cmd->stop_arg != 0) {
-                        cmd->stop_arg = 0;
-                        err++;
-                }
+                err |= cfc_check_trigger_arg_is(&cmd->stop_arg, 0);
         }
 
-        dev_dbg(&this_usbduxsub->interface->dev, "comedi%d: err=%d, "
-                "scan_begin_src=%d, scan_begin_arg=%d, convert_src=%d, "
-                "convert_arg=%d\n", dev->minor, err, cmd->scan_begin_src,
-                cmd->scan_begin_arg, cmd->convert_src, cmd->convert_arg);
-
         if (err)
                 return 3;
 
@@ -2359,9 +2306,10 @@ static int usbduxsigma_attach_common(struct comedi_device *dev,
         return 0;
 }
 
-static int usbduxsigma_attach_usb(struct comedi_device *dev,
-                                  struct usb_interface *uinterf)
+static int usbduxsigma_auto_attach(struct comedi_device *dev,
+                                   unsigned long context_unused)
 {
+        struct usb_interface *uinterf = comedi_to_usb_interface(dev);
         int ret;
         struct usbduxsub *uds;
 
@@ -2370,11 +2318,11 @@ static int usbduxsigma_attach_usb(struct comedi_device *dev,
         uds = usb_get_intfdata(uinterf);
         if (!uds || !uds->probed) {
                 dev_err(dev->class_dev,
-                        "usbduxsigma: error: attach_usb failed, not connected\n");
+                        "usbduxsigma: error: auto_attach failed, not connected\n");
                 ret = -ENODEV;
         } else if (uds->attached) {
                 dev_err(dev->class_dev,
-                       "usbduxsigma: error: attach_usb failed, already attached\n");
+                       "usbduxsigma: error: auto_attach failed, already attached\n");
                 ret = -ENODEV;
         } else
                 ret = usbduxsigma_attach_common(dev, uds);
@@ -2398,7 +2346,7 @@ static void usbduxsigma_detach(struct comedi_device *dev)
 static struct comedi_driver usbduxsigma_driver = {
         .driver_name    = "usbduxsigma",
         .module         = THIS_MODULE,
-        .attach_usb     = usbduxsigma_attach_usb,
+        .auto_attach    = usbduxsigma_auto_attach,
         .detach         = usbduxsigma_detach,
 };
 
diff --git a/drivers/staging/comedi/drivers/vmk80xx.c b/drivers/staging/comedi/drivers/vmk80xx.c
index df277aa591bb..609dc6915997 100644
--- a/drivers/staging/comedi/drivers/vmk80xx.c
+++ b/drivers/staging/comedi/drivers/vmk80xx.c
@@ -1209,9 +1209,10 @@ static int vmk80xx_attach(struct comedi_device *cdev,
 }
 
 /* called via comedi_usb_auto_config() */
-static int vmk80xx_attach_usb(struct comedi_device *cdev,
-                              struct usb_interface *intf)
+static int vmk80xx_auto_attach(struct comedi_device *cdev,
+                               unsigned long context_unused)
 {
+        struct usb_interface *intf = comedi_to_usb_interface(cdev);
         int i;
         int ret;
 
@@ -1246,7 +1247,7 @@ static struct comedi_driver vmk80xx_driver = {
         .driver_name    = "vmk80xx",
         .attach         = vmk80xx_attach,
         .detach         = vmk80xx_detach,
-        .attach_usb     = vmk80xx_attach_usb,
+        .auto_attach    = vmk80xx_auto_attach,
 };
 
 static int vmk80xx_usb_probe(struct usb_interface *intf,
@@ -1371,12 +1372,11 @@ static int vmk80xx_usb_probe(struct usb_interface *intf,
 
         if (dev->board.model == VMK8061_MODEL) {
                 vmk80xx_read_eeprom(dev, IC3_VERSION);
-                printk(KERN_INFO "comedi#: vmk80xx: %s\n", dev->fw.ic3_vers);
+                dev_info(&intf->dev, "%s\n", dev->fw.ic3_vers);
 
                 if (vmk80xx_check_data_link(dev)) {
                         vmk80xx_read_eeprom(dev, IC6_VERSION);
-                        printk(KERN_INFO "comedi#: vmk80xx: %s\n",
-                               dev->fw.ic6_vers);
+                        dev_info(&intf->dev, "%s\n", dev->fw.ic6_vers);
                 } else {
                         dbgcm("comedi#: vmk80xx: no conn. to CPU\n");
                 }
@@ -1387,8 +1387,8 @@ static int vmk80xx_usb_probe(struct usb_interface *intf,
 
         dev->probed = 1;
 
-        printk(KERN_INFO "comedi#: vmk80xx: board #%d [%s] now attached\n",
-               dev->count, dev->board.name);
+        dev_info(&intf->dev, "board #%d [%s] now attached\n",
+                 dev->count, dev->board.name);
 
         mutex_unlock(&glb_mutex);
 
@@ -1422,8 +1422,8 @@ static void vmk80xx_usb_disconnect(struct usb_interface *intf)
         kfree(dev->usb_rx_buf);
         kfree(dev->usb_tx_buf);
 
-        printk(KERN_INFO "comedi#: vmk80xx: board #%d [%s] now detached\n",
-               dev->count, dev->board.name);
+        dev_info(&intf->dev, "board #%d [%s] now detached\n",
+                 dev->count, dev->board.name);
 
         up(&dev->limit_sem);
         mutex_unlock(&glb_mutex);
diff --git a/drivers/staging/comedi/kcomedilib/kcomedilib_main.c b/drivers/staging/comedi/kcomedilib/kcomedilib_main.c
index 3f20ea55b8d0..4dc09a210883 100644
--- a/drivers/staging/comedi/kcomedilib/kcomedilib_main.c
+++ b/drivers/staging/comedi/kcomedilib/kcomedilib_main.c
@@ -21,7 +21,6 @@
 
 */
 
-#define __NO_VERSION__
 #include <linux/module.h>
 
 #include <linux/errno.h>
@@ -95,7 +94,8 @@ static int comedi_do_insn(struct comedi_device *dev,
         s = &dev->subdevices[insn->subdev];
 
         if (s->type == COMEDI_SUBD_UNUSED) {
-                printk(KERN_ERR "%d not useable subdevice\n", insn->subdev);
+                dev_err(dev->class_dev,
+                        "%d not useable subdevice\n", insn->subdev);
                 ret = -EIO;
                 goto error;
         }
@@ -104,7 +104,7 @@ static int comedi_do_insn(struct comedi_device *dev,
 
         ret = comedi_check_chanlist(s, 1, &insn->chanspec);
         if (ret < 0) {
-                printk(KERN_ERR "bad chanspec\n");
+                dev_err(dev->class_dev, "bad chanspec\n");
                 ret = -EINVAL;
                 goto error;
         }
diff --git a/drivers/staging/comedi/proc.c b/drivers/staging/comedi/proc.c
index bb7e70e3e94a..01acbe97653c 100644
--- a/drivers/staging/comedi/proc.c
+++ b/drivers/staging/comedi/proc.c
@@ -28,7 +28,6 @@
         was cool.
 */
 
-#define __NO_VERSION__
 #include "comedidev.h"
 #include "comedi_internal.h"
 #include <linux/proc_fs.h>
diff --git a/drivers/staging/crystalhd/crystalhd_cmds.c b/drivers/staging/crystalhd/crystalhd_cmds.c
index 05fe78748dfc..ed99daa6ef46 100644
--- a/drivers/staging/crystalhd/crystalhd_cmds.c
+++ b/drivers/staging/crystalhd/crystalhd_cmds.c
@@ -308,9 +308,9 @@ static enum BC_STATUS bc_cproc_download_fw(struct crystalhd_cmd *ctx,
         sts = crystalhd_download_fw(ctx->adp, (uint8_t *)idata->add_cdata,
                                   idata->add_cdata_sz);
 
-        if (sts != BC_STS_SUCCESS) {
+        if (sts != BC_STS_SUCCESS)
                 BCMLOG_ERR("Firmware Download Failure!! - %d\n", sts);
-        } else
+        else
                 ctx->state |= BC_LINK_INIT;
 
         return sts;
@@ -951,7 +951,7 @@ enum BC_STATUS crystalhd_user_close(struct crystalhd_cmd *ctx, struct crystalhd_
  *
  * Called at the time of driver load.
  */
-enum BC_STATUS __devinit crystalhd_setup_cmd_context(struct crystalhd_cmd *ctx,
+enum BC_STATUS crystalhd_setup_cmd_context(struct crystalhd_cmd *ctx,
                                     struct crystalhd_adp *adp)
 {
         int i = 0;
@@ -986,7 +986,7 @@ enum BC_STATUS __devinit crystalhd_setup_cmd_context(struct crystalhd_cmd *ctx,
  *
  * Called at the time of driver un-load.
  */
-enum BC_STATUS __devexit crystalhd_delete_cmd_context(struct crystalhd_cmd *ctx)
+enum BC_STATUS crystalhd_delete_cmd_context(struct crystalhd_cmd *ctx)
 {
         BCMLOG(BCMLOG_DBG, "Deleting Command context..\n");
 
diff --git a/drivers/staging/crystalhd/crystalhd_lnx.c b/drivers/staging/crystalhd/crystalhd_lnx.c
index 166203aeb7b4..85f51fb18425 100644
--- a/drivers/staging/crystalhd/crystalhd_lnx.c
+++ b/drivers/staging/crystalhd/crystalhd_lnx.c
@@ -353,7 +353,7 @@ static const struct file_operations chd_dec_fops = {
         .llseek = noop_llseek,
 };
 
-static int __devinit chd_dec_init_chdev(struct crystalhd_adp *adp)
+static int chd_dec_init_chdev(struct crystalhd_adp *adp)
 {
         struct crystalhd_ioctl_data *temp;
         struct device *dev;
@@ -418,7 +418,7 @@ fail:
         return rc;
 }
 
-static void __devexit chd_dec_release_chdev(struct crystalhd_adp *adp)
+static void chd_dec_release_chdev(struct crystalhd_adp *adp)
 {
         struct crystalhd_ioctl_data *temp = NULL;
         if (!adp)
@@ -443,7 +443,7 @@ static void __devexit chd_dec_release_chdev(struct crystalhd_adp *adp)
         crystalhd_delete_elem_pool(adp);
 }
 
-static int __devinit chd_pci_reserve_mem(struct crystalhd_adp *pinfo)
+static int chd_pci_reserve_mem(struct crystalhd_adp *pinfo)
 {
         int rc;
         unsigned long bar2 = pci_resource_start(pinfo->pdev, 2);
@@ -496,7 +496,7 @@ static int __devinit chd_pci_reserve_mem(struct crystalhd_adp *pinfo)
         return 0;
 }
 
-static void __devexit chd_pci_release_mem(struct crystalhd_adp *pinfo)
+static void chd_pci_release_mem(struct crystalhd_adp *pinfo)
 {
         if (!pinfo)
                 return;
@@ -511,7 +511,7 @@ static void __devexit chd_pci_release_mem(struct crystalhd_adp *pinfo)
 }
 
 
-static void __devexit chd_dec_pci_remove(struct pci_dev *pdev)
+static void chd_dec_pci_remove(struct pci_dev *pdev)
 {
         struct crystalhd_adp *pinfo;
         enum BC_STATUS sts = BC_STS_SUCCESS;
@@ -537,7 +537,7 @@ static void __devexit chd_dec_pci_remove(struct pci_dev *pdev)
         g_adp_info = NULL;
 }
 
-static int __devinit chd_dec_pci_probe(struct pci_dev *pdev,
+static int chd_dec_pci_probe(struct pci_dev *pdev,
                              const struct pci_device_id *entry)
 {
         struct crystalhd_adp *pinfo;
@@ -711,7 +711,7 @@ MODULE_DEVICE_TABLE(pci, chd_dec_pci_id_table);
 static struct pci_driver bc_chd_70012_driver = {
         .name     = "Broadcom 70012 Decoder",
         .probe    = chd_dec_pci_probe,
-        .remove   = __devexit_p(chd_dec_pci_remove),
+        .remove   = chd_dec_pci_remove,
         .id_table = chd_dec_pci_id_table,
 #ifdef CONFIG_PM
         .suspend  = chd_dec_pci_suspend,
diff --git a/drivers/staging/crystalhd/crystalhd_misc.c b/drivers/staging/crystalhd/crystalhd_misc.c
index b3a637814a16..a5f109c632dc 100644
--- a/drivers/staging/crystalhd/crystalhd_misc.c
+++ b/drivers/staging/crystalhd/crystalhd_misc.c
@@ -960,7 +960,7 @@ void crystalhd_destroy_dio_pool(struct crystalhd_adp *adp)
  * Create general purpose list element pool to hold pending,
  * and active requests.
  */
-int __devinit crystalhd_create_elem_pool(struct crystalhd_adp *adp,
+int crystalhd_create_elem_pool(struct crystalhd_adp *adp,
                 uint32_t pool_size)
 {
         uint32_t i;
diff --git a/drivers/staging/csr/Makefile b/drivers/staging/csr/Makefile
index ab626edc5ba4..dbd135a8b177 100644
--- a/drivers/staging/csr/Makefile
+++ b/drivers/staging/csr/Makefile
@@ -70,5 +70,4 @@ csr_helper-y :=	csr_time.o			\
                 csr_framework_ext.o             \
                 csr_wifi_serialize_primitive_types.o    \
                 csr_serialize_primitive_types.o \
-                csr_msgconv.o                   \
-                csr_panic.o
+                csr_msgconv.o
diff --git a/drivers/staging/csr/bh.c b/drivers/staging/csr/bh.c
index addee05a4516..1a1f5c79822a 100644
--- a/drivers/staging/csr/bh.c
+++ b/drivers/staging/csr/bh.c
@@ -228,20 +228,19 @@ handle_bh_error(unifi_priv_t *priv)
  *
  * ---------------------------------------------------------------------------
  */
-static int
-bh_thread_function(void *arg)
+static int bh_thread_function(void *arg)
 {
-    unifi_priv_t *priv = (unifi_priv_t*)arg;
-    CsrResult csrResult;
-    long ret;
-    u32 timeout, t;
-    struct uf_thread *this_thread;
+        unifi_priv_t *priv = (unifi_priv_t *)arg;
+        CsrResult csrResult;
+        long ret;
+        u32 timeout, t;
+        struct uf_thread *this_thread;
 
-    unifi_trace(priv, UDBG2, "bh_thread_function starting\n");
+        unifi_trace(priv, UDBG2, "bh_thread_function starting\n");
 
-    this_thread = &priv->bh_thread;
+        this_thread = &priv->bh_thread;
 
-    t = timeout = 0;
+        t = timeout = 0;
     while (!kthread_should_stop()) {
         /* wait until an error occurs, or we need to process something. */
         unifi_trace(priv, UDBG3, "bh_thread goes to sleep.\n");
diff --git a/drivers/staging/csr/csr_framework_ext.c b/drivers/staging/csr/csr_framework_ext.c
index f91a4bf4e68f..2aabb6c6b0af 100644
--- a/drivers/staging/csr/csr_framework_ext.c
+++ b/drivers/staging/csr/csr_framework_ext.c
@@ -9,7 +9,6 @@
 *****************************************************************************/
 
 #include <linux/kernel.h>
-#include <linux/version.h>
 #include <linux/kthread.h>
 #include <linux/module.h>
 #include <linux/freezer.h>
@@ -18,102 +17,6 @@
 #include <linux/bitops.h>
 
 #include "csr_framework_ext.h"
-#include "csr_panic.h"
-
-/*----------------------------------------------------------------------------*
- *  NAME
- *      CsrMutexCreate
- *
- *  DESCRIPTION
- *      Create a mutex and return a handle to the created mutex.
- *
- *  RETURNS
- *      Possible values:
- *          CSR_RESULT_SUCCESS           in case of success
- *          CSR_FE_RESULT_NO_MORE_MUTEXES   in case of out of mutex resources
- *          CSR_FE_RESULT_INVALID_POINTER   in case the mutexHandle pointer is invalid
- *
- *----------------------------------------------------------------------------*/
-CsrResult CsrMutexCreate(CsrMutexHandle *mutexHandle)
-{
-    if (mutexHandle == NULL)
-    {
-        return CSR_FE_RESULT_INVALID_POINTER;
-    }
-
-    sema_init(mutexHandle, 1);
-
-    return CSR_RESULT_SUCCESS;
-}
-
-/*----------------------------------------------------------------------------*
- *  NAME
- *      CsrMutexDestroy
- *
- *  DESCRIPTION
- *      Destroy the previously created mutex.
- *
- *  RETURNS
- *      void
- *
- *----------------------------------------------------------------------------*/
-void CsrMutexDestroy(CsrMutexHandle *mutexHandle)
-{
-}
-
-/*----------------------------------------------------------------------------*
- *  NAME
- *      CsrMutexLock
- *
- *  DESCRIPTION
- *      Lock the mutex refered to by the provided handle.
- *
- *  RETURNS
- *      Possible values:
- *          CSR_RESULT_SUCCESS           in case of success
- *          CSR_FE_RESULT_INVALID_HANDLE    in case the mutexHandle is invalid
- *
- *----------------------------------------------------------------------------*/
-CsrResult CsrMutexLock(CsrMutexHandle *mutexHandle)
-{
-    if (mutexHandle == NULL)
-    {
-        return CSR_FE_RESULT_INVALID_POINTER;
-    }
-
-    if (down_interruptible(mutexHandle))
-    {
-        CsrPanic(CSR_TECH_FW, CSR_PANIC_FW_UNEXPECTED_VALUE, "CsrMutexLock Failed");
-        return CSR_FE_RESULT_INVALID_POINTER;
-    }
-
-    return CSR_RESULT_SUCCESS;
-}
-
-/*----------------------------------------------------------------------------*
- *  NAME
- *      CsrMutexUnlock
- *
- *  DESCRIPTION
- *      Unlock the mutex refered to by the provided handle.
- *
- *  RETURNS
- *      Possible values:
- *          CSR_RESULT_SUCCESS           in case of success
- *          CSR_FE_RESULT_INVALID_HANDLE    in case the mutexHandle is invalid
- *
- *----------------------------------------------------------------------------*/
-CsrResult CsrMutexUnlock(CsrMutexHandle *mutexHandle)
-{
-    if (mutexHandle == NULL)
-    {
-        return CSR_FE_RESULT_INVALID_POINTER;
-    }
-
-    up(mutexHandle);
-
-    return CSR_RESULT_SUCCESS;
-}
 
 /*----------------------------------------------------------------------------*
  *  NAME
diff --git a/drivers/staging/csr/csr_framework_ext.h b/drivers/staging/csr/csr_framework_ext.h
index 66973e93a6bc..e8ae490c09d6 100644
--- a/drivers/staging/csr/csr_framework_ext.h
+++ b/drivers/staging/csr/csr_framework_ext.h
@@ -13,10 +13,6 @@
 #include "csr_result.h"
 #include "csr_framework_ext_types.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Result codes */
 #define CSR_FE_RESULT_NO_MORE_EVENTS    ((CsrResult) 0x0001)
 #define CSR_FE_RESULT_INVALID_POINTER   ((CsrResult) 0x0002)
@@ -34,215 +30,6 @@ extern "C" {
 
 #define CSR_EVENT_WAIT_INFINITE         ((u16) 0xFFFF)
 
-/*----------------------------------------------------------------------------*
- *  NAME
- *      CsrEventCreate
- *
- *  DESCRIPTION
- *      Creates an event and returns a handle to the created event.
- *
- *  RETURNS
- *      Possible values:
- *          CSR_RESULT_SUCCESS          in case of success
- *          CSR_FE_RESULT_NO_MORE_EVENTS   in case of out of event resources
- *          CSR_FE_RESULT_INVALID_POINTER  in case the eventHandle pointer is invalid
- *
- *----------------------------------------------------------------------------*/
-CsrResult CsrEventCreate(CsrEventHandle *eventHandle);
-
-/*----------------------------------------------------------------------------*
- *  NAME
- *      CsrEventWait
- *
- *  DESCRIPTION
- *      Wait fore one or more of the event bits to be set.
- *
- *  RETURNS
- *      Possible values:
- *          CSR_RESULT_SUCCESS              in case of success
- *          CSR_FE_RESULT_TIMEOUT              in case of timeout
- *          CSR_FE_RESULT_INVALID_HANDLE       in case the eventHandle is invalid
- *          CSR_FE_RESULT_INVALID_POINTER      in case the eventBits pointer is invalid
- *
- *----------------------------------------------------------------------------*/
-CsrResult CsrEventWait(CsrEventHandle *eventHandle, u16 timeoutInMs, u32 *eventBits);
-
-/*----------------------------------------------------------------------------*
- *  NAME
- *      CsrEventSet
- *
- *  DESCRIPTION
- *      Set an event.
- *
- *  RETURNS
- *      Possible values:
- *          CSR_RESULT_SUCCESS              in case of success
- *          CSR_FE_RESULT_INVALID_HANDLE       in case the eventHandle is invalid
- *
- *----------------------------------------------------------------------------*/
-CsrResult CsrEventSet(CsrEventHandle *eventHandle, u32 eventBits);
-
-/*----------------------------------------------------------------------------*
- *  NAME
- *      CsrEventDestroy
- *
- *  DESCRIPTION
- *      Destroy the event associated.
- *
- *  RETURNS
- *      void
- *
- *----------------------------------------------------------------------------*/
-void CsrEventDestroy(CsrEventHandle *eventHandle);
-
-/*----------------------------------------------------------------------------*
- *  NAME
- *      CsrMutexCreate
- *
- *  DESCRIPTION
- *      Create a mutex and return a handle to the created mutex.
- *
- *  RETURNS
- *      Possible values:
- *          CSR_RESULT_SUCCESS           in case of success
- *          CSR_FE_RESULT_NO_MORE_MUTEXES   in case of out of mutex resources
- *          CSR_FE_RESULT_INVALID_POINTER   in case the mutexHandle pointer is invalid
- *
- *----------------------------------------------------------------------------*/
-CsrResult CsrMutexCreate(CsrMutexHandle *mutexHandle);
-
-/*----------------------------------------------------------------------------*
- *  NAME
- *      CsrMutexLock
- *
- *  DESCRIPTION
- *      Lock the mutex refered to by the provided handle.
- *
- *  RETURNS
- *      Possible values:
- *          CSR_RESULT_SUCCESS           in case of success
- *          CSR_FE_RESULT_INVALID_HANDLE    in case the mutexHandle is invalid
- *
- *----------------------------------------------------------------------------*/
-CsrResult CsrMutexLock(CsrMutexHandle *mutexHandle);
-
-/*----------------------------------------------------------------------------*
- *  NAME
- *      CsrMutexUnlock
- *
- *  DESCRIPTION
- *      Unlock the mutex refered to by the provided handle.
- *
- *  RETURNS
- *      Possible values:
- *          CSR_RESULT_SUCCESS           in case of success
- *          CSR_FE_RESULT_INVALID_HANDLE    in case the mutexHandle is invalid
- *
- *----------------------------------------------------------------------------*/
-CsrResult CsrMutexUnlock(CsrMutexHandle *mutexHandle);
-
-/*----------------------------------------------------------------------------*
- *  NAME
- *      CsrMutexDestroy
- *
- *  DESCRIPTION
- *      Destroy the previously created mutex.
- *
- *  RETURNS
- *      void
- *
- *----------------------------------------------------------------------------*/
-void CsrMutexDestroy(CsrMutexHandle *mutexHandle);
-
-/*----------------------------------------------------------------------------*
- *  NAME
- *      CsrGlobalMutexLock
- *
- *  DESCRIPTION
- *      Lock the global mutex. The global mutex is a single pre-initialised
- *      shared mutex, spinlock or similar that does not need to be created prior
- *      to use. The limitation is that there is only one single lock shared
- *      between all code. Consequently, it must only be used very briefly to
- *      either protect simple one-time initialisation or to protect the creation
- *      of a dedicated mutex by calling CsrMutexCreate.
- *
- *----------------------------------------------------------------------------*/
-void CsrGlobalMutexLock(void);
-
-/*----------------------------------------------------------------------------*
- *  NAME
- *      CsrGlobalMutexUnlock
- *
- *  DESCRIPTION
- *      Unlock the global mutex.
- *
- *----------------------------------------------------------------------------*/
-void CsrGlobalMutexUnlock(void);
-
-/*----------------------------------------------------------------------------*
- *  NAME
- *      CsrThreadCreate
- *
- *  DESCRIPTION
- *      Create thread function and return a handle to the created thread.
- *
- *  RETURNS
- *      Possible values:
- *          CSR_RESULT_SUCCESS           in case of success
- *          CSR_FE_RESULT_NO_MORE_THREADS   in case of out of thread resources
- *          CSR_FE_RESULT_INVALID_POINTER   in case one of the supplied pointers is invalid
- *
- *----------------------------------------------------------------------------*/
-CsrResult CsrThreadCreate(void (*threadFunction)(void *pointer), void *pointer,
-    u32 stackSize, u16 priority,
-    const char *threadName, CsrThreadHandle *threadHandle);
-
-/*----------------------------------------------------------------------------*
- *  NAME
- *      CsrThreadGetHandle
- *
- *  DESCRIPTION
- *      Return thread handle of calling thread.
- *
- *  RETURNS
- *      Possible values:
- *          CSR_RESULT_SUCCESS             in case of success
- *          CSR_FE_RESULT_INVALID_POINTER  in case the threadHandle pointer is invalid
- *
- *----------------------------------------------------------------------------*/
-CsrResult CsrThreadGetHandle(CsrThreadHandle *threadHandle);
-
-/*----------------------------------------------------------------------------*
- *  NAME
- *      CsrThreadEqual
- *
- *  DESCRIPTION
- *      Compare thread handles
- *
- *  RETURNS
- *      Possible values:
- *          CSR_RESULT_SUCCESS             in case thread handles are identical
- *          CSR_FE_RESULT_INVALID_POINTER  in case either threadHandle pointer is invalid
- *          CSR_RESULT_FAILURE             otherwise
- *
- *----------------------------------------------------------------------------*/
-CsrResult CsrThreadEqual(CsrThreadHandle *threadHandle1, CsrThreadHandle *threadHandle2);
-
-/*----------------------------------------------------------------------------*
- *  NAME
- *      CsrThreadSleep
- *
- *  DESCRIPTION
- *      Sleep for a given period.
- *
- *  RETURNS
- *      void
- *
- *----------------------------------------------------------------------------*/
 void CsrThreadSleep(u16 sleepTimeInMs);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif
diff --git a/drivers/staging/csr/csr_framework_ext_types.h b/drivers/staging/csr/csr_framework_ext_types.h
index 57194ee911ea..575598cf69b2 100644
--- a/drivers/staging/csr/csr_framework_ext_types.h
+++ b/drivers/staging/csr/csr_framework_ext_types.h
@@ -2,11 +2,11 @@
 #define CSR_FRAMEWORK_EXT_TYPES_H__
 /*****************************************************************************
 
-            (c) Cambridge Silicon Radio Limited 2010
-            All rights reserved and confidential information of CSR
+        (c) Cambridge Silicon Radio Limited 2010
+        All rights reserved and confidential information of CSR
 
-            Refer to LICENSE.txt included with this source for details
-            on the license terms.
+        Refer to LICENSE.txt included with this source for details
+        on the license terms.
 
 *****************************************************************************/
 
@@ -17,47 +17,14 @@
 #include <pthread.h>
 #endif
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
 #ifdef __KERNEL__
 
-struct CsrThread
-{
-    struct task_struct *thread_task;
-    char                name[16];
-};
-
-struct CsrEvent
-{
-    /* wait_queue for waking the kernel thread */
-    wait_queue_head_t wakeup_q;
-    unsigned int      wakeup_flag;
-};
-
-typedef struct CsrEvent CsrEventHandle;
 typedef struct semaphore CsrMutexHandle;
-typedef struct CsrThread CsrThreadHandle;
 
 #else /* __KERNEL __ */
 
-struct CsrEvent
-{
-    pthread_cond_t  event;
-    pthread_mutex_t mutex;
-    u32       eventBits;
-};
-
-typedef struct CsrEvent CsrEventHandle;
 typedef pthread_mutex_t CsrMutexHandle;
-typedef pthread_t CsrThreadHandle;
 
 #endif /* __KERNEL__ */
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif
diff --git a/drivers/staging/csr/csr_lib.h b/drivers/staging/csr/csr_lib.h
deleted file mode 100644
index b1a57d5d06f9..000000000000
--- a/drivers/staging/csr/csr_lib.h
+++ /dev/null
@@ -1,188 +0,0 @@
-#ifndef CSR_LIB_H__
-#define CSR_LIB_H__
-/*****************************************************************************
-
-            (c) Cambridge Silicon Radio Limited 2010
-            All rights reserved and confidential information of CSR
-
-            Refer to LICENSE.txt included with this source for details
-            on the license terms.
-
-*****************************************************************************/
-
-#include "csr_prim_defs.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct
-{
-    CsrPrim type;
-} CsrEvent;
-
-/*----------------------------------------------------------------------------*
- *  CsrEvent_struct
- *
- *  DESCRIPTION
- *      Generic message creator.
- *      Allocates and fills in a message with the signature CsrEvent
- *
- *----------------------------------------------------------------------------*/
-CsrEvent *CsrEvent_struct(u16 primtype, u16 msgtype);
-
-typedef struct
-{
-    CsrPrim  type;
-    u8 value;
-} CsrEventCsrUint8;
-
-/*----------------------------------------------------------------------------*
- *  CsrEventCsrUint8_struct
- *
- *  DESCRIPTION
- *      Generic message creator.
- *      Allocates and fills in a message with the signature CsrEventCsrUint8
- *
- *----------------------------------------------------------------------------*/
-CsrEventCsrUint8 *CsrEventCsrUint8_struct(u16 primtype, u16 msgtype, u8 value);
-
-typedef struct
-{
-    CsrPrim   type;
-    u16 value;
-} CsrEventCsrUint16;
-
-/*----------------------------------------------------------------------------*
- *  CsrEventCsrUint16_struct
- *
- *  DESCRIPTION
- *      Generic message creator.
- *      Allocates and fills in a message with the signature CsrEventCsrUint16
- *
- *----------------------------------------------------------------------------*/
-CsrEventCsrUint16 *CsrEventCsrUint16_struct(u16 primtype, u16 msgtype, u16 value);
-
-typedef struct
-{
-    CsrPrim   type;
-    u16 value1;
-    u8  value2;
-} CsrEventCsrUint16CsrUint8;
-
-/*----------------------------------------------------------------------------*
- *  CsrEventCsrUint16CsrUint8_struct
- *
- *  DESCRIPTION
- *      Generic message creator.
- *      Allocates and fills in a message with the signature CsrEventCsrUint16CsrUint8
- *
- *----------------------------------------------------------------------------*/
-CsrEventCsrUint16CsrUint8 *CsrEventCsrUint16CsrUint8_struct(u16 primtype, u16 msgtype, u16 value1, u8 value2);
-
-typedef struct
-{
-    CsrPrim   type;
-    u16 value1;
-    u16 value2;
-} CsrEventCsrUint16CsrUint16;
-
-/*----------------------------------------------------------------------------*
- *  CsrEventCsrUint16CsrUint16_struct
- *
- *  DESCRIPTION
- *      Generic message creator.
- *      Allocates and fills in a message with the signature CsrEventCsrUint16CsrUint16
- *
- *----------------------------------------------------------------------------*/
-CsrEventCsrUint16CsrUint16 *CsrEventCsrUint16CsrUint16_struct(u16 primtype, u16 msgtype, u16 value1, u16 value2);
-
-typedef struct
-{
-    CsrPrim   type;
-    u16 value1;
-    u32 value2;
-} CsrEventCsrUint16CsrUint32;
-
-/*----------------------------------------------------------------------------*
- *  CsrEventCsrUint16_struct
- *
- *  DESCRIPTION
- *      Generic message creator.
- *      Allocates and fills in a message with the signature CsrEventCsrUint16
- *
- *----------------------------------------------------------------------------*/
-CsrEventCsrUint16CsrUint32 *CsrEventCsrUint16CsrUint32_struct(u16 primtype, u16 msgtype, u16 value1, u32 value2);
-
-typedef struct
-{
-    CsrPrim        type;
-    u16      value1;
-    char *value2;
-} CsrEventCsrUint16CsrCharString;
-
-/*----------------------------------------------------------------------------*
- *  CsrEventCsrUint16CsrCharString_struct
- *
- *  DESCRIPTION
- *      Generic message creator.
- *      Allocates and fills in a message with the signature CsrEventCsrUint16CsrCharString
- *
- *----------------------------------------------------------------------------*/
-CsrEventCsrUint16CsrCharString *CsrEventCsrUint16CsrCharString_struct(u16 primtype, u16 msgtype, u16 value1, char *value2);
-
-typedef struct
-{
-    CsrPrim   type;
-    u32 value;
-} CsrEventCsrUint32;
-
-/*----------------------------------------------------------------------------*
- *  CsrEventCsrUint32_struct
- *
- *  DESCRIPTION
- *      Generic message creator.
- *      Allocates and fills in a message with the signature CsrEventCsrUint32
- *
- *----------------------------------------------------------------------------*/
-CsrEventCsrUint32 *CsrEventCsrUint32_struct(u16 primtype, u16 msgtype, u32 value);
-
-typedef struct
-{
-    CsrPrim   type;
-    u32 value1;
-    u16 value2;
-} CsrEventCsrUint32CsrUint16;
-
-/*----------------------------------------------------------------------------*
- *  CsrEventCsrUint32CsrUint16_struct
- *
- *  DESCRIPTION
- *      Generic message creator.
- *      Allocates and fills in a message with the signature CsrEventCsrUint32CsrUint16
- *
- *----------------------------------------------------------------------------*/
-CsrEventCsrUint32CsrUint16 *CsrEventCsrUint32CsrUint16_struct(u16 primtype, u16 msgtype, u32 value1, u32 value2);
-
-typedef struct
-{
-    CsrPrim        type;
-    u32      value1;
-    char *value2;
-} CsrEventCsrUint32CsrCharString;
-
-/*----------------------------------------------------------------------------*
- *  CsrEventCsrUint32CsrCharString_struct
- *
- *  DESCRIPTION
- *      Generic message creator.
- *      Allocates and fills in a message with the signature CsrEventCsrUint32CsrCharString
- *
- *----------------------------------------------------------------------------*/
-CsrEventCsrUint32CsrCharString *CsrEventCsrUint32CsrCharString_struct(u16 primtype, u16 msgtype, u32 value1, char *value2);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* CSR_LIB_H__ */
diff --git a/drivers/staging/csr/csr_log.h b/drivers/staging/csr/csr_log.h
index b2808569f8de..5de5650767de 100644
--- a/drivers/staging/csr/csr_log.h
+++ b/drivers/staging/csr/csr_log.h
@@ -2,23 +2,18 @@
 #define CSR_LOG_H__
 /*****************************************************************************
 
-            (c) Cambridge Silicon Radio Limited 2010
-            All rights reserved and confidential information of CSR
+        (c) Cambridge Silicon Radio Limited 2010
+        All rights reserved and confidential information of CSR
 
-            Refer to LICENSE.txt included with this source for details
-            on the license terms.
+        Refer to LICENSE.txt included with this source for details
+        on the license terms.
 
 *****************************************************************************/
 
 #include "csr_sched.h"
-#include "csr_panic.h"
 #include "csr_prim_defs.h"
 #include "csr_msgconv.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /*
  * Log filtering
  */
@@ -77,34 +72,19 @@ u8 CsrLogTaskIsFiltered(CsrSchedQid taskId, CsrLogLevelTask level);
 /*
  * Logging stuff
  */
-#define CSR_LOG_STRINGIFY_REAL(a) #a
+#define CSR_LOG_STRINGIFY_REAL(a) (#a)
 #define CSR_LOG_STRINGIFY(a) CSR_LOG_STRINGIFY_REAL(a)
 
-#ifdef CSR_LOG_ASSERT_ENABLE
-#define CSR_LOG_ASSERT(cond)                        \
-    do {                                                \
-        if (!(cond))                                    \
-        {                                               \
-            char *panic_arg = "[" __FILE__ ":" CSR_LOG_STRINGIFY(__LINE__) "] - " CSR_LOG_STRINGIFY(cond); \
-            CsrPanic(CSR_TECH_FW, CSR_PANIC_FW_ASSERTION_FAIL, panic_arg); \
-        }                                               \
-    } while (0)
-#else
-#define CSR_LOG_ASSERT(cond)
-#endif
-
-typedef struct
-{
-    u16            primitiveType;
-    const char *primitiveName;
-    CsrMsgConvMsgEntry  *messageConv; /* Private - do not use */
+typedef struct {
+        u16            primitiveType;
+        const char *primitiveName;
+        CsrMsgConvMsgEntry  *messageConv; /* Private - do not use */
 } CsrLogPrimitiveInformation;
 
-typedef struct
-{
-    const char        *techVer;
-    u32                   primitiveInfoCount;
-    CsrLogPrimitiveInformation *primitiveInfo;
+typedef struct {
+        const char        *techVer;
+        u32                   primitiveInfoCount;
+        CsrLogPrimitiveInformation *primitiveInfo;
 } CsrLogTechInformation;
 
 /*---------------------------------*/
@@ -118,21 +98,19 @@ typedef u32 bitmask32_t;
 #ifdef CSR_LOG_INCLUDE_FILE_NAME_AND_LINE_NUMBER
 /* DEPRECATED - replaced by csr_log_text.h */
 #define CSR_LOG_TEXT(text) \
-    do { \
-        if (!CsrLogTaskIsFiltered(CsrSchedTaskQueueGet(), CSR_LOG_LEVEL_TASK_TEXT)) \
-        { \
-            CsrLogTaskText(text, __LINE__, __FILE__); \
-        } \
-    } while (0)
+        do { \
+                if (!CsrLogTaskIsFiltered(CsrSchedTaskQueueGet(), CSR_LOG_LEVEL_TASK_TEXT)) { \
+                        CsrLogTaskText(text, __LINE__, __FILE__); \
+                } \
+        } while (0)
 #else
 /* DEPRECATED - replaced by csr_log_text.h */
 #define CSR_LOG_TEXT(text) \
-    do { \
-        if (!CsrLogTaskIsFiltered(CsrSchedTaskQueueGet(), CSR_LOG_LEVEL_TASK_TEXT)) \
-        { \
-            CsrLogTaskText(text, 0, NULL); \
-        } \
-    } while (0)
+        do { \
+                if (!CsrLogTaskIsFiltered(CsrSchedTaskQueueGet(), CSR_LOG_LEVEL_TASK_TEXT)) { \
+                        CsrLogTaskText(text, 0, NULL); \
+                } \
+        } while (0)
 #endif
 #else
 #define CSR_LOG_TEXT(text)
@@ -140,8 +118,8 @@ typedef u32 bitmask32_t;
 
 /* DEPRECATED - replaced by csr_log_text.h */
 void CsrLogTaskText(const char *text,
-    u32 line,
-    const char *file);
+        u32 line,
+        const char *file);
 
 #define CSR_LOG_STATE_TRANSITION_MASK_FSM_NAME          (0x001)
 #define CSR_LOG_STATE_TRANSITION_MASK_NEXT_STATE        (0x002)
@@ -153,16 +131,16 @@ void CsrLogTaskText(const char *text,
 
 /* DEPRECATED - replaced by csr_log_text.h */
 void CsrLogStateTransition(bitmask16_t mask,
-    u32 identifier,
-    const char *fsm_name,
-    u32 prev_state,
-    const char *prev_state_str,
-    u32 in_event,
-    const char *in_event_str,
-    u32 next_state,
-    const char *next_state_str,
-    u32 line,
-    const char *file);
+        u32 identifier,
+        const char *fsm_name,
+        u32 prev_state,
+        const char *prev_state_str,
+        u32 in_event,
+        const char *in_event_str,
+        u32 next_state,
+        const char *next_state_str,
+        u32 line,
+        const char *file);
 
 /*---------------------------------*/
 /*  BSP logging */
@@ -183,67 +161,63 @@ void CsrLogDeactivate(CsrSchedQid tskid);
 #define SYNERGY_SERIALIZER_TYPE_SER     (0x001)
 
 void CsrLogMessagePut(u32 line,
-    const char *file,
-    CsrSchedQid src_task_id,
-    CsrSchedQid dst_taskid,
-    CsrSchedMsgId msg_id,
-    u16 prim_type,
-    const void *msg);
+        const char *file,
+        CsrSchedQid src_task_id,
+        CsrSchedQid dst_taskid,
+        CsrSchedMsgId msg_id,
+        u16 prim_type,
+        const void *msg);
 
 void CsrLogMessageGet(CsrSchedQid src_task_id,
-    CsrSchedQid dst_taskid,
-    u8 get_res,
-    CsrSchedMsgId msg_id,
-    u16 prim_type,
-    const void *msg);
+        CsrSchedQid dst_taskid,
+        u8 get_res,
+        CsrSchedMsgId msg_id,
+        u16 prim_type,
+        const void *msg);
 
 void CsrLogTimedEventIn(u32 line,
-    const char *file,
-    CsrSchedQid task_id,
-    CsrSchedTid tid,
-    CsrTime requested_delay,
-    u16 fniarg,
-    const void *fnvarg);
+        const char *file,
+        CsrSchedQid task_id,
+        CsrSchedTid tid,
+        u32 requested_delay,
+        u16 fniarg,
+        const void *fnvarg);
 
 void CsrLogTimedEventFire(CsrSchedQid task_id,
-    CsrSchedTid tid);
+        CsrSchedTid tid);
 
 void CsrLogTimedEventDone(CsrSchedQid task_id,
-    CsrSchedTid tid);
+        CsrSchedTid tid);
 
 void CsrLogTimedEventCancel(u32 line,
-    const char *file,
-    CsrSchedQid task_id,
-    CsrSchedTid tid,
-    u8 cancel_res);
+        const char *file,
+        CsrSchedQid task_id,
+        CsrSchedTid tid,
+        u8 cancel_res);
 
 void CsrLogBgintRegister(u8 thread_id,
-    CsrSchedBgint irq,
-    const char *callback,
-    const void *ptr);
+        CsrSchedBgint irq,
+        const char *callback,
+        const void *ptr);
 void CsrLogBgintUnregister(CsrSchedBgint irq);
 void CsrLogBgintSet(CsrSchedBgint irq);
 void CsrLogBgintServiceStart(CsrSchedBgint irq);
 void CsrLogBgintServiceDone(CsrSchedBgint irq);
 
 void CsrLogExceptionStateEvent(u16 prim_type,
-    CsrPrim msg_type,
-    u16 state,
-    u32 line,
-    const char *file);
+        CsrPrim msg_type,
+        u16 state,
+        u32 line,
+        const char *file);
 void CsrLogExceptionGeneral(u16 prim_type,
-    u16 state,
-    const char *text,
-    u32 line,
-    const char *file);
+        u16 state,
+        const char *text,
+        u32 line,
+        const char *file);
 void CsrLogExceptionWarning(u16 prim_type,
-    u16 state,
-    const char *text,
-    u32 line,
-    const char *file);
-
-#ifdef __cplusplus
-}
-#endif
+        u16 state,
+        const char *text,
+        u32 line,
+        const char *file);
 
 #endif
diff --git a/drivers/staging/csr/csr_log_configure.h b/drivers/staging/csr/csr_log_configure.h
index 8842e4bf4611..283647cf9702 100644
--- a/drivers/staging/csr/csr_log_configure.h
+++ b/drivers/staging/csr/csr_log_configure.h
@@ -2,45 +2,16 @@
 #define CSR_LOG_CONFIGURE_H__
 /*****************************************************************************
 
-            (c) Cambridge Silicon Radio Limited 2010
-            All rights reserved and confidential information of CSR
+  (c) Cambridge Silicon Radio Limited 2010
+  All rights reserved and confidential information of CSR
 
-            Refer to LICENSE.txt included with this source for details
-            on the license terms.
+  Refer to LICENSE.txt included with this source for details
+  on the license terms.
 
-*****************************************************************************/
+ *****************************************************************************/
 
 #include "csr_log.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*---------------------------------*/
-/* Log init/deinit                 */
-/*---------------------------------*/
-void CsrLogInit(u8 size);
-void CsrLogDeinit(void);
-
-/*---------------------------------*/
-/* Log Framework Tech info         */
-/*---------------------------------*/
-void CsrLogTechInfoRegister(void);
-
-/* Set the logging level for the environment outside the scheduler context */
-void CsrLogLevelEnvironmentSet(CsrLogLevelEnvironment environmentLogLevel);
-
-
-/* Set the logging level for all scheduler tasks */
-/* This function call takes precedence over all previous calls to CsrLogLevelTaskSetSpecific() */
-void CsrLogLevelTaskSetAll(CsrLogLevelTask tasksLogLevelMask);
-
-/* Set the logging level for a given Task */
-/* This function can be used as a complement to CsrLogLevelTaskSetAll() to add more _or_ less log from a given task than what is set
-generally with CsrLogLevelTaskSetAll(). */
-void CsrLogLevelTaskSetSpecific(CsrSchedQid taskId, CsrLogLevelTask taskLogLevelMask);
-
-
 /*--------------------------------------------*/
 /*  Filtering on log text warning levels      */
 /*--------------------------------------------*/
@@ -65,70 +36,4 @@ typedef u32 CsrLogLevelText;
  * taskId's in the range 0x0600xxxx to 0x06FFxxxx. And so on for other technologies. */
 typedef u32 CsrLogTextTaskId;
 
-/* Set the text logging level for all Tasks */
-/* This function call takes precedence over all previous calls to CsrLogLevelTextSetTask() and CsrLogLevelTextSetTaskSubOrigin() */
-void CsrLogLevelTextSetAll(CsrLogLevelText warningLevelMask);
-
-/* Set the text logging level for a given Task */
-/* This function call takes precedence over all previous calls to CsrLogLevelTextSetTaskSubOrigin(), but it can be used as a complement to
- * CsrLogLevelTextSetAll() to add more _or_ less log from a given task than what is set generally with CsrLogLevelTextSetAll(). */
-void CsrLogLevelTextSetTask(CsrLogTextTaskId taskId, CsrLogLevelText warningLevelMask);
-
-/* Set the text logging level for a given tasks subOrigin */
-/* This function can be used as a complement to CsrLogLevelTextSetAll() and CsrLogLevelTextSetTask() to add more _or_ less log from a given
- * subOrigin within a task than what is set generally with CsrLogLevelTextSetAll() _or_ CsrLogLevelTextSetTask(). */
-void CsrLogLevelTextSetTaskSubOrigin(CsrLogTextTaskId taskId, u16 subOrigin, CsrLogLevelText warningLevelMask);
-
-/*******************************************************************************
-
-    NAME
-        CsrLogLevelTextSet
-
-    DESCRIPTION
-        Set the text logging level for a given origin and optionally sub origin
-        by name. If either string is NULL or zero length, it is interpreted as
-        all origins and/or all sub origins respectively. If originName is NULL
-        or zero length, subOriginName is ignored.
-
-        Passing NULL or zero length strings in both originName and subOriginName
-        is equivalent to calling CsrLogLevelTextSetAll, and overrides all
-        previous filter configurations for all origins and sub origins.
-
-        Passing NULL or a zero length string in subOriginName overrides all
-        previous filter configurations for all sub origins of the specified
-        origin.
-
-        Note: the supplied strings may be accessed after the function returns
-        and must remain valid and constant until CsrLogDeinit is called.
-
-        Note: when specifying an origin (originName is not NULL and not zero
-        length), this function can only be used for origins that use the
-        csr_log_text_2.h interface for registration and logging. Filtering for
-        origins that use the legacy csr_log_text.h interface must be be
-        configured using the legacy filter configuration functions that accept
-        a CsrLogTextTaskId as origin specifier. However, when not specifying an
-        origin this function also affects origins that have been registered with
-        the legacy csr_log_text.h interface. Furthermore, using this function
-        and the legacy filter configuration functions on the same origin is not
-        allowed.
-
-    PARAMETERS
-        originName - a string containing the name of the origin. Can be NULL or
-            zero length to set the log level for all origins. In this case, the
-            subOriginName parameter will be ignored.
-        subOriginName - a string containing the name of the sub origin. Can be
-            NULL or zero length to set the log level for all sub origins of the
-            specified origin.
-        warningLevelMask - The desired log level for the specified origin(s) and
-            sub origin(s).
-
-*******************************************************************************/
-void CsrLogLevelTextSet(const char *originName,
-    const char *subOriginName,
-    CsrLogLevelText warningLevelMask);
-
-#ifdef __cplusplus
-}
-#endif
-
 #endif
diff --git a/drivers/staging/csr/csr_log_text.h b/drivers/staging/csr/csr_log_text.h
index 9fe6c90244c4..cfcf64aa6225 100644
--- a/drivers/staging/csr/csr_log_text.h
+++ b/drivers/staging/csr/csr_log_text.h
@@ -12,10 +12,6 @@
 
 #include "csr_log_configure.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 typedef struct CsrLogSubOrigin
 {
     u16            subOriginNumber;  /* Id of the given SubOrigin */
@@ -125,8 +121,4 @@ void CsrLogTextBufferDebug(CsrLogTextTaskId taskId, u16 subOrigin, size_t buffer
 #define CSR_LOG_TEXT_UNHANDLED_PRIMITIVE(origin, suborigin, primClass, primType)
 #endif
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif
diff --git a/drivers/staging/csr/csr_macro.h b/drivers/staging/csr/csr_macro.h
index 57cbfcb0619b..c47f1d91b6fa 100644
--- a/drivers/staging/csr/csr_macro.h
+++ b/drivers/staging/csr/csr_macro.h
@@ -12,26 +12,10 @@
 
 #include <linux/types.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #define FALSE   (0)
 #define TRUE    (1)
 
 /*------------------------------------------------------------------*/
-/* Bits - intended to operate on u32 values */
-/*------------------------------------------------------------------*/
-#define CSR_MASK_IS_SET(val, mask) (((val) & (mask)) == (mask))
-#define CSR_MASK_IS_UNSET(val, mask) ((((val) & (mask)) ^ mask) == (mask))
-#define CSR_MASK_SET(val, mask)    ((val) |= (mask))
-#define CSR_MASK_UNSET(val, mask)  ((val) = ((val) ^ (mask)) & (val)) /* Unsets the bits in val that are set in mask */
-#define CSR_BIT_IS_SET(val, bit)   ((u8) ((((val) & (1UL << (bit))) != 0)))
-#define CSR_BIT_SET(val, bit)      ((val) |= (1UL << (bit)))
-#define CSR_BIT_UNSET(val, bit)    ((val) &= ~(1UL << (bit)))
-#define CSR_BIT_TOGGLE(val, bit)   ((val) ^= (1UL << (bit)))
-
-/*------------------------------------------------------------------*/
 /* Endian conversion */
 /*------------------------------------------------------------------*/
 #define CSR_GET_UINT16_FROM_LITTLE_ENDIAN(ptr)        (((u16) ((u8 *) (ptr))[0]) | ((u16) ((u8 *) (ptr))[1]) << 8)
@@ -43,72 +27,13 @@ extern "C" {
     ((u8 *) (ptr))[1] = ((u8) (((uint) >> 8) & 0x000000FF)); \
     ((u8 *) (ptr))[2] = ((u8) (((uint) >> 16) & 0x000000FF)); \
     ((u8 *) (ptr))[3] = ((u8) (((uint) >> 24) & 0x000000FF))
-#define CSR_GET_UINT16_FROM_BIG_ENDIAN(ptr) (((u16) ((u8 *) (ptr))[1]) | ((u16) ((u8 *) (ptr))[0]) << 8)
-#define CSR_GET_UINT24_FROM_BIG_ENDIAN(ptr) (((u32) ((u8 *) (ptr))[2]) | \
-                                             ((u32) ((u8 *) (ptr))[1]) << 8 | ((u32) ((u8 *) (ptr))[0]) << 16)
-#define CSR_GET_UINT32_FROM_BIG_ENDIAN(ptr) (((u32) ((u8 *) (ptr))[3]) | ((u32) ((u8 *) (ptr))[2]) << 8 | \
-                                             ((u32) ((u8 *) (ptr))[1]) << 16 | ((u32) ((u8 *) (ptr))[0]) << 24)
-#define CSR_COPY_UINT16_TO_BIG_ENDIAN(uint, ptr)    ((u8 *) (ptr))[1] = ((u8) ((uint) & 0x00FF)); \
-    ((u8 *) (ptr))[0] = ((u8) ((uint) >> 8))
-#define CSR_COPY_UINT24_TO_BIG_ENDIAN(uint, ptr)    ((u8 *) (ptr))[2] = ((u8) ((uint) & 0x000000FF)); \
-    ((u8 *) (ptr))[1] = ((u8) (((uint) >> 8) & 0x000000FF)); \
-    ((u8 *) (ptr))[0] = ((u8) (((uint) >> 16) & 0x000000FF))
-#define CSR_COPY_UINT32_TO_BIG_ENDIAN(uint, ptr)    ((u8 *) (ptr))[3] = ((u8) ((uint) & 0x000000FF)); \
-    ((u8 *) (ptr))[2] = ((u8) (((uint) >> 8) & 0x000000FF)); \
-    ((u8 *) (ptr))[1] = ((u8) (((uint) >> 16) & 0x000000FF)); \
-    ((u8 *) (ptr))[0] = ((u8) (((uint) >> 24) & 0x000000FF))
-
-/*------------------------------------------------------------------*/
-/* XAP conversion macros */
-/*------------------------------------------------------------------*/
-
-#define CSR_LSB16(a) ((u8) ((a) & 0x00ff))
-#define CSR_MSB16(b) ((u8) ((b) >> 8))
-
-#define CSR_CONVERT_8_FROM_XAP(output, input) \
-    (output) = ((u8) (input));(input) += 2
-
-#define CSR_CONVERT_16_FROM_XAP(output, input) \
-    (output) = (u16) ((((u16) (input)[1]) << 8) | \
-                            ((u16) (input)[0]));(input) += 2
-
-#define CSR_CONVERT_32_FROM_XAP(output, input) \
-    (output) = (((u32) (input)[1]) << 24) | \
-               (((u32) (input)[0]) << 16) | \
-               (((u32) (input)[3]) << 8) | \
-               ((u32) (input)[2]);input += 4
-
-#define CSR_ADD_UINT8_TO_XAP(output, input) \
-    (output)[0] = (input);  \
-    (output)[1] = 0;(output) += 2
-
-#define CSR_ADD_UINT16_TO_XAP(output, input) \
-    (output)[0] = ((u8) ((input) & 0x00FF));  \
-    (output)[1] = ((u8) ((input) >> 8));(output) += 2
-
-#define CSR_ADD_UINT32_TO_XAP(output, input) \
-    (output)[0] = ((u8) (((input) >> 16) & 0x00FF)); \
-    (output)[1] = ((u8) ((input) >> 24)); \
-    (output)[2] = ((u8) ((input) & 0x00FF)); \
-    (output)[3] = ((u8) (((input) >> 8) & 0x00FF));(output) += 4
 
 /*------------------------------------------------------------------*/
 /* Misc */
 /*------------------------------------------------------------------*/
-#define CSRMAX(a, b)    (((a) > (b)) ? (a) : (b))
-#define CSRMIN(a, b)    (((a) < (b)) ? (a) : (b))
-
 /* Use this macro on unused local variables that cannot be removed (such as
    unused function parameters). This will quell warnings from certain compilers
    and static code analysis tools like Lint and Valgrind. */
 #define CSR_UNUSED(x) ((void) (x))
 
-#define CSR_TOUPPER(character)  (((character) >= 'a') && ((character) <= 'z') ? ((character) - 0x20) : (character))
-#define CSR_TOLOWER(character)  (((character) >= 'A') && ((character) <= 'Z') ? ((character) + 0x20) : (character))
-#define CSR_ARRAY_SIZE(x)       (sizeof(x) / sizeof(*(x)))
-
-#ifdef __cplusplus
-}
-#endif
-
 #endif
diff --git a/drivers/staging/csr/csr_msg_transport.h b/drivers/staging/csr/csr_msg_transport.h
index b0095b023817..8d88e7836567 100644
--- a/drivers/staging/csr/csr_msg_transport.h
+++ b/drivers/staging/csr/csr_msg_transport.h
@@ -10,16 +10,8 @@
 
 *****************************************************************************/
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #ifndef CsrMsgTransport
 #define CsrMsgTransport CsrSchedMessagePut
 #endif
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* CSR_MSG_TRANSPORT */
diff --git a/drivers/staging/csr/csr_msgconv.c b/drivers/staging/csr/csr_msgconv.c
index 0081a255e91c..db5e845e60f5 100644
--- a/drivers/staging/csr/csr_msgconv.c
+++ b/drivers/staging/csr/csr_msgconv.c
@@ -11,7 +11,6 @@
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/slab.h>
-#include "csr_panic.h"
 #include "csr_sched.h"
 #include "csr_msgconv.h"
 #include "csr_macro.h"
diff --git a/drivers/staging/csr/csr_msgconv.h b/drivers/staging/csr/csr_msgconv.h
index 09489f38e52d..7e4dd388ae37 100644
--- a/drivers/staging/csr/csr_msgconv.h
+++ b/drivers/staging/csr/csr_msgconv.h
@@ -15,10 +15,6 @@
 #include "csr_prim_defs.h"
 #include "csr_sched.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 typedef size_t (CsrMsgSizeofFunc)(void *msg);
 typedef u8 *(CsrMsgSerializeFunc)(u8 *buffer, size_t *length, void *msg);
 typedef void (CsrMsgFreeFunc)(void *msg);
@@ -79,9 +75,4 @@ void CsrUint32Des(u32 *value, u8 *buffer, size_t *offset);
 void CsrMemCpyDes(void *value, u8 *buffer, size_t *offset, size_t length);
 void CsrCharStringDes(char **value, u8 *buffer, size_t *offset);
 
-
-#ifdef __cplusplus
-}
-#endif
-
 #endif
diff --git a/drivers/staging/csr/csr_panic.c b/drivers/staging/csr/csr_panic.c
deleted file mode 100644
index 095f7fa3ae2c..000000000000
--- a/drivers/staging/csr/csr_panic.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/*****************************************************************************
-
-            (c) Cambridge Silicon Radio Limited 2010
-            All rights reserved and confidential information of CSR
-
-            Refer to LICENSE.txt included with this source for details
-            on the license terms.
-
-*****************************************************************************/
-
-#include <linux/kernel.h>
-#include <linux/module.h>
-
-#include "csr_panic.h"
-
-void CsrPanic(u8 tech, u16 reason, const char *p)
-{
-    BUG_ON(1);
-}
-EXPORT_SYMBOL_GPL(CsrPanic);
diff --git a/drivers/staging/csr/csr_panic.h b/drivers/staging/csr/csr_panic.h
deleted file mode 100644
index 37989fc15bbe..000000000000
--- a/drivers/staging/csr/csr_panic.h
+++ /dev/null
@@ -1,53 +0,0 @@
-#ifndef CSR_PANIC_H__
-#define CSR_PANIC_H__
-/*****************************************************************************
-
-            (c) Cambridge Silicon Radio Limited 2010
-            All rights reserved and confidential information of CSR
-
-            Refer to LICENSE.txt included with this source for details
-            on the license terms.
-
-*****************************************************************************/
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Synergy techonology ID definitions */
-#define CSR_TECH_FW     0
-#define CSR_TECH_BT     1
-#define CSR_TECH_WIFI   2
-#define CSR_TECH_GPS    3
-#define CSR_TECH_NFC    4
-
-/* Panic type ID definitions for technology type CSR_TECH_FW */
-#define CSR_PANIC_FW_UNEXPECTED_VALUE        0
-#define CSR_PANIC_FW_HEAP_EXHAUSTION         1
-#define CSR_PANIC_FW_INVALID_PFREE_POINTER   2
-#define CSR_PANIC_FW_EXCEPTION               3
-#define CSR_PANIC_FW_ASSERTION_FAIL          4
-#define CSR_PANIC_FW_NULL_TASK_HANDLER       5
-#define CSR_PANIC_FW_UNKNOWN_TASK            6
-#define CSR_PANIC_FW_QUEUE_ACCESS_VIOLATION  7
-#define CSR_PANIC_FW_TOO_MANY_MESSAGES       8
-#define CSR_PANIC_FW_TOO_MANY_TIMED_EVENTS   9
-#define CSR_PANIC_FW_ABCSP_SYNC_LOST        10
-#define CSR_PANIC_FW_OVERSIZE_ABCSP_PRIM    11
-#define CSR_PANIC_FW_H4_CORRUPTION          12
-#define CSR_PANIC_FW_H4_SYNC_LOST           13
-#define CSR_PANIC_FW_H4_RX_OVERRUN          14
-#define CSR_PANIC_FW_H4_TX_OVERRUN          15
-#define CSR_PANIC_FW_TM_BC_RESTART_FAIL     16
-#define CSR_PANIC_FW_TM_BC_START_FAIL       17
-#define CSR_PANIC_FW_TM_BC_BAD_STATE        18
-#define CSR_PANIC_FW_TM_BC_TRANSPORT_LOST   19
-
-/* Panic interface used by technologies */
-/* DEPRECATED - replaced by csr_log_text.h */
-void CsrPanic(u8 tech, u16 reason, const char *p);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* CSR_PANIC_H__ */
diff --git a/drivers/staging/csr/csr_prim_defs.h b/drivers/staging/csr/csr_prim_defs.h
index 6a7f73dbb706..81a1eaac30d9 100644
--- a/drivers/staging/csr/csr_prim_defs.h
+++ b/drivers/staging/csr/csr_prim_defs.h
@@ -9,9 +9,6 @@
             on the license terms.
 
 *****************************************************************************/
-#ifdef __cplusplus
-extern "C" {
-#endif
 
 /************************************************************************************
  * Segmentation of primitives in upstream and downstream segment
@@ -55,8 +52,4 @@ typedef u16 CsrPrim;
 
 #define CSR_ENV_PRIM                        ((u16) (0x00FF | CSR_SYNERGY_EVENT_CLASS_MISC_BASE))
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* CSR_PRIM_DEFS_H__ */
diff --git a/drivers/staging/csr/csr_result.h b/drivers/staging/csr/csr_result.h
index c7c36d6b59ef..cbb607d943c7 100644
--- a/drivers/staging/csr/csr_result.h
+++ b/drivers/staging/csr/csr_result.h
@@ -10,16 +10,8 @@
 
 *****************************************************************************/
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 typedef u16 CsrResult;
 #define CSR_RESULT_SUCCESS  ((CsrResult) 0x0000)
 #define CSR_RESULT_FAILURE  ((CsrResult) 0xFFFF)
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif
diff --git a/drivers/staging/csr/csr_sched.h b/drivers/staging/csr/csr_sched.h
index cc1b8bf66079..c7d672c59f5b 100644
--- a/drivers/staging/csr/csr_sched.h
+++ b/drivers/staging/csr/csr_sched.h
@@ -12,10 +12,6 @@
 #include <linux/types.h>
 #include "csr_time.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* An identifier issued by the scheduler. */
 typedef u32 CsrSchedIdentifier;
 
@@ -24,7 +20,6 @@ typedef u16 CsrSchedTaskId;
 
 /* A queue identifier */
 typedef u16 CsrSchedQid;
-#define CSR_SCHED_QID_INVALID     ((CsrSchedQid) 0xFFFF)
 
 /* A message identifier */
 typedef CsrSchedIdentifier CsrSchedMsgId;
@@ -33,14 +28,11 @@ typedef CsrSchedIdentifier CsrSchedMsgId;
 typedef CsrSchedIdentifier CsrSchedTid;
 #define CSR_SCHED_TID_INVALID     ((CsrSchedTid) 0)
 
-/* Scheduler entry functions share this structure */
-typedef void (*schedEntryFunction_t)(void **inst);
-
 /* Time constants. */
-#define CSR_SCHED_TIME_MAX                ((CsrTime) 0xFFFFFFFF)
-#define CSR_SCHED_MILLISECOND             ((CsrTime) (1000))
-#define CSR_SCHED_SECOND                  ((CsrTime) (1000 * CSR_SCHED_MILLISECOND))
-#define CSR_SCHED_MINUTE                  ((CsrTime) (60 * CSR_SCHED_SECOND))
+#define CSR_SCHED_TIME_MAX                (0xFFFFFFFF)
+#define CSR_SCHED_MILLISECOND             (1000)
+#define CSR_SCHED_SECOND                  (1000 * CSR_SCHED_MILLISECOND)
+#define CSR_SCHED_MINUTE                  (60 * CSR_SCHED_SECOND)
 
 /* Queue and primitive that identifies the environment */
 #define CSR_SCHED_TASK_ID        0xFFFF
@@ -53,60 +45,6 @@ typedef void (*schedEntryFunction_t)(void **inst);
 typedef u16 CsrSchedBgint;
 #define CSR_SCHED_BGINT_INVALID ((CsrSchedBgint) 0xFFFF)
 
-typedef void (*CsrSchedBgintHandler)(void *);
-
-/*----------------------------------------------------------------------------*
- *  NAME
- *      CsrSchedBgintReg
- *
- *  DESCRIPTION
- *      Register a background interrupt handler function with the scheduler.
- *        When CsrSchedBgint() is called from the foreground (e.g. an interrupt
- *        routine) the registered function is called.
- *
- *        If "cb" is null then the interrupt is effectively disabled. If a
- *        no bgints are available, CSR_SCHED_BGINT_INVALID is returned, otherwise
- *        a CsrSchedBgint value is returned to be used in subsequent calls to
- *        CsrSchedBgint().  id is a possibly NULL identifier used for logging
- *        purposes only.
- *
- *  RETURNS
- *      CsrSchedBgint -- CSR_SCHED_BGINT_INVALID denotes failure to obtain a CsrSchedBgintSet.
- *
- *----------------------------------------------------------------------------*/
-CsrSchedBgint CsrSchedBgintReg(CsrSchedBgintHandler cb,
-    void *context,
-    const char *id);
-
-/*----------------------------------------------------------------------------*
- *  NAME
- *      CsrSchedBgintUnreg
- *
- *  DESCRIPTION
- *      Unregister a background interrupt handler function.
- *
- *      ``irq'' is a background interrupt handle previously obtained
- *      from a call to CsrSchedBgintReg().
- *
- *  RETURNS
- *      void.
- *
- *----------------------------------------------------------------------------*/
-void CsrSchedBgintUnreg(CsrSchedBgint bgint);
-
-/*----------------------------------------------------------------------------*
- *  NAME
- *      CsrSchedBgintSet
- *
- *  DESCRIPTION
- *      Set background interrupt.
- *
- *  RETURNS
- *      void.
- *
- *----------------------------------------------------------------------------*/
-void CsrSchedBgintSet(CsrSchedBgint bgint);
-
 /*----------------------------------------------------------------------------*
  *  NAME
  *      CsrSchedMessagePut
@@ -144,149 +82,4 @@ void CsrSchedMessagePut(CsrSchedQid q,
     void *mv);
 #endif
 
-/*----------------------------------------------------------------------------*
- *  NAME
- *      CsrSchedMessageBroadcast
- *
- *  DESCRIPTION
- *      Sends a message to all tasks.
- *
- *      The user must supply a "factory function" that is called once
- *      for every task that exists. The "factory function", msg_build_func,
- *      must allocate and initialise the message and set the msg_build_ptr
- *      to point to the message when done.
- *
- *  NOTE
- *      N/A
- *
- *  RETURNS
- *      void
- *
- *----------------------------------------------------------------------------*/
-#if defined(CSR_LOG_ENABLE) && defined(CSR_LOG_INCLUDE_FILE_NAME_AND_LINE_NUMBER)
-void CsrSchedMessageBroadcastStringLog(u16 mi,
-    void *(*msg_build_func)(void *),
-    void *msg_build_ptr,
-    u32 line,
-    const char *file);
-#define CsrSchedMessageBroadcast(mi, fn, ptr) CsrSchedMessageBroadcastStringLog((mi), (fn), (ptr), __LINE__, __FILE__)
-#else
-void CsrSchedMessageBroadcast(u16 mi,
-    void *(*msg_build_func)(void *),
-    void *msg_build_ptr);
-#endif
-
-/*----------------------------------------------------------------------------*
- *  NAME
- *      CsrSchedMessageGet
- *
- *  DESCRIPTION
- *      Obtains a message from the message queue belonging to the calling task.
- *      The message consists of one or both of a u16 and a void *.
- *
- *  RETURNS
- *      u8 - TRUE if a message has been obtained from the queue, else FALSE.
- *      If a message is taken from the queue, then "*pmi" and "*pmv" are set to
- *      the "mi" and "mv" passed to CsrSchedMessagePut() respectively.
- *
- *      "pmi" and "pmv" can be null, in which case the corresponding value from
- *      them message is discarded.
- *
- *----------------------------------------------------------------------------*/
-u8 CsrSchedMessageGet(u16 *pmi, void **pmv);
-
-/*----------------------------------------------------------------------------*
- *  NAME
- *      CsrSchedTimerSet
- *
- *  DESCRIPTION
- *      Causes the void function "fn" to be called with the arguments
- *      "fniarg" and "fnvarg" after "delay" has elapsed.
- *
- *      "delay" must be less than half the range of a CsrTime.
- *
- *      CsrSchedTimerSet() does nothing with "fniarg" and "fnvarg" except
- *      deliver them via a call to "fn()".   (Unless CsrSchedTimerCancel()
- *      is used to prevent delivery.)
- *
- *  NOTE
- *      The function will be called at or after "delay"; the actual delay will
- *      depend on the timing behaviour of the scheduler's tasks.
- *
- *  RETURNS
- *      CsrSchedTid - A timed event identifier, can be used in CsrSchedTimerCancel().
- *
- *----------------------------------------------------------------------------*/
-#if defined(CSR_LOG_ENABLE) && defined(CSR_LOG_INCLUDE_FILE_NAME_AND_LINE_NUMBER)
-CsrSchedTid CsrSchedTimerSetStringLog(CsrTime delay,
-    void (*fn)(u16 mi, void *mv),
-    u16 fniarg,
-    void *fnvarg,
-    u32 line,
-    const char *file);
-#define CsrSchedTimerSet(d, fn, fni, fnv) CsrSchedTimerSetStringLog((d), (fn), (fni), (fnv), __LINE__, __FILE__)
-#else
-CsrSchedTid CsrSchedTimerSet(CsrTime delay,
-    void (*fn)(u16 mi, void *mv),
-    u16 fniarg,
-    void *fnvarg);
-#endif
-
-/*----------------------------------------------------------------------------*
- *  NAME
- *      CsrSchedTimerCancel
- *
- *  DESCRIPTION
- *      Attempts to prevent the timed event with identifier "eventid" from
- *      occurring.
- *
- *  RETURNS
- *      u8 - TRUE if cancelled, FALSE if the event has already occurred.
- *
- *----------------------------------------------------------------------------*/
-#if defined(CSR_LOG_ENABLE) && defined(CSR_LOG_INCLUDE_FILE_NAME_AND_LINE_NUMBER)
-u8 CsrSchedTimerCancelStringLog(CsrSchedTid eventid,
-    u16 *pmi,
-    void **pmv,
-    u32 line,
-    const char *file);
-#define CsrSchedTimerCancel(e, pmi, pmv) CsrSchedTimerCancelStringLog((e), (pmi), (pmv), __LINE__, __FILE__)
-#else
-u8 CsrSchedTimerCancel(CsrSchedTid eventid,
-    u16 *pmi,
-    void **pmv);
-#endif
-
-/*----------------------------------------------------------------------------*
- *  NAME
- *      CsrSchedTaskQueueGet
- *
- *  DESCRIPTION
- *      Return the queue identifier for the currently running queue
- *
- *  RETURNS
- *      CsrSchedQid - The current task queue identifier, or 0xFFFF if not available.
- *
- *----------------------------------------------------------------------------*/
-CsrSchedQid CsrSchedTaskQueueGet(void);
-
-
-/*----------------------------------------------------------------------------*
- *  NAME
- *      CsrSchedTaskQueueGet
- *
- *  DESCRIPTION
- *      Return the queue identifier for the currently running queue
- *
- *  RETURNS
- *      char - The current task queue identifier, or 0xFFFF if not available.
- *
- *----------------------------------------------------------------------------*/
-char* CsrSchedTaskNameGet(CsrSchedQid );
-
-
-#ifdef __cplusplus
-}
-#endif
-
 #endif
diff --git a/drivers/staging/csr/csr_sdio.h b/drivers/staging/csr/csr_sdio.h
index f0cda84f6a00..624a53fa1d7e 100644
--- a/drivers/staging/csr/csr_sdio.h
+++ b/drivers/staging/csr/csr_sdio.h
@@ -12,10 +12,6 @@
 
 #include "csr_result.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Result Codes */
 #define CSR_SDIO_RESULT_INVALID_VALUE   ((CsrResult) 1) /* Invalid argument value */
 #define CSR_SDIO_RESULT_NO_DEVICE       ((CsrResult) 2) /* The specified device is no longer present */
@@ -724,8 +720,4 @@ CsrResult CsrSdioHardReset(CsrSdioFunction *function);
 void CsrSdioFunctionActive(CsrSdioFunction *function);
 void CsrSdioFunctionIdle(CsrSdioFunction *function);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif
diff --git a/drivers/staging/csr/csr_serialize_primitive_types.c b/drivers/staging/csr/csr_serialize_primitive_types.c
index bf5e4ab9f959..9713b9afef64 100644
--- a/drivers/staging/csr/csr_serialize_primitive_types.c
+++ b/drivers/staging/csr/csr_serialize_primitive_types.c
@@ -13,7 +13,6 @@
 #include "csr_prim_defs.h"
 #include "csr_msgconv.h"
 #include "csr_macro.h"
-#include "csr_lib.h"
 
 void CsrUint8Des(u8 *value, u8 *buffer, size_t *offset)
 {
diff --git a/drivers/staging/csr/csr_time.c b/drivers/staging/csr/csr_time.c
index 7b597f7622a2..f3f4a9c9c67a 100644
--- a/drivers/staging/csr/csr_time.c
+++ b/drivers/staging/csr/csr_time.c
@@ -9,25 +9,24 @@
 *****************************************************************************/
 
 #include <linux/kernel.h>
-#include <linux/version.h>
 #include <linux/time.h>
 #include <linux/module.h>
 
 #include "csr_time.h"
 
-CsrTime CsrTimeGet(CsrTime *high)
+u32 CsrTimeGet(u32 *high)
 {
         struct timespec ts;
         u64 time;
-        CsrTime low;
+        u32 low;
 
         ts = current_kernel_time();
         time = (u64) ts.tv_sec * 1000000 + ts.tv_nsec / 1000;
 
         if (high != NULL)
-                *high = (CsrTime) ((time >> 32) & 0xFFFFFFFF);
+                *high = (u32) ((time >> 32) & 0xFFFFFFFF);
 
-        low = (CsrTime) (time & 0xFFFFFFFF);
+        low = (u32) (time & 0xFFFFFFFF);
 
         return low;
 }
diff --git a/drivers/staging/csr/csr_time.h b/drivers/staging/csr/csr_time.h
index 2a45f3e4024d..fc29e8e5e478 100644
--- a/drivers/staging/csr/csr_time.h
+++ b/drivers/staging/csr/csr_time.h
@@ -2,77 +2,43 @@
 #define CSR_TIME_H__
 /*****************************************************************************
 
-            (c) Cambridge Silicon Radio Limited 2010
-            All rights reserved and confidential information of CSR
+(c) Cambridge Silicon Radio Limited 2010
+All rights reserved and confidential information of CSR
 
-            Refer to LICENSE.txt included with this source for details
-            on the license terms.
+Refer to LICENSE.txt included with this source for details
+on the license terms.
 
 *****************************************************************************/
 
 #include <linux/types.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*******************************************************************************
-
-    NAME
-        CsrTime
-
-    DESCRIPTION
-        Type to hold a value describing the current system time, which is a
-        measure of time elapsed since some arbitrarily defined fixed time
-        reference, usually associated with system startup.
-
-*******************************************************************************/
-typedef u32 CsrTime;
-
-
 /*******************************************************************************
 
-    NAME
-        CsrTimeUtc
+NAME
+        CsrTimeGet
 
-    DESCRIPTION
-        Type to hold a value describing a UTC wallclock time expressed in
-        seconds and milliseconds elapsed since midnight January 1st 1970.
+DESCRIPTION
+        Returns the current system time in a low and a high part. The low part
+        is expressed in microseconds. The high part is incremented when the low
+        part wraps to provide an extended range.
 
-*******************************************************************************/
-typedef struct
-{
-    u32 sec;
-    u16 msec;
-} CsrTimeUtc;
-
-
-/*******************************************************************************
-
-    NAME
-        CsrTimeGet
+        The caller may provide a NULL pointer as the high parameter.
+        In this case the function just returns the low part and ignores the
+        high parameter.
 
-    DESCRIPTION
-        Returns the current system time in a low and a high part. The low part
-        is expressed in microseconds. The high part is incremented when the low
-        part wraps to provide an extended range.
+        Although the time is expressed in microseconds the actual resolution is
+        platform dependent and can be less. It is recommended that the
+        resolution is at least 10 milliseconds.
 
-        The caller may provide a NULL pointer as the high parameter. In this case
-        the function just returns the low part and ignores the high parameter.
+PARAMETERS
+        high - Pointer to variable that will receive the high part of the
+               current system time. Passing NULL is valid.
 
-        Although the time is expressed in microseconds the actual resolution is
-        platform dependent and can be less. It is recommended that the
-        resolution is at least 10 milliseconds.
-
-    PARAMETERS
-        high - Pointer to variable that will receive the high part of the
-               current system time. Passing NULL is valid.
-
-    RETURNS
-        Low part of current system time in microseconds.
+RETURNS
+        Low part of current system time in microseconds.
 
 *******************************************************************************/
-CsrTime CsrTimeGet(CsrTime *high);
+u32 CsrTimeGet(u32 *high);
 
 
 /*------------------------------------------------------------------*/
@@ -107,8 +73,4 @@ CsrTime CsrTimeGet(CsrTime *high);
  *----------------------------------------------------------------------------*/
 #define CsrTimeSub(t1, t2)    ((s32) (t1) - (s32) (t2))
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif
diff --git a/drivers/staging/csr/csr_wifi_common.h b/drivers/staging/csr/csr_wifi_common.h
index cc41a94b8f25..efc43a525a3d 100644
--- a/drivers/staging/csr/csr_wifi_common.h
+++ b/drivers/staging/csr/csr_wifi_common.h
@@ -14,10 +14,6 @@
 #include <linux/types.h>
 #include "csr_result.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* MAC address */
 typedef struct
 {
@@ -101,9 +97,5 @@ typedef struct
 
 #define CSR_WIFI_VERSION        "5.1.0.0"
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif
 
diff --git a/drivers/staging/csr/csr_wifi_fsm.h b/drivers/staging/csr/csr_wifi_fsm.h
index 073e2f8b5532..fde1508c1eae 100644
--- a/drivers/staging/csr/csr_wifi_fsm.h
+++ b/drivers/staging/csr/csr_wifi_fsm.h
@@ -11,10 +11,6 @@
 #ifndef CSR_WIFI_FSM_H
 #define CSR_WIFI_FSM_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include "csr_prim_defs.h"
 #include "csr_log_text.h"
 #include "csr_wifi_fsm_event.h"
@@ -240,9 +236,5 @@ extern u8 CsrWifiFsmHasEvents(CsrWifiFsmContext *context);
  */
 extern void CsrWifiFsmInstallWakeupCallback(CsrWifiFsmContext *context, CsrWifiFsmExternalWakupCallbackPtr callback);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* CSR_WIFI_FSM_H */
 
diff --git a/drivers/staging/csr/csr_wifi_fsm_event.h b/drivers/staging/csr/csr_wifi_fsm_event.h
index 57a5cafd40bd..0690ca955ef5 100644
--- a/drivers/staging/csr/csr_wifi_fsm_event.h
+++ b/drivers/staging/csr/csr_wifi_fsm_event.h
@@ -11,10 +11,6 @@
 #ifndef CSR_WIFI_FSM_EVENT_H
 #define CSR_WIFI_FSM_EVENT_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include "csr_prim_defs.h"
 #include "csr_sched.h"
 
@@ -42,9 +38,5 @@ typedef struct CsrWifiFsmEvent
     struct CsrWifiFsmEvent *next;
 } CsrWifiFsmEvent;
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* CSR_WIFI_FSM_EVENT_H */
 
diff --git a/drivers/staging/csr/csr_wifi_fsm_types.h b/drivers/staging/csr/csr_wifi_fsm_types.h
index 26752bf316e0..d21c60a81fcf 100644
--- a/drivers/staging/csr/csr_wifi_fsm_types.h
+++ b/drivers/staging/csr/csr_wifi_fsm_types.h
@@ -11,13 +11,8 @@
 #ifndef CSR_WIFI_FSM_TYPES_H
 #define CSR_WIFI_FSM_TYPES_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <linux/types.h>
 #include "csr_macro.h"
-#include "csr_panic.h"
 #include "csr_sched.h"
 
 #ifdef CSR_WIFI_FSM_MUTEX_ENABLE
@@ -432,9 +427,4 @@ struct CsrWifiFsmContext
 #endif
 };
 
-
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* CSR_WIFI_FSM_TYPES_H */
diff --git a/drivers/staging/csr/csr_wifi_hip_card.h b/drivers/staging/csr/csr_wifi_hip_card.h
index 9caf88c7887d..bd47f606e0de 100644
--- a/drivers/staging/csr/csr_wifi_hip_card.h
+++ b/drivers/staging/csr/csr_wifi_hip_card.h
@@ -21,10 +21,6 @@
 #ifndef __CARD_H__
 #define __CARD_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include "csr_wifi_hip_card_sdio.h"
 #include "csr_wifi_hip_signals.h"
 #include "csr_wifi_hip_unifi_udi.h"
@@ -115,9 +111,4 @@ void unifi_debug_string_to_buf(const char *str);
 void unifi_debug_hex_to_buf(const char *buff, u16 length);
 #endif
 
-
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* __CARD_H__ */
diff --git a/drivers/staging/csr/csr_wifi_hip_card_sdio.c b/drivers/staging/csr/csr_wifi_hip_card_sdio.c
index cf148a0fec6a..25cabf3234c2 100644
--- a/drivers/staging/csr/csr_wifi_hip_card_sdio.c
+++ b/drivers/staging/csr/csr_wifi_hip_card_sdio.c
@@ -70,8 +70,6 @@ card_t* unifi_alloc_card(CsrSdioFunction *sdio, void *ospriv)
     card_t *card;
     u32 i;
 
-    func_enter();
-
 
     card = kzalloc(sizeof(card_t), GFP_KERNEL);
     if (card == NULL)
@@ -148,7 +146,6 @@ card_t* unifi_alloc_card(CsrSdioFunction *sdio, void *ospriv)
         }
     }
 #endif
-    func_exit();
     return card;
 } /* unifi_alloc_card() */
 
@@ -171,35 +168,29 @@ CsrResult unifi_init_card(card_t *card, s32 led_mask)
 {
     CsrResult r;
 
-    func_enter();
 
     if (card == NULL)
     {
-        func_exit_r(CSR_WIFI_HIP_RESULT_INVALID_VALUE);
         return CSR_WIFI_HIP_RESULT_INVALID_VALUE;
     }
 
     r = unifi_init(card);
     if (r != CSR_RESULT_SUCCESS)
     {
-        func_exit_r(r);
         return r;
     }
 
     r = unifi_hip_init(card);
     if (r == CSR_WIFI_HIP_RESULT_NO_DEVICE)
     {
-        func_exit_r(r);
         return r;
     }
     if (r != CSR_RESULT_SUCCESS)
     {
         unifi_error(card->ospriv, "Failed to start host protocol.\n");
-        func_exit_r(r);
         return r;
     }
 
-    func_exit();
     return CSR_RESULT_SUCCESS;
 }
 
@@ -223,11 +214,8 @@ CsrResult unifi_init(card_t *card)
     CsrResult r;
     CsrResult csrResult;
 
-    func_enter();
-
     if (card == NULL)
     {
-        func_exit_r(CSR_WIFI_HIP_RESULT_INVALID_VALUE);
         return CSR_WIFI_HIP_RESULT_INVALID_VALUE;
     }
 
@@ -250,7 +238,6 @@ CsrResult unifi_init(card_t *card)
     if (csrResult != CSR_RESULT_SUCCESS)
     {
         r = ConvertCsrSdioToCsrHipResult(card, csrResult);
-        func_exit_r(r);
         return r;
     }
     card->sdio_clock_speed = UNIFI_SDIO_CLOCK_SAFE_HZ;
@@ -268,7 +255,6 @@ CsrResult unifi_init(card_t *card)
     if (r != CSR_RESULT_SUCCESS)
     {
         unifi_error(card->ospriv, "Failed to reset UniFi\n");
-        func_exit_r(r);
         return r;
     }
 
@@ -278,7 +264,6 @@ CsrResult unifi_init(card_t *card)
     if (r != CSR_RESULT_SUCCESS)
     {
         unifi_error(card->ospriv, "Failed to set power save mode\n");
-        func_exit_r(r);
         return r;
     }
 
@@ -298,7 +283,6 @@ CsrResult unifi_init(card_t *card)
     if (r != CSR_RESULT_SUCCESS)
     {
         unifi_error(card->ospriv, "Failed to write SHARED_DMEM_PAGE\n");
-        func_exit_r(r);
         return r;
     }
     r = unifi_write_direct16(card, ChipHelper_HOST_WINDOW2_PAGE(card->helper) * 2, 0);
@@ -309,7 +293,6 @@ CsrResult unifi_init(card_t *card)
     if (r != CSR_RESULT_SUCCESS)
     {
         unifi_error(card->ospriv, "Failed to write PROG_MEM2_PAGE\n");
-        func_exit_r(r);
         return r;
     }
 
@@ -338,7 +321,6 @@ CsrResult unifi_init(card_t *card)
         unifi_error(card->ospriv, "Probe for Flash failed\n");
     }
 
-    func_exit_r(r);
     return r;
 } /* unifi_init() */
 
@@ -363,11 +345,8 @@ CsrResult unifi_download(card_t *card, s32 led_mask)
     CsrResult r;
     void *dlpriv;
 
-    func_enter();
-
     if (card == NULL)
     {
-        func_exit_r(CSR_WIFI_HIP_RESULT_INVALID_VALUE);
         return CSR_WIFI_HIP_RESULT_INVALID_VALUE;
     }
 
@@ -380,7 +359,6 @@ CsrResult unifi_download(card_t *card, s32 led_mask)
     dlpriv = unifi_dl_fw_read_start(card, UNIFI_FW_STA);
     if (dlpriv == NULL)
     {
-        func_exit_r(CSR_WIFI_HIP_RESULT_NOT_FOUND);
         return CSR_WIFI_HIP_RESULT_NOT_FOUND;
     }
 
@@ -389,15 +367,12 @@ CsrResult unifi_download(card_t *card, s32 led_mask)
     if (r != CSR_RESULT_SUCCESS)
     {
         unifi_error(card->ospriv, "Failed to download firmware\n");
-        func_exit_r(r);
         return r;
     }
 
     /* Free the firmware file information. */
     unifi_fw_read_stop(card->ospriv, dlpriv);
 
-    func_exit();
-
     return CSR_RESULT_SUCCESS;
 } /* unifi_download() */
 
@@ -425,8 +400,6 @@ static CsrResult unifi_hip_init(card_t *card)
     CsrResult r;
     CsrResult csrResult;
 
-    func_enter();
-
     r = card_hw_init(card);
     if (r == CSR_WIFI_HIP_RESULT_NO_DEVICE)
     {
@@ -435,7 +408,6 @@ static CsrResult unifi_hip_init(card_t *card)
     if (r != CSR_RESULT_SUCCESS)
     {
         unifi_error(card->ospriv, "Failed to establish communication with UniFi\n");
-        func_exit_r(r);
         return r;
     }
 #ifdef CSR_PRE_ALLOC_NET_DATA
@@ -455,7 +427,6 @@ static CsrResult unifi_hip_init(card_t *card)
     if (r != CSR_RESULT_SUCCESS)
     {
         unifi_error(card->ospriv, "Init slots failed: %d\n", r);
-        func_exit_r(r);
         return r;
     }
 
@@ -464,7 +435,6 @@ static CsrResult unifi_hip_init(card_t *card)
     r = unifi_set_host_state(card, UNIFI_HOST_STATE_AWAKE);
     if (r != CSR_RESULT_SUCCESS)
     {
-        func_exit_r(r);
         return r;
     }
 
@@ -479,12 +449,9 @@ static CsrResult unifi_hip_init(card_t *card)
     r = CardGenInt(card);
     if (r != CSR_RESULT_SUCCESS)
     {
-        func_exit_r(r);
         return r;
     }
 
-    func_exit();
-
     return CSR_RESULT_SUCCESS;
 } /* unifi_hip_init() */
 
@@ -609,8 +576,6 @@ static CsrResult card_hw_init(card_t *card)
     s16 search_4slut_again;
     CsrResult csrResult;
 
-    func_enter();
-
     /*
      * The device revision from the TPLMID_MANF and TPLMID_CARD fields
      * of the CIS are available as
@@ -635,7 +600,6 @@ static CsrResult card_hw_init(card_t *card)
         if (r != CSR_RESULT_SUCCESS)
         {
             unifi_error(card->ospriv, "Firmware hasn't started\n");
-            func_exit_r(r);
             return r;
         }
         unifi_trace(card->ospriv, UDBG4, "SLUT addr 0x%lX\n", slut_address);
@@ -652,7 +616,6 @@ static CsrResult card_hw_init(card_t *card)
         if (csrResult != CSR_RESULT_SUCCESS)
         {
             r = ConvertCsrSdioToCsrHipResult(card, csrResult);
-            func_exit_r(r);
             return r;
         }
         card->sdio_clock_speed = UNIFI_SDIO_CLOCK_INIT_HZ;
@@ -671,14 +634,12 @@ static CsrResult card_hw_init(card_t *card)
         if (r != CSR_RESULT_SUCCESS)
         {
             unifi_error(card->ospriv, "Failed to read SLUT finger print\n");
-            func_exit_r(r);
             return r;
         }
 
         if (finger_print != SLUT_FINGERPRINT)
         {
             unifi_error(card->ospriv, "Failed to find Symbol lookup table fingerprint\n");
-            func_exit_r(CSR_RESULT_FAILURE);
             return CSR_RESULT_FAILURE;
         }
 
@@ -696,7 +657,6 @@ static CsrResult card_hw_init(card_t *card)
             r = unifi_card_read16(card, slut_address, &s);
             if (r != CSR_RESULT_SUCCESS)
             {
-                func_exit_r(r);
                 return r;
             }
             slut_address += 2;
@@ -710,7 +670,6 @@ static CsrResult card_hw_init(card_t *card)
             r = unifi_read32(card, slut_address, &l);
             if (r != CSR_RESULT_SUCCESS)
             {
-                func_exit_r(r);
                 return r;
             }
             slut_address += 4;
@@ -739,7 +698,6 @@ static CsrResult card_hw_init(card_t *card)
                     if (r != CSR_RESULT_SUCCESS)
                     {
                         unifi_error(card->ospriv, "Failed to read config data\n");
-                        func_exit_r(r);
                         return r;
                     }
                     /* .. and then we copy the data to the host structure */
@@ -753,7 +711,6 @@ static CsrResult card_hw_init(card_t *card)
                     {
                         unifi_error(card->ospriv, "From host data slots %d\n", cfg_data->num_fromhost_data_slots);
                         unifi_error(card->ospriv, "need to be (queues * x + 2) (UNIFI_RESERVED_COMMAND_SLOTS for commands)\n");
-                        func_exit_r(CSR_RESULT_FAILURE);
                         return CSR_RESULT_FAILURE;
                     }
 
@@ -781,7 +738,6 @@ static CsrResult card_hw_init(card_t *card)
                         if ((card->sdio_io_block_size % cfg_data->sig_frag_size) != 0)
                         {
                             unifi_error(card->ospriv, "Configuration error: Can not pad to-host signals.\n");
-                            func_exit_r(CSR_WIFI_HIP_RESULT_INVALID_VALUE);
                             return CSR_WIFI_HIP_RESULT_INVALID_VALUE;
                         }
                         cfg_data->tohost_signal_padding = (u16) (card->sdio_io_block_size / cfg_data->sig_frag_size);
@@ -795,7 +751,6 @@ static CsrResult card_hw_init(card_t *card)
                         if (r != CSR_RESULT_SUCCESS)
                         {
                             unifi_error(card->ospriv, "Failed to write To-Host Signal Padding Fragments\n");
-                            func_exit_r(r);
                             return r;
                         }
                     }
@@ -818,7 +773,6 @@ static CsrResult card_hw_init(card_t *card)
                     if (r != CSR_RESULT_SUCCESS)
                     {
                         unifi_error(card->ospriv, "Failed to read build id\n");
-                        func_exit_r(r);
                         return r;
                     }
                     card->build_id = n;
@@ -835,7 +789,6 @@ static CsrResult card_hw_init(card_t *card)
                     if (r != CSR_RESULT_SUCCESS)
                     {
                         unifi_error(card->ospriv, "Failed to read build string\n");
-                        func_exit_r(r);
                         return r;
                     }
                     break;
@@ -853,7 +806,6 @@ static CsrResult card_hw_init(card_t *card)
                     if (r != CSR_RESULT_SUCCESS)
                     {
                         unifi_error(card->ospriv, "Failed to write loader load image command\n");
-                        func_exit_r(r);
                         return r;
                     }
 
@@ -871,7 +823,6 @@ static CsrResult card_hw_init(card_t *card)
                         if (r != CSR_RESULT_SUCCESS)
                         {
                             unifi_error(card->ospriv, "Failed to patch firmware\n");
-                            func_exit_r(r);
                             return r;
                         }
                     }
@@ -882,7 +833,6 @@ static CsrResult card_hw_init(card_t *card)
                     if (r != CSR_RESULT_SUCCESS)
                     {
                         unifi_error(card->ospriv, "Failed to write loader restart command\n");
-                        func_exit_r(r);
                         return r;
                     }
 
@@ -913,7 +863,6 @@ static CsrResult card_hw_init(card_t *card)
     if (cfg_data == NULL)
     {
         unifi_error(card->ospriv, "Failed to find SDIO_SLOT_CONFIG Symbol\n");
-        func_exit_r(CSR_RESULT_FAILURE);
         return CSR_RESULT_FAILURE;
     }
 
@@ -930,12 +879,10 @@ static CsrResult card_hw_init(card_t *card)
     {
         unifi_error(card->ospriv, "Failed to read init flag at %08lx\n",
                     card->init_flag_addr);
-        func_exit_r(r);
         return r;
     }
     if (initialised != 0)
     {
-        func_exit_r(CSR_RESULT_FAILURE);
         return CSR_RESULT_FAILURE;
     }
 
@@ -957,7 +904,6 @@ static CsrResult card_hw_init(card_t *card)
         unifi_error(card->ospriv, "UniFi f/w protocol major version (%d) is different from driver (v%d.%d)\n",
                     major, UNIFI_HIP_MAJOR_VERSION, UNIFI_HIP_MINOR_VERSION);
 #ifndef CSR_WIFI_DISABLE_HIP_VERSION_CHECK
-        func_exit_r(CSR_RESULT_FAILURE);
         return CSR_RESULT_FAILURE;
 #endif
     }
@@ -967,7 +913,6 @@ static CsrResult card_hw_init(card_t *card)
                     major, minor,
                     UNIFI_HIP_MAJOR_VERSION, UNIFI_HIP_MINOR_VERSION);
 #ifndef CSR_WIFI_DISABLE_HIP_VERSION_CHECK
-        func_exit_r(CSR_RESULT_FAILURE);
         return CSR_RESULT_FAILURE;
 #endif
     }
@@ -978,7 +923,6 @@ static CsrResult card_hw_init(card_t *card)
      */
     unifi_read_panic(card);
 
-    func_exit();
     return CSR_RESULT_SUCCESS;
 } /* card_hw_init() */
 
@@ -1004,8 +948,6 @@ static CsrResult card_wait_for_unifi_to_reset(card_t *card)
     u8 io_enable;
     CsrResult csrResult;
 
-    func_enter();
-
     r = CSR_RESULT_SUCCESS;
     for (i = 0; i < MAILBOX2_ATTEMPTS; i++)
     {
@@ -1107,7 +1049,6 @@ static CsrResult card_wait_for_unifi_to_reset(card_t *card)
         r = CSR_RESULT_FAILURE;
     }
 
-    func_exit();
     return r;
 } /* card_wait_for_unifi_to_reset() */
 
@@ -1136,14 +1077,11 @@ static CsrResult card_wait_for_unifi_to_disable(card_t *card)
     u8 io_enable;
     CsrResult csrResult;
 
-    func_enter();
-
     if (card->chip_id <= SDIO_CARD_ID_UNIFI_2)
     {
         unifi_error(card->ospriv,
                     "Function reset method not supported for chip_id=%d\n",
                     card->chip_id);
-        func_exit();
         return CSR_RESULT_FAILURE;
     }
 
@@ -1210,7 +1148,6 @@ static CsrResult card_wait_for_unifi_to_disable(card_t *card)
         r = CSR_RESULT_FAILURE;
     }
 
-    func_exit();
     return r;
 } /* card_wait_for_unifi_to_reset() */
 
@@ -1238,8 +1175,6 @@ CsrResult card_wait_for_firmware_to_start(card_t *card, u32 *paddr)
     u16 mbox0, mbox1;
     CsrResult r;
 
-    func_enter();
-
     /*
      * Wait for UniFi to initialise its data structures by polling
      * the SHARED_MAILBOX1 register.
@@ -1277,7 +1212,6 @@ CsrResult card_wait_for_firmware_to_start(card_t *card, u32 *paddr)
             if (r != CSR_RESULT_SUCCESS)
             {
                 unifi_error(card->ospriv, "Failed to read UniFi Mailbox1 register for second time\n");
-                func_exit_r(r);
                 return r;
             }
             unifi_trace(card->ospriv, UDBG1, "MAILBOX1 value=0x%04X\n", mbox1);
@@ -1296,7 +1230,6 @@ CsrResult card_wait_for_firmware_to_start(card_t *card, u32 *paddr)
     {
         unifi_trace(card->ospriv, UDBG1, "Timeout waiting for firmware to start, Mailbox1 still 0 after %d ms\n",
                     MAILBOX1_ATTEMPTS * MAILBOX1_TIMEOUT);
-        func_exit_r(CSR_RESULT_FAILURE);
         return CSR_RESULT_FAILURE;
     }
 
@@ -1312,7 +1245,6 @@ CsrResult card_wait_for_firmware_to_start(card_t *card, u32 *paddr)
     if (r != CSR_RESULT_SUCCESS)
     {
         unifi_error(card->ospriv, "Failed to write f/w startup handshake to MAILBOX2\n");
-        func_exit_r(r);
         return r;
     }
 
@@ -1330,13 +1262,11 @@ CsrResult card_wait_for_firmware_to_start(card_t *card, u32 *paddr)
     if (r != CSR_RESULT_SUCCESS)
     {
         unifi_error(card->ospriv, "Failed to read UniFi Mailbox0 register\n");
-        func_exit_r(r);
         return r;
     }
 
     *paddr = (((u32)mbox1 << 16) | mbox0);
 
-    func_exit();
     return CSR_RESULT_SUCCESS;
 } /* card_wait_for_firmware_to_start() */
 
@@ -1358,14 +1288,12 @@ CsrResult card_wait_for_firmware_to_start(card_t *card, u32 *paddr)
  */
 CsrResult unifi_capture_panic(card_t *card)
 {
-    func_enter();
 
     /* The firmware must have previously initialised to read the panic addresses
      * from the SLUT
      */
     if (!card->panic_data_phy_addr || !card->panic_data_mac_addr)
     {
-        func_exit();
         return CSR_RESULT_SUCCESS;
     }
 
@@ -1380,7 +1308,6 @@ CsrResult unifi_capture_panic(card_t *card)
         unifi_info(card->ospriv, "Unable to read panic codes");
     }
 
-    func_exit();
     return CSR_RESULT_SUCCESS;
 }
 
@@ -1405,8 +1332,6 @@ static CsrResult card_access_panic(card_t *card)
     s32 i;
     CsrResult r, sr;
 
-    func_enter();
-
     /* A chip version of zero means that the version never got succesfully read
      * during reset. In this case give up because it will not be possible to
      * verify the chip version.
@@ -1513,7 +1438,6 @@ static CsrResult card_access_panic(card_t *card)
     }
 
     r = ConvertCsrSdioToCsrHipResult(card, sr);
-    func_exit_r(r);
     return r;
 }
 
@@ -1536,8 +1460,6 @@ void unifi_read_panic(card_t *card)
     CsrResult r;
     u16 p_code, p_arg;
 
-    func_enter();
-
     /* The firmware must have previously initialised to read the panic addresses
      * from the SLUT
      */
@@ -1584,7 +1506,6 @@ void unifi_read_panic(card_t *card)
         card->last_mac_panic_arg = p_arg;
     }
 
-    func_exit();
 }
 
 
@@ -1607,8 +1528,6 @@ static CsrResult card_allocate_memory_resources(card_t *card)
     s16 n, i, k, r;
     sdio_config_data_t *cfg_data;
 
-    func_enter();
-
     /* Reset any state carried forward from a previous life */
     card->fh_command_queue.q_rd_ptr = 0;
     card->fh_command_queue.q_wr_ptr = 0;
@@ -1634,7 +1553,6 @@ static CsrResult card_allocate_memory_resources(card_t *card)
     if (card->fh_buffer.buf == NULL)
     {
         unifi_error(card->ospriv, "Failed to allocate memory for F-H signals\n");
-        func_exit_r(CSR_WIFI_HIP_RESULT_NO_MEMORY);
         return CSR_WIFI_HIP_RESULT_NO_MEMORY;
     }
     card->fh_buffer.bufsize = UNIFI_FH_BUF_SIZE;
@@ -1645,7 +1563,6 @@ static CsrResult card_allocate_memory_resources(card_t *card)
     if (card->th_buffer.buf == NULL)
     {
         unifi_error(card->ospriv, "Failed to allocate memory for T-H signals\n");
-        func_exit_r(CSR_WIFI_HIP_RESULT_NO_MEMORY);
         return CSR_WIFI_HIP_RESULT_NO_MEMORY;
     }
     card->th_buffer.bufsize = UNIFI_FH_BUF_SIZE;
@@ -1667,7 +1584,6 @@ static CsrResult card_allocate_memory_resources(card_t *card)
     if (card->from_host_data == NULL)
     {
         unifi_error(card->ospriv, "Failed to allocate memory for F-H bulk data array\n");
-        func_exit_r(CSR_WIFI_HIP_RESULT_NO_MEMORY);
         return CSR_WIFI_HIP_RESULT_NO_MEMORY;
     }
 
@@ -1683,7 +1599,6 @@ static CsrResult card_allocate_memory_resources(card_t *card)
     if (card->fh_slot_host_tag_record == NULL)
     {
         unifi_error(card->ospriv, "Failed to allocate memory for F-H slot host tag mapping array\n");
-        func_exit_r(CSR_WIFI_HIP_RESULT_NO_MEMORY);
         return CSR_WIFI_HIP_RESULT_NO_MEMORY;
     }
 
@@ -1702,7 +1617,6 @@ static CsrResult card_allocate_memory_resources(card_t *card)
     if (card->to_host_data == NULL)
     {
         unifi_error(card->ospriv, "Failed to allocate memory for T-H bulk data array\n");
-        func_exit_r(CSR_WIFI_HIP_RESULT_NO_MEMORY);
         return CSR_WIFI_HIP_RESULT_NO_MEMORY;
     }
 
@@ -1736,7 +1650,6 @@ static CsrResult card_allocate_memory_resources(card_t *card)
 
     card->memory_resources_allocated = 1;
 
-    func_exit();
     return CSR_RESULT_SUCCESS;
 } /* card_allocate_memory_resources() */
 
@@ -1781,7 +1694,6 @@ static void unifi_free_bulk_data(card_t *card, bulk_data_desc_t *bulk_data_slot)
  */
 static void card_free_memory_resources(card_t *card)
 {
-    func_enter();
 
     unifi_trace(card->ospriv, UDBG1, "Freeing card memory resources.\n");
 
@@ -1812,7 +1724,6 @@ static void card_free_memory_resources(card_t *card)
 
     card->memory_resources_allocated = 0;
 
-    func_exit();
 } /* card_free_memory_resources() */
 
 
@@ -1820,8 +1731,6 @@ static void card_init_soft_queues(card_t *card)
 {
     s16 i;
 
-    func_enter();
-
     unifi_trace(card->ospriv, UDBG1, "Initialising internal signal queues.\n");
     /* Reset any state carried forward from a previous life */
     card->fh_command_queue.q_rd_ptr = 0;
@@ -1838,7 +1747,6 @@ static void card_init_soft_queues(card_t *card)
 #ifndef CSR_WIFI_HIP_TA_DISABLE
     unifi_ta_sampling_init(card);
 #endif
-    func_exit();
 }
 
 
@@ -1858,7 +1766,6 @@ static void card_init_soft_queues(card_t *card)
 void unifi_cancel_pending_signals(card_t *card)
 {
     s16 i, n, r;
-    func_enter();
 
     unifi_trace(card->ospriv, UDBG1, "Canceling pending signals.\n");
 
@@ -1927,7 +1834,6 @@ void unifi_cancel_pending_signals(card_t *card)
 
     card_init_soft_queues(card);
 
-    func_exit();
 } /* unifi_cancel_pending_signals() */
 
 
@@ -1951,7 +1857,6 @@ void unifi_cancel_pending_signals(card_t *card)
  */
 void unifi_free_card(card_t *card)
 {
-    func_enter();
 #ifdef CSR_PRE_ALLOC_NET_DATA
     prealloc_netdata_free(card);
 #endif
@@ -1967,7 +1872,6 @@ void unifi_free_card(card_t *card)
 
     kfree(card);
 
-    func_exit();
 } /* unifi_free_card() */
 
 
@@ -1989,8 +1893,6 @@ static CsrResult card_init_slots(card_t *card)
     CsrResult r;
     u8 i;
 
-    func_enter();
-
     /* Allocate the buffers we need, only once. */
     if (card->memory_resources_allocated == 1)
     {
@@ -2007,14 +1909,12 @@ static CsrResult card_init_slots(card_t *card)
     {
         unifi_error(card->ospriv, "Failed to allocate card memory resources.\n");
         card_free_memory_resources(card);
-        func_exit_r(r);
         return r;
     }
 
     if (card->sdio_ctrl_addr == 0)
     {
         unifi_error(card->ospriv, "Failed to find config struct!\n");
-        func_exit_r(CSR_WIFI_HIP_RESULT_INVALID_VALUE);
         return CSR_WIFI_HIP_RESULT_INVALID_VALUE;
     }
 
@@ -2037,7 +1937,6 @@ static CsrResult card_init_slots(card_t *card)
         if (r != CSR_RESULT_SUCCESS)
         {
             unifi_error(card->ospriv, "Failed to read from-host sig written count\n");
-            func_exit_r(r);
             return r;
         }
         card->from_host_signals_w = (s16)s;
@@ -2051,7 +1950,6 @@ static CsrResult card_init_slots(card_t *card)
         if (r != CSR_RESULT_SUCCESS)
         {
             unifi_error(card->ospriv, "Failed to read to-host sig read count\n");
-            func_exit_r(r);
             return r;
         }
         card->to_host_signals_r = (s16)s;
@@ -2066,7 +1964,6 @@ static CsrResult card_init_slots(card_t *card)
     if (r != CSR_RESULT_SUCCESS)
     {
         unifi_error(card->ospriv, "Failed to write initialised flag\n");
-        func_exit_r(r);
         return r;
     }
 
@@ -2082,7 +1979,6 @@ static CsrResult card_init_slots(card_t *card)
 
     card->dynamic_slot_data.packets_interval = UNIFI_PACKETS_INTERVAL;
 
-    func_exit();
     return CSR_RESULT_SUCCESS;
 } /* card_init_slots() */
 
@@ -2153,8 +2049,6 @@ static void CardReassignDynamicReservation(card_t *card)
 {
     u8 i;
 
-    func_enter();
-
     unifi_trace(card->ospriv, UDBG5, "Packets Txed %d %d %d %d\n",
                 card->dynamic_slot_data.packets_txed[0],
                 card->dynamic_slot_data.packets_txed[1],
@@ -2176,7 +2070,6 @@ static void CardReassignDynamicReservation(card_t *card)
     }
 
     card->dynamic_slot_data.total_packets_txed = 0;
-    func_exit();
 }
 
 
@@ -2206,8 +2099,6 @@ static void CardCheckDynamicReservation(card_t *card, unifi_TrafficQueue queue)
     q_t *sigq;
     u16 num_data_slots = card->config_data.num_fromhost_data_slots - UNIFI_RESERVED_COMMAND_SLOTS;
 
-    func_enter();
-
     /* Calculate the pending queue length */
     sigq = &card->fh_traffic_queue[queue];
     q_len = CSR_WIFI_HIP_Q_SLOTS_USED(sigq);
@@ -2215,7 +2106,6 @@ static void CardCheckDynamicReservation(card_t *card, unifi_TrafficQueue queue)
     if (q_len <= card->dynamic_slot_data.from_host_reserved_slots[queue])
     {
         unifi_trace(card->ospriv, UDBG5, "queue %d q_len %d already has that many reserved slots, exiting\n", queue, q_len);
-        func_exit();
         return;
     }
 
@@ -2313,7 +2203,6 @@ static void CardCheckDynamicReservation(card_t *card, unifi_TrafficQueue queue)
                     card->dynamic_slot_data.from_host_max_slots[i]);
     }
 
-    func_exit();
 }
 
 
@@ -2336,14 +2225,11 @@ void CardClearFromHostDataSlot(card_t *card, const s16 slot)
     u8 queue = card->from_host_data[slot].queue;
     const void *os_data_ptr = card->from_host_data[slot].bd.os_data_ptr;
 
-    func_enter();
-
     if (card->from_host_data[slot].bd.data_length == 0)
     {
         unifi_warning(card->ospriv,
                       "Surprise: request to clear an already free FH data slot: %d\n",
                       slot);
-        func_exit();
         return;
     }
 
@@ -2379,7 +2265,6 @@ void CardClearFromHostDataSlot(card_t *card, const s16 slot)
 
     unifi_trace(card->ospriv, UDBG4, "CardClearFromHostDataSlot: slot %d recycled %p\n", slot, os_data_ptr);
 
-    func_exit();
 } /* CardClearFromHostDataSlot() */
 
 
@@ -2457,8 +2342,6 @@ u16 CardGetFreeFromHostDataSlots(card_t *card)
 {
     u16 i, n = 0;
 
-    func_enter();
-
     /* First two slots reserved for MLME */
     for (i = 0; i < card->config_data.num_fromhost_data_slots; i++)
     {
@@ -2469,7 +2352,6 @@ u16 CardGetFreeFromHostDataSlots(card_t *card)
         }
     }
 
-    func_exit();
     return n;
 } /* CardGetFreeFromHostDataSlots() */
 
@@ -2506,7 +2388,6 @@ u16 CardAreAllFromHostDataSlotsEmpty(card_t *card)
 
 static CsrResult unifi_identify_hw(card_t *card)
 {
-    func_enter();
 
     card->chip_id = card->sdio_if->sdioId.cardId;
     card->function = card->sdio_if->sdioId.sdioFunction;
@@ -2530,7 +2411,6 @@ static CsrResult unifi_identify_hw(card_t *card)
                ChipHelper_MarketingName(card->helper),
                ChipHelper_FriendlyName(card->helper));
 
-    func_exit();
     return CSR_RESULT_SUCCESS;
 } /* unifi_identify_hw() */
 
@@ -2541,8 +2421,6 @@ static CsrResult unifi_prepare_hw(card_t *card)
     CsrResult csrResult;
     enum unifi_host_state old_state = card->host_state;
 
-    func_enter();
-
     r = unifi_identify_hw(card);
     if (r == CSR_WIFI_HIP_RESULT_NO_DEVICE)
     {
@@ -2551,7 +2429,6 @@ static CsrResult unifi_prepare_hw(card_t *card)
     if (r != CSR_RESULT_SUCCESS)
     {
         unifi_error(card->ospriv, "Failed to identify hw\n");
-        func_exit_r(r);
         return r;
     }
 
@@ -2576,7 +2453,6 @@ static CsrResult unifi_prepare_hw(card_t *card)
         if (csrResult != CSR_RESULT_SUCCESS)
         {
             r = ConvertCsrSdioToCsrHipResult(card, csrResult);
-            func_exit_r(r);
             return r;
         }
         card->sdio_clock_speed = UNIFI_SDIO_CLOCK_INIT_HZ;
@@ -2596,7 +2472,6 @@ static CsrResult unifi_prepare_hw(card_t *card)
         r = ConvertCsrSdioToCsrHipResult(card, csrResult);
         /* Can't enable WLAN function. Try resetting the SDIO block. */
         unifi_error(card->ospriv, "Failed to re-enable function %d.\n", card->function);
-        func_exit_r(r);
         return r;
     }
 
@@ -2610,11 +2485,9 @@ static CsrResult unifi_prepare_hw(card_t *card)
     r = unifi_read_chip_version(card);
     if (r != CSR_RESULT_SUCCESS)
     {
-        func_exit_r(r);
         return r;
     }
 
-    func_exit();
     return CSR_RESULT_SUCCESS;
 } /* unifi_prepare_hw() */
 
@@ -2625,8 +2498,6 @@ static CsrResult unifi_read_chip_version(card_t *card)
     CsrResult r;
     u16 ver;
 
-    func_enter();
-
     gbl_chip_version = ChipHelper_GBL_CHIP_VERSION(card->helper);
 
     /* Try to read the chip version from register. */
@@ -2640,7 +2511,6 @@ static CsrResult unifi_read_chip_version(card_t *card)
         if (r != CSR_RESULT_SUCCESS)
         {
             unifi_error(card->ospriv, "Failed to read GBL_CHIP_VERSION\n");
-            func_exit_r(r);
             return r;
         }
         card->chip_version = ver;
@@ -2653,7 +2523,6 @@ static CsrResult unifi_read_chip_version(card_t *card)
 
     unifi_info(card->ospriv, "Chip Version 0x%04X\n", card->chip_version);
 
-    func_exit_r(r);
     return r;
 } /* unifi_read_chip_version() */
 
@@ -2684,8 +2553,6 @@ static CsrResult unifi_reset_hardware(card_t *card)
     u16 new_block_size = UNIFI_IO_BLOCK_SIZE;
     CsrResult csrResult;
 
-    func_enter();
-
     /* Errors returned by unifi_prepare_hw() are not critical at this point */
     r = unifi_prepare_hw(card);
     if (r == CSR_WIFI_HIP_RESULT_NO_DEVICE)
@@ -2709,7 +2576,6 @@ static CsrResult unifi_reset_hardware(card_t *card)
         if (r != CSR_RESULT_SUCCESS)
         {
             unifi_error(card->ospriv, "unifi_prepare_hw failed after hard reset\n");
-            func_exit_r(r);
             return r;
         }
     }
@@ -2729,7 +2595,6 @@ static CsrResult unifi_reset_hardware(card_t *card)
         if (r != CSR_RESULT_SUCCESS)
         {
             unifi_error(card->ospriv, "software hard reset failed\n");
-            func_exit_r(r);
             return r;
         }
 
@@ -2742,7 +2607,6 @@ static CsrResult unifi_reset_hardware(card_t *card)
             r = unifi_read_chip_version(card);
             if (r != CSR_RESULT_SUCCESS)
             {
-                func_exit_r(r);
                 return r;
             }
         }
@@ -2792,7 +2656,6 @@ static CsrResult unifi_reset_hardware(card_t *card)
     }
 
 
-    func_exit_r(r);
     return r;
 } /* unifi_reset_hardware() */
 
@@ -2818,8 +2681,6 @@ static CsrResult card_reset_method_io_enable(card_t *card)
     CsrResult r;
     CsrResult csrResult;
 
-    func_enter();
-
     /*
      * This resets only function 1, so should be used in
      * preference to the method below (CSR_FUNC_EN)
@@ -2869,7 +2730,6 @@ static CsrResult card_reset_method_io_enable(card_t *card)
         if (r != CSR_RESULT_SUCCESS)
         {
             unifi_warning(card->ospriv, "SDIO error writing SDIO_CSR_FUNC_EN: %d\n", r);
-            func_exit_r(r);
             return r;
         }
         else
@@ -2890,7 +2750,6 @@ static CsrResult card_reset_method_io_enable(card_t *card)
         unifi_warning(card->ospriv, "card_reset_method_io_enable failed to reset UniFi\n");
     }
 
-    func_exit();
     return r;
 } /* card_reset_method_io_enable() */
 
@@ -2915,8 +2774,6 @@ static CsrResult card_reset_method_dbg_reset(card_t *card)
 {
     CsrResult r;
 
-    func_enter();
-
     /*
      * Prepare UniFi for h/w reset
      */
@@ -2930,7 +2787,6 @@ static CsrResult card_reset_method_dbg_reset(card_t *card)
         if (r != CSR_RESULT_SUCCESS)
         {
             unifi_error(card->ospriv, "Failed to set UNIFI_HOST_STATE_DROWSY\n");
-            func_exit_r(r);
             return r;
         }
         CsrThreadSleep(5);
@@ -2944,7 +2800,6 @@ static CsrResult card_reset_method_dbg_reset(card_t *card)
     if (r != CSR_RESULT_SUCCESS)
     {
         unifi_error(card->ospriv, "Can't stop processors\n");
-        func_exit();
         return r;
     }
 
@@ -2963,7 +2818,6 @@ static CsrResult card_reset_method_dbg_reset(card_t *card)
     if (r != CSR_RESULT_SUCCESS)
     {
         unifi_warning(card->ospriv, "SDIO error writing DBG_RESET: %d\n", r);
-        func_exit_r(r);
         return r;
     }
 
@@ -2980,7 +2834,6 @@ static CsrResult card_reset_method_dbg_reset(card_t *card)
         unifi_warning(card->ospriv, "card_reset_method_dbg_reset failed to reset UniFi\n");
     }
 
-    func_exit();
     return r;
 } /* card_reset_method_dbg_reset() */
 
@@ -3008,8 +2861,6 @@ CsrResult unifi_card_hard_reset(card_t *card)
     const struct chip_helper_reset_values *init_data;
     u32 chunks;
 
-    func_enter();
-
     /* Clear cache of page registers */
     card->proc_select = (u32)(-1);
     card->dmem_page = (u32)(-1);
@@ -3028,7 +2879,6 @@ CsrResult unifi_card_hard_reset(card_t *card)
     if (r != CSR_RESULT_SUCCESS)
     {
         unifi_error(card->ospriv, "unifi_card_hard_reset failed to identify h/w\n");
-        func_exit();
         return r;
     }
 
@@ -3039,7 +2889,6 @@ CsrResult unifi_card_hard_reset(card_t *card)
         unifi_error(card->ospriv,
                     "Hard reset (Code download) is unsupported\n");
 
-        func_exit_r(CSR_RESULT_FAILURE);
         return CSR_RESULT_FAILURE;
     }
 
@@ -3058,7 +2907,6 @@ CsrResult unifi_card_hard_reset(card_t *card)
         }
         if (r == CSR_RESULT_SUCCESS)
         {
-            func_exit();
             return r;
         }
     }
@@ -3066,7 +2914,6 @@ CsrResult unifi_card_hard_reset(card_t *card)
     /* Software hard reset */
     r = card_reset_method_dbg_reset(card);
 
-    func_exit_r(r);
     return r;
 } /* unifi_card_hard_reset() */
 
@@ -3097,8 +2944,6 @@ CsrResult CardGenInt(card_t *card)
 {
     CsrResult r;
 
-    func_enter();
-
     if (card->chip_id > SDIO_CARD_ID_UNIFI_2)
     {
         r = sdio_write_f0(card, SDIO_CSR_FROM_HOST_SCRATCH0,
@@ -3117,13 +2962,11 @@ CsrResult CardGenInt(card_t *card)
     if (r != CSR_RESULT_SUCCESS)
     {
         unifi_error(card->ospriv, "SDIO error writing UNIFI_SHARED_IO_INTERRUPT: %d\n", r);
-        func_exit_r(r);
         return r;
     }
 
     card->unifi_interrupt_seq++;
 
-    func_exit();
     return CSR_RESULT_SUCCESS;
 } /* CardGenInt() */
 
@@ -3388,8 +3231,6 @@ CsrResult CardWriteBulkData(card_t *card, card_signal_t *csptr, unifi_TrafficQue
     bulk_data_desc_t *bulkdata = csptr->bulkdata;
     s16 h, nslots;
 
-    func_enter();
-
     /* Count the number of slots required */
     for (i = 0; i < UNIFI_MAX_DATA_REFERENCES; i++)
     {
@@ -3470,7 +3311,6 @@ CsrResult CardWriteBulkData(card_t *card, card_signal_t *csptr, unifi_TrafficQue
             {
                 unifi_trace(card->ospriv, UDBG5, "fh data slot %d: %d\n", i, card->from_host_data[i].bd.data_length);
             }
-            func_exit();
             return CSR_RESULT_FAILURE;
         }
     }
@@ -3523,8 +3363,6 @@ CsrResult CardWriteBulkData(card_t *card, card_signal_t *csptr, unifi_TrafficQue
         }
     }
 
-    func_exit();
-
     return CSR_RESULT_SUCCESS;
 } /*  CardWriteBulkData() */
 
diff --git a/drivers/staging/csr/csr_wifi_hip_card_sdio.h b/drivers/staging/csr/csr_wifi_hip_card_sdio.h
index dc2ed70f7edd..a9b9ec427320 100644
--- a/drivers/staging/csr/csr_wifi_hip_card_sdio.h
+++ b/drivers/staging/csr/csr_wifi_hip_card_sdio.h
@@ -20,10 +20,6 @@
 #ifndef __CARD_SDIO_H__
 #define __CARD_SDIO_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include "csr_wifi_hip_unifi.h"
 #include "csr_wifi_hip_unifi_udi.h"
 #include "csr_wifi_hip_unifihw.h"
@@ -695,8 +691,4 @@ CsrResult prealloc_netdata_alloc(card_t *card);
 void dump(void *mem, u16 len);
 void dump16(void *mem, u16 len);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* __CARD_SDIO_H__ */
diff --git a/drivers/staging/csr/csr_wifi_hip_chiphelper.h b/drivers/staging/csr/csr_wifi_hip_chiphelper.h
index 24737ae8a2de..b6b67ee11db8 100644
--- a/drivers/staging/csr/csr_wifi_hip_chiphelper.h
+++ b/drivers/staging/csr/csr_wifi_hip_chiphelper.h
@@ -14,10 +14,6 @@
 
 #include <linux/types.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* The age of the BlueCore chip.  This is probably not useful, if
    you know the age then you can probably work out the version directly. */
 enum chip_helper_bluecore_age
@@ -408,64 +404,4 @@ s32 ChipHelper_DecodeWindow(ChipDescript *chip_help,
                                  u32 offset,
                                  u16 *page, u16 *addr, u32 *len);
 
-#ifdef __cplusplus
-/* Close the extern "C" */
-}
-
-/*
- * This is the C++ API.
- */
-
-class ChipHelper
-{
-public:
-    /* If this constructor is used then a GetVersionXXX function
-       should be called next. */
-    ChipHelper();
-
-    /* copy constructor */
-    ChipHelper(ChipDescript * desc);
-
-    /* The default constructor assume a BC7 / UF105x series chip
-       and that the number given is the value of UNIFI_GBL_CHIP_VERSION
-       (0xFE81) */
-    ChipHelper(u16 version);
-
-    /* This returns the C interface magic token from a C++ instance. */
-    ChipDescript* GetDescript() const
-    {
-        return m_desc;
-    }
-
-
-    /* Clear out theis class (set it to the null token). */
-    void ClearVersion();
-
-    /* Load this class with data for a specific chip. */
-    void GetVersionAny(u16 from_FF9A, u16 from_FE81);
-    void GetVersionUniFi(u16 version);
-    void GetVersionBlueCore(chip_helper_bluecore_age age, u16 version);
-    void GetVersionSdio(u8 sdio_version);
-
-    /* Helpers to build the definitions of the member functions. */
-#define CHIP_HELPER_DEF0_CPP_DEC(ret_type, name, info)    \
-    ret_type name() const;
-#define CHIP_HELPER_DEF1_CPP_DEC(ret_type, name, type1, name1)   \
-    ret_type name(type1 name1) const;
-
-    CHIP_HELPER_LIST(CPP_DEC)
-
-
-    /* The DecodeWindow function, see the description of the C version. */
-    s32 DecodeWindow(chip_helper_window_index window,
-                          chip_helper_window_type type,
-                          u32 offset,
-                          u16 &page, u16 &addr, u32 &len) const;
-
-private:
-    ChipDescript *m_desc;
-};
-
-#endif /* __cplusplus */
-
 #endif
diff --git a/drivers/staging/csr/csr_wifi_hip_chiphelper_private.h b/drivers/staging/csr/csr_wifi_hip_chiphelper_private.h
index cb0ea4b63e65..e5e579912550 100644
--- a/drivers/staging/csr/csr_wifi_hip_chiphelper_private.h
+++ b/drivers/staging/csr/csr_wifi_hip_chiphelper_private.h
@@ -14,10 +14,6 @@
 
 #include "csr_wifi_hip_chiphelper.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
 /* This GP stuff should be somewhere else? */
 
 /* Memory spaces encoded in top byte of Generic Pointer type */
@@ -201,8 +197,4 @@ struct chip_device_desc_t
     const struct window_info_t *windows[CHIP_HELPER_WINDOW_COUNT];
 };
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
 #endif /* CSR_WIFI_HIP_CHIPHELPER_PRIVATE_H__ */
diff --git a/drivers/staging/csr/csr_wifi_hip_conversions.h b/drivers/staging/csr/csr_wifi_hip_conversions.h
index 7d045c069362..bf7a52e82995 100644
--- a/drivers/staging/csr/csr_wifi_hip_conversions.h
+++ b/drivers/staging/csr/csr_wifi_hip_conversions.h
@@ -23,10 +23,6 @@
 #ifndef __CSR_WIFI_HIP_CONVERSIONS_H__
 #define __CSR_WIFI_HIP_CONVERSIONS_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #define SIZEOF_UINT16           2
 #define SIZEOF_UINT32           4
 #define SIZEOF_UINT64           8
@@ -73,9 +69,5 @@ s32 get_packed_struct_size(const u8 *buf);
 CsrResult read_unpack_signal(const u8 *ptr, CSR_SIGNAL *sig);
 CsrResult write_pack(const CSR_SIGNAL *sig, u8 *ptr, u16 *sig_len);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* __CSR_WIFI_HIP_CONVERSIONS_H__ */
 
diff --git a/drivers/staging/csr/csr_wifi_hip_download.c b/drivers/staging/csr/csr_wifi_hip_download.c
index 6db672caaa02..2f44a383d2cf 100644
--- a/drivers/staging/csr/csr_wifi_hip_download.c
+++ b/drivers/staging/csr/csr_wifi_hip_download.c
@@ -68,7 +68,6 @@ static CsrResult _find_in_slut(card_t *card, symbol_t *psym, u32 *pslut)
         if (r != CSR_RESULT_SUCCESS)
         {
             unifi_error(card->ospriv, "Firmware hasn't started\n");
-            func_exit_r(r);
             return r;
         }
         *pslut = slut_address;
@@ -81,7 +80,6 @@ static CsrResult _find_in_slut(card_t *card, symbol_t *psym, u32 *pslut)
         if (csrResult != CSR_RESULT_SUCCESS)
         {
             r = ConvertCsrSdioToCsrHipResult(card, csrResult);
-            func_exit_r(r);
             return r;
         }
         card->sdio_clock_speed = UNIFI_SDIO_CLOCK_INIT_HZ;
@@ -106,14 +104,12 @@ static CsrResult _find_in_slut(card_t *card, symbol_t *psym, u32 *pslut)
     if (r != CSR_RESULT_SUCCESS)
     {
         unifi_error(card->ospriv, "Failed to read SLUT finger print\n");
-        func_exit_r(r);
         return r;
     }
 
     if (finger_print != SLUT_FINGERPRINT)
     {
         unifi_error(card->ospriv, "Failed to find SLUT fingerprint\n");
-        func_exit_r(CSR_RESULT_FAILURE);
         return CSR_RESULT_FAILURE;
     }
 
@@ -128,7 +124,6 @@ static CsrResult _find_in_slut(card_t *card, symbol_t *psym, u32 *pslut)
         r = unifi_card_read16(card, slut_address, &id);
         if (r != CSR_RESULT_SUCCESS)
         {
-            func_exit_r(r);
             return r;
         }
         slut_address += 2;
@@ -143,7 +138,6 @@ static CsrResult _find_in_slut(card_t *card, symbol_t *psym, u32 *pslut)
         r = unifi_read32(card, slut_address, &obj);
         if (r != CSR_RESULT_SUCCESS)
         {
-            func_exit_r(r);
             return r;
         }
         slut_address += 4;
@@ -161,7 +155,6 @@ static CsrResult _find_in_slut(card_t *card, symbol_t *psym, u32 *pslut)
         }
     }
 
-    func_exit_r(r);
     return r;
 }
 
@@ -279,7 +272,6 @@ static CsrResult do_patch_convert_download(card_t *card, void *dlpriv, xbv1_t *p
         if (r != CSR_RESULT_SUCCESS)
         {
             unifi_error(card->ospriv, "Converted patch download failed\n");
-            func_exit_r(r);
             return r;
         }
         else
@@ -294,7 +286,6 @@ static CsrResult do_patch_convert_download(card_t *card, void *dlpriv, xbv1_t *p
             unifi_error(card->ospriv, "Failed to write loader restart cmd\n");
         }
 
-        func_exit_r(r);
         return r;
     }
 }
@@ -327,8 +318,6 @@ CsrResult unifi_dl_firmware(card_t *card, void *dlpriv)
     xbv1_t *fwinfo;
     CsrResult r;
 
-    func_enter();
-
     fwinfo = kmalloc(sizeof(xbv1_t), GFP_KERNEL);
     if (fwinfo == NULL)
     {
@@ -376,7 +365,6 @@ CsrResult unifi_dl_firmware(card_t *card, void *dlpriv)
     }
 
     kfree(fwinfo);
-    func_exit_r(r);
     return r;
 } /* unifi_dl_firmware() */
 
@@ -407,15 +395,12 @@ CsrResult unifi_dl_patch(card_t *card, void *dlpriv, u32 boot_ctrl)
     xbv1_t *fwinfo;
     CsrResult r;
 
-    func_enter();
-
     unifi_info(card->ospriv, "unifi_dl_patch %p %08x\n", dlpriv, boot_ctrl);
 
     fwinfo = kmalloc(sizeof(xbv1_t), GFP_KERNEL);
     if (fwinfo == NULL)
     {
         unifi_error(card->ospriv, "Failed to allocate memory for patches\n");
-        func_exit();
         return CSR_WIFI_HIP_RESULT_NO_MEMORY;
     }
 
@@ -431,7 +416,6 @@ CsrResult unifi_dl_patch(card_t *card, void *dlpriv, u32 boot_ctrl)
     {
         kfree(fwinfo);
         unifi_error(card->ospriv, "Failed to read in patch file\n");
-        func_exit();
         return CSR_WIFI_HIP_RESULT_INVALID_VALUE;
     }
 
@@ -446,7 +430,6 @@ CsrResult unifi_dl_patch(card_t *card, void *dlpriv, u32 boot_ctrl)
                     card->build_id, fwinfo->build_id);
         kfree(fwinfo);
 #ifndef CSR_WIFI_IGNORE_PATCH_VERSION_MISMATCH
-        func_exit();
         return CSR_WIFI_HIP_RESULT_INVALID_VALUE;
 #else
         fwinfo = NULL;
@@ -463,7 +446,6 @@ CsrResult unifi_dl_patch(card_t *card, void *dlpriv, u32 boot_ctrl)
 
     kfree(fwinfo);
 
-    func_exit_r(r);
     return r;
 } /* unifi_dl_patch() */
 
diff --git a/drivers/staging/csr/csr_wifi_hip_dump.c b/drivers/staging/csr/csr_wifi_hip_dump.c
index d67b460e7a85..7b7eec49d028 100644
--- a/drivers/staging/csr/csr_wifi_hip_dump.c
+++ b/drivers/staging/csr/csr_wifi_hip_dump.c
@@ -40,7 +40,7 @@
 typedef struct coredump_buf
 {
     u16  count;                       /* serial number of dump */
-    CsrTime    timestamp;                   /* host's system time at capture */
+    u32  timestamp;                   /* host's system time at capture */
     s16   requestor;                   /* request: 0=auto dump, 1=manual */
     u16  chip_ver;
     u32  fw_ver;
@@ -104,8 +104,6 @@ CsrResult unifi_coredump_request_at_next_reset(card_t *card, s8 enable)
 {
     CsrResult r;
 
-    func_enter();
-
     if (enable)
     {
         unifi_trace(card->ospriv, UDBG2, "Mini-coredump requested after reset\n");
@@ -121,7 +119,6 @@ CsrResult unifi_coredump_request_at_next_reset(card_t *card, s8 enable)
         r = CSR_RESULT_SUCCESS;
     }
 
-    func_exit_r(r);
     return r;
 }
 
@@ -145,8 +142,6 @@ CsrResult unifi_coredump_handle_request(card_t *card)
 {
     CsrResult r = CSR_RESULT_SUCCESS;
 
-    func_enter();
-
     if (card == NULL)
     {
         r = CSR_WIFI_HIP_RESULT_INVALID_VALUE;
@@ -160,7 +155,6 @@ CsrResult unifi_coredump_handle_request(card_t *card)
         }
     }
 
-    func_exit_r(r);
     return r;
 }
 
@@ -192,9 +186,7 @@ CsrResult unifi_coredump_capture(card_t *card, struct unifi_coredump_req *req)
 {
     CsrResult r = CSR_RESULT_SUCCESS;
     static u16 dump_seq_no = 1;
-    CsrTime time_of_capture;
-
-    func_enter();
+    u32 time_of_capture;
 
     if (card->dump_next_write == NULL)
     {
@@ -269,7 +261,6 @@ CsrResult unifi_coredump_capture(card_t *card, struct unifi_coredump_req *req)
     }
 
 done:
-    func_exit_r(r);
     return r;
 } /* unifi_coredump_capture() */
 
@@ -358,8 +349,6 @@ CsrResult unifi_coredump_get_value(card_t *card, struct unifi_coredump_req *req)
     s32 i = 0;
     coredump_buffer *find_dump = NULL;
 
-    func_enter();
-
     if (req == NULL || card == NULL)
     {
         r = CSR_WIFI_HIP_RESULT_INVALID_VALUE;
@@ -452,7 +441,6 @@ CsrResult unifi_coredump_get_value(card_t *card, struct unifi_coredump_req *req)
     req->serial = find_dump->count;
 
 done:
-    func_exit_r(r);
     return r;
 } /* unifi_coredump_get_value() */
 
@@ -481,8 +469,6 @@ static CsrResult unifi_coredump_read_zone(card_t *card, u16 *zonebuf, const stru
 {
     CsrResult r;
 
-    func_enter();
-
     if (zonebuf == NULL || def == NULL)
     {
         r = CSR_WIFI_HIP_RESULT_INVALID_VALUE;
@@ -521,7 +507,6 @@ static CsrResult unifi_coredump_read_zone(card_t *card, u16 *zonebuf, const stru
     }
 
 done:
-    func_exit_r(r);
     return r;
 }
 
@@ -551,8 +536,6 @@ static CsrResult unifi_coredump_read_zones(card_t *card, coredump_buffer *dump_b
     CsrResult r = CSR_RESULT_SUCCESS;
     s32 i;
 
-    func_enter();
-
     /* Walk the table of coredump zone definitions and read them from the chip */
     for (i = 0;
          (i < HIP_CDUMP_NUM_ZONES) && (r == 0);
@@ -561,7 +544,6 @@ static CsrResult unifi_coredump_read_zones(card_t *card, coredump_buffer *dump_b
         r = unifi_coredump_read_zone(card, dump_buf->zone[i], &zonedef_table[i]);
     }
 
-    func_exit_r(r);
     return r;
 }
 
@@ -590,8 +572,6 @@ static CsrResult unifi_coredump_from_sdio(card_t *card, coredump_buffer *dump_bu
     CsrResult r;
     u32 sdio_addr;
 
-    func_enter();
-
     if (dump_buf == NULL)
     {
         r = CSR_WIFI_HIP_RESULT_INVALID_VALUE;
@@ -634,7 +614,6 @@ static CsrResult unifi_coredump_from_sdio(card_t *card, coredump_buffer *dump_bu
     }
 
 done:
-    func_exit_r(r);
     return r;
 } /* unifi_coredump_from_sdio() */
 
@@ -743,8 +722,6 @@ CsrResult unifi_coredump_init(card_t *card, u16 num_dump_buffers)
     u32 i = 0;
 #endif
 
-    func_enter();
-
     card->request_coredump_on_reset = 0;
     card->dump_next_write = NULL;
     card->dump_cur_read = NULL;
@@ -790,7 +767,6 @@ CsrResult unifi_coredump_init(card_t *card, u16 num_dump_buffers)
 
 done:
 #endif
-    func_exit();
     return CSR_RESULT_SUCCESS;
 
 #ifndef UNIFI_DISABLE_COREDUMP
@@ -798,7 +774,6 @@ fail:
     /* Unwind what we allocated so far */
     unifi_error(ospriv, "Out of memory allocating core dump node %d\n", i);
     unifi_coredump_free(card);
-    func_exit();
     return CSR_WIFI_HIP_RESULT_NO_MEMORY;
 #endif
 } /* unifi_coreump_init() */
@@ -826,7 +801,6 @@ void unifi_coredump_free(card_t *card)
     s16 i = 0;
     s16 j;
 
-    func_enter();
     unifi_trace(ospriv, UDBG2, "Core dump de-configured\n");
 
     if (card->dump_buf == NULL)
@@ -858,8 +832,6 @@ void unifi_coredump_free(card_t *card)
     card->dump_buf = NULL;
     card->dump_next_write = NULL;
     card->dump_cur_read = NULL;
-
-    func_exit();
 } /* unifi_coredump_free() */
 
 
diff --git a/drivers/staging/csr/csr_wifi_hip_send.c b/drivers/staging/csr/csr_wifi_hip_send.c
index 86aa23cefe30..76429e5e77cf 100644
--- a/drivers/staging/csr/csr_wifi_hip_send.c
+++ b/drivers/staging/csr/csr_wifi_hip_send.c
@@ -270,8 +270,6 @@ static CsrResult send_signal(card_t *card, const u8 *sigptr, u32 siglen,
         }
     }
 
-    func_exit();
-
     return CSR_RESULT_SUCCESS;
 } /*  send_signal() */
 
diff --git a/drivers/staging/csr/csr_wifi_hip_signals.h b/drivers/staging/csr/csr_wifi_hip_signals.h
index 5f841556bbef..ca4d0774195c 100644
--- a/drivers/staging/csr/csr_wifi_hip_signals.h
+++ b/drivers/staging/csr/csr_wifi_hip_signals.h
@@ -1,10 +1,10 @@
 /*****************************************************************************
 
-            (c) Cambridge Silicon Radio Limited 2011
-            All rights reserved and confidential information of CSR
+        (c) Cambridge Silicon Radio Limited 2011
+        All rights reserved and confidential information of CSR
 
-            Refer to LICENSE.txt included with this source for details
-            on the license terms.
+        Refer to LICENSE.txt included with this source for details
+        on the license terms.
 
 *****************************************************************************/
 
@@ -101,10 +101,6 @@
 /* FUNCTION DECLARATIONS */
 /******************************************************************************/
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
 /******************************************************************************
  * SigGetNumDataRefs - Retrieve pointers to data-refs from a signal.
  *
@@ -129,9 +125,4 @@ s32 SigGetDataRefs(CSR_SIGNAL *aSignal, CSR_DATAREF **aDataRef);
  */
 s32 SigGetSize(const CSR_SIGNAL *aSignal);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
 #endif /* __CSR_WIFI_HIP_SIGNALS_H__ */
diff --git a/drivers/staging/csr/csr_wifi_hip_sigs.h b/drivers/staging/csr/csr_wifi_hip_sigs.h
index 2b9f51d7f296..6112cc3e87fa 100644
--- a/drivers/staging/csr/csr_wifi_hip_sigs.h
+++ b/drivers/staging/csr/csr_wifi_hip_sigs.h
@@ -16,10 +16,6 @@
 #ifndef CSR_WIFI_HIP_SIGS_H
 #define CSR_WIFI_HIP_SIGS_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 typedef s16 csr_place_holding_type;
 
 typedef u16 CSR_ASSOCIATION_ID;
@@ -1418,8 +1414,4 @@ typedef struct CSR_SIGNAL_PRIMITIVE
 
 u32 SigGetFilterPos(u16 aSigID);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif
diff --git a/drivers/staging/csr/csr_wifi_hip_ta_sampling.h b/drivers/staging/csr/csr_wifi_hip_ta_sampling.h
index 46c630b4beea..aa684c654d06 100644
--- a/drivers/staging/csr/csr_wifi_hip_ta_sampling.h
+++ b/drivers/staging/csr/csr_wifi_hip_ta_sampling.h
@@ -21,10 +21,6 @@
 #ifndef __TA_SAMPLING_H__
 #define __TA_SAMPLING_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include "csr_wifi_hip_unifi.h"
 
 typedef struct ta_l4stats
@@ -67,9 +63,4 @@ typedef struct ta_data
 
 void unifi_ta_sampling_init(card_t *card);
 
-
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* __TA_SAMPLING_H__ */
diff --git a/drivers/staging/csr/csr_wifi_hip_unifi.h b/drivers/staging/csr/csr_wifi_hip_unifi.h
index 2923e2ef12f2..c2a2231680f5 100644
--- a/drivers/staging/csr/csr_wifi_hip_unifi.h
+++ b/drivers/staging/csr/csr_wifi_hip_unifi.h
@@ -20,10 +20,6 @@
 #ifndef __CSR_WIFI_HIP_UNIFI_H__
 #define __CSR_WIFI_HIP_UNIFI_H__ 1
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #ifndef CSR_WIFI_HIP_TA_DISABLE
 #include "csr_wifi_router_ctrl_prim.h"
 #include "csr_wifi_router_prim.h"
@@ -228,7 +224,7 @@ typedef struct unifi_coredump_req
     u32 chip_ver;                 /* Chip version */
     u32 fw_ver;                   /* Firmware version */
     s32  requestor;                /* Requestor: 0=auto dump, 1=manual */
-    CsrTime   timestamp;                /* time of capture by driver */
+    u32 timestamp;                /* time of capture by driver */
     u32 serial;                   /* capture serial number */
     s32  value;                    /* register value */
 } unifi_coredump_req_t;                 /* mini-coredumped reg value request */
@@ -872,8 +868,4 @@ CsrResult unifi_coredump_request_at_next_reset(card_t *card, s8 enable);
 CsrResult unifi_coredump_init(card_t *card, u16 num_dump_buffers);
 void unifi_coredump_free(card_t *card);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* __CSR_WIFI_HIP_UNIFI_H__ */
diff --git a/drivers/staging/csr/csr_wifi_hip_unifi_signal_names.c b/drivers/staging/csr/csr_wifi_hip_unifi_signal_names.c
index 7c13df295c11..9a3528599f3c 100644
--- a/drivers/staging/csr/csr_wifi_hip_unifi_signal_names.c
+++ b/drivers/staging/csr/csr_wifi_hip_unifi_signal_names.c
@@ -10,37 +10,32 @@
 
 #include "csr_wifi_hip_unifi.h"
 
-struct sig_name
-{
-    s16             id;
-    const char *name;
+struct sig_name {
+        s16 id;
+        const char *name;
 };
 
 static const struct sig_name Unifi_bulkcmd_names[] = {
-    {  0, "SignalCmd" },
-    {  1, "CopyToHost" },
-    {  2, "CopyToHostAck" },
-    {  3, "CopyFromHost" },
-    {  4, "CopyFromHostAck" },
-    {  5, "ClearSlot" },
-    {  6, "CopyOverlay" },
-    {  7, "CopyOverlayAck" },
-    {  8, "CopyFromHostAndClearSlot" },
-    {  15, "Padding" }
+        { 0, "SignalCmd" },
+        { 1, "CopyToHost" },
+        { 2, "CopyToHostAck" },
+        { 3, "CopyFromHost" },
+        { 4, "CopyFromHostAck" },
+        { 5, "ClearSlot" },
+        { 6, "CopyOverlay" },
+        { 7, "CopyOverlayAck" },
+        { 8, "CopyFromHostAndClearSlot" },
+        { 15, "Padding" }
 };
 
-const char* lookup_bulkcmd_name(u16 id)
+const char *lookup_bulkcmd_name(u16 id)
 {
-    if (id < 9)
-    {
-        return Unifi_bulkcmd_names[id].name;
-    }
-    if (id == 15)
-    {
-        return "Padding";
-    }
-
-    return "UNKNOWN";
+        if (id < 9)
+                return Unifi_bulkcmd_names[id].name;
+        if (id == 15)
+                return "Padding";
+
+        return "UNKNOWN";
 }
 
 
diff --git a/drivers/staging/csr/csr_wifi_hip_unifi_udi.h b/drivers/staging/csr/csr_wifi_hip_unifi_udi.h
index 83032d0b4ec9..9d85cfd57616 100644
--- a/drivers/staging/csr/csr_wifi_hip_unifi_udi.h
+++ b/drivers/staging/csr/csr_wifi_hip_unifi_udi.h
@@ -20,10 +20,6 @@
 #ifndef __CSR_WIFI_HIP_UNIFI_UDI_H__
 #define __CSR_WIFI_HIP_UNIFI_UDI_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include "csr_wifi_hip_unifi.h"
 #include "csr_wifi_hip_signals.h"
 
@@ -68,9 +64,4 @@ s32 unifi_print_status(card_t *card, char *str, s32 *remain);
         }                                                           \
     } while (0)
 
-
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* __CSR_WIFI_HIP_UNIFI_UDI_H__ */
diff --git a/drivers/staging/csr/csr_wifi_hip_unifihw.h b/drivers/staging/csr/csr_wifi_hip_unifihw.h
index 5ffd6ba38d3b..3f9fcbd55b55 100644
--- a/drivers/staging/csr/csr_wifi_hip_unifihw.h
+++ b/drivers/staging/csr/csr_wifi_hip_unifihw.h
@@ -20,10 +20,6 @@
 #ifndef __UNIFIHW_H__
 #define __UNIFIHW_H__ 1
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Symbol Look Up Table fingerprint. IDs are in sigs.h */
 #define SLUT_FINGERPRINT        0xD397
 
@@ -60,8 +56,4 @@ extern "C" {
 #define UNIFI_GP_OFFSET(GP)  ((GP) & 0xFFFFFF)
 #define UNIFI_GP_SPACE(GP)   (((GP) >> 24) & 0xFF)
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* __UNIFIHW_H__ */
diff --git a/drivers/staging/csr/csr_wifi_hip_unifiversion.h b/drivers/staging/csr/csr_wifi_hip_unifiversion.h
index e1fdbb27a463..d1c66783f32c 100644
--- a/drivers/staging/csr/csr_wifi_hip_unifiversion.h
+++ b/drivers/staging/csr/csr_wifi_hip_unifiversion.h
@@ -21,18 +21,10 @@
 #ifndef __UNIFIVERSION_H__
 #define __UNIFIVERSION_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /*
  * The minimum version of Host Interface Protocol required by the driver.
  */
 #define UNIFI_HIP_MAJOR_VERSION 9
 #define UNIFI_HIP_MINOR_VERSION 1
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* __UNIFIVERSION_H__ */
diff --git a/drivers/staging/csr/csr_wifi_hip_xbv.c b/drivers/staging/csr/csr_wifi_hip_xbv.c
index 071f80a49f19..050a15fbadf9 100644
--- a/drivers/staging/csr/csr_wifi_hip_xbv.c
+++ b/drivers/staging/csr/csr_wifi_hip_xbv.c
@@ -758,7 +758,7 @@ static u32 write_fwdl_to_ptdl(void *buf, const u32 offset, fwreadfn_t readfn,
     while (left)
     {
         /* Calculate amount to be transferred */
-        sec_data_len = CSRMIN(left, PTDL_MAX_SIZE - PTDL_HDR_SIZE);
+        sec_data_len = min_t(u32, left, PTDL_MAX_SIZE - PTDL_HDR_SIZE);
         sec_len = sec_data_len + PTDL_HDR_SIZE;
 
         /* Write PTDL header + entire PTDL size */
diff --git a/drivers/staging/csr/csr_wifi_hip_xbv.h b/drivers/staging/csr/csr_wifi_hip_xbv.h
index 9b60a7e2dc78..3c507235323d 100644
--- a/drivers/staging/csr/csr_wifi_hip_xbv.h
+++ b/drivers/staging/csr/csr_wifi_hip_xbv.h
@@ -21,10 +21,6 @@
 #ifndef __XBV_H__
 #define __XBV_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #ifndef CSR_WIFI_XBV_TEST
 /* Driver includes */
 #include "csr_wifi_hip_unifi.h"
@@ -120,8 +116,4 @@ s32 xbv1_read_slut(card_t *card, fwreadfn_t readfn, void *dlpriv, xbv1_t *fwinfo
 void* xbv_to_patch(card_t *card, fwreadfn_t readfn, const void *fw_buf, const xbv1_t *fwinfo,
                    u32 *size);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* __XBV_H__ */
diff --git a/drivers/staging/csr/csr_wifi_hostio_prim.h b/drivers/staging/csr/csr_wifi_hostio_prim.h
index bf7c55c6e84b..cfb3e272e359 100644
--- a/drivers/staging/csr/csr_wifi_hostio_prim.h
+++ b/drivers/staging/csr/csr_wifi_hostio_prim.h
@@ -12,16 +12,7 @@
 #ifndef CSR_WIFI_HOSTIO_H
 #define CSR_WIFI_HOSTIO_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
 #define CSR_WIFI_HOSTIO_PRIM 0x0453
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* CSR_WIFI_HOSTIO_H */
 
diff --git a/drivers/staging/csr/csr_wifi_lib.h b/drivers/staging/csr/csr_wifi_lib.h
index eb56f6208871..5fde0efb5dca 100644
--- a/drivers/staging/csr/csr_wifi_lib.h
+++ b/drivers/staging/csr/csr_wifi_lib.h
@@ -12,11 +12,6 @@
 
 #include "csr_wifi_fsm_event.h"
 
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /*----------------------------------------------------------------------------*
  *  CsrWifiFsmEventInit
  *
@@ -105,8 +100,4 @@ typedef struct
  *----------------------------------------------------------------------------*/
 CsrWifiEventCsrUint16CsrUint8* CsrWifiEventCsrUint16CsrUint8_struct(u16 primtype, u16 msgtype, CsrSchedQid dst, CsrSchedQid src, u16 value16, u8 value8);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* CSR_WIFI_LIB_H__ */
diff --git a/drivers/staging/csr/csr_wifi_msgconv.h b/drivers/staging/csr/csr_wifi_msgconv.h
index 7ec35d70e14a..f8b402947a09 100644
--- a/drivers/staging/csr/csr_wifi_msgconv.h
+++ b/drivers/staging/csr/csr_wifi_msgconv.h
@@ -14,11 +14,6 @@
 #include "csr_prim_defs.h"
 #include "csr_sched.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
 void CsrUint16SerBigEndian(u8 *ptr, size_t *len, u16 v);
 void CsrUint24SerBigEndian(u8 *ptr, size_t *len, u32 v);
 void CsrUint32SerBigEndian(u8 *ptr, size_t *len, u32 v);
@@ -51,8 +46,4 @@ size_t CsrWifiEventCsrUint16CsrUint8Sizeof(void *msg);
 u8* CsrWifiEventCsrUint16CsrUint8Ser(u8 *ptr, size_t *len, void *msg);
 void* CsrWifiEventCsrUint16CsrUint8Des(u8 *buffer, size_t length);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* CSR_WIFI_MSGCONV_H__ */
diff --git a/drivers/staging/csr/csr_wifi_nme_ap_converter_init.h b/drivers/staging/csr/csr_wifi_nme_ap_converter_init.h
index 4072c06a152d..b89d7c7f8e21 100644
--- a/drivers/staging/csr/csr_wifi_nme_ap_converter_init.h
+++ b/drivers/staging/csr/csr_wifi_nme_ap_converter_init.h
@@ -13,10 +13,6 @@
 #ifndef CSR_WIFI_NME_AP_CONVERTER_INIT_H__
 #define CSR_WIFI_NME_AP_CONVERTER_INIT_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #ifndef CSR_WIFI_NME_ENABLE
 #error CSR_WIFI_NME_ENABLE MUST be defined inorder to use csr_wifi_nme_ap_converter_init.h
 #endif
@@ -42,8 +38,4 @@ extern void CsrWifiNmeApConverterInit(void);
 
 #endif /* EXCLUDE_CSR_WIFI_NME_AP_MODULE */
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* CSR_WIFI_NME_AP_CONVERTER_INIT_H__ */
diff --git a/drivers/staging/csr/csr_wifi_nme_ap_lib.h b/drivers/staging/csr/csr_wifi_nme_ap_lib.h
index d4014709112b..6d8df8366817 100644
--- a/drivers/staging/csr/csr_wifi_nme_ap_lib.h
+++ b/drivers/staging/csr/csr_wifi_nme_ap_lib.h
@@ -22,11 +22,6 @@
 #include "csr_wifi_nme_ap_prim.h"
 #include "csr_wifi_nme_task.h"
 
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #ifndef CSR_WIFI_NME_ENABLE
 #error CSR_WIFI_NME_ENABLE MUST be defined inorder to use csr_wifi_nme_ap_lib.h
 #endif
@@ -58,24 +53,6 @@ void CsrWifiNmeApFreeUpstreamMessageContents(u16 eventClass, void *message);
  *----------------------------------------------------------------------------*/
 void CsrWifiNmeApFreeDownstreamMessageContents(u16 eventClass, void *message);
 
-/*----------------------------------------------------------------------------*
- * Enum to string functions
- *----------------------------------------------------------------------------*/
-const char* CsrWifiNmeApPersCredentialTypeToString(CsrWifiNmeApPersCredentialType value);
-
-
-/*----------------------------------------------------------------------------*
- * CsrPrim Type toString function.
- * Converts a message type to the String name of the Message
- *----------------------------------------------------------------------------*/
-const char* CsrWifiNmeApPrimTypeToString(CsrPrim msgType);
-
-/*----------------------------------------------------------------------------*
- * Lookup arrays for PrimType name Strings
- *----------------------------------------------------------------------------*/
-extern const char *CsrWifiNmeApUpstreamPrimNames[CSR_WIFI_NME_AP_PRIM_UPSTREAM_COUNT];
-extern const char *CsrWifiNmeApDownstreamPrimNames[CSR_WIFI_NME_AP_PRIM_DOWNSTREAM_COUNT];
-
 /*******************************************************************************
 
   NAME
@@ -515,9 +492,4 @@ extern const char *CsrWifiNmeApDownstreamPrimNames[CSR_WIFI_NME_AP_PRIM_DOWNSTRE
 #define CsrWifiNmeApWpsRegisterCfmSend(dst__, interfaceTag__, status__) \
     CsrWifiNmeApWpsRegisterCfmSendTo(dst__, CSR_WIFI_NME_IFACEQUEUE, interfaceTag__, status__)
 
-
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* CSR_WIFI_NME_AP_LIB_H__ */
diff --git a/drivers/staging/csr/csr_wifi_nme_ap_prim.h b/drivers/staging/csr/csr_wifi_nme_ap_prim.h
index fc44560b28b8..b32bdbc7e22f 100644
--- a/drivers/staging/csr/csr_wifi_nme_ap_prim.h
+++ b/drivers/staging/csr/csr_wifi_nme_ap_prim.h
@@ -22,10 +22,6 @@
 #include "csr_wifi_sme_ap_prim.h"
 #include "csr_wifi_nme_prim.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #ifndef CSR_WIFI_NME_ENABLE
 #error CSR_WIFI_NME_ENABLE MUST be defined inorder to use csr_wifi_nme_ap_prim.h
 #endif
@@ -494,10 +490,5 @@ typedef struct
     CsrWifiMacAddress     peerDeviceAddress;
 } CsrWifiNmeApStationInd;
 
-
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* CSR_WIFI_NME_AP_PRIM_H__ */
 
diff --git a/drivers/staging/csr/csr_wifi_nme_ap_sef.h b/drivers/staging/csr/csr_wifi_nme_ap_sef.h
index 3f353633fa5e..3daaa0944dba 100644
--- a/drivers/staging/csr/csr_wifi_nme_ap_sef.h
+++ b/drivers/staging/csr/csr_wifi_nme_ap_sef.h
@@ -11,11 +11,6 @@
 
 #include "csr_wifi_nme_prim.h"
 
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 void CsrWifiNmeApUpstreamStateHandlers(void* drvpriv, CsrWifiFsmEvent* msg);
 
 
@@ -23,9 +18,4 @@ extern void CsrWifiNmeApConfigSetCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg)
 extern void CsrWifiNmeApStartCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg);
 extern void CsrWifiNmeApStopCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg);
 
-
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* CSR_WIFI_ROUTER_SEF_CSR_WIFI_NME_H__ */
diff --git a/drivers/staging/csr/csr_wifi_nme_ap_serialize.h b/drivers/staging/csr/csr_wifi_nme_ap_serialize.h
index 0f5782947223..c04585e72460 100644
--- a/drivers/staging/csr/csr_wifi_nme_ap_serialize.h
+++ b/drivers/staging/csr/csr_wifi_nme_ap_serialize.h
@@ -17,10 +17,6 @@
 
 #include "csr_wifi_nme_ap_prim.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #ifndef CSR_WIFI_NME_ENABLE
 #error CSR_WIFI_NME_ENABLE MUST be defined inorder to use csr_wifi_nme_ap_serialize.h
 #endif
@@ -95,9 +91,4 @@ extern void* CsrWifiNmeApStationIndDes(u8 *buffer, size_t len);
 extern size_t CsrWifiNmeApStationIndSizeof(void *msg);
 #define CsrWifiNmeApStationIndSerFree CsrWifiNmeApPfree
 
-
-#ifdef __cplusplus
-}
-#endif
 #endif /* CSR_WIFI_NME_AP_SERIALIZE_H__ */
-
diff --git a/drivers/staging/csr/csr_wifi_nme_converter_init.h b/drivers/staging/csr/csr_wifi_nme_converter_init.h
index 6661914fb403..85e6f5f57130 100644
--- a/drivers/staging/csr/csr_wifi_nme_converter_init.h
+++ b/drivers/staging/csr/csr_wifi_nme_converter_init.h
@@ -13,10 +13,6 @@
 #ifndef CSR_WIFI_NME_CONVERTER_INIT_H__
 #define CSR_WIFI_NME_CONVERTER_INIT_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #ifndef CSR_WIFI_NME_ENABLE
 #error CSR_WIFI_NME_ENABLE MUST be defined inorder to use csr_wifi_nme_converter_init.h
 #endif
@@ -39,8 +35,4 @@ extern void CsrWifiNmeConverterInit(void);
 
 #endif /* EXCLUDE_CSR_WIFI_NME_MODULE */
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* CSR_WIFI_NME_CONVERTER_INIT_H__ */
diff --git a/drivers/staging/csr/csr_wifi_nme_lib.h b/drivers/staging/csr/csr_wifi_nme_lib.h
index 709ece464977..5a1f132009bf 100644
--- a/drivers/staging/csr/csr_wifi_nme_lib.h
+++ b/drivers/staging/csr/csr_wifi_nme_lib.h
@@ -23,68 +23,10 @@
 #include "csr_wifi_nme_task.h"
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #ifndef CSR_WIFI_NME_ENABLE
 #error CSR_WIFI_NME_ENABLE MUST be defined inorder to use csr_wifi_nme_lib.h
 #endif
 
-/*----------------------------------------------------------------------------*
- *  CsrWifiNmeFreeUpstreamMessageContents
- *
- *  DESCRIPTION
- *      Free the allocated memory in a CSR_WIFI_NME upstream message. Does not
- *      free the message itself, and can only be used for upstream messages.
- *
- *  PARAMETERS
- *      Deallocates the resources in a CSR_WIFI_NME upstream message
- *----------------------------------------------------------------------------*/
-void CsrWifiNmeFreeUpstreamMessageContents(u16 eventClass, void *message);
-
-/*----------------------------------------------------------------------------*
- *  CsrWifiNmeFreeDownstreamMessageContents
- *
- *  DESCRIPTION
- *      Free the allocated memory in a CSR_WIFI_NME downstream message. Does not
- *      free the message itself, and can only be used for downstream messages.
- *
- *  PARAMETERS
- *      Deallocates the resources in a CSR_WIFI_NME downstream message
- *----------------------------------------------------------------------------*/
-void CsrWifiNmeFreeDownstreamMessageContents(u16 eventClass, void *message);
-
-/*----------------------------------------------------------------------------*
- * Enum to string functions
- *----------------------------------------------------------------------------*/
-const char* CsrWifiNmeAuthModeToString(CsrWifiNmeAuthMode value);
-const char* CsrWifiNmeBssTypeToString(CsrWifiNmeBssType value);
-const char* CsrWifiNmeCcxOptionsMaskToString(CsrWifiNmeCcxOptionsMask value);
-const char* CsrWifiNmeConfigActionToString(CsrWifiNmeConfigAction value);
-const char* CsrWifiNmeConnectionStatusToString(CsrWifiNmeConnectionStatus value);
-const char* CsrWifiNmeCredentialTypeToString(CsrWifiNmeCredentialType value);
-const char* CsrWifiNmeEapMethodToString(CsrWifiNmeEapMethod value);
-const char* CsrWifiNmeEncryptionToString(CsrWifiNmeEncryption value);
-const char* CsrWifiNmeIndicationsToString(CsrWifiNmeIndications value);
-const char* CsrWifiNmeSecErrorToString(CsrWifiNmeSecError value);
-const char* CsrWifiNmeSimCardTypeToString(CsrWifiNmeSimCardType value);
-const char* CsrWifiNmeUmtsAuthResultToString(CsrWifiNmeUmtsAuthResult value);
-const char* CsrWifiNmeWmmQosInfoToString(CsrWifiNmeWmmQosInfo value);
-
-
-/*----------------------------------------------------------------------------*
- * CsrPrim Type toString function.
- * Converts a message type to the String name of the Message
- *----------------------------------------------------------------------------*/
-const char* CsrWifiNmePrimTypeToString(CsrPrim msgType);
-
-/*----------------------------------------------------------------------------*
- * Lookup arrays for PrimType name Strings
- *----------------------------------------------------------------------------*/
-extern const char *CsrWifiNmeUpstreamPrimNames[CSR_WIFI_NME_PRIM_UPSTREAM_COUNT];
-extern const char *CsrWifiNmeDownstreamPrimNames[CSR_WIFI_NME_PRIM_DOWNSTREAM_COUNT];
-
 /*******************************************************************************
 
   NAME
@@ -1046,9 +988,4 @@ extern const char *CsrWifiNmeDownstreamPrimNames[CSR_WIFI_NME_PRIM_DOWNSTREAM_CO
 #define CsrWifiNmeWpsReqSend(src__, interfaceTag__, pin__, ssid__, bssid__) \
     CsrWifiNmeWpsReqSendTo(CSR_WIFI_NME_IFACEQUEUE, src__, interfaceTag__, pin__, ssid__, bssid__)
 
-
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* CSR_WIFI_NME_LIB_H__ */
diff --git a/drivers/staging/csr/csr_wifi_nme_prim.h b/drivers/staging/csr/csr_wifi_nme_prim.h
index 20dc77971f94..9a7927a117ea 100644
--- a/drivers/staging/csr/csr_wifi_nme_prim.h
+++ b/drivers/staging/csr/csr_wifi_nme_prim.h
@@ -21,10 +21,6 @@
 #include "csr_wifi_fsm_event.h"
 #include "csr_wifi_sme_prim.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #ifndef CSR_WIFI_NME_ENABLE
 #error CSR_WIFI_NME_ENABLE MUST be defined inorder to use csr_wifi_nme_prim.h
 #endif
@@ -1657,10 +1653,5 @@ typedef struct
     CsrResult       status;
 } CsrWifiNmeEventMaskSetCfm;
 
-
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* CSR_WIFI_NME_PRIM_H__ */
 
diff --git a/drivers/staging/csr/csr_wifi_nme_serialize.h b/drivers/staging/csr/csr_wifi_nme_serialize.h
index c6b163660a3e..ebac484419cf 100644
--- a/drivers/staging/csr/csr_wifi_nme_serialize.h
+++ b/drivers/staging/csr/csr_wifi_nme_serialize.h
@@ -16,10 +16,6 @@
 #include "csr_wifi_msgconv.h"
 #include "csr_wifi_nme_prim.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #ifndef CSR_WIFI_NME_ENABLE
 #error CSR_WIFI_NME_ENABLE MUST be defined inorder to use csr_wifi_nme_serialize.h
 #endif
@@ -166,9 +162,5 @@ extern size_t CsrWifiNmeSimUmtsAuthIndSizeof(void *msg);
 #define CsrWifiNmeEventMaskSetCfmSizeof CsrWifiEventCsrUint16Sizeof
 #define CsrWifiNmeEventMaskSetCfmSerFree CsrWifiNmePfree
 
-
-#ifdef __cplusplus
-}
-#endif
 #endif /* CSR_WIFI_NME_SERIALIZE_H__ */
 
diff --git a/drivers/staging/csr/csr_wifi_nme_task.h b/drivers/staging/csr/csr_wifi_nme_task.h
index 76f44dbe26a9..84e973a59bb2 100644
--- a/drivers/staging/csr/csr_wifi_nme_task.h
+++ b/drivers/staging/csr/csr_wifi_nme_task.h
@@ -16,23 +16,12 @@
 #include <linux/types.h>
 #include "csr_sched.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #ifndef CSR_WIFI_NME_ENABLE
 #error CSR_WIFI_NME_ENABLE MUST be defined inorder to use csr_wifi_nme_task.h
 #endif
 
 #define CSR_WIFI_NME_LOG_ID 0x1203FFFF
 extern CsrSchedQid CSR_WIFI_NME_IFACEQUEUE;
-void CsrWifiNmeInit(void **gash);
-void CsrWifiNmeDeinit(void **gash);
-void CsrWifiNmeHandler(void **gash);
-
-#ifdef __cplusplus
-}
-#endif
 
 #endif /* CSR_WIFI_NME_TASK_H__ */
 
diff --git a/drivers/staging/csr/csr_wifi_private_common.h b/drivers/staging/csr/csr_wifi_private_common.h
index 47309984e2a7..ee3bd51b934a 100644
--- a/drivers/staging/csr/csr_wifi_private_common.h
+++ b/drivers/staging/csr/csr_wifi_private_common.h
@@ -11,10 +11,6 @@
 #ifndef CSR_WIFI_PRIVATE_COMMON_H__
 #define CSR_WIFI_PRIVATE_COMMON_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /**
  * @brief maximum number of STAs allowed to be connected
  *
@@ -81,9 +77,5 @@ typedef u8 CsrWifiInterfaceMode;
 #define  CSR_WIFI_MODE_WPS_ENROLLEE                     ((CsrWifiInterfaceMode) 0x06)
 #define  CSR_WIFI_MODE_IBSS                             ((CsrWifiInterfaceMode) 0x07)
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif
 
diff --git a/drivers/staging/csr/csr_wifi_result.h b/drivers/staging/csr/csr_wifi_result.h
index 2f87cda9003e..3c394c7e5fa9 100644
--- a/drivers/staging/csr/csr_wifi_result.h
+++ b/drivers/staging/csr/csr_wifi_result.h
@@ -13,10 +13,6 @@
 
 #include "csr_result.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* THIS FILE SHOULD CONTAIN ONLY RESULT CODES */
 
 /* Result Codes */
@@ -27,9 +23,5 @@ extern "C" {
 #define CSR_WIFI_HIP_RESULT_RANGE            ((CsrResult) 5) /* Request exceeds the range of a file or a buffer */
 #define CSR_WIFI_HIP_RESULT_NOT_FOUND        ((CsrResult) 6) /* A file (typically a f/w patch) is not found */
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* CSR_WIFI_RESULT_H__ */
 
diff --git a/drivers/staging/csr/csr_wifi_router_converter_init.h b/drivers/staging/csr/csr_wifi_router_converter_init.h
index 2a293e457ffb..478327b75c18 100644
--- a/drivers/staging/csr/csr_wifi_router_converter_init.h
+++ b/drivers/staging/csr/csr_wifi_router_converter_init.h
@@ -13,10 +13,6 @@
 #ifndef CSR_WIFI_ROUTER_CONVERTER_INIT_H__
 #define CSR_WIFI_ROUTER_CONVERTER_INIT_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #ifndef EXCLUDE_CSR_WIFI_ROUTER_MODULE
 
 #include "csr_msgconv.h"
@@ -35,8 +31,4 @@ extern void CsrWifiRouterConverterInit(void);
 
 #endif /* EXCLUDE_CSR_WIFI_ROUTER_MODULE */
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* CSR_WIFI_ROUTER_CONVERTER_INIT_H__ */
diff --git a/drivers/staging/csr/csr_wifi_router_ctrl_converter_init.h b/drivers/staging/csr/csr_wifi_router_ctrl_converter_init.h
index 0c9d26b7a0b4..c98458912825 100644
--- a/drivers/staging/csr/csr_wifi_router_ctrl_converter_init.h
+++ b/drivers/staging/csr/csr_wifi_router_ctrl_converter_init.h
@@ -13,10 +13,6 @@
 #ifndef CSR_WIFI_ROUTER_CTRL_CONVERTER_INIT_H__
 #define CSR_WIFI_ROUTER_CTRL_CONVERTER_INIT_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #ifndef EXCLUDE_CSR_WIFI_ROUTER_CTRL_MODULE
 
 #include "csr_msgconv.h"
@@ -35,8 +31,4 @@ extern void CsrWifiRouterCtrlConverterInit(void);
 
 #endif /* EXCLUDE_CSR_WIFI_ROUTER_CTRL_MODULE */
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* CSR_WIFI_ROUTER_CTRL_CONVERTER_INIT_H__ */
diff --git a/drivers/staging/csr/csr_wifi_router_ctrl_lib.h b/drivers/staging/csr/csr_wifi_router_ctrl_lib.h
index 93d0fadf5e6f..f235153c42af 100644
--- a/drivers/staging/csr/csr_wifi_router_ctrl_lib.h
+++ b/drivers/staging/csr/csr_wifi_router_ctrl_lib.h
@@ -22,11 +22,6 @@
 #include "csr_wifi_router_ctrl_prim.h"
 #include "csr_wifi_router_task.h"
 
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /*----------------------------------------------------------------------------*
  *  CsrWifiRouterCtrlFreeUpstreamMessageContents
  *
@@ -2084,9 +2079,4 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI
 #define CsrWifiRouterCtrlWifiOnCfmSend(dst__, clientData__, status__) \
     CsrWifiRouterCtrlWifiOnCfmSendTo(dst__, CSR_WIFI_ROUTER_IFACEQUEUE, clientData__, status__)
 
-
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* CSR_WIFI_ROUTER_CTRL_LIB_H__ */
diff --git a/drivers/staging/csr/csr_wifi_router_ctrl_prim.h b/drivers/staging/csr/csr_wifi_router_ctrl_prim.h
index ec972ac0b5aa..1312a335dd76 100644
--- a/drivers/staging/csr/csr_wifi_router_ctrl_prim.h
+++ b/drivers/staging/csr/csr_wifi_router_ctrl_prim.h
@@ -20,10 +20,6 @@
 #include "csr_result.h"
 #include "csr_wifi_fsm_event.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #define CSR_WIFI_ROUTER_CTRL_PRIM                                       (0x0401)
 
 typedef CsrPrim CsrWifiRouterCtrlPrim;
@@ -2113,10 +2109,5 @@ typedef struct
     u8                      *data;
 } CsrWifiRouterCtrlWapiUnicastTxEncryptInd;
 
-
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* CSR_WIFI_ROUTER_CTRL_PRIM_H__ */
 
diff --git a/drivers/staging/csr/csr_wifi_router_ctrl_sef.c b/drivers/staging/csr/csr_wifi_router_ctrl_sef.c
index 33d92b698c59..99cf93061d1b 100644
--- a/drivers/staging/csr/csr_wifi_router_ctrl_sef.c
+++ b/drivers/staging/csr/csr_wifi_router_ctrl_sef.c
@@ -9,37 +9,38 @@
  *****************************************************************************/
 #include "csr_wifi_router_ctrl_sef.h"
 
-const CsrWifiRouterCtrlStateHandlerType CsrWifiRouterCtrlDownstreamStateHandlers[CSR_WIFI_ROUTER_CTRL_PRIM_DOWNSTREAM_COUNT] =
-{
-    /* 0x0000 */ CsrWifiRouterCtrlConfigurePowerModeReqHandler,
-    /* 0x0001 */ CsrWifiRouterCtrlHipReqHandler,
-    /* 0x0002 */ CsrWifiRouterCtrlMediaStatusReqHandler,
-    /* 0x0003 */ CsrWifiRouterCtrlMulticastAddressResHandler,
-    /* 0x0004 */ CsrWifiRouterCtrlPortConfigureReqHandler,
-    /* 0x0005 */ CsrWifiRouterCtrlQosControlReqHandler,
-    /* 0x0006 */ CsrWifiRouterCtrlSuspendResHandler,
-    /* 0x0007 */ CsrWifiRouterCtrlTclasAddReqHandler,
-    /* 0x0008 */ CsrWifiRouterCtrlResumeResHandler,
-    /* 0x0009 */ CsrWifiRouterCtrlRawSdioDeinitialiseReqHandler,
-    /* 0x000A */ CsrWifiRouterCtrlRawSdioInitialiseReqHandler,
-    /* 0x000B */ CsrWifiRouterCtrlTclasDelReqHandler,
-    /* 0x000C */ CsrWifiRouterCtrlTrafficClassificationReqHandler,
-    /* 0x000D */ CsrWifiRouterCtrlTrafficConfigReqHandler,
-    /* 0x000E */ CsrWifiRouterCtrlWifiOffReqHandler,
-    /* 0x000F */ CsrWifiRouterCtrlWifiOffResHandler,
-    /* 0x0010 */ CsrWifiRouterCtrlWifiOnReqHandler,
-    /* 0x0011 */ CsrWifiRouterCtrlWifiOnResHandler,
-    /* 0x0012 */ CsrWifiRouterCtrlM4TransmitReqHandler,
-    /* 0x0013 */ CsrWifiRouterCtrlModeSetReqHandler,
-    /* 0x0014 */ CsrWifiRouterCtrlPeerAddReqHandler,
-    /* 0x0015 */ CsrWifiRouterCtrlPeerDelReqHandler,
-    /* 0x0016 */ CsrWifiRouterCtrlPeerUpdateReqHandler,
-    /* 0x0017 */ CsrWifiRouterCtrlCapabilitiesReqHandler,
-    /* 0x0018 */ CsrWifiRouterCtrlBlockAckEnableReqHandler,
-    /* 0x0019 */ CsrWifiRouterCtrlBlockAckDisableReqHandler,
-    /* 0x001A */ CsrWifiRouterCtrlWapiRxPktReqHandler,
-    /* 0x001B */ CsrWifiRouterCtrlWapiMulticastFilterReqHandler,
-    /* 0x001C */ CsrWifiRouterCtrlWapiUnicastFilterReqHandler,
-    /* 0x001D */ CsrWifiRouterCtrlWapiUnicastTxPktReqHandler,
-    /* 0x001E */ CsrWifiRouterCtrlWapiFilterReqHandler,
+const CsrWifiRouterCtrlStateHandlerType
+        CsrWifiRouterCtrlDownstreamStateHandlers
+        [CSR_WIFI_ROUTER_CTRL_PRIM_DOWNSTREAM_COUNT] = {
+                /* 0x0000 */ CsrWifiRouterCtrlConfigurePowerModeReqHandler,
+                /* 0x0001 */ CsrWifiRouterCtrlHipReqHandler,
+                /* 0x0002 */ CsrWifiRouterCtrlMediaStatusReqHandler,
+                /* 0x0003 */ CsrWifiRouterCtrlMulticastAddressResHandler,
+                /* 0x0004 */ CsrWifiRouterCtrlPortConfigureReqHandler,
+                /* 0x0005 */ CsrWifiRouterCtrlQosControlReqHandler,
+                /* 0x0006 */ CsrWifiRouterCtrlSuspendResHandler,
+                /* 0x0007 */ CsrWifiRouterCtrlTclasAddReqHandler,
+                /* 0x0008 */ CsrWifiRouterCtrlResumeResHandler,
+                /* 0x0009 */ CsrWifiRouterCtrlRawSdioDeinitialiseReqHandler,
+                /* 0x000A */ CsrWifiRouterCtrlRawSdioInitialiseReqHandler,
+                /* 0x000B */ CsrWifiRouterCtrlTclasDelReqHandler,
+                /* 0x000C */ CsrWifiRouterCtrlTrafficClassificationReqHandler,
+                /* 0x000D */ CsrWifiRouterCtrlTrafficConfigReqHandler,
+                /* 0x000E */ CsrWifiRouterCtrlWifiOffReqHandler,
+                /* 0x000F */ CsrWifiRouterCtrlWifiOffResHandler,
+                /* 0x0010 */ CsrWifiRouterCtrlWifiOnReqHandler,
+                /* 0x0011 */ CsrWifiRouterCtrlWifiOnResHandler,
+                /* 0x0012 */ CsrWifiRouterCtrlM4TransmitReqHandler,
+                /* 0x0013 */ CsrWifiRouterCtrlModeSetReqHandler,
+                /* 0x0014 */ CsrWifiRouterCtrlPeerAddReqHandler,
+                /* 0x0015 */ CsrWifiRouterCtrlPeerDelReqHandler,
+                /* 0x0016 */ CsrWifiRouterCtrlPeerUpdateReqHandler,
+                /* 0x0017 */ CsrWifiRouterCtrlCapabilitiesReqHandler,
+                /* 0x0018 */ CsrWifiRouterCtrlBlockAckEnableReqHandler,
+                /* 0x0019 */ CsrWifiRouterCtrlBlockAckDisableReqHandler,
+                /* 0x001A */ CsrWifiRouterCtrlWapiRxPktReqHandler,
+                /* 0x001B */ CsrWifiRouterCtrlWapiMulticastFilterReqHandler,
+                /* 0x001C */ CsrWifiRouterCtrlWapiUnicastFilterReqHandler,
+                /* 0x001D */ CsrWifiRouterCtrlWapiUnicastTxPktReqHandler,
+                /* 0x001E */ CsrWifiRouterCtrlWapiFilterReqHandler,
 };
diff --git a/drivers/staging/csr/csr_wifi_router_ctrl_sef.h b/drivers/staging/csr/csr_wifi_router_ctrl_sef.h
index e0ee5cf45f9e..2fb4937bc909 100644
--- a/drivers/staging/csr/csr_wifi_router_ctrl_sef.h
+++ b/drivers/staging/csr/csr_wifi_router_ctrl_sef.h
@@ -12,10 +12,6 @@
 
 #include "csr_wifi_router_ctrl_prim.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
     typedef void (*CsrWifiRouterCtrlStateHandlerType)(void* drvpriv, CsrWifiFsmEvent* msg);
 
     extern const CsrWifiRouterCtrlStateHandlerType CsrWifiRouterCtrlDownstreamStateHandlers[CSR_WIFI_ROUTER_CTRL_PRIM_DOWNSTREAM_COUNT];
@@ -51,8 +47,5 @@ extern "C" {
     extern void CsrWifiRouterCtrlWapiUnicastTxPktReqHandler(void* drvpriv, CsrWifiFsmEvent* msg);
     extern void CsrWifiRouterCtrlWapiUnicastFilterReqHandler(void* drvpriv, CsrWifiFsmEvent* msg);
     extern void CsrWifiRouterCtrlWapiFilterReqHandler(void* drvpriv, CsrWifiFsmEvent* msg);
-#ifdef __cplusplus
-}
-#endif
 
 #endif /* CSR_WIFI_ROUTER_SEF_CSR_WIFI_ROUTER_CTRL_H__ */
diff --git a/drivers/staging/csr/csr_wifi_router_ctrl_serialize.h b/drivers/staging/csr/csr_wifi_router_ctrl_serialize.h
index 2c2a229f4bf1..c9048386cfcb 100644
--- a/drivers/staging/csr/csr_wifi_router_ctrl_serialize.h
+++ b/drivers/staging/csr/csr_wifi_router_ctrl_serialize.h
@@ -17,10 +17,6 @@
 
 #include "csr_wifi_router_ctrl_prim.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 extern void CsrWifiRouterCtrlPfree(void *ptr);
 
 extern u8* CsrWifiRouterCtrlConfigurePowerModeReqSer(u8 *ptr, size_t *len, void *msg);
@@ -333,9 +329,5 @@ extern void* CsrWifiRouterCtrlWapiUnicastTxEncryptIndDes(u8 *buffer, size_t len)
 extern size_t CsrWifiRouterCtrlWapiUnicastTxEncryptIndSizeof(void *msg);
 extern void CsrWifiRouterCtrlWapiUnicastTxEncryptIndSerFree(void *msg);
 
-
-#ifdef __cplusplus
-}
-#endif
 #endif /* CSR_WIFI_ROUTER_CTRL_SERIALIZE_H__ */
 
diff --git a/drivers/staging/csr/csr_wifi_router_free_upstream_contents.c b/drivers/staging/csr/csr_wifi_router_free_upstream_contents.c
index de1086d7158d..4cd126338e27 100644
--- a/drivers/staging/csr/csr_wifi_router_free_upstream_contents.c
+++ b/drivers/staging/csr/csr_wifi_router_free_upstream_contents.c
@@ -1,10 +1,10 @@
 /*****************************************************************************
 
-            (c) Cambridge Silicon Radio Limited 2011
-            All rights reserved and confidential information of CSR
+        (c) Cambridge Silicon Radio Limited 2011
+        All rights reserved and confidential information of CSR
 
-            Refer to LICENSE.txt included with this source for details
-            on the license terms.
+        Refer to LICENSE.txt included with this source for details
+        on the license terms.
 
 *****************************************************************************/
 
@@ -26,28 +26,22 @@
  *----------------------------------------------------------------------------*/
 void CsrWifiRouterFreeUpstreamMessageContents(u16 eventClass, void *message)
 {
-    if (eventClass != CSR_WIFI_ROUTER_PRIM)
-    {
-        return;
-    }
-    if (NULL == message)
-    {
-        return;
-    }
-
-    switch (*((CsrWifiRouterPrim *) message))
-    {
-        case CSR_WIFI_ROUTER_MA_PACKET_IND:
-        {
-            CsrWifiRouterMaPacketInd *p = (CsrWifiRouterMaPacketInd *)message;
-            kfree(p->frame);
-            p->frame = NULL;
-            break;
-        }
-
-        default:
-            break;
-    }
+        if (eventClass != CSR_WIFI_ROUTER_PRIM)
+                return;
+        if (NULL == message)
+                return;
+        switch (*((CsrWifiRouterPrim *) message)) {
+        case CSR_WIFI_ROUTER_MA_PACKET_IND:
+        {
+                CsrWifiRouterMaPacketInd *p =
+                        (CsrWifiRouterMaPacketInd *) message;
+                kfree(p->frame);
+                p->frame = NULL;
+                break;
+        }
+        default:
+                break;
+        }
 }
 
 
diff --git a/drivers/staging/csr/csr_wifi_router_lib.h b/drivers/staging/csr/csr_wifi_router_lib.h
index 06a2214714b7..b0477c413aae 100644
--- a/drivers/staging/csr/csr_wifi_router_lib.h
+++ b/drivers/staging/csr/csr_wifi_router_lib.h
@@ -22,11 +22,6 @@
 #include "csr_wifi_router_prim.h"
 #include "csr_wifi_router_task.h"
 
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /*----------------------------------------------------------------------------*
  *  CsrWifiRouterFreeUpstreamMessageContents
  *
@@ -419,9 +414,4 @@ extern const char *CsrWifiRouterDownstreamPrimNames[CSR_WIFI_ROUTER_PRIM_DOWNSTR
 #define CsrWifiRouterMaPacketUnsubscribeCfmSend(dst__, interfaceTag__, status__) \
     CsrWifiRouterMaPacketUnsubscribeCfmSendTo(dst__, CSR_WIFI_ROUTER_IFACEQUEUE, interfaceTag__, status__)
 
-
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* CSR_WIFI_ROUTER_LIB_H__ */
diff --git a/drivers/staging/csr/csr_wifi_router_prim.h b/drivers/staging/csr/csr_wifi_router_prim.h
index c61486fbb6d6..c52344b51f2f 100644
--- a/drivers/staging/csr/csr_wifi_router_prim.h
+++ b/drivers/staging/csr/csr_wifi_router_prim.h
@@ -20,10 +20,6 @@
 #include "csr_result.h"
 #include "csr_wifi_fsm_event.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #define CSR_WIFI_ROUTER_PRIM                                            (0x0400)
 
 typedef CsrPrim CsrWifiRouterPrim;
@@ -421,10 +417,5 @@ typedef struct
     u16                      rate;
 } CsrWifiRouterMaPacketInd;
 
-
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* CSR_WIFI_ROUTER_PRIM_H__ */
 
diff --git a/drivers/staging/csr/csr_wifi_router_sef.h b/drivers/staging/csr/csr_wifi_router_sef.h
index 49dd158fa98d..86692c7780c9 100644
--- a/drivers/staging/csr/csr_wifi_router_sef.h
+++ b/drivers/staging/csr/csr_wifi_router_sef.h
@@ -12,10 +12,6 @@
 
 #include "csr_wifi_router_prim.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
     typedef void (*CsrWifiRouterStateHandlerType)(void* drvpriv, CsrWifiFsmEvent* msg);
 
     extern const CsrWifiRouterStateHandlerType CsrWifiRouterDownstreamStateHandlers[CSR_WIFI_ROUTER_PRIM_DOWNSTREAM_COUNT];
@@ -26,8 +22,4 @@ extern "C" {
     extern void CsrWifiRouterMaPacketResHandler(void* drvpriv, CsrWifiFsmEvent* msg);
     extern void CsrWifiRouterMaPacketCancelReqHandler(void* drvpriv, CsrWifiFsmEvent* msg);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* CSR_WIFI_ROUTER_SEF_CSR_WIFI_ROUTER_H__ */
diff --git a/drivers/staging/csr/csr_wifi_router_serialize.h b/drivers/staging/csr/csr_wifi_router_serialize.h
index 07e21b2b4363..94ccdac5606f 100644
--- a/drivers/staging/csr/csr_wifi_router_serialize.h
+++ b/drivers/staging/csr/csr_wifi_router_serialize.h
@@ -16,10 +16,6 @@
 #include "csr_wifi_msgconv.h"
 #include "csr_wifi_router_prim.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 extern void CsrWifiRouterPfree(void *ptr);
 
 extern u8* CsrWifiRouterMaPacketSubscribeReqSer(u8 *ptr, size_t *len, void *msg);
@@ -67,9 +63,5 @@ extern void* CsrWifiRouterMaPacketIndDes(u8 *buffer, size_t len);
 extern size_t CsrWifiRouterMaPacketIndSizeof(void *msg);
 extern void CsrWifiRouterMaPacketIndSerFree(void *msg);
 
-
-#ifdef __cplusplus
-}
-#endif
 #endif /* CSR_WIFI_ROUTER_SERIALIZE_H__ */
 
diff --git a/drivers/staging/csr/csr_wifi_router_task.h b/drivers/staging/csr/csr_wifi_router_task.h
index 4e51fae4cda0..9ba892f34e6d 100644
--- a/drivers/staging/csr/csr_wifi_router_task.h
+++ b/drivers/staging/csr/csr_wifi_router_task.h
@@ -15,19 +15,11 @@
 
 #include "csr_sched.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #define CSR_WIFI_ROUTER_LOG_ID 0x1201FFFF
 extern CsrSchedQid CSR_WIFI_ROUTER_IFACEQUEUE;
 void CsrWifiRouterInit(void **gash);
 void CsrWifiRouterDeinit(void **gash);
 void CsrWifiRouterHandler(void **gash);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* CSR_WIFI_ROUTER_TASK_H__ */
 
diff --git a/drivers/staging/csr/csr_wifi_sme_ap_lib.h b/drivers/staging/csr/csr_wifi_sme_ap_lib.h
index 350cb9ec3012..48ea9143f591 100644
--- a/drivers/staging/csr/csr_wifi_sme_ap_lib.h
+++ b/drivers/staging/csr/csr_wifi_sme_ap_lib.h
@@ -22,11 +22,6 @@
 #include "csr_wifi_sme_ap_prim.h"
 #include "csr_wifi_sme_task.h"
 
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #ifndef CSR_WIFI_AP_ENABLE
 #error CSR_WIFI_AP_ENABLE MUST be defined inorder to use csr_wifi_sme_ap_lib.h
 #endif
@@ -776,8 +771,4 @@ extern const char *CsrWifiSmeApDownstreamPrimNames[CSR_WIFI_SME_AP_PRIM_DOWNSTRE
     CsrWifiSmeApWpsRegistrationStartedCfmSendTo(dst__, CSR_WIFI_SME_IFACEQUEUE, interfaceTag__, status__)
 
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* CSR_WIFI_SME_AP_LIB_H__ */
diff --git a/drivers/staging/csr/csr_wifi_sme_ap_prim.h b/drivers/staging/csr/csr_wifi_sme_ap_prim.h
index 93b64e9154c8..3c4bcbc16126 100644
--- a/drivers/staging/csr/csr_wifi_sme_ap_prim.h
+++ b/drivers/staging/csr/csr_wifi_sme_ap_prim.h
@@ -20,10 +20,6 @@
 #include "csr_wifi_fsm_event.h"
 #include "csr_wifi_sme_prim.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #ifndef CSR_WIFI_AP_ENABLE
 #error CSR_WIFI_AP_ENABLE MUST be defined inorder to use csr_wifi_sme_ap_prim.h
 #endif
@@ -1030,9 +1026,5 @@ typedef struct
 } CsrWifiSmeApBaDeleteCfm;
 
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* CSR_WIFI_SME_AP_PRIM_H__ */
 
diff --git a/drivers/staging/csr/csr_wifi_sme_converter_init.h b/drivers/staging/csr/csr_wifi_sme_converter_init.h
index fb895dec7688..ba5e4b44bb6b 100644
--- a/drivers/staging/csr/csr_wifi_sme_converter_init.h
+++ b/drivers/staging/csr/csr_wifi_sme_converter_init.h
@@ -13,10 +13,6 @@
 #ifndef CSR_WIFI_SME_CONVERTER_INIT_H__
 #define CSR_WIFI_SME_CONVERTER_INIT_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #ifndef EXCLUDE_CSR_WIFI_SME_MODULE
 
 #include "csr_msgconv.h"
@@ -35,8 +31,4 @@ extern void CsrWifiSmeConverterInit(void);
 
 #endif /* EXCLUDE_CSR_WIFI_SME_MODULE */
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* CSR_WIFI_SME_CONVERTER_INIT_H__ */
diff --git a/drivers/staging/csr/csr_wifi_sme_lib.h b/drivers/staging/csr/csr_wifi_sme_lib.h
index 3ca745608252..53cf1268286e 100644
--- a/drivers/staging/csr/csr_wifi_sme_lib.h
+++ b/drivers/staging/csr/csr_wifi_sme_lib.h
@@ -32,11 +32,6 @@
 # endif
 #endif
 
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /*----------------------------------------------------------------------------*
  *  CsrWifiSmeFreeUpstreamMessageContents
  *
@@ -4305,9 +4300,4 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
 #define CsrWifiSmeWpsConfigurationCfmSend(dst__, status__) \
     CsrWifiSmeWpsConfigurationCfmSendTo(dst__, CSR_WIFI_SME_IFACEQUEUE, status__)
 
-
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* CSR_WIFI_SME_LIB_H__ */
diff --git a/drivers/staging/csr/csr_wifi_sme_prim.h b/drivers/staging/csr/csr_wifi_sme_prim.h
index 55cac5059bf7..17ec79c77e54 100644
--- a/drivers/staging/csr/csr_wifi_sme_prim.h
+++ b/drivers/staging/csr/csr_wifi_sme_prim.h
@@ -20,10 +20,6 @@
 #include "csr_result.h"
 #include "csr_wifi_fsm_event.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #define CSR_WIFI_SME_PRIM                                               (0x0404)
 
 typedef CsrPrim CsrWifiSmePrim;
@@ -6510,10 +6506,5 @@ typedef struct
     CsrResult       status;
 } CsrWifiSmeWpsConfigurationCfm;
 
-
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* CSR_WIFI_SME_PRIM_H__ */
 
diff --git a/drivers/staging/csr/csr_wifi_sme_sef.h b/drivers/staging/csr/csr_wifi_sme_sef.h
index c8741811b2e4..78b88c067236 100644
--- a/drivers/staging/csr/csr_wifi_sme_sef.h
+++ b/drivers/staging/csr/csr_wifi_sme_sef.h
@@ -1,10 +1,10 @@
 /*****************************************************************************
 
-            (c) Cambridge Silicon Radio Limited 2010
-            Confidential information of CSR
+        (c) Cambridge Silicon Radio Limited 2010
+        Confidential information of CSR
 
-            Refer to LICENSE.txt included with this source for details
-            on the license terms.
+        Refer to LICENSE.txt included with this source for details
+        on the license terms.
 
 *****************************************************************************/
 #ifndef CSR_WIFI_ROUTER_SEF_CSR_WIFI_SME_H__
@@ -12,90 +12,131 @@
 
 #include "csr_wifi_sme_prim.h"
 
+typedef void (*CsrWifiSmeStateHandlerType)(void *drvpriv, CsrWifiFsmEvent *msg);
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+extern const CsrWifiSmeStateHandlerType
+        CsrWifiSmeUpstreamStateHandlers[CSR_WIFI_SME_PRIM_UPSTREAM_COUNT];
 
-typedef void (*CsrWifiSmeStateHandlerType)(void* drvpriv, CsrWifiFsmEvent* msg);
 
-extern const CsrWifiSmeStateHandlerType CsrWifiSmeUpstreamStateHandlers[CSR_WIFI_SME_PRIM_UPSTREAM_COUNT];
-
-
-extern void CsrWifiSmeActivateCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg);
-extern void CsrWifiSmeAdhocConfigGetCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg);
-extern void CsrWifiSmeAdhocConfigSetCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg);
-extern void CsrWifiSmeAssociationCompleteIndHandler(void* drvpriv, CsrWifiFsmEvent* msg);
-extern void CsrWifiSmeAssociationStartIndHandler(void* drvpriv, CsrWifiFsmEvent* msg);
-extern void CsrWifiSmeBlacklistCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg);
-extern void CsrWifiSmeCalibrationDataGetCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg);
-extern void CsrWifiSmeCalibrationDataSetCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg);
-extern void CsrWifiSmeCcxConfigGetCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg);
-extern void CsrWifiSmeCcxConfigSetCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg);
-extern void CsrWifiSmeCoexConfigGetCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg);
-extern void CsrWifiSmeCoexConfigSetCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg);
-extern void CsrWifiSmeCoexInfoGetCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg);
-extern void CsrWifiSmeConnectCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg);
-extern void CsrWifiSmeConnectionConfigGetCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg);
-extern void CsrWifiSmeConnectionInfoGetCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg);
-extern void CsrWifiSmeConnectionQualityIndHandler(void* drvpriv, CsrWifiFsmEvent* msg);
-extern void CsrWifiSmeConnectionStatsGetCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg);
-extern void CsrWifiSmeDeactivateCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg);
-extern void CsrWifiSmeDisconnectCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg);
-extern void CsrWifiSmeEventMaskSetCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg);
-extern void CsrWifiSmeHostConfigGetCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg);
-extern void CsrWifiSmeHostConfigSetCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg);
-extern void CsrWifiSmeIbssStationIndHandler(void* drvpriv, CsrWifiFsmEvent* msg);
-extern void CsrWifiSmeKeyCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg);
-extern void CsrWifiSmeLinkQualityGetCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg);
-extern void CsrWifiSmeMediaStatusIndHandler(void* drvpriv, CsrWifiFsmEvent* msg);
-extern void CsrWifiSmeMibConfigGetCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg);
-extern void CsrWifiSmeMibConfigSetCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg);
-extern void CsrWifiSmeMibGetCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg);
-extern void CsrWifiSmeMibGetNextCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg);
-extern void CsrWifiSmeMibSetCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg);
-extern void CsrWifiSmeMicFailureIndHandler(void* drvpriv, CsrWifiFsmEvent* msg);
-extern void CsrWifiSmeMulticastAddressCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg);
-extern void CsrWifiSmePacketFilterSetCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg);
-extern void CsrWifiSmePermanentMacAddressGetCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg);
-extern void CsrWifiSmePmkidCandidateListIndHandler(void* drvpriv, CsrWifiFsmEvent* msg);
-extern void CsrWifiSmePmkidCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg);
-extern void CsrWifiSmePowerConfigGetCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg);
-extern void CsrWifiSmePowerConfigSetCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg);
-extern void CsrWifiSmeRegulatoryDomainInfoGetCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg);
-extern void CsrWifiSmeRoamCompleteIndHandler(void* drvpriv, CsrWifiFsmEvent* msg);
-extern void CsrWifiSmeRoamStartIndHandler(void* drvpriv, CsrWifiFsmEvent* msg);
-extern void CsrWifiSmeRoamingConfigGetCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg);
-extern void CsrWifiSmeRoamingConfigSetCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg);
-extern void CsrWifiSmeScanConfigGetCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg);
-extern void CsrWifiSmeScanConfigSetCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg);
-extern void CsrWifiSmeScanFullCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg);
-extern void CsrWifiSmeScanResultIndHandler(void* drvpriv, CsrWifiFsmEvent* msg);
-extern void CsrWifiSmeScanResultsFlushCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg);
-extern void CsrWifiSmeScanResultsGetCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg);
-extern void CsrWifiSmeSmeStaConfigGetCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg);
-extern void CsrWifiSmeSmeStaConfigSetCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg);
-extern void CsrWifiSmeStationMacAddressGetCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg);
-extern void CsrWifiSmeTspecIndHandler(void* drvpriv, CsrWifiFsmEvent* msg);
-extern void CsrWifiSmeTspecCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg);
-extern void CsrWifiSmeVersionsGetCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg);
-extern void CsrWifiSmeWifiFlightmodeCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg);
-extern void CsrWifiSmeWifiOffIndHandler(void* drvpriv, CsrWifiFsmEvent* msg);
-extern void CsrWifiSmeWifiOffCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg);
-extern void CsrWifiSmeWifiOnCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg);
-extern void CsrWifiSmeCloakedSsidsSetCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg);
-extern void CsrWifiSmeCloakedSsidsGetCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg);
-extern void CsrWifiSmeWifiOnIndHandler(void* drvpriv, CsrWifiFsmEvent* msg);
-extern void CsrWifiSmeSmeCommonConfigGetCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg);
-extern void CsrWifiSmeSmeCommonConfigSetCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg);
-extern void CsrWifiSmeGetInterfaceCapabilityCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg);
-extern void CsrWifiSmeErrorIndHandler(void* drvpriv, CsrWifiFsmEvent* msg);
-extern void CsrWifiSmeInfoIndHandler(void* drvpriv, CsrWifiFsmEvent* msg);
-extern void CsrWifiSmeCoreDumpIndHandler(void* drvpriv, CsrWifiFsmEvent* msg);
-extern void CsrWifiSmeAmpStatusChangeIndHandler(void* drvpriv, CsrWifiFsmEvent* msg);
-
-#ifdef __cplusplus
-}
-#endif
+extern void CsrWifiSmeActivateCfmHandler(void *drvpriv, CsrWifiFsmEvent *msg);
+extern void CsrWifiSmeAdhocConfigGetCfmHandler(void *drvpriv,
+        CsrWifiFsmEvent *msg);
+extern void CsrWifiSmeAdhocConfigSetCfmHandler(void *drvpriv,
+        CsrWifiFsmEvent *msg);
+extern void CsrWifiSmeAssociationCompleteIndHandler(void *drvpriv,
+        CsrWifiFsmEvent *msg);
+extern void CsrWifiSmeAssociationStartIndHandler(void *drvpriv,
+        CsrWifiFsmEvent *msg);
+extern void CsrWifiSmeBlacklistCfmHandler(void *drvpriv,
+        CsrWifiFsmEvent *msg);
+extern void CsrWifiSmeCalibrationDataGetCfmHandler(void *drvpriv,
+        CsrWifiFsmEvent *msg);
+extern void CsrWifiSmeCalibrationDataSetCfmHandler(void *drvpriv,
+        CsrWifiFsmEvent *msg);
+extern void CsrWifiSmeCcxConfigGetCfmHandler(void *drvpriv,
+        CsrWifiFsmEvent *msg);
+extern void CsrWifiSmeCcxConfigSetCfmHandler(void *drvpriv,
+        CsrWifiFsmEvent *msg);
+extern void CsrWifiSmeCoexConfigGetCfmHandler(void *drvpriv,
+        CsrWifiFsmEvent *msg);
+extern void CsrWifiSmeCoexConfigSetCfmHandler(void *drvpriv,
+        CsrWifiFsmEvent *msg);
+extern void CsrWifiSmeCoexInfoGetCfmHandler(void *drvpriv,
+        CsrWifiFsmEvent *msg);
+extern void CsrWifiSmeConnectCfmHandler(void *drvpriv, CsrWifiFsmEvent *msg);
+extern void CsrWifiSmeConnectionConfigGetCfmHandler(void *drvpriv,
+        CsrWifiFsmEvent *msg);
+extern void CsrWifiSmeConnectionInfoGetCfmHandler(void *drvpriv,
+        CsrWifiFsmEvent *msg);
+extern void CsrWifiSmeConnectionQualityIndHandler(void *drvpriv,
+        CsrWifiFsmEvent *msg);
+extern void CsrWifiSmeConnectionStatsGetCfmHandler(void *drvpriv,
+        CsrWifiFsmEvent *msg);
+extern void CsrWifiSmeDeactivateCfmHandler(void *drvpriv, CsrWifiFsmEvent *msg);
+extern void CsrWifiSmeDisconnectCfmHandler(void *drvpriv, CsrWifiFsmEvent *msg);
+extern void CsrWifiSmeEventMaskSetCfmHandler(void *drvpriv,
+        CsrWifiFsmEvent *msg);
+extern void CsrWifiSmeHostConfigGetCfmHandler(void *drvpriv,
+        CsrWifiFsmEvent *msg);
+extern void CsrWifiSmeHostConfigSetCfmHandler(void *drvpriv,
+        CsrWifiFsmEvent *msg);
+extern void CsrWifiSmeIbssStationIndHandler(void *drvpriv,
+        CsrWifiFsmEvent *msg);
+extern void CsrWifiSmeKeyCfmHandler(void *drvpriv, CsrWifiFsmEvent *msg);
+extern void CsrWifiSmeLinkQualityGetCfmHandler(void *drvpriv,
+        CsrWifiFsmEvent *msg);
+extern void CsrWifiSmeMediaStatusIndHandler(void *drvpriv,
+        CsrWifiFsmEvent *msg);
+extern void CsrWifiSmeMibConfigGetCfmHandler(void *drvpriv,
+        CsrWifiFsmEvent *msg);
+extern void CsrWifiSmeMibConfigSetCfmHandler(void *drvpriv,
+        CsrWifiFsmEvent *msg);
+extern void CsrWifiSmeMibGetCfmHandler(void *drvpriv, CsrWifiFsmEvent *msg);
+extern void CsrWifiSmeMibGetNextCfmHandler(void *drvpriv, CsrWifiFsmEvent *msg);
+extern void CsrWifiSmeMibSetCfmHandler(void *drvpriv, CsrWifiFsmEvent *msg);
+extern void CsrWifiSmeMicFailureIndHandler(void *drvpriv, CsrWifiFsmEvent *msg);
+extern void CsrWifiSmeMulticastAddressCfmHandler(void *drvpriv,
+        CsrWifiFsmEvent *msg);
+extern void CsrWifiSmePacketFilterSetCfmHandler(void *drvpriv,
+        CsrWifiFsmEvent *msg);
+extern void CsrWifiSmePermanentMacAddressGetCfmHandler(void *drvpriv,
+        CsrWifiFsmEvent *msg);
+extern void CsrWifiSmePmkidCandidateListIndHandler(void *drvpriv,
+        CsrWifiFsmEvent *msg);
+extern void CsrWifiSmePmkidCfmHandler(void *drvpriv, CsrWifiFsmEvent *msg);
+extern void CsrWifiSmePowerConfigGetCfmHandler(void *drvpriv,
+        CsrWifiFsmEvent *msg);
+extern void CsrWifiSmePowerConfigSetCfmHandler(void *drvpriv,
+        CsrWifiFsmEvent *msg);
+extern void CsrWifiSmeRegulatoryDomainInfoGetCfmHandler(void *drvpriv,
+        CsrWifiFsmEvent *msg);
+extern void CsrWifiSmeRoamCompleteIndHandler(void *drvpriv,
+        CsrWifiFsmEvent *msg);
+extern void CsrWifiSmeRoamStartIndHandler(void *drvpriv, CsrWifiFsmEvent *msg);
+extern void CsrWifiSmeRoamingConfigGetCfmHandler(void *drvpriv,
+        CsrWifiFsmEvent *msg);
+extern void CsrWifiSmeRoamingConfigSetCfmHandler(void *drvpriv,
+        CsrWifiFsmEvent *msg);
+extern void CsrWifiSmeScanConfigGetCfmHandler(void *drvpriv,
+        CsrWifiFsmEvent *msg);
+extern void CsrWifiSmeScanConfigSetCfmHandler(void *drvpriv,
+        CsrWifiFsmEvent *msg);
+extern void CsrWifiSmeScanFullCfmHandler(void *drvpriv, CsrWifiFsmEvent *msg);
+extern void CsrWifiSmeScanResultIndHandler(void *drvpriv, CsrWifiFsmEvent *msg);
+extern void CsrWifiSmeScanResultsFlushCfmHandler(void *drvpriv,
+        CsrWifiFsmEvent *msg);
+extern void CsrWifiSmeScanResultsGetCfmHandler(void *drvpriv,
+        CsrWifiFsmEvent *msg);
+extern void CsrWifiSmeSmeStaConfigGetCfmHandler(void *drvpriv,
+        CsrWifiFsmEvent *msg);
+extern void CsrWifiSmeSmeStaConfigSetCfmHandler(void *drvpriv,
+        CsrWifiFsmEvent *msg);
+extern void CsrWifiSmeStationMacAddressGetCfmHandler(void *drvpriv,
+        CsrWifiFsmEvent *msg);
+extern void CsrWifiSmeTspecIndHandler(void *drvpriv, CsrWifiFsmEvent *msg);
+extern void CsrWifiSmeTspecCfmHandler(void *drvpriv, CsrWifiFsmEvent *msg);
+extern void CsrWifiSmeVersionsGetCfmHandler(void *drvpriv,
+        CsrWifiFsmEvent *msg);
+extern void CsrWifiSmeWifiFlightmodeCfmHandler(void *drvpriv,
+        CsrWifiFsmEvent *msg);
+extern void CsrWifiSmeWifiOffIndHandler(void *drvpriv, CsrWifiFsmEvent *msg);
+extern void CsrWifiSmeWifiOffCfmHandler(void *drvpriv, CsrWifiFsmEvent *msg);
+extern void CsrWifiSmeWifiOnCfmHandler(void *drvpriv, CsrWifiFsmEvent *msg);
+extern void CsrWifiSmeCloakedSsidsSetCfmHandler(void *drvpriv,
+        CsrWifiFsmEvent *msg);
+extern void CsrWifiSmeCloakedSsidsGetCfmHandler(void *drvpriv,
+        CsrWifiFsmEvent *msg);
+extern void CsrWifiSmeWifiOnIndHandler(void *drvpriv, CsrWifiFsmEvent *msg);
+extern void CsrWifiSmeSmeCommonConfigGetCfmHandler(void *drvpriv,
+        CsrWifiFsmEvent *msg);
+extern void CsrWifiSmeSmeCommonConfigSetCfmHandler(void *drvpriv,
+        CsrWifiFsmEvent *msg);
+extern void CsrWifiSmeGetInterfaceCapabilityCfmHandler(void *drvpriv,
+        CsrWifiFsmEvent *msg);
+extern void CsrWifiSmeErrorIndHandler(void *drvpriv, CsrWifiFsmEvent *msg);
+extern void CsrWifiSmeInfoIndHandler(void *drvpriv, CsrWifiFsmEvent *msg);
+extern void CsrWifiSmeCoreDumpIndHandler(void *drvpriv, CsrWifiFsmEvent *msg);
+extern void CsrWifiSmeAmpStatusChangeIndHandler(void *drvpriv,
+        CsrWifiFsmEvent *msg);
 
 #endif /* CSR_WIFI_ROUTER_SEF_CSR_WIFI_SME_H__ */
diff --git a/drivers/staging/csr/csr_wifi_sme_serialize.h b/drivers/staging/csr/csr_wifi_sme_serialize.h
index 4f3af0a6be7c..f8526269b203 100644
--- a/drivers/staging/csr/csr_wifi_sme_serialize.h
+++ b/drivers/staging/csr/csr_wifi_sme_serialize.h
@@ -1,10 +1,10 @@
 /*****************************************************************************
 
-            (c) Cambridge Silicon Radio Limited 2012
-            All rights reserved and confidential information of CSR
+        (c) Cambridge Silicon Radio Limited 2012
+        All rights reserved and confidential information of CSR
 
-            Refer to LICENSE.txt included with this source for details
-            on the license terms.
+        Refer to LICENSE.txt included with this source for details
+        on the license terms.
 
 *****************************************************************************/
 
@@ -16,10 +16,6 @@
 #include "csr_wifi_msgconv.h"
 #include "csr_wifi_sme_prim.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 extern void CsrWifiSmePfree(void *ptr);
 
 #define CsrWifiSmeActivateReqSer CsrWifiEventSer
@@ -32,13 +28,13 @@ extern void CsrWifiSmePfree(void *ptr);
 #define CsrWifiSmeAdhocConfigGetReqSizeof CsrWifiEventSizeof
 #define CsrWifiSmeAdhocConfigGetReqSerFree CsrWifiSmePfree
 
-extern u8* CsrWifiSmeAdhocConfigSetReqSer(u8 *ptr, size_t *len, void *msg);
-extern void* CsrWifiSmeAdhocConfigSetReqDes(u8 *buffer, size_t len);
+extern u8 *CsrWifiSmeAdhocConfigSetReqSer(u8 *ptr, size_t *len, void *msg);
+extern void *CsrWifiSmeAdhocConfigSetReqDes(u8 *buffer, size_t len);
 extern size_t CsrWifiSmeAdhocConfigSetReqSizeof(void *msg);
 #define CsrWifiSmeAdhocConfigSetReqSerFree CsrWifiSmePfree
 
-extern u8* CsrWifiSmeBlacklistReqSer(u8 *ptr, size_t *len, void *msg);
-extern void* CsrWifiSmeBlacklistReqDes(u8 *buffer, size_t len);
+extern u8 *CsrWifiSmeBlacklistReqSer(u8 *ptr, size_t *len, void *msg);
+extern void *CsrWifiSmeBlacklistReqDes(u8 *buffer, size_t len);
 extern size_t CsrWifiSmeBlacklistReqSizeof(void *msg);
 extern void CsrWifiSmeBlacklistReqSerFree(void *msg);
 
@@ -47,8 +43,8 @@ extern void CsrWifiSmeBlacklistReqSerFree(void *msg);
 #define CsrWifiSmeCalibrationDataGetReqSizeof CsrWifiEventSizeof
 #define CsrWifiSmeCalibrationDataGetReqSerFree CsrWifiSmePfree
 
-extern u8* CsrWifiSmeCalibrationDataSetReqSer(u8 *ptr, size_t *len, void *msg);
-extern void* CsrWifiSmeCalibrationDataSetReqDes(u8 *buffer, size_t len);
+extern u8 *CsrWifiSmeCalibrationDataSetReqSer(u8 *ptr, size_t *len, void *msg);
+extern void *CsrWifiSmeCalibrationDataSetReqDes(u8 *buffer, size_t len);
 extern size_t CsrWifiSmeCalibrationDataSetReqSizeof(void *msg);
 extern void CsrWifiSmeCalibrationDataSetReqSerFree(void *msg);
 
@@ -57,8 +53,8 @@ extern void CsrWifiSmeCalibrationDataSetReqSerFree(void *msg);
 #define CsrWifiSmeCcxConfigGetReqSizeof CsrWifiEventCsrUint16Sizeof
 #define CsrWifiSmeCcxConfigGetReqSerFree CsrWifiSmePfree
 
-extern u8* CsrWifiSmeCcxConfigSetReqSer(u8 *ptr, size_t *len, void *msg);
-extern void* CsrWifiSmeCcxConfigSetReqDes(u8 *buffer, size_t len);
+extern u8 *CsrWifiSmeCcxConfigSetReqSer(u8 *ptr, size_t *len, void *msg);
+extern void *CsrWifiSmeCcxConfigSetReqDes(u8 *buffer, size_t len);
 extern size_t CsrWifiSmeCcxConfigSetReqSizeof(void *msg);
 #define CsrWifiSmeCcxConfigSetReqSerFree CsrWifiSmePfree
 
@@ -67,8 +63,8 @@ extern size_t CsrWifiSmeCcxConfigSetReqSizeof(void *msg);
 #define CsrWifiSmeCoexConfigGetReqSizeof CsrWifiEventSizeof
 #define CsrWifiSmeCoexConfigGetReqSerFree CsrWifiSmePfree
 
-extern u8* CsrWifiSmeCoexConfigSetReqSer(u8 *ptr, size_t *len, void *msg);
-extern void* CsrWifiSmeCoexConfigSetReqDes(u8 *buffer, size_t len);
+extern u8 *CsrWifiSmeCoexConfigSetReqSer(u8 *ptr, size_t *len, void *msg);
+extern void *CsrWifiSmeCoexConfigSetReqDes(u8 *buffer, size_t len);
 extern size_t CsrWifiSmeCoexConfigSetReqSizeof(void *msg);
 #define CsrWifiSmeCoexConfigSetReqSerFree CsrWifiSmePfree
 
@@ -77,8 +73,8 @@ extern size_t CsrWifiSmeCoexConfigSetReqSizeof(void *msg);
 #define CsrWifiSmeCoexInfoGetReqSizeof CsrWifiEventSizeof
 #define CsrWifiSmeCoexInfoGetReqSerFree CsrWifiSmePfree
 
-extern u8* CsrWifiSmeConnectReqSer(u8 *ptr, size_t *len, void *msg);
-extern void* CsrWifiSmeConnectReqDes(u8 *buffer, size_t len);
+extern u8 *CsrWifiSmeConnectReqSer(u8 *ptr, size_t *len, void *msg);
+extern void *CsrWifiSmeConnectReqDes(u8 *buffer, size_t len);
 extern size_t CsrWifiSmeConnectReqSizeof(void *msg);
 extern void CsrWifiSmeConnectReqSerFree(void *msg);
 
@@ -117,13 +113,13 @@ extern void CsrWifiSmeConnectReqSerFree(void *msg);
 #define CsrWifiSmeHostConfigGetReqSizeof CsrWifiEventCsrUint16Sizeof
 #define CsrWifiSmeHostConfigGetReqSerFree CsrWifiSmePfree
 
-extern u8* CsrWifiSmeHostConfigSetReqSer(u8 *ptr, size_t *len, void *msg);
-extern void* CsrWifiSmeHostConfigSetReqDes(u8 *buffer, size_t len);
+extern u8 *CsrWifiSmeHostConfigSetReqSer(u8 *ptr, size_t *len, void *msg);
+extern void *CsrWifiSmeHostConfigSetReqDes(u8 *buffer, size_t len);
 extern size_t CsrWifiSmeHostConfigSetReqSizeof(void *msg);
 #define CsrWifiSmeHostConfigSetReqSerFree CsrWifiSmePfree
 
-extern u8* CsrWifiSmeKeyReqSer(u8 *ptr, size_t *len, void *msg);
-extern void* CsrWifiSmeKeyReqDes(u8 *buffer, size_t len);
+extern u8 *CsrWifiSmeKeyReqSer(u8 *ptr, size_t *len, void *msg);
+extern void *CsrWifiSmeKeyReqDes(u8 *buffer, size_t len);
 extern size_t CsrWifiSmeKeyReqSizeof(void *msg);
 #define CsrWifiSmeKeyReqSerFree CsrWifiSmePfree
 
@@ -137,33 +133,33 @@ extern size_t CsrWifiSmeKeyReqSizeof(void *msg);
 #define CsrWifiSmeMibConfigGetReqSizeof CsrWifiEventSizeof
 #define CsrWifiSmeMibConfigGetReqSerFree CsrWifiSmePfree
 
-extern u8* CsrWifiSmeMibConfigSetReqSer(u8 *ptr, size_t *len, void *msg);
-extern void* CsrWifiSmeMibConfigSetReqDes(u8 *buffer, size_t len);
+extern u8 *CsrWifiSmeMibConfigSetReqSer(u8 *ptr, size_t *len, void *msg);
+extern void *CsrWifiSmeMibConfigSetReqDes(u8 *buffer, size_t len);
 extern size_t CsrWifiSmeMibConfigSetReqSizeof(void *msg);
 #define CsrWifiSmeMibConfigSetReqSerFree CsrWifiSmePfree
 
-extern u8* CsrWifiSmeMibGetNextReqSer(u8 *ptr, size_t *len, void *msg);
-extern void* CsrWifiSmeMibGetNextReqDes(u8 *buffer, size_t len);
+extern u8 *CsrWifiSmeMibGetNextReqSer(u8 *ptr, size_t *len, void *msg);
+extern void *CsrWifiSmeMibGetNextReqDes(u8 *buffer, size_t len);
 extern size_t CsrWifiSmeMibGetNextReqSizeof(void *msg);
 extern void CsrWifiSmeMibGetNextReqSerFree(void *msg);
 
-extern u8* CsrWifiSmeMibGetReqSer(u8 *ptr, size_t *len, void *msg);
-extern void* CsrWifiSmeMibGetReqDes(u8 *buffer, size_t len);
+extern u8 *CsrWifiSmeMibGetReqSer(u8 *ptr, size_t *len, void *msg);
+extern void *CsrWifiSmeMibGetReqDes(u8 *buffer, size_t len);
 extern size_t CsrWifiSmeMibGetReqSizeof(void *msg);
 extern void CsrWifiSmeMibGetReqSerFree(void *msg);
 
-extern u8* CsrWifiSmeMibSetReqSer(u8 *ptr, size_t *len, void *msg);
-extern void* CsrWifiSmeMibSetReqDes(u8 *buffer, size_t len);
+extern u8 *CsrWifiSmeMibSetReqSer(u8 *ptr, size_t *len, void *msg);
+extern void *CsrWifiSmeMibSetReqDes(u8 *buffer, size_t len);
 extern size_t CsrWifiSmeMibSetReqSizeof(void *msg);
 extern void CsrWifiSmeMibSetReqSerFree(void *msg);
 
-extern u8* CsrWifiSmeMulticastAddressReqSer(u8 *ptr, size_t *len, void *msg);
-extern void* CsrWifiSmeMulticastAddressReqDes(u8 *buffer, size_t len);
+extern u8 *CsrWifiSmeMulticastAddressReqSer(u8 *ptr, size_t *len, void *msg);
+extern void *CsrWifiSmeMulticastAddressReqDes(u8 *buffer, size_t len);
 extern size_t CsrWifiSmeMulticastAddressReqSizeof(void *msg);
 extern void CsrWifiSmeMulticastAddressReqSerFree(void *msg);
 
-extern u8* CsrWifiSmePacketFilterSetReqSer(u8 *ptr, size_t *len, void *msg);
-extern void* CsrWifiSmePacketFilterSetReqDes(u8 *buffer, size_t len);
+extern u8 *CsrWifiSmePacketFilterSetReqSer(u8 *ptr, size_t *len, void *msg);
+extern void *CsrWifiSmePacketFilterSetReqDes(u8 *buffer, size_t len);
 extern size_t CsrWifiSmePacketFilterSetReqSizeof(void *msg);
 extern void CsrWifiSmePacketFilterSetReqSerFree(void *msg);
 
@@ -172,8 +168,8 @@ extern void CsrWifiSmePacketFilterSetReqSerFree(void *msg);
 #define CsrWifiSmePermanentMacAddressGetReqSizeof CsrWifiEventSizeof
 #define CsrWifiSmePermanentMacAddressGetReqSerFree CsrWifiSmePfree
 
-extern u8* CsrWifiSmePmkidReqSer(u8 *ptr, size_t *len, void *msg);
-extern void* CsrWifiSmePmkidReqDes(u8 *buffer, size_t len);
+extern u8 *CsrWifiSmePmkidReqSer(u8 *ptr, size_t *len, void *msg);
+extern void *CsrWifiSmePmkidReqDes(u8 *buffer, size_t len);
 extern size_t CsrWifiSmePmkidReqSizeof(void *msg);
 extern void CsrWifiSmePmkidReqSerFree(void *msg);
 
@@ -182,8 +178,8 @@ extern void CsrWifiSmePmkidReqSerFree(void *msg);
 #define CsrWifiSmePowerConfigGetReqSizeof CsrWifiEventSizeof
 #define CsrWifiSmePowerConfigGetReqSerFree CsrWifiSmePfree
 
-extern u8* CsrWifiSmePowerConfigSetReqSer(u8 *ptr, size_t *len, void *msg);
-extern void* CsrWifiSmePowerConfigSetReqDes(u8 *buffer, size_t len);
+extern u8 *CsrWifiSmePowerConfigSetReqSer(u8 *ptr, size_t *len, void *msg);
+extern void *CsrWifiSmePowerConfigSetReqDes(u8 *buffer, size_t len);
 extern size_t CsrWifiSmePowerConfigSetReqSizeof(void *msg);
 #define CsrWifiSmePowerConfigSetReqSerFree CsrWifiSmePfree
 
@@ -197,8 +193,8 @@ extern size_t CsrWifiSmePowerConfigSetReqSizeof(void *msg);
 #define CsrWifiSmeRoamingConfigGetReqSizeof CsrWifiEventCsrUint16Sizeof
 #define CsrWifiSmeRoamingConfigGetReqSerFree CsrWifiSmePfree
 
-extern u8* CsrWifiSmeRoamingConfigSetReqSer(u8 *ptr, size_t *len, void *msg);
-extern void* CsrWifiSmeRoamingConfigSetReqDes(u8 *buffer, size_t len);
+extern u8 *CsrWifiSmeRoamingConfigSetReqSer(u8 *ptr, size_t *len, void *msg);
+extern void *CsrWifiSmeRoamingConfigSetReqDes(u8 *buffer, size_t len);
 extern size_t CsrWifiSmeRoamingConfigSetReqSizeof(void *msg);
 #define CsrWifiSmeRoamingConfigSetReqSerFree CsrWifiSmePfree
 
@@ -207,13 +203,13 @@ extern size_t CsrWifiSmeRoamingConfigSetReqSizeof(void *msg);
 #define CsrWifiSmeScanConfigGetReqSizeof CsrWifiEventSizeof
 #define CsrWifiSmeScanConfigGetReqSerFree CsrWifiSmePfree
 
-extern u8* CsrWifiSmeScanConfigSetReqSer(u8 *ptr, size_t *len, void *msg);
-extern void* CsrWifiSmeScanConfigSetReqDes(u8 *buffer, size_t len);
+extern u8 *CsrWifiSmeScanConfigSetReqSer(u8 *ptr, size_t *len, void *msg);
+extern void *CsrWifiSmeScanConfigSetReqDes(u8 *buffer, size_t len);
 extern size_t CsrWifiSmeScanConfigSetReqSizeof(void *msg);
 extern void CsrWifiSmeScanConfigSetReqSerFree(void *msg);
 
-extern u8* CsrWifiSmeScanFullReqSer(u8 *ptr, size_t *len, void *msg);
-extern void* CsrWifiSmeScanFullReqDes(u8 *buffer, size_t len);
+extern u8 *CsrWifiSmeScanFullReqSer(u8 *ptr, size_t *len, void *msg);
+extern void *CsrWifiSmeScanFullReqDes(u8 *buffer, size_t len);
 extern size_t CsrWifiSmeScanFullReqSizeof(void *msg);
 extern void CsrWifiSmeScanFullReqSerFree(void *msg);
 
@@ -232,8 +228,8 @@ extern void CsrWifiSmeScanFullReqSerFree(void *msg);
 #define CsrWifiSmeSmeStaConfigGetReqSizeof CsrWifiEventCsrUint16Sizeof
 #define CsrWifiSmeSmeStaConfigGetReqSerFree CsrWifiSmePfree
 
-extern u8* CsrWifiSmeSmeStaConfigSetReqSer(u8 *ptr, size_t *len, void *msg);
-extern void* CsrWifiSmeSmeStaConfigSetReqDes(u8 *buffer, size_t len);
+extern u8 *CsrWifiSmeSmeStaConfigSetReqSer(u8 *ptr, size_t *len, void *msg);
+extern void *CsrWifiSmeSmeStaConfigSetReqDes(u8 *buffer, size_t len);
 extern size_t CsrWifiSmeSmeStaConfigSetReqSizeof(void *msg);
 #define CsrWifiSmeSmeStaConfigSetReqSerFree CsrWifiSmePfree
 
@@ -242,8 +238,8 @@ extern size_t CsrWifiSmeSmeStaConfigSetReqSizeof(void *msg);
 #define CsrWifiSmeStationMacAddressGetReqSizeof CsrWifiEventSizeof
 #define CsrWifiSmeStationMacAddressGetReqSerFree CsrWifiSmePfree
 
-extern u8* CsrWifiSmeTspecReqSer(u8 *ptr, size_t *len, void *msg);
-extern void* CsrWifiSmeTspecReqDes(u8 *buffer, size_t len);
+extern u8 *CsrWifiSmeTspecReqSer(u8 *ptr, size_t *len, void *msg);
+extern void *CsrWifiSmeTspecReqDes(u8 *buffer, size_t len);
 extern size_t CsrWifiSmeTspecReqSizeof(void *msg);
 extern void CsrWifiSmeTspecReqSerFree(void *msg);
 
@@ -252,8 +248,8 @@ extern void CsrWifiSmeTspecReqSerFree(void *msg);
 #define CsrWifiSmeVersionsGetReqSizeof CsrWifiEventSizeof
 #define CsrWifiSmeVersionsGetReqSerFree CsrWifiSmePfree
 
-extern u8* CsrWifiSmeWifiFlightmodeReqSer(u8 *ptr, size_t *len, void *msg);
-extern void* CsrWifiSmeWifiFlightmodeReqDes(u8 *buffer, size_t len);
+extern u8 *CsrWifiSmeWifiFlightmodeReqSer(u8 *ptr, size_t *len, void *msg);
+extern void *CsrWifiSmeWifiFlightmodeReqDes(u8 *buffer, size_t len);
 extern size_t CsrWifiSmeWifiFlightmodeReqSizeof(void *msg);
 extern void CsrWifiSmeWifiFlightmodeReqSerFree(void *msg);
 
@@ -262,13 +258,13 @@ extern void CsrWifiSmeWifiFlightmodeReqSerFree(void *msg);
 #define CsrWifiSmeWifiOffReqSizeof CsrWifiEventSizeof
 #define CsrWifiSmeWifiOffReqSerFree CsrWifiSmePfree
 
-extern u8* CsrWifiSmeWifiOnReqSer(u8 *ptr, size_t *len, void *msg);
-extern void* CsrWifiSmeWifiOnReqDes(u8 *buffer, size_t len);
+extern u8 *CsrWifiSmeWifiOnReqSer(u8 *ptr, size_t *len, void *msg);
+extern void *CsrWifiSmeWifiOnReqDes(u8 *buffer, size_t len);
 extern size_t CsrWifiSmeWifiOnReqSizeof(void *msg);
 extern void CsrWifiSmeWifiOnReqSerFree(void *msg);
 
-extern u8* CsrWifiSmeCloakedSsidsSetReqSer(u8 *ptr, size_t *len, void *msg);
-extern void* CsrWifiSmeCloakedSsidsSetReqDes(u8 *buffer, size_t len);
+extern u8 *CsrWifiSmeCloakedSsidsSetReqSer(u8 *ptr, size_t *len, void *msg);
+extern void *CsrWifiSmeCloakedSsidsSetReqDes(u8 *buffer, size_t len);
 extern size_t CsrWifiSmeCloakedSsidsSetReqSizeof(void *msg);
 extern void CsrWifiSmeCloakedSsidsSetReqSerFree(void *msg);
 
@@ -282,8 +278,8 @@ extern void CsrWifiSmeCloakedSsidsSetReqSerFree(void *msg);
 #define CsrWifiSmeSmeCommonConfigGetReqSizeof CsrWifiEventSizeof
 #define CsrWifiSmeSmeCommonConfigGetReqSerFree CsrWifiSmePfree
 
-extern u8* CsrWifiSmeSmeCommonConfigSetReqSer(u8 *ptr, size_t *len, void *msg);
-extern void* CsrWifiSmeSmeCommonConfigSetReqDes(u8 *buffer, size_t len);
+extern u8 *CsrWifiSmeSmeCommonConfigSetReqSer(u8 *ptr, size_t *len, void *msg);
+extern void *CsrWifiSmeSmeCommonConfigSetReqDes(u8 *buffer, size_t len);
 extern size_t CsrWifiSmeSmeCommonConfigSetReqSizeof(void *msg);
 #define CsrWifiSmeSmeCommonConfigSetReqSerFree CsrWifiSmePfree
 
@@ -292,13 +288,13 @@ extern size_t CsrWifiSmeSmeCommonConfigSetReqSizeof(void *msg);
 #define CsrWifiSmeInterfaceCapabilityGetReqSizeof CsrWifiEventSizeof
 #define CsrWifiSmeInterfaceCapabilityGetReqSerFree CsrWifiSmePfree
 
-extern u8* CsrWifiSmeWpsConfigurationReqSer(u8 *ptr, size_t *len, void *msg);
-extern void* CsrWifiSmeWpsConfigurationReqDes(u8 *buffer, size_t len);
+extern u8 *CsrWifiSmeWpsConfigurationReqSer(u8 *ptr, size_t *len, void *msg);
+extern void *CsrWifiSmeWpsConfigurationReqDes(u8 *buffer, size_t len);
 extern size_t CsrWifiSmeWpsConfigurationReqSizeof(void *msg);
 extern void CsrWifiSmeWpsConfigurationReqSerFree(void *msg);
 
-extern u8* CsrWifiSmeSetReqSer(u8 *ptr, size_t *len, void *msg);
-extern void* CsrWifiSmeSetReqDes(u8 *buffer, size_t len);
+extern u8 *CsrWifiSmeSetReqSer(u8 *ptr, size_t *len, void *msg);
+extern void *CsrWifiSmeSetReqDes(u8 *buffer, size_t len);
 extern size_t CsrWifiSmeSetReqSizeof(void *msg);
 extern void CsrWifiSmeSetReqSerFree(void *msg);
 
@@ -307,8 +303,8 @@ extern void CsrWifiSmeSetReqSerFree(void *msg);
 #define CsrWifiSmeActivateCfmSizeof CsrWifiEventCsrUint16Sizeof
 #define CsrWifiSmeActivateCfmSerFree CsrWifiSmePfree
 
-extern u8* CsrWifiSmeAdhocConfigGetCfmSer(u8 *ptr, size_t *len, void *msg);
-extern void* CsrWifiSmeAdhocConfigGetCfmDes(u8 *buffer, size_t len);
+extern u8 *CsrWifiSmeAdhocConfigGetCfmSer(u8 *ptr, size_t *len, void *msg);
+extern void *CsrWifiSmeAdhocConfigGetCfmDes(u8 *buffer, size_t len);
 extern size_t CsrWifiSmeAdhocConfigGetCfmSizeof(void *msg);
 #define CsrWifiSmeAdhocConfigGetCfmSerFree CsrWifiSmePfree
 
@@ -317,23 +313,23 @@ extern size_t CsrWifiSmeAdhocConfigGetCfmSizeof(void *msg);
 #define CsrWifiSmeAdhocConfigSetCfmSizeof CsrWifiEventCsrUint16Sizeof
 #define CsrWifiSmeAdhocConfigSetCfmSerFree CsrWifiSmePfree
 
-extern u8* CsrWifiSmeAssociationCompleteIndSer(u8 *ptr, size_t *len, void *msg);
-extern void* CsrWifiSmeAssociationCompleteIndDes(u8 *buffer, size_t len);
+extern u8 *CsrWifiSmeAssociationCompleteIndSer(u8 *ptr, size_t *len, void *msg);
+extern void *CsrWifiSmeAssociationCompleteIndDes(u8 *buffer, size_t len);
 extern size_t CsrWifiSmeAssociationCompleteIndSizeof(void *msg);
 extern void CsrWifiSmeAssociationCompleteIndSerFree(void *msg);
 
-extern u8* CsrWifiSmeAssociationStartIndSer(u8 *ptr, size_t *len, void *msg);
-extern void* CsrWifiSmeAssociationStartIndDes(u8 *buffer, size_t len);
+extern u8 *CsrWifiSmeAssociationStartIndSer(u8 *ptr, size_t *len, void *msg);
+extern void *CsrWifiSmeAssociationStartIndDes(u8 *buffer, size_t len);
 extern size_t CsrWifiSmeAssociationStartIndSizeof(void *msg);
 #define CsrWifiSmeAssociationStartIndSerFree CsrWifiSmePfree
 
-extern u8* CsrWifiSmeBlacklistCfmSer(u8 *ptr, size_t *len, void *msg);
-extern void* CsrWifiSmeBlacklistCfmDes(u8 *buffer, size_t len);
+extern u8 *CsrWifiSmeBlacklistCfmSer(u8 *ptr, size_t *len, void *msg);
+extern void *CsrWifiSmeBlacklistCfmDes(u8 *buffer, size_t len);
 extern size_t CsrWifiSmeBlacklistCfmSizeof(void *msg);
 extern void CsrWifiSmeBlacklistCfmSerFree(void *msg);
 
-extern u8* CsrWifiSmeCalibrationDataGetCfmSer(u8 *ptr, size_t *len, void *msg);
-extern void* CsrWifiSmeCalibrationDataGetCfmDes(u8 *buffer, size_t len);
+extern u8 *CsrWifiSmeCalibrationDataGetCfmSer(u8 *ptr, size_t *len, void *msg);
+extern void *CsrWifiSmeCalibrationDataGetCfmDes(u8 *buffer, size_t len);
 extern size_t CsrWifiSmeCalibrationDataGetCfmSizeof(void *msg);
 extern void CsrWifiSmeCalibrationDataGetCfmSerFree(void *msg);
 
@@ -342,18 +338,18 @@ extern void CsrWifiSmeCalibrationDataGetCfmSerFree(void *msg);
 #define CsrWifiSmeCalibrationDataSetCfmSizeof CsrWifiEventCsrUint16Sizeof
 #define CsrWifiSmeCalibrationDataSetCfmSerFree CsrWifiSmePfree
 
-extern u8* CsrWifiSmeCcxConfigGetCfmSer(u8 *ptr, size_t *len, void *msg);
-extern void* CsrWifiSmeCcxConfigGetCfmDes(u8 *buffer, size_t len);
+extern u8 *CsrWifiSmeCcxConfigGetCfmSer(u8 *ptr, size_t *len, void *msg);
+extern void *CsrWifiSmeCcxConfigGetCfmDes(u8 *buffer, size_t len);
 extern size_t CsrWifiSmeCcxConfigGetCfmSizeof(void *msg);
 #define CsrWifiSmeCcxConfigGetCfmSerFree CsrWifiSmePfree
 
-extern u8* CsrWifiSmeCcxConfigSetCfmSer(u8 *ptr, size_t *len, void *msg);
-extern void* CsrWifiSmeCcxConfigSetCfmDes(u8 *buffer, size_t len);
+extern u8 *CsrWifiSmeCcxConfigSetCfmSer(u8 *ptr, size_t *len, void *msg);
+extern void *CsrWifiSmeCcxConfigSetCfmDes(u8 *buffer, size_t len);
 extern size_t CsrWifiSmeCcxConfigSetCfmSizeof(void *msg);
 #define CsrWifiSmeCcxConfigSetCfmSerFree CsrWifiSmePfree
 
-extern u8* CsrWifiSmeCoexConfigGetCfmSer(u8 *ptr, size_t *len, void *msg);
-extern void* CsrWifiSmeCoexConfigGetCfmDes(u8 *buffer, size_t len);
+extern u8 *CsrWifiSmeCoexConfigGetCfmSer(u8 *ptr, size_t *len, void *msg);
+extern void *CsrWifiSmeCoexConfigGetCfmDes(u8 *buffer, size_t len);
 extern size_t CsrWifiSmeCoexConfigGetCfmSizeof(void *msg);
 #define CsrWifiSmeCoexConfigGetCfmSerFree CsrWifiSmePfree
 
@@ -362,33 +358,33 @@ extern size_t CsrWifiSmeCoexConfigGetCfmSizeof(void *msg);
 #define CsrWifiSmeCoexConfigSetCfmSizeof CsrWifiEventCsrUint16Sizeof
 #define CsrWifiSmeCoexConfigSetCfmSerFree CsrWifiSmePfree
 
-extern u8* CsrWifiSmeCoexInfoGetCfmSer(u8 *ptr, size_t *len, void *msg);
-extern void* CsrWifiSmeCoexInfoGetCfmDes(u8 *buffer, size_t len);
+extern u8 *CsrWifiSmeCoexInfoGetCfmSer(u8 *ptr, size_t *len, void *msg);
+extern void *CsrWifiSmeCoexInfoGetCfmDes(u8 *buffer, size_t len);
 extern size_t CsrWifiSmeCoexInfoGetCfmSizeof(void *msg);
 #define CsrWifiSmeCoexInfoGetCfmSerFree CsrWifiSmePfree
 
-extern u8* CsrWifiSmeConnectCfmSer(u8 *ptr, size_t *len, void *msg);
-extern void* CsrWifiSmeConnectCfmDes(u8 *buffer, size_t len);
+extern u8 *CsrWifiSmeConnectCfmSer(u8 *ptr, size_t *len, void *msg);
+extern void *CsrWifiSmeConnectCfmDes(u8 *buffer, size_t len);
 extern size_t CsrWifiSmeConnectCfmSizeof(void *msg);
 #define CsrWifiSmeConnectCfmSerFree CsrWifiSmePfree
 
-extern u8* CsrWifiSmeConnectionConfigGetCfmSer(u8 *ptr, size_t *len, void *msg);
-extern void* CsrWifiSmeConnectionConfigGetCfmDes(u8 *buffer, size_t len);
+extern u8 *CsrWifiSmeConnectionConfigGetCfmSer(u8 *ptr, size_t *len, void *msg);
+extern void *CsrWifiSmeConnectionConfigGetCfmDes(u8 *buffer, size_t len);
 extern size_t CsrWifiSmeConnectionConfigGetCfmSizeof(void *msg);
 extern void CsrWifiSmeConnectionConfigGetCfmSerFree(void *msg);
 
-extern u8* CsrWifiSmeConnectionInfoGetCfmSer(u8 *ptr, size_t *len, void *msg);
-extern void* CsrWifiSmeConnectionInfoGetCfmDes(u8 *buffer, size_t len);
+extern u8 *CsrWifiSmeConnectionInfoGetCfmSer(u8 *ptr, size_t *len, void *msg);
+extern void *CsrWifiSmeConnectionInfoGetCfmDes(u8 *buffer, size_t len);
 extern size_t CsrWifiSmeConnectionInfoGetCfmSizeof(void *msg);
 extern void CsrWifiSmeConnectionInfoGetCfmSerFree(void *msg);
 
-extern u8* CsrWifiSmeConnectionQualityIndSer(u8 *ptr, size_t *len, void *msg);
-extern void* CsrWifiSmeConnectionQualityIndDes(u8 *buffer, size_t len);
+extern u8 *CsrWifiSmeConnectionQualityIndSer(u8 *ptr, size_t *len, void *msg);
+extern void *CsrWifiSmeConnectionQualityIndDes(u8 *buffer, size_t len);
 extern size_t CsrWifiSmeConnectionQualityIndSizeof(void *msg);
 #define CsrWifiSmeConnectionQualityIndSerFree CsrWifiSmePfree
 
-extern u8* CsrWifiSmeConnectionStatsGetCfmSer(u8 *ptr, size_t *len, void *msg);
-extern void* CsrWifiSmeConnectionStatsGetCfmDes(u8 *buffer, size_t len);
+extern u8 *CsrWifiSmeConnectionStatsGetCfmSer(u8 *ptr, size_t *len, void *msg);
+extern void *CsrWifiSmeConnectionStatsGetCfmDes(u8 *buffer, size_t len);
 extern size_t CsrWifiSmeConnectionStatsGetCfmSizeof(void *msg);
 #define CsrWifiSmeConnectionStatsGetCfmSerFree CsrWifiSmePfree
 
@@ -397,8 +393,8 @@ extern size_t CsrWifiSmeConnectionStatsGetCfmSizeof(void *msg);
 #define CsrWifiSmeDeactivateCfmSizeof CsrWifiEventCsrUint16Sizeof
 #define CsrWifiSmeDeactivateCfmSerFree CsrWifiSmePfree
 
-extern u8* CsrWifiSmeDisconnectCfmSer(u8 *ptr, size_t *len, void *msg);
-extern void* CsrWifiSmeDisconnectCfmDes(u8 *buffer, size_t len);
+extern u8 *CsrWifiSmeDisconnectCfmSer(u8 *ptr, size_t *len, void *msg);
+extern void *CsrWifiSmeDisconnectCfmDes(u8 *buffer, size_t len);
 extern size_t CsrWifiSmeDisconnectCfmSizeof(void *msg);
 #define CsrWifiSmeDisconnectCfmSerFree CsrWifiSmePfree
 
@@ -407,38 +403,38 @@ extern size_t CsrWifiSmeDisconnectCfmSizeof(void *msg);
 #define CsrWifiSmeEventMaskSetCfmSizeof CsrWifiEventCsrUint16Sizeof
 #define CsrWifiSmeEventMaskSetCfmSerFree CsrWifiSmePfree
 
-extern u8* CsrWifiSmeHostConfigGetCfmSer(u8 *ptr, size_t *len, void *msg);
-extern void* CsrWifiSmeHostConfigGetCfmDes(u8 *buffer, size_t len);
+extern u8 *CsrWifiSmeHostConfigGetCfmSer(u8 *ptr, size_t *len, void *msg);
+extern void *CsrWifiSmeHostConfigGetCfmDes(u8 *buffer, size_t len);
 extern size_t CsrWifiSmeHostConfigGetCfmSizeof(void *msg);
 #define CsrWifiSmeHostConfigGetCfmSerFree CsrWifiSmePfree
 
-extern u8* CsrWifiSmeHostConfigSetCfmSer(u8 *ptr, size_t *len, void *msg);
-extern void* CsrWifiSmeHostConfigSetCfmDes(u8 *buffer, size_t len);
+extern u8 *CsrWifiSmeHostConfigSetCfmSer(u8 *ptr, size_t *len, void *msg);
+extern void *CsrWifiSmeHostConfigSetCfmDes(u8 *buffer, size_t len);
 extern size_t CsrWifiSmeHostConfigSetCfmSizeof(void *msg);
 #define CsrWifiSmeHostConfigSetCfmSerFree CsrWifiSmePfree
 
-extern u8* CsrWifiSmeIbssStationIndSer(u8 *ptr, size_t *len, void *msg);
-extern void* CsrWifiSmeIbssStationIndDes(u8 *buffer, size_t len);
+extern u8 *CsrWifiSmeIbssStationIndSer(u8 *ptr, size_t *len, void *msg);
+extern void *CsrWifiSmeIbssStationIndDes(u8 *buffer, size_t len);
 extern size_t CsrWifiSmeIbssStationIndSizeof(void *msg);
 #define CsrWifiSmeIbssStationIndSerFree CsrWifiSmePfree
 
-extern u8* CsrWifiSmeKeyCfmSer(u8 *ptr, size_t *len, void *msg);
-extern void* CsrWifiSmeKeyCfmDes(u8 *buffer, size_t len);
+extern u8 *CsrWifiSmeKeyCfmSer(u8 *ptr, size_t *len, void *msg);
+extern void *CsrWifiSmeKeyCfmDes(u8 *buffer, size_t len);
 extern size_t CsrWifiSmeKeyCfmSizeof(void *msg);
 #define CsrWifiSmeKeyCfmSerFree CsrWifiSmePfree
 
-extern u8* CsrWifiSmeLinkQualityGetCfmSer(u8 *ptr, size_t *len, void *msg);
-extern void* CsrWifiSmeLinkQualityGetCfmDes(u8 *buffer, size_t len);
+extern u8 *CsrWifiSmeLinkQualityGetCfmSer(u8 *ptr, size_t *len, void *msg);
+extern void *CsrWifiSmeLinkQualityGetCfmDes(u8 *buffer, size_t len);
 extern size_t CsrWifiSmeLinkQualityGetCfmSizeof(void *msg);
 #define CsrWifiSmeLinkQualityGetCfmSerFree CsrWifiSmePfree
 
-extern u8* CsrWifiSmeMediaStatusIndSer(u8 *ptr, size_t *len, void *msg);
-extern void* CsrWifiSmeMediaStatusIndDes(u8 *buffer, size_t len);
+extern u8 *CsrWifiSmeMediaStatusIndSer(u8 *ptr, size_t *len, void *msg);
+extern void *CsrWifiSmeMediaStatusIndDes(u8 *buffer, size_t len);
 extern size_t CsrWifiSmeMediaStatusIndSizeof(void *msg);
 extern void CsrWifiSmeMediaStatusIndSerFree(void *msg);
 
-extern u8* CsrWifiSmeMibConfigGetCfmSer(u8 *ptr, size_t *len, void *msg);
-extern void* CsrWifiSmeMibConfigGetCfmDes(u8 *buffer, size_t len);
+extern u8 *CsrWifiSmeMibConfigGetCfmSer(u8 *ptr, size_t *len, void *msg);
+extern void *CsrWifiSmeMibConfigGetCfmDes(u8 *buffer, size_t len);
 extern size_t CsrWifiSmeMibConfigGetCfmSizeof(void *msg);
 #define CsrWifiSmeMibConfigGetCfmSerFree CsrWifiSmePfree
 
@@ -447,13 +443,13 @@ extern size_t CsrWifiSmeMibConfigGetCfmSizeof(void *msg);
 #define CsrWifiSmeMibConfigSetCfmSizeof CsrWifiEventCsrUint16Sizeof
 #define CsrWifiSmeMibConfigSetCfmSerFree CsrWifiSmePfree
 
-extern u8* CsrWifiSmeMibGetCfmSer(u8 *ptr, size_t *len, void *msg);
-extern void* CsrWifiSmeMibGetCfmDes(u8 *buffer, size_t len);
+extern u8 *CsrWifiSmeMibGetCfmSer(u8 *ptr, size_t *len, void *msg);
+extern void *CsrWifiSmeMibGetCfmDes(u8 *buffer, size_t len);
 extern size_t CsrWifiSmeMibGetCfmSizeof(void *msg);
 extern void CsrWifiSmeMibGetCfmSerFree(void *msg);
 
-extern u8* CsrWifiSmeMibGetNextCfmSer(u8 *ptr, size_t *len, void *msg);
-extern void* CsrWifiSmeMibGetNextCfmDes(u8 *buffer, size_t len);
+extern u8 *CsrWifiSmeMibGetNextCfmSer(u8 *ptr, size_t *len, void *msg);
+extern void *CsrWifiSmeMibGetNextCfmDes(u8 *buffer, size_t len);
 extern size_t CsrWifiSmeMibGetNextCfmSizeof(void *msg);
 extern void CsrWifiSmeMibGetNextCfmSerFree(void *msg);
 
@@ -462,38 +458,39 @@ extern void CsrWifiSmeMibGetNextCfmSerFree(void *msg);
 #define CsrWifiSmeMibSetCfmSizeof CsrWifiEventCsrUint16Sizeof
 #define CsrWifiSmeMibSetCfmSerFree CsrWifiSmePfree
 
-extern u8* CsrWifiSmeMicFailureIndSer(u8 *ptr, size_t *len, void *msg);
-extern void* CsrWifiSmeMicFailureIndDes(u8 *buffer, size_t len);
+extern u8 *CsrWifiSmeMicFailureIndSer(u8 *ptr, size_t *len, void *msg);
+extern void *CsrWifiSmeMicFailureIndDes(u8 *buffer, size_t len);
 extern size_t CsrWifiSmeMicFailureIndSizeof(void *msg);
 #define CsrWifiSmeMicFailureIndSerFree CsrWifiSmePfree
 
-extern u8* CsrWifiSmeMulticastAddressCfmSer(u8 *ptr, size_t *len, void *msg);
-extern void* CsrWifiSmeMulticastAddressCfmDes(u8 *buffer, size_t len);
+extern u8 *CsrWifiSmeMulticastAddressCfmSer(u8 *ptr, size_t *len, void *msg);
+extern void *CsrWifiSmeMulticastAddressCfmDes(u8 *buffer, size_t len);
 extern size_t CsrWifiSmeMulticastAddressCfmSizeof(void *msg);
 extern void CsrWifiSmeMulticastAddressCfmSerFree(void *msg);
 
-extern u8* CsrWifiSmePacketFilterSetCfmSer(u8 *ptr, size_t *len, void *msg);
-extern void* CsrWifiSmePacketFilterSetCfmDes(u8 *buffer, size_t len);
+extern u8 *CsrWifiSmePacketFilterSetCfmSer(u8 *ptr, size_t *len, void *msg);
+extern void *CsrWifiSmePacketFilterSetCfmDes(u8 *buffer, size_t len);
 extern size_t CsrWifiSmePacketFilterSetCfmSizeof(void *msg);
 #define CsrWifiSmePacketFilterSetCfmSerFree CsrWifiSmePfree
 
-extern u8* CsrWifiSmePermanentMacAddressGetCfmSer(u8 *ptr, size_t *len, void *msg);
-extern void* CsrWifiSmePermanentMacAddressGetCfmDes(u8 *buffer, size_t len);
+extern u8 *CsrWifiSmePermanentMacAddressGetCfmSer(u8 *ptr, size_t *len,
+        void *msg);
+extern void *CsrWifiSmePermanentMacAddressGetCfmDes(u8 *buffer, size_t len);
 extern size_t CsrWifiSmePermanentMacAddressGetCfmSizeof(void *msg);
 #define CsrWifiSmePermanentMacAddressGetCfmSerFree CsrWifiSmePfree
 
-extern u8* CsrWifiSmePmkidCandidateListIndSer(u8 *ptr, size_t *len, void *msg);
-extern void* CsrWifiSmePmkidCandidateListIndDes(u8 *buffer, size_t len);
+extern u8 *CsrWifiSmePmkidCandidateListIndSer(u8 *ptr, size_t *len, void *msg);
+extern void *CsrWifiSmePmkidCandidateListIndDes(u8 *buffer, size_t len);
 extern size_t CsrWifiSmePmkidCandidateListIndSizeof(void *msg);
 extern void CsrWifiSmePmkidCandidateListIndSerFree(void *msg);
 
-extern u8* CsrWifiSmePmkidCfmSer(u8 *ptr, size_t *len, void *msg);
-extern void* CsrWifiSmePmkidCfmDes(u8 *buffer, size_t len);
+extern u8 *CsrWifiSmePmkidCfmSer(u8 *ptr, size_t *len, void *msg);
+extern void *CsrWifiSmePmkidCfmDes(u8 *buffer, size_t len);
 extern size_t CsrWifiSmePmkidCfmSizeof(void *msg);
 extern void CsrWifiSmePmkidCfmSerFree(void *msg);
 
-extern u8* CsrWifiSmePowerConfigGetCfmSer(u8 *ptr, size_t *len, void *msg);
-extern void* CsrWifiSmePowerConfigGetCfmDes(u8 *buffer, size_t len);
+extern u8 *CsrWifiSmePowerConfigGetCfmSer(u8 *ptr, size_t *len, void *msg);
+extern void *CsrWifiSmePowerConfigGetCfmDes(u8 *buffer, size_t len);
 extern size_t CsrWifiSmePowerConfigGetCfmSizeof(void *msg);
 #define CsrWifiSmePowerConfigGetCfmSerFree CsrWifiSmePfree
 
@@ -502,33 +499,34 @@ extern size_t CsrWifiSmePowerConfigGetCfmSizeof(void *msg);
 #define CsrWifiSmePowerConfigSetCfmSizeof CsrWifiEventCsrUint16Sizeof
 #define CsrWifiSmePowerConfigSetCfmSerFree CsrWifiSmePfree
 
-extern u8* CsrWifiSmeRegulatoryDomainInfoGetCfmSer(u8 *ptr, size_t *len, void *msg);
-extern void* CsrWifiSmeRegulatoryDomainInfoGetCfmDes(u8 *buffer, size_t len);
+extern u8 *CsrWifiSmeRegulatoryDomainInfoGetCfmSer(u8 *ptr, size_t *len,
+        void *msg);
+extern void *CsrWifiSmeRegulatoryDomainInfoGetCfmDes(u8 *buffer, size_t len);
 extern size_t CsrWifiSmeRegulatoryDomainInfoGetCfmSizeof(void *msg);
 #define CsrWifiSmeRegulatoryDomainInfoGetCfmSerFree CsrWifiSmePfree
 
-extern u8* CsrWifiSmeRoamCompleteIndSer(u8 *ptr, size_t *len, void *msg);
-extern void* CsrWifiSmeRoamCompleteIndDes(u8 *buffer, size_t len);
+extern u8 *CsrWifiSmeRoamCompleteIndSer(u8 *ptr, size_t *len, void *msg);
+extern void *CsrWifiSmeRoamCompleteIndDes(u8 *buffer, size_t len);
 extern size_t CsrWifiSmeRoamCompleteIndSizeof(void *msg);
 #define CsrWifiSmeRoamCompleteIndSerFree CsrWifiSmePfree
 
-extern u8* CsrWifiSmeRoamStartIndSer(u8 *ptr, size_t *len, void *msg);
-extern void* CsrWifiSmeRoamStartIndDes(u8 *buffer, size_t len);
+extern u8 *CsrWifiSmeRoamStartIndSer(u8 *ptr, size_t *len, void *msg);
+extern void *CsrWifiSmeRoamStartIndDes(u8 *buffer, size_t len);
 extern size_t CsrWifiSmeRoamStartIndSizeof(void *msg);
 #define CsrWifiSmeRoamStartIndSerFree CsrWifiSmePfree
 
-extern u8* CsrWifiSmeRoamingConfigGetCfmSer(u8 *ptr, size_t *len, void *msg);
-extern void* CsrWifiSmeRoamingConfigGetCfmDes(u8 *buffer, size_t len);
+extern u8 *CsrWifiSmeRoamingConfigGetCfmSer(u8 *ptr, size_t *len, void *msg);
+extern void *CsrWifiSmeRoamingConfigGetCfmDes(u8 *buffer, size_t len);
 extern size_t CsrWifiSmeRoamingConfigGetCfmSizeof(void *msg);
 #define CsrWifiSmeRoamingConfigGetCfmSerFree CsrWifiSmePfree
 
-extern u8* CsrWifiSmeRoamingConfigSetCfmSer(u8 *ptr, size_t *len, void *msg);
-extern void* CsrWifiSmeRoamingConfigSetCfmDes(u8 *buffer, size_t len);
+extern u8 *CsrWifiSmeRoamingConfigSetCfmSer(u8 *ptr, size_t *len, void *msg);
+extern void *CsrWifiSmeRoamingConfigSetCfmDes(u8 *buffer, size_t len);
 extern size_t CsrWifiSmeRoamingConfigSetCfmSizeof(void *msg);
 #define CsrWifiSmeRoamingConfigSetCfmSerFree CsrWifiSmePfree
 
-extern u8* CsrWifiSmeScanConfigGetCfmSer(u8 *ptr, size_t *len, void *msg);
-extern void* CsrWifiSmeScanConfigGetCfmDes(u8 *buffer, size_t len);
+extern u8 *CsrWifiSmeScanConfigGetCfmSer(u8 *ptr, size_t *len, void *msg);
+extern void *CsrWifiSmeScanConfigGetCfmDes(u8 *buffer, size_t len);
 extern size_t CsrWifiSmeScanConfigGetCfmSizeof(void *msg);
 extern void CsrWifiSmeScanConfigGetCfmSerFree(void *msg);
 
@@ -542,8 +540,8 @@ extern void CsrWifiSmeScanConfigGetCfmSerFree(void *msg);
 #define CsrWifiSmeScanFullCfmSizeof CsrWifiEventCsrUint16Sizeof
 #define CsrWifiSmeScanFullCfmSerFree CsrWifiSmePfree
 
-extern u8* CsrWifiSmeScanResultIndSer(u8 *ptr, size_t *len, void *msg);
-extern void* CsrWifiSmeScanResultIndDes(u8 *buffer, size_t len);
+extern u8 *CsrWifiSmeScanResultIndSer(u8 *ptr, size_t *len, void *msg);
+extern void *CsrWifiSmeScanResultIndDes(u8 *buffer, size_t len);
 extern size_t CsrWifiSmeScanResultIndSizeof(void *msg);
 extern void CsrWifiSmeScanResultIndSerFree(void *msg);
 
@@ -552,38 +550,39 @@ extern void CsrWifiSmeScanResultIndSerFree(void *msg);
 #define CsrWifiSmeScanResultsFlushCfmSizeof CsrWifiEventCsrUint16Sizeof
 #define CsrWifiSmeScanResultsFlushCfmSerFree CsrWifiSmePfree
 
-extern u8* CsrWifiSmeScanResultsGetCfmSer(u8 *ptr, size_t *len, void *msg);
-extern void* CsrWifiSmeScanResultsGetCfmDes(u8 *buffer, size_t len);
+extern u8 *CsrWifiSmeScanResultsGetCfmSer(u8 *ptr, size_t *len, void *msg);
+extern void *CsrWifiSmeScanResultsGetCfmDes(u8 *buffer, size_t len);
 extern size_t CsrWifiSmeScanResultsGetCfmSizeof(void *msg);
 extern void CsrWifiSmeScanResultsGetCfmSerFree(void *msg);
 
-extern u8* CsrWifiSmeSmeStaConfigGetCfmSer(u8 *ptr, size_t *len, void *msg);
-extern void* CsrWifiSmeSmeStaConfigGetCfmDes(u8 *buffer, size_t len);
+extern u8 *CsrWifiSmeSmeStaConfigGetCfmSer(u8 *ptr, size_t *len, void *msg);
+extern void *CsrWifiSmeSmeStaConfigGetCfmDes(u8 *buffer, size_t len);
 extern size_t CsrWifiSmeSmeStaConfigGetCfmSizeof(void *msg);
 #define CsrWifiSmeSmeStaConfigGetCfmSerFree CsrWifiSmePfree
 
-extern u8* CsrWifiSmeSmeStaConfigSetCfmSer(u8 *ptr, size_t *len, void *msg);
-extern void* CsrWifiSmeSmeStaConfigSetCfmDes(u8 *buffer, size_t len);
+extern u8 *CsrWifiSmeSmeStaConfigSetCfmSer(u8 *ptr, size_t *len, void *msg);
+extern void *CsrWifiSmeSmeStaConfigSetCfmDes(u8 *buffer, size_t len);
 extern size_t CsrWifiSmeSmeStaConfigSetCfmSizeof(void *msg);
 #define CsrWifiSmeSmeStaConfigSetCfmSerFree CsrWifiSmePfree
 
-extern u8* CsrWifiSmeStationMacAddressGetCfmSer(u8 *ptr, size_t *len, void *msg);
-extern void* CsrWifiSmeStationMacAddressGetCfmDes(u8 *buffer, size_t len);
+extern u8 *CsrWifiSmeStationMacAddressGetCfmSer(u8 *ptr, size_t *len,
+        void *msg);
+extern void *CsrWifiSmeStationMacAddressGetCfmDes(u8 *buffer, size_t len);
 extern size_t CsrWifiSmeStationMacAddressGetCfmSizeof(void *msg);
 #define CsrWifiSmeStationMacAddressGetCfmSerFree CsrWifiSmePfree
 
-extern u8* CsrWifiSmeTspecIndSer(u8 *ptr, size_t *len, void *msg);
-extern void* CsrWifiSmeTspecIndDes(u8 *buffer, size_t len);
+extern u8 *CsrWifiSmeTspecIndSer(u8 *ptr, size_t *len, void *msg);
+extern void *CsrWifiSmeTspecIndDes(u8 *buffer, size_t len);
 extern size_t CsrWifiSmeTspecIndSizeof(void *msg);
 extern void CsrWifiSmeTspecIndSerFree(void *msg);
 
-extern u8* CsrWifiSmeTspecCfmSer(u8 *ptr, size_t *len, void *msg);
-extern void* CsrWifiSmeTspecCfmDes(u8 *buffer, size_t len);
+extern u8 *CsrWifiSmeTspecCfmSer(u8 *ptr, size_t *len, void *msg);
+extern void *CsrWifiSmeTspecCfmDes(u8 *buffer, size_t len);
 extern size_t CsrWifiSmeTspecCfmSizeof(void *msg);
 extern void CsrWifiSmeTspecCfmSerFree(void *msg);
 
-extern u8* CsrWifiSmeVersionsGetCfmSer(u8 *ptr, size_t *len, void *msg);
-extern void* CsrWifiSmeVersionsGetCfmDes(u8 *buffer, size_t len);
+extern u8 *CsrWifiSmeVersionsGetCfmSer(u8 *ptr, size_t *len, void *msg);
+extern void *CsrWifiSmeVersionsGetCfmDes(u8 *buffer, size_t len);
 extern size_t CsrWifiSmeVersionsGetCfmSizeof(void *msg);
 extern void CsrWifiSmeVersionsGetCfmSerFree(void *msg);
 
@@ -612,18 +611,18 @@ extern void CsrWifiSmeVersionsGetCfmSerFree(void *msg);
 #define CsrWifiSmeCloakedSsidsSetCfmSizeof CsrWifiEventCsrUint16Sizeof
 #define CsrWifiSmeCloakedSsidsSetCfmSerFree CsrWifiSmePfree
 
-extern u8* CsrWifiSmeCloakedSsidsGetCfmSer(u8 *ptr, size_t *len, void *msg);
-extern void* CsrWifiSmeCloakedSsidsGetCfmDes(u8 *buffer, size_t len);
+extern u8 *CsrWifiSmeCloakedSsidsGetCfmSer(u8 *ptr, size_t *len, void *msg);
+extern void *CsrWifiSmeCloakedSsidsGetCfmDes(u8 *buffer, size_t len);
 extern size_t CsrWifiSmeCloakedSsidsGetCfmSizeof(void *msg);
 extern void CsrWifiSmeCloakedSsidsGetCfmSerFree(void *msg);
 
-extern u8* CsrWifiSmeWifiOnIndSer(u8 *ptr, size_t *len, void *msg);
-extern void* CsrWifiSmeWifiOnIndDes(u8 *buffer, size_t len);
+extern u8 *CsrWifiSmeWifiOnIndSer(u8 *ptr, size_t *len, void *msg);
+extern void *CsrWifiSmeWifiOnIndDes(u8 *buffer, size_t len);
 extern size_t CsrWifiSmeWifiOnIndSizeof(void *msg);
 #define CsrWifiSmeWifiOnIndSerFree CsrWifiSmePfree
 
-extern u8* CsrWifiSmeSmeCommonConfigGetCfmSer(u8 *ptr, size_t *len, void *msg);
-extern void* CsrWifiSmeSmeCommonConfigGetCfmDes(u8 *buffer, size_t len);
+extern u8 *CsrWifiSmeSmeCommonConfigGetCfmSer(u8 *ptr, size_t *len, void *msg);
+extern void *CsrWifiSmeSmeCommonConfigGetCfmDes(u8 *buffer, size_t len);
 extern size_t CsrWifiSmeSmeCommonConfigGetCfmSizeof(void *msg);
 #define CsrWifiSmeSmeCommonConfigGetCfmSerFree CsrWifiSmePfree
 
@@ -632,23 +631,24 @@ extern size_t CsrWifiSmeSmeCommonConfigGetCfmSizeof(void *msg);
 #define CsrWifiSmeSmeCommonConfigSetCfmSizeof CsrWifiEventCsrUint16Sizeof
 #define CsrWifiSmeSmeCommonConfigSetCfmSerFree CsrWifiSmePfree
 
-extern u8* CsrWifiSmeInterfaceCapabilityGetCfmSer(u8 *ptr, size_t *len, void *msg);
-extern void* CsrWifiSmeInterfaceCapabilityGetCfmDes(u8 *buffer, size_t len);
+extern u8 *CsrWifiSmeInterfaceCapabilityGetCfmSer(u8 *ptr, size_t *len,
+        void *msg);
+extern void *CsrWifiSmeInterfaceCapabilityGetCfmDes(u8 *buffer, size_t len);
 extern size_t CsrWifiSmeInterfaceCapabilityGetCfmSizeof(void *msg);
 #define CsrWifiSmeInterfaceCapabilityGetCfmSerFree CsrWifiSmePfree
 
-extern u8* CsrWifiSmeErrorIndSer(u8 *ptr, size_t *len, void *msg);
-extern void* CsrWifiSmeErrorIndDes(u8 *buffer, size_t len);
+extern u8 *CsrWifiSmeErrorIndSer(u8 *ptr, size_t *len, void *msg);
+extern void *CsrWifiSmeErrorIndDes(u8 *buffer, size_t len);
 extern size_t CsrWifiSmeErrorIndSizeof(void *msg);
 extern void CsrWifiSmeErrorIndSerFree(void *msg);
 
-extern u8* CsrWifiSmeInfoIndSer(u8 *ptr, size_t *len, void *msg);
-extern void* CsrWifiSmeInfoIndDes(u8 *buffer, size_t len);
+extern u8 *CsrWifiSmeInfoIndSer(u8 *ptr, size_t *len, void *msg);
+extern void *CsrWifiSmeInfoIndDes(u8 *buffer, size_t len);
 extern size_t CsrWifiSmeInfoIndSizeof(void *msg);
 extern void CsrWifiSmeInfoIndSerFree(void *msg);
 
-extern u8* CsrWifiSmeCoreDumpIndSer(u8 *ptr, size_t *len, void *msg);
-extern void* CsrWifiSmeCoreDumpIndDes(u8 *buffer, size_t len);
+extern u8 *CsrWifiSmeCoreDumpIndSer(u8 *ptr, size_t *len, void *msg);
+extern void *CsrWifiSmeCoreDumpIndDes(u8 *buffer, size_t len);
 extern size_t CsrWifiSmeCoreDumpIndSizeof(void *msg);
 extern void CsrWifiSmeCoreDumpIndSerFree(void *msg);
 
@@ -662,9 +662,5 @@ extern void CsrWifiSmeCoreDumpIndSerFree(void *msg);
 #define CsrWifiSmeWpsConfigurationCfmSizeof CsrWifiEventCsrUint16Sizeof
 #define CsrWifiSmeWpsConfigurationCfmSerFree CsrWifiSmePfree
 
-
-#ifdef __cplusplus
-}
-#endif
 #endif /* CSR_WIFI_SME_SERIALIZE_H__ */
 
diff --git a/drivers/staging/csr/csr_wifi_sme_task.h b/drivers/staging/csr/csr_wifi_sme_task.h
index 0f725e454939..1e938c1fa964 100644
--- a/drivers/staging/csr/csr_wifi_sme_task.h
+++ b/drivers/staging/csr/csr_wifi_sme_task.h
@@ -1,10 +1,10 @@
 /*****************************************************************************
 
-            (c) Cambridge Silicon Radio Limited 2011
-            All rights reserved and confidential information of CSR
+        (c) Cambridge Silicon Radio Limited 2011
+        All rights reserved and confidential information of CSR
 
-            Refer to LICENSE.txt included with this source for details
-            on the license terms.
+        Refer to LICENSE.txt included with this source for details
+        on the license terms.
 
 *****************************************************************************/
 
@@ -15,19 +15,11 @@
 
 #include "csr_sched.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #define CSR_WIFI_SME_LOG_ID 0x1202FFFF
 extern CsrSchedQid CSR_WIFI_SME_IFACEQUEUE;
 void CsrWifiSmeInit(void **gash);
 void CsrWifiSmeDeinit(void **gash);
 void CsrWifiSmeHandler(void **gash);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* CSR_WIFI_SME_TASK_H__ */
 
diff --git a/drivers/staging/csr/csr_wifi_vif_utils.h b/drivers/staging/csr/csr_wifi_vif_utils.h
index 523172d1ac92..8ff97888996d 100644
--- a/drivers/staging/csr/csr_wifi_vif_utils.h
+++ b/drivers/staging/csr/csr_wifi_vif_utils.h
@@ -11,10 +11,6 @@
 #ifndef CSR_WIFI_VIF_UTILS_H
 #define CSR_WIFI_VIF_UTILS_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* STANDARD INCLUDES ********************************************************/
 
 /* PROJECT INCLUDES *********************************************************/
@@ -27,82 +23,5 @@ extern "C" {
 #define CSR_WIFI_NUM_INTERFACES        (u8)0x1
 #define CSR_WIFI_INTERFACE_IN_USE      (u16)0x0
 
-/* This is used at places where interface Id isn't available*/
-#define CSR_WIFI_INTERFACE_ZERO        0
-#define CSR_WIFI_INTERFACE_STA         0
-#define CSR_WIFI_INTERFACE_AMP         0
-
-
-#define CSR_WIFI_VIF_UTILS_UNDEFINED_TAG 0xFFFF
-
-/* Extract the Interface Id from the event */
-#define CsrWifiVifUtilsGetVifTagFromEvent(msg) \
-    ((u16) * ((u16 *) ((u8 *) (msg) + sizeof(CsrWifiFsmEvent))))
-
-/* The HPI Vif combines the type and the interface id */
-#define CsrWifiVifUtilsGetVifTagFromHipEvent(msg) \
-    ((msg)->virtualInterfaceIdentifier & 0x00FF)
-
-#define CsrWifiVifUtilsPackHipEventVif(type, interfaceId) \
-    ((u16)((interfaceId) | ((type) << 8)))
-
-
-/* TYPES DEFINITIONS ********************************************************/
-
-/* GLOBAL VARIABLE DECLARATIONS *********************************************/
-
-/* PUBLIC FUNCTION PROTOTYPES ***********************************************/
-
-/**
- * @brief
- *     First checks if the mode is supported capability bitmap of the interface.
- *     If this succeeds, then checks if running this mode on this interface is allowed.
- *
- * @param[in] u8 : interface capability bitmap
- * @param[in] u8* : pointer to the array of current interface modes
- * @param[in] u16 : interfaceTag
- * @param[in] CsrWifiInterfaceMode : mode
- *
- * @return
- *     u8 : returns true if the interface is allowed to operate in the mode otherwise false.
- */
-extern u8 CsrWifiVifUtilsCheckCompatibility(u8             interfaceCapability,
-                                                 u8            *currentInterfaceModes,
-                                                 u16            interfaceTag,
-                                                 CsrWifiInterfaceMode mode);
-
-/**
- * @brief
- *     Checks if the specified interface is supported.
- *     NOTE: Only checks that the interface is supported, no checks are made to
- *     determine whether a supported interface may be made active.
- *
- * @param[in] u16 : interfaceTag
- *
- * @return
- *     u8 : returns true if the interface is supported, otherwise false.
- */
-extern u8 CsrWifiVifUtilsIsSupported(u16 interfaceTag);
-
-#ifdef CSR_LOG_ENABLE
-/**
- * @brief
- *     Registers the virtual interface utils logging details.
- *     Should only be called once at initialisation.
- *
- * @param[in/out] None
- *
- * @return
- *     None
- */
-void CsrWifiVifUtilsLogTextRegister(void);
-#else
-#define CsrWifiVifUtilsLogTextRegister()
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* CSR_WIFI_VIF_UTILS_H */
 
diff --git a/drivers/staging/csr/data_tx.c b/drivers/staging/csr/data_tx.c
index 8ed7a7845cc6..9e3d8b8ab02c 100644
--- a/drivers/staging/csr/data_tx.c
+++ b/drivers/staging/csr/data_tx.c
@@ -18,33 +18,30 @@
 int
 uf_verify_m4(unifi_priv_t *priv, const unsigned char *packet, unsigned int length)
 {
-    const unsigned char *p = packet;
-    u16 keyinfo;
+        const unsigned char *p = packet;
+        u16 keyinfo;
 
 
-    if (length < (4 + 5 + 8 + 32 + 16 + 8 + 8 + 16 + 1 + 8)) {
-        return 1;
-    }
+        if (length < (4 + 5 + 8 + 32 + 16 + 8 + 8 + 16 + 1 + 8))
+                return 1;
 
-    p += 8;
-    keyinfo = p[5] << 8 | p[6]; /* big-endian */
-    if (
-          (p[0] == 1 || p[0] == 2) /* protocol version 802.1X-2001 (WPA) or -2004 (WPA2) */ &&
-          p[1] == 3 /* EAPOL-Key */ &&
-          /* don't bother checking p[2] p[3] (hh ll, packet body length) */
-          (p[4] == 254 || p[4] == 2) /* descriptor type P802.1i-D3.0 (WPA) or 802.11i-2004 (WPA2) */ &&
-          ((keyinfo & 0x0007) == 1 || (keyinfo & 0x0007) == 2) /* key descriptor version */ &&
-         (keyinfo & ~0x0207U) == 0x0108 && /* key info for 4/4 or 4/2 -- ignore key desc version and sec bit (since varies in WPA 4/4) */
-          (p[4 + 5 + 8 + 32 + 16 + 8 + 8 + 16 + 0] == 0 && /* key data length (2 octets) 0 for 4/4 only */
-           p[4 + 5 + 8 + 32 + 16 + 8 + 8 + 16 + 1] == 0)
-        ) {
-        unifi_trace(priv, UDBG1, "uf_verify_m4: M4 detected \n");
-        return 0;
-    }
-    else
-    {
-        return 1;
-    }
+        p += 8;
+        keyinfo = p[5] << 8 | p[6]; /* big-endian */
+        if (
+          (p[0] == 1 || p[0] == 2) /* protocol version 802.1X-2001 (WPA) or -2004 (WPA2) */ &&
+          p[1] == 3 /* EAPOL-Key */ &&
+          /* don't bother checking p[2] p[3] (hh ll, packet body length) */
+          (p[4] == 254 || p[4] == 2) /* descriptor type P802.1i-D3.0 (WPA) or 802.11i-2004 (WPA2) */ &&
+          ((keyinfo & 0x0007) == 1 || (keyinfo & 0x0007) == 2) /* key descriptor version */ &&
+         (keyinfo & ~0x0207U) == 0x0108 && /* key info for 4/4 or 4/2 -- ignore key desc version and sec bit (since varies in WPA 4/4) */
+          (p[4 + 5 + 8 + 32 + 16 + 8 + 8 + 16 + 0] == 0 && /* key data length (2 octets) 0 for 4/4 only */
+           p[4 + 5 + 8 + 32 + 16 + 8 + 8 + 16 + 1] == 0)
+        ) {
+                unifi_trace(priv, UDBG1, "uf_verify_m4: M4 detected\n");
+                return 0;
+        } else {
+                return 1;
+        }
 }
 
 /*
diff --git a/drivers/staging/csr/drv.c b/drivers/staging/csr/drv.c
index 249758076a75..4780c32c2fe3 100644
--- a/drivers/staging/csr/drv.c
+++ b/drivers/staging/csr/drv.c
@@ -166,33 +166,32 @@ s32 CsrHipResultToStatus(CsrResult csrResult)
 static const char*
 trace_putest_cmdid(unifi_putest_command_t putest_cmd)
 {
-    switch (putest_cmd)
-    {
-        case UNIFI_PUTEST_START:
-            return "START";
-        case UNIFI_PUTEST_STOP:
-            return "STOP";
-        case UNIFI_PUTEST_SET_SDIO_CLOCK:
-            return "SET CLOCK";
-        case UNIFI_PUTEST_CMD52_READ:
-            return "CMD52R";
-        case UNIFI_PUTEST_CMD52_BLOCK_READ:
-            return "CMD52BR";
-        case UNIFI_PUTEST_CMD52_WRITE:
-            return "CMD52W";
-        case UNIFI_PUTEST_DL_FW:
-            return "D/L FW";
-        case UNIFI_PUTEST_DL_FW_BUFF:
-            return "D/L FW BUFFER";
-        case UNIFI_PUTEST_COREDUMP_PREPARE:
-            return "PREPARE COREDUMP";
-        case UNIFI_PUTEST_GP_READ16:
-            return "GP16R";
-        case UNIFI_PUTEST_GP_WRITE16:
-            return "GP16W";
-        default:
-            return "ERROR: unrecognised command";
-    }
+        switch (putest_cmd) {
+        case UNIFI_PUTEST_START:
+                return "START";
+        case UNIFI_PUTEST_STOP:
+                return "STOP";
+        case UNIFI_PUTEST_SET_SDIO_CLOCK:
+                return "SET CLOCK";
+        case UNIFI_PUTEST_CMD52_READ:
+                return "CMD52R";
+        case UNIFI_PUTEST_CMD52_BLOCK_READ:
+                return "CMD52BR";
+        case UNIFI_PUTEST_CMD52_WRITE:
+                return "CMD52W";
+        case UNIFI_PUTEST_DL_FW:
+                return "D/L FW";
+        case UNIFI_PUTEST_DL_FW_BUFF:
+                return "D/L FW BUFFER";
+        case UNIFI_PUTEST_COREDUMP_PREPARE:
+                return "PREPARE COREDUMP";
+        case UNIFI_PUTEST_GP_READ16:
+                return "GP16R";
+        case UNIFI_PUTEST_GP_WRITE16:
+                return "GP16W";
+        default:
+                return "ERROR: unrecognised command";
+        }
  }
 
 #ifdef CSR_WIFI_HIP_DEBUG_OFFLINE
@@ -266,8 +265,6 @@ unifi_open(struct inode *inode, struct file *file)
     unifi_priv_t *priv;
     ul_client_t *udi_cli;
 
-    func_enter();
-
     devno = MINOR(inode->i_rdev) >> 1;
 
     /*
@@ -278,7 +275,6 @@ unifi_open(struct inode *inode, struct file *file)
     priv = uf_get_instance(devno);
     if (priv == NULL) {
         unifi_error(NULL, "unifi_open: No device present\n");
-        func_exit();
         return -ENODEV;
     }
 
@@ -290,7 +286,6 @@ unifi_open(struct inode *inode, struct file *file)
             /* Too many clients already using this device */
             unifi_error(priv, "Too many clients already open\n");
             uf_put_instance(devno);
-            func_exit();
             return -ENOSPC;
         }
         unifi_trace(priv, UDBG1, "Client is registered to /dev/unifiudi%d\n", devno);
@@ -310,7 +305,6 @@ unifi_open(struct inode *inode, struct file *file)
             uf_put_instance(devno);
 
             unifi_info(priv, "There is already a configuration client using the character device\n");
-            func_exit();
             return -EBUSY;
         }
 #endif /* CSR_SME_USERSPACE */
@@ -331,7 +325,6 @@ unifi_open(struct inode *inode, struct file *file)
             uf_put_instance(devno);
 
             unifi_error(priv, "Too many clients already open\n");
-            func_exit();
             return -ENOSPC;
         }
 
@@ -357,7 +350,6 @@ unifi_open(struct inode *inode, struct file *file)
      */
     file->private_data = udi_cli;
 
-    func_exit();
     return 0;
 } /* unifi_open() */
 
@@ -369,8 +361,6 @@ unifi_release(struct inode *inode, struct file *filp)
     int devno;
     unifi_priv_t *priv;
 
-    func_enter();
-
     priv = uf_find_instance(udi_cli->instance);
     if (!priv) {
         unifi_error(priv, "unifi_close: instance for device not found\n");
@@ -465,8 +455,6 @@ unifi_read(struct file *filp, char *p, size_t len, loff_t *poff)
     struct list_head *l;
     int msglen;
 
-    func_enter();
-
     priv = uf_find_instance(pcli->instance);
     if (!priv) {
         unifi_error(priv, "invalid priv\n");
@@ -527,7 +515,6 @@ unifi_read(struct file *filp, char *p, size_t len, loff_t *poff)
     /* It is our resposibility to free the message buffer. */
     kfree(logptr);
 
-    func_exit_r(msglen);
     return msglen;
 
 } /* unifi_read() */
@@ -615,7 +602,6 @@ udi_send_signal_unpacked(unifi_priv_t *priv, unsigned char* data, uint data_len)
                 unifi_net_data_free(priv, &bulk_data.d[i]);
             }
         }
-        func_exit();
         return -EIO;
     }
 
@@ -654,8 +640,6 @@ udi_send_signal_raw(unifi_priv_t *priv, unsigned char *buf, int buflen)
     int bytecount;
     CsrResult csrResult;
 
-    func_enter();
-
     /*
      * The signal is the first thing in buf, the signal id is the
      * first 16 bits of the signal.
@@ -668,7 +652,6 @@ udi_send_signal_raw(unifi_priv_t *priv, unsigned char *buf, int buflen)
     if ((signal_size <= 0) || (signal_size > buflen)) {
         unifi_error(priv, "udi_send_signal_raw - Couldn't find length of signal 0x%x\n",
                     sig_id);
-        func_exit();
         return -EINVAL;
     }
     unifi_trace(priv, UDBG2, "udi_send_signal_raw: signal 0x%.4X len:%d\n",
@@ -713,7 +696,6 @@ udi_send_signal_raw(unifi_priv_t *priv, unsigned char *buf, int buflen)
 
     if (bytecount > buflen) {
         unifi_error(priv, "udi_send_signal_raw: Not enough data (%d instead of %d)\n", buflen, bytecount);
-        func_exit();
         return -EINVAL;
     }
 
@@ -721,7 +703,6 @@ udi_send_signal_raw(unifi_priv_t *priv, unsigned char *buf, int buflen)
     r = ul_send_signal_raw(priv, buf, signal_size, &data_ptrs);
     if (r < 0) {
         unifi_error(priv, "udi_send_signal_raw: send failed (%d)\n", r);
-        func_exit();
         return -EIO;
     }
 
@@ -746,8 +727,6 @@ udi_send_signal_raw(unifi_priv_t *priv, unsigned char *buf, int buflen)
     }
 #endif
 
-    func_exit_r(bytecount);
-
     return bytecount;
 } /* udi_send_signal_raw */
 
@@ -784,8 +763,6 @@ unifi_write(struct file *filp, const char *p, size_t len, loff_t *poff)
     bulk_data_param_t bulkdata;
     CsrResult csrResult;
 
-    func_enter();
-
     priv = uf_find_instance(pcli->instance);
     if (!priv) {
         unifi_error(priv, "invalid priv\n");
@@ -812,7 +789,6 @@ unifi_write(struct file *filp, const char *p, size_t len, loff_t *poff)
         csrResult = unifi_net_data_malloc(priv, &bulkdata.d[0], len);
         if (csrResult != CSR_RESULT_SUCCESS) {
             unifi_error(priv, "unifi_write: failed to allocate request_data.\n");
-            func_exit();
             return -ENOMEM;
         }
 
@@ -822,7 +798,6 @@ unifi_write(struct file *filp, const char *p, size_t len, loff_t *poff)
         if (copy_from_user((void*)user_data_buf, p, len)) {
             unifi_error(priv, "unifi_write: copy from user failed\n");
             unifi_net_data_free(priv, &bulkdata.d[0]);
-            func_exit();
             return -EFAULT;
         }
 
@@ -838,7 +813,6 @@ unifi_write(struct file *filp, const char *p, size_t len, loff_t *poff)
             unifi_error(priv, "unifi_write - Couldn't find length of signal 0x%x\n",
                         sig_id);
             unifi_net_data_free(priv, &bulkdata.d[0]);
-            func_exit();
             return -EINVAL;
         }
 
@@ -849,7 +823,6 @@ unifi_write(struct file *filp, const char *p, size_t len, loff_t *poff)
         signal_buf = kmalloc(signal_size, GFP_KERNEL);
         if (!signal_buf) {
             unifi_net_data_free(priv, &bulkdata.d[0]);
-            func_exit();
             return -ENOMEM;
         }
 
@@ -948,8 +921,6 @@ unifi_write(struct file *filp, const char *p, size_t len, loff_t *poff)
 
     kfree(buf);
 
-    func_exit_r(bytes_written);
-
     return bytes_written;
 } /* unifi_write() */
 
@@ -1657,8 +1628,6 @@ unifi_poll(struct file *filp, poll_table *wait)
     unsigned int mask = 0;
     int ready;
 
-    func_enter();
-
     ready = !list_empty(&pcli->udi_log);
 
     poll_wait(filp, &pcli->udi_wq, wait);
@@ -1667,8 +1636,6 @@ unifi_poll(struct file *filp, poll_table *wait)
         mask |= POLLIN | POLLRDNORM;    /* readable */
     }
 
-    func_exit();
-
     return mask;
 } /* unifi_poll() */
 
@@ -1784,8 +1751,6 @@ udi_log_event(ul_client_t *pcli,
     unsigned long n_1000;
 #endif
 
-    func_enter();
-
     /* Just a sanity check */
     if ((signal == NULL) || (signal_len <= 0)) {
         return;
@@ -1901,7 +1866,6 @@ udi_log_event(ul_client_t *pcli,
     if (down_interruptible(&pcli->udi_sem)) {
         printk(KERN_WARNING "udi_log_event_q: Failed to get udi sem\n");
         kfree(logptr);
-        func_exit();
         return;
     }
     list_add_tail(&logptr->q, &pcli->udi_log);
@@ -1910,7 +1874,6 @@ udi_log_event(ul_client_t *pcli,
     /* Wake any waiting user process */
     wake_up_interruptible(&pcli->udi_wq);
 
-    func_exit();
 } /* udi_log_event() */
 
 #ifdef CSR_SME_USERSPACE
@@ -1921,8 +1884,6 @@ uf_sme_queue_message(unifi_priv_t *priv, u8 *buffer, int length)
     udi_msg_t *msgptr;
     u8 *p;
 
-    func_enter();
-
     /* Just a sanity check */
     if ((buffer == NULL) || (length <= 0)) {
         return -EINVAL;
@@ -1968,8 +1929,6 @@ uf_sme_queue_message(unifi_priv_t *priv, u8 *buffer, int length)
     /* It is our responsibility to free the buffer allocated in build_packed_*() */
     kfree(buffer);
 
-    func_exit();
-
     return 0;
 
 } /* uf_sme_queue_message() */
@@ -2059,10 +2018,10 @@ int uf_create_device_nodes(unifi_priv_t *priv, int bus_id)
 
 void uf_destroy_device_nodes(unifi_priv_t *priv)
 {
-    device_destroy(unifi_class, priv->unifiudi_cdev.dev);
-    device_destroy(unifi_class, priv->unifi_cdev.dev);
-    cdev_del(&priv->unifiudi_cdev);
-    cdev_del(&priv->unifi_cdev);
+        device_destroy(unifi_class, priv->unifiudi_cdev.dev);
+        device_destroy(unifi_class, priv->unifi_cdev.dev);
+        cdev_del(&priv->unifiudi_cdev);
+        cdev_del(&priv->unifi_cdev);
 }
 
 
diff --git a/drivers/staging/csr/firmware.c b/drivers/staging/csr/firmware.c
index b6d8a6e52915..b42a4d6a0c36 100644
--- a/drivers/staging/csr/firmware.c
+++ b/drivers/staging/csr/firmware.c
@@ -62,8 +62,6 @@ unifi_fw_read_start(void *ospriv, s8 is_fw, const card_info_t *info)
     unifi_priv_t *priv = (unifi_priv_t*)ospriv;
     CSR_UNUSED(info);
 
-    func_enter();
-
     if (is_fw == UNIFI_FW_STA) {
         /* F/w may have been released after a previous successful download. */
         if (priv->fw_sta.dl_data == NULL) {
@@ -72,7 +70,6 @@ unifi_fw_read_start(void *ospriv, s8 is_fw, const card_info_t *info)
         }
         /* Set up callback struct for readfunc() */
         if (priv->fw_sta.dl_data != NULL) {
-            func_exit();
             return &priv->fw_sta;
         }
 
@@ -80,7 +77,6 @@ unifi_fw_read_start(void *ospriv, s8 is_fw, const card_info_t *info)
         unifi_error(priv, "downloading firmware... unknown request: %d\n", is_fw);
     }
 
-    func_exit();
     return NULL;
 } /* unifi_fw_read_start() */
 
@@ -105,7 +101,6 @@ unifi_fw_read_stop(void *ospriv, void *dlpriv)
 {
     unifi_priv_t *priv = (unifi_priv_t*)ospriv;
     struct dlpriv *dl_struct = (struct dlpriv *)dlpriv;
-    func_enter();
 
     if (dl_struct != NULL) {
         if (dl_struct->dl_data != NULL) {
@@ -115,7 +110,6 @@ unifi_fw_read_stop(void *ospriv, void *dlpriv)
         uf_release_firmware(priv, dl_struct);
     }
 
-    func_exit();
 } /* unifi_fw_read_stop() */
 
 
@@ -143,17 +137,14 @@ void *
 unifi_fw_open_buffer(void *ospriv, void *fwbuf, u32 len)
 {
     unifi_priv_t *priv = (unifi_priv_t*)ospriv;
-    func_enter();
 
     if (fwbuf == NULL) {
-        func_exit();
         return NULL;
     }
     priv->fw_conv.dl_data = fwbuf;
     priv->fw_conv.dl_len = len;
     priv->fw_conv.fw_desc = NULL;   /* No OS f/w resource is associated */
 
-    func_exit();
     return &priv->fw_conv;
 }
 
@@ -242,8 +233,6 @@ unifi_fw_read(void *ospriv, void *arg, u32 offset, void *buf, u32 len)
 int
 uf_run_unifihelper(unifi_priv_t *priv)
 {
-#ifdef CONFIG_HOTPLUG
-
 #ifdef ANDROID_BUILD
     char *prog = "/system/bin/unififw";
 #else
@@ -289,10 +278,6 @@ uf_run_unifihelper(unifi_priv_t *priv)
     r = call_usermodehelper(argv[0], argv, envp, UMH_WAIT_EXEC);
 
     return r;
-#else
-    unifi_trace(priv, UDBG1, "Can't automatically download firmware because kernel does not have HOTPLUG\n");
-    return -1;
-#endif
 } /* uf_run_unifihelper() */
 
 #ifdef CSR_WIFI_SPLIT_PATCH
diff --git a/drivers/staging/csr/inet.c b/drivers/staging/csr/inet.c
index b4acb54ecc62..b3ef818fef35 100644
--- a/drivers/staging/csr/inet.c
+++ b/drivers/staging/csr/inet.c
@@ -93,14 +93,12 @@ static struct notifier_block uf_inetaddr_notifier = {
 
 void uf_register_inet_notifier(void)
 {
-    if (atomic_inc_return(&inet_notif_refs) == 1) {
-        register_inetaddr_notifier(&uf_inetaddr_notifier);
-    }
+        if (atomic_inc_return(&inet_notif_refs) == 1)
+                register_inetaddr_notifier(&uf_inetaddr_notifier);
 }
 
 void uf_unregister_inet_notifier(void)
 {
-    if (atomic_dec_return(&inet_notif_refs) == 0) {
-        unregister_inetaddr_notifier(&uf_inetaddr_notifier);
-    }
+        if (atomic_dec_return(&inet_notif_refs) == 0)
+                unregister_inetaddr_notifier(&uf_inetaddr_notifier);
 }
diff --git a/drivers/staging/csr/io.c b/drivers/staging/csr/io.c
index caf48e3120ca..af9c28f073b9 100644
--- a/drivers/staging/csr/io.c
+++ b/drivers/staging/csr/io.c
@@ -31,7 +31,6 @@
  * ---------------------------------------------------------------------------
  */
 #include <linux/proc_fs.h>
-#include <linux/version.h>
 
 #include "csr_wifi_hip_unifi.h"
 #include "csr_wifi_hip_unifiversion.h"
@@ -86,7 +85,6 @@ static int uf_read_proc(char *page, char **start, off_t offset, int count,
 static CsrResult signal_buffer_init(unifi_priv_t * priv, int size)
 {
     int i;
-    func_enter();
 
     priv->rxSignalBuffer.writePointer =
     priv->rxSignalBuffer.readPointer = 0;
@@ -106,11 +104,9 @@ static CsrResult signal_buffer_init(unifi_priv_t * priv, int size)
                  kfree(priv->rxSignalBuffer.rx_buff[j].bufptr);
                  priv->rxSignalBuffer.rx_buff[j].bufptr = NULL;
              }
-             func_exit();
              return -1;
          }
     }
-    func_exit();
     return 0;
 }
 
@@ -265,8 +261,6 @@ register_unifi_sdio(CsrSdioFunction *sdio_dev, int bus_id, struct device *dev)
     int r = -1;
     CsrResult csrResult;
 
-    func_enter();
-
     if ((bus_id < 0) || (bus_id >= MAX_UNIFI_DEVS)) {
         unifi_error(priv, "register_unifi_sdio: invalid device %d\n",
                 bus_id);
@@ -415,7 +409,6 @@ register_unifi_sdio(CsrSdioFunction *sdio_dev, int bus_id, struct device *dev)
 
     up(&Unifi_instance_mutex);
 
-    func_exit();
     return priv;
 
 failed4:
@@ -449,7 +442,6 @@ failed0:
 
     up(&Unifi_instance_mutex);
 
-    func_exit();
     return NULL;
 } /* register_unifi_sdio() */
 
@@ -473,7 +465,6 @@ failed0:
 static void
 ask_unifi_sdio_cleanup(unifi_priv_t *priv)
 {
-    func_enter();
 
     /*
      * Now clear the flag that says the old instance is in use.
@@ -486,8 +477,6 @@ ask_unifi_sdio_cleanup(unifi_priv_t *priv)
     unifi_trace(NULL, UDBG5, "ask_unifi_sdio_cleanup: wake up cleanup workqueue.\n");
     wake_up(&Unifi_cleanup_wq);
 
-    func_exit();
-
 } /* ask_unifi_sdio_cleanup() */
 
 
@@ -511,8 +500,6 @@ cleanup_unifi_sdio(unifi_priv_t *priv)
     int i;
     static const CsrWifiMacAddress broadcast_address = {{0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}};
 
-    func_enter();
-
     /* Remove the device nodes */
     uf_destroy_device_nodes(priv);
 
@@ -604,8 +591,6 @@ cleanup_unifi_sdio(unifi_priv_t *priv)
 
     unifi_trace(NULL, UDBG5, "cleanup_unifi_sdio: DONE.\n");
 
-    func_exit();
-
 } /* cleanup_unifi_sdio() */
 
 
@@ -639,7 +624,6 @@ unregister_unifi_sdio(int bus_id)
     if (priv == NULL) {
         unifi_error(priv, "unregister_unifi_sdio: device %d is not registered\n",
                 bus_id);
-        func_exit();
         return;
     }
 
@@ -1016,37 +1000,37 @@ uf_remove_os_device(int bus_id)
 static void
 uf_sdio_inserted(CsrSdioFunction *sdio_ctx)
 {
-    unifi_priv_t *priv;
+        unifi_priv_t *priv;
 
-    unifi_trace(NULL, UDBG5, "uf_sdio_inserted(0x%p), slot_id=%d, dev=%p\n",
-            sdio_ctx, active_slot, os_devices[active_slot]);
+        unifi_trace(NULL, UDBG5, "uf_sdio_inserted(0x%p), slot_id=%d, dev=%p\n",
+                      sdio_ctx, active_slot, os_devices[active_slot]);
 
-    priv = register_unifi_sdio(sdio_ctx, active_slot, os_devices[active_slot]);
-    if (priv == NULL) {
-        CsrSdioInsertedAcknowledge(sdio_ctx, CSR_RESULT_FAILURE);
-        return;
-    }
+        priv = register_unifi_sdio(sdio_ctx, active_slot, os_devices[active_slot]);
+        if (priv == NULL) {
+                CsrSdioInsertedAcknowledge(sdio_ctx, CSR_RESULT_FAILURE);
+                return;
+        }
 
-    sdio_ctx->driverData = priv;
+        sdio_ctx->driverData = priv;
 
-    CsrSdioInsertedAcknowledge(sdio_ctx, CSR_RESULT_SUCCESS);
+        CsrSdioInsertedAcknowledge(sdio_ctx, CSR_RESULT_SUCCESS);
 } /* uf_sdio_inserted() */
 
 
 static void
 uf_sdio_removed(CsrSdioFunction *sdio_ctx)
 {
-    unregister_unifi_sdio(active_slot);
-    CsrSdioRemovedAcknowledge(sdio_ctx);
+        unregister_unifi_sdio(active_slot);
+        CsrSdioRemovedAcknowledge(sdio_ctx);
 } /* uf_sdio_removed() */
 
 
 static void
 uf_sdio_dsr_handler(CsrSdioFunction *sdio_ctx)
 {
-    unifi_priv_t *priv = sdio_ctx->driverData;
+        unifi_priv_t *priv = sdio_ctx->driverData;
 
-    unifi_sdio_interrupt_handler(priv->card);
+        unifi_sdio_interrupt_handler(priv->card);
 } /* uf_sdio_dsr_handler() */
 
 /*
@@ -1068,7 +1052,7 @@ uf_sdio_dsr_handler(CsrSdioFunction *sdio_ctx)
 static CsrSdioInterruptDsrCallback
 uf_sdio_int_handler(CsrSdioFunction *sdio_ctx)
 {
-    return uf_sdio_dsr_handler;
+        return uf_sdio_dsr_handler;
 } /* uf_sdio_int_handler() */
 
 
@@ -1076,18 +1060,18 @@ uf_sdio_int_handler(CsrSdioFunction *sdio_ctx)
 
 static CsrSdioFunctionId unifi_ids[] =
 {
-    {
-        .manfId = SDIO_MANF_ID_CSR,
-        .cardId = SDIO_CARD_ID_UNIFI_3,
-        .sdioFunction = SDIO_WLAN_FUNC_ID_UNIFI_3,
-        .sdioInterface = CSR_SDIO_ANY_SDIO_INTERFACE,
-    },
-    {
-        .manfId = SDIO_MANF_ID_CSR,
-        .cardId = SDIO_CARD_ID_UNIFI_4,
-        .sdioFunction = SDIO_WLAN_FUNC_ID_UNIFI_4,
-        .sdioInterface = CSR_SDIO_ANY_SDIO_INTERFACE,
-    }
+        {
+                .manfId = SDIO_MANF_ID_CSR,
+                .cardId = SDIO_CARD_ID_UNIFI_3,
+                .sdioFunction = SDIO_WLAN_FUNC_ID_UNIFI_3,
+                .sdioInterface = CSR_SDIO_ANY_SDIO_INTERFACE,
+        },
+        {
+                .manfId = SDIO_MANF_ID_CSR,
+                .cardId = SDIO_CARD_ID_UNIFI_4,
+                .sdioFunction = SDIO_WLAN_FUNC_ID_UNIFI_4,
+                .sdioInterface = CSR_SDIO_ANY_SDIO_INTERFACE,
+        }
 };
 
 
@@ -1096,14 +1080,14 @@ static CsrSdioFunctionId unifi_ids[] =
  */
 static CsrSdioFunctionDriver unifi_sdioFunction_drv =
 {
-    .inserted = uf_sdio_inserted,
-    .removed = uf_sdio_removed,
-    .intr = uf_sdio_int_handler,
-    .suspend = uf_lx_suspend,
-    .resume = uf_lx_resume,
-
-    .ids = unifi_ids,
-    .idsCount = sizeof(unifi_ids) / sizeof(unifi_ids[0])
+        .inserted = uf_sdio_inserted,
+        .removed = uf_sdio_removed,
+        .intr = uf_sdio_int_handler,
+        .suspend = uf_lx_suspend,
+        .resume = uf_lx_resume,
+
+        .ids = unifi_ids,
+        .idsCount = sizeof(unifi_ids) / sizeof(unifi_ids[0])
 };
 
 
@@ -1126,15 +1110,15 @@ static CsrSdioFunctionDriver unifi_sdioFunction_drv =
 int __init
 uf_sdio_load(void)
 {
-    CsrResult csrResult;
+        CsrResult csrResult;
 
-    csrResult = CsrSdioFunctionDriverRegister(&unifi_sdioFunction_drv);
-    if (csrResult != CSR_RESULT_SUCCESS) {
-        unifi_error(NULL, "Failed to register UniFi SDIO driver: csrResult=%d\n", csrResult);
-        return -EIO;
-    }
+        csrResult = CsrSdioFunctionDriverRegister(&unifi_sdioFunction_drv);
+        if (csrResult != CSR_RESULT_SUCCESS) {
+                unifi_error(NULL, "Failed to register UniFi SDIO driver: csrResult=%d\n", csrResult);
+                return -EIO;
+        }
 
-    return 0;
+        return 0;
 } /* uf_sdio_load() */
 
 
@@ -1142,6 +1126,6 @@ uf_sdio_load(void)
 void __exit
 uf_sdio_unload(void)
 {
-    CsrSdioFunctionDriverUnregister(&unifi_sdioFunction_drv);
+        CsrSdioFunctionDriverUnregister(&unifi_sdioFunction_drv);
 } /* uf_sdio_unload() */
 
diff --git a/drivers/staging/csr/mlme.c b/drivers/staging/csr/mlme.c
index ed767eccbb32..861d6b7687c7 100644
--- a/drivers/staging/csr/mlme.c
+++ b/drivers/staging/csr/mlme.c
@@ -154,8 +154,6 @@ unifi_mlme_blocking_request(unifi_priv_t *priv, ul_client_t *pcli,
 {
     int r;
 
-    func_enter();
-
     if (sig->SignalPrimitiveHeader.SignalId == 0) {
         unifi_error(priv, "unifi_mlme_blocking_request: Invalid Signal Id (0x%x)\n",
                     sig->SignalPrimitiveHeader.SignalId);
@@ -199,7 +197,6 @@ unifi_mlme_blocking_request(unifi_priv_t *priv, ul_client_t *pcli,
         return r;
     }
 
-    func_exit();
     return 0;
 } /* unifi_mlme_blocking_request() */
 
diff --git a/drivers/staging/csr/monitor.c b/drivers/staging/csr/monitor.c
index 7c524a18958e..c8e20e4c6111 100644
--- a/drivers/staging/csr/monitor.c
+++ b/drivers/staging/csr/monitor.c
@@ -10,7 +10,6 @@
  * ---------------------------------------------------------------------------
  */
 
-#include <linux/version.h>
 #include "unifi_priv.h"
 
 #ifdef UNIFI_SNIFF_ARPHRD
@@ -122,8 +121,6 @@ netrx_radiotap(unifi_priv_t *priv,
     struct unifi_rx_radiotap_header *unifi_rt;
     int signal, noise, snr;
 
-    func_enter();
-
     if (ind_data_len <= 0) {
         unifi_error(priv, "Invalid length in CSR_MA_SNIFFDATA_INDICATION.\n");
         return;
@@ -205,7 +202,6 @@ netrx_radiotap(unifi_priv_t *priv,
     priv->stats.rx_packets++;
     priv->stats.rx_bytes += ind_data_len;
 
-    func_exit();
 } /* netrx_radiotap() */
 #endif /* RADIOTAP */
 
@@ -256,8 +252,6 @@ netrx_prism(unifi_priv_t *priv,
     } *avs;
     int signal, noise, snr;
 
-    func_enter();
-
     if (ind_data_len <= 0) {
         unifi_error(priv, "Invalid length in CSR_MA_SNIFFDATA_INDICATION.\n");
         return;
@@ -319,7 +313,6 @@ netrx_prism(unifi_priv_t *priv,
     priv->stats.rx_packets++;
     priv->stats.rx_bytes += ind_data_len;
 
-    func_exit();
 } /* netrx_prism() */
 #endif /* PRISM */
 
@@ -351,11 +344,8 @@ ma_sniffdata_ind(void *ospriv,
     struct net_device *dev = priv->netdev;
     struct sk_buff *skb = (struct sk_buff*)bulkdata->d[0].os_net_buf_ptr;
 
-    func_enter();
-
     if (bulkdata->d[0].data_length == 0) {
         unifi_warning(priv, "rx: MA-SNIFFDATA indication with zero bulk data\n");
-        func_exit();
         return;
     }
 
diff --git a/drivers/staging/csr/netdev.c b/drivers/staging/csr/netdev.c
index 9a52ab408e1a..7dad26f70175 100644
--- a/drivers/staging/csr/netdev.c
+++ b/drivers/staging/csr/netdev.c
@@ -47,7 +47,6 @@
 #include <linux/etherdevice.h>
 #include <linux/mutex.h>
 #include <linux/semaphore.h>
-#include <linux/version.h>
 #include <linux/vmalloc.h>
 #include "csr_wifi_hip_unifi.h"
 #include "csr_wifi_hip_conversions.h"
@@ -55,7 +54,7 @@
 #include <net/pkt_sched.h>
 
 
-/* Wext handler is suported only if CSR_SUPPORT_WEXT is defined */
+/* Wext handler is supported only if CSR_SUPPORT_WEXT is defined */
 #ifdef CSR_SUPPORT_WEXT
 extern struct iw_handler_def unifi_iw_handler_def;
 #endif /* CSR_SUPPORT_WEXT */
@@ -89,7 +88,7 @@ typedef int (*tx_signal_handler)(unifi_priv_t *priv, struct sk_buff *skb, const
 /*
  * The driver uses the qdisc interface to buffer and control all
  * outgoing traffic. We create a root qdisc, register our qdisc operations
- * and later we create two subsiduary pfifo queues for the uncontrolled
+ * and later we create two subsidiary pfifo queues for the uncontrolled
  * and controlled ports.
  *
  * The network stack delivers all outgoing packets in our enqueue handler.
@@ -478,8 +477,6 @@ uf_free_netdevice(unifi_priv_t *priv)
     int i;
     unsigned long flags;
 
-    func_enter();
-
     unifi_trace(priv, UDBG1, "uf_free_netdevice\n");
 
     if (!priv) {
@@ -554,7 +551,6 @@ uf_free_netdevice(unifi_priv_t *priv)
         }
     }
 
-    func_exit();
     return 0;
 } /* uf_free_netdevice() */
 
@@ -578,8 +574,6 @@ uf_net_open(struct net_device *dev)
     netInterface_priv_t *interfacePriv = (netInterface_priv_t *)netdev_priv(dev);
     unifi_priv_t *priv = interfacePriv->privPtr;
 
-    func_enter();
-
     /* If we haven't finished UniFi initialisation, we can't start */
     if (priv->init_progress != UNIFI_INIT_COMPLETED) {
         unifi_warning(priv, "%s: unifi not ready, failing net_open\n", __FUNCTION__);
@@ -615,7 +609,6 @@ uf_net_open(struct net_device *dev)
 
     netif_tx_start_all_queues(dev);
 
-    func_exit();
     return 0;
 } /* uf_net_open() */
 
@@ -627,8 +620,6 @@ uf_net_stop(struct net_device *dev)
     netInterface_priv_t *interfacePriv = (netInterface_priv_t*)netdev_priv(dev);
     unifi_priv_t *priv = interfacePriv->privPtr;
 
-    func_enter();
-
     /* Stop sniffing if in Monitor mode */
     if (priv->wext_conf.mode == IW_MODE_MONITOR) {
         if (priv->card) {
@@ -639,13 +630,10 @@ uf_net_stop(struct net_device *dev)
             }
         }
     }
-#else
-    func_enter();
 #endif
 
     netif_tx_stop_all_queues(dev);
 
-    func_exit();
     return 0;
 } /* uf_net_stop() */
 
@@ -675,7 +663,6 @@ static CSR_PRIORITY uf_get_packet_priority(unifi_priv_t *priv, netInterface_priv
 {
     CSR_PRIORITY priority = CSR_CONTENTION;
 
-    func_enter();
     priority = (CSR_PRIORITY) (skb->priority >> 5);
 
     if (priority == CSR_QOS_UP0) { /* 0 */
@@ -721,7 +708,6 @@ static CSR_PRIORITY uf_get_packet_priority(unifi_priv_t *priv, netInterface_priv
 
     unifi_trace(priv, UDBG5, "Packet priority = %d\n", priority);
 
-    func_exit();
     return priority;
 }
 
@@ -750,8 +736,6 @@ get_packet_priority(unifi_priv_t *priv, struct sk_buff *skb, const struct ethhdr
 
     u8 interfaceMode = interfacePriv->interfaceMode;
 
-    func_enter();
-
     /* Priority Mapping for all the Modes */
     switch(interfaceMode)
     {
@@ -788,7 +772,6 @@ get_packet_priority(unifi_priv_t *priv, struct sk_buff *skb, const struct ethhdr
     }
     unifi_trace(priv, UDBG5, "priority = %x\n", priority);
 
-    func_exit();
     return priority;
 }
 
@@ -816,8 +799,6 @@ uf_net_select_queue(struct net_device *dev, struct sk_buff *skb)
     int proto;
     CSR_PRIORITY priority;
 
-    func_enter();
-
     memcpy(&ehdr, skb->data, ETH_HLEN);
     proto = ntohs(ehdr.h_proto);
 
@@ -836,7 +817,6 @@ uf_net_select_queue(struct net_device *dev, struct sk_buff *skb)
     }
 
 
-    func_exit();
     return (u16)queue;
 } /* uf_net_select_queue() */
 
@@ -1582,7 +1562,7 @@ send_ma_pkt_request(unifi_priv_t *priv, struct sk_buff *skb, const struct ethhdr
         return -1;
     }
 
-    /* RA adrress must contain the immediate destination MAC address that is similiar to
+    /* RA address must contain the immediate destination MAC address that is similar to
      * the Address 1 field of 802.11 Mac header here 4 is: (sizeof(framecontrol) + sizeof (durationID))
      * which is address 1 field
      */
@@ -1760,8 +1740,6 @@ uf_net_xmit(struct sk_buff *skb, struct net_device *dev)
     CSR_PRIORITY priority;
     CsrWifiRouterCtrlPortAction port_action;
 
-    func_enter();
-
     unifi_trace(priv, UDBG5, "unifi_net_xmit: skb = %x\n", skb);
 
     memcpy(&ehdr, skb->data, ETH_HLEN);
@@ -1805,7 +1783,6 @@ uf_net_xmit(struct sk_buff *skb, struct net_device *dev)
         interfacePriv->stats.tx_dropped++;
         kfree_skb(skb);
 
-        func_exit();
         return NETDEV_TX_OK;
     }
 
@@ -1848,7 +1825,6 @@ uf_net_xmit(struct sk_buff *skb, struct net_device *dev)
 
     /* The skb will have been freed by send_XXX_request() */
 
-    func_exit();
     return result;
 } /* uf_net_xmit() */
 
@@ -1877,7 +1853,6 @@ unifi_pause_xmit(void *ospriv, unifi_TrafficQueue queue)
     unifi_priv_t *priv = ospriv;
     int i; /* used as a loop counter */
 
-    func_enter();
     unifi_trace(priv, UDBG2, "Stopping queue %d\n", queue);
 
     for(i=0;i<CSR_WIFI_NUM_INTERFACES;i++)
@@ -1897,7 +1872,6 @@ unifi_pause_xmit(void *ospriv, unifi_TrafficQueue queue)
         unifi_error(priv, "Start buffering %d defaulting to 0\n", queue);
      }
 #endif
-    func_exit();
 
 } /* unifi_pause_xmit() */
 
@@ -1907,7 +1881,6 @@ unifi_restart_xmit(void *ospriv, unifi_TrafficQueue queue)
     unifi_priv_t *priv = ospriv;
     int i=0; /* used as a loop counter */
 
-    func_enter();
     unifi_trace(priv, UDBG2, "Waking queue %d\n", queue);
 
     for(i=0;i<CSR_WIFI_NUM_INTERFACES;i++)
@@ -1927,7 +1900,6 @@ unifi_restart_xmit(void *ospriv, unifi_TrafficQueue queue)
         uf_send_buffered_frames(priv,0);
     }
 #endif
-    func_exit();
 } /* unifi_restart_xmit() */
 
 
@@ -1963,7 +1935,6 @@ indicate_rx_skb(unifi_priv_t *priv, u16 ifTag, u8* dst_a, u8* src_a, struct sk_b
         priv->interfacePriv[ifTag]->stats.rx_frame_errors++;
         unifi_net_data_free(priv, &bulkdata->d[0]);
         unifi_notice(priv, "indicate_rx_skb: Discard unknown frame.\n");
-        func_exit();
         return;
     }
 
@@ -1975,7 +1946,6 @@ indicate_rx_skb(unifi_priv_t *priv, u16 ifTag, u8* dst_a, u8* src_a, struct sk_b
         unifi_net_data_free(priv, &bulkdata->d[0]);
         unifi_trace(priv, UDBG5, "indicate_rx_skb: Data given to subscription"
                 "API, not being given to kernel\n");
-        func_exit();
         return;
     }
 
@@ -1998,7 +1968,6 @@ indicate_rx_skb(unifi_priv_t *priv, u16 ifTag, u8* dst_a, u8* src_a, struct sk_b
         priv->interfacePriv[ifTag]->stats.rx_errors++;
         priv->interfacePriv[ifTag]->stats.rx_length_errors++;
         unifi_net_data_free(priv, &bulkdata->d[0]);
-        func_exit();
         return;
     }
 
@@ -2025,7 +1994,6 @@ indicate_rx_skb(unifi_priv_t *priv, u16 ifTag, u8* dst_a, u8* src_a, struct sk_b
     priv->interfacePriv[ifTag]->stats.rx_packets++;
     priv->interfacePriv[ifTag]->stats.rx_bytes += bulkdata->d[0].data_length;
 
-    func_exit();
     return;
 }
 
@@ -2178,8 +2146,6 @@ unifi_rx(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_data_param_t *bulkdata)
     netInterface_priv_t *interfacePriv;
     struct ethhdr ehdr;
 
-    func_enter();
-
     interfaceTag = (pkt_ind->VirtualInterfaceIdentifier & 0xff);
     interfacePriv = priv->interfacePriv[interfaceTag];
 
@@ -2188,7 +2154,6 @@ unifi_rx(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_data_param_t *bulkdata)
     {
         unifi_error(priv, "%s: MA-PACKET indication with bad interfaceTag %d\n", __FUNCTION__, interfaceTag);
         unifi_net_data_free(priv,&bulkdata->d[0]);
-        func_exit();
         return;
     }
 
@@ -2197,14 +2162,12 @@ unifi_rx(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_data_param_t *bulkdata)
     {
         unifi_error(priv, "%s: MA-PACKET indication with unallocated interfaceTag %d\n", __FUNCTION__, interfaceTag);
         unifi_net_data_free(priv, &bulkdata->d[0]);
-        func_exit();
         return;
     }
 
     if (bulkdata->d[0].data_length == 0) {
         unifi_warning(priv, "%s: MA-PACKET indication with zero bulk data\n", __FUNCTION__);
         unifi_net_data_free(priv,&bulkdata->d[0]);
-        func_exit();
         return;
     }
 
@@ -2326,7 +2289,6 @@ unifi_rx(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_data_param_t *bulkdata)
             sa[0], sa[1],sa[2], sa[3], sa[4],sa[5]);
             CsrWifiRouterCtrlUnexpectedFrameIndSend(priv->CSR_WIFI_SME_IFACEQUEUE,0,interfaceTag,peerMacAddress);
             unifi_net_data_free(priv, &bulkdata->d[0]);
-            func_exit();
             return;
         }
 
@@ -2343,7 +2305,6 @@ unifi_rx(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_data_param_t *bulkdata)
             unifi_net_data_free(priv, &bulkdata->d[0]);
             unifi_notice(priv, "%s: Dropping packet, proto=0x%04x, %s port\n", __FUNCTION__,
                          proto, queue ? "Controlled" : "Un-controlled");
-            func_exit();
             return;
         }
 
@@ -2351,7 +2312,6 @@ unifi_rx(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_data_param_t *bulkdata)
         if((dataFrameType == QOS_DATA_NULL) || (dataFrameType == DATA_NULL)){
             unifi_trace(priv, UDBG5, "%s: Null Frame Received and Freed\n", __FUNCTION__);
             unifi_net_data_free(priv, &bulkdata->d[0]);
-            func_exit();
             return;
         }
 
@@ -2366,7 +2326,6 @@ unifi_rx(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_data_param_t *bulkdata)
              bulkdata,
              macHeaderLengthInBytes)))
         {
-            func_exit();
             return;
         }
         unifi_trace(priv, UDBG5, "unifi_rx: no specific AP handling process as normal frame, MAC Header len %d\n",macHeaderLengthInBytes);
@@ -2389,7 +2348,6 @@ unifi_rx(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_data_param_t *bulkdata)
             unifi_trace(priv, UDBG1, "Zero length frame, but not null-data %04x\n", frameControl);
         }
         unifi_net_data_free(priv, &bulkdata->d[0]);
-        func_exit();
         return;
     }
 
@@ -2399,7 +2357,6 @@ unifi_rx(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_data_param_t *bulkdata)
         unifi_net_data_free(priv, &bulkdata->d[0]);
         unifi_notice(priv, "%s: Dropping packet, proto=0x%04x, %s port\n",
                      __FUNCTION__, proto, queue ? "controlled" : "uncontrolled");
-        func_exit();
         return;
     } else if ( (port_action == CSR_WIFI_ROUTER_CTRL_PORT_ACTION_8021X_PORT_CLOSED_BLOCK) ||
                    (interfacePriv->connected != UnifiConnected) ) {
@@ -2415,7 +2372,6 @@ unifi_rx(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_data_param_t *bulkdata)
                         __FUNCTION__, sizeof(rx_buffered_packets_t));
             interfacePriv->stats.rx_dropped++;
             unifi_net_data_free(priv, &bulkdata->d[0]);
-            func_exit();
             return;
         }
 
@@ -2439,15 +2395,12 @@ unifi_rx(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_data_param_t *bulkdata)
         list_add_tail(&rx_q_item->q, rx_list);
         up(&priv->rx_q_sem);
 
-        func_exit();
         return;
 
     }
 
     indicate_rx_skb(priv, interfaceTag, da, sa, skb, signal, bulkdata);
 
-    func_exit();
-
 } /* unifi_rx() */
 
 static void process_ma_packet_cfm(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_data_param_t *bulkdata)
@@ -2456,7 +2409,6 @@ static void process_ma_packet_cfm(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_d
     const CSR_MA_PACKET_CONFIRM *pkt_cfm = &signal->u.MaPacketConfirm;
     netInterface_priv_t *interfacePriv;
 
-    func_enter();
     interfaceTag = (pkt_cfm->VirtualInterfaceIdentifier & 0xff);
     interfacePriv = priv->interfacePriv[interfaceTag];
 
@@ -2464,7 +2416,6 @@ static void process_ma_packet_cfm(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_d
     if (interfaceTag >= CSR_WIFI_NUM_INTERFACES)
     {
         unifi_error(priv, "%s: MA-PACKET confirm with bad interfaceTag %d\n", __FUNCTION__, interfaceTag);
-        func_exit();
         return;
     }
 #ifdef CSR_SUPPORT_SME
@@ -2487,7 +2438,6 @@ static void process_ma_packet_cfm(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_d
         interfacePriv->m4_hostTag = 0xffffffff;
     }
 #endif
-    func_exit();
     return;
 }
 
@@ -2528,8 +2478,6 @@ static void process_ma_packet_ind(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_d
 
 #endif
 
-    func_enter();
-
     interfaceTag = (pkt_ind->VirtualInterfaceIdentifier & 0xff);
     interfacePriv = priv->interfacePriv[interfaceTag];
 
@@ -2539,7 +2487,6 @@ static void process_ma_packet_ind(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_d
     {
         unifi_error(priv, "%s: MA-PACKET indication with bad interfaceTag %d\n", __FUNCTION__, interfaceTag);
         unifi_net_data_free(priv,&bulkdata->d[0]);
-        func_exit();
         return;
     }
 
@@ -2548,24 +2495,21 @@ static void process_ma_packet_ind(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_d
     {
         unifi_error(priv, "%s: MA-PACKET indication with unallocated interfaceTag %d\n", __FUNCTION__, interfaceTag);
         unifi_net_data_free(priv, &bulkdata->d[0]);
-        func_exit();
         return;
     }
 
     if (bulkdata->d[0].data_length == 0) {
         unifi_warning(priv, "%s: MA-PACKET indication with zero bulk data\n", __FUNCTION__);
         unifi_net_data_free(priv,&bulkdata->d[0]);
-        func_exit();
         return;
     }
     /* For monitor mode we need to pass this indication to the registered application
-    handle this seperately*/
+    handle this separately*/
     /* MIC failure is already taken care of so no need to send the PDUs which are not successfully received in non-monitor mode*/
     if(pkt_ind->ReceptionStatus != CSR_RX_SUCCESS)
     {
         unifi_warning(priv, "%s: MA-PACKET indication with status = %d\n",__FUNCTION__, pkt_ind->ReceptionStatus);
         unifi_net_data_free(priv,&bulkdata->d[0]);
-        func_exit();
         return;
     }
 
@@ -2613,13 +2557,11 @@ static void process_ma_packet_ind(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_d
         }
 #endif
         unifi_net_data_free(priv,&bulkdata->d[0]);
-        func_exit();
         return;
     }
     if(frameType != IEEE802_11_FRAMETYPE_DATA) {
         unifi_warning(priv, "%s: Non control Non Data frame is received\n",__FUNCTION__);
         unifi_net_data_free(priv,&bulkdata->d[0]);
-        func_exit();
         return;
     }
 
@@ -2637,7 +2579,6 @@ static void process_ma_packet_ind(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_d
             sa[0], sa[1],sa[2], sa[3], sa[4],sa[5]);
             CsrWifiRouterCtrlUnexpectedFrameIndSend(priv->CSR_WIFI_SME_IFACEQUEUE,0,interfaceTag,peerMacAddress);
             unifi_net_data_free(priv, &bulkdata->d[0]);
-            func_exit();
             return;
         }
 
@@ -2743,7 +2684,6 @@ static void process_ma_packet_ind(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_d
     up(&priv->ba_mutex);
     process_ba_complete(priv, interfacePriv);
 
-    func_exit();
 }
 /*
  * ---------------------------------------------------------------------------
@@ -2836,8 +2776,6 @@ netdev_mlme_event_handler(ul_client_t *pcli, const u8 *sig_packed, int sig_len,
     int id, r;
     bulk_data_param_t bulkdata;
 
-    func_enter();
-
     /* Just a sanity check */
     if (sig_packed == NULL) {
         return;
@@ -2902,7 +2840,6 @@ netdev_mlme_event_handler(ul_client_t *pcli, const u8 *sig_packed, int sig_len,
             break;
     }
 
-    func_exit();
 } /* netdev_mlme_event_handler() */
 
 
@@ -3100,13 +3037,13 @@ static void update_expected_sn(unifi_priv_t *priv,
     u16 gap;
 
     gap = (sn - ba_session->expected_sn) & 0xFFF;
-    unifi_trace(priv, UDBG6, "%s: proccess the frames up to new_expected_sn = %d gap = %d\n", __FUNCTION__, sn, gap);
+    unifi_trace(priv, UDBG6, "%s: process the frames up to new_expected_sn = %d gap = %d\n", __FUNCTION__, sn, gap);
     for(j = 0; j < gap && j < ba_session->wind_size; j++) {
         i = SN_TO_INDEX(ba_session, ba_session->expected_sn);
-        unifi_trace(priv, UDBG6, "%s: proccess the slot index = %d\n", __FUNCTION__, i);
+        unifi_trace(priv, UDBG6, "%s: process the slot index = %d\n", __FUNCTION__, i);
         if(ba_session->buffer[i].active) {
             add_frame_to_ba_complete(priv, interfacePriv, &ba_session->buffer[i]);
-            unifi_trace(priv, UDBG6, "%s: proccess the frame at index = %d expected_sn = %d\n", __FUNCTION__, i, ba_session->expected_sn);
+            unifi_trace(priv, UDBG6, "%s: process the frame at index = %d expected_sn = %d\n", __FUNCTION__, i, ba_session->expected_sn);
             FREE_BUFFER_SLOT(ba_session, i);
         } else {
             unifi_trace(priv, UDBG6, "%s: empty slot at index = %d\n", __FUNCTION__, i);
@@ -3247,8 +3184,8 @@ static void check_ba_frame_age_timeout( unifi_priv_t *priv,
                                         netInterface_priv_t *interfacePriv,
                                         ba_session_rx_struct *ba_session)
 {
-    CsrTime now;
-    CsrTime age;
+    u32 now;
+    u32 age;
     u8 i, j;
     u16 sn_temp;
 
@@ -3283,11 +3220,11 @@ static void check_ba_frame_age_timeout( unifi_priv_t *priv,
                 if (ba_session->buffer[i].recv_time > now)
                 {
                     /* timer wrap */
-                    age = CsrTimeAdd((CsrTime)CsrTimeSub(CSR_SCHED_TIME_MAX, ba_session->buffer[i].recv_time), now);
+                    age = CsrTimeAdd((u32)CsrTimeSub(CSR_SCHED_TIME_MAX, ba_session->buffer[i].recv_time), now);
                 }
                 else
                 {
-                    age = (CsrTime)CsrTimeSub(now, ba_session->buffer[i].recv_time);
+                    age = (u32)CsrTimeSub(now, ba_session->buffer[i].recv_time);
                 }
 
                 if (age >= CSR_WIFI_BA_MPDU_FRAME_AGE_TIMEOUT)
@@ -3331,8 +3268,6 @@ static void process_ma_packet_error_ind(unifi_priv_t *priv, CSR_SIGNAL *signal,
     CSR_PRIORITY        UserPriority;
     CSR_SEQUENCE_NUMBER sn;
 
-    func_enter();
-
     interfaceTag = (pkt_err_ind->VirtualInterfaceIdentifier & 0xff);
 
 
@@ -3340,7 +3275,6 @@ static void process_ma_packet_error_ind(unifi_priv_t *priv, CSR_SIGNAL *signal,
     if (interfaceTag >= CSR_WIFI_NUM_INTERFACES)
     {
         unifi_error(priv, "%s: MaPacketErrorIndication indication with bad interfaceTag %d\n", __FUNCTION__, interfaceTag);
-        func_exit();
         return;
     }
 
@@ -3348,7 +3282,6 @@ static void process_ma_packet_error_ind(unifi_priv_t *priv, CSR_SIGNAL *signal,
     UserPriority = pkt_err_ind->UserPriority;
     if(UserPriority > 15) {
         unifi_error(priv, "%s: MaPacketErrorIndication indication with bad UserPriority=%d\n", __FUNCTION__, UserPriority);
-        func_exit();
     }
     sn = pkt_err_ind->SequenceNumber;
 
@@ -3369,7 +3302,6 @@ static void process_ma_packet_error_ind(unifi_priv_t *priv, CSR_SIGNAL *signal,
 
     up(&priv->ba_mutex);
     process_ba_complete(priv, interfacePriv);
-    func_exit();
 }
 
 
diff --git a/drivers/staging/csr/os.c b/drivers/staging/csr/os.c
index 35dc9087d79f..37ec59df3581 100644
--- a/drivers/staging/csr/os.c
+++ b/drivers/staging/csr/os.c
@@ -412,9 +412,8 @@ dump(void *mem, u16 len)
         return;
     }
     for (i = 0; i < len; i++) {
-        if (col == 0) {
+        if (col == 0)
             printk("0x%02X: ", i);
-        }
 
         printk(" %02X", pdata[i]);
 
@@ -423,9 +422,8 @@ dump(void *mem, u16 len)
             col = 0;
         }
     }
-    if (col) {
+    if (col)
         printk("\n");
-    }
 } /* dump() */
 
 
@@ -438,9 +436,8 @@ dump16(void *mem, u16 len)
     printk("timestamp %s \n", print_time());
 #endif /* ANDROID_TIMESTAMP */
     for (i = 0; i < len; i+=2) {
-        if (col == 0) {
+        if (col == 0)
             printk("0x%02X: ", i);
-        }
 
         printk(" %04X", *p++);
 
@@ -449,9 +446,8 @@ dump16(void *mem, u16 len)
             col = 0;
         }
     }
-    if (col) {
+    if (col)
         printk("\n");
-    }
 }
 
 
@@ -459,7 +455,7 @@ dump16(void *mem, u16 len)
 void
 dump_str(void *mem, u16 len)
 {
-    int i, col = 0;
+    int i;
     unsigned char *pdata = (unsigned char *)mem;
 #ifdef ANDROID_TIMESTAMP
     printk("timestamp %s \n", print_time());
@@ -467,9 +463,7 @@ dump_str(void *mem, u16 len)
     for (i = 0; i < len; i++) {
         printk("%c", pdata[i]);
     }
-    if (col) {
-        printk("\n");
-    }
+        printk("\n");
 
 } /* dump_str() */
 #endif /* CSR_ONLY_NOTES */
diff --git a/drivers/staging/csr/sdio_mmc.c b/drivers/staging/csr/sdio_mmc.c
index af3e40bb5010..b6a16de08f4e 100644
--- a/drivers/staging/csr/sdio_mmc.c
+++ b/drivers/staging/csr/sdio_mmc.c
@@ -14,7 +14,6 @@
 #include <linux/kernel.h>
 #include <linux/mutex.h>
 #include <linux/gfp.h>
-#include <linux/version.h>
 #include <linux/mmc/core.h>
 #include <linux/mmc/card.h>
 #include <linux/mmc/host.h>
@@ -152,7 +151,6 @@ CsrSdioRead8(CsrSdioFunction *function, u32 address, u8 *data)
     _sdio_release_host(func);
 
     if (err) {
-        func_exit_r(err);
         return ConvertSdioToCsrSdioResult(err);
     }
 
@@ -170,7 +168,6 @@ CsrSdioWrite8(CsrSdioFunction *function, u32 address, u8 data)
     _sdio_release_host(func);
 
     if (err) {
-        func_exit_r(err);
         return ConvertSdioToCsrSdioResult(err);
     }
 
@@ -246,7 +243,6 @@ CsrSdioF0Read8(CsrSdioFunction *function, u32 address, u8 *data)
     _sdio_release_host(func);
 
     if (err) {
-        func_exit_r(err);
         return ConvertSdioToCsrSdioResult(err);
     }
 
@@ -268,7 +264,6 @@ CsrSdioF0Write8(CsrSdioFunction *function, u32 address, u8 data)
     _sdio_release_host(func);
 
     if (err) {
-        func_exit_r(err);
         return ConvertSdioToCsrSdioResult(err);
     }
 
@@ -287,7 +282,6 @@ CsrSdioRead(CsrSdioFunction *function, u32 address, void *data, u32 length)
     _sdio_release_host(func);
 
     if (err) {
-        func_exit_r(err);
         return ConvertSdioToCsrSdioResult(err);
     }
 
@@ -305,7 +299,6 @@ CsrSdioWrite(CsrSdioFunction *function, u32 address, const void *data, u32 lengt
     _sdio_release_host(func);
 
     if (err) {
-        func_exit_r(err);
         return ConvertSdioToCsrSdioResult(err);
     }
 
@@ -480,7 +473,6 @@ CsrSdioInterruptEnable(CsrSdioFunction *function)
 #endif
     _sdio_release_host(func);
 
-    func_exit();
     if (err) {
         printk(KERN_ERR "unifi: %s: error %d writing IENx\n", __FUNCTION__, err);
         return ConvertSdioToCsrSdioResult(err);
@@ -507,7 +499,6 @@ CsrSdioInterruptDisable(CsrSdioFunction *function)
 #endif
     _sdio_release_host(func);
 
-    func_exit();
     if (err) {
         printk(KERN_ERR "unifi: %s: error %d writing IENx\n", __FUNCTION__, err);
         return ConvertSdioToCsrSdioResult(err);
@@ -541,8 +532,6 @@ CsrSdioFunctionEnable(CsrSdioFunction *function)
     struct sdio_func *func = (struct sdio_func *)function->priv;
     int err;
 
-    func_enter();
-
     /* Enable UniFi function 1 (the 802.11 part). */
     _sdio_claim_host(func);
     err = sdio_enable_func(func);
@@ -551,7 +540,6 @@ CsrSdioFunctionEnable(CsrSdioFunction *function)
         unifi_error(NULL, "Failed to enable SDIO function %d\n", func->num);
     }
 
-    func_exit();
     return ConvertSdioToCsrSdioResult(err);
 } /* CsrSdioFunctionEnable() */
 
@@ -575,8 +563,6 @@ CsrSdioFunctionDisable(CsrSdioFunction *function)
     struct sdio_func *func = (struct sdio_func *)function->priv;
     int err;
 
-    func_enter();
-
     /* Disable UniFi function 1 (the 802.11 part). */
     _sdio_claim_host(func);
     err = sdio_disable_func(func);
@@ -585,7 +571,6 @@ CsrSdioFunctionDisable(CsrSdioFunction *function)
         unifi_error(NULL, "Failed to disable SDIO function %d\n", func->num);
     }
 
-    func_exit();
     return ConvertSdioToCsrSdioResult(err);
 } /* CsrSdioFunctionDisable() */
 
@@ -1034,8 +1019,6 @@ uf_glue_sdio_probe(struct sdio_func *func,
     int instance;
     CsrSdioFunction *sdio_ctx;
 
-    func_enter();
-
     /* First of all claim the SDIO driver */
     sdio_claim_host(func);
 
@@ -1103,7 +1086,6 @@ uf_glue_sdio_probe(struct sdio_func *func,
     wake_lock(&unifi_sdio_wake_lock);
 #endif
 
-    func_exit();
     return 0;
 } /* uf_glue_sdio_probe() */
 
@@ -1131,8 +1113,6 @@ uf_glue_sdio_remove(struct sdio_func *func)
         return;
     }
 
-    func_enter();
-
     unifi_info(NULL, "UniFi card removed\n");
 
     /* Clean up the SDIO function driver */
@@ -1148,8 +1128,6 @@ uf_glue_sdio_remove(struct sdio_func *func)
 
     kfree(sdio_ctx);
 
-    func_exit();
-
 } /* uf_glue_sdio_remove */
 
 
@@ -1183,11 +1161,8 @@ MODULE_DEVICE_TABLE(sdio, unifi_ids);
 static int
 uf_glue_sdio_suspend(struct device *dev)
 {
-    func_enter();
-
     unifi_trace(NULL, UDBG1, "uf_glue_sdio_suspend");
 
-    func_exit();
     return 0;
 } /* uf_glue_sdio_suspend */
 
@@ -1208,8 +1183,6 @@ uf_glue_sdio_suspend(struct device *dev)
 static int
 uf_glue_sdio_resume(struct device *dev)
 {
-    func_enter();
-
     unifi_trace(NULL, UDBG1, "uf_glue_sdio_resume");
 
 #ifdef ANDROID_BUILD
@@ -1217,7 +1190,6 @@ uf_glue_sdio_resume(struct device *dev)
     wake_lock(&unifi_sdio_wake_lock);
 #endif
 
-    func_exit();
     return 0;
 
 } /* uf_glue_sdio_resume */
diff --git a/drivers/staging/csr/sme_blocking.c b/drivers/staging/csr/sme_blocking.c
index 543e8f2c407a..d88ccd5bd428 100644
--- a/drivers/staging/csr/sme_blocking.c
+++ b/drivers/staging/csr/sme_blocking.c
@@ -270,17 +270,15 @@ int sme_mgt_wifi_off(unifi_priv_t *priv)
     }
 
     r = sme_init_request(priv);
-    if (r) {
+    if (r)
         return -EIO;
-    }
 
     /* Stop the SME */
     CsrWifiSmeWifiOffReqSend(0);
 
     r = sme_wait_for_reply(priv, UNIFI_SME_MGT_LONG_TIMEOUT);
-    if (r) {
+    if (r)
         return r;
-    }
 
     unifi_trace(priv, UDBG4,
                 "sme_mgt_wifi_off: unifi_mgt_wifi_off_req <-- (r=%d, status=%d)\n",
@@ -300,16 +298,14 @@ int sme_mgt_key(unifi_priv_t *priv, CsrWifiSmeKey *sme_key,
     }
 
     r = sme_init_request(priv);
-    if (r) {
+    if (r)
         return -EIO;
-    }
 
     CsrWifiSmeKeyReqSend(0, CSR_WIFI_INTERFACE_IN_USE, action, *sme_key);
 
     r = sme_wait_for_reply(priv, UNIFI_SME_MGT_SHORT_TIMEOUT);
-    if (r) {
+    if (r)
         return r;
-    }
 
     return convert_sme_error(priv->sme_reply.reply_status);
 }
@@ -332,9 +328,8 @@ int sme_mgt_scan_full(unifi_priv_t *priv,
     unifi_trace(priv, UDBG4, "sme_mgt_scan_full: -->\n");
 
     r = sme_init_request(priv);
-    if (r) {
+    if (r)
         return -EIO;
-    }
 
     /* If a channel list is provided, do an active scan */
     if (is_active) {
@@ -354,16 +349,14 @@ int sme_mgt_scan_full(unifi_priv_t *priv,
                               0, NULL);
 
     r = sme_wait_for_reply(priv, UNIFI_SME_MGT_LONG_TIMEOUT);
-    if (r) {
+    if (r)
         return r;
-    }
 
     unifi_trace(priv, UDBG4, "sme_mgt_scan_full: <-- (status=%d)\n", priv->sme_reply.reply_status);
-    if (priv->sme_reply.reply_status == CSR_WIFI_RESULT_UNAVAILABLE) {
+    if (priv->sme_reply.reply_status == CSR_WIFI_RESULT_UNAVAILABLE)
         return 0; /* initial scan already underway */
-    } else {
+    else
         return convert_sme_error(priv->sme_reply.reply_status);
-    }
 }
 
 
@@ -385,15 +378,13 @@ int sme_mgt_scan_results_get_async(unifi_priv_t *priv,
     }
 
     r = sme_init_request(priv);
-    if (r) {
+    if (r)
         return -EIO;
-    }
 
     CsrWifiSmeScanResultsGetReqSend(0);
     r = sme_wait_for_reply(priv, UNIFI_SME_MGT_LONG_TIMEOUT);
-    if (r) {
+    if (r)
         return r;
-    }
 
     scan_result_list_count = priv->sme_reply.reply_scan_results_count;
     scan_result_list = priv->sme_reply.reply_scan_results;
@@ -454,20 +445,17 @@ int sme_mgt_connect(unifi_priv_t *priv)
                 priv->connection_config.ssid.ssid);
 
     r = sme_init_request(priv);
-    if (r) {
+    if (r)
         return -EIO;
-    }
 
     CsrWifiSmeConnectReqSend(0, CSR_WIFI_INTERFACE_IN_USE, priv->connection_config);
     r = sme_wait_for_reply(priv, UNIFI_SME_MGT_SHORT_TIMEOUT);
-    if (r) {
+    if (r)
         return r;
-    }
 
-    if (priv->sme_reply.reply_status) {
+    if (priv->sme_reply.reply_status)
         unifi_trace(priv, UDBG1, "sme_mgt_connect: failed with SME status %d\n",
                     priv->sme_reply.reply_status);
-    }
 
     return convert_sme_error(priv->sme_reply.reply_status);
 }
@@ -483,15 +471,13 @@ int sme_mgt_disconnect(unifi_priv_t *priv)
     }
 
     r = sme_init_request(priv);
-    if (r) {
+    if (r)
         return -EIO;
-    }
 
     CsrWifiSmeDisconnectReqSend(0, CSR_WIFI_INTERFACE_IN_USE);
     r = sme_wait_for_reply(priv, UNIFI_SME_MGT_SHORT_TIMEOUT);
-    if (r) {
+    if (r)
         return r;
-    }
 
     unifi_trace(priv, UDBG4, "sme_mgt_disconnect: <-- (status=%d)\n", priv->sme_reply.reply_status);
     return convert_sme_error(priv->sme_reply.reply_status);
@@ -510,16 +496,14 @@ int sme_mgt_pmkid(unifi_priv_t *priv,
     }
 
     r = sme_init_request(priv);
-    if (r) {
+    if (r)
         return -EIO;
-    }
 
     CsrWifiSmePmkidReqSend(0, CSR_WIFI_INTERFACE_IN_USE, action,
                         pmkid_list->pmkidsCount, pmkid_list->pmkids);
     r = sme_wait_for_reply(priv, UNIFI_SME_MGT_SHORT_TIMEOUT);
-    if (r) {
+    if (r)
         return r;
-    }
 
     unifi_trace(priv, UDBG4, "sme_mgt_pmkid: <-- (status=%d)\n", priv->sme_reply.reply_status);
     return convert_sme_error(priv->sme_reply.reply_status);
@@ -537,9 +521,8 @@ int sme_mgt_mib_get(unifi_priv_t *priv,
     }
 
     r = sme_init_request(priv);
-    if (r) {
+    if (r)
         return -EIO;
-    }
 
     priv->mib_cfm_buffer = varbind;
     priv->mib_cfm_buffer_length = MAX_VARBIND_LENGTH;
@@ -571,15 +554,13 @@ int sme_mgt_mib_set(unifi_priv_t *priv,
     }
 
     r = sme_init_request(priv);
-    if (r) {
+    if (r)
         return -EIO;
-    }
 
     CsrWifiSmeMibSetReqSend(0, length, varbind);
     r = sme_wait_for_reply(priv, UNIFI_SME_MGT_SHORT_TIMEOUT);
-    if (r) {
+    if (r)
         return r;
-    }
 
     unifi_trace(priv, UDBG4, "sme_mgt_mib_set: <-- (status=%d)\n", priv->sme_reply.reply_status);
     return convert_sme_error(priv->sme_reply.reply_status);
@@ -598,16 +579,14 @@ int sme_mgt_power_config_set(unifi_priv_t *priv, CsrWifiSmePowerConfig *powerCon
     }
 
     r = sme_init_request(priv);
-    if (r) {
+    if (r)
         return -EIO;
-    }
 
     CsrWifiSmePowerConfigSetReqSend(0, *powerConfig);
 
     r = sme_wait_for_reply(priv, UNIFI_SME_MGT_SHORT_TIMEOUT);
-    if (r) {
+    if (r)
         return r;
-    }
 
     unifi_trace(priv, UDBG4,
                 "sme_mgt_set_value_async: unifi_mgt_set_value_req <-- (r=%d status=%d)\n",
@@ -637,29 +616,26 @@ int sme_mgt_sme_config_set(unifi_priv_t *priv, CsrWifiSmeStaConfig *staConfig, C
     }
 
     r = sme_init_request(priv);
-    if (r) {
+    if (r)
         return -EIO;
-    }
 
     CsrWifiSmeSmeStaConfigSetReqSend(0, CSR_WIFI_INTERFACE_IN_USE, *staConfig);
     r = sme_wait_for_reply(priv, UNIFI_SME_MGT_SHORT_TIMEOUT);
-    if (r) {
+    if (r)
         return r;
-    }
+
     unifi_trace(priv, UDBG4,
                 "sme_mgt_sme_config_set: CsrWifiSmeSmeStaConfigSetReq <-- (r=%d status=%d)\n",
                 r, priv->sme_reply.reply_status);
 
     r = sme_init_request(priv);
-    if (r) {
+    if (r)
         return -EIO;
-    }
 
     CsrWifiSmeSmeCommonConfigSetReqSend(0, *deviceConfig);
     r = sme_wait_for_reply(priv, UNIFI_SME_MGT_SHORT_TIMEOUT);
-    if (r) {
+    if (r)
         return r;
-    }
 
     unifi_trace(priv, UDBG4,
                 "sme_mgt_sme_config_set: CsrWifiSmeSmeCommonConfigSetReq <-- (r=%d status=%d)\n",
@@ -693,16 +669,14 @@ int sme_mgt_mib_config_set(unifi_priv_t *priv, CsrWifiSmeMibConfig *mibConfig)
     }
 
     r = sme_init_request(priv);
-    if (r) {
+    if (r)
         return -EIO;
-    }
 
     CsrWifiSmeMibConfigSetReqSend(0, *mibConfig);
 
     r = sme_wait_for_reply(priv, UNIFI_SME_MGT_SHORT_TIMEOUT);
-    if (r) {
+    if (r)
         return r;
-    }
 
     unifi_trace(priv, UDBG4,
                 "sme_mgt_mib_config_set: unifi_mgt_set_mib_config_req <-- (r=%d status=%d)\n",
@@ -732,16 +706,14 @@ int sme_mgt_coex_config_set(unifi_priv_t *priv, CsrWifiSmeCoexConfig *coexConfig
     }
 
     r = sme_init_request(priv);
-    if (r) {
+    if (r)
         return -EIO;
-    }
 
     CsrWifiSmeCoexConfigSetReqSend(0, *coexConfig);
 
     r = sme_wait_for_reply(priv, UNIFI_SME_MGT_SHORT_TIMEOUT);
-    if (r) {
+    if (r)
         return r;
-    }
 
     unifi_trace(priv, UDBG4,
                 "sme_mgt_coex_config_set: unifi_mgt_set_mib_config_req <-- (r=%d status=%d)\n",
@@ -773,16 +745,14 @@ int sme_mgt_host_config_set(unifi_priv_t *priv, CsrWifiSmeHostConfig *hostConfig
     }
 
     r = sme_init_request(priv);
-    if (r) {
+    if (r)
         return -EIO;
-    }
 
     CsrWifiSmeHostConfigSetReqSend(0, CSR_WIFI_INTERFACE_IN_USE, *hostConfig);
 
     r = sme_wait_for_reply(priv, UNIFI_SME_MGT_SHORT_TIMEOUT);
-    if (r) {
+    if (r)
         return r;
-    }
 
     unifi_trace(priv, UDBG4,
                 "sme_mgt_host_config_set: unifi_mgt_set_host_config_req <-- (r=%d status=%d)\n",
@@ -815,16 +785,14 @@ int sme_mgt_versions_get(unifi_priv_t *priv, CsrWifiSmeVersions *versions)
 
     unifi_trace(priv, UDBG4, "sme_mgt_versions_get: unifi_mgt_versions_get_req -->\n");
     r = sme_init_request(priv);
-    if (r) {
+    if (r)
         return -EIO;
-    }
 
     CsrWifiSmeVersionsGetReqSend(0);
 
     r = sme_wait_for_reply(priv, UNIFI_SME_MGT_SHORT_TIMEOUT);
-    if (r) {
+    if (r)
         return r;
-    }
 
     /* store the reply */
     if (versions != NULL) {
@@ -861,16 +829,14 @@ int sme_mgt_power_config_get(unifi_priv_t *priv, CsrWifiSmePowerConfig *powerCon
 
     unifi_trace(priv, UDBG4, "sme_mgt_power_config_get: unifi_mgt_power_config_req -->\n");
     r = sme_init_request(priv);
-    if (r) {
+    if (r)
         return -EIO;
-    }
 
     CsrWifiSmePowerConfigGetReqSend(0);
 
     r = sme_wait_for_reply(priv, UNIFI_SME_MGT_SHORT_TIMEOUT);
-    if (r) {
+    if (r)
         return r;
-    }
 
     /* store the reply */
     if (powerConfig != NULL) {
@@ -905,23 +871,20 @@ int sme_mgt_host_config_get(unifi_priv_t *priv, CsrWifiSmeHostConfig *hostConfig
 
     unifi_trace(priv, UDBG4, "sme_mgt_host_config_get: unifi_mgt_host_config_get_req -->\n");
     r = sme_init_request(priv);
-    if (r) {
+    if (r)
         return -EIO;
-    }
 
     CsrWifiSmeHostConfigGetReqSend(0, CSR_WIFI_INTERFACE_IN_USE);
 
     r = sme_wait_for_reply(priv, UNIFI_SME_MGT_SHORT_TIMEOUT);
-    if (r) {
+    if (r)
         return r;
-    }
 
     /* store the reply */
-    if (hostConfig != NULL) {
+    if (hostConfig != NULL)
         memcpy((unsigned char*)hostConfig,
                (unsigned char*)&priv->sme_reply.hostConfig,
                sizeof(CsrWifiSmeHostConfig));
-    }
 
     unifi_trace(priv, UDBG4,
                 "sme_mgt_host_config_get: unifi_mgt_host_config_get_req <-- (r=%d status=%d)\n",
@@ -951,41 +914,35 @@ int sme_mgt_sme_config_get(unifi_priv_t *priv, CsrWifiSmeStaConfig *staConfig, C
 
     /* Common device config */
     r = sme_init_request(priv);
-    if (r) {
+    if (r)
         return -EIO;
-    }
 
     CsrWifiSmeSmeCommonConfigGetReqSend(0);
     r = sme_wait_for_reply(priv, UNIFI_SME_MGT_SHORT_TIMEOUT);
-    if (r) {
+    if (r)
         return r;
-    }
 
     /* store the reply */
-    if (deviceConfig != NULL) {
+    if (deviceConfig != NULL)
         memcpy((unsigned char*)deviceConfig,
                (unsigned char*)&priv->sme_reply.deviceConfig,
                sizeof(CsrWifiSmeDeviceConfig));
-    }
 
     /* STA config */
     r = sme_init_request(priv);
-    if (r) {
+    if (r)
         return -EIO;
-    }
 
     CsrWifiSmeSmeStaConfigGetReqSend(0, CSR_WIFI_INTERFACE_IN_USE);
     r = sme_wait_for_reply(priv, UNIFI_SME_MGT_SHORT_TIMEOUT);
-    if (r) {
+    if (r)
         return r;
-    }
 
     /* store the reply */
-    if (staConfig != NULL) {
+    if (staConfig != NULL)
         memcpy((unsigned char*)staConfig,
                (unsigned char*)&priv->sme_reply.staConfig,
                sizeof(CsrWifiSmeStaConfig));
-    }
 
     unifi_trace(priv, UDBG4,
                 "sme_mgt_sme_config_get: unifi_mgt_sme_config_get_req <-- (r=%d status=%d)\n",
@@ -1014,23 +971,20 @@ int sme_mgt_coex_info_get(unifi_priv_t *priv, CsrWifiSmeCoexInfo *coexInfo)
 
     unifi_trace(priv, UDBG4, "sme_mgt_coex_info_get: unifi_mgt_coex_info_get_req -->\n");
     r = sme_init_request(priv);
-    if (r) {
+    if (r)
         return -EIO;
-    }
 
     CsrWifiSmeCoexInfoGetReqSend(0);
 
     r = sme_wait_for_reply(priv, UNIFI_SME_MGT_SHORT_TIMEOUT);
-    if (r) {
+    if (r)
         return r;
-    }
 
     /* store the reply */
-    if (coexInfo != NULL) {
+    if (coexInfo != NULL)
         memcpy((unsigned char*)coexInfo,
                (unsigned char*)&priv->sme_reply.coexInfo,
                sizeof(CsrWifiSmeCoexInfo));
-    }
 
     unifi_trace(priv, UDBG4,
                 "sme_mgt_coex_info_get: unifi_mgt_coex_info_get_req <-- (r=%d status=%d)\n",
@@ -1060,23 +1014,20 @@ int sme_mgt_coex_config_get(unifi_priv_t *priv, CsrWifiSmeCoexConfig *coexConfig
 
     unifi_trace(priv, UDBG4, "sme_mgt_coex_config_get: unifi_mgt_coex_config_get_req -->\n");
     r = sme_init_request(priv);
-    if (r) {
+    if (r)
         return -EIO;
-    }
 
     CsrWifiSmeCoexConfigGetReqSend(0);
 
     r = sme_wait_for_reply(priv, UNIFI_SME_MGT_SHORT_TIMEOUT);
-    if (r) {
+    if (r)
         return r;
-    }
 
     /* store the reply */
-    if (coexConfig != NULL) {
+    if (coexConfig != NULL)
         memcpy((unsigned char*)coexConfig,
                (unsigned char*)&priv->sme_reply.coexConfig,
                sizeof(CsrWifiSmeCoexConfig));
-    }
 
     unifi_trace(priv, UDBG4,
                 "sme_mgt_coex_config_get: unifi_mgt_coex_config_get_req <-- (r=%d status=%d)\n",
@@ -1104,23 +1055,20 @@ int sme_mgt_mib_config_get(unifi_priv_t *priv, CsrWifiSmeMibConfig *mibConfig)
 
     unifi_trace(priv, UDBG4, "sme_mgt_mib_config_get: unifi_mgt_mib_config_get_req -->\n");
     r = sme_init_request(priv);
-    if (r) {
+    if (r)
         return -EIO;
-    }
 
     CsrWifiSmeMibConfigGetReqSend(0);
 
     r = sme_wait_for_reply(priv, UNIFI_SME_MGT_SHORT_TIMEOUT);
-    if (r) {
+    if (r)
         return r;
-    }
 
     /* store the reply */
-    if (mibConfig != NULL) {
+    if (mibConfig != NULL)
         memcpy((unsigned char*)mibConfig,
                (unsigned char*)&priv->sme_reply.mibConfig,
                sizeof(CsrWifiSmeMibConfig));
-    }
 
     unifi_trace(priv, UDBG4,
                 "sme_mgt_mib_config_get: unifi_mgt_mib_config_get_req <-- (r=%d status=%d)\n",
@@ -1148,23 +1096,20 @@ int sme_mgt_connection_info_get(unifi_priv_t *priv, CsrWifiSmeConnectionInfo *co
 
     unifi_trace(priv, UDBG4, "sme_mgt_connection_info_get: unifi_mgt_connection_info_get_req -->\n");
     r = sme_init_request(priv);
-    if (r) {
+    if (r)
         return -EIO;
-    }
 
     CsrWifiSmeConnectionInfoGetReqSend(0, CSR_WIFI_INTERFACE_IN_USE);
 
     r = sme_wait_for_reply(priv, UNIFI_SME_MGT_SHORT_TIMEOUT);
-    if (r) {
+    if (r)
         return r;
-    }
 
     /* store the reply */
-    if (connectionInfo != NULL) {
+    if (connectionInfo != NULL)
         memcpy((unsigned char*)connectionInfo,
                (unsigned char*)&priv->sme_reply.connectionInfo,
                sizeof(CsrWifiSmeConnectionInfo));
-    }
 
     unifi_trace(priv, UDBG4,
                 "sme_mgt_connection_info_get: unifi_mgt_connection_info_get_req <-- (r=%d status=%d)\n",
@@ -1192,23 +1137,20 @@ int sme_mgt_connection_config_get(unifi_priv_t *priv, CsrWifiSmeConnectionConfig
 
     unifi_trace(priv, UDBG4, "sme_mgt_connection_config_get: unifi_mgt_connection_config_get_req -->\n");
     r = sme_init_request(priv);
-    if (r) {
+    if (r)
         return -EIO;
-    }
 
     CsrWifiSmeConnectionConfigGetReqSend(0, CSR_WIFI_INTERFACE_IN_USE);
 
     r = sme_wait_for_reply(priv, UNIFI_SME_MGT_SHORT_TIMEOUT);
-    if (r) {
+    if (r)
         return r;
-    }
 
     /* store the reply */
-    if (connectionConfig != NULL) {
+    if (connectionConfig != NULL)
         memcpy((unsigned char*)connectionConfig,
                (unsigned char*)&priv->sme_reply.connectionConfig,
                sizeof(CsrWifiSmeConnectionConfig));
-    }
 
     unifi_trace(priv, UDBG4,
                 "sme_mgt_connection_config_get: unifi_mgt_connection_config_get_req <-- (r=%d status=%d)\n",
@@ -1236,23 +1178,20 @@ int sme_mgt_connection_stats_get(unifi_priv_t *priv, CsrWifiSmeConnectionStats *
 
     unifi_trace(priv, UDBG4, "sme_mgt_connection_stats_get: unifi_mgt_connection_stats_get_req -->\n");
     r = sme_init_request(priv);
-    if (r) {
+    if (r)
         return -EIO;
-    }
 
     CsrWifiSmeConnectionStatsGetReqSend(0, CSR_WIFI_INTERFACE_IN_USE);
 
     r = sme_wait_for_reply(priv, UNIFI_SME_MGT_SHORT_TIMEOUT);
-    if (r) {
+    if (r)
         return r;
-    }
 
     /* store the reply */
-    if (connectionStats != NULL) {
+    if (connectionStats != NULL)
         memcpy((unsigned char*)connectionStats,
                (unsigned char*)&priv->sme_reply.connectionStats,
                sizeof(CsrWifiSmeConnectionStats));
-    }
 
     unifi_trace(priv, UDBG4,
                 "sme_mgt_connection_stats_get: unifi_mgt_connection_stats_get_req <-- (r=%d status=%d)\n",
@@ -1272,58 +1211,56 @@ int sme_mgt_connection_stats_get(unifi_priv_t *priv, CsrWifiSmeConnectionStats *
 
 int sme_mgt_packet_filter_set(unifi_priv_t *priv)
 {
-    CsrWifiIp4Address ipAddress = {{0xFF, 0xFF, 0xFF, 0xFF }};
-    if (priv->smepriv == NULL) {
-        unifi_error(priv, "sme_mgt_packet_filter_set: invalid smepriv\n");
-        return -EIO;
-    }
-    if (priv->packet_filters.arp_filter) {
-        ipAddress.a[0] = (priv->sta_ip_address      ) & 0xFF;
-        ipAddress.a[1] = (priv->sta_ip_address >>  8) & 0xFF;
-        ipAddress.a[2] = (priv->sta_ip_address >> 16) & 0xFF;
-        ipAddress.a[3] = (priv->sta_ip_address >> 24) & 0xFF;
-    }
-
-    unifi_trace(priv, UDBG5,
-                "sme_mgt_packet_filter_set: IP address %d.%d.%d.%d\n",
-                ipAddress.a[0], ipAddress.a[1],
-                ipAddress.a[2], ipAddress.a[3]);
-
-    /* Doesn't block for a confirm */
-    CsrWifiSmePacketFilterSetReqSend(0, CSR_WIFI_INTERFACE_IN_USE,
-                                     priv->packet_filters.tclas_ies_length,
-                                     priv->filter_tclas_ies,
-                                     priv->packet_filters.filter_mode,
-                                     ipAddress);
-    return 0;
+        CsrWifiIp4Address ipAddress = {{0xFF, 0xFF, 0xFF, 0xFF }};
+        if (priv->smepriv == NULL) {
+                unifi_error(priv, "sme_mgt_packet_filter_set: invalid smepriv\n");
+                return -EIO;
+        }
+        if (priv->packet_filters.arp_filter) {
+                ipAddress.a[0] = (priv->sta_ip_address      ) & 0xFF;
+                ipAddress.a[1] = (priv->sta_ip_address >>  8) & 0xFF;
+                ipAddress.a[2] = (priv->sta_ip_address >> 16) & 0xFF;
+                ipAddress.a[3] = (priv->sta_ip_address >> 24) & 0xFF;
+        }
+
+        unifi_trace(priv, UDBG5,
+                "sme_mgt_packet_filter_set: IP address %d.%d.%d.%d\n",
+                ipAddress.a[0], ipAddress.a[1],
+                ipAddress.a[2], ipAddress.a[3]);
+
+        /* Doesn't block for a confirm */
+        CsrWifiSmePacketFilterSetReqSend(0, CSR_WIFI_INTERFACE_IN_USE,
+                                     priv->packet_filters.tclas_ies_length,
+                                     priv->filter_tclas_ies,
+                                     priv->packet_filters.filter_mode,
+                                     ipAddress);
+        return 0;
 }
 
 int sme_mgt_tspec(unifi_priv_t *priv, CsrWifiSmeListAction action,
         u32 tid, CsrWifiSmeDataBlock *tspec, CsrWifiSmeDataBlock *tclas)
 {
-    int r;
-
-    if (priv->smepriv == NULL) {
-        unifi_error(priv, "sme_mgt_tspec: invalid smepriv\n");
-        return -EIO;
-    }
-
-    r = sme_init_request(priv);
-    if (r) {
-        return -EIO;
-    }
-
-    CsrWifiSmeTspecReqSend(0, CSR_WIFI_INTERFACE_IN_USE,
-                           action, tid, TRUE, 0,
-                           tspec->length, tspec->data,
-                           tclas->length, tclas->data);
-    r = sme_wait_for_reply(priv, UNIFI_SME_MGT_SHORT_TIMEOUT);
-    if (r) {
-        return r;
-    }
-
-    unifi_trace(priv, UDBG4, "sme_mgt_tspec: <-- (status=%d)\n", priv->sme_reply.reply_status);
-    return convert_sme_error(priv->sme_reply.reply_status);
+        int r;
+
+        if (priv->smepriv == NULL) {
+                unifi_error(priv, "sme_mgt_tspec: invalid smepriv\n");
+                return -EIO;
+        }
+
+        r = sme_init_request(priv);
+        if (r)
+                return -EIO;
+
+        CsrWifiSmeTspecReqSend(0, CSR_WIFI_INTERFACE_IN_USE,
+                              action, tid, TRUE, 0,
+                              tspec->length, tspec->data,
+                              tclas->length, tclas->data);
+        r = sme_wait_for_reply(priv, UNIFI_SME_MGT_SHORT_TIMEOUT);
+        if (r)
+                return r;
+
+        unifi_trace(priv, UDBG4, "sme_mgt_tspec: <-- (status=%d)\n", priv->sme_reply.reply_status);
+        return convert_sme_error(priv->sme_reply.reply_status);
 }
 
 
@@ -1339,9 +1276,8 @@ int sme_sys_suspend(unifi_priv_t *priv)
     }
 
     r = sme_init_request(priv);
-    if (r) {
+    if (r)
         return -EIO;
-    }
 
     /* Suspend the SME, which MAY cause it to power down UniFi */
     CsrWifiRouterCtrlSuspendIndSend(priv->CSR_WIFI_SME_IFACEQUEUE,0, 0, priv->wol_suspend);
@@ -1427,17 +1363,15 @@ int sme_sys_resume(unifi_priv_t *priv)
     }
 
     r = sme_init_request(priv);
-    if (r) {
+    if (r)
         return -EIO;
-    }
 
     CsrWifiRouterCtrlResumeIndSend(priv->CSR_WIFI_SME_IFACEQUEUE,0, priv->wol_suspend);
 
     r = sme_wait_for_reply(priv, UNIFI_SME_SYS_LONG_TIMEOUT);
-    if (r) {
+    if (r)
         unifi_notice(priv,
                 "resume: SME did not reply, return success anyway\n");
-    }
 
     return 0;
 }
@@ -1453,16 +1387,14 @@ int sme_ap_stop(unifi_priv_t *priv,u16 interface_tag)
     }
 
     r = sme_init_request(priv);
-    if (r) {
+    if (r)
         return -EIO;
-    }
 
     CsrWifiNmeApStopReqSend(0,interface_tag);
 
     r = sme_wait_for_reply(priv, UNIFI_SME_MGT_SHORT_TIMEOUT);
-    if (r) {
+    if (r)
         return r;
-    }
 
     unifi_trace(priv, UDBG4,
                 "sme_ap_stop <-- (r=%d status=%d)\n",
@@ -1484,9 +1416,8 @@ int sme_ap_start(unifi_priv_t *priv,u16 interface_tag,
     }
 
     r = sme_init_request(priv);
-    if (r) {
+    if (r)
         return -EIO;
-    }
 
     CsrWifiNmeApStartReqSend(0,interface_tag,CSR_WIFI_AP_TYPE_LEGACY,FALSE,
                              ap_config->ssid,1,ap_config->channel,
@@ -1494,9 +1425,8 @@ int sme_ap_start(unifi_priv_t *priv,u16 interface_tag,
                              p2p_go_param,FALSE);
 
     r = sme_wait_for_reply(priv, UNIFI_SME_MGT_SHORT_TIMEOUT);
-    if (r) {
+    if (r)
         return r;
-    }
 
     unifi_trace(priv, UDBG4,
                 "sme_ap_start <-- (r=%d status=%d)\n",
@@ -1518,14 +1448,15 @@ int sme_ap_config(unifi_priv_t *priv,
     }
 
     r = sme_init_request(priv);
-    if (r) {
+    if (r)
         return -EIO;
-    }
 
     CsrWifiNmeApConfigSetReqSend(0,*group_security_config,
                                  *ap_mac_config);
 
     r = sme_wait_for_reply(priv, UNIFI_SME_MGT_SHORT_TIMEOUT);
+        if (r)
+                return r;
 
     unifi_trace(priv, UDBG4,
                 "sme_ap_config <-- (r=%d status=%d)\n",
diff --git a/drivers/staging/csr/sme_native.c b/drivers/staging/csr/sme_native.c
index d7a5125d9a8e..525fe1bce0e6 100644
--- a/drivers/staging/csr/sme_native.c
+++ b/drivers/staging/csr/sme_native.c
@@ -12,7 +12,6 @@
  */
 
 #include <linux/netdevice.h>
-#include <linux/version.h>
 #include "unifi_priv.h"
 #include "csr_wifi_hip_unifi.h"
 #include "csr_wifi_hip_conversions.h"
@@ -22,23 +21,17 @@ static const unsigned char wildcard_address[ETH_ALEN] = {0x00, 0x00, 0x00, 0x00,
 int
 uf_sme_init(unifi_priv_t *priv)
 {
-    func_enter();
-
     sema_init(&priv->mlme_blocking_mutex, 1);
 
 #ifdef CSR_SUPPORT_WEXT
     {
         int r = uf_init_wext_interface(priv);
         if (r != 0) {
-            func_exit();
             return r;
         }
     }
 #endif
 
-
-
-    func_exit();
     return 0;
 } /* uf_sme_init() */
 
@@ -47,8 +40,6 @@ void
 uf_sme_deinit(unifi_priv_t *priv)
 {
 
-    func_enter();
-
     /* Free memory allocated for the scan table */
 /*    unifi_clear_scan_table(priv); */
 
@@ -59,8 +50,6 @@ uf_sme_deinit(unifi_priv_t *priv)
     uf_deinit_wext_interface(priv);
 #endif
 
-
-    func_exit();
 } /* uf_sme_deinit() */
 
 
@@ -222,8 +211,6 @@ sme_native_log_event(ul_client_t *pcli,
     CSR_SIGNAL signal;
     ul_client_t *client = pcli;
 
-    func_enter();
-
     if (client == NULL) {
         unifi_error(NULL, "sme_native_log_event: client has exited\n");
         return;
@@ -334,8 +321,6 @@ sme_native_log_event(ul_client_t *pcli,
     /* Wake any waiting user process */
     wake_up_interruptible(&client->udi_wq);
 
-    func_exit();
-
 } /* sme_native_log_event() */
 
 
@@ -461,8 +446,6 @@ sme_native_mlme_event_handler(ul_client_t *pcli,
     unifi_priv_t *priv = uf_find_instance(pcli->instance);
     int id, r;
 
-    func_enter();
-
     /* Just a sanity check */
     if ((sig_packed == NULL) || (sig_len <= 0)) {
         return;
@@ -542,7 +525,6 @@ sme_native_mlme_event_handler(ul_client_t *pcli,
             break;
     }
 
-    func_exit();
 } /* sme_native_mlme_event_handler() */
 
 
@@ -574,14 +556,11 @@ unifi_reset_state(unifi_priv_t *priv, unsigned char *macaddr,
 {
     int r = 0;
 
-    func_enter();
-
 #ifdef CSR_SUPPORT_WEXT
     /* The reset clears any 802.11 association. */
     priv->wext_conf.flag_associated = 0;
 #endif
 
-    func_exit();
     return r;
 } /* unifi_reset_state() */
 
diff --git a/drivers/staging/csr/sme_sys.c b/drivers/staging/csr/sme_sys.c
index 5b26c41c01f6..2b068197ed44 100644
--- a/drivers/staging/csr/sme_sys.c
+++ b/drivers/staging/csr/sme_sys.c
@@ -14,7 +14,6 @@
  * ---------------------------------------------------------------------------
  */
 
-#include <linux/version.h>
 #include "csr_wifi_hip_unifiversion.h"
 #include "unifi_priv.h"
 #include "csr_wifi_hip_conversions.h"
@@ -413,8 +412,6 @@ uf_send_gratuitous_arp(unifi_priv_t *priv, u16 interfaceTag)
                                          0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
                                          0xc0, 0xa8, 0x00, 0x02};
 
-    func_enter();
-
     csrResult = unifi_net_data_malloc(priv, &bulkdata.d[0], sizeof(arp_req));
     if (csrResult != CSR_RESULT_SUCCESS)
     {
@@ -480,8 +477,6 @@ uf_send_gratuitous_arp(unifi_priv_t *priv, u16 interfaceTag)
         return;
     }
 
-    func_exit();
-
 }
 #endif /* CSR_WIFI_SEND_GRATUITOUS_ARP */
 
@@ -2102,7 +2097,7 @@ static int peer_add_new_record(unifi_priv_t *priv,CsrWifiRouterCtrlPeerAddReq *r
     u8 freeSlotFound = FALSE;
     CsrWifiRouterCtrlStaInfo_t *newRecord = NULL;
     netInterface_priv_t *interfacePriv = priv->interfacePriv[req->interfaceTag];
-    CsrTime currentTime, currentTimeHi;
+    u32 currentTime, currentTimeHi;
     unsigned long lock_flags;
 
     if (req->interfaceTag >= CSR_WIFI_NUM_INTERFACES) {
@@ -2296,8 +2291,8 @@ static void check_inactivity_timer_expire_func(unsigned long data)
     struct unifi_priv *priv;
     CsrWifiRouterCtrlStaInfo_t *sta_record = NULL;
     u8 i = 0;
-    CsrTime now;
-    CsrTime inactive_time;
+    u32 now;
+    u32 inactive_time;
     netInterface_priv_t *interfacePriv = (netInterface_priv_t *) data;
 
     if (!interfacePriv)
@@ -2329,11 +2324,11 @@ static void check_inactivity_timer_expire_func(unsigned long data)
             if (sta_record->lastActivity > now)
             {
                 /* simple timer wrap (for 1 wrap) */
-                inactive_time = CsrTimeAdd((CsrTime)CsrTimeSub(CSR_SCHED_TIME_MAX, sta_record->lastActivity), now);
+                inactive_time = CsrTimeAdd((u32)CsrTimeSub(CSR_SCHED_TIME_MAX, sta_record->lastActivity), now);
             }
             else
             {
-                inactive_time = (CsrTime)CsrTimeSub(now, sta_record->lastActivity);
+                inactive_time = (u32)CsrTimeSub(now, sta_record->lastActivity);
             }
 
             if (inactive_time >= STA_INACTIVE_TIMEOUT_VAL)
@@ -2411,8 +2406,6 @@ void uf_send_disconnected_ind_wq(struct work_struct *work)
     struct list_head send_cfm_list;
     u8 j;
 
-    func_enter();
-
     if(!staInfo) {
         return;
     }
diff --git a/drivers/staging/csr/sme_userspace.h b/drivers/staging/csr/sme_userspace.h
index 7816b15b4b5d..ebe371c732b2 100644
--- a/drivers/staging/csr/sme_userspace.h
+++ b/drivers/staging/csr/sme_userspace.h
@@ -32,7 +32,7 @@ int uf_sme_queue_message(unifi_priv_t *priv, u8 *buffer, int length);
 #include "csr_wifi_sme_lib.h"
 
 void CsrWifiRouterTransportInit(unifi_priv_t *priv);
-void CsrWifiRouterTransportRecv(unifi_priv_t *priv, u8* buffer, size_t bufferLength);
+void CsrWifiRouterTransportRecv(unifi_priv_t *priv, u8 *buffer, size_t bufferLength);
 void CsrWifiRouterTransportDeInit(unifi_priv_t *priv);
 
 #endif /* __LINUX_SME_USERSPACE_H__ */
diff --git a/drivers/staging/csr/sme_wext.c b/drivers/staging/csr/sme_wext.c
index b58c0c6b171c..5e06a380b40a 100644
--- a/drivers/staging/csr/sme_wext.c
+++ b/drivers/staging/csr/sme_wext.c
@@ -800,7 +800,6 @@ iwprivsconfwapi(struct net_device *dev, struct iw_request_info *info,
     u8 enable;
     netInterface_priv_t *interfacePriv = (netInterface_priv_t *)netdev_priv(dev);
     unifi_priv_t *priv = interfacePriv->privPtr;
-    func_enter();
 
     unifi_trace(priv, UDBG1, "iwprivsconfwapi\n" );
 
@@ -824,7 +823,6 @@ iwprivsconfwapi(struct net_device *dev, struct iw_request_info *info,
             ~(CSR_WIFI_SME_ENCRYPTION_CIPHER_PAIRWISE_SMS4 | CSR_WIFI_SME_ENCRYPTION_CIPHER_GROUP_SMS4);
     }
 
-    func_exit();
     return 0;
 }
 
@@ -837,7 +835,6 @@ iwprivswpikey(struct net_device *dev, struct iw_request_info *info,
     unifiio_wapi_key_t inKey;
     netInterface_priv_t *interfacePriv = (netInterface_priv_t *)netdev_priv(dev);
     unifi_priv_t *priv = interfacePriv->privPtr;
-    func_enter();
 
     unifi_trace(priv, UDBG1, "iwprivswpikey\n" );
 
@@ -882,7 +879,6 @@ iwprivswpikey(struct net_device *dev, struct iw_request_info *info,
         return convert_sme_error(r);
     }
 
-    func_exit();
     return r;
 }
 #endif
@@ -914,7 +910,6 @@ unifi_siwfreq(struct net_device *dev, struct iw_request_info *info,
     unifi_priv_t *priv = interfacePriv->privPtr;
     struct iw_freq *freq = (struct iw_freq *)wrqu;
 
-    func_enter();
     unifi_trace(priv, UDBG2, "unifi_siwfreq\n");
 
     if(interfacePriv->interfaceMode == CSR_WIFI_ROUTER_CTRL_MODE_AP ||
@@ -935,7 +930,6 @@ unifi_siwfreq(struct net_device *dev, struct iw_request_info *info,
         priv->connection_config.adhocChannel = wext_freq_to_channel(freq->m, freq->e);
     }
 
-    func_exit();
     return 0;
 } /* unifi_siwfreq() */
 
@@ -950,7 +944,6 @@ unifi_giwfreq(struct net_device *dev, struct iw_request_info *info,
     int err = 0;
     CsrWifiSmeConnectionInfo connectionInfo;
 
-    func_enter();
     unifi_trace(priv, UDBG2, "unifi_giwfreq\n");
     CHECK_INITED(priv);
 
@@ -970,7 +963,6 @@ unifi_giwfreq(struct net_device *dev, struct iw_request_info *info,
             (connectionInfo.networkType80211 == CSR_WIFI_SME_RADIO_IF_GHZ_5_0));
     freq->e = 6;
 
-    func_exit();
     return convert_sme_error(err);
 } /* unifi_giwfreq() */
 
@@ -982,7 +974,6 @@ unifi_siwmode(struct net_device *dev, struct iw_request_info *info,
     netInterface_priv_t *interfacePriv = (netInterface_priv_t *)netdev_priv(dev);
     unifi_priv_t *priv = interfacePriv->privPtr;
 
-    func_enter();
     unifi_trace(priv, UDBG2, "unifi_siwmode\n");
 
     if(interfacePriv->interfaceMode == CSR_WIFI_ROUTER_CTRL_MODE_AP ||
@@ -1011,7 +1002,6 @@ unifi_siwmode(struct net_device *dev, struct iw_request_info *info,
     priv->connection_config.ssid.length = 0;
     memset(priv->connection_config.bssid.a, 0xFF, ETH_ALEN);
 
-    func_exit();
     return 0;
 } /* unifi_siwmode() */
 
@@ -1026,7 +1016,6 @@ unifi_giwmode(struct net_device *dev, struct iw_request_info *info,
     unifi_priv_t *priv = interfacePriv->privPtr;
     CsrWifiSmeConnectionConfig connectionConfig;
 
-    func_enter();
     unifi_trace(priv, UDBG2, "unifi_giwmode\n");
     CHECK_INITED(priv);
 
@@ -1069,7 +1058,6 @@ unifi_giwmode(struct net_device *dev, struct iw_request_info *info,
 
     }
     unifi_trace(priv, UDBG4, "unifi_giwmode: mode = 0x%x\n", wrqu->mode);
-    func_exit();
     return r;
 } /* unifi_giwmode() */
 
@@ -1192,8 +1180,6 @@ unifi_siwap(struct net_device *dev, struct iw_request_info *info,
     unifi_priv_t *priv = interfacePriv->privPtr;
     int err = 0;
 
-    func_enter();
-
     CHECK_INITED(priv);
 
     if(interfacePriv->interfaceMode == CSR_WIFI_ROUTER_CTRL_MODE_AP ||
@@ -1235,11 +1221,9 @@ unifi_siwap(struct net_device *dev, struct iw_request_info *info,
         err = sme_mgt_connect(priv);
         if (err) {
             unifi_error(priv, "unifi_siwap: Join failed, status %d\n", err);
-            func_exit();
             return convert_sme_error(err);
         }
     }
-    func_exit();
 
     return 0;
 } /* unifi_siwap() */
@@ -1255,8 +1239,6 @@ unifi_giwap(struct net_device *dev, struct iw_request_info *info,
     int r = 0;
     u8 *bssid;
 
-    func_enter();
-
     CHECK_INITED(priv);
     unifi_trace(priv, UDBG2, "unifi_giwap\n");
 
@@ -1281,7 +1263,6 @@ unifi_giwap(struct net_device *dev, struct iw_request_info *info,
         memset(wrqu->ap_addr.sa_data, 0, ETH_ALEN);
     }
 
-    func_exit();
     return 0;
 } /* unifi_giwap() */
 
@@ -1302,8 +1283,6 @@ unifi_siwscan(struct net_device *dev, struct iw_request_info *info,
     struct iw_scan_req *req = (struct iw_scan_req *) extra;
 #endif
 
-    func_enter();
-
     CHECK_INITED(priv);
 
     if(interfacePriv->interfaceMode == CSR_WIFI_ROUTER_CTRL_MODE_AP ||
@@ -1366,7 +1345,6 @@ unifi_siwscan(struct net_device *dev, struct iw_request_info *info,
         kfree(channel_list);
     }
 
-    func_exit();
     return r;
 
 } /* unifi_siwscan() */
@@ -1707,7 +1685,6 @@ unifi_siwessid(struct net_device *dev, struct iw_request_info *info,
     int len;
     int err = 0;
 
-    func_enter();
     CHECK_INITED(priv);
 
     if(interfacePriv->interfaceMode == CSR_WIFI_ROUTER_CTRL_MODE_AP ||
@@ -1760,11 +1737,9 @@ unifi_siwessid(struct net_device *dev, struct iw_request_info *info,
     UF_RTNL_LOCK();
     if (err) {
         unifi_error(priv, "unifi_siwessid: Join failed, status %d\n", err);
-        func_exit();
         return convert_sme_error(err);
     }
 
-    func_exit();
     return 0;
 } /* unifi_siwessid() */
 
@@ -1779,7 +1754,6 @@ unifi_giwessid(struct net_device *dev, struct iw_request_info *info,
     CsrWifiSmeConnectionInfo connectionInfo;
     int r = 0;
 
-    func_enter();
     unifi_trace(priv, UDBG2, "unifi_giwessid\n");
     CHECK_INITED(priv);
 
@@ -1805,7 +1779,6 @@ unifi_giwessid(struct net_device *dev, struct iw_request_info *info,
                 data->length, essid);
     }
 
-    func_exit();
 
     return 0;
 } /* unifi_giwessid() */
@@ -1821,8 +1794,6 @@ unifi_siwrate(struct net_device *dev, struct iw_request_info *info,
     CsrWifiSmeMibConfig mibConfig;
     int r;
 
-    func_enter();
-
     CHECK_INITED(priv);
     unifi_trace(priv, UDBG2, "unifi_siwrate\n");
 
@@ -1863,7 +1834,6 @@ unifi_siwrate(struct net_device *dev, struct iw_request_info *info,
         return r;
     }
 
-    func_exit();
 
     return 0;
 } /* unifi_siwrate() */
@@ -1882,7 +1852,6 @@ unifi_giwrate(struct net_device *dev, struct iw_request_info *info,
     CsrWifiSmeMibConfig mibConfig;
     CsrWifiSmeConnectionStats connectionStats;
 
-    func_enter();
     unifi_trace(priv, UDBG2, "unifi_giwrate\n");
     CHECK_INITED(priv);
 
@@ -1913,8 +1882,6 @@ unifi_giwrate(struct net_device *dev, struct iw_request_info *info,
     args->value = bitrate * 500000;
     args->fixed = !flag;
 
-    func_exit();
-
     return 0;
 } /* unifi_giwrate() */
 
@@ -2081,7 +2048,6 @@ unifi_siwencode(struct net_device *dev, struct iw_request_info *info,
     int privacy = -1;
     CsrWifiSmeKey sme_key;
 
-    func_enter();
     unifi_trace(priv, UDBG2, "unifi_siwencode\n");
 
     CHECK_INITED(priv);
@@ -2236,7 +2202,6 @@ unifi_siwencode(struct net_device *dev, struct iw_request_info *info,
             CSR_WIFI_SME_ENCRYPTION_CIPHER_NONE;
     }
 
-    func_exit_r(rc);
     return convert_sme_error(rc);
 
 } /* unifi_siwencode() */
@@ -2467,7 +2432,6 @@ unifi_siwmlme(struct net_device *dev, struct iw_request_info *info,
     netInterface_priv_t *interfacePriv = (netInterface_priv_t *)netdev_priv(dev);
     unifi_priv_t *priv = interfacePriv->privPtr;
     struct iw_mlme *mlme = (struct iw_mlme *)extra;
-    func_enter();
 
     unifi_trace(priv, UDBG2, "unifi_siwmlme\n");
     CHECK_INITED(priv);
@@ -2488,11 +2452,9 @@ unifi_siwmlme(struct net_device *dev, struct iw_request_info *info,
             UF_RTNL_LOCK();
             break;
         default:
-            func_exit_r(-EOPNOTSUPP);
             return -EOPNOTSUPP;
     }
 
-    func_exit();
     return 0;
 } /* unifi_siwmlme() */
 
@@ -2529,7 +2491,6 @@ unifi_siwgenie(struct net_device *dev, struct iw_request_info *info,
     unifi_priv_t *priv = interfacePriv->privPtr;
     int len;
 
-    func_enter();
     unifi_trace(priv, UDBG2, "unifi_siwgenie\n");
 
     if(interfacePriv->interfaceMode == CSR_WIFI_ROUTER_CTRL_MODE_AP ||
@@ -2548,20 +2509,17 @@ unifi_siwgenie(struct net_device *dev, struct iw_request_info *info,
 
     len = wrqu->data.length;
     if (len == 0) {
-        func_exit();
         return 0;
     }
 
     priv->connection_config.mlmeAssociateReqInformationElements = kmalloc(len, GFP_KERNEL);
     if (priv->connection_config.mlmeAssociateReqInformationElements == NULL) {
-        func_exit();
         return -ENOMEM;
     }
 
     priv->connection_config.mlmeAssociateReqInformationElementsLength = len;
     memcpy( priv->connection_config.mlmeAssociateReqInformationElements, extra, len);
 
-    func_exit();
     return 0;
 } /* unifi_siwgenie() */
 
@@ -2574,7 +2532,6 @@ unifi_giwgenie(struct net_device *dev, struct iw_request_info *info,
     unifi_priv_t *priv = interfacePriv->privPtr;
     int len;
 
-    func_enter();
     unifi_trace(priv, UDBG2, "unifi_giwgenie\n");
 
     if(interfacePriv->interfaceMode == CSR_WIFI_ROUTER_CTRL_MODE_AP ||
@@ -2599,7 +2556,6 @@ unifi_giwgenie(struct net_device *dev, struct iw_request_info *info,
     wrqu->data.length = len;
     memcpy(extra, priv->connection_config.mlmeAssociateReqInformationElements, len);
 
-    func_exit();
     return 0;
 } /* unifi_giwgenie() */
 
@@ -2627,7 +2583,6 @@ _unifi_siwauth(struct net_device *dev, struct iw_request_info *info,
     unifi_priv_t *priv = interfacePriv->privPtr;
     CsrWifiSmeAuthModeMask new_auth;
 
-    func_enter();
     unifi_trace(priv, UDBG2, "unifi_siwauth\n");
 
     if(interfacePriv->interfaceMode == CSR_WIFI_ROUTER_CTRL_MODE_AP ||
@@ -2848,7 +2803,6 @@ _unifi_siwauth(struct net_device *dev, struct iw_request_info *info,
     }
 
     unifi_trace(priv, UDBG2, "authModeMask = %d", priv->connection_config.authModeMask);
-    func_exit();
 
     return 0;
 } /* _unifi_siwauth() */
@@ -2911,8 +2865,6 @@ _unifi_siwencodeext(struct net_device *dev, struct iw_request_info *info,
     CsrWifiSmeKey sme_key;
     CsrWifiSmeKeyType key_type;
 
-    func_enter();
-
     CHECK_INITED(priv);
 
     if(interfacePriv->interfaceMode == CSR_WIFI_ROUTER_CTRL_MODE_AP ||
@@ -3061,7 +3013,6 @@ _unifi_siwencodeext(struct net_device *dev, struct iw_request_info *info,
         return convert_sme_error(r);
     }
 
-    func_exit();
     return r;
 } /* _unifi_siwencodeext() */
 
diff --git a/drivers/staging/csr/ul_int.c b/drivers/staging/csr/ul_int.c
index 4013d021ebbf..0fae6f48f79b 100644
--- a/drivers/staging/csr/ul_int.c
+++ b/drivers/staging/csr/ul_int.c
@@ -12,7 +12,6 @@
  *
  * ***************************************************************************
  */
-#include <linux/version.h>
 #include "csr_wifi_hip_unifi.h"
 #include "csr_wifi_hip_conversions.h"
 #include "unifi_priv.h"
diff --git a/drivers/staging/csr/unifi_event.c b/drivers/staging/csr/unifi_event.c
index c27b23daf399..e81a99878272 100644
--- a/drivers/staging/csr/unifi_event.c
+++ b/drivers/staging/csr/unifi_event.c
@@ -376,8 +376,6 @@ unifi_process_receive_event(void *ospriv,
     s16 signal_id;
     u8 pktIndToSme = FALSE, freeBulkData = FALSE;
 
-    func_enter();
-
     unifi_trace(priv, UDBG5, "unifi_process_receive_event: "
                 "%04x %04x %04x %04x %04x %04x %04x %04x (%d)\n",
                 CSR_GET_UINT16_FROM_LITTLE_ENDIAN((sigdata) + sizeof(s16)*0) & 0xFFFF,
@@ -523,7 +521,6 @@ unifi_process_receive_event(void *ospriv,
                                     unifi_net_data_free(priv, (void *)&bulkdata->d[i]);
                                 }
                            }
-                           func_exit();
                            return;
                        }
                    } /* CSR_MA_PACKET_INDICATION_ID */
@@ -573,7 +570,6 @@ unifi_process_receive_event(void *ospriv,
             }
     }
 
-    func_exit();
 } /* unifi_process_receive_event() */
 
 
@@ -587,7 +583,6 @@ void unifi_rx_queue_flush(void *ospriv)
 {
     unifi_priv_t *priv = (unifi_priv_t*)ospriv;
 
-    func_enter();
     unifi_trace(priv, UDBG4, "rx_wq_handler: RdPtr = %d WritePtr =  %d\n",
                 priv->rxSignalBuffer.readPointer,priv->rxSignalBuffer.writePointer);
     if(priv != NULL) {
@@ -605,7 +600,6 @@ void unifi_rx_queue_flush(void *ospriv)
         }
         priv->rxSignalBuffer.readPointer = readPointer;
     }
-    func_exit();
 }
 
 void rx_wq_handler(struct work_struct *work)
@@ -655,7 +649,6 @@ unifi_receive_event(void *ospriv,
     u8 writePointer;
     int i;
     rx_buff_struct_t * rx_buff;
-    func_enter();
 
     unifi_trace(priv, UDBG5, "unifi_receive_event: "
             "%04x %04x %04x %04x %04x %04x %04x %04x (%d)\n",
@@ -695,6 +688,5 @@ unifi_receive_event(void *ospriv,
 #else
     unifi_process_receive_event(ospriv, sigdata, siglen, bulkdata);
 #endif
-    func_exit();
 } /* unifi_receive_event() */
 
diff --git a/drivers/staging/csr/unifi_os.h b/drivers/staging/csr/unifi_os.h
index 4e63a942f1a2..56a26982070e 100644
--- a/drivers/staging/csr/unifi_os.h
+++ b/drivers/staging/csr/unifi_os.h
@@ -61,26 +61,6 @@ extern int unifi_debug;
  * etc.
  */
 
-#define func_enter()                                    \
-    do {                                                \
-        if (unifi_debug >= 5) {                         \
-            printk("unifi: => %s\n", __FUNCTION__);     \
-        }                                               \
-    } while (0)
-#define func_exit()                                     \
-    do {                                                \
-        if (unifi_debug >= 5) {                         \
-            printk("unifi: <= %s\n", __FUNCTION__);     \
-        }                                               \
-    } while (0)
-#define func_exit_r(_rc)                                        \
-    do {                                                        \
-        if (unifi_debug >= 5) {                                 \
-            printk("unifi: <= %s %d\n", __FUNCTION__, (int)(_rc));   \
-        }                                                       \
-    } while (0)
-
-
 #define ASSERT(cond)                                            \
     do {                                                            \
         if (!(cond)) {                                              \
@@ -107,9 +87,6 @@ void unifi_trace(void* ospriv, int level, const char *fmt, ...);
 #else
 
 /* Stubs */
-#define func_enter()
-#define func_exit()
-#define func_exit_r(_rc)
 
 #define ASSERT(cond)
 
diff --git a/drivers/staging/csr/unifi_pdu_processing.c b/drivers/staging/csr/unifi_pdu_processing.c
index ae7c8fc94092..95efc360cc2d 100644
--- a/drivers/staging/csr/unifi_pdu_processing.c
+++ b/drivers/staging/csr/unifi_pdu_processing.c
@@ -14,7 +14,6 @@
  * ---------------------------------------------------------------------------
  */
 
-#include <linux/version.h>
 #include <linux/types.h>
 #include <linux/etherdevice.h>
 #include <linux/vmalloc.h>
@@ -409,7 +408,6 @@ CsrResult enque_tx_data_pdu(unifi_priv_t *priv, bulk_data_param_t *bulkdata,
         unifi_error(priv,
                 "Failed to allocate %d bytes for tx packet record\n",
                 sizeof(tx_buffered_packets_t));
-        func_exit();
         return CSR_RESULT_FAILURE;
     }
 
@@ -1117,8 +1115,8 @@ void uf_process_ma_pkt_cfm_for_ap(unifi_priv_t *priv,u16 interfaceTag, const CSR
             staRecord->nullDataHostTag = INVALID_HOST_TAG;
 
             if(pkt_cfm->TransmissionStatus == CSR_TX_RETRY_LIMIT){
-                CsrTime now;
-                CsrTime inactive_time;
+                u32 now;
+                u32 inactive_time;
 
                 unifi_trace(priv, UDBG1, "Nulldata to probe STA ALIVE Failed with retry limit\n");
                 /* Recheck if there is some activity after null data is sent.
@@ -1134,12 +1132,12 @@ void uf_process_ma_pkt_cfm_for_ap(unifi_priv_t *priv,u16 interfaceTag, const CSR
                 if (staRecord->lastActivity > now)
                 {
                     /* simple timer wrap (for 1 wrap) */
-                    inactive_time = CsrTimeAdd((CsrTime)CsrTimeSub(CSR_SCHED_TIME_MAX, staRecord->lastActivity),
+                    inactive_time = CsrTimeAdd((u32)CsrTimeSub(CSR_SCHED_TIME_MAX, staRecord->lastActivity),
                                                now);
                 }
                 else
                 {
-                    inactive_time = (CsrTime)CsrTimeSub(now, staRecord->lastActivity);
+                    inactive_time = (u32)CsrTimeSub(now, staRecord->lastActivity);
                 }
 
                 if (inactive_time >= STA_INACTIVE_TIMEOUT_VAL)
@@ -2024,7 +2022,6 @@ u8 send_multicast_frames(unifi_priv_t *priv, u16 interfaceTag)
     netInterface_priv_t *interfacePriv = priv->interfacePriv[interfaceTag];
     u32 hostTag = 0xffffffff;
 
-    func_enter();
     if(!isRouterBufferEnabled(priv,UNIFI_TRAFFIC_Q_VO)) {
         while((interfacePriv->dtimActive)&& (buffered_pkt=dequeue_tx_data_pdu(priv,&interfacePriv->genericMulticastOrBroadCastMgtFrames))) {
             buffered_pkt->transmissionControl |= (TRANSMISSION_CONTROL_TRIGGER_MASK);
@@ -2124,7 +2121,6 @@ void uf_process_ma_vif_availibility_ind(unifi_priv_t *priv,u8 *sigdata,
     CSR_RESULT_CODE resultCode = CSR_RC_SUCCESS;
     netInterface_priv_t *interfacePriv;
 
-    func_enter();
     unifi_trace(priv, UDBG3,
             "uf_process_ma_vif_availibility_ind: Process signal 0x%.4X\n",
             *((u16*)sigdata));
@@ -2134,7 +2130,6 @@ void uf_process_ma_vif_availibility_ind(unifi_priv_t *priv,u8 *sigdata,
         unifi_error(priv,
                     "uf_process_ma_vif_availibility_ind: Received unknown signal 0x%.4X.\n",
                     CSR_GET_UINT16_FROM_LITTLE_ENDIAN(sigdata));
-        func_exit();
         return;
     }
     ind = &signal.u.MaVifAvailabilityIndication;
@@ -2369,8 +2364,6 @@ void uf_send_buffered_data_from_ac(unifi_priv_t *priv,
     u8 moreData = FALSE;
     s8 r =0;
 
-    func_enter();
-
     unifi_trace(priv,UDBG2,"uf_send_buffered_data_from_ac :\n");
 
     while(!isRouterBufferEnabled(priv,queue) &&
@@ -2399,8 +2392,6 @@ void uf_send_buffered_data_from_ac(unifi_priv_t *priv,
       }
   }
 
-  func_exit();
-
 }
 
 void uf_send_buffered_frames(unifi_priv_t *priv,unifi_TrafficQueue q)
@@ -2416,7 +2407,6 @@ void uf_send_buffered_frames(unifi_priv_t *priv,unifi_TrafficQueue q)
     if(!((interfacePriv->interfaceMode == CSR_WIFI_ROUTER_CTRL_MODE_AP) ||
         (interfacePriv->interfaceMode == CSR_WIFI_ROUTER_CTRL_MODE_P2PGO)))
         return;
-    func_enter();
 
     queue = (q<=3)?q:0;
 
@@ -2451,7 +2441,6 @@ void uf_send_buffered_frames(unifi_priv_t *priv,unifi_TrafficQueue q)
                interfacePriv->dtimActive = FALSE;
            }
         }
-        func_exit();
         return;
     }
     if(priv->pausedStaHandle[queue] > 7) {
@@ -2542,7 +2531,6 @@ void uf_send_buffered_frames(unifi_priv_t *priv,unifi_TrafficQueue q)
      */
     unifi_trace(priv, UDBG4, "csrWifiHipSendBufferedFrames: UAPSD Resume Q=%x\n", queue);
     resume_suspended_uapsd(priv, interfaceTag);
-    func_exit();
 }
 
 
@@ -2770,7 +2758,6 @@ void uf_send_qos_null(unifi_priv_t * priv,u16 interfaceTag, const u8 *da,CSR_PRI
     CSR_RATE transmitRate = 0;
 
 
-    func_enter();
     /* Send a Null Frame to Peer,
      * 32= size of mac header  */
     csrResult = unifi_net_data_malloc(priv, &bulkdata.d[0], MAC_HEADER_SIZE + QOS_CONTROL_HEADER_SIZE);
@@ -2823,7 +2810,6 @@ void uf_send_qos_null(unifi_priv_t * priv,u16 interfaceTag, const u8 *da,CSR_PRI
         unifi_net_data_free(priv, &bulkdata.d[0]);
     }
 
-    func_exit();
     return;
 
 }
@@ -2842,7 +2828,6 @@ void uf_send_nulldata(unifi_priv_t * priv,u16 interfaceTag, const u8 *da,CSR_PRI
     CSR_MA_PACKET_REQUEST *req = &signal.u.MaPacketRequest;
     unsigned long lock_flags;
 
-    func_enter();
     /* Send a Null Frame to Peer, size = 24 for MAC header */
     csrResult = unifi_net_data_malloc(priv, &bulkdata.d[0], MAC_HEADER_SIZE);
 
@@ -2909,7 +2894,6 @@ void uf_send_nulldata(unifi_priv_t * priv,u16 interfaceTag, const u8 *da,CSR_PRI
         srcStaInfo->nullDataHostTag = INVALID_HOST_TAG;
     }
 
-    func_exit();
     return;
 }
 
@@ -3327,8 +3311,6 @@ void uf_prepare_send_cfm_list_for_queued_pkts(unifi_priv_t * priv,
     struct list_head *placeHolder;
     unsigned long lock_flags;
 
-    func_enter();
-
     spin_lock_irqsave(&priv->tx_q_lock,lock_flags);
 
     /* Search through the list and if confirmation required for any frames,
@@ -3357,7 +3339,6 @@ void uf_prepare_send_cfm_list_for_queued_pkts(unifi_priv_t * priv,
 
     spin_unlock_irqrestore(&priv->tx_q_lock,lock_flags);
 
-    func_exit();
 }
 
 
@@ -3492,11 +3473,11 @@ CsrWifiRouterCtrlStaInfo_t * CsrWifiRouterCtrlGetStationRecordFromHandle(unifi_p
 }
 
 /* Function to do inactivity */
-void uf_check_inactivity(unifi_priv_t *priv, u16 interfaceTag, CsrTime currentTime)
+void uf_check_inactivity(unifi_priv_t *priv, u16 interfaceTag, u32 currentTime)
 {
     u32 i;
     CsrWifiRouterCtrlStaInfo_t *staInfo;
-    CsrTime elapsedTime;    /* Time in microseconds */
+    u32 elapsedTime;    /* Time in microseconds */
     netInterface_priv_t *interfacePriv = priv->interfacePriv[interfaceTag];
     CsrWifiMacAddress peerMacAddress;
     unsigned long lock_flags;
@@ -3543,8 +3524,8 @@ void uf_check_inactivity(unifi_priv_t *priv, u16 interfaceTag, CsrTime currentTi
 /* Function to update activity of a station */
 void uf_update_sta_activity(unifi_priv_t *priv, u16 interfaceTag, const u8 *peerMacAddress)
 {
-    CsrTime elapsedTime, currentTime;    /* Time in microseconds */
-    CsrTime timeHi;         /* Not used - Time in microseconds */
+    u32 elapsedTime, currentTime;    /* Time in microseconds */
+    u32 timeHi;         /* Not used - Time in microseconds */
     CsrWifiRouterCtrlStaInfo_t *staInfo;
     netInterface_priv_t *interfacePriv = priv->interfacePriv[interfaceTag];
     unsigned long lock_flags;
@@ -3595,7 +3576,6 @@ void resume_unicast_buffered_frames(unifi_priv_t *priv, u16 interfaceTag)
    int r;
    unsigned long lock_flags;
 
-   func_enter();
    while(!isRouterBufferEnabled(priv,3) &&
                             ((buffered_pkt=dequeue_tx_data_pdu(priv,&interfacePriv->genericMgtFrames))!=NULL)) {
         buffered_pkt->transmissionControl &=
@@ -3672,7 +3652,6 @@ void resume_unicast_buffered_frames(unifi_priv_t *priv, u16 interfaceTag)
           }
        }
     }
-    func_exit();
 }
 void update_eosp_to_head_of_broadcast_list_head(unifi_priv_t *priv,u16 interfaceTag)
 {
@@ -3683,7 +3662,6 @@ void update_eosp_to_head_of_broadcast_list_head(unifi_priv_t *priv,u16 interface
     struct list_head *placeHolder;
     tx_buffered_packets_t *tx_q_item;
 
-    func_enter();
     if (interfacePriv->noOfbroadcastPktQueued) {
 
         /* Update the EOSP to the HEAD of b/c list
@@ -3700,7 +3678,6 @@ void update_eosp_to_head_of_broadcast_list_head(unifi_priv_t *priv,u16 interface
         }
         spin_unlock_irqrestore(&priv->tx_q_lock,lock_flags);
     }
-    func_exit();
 }
 
 /*
diff --git a/drivers/staging/csr/unifi_priv.h b/drivers/staging/csr/unifi_priv.h
index aec8e28fb60d..d20d74ce56cb 100644
--- a/drivers/staging/csr/unifi_priv.h
+++ b/drivers/staging/csr/unifi_priv.h
@@ -17,7 +17,6 @@
 #ifndef __LINUX_UNIFI_PRIV_H__
 #define __LINUX_UNIFI_PRIV_H__ 1
 
-#include <linux/version.h>
 #include <linux/module.h>
 #include <linux/string.h>
 #include <linux/errno.h>
@@ -313,7 +312,7 @@ typedef struct CsrWifiRouterCtrlStaInfo_t {
     CSR_CLIENT_TAG nullDataHostTag;
 
     /* Activity timestamps for the station */
-    CsrTime lastActivity;
+    u32 lastActivity;
 
     /* during m/c transmission sp suspended */
     u8 uspSuspend;
@@ -653,7 +652,7 @@ typedef struct {
     bulk_data_param_t bulkdata;
     CSR_SIGNAL signal;
     u16 sn;
-    CsrTime recv_time;
+    u32 recv_time;
 } frame_desc_struct;
 
 typedef struct {
@@ -736,7 +735,7 @@ typedef struct netInterface_priv
     u8 sta_activity_check_enabled;
 
     /* Timestamp when the last inactivity check was done */
-    CsrTime last_inactivity_check;
+    u32 last_inactivity_check;
 
     /*number of multicast or borad cast packets  queued*/
     u16 noOfbroadcastPktQueued;
diff --git a/drivers/staging/csr/unifi_sme.c b/drivers/staging/csr/unifi_sme.c
index ff639d47d07b..7c6c4138fc76 100644
--- a/drivers/staging/csr/unifi_sme.c
+++ b/drivers/staging/csr/unifi_sme.c
@@ -78,23 +78,19 @@ sme_log_event(ul_client_t *pcli,
     CsrResult result = CSR_RESULT_SUCCESS;
     int r;
 
-    func_enter();
     /* Just a sanity check */
     if ((signal == NULL) || (signal_len <= 0)) {
-        func_exit();
         return;
     }
 
     priv = uf_find_instance(pcli->instance);
     if (!priv) {
         unifi_error(priv, "sme_log_event: invalid priv\n");
-        func_exit();
         return;
     }
 
     if (priv->smepriv == NULL) {
         unifi_error(priv, "sme_log_event: invalid smepriv\n");
-        func_exit();
         return;
     }
 
@@ -109,7 +105,6 @@ sme_log_event(ul_client_t *pcli,
         if ((unpacked_signal.SignalPrimitiveHeader.SignalId == CSR_DEBUG_STRING_INDICATION_ID) ||
             (unpacked_signal.SignalPrimitiveHeader.SignalId == CSR_DEBUG_WORD16_INDICATION_ID))
         {
-            func_exit();
             return;
         }
         if (unpacked_signal.SignalPrimitiveHeader.SignalId == CSR_MA_PACKET_INDICATION_ID)
@@ -171,7 +166,6 @@ sme_log_event(ul_client_t *pcli,
             if (interfaceTag >= CSR_WIFI_NUM_INTERFACES)
             {
                 unifi_error(priv, "Bad MA_PACKET_CONFIRM interfaceTag %d\n", interfaceTag);
-                func_exit();
                 return;
             }
 
@@ -219,7 +213,6 @@ sme_log_event(ul_client_t *pcli,
                 } else {
                     unifi_trace(priv, UDBG1, "%s: M4 received from netdevice\n", __FUNCTION__);
                 }
-                func_exit();
                 return;
             }
         }
@@ -248,7 +241,6 @@ sme_log_event(ul_client_t *pcli,
             dataref1.length, dataref1.data,
             dataref2.length, dataref2.data);
 
-    func_exit();
 } /* sme_log_event() */
 
 
@@ -1158,8 +1150,6 @@ uf_send_m4_ready_wq(struct work_struct *work)
     CsrWifiMacAddress peer;
     unsigned long flags;
 
-    func_enter();
-
     /* The peer address was stored in the signal */
     spin_lock_irqsave(&priv->m4_lock, flags);
     memcpy(peer.a, req->Ra.x, sizeof(peer.a));
@@ -1171,8 +1161,6 @@ uf_send_m4_ready_wq(struct work_struct *work)
         unifi_trace(priv, UDBG1, "M4ReadyToSendInd sent for peer %pMF\n",
                 peer.a);
 
-    func_exit();
-
 } /* uf_send_m4_ready_wq() */
 
 #if (defined(CSR_WIFI_SECURITY_WAPI_ENABLE) && defined(CSR_WIFI_SECURITY_WAPI_SW_ENCRYPTION))
@@ -1204,8 +1192,6 @@ void uf_send_pkt_to_encrypt(struct work_struct *work)
 
     if (interfacePriv->interfaceMode == CSR_WIFI_ROUTER_CTRL_MODE_STA) {
 
-        func_enter();
-
         pktBulkDataLength = interfacePriv->wapi_unicast_bulk_data.data_length;
 
         if (pktBulkDataLength > 0) {
@@ -1231,7 +1217,6 @@ void uf_send_pkt_to_encrypt(struct work_struct *work)
 
         kfree(pktBulkData); /* Would have been copied over by the SME Handler */
 
-        func_exit();
     } else {
             unifi_warning(priv, "uf_send_pkt_to_encrypt() is NOT applicable for interface mode - %d\n",interfacePriv->interfaceMode);
     }
diff --git a/drivers/staging/csr/unifi_wext.h b/drivers/staging/csr/unifi_wext.h
index 6834c43abfbb..beba089e2e35 100644
--- a/drivers/staging/csr/unifi_wext.h
+++ b/drivers/staging/csr/unifi_wext.h
@@ -16,7 +16,6 @@
 #define __LINUX_UNIFI_WEXT_H__ 1
 
 #include <linux/kernel.h>
-#include <linux/version.h>
 #include <net/iw_handler.h>
 #include "csr_wifi_sme_prim.h"
 
diff --git a/drivers/staging/cxt1e1/musycc.c b/drivers/staging/cxt1e1/musycc.c
index ba721c604061..b2cc68a1fe87 100644
--- a/drivers/staging/cxt1e1/musycc.c
+++ b/drivers/staging/cxt1e1/musycc.c
@@ -55,26 +55,26 @@ extern int  cxt1e1_max_mtu;
 extern int  max_rxdesc_used;
 extern int  max_txdesc_used;
 extern ci_t *CI;                /* dummy pointr to board ZEROE's data - DEBUG
-                                 * USAGE */
+                                 * USAGE */
 
 
 /*******************************************************************/
 /* forward references */
-void        c4_fifo_free (mpi_t *, int);
-void        c4_wk_chan_restart (mch_t *);
-void        musycc_bh_tx_eom (mpi_t *, int);
-int         musycc_chan_up (ci_t *, int);
-status_t __init musycc_init (ci_t *);
-STATIC void __init musycc_init_port (mpi_t *);
-void        musycc_intr_bh_tasklet (ci_t *);
-void        musycc_serv_req (mpi_t *, u_int32_t);
-void        musycc_update_timeslots (mpi_t *);
+void        c4_fifo_free(mpi_t *, int);
+void        c4_wk_chan_restart(mch_t *);
+void        musycc_bh_tx_eom(mpi_t *, int);
+int         musycc_chan_up(ci_t *, int);
+status_t __init musycc_init(ci_t *);
+STATIC void __init musycc_init_port(mpi_t *);
+void        musycc_intr_bh_tasklet(ci_t *);
+void        musycc_serv_req(mpi_t *, u_int32_t);
+void        musycc_update_timeslots(mpi_t *);
 
 /*******************************************************************/
 
 #if 1
 STATIC int
-musycc_dump_rxbuffer_ring (mch_t * ch, int lockit)
+musycc_dump_rxbuffer_ring(mch_t * ch, int lockit)
 {
     struct mdesc *m;
     unsigned long flags = 0;
@@ -83,71 +83,64 @@ musycc_dump_rxbuffer_ring (mch_t * ch, int lockit)
     int         n;
 
     if (lockit)
-    {
-        spin_lock_irqsave (&ch->ch_rxlock, flags);
-    }
+        spin_lock_irqsave(&ch->ch_rxlock, flags);
     if (ch->rxd_num == 0)
-    {
-        pr_info("  ZERO receive buffers allocated for this channel.");
-    } else
-    {
-        FLUSH_MEM_READ ();
-        m = &ch->mdr[ch->rxix_irq_srv];
-        for (n = ch->rxd_num; n; n--)
-        {
-            status = le32_to_cpu (m->status);
-            {
-                pr_info("%c  %08lx[%2d]: sts %08x (%c%c%c%c:%d.) Data [%08x] Next [%08x]\n",
-                        (m == &ch->mdr[ch->rxix_irq_srv]) ? 'F' : ' ',
-                        (unsigned long) m, n,
-                        status,
-                        m->data ? (status & HOST_RX_OWNED ? 'H' : 'M') : '-',
-                        status & POLL_DISABLED ? 'P' : '-',
-                        status & EOBIRQ_ENABLE ? 'b' : '-',
-                        status & EOMIRQ_ENABLE ? 'm' : '-',
-                        status & LENGTH_MASK,
-                        le32_to_cpu (m->data), le32_to_cpu (m->next));
+        pr_info("  ZERO receive buffers allocated for this channel.");
+    else {
+        FLUSH_MEM_READ();
+        m = &ch->mdr[ch->rxix_irq_srv];
+        for (n = ch->rxd_num; n; n--) {
+            status = le32_to_cpu(m->status);
+            {
+                pr_info("%c  %08lx[%2d]: sts %08x (%c%c%c%c:%d.) Data [%08x] Next [%08x]\n",
+                        (m == &ch->mdr[ch->rxix_irq_srv]) ? 'F' : ' ',
+                        (unsigned long) m, n,
+                        status,
+                        m->data ? (status & HOST_RX_OWNED ? 'H' : 'M') : '-',
+                        status & POLL_DISABLED ? 'P' : '-',
+                        status & EOBIRQ_ENABLE ? 'b' : '-',
+                        status & EOMIRQ_ENABLE ? 'm' : '-',
+                        status & LENGTH_MASK,
+                        le32_to_cpu(m->data), le32_to_cpu(m->next));
 #ifdef RLD_DUMP_BUFDATA
-                {
-                    u_int32_t  *dp;
-                    int         len = status & LENGTH_MASK;
+                {
+                    u_int32_t  *dp;
+                    int         len = status & LENGTH_MASK;
 
 #if 1
-                    if (m->data && (status & HOST_RX_OWNED))
+                    if (m->data && (status & HOST_RX_OWNED))
 #else
-                    if (m->data)    /* always dump regardless of valid RX
-                                     * data */
+                    if (m->data)    /* always dump regardless of valid RX
+                                     * data */
 #endif
-                    {
-                        dp = (u_int32_t *) OS_phystov ((void *) (le32_to_cpu (m->data)));
-                        if (len >= 0x10)
-                            pr_info("    %x[%x]: %08X %08X %08X %08x\n", (u_int32_t) dp, len,
-                                    *dp, *(dp + 1), *(dp + 2), *(dp + 3));
-                        else if (len >= 0x08)
-                            pr_info("    %x[%x]: %08X %08X\n", (u_int32_t) dp, len,
-                                    *dp, *(dp + 1));
-                        else
-                            pr_info("    %x[%x]: %08X\n", (u_int32_t) dp, len, *dp);
-                    }
-                }
+                    {
+                        dp = (u_int32_t *) OS_phystov((void *) (le32_to_cpu(m->data)));
+                        if (len >= 0x10)
+                            pr_info("    %x[%x]: %08X %08X %08X %08x\n", (u_int32_t) dp, len,
+                                    *dp, *(dp + 1), *(dp + 2), *(dp + 3));
+                        else if (len >= 0x08)
+                            pr_info("    %x[%x]: %08X %08X\n", (u_int32_t) dp, len,
+                                    *dp, *(dp + 1));
+                        else
+                            pr_info("    %x[%x]: %08X\n", (u_int32_t) dp, len, *dp);
+                    }
+                }
 #endif
-            }
-            m = m->snext;
-        }
+            }
+            m = m->snext;
+        }
     }                               /* -for- */
     pr_info("\n");
 
     if (lockit)
-    {
-        spin_unlock_irqrestore (&ch->ch_rxlock, flags);
-    }
+        spin_unlock_irqrestore(&ch->ch_rxlock, flags);
     return 0;
 }
 #endif
 
 #if 1
 STATIC int
-musycc_dump_txbuffer_ring (mch_t * ch, int lockit)
+musycc_dump_txbuffer_ring(mch_t * ch, int lockit)
 {
     struct mdesc *m;
     unsigned long flags = 0;
@@ -155,60 +148,52 @@ musycc_dump_txbuffer_ring (mch_t * ch, int lockit)
     int         n;
 
     if (lockit)
-    {
-        spin_lock_irqsave (&ch->ch_txlock, flags);
-    }
+        spin_lock_irqsave(&ch->ch_txlock, flags);
     if (ch->txd_num == 0)
-    {
-        pr_info("  ZERO transmit buffers allocated for this channel.");
-    } else
-    {
-        FLUSH_MEM_READ ();
-        m = ch->txd_irq_srv;
-        for (n = ch->txd_num; n; n--)
-        {
-            status = le32_to_cpu (m->status);
-            {
-                pr_info("%c%c %08lx[%2d]: sts %08x (%c%c%c%c:%d.) Data [%08x] Next [%08x]\n",
-                        (m == ch->txd_usr_add) ? 'F' : ' ',
-                        (m == ch->txd_irq_srv) ? 'L' : ' ',
-                        (unsigned long) m, n,
-                        status,
-                     m->data ? (status & MUSYCC_TX_OWNED ? 'M' : 'H') : '-',
-                        status & POLL_DISABLED ? 'P' : '-',
-                        status & EOBIRQ_ENABLE ? 'b' : '-',
-                        status & EOMIRQ_ENABLE ? 'm' : '-',
-                        status & LENGTH_MASK,
-                        le32_to_cpu (m->data), le32_to_cpu (m->next));
+        pr_info("  ZERO transmit buffers allocated for this channel.");
+    else {
+        FLUSH_MEM_READ();
+        m = ch->txd_irq_srv;
+        for (n = ch->txd_num; n; n--) {
+            status = le32_to_cpu(m->status);
+            {
+                pr_info("%c%c %08lx[%2d]: sts %08x (%c%c%c%c:%d.) Data [%08x] Next [%08x]\n",
+                        (m == ch->txd_usr_add) ? 'F' : ' ',
+                        (m == ch->txd_irq_srv) ? 'L' : ' ',
+                        (unsigned long) m, n,
+                        status,
+                     m->data ? (status & MUSYCC_TX_OWNED ? 'M' : 'H') : '-',
+                        status & POLL_DISABLED ? 'P' : '-',
+                        status & EOBIRQ_ENABLE ? 'b' : '-',
+                        status & EOMIRQ_ENABLE ? 'm' : '-',
+                        status & LENGTH_MASK,
+                        le32_to_cpu(m->data), le32_to_cpu(m->next));
 #ifdef RLD_DUMP_BUFDATA
-                {
-                    u_int32_t  *dp;
-                    int         len = status & LENGTH_MASK;
-
-                    if (m->data)
-                    {
-                        dp = (u_int32_t *) OS_phystov ((void *) (le32_to_cpu (m->data)));
-                        if (len >= 0x10)
-                            pr_info("    %x[%x]: %08X %08X %08X %08x\n", (u_int32_t) dp, len,
-                                    *dp, *(dp + 1), *(dp + 2), *(dp + 3));
-                        else if (len >= 0x08)
-                            pr_info("    %x[%x]: %08X %08X\n", (u_int32_t) dp, len,
-                                    *dp, *(dp + 1));
-                        else
-                            pr_info("    %x[%x]: %08X\n", (u_int32_t) dp, len, *dp);
-                    }
-                }
+                {
+                    u_int32_t  *dp;
+                    int         len = status & LENGTH_MASK;
+
+                    if (m->data) {
+                        dp = (u_int32_t *) OS_phystov((void *) (le32_to_cpu(m->data)));
+                        if (len >= 0x10)
+                            pr_info("    %x[%x]: %08X %08X %08X %08x\n", (u_int32_t) dp, len,
+                                    *dp, *(dp + 1), *(dp + 2), *(dp + 3));
+                        else if (len >= 0x08)
+                            pr_info("    %x[%x]: %08X %08X\n", (u_int32_t) dp, len,
+                                    *dp, *(dp + 1));
+                        else
+                            pr_info("    %x[%x]: %08X\n", (u_int32_t) dp, len, *dp);
+                    }
+                }
 #endif
-            }
-            m = m->snext;
-        }
+            }
+            m = m->snext;
+        }
     }                               /* -for- */
     pr_info("\n");
 
     if (lockit)
-    {
-        spin_unlock_irqrestore (&ch->ch_txlock, flags);
-    }
+        spin_unlock_irqrestore(&ch->ch_txlock, flags);
     return 0;
 }
 #endif
@@ -220,58 +205,55 @@ musycc_dump_txbuffer_ring (mch_t * ch, int lockit)
  */
 
 status_t
-musycc_dump_ring (ci_t * ci, unsigned int chan)
+musycc_dump_ring(ci_t * ci, unsigned int chan)
 {
     mch_t      *ch;
 
     if (chan >= MAX_CHANS_USED)
+        return SBE_DRVR_FAIL;       /* E2BIG */
     {
-        return SBE_DRVR_FAIL;       /* E2BIG */
-    }
-    {
-        int         bh;
-
-        bh = atomic_read (&ci->bh_pending);
-        pr_info(">> bh_pend %d [%d] ihead %d itail %d [%d] th_cnt %d bh_cnt %d wdcnt %d note %d\n",
-                bh, max_bh, ci->iqp_headx, ci->iqp_tailx, max_intcnt,
-                ci->intlog.drvr_intr_thcount,
-                ci->intlog.drvr_intr_bhcount,
-                ci->wdcount, ci->wd_notify);
-        max_bh = 0;                 /* reset counter */
-        max_intcnt = 0;             /* reset counter */
+        int         bh;
+
+        bh = atomic_read(&ci->bh_pending);
+        pr_info(">> bh_pend %d [%d] ihead %d itail %d [%d] th_cnt %d bh_cnt %d wdcnt %d note %d\n",
+                bh, max_bh, ci->iqp_headx, ci->iqp_tailx, max_intcnt,
+                ci->intlog.drvr_intr_thcount,
+                ci->intlog.drvr_intr_bhcount,
+                ci->wdcount, ci->wd_notify);
+        max_bh = 0;                 /* reset counter */
+        max_intcnt = 0;             /* reset counter */
     }
 
-    if (!(ch = sd_find_chan (dummy, chan)))
-    {
-        pr_info(">> musycc_dump_ring: channel %d not up.\n", chan);
-        return ENOENT;
+    if (!(ch = sd_find_chan(dummy, chan))) {
+        pr_info(">> musycc_dump_ring: channel %d not up.\n", chan);
+        return ENOENT;
     }
     pr_info(">> CI %p CHANNEL %3d @ %p: state %x status/p %x/%x\n", ci, chan, ch, ch->state,
-            ch->status, ch->p.status);
+            ch->status, ch->p.status);
     pr_info("--------------------------------\nTX Buffer Ring - Channel %d, txd_num %d. (bd/ch pend %d %d), TXD required %d, txpkt %lu\n",
-            chan, ch->txd_num,
-            (u_int32_t) atomic_read (&ci->tx_pending), (u_int32_t) atomic_read (&ch->tx_pending), ch->txd_required, ch->s.tx_packets);
+            chan, ch->txd_num,
+            (u_int32_t) atomic_read(&ci->tx_pending), (u_int32_t) atomic_read(&ch->tx_pending), ch->txd_required, ch->s.tx_packets);
     pr_info("++ User 0x%p IRQ_SRV 0x%p USR_ADD 0x%p QStopped %x, start_tx %x tx_full %d txd_free %d mode %x\n",
-            ch->user, ch->txd_irq_srv, ch->txd_usr_add,
-            sd_queue_stopped (ch->user),
-            ch->ch_start_tx, ch->tx_full, ch->txd_free, ch->p.chan_mode);
-    musycc_dump_txbuffer_ring (ch, 1);
+            ch->user, ch->txd_irq_srv, ch->txd_usr_add,
+            sd_queue_stopped(ch->user),
+            ch->ch_start_tx, ch->tx_full, ch->txd_free, ch->p.chan_mode);
+    musycc_dump_txbuffer_ring(ch, 1);
     pr_info("RX Buffer Ring - Channel %d, rxd_num %d. IRQ_SRV[%d] 0x%p, start_rx %x rxpkt %lu\n",
-            chan, ch->rxd_num, ch->rxix_irq_srv,
-            &ch->mdr[ch->rxix_irq_srv], ch->ch_start_rx, ch->s.rx_packets);
-    musycc_dump_rxbuffer_ring (ch, 1);
+            chan, ch->rxd_num, ch->rxix_irq_srv,
+            &ch->mdr[ch->rxix_irq_srv], ch->ch_start_rx, ch->s.rx_packets);
+    musycc_dump_rxbuffer_ring(ch, 1);
 
     return SBE_DRVR_SUCCESS;
 }
 
 
 status_t
-musycc_dump_rings (ci_t * ci, unsigned int start_chan)
+musycc_dump_rings(ci_t * ci, unsigned int start_chan)
 {
     unsigned int chan;
 
     for (chan = start_chan; chan < (start_chan + 5); chan++)
-        musycc_dump_ring (ci, chan);
+        musycc_dump_ring(ci, chan);
     return SBE_DRVR_SUCCESS;
 }
 
@@ -282,7 +264,7 @@ musycc_dump_rings (ci_t * ci, unsigned int start_chan)
  */
 
 void
-musycc_init_mdt (mpi_t * pi)
+musycc_init_mdt(mpi_t * pi)
 {
     u_int32_t  *addr, cfg;
     int         i;
@@ -299,56 +281,50 @@ musycc_init_mdt (mpi_t * pi)
     cfg = CFG_CH_FLAG_7E << IDLE_CODE;
 
     for (i = 0; i < 32; addr++, i++)
-    {
-        pci_write_32 (addr, cfg);
-    }
+        pci_write_32(addr, cfg);
 }
 
 
 /* Set TX thp to the next unprocessed md */
 
 void
-musycc_update_tx_thp (mch_t * ch)
+musycc_update_tx_thp(mch_t * ch)
 {
     struct mdesc *md;
     unsigned long flags;
 
-    spin_lock_irqsave (&ch->ch_txlock, flags);
-    while (1)
-    {
-        md = ch->txd_irq_srv;
-        FLUSH_MEM_READ ();
-        if (!md->data)
-        {
-            /* No MDs with buffers to process */
-            spin_unlock_irqrestore (&ch->ch_txlock, flags);
-            return;
-        }
-        if ((le32_to_cpu (md->status)) & MUSYCC_TX_OWNED)
-        {
-            /* this is the MD to restart TX with */
-            break;
-        }
-        /*
-         * Otherwise, we have a valid, host-owned message descriptor which
-         * has been successfully transmitted and whose buffer can be freed,
-         * so... process this MD, it's owned by the host.  (This might give
-         * as a new, updated txd_irq_srv.)
-         */
-        musycc_bh_tx_eom (ch->up, ch->gchan);
+    spin_lock_irqsave(&ch->ch_txlock, flags);
+    while (1) {
+        md = ch->txd_irq_srv;
+        FLUSH_MEM_READ();
+        if (!md->data) {
+            /* No MDs with buffers to process */
+            spin_unlock_irqrestore(&ch->ch_txlock, flags);
+            return;
+        }
+        if ((le32_to_cpu(md->status)) & MUSYCC_TX_OWNED) {
+            /* this is the MD to restart TX with */
+            break;
+        }
+        /*
+         * Otherwise, we have a valid, host-owned message descriptor which
+         * has been successfully transmitted and whose buffer can be freed,
+         * so... process this MD, it's owned by the host.  (This might give
+         * as a new, updated txd_irq_srv.)
+         */
+        musycc_bh_tx_eom(ch->up, ch->gchan);
     }
     md = ch->txd_irq_srv;
-    ch->up->regram->thp[ch->gchan] = cpu_to_le32 (OS_vtophys (md));
-    FLUSH_MEM_WRITE ();
-
-    if (ch->tx_full)
-    {
-        ch->tx_full = 0;
-        ch->txd_required = 0;
-        sd_enable_xmit (ch->user);  /* re-enable to catch flow controlled
-                                     * channel */
+    ch->up->regram->thp[ch->gchan] = cpu_to_le32(OS_vtophys(md));
+    FLUSH_MEM_WRITE();
+
+    if (ch->tx_full) {
+        ch->tx_full = 0;
+        ch->txd_required = 0;
+        sd_enable_xmit(ch->user);  /* re-enable to catch flow controlled
+                                     * channel */
     }
-    spin_unlock_irqrestore (&ch->ch_txlock, flags);
+    spin_unlock_irqrestore(&ch->ch_txlock, flags);
 
 #ifdef RLD_TRANS_DEBUG
     pr_info("++ musycc_update_tx_thp[%d]: setting thp = %p, sts %x\n", ch->channum, md, md->status);
@@ -366,7 +342,7 @@ musycc_update_tx_thp (mch_t * ch)
  */
 
 void
-musycc_wq_chan_restart (void *arg)      /* channel private structure */
+musycc_wq_chan_restart(void *arg)      /* channel private structure */
 {
     mch_t      *ch;
     mpi_t      *pi;
@@ -380,7 +356,7 @@ musycc_wq_chan_restart (void *arg)      /* channel private structure */
 
 #ifdef RLD_TRANS_DEBUG
     pr_info("wq_chan_restart[%d]: start_RT[%d/%d] status %x\n",
-            ch->channum, ch->ch_start_rx, ch->ch_start_tx, ch->status);
+            ch->channum, ch->ch_start_rx, ch->ch_start_tx, ch->status);
 
 #endif
 
@@ -388,80 +364,74 @@ musycc_wq_chan_restart (void *arg)      /* channel private structure */
     /** check for RX restart request **/
     /**********************************/
 
-    if ((ch->ch_start_rx) && (ch->status & RX_ENABLED))
-    {
+    if ((ch->ch_start_rx) && (ch->status & RX_ENABLED)) {
 
-        ch->ch_start_rx = 0;
+        ch->ch_start_rx = 0;
 #if defined(RLD_TRANS_DEBUG) || defined(RLD_RXACT_DEBUG)
-        {
-            static int  hereb4 = 7;
+        {
+            static int  hereb4 = 7;
 
-            if (hereb4)             /* RLD DEBUG */
-            {
-                hereb4--;
+            if (hereb4) {            /* RLD DEBUG */
+                hereb4--;
 #ifdef RLD_TRANS_DEBUG
-                md = &ch->mdr[ch->rxix_irq_srv];
-                pr_info("++ musycc_wq_chan_restart[%d] CHAN RX ACTIVATE: rxix_irq_srv %d, md %p sts %x, rxpkt %lu\n",
-                ch->channum, ch->rxix_irq_srv, md, le32_to_cpu (md->status),
-                        ch->s.rx_packets);
+                md = &ch->mdr[ch->rxix_irq_srv];
+                pr_info("++ musycc_wq_chan_restart[%d] CHAN RX ACTIVATE: rxix_irq_srv %d, md %p sts %x, rxpkt %lu\n",
+                ch->channum, ch->rxix_irq_srv, md, le32_to_cpu(md->status),
+                        ch->s.rx_packets);
 #elif defined(RLD_RXACT_DEBUG)
-                md = &ch->mdr[ch->rxix_irq_srv];
-                pr_info("++ musycc_wq_chan_restart[%d] CHAN RX ACTIVATE: rxix_irq_srv %d, md %p sts %x, rxpkt %lu\n",
-                ch->channum, ch->rxix_irq_srv, md, le32_to_cpu (md->status),
-                        ch->s.rx_packets);
-                musycc_dump_rxbuffer_ring (ch, 1);      /* RLD DEBUG */
+                md = &ch->mdr[ch->rxix_irq_srv];
+                pr_info("++ musycc_wq_chan_restart[%d] CHAN RX ACTIVATE: rxix_irq_srv %d, md %p sts %x, rxpkt %lu\n",
+                ch->channum, ch->rxix_irq_srv, md, le32_to_cpu(md->status),
+                        ch->s.rx_packets);
+                musycc_dump_rxbuffer_ring(ch, 1);      /* RLD DEBUG */
 #endif
-            }
-        }
+            }
+        }
 #endif
-        musycc_serv_req (pi, SR_CHANNEL_ACTIVATE | SR_RX_DIRECTION | ch->gchan);
+        musycc_serv_req(pi, SR_CHANNEL_ACTIVATE | SR_RX_DIRECTION | ch->gchan);
     }
     /**********************************/
     /** check for TX restart request **/
     /**********************************/
 
-    if ((ch->ch_start_tx) && (ch->status & TX_ENABLED))
-    {
-        /* find next unprocessed message, then set TX thp to it */
-        musycc_update_tx_thp (ch);
+    if ((ch->ch_start_tx) && (ch->status & TX_ENABLED)) {
+        /* find next unprocessed message, then set TX thp to it */
+        musycc_update_tx_thp(ch);
 
 #if 0
-        spin_lock_irqsave (&ch->ch_txlock, flags);
+        spin_lock_irqsave(&ch->ch_txlock, flags);
 #endif
-        md = ch->txd_irq_srv;
-        if (!md)
-        {
+        md = ch->txd_irq_srv;
+        if (!md) {
 #ifdef RLD_TRANS_DEBUG
-            pr_info("-- musycc_wq_chan_restart[%d]: WARNING, starting NULL md\n", ch->channum);
+            pr_info("-- musycc_wq_chan_restart[%d]: WARNING, starting NULL md\n", ch->channum);
 #endif
 #if 0
-            spin_unlock_irqrestore (&ch->ch_txlock, flags);
+            spin_unlock_irqrestore(&ch->ch_txlock, flags);
 #endif
-        } else if (md->data && ((le32_to_cpu (md->status)) & MUSYCC_TX_OWNED))
-        {
-            ch->ch_start_tx = 0;
+        } else if (md->data && ((le32_to_cpu(md->status)) & MUSYCC_TX_OWNED)) {
+            ch->ch_start_tx = 0;
 #if 0
-            spin_unlock_irqrestore (&ch->ch_txlock, flags);   /* allow interrupts for service request */
+            spin_unlock_irqrestore(&ch->ch_txlock, flags);   /* allow interrupts for service request */
 #endif
 #ifdef RLD_TRANS_DEBUG
-            pr_info("++ musycc_wq_chan_restart() CHAN TX ACTIVATE: chan %d txd_irq_srv %p = sts %x, txpkt %lu\n",
-                    ch->channum, ch->txd_irq_srv, ch->txd_irq_srv->status, ch->s.tx_packets);
+            pr_info("++ musycc_wq_chan_restart() CHAN TX ACTIVATE: chan %d txd_irq_srv %p = sts %x, txpkt %lu\n",
+                    ch->channum, ch->txd_irq_srv, ch->txd_irq_srv->status, ch->s.tx_packets);
 #endif
-            musycc_serv_req (pi, SR_CHANNEL_ACTIVATE | SR_TX_DIRECTION | ch->gchan);
-        }
+            musycc_serv_req(pi, SR_CHANNEL_ACTIVATE | SR_TX_DIRECTION | ch->gchan);
+        }
 #ifdef RLD_RESTART_DEBUG
-        else
-        {
-            /* retain request to start until retried and we have data to xmit */
-            pr_info("-- musycc_wq_chan_restart[%d]: DELAYED due to md %p sts %x data %x, start_tx %x\n",
-                    ch->channum, md,
-                    le32_to_cpu (md->status),
-                    le32_to_cpu (md->data), ch->ch_start_tx);
-            musycc_dump_txbuffer_ring (ch, 0);
+        else {
+            /* retain request to start until retried and we have data to xmit */
+            pr_info("-- musycc_wq_chan_restart[%d]: DELAYED due to md %p sts %x data %x, start_tx %x\n",
+                    ch->channum, md,
+                    le32_to_cpu(md->status),
+                    le32_to_cpu(md->data), ch->ch_start_tx);
+            musycc_dump_txbuffer_ring(ch, 0);
 #if 0
-            spin_unlock_irqrestore (&ch->ch_txlock, flags);   /* allow interrupts for service request */
+            spin_unlock_irqrestore(&ch->ch_txlock, flags);   /* allow interrupts for service request */
 #endif
-        }
+        }
 #endif
     }
 }
@@ -473,41 +443,41 @@ musycc_wq_chan_restart (void *arg)      /* channel private structure */
   */
 
 void
-musycc_chan_restart (mch_t * ch)
+musycc_chan_restart(mch_t * ch)
 {
 #ifdef RLD_RESTART_DEBUG
     pr_info("++ musycc_chan_restart[%d]: txd_irq_srv @ %p = sts %x\n",
-            ch->channum, ch->txd_irq_srv, ch->txd_irq_srv->status);
+            ch->channum, ch->txd_irq_srv, ch->txd_irq_srv->status);
 #endif
 
     /* 2.6 - find next unprocessed message, then set TX thp to it */
 #ifdef RLD_RESTART_DEBUG
     pr_info(">> musycc_chan_restart: scheduling Chan %x workQ @ %p\n", ch->channum, &ch->ch_work);
 #endif
-    c4_wk_chan_restart (ch);        /* work queue mechanism fires off: Ref:
-                                     * musycc_wq_chan_restart () */
+    c4_wk_chan_restart(ch);        /* work queue mechanism fires off: Ref:
+                                     * musycc_wq_chan_restart () */
 
 }
 
 
 void
-rld_put_led (mpi_t * pi, u_int32_t ledval)
+rld_put_led(mpi_t * pi, u_int32_t ledval)
 {
     static u_int32_t led = 0;
 
     if (ledval == 0)
-        led = 0;
+        led = 0;
     else
-        led |= ledval;
+        led |= ledval;
 
-    pci_write_32 ((u_int32_t *) &pi->up->cpldbase->leds, led);  /* RLD DEBUG TRANHANG */
+    pci_write_32((u_int32_t *) &pi->up->cpldbase->leds, led);  /* RLD DEBUG TRANHANG */
 }
 
 
 #define MUSYCC_SR_RETRY_CNT  9
 
 void
-musycc_serv_req (mpi_t * pi, u_int32_t req)
+musycc_serv_req(mpi_t * pi, u_int32_t req)
 {
     volatile u_int32_t r;
     int         rcnt;
@@ -520,49 +490,46 @@ musycc_serv_req (mpi_t * pi, u_int32_t req)
      * acknowledged."
      */
 
-    SD_SEM_TAKE (&pi->sr_sem_busy, "serv");     /* only 1 thru here, per
-                                                 * group */
+    SD_SEM_TAKE(&pi->sr_sem_busy, "serv");     /* only 1 thru here, per
+                                                 * group */
 
-    if (pi->sr_last == req)
-    {
+    if (pi->sr_last == req) {
 #ifdef RLD_TRANS_DEBUG
-        pr_info(">> same SR, Port %d Req %x\n", pi->portnum, req);
+        pr_info(">> same SR, Port %d Req %x\n", pi->portnum, req);
 #endif
 
-        /*
-         * The most likely repeated request is the channel activation command
-         * which follows the occurrence of a Transparent mode TX ONR or a
-         * BUFF error.  If the previous command was a CHANNEL ACTIVATE,
-         * precede it with a NOOP command in order maintain coherent control
-         * of this current (re)ACTIVATE.
-         */
-
-        r = (pi->sr_last & ~SR_GCHANNEL_MASK);
-        if ((r == (SR_CHANNEL_ACTIVATE | SR_TX_DIRECTION)) ||
-            (r == (SR_CHANNEL_ACTIVATE | SR_RX_DIRECTION)))
-        {
+        /*
+         * The most likely repeated request is the channel activation command
+         * which follows the occurrence of a Transparent mode TX ONR or a
+         * BUFF error.  If the previous command was a CHANNEL ACTIVATE,
+         * precede it with a NOOP command in order maintain coherent control
+         * of this current (re)ACTIVATE.
+         */
+
+        r = (pi->sr_last & ~SR_GCHANNEL_MASK);
+        if ((r == (SR_CHANNEL_ACTIVATE | SR_TX_DIRECTION)) ||
+            (r == (SR_CHANNEL_ACTIVATE | SR_RX_DIRECTION))) {
 #ifdef RLD_TRANS_DEBUG
-            pr_info(">> same CHAN ACT SR, Port %d Req %x => issue SR_NOOP CMD\n", pi->portnum, req);
+            pr_info(">> same CHAN ACT SR, Port %d Req %x => issue SR_NOOP CMD\n", pi->portnum, req);
 #endif
-            SD_SEM_GIVE (&pi->sr_sem_busy);     /* allow this next request */
-            musycc_serv_req (pi, SR_NOOP);
-            SD_SEM_TAKE (&pi->sr_sem_busy, "serv");     /* relock & continue w/
-                                                         * original req */
-        } else if (req == SR_NOOP)
-        {
-            /* no need to issue back-to-back SR_NOOP commands at this time */
+            SD_SEM_GIVE(&pi->sr_sem_busy);     /* allow this next request */
+            musycc_serv_req(pi, SR_NOOP);
+            SD_SEM_TAKE(&pi->sr_sem_busy, "serv");     /* relock & continue w/
+                                                         * original req */
+        } else if (req == SR_NOOP) {
+            /* no need to issue back-to-back SR_NOOP commands at this time */
 #ifdef RLD_TRANS_DEBUG
-            pr_info(">> same Port SR_NOOP skipped, Port %d\n", pi->portnum);
+            pr_info(">> same Port SR_NOOP skipped, Port %d\n", pi->portnum);
 #endif
-            SD_SEM_GIVE (&pi->sr_sem_busy);     /* allow this next request */
-            return;
-        }
+            SD_SEM_GIVE(&pi->sr_sem_busy);     /* allow this next request */
+            return;
+        }
     }
     rcnt = 0;
     pi->sr_last = req;
 rewrite:
-    pci_write_32 ((u_int32_t *) &pi->reg->srd, req);
-    FLUSH_MEM_WRITE ();
+    pci_write_32((u_int32_t *) &pi->reg->srd, req);
+    FLUSH_MEM_WRITE();
 
     /*
      * Per MUSYCC Manual, Section 6.1,2 - "When writing an SCR service
@@ -572,120 +539,108 @@ rewrite:
      * the host follow any SCR write with another operation which reads from
      * the same address."
      */
-    r = pci_read_32 ((u_int32_t *) &pi->reg->srd);      /* adhere to write
-                                                         * timing imposition */
-
-
-    if ((r != req) && (req != SR_CHIP_RESET) && (++rcnt <= MUSYCC_SR_RETRY_CNT))
-    {
-        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));
-        OS_uwait_dummy ();          /* this delay helps reduce reissue counts
-                                     * (reason not yet researched) */
-        goto rewrite;
+    r = pci_read_32((u_int32_t *) &pi->reg->srd);      /* adhere to write
+                                                         * timing imposition */
+
+
+    if ((r != req) && (req != SR_CHIP_RESET) && (++rcnt <= MUSYCC_SR_RETRY_CNT)) {
+        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));
+        OS_uwait_dummy();          /* this delay helps reduce reissue counts
+                                     * (reason not yet researched) */
+        goto rewrite;
     }
-    if (rcnt > MUSYCC_SR_RETRY_CNT)
-    {
-        pr_warning("%s: failed service request (#%d)= %x, group %d.\n",
-                   pi->up->devname, MUSYCC_SR_RETRY_CNT, req, pi->portnum);
-        SD_SEM_GIVE (&pi->sr_sem_busy); /* allow any next request */
-        return;
+    if (rcnt > MUSYCC_SR_RETRY_CNT) {
+        pr_warning("%s: failed service request (#%d)= %x, group %d.\n",
+                   pi->up->devname, MUSYCC_SR_RETRY_CNT, req, pi->portnum);
+        SD_SEM_GIVE(&pi->sr_sem_busy); /* allow any next request */
+        return;
     }
-    if (req == SR_CHIP_RESET)
-    {
-        /*
-         * PORT NOTE: the CHIP_RESET command is NOT ack'd by the MUSYCC, thus
-         * the upcoming delay is used.  Though the MUSYCC documentation
-         * suggests a read-after-write would supply the required delay, it's
-         * unclear what CPU/BUS clock speeds might have been assumed when
-         * suggesting this 'lack of ACK' workaround.  Thus the use of uwait.
-         */
-        OS_uwait (100000, "icard"); /* 100ms */
-    } else
-    {
-        FLUSH_MEM_READ ();
-        SD_SEM_TAKE (&pi->sr_sem_wait, "sakack");       /* sleep until SACK
-                                                         * interrupt occurs */
+    if (req == SR_CHIP_RESET) {
+        /*
+         * PORT NOTE: the CHIP_RESET command is NOT ack'd by the MUSYCC, thus
+         * the upcoming delay is used.  Though the MUSYCC documentation
+         * suggests a read-after-write would supply the required delay, it's
+         * unclear what CPU/BUS clock speeds might have been assumed when
+         * suggesting this 'lack of ACK' workaround.  Thus the use of uwait.
+         */
+        OS_uwait(100000, "icard"); /* 100ms */
+    } else {
+        FLUSH_MEM_READ();
+        SD_SEM_TAKE(&pi->sr_sem_wait, "sakack");       /* sleep until SACK
+                                                         * interrupt occurs */
     }
-    SD_SEM_GIVE (&pi->sr_sem_busy); /* allow any next request */
+    SD_SEM_GIVE(&pi->sr_sem_busy); /* allow any next request */
 }
 
 
 #ifdef  SBE_PMCC4_ENABLE
 void
-musycc_update_timeslots (mpi_t * pi)
+musycc_update_timeslots(mpi_t * pi)
 {
     int         i, ch;
-    char        e1mode = IS_FRAME_ANY_E1 (pi->p.port_mode);
-
-    for (i = 0; i < 32; i++)
-    {
-        int         usedby = 0, last = 0, ts, j, bits[8];
-
-        u_int8_t lastval = 0;
-
-        if (((i == 0) && e1mode) || /* disable if  E1 mode */
-            ((i == 16) && ((pi->p.port_mode == CFG_FRAME_E1CRC_CAS) || (pi->p.port_mode == CFG_FRAME_E1CRC_CAS_AMI)))
-            || ((i > 23) && (!e1mode))) /* disable if T1 mode */
-        {
-            pi->tsm[i] = 0xff;      /* make tslot unavailable for this mode */
-        } else
-        {
-            pi->tsm[i] = 0x00;      /* make tslot available for assignment */
-        }
-        for (j = 0; j < 8; j++)
-            bits[j] = -1;
-        for (ch = 0; ch < MUSYCC_NCHANS; ch++)
-        {
-            if ((pi->chan[ch]->state == UP) && (pi->chan[ch]->p.bitmask[i]))
-            {
-                usedby++;
-                last = ch;
-                lastval = pi->chan[ch]->p.bitmask[i];
-                for (j = 0; j < 8; j++)
-                    if (lastval & (1 << j))
-                        bits[j] = ch;
-                pi->tsm[i] |= lastval;
-            }
-        }
-        if (!usedby)
-            ts = 0;
-        else if ((usedby == 1) && (lastval == 0xff))
-            ts = (4 << 5) | last;
-        else if ((usedby == 1) && (lastval == 0x7f))
-            ts = (5 << 5) | last;
-        else
-        {
-            int         idx;
-
-            if (bits[0] < 0)
-                ts = (6 << 5) | (idx = last);
-            else
-                ts = (7 << 5) | (idx = bits[0]);
-            for (j = 1; j < 8; j++)
-            {
-                pi->regram->rscm[idx * 8 + j] = (bits[j] < 0) ? 0 : (0x80 | bits[j]);
-                pi->regram->tscm[idx * 8 + j] = (bits[j] < 0) ? 0 : (0x80 | bits[j]);
-            }
-        }
-        pi->regram->rtsm[i] = ts;
-        pi->regram->ttsm[i] = ts;
+    char        e1mode = IS_FRAME_ANY_E1(pi->p.port_mode);
+
+    for (i = 0; i < 32; i++) {
+        int         usedby = 0, last = 0, ts, j, bits[8];
+
+        u_int8_t lastval = 0;
+
+        if (((i == 0) && e1mode) || /* disable if  E1 mode */
+            ((i == 16) && ((pi->p.port_mode == CFG_FRAME_E1CRC_CAS) || (pi->p.port_mode == CFG_FRAME_E1CRC_CAS_AMI)))
+            || ((i > 23) && (!e1mode))) /* disable if T1 mode */
+            pi->tsm[i] = 0xff;      /* make tslot unavailable for this mode */
+        else
+            pi->tsm[i] = 0x00;      /* make tslot available for assignment */
+        for (j = 0; j < 8; j++)
+            bits[j] = -1;
+        for (ch = 0; ch < MUSYCC_NCHANS; ch++) {
+            if ((pi->chan[ch]->state == UP) && (pi->chan[ch]->p.bitmask[i])) {
+                usedby++;
+                last = ch;
+                lastval = pi->chan[ch]->p.bitmask[i];
+                for (j = 0; j < 8; j++)
+                    if (lastval & (1 << j))
+                        bits[j] = ch;
+                pi->tsm[i] |= lastval;
+            }
+        }
+        if (!usedby)
+            ts = 0;
+        else if ((usedby == 1) && (lastval == 0xff))
+            ts = (4 << 5) | last;
+        else if ((usedby == 1) && (lastval == 0x7f))
+            ts = (5 << 5) | last;
+        else {
+            int         idx;
+
+            if (bits[0] < 0)
+                ts = (6 << 5) | (idx = last);
+            else
+                ts = (7 << 5) | (idx = bits[0]);
+            for (j = 1; j < 8; j++) {
+                pi->regram->rscm[idx * 8 + j] = (bits[j] < 0) ? 0 : (0x80 | bits[j]);
+                pi->regram->tscm[idx * 8 + j] = (bits[j] < 0) ? 0 : (0x80 | bits[j]);
+            }
+        }
+        pi->regram->rtsm[i] = ts;
+        pi->regram->ttsm[i] = ts;
     }
-    FLUSH_MEM_WRITE ();
+    FLUSH_MEM_WRITE();
 
-    musycc_serv_req (pi, SR_TIMESLOT_MAP | SR_RX_DIRECTION);
-    musycc_serv_req (pi, SR_TIMESLOT_MAP | SR_TX_DIRECTION);
-    musycc_serv_req (pi, SR_SUBCHANNEL_MAP | SR_RX_DIRECTION);
-    musycc_serv_req (pi, SR_SUBCHANNEL_MAP | SR_TX_DIRECTION);
+    musycc_serv_req(pi, SR_TIMESLOT_MAP | SR_RX_DIRECTION);
+    musycc_serv_req(pi, SR_TIMESLOT_MAP | SR_TX_DIRECTION);
+    musycc_serv_req(pi, SR_SUBCHANNEL_MAP | SR_RX_DIRECTION);
+    musycc_serv_req(pi, SR_SUBCHANNEL_MAP | SR_TX_DIRECTION);
 }
 #endif
 
 
 #ifdef SBE_WAN256T3_ENABLE
 void
-musycc_update_timeslots (mpi_t * pi)
+musycc_update_timeslots(mpi_t * pi)
 {
     mch_t      *ch;
 
@@ -699,21 +654,20 @@ musycc_update_timeslots (mpi_t * pi)
 #ifdef SBE_WAN256T3_ENABLE
     hmask = (0x1f << hyperdummy) & 0x1f;
 #endif
-    for (i = 0; i < 128; i++)
-    {
-        gchan = ((pi->portnum * MUSYCC_NCHANS) + (i & hmask)) % MUSYCC_NCHANS;
-        ch = pi->chan[gchan];
-        if (ch->p.mode_56k)
-            tsen = MODE_56KBPS;
-        else
-            tsen = MODE_64KBPS;     /* also the default */
-        ts = ((pi->portnum % 4) == (i / 32)) ? (tsen << 5) | (i & hmask) : 0;
-        pi->regram->rtsm[i] = ts;
-        pi->regram->ttsm[i] = ts;
+    for (i = 0; i < 128; i++) {
+        gchan = ((pi->portnum * MUSYCC_NCHANS) + (i & hmask)) % MUSYCC_NCHANS;
+        ch = pi->chan[gchan];
+        if (ch->p.mode_56k)
+            tsen = MODE_56KBPS;
+        else
+            tsen = MODE_64KBPS;     /* also the default */
+        ts = ((pi->portnum % 4) == (i / 32)) ? (tsen << 5) | (i & hmask) : 0;
+        pi->regram->rtsm[i] = ts;
+        pi->regram->ttsm[i] = ts;
     }
-    FLUSH_MEM_WRITE ();
-    musycc_serv_req (pi, SR_TIMESLOT_MAP | SR_RX_DIRECTION);
-    musycc_serv_req (pi, SR_TIMESLOT_MAP | SR_TX_DIRECTION);
+    FLUSH_MEM_WRITE();
+    musycc_serv_req(pi, SR_TIMESLOT_MAP | SR_RX_DIRECTION);
+    musycc_serv_req(pi, SR_TIMESLOT_MAP | SR_TX_DIRECTION);
 }
 #endif
 
@@ -723,26 +677,25 @@ musycc_update_timeslots (mpi_t * pi)
   * into a hardware specific register value (IE. MUSYCC CCD Register).
   */
 u_int32_t
-musycc_chan_proto (int proto)
+musycc_chan_proto(int proto)
 {
     int         reg;
 
-    switch (proto)
-    {
+    switch (proto) {
     case CFG_CH_PROTO_TRANS:        /* 0 */
-        reg = MUSYCC_CCD_TRANS;
-        break;
+        reg = MUSYCC_CCD_TRANS;
+        break;
     case CFG_CH_PROTO_SS7:          /* 1 */
-        reg = MUSYCC_CCD_SS7;
-        break;
+        reg = MUSYCC_CCD_SS7;
+        break;
     default:
     case CFG_CH_PROTO_ISLP_MODE:   /* 4 */
     case CFG_CH_PROTO_HDLC_FCS16:  /* 2 */
-        reg = MUSYCC_CCD_HDLC_FCS16;
-        break;
+        reg = MUSYCC_CCD_HDLC_FCS16;
+        break;
     case CFG_CH_PROTO_HDLC_FCS32:  /* 3 */
-        reg = MUSYCC_CCD_HDLC_FCS32;
-        break;
+        reg = MUSYCC_CCD_HDLC_FCS32;
+        break;
     }
 
     return reg;
@@ -750,46 +703,46 @@ musycc_chan_proto (int proto)
 
 #ifdef SBE_WAN256T3_ENABLE
 STATIC void __init
-musycc_init_port (mpi_t * pi)
+musycc_init_port(mpi_t * pi)
 {
-    pci_write_32 ((u_int32_t *) &pi->reg->gbp, OS_vtophys (pi->regram));
+    pci_write_32((u_int32_t *) &pi->reg->gbp, OS_vtophys(pi->regram));
 
     pi->regram->grcd =
-        __constant_cpu_to_le32 (MUSYCC_GRCD_RX_ENABLE |
-                                MUSYCC_GRCD_TX_ENABLE |
-                                MUSYCC_GRCD_SF_ALIGN |
-                                MUSYCC_GRCD_SUBCHAN_DISABLE |
-                                MUSYCC_GRCD_OOFMP_DISABLE |
-                                MUSYCC_GRCD_COFAIRQ_DISABLE |
-                                MUSYCC_GRCD_MC_ENABLE |
-                       (MUSYCC_GRCD_POLLTH_32 << MUSYCC_GRCD_POLLTH_SHIFT));
+        __constant_cpu_to_le32(MUSYCC_GRCD_RX_ENABLE |
+                                MUSYCC_GRCD_TX_ENABLE |
+                                MUSYCC_GRCD_SF_ALIGN |
+                                MUSYCC_GRCD_SUBCHAN_DISABLE |
+                                MUSYCC_GRCD_OOFMP_DISABLE |
+                                MUSYCC_GRCD_COFAIRQ_DISABLE |
+                                MUSYCC_GRCD_MC_ENABLE |
+                       (MUSYCC_GRCD_POLLTH_32 << MUSYCC_GRCD_POLLTH_SHIFT));
 
     pi->regram->pcd =
-        __constant_cpu_to_le32 (MUSYCC_PCD_E1X4_MODE |
-                                MUSYCC_PCD_TXDATA_RISING |
-                                MUSYCC_PCD_TX_DRIVEN);
+        __constant_cpu_to_le32(MUSYCC_PCD_E1X4_MODE |
+                                MUSYCC_PCD_TXDATA_RISING |
+                                MUSYCC_PCD_TX_DRIVEN);
 
     /* Message length descriptor */
-       pi->regram->mld = __constant_cpu_to_le32 (cxt1e1_max_mru | (cxt1e1_max_mru << 16));
-    FLUSH_MEM_WRITE ();
+       pi->regram->mld = __constant_cpu_to_le32(cxt1e1_max_mru | (cxt1e1_max_mru << 16));
+    FLUSH_MEM_WRITE();
 
-    musycc_serv_req (pi, SR_GROUP_INIT | SR_RX_DIRECTION);
-    musycc_serv_req (pi, SR_GROUP_INIT | SR_TX_DIRECTION);
+    musycc_serv_req(pi, SR_GROUP_INIT | SR_RX_DIRECTION);
+    musycc_serv_req(pi, SR_GROUP_INIT | SR_TX_DIRECTION);
 
-    musycc_init_mdt (pi);
+    musycc_init_mdt(pi);
 
-    musycc_update_timeslots (pi);
+    musycc_update_timeslots(pi);
 }
 #endif
 
 
 status_t    __init
-musycc_init (ci_t * ci)
+musycc_init(ci_t * ci)
 {
     char       *regaddr;        /* temp for address boundary calculations */
     int         i, gchan;
 
-    OS_sem_init (&ci->sem_wdbusy, SEM_AVAILABLE);       /* watchdog exclusion */
+    OS_sem_init(&ci->sem_wdbusy, SEM_AVAILABLE);       /* watchdog exclusion */
 
     /*
      * Per MUSYCC manual, Section 6.3.4 - "The host must allocate a dword
@@ -798,87 +751,80 @@ musycc_init (ci_t * ci)
 
 #define INT_QUEUE_BOUNDARY  4
 
-    regaddr = OS_kmalloc ((INT_QUEUE_SIZE + 1) * sizeof (u_int32_t));
+    regaddr = OS_kmalloc((INT_QUEUE_SIZE + 1) * sizeof(u_int32_t));
     if (regaddr == 0)
-        return ENOMEM;
+        return ENOMEM;
     ci->iqd_p_saved = regaddr;      /* save orig value for free's usage */
     ci->iqd_p = (u_int32_t *) ((unsigned long) (regaddr + INT_QUEUE_BOUNDARY - 1) &
-                               (~(INT_QUEUE_BOUNDARY - 1)));    /* this calculates
-                                                                 * closest boundary */
+                               (~(INT_QUEUE_BOUNDARY - 1)));    /* this calculates
+                                                                 * closest boundary */
 
     for (i = 0; i < INT_QUEUE_SIZE; i++)
-    {
-        ci->iqd_p[i] = __constant_cpu_to_le32 (INT_EMPTY_ENTRY);
-    }
+        ci->iqd_p[i] = __constant_cpu_to_le32(INT_EMPTY_ENTRY);
 
-    for (i = 0; i < ci->max_port; i++)
-    {
-        mpi_t      *pi = &ci->port[i];
+    for (i = 0; i < ci->max_port; i++) {
+        mpi_t      *pi = &ci->port[i];
 
-        /*
-         * Per MUSYCC manual, Section 6.3.2 - "The host must allocate a 2KB
-         * bound memory segment for Channel Group 0."
-         */
+        /*
+         * Per MUSYCC manual, Section 6.3.2 - "The host must allocate a 2KB
+         * bound memory segment for Channel Group 0."
+         */
 
 #define GROUP_BOUNDARY   0x800
 
-        regaddr = OS_kmalloc (sizeof (struct musycc_groupr) + GROUP_BOUNDARY);
-        if (regaddr == 0)
-        {
-            for (gchan = 0; gchan < i; gchan++)
-            {
-                pi = &ci->port[gchan];
-                OS_kfree (pi->reg);
-                pi->reg = 0;
-            }
-            return ENOMEM;
-        }
-        pi->regram_saved = regaddr; /* save orig value for free's usage */
-        pi->regram = (struct musycc_groupr *) ((unsigned long) (regaddr + GROUP_BOUNDARY - 1) &
-                                               (~(GROUP_BOUNDARY - 1)));        /* this calculates
-                                                                                 * closest boundary */
+        regaddr = OS_kmalloc(sizeof(struct musycc_groupr) + GROUP_BOUNDARY);
+        if (regaddr == 0) {
+            for (gchan = 0; gchan < i; gchan++) {
+                pi = &ci->port[gchan];
+                OS_kfree(pi->reg);
+                pi->reg = 0;
+            }
+            return ENOMEM;
+        }
+        pi->regram_saved = regaddr; /* save orig value for free's usage */
+        pi->regram = (struct musycc_groupr *) ((unsigned long) (regaddr + GROUP_BOUNDARY - 1) &
+                                               (~(GROUP_BOUNDARY - 1)));        /* this calculates
+                                                                                 * closest boundary */
     }
 
     /* any board centric MUSYCC commands will use group ZERO as its "home" */
     ci->regram = ci->port[0].regram;
-    musycc_serv_req (&ci->port[0], SR_CHIP_RESET);
+    musycc_serv_req(&ci->port[0], SR_CHIP_RESET);
 
-    pci_write_32 ((u_int32_t *) &ci->reg->gbp, OS_vtophys (ci->regram));
-    pci_flush_write (ci);
+    pci_write_32((u_int32_t *) &ci->reg->gbp, OS_vtophys(ci->regram));
+    pci_flush_write(ci);
 #ifdef CONFIG_SBE_PMCC4_NCOMM
-    ci->regram->__glcd = __constant_cpu_to_le32 (GCD_MAGIC);
+    ci->regram->__glcd = __constant_cpu_to_le32(GCD_MAGIC);
 #else
     /* standard driver POLLS for INTB via CPLD register */
-    ci->regram->__glcd = __constant_cpu_to_le32 (GCD_MAGIC | MUSYCC_GCD_INTB_DISABLE);
+    ci->regram->__glcd = __constant_cpu_to_le32(GCD_MAGIC | MUSYCC_GCD_INTB_DISABLE);
 #endif
 
-    ci->regram->__iqp = cpu_to_le32 (OS_vtophys (&ci->iqd_p[0]));
-    ci->regram->__iql = __constant_cpu_to_le32 (INT_QUEUE_SIZE - 1);
-    pci_write_32 ((u_int32_t *) &ci->reg->dacbp, 0);
-    FLUSH_MEM_WRITE ();
+    ci->regram->__iqp = cpu_to_le32(OS_vtophys(&ci->iqd_p[0]));
+    ci->regram->__iql = __constant_cpu_to_le32(INT_QUEUE_SIZE - 1);
+    pci_write_32((u_int32_t *) &ci->reg->dacbp, 0);
+    FLUSH_MEM_WRITE();
 
     ci->state = C_RUNNING;          /* mark as full interrupt processing
-                                     * available */
+                                     * available */
 
-    musycc_serv_req (&ci->port[0], SR_GLOBAL_INIT);     /* FIRST INTERRUPT ! */
+    musycc_serv_req(&ci->port[0], SR_GLOBAL_INIT);     /* FIRST INTERRUPT ! */
 
     /* sanity check settable parameters */
 
-       if (cxt1e1_max_mru > 0xffe)
-    {
-        pr_warning("Maximum allowed MRU exceeded, resetting %d to %d.\n",
-                                  cxt1e1_max_mru, 0xffe);
-               cxt1e1_max_mru = 0xffe;
+       if (cxt1e1_max_mru > 0xffe) {
+        pr_warning("Maximum allowed MRU exceeded, resetting %d to %d.\n",
+                                  cxt1e1_max_mru, 0xffe);
+               cxt1e1_max_mru = 0xffe;
     }
-       if (cxt1e1_max_mtu > 0xffe)
-    {
-        pr_warning("Maximum allowed MTU exceeded, resetting %d to %d.\n",
-                                  cxt1e1_max_mtu, 0xffe);
-               cxt1e1_max_mtu = 0xffe;
+       if (cxt1e1_max_mtu > 0xffe) {
+        pr_warning("Maximum allowed MTU exceeded, resetting %d to %d.\n",
+                                  cxt1e1_max_mtu, 0xffe);
+               cxt1e1_max_mtu = 0xffe;
     }
 #ifdef SBE_WAN256T3_ENABLE
     for (i = 0; i < MUSYCC_NPORTS; i++)
-        musycc_init_port (&ci->port[i]);
+        musycc_init_port(&ci->port[i]);
 #endif
 
     return SBE_DRVR_SUCCESS;        /* no error */
@@ -886,7 +832,7 @@ musycc_init (ci_t * ci)
 
 
 void
-musycc_bh_tx_eom (mpi_t * pi, int gchan)
+musycc_bh_tx_eom(mpi_t * pi, int gchan)
 {
     mch_t      *ch;
     struct mdesc *md;
@@ -900,128 +846,117 @@ musycc_bh_tx_eom (mpi_t * pi, int gchan)
     volatile u_int32_t status;
 
     ch = pi->chan[gchan];
-    if (ch == 0 || ch->state != UP)
-    {
-        if (cxt1e1_log_level >= LOG_ERROR)
-            pr_info("%s: intr: xmit EOM on uninitialized channel %d\n",
-                    pi->up->devname, gchan);
+    if (ch == 0 || ch->state != UP) {
+        if (cxt1e1_log_level >= LOG_ERROR)
+            pr_info("%s: intr: xmit EOM on uninitialized channel %d\n",
+                    pi->up->devname, gchan);
     }
     if (ch == 0 || ch->mdt == 0)
-        return;                     /* note: mdt==0 implies a malloc()
-                                     * failure w/in chan_up() routine */
+        return;                     /* note: mdt==0 implies a malloc()
+                                     * failure w/in chan_up() routine */
 
 #if 0
 #ifdef SBE_ISR_INLINE
-    spin_lock_irq (&ch->ch_txlock);
+    spin_lock_irq(&ch->ch_txlock);
 #else
-    spin_lock_irqsave (&ch->ch_txlock, flags);
+    spin_lock_irqsave(&ch->ch_txlock, flags);
 #endif
 #endif
-    do
-    {
-        FLUSH_MEM_READ ();
-        md = ch->txd_irq_srv;
-        status = le32_to_cpu (md->status);
-
-        /*
-         * Note: Per MUSYCC Ref 6.4.9, the host does not poll a host-owned
-         * Transmit Buffer Descriptor during Transparent Mode.
-         */
-        if (status & MUSYCC_TX_OWNED)
-        {
-            int         readCount, loopCount;
-
-            /***********************************************************/
-            /* HW Bug Fix                                              */
-            /* ----------                                              */
-            /* Under certain PCI Bus loading conditions, the data      */
-            /* associated with an update of Shared Memory is delayed   */
-            /* relative to its PCI Interrupt.  This is caught when     */
-            /* the host determines it does not yet OWN the descriptor. */
-            /***********************************************************/
-
-            readCount = 0;
-            while (status & MUSYCC_TX_OWNED)
-            {
-                for (loopCount = 0; loopCount < 0x30; loopCount++)
-                    OS_uwait_dummy ();  /* use call to avoid optimization
-                                         * removal of dummy delay */
-                FLUSH_MEM_READ ();
-                status = le32_to_cpu (md->status);
-                if (readCount++ > 40)
-                    break;          /* don't wait any longer */
-            }
-            if (status & MUSYCC_TX_OWNED)
-            {
-                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,
-                            md, status);
-                    pr_info("++ User 0x%p IRQ_SRV 0x%p USR_ADD 0x%p QStopped %x, start_tx %x tx_full %d txd_free %d mode %x\n",
-                            ch->user, ch->txd_irq_srv, ch->txd_usr_add,
-                            sd_queue_stopped (ch->user),
-                            ch->ch_start_tx, ch->tx_full, ch->txd_free, ch->p.chan_mode);
-                    musycc_dump_txbuffer_ring (ch, 0);
-                }
-                break;              /* Not our mdesc, done */
-            } else
-            {
-                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);
-            }
-        }
-        ch->txd_irq_srv = md->snext;
-
-        md->data = 0;
-        if (md->mem_token != 0)
-        {
-            /* upcount channel */
-            atomic_sub (OS_mem_token_tlen (md->mem_token), &ch->tx_pending);
-            /* upcount card */
-            atomic_sub (OS_mem_token_tlen (md->mem_token), &pi->up->tx_pending);
+    do {
+        FLUSH_MEM_READ();
+        md = ch->txd_irq_srv;
+        status = le32_to_cpu(md->status);
+
+        /*
+         * Note: Per MUSYCC Ref 6.4.9, the host does not poll a host-owned
+         * Transmit Buffer Descriptor during Transparent Mode.
+         */
+        if (status & MUSYCC_TX_OWNED) {
+            int         readCount, loopCount;
+
+            /***********************************************************/
+            /* HW Bug Fix                                              */
+            /* ----------                                              */
+            /* Under certain PCI Bus loading conditions, the data      */
+            /* associated with an update of Shared Memory is delayed   */
+            /* relative to its PCI Interrupt.  This is caught when     */
+            /* the host determines it does not yet OWN the descriptor. */
+            /***********************************************************/
+
+            readCount = 0;
+            while (status & MUSYCC_TX_OWNED) {
+                for (loopCount = 0; loopCount < 0x30; loopCount++)
+                    OS_uwait_dummy();  /* use call to avoid optimization
+                                         * removal of dummy delay */
+                FLUSH_MEM_READ();
+                status = le32_to_cpu(md->status);
+                if (readCount++ > 40)
+                    break;          /* don't wait any longer */
+            }
+            if (status & MUSYCC_TX_OWNED) {
+                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,
+                            md, status);
+                    pr_info("++ User 0x%p IRQ_SRV 0x%p USR_ADD 0x%p QStopped %x, start_tx %x tx_full %d txd_free %d mode %x\n",
+                            ch->user, ch->txd_irq_srv, ch->txd_usr_add,
+                            sd_queue_stopped(ch->user),
+                            ch->ch_start_tx, ch->tx_full, ch->txd_free, ch->p.chan_mode);
+                    musycc_dump_txbuffer_ring(ch, 0);
+                }
+                break;              /* Not our mdesc, done */
+            } else {
+                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);
+            }
+        }
+        ch->txd_irq_srv = md->snext;
+
+        md->data = 0;
+        if (md->mem_token != 0) {
+            /* upcount channel */
+            atomic_sub(OS_mem_token_tlen(md->mem_token), &ch->tx_pending);
+            /* upcount card */
+            atomic_sub(OS_mem_token_tlen(md->mem_token), &pi->up->tx_pending);
 #ifdef SBE_WAN256T3_ENABLE
-            if (!atomic_read (&pi->up->tx_pending))
-                wan256t3_led (pi->up, LED_TX, 0);
+            if (!atomic_read(&pi->up->tx_pending))
+                wan256t3_led(pi->up, LED_TX, 0);
 #endif
 
 #ifdef CONFIG_SBE_WAN256T3_NCOMM
-            /* callback that our packet was sent */
-            {
-                int         hdlcnum = (pi->portnum * 32 + gchan);
-
-                if (hdlcnum >= 228)
-                {
-                    if (nciProcess_TX_complete)
-                        (*nciProcess_TX_complete) (hdlcnum,
-                                                   getuserbychan (gchan));
-                }
-            }
+            /* callback that our packet was sent */
+            {
+                int         hdlcnum = (pi->portnum * 32 + gchan);
+
+                if (hdlcnum >= 228) {
+                    if (nciProcess_TX_complete)
+                        (*nciProcess_TX_complete) (hdlcnum,
+                                                   getuserbychan(gchan));
+                }
+            }
 #endif                              /*** CONFIG_SBE_WAN256T3_NCOMM ***/
 
-            OS_mem_token_free_irq (md->mem_token);
-            md->mem_token = 0;
-        }
-        md->status = 0;
+            OS_mem_token_free_irq(md->mem_token);
+            md->mem_token = 0;
+        }
+        md->status = 0;
 #ifdef RLD_TXFULL_DEBUG
-        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);
+        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
-        ++ch->txd_free;
-        FLUSH_MEM_WRITE ();
-
-        if ((ch->p.chan_mode != CFG_CH_PROTO_TRANS) && (status & EOBIRQ_ENABLE))
-        {
-            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)
-                break;
-        }
-    }
-    while ((ch->p.chan_mode != CFG_CH_PROTO_TRANS) && ((status & EOMIRQ_ENABLE) == 0));
+        ++ch->txd_free;
+        FLUSH_MEM_WRITE();
+
+        if ((ch->p.chan_mode != CFG_CH_PROTO_TRANS) && (status & EOBIRQ_ENABLE)) {
+            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)
+                break;
+        }
+    } while ((ch->p.chan_mode != CFG_CH_PROTO_TRANS) && ((status & EOMIRQ_ENABLE) == 0));
     /*
      * NOTE: (The above 'while' is coupled w/ previous 'do', way above.) Each
      * Transparent data buffer has the EOB bit, and NOT the EOM bit, set and
@@ -1029,56 +964,53 @@ musycc_bh_tx_eom (mpi_t * pi, int gchan)
      * buffer.
      */
 
-    FLUSH_MEM_READ ();
+    FLUSH_MEM_READ();
     /*
      * Smooth flow control hysterisis by maintaining task stoppage until half
      * the available write buffers are available.
      */
-    if (ch->tx_full && (ch->txd_free >= (ch->txd_num / 2)))
-    {
-        /*
-         * Then, only releave task stoppage if we actually have enough
-         * buffers to service the last requested packet.  It may require MORE
-         * than half the available!
-         */
-        if (ch->txd_free >= ch->txd_required)
-        {
+    if (ch->tx_full && (ch->txd_free >= (ch->txd_num / 2))) {
+        /*
+         * Then, only releave task stoppage if we actually have enough
+         * buffers to service the last requested packet.  It may require MORE
+         * than half the available!
+         */
+        if (ch->txd_free >= ch->txd_required) {
 
 #ifdef RLD_TXFULL_DEBUG
-            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);
+            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);
 #endif
-            ch->tx_full = 0;
-            ch->txd_required = 0;
-            sd_enable_xmit (ch->user);  /* re-enable to catch flow controlled
-                                         * channel */
-        }
+            ch->tx_full = 0;
+            ch->txd_required = 0;
+            sd_enable_xmit(ch->user);  /* re-enable to catch flow controlled
+                                         * channel */
+        }
     }
 #ifdef RLD_TXFULL_DEBUG
-    else if (ch->tx_full)
-    {
-        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);
+    else if (ch->tx_full) {
+        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);
     }
 #endif
 
-    FLUSH_MEM_WRITE ();
+    FLUSH_MEM_WRITE();
 #if 0
 #ifdef SBE_ISR_INLINE
-    spin_unlock_irq (&ch->ch_txlock);
+    spin_unlock_irq(&ch->ch_txlock);
 #else
-    spin_unlock_irqrestore (&ch->ch_txlock, flags);
+    spin_unlock_irqrestore(&ch->ch_txlock, flags);
 #endif
 #endif
 }
 
 
 STATIC void
-musycc_bh_rx_eom (mpi_t * pi, int gchan)
+musycc_bh_rx_eom(mpi_t * pi, int gchan)
 {
     mch_t      *ch;
     void       *m, *m2;
@@ -1087,89 +1019,76 @@ musycc_bh_rx_eom (mpi_t * pi, int gchan)
     u_int32_t   error;
 
     ch = pi->chan[gchan];
-    if (ch == 0 || ch->state != UP)
-    {
-        if (cxt1e1_log_level > LOG_ERROR)
-            pr_info("%s: intr: receive EOM on uninitialized channel %d\n",
-                    pi->up->devname, gchan);
-        return;
+    if (ch == 0 || ch->state != UP) {
+        if (cxt1e1_log_level > LOG_ERROR)
+            pr_info("%s: intr: receive EOM on uninitialized channel %d\n",
+                    pi->up->devname, gchan);
+        return;
     }
     if (ch->mdr == 0)
-        return;                     /* can this happen ? */
-
-    for (;;)
-    {
-        FLUSH_MEM_READ ();
-        md = &ch->mdr[ch->rxix_irq_srv];
-        status = le32_to_cpu (md->status);
-        if (!(status & HOST_RX_OWNED))
-            break;                  /* Not our mdesc, done */
-        m = md->mem_token;
-        error = (status >> 16) & 0xf;
-        if (error == 0)
-        {
+        return;                     /* can this happen ? */
+
+    for (;;) {
+        FLUSH_MEM_READ();
+        md = &ch->mdr[ch->rxix_irq_srv];
+        status = le32_to_cpu(md->status);
+        if (!(status & HOST_RX_OWNED))
+            break;                  /* Not our mdesc, done */
+        m = md->mem_token;
+        error = (status >> 16) & 0xf;
+        if (error == 0) {
 #ifdef CONFIG_SBE_WAN256T3_NCOMM
-            int         hdlcnum = (pi->portnum * 32 + gchan);
-
-            /*
-             * if the packet number belongs to NCOMM, then send it to the TMS
-             * driver
-             */
-            if (hdlcnum >= 228)
-            {
-                if (nciProcess_RX_packet)
-                    (*nciProcess_RX_packet) (hdlcnum, status & 0x3fff, m, ch->user);
-            } else
+            int         hdlcnum = (pi->portnum * 32 + gchan);
+
+            /*
+             * if the packet number belongs to NCOMM, then send it to the TMS
+             * driver
+             */
+            if (hdlcnum >= 228) {
+                if (nciProcess_RX_packet)
+                    (*nciProcess_RX_packet) (hdlcnum, status & 0x3fff, m, ch->user);
+            } else
 #endif                              /*** CONFIG_SBE_WAN256T3_NCOMM ***/
 
-            {
-                               if ((m2 = OS_mem_token_alloc (cxt1e1_max_mru)))
-                {
-                    /* substitute the mbuf+cluster */
-                    md->mem_token = m2;
-                    md->data = cpu_to_le32 (OS_vtophys (OS_mem_token_data (m2)));
-
-                    /* pass the received mbuf upward */
-                    sd_recv_consume (m, status & LENGTH_MASK, ch->user);
-                    ch->s.rx_packets++;
-                    ch->s.rx_bytes += status & LENGTH_MASK;
-                } else
-                {
-                    ch->s.rx_dropped++;
-                }
-            }
-        } else if (error == ERR_FCS)
-        {
-            ch->s.rx_crc_errors++;
-        } else if (error == ERR_ALIGN)
-        {
-            ch->s.rx_missed_errors++;
-        } else if (error == ERR_ABT)
-        {
-            ch->s.rx_missed_errors++;
-        } else if (error == ERR_LNG)
-        {
-            ch->s.rx_length_errors++;
-        } else if (error == ERR_SHT)
-        {
-            ch->s.rx_length_errors++;
-        }
-        FLUSH_MEM_WRITE ();
-               status = cxt1e1_max_mru;
-        if (ch->p.chan_mode == CFG_CH_PROTO_TRANS)
-            status |= EOBIRQ_ENABLE;
-        md->status = cpu_to_le32 (status);
-
-        /* Check next mdesc in the ring */
-        if (++ch->rxix_irq_srv >= ch->rxd_num)
-            ch->rxix_irq_srv = 0;
-        FLUSH_MEM_WRITE ();
+            {
+                if ((m2 = OS_mem_token_alloc(cxt1e1_max_mru))) {
+                    /* substitute the mbuf+cluster */
+                    md->mem_token = m2;
+                    md->data = cpu_to_le32(OS_vtophys(OS_mem_token_data(m2)));
+
+                    /* pass the received mbuf upward */
+                    sd_recv_consume(m, status & LENGTH_MASK, ch->user);
+                    ch->s.rx_packets++;
+                    ch->s.rx_bytes += status & LENGTH_MASK;
+                } else
+                    ch->s.rx_dropped++;
+            }
+        } else if (error == ERR_FCS)
+            ch->s.rx_crc_errors++;
+        else if (error == ERR_ALIGN)
+            ch->s.rx_missed_errors++;
+        else if (error == ERR_ABT)
+            ch->s.rx_missed_errors++;
+        else if (error == ERR_LNG)
+            ch->s.rx_length_errors++;
+        else if (error == ERR_SHT)
+            ch->s.rx_length_errors++;
+        FLUSH_MEM_WRITE();
+               status = cxt1e1_max_mru;
+        if (ch->p.chan_mode == CFG_CH_PROTO_TRANS)
+            status |= EOBIRQ_ENABLE;
+        md->status = cpu_to_le32(status);
+
+        /* Check next mdesc in the ring */
+        if (++ch->rxix_irq_srv >= ch->rxd_num)
+            ch->rxix_irq_srv = 0;
+        FLUSH_MEM_WRITE();
     }
 }
 
 
 irqreturn_t
-musycc_intr_th_handler (void *devp)
+musycc_intr_th_handler(void *devp)
 {
     ci_t       *ci = (ci_t *) devp;
     volatile u_int32_t status, currInt = 0;
@@ -1180,28 +1099,25 @@ musycc_intr_th_handler (void *devp)
      * might be shared, just return.
      */
     if (ci->state == C_INIT)
-    {
-        return IRQ_NONE;
-    }
+        return IRQ_NONE;
     /*
      * Marked as hardware available. Don't service interrupts, just clear the
      * event.
      */
 
-    if (ci->state == C_IDLE)
-    {
-        status = pci_read_32 ((u_int32_t *) &ci->reg->isd);
+    if (ci->state == C_IDLE) {
+        status = pci_read_32((u_int32_t *) &ci->reg->isd);
 
-        /* clear the interrupt but process nothing else */
-        pci_write_32 ((u_int32_t *) &ci->reg->isd, status);
-        return IRQ_HANDLED;
+        /* clear the interrupt but process nothing else */
+        pci_write_32((u_int32_t *) &ci->reg->isd, status);
+        return IRQ_HANDLED;
     }
-    FLUSH_PCI_READ ();
-    FLUSH_MEM_READ ();
+    FLUSH_PCI_READ();
+    FLUSH_MEM_READ();
 
-    status = pci_read_32 ((u_int32_t *) &ci->reg->isd);
-    nextInt = INTRPTS_NEXTINT (status);
-    intCnt = INTRPTS_INTCNT (status);
+    status = pci_read_32((u_int32_t *) &ci->reg->isd);
+    nextInt = INTRPTS_NEXTINT(status);
+    intCnt = INTRPTS_INTCNT(status);
     ci->intlog.drvr_intr_thcount++;
 
     /*********************************************************/
@@ -1218,22 +1134,20 @@ musycc_intr_th_handler (void *devp)
     /* incorrect ISD's are encountered.                      */
     /*********************************************************/
 
-    if (nextInt != INTRPTS_NEXTINT (ci->intlog.this_status_new))
-    {
-        if (cxt1e1_log_level >= LOG_MONITOR)
-        {
-            pr_info("%s: note - updated ISD from %08x to %08x\n",
-                    ci->devname, status,
-              (status & (~INTRPTS_NEXTINT_M)) | ci->intlog.this_status_new);
-        }
-        /*
-         * Replace bogus status with software corrected value.
-         *
-         * It's not known whether, during this problem occurrence, if the
-         * INTFULL bit is correctly reported or not.
-         */
-        status = (status & (~INTRPTS_NEXTINT_M)) | (ci->intlog.this_status_new);
-        nextInt = INTRPTS_NEXTINT (status);
+    if (nextInt != INTRPTS_NEXTINT(ci->intlog.this_status_new)) {
+        if (cxt1e1_log_level >= LOG_MONITOR) {
+            pr_info("%s: note - updated ISD from %08x to %08x\n",
+                    ci->devname, status,
+              (status & (~INTRPTS_NEXTINT_M)) | ci->intlog.this_status_new);
+        }
+        /*
+         * Replace bogus status with software corrected value.
+         *
+         * It's not known whether, during this problem occurrence, if the
+         * INTFULL bit is correctly reported or not.
+         */
+        status = (status & (~INTRPTS_NEXTINT_M)) | (ci->intlog.this_status_new);
+        nextInt = INTRPTS_NEXTINT(status);
     }
     /**********************************************/
     /* Cn847x Bug Fix                             */
@@ -1243,43 +1157,40 @@ musycc_intr_th_handler (void *devp)
     /**********************************************/
 
     if (intCnt == INT_QUEUE_SIZE)
-    {
-        currInt = ((intCnt - 1) + nextInt) & (INT_QUEUE_SIZE - 1);
-    } else
-        /************************************************/
-        /* Interrupt Write Location Issues              */
-        /* -------------------------------              */
-        /* When the interrupt status descriptor is      */
-        /* written, the interrupt line is de-asserted   */
-        /* by the Cn847x.  In the case of MIPS          */
-        /* microprocessors, this must occur at the      */
-        /* beginning of the interrupt handler so that   */
-        /* the interrupt handle is not re-entered due   */
-        /* to interrupt dis-assertion latency.          */
-        /* In the case of all other processors, this    */
-        /* action should occur at the end of the        */
-        /* interrupt handler to avoid overwriting the   */
-        /* interrupt queue.                             */
-        /************************************************/
+        currInt = ((intCnt - 1) + nextInt) & (INT_QUEUE_SIZE - 1);
+    else
+        /************************************************/
+        /* Interrupt Write Location Issues              */
+        /* -------------------------------              */
+        /* When the interrupt status descriptor is      */
+        /* written, the interrupt line is de-asserted   */
+        /* by the Cn847x.  In the case of MIPS          */
+        /* microprocessors, this must occur at the      */
+        /* beginning of the interrupt handler so that   */
+        /* the interrupt handle is not re-entered due   */
+        /* to interrupt dis-assertion latency.          */
+        /* In the case of all other processors, this    */
+        /* action should occur at the end of the        */
+        /* interrupt handler to avoid overwriting the   */
+        /* interrupt queue.                             */
+        /************************************************/
 
     if (intCnt)
-    {
-        currInt = (intCnt + nextInt) & (INT_QUEUE_SIZE - 1);
-    } else
-    {
-        /*
-         * NOTE: Servicing an interrupt whose ISD contains a count of ZERO
-         * can be indicative of a Shared Interrupt chain.  Our driver can be
-         * called from the system's interrupt handler as a matter of the OS
-         * walking the chain.  As the chain is walked, the interrupt will
-         * eventually be serviced by the correct driver/handler.
-         */
+        currInt = (intCnt + nextInt) & (INT_QUEUE_SIZE - 1);
+    else {
+        /*
+         * NOTE: Servicing an interrupt whose ISD contains a count of ZERO
+         * can be indicative of a Shared Interrupt chain.  Our driver can be
+         * called from the system's interrupt handler as a matter of the OS
+         * walking the chain.  As the chain is walked, the interrupt will
+         * eventually be serviced by the correct driver/handler.
+         */
 #if 0
-        /* chained interrupt = not ours */
-        pr_info(">> %s: intCnt NULL, sts %x, possibly a chained interrupt!\n",
-                ci->devname, status);
+        /* chained interrupt = not ours */
+        pr_info(">> %s: intCnt NULL, sts %x, possibly a chained interrupt!\n",
+                ci->devname, status);
 #endif
-        return IRQ_NONE;
+        return IRQ_NONE;
     }
 
     ci->iqp_tailx = currInt;
@@ -1289,27 +1200,25 @@ musycc_intr_th_handler (void *devp)
     ci->intlog.this_status_new = currInt;
 
     if ((cxt1e1_log_level >= LOG_WARN) && (status & INTRPTS_INTFULL_M))
-    {
-        pr_info("%s: Interrupt queue full condition occurred\n", ci->devname);
-    }
+        pr_info("%s: Interrupt queue full condition occurred\n", ci->devname);
     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));
+        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));
 
-    FLUSH_MEM_WRITE ();
+    FLUSH_MEM_WRITE();
 #if defined(SBE_ISR_TASKLET)
-    pci_write_32 ((u_int32_t *) &ci->reg->isd, currInt);
-    atomic_inc (&ci->bh_pending);
-    tasklet_schedule (&ci->ci_musycc_isr_tasklet);
+    pci_write_32((u_int32_t *) &ci->reg->isd, currInt);
+    atomic_inc(&ci->bh_pending);
+    tasklet_schedule(&ci->ci_musycc_isr_tasklet);
 #elif defined(SBE_ISR_IMMEDIATE)
-    pci_write_32 ((u_int32_t *) &ci->reg->isd, currInt);
-    atomic_inc (&ci->bh_pending);
-    queue_task (&ci->ci_musycc_isr_tq, &tq_immediate);
-    mark_bh (IMMEDIATE_BH);
+    pci_write_32((u_int32_t *) &ci->reg->isd, currInt);
+    atomic_inc(&ci->bh_pending);
+    queue_task(&ci->ci_musycc_isr_tq, &tq_immediate);
+    mark_bh(IMMEDIATE_BH);
 #elif defined(SBE_ISR_INLINE)
-    (void) musycc_intr_bh_tasklet (ci);
-    pci_write_32 ((u_int32_t *) &ci->reg->isd, currInt);
+    (void) musycc_intr_bh_tasklet(ci);
+    pci_write_32((u_int32_t *) &ci->reg->isd, currInt);
 #endif
     return IRQ_HANDLED;
 }
@@ -1320,7 +1229,7 @@ unsigned long
 #else
 void
 #endif
-musycc_intr_bh_tasklet (ci_t * ci)
+musycc_intr_bh_tasklet(ci_t * ci)
 {
     mpi_t      *pi;
     mch_t      *ch;
@@ -1336,21 +1245,19 @@ musycc_intr_bh_tasklet (ci_t * ci)
      * Hardware not available, potential interrupt hang.  But since interrupt
      * might be shared, just return.
      */
-    if ((drvr_state != SBE_DRVR_AVAILABLE) || (ci->state == C_INIT))
-    {
+    if ((drvr_state != SBE_DRVR_AVAILABLE) || (ci->state == C_INIT)) {
 #if defined(SBE_ISR_IMMEDIATE)
-        return 0L;
+        return 0L;
 #else
-        return;
+        return;
 #endif
     }
 #if defined(SBE_ISR_TASKLET) || defined(SBE_ISR_IMMEDIATE)
-    if (drvr_state != SBE_DRVR_AVAILABLE)
-    {
+    if (drvr_state != SBE_DRVR_AVAILABLE) {
 #if defined(SBE_ISR_TASKLET)
-        return;
+        return;
 #elif defined(SBE_ISR_IMMEDIATE)
-        return 0L;
+        return 0L;
 #endif
     }
 #elif defined(SBE_ISR_INLINE)
@@ -1358,273 +1265,249 @@ musycc_intr_bh_tasklet (ci_t * ci)
 #endif
 
     ci->intlog.drvr_intr_bhcount++;
-    FLUSH_MEM_READ ();
+    FLUSH_MEM_READ();
     {
-        unsigned int bh = atomic_read (&ci->bh_pending);
+        unsigned int bh = atomic_read(&ci->bh_pending);
 
-        max_bh = max (bh, max_bh);
+        max_bh = max(bh, max_bh);
     }
-    atomic_set (&ci->bh_pending, 0);/* if here, no longer pending */
-    while ((headx = ci->iqp_headx) != (tailx = ci->iqp_tailx))
-    {
-        intCnt = (tailx >= headx) ? (tailx - headx) : (tailx - headx + INT_QUEUE_SIZE);
-        currInt = le32_to_cpu (ci->iqd_p[headx]);
-
-        max_intcnt = max (intCnt, max_intcnt);  /* RLD DEBUG */
-
-        /**************************************************/
-        /* HW Bug Fix                                     */
-        /* ----------                                     */
-        /* The following code checks for the condition    */
-        /* of interrupt assertion before interrupt        */
-        /* queue update.  This is a problem on several    */
-        /* PCI-Local bridge chips found on some products. */
-        /**************************************************/
-
-        readCount = 0;
-        if ((currInt == badInt) || (currInt == badInt2))
-            ci->intlog.drvr_int_failure++;
-
-        while ((currInt == badInt) || (currInt == badInt2))
-        {
-            for (loopCount = 0; loopCount < 0x30; loopCount++)
-                OS_uwait_dummy ();  /* use call to avoid optimization removal
-                                     * of dummy delay */
-            FLUSH_MEM_READ ();
-            currInt = le32_to_cpu (ci->iqd_p[headx]);
-            if (readCount++ > 20)
-                break;
-        }
-
-        if ((currInt == badInt) || (currInt == badInt2))        /* catch failure of Bug
-                                                                 * Fix checking */
-        {
-            if (cxt1e1_log_level >= LOG_WARN)
-                pr_info("%s: Illegal Interrupt Detected @ 0x%p, mod %d.)\n",
-                        ci->devname, &ci->iqd_p[headx], headx);
-
-            /*
-             * If the descriptor has not recovered, then leaving the EMPTY
-             * entry set will not signal to the MUSYCC that this descriptor
-             * has been serviced. The Interrupt Queue can then start losing
-             * available descriptors and MUSYCC eventually encounters and
-             * reports the INTFULL condition.  Per manual, changing any bit
-             * marks descriptor as available, thus the use of different
-             * EMPTY_ENTRY values.
-             */
-
-            if (currInt == badInt)
-            {
-                ci->iqd_p[headx] = __constant_cpu_to_le32 (INT_EMPTY_ENTRY2);
-            } else
-            {
-                ci->iqd_p[headx] = __constant_cpu_to_le32 (INT_EMPTY_ENTRY);
-            }
-            ci->iqp_headx = (headx + 1) & (INT_QUEUE_SIZE - 1); /* insure wrapness */
-            FLUSH_MEM_WRITE ();
-            FLUSH_MEM_READ ();
-            continue;
-        }
-        group = INTRPT_GRP (currInt);
-        gchan = INTRPT_CH (currInt);
-        event = INTRPT_EVENT (currInt);
-        err = INTRPT_ERROR (currInt);
-        tx = currInt & INTRPT_DIR_M;
-
-        ci->iqd_p[headx] = __constant_cpu_to_le32 (INT_EMPTY_ENTRY);
-        FLUSH_MEM_WRITE ();
-
-        if (cxt1e1_log_level >= LOG_DEBUG)
-        {
-            if (err != 0)
-                pr_info(" %08x -> err: %2d,", currInt, err);
-
-            pr_info("+ interrupt event: %d, grp: %d, chan: %2d, side: %cX\n",
-                    event, group, gchan, tx ? 'T' : 'R');
-        }
-        pi = &ci->port[group];      /* notice that here we assume 1-1 group -
-                                     * port mapping */
-        ch = pi->chan[gchan];
-        switch (event)
-        {
-        case EVE_SACK:              /* Service Request Acknowledge */
-            if (cxt1e1_log_level >= LOG_DEBUG)
-            {
-                volatile u_int32_t r;
-
-                r = pci_read_32 ((u_int32_t *) &pi->reg->srd);
-                pr_info("- SACK cmd: %08x (hdw= %08x)\n", pi->sr_last, r);
-            }
-            SD_SEM_GIVE (&pi->sr_sem_wait);     /* wake up waiting process */
-            break;
-        case EVE_CHABT:     /* Change To Abort Code (0x7e -> 0xff) */
-        case EVE_CHIC:              /* Change To Idle Code (0xff -> 0x7e) */
-            break;
-        case EVE_EOM:               /* End Of Message */
-        case EVE_EOB:               /* End Of Buffer (Transparent mode) */
-            if (tx)
-            {
-                musycc_bh_tx_eom (pi, gchan);
-            } else
-            {
-                musycc_bh_rx_eom (pi, gchan);
-            }
+    atomic_set(&ci->bh_pending, 0);/* if here, no longer pending */
+    while ((headx = ci->iqp_headx) != (tailx = ci->iqp_tailx)) {
+        intCnt = (tailx >= headx) ? (tailx - headx) : (tailx - headx + INT_QUEUE_SIZE);
+        currInt = le32_to_cpu(ci->iqd_p[headx]);
+
+        max_intcnt = max(intCnt, max_intcnt);  /* RLD DEBUG */
+
+        /**************************************************/
+        /* HW Bug Fix                                     */
+        /* ----------                                     */
+        /* The following code checks for the condition    */
+        /* of interrupt assertion before interrupt        */
+        /* queue update.  This is a problem on several    */
+        /* PCI-Local bridge chips found on some products. */
+        /**************************************************/
+
+        readCount = 0;
+        if ((currInt == badInt) || (currInt == badInt2))
+            ci->intlog.drvr_int_failure++;
+
+        while ((currInt == badInt) || (currInt == badInt2)) {
+            for (loopCount = 0; loopCount < 0x30; loopCount++)
+                OS_uwait_dummy();  /* use call to avoid optimization removal
+                                     * of dummy delay */
+            FLUSH_MEM_READ();
+            currInt = le32_to_cpu(ci->iqd_p[headx]);
+            if (readCount++ > 20)
+                break;
+        }
+
+        if ((currInt == badInt) || (currInt == badInt2)) {      /* catch failure of Bug
+                                                                 * Fix checking */
+            if (cxt1e1_log_level >= LOG_WARN)
+                pr_info("%s: Illegal Interrupt Detected @ 0x%p, mod %d.)\n",
+                        ci->devname, &ci->iqd_p[headx], headx);
+
+            /*
+             * If the descriptor has not recovered, then leaving the EMPTY
+             * entry set will not signal to the MUSYCC that this descriptor
+             * has been serviced. The Interrupt Queue can then start losing
+             * available descriptors and MUSYCC eventually encounters and
+             * reports the INTFULL condition.  Per manual, changing any bit
+             * marks descriptor as available, thus the use of different
+             * EMPTY_ENTRY values.
+             */
+
+            if (currInt == badInt)
+                ci->iqd_p[headx] = __constant_cpu_to_le32(INT_EMPTY_ENTRY2);
+            else
+                ci->iqd_p[headx] = __constant_cpu_to_le32(INT_EMPTY_ENTRY);
+            ci->iqp_headx = (headx + 1) & (INT_QUEUE_SIZE - 1); /* insure wrapness */
+            FLUSH_MEM_WRITE();
+            FLUSH_MEM_READ();
+            continue;
+        }
+        group = INTRPT_GRP(currInt);
+        gchan = INTRPT_CH(currInt);
+        event = INTRPT_EVENT(currInt);
+        err = INTRPT_ERROR(currInt);
+        tx = currInt & INTRPT_DIR_M;
+
+        ci->iqd_p[headx] = __constant_cpu_to_le32(INT_EMPTY_ENTRY);
+        FLUSH_MEM_WRITE();
+
+        if (cxt1e1_log_level >= LOG_DEBUG) {
+            if (err != 0)
+                pr_info(" %08x -> err: %2d,", currInt, err);
+
+            pr_info("+ interrupt event: %d, grp: %d, chan: %2d, side: %cX\n",
+                    event, group, gchan, tx ? 'T' : 'R');
+        }
+        pi = &ci->port[group];      /* notice that here we assume 1-1 group -
+                                     * port mapping */
+        ch = pi->chan[gchan];
+        switch (event) {
+        case EVE_SACK:              /* Service Request Acknowledge */
+            if (cxt1e1_log_level >= LOG_DEBUG) {
+                volatile u_int32_t r;
+
+                r = pci_read_32((u_int32_t *) &pi->reg->srd);
+                pr_info("- SACK cmd: %08x (hdw= %08x)\n", pi->sr_last, r);
+            }
+            SD_SEM_GIVE(&pi->sr_sem_wait);     /* wake up waiting process */
+            break;
+        case EVE_CHABT:     /* Change To Abort Code (0x7e -> 0xff) */
+        case EVE_CHIC:              /* Change To Idle Code (0xff -> 0x7e) */
+            break;
+        case EVE_EOM:               /* End Of Message */
+        case EVE_EOB:               /* End Of Buffer (Transparent mode) */
+            if (tx)
+                musycc_bh_tx_eom(pi, gchan);
+            else
+                musycc_bh_rx_eom(pi, gchan);
 #if 0
-            break;
+            break;
 #else
-            /*
-             * MUSYCC Interrupt Descriptor section states that EOB and EOM
-             * can be combined with the NONE error (as well as others).  So
-             * drop thru to catch this...
-             */
+            /*
+             * MUSYCC Interrupt Descriptor section states that EOB and EOM
+             * can be combined with the NONE error (as well as others).  So
+             * drop thru to catch this...
+             */
 #endif
-        case EVE_NONE:
-            if (err == ERR_SHT)
-            {
-                ch->s.rx_length_errors++;
-            }
-            break;
-        default:
-            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;
-        }                           /* switch on event */
-
-
-        /*
-         * Per MUSYCC Manual, Section 6.4.8.3 [Transmit Errors], TX errors
-         * are service-affecting and require action to resume normal
-         * bit-level processing.
-         */
-
-        switch (err)
-        {
-        case ERR_ONR:
-            /*
-             * Per MUSYCC manual, Section  6.4.8.3 [Transmit Errors], this
-             * error requires Transmit channel reactivation.
-             *
-             * Per MUSYCC manual, Section  6.4.8.4 [Receive Errors], this error
-             * requires Receive channel reactivation.
-             */
-            if (tx)
-            {
-
-                /*
-                 * TX ONR Error only occurs when channel is configured for
-                 * Transparent Mode.  However, this code will catch and
-                 * re-activate on ANY TX ONR error.
-                 */
-
-                /*
-                 * Set flag to re-enable on any next transmit attempt.
-                 */
-                ch->ch_start_tx = CH_START_TX_ONR;
-
-                {
+        case EVE_NONE:
+            if (err == ERR_SHT)
+                ch->s.rx_length_errors++;
+            break;
+        default:
+            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;
+        }                           /* switch on event */
+
+
+        /*
+         * Per MUSYCC Manual, Section 6.4.8.3 [Transmit Errors], TX errors
+         * are service-affecting and require action to resume normal
+         * bit-level processing.
+         */
+
+        switch (err) {
+        case ERR_ONR:
+            /*
+             * Per MUSYCC manual, Section  6.4.8.3 [Transmit Errors], this
+             * error requires Transmit channel reactivation.
+             *
+             * Per MUSYCC manual, Section  6.4.8.4 [Receive Errors], this error
+             * requires Receive channel reactivation.
+             */
+            if (tx) {
+
+                /*
+                 * TX ONR Error only occurs when channel is configured for
+                 * Transparent Mode.  However, this code will catch and
+                 * re-activate on ANY TX ONR error.
+                 */
+
+                /*
+                 * Set flag to re-enable on any next transmit attempt.
+                 */
+                ch->ch_start_tx = CH_START_TX_ONR;
+
+                {
 #ifdef RLD_TRANS_DEBUG
-                    if (1 || cxt1e1_log_level >= LOG_MONITOR)
+                    if (1 || cxt1e1_log_level >= LOG_MONITOR)
 #else
-                    if (cxt1e1_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",
-                                ci->devname, ch->channum, ch->p.chan_mode, sd_queue_stopped (ch->user), ch->txd_free);
+                    {
+                        pr_info("%s: TX buffer underflow [ONR] on channel %d, mode %x QStopped %x free %d\n",
+                                ci->devname, ch->channum, ch->p.chan_mode, sd_queue_stopped(ch->user), ch->txd_free);
 #ifdef RLD_DEBUG
-                        if (ch->p.chan_mode == 2)       /* problem = ONR on HDLC
-                                                         * mode */
-                        {
-                            pr_info("++ Failed Last %x Next %x QStopped %x, start_tx %x tx_full %d txd_free %d mode %x\n",
-                                    (u_int32_t) ch->txd_irq_srv, (u_int32_t) ch->txd_usr_add,
-                                    sd_queue_stopped (ch->user),
-                                    ch->ch_start_tx, ch->tx_full, ch->txd_free, ch->p.chan_mode);
-                            musycc_dump_txbuffer_ring (ch, 0);
-                        }
+                        if (ch->p.chan_mode == 2) {     /* problem = ONR on HDLC
+                                                         * mode */
+                            pr_info("++ Failed Last %x Next %x QStopped %x, start_tx %x tx_full %d txd_free %d mode %x\n",
+                                    (u_int32_t) ch->txd_irq_srv, (u_int32_t) ch->txd_usr_add,
+                                    sd_queue_stopped(ch->user),
+                                    ch->ch_start_tx, ch->tx_full, ch->txd_free, ch->p.chan_mode);
+                            musycc_dump_txbuffer_ring(ch, 0);
+                        }
 #endif
-                    }
-                }
-            } else                  /* RX buffer overrun */
-            {
-                /*
-                 * Per MUSYCC manual, Section 6.4.8.4 [Receive Errors],
-                 * channel recovery for this RX ONR error IS required.  It is
-                 * also suggested to increase the number of receive buffers
-                 * for this channel.  Receive channel reactivation IS
-                 * required, and data has been lost.
-                 */
-                ch->s.rx_over_errors++;
-                ch->ch_start_rx = CH_START_RX_ONR;
-
-                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);
-                    //musycc_dump_rxbuffer_ring (ch, 0);        /* RLD DEBUG */
-                }
-            }
-            musycc_chan_restart (ch);
-            break;
-        case ERR_BUF:
-            if (tx)
-            {
-                ch->s.tx_fifo_errors++;
-                ch->ch_start_tx = CH_START_TX_BUF;
-                /*
-                 * Per MUSYCC manual, Section  6.4.8.3 [Transmit Errors],
-                 * this BUFF error requires Transmit channel reactivation.
-                 */
-                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 */
-            {
-                ch->s.rx_over_errors++;
-                /*
-                 * Per MUSYCC manual, Section 6.4.8.4 [Receive Errors], HDLC
-                 * mode requires NO recovery for this RX BUFF error is
-                 * required.  It is suggested to increase the FIFO buffer
-                 * space for this channel.  Receive channel reactivation is
-                 * not required, but data has been lost.
-                 */
-                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);
-                /*
-                 * Per MUSYCC manual, Section 6.4.9.4 [Receive Errors],
-                 * Transparent mode DOES require recovery for the RX BUFF
-                 * error.  It is suggested to increase the FIFO buffer space
-                 * for this channel.  Receive channel reactivation IS
-                 * required and data has been lost.
-                 */
-                if (ch->p.chan_mode == CFG_CH_PROTO_TRANS)
-                    ch->ch_start_rx = CH_START_RX_BUF;
-            }
-
-            if (tx || (ch->p.chan_mode == CFG_CH_PROTO_TRANS))
-                musycc_chan_restart (ch);
-            break;
-        default:
-            break;
-        }                           /* switch on err */
-
-        /* Check for interrupt lost condition */
-        if ((currInt & INTRPT_ILOST_M) && (cxt1e1_log_level >= LOG_ERROR))
-        {
-            pr_info("%s: Interrupt queue overflow - ILOST asserted\n",
-                    ci->devname);
-        }
-        ci->iqp_headx = (headx + 1) & (INT_QUEUE_SIZE - 1);     /* insure wrapness */
-        FLUSH_MEM_WRITE ();
-        FLUSH_MEM_READ ();
+                    }
+                }
+            } else {                 /* RX buffer overrun */
+                /*
+                 * Per MUSYCC manual, Section 6.4.8.4 [Receive Errors],
+                 * channel recovery for this RX ONR error IS required.  It is
+                 * also suggested to increase the number of receive buffers
+                 * for this channel.  Receive channel reactivation IS
+                 * required, and data has been lost.
+                 */
+                ch->s.rx_over_errors++;
+                ch->ch_start_rx = CH_START_RX_ONR;
+
+                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);
+                    //musycc_dump_rxbuffer_ring (ch, 0);        /* RLD DEBUG */
+                }
+            }
+            musycc_chan_restart(ch);
+            break;
+        case ERR_BUF:
+            if (tx) {
+                ch->s.tx_fifo_errors++;
+                ch->ch_start_tx = CH_START_TX_BUF;
+                /*
+                 * Per MUSYCC manual, Section  6.4.8.3 [Transmit Errors],
+                 * this BUFF error requires Transmit channel reactivation.
+                 */
+                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 */
+                ch->s.rx_over_errors++;
+                /*
+                 * Per MUSYCC manual, Section 6.4.8.4 [Receive Errors], HDLC
+                 * mode requires NO recovery for this RX BUFF error is
+                 * required.  It is suggested to increase the FIFO buffer
+                 * space for this channel.  Receive channel reactivation is
+                 * not required, but data has been lost.
+                 */
+                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);
+                /*
+                 * Per MUSYCC manual, Section 6.4.9.4 [Receive Errors],
+                 * Transparent mode DOES require recovery for the RX BUFF
+                 * error.  It is suggested to increase the FIFO buffer space
+                 * for this channel.  Receive channel reactivation IS
+                 * required and data has been lost.
+                 */
+                if (ch->p.chan_mode == CFG_CH_PROTO_TRANS)
+                    ch->ch_start_rx = CH_START_RX_BUF;
+            }
+
+            if (tx || (ch->p.chan_mode == CFG_CH_PROTO_TRANS))
+                musycc_chan_restart(ch);
+            break;
+        default:
+            break;
+        }                           /* switch on err */
+
+        /* Check for interrupt lost condition */
+        if ((currInt & INTRPT_ILOST_M) && (cxt1e1_log_level >= LOG_ERROR))
+            pr_info("%s: Interrupt queue overflow - ILOST asserted\n",
+                    ci->devname);
+        ci->iqp_headx = (headx + 1) & (INT_QUEUE_SIZE - 1);     /* insure wrapness */
+        FLUSH_MEM_WRITE();
+        FLUSH_MEM_READ();
     }                               /* while */
-    if ((cxt1e1_log_level >= LOG_MONITOR2) && (ci->iqp_headx != ci->iqp_tailx))
-    {
-        int         bh;
+    if ((cxt1e1_log_level >= LOG_MONITOR2) && (ci->iqp_headx != ci->iqp_tailx)) {
+        int         bh;
 
-        bh = atomic_read (&CI->bh_pending);
-        pr_info("_bh_: late arrivals, head %d != tail %d, pending %d\n",
-                ci->iqp_headx, ci->iqp_tailx, bh);
+        bh = atomic_read(&CI->bh_pending);
+        pr_info("_bh_: late arrivals, head %d != tail %d, pending %d\n",
+                ci->iqp_headx, ci->iqp_tailx, bh);
     }
 #if defined(SBE_ISR_IMMEDIATE)
     return 0L;
@@ -1634,14 +1517,14 @@ musycc_intr_bh_tasklet (ci_t * ci)
 
 #if 0
 int         __init
-musycc_new_chan (ci_t * ci, int channum, void *user)
+musycc_new_chan(ci_t * ci, int channum, void *user)
 {
     mch_t      *ch;
 
     ch = ci->port[channum / MUSYCC_NCHANS].chan[channum % MUSYCC_NCHANS];
 
     if (ch->state != UNASSIGNED)
-        return EEXIST;
+        return EEXIST;
     /* NOTE: mch_t already cleared during OS_kmalloc() */
     ch->state = DOWN;
     ch->user = user;
@@ -1653,8 +1536,8 @@ musycc_new_chan (ci_t * ci, int channum, void *user)
     ch->p.chan_mode = CFG_CH_PROTO_HDLC_FCS16;
     ch->p.idlecode = CFG_CH_FLAG_7E;
     ch->p.pad_fill_count = 2;
-    spin_lock_init (&ch->ch_rxlock);
-    spin_lock_init (&ch->ch_txlock);
+    spin_lock_init(&ch->ch_rxlock);
+    spin_lock_init(&ch->ch_txlock);
 
     return 0;
 }
@@ -1663,53 +1546,49 @@ musycc_new_chan (ci_t * ci, int channum, void *user)
 
 #ifdef SBE_PMCC4_ENABLE
 status_t
-musycc_chan_down (ci_t * dummy, int channum)
+musycc_chan_down(ci_t * dummy, int channum)
 {
     mpi_t      *pi;
     mch_t      *ch;
     int         i, gchan;
 
-    if (!(ch = sd_find_chan (dummy, channum)))
-        return EINVAL;
+    if (!(ch = sd_find_chan(dummy, channum)))
+        return EINVAL;
     pi = ch->up;
     gchan = ch->gchan;
 
     /* Deactivate the channel */
-    musycc_serv_req (pi, SR_CHANNEL_DEACTIVATE | SR_RX_DIRECTION | gchan);
+    musycc_serv_req(pi, SR_CHANNEL_DEACTIVATE | SR_RX_DIRECTION | gchan);
     ch->ch_start_rx = 0;
-    musycc_serv_req (pi, SR_CHANNEL_DEACTIVATE | SR_TX_DIRECTION | gchan);
+    musycc_serv_req(pi, SR_CHANNEL_DEACTIVATE | SR_TX_DIRECTION | gchan);
     ch->ch_start_tx = 0;
 
     if (ch->state == DOWN)
-        return 0;
+        return 0;
     ch->state = DOWN;
 
     pi->regram->thp[gchan] = 0;
     pi->regram->tmp[gchan] = 0;
     pi->regram->rhp[gchan] = 0;
     pi->regram->rmp[gchan] = 0;
-    FLUSH_MEM_WRITE ();
+    FLUSH_MEM_WRITE();
     for (i = 0; i < ch->txd_num; i++)
-    {
-        if (ch->mdt[i].mem_token != 0)
-            OS_mem_token_free (ch->mdt[i].mem_token);
-    }
+        if (ch->mdt[i].mem_token != 0)
+            OS_mem_token_free(ch->mdt[i].mem_token);
 
     for (i = 0; i < ch->rxd_num; i++)
-    {
-        if (ch->mdr[i].mem_token != 0)
-            OS_mem_token_free (ch->mdr[i].mem_token);
-    }
+        if (ch->mdr[i].mem_token != 0)
+            OS_mem_token_free(ch->mdr[i].mem_token);
 
-    OS_kfree (ch->mdr);
+    OS_kfree(ch->mdr);
     ch->mdr = 0;
     ch->rxd_num = 0;
-    OS_kfree (ch->mdt);
+    OS_kfree(ch->mdt);
     ch->mdt = 0;
     ch->txd_num = 0;
 
-    musycc_update_timeslots (pi);
-    c4_fifo_free (pi, ch->gchan);
+    musycc_update_timeslots(pi);
+    c4_fifo_free(pi, ch->gchan);
 
     pi->openchans--;
     return 0;
@@ -1718,38 +1597,38 @@ musycc_chan_down (ci_t * dummy, int channum)
 
 
 int
-musycc_del_chan (ci_t * ci, int channum)
+musycc_del_chan(ci_t * ci, int channum)
 {
     mch_t      *ch;
 
     if ((channum < 0) || (channum >= (MUSYCC_NPORTS * MUSYCC_NCHANS)))  /* sanity chk param */
-        return ECHRNG;
-    if (!(ch = sd_find_chan (ci, channum)))
-        return ENOENT;
+        return ECHRNG;
+    if (!(ch = sd_find_chan(ci, channum)))
+        return ENOENT;
     if (ch->state == UP)
-        musycc_chan_down (ci, channum);
+        musycc_chan_down(ci, channum);
     ch->state = UNASSIGNED;
     return 0;
 }
 
 
 int
-musycc_del_chan_stats (ci_t * ci, int channum)
+musycc_del_chan_stats(ci_t * ci, int channum)
 {
     mch_t      *ch;
 
     if (channum < 0 || channum >= (MUSYCC_NPORTS * MUSYCC_NCHANS))      /* sanity chk param */
-        return ECHRNG;
-    if (!(ch = sd_find_chan (ci, channum)))
-        return ENOENT;
+        return ECHRNG;
+    if (!(ch = sd_find_chan(ci, channum)))
+        return ENOENT;
 
-    memset (&ch->s, 0, sizeof (struct sbecom_chan_stats));
+    memset(&ch->s, 0, sizeof(struct sbecom_chan_stats));
     return 0;
 }
 
 
 int
-musycc_start_xmit (ci_t * ci, int channum, void *mem_token)
+musycc_start_xmit(ci_t * ci, int channum, void *mem_token)
 {
     mch_t      *ch;
     struct mdesc *md;
@@ -1760,16 +1639,16 @@ musycc_start_xmit (ci_t * ci, int channum, void *mem_token)
     int         txd_need_cnt;
     u_int32_t   len;
 
-    if (!(ch = sd_find_chan (ci, channum)))
-        return -ENOENT;
+    if (!(ch = sd_find_chan(ci, channum)))
+        return -ENOENT;
 
     if (ci->state != C_RUNNING)     /* full interrupt processing available */
-        return -EINVAL;
+        return -EINVAL;
     if (ch->state != UP)
-        return -EINVAL;
+        return -EINVAL;
 
     if (!(ch->status & TX_ENABLED))
-        return -EROFS;               /* how else to flag unwritable state ? */
+        return -EROFS;               /* how else to flag unwritable state ? */
 
 #ifdef RLD_TRANS_DEBUGx
     if (1 || cxt1e1_log_level >= LOG_MONITOR2)
@@ -1777,66 +1656,58 @@ musycc_start_xmit (ci_t * ci, int channum, void *mem_token)
     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",
-                channum, ch->state, ch->ch_start_tx, ch->tx_full,
-                ch->txd_free, ch->txd_required, sd_queue_stopped (ch->user));
+        pr_info("++ start_xmt[%d]: state %x start %x full %d free %d required %d stopped %x\n",
+                channum, ch->state, ch->ch_start_tx, ch->tx_full,
+                ch->txd_free, ch->txd_required, sd_queue_stopped(ch->user));
     }
     /***********************************************/
     /** Determine total amount of data to be sent **/
     /***********************************************/
     m2 = mem_token;
     txd_need_cnt = 0;
-    for (len = OS_mem_token_tlen (m2); len > 0;
-         m2 = (void *) OS_mem_token_next (m2))
-    {
-        if (!OS_mem_token_len (m2))
-            continue;
-        txd_need_cnt++;
-        len -= OS_mem_token_len (m2);
+    for (len = OS_mem_token_tlen(m2); len > 0;
+         m2 = (void *) OS_mem_token_next(m2)) {
+        if (!OS_mem_token_len(m2))
+            continue;
+        txd_need_cnt++;
+        len -= OS_mem_token_len(m2);
     }
 
-    if (txd_need_cnt == 0)
-    {
-        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 */
+    if (txd_need_cnt == 0) {
+        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 */
     }
     /*************************************************/
     /** Are there sufficient descriptors available? **/
     /*************************************************/
-    if (txd_need_cnt > ch->txd_num) /* never enough descriptors for this
-                                     * large a buffer */
-    {
-        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);
-        }
-        ch->s.tx_dropped++;
-        OS_mem_token_free (mem_token);
-        return 0;
+    if (txd_need_cnt > ch->txd_num) { /* never enough descriptors for this
+                                       * large a buffer */
+        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);
+        ch->s.tx_dropped++;
+        OS_mem_token_free(mem_token);
+        return 0;
     }
 #if 0
-    spin_lock_irqsave (&ch->ch_txlock, flags);
+    spin_lock_irqsave(&ch->ch_txlock, flags);
 #endif
     /************************************************************/
     /** flow control the line if not enough descriptors remain **/
     /************************************************************/
-    if (txd_need_cnt > ch->txd_free)
-    {
-        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);
-        }
-        ch->tx_full = 1;
-        ch->txd_required = txd_need_cnt;
-        sd_disable_xmit (ch->user);
+    if (txd_need_cnt > ch->txd_free) {
+        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);
+        ch->tx_full = 1;
+        ch->txd_required = txd_need_cnt;
+        sd_disable_xmit(ch->user);
 #if 0
-        spin_unlock_irqrestore (&ch->ch_txlock, flags);
+        spin_unlock_irqrestore(&ch->ch_txlock, flags);
 #endif
-        return -EBUSY;               /* tell user to try again later */
+        return -EBUSY;               /* tell user to try again later */
     }
     /**************************************************/
     /** Put the user data into MUSYCC data buffer(s) **/
@@ -1844,74 +1715,71 @@ musycc_start_xmit (ci_t * ci, int channum, void *mem_token)
     m2 = mem_token;
     md = ch->txd_usr_add;           /* get current available descriptor */
 
-    for (len = OS_mem_token_tlen (m2); len > 0; m2 = OS_mem_token_next (m2))
-    {
-        int         u = OS_mem_token_len (m2);
-
-        if (!u)
-            continue;
-        len -= u;
-
-        /*
-         * Enable following chunks, yet wait to enable the FIRST chunk until
-         * after ALL subsequent chunks are setup.
-         */
-        if (md != ch->txd_usr_add)  /* not first chunk */
-            u |= MUSYCC_TX_OWNED;   /* transfer ownership from HOST to MUSYCC */
-
-        if (len)                    /* not last chunk */
-            u |= EOBIRQ_ENABLE;
-        else if (ch->p.chan_mode == CFG_CH_PROTO_TRANS)
-        {
-            /*
-             * Per MUSYCC Ref 6.4.9 for Transparent Mode, the host must
-             * always clear EOMIRQ_ENABLE in every Transmit Buffer Descriptor
-             * (IE. don't set herein).
-             */
-            u |= EOBIRQ_ENABLE;
-        } else
-            u |= EOMIRQ_ENABLE;     /* EOM, last HDLC chunk */
-
-
-        /* last chunk in hdlc mode */
-        u |= (ch->p.idlecode << IDLE_CODE);
-        if (ch->p.pad_fill_count)
-        {
+    for (len = OS_mem_token_tlen(m2); len > 0; m2 = OS_mem_token_next(m2)) {
+        int         u = OS_mem_token_len(m2);
+
+        if (!u)
+            continue;
+        len -= u;
+
+        /*
+         * Enable following chunks, yet wait to enable the FIRST chunk until
+         * after ALL subsequent chunks are setup.
+         */
+        if (md != ch->txd_usr_add)  /* not first chunk */
+            u |= MUSYCC_TX_OWNED;   /* transfer ownership from HOST to MUSYCC */
+
+        if (len)                    /* not last chunk */
+            u |= EOBIRQ_ENABLE;
+        else if (ch->p.chan_mode == CFG_CH_PROTO_TRANS) {
+            /*
+             * Per MUSYCC Ref 6.4.9 for Transparent Mode, the host must
+             * always clear EOMIRQ_ENABLE in every Transmit Buffer Descriptor
+             * (IE. don't set herein).
+             */
+            u |= EOBIRQ_ENABLE;
+        } else
+            u |= EOMIRQ_ENABLE;     /* EOM, last HDLC chunk */
+
+
+        /* last chunk in hdlc mode */
+        u |= (ch->p.idlecode << IDLE_CODE);
+        if (ch->p.pad_fill_count) {
 #if 0
-            /* NOOP NOTE: u_int8_t cannot be > 0xFF */
-            /* sanitize pad_fill_count for maximums allowed by hardware */
-            if (ch->p.pad_fill_count > EXTRA_FLAGS_MASK)
-                ch->p.pad_fill_count = EXTRA_FLAGS_MASK;
+            /* NOOP NOTE: u_int8_t cannot be > 0xFF */
+            /* sanitize pad_fill_count for maximums allowed by hardware */
+            if (ch->p.pad_fill_count > EXTRA_FLAGS_MASK)
+                ch->p.pad_fill_count = EXTRA_FLAGS_MASK;
 #endif
-            u |= (PADFILL_ENABLE | (ch->p.pad_fill_count << EXTRA_FLAGS));
-        }
-        md->mem_token = len ? 0 : mem_token;    /* Fill in mds on last
-                                                 * segment, others set ZERO
-                                                 * so that entire token is
-                                                 * removed ONLY when ALL
-                                                 * segments have been
-                                                 * transmitted. */
-
-        md->data = cpu_to_le32 (OS_vtophys (OS_mem_token_data (m2)));
-        FLUSH_MEM_WRITE ();
-        md->status = cpu_to_le32 (u);
-        --ch->txd_free;
-        md = md->snext;
+            u |= (PADFILL_ENABLE | (ch->p.pad_fill_count << EXTRA_FLAGS));
+        }
+        md->mem_token = len ? 0 : mem_token;    /* Fill in mds on last
+                                                 * segment, others set ZERO
+                                                 * so that entire token is
+                                                 * removed ONLY when ALL
+                                                 * segments have been
+                                                 * transmitted. */
+
+        md->data = cpu_to_le32(OS_vtophys(OS_mem_token_data(m2)));
+        FLUSH_MEM_WRITE();
+        md->status = cpu_to_le32(u);
+        --ch->txd_free;
+        md = md->snext;
     }
-    FLUSH_MEM_WRITE ();
+    FLUSH_MEM_WRITE();
 
 
     /*
      * Now transfer ownership of first chunk from HOST to MUSYCC in order to
      * fire-off this XMIT.
      */
-    ch->txd_usr_add->status |= __constant_cpu_to_le32 (MUSYCC_TX_OWNED);
-    FLUSH_MEM_WRITE ();
+    ch->txd_usr_add->status |= __constant_cpu_to_le32(MUSYCC_TX_OWNED);
+    FLUSH_MEM_WRITE();
     ch->txd_usr_add = md;
 
-    len = OS_mem_token_tlen (mem_token);
-    atomic_add (len, &ch->tx_pending);
-    atomic_add (len, &ci->tx_pending);
+    len = OS_mem_token_tlen(mem_token);
+    atomic_add(len, &ch->tx_pending);
+    atomic_add(len, &ci->tx_pending);
     ch->s.tx_packets++;
     ch->s.tx_bytes += len;
     /*
@@ -1919,11 +1787,9 @@ musycc_start_xmit (ci_t * ci, int channum, void *mem_token)
      * transmission.
      */
     if (ch->ch_start_tx)
-    {
-        musycc_chan_restart (ch);
-    }
+        musycc_chan_restart(ch);
 #ifdef SBE_WAN256T3_ENABLE
-    wan256t3_led (ci, LED_TX, LEDV_G);
+    wan256t3_led(ci, LED_TX, LEDV_G);
 #endif
     return 0;
 }
diff --git a/drivers/staging/cxt1e1/musycc.h b/drivers/staging/cxt1e1/musycc.h
index cf6b54e15689..56fb42f0f64e 100644
--- a/drivers/staging/cxt1e1/musycc.h
+++ b/drivers/staging/cxt1e1/musycc.h
@@ -48,59 +48,57 @@
 #define INT_QUEUE_SIZE    MUSYCC_NIQD
 
 /* RAM image of MUSYCC registers laid out as a C structure */
-    struct musycc_groupr
-    {
-        VINT32      thp[32];    /* Transmit Head Pointer [5-29]           */
-        VINT32      tmp[32];    /* Transmit Message Pointer [5-30]        */
-        VINT32      rhp[32];    /* Receive Head Pointer [5-29]            */
-        VINT32      rmp[32];    /* Receive Message Pointer [5-30]         */
-        VINT8       ttsm[128];  /* Time Slot Map [5-22]                   */
-        VINT8       tscm[256];  /* Subchannel Map [5-24]                  */
-        VINT32      tcct[32];   /* Channel Configuration [5-26]           */
-        VINT8       rtsm[128];  /* Time Slot Map [5-22]                   */
-        VINT8       rscm[256];  /* Subchannel Map [5-24]                  */
-        VINT32      rcct[32];   /* Channel Configuration [5-26]           */
-        VINT32      __glcd;     /* Global Configuration Descriptor [5-10] */
-        VINT32      __iqp;      /* Interrupt Queue Pointer [5-36]         */
-        VINT32      __iql;      /* Interrupt Queue Length [5-36]          */
-        VINT32      grcd;       /* Group Configuration Descriptor [5-16]  */
-        VINT32      mpd;        /* Memory Protection Descriptor [5-18]    */
-        VINT32      mld;        /* Message Length Descriptor [5-20]       */
-        VINT32      pcd;        /* Port Configuration Descriptor [5-19]   */
-    };
+struct musycc_groupr {
+        VINT32      thp[32];    /* Transmit Head Pointer [5-29]           */
+        VINT32      tmp[32];    /* Transmit Message Pointer [5-30]        */
+        VINT32      rhp[32];    /* Receive Head Pointer [5-29]            */
+        VINT32      rmp[32];    /* Receive Message Pointer [5-30]         */
+        VINT8       ttsm[128];  /* Time Slot Map [5-22]                   */
+        VINT8       tscm[256];  /* Subchannel Map [5-24]                  */
+        VINT32      tcct[32];   /* Channel Configuration [5-26]           */
+        VINT8       rtsm[128];  /* Time Slot Map [5-22]                   */
+        VINT8       rscm[256];  /* Subchannel Map [5-24]                  */
+        VINT32      rcct[32];   /* Channel Configuration [5-26]           */
+        VINT32      __glcd;     /* Global Configuration Descriptor [5-10] */
+        VINT32      __iqp;      /* Interrupt Queue Pointer [5-36]         */
+        VINT32      __iql;      /* Interrupt Queue Length [5-36]          */
+        VINT32      grcd;       /* Group Configuration Descriptor [5-16]  */
+        VINT32      mpd;        /* Memory Protection Descriptor [5-18]    */
+        VINT32      mld;        /* Message Length Descriptor [5-20]       */
+        VINT32      pcd;        /* Port Configuration Descriptor [5-19]   */
+};
 
 /* hardware MUSYCC registers laid out as a C structure */
-    struct musycc_globalr
-    {
-        VINT32      gbp;        /* Group Base Pointer                     */
-        VINT32      dacbp;      /* Dual Address Cycle Base Pointer        */
-        VINT32      srd;        /* Service Request Descriptor             */
-        VINT32      isd;        /* Interrupt Service Descriptor           */
-        /*
-         * adjust __thp due to above 4 registers, which are not contained
-         * within musycc_groupr[]. All __XXX[] are just place holders,
-         * anyhow.
-         */
-        VINT32      __thp[32 - 4];      /* Transmit Head Pointer [5-29]           */
-        VINT32      __tmp[32];  /* Transmit Message Pointer [5-30]        */
-        VINT32      __rhp[32];  /* Receive Head Pointer [5-29]            */
-        VINT32      __rmp[32];  /* Receive Message Pointer [5-30]         */
-        VINT8       ttsm[128];  /* Time Slot Map [5-22]                   */
-        VINT8       tscm[256];  /* Subchannel Map [5-24]                  */
-        VINT32      tcct[32];   /* Channel Configuration [5-26]           */
-        VINT8       rtsm[128];  /* Time Slot Map [5-22]                   */
-        VINT8       rscm[256];  /* Subchannel Map [5-24]                  */
-        VINT32      rcct[32];   /* Channel Configuration [5-26]           */
-        VINT32      glcd;       /* Global Configuration Descriptor [5-10] */
-        VINT32      iqp;        /* Interrupt Queue Pointer [5-36]         */
-        VINT32      iql;        /* Interrupt Queue Length [5-36]          */
-        VINT32      grcd;       /* Group Configuration Descriptor [5-16]  */
-        VINT32      mpd;        /* Memory Protection Descriptor [5-18]    */
-        VINT32      mld;        /* Message Length Descriptor [5-20]       */
-        VINT32      pcd;        /* Port Configuration Descriptor [5-19]   */
-        VINT32      rbist;      /* Receive BIST status [5-4]              */
-        VINT32      tbist;      /* Receive BIST status [5-4]              */
-    };
+struct musycc_globalr {
+        VINT32      gbp;        /* Group Base Pointer                     */
+        VINT32      dacbp;      /* Dual Address Cycle Base Pointer        */
+        VINT32      srd;        /* Service Request Descriptor             */
+        VINT32      isd;        /* Interrupt Service Descriptor           */
+        /*
+         * adjust __thp due to above 4 registers, which are not contained
+         * within musycc_groupr[]. All __XXX[] are just place holders,
+         * anyhow.
+         */
+        VINT32      __thp[32 - 4];      /* Transmit Head Pointer [5-29]           */
+        VINT32      __tmp[32];  /* Transmit Message Pointer [5-30]        */
+        VINT32      __rhp[32];  /* Receive Head Pointer [5-29]            */
+        VINT32      __rmp[32];  /* Receive Message Pointer [5-30]         */
+        VINT8       ttsm[128];  /* Time Slot Map [5-22]                   */
+        VINT8       tscm[256];  /* Subchannel Map [5-24]                  */
+        VINT32      tcct[32];   /* Channel Configuration [5-26]           */
+        VINT8       rtsm[128];  /* Time Slot Map [5-22]                   */
+        VINT8       rscm[256];  /* Subchannel Map [5-24]                  */
+        VINT32      rcct[32];   /* Channel Configuration [5-26]           */
+        VINT32      glcd;       /* Global Configuration Descriptor [5-10] */
+        VINT32      iqp;        /* Interrupt Queue Pointer [5-36]         */
+        VINT32      iql;        /* Interrupt Queue Length [5-36]          */
+        VINT32      grcd;       /* Group Configuration Descriptor [5-16]  */
+        VINT32      mpd;        /* Memory Protection Descriptor [5-18]    */
+        VINT32      mld;        /* Message Length Descriptor [5-20]       */
+        VINT32      pcd;        /* Port Configuration Descriptor [5-19]   */
+        VINT32      rbist;      /* Receive BIST status [5-4]              */
+        VINT32      tbist;      /* Receive BIST status [5-4]              */
+};
 
 /* Global Config Descriptor bit macros */
 #define MUSYCC_GCD_ECLK_ENABLE  0x00000800      /* EBUS clock enable */
@@ -108,18 +106,18 @@
 #define MUSYCC_GCD_INTA_DISABLE 0x00000008      /* PCI INTA disable */
 #define MUSYCC_GCD_INTB_DISABLE 0x00000004      /* PCI INTB disable */
 #define MUSYCC_GCD_BLAPSE       12      /* Position index for BLAPSE bit
-                                         * field */
+                                         * field */
 #define MUSYCC_GCD_ALAPSE       8       /* Position index for ALAPSE bit
-                                         * field */
+                                         * field */
 #define MUSYCC_GCD_ELAPSE       4       /* Position index for ELAPSE bit
-                                         * field */
+                                         * field */
 #define MUSYCC_GCD_PORTMAP_3    3       /* Reserved */
 #define MUSYCC_GCD_PORTMAP_2    2       /* Port 0=>Grp 0,1,2,3; Port 1=>Grp
-                                         * 4,5,6,7 */
+                                         * 4,5,6,7 */
 #define MUSYCC_GCD_PORTMAP_1    1       /* Port 0=>Grp 0,1; Port 1=>Grp 2,3,
-                                         * etc... */
+                                         * etc... */
 #define MUSYCC_GCD_PORTMAP_0    0       /* Port 0=>Grp 0; Port 1=>Grp 2,
-                                         * etc... */
+                                         * etc... */
 
 /* and board specific assignments... */
 #ifdef SBE_WAN256T3_ENABLE
@@ -137,57 +135,57 @@
 #endif
 
 #define GCD_MAGIC   (((BLAPSE_VAL)<<(MUSYCC_GCD_BLAPSE)) | \
-                     ((ALAPSE_VAL)<<(MUSYCC_GCD_ALAPSE)) | \
-                     ((ELAPSE_VAL)<<(MUSYCC_GCD_ELAPSE)) | \
-                     (MUSYCC_GCD_ECLK_ENABLE) | PORTMAP_VAL)
+                     ((ALAPSE_VAL)<<(MUSYCC_GCD_ALAPSE)) | \
+                     ((ELAPSE_VAL)<<(MUSYCC_GCD_ELAPSE)) | \
+                     (MUSYCC_GCD_ECLK_ENABLE) | PORTMAP_VAL)
 
 /* Group Config Descriptor bit macros */
 #define MUSYCC_GRCD_RX_ENABLE       0x00000001  /* Enable receive processing */
 #define MUSYCC_GRCD_TX_ENABLE       0x00000002  /* Enable transmit processing */
 #define MUSYCC_GRCD_SUBCHAN_DISABLE 0x00000004  /* Master disable for
-                                                 * subchanneling */
+                                                 * subchanneling */
 #define MUSYCC_GRCD_OOFMP_DISABLE   0x00000008  /* Out of Frame message
-                                                 * processing disabled all
-                                                 * channels */
+                                                 * processing disabled all
+                                                 * channels */
 #define MUSYCC_GRCD_OOFIRQ_DISABLE  0x00000010  /* Out of Frame/In Frame irqs
-                                                 * disabled */
+                                                 * disabled */
 #define MUSYCC_GRCD_COFAIRQ_DISABLE 0x00000020  /* Change of Frame Alignment
-                                                 * irq disabled */
+                                                 * irq disabled */
 #define MUSYCC_GRCD_INHRBSD         0x00000100  /* Receive Buffer Status
-                                                 * overwrite disabled */
+                                                 * overwrite disabled */
 #define MUSYCC_GRCD_INHTBSD         0x00000200  /* Transmit Buffer Status
-                                                 * overwrite disabled */
+                                                 * overwrite disabled */
 #define MUSYCC_GRCD_SF_ALIGN        0x00008000  /* External frame sync */
 #define MUSYCC_GRCD_MC_ENABLE       0x00000040  /* Message configuration bits
-                                                 * copy enable. Conexant sez
-                                                 * turn this on */
+                                                 * copy enable. Conexant sez
+                                                 * turn this on */
 #define MUSYCC_GRCD_POLLTH_16       0x00000001  /* Poll every 16th frame */
 #define MUSYCC_GRCD_POLLTH_32       0x00000002  /* Poll every 32nd frame */
 #define MUSYCC_GRCD_POLLTH_64       0x00000003  /* Poll every 64th frame */
 #define MUSYCC_GRCD_POLLTH_SHIFT    10  /* Position index for poll throttle
-                                         * bit field */
+                                         * bit field */
 #define MUSYCC_GRCD_SUERM_THRESH_SHIFT 16       /* Position index for SUERM
-                                                 * count threshold */
+                                                 * count threshold */
 
 /* Port Config Descriptor bit macros */
 #define MUSYCC_PCD_E1X2_MODE       2    /* Port mode in bits 0-2. T1 and E1 */
 #define MUSYCC_PCD_E1X4_MODE       3    /* are defined in cn847x.h */
 #define MUSYCC_PCD_NX64_MODE       4
 #define MUSYCC_PCD_TXDATA_RISING   0x00000010   /* Sample Tx data on TCLK
-                                                 * rising edge */
+                                                 * rising edge */
 #define MUSYCC_PCD_TXSYNC_RISING   0x00000020   /* Sample Tx frame sync on
-                                                 * TCLK rising edge */
+                                                 * TCLK rising edge */
 #define MUSYCC_PCD_RXDATA_RISING   0x00000040   /* Sample Rx data on RCLK
-                                                 * rising edge */
+                                                 * rising edge */
 #define MUSYCC_PCD_RXSYNC_RISING   0x00000080   /* Sample Rx frame sync on
-                                                 * RCLK rising edge */
+                                                 * RCLK rising edge */
 #define MUSYCC_PCD_ROOF_RISING     0x00000100   /* Sample Rx Out Of Frame
-                                                 * signal on RCLK rising edge */
+                                                 * signal on RCLK rising edge */
 #define MUSYCC_PCD_TX_DRIVEN       0x00000200   /* No mapped timeslots causes
-                                                 * logic 1 on output, else
-                                                 * tristate */
+                                                 * logic 1 on output, else
+                                                 * tristate */
 #define MUSYCC_PCD_PORTMODE_MASK   0xfffffff8   /* For changing the port mode
-                                                 * between E1 and T1 */
+                                                 * between E1 and T1 */
 
 /* Time Slot Descriptor bit macros */
 #define MUSYCC_TSD_MODE_64KBPS              4
@@ -202,17 +200,17 @@
 #define MUSYCC_CCD_BUFIRQ_DISABLE  0x00000002   /* BUFF and ONR irqs disabled */
 #define MUSYCC_CCD_EOMIRQ_DISABLE  0x00000004   /* EOM irq disabled */
 #define MUSYCC_CCD_MSGIRQ_DISABLE  0x00000008   /* LNG, FCS, ALIGN, and ABT
-                                                 * irqs disabled */
+                                                 * irqs disabled */
 #define MUSYCC_CCD_IDLEIRQ_DISABLE 0x00000010   /* CHABT, CHIC, and SHT irqs
-                                                 * disabled */
+                                                 * disabled */
 #define MUSYCC_CCD_FILTIRQ_DISABLE 0x00000020   /* SFILT irq disabled */
 #define MUSYCC_CCD_SDECIRQ_DISABLE 0x00000040   /* SDEC irq disabled */
 #define MUSYCC_CCD_SINCIRQ_DISABLE 0x00000080   /* SINC irq disabled */
 #define MUSYCC_CCD_SUERIRQ_DISABLE 0x00000100   /* SUERR irq disabled */
 #define MUSYCC_CCD_FCS_XFER        0x00000200   /* Propagate FCS along with
-                                                 * received data */
+                                                 * received data */
 #define MUSYCC_CCD_PROTO_SHIFT     12   /* Position index for protocol bit
-                                         * field */
+                                         * field */
 #define MUSYCC_CCD_TRANS           0    /* Protocol mode in bits 12-14 */
 #define MUSYCC_CCD_SS7             1
 #define MUSYCC_CCD_HDLC_FCS16      2
@@ -220,11 +218,11 @@
 #define MUSYCC_CCD_EOPIRQ_DISABLE  0x00008000   /* EOP irq disabled */
 #define MUSYCC_CCD_INVERT_DATA     0x00800000   /* Invert data */
 #define MUSYCC_CCD_MAX_LENGTH      10   /* Position index for max length bit
-                                         * field */
+                                         * field */
 #define MUSYCC_CCD_BUFFER_LENGTH   16   /* Position index for internal data
-                                         * buffer length */
+                                         * buffer length */
 #define MUSYCC_CCD_BUFFER_LOC      24   /* Position index for internal data
-                                         * buffer starting location */
+                                         * buffer starting location */
 
 /****************************************************************************
  * Interrupt Descriptor Information */
@@ -266,7 +264,7 @@
 #define INTRPT_GRP_S           29
 #define INTRPT_GRP_MSB_S       12
 #define INTRPT_GRP(x)          (((x & INTRPT_GRP_M) >> INTRPT_GRP_S) | \
-                               ((x & INTRPT_GRP_MSB_M) >> INTRPT_GRP_MSB_S))
+                               ((x & INTRPT_GRP_MSB_M) >> INTRPT_GRP_MSB_S))
 
 #define INTRPT_CH_M            0x1F000000
 #define INTRPT_CH_S            24
@@ -295,82 +293,82 @@
 
 /* Buffer Descriptor bit macros */
 #define OWNER_BIT       0x80000000      /* Set for MUSYCC owner on xmit, host
-                                         * owner on receive */
+                                         * owner on receive */
 #define HOST_TX_OWNED   0x00000000      /* Host owns descriptor */
 #define MUSYCC_TX_OWNED 0x80000000      /* MUSYCC owns descriptor */
 #define HOST_RX_OWNED   0x80000000      /* Host owns descriptor */
 #define MUSYCC_RX_OWNED 0x00000000      /* MUSYCC owns descriptor */
 
 #define POLL_DISABLED   0x40000000      /* MUSYCC not allowed to poll buffer
-                                         * for ownership */
+                                         * for ownership */
 #define EOMIRQ_ENABLE   0x20000000      /* This buffer contains the end of
-                                         * the message */
+                                         * the message */
 #define EOBIRQ_ENABLE   0x10000000      /* EOB irq enabled */
 #define PADFILL_ENABLE  0x01000000      /* Enable padfill */
 #define REPEAT_BIT      0x00008000      /* Bit on for FISU descriptor */
 #define LENGTH_MASK         0X3fff      /* This part of status descriptor is
-                                         * length */
+                                         * length */
 #define IDLE_CODE               25      /* Position index for idle code (2
-                                         * bits) */
+                                         * bits) */
 #define EXTRA_FLAGS             16      /* Position index for minimum flags
-                                         * between messages (8 bits) */
+                                         * between messages (8 bits) */
 #define IDLE_CODE_MASK        0x03      /* Gets rid of garbage before the
-                                         * pattern is OR'd in */
+                                         * pattern is OR'd in */
 #define EXTRA_FLAGS_MASK      0xff      /* Gets rid of garbage before the
-                                         * pattern is OR'd in */
+                                         * pattern is OR'd in */
 #define PCI_PERMUTED_OWNER_BIT  0x00000080      /* For flipping the bit on
-                                                 * the polled mode descriptor */
+                                                 * the polled mode descriptor */
 
 /* Service Request Descriptor bit macros */
 #define SREQ  8                 /* Position index for service request bit
-                                 * field */
+                                 * field */
 #define SR_NOOP                 (0<<(SREQ))     /* No Operation. Generates SACK */
 #define SR_CHIP_RESET           (1<<(SREQ))     /* Soft chip reset */
 #define SR_GROUP_RESET          (2<<(SREQ))     /* Group reset */
 #define SR_GLOBAL_INIT          (4<<(SREQ))     /* Global init: read global
-                                                 * config deswc and interrupt
-                                                 * queue desc */
+                                                 * config deswc and interrupt
+                                                 * queue desc */
 #define SR_GROUP_INIT           (5<<(SREQ))     /* Group init: read Timeslot
-                                                 * and Subchannel maps,
-                                                 * Channel Config, */
+                                                 * and Subchannel maps,
+                                                 * Channel Config, */
     /*
      * Group Config, Memory Protect, Message Length, and Port Config
      * Descriptors
      */
 #define SR_CHANNEL_ACTIVATE     (8<<(SREQ))     /* Init channel, read Head
-                                                 * Pointer, process first
-                                                 * Message Descriptor */
+                                                 * Pointer, process first
+                                                 * Message Descriptor */
 #define SR_GCHANNEL_MASK        0x001F          /* channel portion (gchan) */
 #define SR_CHANNEL_DEACTIVATE   (9<<(SREQ))     /* Stop channel processing */
 #define SR_JUMP                 (10<<(SREQ))    /* a: Process new Message
-                                                 * List */
+                                                 * List */
 #define SR_CHANNEL_CONFIG       (11<<(SREQ))    /* b: Read channel
-                                                 * Configuration Descriptor */
+                                                 * Configuration Descriptor */
 #define SR_GLOBAL_CONFIG        (16<<(SREQ))    /* 10: Read Global
-                                                 * Configuration Descriptor */
+                                                 * Configuration Descriptor */
 #define SR_INTERRUPT_Q          (17<<(SREQ))    /* 11: Read Interrupt Queue
-                                                 * Descriptor */
+                                                 * Descriptor */
 #define SR_GROUP_CONFIG         (18<<(SREQ))    /* 12: Read Group
-                                                 * Configuration Descriptor */
+                                                 * Configuration Descriptor */
 #define SR_MEMORY_PROTECT       (19<<(SREQ))    /* 13: Read Memory Protection
-                                                 * Descriptor */
+                                                 * Descriptor */
 #define SR_MESSAGE_LENGTH       (20<<(SREQ))    /* 14: Read Message Length
-                                                 * Descriptor */
+                                                 * Descriptor */
 #define SR_PORT_CONFIG          (21<<(SREQ))    /* 15: Read Port
-                                                 * Configuration Descriptor */
+                                                 * Configuration Descriptor */
 #define SR_TIMESLOT_MAP         (24<<(SREQ))    /* 18: Read Timeslot Map */
 #define SR_SUBCHANNEL_MAP       (25<<(SREQ))    /* 19: Read Subchannel Map */
 #define SR_CHAN_CONFIG_TABLE    (26<<(SREQ))    /* 20: Read Channel
-                                                 * Configuration Table for
-                                                 * the group */
+                                                 * Configuration Table for
+                                                 * the group */
 #define SR_TX_DIRECTION         0x00000020      /* Transmit direction bit.
-                                                 * Bit off indicates receive
-                                                 * direction */
+                                                 * Bit off indicates receive
+                                                 * direction */
 #define SR_RX_DIRECTION         0x00000000
 
 /* Interrupt Descriptor bit macros */
 #define GROUP10                     29  /* Position index for the 2 LS group
-                                         * bits */
+                                         * bits */
 #define CHANNEL                     24  /* Position index for channel bits */
 #define INT_IQD_TX          0x80000000
 #define INT_IQD_GRP         0x60000000
@@ -384,7 +382,7 @@
 /* Interrupt Descriptor Events */
 #define EVE_EVENT               20      /* Position index for event bits */
 #define EVE_NONE                0       /* No event to report in this
-                                         * interrupt */
+                                         * interrupt */
 #define EVE_SACK                1       /* Service Request acknowledge */
 #define EVE_EOB                 2       /* End of Buffer */
 #define EVE_EOM                 3       /* End of Message */
@@ -411,12 +409,12 @@
 #define ERR_PERR                15      /* PCI Parity Error */
 /* Other Stuff */
 #define TRANSMIT_DIRECTION  0x80000000  /* Transmit direction bit. Bit off
-                                         * indicates receive direction */
+                                         * indicates receive direction */
 #define ILOST               0x00008000  /* Interrupt Lost */
 #define GROUPMSB            0x00004000  /* Group number MSB */
 #define SACK_IMAGE          0x00100000  /* Used in IRQ for semaphore test */
 #define INITIAL_STATUS      0x10000     /* IRQ status should be this after
-                                         * reset */
+                                         * reset */
 
 /*  This must be defined on an entire channel group (Port) basis */
 #define SUERM_THRESHOLD     0x1f
diff --git a/drivers/staging/cxt1e1/sbecrc.c b/drivers/staging/cxt1e1/sbecrc.c
index 3f3cd60ac367..87512a53f720 100644
--- a/drivers/staging/cxt1e1/sbecrc.c
+++ b/drivers/staging/cxt1e1/sbecrc.c
@@ -44,25 +44,23 @@ static u_int32_t CRCTable[CRC_TABLE_ENTRIES];
 ***************************************************************************/
 
 static void
-genCrcTable (u_int32_t *CRCTable)
+genCrcTable(u_int32_t *CRCTable)
 {
-    int         ii, jj;
-    u_int32_t      crc;
-
-    for (ii = 0; ii < CRC_TABLE_ENTRIES; ii++)
-    {
-        crc = ii;
-        for (jj = 8; jj > 0; jj--)
-        {
-            if (crc & 1)
-                crc = (crc >> 1) ^ CRC32_POLYNOMIAL;
-            else
-                crc >>= 1;
-        }
-        CRCTable[ii] = crc;
-    }
-
-    crcTableInit++;
+        int         ii, jj;
+        u_int32_t      crc;
+
+        for (ii = 0; ii < CRC_TABLE_ENTRIES; ii++) {
+                crc = ii;
+                for (jj = 8; jj > 0; jj--) {
+                        if (crc & 1)
+                                crc = (crc >> 1) ^ CRC32_POLYNOMIAL;
+                        else
+                                crc >>= 1;
+                }
+                CRCTable[ii] = crc;
+        }
+
+        crcTableInit++;
 }
 
 
@@ -85,52 +83,49 @@ genCrcTable (u_int32_t *CRCTable)
 */
 
 void
-sbeCrc (u_int8_t *buffer,          /* data buffer to crc */
-        u_int32_t count,           /* length of block in bytes */
-        u_int32_t initialCrc,      /* starting CRC */
-        u_int32_t *result)
+sbeCrc(u_int8_t *buffer,          /* data buffer to crc */
+        u_int32_t count,           /* length of block in bytes */
+        u_int32_t initialCrc,      /* starting CRC */
+        u_int32_t *result)
 {
-    u_int32_t     *tbl = 0;
-    u_int32_t      temp1, temp2, crc;
-
-    /*
-     * if table not yet created, do so. Don't care about "extra" time
-     * checking this every time sbeCrc() is called, since CRC calculations are
-     * already time consuming
-     */
-    if (!crcTableInit)
-    {
+        u_int32_t     *tbl = 0;
+        u_int32_t      temp1, temp2, crc;
+
+        /*
+        * if table not yet created, do so. Don't care about "extra" time
+        * checking this every time sbeCrc() is called, since CRC calculations
+        * are already time consuming
+        */
+        if (!crcTableInit) {
 #ifdef STATIC_CRC_TABLE
-        tbl = &CRCTable;
-        genCrcTable (tbl);
+                tbl = &CRCTable;
+                genCrcTable(tbl);
 #else
-        tbl = (u_int32_t *) OS_kmalloc (CRC_TABLE_ENTRIES * sizeof (u_int32_t));
-        if (tbl == 0)
-        {
-            *result = 0;            /* dummy up return value due to malloc
-                                     * failure */
-            return;
-        }
-        genCrcTable (tbl);
+                tbl = (u_int32_t *) OS_kmalloc(CRC_TABLE_ENTRIES * sizeof(u_int32_t));
+                if (tbl == 0) {
+                        *result = 0;   /* dummy up return value due to malloc
+                                        * failure */
+                        return;
+                }
+                genCrcTable(tbl);
 #endif
-    }
-    /* inverting bits makes ZMODEM & PKZIP compatible */
-    crc = initialCrc ^ 0xFFFFFFFFL;
+        }
+        /* inverting bits makes ZMODEM & PKZIP compatible */
+        crc = initialCrc ^ 0xFFFFFFFFL;
 
-    while (count-- != 0)
-    {
-        temp1 = (crc >> 8) & 0x00FFFFFFL;
-        temp2 = tbl[((int) crc ^ *buffer++) & 0xff];
-        crc = temp1 ^ temp2;
-    }
+        while (count-- != 0) {
+                temp1 = (crc >> 8) & 0x00FFFFFFL;
+                temp2 = tbl[((int) crc ^ *buffer++) & 0xff];
+                crc = temp1 ^ temp2;
+        }
 
-    crc ^= 0xFFFFFFFFL;
+        crc ^= 0xFFFFFFFFL;
 
-    *result = crc;
+        *result = crc;
 
 #ifndef STATIC_CRC_TABLE
-    crcTableInit = 0;
-    OS_kfree (tbl);
+        crcTableInit = 0;
+        OS_kfree(tbl);
 #endif
 }
 
diff --git a/drivers/staging/dgrp/dgrp_dpa_ops.c b/drivers/staging/dgrp/dgrp_dpa_ops.c
index 49e670915e5c..021cca498f2c 100644
--- a/drivers/staging/dgrp/dgrp_dpa_ops.c
+++ b/drivers/staging/dgrp/dgrp_dpa_ops.c
@@ -387,7 +387,7 @@ static long dgrp_dpa_ioctl(struct file *file, unsigned int cmd,
 
                 port = getchan.ch_port;
 
-                if (port < 0 || port > nd->nd_chan_count)
+                if (port > nd->nd_chan_count)
                         return -EINVAL;
 
                 ch = nd->nd_chan + port;
diff --git a/drivers/staging/dgrp/dgrp_net_ops.c b/drivers/staging/dgrp/dgrp_net_ops.c
index ab839ea3b44c..c409cd03e8c1 100644
--- a/drivers/staging/dgrp/dgrp_net_ops.c
+++ b/drivers/staging/dgrp/dgrp_net_ops.c
@@ -1057,13 +1057,13 @@ static int dgrp_net_release(struct inode *inode, struct file *file)
 
         spin_unlock_irqrestore(&dgrp_poll_data.poll_lock, lock_flags);
 
-done:
         down(&nd->nd_net_semaphore);
 
         dgrp_monitor_message(nd, "Net Close");
 
         up(&nd->nd_net_semaphore);
 
+done:
         module_put(THIS_MODULE);
         file->private_data = NULL;
         return 0;
@@ -1671,6 +1671,9 @@ static int dgrp_send(struct nd_struct *nd, long tmax)
                                  * do the job.
                                  */
 
+                                /* FIXME: jiffies - ch->ch_waketime can never
+                                   be < 0. Someone needs to work out what is
+                                   actually intended here */
                                 if (ch->ch_pun.un_open_count &&
                                     (ch->ch_pun.un_flag &
                                     (UN_EMPTY|UN_TIME|UN_LOW|UN_PWAIT)) != 0) {
diff --git a/drivers/staging/dgrp/dgrp_sysfs.c b/drivers/staging/dgrp/dgrp_sysfs.c
index e5a3c88d016e..43ab9f4d9349 100644
--- a/drivers/staging/dgrp/dgrp_sysfs.c
+++ b/drivers/staging/dgrp/dgrp_sysfs.c
@@ -17,7 +17,6 @@
 #include "dgrp_common.h"
 
 #include <linux/kernel.h>
-#include <linux/version.h>
 #include <linux/module.h>
 #include <linux/ctype.h>
 #include <linux/string.h>
@@ -177,7 +176,7 @@ static ssize_t dgrp_node_description_show(struct device *c,
         if (!nd)
                 return 0;
 
-        if (nd->nd_state == NS_READY && nd->nd_ps_desc)
+        if (nd->nd_state == NS_READY)
                 return snprintf(buf, PAGE_SIZE, "%s\n", nd->nd_ps_desc);
         return 0;
 }
diff --git a/drivers/staging/dgrp/dgrp_tty.c b/drivers/staging/dgrp/dgrp_tty.c
index e125b03598d7..efa62ced7c8a 100644
--- a/drivers/staging/dgrp/dgrp_tty.c
+++ b/drivers/staging/dgrp/dgrp_tty.c
@@ -2615,21 +2615,6 @@ static int dgrp_tty_ioctl(struct tty_struct *tty, unsigned int cmd,
                  */
                 return 0;
 
-        case TIOCGSOFTCAR:
-                rc = access_ok(VERIFY_WRITE, (void __user *) arg,
-                               sizeof(long));
-                if (rc == 0)
-                        return -EFAULT;
-                put_user(C_CLOCAL(tty) ? 1 : 0, (unsigned long __user *) arg);
-                return 0;
-
-        case TIOCSSOFTCAR:
-                get_user(arg, (unsigned long __user *) arg);
-                tty->termios.c_cflag =
-                        ((tty->termios.c_cflag & ~CLOCAL) |
-                         (arg ? CLOCAL : 0));
-                return 0;
-
         case TIOCMGET:
                 rc = access_ok(VERIFY_WRITE, (void __user *) arg,
                                  sizeof(unsigned int));
diff --git a/drivers/staging/et131x/README b/drivers/staging/et131x/README
index 82657233c8b6..38537d4c4e14 100644
--- a/drivers/staging/et131x/README
+++ b/drivers/staging/et131x/README
@@ -8,7 +8,7 @@ Note, the powermanagement options were removed from the vendor provided
 driver as they did not build properly at the time.
 
 TODO:
-        - Use of kmem_cache seems a bit unusual
+        - some rx packets have CRC/code/frame errors
 
 Please send patches to:
         Greg Kroah-Hartman <gregkh@linuxfoundation.org>
diff --git a/drivers/staging/et131x/et131x.c b/drivers/staging/et131x/et131x.c
index 413da0d6b9f6..84bbcd48e264 100644
--- a/drivers/staging/et131x/et131x.c
+++ b/drivers/staging/et131x/et131x.c
@@ -143,7 +143,6 @@ MODULE_DESCRIPTION("10/100/1000 Base-T Ethernet Driver for the ET1310 by Agere S
 #define fMP_DEST_BROAD                  0x00000002
 
 /* MP_ADAPTER flags */
-#define fMP_ADAPTER_RECV_LOOKASIDE      0x00000004
 #define fMP_ADAPTER_INTERRUPT_IN_USE    0x00000008
 
 /* MP_SHARED flags */
@@ -176,22 +175,14 @@ MODULE_DESCRIPTION("10/100/1000 Base-T Ethernet Driver for the ET1310 by Agere S
 #define PARM_DMA_CACHE_DEF      0
 
 /* RX defines */
-#define USE_FBR0 1
-#define FBR_CHUNKS 32
-#define MAX_DESC_PER_RING_RX         1024
+#define FBR_CHUNKS              32
+#define MAX_DESC_PER_RING_RX    1024
 
 /* number of RFDs - default and min */
-#ifdef USE_FBR0
 #define RFD_LOW_WATER_MARK      40
 #define NIC_DEFAULT_NUM_RFD     1024
 #define NUM_FBRS                2
-#else
-#define RFD_LOW_WATER_MARK      20
-#define NIC_DEFAULT_NUM_RFD     256
-#define NUM_FBRS                1
-#endif
 
-#define NIC_MIN_NUM_RFD         64
 #define NUM_PACKETS_HANDLED     256
 
 #define ALCATEL_MULTICAST_PKT   0x01000000
@@ -291,29 +282,20 @@ struct rx_status_block {
  */
 struct fbr_lookup {
         void            *virt[MAX_DESC_PER_RING_RX];
-        void            *buffer1[MAX_DESC_PER_RING_RX];
-        void            *buffer2[MAX_DESC_PER_RING_RX];
         u32              bus_high[MAX_DESC_PER_RING_RX];
         u32              bus_low[MAX_DESC_PER_RING_RX];
         void            *ring_virtaddr;
         dma_addr_t       ring_physaddr;
         void            *mem_virtaddrs[MAX_DESC_PER_RING_RX / FBR_CHUNKS];
         dma_addr_t       mem_physaddrs[MAX_DESC_PER_RING_RX / FBR_CHUNKS];
-        u64              real_physaddr;
-        u64              offset;
         u32              local_full;
         u32              num_entries;
-        u32              buffsize;
+        dma_addr_t       buffsize;
 };
 
 /*
  * struct rx_ring is the sructure representing the adaptor's local
  * reference(s) to the rings
- *
- ******************************************************************************
- * IMPORTANT NOTE :- fbr_lookup *fbr[NUM_FBRS] uses index 0 to refer to FBR1
- *                      and index 1 to refer to FRB0
- ******************************************************************************
  */
 struct rx_ring {
         struct fbr_lookup *fbr[NUM_FBRS];
@@ -332,9 +314,6 @@ struct rx_ring {
         u32 num_rfd;
 
         bool unfinished_receives;
-
-        /* lookaside lists */
-        struct kmem_cache *recv_lookaside;
 };
 
 /* TX defines */
@@ -866,28 +845,27 @@ static void et131x_rx_dma_enable(struct et131x_adapter *adapter)
         /* Setup the receive dma configuration register for normal operation */
         u32 csr =  0x2000;      /* FBR1 enable */
 
-        if (adapter->rx_ring.fbr[0]->buffsize == 4096)
+        if (adapter->rx_ring.fbr[1]->buffsize == 4096)
                 csr |= 0x0800;
-        else if (adapter->rx_ring.fbr[0]->buffsize == 8192)
+        else if (adapter->rx_ring.fbr[1]->buffsize == 8192)
                 csr |= 0x1000;
-        else if (adapter->rx_ring.fbr[0]->buffsize == 16384)
+        else if (adapter->rx_ring.fbr[1]->buffsize == 16384)
                 csr |= 0x1800;
-#ifdef USE_FBR0
+
         csr |= 0x0400;          /* FBR0 enable */
-        if (adapter->rx_ring.fbr[1]->buffsize == 256)
+        if (adapter->rx_ring.fbr[0]->buffsize == 256)
                 csr |= 0x0100;
-        else if (adapter->rx_ring.fbr[1]->buffsize == 512)
+        else if (adapter->rx_ring.fbr[0]->buffsize == 512)
                 csr |= 0x0200;
-        else if (adapter->rx_ring.fbr[1]->buffsize == 1024)
+        else if (adapter->rx_ring.fbr[0]->buffsize == 1024)
                 csr |= 0x0300;
-#endif
         writel(csr, &adapter->regs->rxdma.csr);
 
         csr = readl(&adapter->regs->rxdma.csr);
-        if ((csr & 0x00020000) != 0) {
+        if (csr & 0x00020000) {
                 udelay(5);
                 csr = readl(&adapter->regs->rxdma.csr);
-                if ((csr & 0x00020000) != 0) {
+                if (csr & 0x00020000) {
                         dev_err(&adapter->pdev->dev,
                             "RX Dma failed to exit halt state.  CSR 0x%08x\n",
                                 csr);
@@ -1758,22 +1736,8 @@ static void et1310_phy_power_down(struct et131x_adapter *adapter, bool down)
  */
 static void et131x_xcvr_init(struct et131x_adapter *adapter)
 {
-        u16 imr;
-        u16 isr;
         u16 lcr2;
 
-        et131x_mii_read(adapter, PHY_INTERRUPT_STATUS, &isr);
-        et131x_mii_read(adapter, PHY_INTERRUPT_MASK, &imr);
-
-        /* Set the link status interrupt only.  Bad behavior when link status
-         * and auto neg are set, we run into a nested interrupt problem
-         */
-        imr |= (ET_PHY_INT_MASK_AUTONEGSTAT |
-                ET_PHY_INT_MASK_LINKSTAT |
-                ET_PHY_INT_MASK_ENABLE);
-
-        et131x_mii_write(adapter, PHY_INTERRUPT_MASK, imr);
-
         /* Set the LED behavior such that LED 1 indicates speed (off =
          * 10Mbits, blink = 100Mbits, on = 1000Mbits) and LED 2 indicates
          * link and activity (on for link, blink off for activity).
@@ -1798,7 +1762,7 @@ static void et131x_xcvr_init(struct et131x_adapter *adapter)
 }
 
 /**
- * et131x_configure_global_regs -       configure JAGCore global regs
+ * et131x_configure_global_regs - configure JAGCore global regs
  * @adapter: pointer to our adapter structure
  *
  * Used to configure the global registers on the JAGCore
@@ -1856,29 +1820,22 @@ static void et131x_config_rx_dma_regs(struct et131x_adapter *adapter)
         u32 entry;
         u32 psr_num_des;
         unsigned long flags;
+        u8 id;
 
         /* Halt RXDMA to perform the reconfigure.  */
         et131x_rx_dma_disable(adapter);
 
-        /* Load the completion writeback physical address
-         *
-         * NOTE : dma_alloc_coherent(), used above to alloc DMA regions,
-         * ALWAYS returns SAC (32-bit) addresses. If DAC (64-bit) addresses
-         * are ever returned, make sure the high part is retrieved here
-         * before storing the adjusted address.
-         */
-        writel((u32) ((u64)rx_local->rx_status_bus >> 32),
-               &rx_dma->dma_wb_base_hi);
-        writel((u32) rx_local->rx_status_bus, &rx_dma->dma_wb_base_lo);
+        /* Load the completion writeback physical address */
+        writel(upper_32_bits(rx_local->rx_status_bus), &rx_dma->dma_wb_base_hi);
+        writel(lower_32_bits(rx_local->rx_status_bus), &rx_dma->dma_wb_base_lo);
 
         memset(rx_local->rx_status_block, 0, sizeof(struct rx_status_block));
 
         /* Set the address and parameters of the packet status ring into the
          * 1310's registers
          */
-        writel((u32) ((u64)rx_local->ps_ring_physaddr >> 32),
-               &rx_dma->psr_base_hi);
-        writel((u32) rx_local->ps_ring_physaddr, &rx_dma->psr_base_lo);
+        writel(upper_32_bits(rx_local->ps_ring_physaddr), &rx_dma->psr_base_hi);
+        writel(lower_32_bits(rx_local->ps_ring_physaddr), &rx_dma->psr_base_lo);
         writel(rx_local->psr_num_entries - 1, &rx_dma->psr_num_des);
         writel(0, &rx_dma->psr_full_offset);
 
@@ -1891,56 +1848,56 @@ static void et131x_config_rx_dma_regs(struct et131x_adapter *adapter)
         /* These local variables track the PSR in the adapter structure */
         rx_local->local_psr_full = 0;
 
-        /* Now's the best time to initialize FBR1 contents */
-        fbr_entry = (struct fbr_desc *) rx_local->fbr[0]->ring_virtaddr;
-        for (entry = 0; entry < rx_local->fbr[0]->num_entries; entry++) {
-                fbr_entry->addr_hi = rx_local->fbr[0]->bus_high[entry];
-                fbr_entry->addr_lo = rx_local->fbr[0]->bus_low[entry];
-                fbr_entry->word2 = entry;
-                fbr_entry++;
-        }
-
-        /* Set the address and parameters of Free buffer ring 1 (and 0 if
-         * required) into the 1310's registers
-         */
-        writel((u32) (rx_local->fbr[0]->real_physaddr >> 32),
-               &rx_dma->fbr1_base_hi);
-        writel((u32) rx_local->fbr[0]->real_physaddr, &rx_dma->fbr1_base_lo);
-        writel(rx_local->fbr[0]->num_entries - 1, &rx_dma->fbr1_num_des);
-        writel(ET_DMA10_WRAP, &rx_dma->fbr1_full_offset);
-
-        /* This variable tracks the free buffer ring 1 full position, so it
-         * has to match the above.
-         */
-        rx_local->fbr[0]->local_full = ET_DMA10_WRAP;
-        writel(
-           ((rx_local->fbr[0]->num_entries * LO_MARK_PERCENT_FOR_RX) / 100) - 1,
-           &rx_dma->fbr1_min_des);
-
-#ifdef USE_FBR0
-        /* Now's the best time to initialize FBR0 contents */
-        fbr_entry = (struct fbr_desc *) rx_local->fbr[1]->ring_virtaddr;
-        for (entry = 0; entry < rx_local->fbr[1]->num_entries; entry++) {
-                fbr_entry->addr_hi = rx_local->fbr[1]->bus_high[entry];
-                fbr_entry->addr_lo = rx_local->fbr[1]->bus_low[entry];
-                fbr_entry->word2 = entry;
-                fbr_entry++;
-        }
+        for (id = 0; id < NUM_FBRS; id++) {
+                u32 *num_des;
+                u32 *full_offset;
+                u32 *min_des;
+                u32 *base_hi;
+                u32 *base_lo;
+
+                if (id == 0) {
+                        num_des = &rx_dma->fbr0_num_des;
+                        full_offset = &rx_dma->fbr0_full_offset;
+                        min_des = &rx_dma->fbr0_min_des;
+                        base_hi = &rx_dma->fbr0_base_hi;
+                        base_lo = &rx_dma->fbr0_base_lo;
+                } else {
+                        num_des = &rx_dma->fbr1_num_des;
+                        full_offset = &rx_dma->fbr1_full_offset;
+                        min_des = &rx_dma->fbr1_min_des;
+                        base_hi = &rx_dma->fbr1_base_hi;
+                        base_lo = &rx_dma->fbr1_base_lo;
+                }
 
-        writel((u32) (rx_local->fbr[1]->real_physaddr >> 32),
-               &rx_dma->fbr0_base_hi);
-        writel((u32) rx_local->fbr[1]->real_physaddr, &rx_dma->fbr0_base_lo);
-        writel(rx_local->fbr[1]->num_entries - 1, &rx_dma->fbr0_num_des);
-        writel(ET_DMA10_WRAP, &rx_dma->fbr0_full_offset);
+                /* Now's the best time to initialize FBR contents */
+                fbr_entry =
+                    (struct fbr_desc *) rx_local->fbr[id]->ring_virtaddr;
+                for (entry = 0;
+                     entry < rx_local->fbr[id]->num_entries; entry++) {
+                        fbr_entry->addr_hi = rx_local->fbr[id]->bus_high[entry];
+                        fbr_entry->addr_lo = rx_local->fbr[id]->bus_low[entry];
+                        fbr_entry->word2 = entry;
+                        fbr_entry++;
+                }
 
-        /* This variable tracks the free buffer ring 0 full position, so it
-         * has to match the above.
-         */
-        rx_local->fbr[1]->local_full = ET_DMA10_WRAP;
-        writel(
-           ((rx_local->fbr[1]->num_entries * LO_MARK_PERCENT_FOR_RX) / 100) - 1,
-           &rx_dma->fbr0_min_des);
-#endif
+                /* Set the address and parameters of Free buffer ring 1 and 0
+                 * into the 1310's registers
+                 */
+                writel(upper_32_bits(rx_local->fbr[id]->ring_physaddr),
+                       base_hi);
+                writel(lower_32_bits(rx_local->fbr[id]->ring_physaddr),
+                       base_lo);
+                writel(rx_local->fbr[id]->num_entries - 1, num_des);
+                writel(ET_DMA10_WRAP, full_offset);
+
+                /* This variable tracks the free buffer ring 1 full position,
+                 * so it has to match the above.
+                 */
+                rx_local->fbr[id]->local_full = ET_DMA10_WRAP;
+                writel(((rx_local->fbr[id]->num_entries *
+                                        LO_MARK_PERCENT_FOR_RX) / 100) - 1,
+                       min_des);
+        }
 
         /* Program the number of packets we will receive before generating an
          * interrupt.
@@ -1971,18 +1928,19 @@ static void et131x_config_tx_dma_regs(struct et131x_adapter *adapter)
         struct txdma_regs __iomem *txdma = &adapter->regs->txdma;
 
         /* Load the hardware with the start of the transmit descriptor ring. */
-        writel((u32) ((u64)adapter->tx_ring.tx_desc_ring_pa >> 32),
+        writel(upper_32_bits(adapter->tx_ring.tx_desc_ring_pa),
                &txdma->pr_base_hi);
-        writel((u32) adapter->tx_ring.tx_desc_ring_pa,
+        writel(lower_32_bits(adapter->tx_ring.tx_desc_ring_pa),
                &txdma->pr_base_lo);
 
         /* Initialise the transmit DMA engine */
         writel(NUM_DESC_PER_RING_TX - 1, &txdma->pr_num_des);
 
         /* Load the completion writeback physical address */
-        writel((u32)((u64)adapter->tx_ring.tx_status_pa >> 32),
-                                                &txdma->dma_wb_base_hi);
-        writel((u32)adapter->tx_ring.tx_status_pa, &txdma->dma_wb_base_lo);
+        writel(upper_32_bits(adapter->tx_ring.tx_status_pa),
+               &txdma->dma_wb_base_hi);
+        writel(lower_32_bits(adapter->tx_ring.tx_status_pa),
+               &txdma->dma_wb_base_lo);
 
         *adapter->tx_ring.tx_status = 0;
 
@@ -2267,31 +2225,6 @@ static inline u32 bump_free_buff_ring(u32 *free_buff_ring, u32 limit)
 }
 
 /**
- * et131x_align_allocated_memory - Align allocated memory on a given boundary
- * @adapter: pointer to our adapter structure
- * @phys_addr: pointer to Physical address
- * @offset: pointer to the offset variable
- * @mask: correct mask
- */
-static void et131x_align_allocated_memory(struct et131x_adapter *adapter,
-                                          u64 *phys_addr, u64 *offset,
-                                          u64 mask)
-{
-        u64 new_addr = *phys_addr & ~mask;
-
-        *offset = 0;
-
-        if (new_addr != *phys_addr) {
-                /* Move to next aligned block */
-                new_addr += mask + 1;
-                /* Return offset for adjusting virt addr */
-                *offset = new_addr - *phys_addr;
-                /* Return new physical address */
-                *phys_addr = new_addr;
-        }
-}
-
-/**
  * et131x_rx_dma_memory_alloc
  * @adapter: pointer to our private adapter structure
  *
@@ -2302,19 +2235,19 @@ static void et131x_align_allocated_memory(struct et131x_adapter *adapter,
  */
 static int et131x_rx_dma_memory_alloc(struct et131x_adapter *adapter)
 {
+        u8 id;
         u32 i, j;
         u32 bufsize;
-        u32 pktstat_ringsize, fbr_chunksize;
+        u32 pktstat_ringsize;
+        u32 fbr_chunksize;
         struct rx_ring *rx_ring;
 
         /* Setup some convenience pointers */
         rx_ring = &adapter->rx_ring;
 
         /* Alloc memory for the lookup table */
-#ifdef USE_FBR0
-        rx_ring->fbr[1] = kmalloc(sizeof(struct fbr_lookup), GFP_KERNEL);
-#endif
         rx_ring->fbr[0] = kmalloc(sizeof(struct fbr_lookup), GFP_KERNEL);
+        rx_ring->fbr[1] = kmalloc(sizeof(struct fbr_lookup), GFP_KERNEL);
 
         /* The first thing we will do is configure the sizes of the buffer
          * rings. These will change based on jumbo packet support.  Larger
@@ -2335,211 +2268,85 @@ static int et131x_rx_dma_memory_alloc(struct et131x_adapter *adapter)
          */
 
         if (adapter->registry_jumbo_packet < 2048) {
-#ifdef USE_FBR0
-                rx_ring->fbr[1]->buffsize = 256;
-                rx_ring->fbr[1]->num_entries = 512;
-#endif
-                rx_ring->fbr[0]->buffsize = 2048;
+                rx_ring->fbr[0]->buffsize = 256;
                 rx_ring->fbr[0]->num_entries = 512;
+                rx_ring->fbr[1]->buffsize = 2048;
+                rx_ring->fbr[1]->num_entries = 512;
         } else if (adapter->registry_jumbo_packet < 4096) {
-#ifdef USE_FBR0
-                rx_ring->fbr[1]->buffsize = 512;
-                rx_ring->fbr[1]->num_entries = 1024;
-#endif
-                rx_ring->fbr[0]->buffsize = 4096;
-                rx_ring->fbr[0]->num_entries = 512;
+                rx_ring->fbr[0]->buffsize = 512;
+                rx_ring->fbr[0]->num_entries = 1024;
+                rx_ring->fbr[1]->buffsize = 4096;
+                rx_ring->fbr[1]->num_entries = 512;
         } else {
-#ifdef USE_FBR0
-                rx_ring->fbr[1]->buffsize = 1024;
-                rx_ring->fbr[1]->num_entries = 768;
-#endif
-                rx_ring->fbr[0]->buffsize = 16384;
-                rx_ring->fbr[0]->num_entries = 128;
+                rx_ring->fbr[0]->buffsize = 1024;
+                rx_ring->fbr[0]->num_entries = 768;
+                rx_ring->fbr[1]->buffsize = 16384;
+                rx_ring->fbr[1]->num_entries = 128;
         }
 
-#ifdef USE_FBR0
         adapter->rx_ring.psr_num_entries =
-                                adapter->rx_ring.fbr[1]->num_entries +
-                                adapter->rx_ring.fbr[0]->num_entries;
-#else
-        adapter->rx_ring.psr_num_entries = adapter->rx_ring.fbr[0]->num_entries;
-#endif
+                                adapter->rx_ring.fbr[0]->num_entries +
+                                adapter->rx_ring.fbr[1]->num_entries;
 
-        /* Allocate an area of memory for Free Buffer Ring 1 */
-        bufsize = (sizeof(struct fbr_desc) * rx_ring->fbr[0]->num_entries) +
-                                                                        0xfff;
-        rx_ring->fbr[0]->ring_virtaddr = dma_alloc_coherent(&adapter->pdev->dev,
+        for (id = 0; id < NUM_FBRS; id++) {
+                /* Allocate an area of memory for Free Buffer Ring */
+                bufsize =
+                    (sizeof(struct fbr_desc) * rx_ring->fbr[id]->num_entries);
+                rx_ring->fbr[id]->ring_virtaddr =
+                                dma_alloc_coherent(&adapter->pdev->dev,
                                         bufsize,
-                                        &rx_ring->fbr[0]->ring_physaddr,
+                                        &rx_ring->fbr[id]->ring_physaddr,
                                         GFP_KERNEL);
-        if (!rx_ring->fbr[0]->ring_virtaddr) {
-                dev_err(&adapter->pdev->dev,
-                          "Cannot alloc memory for Free Buffer Ring 1\n");
-                return -ENOMEM;
-        }
-
-        /* Save physical address
-         *
-         * NOTE: dma_alloc_coherent(), used above to alloc DMA regions,
-         * ALWAYS returns SAC (32-bit) addresses. If DAC (64-bit) addresses
-         * are ever returned, make sure the high part is retrieved here
-         * before storing the adjusted address.
-         */
-        rx_ring->fbr[0]->real_physaddr = rx_ring->fbr[0]->ring_physaddr;
-
-        /* Align Free Buffer Ring 1 on a 4K boundary */
-        et131x_align_allocated_memory(adapter,
-                                      &rx_ring->fbr[0]->real_physaddr,
-                                      &rx_ring->fbr[0]->offset, 0x0FFF);
-
-        rx_ring->fbr[0]->ring_virtaddr =
-                        (void *)((u8 *) rx_ring->fbr[0]->ring_virtaddr +
-                        rx_ring->fbr[0]->offset);
-
-#ifdef USE_FBR0
-        /* Allocate an area of memory for Free Buffer Ring 0 */
-        bufsize = (sizeof(struct fbr_desc) * rx_ring->fbr[1]->num_entries) +
-                                                                        0xfff;
-        rx_ring->fbr[1]->ring_virtaddr = dma_alloc_coherent(&adapter->pdev->dev,
-                                                bufsize,
-                                                &rx_ring->fbr[1]->ring_physaddr,
-                                                GFP_KERNEL);
-        if (!rx_ring->fbr[1]->ring_virtaddr) {
-                dev_err(&adapter->pdev->dev,
-                          "Cannot alloc memory for Free Buffer Ring 0\n");
-                return -ENOMEM;
-        }
-
-        /* Save physical address
-         *
-         * NOTE: dma_alloc_coherent(), used above to alloc DMA regions,
-         * ALWAYS returns SAC (32-bit) addresses. If DAC (64-bit) addresses
-         * are ever returned, make sure the high part is retrieved here before
-         * storing the adjusted address.
-         */
-        rx_ring->fbr[1]->real_physaddr = rx_ring->fbr[1]->ring_physaddr;
-
-        /* Align Free Buffer Ring 0 on a 4K boundary */
-        et131x_align_allocated_memory(adapter,
-                                      &rx_ring->fbr[1]->real_physaddr,
-                                      &rx_ring->fbr[1]->offset, 0x0FFF);
-
-        rx_ring->fbr[1]->ring_virtaddr =
-                        (void *)((u8 *) rx_ring->fbr[1]->ring_virtaddr +
-                        rx_ring->fbr[1]->offset);
-#endif
-        for (i = 0; i < (rx_ring->fbr[0]->num_entries / FBR_CHUNKS); i++) {
-                u64 fbr1_tmp_physaddr;
-                u64 fbr1_offset;
-                u32 fbr1_align;
-
-                /* This code allocates an area of memory big enough for N
-                 * free buffers + (buffer_size - 1) so that the buffers can
-                 * be aligned on 4k boundaries.  If each buffer were aligned
-                 * to a buffer_size boundary, the effect would be to double
-                 * the size of FBR0.  By allocating N buffers at once, we
-                 * reduce this overhead.
-                 */
-                if (rx_ring->fbr[0]->buffsize > 4096)
-                        fbr1_align = 4096;
-                else
-                        fbr1_align = rx_ring->fbr[0]->buffsize;
-
-                fbr_chunksize =
-                    (FBR_CHUNKS * rx_ring->fbr[0]->buffsize) + fbr1_align - 1;
-                rx_ring->fbr[0]->mem_virtaddrs[i] =
-                    dma_alloc_coherent(&adapter->pdev->dev, fbr_chunksize,
-                                       &rx_ring->fbr[0]->mem_physaddrs[i],
-                                       GFP_KERNEL);
-
-                if (!rx_ring->fbr[0]->mem_virtaddrs[i]) {
+                if (!rx_ring->fbr[id]->ring_virtaddr) {
                         dev_err(&adapter->pdev->dev,
-                                "Could not alloc memory\n");
+                           "Cannot alloc memory for Free Buffer Ring %d\n", id);
                         return -ENOMEM;
                 }
-
-                /* See NOTE in "Save Physical Address" comment above */
-                fbr1_tmp_physaddr = rx_ring->fbr[0]->mem_physaddrs[i];
-
-                et131x_align_allocated_memory(adapter,
-                                              &fbr1_tmp_physaddr,
-                                              &fbr1_offset, (fbr1_align - 1));
-
-                for (j = 0; j < FBR_CHUNKS; j++) {
-                        u32 index = (i * FBR_CHUNKS) + j;
-
-                        /* Save the Virtual address of this index for quick
-                         * access later
-                         */
-                        rx_ring->fbr[0]->virt[index] =
-                            (u8 *) rx_ring->fbr[0]->mem_virtaddrs[i] +
-                            (j * rx_ring->fbr[0]->buffsize) + fbr1_offset;
-
-                        /* now store the physical address in the descriptor
-                         * so the device can access it
-                         */
-                        rx_ring->fbr[0]->bus_high[index] =
-                            (u32) (fbr1_tmp_physaddr >> 32);
-                        rx_ring->fbr[0]->bus_low[index] =
-                            (u32) fbr1_tmp_physaddr;
-
-                        fbr1_tmp_physaddr += rx_ring->fbr[0]->buffsize;
-
-                        rx_ring->fbr[0]->buffer1[index] =
-                            rx_ring->fbr[0]->virt[index];
-                        rx_ring->fbr[0]->buffer2[index] =
-                            rx_ring->fbr[0]->virt[index] - 4;
-                }
         }
 
-#ifdef USE_FBR0
-        /* Same for FBR0 (if in use) */
-        for (i = 0; i < (rx_ring->fbr[1]->num_entries / FBR_CHUNKS); i++) {
-                u64 fbr0_tmp_physaddr;
-                u64 fbr0_offset;
+        for (id = 0; id < NUM_FBRS; id++) {
+                fbr_chunksize = (FBR_CHUNKS * rx_ring->fbr[id]->buffsize);
 
-                fbr_chunksize =
-                    ((FBR_CHUNKS + 1) * rx_ring->fbr[1]->buffsize) - 1;
-                rx_ring->fbr[1]->mem_virtaddrs[i] =
-                    dma_alloc_coherent(&adapter->pdev->dev, fbr_chunksize,
-                                       &rx_ring->fbr[1]->mem_physaddrs[i],
-                                       GFP_KERNEL);
+                for (i = 0;
+                     i < (rx_ring->fbr[id]->num_entries / FBR_CHUNKS); i++) {
+                        dma_addr_t fbr_tmp_physaddr;
 
-                if (!rx_ring->fbr[1]->mem_virtaddrs[i]) {
-                        dev_err(&adapter->pdev->dev,
-                                "Could not alloc memory\n");
-                        return -ENOMEM;
-                }
-
-                /* See NOTE in "Save Physical Address" comment above */
-                fbr0_tmp_physaddr = rx_ring->fbr[1]->mem_physaddrs[i];
+                        rx_ring->fbr[id]->mem_virtaddrs[i] = dma_alloc_coherent(
+                                        &adapter->pdev->dev, fbr_chunksize,
+                                        &rx_ring->fbr[id]->mem_physaddrs[i],
+                                        GFP_KERNEL);
 
-                et131x_align_allocated_memory(adapter,
-                                              &fbr0_tmp_physaddr,
-                                              &fbr0_offset,
-                                              rx_ring->fbr[1]->buffsize - 1);
+                        if (!rx_ring->fbr[id]->mem_virtaddrs[i]) {
+                                dev_err(&adapter->pdev->dev,
+                                        "Could not alloc memory\n");
+                                return -ENOMEM;
+                        }
 
-                for (j = 0; j < FBR_CHUNKS; j++) {
-                        u32 index = (i * FBR_CHUNKS) + j;
+                        /* See NOTE in "Save Physical Address" comment above */
+                        fbr_tmp_physaddr = rx_ring->fbr[id]->mem_physaddrs[i];
 
-                        rx_ring->fbr[1]->virt[index] =
-                            (u8 *) rx_ring->fbr[1]->mem_virtaddrs[i] +
-                            (j * rx_ring->fbr[1]->buffsize) + fbr0_offset;
+                        for (j = 0; j < FBR_CHUNKS; j++) {
+                                u32 index = (i * FBR_CHUNKS) + j;
 
-                        rx_ring->fbr[1]->bus_high[index] =
-                            (u32) (fbr0_tmp_physaddr >> 32);
-                        rx_ring->fbr[1]->bus_low[index] =
-                            (u32) fbr0_tmp_physaddr;
+                                /* Save the Virtual address of this index for
+                                 * quick access later
+                                 */
+                                rx_ring->fbr[id]->virt[index] =
+                                  (u8 *) rx_ring->fbr[id]->mem_virtaddrs[i] +
+                                  (j * rx_ring->fbr[id]->buffsize);
 
-                        fbr0_tmp_physaddr += rx_ring->fbr[1]->buffsize;
+                                /* now store the physical address in the
+                                 * descriptor so the device can access it
+                                 */
+                                rx_ring->fbr[id]->bus_high[index] =
+                                                upper_32_bits(fbr_tmp_physaddr);
+                                rx_ring->fbr[id]->bus_low[index] =
+                                                lower_32_bits(fbr_tmp_physaddr);
 
-                        rx_ring->fbr[1]->buffer1[index] =
-                            rx_ring->fbr[1]->virt[index];
-                        rx_ring->fbr[1]->buffer2[index] =
-                            rx_ring->fbr[1]->virt[index] - 4;
+                                fbr_tmp_physaddr += rx_ring->fbr[id]->buffsize;
+                        }
                 }
         }
-#endif
 
         /* Allocate an area of memory for FIFO of Packet Status ring entries */
         pktstat_ringsize =
@@ -2578,21 +2385,6 @@ static int et131x_rx_dma_memory_alloc(struct et131x_adapter *adapter)
         rx_ring->num_rfd = NIC_DEFAULT_NUM_RFD;
         pr_info("PRS %llx\n", (unsigned long long)rx_ring->rx_status_bus);
 
-        /* Recv
-         * kmem_cache_create initializes a lookaside list. After successful
-         * creation, nonpaged fixed-size blocks can be allocated from and
-         * freed to the lookaside list.
-         * RFDs will be allocated from this pool.
-         */
-        rx_ring->recv_lookaside = kmem_cache_create(adapter->netdev->name,
-                                                   sizeof(struct rfd),
-                                                   0,
-                                                   SLAB_CACHE_DMA |
-                                                   SLAB_HWCACHE_ALIGN,
-                                                   NULL);
-
-        adapter->flags |= fMP_ADAPTER_RECV_LOOKASIDE;
-
         /* The RFDs are going to be put on lists later on, so initialize the
          * lists now.
          */
@@ -2606,6 +2398,7 @@ static int et131x_rx_dma_memory_alloc(struct et131x_adapter *adapter)
  */
 static void et131x_rx_dma_memory_free(struct et131x_adapter *adapter)
 {
+        u8 id;
         u32 index;
         u32 bufsize;
         u32 pktstat_ringsize;
@@ -2624,92 +2417,45 @@ static void et131x_rx_dma_memory_free(struct et131x_adapter *adapter)
 
                 list_del(&rfd->list_node);
                 rfd->skb = NULL;
-                kmem_cache_free(adapter->rx_ring.recv_lookaside, rfd);
+                kfree(rfd);
         }
 
-        /* Free Free Buffer Ring 1 */
-        if (rx_ring->fbr[0]->ring_virtaddr) {
-                /* First the packet memory */
-                for (index = 0; index <
-                     (rx_ring->fbr[0]->num_entries / FBR_CHUNKS); index++) {
-                        if (rx_ring->fbr[0]->mem_virtaddrs[index]) {
-                                u32 fbr1_align;
-
-                                if (rx_ring->fbr[0]->buffsize > 4096)
-                                        fbr1_align = 4096;
-                                else
-                                        fbr1_align = rx_ring->fbr[0]->buffsize;
-
-                                bufsize =
-                                    (rx_ring->fbr[0]->buffsize * FBR_CHUNKS) +
-                                    fbr1_align - 1;
-
-                                dma_free_coherent(&adapter->pdev->dev,
-                                        bufsize,
-                                        rx_ring->fbr[0]->mem_virtaddrs[index],
-                                        rx_ring->fbr[0]->mem_physaddrs[index]);
-
-                                rx_ring->fbr[0]->mem_virtaddrs[index] = NULL;
-                        }
-                }
-
-                /* Now the FIFO itself */
-                rx_ring->fbr[0]->ring_virtaddr = (void *)((u8 *)
-                    rx_ring->fbr[0]->ring_virtaddr - rx_ring->fbr[0]->offset);
-
-                bufsize =
-                    (sizeof(struct fbr_desc) * rx_ring->fbr[0]->num_entries) +
-                                                                        0xfff;
-
-                dma_free_coherent(&adapter->pdev->dev, bufsize,
-                                    rx_ring->fbr[0]->ring_virtaddr,
-                                    rx_ring->fbr[0]->ring_physaddr);
-
-                rx_ring->fbr[0]->ring_virtaddr = NULL;
-        }
+        /* Free Free Buffer Rings */
+        for (id = 0; id < NUM_FBRS; id++) {
+                if (!rx_ring->fbr[id]->ring_virtaddr)
+                        continue;
 
-#ifdef USE_FBR0
-        /* Now the same for Free Buffer Ring 0 */
-        if (rx_ring->fbr[1]->ring_virtaddr) {
                 /* First the packet memory */
-                for (index = 0; index <
-                     (rx_ring->fbr[1]->num_entries / FBR_CHUNKS); index++) {
-                        if (rx_ring->fbr[1]->mem_virtaddrs[index]) {
+                for (index = 0;
+                     index < (rx_ring->fbr[id]->num_entries / FBR_CHUNKS);
+                     index++) {
+                        if (rx_ring->fbr[id]->mem_virtaddrs[index]) {
                                 bufsize =
-                                    (rx_ring->fbr[1]->buffsize *
-                                     (FBR_CHUNKS + 1)) - 1;
+                                    rx_ring->fbr[id]->buffsize * FBR_CHUNKS;
 
                                 dma_free_coherent(&adapter->pdev->dev,
                                         bufsize,
-                                        rx_ring->fbr[1]->mem_virtaddrs[index],
-                                        rx_ring->fbr[1]->mem_physaddrs[index]);
+                                        rx_ring->fbr[id]->mem_virtaddrs[index],
+                                        rx_ring->fbr[id]->mem_physaddrs[index]);
 
-                                rx_ring->fbr[1]->mem_virtaddrs[index] = NULL;
+                                rx_ring->fbr[id]->mem_virtaddrs[index] = NULL;
                         }
                 }
 
-                /* Now the FIFO itself */
-                rx_ring->fbr[1]->ring_virtaddr = (void *)((u8 *)
-                    rx_ring->fbr[1]->ring_virtaddr - rx_ring->fbr[1]->offset);
-
                 bufsize =
-                    (sizeof(struct fbr_desc) * rx_ring->fbr[1]->num_entries) +
-                                                                        0xfff;
+                    sizeof(struct fbr_desc) * rx_ring->fbr[id]->num_entries;
 
-                dma_free_coherent(&adapter->pdev->dev,
-                                  bufsize,
-                                  rx_ring->fbr[1]->ring_virtaddr,
-                                  rx_ring->fbr[1]->ring_physaddr);
+                dma_free_coherent(&adapter->pdev->dev, bufsize,
+                                    rx_ring->fbr[id]->ring_virtaddr,
+                                    rx_ring->fbr[id]->ring_physaddr);
 
-                rx_ring->fbr[1]->ring_virtaddr = NULL;
+                rx_ring->fbr[id]->ring_virtaddr = NULL;
         }
-#endif
 
         /* Free Packet Status Ring */
         if (rx_ring->ps_ring_virtaddr) {
-                pktstat_ringsize =
-                    sizeof(struct pkt_stat_desc) *
-                    adapter->rx_ring.psr_num_entries;
+                pktstat_ringsize = sizeof(struct pkt_stat_desc) *
+                                        adapter->rx_ring.psr_num_entries;
 
                 dma_free_coherent(&adapter->pdev->dev, pktstat_ringsize,
                                     rx_ring->ps_ring_virtaddr,
@@ -2726,18 +2472,9 @@ static void et131x_rx_dma_memory_free(struct et131x_adapter *adapter)
                 rx_ring->rx_status_block = NULL;
         }
 
-        /* Destroy the lookaside (RFD) pool */
-        if (adapter->flags & fMP_ADAPTER_RECV_LOOKASIDE) {
-                kmem_cache_destroy(rx_ring->recv_lookaside);
-                adapter->flags &= ~fMP_ADAPTER_RECV_LOOKASIDE;
-        }
-
         /* Free the FBR Lookup Table */
-#ifdef USE_FBR0
-        kfree(rx_ring->fbr[1]);
-#endif
-
         kfree(rx_ring->fbr[0]);
+        kfree(rx_ring->fbr[1]);
 
         /* Reset Counters */
         rx_ring->num_ready_recv = 0;
@@ -2751,8 +2488,7 @@ static void et131x_rx_dma_memory_free(struct et131x_adapter *adapter)
  */
 static int et131x_init_recv(struct et131x_adapter *adapter)
 {
-        int status = -ENOMEM;
-        struct rfd *rfd = NULL;
+        struct rfd *rfd;
         u32 rfdct;
         u32 numrfd = 0;
         struct rx_ring *rx_ring;
@@ -2762,14 +2498,11 @@ static int et131x_init_recv(struct et131x_adapter *adapter)
 
         /* Setup each RFD */
         for (rfdct = 0; rfdct < rx_ring->num_rfd; rfdct++) {
-                rfd = kmem_cache_alloc(rx_ring->recv_lookaside,
-                                                     GFP_ATOMIC | GFP_DMA);
+                rfd = kzalloc(sizeof(struct rfd), GFP_ATOMIC | GFP_DMA);
 
                 if (!rfd) {
-                        dev_err(&adapter->pdev->dev,
-                                  "Couldn't alloc RFD out of kmem_cache\n");
-                        status = -ENOMEM;
-                        continue;
+                        dev_err(&adapter->pdev->dev, "Couldn't alloc RFD\n");
+                        return -ENOMEM;
                 }
 
                 rfd->skb = NULL;
@@ -2782,17 +2515,7 @@ static int et131x_init_recv(struct et131x_adapter *adapter)
                 numrfd++;
         }
 
-        if (numrfd > NIC_MIN_NUM_RFD)
-                status = 0;
-
-        rx_ring->num_rfd = numrfd;
-
-        if (status != 0) {
-                kmem_cache_free(rx_ring->recv_lookaside, rfd);
-                dev_err(&adapter->pdev->dev,
-                          "Allocation problems in et131x_init_recv\n");
-        }
-        return status;
+        return 0;
 }
 
 /**
@@ -2831,51 +2554,34 @@ static void nic_return_rfd(struct et131x_adapter *adapter, struct rfd *rfd)
         /* We don't use any of the OOB data besides status. Otherwise, we
          * need to clean up OOB data
          */
-        if (
-#ifdef USE_FBR0
-            (ring_index == 0 && buff_index < rx_local->fbr[1]->num_entries) ||
-#endif
-            (ring_index == 1 && buff_index < rx_local->fbr[0]->num_entries)) {
+        if (buff_index < rx_local->fbr[ring_index]->num_entries) {
+                u32 *offset;
+                struct fbr_desc *next;
+
                 spin_lock_irqsave(&adapter->fbr_lock, flags);
 
-                if (ring_index == 1) {
-                        struct fbr_desc *next = (struct fbr_desc *)
-                                        (rx_local->fbr[0]->ring_virtaddr) +
-                                        INDEX10(rx_local->fbr[0]->local_full);
+                if (ring_index == 0)
+                        offset = &rx_dma->fbr0_full_offset;
+                else
+                        offset = &rx_dma->fbr1_full_offset;
 
-                        /* Handle the Free Buffer Ring advancement here. Write
-                         * the PA / Buffer Index for the returned buffer into
-                         * the oldest (next to be freed)FBR entry
-                         */
-                        next->addr_hi = rx_local->fbr[0]->bus_high[buff_index];
-                        next->addr_lo = rx_local->fbr[0]->bus_low[buff_index];
-                        next->word2 = buff_index;
-
-                        writel(bump_free_buff_ring(
-                                        &rx_local->fbr[0]->local_full,
-                                        rx_local->fbr[0]->num_entries - 1),
-                                        &rx_dma->fbr1_full_offset);
-                }
-#ifdef USE_FBR0
-                else {
-                        struct fbr_desc *next = (struct fbr_desc *)
-                                rx_local->fbr[1]->ring_virtaddr +
-                                    INDEX10(rx_local->fbr[1]->local_full);
+                next = (struct fbr_desc *)
+                           (rx_local->fbr[ring_index]->ring_virtaddr) +
+                                INDEX10(rx_local->fbr[ring_index]->local_full);
+
+                /* Handle the Free Buffer Ring advancement here. Write
+                 * the PA / Buffer Index for the returned buffer into
+                 * the oldest (next to be freed)FBR entry
+                 */
+                next->addr_hi = rx_local->fbr[ring_index]->bus_high[buff_index];
+                next->addr_lo = rx_local->fbr[ring_index]->bus_low[buff_index];
+                next->word2 = buff_index;
+
+                writel(bump_free_buff_ring(
+                                  &rx_local->fbr[ring_index]->local_full,
+                                  rx_local->fbr[ring_index]->num_entries - 1),
+                       offset);
 
-                        /* Handle the Free Buffer Ring advancement here. Write
-                         * the PA / Buffer Index for the returned buffer into
-                         * the oldest (next to be freed) FBR entry
-                         */
-                        next->addr_hi = rx_local->fbr[1]->bus_high[buff_index];
-                        next->addr_lo = rx_local->fbr[1]->bus_low[buff_index];
-                        next->word2 = buff_index;
-
-                        writel(bump_free_buff_ring(
-                                        &rx_local->fbr[1]->local_full,
-                                        rx_local->fbr[1]->num_entries - 1),
-                               &rx_dma->fbr0_full_offset);
-                }
-#endif
                 spin_unlock_irqrestore(&adapter->fbr_lock, flags);
         } else {
                 dev_err(&adapter->pdev->dev,
@@ -2919,6 +2625,7 @@ static struct rfd *nic_rx_pkts(struct et131x_adapter *adapter)
         u32 len;
         u32 word0;
         u32 word1;
+        struct sk_buff *skb;
 
         /* RX Status block is written by the DMA engine prior to every
          * interrupt. It contains the next to be used entry in the Packet
@@ -2929,16 +2636,14 @@ static struct rfd *nic_rx_pkts(struct et131x_adapter *adapter)
 
         /* Check the PSR and wrap bits do not match */
         if ((word1 & 0x1FFF) == (rx_local->local_psr_full & 0x1FFF))
-                /* Looks like this ring is not updated yet */
-                return NULL;
+                return NULL; /* Looks like this ring is not updated yet */
 
         /* The packet status ring indicates that data is available. */
         psr = (struct pkt_stat_desc *) (rx_local->ps_ring_virtaddr) +
                         (rx_local->local_psr_full & 0xFFF);
 
-        /* Grab any information that is required once the PSR is
-         * advanced, since we can no longer rely on the memory being
-         * accurate
+        /* Grab any information that is required once the PSR is advanced,
+         * since we can no longer rely on the memory being accurate
          */
         len = psr->word1 & 0xFFFF;
         ring_index = (psr->word1 >> 26) & 0x03;
@@ -2955,40 +2660,24 @@ static struct rfd *nic_rx_pkts(struct et131x_adapter *adapter)
                 rx_local->local_psr_full ^= 0x1000;
         }
 
-        writel(rx_local->local_psr_full,
-               &adapter->regs->rxdma.psr_full_offset);
-
-#ifndef USE_FBR0
-        if (ring_index != 1)
-                return NULL;
-#endif
+        writel(rx_local->local_psr_full, &adapter->regs->rxdma.psr_full_offset);
 
-#ifdef USE_FBR0
         if (ring_index > 1 ||
-                (ring_index == 0 &&
-                buff_index > rx_local->fbr[1]->num_entries - 1) ||
-                (ring_index == 1 &&
-                buff_index > rx_local->fbr[0]->num_entries - 1)) {
-#else
-        if (ring_index != 1 || buff_index > rx_local->fbr[0]->num_entries - 1) {
-#endif
+                    buff_index > rx_local->fbr[ring_index]->num_entries - 1) {
                 /* Illegal buffer or ring index cannot be used by S/W*/
                 dev_err(&adapter->pdev->dev,
-                          "NICRxPkts PSR Entry %d indicates "
-                          "length of %d and/or bad bi(%d)\n",
-                          rx_local->local_psr_full & 0xFFF,
-                          len, buff_index);
+                        "NICRxPkts PSR Entry %d indicates length of %d and/or bad bi(%d)\n",
+                        rx_local->local_psr_full & 0xFFF, len, buff_index);
                 return NULL;
         }
 
         /* Get and fill the RFD. */
         spin_lock_irqsave(&adapter->rcv_lock, flags);
 
-        rfd = NULL;
         element = rx_local->recv_list.next;
         rfd = (struct rfd *) list_entry(element, struct rfd, list_node);
 
-        if (rfd == NULL) {
+        if (!rfd) {
                 spin_unlock_irqrestore(&adapter->rcv_lock, flags);
                 return NULL;
         }
@@ -3001,119 +2690,95 @@ static struct rfd *nic_rx_pkts(struct et131x_adapter *adapter)
         rfd->bufferindex = buff_index;
         rfd->ringindex = ring_index;
 
-        /* In V1 silicon, there is a bug which screws up filtering of
-         * runt packets.  Therefore runt packet filtering is disabled
-         * in the MAC and the packets are dropped here.  They are
-         * also counted here.
+        /* In V1 silicon, there is a bug which screws up filtering of runt
+         * packets. Therefore runt packet filtering is disabled in the MAC and
+         * the packets are dropped here. They are also counted here.
          */
         if (len < (NIC_MIN_PACKET_SIZE + 4)) {
                 adapter->stats.rx_other_errs++;
                 len = 0;
         }
 
-        if (len) {
-                /* Determine if this is a multicast packet coming in */
-                if ((word0 & ALCATEL_MULTICAST_PKT) &&
-                    !(word0 & ALCATEL_BROADCAST_PKT)) {
-                        /* Promiscuous mode and Multicast mode are
-                         * not mutually exclusive as was first
-                         * thought.  I guess Promiscuous is just
-                         * considered a super-set of the other
-                         * filters. Generally filter is 0x2b when in
-                         * promiscuous mode.
-                         */
-                        if ((adapter->packet_filter &
-                                        ET131X_PACKET_TYPE_MULTICAST)
-                            && !(adapter->packet_filter &
-                                        ET131X_PACKET_TYPE_PROMISCUOUS)
-                            && !(adapter->packet_filter &
+        if (len == 0) {
+                rfd->len = 0;
+                goto out;
+        }
+
+        /* Determine if this is a multicast packet coming in */
+        if ((word0 & ALCATEL_MULTICAST_PKT) &&
+            !(word0 & ALCATEL_BROADCAST_PKT)) {
+                /* Promiscuous mode and Multicast mode are not mutually
+                 * exclusive as was first thought. I guess Promiscuous is just
+                 * considered a super-set of the other filters. Generally filter
+                 * is 0x2b when in promiscuous mode.
+                 */
+                if ((adapter->packet_filter & ET131X_PACKET_TYPE_MULTICAST)
+                   && !(adapter->packet_filter & ET131X_PACKET_TYPE_PROMISCUOUS)
+                   && !(adapter->packet_filter &
                                         ET131X_PACKET_TYPE_ALL_MULTICAST)) {
-                                /*
-                                 * Note - ring_index for fbr[] array is reversed
-                                 * 1 for FBR0 etc
-                                 */
-                                buf = rx_local->fbr[(ring_index == 0 ? 1 : 0)]->
-                                                virt[buff_index];
+                        buf = rx_local->fbr[ring_index]->virt[buff_index];
 
-                                /* Loop through our list to see if the
-                                 * destination address of this packet
-                                 * matches one in our list.
-                                 */
-                                for (i = 0; i < adapter->multicast_addr_count;
-                                     i++) {
-                                        if (buf[0] ==
-                                                adapter->multicast_list[i][0]
-                                            && buf[1] ==
-                                                adapter->multicast_list[i][1]
-                                            && buf[2] ==
-                                                adapter->multicast_list[i][2]
-                                            && buf[3] ==
-                                                adapter->multicast_list[i][3]
-                                            && buf[4] ==
-                                                adapter->multicast_list[i][4]
-                                            && buf[5] ==
-                                                adapter->multicast_list[i][5]) {
-                                                break;
-                                        }
+                        /* Loop through our list to see if the destination
+                         * address of this packet matches one in our list.
+                         */
+                        for (i = 0; i < adapter->multicast_addr_count; i++) {
+                                if (buf[0] == adapter->multicast_list[i][0]
+                                 && buf[1] == adapter->multicast_list[i][1]
+                                 && buf[2] == adapter->multicast_list[i][2]
+                                 && buf[3] == adapter->multicast_list[i][3]
+                                 && buf[4] == adapter->multicast_list[i][4]
+                                 && buf[5] == adapter->multicast_list[i][5]) {
+                                        break;
                                 }
-
-                                /* If our index is equal to the number
-                                 * of Multicast address we have, then
-                                 * this means we did not find this
-                                 * packet's matching address in our
-                                 * list.  Set the len to zero,
-                                 * so we free our RFD when we return
-                                 * from this function.
-                                 */
-                                if (i == adapter->multicast_addr_count)
-                                        len = 0;
                         }
 
-                        if (len > 0)
-                                adapter->stats.multicast_pkts_rcvd++;
-                } else if (word0 & ALCATEL_BROADCAST_PKT)
-                        adapter->stats.broadcast_pkts_rcvd++;
-                else
-                        /* Not sure what this counter measures in
-                         * promiscuous mode. Perhaps we should check
-                         * the MAC address to see if it is directed
-                         * to us in promiscuous mode.
+                        /* If our index is equal to the number of Multicast
+                         * address we have, then this means we did not find this
+                         * packet's matching address in our list. Set the len to
+                         * zero, so we free our RFD when we return from this
+                         * function.
                          */
-                        adapter->stats.unicast_pkts_rcvd++;
-        }
+                        if (i == adapter->multicast_addr_count)
+                                len = 0;
+                }
 
-        if (len > 0) {
-                struct sk_buff *skb = NULL;
+                if (len > 0)
+                        adapter->stats.multicast_pkts_rcvd++;
+        } else if (word0 & ALCATEL_BROADCAST_PKT) {
+                adapter->stats.broadcast_pkts_rcvd++;
+        } else {
+                /* Not sure what this counter measures in promiscuous mode.
+                 * Perhaps we should check the MAC address to see if it is
+                 * directed to us in promiscuous mode.
+                 */
+                adapter->stats.unicast_pkts_rcvd++;
+        }
 
-                /*rfd->len = len - 4; */
-                rfd->len = len;
+        if (len == 0) {
+                rfd->len = 0;
+                goto out;
+        }
 
-                skb = dev_alloc_skb(rfd->len + 2);
-                if (!skb) {
-                        dev_err(&adapter->pdev->dev,
-                                  "Couldn't alloc an SKB for Rx\n");
-                        return NULL;
-                }
+        rfd->len = len;
 
-                adapter->net_stats.rx_bytes += rfd->len;
+        skb = dev_alloc_skb(rfd->len + 2);
+        if (!skb) {
+                dev_err(&adapter->pdev->dev, "Couldn't alloc an SKB for Rx\n");
+                return NULL;
+        }
 
-                /*
-                 * Note - ring_index for fbr[] array is reversed,
-                 * 1 for FBR0 etc
-                 */
-                memcpy(skb_put(skb, rfd->len),
-                    rx_local->fbr[(ring_index == 0 ? 1 : 0)]->virt[buff_index],
-                    rfd->len);
+        adapter->net_stats.rx_bytes += rfd->len;
 
-                skb->dev = adapter->netdev;
-                skb->protocol = eth_type_trans(skb, adapter->netdev);
-                skb->ip_summed = CHECKSUM_NONE;
+        memcpy(skb_put(skb, rfd->len),
+               rx_local->fbr[ring_index]->virt[buff_index],
+               rfd->len);
 
-                netif_rx_ni(skb);
-        } else {
-                rfd->len = 0;
-        }
+        skb->dev = adapter->netdev;
+        skb->protocol = eth_type_trans(skb, adapter->netdev);
+        skb->ip_summed = CHECKSUM_NONE;
+        netif_rx_ni(skb);
 
+out:
         nic_return_rfd(adapter, rfd);
         return rfd;
 }
@@ -3198,10 +2863,7 @@ static int et131x_tx_dma_memory_alloc(struct et131x_adapter *adapter)
                 return -ENOMEM;
         }
 
-        /* Allocate enough memory for the Tx descriptor ring, and allocate
-         * some extra so that the ring can be aligned on a 4k boundary.
-         */
-        desc_size = (sizeof(struct tx_desc) * NUM_DESC_PER_RING_TX) + 4096 - 1;
+        desc_size = (sizeof(struct tx_desc) * NUM_DESC_PER_RING_TX);
         tx_ring->tx_desc_ring =
             (struct tx_desc *) dma_alloc_coherent(&adapter->pdev->dev,
                                                   desc_size,
@@ -3245,8 +2907,7 @@ static void et131x_tx_dma_memory_free(struct et131x_adapter *adapter)
 
         if (adapter->tx_ring.tx_desc_ring) {
                 /* Free memory relating to Tx rings here */
-                desc_size = (sizeof(struct tx_desc) * NUM_DESC_PER_RING_TX)
-                                                                + 4096 - 1;
+                desc_size = (sizeof(struct tx_desc) * NUM_DESC_PER_RING_TX);
                 dma_free_coherent(&adapter->pdev->dev,
                                     desc_size,
                                     adapter->tx_ring.tx_desc_ring,
@@ -3285,6 +2946,7 @@ static int nic_send_packet(struct et131x_adapter *adapter, struct tcb *tcb)
         struct skb_frag_struct *frags = &skb_shinfo(skb)->frags[0];
         unsigned long flags;
         struct phy_device *phydev = adapter->phydev;
+        dma_addr_t dma_addr;
 
         /* Part of the optimizations of this send routine restrict us to
          * sending 24 fragments at a pass.  In practice we should never see
@@ -3313,85 +2975,47 @@ static int nic_send_packet(struct et131x_adapter *adapter, struct tcb *tcb)
                          * This will work until we determine why the hardware
                          * doesn't seem to like large fragments.
                          */
-                        if ((skb->len - skb->data_len) <= 1514) {
-                                desc[frag].addr_hi = 0;
+                        if (skb_headlen(skb) <= 1514) {
                                 /* Low 16bits are length, high is vlan and
                                    unused currently so zero */
-                                desc[frag].len_vlan =
-                                        skb->len - skb->data_len;
-
-                                /* NOTE: Here, the dma_addr_t returned from
-                                 * dma_map_single() is implicitly cast as a
-                                 * u32. Although dma_addr_t can be
-                                 * 64-bit, the address returned by
-                                 * dma_map_single() is always 32-bit
-                                 * addressable (as defined by the pci/dma
-                                 * subsystem)
-                                 */
-                                desc[frag++].addr_lo =
-                                    dma_map_single(&adapter->pdev->dev,
-                                                   skb->data,
-                                                   skb->len -
-                                                   skb->data_len,
-                                                   DMA_TO_DEVICE);
+                                desc[frag].len_vlan = skb_headlen(skb);
+                                dma_addr = dma_map_single(&adapter->pdev->dev,
+                                                          skb->data,
+                                                          skb_headlen(skb),
+                                                          DMA_TO_DEVICE);
+                                desc[frag].addr_lo = lower_32_bits(dma_addr);
+                                desc[frag].addr_hi = upper_32_bits(dma_addr);
+                                frag++;
                         } else {
-                                desc[frag].addr_hi = 0;
-                                desc[frag].len_vlan =
-                                    (skb->len - skb->data_len) / 2;
-
-                                /* NOTE: Here, the dma_addr_t returned from
-                                 * dma_map_single() is implicitly cast as a
-                                 * u32. Although dma_addr_t can be
-                                 * 64-bit, the address returned by
-                                 * dma_map_single() is always 32-bit
-                                 * addressable (as defined by the pci/dma
-                                 * subsystem)
-                                 */
-                                desc[frag++].addr_lo =
-                                    dma_map_single(&adapter->pdev->dev,
-                                                   skb->data,
-                                                   ((skb->len -
-                                                     skb->data_len) / 2),
-                                                   DMA_TO_DEVICE);
-                                desc[frag].addr_hi = 0;
-
-                                desc[frag].len_vlan =
-                                    (skb->len - skb->data_len) / 2;
-
-                                /* NOTE: Here, the dma_addr_t returned from
-                                 * dma_map_single() is implicitly cast as a
-                                 * u32. Although dma_addr_t can be
-                                 * 64-bit, the address returned by
-                                 * dma_map_single() is always 32-bit
-                                 * addressable (as defined by the pci/dma
-                                 * subsystem)
-                                 */
-                                desc[frag++].addr_lo =
-                                    dma_map_single(&adapter->pdev->dev,
-                                                   skb->data +
-                                                   ((skb->len -
-                                                     skb->data_len) / 2),
-                                                   ((skb->len -
-                                                     skb->data_len) / 2),
-                                                   DMA_TO_DEVICE);
+                                desc[frag].len_vlan = skb_headlen(skb) / 2;
+                                dma_addr = dma_map_single(&adapter->pdev->dev,
+                                                         skb->data,
+                                                         (skb_headlen(skb) / 2),
+                                                         DMA_TO_DEVICE);
+                                desc[frag].addr_lo = lower_32_bits(dma_addr);
+                                desc[frag].addr_hi = upper_32_bits(dma_addr);
+                                frag++;
+
+                                desc[frag].len_vlan = skb_headlen(skb) / 2;
+                                dma_addr = dma_map_single(&adapter->pdev->dev,
+                                                         skb->data +
+                                                         (skb_headlen(skb) / 2),
+                                                         (skb_headlen(skb) / 2),
+                                                         DMA_TO_DEVICE);
+                                desc[frag].addr_lo = lower_32_bits(dma_addr);
+                                desc[frag].addr_hi = upper_32_bits(dma_addr);
+                                frag++;
                         }
                 } else {
-                        desc[frag].addr_hi = 0;
-                        desc[frag].len_vlan =
-                                        frags[i - 1].size;
-
-                        /* NOTE: Here, the dma_addr_t returned from
-                         * dma_map_page() is implicitly cast as a u32.
-                         * Although dma_addr_t can be 64-bit, the address
-                         * returned by dma_map_page() is always 32-bit
-                         * addressable (as defined by the pci/dma subsystem)
-                         */
-                        desc[frag++].addr_lo = skb_frag_dma_map(
-                                                        &adapter->pdev->dev,
-                                                        &frags[i - 1],
-                                                        0,
-                                                        frags[i - 1].size,
-                                                        DMA_TO_DEVICE);
+                        desc[frag].len_vlan = frags[i - 1].size;
+                        dma_addr = skb_frag_dma_map(&adapter->pdev->dev,
+                                                    &frags[i - 1],
+                                                    0,
+                                                    frags[i - 1].size,
+                                                    DMA_TO_DEVICE);
+                        desc[frag].addr_lo = lower_32_bits(dma_addr);
+                        desc[frag].addr_hi = upper_32_bits(dma_addr);
+                        frag++;
                 }
         }
 
@@ -3521,7 +3145,7 @@ static int send_packet(struct sk_buff *skb, struct et131x_adapter *adapter)
 
         tcb->skb = skb;
 
-        if (skb->data != NULL && skb->len - skb->data_len >= 6) {
+        if (skb->data != NULL && skb_headlen(skb) >= 6) {
                 shbufva = (u16 *) skb->data;
 
                 if ((shbufva[0] == 0xffff) &&
@@ -3618,6 +3242,7 @@ static inline void free_send_packet(struct et131x_adapter *adapter,
         unsigned long flags;
         struct tx_desc *desc = NULL;
         struct net_device_stats *stats = &adapter->net_stats;
+        u64  dma_addr;
 
         if (tcb->flags & fMP_DEST_BROAD)
                 atomic_inc(&adapter->stats.broadcast_pkts_xmtd);
@@ -3638,8 +3263,11 @@ static inline void free_send_packet(struct et131x_adapter *adapter,
                                     (adapter->tx_ring.tx_desc_ring +
                                                 INDEX10(tcb->index_start));
 
+                        dma_addr = desc->addr_lo;
+                        dma_addr |= (u64)desc->addr_hi << 32;
+
                         dma_unmap_single(&adapter->pdev->dev,
-                                         desc->addr_lo,
+                                         dma_addr,
                                          desc->len_vlan, DMA_TO_DEVICE);
 
                         add_10bit(&tcb->index_start, 1);
@@ -3830,7 +3458,12 @@ static void et131x_get_regs(struct net_device *netdev,
         et131x_mii_read(adapter, 0x08, (u16 *)&regs_buff[num++]);
         et131x_mii_read(adapter, MII_CTRL1000, (u16 *)&regs_buff[num++]);
         et131x_mii_read(adapter, MII_STAT1000, (u16 *)&regs_buff[num++]);
+        et131x_mii_read(adapter, 0x0b, (u16 *)&regs_buff[num++]);
+        et131x_mii_read(adapter, 0x0c, (u16 *)&regs_buff[num++]);
+        et131x_mii_read(adapter, MII_MMD_CTRL, (u16 *)&regs_buff[num++]);
+        et131x_mii_read(adapter, MII_MMD_DATA, (u16 *)&regs_buff[num++]);
         et131x_mii_read(adapter, MII_ESTATUS, (u16 *)&regs_buff[num++]);
+
         et131x_mii_read(adapter, PHY_INDEX_REG, (u16 *)&regs_buff[num++]);
         et131x_mii_read(adapter, PHY_DATA_REG, (u16 *)&regs_buff[num++]);
         et131x_mii_read(adapter, PHY_MPHY_CONTROL_REG,
@@ -3839,6 +3472,7 @@ static void et131x_get_regs(struct net_device *netdev,
                         (u16 *)&regs_buff[num++]);
         et131x_mii_read(adapter, PHY_LOOPBACK_CONTROL+1,
                         (u16 *)&regs_buff[num++]);
+
         et131x_mii_read(adapter, PHY_REGISTER_MGMT_CONTROL,
                         (u16 *)&regs_buff[num++]);
         et131x_mii_read(adapter, PHY_CONFIG, (u16 *)&regs_buff[num++]);
@@ -3943,7 +3577,7 @@ static struct ethtool_ops et131x_ethtool_ops = {
         .get_drvinfo    = et131x_get_drvinfo,
         .get_regs_len   = et131x_get_regs_len,
         .get_regs       = et131x_get_regs,
-        .get_link = ethtool_op_get_link,
+        .get_link       = ethtool_op_get_link,
 };
 /**
  * et131x_hwaddr_init - set up the MAC Address on the ET1310
@@ -4110,8 +3744,18 @@ static void et131x_error_timer_handler(unsigned long data)
         }
 
         /* This is a periodic timer, so reschedule */
-        mod_timer(&adapter->error_timer, jiffies +
-                                          TX_ERROR_PERIOD * HZ / 1000);
+        mod_timer(&adapter->error_timer, jiffies + TX_ERROR_PERIOD * HZ / 1000);
+}
+
+/**
+ * et131x_adapter_memory_free - Free all memory allocated for use by Tx & Rx
+ * @adapter: pointer to our private adapter structure
+ */
+static void et131x_adapter_memory_free(struct et131x_adapter *adapter)
+{
+        /* Free DMA memory */
+        et131x_tx_dma_memory_free(adapter);
+        et131x_rx_dma_memory_free(adapter);
 }
 
 /**
@@ -4144,26 +3788,14 @@ static int et131x_adapter_memory_alloc(struct et131x_adapter *adapter)
 
         /* Init receive data structures */
         status = et131x_init_recv(adapter);
-        if (status != 0) {
+        if (status) {
                 dev_err(&adapter->pdev->dev,
                         "et131x_init_recv FAILED\n");
-                et131x_tx_dma_memory_free(adapter);
-                et131x_rx_dma_memory_free(adapter);
+                et131x_adapter_memory_free(adapter);
         }
         return status;
 }
 
-/**
- * et131x_adapter_memory_free - Free all memory allocated for use by Tx & Rx
- * @adapter: pointer to our private adapter structure
- */
-static void et131x_adapter_memory_free(struct et131x_adapter *adapter)
-{
-        /* Free DMA memory */
-        et131x_tx_dma_memory_free(adapter);
-        et131x_rx_dma_memory_free(adapter);
-}
-
 static void et131x_adjust_link(struct net_device *netdev)
 {
         struct et131x_adapter *adapter = netdev_priv(netdev);
@@ -4358,7 +3990,7 @@ static struct et131x_adapter *et131x_adapter_init(struct net_device *netdev,
  * PCI subsystem detects that a PCI device which matches the information
  * contained in the pci_device_id table has been removed.
  */
-static void __devexit et131x_pci_remove(struct pci_dev *pdev)
+static void et131x_pci_remove(struct pci_dev *pdev)
 {
         struct net_device *netdev = pci_get_drvdata(pdev);
         struct et131x_adapter *adapter = netdev_priv(netdev);
@@ -4558,182 +4190,169 @@ static void et131x_isr_handler(struct work_struct *work)
 
         status &= 0xffffffd7;
 
-        if (status) {
-                /* Handle the TXDMA Error interrupt */
-                if (status & ET_INTR_TXDMA_ERR) {
-                        u32 txdma_err;
-
-                        /* Following read also clears the register (COR) */
-                        txdma_err = readl(&iomem->txdma.tx_dma_error);
+        if (!status)
+                goto out;
 
-                        dev_warn(&adapter->pdev->dev,
-                                    "TXDMA_ERR interrupt, error = %d\n",
-                                    txdma_err);
-                }
+        /* Handle the TXDMA Error interrupt */
+        if (status & ET_INTR_TXDMA_ERR) {
+                u32 txdma_err;
 
-                /* Handle Free Buffer Ring 0 and 1 Low interrupt */
-                if (status &
-                    (ET_INTR_RXDMA_FB_R0_LOW | ET_INTR_RXDMA_FB_R1_LOW)) {
-                        /*
-                         * This indicates the number of unused buffers in
-                         * RXDMA free buffer ring 0 is <= the limit you
-                         * programmed. Free buffer resources need to be
-                         * returned.  Free buffers are consumed as packets
-                         * are passed from the network to the host. The host
-                         * becomes aware of the packets from the contents of
-                         * the packet status ring. This ring is queried when
-                         * the packet done interrupt occurs. Packets are then
-                         * passed to the OS. When the OS is done with the
-                         * packets the resources can be returned to the
-                         * ET1310 for re-use. This interrupt is one method of
-                         * returning resources.
-                         */
+                /* Following read also clears the register (COR) */
+                txdma_err = readl(&iomem->txdma.tx_dma_error);
 
-                        /* If the user has flow control on, then we will
-                         * send a pause packet, otherwise just exit
-                         */
-                        if (adapter->flowcontrol == FLOW_TXONLY ||
-                            adapter->flowcontrol == FLOW_BOTH) {
-                                u32 pm_csr;
+                dev_warn(&adapter->pdev->dev,
+                            "TXDMA_ERR interrupt, error = %d\n",
+                            txdma_err);
+        }
 
-                                /* Tell the device to send a pause packet via
-                                 * the back pressure register (bp req  and
-                                 * bp xon/xoff)
-                                 */
-                                pm_csr = readl(&iomem->global.pm_csr);
-                                if (!et1310_in_phy_coma(adapter))
-                                        writel(3, &iomem->txmac.bp_ctrl);
-                        }
-                }
+        /* Handle Free Buffer Ring 0 and 1 Low interrupt */
+        if (status & (ET_INTR_RXDMA_FB_R0_LOW | ET_INTR_RXDMA_FB_R1_LOW)) {
+                /*
+                 * This indicates the number of unused buffers in RXDMA free
+                 * buffer ring 0 is <= the limit you programmed. Free buffer
+                 * resources need to be returned.  Free buffers are consumed as
+                 * packets are passed from the network to the host. The host
+                 * becomes aware of the packets from the contents of the packet
+                 * status ring. This ring is queried when the packet done
+                 * interrupt occurs. Packets are then passed to the OS. When
+                 * the OS is done with the packets the resources can be
+                 * returned to the ET1310 for re-use. This interrupt is one
+                 * method of returning resources.
+                 */
 
-                /* Handle Packet Status Ring Low Interrupt */
-                if (status & ET_INTR_RXDMA_STAT_LOW) {
+                /*
+                 *  If the user has flow control on, then we will
+                 * send a pause packet, otherwise just exit
+                 */
+                if (adapter->flowcontrol == FLOW_TXONLY ||
+                    adapter->flowcontrol == FLOW_BOTH) {
+                        u32 pm_csr;
 
                         /*
-                         * Same idea as with the two Free Buffer Rings.
-                         * Packets going from the network to the host each
-                         * consume a free buffer resource and a packet status
-                         * resource.  These resoures are passed to the OS.
-                         * When the OS is done with the resources, they need
-                         * to be returned to the ET1310. This is one method
-                         * of returning the resources.
+                         * Tell the device to send a pause packet via the back
+                         * pressure register (bp req and bp xon/xoff)
                          */
+                        pm_csr = readl(&iomem->global.pm_csr);
+                        if (!et1310_in_phy_coma(adapter))
+                                writel(3, &iomem->txmac.bp_ctrl);
                 }
+        }
 
-                /* Handle RXDMA Error Interrupt */
-                if (status & ET_INTR_RXDMA_ERR) {
-                        /*
-                         * The rxdma_error interrupt is sent when a time-out
-                         * on a request issued by the JAGCore has occurred or
-                         * a completion is returned with an un-successful
-                         * status.  In both cases the request is considered
-                         * complete. The JAGCore will automatically re-try the
-                         * request in question. Normally information on events
-                         * like these are sent to the host using the "Advanced
-                         * Error Reporting" capability. This interrupt is
-                         * another way of getting similar information. The
-                         * only thing required is to clear the interrupt by
-                         * reading the ISR in the global resources. The
-                         * JAGCore will do a re-try on the request.  Normally
-                         * you should never see this interrupt. If you start
-                         * to see this interrupt occurring frequently then
-                         * something bad has occurred. A reset might be the
-                         * thing to do.
-                         */
-                        /* TRAP();*/
+        /* Handle Packet Status Ring Low Interrupt */
+        if (status & ET_INTR_RXDMA_STAT_LOW) {
+                /*
+                 * Same idea as with the two Free Buffer Rings. Packets going
+                 * from the network to the host each consume a free buffer
+                 * resource and a packet status resource. These resoures are
+                 * passed to the OS. When the OS is done with the resources,
+                 * they need to be returned to the ET1310. This is one method
+                 * of returning the resources.
+                 */
+        }
 
-                        dev_warn(&adapter->pdev->dev,
-                                    "RxDMA_ERR interrupt, error %x\n",
-                                    readl(&iomem->txmac.tx_test));
-                }
+        /* Handle RXDMA Error Interrupt */
+        if (status & ET_INTR_RXDMA_ERR) {
+                /*
+                 * The rxdma_error interrupt is sent when a time-out on a
+                 * request issued by the JAGCore has occurred or a completion is
+                 * returned with an un-successful status. In both cases the
+                 * request is considered complete. The JAGCore will
+                 * automatically re-try the request in question. Normally
+                 * information on events like these are sent to the host using
+                 * the "Advanced Error Reporting" capability. This interrupt is
+                 * another way of getting similar information. The only thing
+                 * required is to clear the interrupt by reading the ISR in the
+                 * global resources. The JAGCore will do a re-try on the
+                 * request. Normally you should never see this interrupt. If
+                 * you start to see this interrupt occurring frequently then
+                 * something bad has occurred. A reset might be the thing to do.
+                 */
+                /* TRAP();*/
 
-                /* Handle the Wake on LAN Event */
-                if (status & ET_INTR_WOL) {
-                        /*
-                         * This is a secondary interrupt for wake on LAN.
-                         * The driver should never see this, if it does,
-                         * something serious is wrong. We will TRAP the
-                         * message when we are in DBG mode, otherwise we
-                         * will ignore it.
-                         */
-                        dev_err(&adapter->pdev->dev, "WAKE_ON_LAN interrupt\n");
-                }
+                dev_warn(&adapter->pdev->dev,
+                            "RxDMA_ERR interrupt, error %x\n",
+                            readl(&iomem->txmac.tx_test));
+        }
 
-                /* Let's move on to the TxMac */
-                if (status & ET_INTR_TXMAC) {
-                        u32 err = readl(&iomem->txmac.err);
+        /* Handle the Wake on LAN Event */
+        if (status & ET_INTR_WOL) {
+                /*
+                 * This is a secondary interrupt for wake on LAN. The driver
+                 * should never see this, if it does, something serious is
+                 * wrong. We will TRAP the message when we are in DBG mode,
+                 * otherwise we will ignore it.
+                 */
+                dev_err(&adapter->pdev->dev, "WAKE_ON_LAN interrupt\n");
+        }
 
-                        /*
-                         * When any of the errors occur and TXMAC generates
-                         * an interrupt to report these errors, it usually
-                         * means that TXMAC has detected an error in the data
-                         * stream retrieved from the on-chip Tx Q. All of
-                         * these errors are catastrophic and TXMAC won't be
-                         * able to recover data when these errors occur.  In
-                         * a nutshell, the whole Tx path will have to be reset
-                         * and re-configured afterwards.
-                         */
-                        dev_warn(&adapter->pdev->dev,
-                                    "TXMAC interrupt, error 0x%08x\n",
-                                    err);
+        /* Let's move on to the TxMac */
+        if (status & ET_INTR_TXMAC) {
+                u32 err = readl(&iomem->txmac.err);
 
-                        /* If we are debugging, we want to see this error,
-                         * otherwise we just want the device to be reset and
-                         * continue
-                         */
-                }
+                /*
+                 * When any of the errors occur and TXMAC generates an
+                 * interrupt to report these errors, it usually means that
+                 * TXMAC has detected an error in the data stream retrieved
+                 * from the on-chip Tx Q. All of these errors are catastrophic
+                 * and TXMAC won't be able to recover data when these errors
+                 * occur. In a nutshell, the whole Tx path will have to be reset
+                 * and re-configured afterwards.
+                 */
+                dev_warn(&adapter->pdev->dev,
+                         "TXMAC interrupt, error 0x%08x\n",
+                         err);
 
-                /* Handle RXMAC Interrupt */
-                if (status & ET_INTR_RXMAC) {
-                        /*
-                         * These interrupts are catastrophic to the device,
-                         * what we need to do is disable the interrupts and
-                         * set the flag to cause us to reset so we can solve
-                         * this issue.
-                         */
-                        /* MP_SET_FLAG( adapter,
-                                                fMP_ADAPTER_HARDWARE_ERROR); */
+                /*
+                 * If we are debugging, we want to see this error, otherwise we
+                 * just want the device to be reset and continue
+                 */
+        }
 
-                        dev_warn(&adapter->pdev->dev,
-                          "RXMAC interrupt, error 0x%08x.  Requesting reset\n",
-                                    readl(&iomem->rxmac.err_reg));
+        /* Handle RXMAC Interrupt */
+        if (status & ET_INTR_RXMAC) {
+                /*
+                 * These interrupts are catastrophic to the device, what we need
+                 * to do is disable the interrupts and set the flag to cause us
+                 * to reset so we can solve this issue.
+                 */
+                /* MP_SET_FLAG( adapter, fMP_ADAPTER_HARDWARE_ERROR); */
 
-                        dev_warn(&adapter->pdev->dev,
-                                    "Enable 0x%08x, Diag 0x%08x\n",
-                                    readl(&iomem->rxmac.ctrl),
-                                    readl(&iomem->rxmac.rxq_diag));
+                dev_warn(&adapter->pdev->dev,
+                         "RXMAC interrupt, error 0x%08x.  Requesting reset\n",
+                         readl(&iomem->rxmac.err_reg));
 
-                        /*
-                         * If we are debugging, we want to see this error,
-                         * otherwise we just want the device to be reset and
-                         * continue
-                         */
-                }
+                dev_warn(&adapter->pdev->dev,
+                         "Enable 0x%08x, Diag 0x%08x\n",
+                         readl(&iomem->rxmac.ctrl),
+                         readl(&iomem->rxmac.rxq_diag));
 
-                /* Handle MAC_STAT Interrupt */
-                if (status & ET_INTR_MAC_STAT) {
-                        /*
-                         * This means at least one of the un-masked counters
-                         * in the MAC_STAT block has rolled over.  Use this
-                         * to maintain the top, software managed bits of the
-                         * counter(s).
-                         */
-                        et1310_handle_macstat_interrupt(adapter);
-                }
+                /*
+                 * If we are debugging, we want to see this error, otherwise we
+                 * just want the device to be reset and continue
+                 */
+        }
 
-                /* Handle SLV Timeout Interrupt */
-                if (status & ET_INTR_SLV_TIMEOUT) {
-                        /*
-                         * This means a timeout has occurred on a read or
-                         * write request to one of the JAGCore registers. The
-                         * Global Resources block has terminated the request
-                         * and on a read request, returned a "fake" value.
-                         * The most likely reasons are: Bad Address or the
-                         * addressed module is in a power-down state and
-                         * can't respond.
-                         */
-                }
+        /* Handle MAC_STAT Interrupt */
+        if (status & ET_INTR_MAC_STAT) {
+                /*
+                 * This means at least one of the un-masked counters in the
+                 * MAC_STAT block has rolled over. Use this to maintain the top,
+                 * software managed bits of the counter(s).
+                 */
+                et1310_handle_macstat_interrupt(adapter);
         }
+
+        /* Handle SLV Timeout Interrupt */
+        if (status & ET_INTR_SLV_TIMEOUT) {
+                /*
+                 * This means a timeout has occurred on a read or write request
+                 * to one of the JAGCore registers. The Global Resources block
+                 * has terminated the request and on a read request, returned a
+                 * "fake" value. The most likely reasons are: Bad Address or the
+                 * addressed module is in a power-down state and can't respond.
+                 */
+        }
+out:
         et131x_enable_interrupts(adapter);
 }
 
@@ -5221,7 +4840,7 @@ static const struct net_device_ops et131x_netdev_ops = {
  * contained in the pci_device_id table. This routine is the equivalent to
  * a device insertion routine.
  */
-static int __devinit et131x_pci_setup(struct pci_dev *pdev,
+static int et131x_pci_setup(struct pci_dev *pdev,
                                const struct pci_device_id *ent)
 {
         struct net_device *netdev;
@@ -5423,7 +5042,7 @@ static struct pci_driver et131x_driver = {
         .name           = DRIVER_NAME,
         .id_table       = et131x_pci_table,
         .probe          = et131x_pci_setup,
-        .remove         = __devexit_p(et131x_pci_remove),
+        .remove         = et131x_pci_remove,
         .driver.pm      = ET131X_PM_OPS,
 };
 
diff --git a/drivers/staging/et131x/et131x.h b/drivers/staging/et131x/et131x.h
index 864379b4e8df..347e63ddde1f 100644
--- a/drivers/staging/et131x/et131x.h
+++ b/drivers/staging/et131x/et131x.h
@@ -1538,10 +1538,6 @@ struct address_map {
  *      0:      int_en
  */
 
-#define ET_PHY_INT_MASK_AUTONEGSTAT     0x0100
-#define ET_PHY_INT_MASK_LINKSTAT        0x0004
-#define ET_PHY_INT_MASK_ENABLE          0x0001
-
 /* MI Register 25: Interrupt Status Reg(0x19)
  *      15-10:  reserved
  *      9:      mdio_sync_lost
diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_proc.c b/drivers/staging/ft1000/ft1000-usb/ft1000_proc.c
index 5ae396716136..1edaddba816f 100644
--- a/drivers/staging/ft1000/ft1000-usb/ft1000_proc.c
+++ b/drivers/staging/ft1000/ft1000-usb/ft1000_proc.c
@@ -205,7 +205,7 @@ int ft1000_init_proc(struct net_device *dev)
 {
         struct ft1000_info *info;
         struct proc_dir_entry *ft1000_proc_file;
-        int ret = 0;
+        int ret = -EINVAL;
 
         info = netdev_priv(dev);
 
@@ -213,7 +213,6 @@ int ft1000_init_proc(struct net_device *dev)
         if (info->ft1000_proc_dir == NULL) {
                 printk(KERN_WARNING "Unable to create %s dir.\n",
                         FT1000_PROC_DIR);
-                ret = -EINVAL;
                 goto fail;
         }
 
@@ -223,7 +222,6 @@ int ft1000_init_proc(struct net_device *dev)
 
         if (ft1000_proc_file == NULL) {
                 printk(KERN_WARNING "Unable to create /proc entry.\n");
-                ret = -EINVAL;
                 goto fail_entry;
         }
 
diff --git a/drivers/staging/fwserial/Kconfig b/drivers/staging/fwserial/Kconfig
new file mode 100644
index 000000000000..580406cb1808
--- /dev/null
+++ b/drivers/staging/fwserial/Kconfig
@@ -0,0 +1,9 @@
+config FIREWIRE_SERIAL
+       tristate "TTY over Firewire"
+       depends on FIREWIRE
+       help
+          This enables TTY over IEEE 1394, providing high-speed serial
+          connectivity to cabled peers.
+
+          To compile this driver as a module, say M here:  the module will
+          be called firewire-serial.
diff --git a/drivers/staging/fwserial/Makefile b/drivers/staging/fwserial/Makefile
new file mode 100644
index 000000000000..2170869a19b1
--- /dev/null
+++ b/drivers/staging/fwserial/Makefile
@@ -0,0 +1,2 @@
+obj-$(CONFIG_FIREWIRE_SERIAL) += firewire-serial.o
+firewire-serial-objs := fwserial.o dma_fifo.o
diff --git a/drivers/staging/fwserial/TODO b/drivers/staging/fwserial/TODO
new file mode 100644
index 000000000000..726900548eae
--- /dev/null
+++ b/drivers/staging/fwserial/TODO
@@ -0,0 +1,37 @@
+TODOs
+-----
+1. Implement retries for RCODE_BUSY, RCODE_NO_ACK and RCODE_SEND_ERROR
+   - I/O is handled asynchronously which presents some issues when error
+     conditions occur.
+2. Implement _robust_ console on top of this. The existing prototype console
+   driver is not ready for the big leagues yet.
+3. Expose means of controlling attach/detach of peers via sysfs. Include
+   GUID-to-port matching/whitelist/blacklist.
+
+-- Issues with firewire stack --
+1. This driver uses the same unregistered vendor id that the firewire core does
+     (0xd00d1e). Perhaps this could be exposed as a define in
+     firewire-constants.h?
+2. MAX_ASYNC_PAYLOAD needs to be publicly exposed by core/ohci
+   - otherwise how will this driver know the max size of address window to
+     open for one packet write?
+3. Maybe device_max_receive() and link_speed_to_max_payload() should be
+     taken up by the firewire core?
+4. To avoid dropping rx data while still limiting the maximum buffering,
+     the size of the AR context must be known. How to expose this to drivers?
+5. Explore if bigger AR context will reduce RCODE_BUSY responses
+   (or auto-grow to certain max size -- but this would require major surgery
+    as the current AR is contiguously mapped)
+
+-- Issues with TTY core --
+  1. Hack for alternate device name scheme
+     - because udev no longer allows device renaming, devices should have
+       their proper names on creation. This is an issue for creating the
+       fwloop<n> device with the fwtty<n> devices because although duplicating
+       roughly the same operations as tty_port_register_device() isn't difficult,
+       access to the tty_class & tty_fops is restricted in scope.
+
+       This is currently being worked around in create_loop_device() by
+       extracting the tty_class ptr and tty_fops ptr from the previously created
+       tty devices. Perhaps an add'l api can be added -- eg.,
+       tty_{port_}register_named_device().
diff --git a/drivers/staging/fwserial/dma_fifo.c b/drivers/staging/fwserial/dma_fifo.c
new file mode 100644
index 000000000000..5e8463445504
--- /dev/null
+++ b/drivers/staging/fwserial/dma_fifo.c
@@ -0,0 +1,307 @@
+/*
+ * DMA-able FIFO implementation
+ *
+ * Copyright (C) 2012 Peter Hurley <peter@hurleysoftware.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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/kernel.h>
+#include <linux/slab.h>
+#include <linux/list.h>
+#include <linux/bug.h>
+
+#include "dma_fifo.h"
+
+#ifdef DEBUG_TRACING
+#define df_trace(s, args...) pr_debug(s, ##args)
+#else
+#define df_trace(s, args...)
+#endif
+
+#define FAIL(fifo, condition, format...) ({                             \
+        fifo->corrupt = !!(condition);                                  \
+        WARN(fifo->corrupt, format);                                    \
+})
+
+/*
+ * private helper fn to determine if check is in open interval (lo,hi)
+ */
+static bool addr_check(unsigned check, unsigned lo, unsigned hi)
+{
+        return check - (lo + 1) < (hi - 1) - lo;
+}
+
+/**
+ * dma_fifo_init: initialize the fifo to a valid but inoperative state
+ * @fifo: address of in-place "struct dma_fifo" object
+ */
+void dma_fifo_init(struct dma_fifo *fifo)
+{
+        memset(fifo, 0, sizeof(*fifo));
+        INIT_LIST_HEAD(&fifo->pending);
+}
+
+/**
+ * dma_fifo_alloc - initialize and allocate dma_fifo
+ * @fifo: address of in-place "struct dma_fifo" object
+ * @size: 'apparent' size, in bytes, of fifo
+ * @align: dma alignment to maintain (should be at least cpu cache alignment),
+ *         must be power of 2
+ * @tx_limit: maximum # of bytes transmissable per dma (rounded down to
+ *            multiple of alignment, but at least align size)
+ * @open_limit: maximum # of outstanding dma transactions allowed
+ * @gfp_mask: get_free_pages mask, passed to kmalloc()
+ *
+ * The 'apparent' size will be rounded up to next greater aligned size.
+ * Returns 0 if no error, otherwise an error code
+ */
+int dma_fifo_alloc(struct dma_fifo *fifo, int size, unsigned align,
+                   int tx_limit, int open_limit, gfp_t gfp_mask)
+{
+        int capacity;
+
+        if (!is_power_of_2(align) || size < 0)
+                return -EINVAL;
+
+        size = round_up(size, align);
+        capacity = size + align * open_limit + align * DMA_FIFO_GUARD;
+        fifo->data = kmalloc(capacity, gfp_mask);
+        if (!fifo->data)
+                return -ENOMEM;
+
+        fifo->in = 0;
+        fifo->out = 0;
+        fifo->done = 0;
+        fifo->size = size;
+        fifo->avail = size;
+        fifo->align = align;
+        fifo->tx_limit = max_t(int, round_down(tx_limit, align), align);
+        fifo->open = 0;
+        fifo->open_limit = open_limit;
+        fifo->guard = size + align * open_limit;
+        fifo->capacity = capacity;
+        fifo->corrupt = 0;
+
+        return 0;
+}
+
+/**
+ * dma_fifo_free - frees the fifo
+ * @fifo: address of in-place "struct dma_fifo" to free
+ *
+ * Also reinits the fifo to a valid but inoperative state. This
+ * allows the fifo to be reused with a different target requiring
+ * different fifo parameters.
+ */
+void dma_fifo_free(struct dma_fifo *fifo)
+{
+        struct dma_pending *pending, *next;
+
+        if (fifo->data == NULL)
+                return;
+
+        list_for_each_entry_safe(pending, next, &fifo->pending, link)
+                list_del_init(&pending->link);
+        kfree(fifo->data);
+        fifo->data = NULL;
+}
+
+/**
+ * dma_fifo_reset - dumps the fifo contents and reinits for reuse
+ * @fifo: address of in-place "struct dma_fifo" to reset
+ */
+void dma_fifo_reset(struct dma_fifo *fifo)
+{
+        struct dma_pending *pending, *next;
+
+        if (fifo->data == NULL)
+                return;
+
+        list_for_each_entry_safe(pending, next, &fifo->pending, link)
+                list_del_init(&pending->link);
+        fifo->in = 0;
+        fifo->out = 0;
+        fifo->done = 0;
+        fifo->avail = fifo->size;
+        fifo->open = 0;
+        fifo->corrupt = 0;
+}
+
+/**
+ * dma_fifo_in - copies data into the fifo
+ * @fifo: address of in-place "struct dma_fifo" to write to
+ * @src: buffer to copy from
+ * @n: # of bytes to copy
+ *
+ * Returns the # of bytes actually copied, which can be less than requested if
+ * the fifo becomes full. If < 0, return is error code.
+ */
+int dma_fifo_in(struct dma_fifo *fifo, const void *src, int n)
+{
+        int ofs, l;
+
+        if (fifo->data == NULL)
+                return -ENOENT;
+        if (fifo->corrupt)
+                return -ENXIO;
+
+        if (n > fifo->avail)
+                n = fifo->avail;
+        if (n <= 0)
+                return 0;
+
+        ofs = fifo->in % fifo->capacity;
+        l = min(n, fifo->capacity - ofs);
+        memcpy(fifo->data + ofs, src, l);
+        memcpy(fifo->data, src + l, n - l);
+
+        if (FAIL(fifo, addr_check(fifo->done, fifo->in, fifo->in + n) ||
+                        fifo->avail < n,
+                        "fifo corrupt: in:%u out:%u done:%u n:%d avail:%d",
+                        fifo->in, fifo->out, fifo->done, n, fifo->avail))
+                return -ENXIO;
+
+        fifo->in += n;
+        fifo->avail -= n;
+
+        df_trace("in:%u out:%u done:%u n:%d avail:%d", fifo->in, fifo->out,
+                 fifo->done, n, fifo->avail);
+
+        return n;
+}
+
+/**
+ * dma_fifo_out_pend - gets address/len of next avail read and marks as pended
+ * @fifo: address of in-place "struct dma_fifo" to read from
+ * @pended: address of structure to fill with read address/len
+ *          The data/len fields will be NULL/0 if no dma is pended.
+ *
+ * Returns the # of used bytes remaining in fifo (ie, if > 0, more data
+ * remains in the fifo that was not pended). If < 0, return is error code.
+ */
+int dma_fifo_out_pend(struct dma_fifo *fifo, struct dma_pending *pended)
+{
+        unsigned len, n, ofs, l, limit;
+
+        if (fifo->data == NULL)
+                return -ENOENT;
+        if (fifo->corrupt)
+                return -ENXIO;
+
+        pended->len = 0;
+        pended->data = NULL;
+        pended->out = fifo->out;
+
+        len = fifo->in - fifo->out;
+        if (!len)
+                return -ENODATA;
+        if (fifo->open == fifo->open_limit)
+                return -EAGAIN;
+
+        n = len;
+        ofs = fifo->out % fifo->capacity;
+        l = fifo->capacity - ofs;
+        limit = min_t(unsigned, l, fifo->tx_limit);
+        if (n > limit) {
+                n = limit;
+                fifo->out += limit;
+        } else if (ofs + n > fifo->guard) {
+                fifo->out += l;
+                fifo->in = fifo->out;
+        } else {
+                fifo->out += round_up(n, fifo->align);
+                fifo->in = fifo->out;
+        }
+
+        df_trace("in: %u out: %u done: %u n: %d len: %u avail: %d", fifo->in,
+                 fifo->out, fifo->done, n, len, fifo->avail);
+
+        pended->len = n;
+        pended->data = fifo->data + ofs;
+        pended->next = fifo->out;
+        list_add_tail(&pended->link, &fifo->pending);
+        ++fifo->open;
+
+        if (FAIL(fifo, fifo->open > fifo->open_limit,
+                        "past open limit:%d (limit:%d)",
+                        fifo->open, fifo->open_limit))
+                return -ENXIO;
+        if (FAIL(fifo, fifo->out & (fifo->align - 1),
+                        "fifo out unaligned:%u (align:%u)",
+                        fifo->out, fifo->align))
+                return -ENXIO;
+
+        return len - n;
+}
+
+/**
+ * dma_fifo_out_complete - marks pended dma as completed
+ * @fifo: address of in-place "struct dma_fifo" which was read from
+ * @complete: address of structure for previously pended dma to mark completed
+ */
+int dma_fifo_out_complete(struct dma_fifo *fifo, struct dma_pending *complete)
+{
+        struct dma_pending *pending, *next, *tmp;
+
+        if (fifo->data == NULL)
+                return -ENOENT;
+        if (fifo->corrupt)
+                return -ENXIO;
+        if (list_empty(&fifo->pending) && fifo->open == 0)
+                return -EINVAL;
+
+        if (FAIL(fifo, list_empty(&fifo->pending) != (fifo->open == 0),
+                        "pending list disagrees with open count:%d",
+                        fifo->open))
+                return -ENXIO;
+
+        tmp = complete->data;
+        *tmp = *complete;
+        list_replace(&complete->link, &tmp->link);
+        dp_mark_completed(tmp);
+
+        /* Only update the fifo in the original pended order */
+        list_for_each_entry_safe(pending, next, &fifo->pending, link) {
+                if (!dp_is_completed(pending)) {
+                        df_trace("still pending: saved out: %u len: %d",
+                                 pending->out, pending->len);
+                        break;
+                }
+
+                if (FAIL(fifo, pending->out != fifo->done ||
+                                addr_check(fifo->in, fifo->done, pending->next),
+                                "in:%u out:%u done:%u saved:%u next:%u",
+                                fifo->in, fifo->out, fifo->done, pending->out,
+                                pending->next))
+                        return -ENXIO;
+
+                list_del_init(&pending->link);
+                fifo->done = pending->next;
+                fifo->avail += pending->len;
+                --fifo->open;
+
+                df_trace("in: %u out: %u done: %u len: %u avail: %d", fifo->in,
+                         fifo->out, fifo->done, pending->len, fifo->avail);
+        }
+
+        if (FAIL(fifo, fifo->open < 0, "open dma:%d < 0", fifo->open))
+                return -ENXIO;
+        if (FAIL(fifo, fifo->avail > fifo->size, "fifo avail:%d > size:%d",
+                        fifo->avail, fifo->size))
+                return -ENXIO;
+
+        return 0;
+}
diff --git a/drivers/staging/fwserial/dma_fifo.h b/drivers/staging/fwserial/dma_fifo.h
new file mode 100644
index 000000000000..a113fe1e6f19
--- /dev/null
+++ b/drivers/staging/fwserial/dma_fifo.h
@@ -0,0 +1,130 @@
+/*
+ * DMA-able FIFO interface
+ *
+ * Copyright (C) 2012 Peter Hurley <peter@hurleysoftware.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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.
+ */
+
+#ifndef _DMA_FIFO_H_
+#define _DMA_FIFO_H_
+
+/**
+ * The design basis for the DMA FIFO is to provide an output side that
+ * complies with the streaming DMA API design that can be DMA'd from directly
+ * (without additional copying), coupled with an input side that maintains a
+ * logically consistent 'apparent' size (ie, bytes in + bytes avail is static
+ * for the lifetime of the FIFO).
+ *
+ * DMA output transactions originate on a cache line boundary and can be
+ * variably-sized. DMA output transactions can be retired out-of-order but
+ * the FIFO will only advance the output in the original input sequence.
+ * This means the FIFO will eventually stall if a transaction is never retired.
+ *
+ * Chunking the output side into cache line multiples means that some FIFO
+ * memory is unused. For example, if all the avail input has been pended out,
+ * then the in and out markers are re-aligned to the next cache line.
+ * The maximum possible waste is
+ *     (cache line alignment - 1) * (max outstanding dma transactions)
+ * This potential waste requires additional hidden capacity within the FIFO
+ * to be able to accept input while the 'apparent' size has not been reached.
+ *
+ * Additional cache lines (ie, guard area) are used to minimize DMA
+ * fragmentation when wrapping at the end of the FIFO. Input is allowed into the
+ * guard area, but the in and out FIFO markers are wrapped when DMA is pended.
+ */
+
+#define DMA_FIFO_GUARD 3   /* # of cache lines to reserve for the guard area */
+
+struct dma_fifo {
+        unsigned         in;
+        unsigned         out;           /* updated when dma is pended         */
+        unsigned         done;          /* updated upon dma completion        */
+        struct {
+                unsigned corrupt:1;
+        };
+        int              size;          /* 'apparent' size of fifo            */
+        int              guard;         /* ofs of guard area                  */
+        int              capacity;      /* size + reserved                    */
+        int              avail;         /* # of unused bytes in fifo          */
+        unsigned         align;         /* must be power of 2                 */
+        int              tx_limit;      /* max # of bytes per dma transaction */
+        int              open_limit;    /* max # of outstanding allowed       */
+        int              open;          /* # of outstanding dma transactions  */
+        struct list_head pending;       /* fifo markers for outstanding dma   */
+        void             *data;
+};
+
+struct dma_pending {
+        struct list_head link;
+        void             *data;
+        unsigned         len;
+        unsigned         next;
+        unsigned         out;
+};
+
+static inline void dp_mark_completed(struct dma_pending *dp)
+{
+        dp->data += 1;
+}
+
+static inline bool dp_is_completed(struct dma_pending *dp)
+{
+        return (unsigned long)dp->data & 1UL;
+}
+
+extern void dma_fifo_init(struct dma_fifo *fifo);
+extern int dma_fifo_alloc(struct dma_fifo *fifo, int size, unsigned align,
+                          int tx_limit, int open_limit, gfp_t gfp_mask);
+extern void dma_fifo_free(struct dma_fifo *fifo);
+extern void dma_fifo_reset(struct dma_fifo *fifo);
+extern int dma_fifo_in(struct dma_fifo *fifo, const void *src, int n);
+extern int dma_fifo_out_pend(struct dma_fifo *fifo, struct dma_pending *pended);
+extern int dma_fifo_out_complete(struct dma_fifo *fifo,
+                                 struct dma_pending *complete);
+
+/* returns the # of used bytes in the fifo */
+static inline int dma_fifo_level(struct dma_fifo *fifo)
+{
+        return fifo->size - fifo->avail;
+}
+
+/* returns the # of bytes ready for output in the fifo */
+static inline int dma_fifo_out_level(struct dma_fifo *fifo)
+{
+        return fifo->in - fifo->out;
+}
+
+/* returns the # of unused bytes in the fifo */
+static inline int dma_fifo_avail(struct dma_fifo *fifo)
+{
+        return fifo->avail;
+}
+
+/* returns true if fifo has max # of outstanding dmas */
+static inline bool dma_fifo_busy(struct dma_fifo *fifo)
+{
+        return fifo->open == fifo->open_limit;
+}
+
+/* changes the max size of dma returned from dma_fifo_out_pend() */
+static inline int dma_fifo_change_tx_limit(struct dma_fifo *fifo, int tx_limit)
+{
+        tx_limit = round_down(tx_limit, fifo->align);
+        fifo->tx_limit = max_t(int, tx_limit, fifo->align);
+        return 0;
+}
+
+#endif /* _DMA_FIFO_H_ */
diff --git a/drivers/staging/fwserial/fwserial.c b/drivers/staging/fwserial/fwserial.c
new file mode 100644
index 000000000000..5d4d64a3ea81
--- /dev/null
+++ b/drivers/staging/fwserial/fwserial.c
@@ -0,0 +1,2946 @@
+/*
+ * FireWire Serial driver
+ *
+ * Copyright (C) 2012 Peter Hurley <peter@hurleysoftware.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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/sched.h>
+#include <linux/slab.h>
+#include <linux/device.h>
+#include <linux/mod_devicetable.h>
+#include <linux/rculist.h>
+#include <linux/workqueue.h>
+#include <linux/ratelimit.h>
+#include <linux/bug.h>
+#include <linux/uaccess.h>
+
+#include "fwserial.h"
+
+#define be32_to_u64(hi, lo)  ((u64)be32_to_cpu(hi) << 32 | be32_to_cpu(lo))
+
+#define LINUX_VENDOR_ID   0xd00d1eU  /* same id used in card root directory   */
+#define FWSERIAL_VERSION  0x00e81cU  /* must be unique within LINUX_VENDOR_ID */
+
+/* configurable options */
+static int num_ttys = 4;            /* # of std ttys to create per fw_card    */
+                                    /* - doubles as loopback port index       */
+static bool auto_connect = true;    /* try to VIRT_CABLE to every peer        */
+static bool create_loop_dev = true; /* create a loopback device for each card */
+bool limit_bw;                      /* limit async bandwidth to 20% of max    */
+
+module_param_named(ttys, num_ttys, int, S_IRUGO | S_IWUSR);
+module_param_named(auto, auto_connect, bool, S_IRUGO | S_IWUSR);
+module_param_named(loop, create_loop_dev, bool, S_IRUGO | S_IWUSR);
+module_param(limit_bw, bool, S_IRUGO | S_IWUSR);
+
+/*
+ * Threshold below which the tty is woken for writing
+ * - should be equal to WAKEUP_CHARS in drivers/tty/n_tty.c because
+ *   even if the writer is woken, n_tty_poll() won't set POLLOUT until
+ *   our fifo is below this level
+ */
+#define WAKEUP_CHARS             256
+
+/**
+ * fwserial_list: list of every fw_serial created for each fw_card
+ * See discussion in fwserial_probe.
+ */
+static LIST_HEAD(fwserial_list);
+static DEFINE_MUTEX(fwserial_list_mutex);
+
+/**
+ * port_table: array of tty ports allocated to each fw_card
+ *
+ * tty ports are allocated during probe when an fw_serial is first
+ * created for a given fw_card. Ports are allocated in a contiguous block,
+ * each block consisting of 'num_ports' ports.
+ */
+static struct fwtty_port *port_table[MAX_TOTAL_PORTS];
+static DEFINE_MUTEX(port_table_lock);
+static bool port_table_corrupt;
+#define FWTTY_INVALID_INDEX  MAX_TOTAL_PORTS
+
+/* total # of tty ports created per fw_card */
+static int num_ports;
+
+/* slab used as pool for struct fwtty_transactions */
+static struct kmem_cache *fwtty_txn_cache;
+
+struct fwtty_transaction;
+typedef void (*fwtty_transaction_cb)(struct fw_card *card, int rcode,
+                                     void *data, size_t length,
+                                     struct fwtty_transaction *txn);
+
+struct fwtty_transaction {
+        struct fw_transaction      fw_txn;
+        fwtty_transaction_cb       callback;
+        struct fwtty_port          *port;
+        union {
+                struct dma_pending dma_pended;
+        };
+};
+
+#define to_device(a, b)                 (a->b)
+#define fwtty_err(p, s, v...)           dev_err(to_device(p, device), s, ##v)
+#define fwtty_info(p, s, v...)          dev_info(to_device(p, device), s, ##v)
+#define fwtty_notice(p, s, v...)        dev_notice(to_device(p, device), s, ##v)
+#define fwtty_dbg(p, s, v...)           \
+                dev_dbg(to_device(p, device), "%s: " s, __func__, ##v)
+#define fwtty_err_ratelimited(p, s, v...) \
+                dev_err_ratelimited(to_device(p, device), s, ##v)
+
+#ifdef DEBUG
+static inline void debug_short_write(struct fwtty_port *port, int c, int n)
+{
+        int avail;
+
+        if (n < c) {
+                spin_lock_bh(&port->lock);
+                avail = dma_fifo_avail(&port->tx_fifo);
+                spin_unlock_bh(&port->lock);
+                fwtty_dbg(port, "short write: avail:%d req:%d wrote:%d",
+                          avail, c, n);
+        }
+}
+#else
+#define debug_short_write(port, c, n)
+#endif
+
+static struct fwtty_peer *__fwserial_peer_by_node_id(struct fw_card *card,
+                                                     int generation, int id);
+
+#ifdef FWTTY_PROFILING
+
+static void profile_fifo_avail(struct fwtty_port *port, unsigned *stat)
+{
+        spin_lock_bh(&port->lock);
+        profile_size_distrib(stat, dma_fifo_avail(&port->tx_fifo));
+        spin_unlock_bh(&port->lock);
+}
+
+static void dump_profile(struct seq_file *m, struct stats *stats)
+{
+        /* for each stat, print sum of 0 to 2^k, then individually */
+        int k = 4;
+        unsigned sum;
+        int j;
+        char t[10];
+
+        snprintf(t, 10, "< %d", 1 << k);
+        seq_printf(m, "\n%14s  %6s", " ", t);
+        for (j = k + 1; j < DISTRIBUTION_MAX_INDEX; ++j)
+                seq_printf(m, "%6d", 1 << j);
+
+        ++k;
+        for (j = 0, sum = 0; j <= k; ++j)
+                sum += stats->reads[j];
+        seq_printf(m, "\n%14s: %6d", "reads", sum);
+        for (j = k + 1; j <= DISTRIBUTION_MAX_INDEX; ++j)
+                seq_printf(m, "%6d", stats->reads[j]);
+
+        for (j = 0, sum = 0; j <= k; ++j)
+                sum += stats->writes[j];
+        seq_printf(m, "\n%14s: %6d", "writes", sum);
+        for (j = k + 1; j <= DISTRIBUTION_MAX_INDEX; ++j)
+                seq_printf(m, "%6d", stats->writes[j]);
+
+        for (j = 0, sum = 0; j <= k; ++j)
+                sum += stats->txns[j];
+        seq_printf(m, "\n%14s: %6d", "txns", sum);
+        for (j = k + 1; j <= DISTRIBUTION_MAX_INDEX; ++j)
+                seq_printf(m, "%6d", stats->txns[j]);
+
+        for (j = 0, sum = 0; j <= k; ++j)
+                sum += stats->unthrottle[j];
+        seq_printf(m, "\n%14s: %6d", "avail @ unthr", sum);
+        for (j = k + 1; j <= DISTRIBUTION_MAX_INDEX; ++j)
+                seq_printf(m, "%6d", stats->unthrottle[j]);
+}
+
+#else
+#define profile_fifo_avail(port, stat)
+#define dump_profile(m, stats)
+#endif
+
+/* Returns the max receive packet size for the given card */
+static inline int device_max_receive(struct fw_device *fw_device)
+{
+        return 1 <<  (clamp_t(int, fw_device->max_rec, 8U, 13U) + 1);
+}
+
+static void fwtty_log_tx_error(struct fwtty_port *port, int rcode)
+{
+        switch (rcode) {
+        case RCODE_SEND_ERROR:
+                fwtty_err_ratelimited(port, "card busy");
+                break;
+        case RCODE_ADDRESS_ERROR:
+                fwtty_err_ratelimited(port, "bad unit addr or write length");
+                break;
+        case RCODE_DATA_ERROR:
+                fwtty_err_ratelimited(port, "failed rx");
+                break;
+        case RCODE_NO_ACK:
+                fwtty_err_ratelimited(port, "missing ack");
+                break;
+        case RCODE_BUSY:
+                fwtty_err_ratelimited(port, "remote busy");
+                break;
+        default:
+                fwtty_err_ratelimited(port, "failed tx: %d", rcode);
+        }
+}
+
+static void fwtty_txn_constructor(void *this)
+{
+        struct fwtty_transaction *txn = this;
+
+        init_timer(&txn->fw_txn.split_timeout_timer);
+}
+
+static void fwtty_common_callback(struct fw_card *card, int rcode,
+                                  void *payload, size_t len, void *cb_data)
+{
+        struct fwtty_transaction *txn = cb_data;
+        struct fwtty_port *port = txn->port;
+
+        if (port && rcode != RCODE_COMPLETE)
+                fwtty_log_tx_error(port, rcode);
+        if (txn->callback)
+                txn->callback(card, rcode, payload, len, txn);
+        kmem_cache_free(fwtty_txn_cache, txn);
+}
+
+static int fwtty_send_data_async(struct fwtty_peer *peer, int tcode,
+                                 unsigned long long addr, void *payload,
+                                 size_t len, fwtty_transaction_cb callback,
+                                 struct fwtty_port *port)
+{
+        struct fwtty_transaction *txn;
+        int generation;
+
+        txn = kmem_cache_alloc(fwtty_txn_cache, GFP_ATOMIC);
+        if (!txn)
+                return -ENOMEM;
+
+        txn->callback = callback;
+        txn->port = port;
+
+        generation = peer->generation;
+        smp_rmb();
+        fw_send_request(peer->serial->card, &txn->fw_txn, tcode,
+                        peer->node_id, generation, peer->speed, addr, payload,
+                        len, fwtty_common_callback, txn);
+        return 0;
+}
+
+static void fwtty_send_txn_async(struct fwtty_peer *peer,
+                                 struct fwtty_transaction *txn, int tcode,
+                                 unsigned long long addr, void *payload,
+                                 size_t len, fwtty_transaction_cb callback,
+                                 struct fwtty_port *port)
+{
+        int generation;
+
+        txn->callback = callback;
+        txn->port = port;
+
+        generation = peer->generation;
+        smp_rmb();
+        fw_send_request(peer->serial->card, &txn->fw_txn, tcode,
+                        peer->node_id, generation, peer->speed, addr, payload,
+                        len, fwtty_common_callback, txn);
+}
+
+
+static void __fwtty_restart_tx(struct fwtty_port *port)
+{
+        int len, avail;
+
+        len = dma_fifo_out_level(&port->tx_fifo);
+        if (len)
+                schedule_delayed_work(&port->drain, 0);
+        avail = dma_fifo_avail(&port->tx_fifo);
+
+        fwtty_dbg(port, "fifo len: %d avail: %d", len, avail);
+}
+
+static void fwtty_restart_tx(struct fwtty_port *port)
+{
+        spin_lock_bh(&port->lock);
+        __fwtty_restart_tx(port);
+        spin_unlock_bh(&port->lock);
+}
+
+/**
+ * fwtty_update_port_status - decodes & dispatches line status changes
+ *
+ * Note: in loopback, the port->lock is being held. Only use functions that
+ * don't attempt to reclaim the port->lock.
+ */
+static void fwtty_update_port_status(struct fwtty_port *port, unsigned status)
+{
+        unsigned delta;
+        struct tty_struct *tty;
+
+        /* simulated LSR/MSR status from remote */
+        status &= ~MCTRL_MASK;
+        delta = (port->mstatus ^ status) & ~MCTRL_MASK;
+        delta &= ~(status & TIOCM_RNG);
+        port->mstatus = status;
+
+        if (delta & TIOCM_RNG)
+                ++port->icount.rng;
+        if (delta & TIOCM_DSR)
+                ++port->icount.dsr;
+        if (delta & TIOCM_CAR)
+                ++port->icount.dcd;
+        if (delta & TIOCM_CTS)
+                ++port->icount.cts;
+
+        fwtty_dbg(port, "status: %x delta: %x", status, delta);
+
+        if (delta & TIOCM_CAR) {
+                tty = tty_port_tty_get(&port->port);
+                if (tty && !C_CLOCAL(tty)) {
+                        if (status & TIOCM_CAR)
+                                wake_up_interruptible(&port->port.open_wait);
+                        else
+                                schedule_work(&port->hangup);
+                }
+                tty_kref_put(tty);
+        }
+
+        if (delta & TIOCM_CTS) {
+                tty = tty_port_tty_get(&port->port);
+                if (tty && C_CRTSCTS(tty)) {
+                        if (tty->hw_stopped) {
+                                if (status & TIOCM_CTS) {
+                                        tty->hw_stopped = 0;
+                                        if (port->loopback)
+                                                __fwtty_restart_tx(port);
+                                        else
+                                                fwtty_restart_tx(port);
+                                }
+                        } else {
+                                if (~status & TIOCM_CTS)
+                                        tty->hw_stopped = 1;
+                        }
+                }
+                tty_kref_put(tty);
+
+        } else if (delta & OOB_TX_THROTTLE) {
+                tty = tty_port_tty_get(&port->port);
+                if (tty) {
+                        if (tty->hw_stopped) {
+                                if (~status & OOB_TX_THROTTLE) {
+                                        tty->hw_stopped = 0;
+                                        if (port->loopback)
+                                                __fwtty_restart_tx(port);
+                                        else
+                                                fwtty_restart_tx(port);
+                                }
+                        } else {
+                                if (status & OOB_TX_THROTTLE)
+                                        tty->hw_stopped = 1;
+                        }
+                }
+                tty_kref_put(tty);
+        }
+
+        if (delta & (UART_LSR_BI << 24)) {
+                if (status & (UART_LSR_BI << 24)) {
+                        port->break_last = jiffies;
+                        schedule_delayed_work(&port->emit_breaks, 0);
+                } else {
+                        /* run emit_breaks one last time (if pending) */
+                        mod_delayed_work(system_wq, &port->emit_breaks, 0);
+                }
+        }
+
+        if (delta & (TIOCM_DSR | TIOCM_CAR | TIOCM_CTS | TIOCM_RNG))
+                wake_up_interruptible(&port->port.delta_msr_wait);
+}
+
+/**
+ * __fwtty_port_line_status - generate 'line status' for indicated port
+ *
+ * This function returns a remote 'MSR' state based on the local 'MCR' state,
+ * as if a null modem cable was attached. The actual status is a mangling
+ * of TIOCM_* bits suitable for sending to a peer's status_addr.
+ *
+ * Note: caller must be holding port lock
+ */
+static unsigned __fwtty_port_line_status(struct fwtty_port *port)
+{
+        unsigned status = 0;
+
+        /* TODO: add module param to tie RNG to DTR as well */
+
+        if (port->mctrl & TIOCM_DTR)
+                status |= TIOCM_DSR | TIOCM_CAR;
+        if (port->mctrl & TIOCM_RTS)
+                status |= TIOCM_CTS;
+        if (port->mctrl & OOB_RX_THROTTLE)
+                status |= OOB_TX_THROTTLE;
+        /* emulate BRK as add'l line status */
+        if (port->break_ctl)
+                status |= UART_LSR_BI << 24;
+
+        return status;
+}
+
+/**
+ * __fwtty_write_port_status - send the port line status to peer
+ *
+ * Note: caller must be holding the port lock.
+ */
+static int __fwtty_write_port_status(struct fwtty_port *port)
+{
+        struct fwtty_peer *peer;
+        int err = -ENOENT;
+        unsigned status = __fwtty_port_line_status(port);
+
+        rcu_read_lock();
+        peer = rcu_dereference(port->peer);
+        if (peer) {
+                err = fwtty_send_data_async(peer, TCODE_WRITE_QUADLET_REQUEST,
+                                            peer->status_addr, &status,
+                                            sizeof(status), NULL, port);
+        }
+        rcu_read_unlock();
+
+        return err;
+}
+
+/**
+ * fwtty_write_port_status - same as above but locked by port lock
+ */
+static int fwtty_write_port_status(struct fwtty_port *port)
+{
+        int err;
+
+        spin_lock_bh(&port->lock);
+        err = __fwtty_write_port_status(port);
+        spin_unlock_bh(&port->lock);
+        return err;
+}
+
+static void __fwtty_throttle(struct fwtty_port *port, struct tty_struct *tty)
+{
+        unsigned old;
+
+        old = port->mctrl;
+        port->mctrl |= OOB_RX_THROTTLE;
+        if (C_CRTSCTS(tty))
+                port->mctrl &= ~TIOCM_RTS;
+        if (~old & OOB_RX_THROTTLE)
+                __fwtty_write_port_status(port);
+}
+
+/**
+ * fwtty_do_hangup - wait for ldisc to deliver all pending rx; only then hangup
+ *
+ * When the remote has finished tx, and all in-flight rx has been received and
+ * and pushed to the flip buffer, the remote may close its device. This will
+ * drop DTR on the remote which will drop carrier here. Typically, the tty is
+ * hung up when carrier is dropped or lost.
+ *
+ * However, there is a race between the hang up and the line discipline
+ * delivering its data to the reader. A hangup will cause the ldisc to flush
+ * (ie., clear) the read buffer and flip buffer. Because of firewire's
+ * relatively high throughput, the ldisc frequently lags well behind the driver,
+ * resulting in lost data (which has already been received and written to
+ * the flip buffer) when the remote closes its end.
+ *
+ * Unfortunately, since the flip buffer offers no direct method for determining
+ * if it holds data, ensuring the ldisc has delivered all data is problematic.
+ */
+
+/* FIXME: drop this workaround when __tty_hangup waits for ldisc completion */
+static void fwtty_do_hangup(struct work_struct *work)
+{
+        struct fwtty_port *port = to_port(work, hangup);
+        struct tty_struct *tty;
+
+        schedule_timeout_uninterruptible(msecs_to_jiffies(50));
+
+        tty = tty_port_tty_get(&port->port);
+        if (tty)
+                tty_vhangup(tty);
+        tty_kref_put(tty);
+}
+
+
+static void fwtty_emit_breaks(struct work_struct *work)
+{
+        struct fwtty_port *port = to_port(to_delayed_work(work), emit_breaks);
+        struct tty_struct *tty;
+        static const char buf[16];
+        unsigned long now = jiffies;
+        unsigned long elapsed = now - port->break_last;
+        int n, t, c, brk = 0;
+
+        tty = tty_port_tty_get(&port->port);
+        if (!tty)
+                return;
+
+        /* generate breaks at the line rate (but at least 1) */
+        n = (elapsed * port->cps) / HZ + 1;
+        port->break_last = now;
+
+        fwtty_dbg(port, "sending %d brks", n);
+
+        while (n) {
+                t = min(n, 16);
+                c = tty_insert_flip_string_fixed_flag(tty, buf, TTY_BREAK, t);
+                n -= c;
+                brk += c;
+                if (c < t)
+                        break;
+        }
+        tty_flip_buffer_push(tty);
+
+        tty_kref_put(tty);
+
+        if (port->mstatus & (UART_LSR_BI << 24))
+                schedule_delayed_work(&port->emit_breaks, FREQ_BREAKS);
+        port->icount.brk += brk;
+}
+
+static void fwtty_pushrx(struct work_struct *work)
+{
+        struct fwtty_port *port = to_port(work, push);
+        struct tty_struct *tty;
+        struct buffered_rx *buf, *next;
+        int n, c = 0;
+
+        tty = tty_port_tty_get(&port->port);
+        if (!tty)
+                return;
+
+        spin_lock_bh(&port->lock);
+        list_for_each_entry_safe(buf, next, &port->buf_list, list) {
+                n = tty_insert_flip_string_fixed_flag(tty, buf->data,
+                                                      TTY_NORMAL, buf->n);
+                c += n;
+                port->buffered -= n;
+                if (n < buf->n) {
+                        if (n > 0) {
+                                memmove(buf->data, buf->data + n, buf->n - n);
+                                buf->n -= n;
+                        }
+                        __fwtty_throttle(port, tty);
+                        break;
+                } else {
+                        list_del(&buf->list);
+                        kfree(buf);
+                }
+        }
+        if (c > 0)
+                tty_flip_buffer_push(tty);
+
+        if (list_empty(&port->buf_list))
+                clear_bit(BUFFERING_RX, &port->flags);
+        spin_unlock_bh(&port->lock);
+
+        tty_kref_put(tty);
+}
+
+static int fwtty_buffer_rx(struct fwtty_port *port, unsigned char *d, size_t n)
+{
+        struct buffered_rx *buf;
+        size_t size = (n + sizeof(struct buffered_rx) + 0xFF) & ~0xFF;
+
+        if (port->buffered + n > HIGH_WATERMARK)
+                return 0;
+        buf = kmalloc(size, GFP_ATOMIC);
+        if (!buf)
+                return 0;
+        INIT_LIST_HEAD(&buf->list);
+        buf->n = n;
+        memcpy(buf->data, d, n);
+
+        spin_lock_bh(&port->lock);
+        list_add_tail(&buf->list, &port->buf_list);
+        port->buffered += n;
+        if (port->buffered > port->stats.watermark)
+                port->stats.watermark = port->buffered;
+        set_bit(BUFFERING_RX, &port->flags);
+        spin_unlock_bh(&port->lock);
+
+        return n;
+}
+
+static int fwtty_rx(struct fwtty_port *port, unsigned char *data, size_t len)
+{
+        struct tty_struct *tty;
+        int c, n = len;
+        unsigned lsr;
+        int err = 0;
+
+        tty = tty_port_tty_get(&port->port);
+        if (!tty)
+                return -ENOENT;
+
+        fwtty_dbg(port, "%d", n);
+        profile_size_distrib(port->stats.reads, n);
+
+        if (port->write_only) {
+                n = 0;
+                goto out;
+        }
+
+        /* disregard break status; breaks are generated by emit_breaks work */
+        lsr = (port->mstatus >> 24) & ~UART_LSR_BI;
+
+        if (port->overrun)
+                lsr |= UART_LSR_OE;
+
+        if (lsr & UART_LSR_OE)
+                ++port->icount.overrun;
+
+        lsr &= port->status_mask;
+        if (lsr & ~port->ignore_mask & UART_LSR_OE) {
+                if (!tty_insert_flip_char(tty, 0, TTY_OVERRUN)) {
+                        err = -EIO;
+                        goto out;
+                }
+        }
+        port->overrun = false;
+
+        if (lsr & port->ignore_mask & ~UART_LSR_OE) {
+                /* TODO: don't drop SAK and Magic SysRq here */
+                n = 0;
+                goto out;
+        }
+
+        if (!test_bit(BUFFERING_RX, &port->flags)) {
+                c = tty_insert_flip_string_fixed_flag(tty, data, TTY_NORMAL, n);
+                if (c > 0)
+                        tty_flip_buffer_push(tty);
+                n -= c;
+
+                if (n) {
+                        /* start buffering and throttling */
+                        n -= fwtty_buffer_rx(port, &data[c], n);
+
+                        spin_lock_bh(&port->lock);
+                        __fwtty_throttle(port, tty);
+                        spin_unlock_bh(&port->lock);
+                }
+        } else
+                n -= fwtty_buffer_rx(port, data, n);
+
+        if (n) {
+                port->overrun = true;
+                err = -EIO;
+        }
+
+out:
+        tty_kref_put(tty);
+
+        port->icount.rx += len;
+        port->stats.lost += n;
+        return err;
+}
+
+/**
+ * fwtty_port_handler - bus address handler for port reads/writes
+ * @parameters: fw_address_callback_t as specified by firewire core interface
+ *
+ * This handler is responsible for handling inbound read/write dma from remotes.
+ */
+static void fwtty_port_handler(struct fw_card *card,
+                               struct fw_request *request,
+                               int tcode, int destination, int source,
+                               int generation,
+                               unsigned long long addr,
+                               void *data, size_t len,
+                               void *callback_data)
+{
+        struct fwtty_port *port = callback_data;
+        struct fwtty_peer *peer;
+        int err;
+        int rcode;
+
+        /* Only accept rx from the peer virtual-cabled to this port */
+        rcu_read_lock();
+        peer = __fwserial_peer_by_node_id(card, generation, source);
+        rcu_read_unlock();
+        if (!peer || peer != rcu_access_pointer(port->peer)) {
+                rcode = RCODE_ADDRESS_ERROR;
+                fwtty_err_ratelimited(port, "ignoring unauthenticated data");
+                goto respond;
+        }
+
+        switch (tcode) {
+        case TCODE_WRITE_QUADLET_REQUEST:
+                if (addr != port->rx_handler.offset || len != 4)
+                        rcode = RCODE_ADDRESS_ERROR;
+                else {
+                        fwtty_update_port_status(port, *(unsigned *)data);
+                        rcode = RCODE_COMPLETE;
+                }
+                break;
+
+        case TCODE_WRITE_BLOCK_REQUEST:
+                if (addr != port->rx_handler.offset + 4 ||
+                    len > port->rx_handler.length - 4) {
+                        rcode = RCODE_ADDRESS_ERROR;
+                } else {
+                        err = fwtty_rx(port, data, len);
+                        switch (err) {
+                        case 0:
+                                rcode = RCODE_COMPLETE;
+                                break;
+                        case -EIO:
+                                rcode = RCODE_DATA_ERROR;
+                                break;
+                        default:
+                                rcode = RCODE_CONFLICT_ERROR;
+                                break;
+                        }
+                }
+                break;
+
+        default:
+                rcode = RCODE_TYPE_ERROR;
+        }
+
+respond:
+        fw_send_response(card, request, rcode);
+}
+
+/**
+ * fwtty_tx_complete - callback for tx dma
+ * @data: ignored, has no meaning for write txns
+ * @length: ignored, has no meaning for write txns
+ *
+ * The writer must be woken here if the fifo has been emptied because it
+ * may have slept if chars_in_buffer was != 0
+ */
+static void fwtty_tx_complete(struct fw_card *card, int rcode,
+                              void *data, size_t length,
+                              struct fwtty_transaction *txn)
+{
+        struct fwtty_port *port = txn->port;
+        struct tty_struct *tty;
+        int len;
+
+        fwtty_dbg(port, "rcode: %d", rcode);
+
+        switch (rcode) {
+        case RCODE_COMPLETE:
+                spin_lock_bh(&port->lock);
+                dma_fifo_out_complete(&port->tx_fifo, &txn->dma_pended);
+                len = dma_fifo_level(&port->tx_fifo);
+                spin_unlock_bh(&port->lock);
+
+                port->icount.tx += txn->dma_pended.len;
+                break;
+
+        default:
+                /* TODO: implement retries */
+                spin_lock_bh(&port->lock);
+                dma_fifo_out_complete(&port->tx_fifo, &txn->dma_pended);
+                len = dma_fifo_level(&port->tx_fifo);
+                spin_unlock_bh(&port->lock);
+
+                port->stats.dropped += txn->dma_pended.len;
+        }
+
+        if (len < WAKEUP_CHARS) {
+                tty = tty_port_tty_get(&port->port);
+                if (tty) {
+                        tty_wakeup(tty);
+                        tty_kref_put(tty);
+                }
+        }
+}
+
+static int fwtty_tx(struct fwtty_port *port, bool drain)
+{
+        struct fwtty_peer *peer;
+        struct fwtty_transaction *txn;
+        struct tty_struct *tty;
+        int n, len;
+
+        tty = tty_port_tty_get(&port->port);
+        if (!tty)
+                return -ENOENT;
+
+        rcu_read_lock();
+        peer = rcu_dereference(port->peer);
+        if (!peer) {
+                n = -EIO;
+                goto out;
+        }
+
+        if (test_and_set_bit(IN_TX, &port->flags)) {
+                n = -EALREADY;
+                goto out;
+        }
+
+        /* try to write as many dma transactions out as possible */
+        n = -EAGAIN;
+        while (!tty->stopped && !tty->hw_stopped &&
+                        !test_bit(STOP_TX, &port->flags)) {
+                txn = kmem_cache_alloc(fwtty_txn_cache, GFP_ATOMIC);
+                if (!txn) {
+                        n = -ENOMEM;
+                        break;
+                }
+
+                spin_lock_bh(&port->lock);
+                n = dma_fifo_out_pend(&port->tx_fifo, &txn->dma_pended);
+                spin_unlock_bh(&port->lock);
+
+                fwtty_dbg(port, "out: %u rem: %d", txn->dma_pended.len, n);
+
+                if (n < 0) {
+                        kmem_cache_free(fwtty_txn_cache, txn);
+                        if (n == -EAGAIN)
+                                ++port->stats.tx_stall;
+                        else if (n == -ENODATA)
+                                profile_size_distrib(port->stats.txns, 0);
+                        else {
+                                ++port->stats.fifo_errs;
+                                fwtty_err_ratelimited(port, "fifo err: %d", n);
+                        }
+                        break;
+                }
+
+                profile_size_distrib(port->stats.txns, txn->dma_pended.len);
+
+                fwtty_send_txn_async(peer, txn, TCODE_WRITE_BLOCK_REQUEST,
+                                     peer->fifo_addr, txn->dma_pended.data,
+                                     txn->dma_pended.len, fwtty_tx_complete,
+                                     port);
+                ++port->stats.sent;
+
+                /*
+                 * Stop tx if the 'last view' of the fifo is empty or if
+                 * this is the writer and there's not enough data to bother
+                 */
+                if (n == 0 || (!drain && n < WRITER_MINIMUM))
+                        break;
+        }
+
+        if (n >= 0 || n == -EAGAIN || n == -ENOMEM || n == -ENODATA) {
+                spin_lock_bh(&port->lock);
+                len = dma_fifo_out_level(&port->tx_fifo);
+                if (len) {
+                        unsigned long delay = (n == -ENOMEM) ? HZ : 1;
+                        schedule_delayed_work(&port->drain, delay);
+                }
+                len = dma_fifo_level(&port->tx_fifo);
+                spin_unlock_bh(&port->lock);
+
+                /* wakeup the writer */
+                if (drain && len < WAKEUP_CHARS)
+                        tty_wakeup(tty);
+        }
+
+        clear_bit(IN_TX, &port->flags);
+        wake_up_interruptible(&port->wait_tx);
+
+out:
+        rcu_read_unlock();
+        tty_kref_put(tty);
+        return n;
+}
+
+static void fwtty_drain_tx(struct work_struct *work)
+{
+        struct fwtty_port *port = to_port(to_delayed_work(work), drain);
+
+        fwtty_tx(port, true);
+}
+
+static void fwtty_write_xchar(struct fwtty_port *port, char ch)
+{
+        struct fwtty_peer *peer;
+
+        ++port->stats.xchars;
+
+        fwtty_dbg(port, "%02x", ch);
+
+        rcu_read_lock();
+        peer = rcu_dereference(port->peer);
+        if (peer) {
+                fwtty_send_data_async(peer, TCODE_WRITE_BLOCK_REQUEST,
+                                      peer->fifo_addr, &ch, sizeof(ch),
+                                      NULL, port);
+        }
+        rcu_read_unlock();
+}
+
+struct fwtty_port *fwtty_port_get(unsigned index)
+{
+        struct fwtty_port *port;
+
+        if (index >= MAX_TOTAL_PORTS)
+                return NULL;
+
+        mutex_lock(&port_table_lock);
+        port = port_table[index];
+        if (port)
+                kref_get(&port->serial->kref);
+        mutex_unlock(&port_table_lock);
+        return port;
+}
+EXPORT_SYMBOL(fwtty_port_get);
+
+static int fwtty_ports_add(struct fw_serial *serial)
+{
+        int err = -EBUSY;
+        int i, j;
+
+        if (port_table_corrupt)
+                return err;
+
+        mutex_lock(&port_table_lock);
+        for (i = 0; i + num_ports <= MAX_TOTAL_PORTS; i += num_ports) {
+                if (!port_table[i]) {
+                        for (j = 0; j < num_ports; ++i, ++j) {
+                                serial->ports[j]->index = i;
+                                port_table[i] = serial->ports[j];
+                        }
+                        err = 0;
+                        break;
+                }
+        }
+        mutex_unlock(&port_table_lock);
+        return err;
+}
+
+static void fwserial_destroy(struct kref *kref)
+{
+        struct fw_serial *serial = to_serial(kref, kref);
+        struct fwtty_port **ports = serial->ports;
+        int j, i = ports[0]->index;
+
+        synchronize_rcu();
+
+        mutex_lock(&port_table_lock);
+        for (j = 0; j < num_ports; ++i, ++j) {
+                static bool once;
+                int corrupt = port_table[i] != ports[j];
+                if (corrupt && !once) {
+                        WARN(corrupt, "port_table[%d]: %p != ports[%d]: %p",
+                             i, port_table[i], j, ports[j]);
+                        once = true;
+                        port_table_corrupt = true;
+                }
+
+                port_table[i] = NULL;
+        }
+        mutex_unlock(&port_table_lock);
+
+        for (j = 0; j < num_ports; ++j) {
+                fw_core_remove_address_handler(&ports[j]->rx_handler);
+                dma_fifo_free(&ports[j]->tx_fifo);
+                kfree(ports[j]);
+        }
+        kfree(serial);
+}
+
+void fwtty_port_put(struct fwtty_port *port)
+{
+        kref_put(&port->serial->kref, fwserial_destroy);
+}
+EXPORT_SYMBOL(fwtty_port_put);
+
+static void fwtty_port_dtr_rts(struct tty_port *tty_port, int on)
+{
+        struct fwtty_port *port = to_port(tty_port, port);
+
+        fwtty_dbg(port, "on/off: %d", on);
+
+        spin_lock_bh(&port->lock);
+        /* Don't change carrier state if this is a console */
+        if (!port->port.console) {
+                if (on)
+                        port->mctrl |= TIOCM_DTR | TIOCM_RTS;
+                else
+                        port->mctrl &= ~(TIOCM_DTR | TIOCM_RTS);
+        }
+
+        __fwtty_write_port_status(port);
+        spin_unlock_bh(&port->lock);
+}
+
+/**
+ * fwtty_port_carrier_raised: required tty_port operation
+ *
+ * This port operation is polled after a tty has been opened and is waiting for
+ * carrier detect -- see drivers/tty/tty_port:tty_port_block_til_ready().
+ */
+static int fwtty_port_carrier_raised(struct tty_port *tty_port)
+{
+        struct fwtty_port *port = to_port(tty_port, port);
+        int rc;
+
+        rc = (port->mstatus & TIOCM_CAR);
+
+        fwtty_dbg(port, "%d", rc);
+
+        return rc;
+}
+
+static unsigned set_termios(struct fwtty_port *port, struct tty_struct *tty)
+{
+        unsigned baud, frame;
+
+        baud = tty_termios_baud_rate(&tty->termios);
+        tty_termios_encode_baud_rate(&tty->termios, baud, baud);
+
+        /* compute bit count of 2 frames */
+        frame = 12 + ((C_CSTOPB(tty)) ? 4 : 2) + ((C_PARENB(tty)) ? 2 : 0);
+
+        switch (C_CSIZE(tty)) {
+        case CS5:
+                frame -= (C_CSTOPB(tty)) ? 1 : 0;
+                break;
+        case CS6:
+                frame += 2;
+                break;
+        case CS7:
+                frame += 4;
+                break;
+        case CS8:
+                frame += 6;
+                break;
+        }
+
+        port->cps = (baud << 1) / frame;
+
+        port->status_mask = UART_LSR_OE;
+        if (_I_FLAG(tty, BRKINT | PARMRK))
+                port->status_mask |= UART_LSR_BI;
+
+        port->ignore_mask = 0;
+        if (I_IGNBRK(tty)) {
+                port->ignore_mask |= UART_LSR_BI;
+                if (I_IGNPAR(tty))
+                        port->ignore_mask |= UART_LSR_OE;
+        }
+
+        port->write_only = !C_CREAD(tty);
+
+        /* turn off echo and newline xlat if loopback */
+        if (port->loopback) {
+                tty->termios.c_lflag &= ~(ECHO | ECHOE | ECHOK | ECHOKE |
+                                          ECHONL | ECHOPRT | ECHOCTL);
+                tty->termios.c_oflag &= ~ONLCR;
+        }
+
+        return baud;
+}
+
+static int fwtty_port_activate(struct tty_port *tty_port,
+                               struct tty_struct *tty)
+{
+        struct fwtty_port *port = to_port(tty_port, port);
+        unsigned baud;
+        int err;
+
+        set_bit(TTY_IO_ERROR, &tty->flags);
+
+        err = dma_fifo_alloc(&port->tx_fifo, FWTTY_PORT_TXFIFO_LEN,
+                             cache_line_size(),
+                             port->max_payload,
+                             FWTTY_PORT_MAX_PEND_DMA,
+                             GFP_KERNEL);
+        if (err)
+                return err;
+
+        spin_lock_bh(&port->lock);
+
+        baud = set_termios(port, tty);
+
+        /* if console, don't change carrier state */
+        if (!port->port.console) {
+                port->mctrl = 0;
+                if (baud != 0)
+                        port->mctrl = TIOCM_DTR | TIOCM_RTS;
+        }
+
+        if (C_CRTSCTS(tty) && ~port->mstatus & TIOCM_CTS)
+                tty->hw_stopped = 1;
+
+        __fwtty_write_port_status(port);
+        spin_unlock_bh(&port->lock);
+
+        clear_bit(TTY_IO_ERROR, &tty->flags);
+
+        return 0;
+}
+
+/**
+ * fwtty_port_shutdown
+ *
+ * Note: the tty port core ensures this is not the console and
+ * manages TTY_IO_ERROR properly
+ */
+static void fwtty_port_shutdown(struct tty_port *tty_port)
+{
+        struct fwtty_port *port = to_port(tty_port, port);
+        struct buffered_rx *buf, *next;
+
+        /* TODO: cancel outstanding transactions */
+
+        cancel_delayed_work_sync(&port->emit_breaks);
+        cancel_delayed_work_sync(&port->drain);
+        cancel_work_sync(&port->push);
+
+        spin_lock_bh(&port->lock);
+        list_for_each_entry_safe(buf, next, &port->buf_list, list) {
+                list_del(&buf->list);
+                kfree(buf);
+        }
+        port->buffered = 0;
+        port->flags = 0;
+        port->break_ctl = 0;
+        port->overrun = 0;
+        __fwtty_write_port_status(port);
+        dma_fifo_free(&port->tx_fifo);
+        spin_unlock_bh(&port->lock);
+}
+
+static int fwtty_open(struct tty_struct *tty, struct file *fp)
+{
+        struct fwtty_port *port = tty->driver_data;
+
+        return tty_port_open(&port->port, tty, fp);
+}
+
+static void fwtty_close(struct tty_struct *tty, struct file *fp)
+{
+        struct fwtty_port *port = tty->driver_data;
+
+        tty_port_close(&port->port, tty, fp);
+}
+
+static void fwtty_hangup(struct tty_struct *tty)
+{
+        struct fwtty_port *port = tty->driver_data;
+
+        tty_port_hangup(&port->port);
+}
+
+static void fwtty_cleanup(struct tty_struct *tty)
+{
+        struct fwtty_port *port = tty->driver_data;
+
+        tty->driver_data = NULL;
+        fwtty_port_put(port);
+}
+
+static int fwtty_install(struct tty_driver *driver, struct tty_struct *tty)
+{
+        struct fwtty_port *port = fwtty_port_get(tty->index);
+        int err;
+
+        err = tty_standard_install(driver, tty);
+        if (!err)
+                tty->driver_data = port;
+        else
+                fwtty_port_put(port);
+        return err;
+}
+
+static int fwtty_write(struct tty_struct *tty, const unsigned char *buf, int c)
+{
+        struct fwtty_port *port = tty->driver_data;
+        int n, len;
+
+        fwtty_dbg(port, "%d", c);
+        profile_size_distrib(port->stats.writes, c);
+
+        spin_lock_bh(&port->lock);
+        n = dma_fifo_in(&port->tx_fifo, buf, c);
+        len = dma_fifo_out_level(&port->tx_fifo);
+        if (len < DRAIN_THRESHOLD)
+                schedule_delayed_work(&port->drain, 1);
+        spin_unlock_bh(&port->lock);
+
+        if (len >= DRAIN_THRESHOLD)
+                fwtty_tx(port, false);
+
+        debug_short_write(port, c, n);
+
+        return (n < 0) ? 0 : n;
+}
+
+static int fwtty_write_room(struct tty_struct *tty)
+{
+        struct fwtty_port *port = tty->driver_data;
+        int n;
+
+        spin_lock_bh(&port->lock);
+        n = dma_fifo_avail(&port->tx_fifo);
+        spin_unlock_bh(&port->lock);
+
+        fwtty_dbg(port, "%d", n);
+
+        return n;
+}
+
+static int fwtty_chars_in_buffer(struct tty_struct *tty)
+{
+        struct fwtty_port *port = tty->driver_data;
+        int n;
+
+        spin_lock_bh(&port->lock);
+        n = dma_fifo_level(&port->tx_fifo);
+        spin_unlock_bh(&port->lock);
+
+        fwtty_dbg(port, "%d", n);
+
+        return n;
+}
+
+static void fwtty_send_xchar(struct tty_struct *tty, char ch)
+{
+        struct fwtty_port *port = tty->driver_data;
+
+        fwtty_dbg(port, "%02x", ch);
+
+        fwtty_write_xchar(port, ch);
+}
+
+static void fwtty_throttle(struct tty_struct *tty)
+{
+        struct fwtty_port *port = tty->driver_data;
+
+        /*
+         * Ignore throttling (but not unthrottling).
+         * It only makes sense to throttle when data will no longer be
+         * accepted by the tty flip buffer. For example, it is
+         * possible for received data to overflow the tty buffer long
+         * before the line discipline ever has a chance to throttle the driver.
+         * Additionally, the driver may have already completed the I/O
+         * but the tty buffer is still emptying, so the line discipline is
+         * throttling and unthrottling nothing.
+         */
+
+        ++port->stats.throttled;
+}
+
+static void fwtty_unthrottle(struct tty_struct *tty)
+{
+        struct fwtty_port *port = tty->driver_data;
+
+        fwtty_dbg(port, "CRTSCTS: %d", (C_CRTSCTS(tty) != 0));
+
+        profile_fifo_avail(port, port->stats.unthrottle);
+
+        schedule_work(&port->push);
+
+        spin_lock_bh(&port->lock);
+        port->mctrl &= ~OOB_RX_THROTTLE;
+        if (C_CRTSCTS(tty))
+                port->mctrl |= TIOCM_RTS;
+        __fwtty_write_port_status(port);
+        spin_unlock_bh(&port->lock);
+}
+
+static int check_msr_delta(struct fwtty_port *port, unsigned long mask,
+                           struct async_icount *prev)
+{
+        struct async_icount now;
+        int delta;
+
+        now = port->icount;
+
+        delta = ((mask & TIOCM_RNG && prev->rng != now.rng) ||
+                 (mask & TIOCM_DSR && prev->dsr != now.dsr) ||
+                 (mask & TIOCM_CAR && prev->dcd != now.dcd) ||
+                 (mask & TIOCM_CTS && prev->cts != now.cts));
+
+        *prev = now;
+
+        return delta;
+}
+
+static int wait_msr_change(struct fwtty_port *port, unsigned long mask)
+{
+        struct async_icount prev;
+
+        prev = port->icount;
+
+        return wait_event_interruptible(port->port.delta_msr_wait,
+                                        check_msr_delta(port, mask, &prev));
+}
+
+static int get_serial_info(struct fwtty_port *port,
+                           struct serial_struct __user *info)
+{
+        struct serial_struct tmp;
+
+        memset(&tmp, 0, sizeof(tmp));
+
+        tmp.type =  PORT_UNKNOWN;
+        tmp.line =  port->port.tty->index;
+        tmp.flags = port->port.flags;
+        tmp.xmit_fifo_size = FWTTY_PORT_TXFIFO_LEN;
+        tmp.baud_base = 400000000;
+        tmp.close_delay = port->port.close_delay;
+
+        return (copy_to_user(info, &tmp, sizeof(*info))) ? -EFAULT : 0;
+}
+
+static int set_serial_info(struct fwtty_port *port,
+                           struct serial_struct __user *info)
+{
+        struct serial_struct tmp;
+
+        if (copy_from_user(&tmp, info, sizeof(tmp)))
+                return -EFAULT;
+
+        if (tmp.irq != 0 || tmp.port != 0 || tmp.custom_divisor != 0 ||
+                        tmp.baud_base != 400000000)
+                return -EPERM;
+
+        if (!capable(CAP_SYS_ADMIN)) {
+                if (((tmp.flags & ~ASYNC_USR_MASK) !=
+                     (port->port.flags & ~ASYNC_USR_MASK)))
+                        return -EPERM;
+        } else
+                port->port.close_delay = tmp.close_delay * HZ / 100;
+
+        return 0;
+}
+
+static int fwtty_ioctl(struct tty_struct *tty, unsigned cmd,
+                       unsigned long arg)
+{
+        struct fwtty_port *port = tty->driver_data;
+        int err;
+
+        switch (cmd) {
+        case TIOCGSERIAL:
+                mutex_lock(&port->port.mutex);
+                err = get_serial_info(port, (void __user *)arg);
+                mutex_unlock(&port->port.mutex);
+                break;
+
+        case TIOCSSERIAL:
+                mutex_lock(&port->port.mutex);
+                err = set_serial_info(port, (void __user *)arg);
+                mutex_unlock(&port->port.mutex);
+                break;
+
+        case TIOCMIWAIT:
+                err = wait_msr_change(port, arg);
+                break;
+
+        default:
+                err = -ENOIOCTLCMD;
+        }
+
+        return err;
+}
+
+static void fwtty_set_termios(struct tty_struct *tty, struct ktermios *old)
+{
+        struct fwtty_port *port = tty->driver_data;
+        unsigned baud;
+
+        spin_lock_bh(&port->lock);
+        baud = set_termios(port, tty);
+
+        if ((baud == 0) && (old->c_cflag & CBAUD))
+                port->mctrl &= ~(TIOCM_DTR | TIOCM_RTS);
+        else if ((baud != 0) && !(old->c_cflag & CBAUD)) {
+                if (C_CRTSCTS(tty) || !test_bit(TTY_THROTTLED, &tty->flags))
+                        port->mctrl |= TIOCM_DTR | TIOCM_RTS;
+                else
+                        port->mctrl |= TIOCM_DTR;
+        }
+        __fwtty_write_port_status(port);
+        spin_unlock_bh(&port->lock);
+
+        if (old->c_cflag & CRTSCTS) {
+                if (!C_CRTSCTS(tty)) {
+                        tty->hw_stopped = 0;
+                        fwtty_restart_tx(port);
+                }
+        } else if (C_CRTSCTS(tty) && ~port->mstatus & TIOCM_CTS) {
+                tty->hw_stopped = 1;
+        }
+}
+
+/**
+ * fwtty_break_ctl - start/stop sending breaks
+ *
+ * Signals the remote to start or stop generating simulated breaks.
+ * First, stop dequeueing from the fifo and wait for writer/drain to leave tx
+ * before signalling the break line status. This guarantees any pending rx will
+ * be queued to the line discipline before break is simulated on the remote.
+ * Conversely, turning off break_ctl requires signalling the line status change,
+ * then enabling tx.
+ */
+static int fwtty_break_ctl(struct tty_struct *tty, int state)
+{
+        struct fwtty_port *port = tty->driver_data;
+        long ret;
+
+        fwtty_dbg(port, "%d", state);
+
+        if (state == -1) {
+                set_bit(STOP_TX, &port->flags);
+                ret = wait_event_interruptible_timeout(port->wait_tx,
+                                               !test_bit(IN_TX, &port->flags),
+                                               10);
+                if (ret == 0 || ret == -ERESTARTSYS) {
+                        clear_bit(STOP_TX, &port->flags);
+                        fwtty_restart_tx(port);
+                        return -EINTR;
+                }
+        }
+
+        spin_lock_bh(&port->lock);
+        port->break_ctl = (state == -1);
+        __fwtty_write_port_status(port);
+        spin_unlock_bh(&port->lock);
+
+        if (state == 0) {
+                spin_lock_bh(&port->lock);
+                dma_fifo_reset(&port->tx_fifo);
+                clear_bit(STOP_TX, &port->flags);
+                spin_unlock_bh(&port->lock);
+        }
+        return 0;
+}
+
+static int fwtty_tiocmget(struct tty_struct *tty)
+{
+        struct fwtty_port *port = tty->driver_data;
+        unsigned tiocm;
+
+        spin_lock_bh(&port->lock);
+        tiocm = (port->mctrl & MCTRL_MASK) | (port->mstatus & ~MCTRL_MASK);
+        spin_unlock_bh(&port->lock);
+
+        fwtty_dbg(port, "%x", tiocm);
+
+        return tiocm;
+}
+
+static int fwtty_tiocmset(struct tty_struct *tty, unsigned set, unsigned clear)
+{
+        struct fwtty_port *port = tty->driver_data;
+
+        fwtty_dbg(port, "set: %x clear: %x", set, clear);
+
+        /* TODO: simulate loopback if TIOCM_LOOP set */
+
+        spin_lock_bh(&port->lock);
+        port->mctrl &= ~(clear & MCTRL_MASK & 0xffff);
+        port->mctrl |= set & MCTRL_MASK & 0xffff;
+        __fwtty_write_port_status(port);
+        spin_unlock_bh(&port->lock);
+        return 0;
+}
+
+static int fwtty_get_icount(struct tty_struct *tty,
+                            struct serial_icounter_struct *icount)
+{
+        struct fwtty_port *port = tty->driver_data;
+        struct stats stats;
+
+        memcpy(&stats, &port->stats, sizeof(stats));
+        if (port->port.console)
+                (*port->fwcon_ops->stats)(&stats, port->con_data);
+
+        icount->cts = port->icount.cts;
+        icount->dsr = port->icount.dsr;
+        icount->rng = port->icount.rng;
+        icount->dcd = port->icount.dcd;
+        icount->rx  = port->icount.rx;
+        icount->tx  = port->icount.tx + stats.xchars;
+        icount->frame   = port->icount.frame;
+        icount->overrun = port->icount.overrun;
+        icount->parity  = port->icount.parity;
+        icount->brk     = port->icount.brk;
+        icount->buf_overrun = port->icount.overrun;
+        return 0;
+}
+
+static void fwtty_proc_show_port(struct seq_file *m, struct fwtty_port *port)
+{
+        struct stats stats;
+
+        memcpy(&stats, &port->stats, sizeof(stats));
+        if (port->port.console)
+                (*port->fwcon_ops->stats)(&stats, port->con_data);
+
+        seq_printf(m, " tx:%d rx:%d", port->icount.tx + stats.xchars,
+                   port->icount.rx);
+        seq_printf(m, " cts:%d dsr:%d rng:%d dcd:%d", port->icount.cts,
+                   port->icount.dsr, port->icount.rng, port->icount.dcd);
+        seq_printf(m, " fe:%d oe:%d pe:%d brk:%d", port->icount.frame,
+                   port->icount.overrun, port->icount.parity, port->icount.brk);
+        seq_printf(m, " dr:%d st:%d err:%d lost:%d", stats.dropped,
+                   stats.tx_stall, stats.fifo_errs, stats.lost);
+        seq_printf(m, " pkts:%d thr:%d wtrmk:%d", stats.sent, stats.throttled,
+                   stats.watermark);
+        seq_printf(m, " addr:%012llx", port->rx_handler.offset);
+
+        if (port->port.console) {
+                seq_printf(m, "\n    ");
+                (*port->fwcon_ops->proc_show)(m, port->con_data);
+        }
+
+        dump_profile(m, &port->stats);
+}
+
+static void fwtty_proc_show_peer(struct seq_file *m, struct fwtty_peer *peer)
+{
+        int generation = peer->generation;
+
+        smp_rmb();
+        seq_printf(m, " %s:", dev_name(&peer->unit->device));
+        seq_printf(m, " node:%04x gen:%d", peer->node_id, generation);
+        seq_printf(m, " sp:%d max:%d guid:%016llx", peer->speed,
+                   peer->max_payload, (unsigned long long) peer->guid);
+
+        if (capable(CAP_SYS_ADMIN)) {
+                seq_printf(m, " mgmt:%012llx",
+                           (unsigned long long) peer->mgmt_addr);
+                seq_printf(m, " addr:%012llx",
+                           (unsigned long long) peer->status_addr);
+        }
+        seq_putc(m, '\n');
+}
+
+static int fwtty_proc_show(struct seq_file *m, void *v)
+{
+        struct fwtty_port *port;
+        struct fw_serial *serial;
+        struct fwtty_peer *peer;
+        int i;
+
+        seq_puts(m, "fwserinfo: 1.0 driver: 1.0\n");
+        for (i = 0; i < MAX_TOTAL_PORTS && (port = fwtty_port_get(i)); ++i) {
+                seq_printf(m, "%2d:", i);
+                if (capable(CAP_SYS_ADMIN))
+                        fwtty_proc_show_port(m, port);
+                fwtty_port_put(port);
+                seq_printf(m, "\n");
+        }
+        seq_putc(m, '\n');
+
+        rcu_read_lock();
+        list_for_each_entry_rcu(serial, &fwserial_list, list) {
+                seq_printf(m, "card: %s  guid: %016llx\n",
+                           dev_name(serial->card->device),
+                           (unsigned long long) serial->card->guid);
+                list_for_each_entry_rcu(peer, &serial->peer_list, list)
+                        fwtty_proc_show_peer(m, peer);
+        }
+        rcu_read_unlock();
+        return 0;
+}
+
+static int fwtty_proc_open(struct inode *inode, struct file *fp)
+{
+        return single_open(fp, fwtty_proc_show, NULL);
+}
+
+static const struct file_operations fwtty_proc_fops = {
+        .owner =        THIS_MODULE,
+        .open =         fwtty_proc_open,
+        .read =         seq_read,
+        .llseek =       seq_lseek,
+        .release =      single_release,
+};
+
+static const struct tty_port_operations fwtty_port_ops = {
+        .dtr_rts =              fwtty_port_dtr_rts,
+        .carrier_raised =       fwtty_port_carrier_raised,
+        .shutdown =             fwtty_port_shutdown,
+        .activate =             fwtty_port_activate,
+};
+
+static const struct tty_operations fwtty_ops = {
+        .open =                 fwtty_open,
+        .close =                fwtty_close,
+        .hangup =               fwtty_hangup,
+        .cleanup =              fwtty_cleanup,
+        .install =              fwtty_install,
+        .write =                fwtty_write,
+        .write_room =           fwtty_write_room,
+        .chars_in_buffer =      fwtty_chars_in_buffer,
+        .send_xchar =           fwtty_send_xchar,
+        .throttle =             fwtty_throttle,
+        .unthrottle =           fwtty_unthrottle,
+        .ioctl =                fwtty_ioctl,
+        .set_termios =          fwtty_set_termios,
+        .break_ctl =            fwtty_break_ctl,
+        .tiocmget =             fwtty_tiocmget,
+        .tiocmset =             fwtty_tiocmset,
+        .get_icount =           fwtty_get_icount,
+        .proc_fops =            &fwtty_proc_fops,
+};
+
+static inline int mgmt_pkt_expected_len(__be16 code)
+{
+        static const struct fwserial_mgmt_pkt pkt;
+
+        switch (be16_to_cpu(code)) {
+        case FWSC_VIRT_CABLE_PLUG:
+                return sizeof(pkt.hdr) + sizeof(pkt.plug_req);
+
+        case FWSC_VIRT_CABLE_PLUG_RSP:  /* | FWSC_RSP_OK */
+                return sizeof(pkt.hdr) + sizeof(pkt.plug_rsp);
+
+
+        case FWSC_VIRT_CABLE_UNPLUG:
+        case FWSC_VIRT_CABLE_UNPLUG_RSP:
+        case FWSC_VIRT_CABLE_PLUG_RSP | FWSC_RSP_NACK:
+        case FWSC_VIRT_CABLE_UNPLUG_RSP | FWSC_RSP_NACK:
+                return sizeof(pkt.hdr);
+
+        default:
+                return -1;
+        }
+}
+
+static inline void fill_plug_params(struct virt_plug_params *params,
+                                    struct fwtty_port *port)
+{
+        u64 status_addr = port->rx_handler.offset;
+        u64 fifo_addr = port->rx_handler.offset + 4;
+        size_t fifo_len = port->rx_handler.length - 4;
+
+        params->status_hi = cpu_to_be32(status_addr >> 32);
+        params->status_lo = cpu_to_be32(status_addr);
+        params->fifo_hi = cpu_to_be32(fifo_addr >> 32);
+        params->fifo_lo = cpu_to_be32(fifo_addr);
+        params->fifo_len = cpu_to_be32(fifo_len);
+}
+
+static inline void fill_plug_req(struct fwserial_mgmt_pkt *pkt,
+                                 struct fwtty_port *port)
+{
+        pkt->hdr.code = cpu_to_be16(FWSC_VIRT_CABLE_PLUG);
+        pkt->hdr.len = cpu_to_be16(mgmt_pkt_expected_len(pkt->hdr.code));
+        fill_plug_params(&pkt->plug_req, port);
+}
+
+static inline void fill_plug_rsp_ok(struct fwserial_mgmt_pkt *pkt,
+                                    struct fwtty_port *port)
+{
+        pkt->hdr.code = cpu_to_be16(FWSC_VIRT_CABLE_PLUG_RSP);
+        pkt->hdr.len = cpu_to_be16(mgmt_pkt_expected_len(pkt->hdr.code));
+        fill_plug_params(&pkt->plug_rsp, port);
+}
+
+static inline void fill_plug_rsp_nack(struct fwserial_mgmt_pkt *pkt)
+{
+        pkt->hdr.code = cpu_to_be16(FWSC_VIRT_CABLE_PLUG_RSP | FWSC_RSP_NACK);
+        pkt->hdr.len = cpu_to_be16(mgmt_pkt_expected_len(pkt->hdr.code));
+}
+
+static inline void fill_unplug_req(struct fwserial_mgmt_pkt *pkt)
+{
+        pkt->hdr.code = cpu_to_be16(FWSC_VIRT_CABLE_UNPLUG);
+        pkt->hdr.len = cpu_to_be16(mgmt_pkt_expected_len(pkt->hdr.code));
+}
+
+static inline void fill_unplug_rsp_nack(struct fwserial_mgmt_pkt *pkt)
+{
+        pkt->hdr.code = cpu_to_be16(FWSC_VIRT_CABLE_UNPLUG_RSP | FWSC_RSP_NACK);
+        pkt->hdr.len = cpu_to_be16(mgmt_pkt_expected_len(pkt->hdr.code));
+}
+
+static inline void fill_unplug_rsp_ok(struct fwserial_mgmt_pkt *pkt)
+{
+        pkt->hdr.code = cpu_to_be16(FWSC_VIRT_CABLE_UNPLUG_RSP);
+        pkt->hdr.len = cpu_to_be16(mgmt_pkt_expected_len(pkt->hdr.code));
+}
+
+static void fwserial_virt_plug_complete(struct fwtty_peer *peer,
+                                        struct virt_plug_params *params)
+{
+        struct fwtty_port *port = peer->port;
+
+        peer->status_addr = be32_to_u64(params->status_hi, params->status_lo);
+        peer->fifo_addr = be32_to_u64(params->fifo_hi, params->fifo_lo);
+        peer->fifo_len = be32_to_cpu(params->fifo_len);
+        peer_set_state(peer, FWPS_ATTACHED);
+
+        /* reconfigure tx_fifo optimally for this peer */
+        spin_lock_bh(&port->lock);
+        port->max_payload = min3(peer->max_payload, peer->fifo_len,
+                                 MAX_ASYNC_PAYLOAD);
+        dma_fifo_change_tx_limit(&port->tx_fifo, port->max_payload);
+        spin_unlock_bh(&peer->port->lock);
+
+        if (port->port.console && port->fwcon_ops->notify != NULL)
+                (*port->fwcon_ops->notify)(FWCON_NOTIFY_ATTACH, port->con_data);
+
+        fwtty_info(&peer->unit, "peer (guid:%016llx) connected on %s",
+                   (unsigned long long)peer->guid, dev_name(port->device));
+}
+
+static inline int fwserial_send_mgmt_sync(struct fwtty_peer *peer,
+                                          struct fwserial_mgmt_pkt *pkt)
+{
+        int generation;
+        int rcode, tries = 5;
+
+        do {
+                generation = peer->generation;
+                smp_rmb();
+
+                rcode = fw_run_transaction(peer->serial->card,
+                                           TCODE_WRITE_BLOCK_REQUEST,
+                                           peer->node_id,
+                                           generation, peer->speed,
+                                           peer->mgmt_addr,
+                                           pkt, be16_to_cpu(pkt->hdr.len));
+                if (rcode == RCODE_BUSY || rcode == RCODE_SEND_ERROR ||
+                    rcode == RCODE_GENERATION) {
+                        fwtty_dbg(&peer->unit, "mgmt write error: %d", rcode);
+                        continue;
+                } else
+                        break;
+        } while (--tries > 0);
+        return rcode;
+}
+
+/**
+ * fwserial_claim_port - attempt to claim port @ index for peer
+ *
+ * Returns ptr to claimed port or error code (as ERR_PTR())
+ * Can sleep - must be called from process context
+ */
+static struct fwtty_port *fwserial_claim_port(struct fwtty_peer *peer,
+                                              int index)
+{
+        struct fwtty_port *port;
+
+        if (index < 0 || index >= num_ports)
+                return ERR_PTR(-EINVAL);
+
+        /* must guarantee that previous port releases have completed */
+        synchronize_rcu();
+
+        port = peer->serial->ports[index];
+        spin_lock_bh(&port->lock);
+        if (!rcu_access_pointer(port->peer))
+                rcu_assign_pointer(port->peer, peer);
+        else
+                port = ERR_PTR(-EBUSY);
+        spin_unlock_bh(&port->lock);
+
+        return port;
+}
+
+/**
+ * fwserial_find_port - find avail port and claim for peer
+ *
+ * Returns ptr to claimed port or NULL if none avail
+ * Can sleep - must be called from process context
+ */
+static struct fwtty_port *fwserial_find_port(struct fwtty_peer *peer)
+{
+        struct fwtty_port **ports = peer->serial->ports;
+        int i;
+
+        /* must guarantee that previous port releases have completed */
+        synchronize_rcu();
+
+        /* TODO: implement optional GUID-to-specific port # matching */
+
+        /* find an unattached port (but not the loopback port, if present) */
+        for (i = 0; i < num_ttys; ++i) {
+                spin_lock_bh(&ports[i]->lock);
+                if (!ports[i]->peer) {
+                        /* claim port */
+                        rcu_assign_pointer(ports[i]->peer, peer);
+                        spin_unlock_bh(&ports[i]->lock);
+                        return ports[i];
+                }
+                spin_unlock_bh(&ports[i]->lock);
+        }
+        return NULL;
+}
+
+static void fwserial_release_port(struct fwtty_port *port)
+{
+        /* drop carrier (and all other line status) */
+        fwtty_update_port_status(port, 0);
+
+        spin_lock_bh(&port->lock);
+
+        /* reset dma fifo max transmission size back to S100 */
+        port->max_payload = link_speed_to_max_payload(SCODE_100);
+        dma_fifo_change_tx_limit(&port->tx_fifo, port->max_payload);
+
+        rcu_assign_pointer(port->peer, NULL);
+        spin_unlock_bh(&port->lock);
+
+        if (port->port.console && port->fwcon_ops->notify != NULL)
+                (*port->fwcon_ops->notify)(FWCON_NOTIFY_DETACH, port->con_data);
+}
+
+static void fwserial_plug_timeout(unsigned long data)
+{
+        struct fwtty_peer *peer = (struct fwtty_peer *) data;
+        struct fwtty_port *port;
+
+        spin_lock_bh(&peer->lock);
+        if (peer->state != FWPS_PLUG_PENDING) {
+                spin_unlock_bh(&peer->lock);
+                return;
+        }
+
+        port = peer_revert_state(peer);
+        spin_unlock_bh(&peer->lock);
+
+        if (port)
+                fwserial_release_port(port);
+}
+
+/**
+ * fwserial_connect_peer - initiate virtual cable with peer
+ *
+ * Returns 0 if VIRT_CABLE_PLUG request was successfully sent,
+ * otherwise error code.  Must be called from process context.
+ */
+static int fwserial_connect_peer(struct fwtty_peer *peer)
+{
+        struct fwtty_port *port;
+        struct fwserial_mgmt_pkt *pkt;
+        int err, rcode;
+
+        pkt = kmalloc(sizeof(*pkt), GFP_KERNEL);
+        if (!pkt)
+                return -ENOMEM;
+
+        port = fwserial_find_port(peer);
+        if (!port) {
+                fwtty_err(&peer->unit, "avail ports in use");
+                err = -EBUSY;
+                goto free_pkt;
+        }
+
+        spin_lock_bh(&peer->lock);
+
+        /* only initiate VIRT_CABLE_PLUG if peer is currently not attached */
+        if (peer->state != FWPS_NOT_ATTACHED) {
+                err = -EBUSY;
+                goto release_port;
+        }
+
+        peer->port = port;
+        peer_set_state(peer, FWPS_PLUG_PENDING);
+
+        fill_plug_req(pkt, peer->port);
+
+        setup_timer(&peer->timer, fwserial_plug_timeout, (unsigned long)peer);
+        mod_timer(&peer->timer, jiffies + VIRT_CABLE_PLUG_TIMEOUT);
+        spin_unlock_bh(&peer->lock);
+
+        rcode = fwserial_send_mgmt_sync(peer, pkt);
+
+        spin_lock_bh(&peer->lock);
+        if (peer->state == FWPS_PLUG_PENDING && rcode != RCODE_COMPLETE) {
+                if (rcode == RCODE_CONFLICT_ERROR)
+                        err = -EAGAIN;
+                else
+                        err = -EIO;
+                goto cancel_timer;
+        }
+        spin_unlock_bh(&peer->lock);
+
+        kfree(pkt);
+        return 0;
+
+cancel_timer:
+        del_timer(&peer->timer);
+        peer_revert_state(peer);
+release_port:
+        spin_unlock_bh(&peer->lock);
+        fwserial_release_port(port);
+free_pkt:
+        kfree(pkt);
+        return err;
+}
+
+/**
+ * fwserial_close_port -
+ * HUP the tty (if the tty exists) and unregister the tty device.
+ * Only used by the unit driver upon unit removal to disconnect and
+ * cleanup all attached ports
+ *
+ * The port reference is put by fwtty_cleanup (if a reference was
+ * ever taken).
+ */
+static void fwserial_close_port(struct fwtty_port *port)
+{
+        struct tty_struct *tty;
+
+        mutex_lock(&port->port.mutex);
+        tty = tty_port_tty_get(&port->port);
+        if (tty) {
+                tty_vhangup(tty);
+                tty_kref_put(tty);
+        }
+        mutex_unlock(&port->port.mutex);
+
+        tty_unregister_device(fwtty_driver, port->index);
+}
+
+/**
+ * fwserial_lookup - finds first fw_serial associated with card
+ * @card: fw_card to match
+ *
+ * NB: caller must be holding fwserial_list_mutex
+ */
+static struct fw_serial *fwserial_lookup(struct fw_card *card)
+{
+        struct fw_serial *serial;
+
+        list_for_each_entry(serial, &fwserial_list, list) {
+                if (card == serial->card)
+                        return serial;
+        }
+
+        return NULL;
+}
+
+/**
+ * __fwserial_lookup_rcu - finds first fw_serial associated with card
+ * @card: fw_card to match
+ *
+ * NB: caller must be inside rcu_read_lock() section
+ */
+static struct fw_serial *__fwserial_lookup_rcu(struct fw_card *card)
+{
+        struct fw_serial *serial;
+
+        list_for_each_entry_rcu(serial, &fwserial_list, list) {
+                if (card == serial->card)
+                        return serial;
+        }
+
+        return NULL;
+}
+
+/**
+ * __fwserial_peer_by_node_id - finds a peer matching the given generation + id
+ *
+ * If a matching peer could not be found for the specified generation/node id,
+ * this could be because:
+ * a) the generation has changed and one of the nodes hasn't updated yet
+ * b) the remote node has created its remote unit device before this
+ *    local node has created its corresponding remote unit device
+ * In either case, the remote node should retry
+ *
+ * Note: caller must be in rcu_read_lock() section
+ */
+static struct fwtty_peer *__fwserial_peer_by_node_id(struct fw_card *card,
+                                                     int generation, int id)
+{
+        struct fw_serial *serial;
+        struct fwtty_peer *peer;
+
+        serial = __fwserial_lookup_rcu(card);
+        if (!serial) {
+                /*
+                 * Something is very wrong - there should be a matching
+                 * fw_serial structure for every fw_card. Maybe the remote node
+                 * has created its remote unit device before this driver has
+                 * been probed for any unit devices...
+                 */
+                fwtty_err(card, "unknown card (guid %016llx)",
+                          (unsigned long long) card->guid);
+                return NULL;
+        }
+
+        list_for_each_entry_rcu(peer, &serial->peer_list, list) {
+                int g = peer->generation;
+                smp_rmb();
+                if (generation == g && id == peer->node_id)
+                        return peer;
+        }
+
+        return NULL;
+}
+
+#ifdef DEBUG
+static void __dump_peer_list(struct fw_card *card)
+{
+        struct fw_serial *serial;
+        struct fwtty_peer *peer;
+
+        serial = __fwserial_lookup_rcu(card);
+        if (!serial)
+                return;
+
+        list_for_each_entry_rcu(peer, &serial->peer_list, list) {
+                int g = peer->generation;
+                smp_rmb();
+                fwtty_dbg(card, "peer(%d:%x) guid: %016llx\n", g,
+                          peer->node_id, (unsigned long long) peer->guid);
+        }
+}
+#else
+#define __dump_peer_list(s)
+#endif
+
+static void fwserial_auto_connect(struct work_struct *work)
+{
+        struct fwtty_peer *peer = to_peer(to_delayed_work(work), connect);
+        int err;
+
+        err = fwserial_connect_peer(peer);
+        if (err == -EAGAIN && ++peer->connect_retries < MAX_CONNECT_RETRIES)
+                schedule_delayed_work(&peer->connect, CONNECT_RETRY_DELAY);
+}
+
+/**
+ * fwserial_add_peer - add a newly probed 'serial' unit device as a 'peer'
+ * @serial: aggregate representing the specific fw_card to add the peer to
+ * @unit: 'peer' to create and add to peer_list of serial
+ *
+ * Adds a 'peer' (ie, a local or remote 'serial' unit device) to the list of
+ * peers for a specific fw_card. Optionally, auto-attach this peer to an
+ * available tty port. This function is called either directly or indirectly
+ * as a result of a 'serial' unit device being created & probed.
+ *
+ * Note: this function is serialized with fwserial_remove_peer() by the
+ * fwserial_list_mutex held in fwserial_probe().
+ *
+ * A 1:1 correspondence between an fw_unit and an fwtty_peer is maintained
+ * via the dev_set_drvdata() for the device of the fw_unit.
+ */
+static int fwserial_add_peer(struct fw_serial *serial, struct fw_unit *unit)
+{
+        struct device *dev = &unit->device;
+        struct fw_device  *parent = fw_parent_device(unit);
+        struct fwtty_peer *peer;
+        struct fw_csr_iterator ci;
+        int key, val;
+        int generation;
+
+        peer = kzalloc(sizeof(*peer), GFP_KERNEL);
+        if (!peer)
+                return -ENOMEM;
+
+        peer_set_state(peer, FWPS_NOT_ATTACHED);
+
+        dev_set_drvdata(dev, peer);
+        peer->unit = unit;
+        peer->guid = (u64)parent->config_rom[3] << 32 | parent->config_rom[4];
+        peer->speed = parent->max_speed;
+        peer->max_payload = min(device_max_receive(parent),
+                                link_speed_to_max_payload(peer->speed));
+
+        generation = parent->generation;
+        smp_rmb();
+        peer->node_id = parent->node_id;
+        smp_wmb();
+        peer->generation = generation;
+
+        /* retrieve the mgmt bus addr from the unit directory */
+        fw_csr_iterator_init(&ci, unit->directory);
+        while (fw_csr_iterator_next(&ci, &key, &val)) {
+                if (key == (CSR_OFFSET | CSR_DEPENDENT_INFO)) {
+                        peer->mgmt_addr = CSR_REGISTER_BASE + 4 * val;
+                        break;
+                }
+        }
+        if (peer->mgmt_addr == 0ULL) {
+                /*
+                 * No mgmt address effectively disables VIRT_CABLE_PLUG -
+                 * this peer will not be able to attach to a remote
+                 */
+                peer_set_state(peer, FWPS_NO_MGMT_ADDR);
+        }
+
+        spin_lock_init(&peer->lock);
+        peer->port = NULL;
+
+        init_timer(&peer->timer);
+        INIT_WORK(&peer->work, NULL);
+        INIT_DELAYED_WORK(&peer->connect, fwserial_auto_connect);
+
+        /* associate peer with specific fw_card */
+        peer->serial = serial;
+        list_add_rcu(&peer->list, &serial->peer_list);
+
+        fwtty_info(&peer->unit, "peer added (guid:%016llx)",
+                   (unsigned long long)peer->guid);
+
+        /* identify the local unit & virt cable to loopback port */
+        if (parent->is_local) {
+                serial->self = peer;
+                if (create_loop_dev) {
+                        struct fwtty_port *port;
+                        port = fwserial_claim_port(peer, num_ttys);
+                        if (!IS_ERR(port)) {
+                                struct virt_plug_params params;
+
+                                spin_lock_bh(&peer->lock);
+                                peer->port = port;
+                                fill_plug_params(&params, port);
+                                fwserial_virt_plug_complete(peer, &params);
+                                spin_unlock_bh(&peer->lock);
+
+                                fwtty_write_port_status(port);
+                        }
+                }
+
+        } else if (auto_connect) {
+                /* auto-attach to remote units only (if policy allows) */
+                schedule_delayed_work(&peer->connect, 1);
+        }
+
+        return 0;
+}
+
+/**
+ * fwserial_remove_peer - remove a 'serial' unit device as a 'peer'
+ *
+ * Remove a 'peer' from its list of peers. This function is only
+ * called by fwserial_remove() on bus removal of the unit device.
+ *
+ * Note: this function is serialized with fwserial_add_peer() by the
+ * fwserial_list_mutex held in fwserial_remove().
+ */
+static void fwserial_remove_peer(struct fwtty_peer *peer)
+{
+        struct fwtty_port *port;
+
+        spin_lock_bh(&peer->lock);
+        peer_set_state(peer, FWPS_GONE);
+        spin_unlock_bh(&peer->lock);
+
+        cancel_delayed_work_sync(&peer->connect);
+        cancel_work_sync(&peer->work);
+
+        spin_lock_bh(&peer->lock);
+        /* if this unit is the local unit, clear link */
+        if (peer == peer->serial->self)
+                peer->serial->self = NULL;
+
+        /* cancel the request timeout timer (if running) */
+        del_timer(&peer->timer);
+
+        port = peer->port;
+        peer->port = NULL;
+
+        list_del_rcu(&peer->list);
+
+        fwtty_info(&peer->unit, "peer removed (guid:%016llx)",
+                   (unsigned long long)peer->guid);
+
+        spin_unlock_bh(&peer->lock);
+
+        if (port)
+                fwserial_release_port(port);
+
+        synchronize_rcu();
+        kfree(peer);
+}
+
+/**
+ * create_loop_device - create a loopback tty device
+ * @tty_driver: tty_driver to own loopback device
+ * @prototype: ptr to already-assigned 'prototype' tty port
+ * @index: index to associate this device with the tty port
+ * @parent: device to child to
+ *
+ * HACK - this is basically tty_port_register_device() with an
+ * alternate naming scheme. Suggest tty_port_register_named_device()
+ * helper api.
+ *
+ * Creates a loopback tty device named 'fwloop<n>' which is attached to
+ * the local unit in fwserial_add_peer(). Note that <n> in the device
+ * name advances in increments of port allocation blocks, ie., for port
+ * indices 0..3, the device name will be 'fwloop0'; for 4..7, 'fwloop1',
+ * and so on.
+ *
+ * Only one loopback device should be created per fw_card.
+ */
+static void release_loop_device(struct device *dev)
+{
+        kfree(dev);
+}
+
+static struct device *create_loop_device(struct tty_driver *driver,
+                                         struct fwtty_port *prototype,
+                                         struct fwtty_port *port,
+                                         struct device *parent)
+{
+        char name[64];
+        int index = port->index;
+        dev_t devt = MKDEV(driver->major, driver->minor_start) + index;
+        struct device *dev = NULL;
+        int err;
+
+        if (index >= fwtty_driver->num)
+                return ERR_PTR(-EINVAL);
+
+        snprintf(name, 64, "%s%d", loop_dev_name, index / num_ports);
+
+        tty_port_link_device(&port->port, driver, index);
+
+        cdev_init(&driver->cdevs[index], driver->cdevs[prototype->index].ops);
+        driver->cdevs[index].owner = driver->owner;
+        err = cdev_add(&driver->cdevs[index], devt, 1);
+        if (err)
+                return ERR_PTR(err);
+
+        dev = kzalloc(sizeof(*dev), GFP_KERNEL);
+        if (!dev) {
+                cdev_del(&driver->cdevs[index]);
+                return ERR_PTR(-ENOMEM);
+        }
+
+        dev->devt = devt;
+        dev->class = prototype->device->class;
+        dev->parent = parent;
+        dev->release = release_loop_device;
+        dev_set_name(dev, "%s", name);
+        dev->groups = NULL;
+        dev_set_drvdata(dev, NULL);
+
+        err = device_register(dev);
+        if (err) {
+                put_device(dev);
+                cdev_del(&driver->cdevs[index]);
+                return ERR_PTR(err);
+        }
+
+        return dev;
+}
+
+/**
+ * fwserial_create - init everything to create TTYs for a specific fw_card
+ * @unit: fw_unit for first 'serial' unit device probed for this fw_card
+ *
+ * This function inits the aggregate structure (an fw_serial instance)
+ * used to manage the TTY ports registered by a specific fw_card. Also, the
+ * unit device is added as the first 'peer'.
+ *
+ * This unit device may represent a local unit device (as specified by the
+ * config ROM unit directory) or it may represent a remote unit device
+ * (as specified by the reading of the remote node's config ROM).
+ *
+ * Returns 0 to indicate "ownership" of the unit device, or a negative errno
+ * value to indicate which error.
+ */
+static int fwserial_create(struct fw_unit *unit)
+{
+        struct fw_device *parent = fw_parent_device(unit);
+        struct fw_card *card = parent->card;
+        struct fw_serial *serial;
+        struct fwtty_port *port;
+        struct device *tty_dev;
+        int i, j;
+        int err;
+
+        serial = kzalloc(sizeof(*serial), GFP_KERNEL);
+        if (!serial)
+                return -ENOMEM;
+
+        kref_init(&serial->kref);
+        serial->card = card;
+        INIT_LIST_HEAD(&serial->peer_list);
+
+        for (i = 0; i < num_ports; ++i) {
+                port = kzalloc(sizeof(*port), GFP_KERNEL);
+                if (!port) {
+                        err = -ENOMEM;
+                        goto free_ports;
+                }
+                tty_port_init(&port->port);
+                port->index = FWTTY_INVALID_INDEX;
+                port->port.ops = &fwtty_port_ops;
+                port->serial = serial;
+
+                spin_lock_init(&port->lock);
+                INIT_DELAYED_WORK(&port->drain, fwtty_drain_tx);
+                INIT_DELAYED_WORK(&port->emit_breaks, fwtty_emit_breaks);
+                INIT_WORK(&port->hangup, fwtty_do_hangup);
+                INIT_WORK(&port->push, fwtty_pushrx);
+                INIT_LIST_HEAD(&port->buf_list);
+                init_waitqueue_head(&port->wait_tx);
+                port->max_payload = link_speed_to_max_payload(SCODE_100);
+                dma_fifo_init(&port->tx_fifo);
+
+                rcu_assign_pointer(port->peer, NULL);
+                serial->ports[i] = port;
+
+                /* get unique bus addr region for port's status & recv fifo */
+                port->rx_handler.length = FWTTY_PORT_RXFIFO_LEN + 4;
+                port->rx_handler.address_callback = fwtty_port_handler;
+                port->rx_handler.callback_data = port;
+                /*
+                 * XXX: use custom memory region above cpu physical memory addrs
+                 * this will ease porting to 64-bit firewire adapters
+                 */
+                err = fw_core_add_address_handler(&port->rx_handler,
+                                                  &fw_high_memory_region);
+                if (err) {
+                        kfree(port);
+                        goto free_ports;
+                }
+        }
+        /* preserve i for error cleanup */
+
+        err = fwtty_ports_add(serial);
+        if (err) {
+                fwtty_err(&unit, "no space in port table");
+                goto free_ports;
+        }
+
+        for (j = 0; j < num_ttys; ++j) {
+                tty_dev = tty_port_register_device(&serial->ports[j]->port,
+                                                   fwtty_driver,
+                                                   serial->ports[j]->index,
+                                                   card->device);
+                if (IS_ERR(tty_dev)) {
+                        err = PTR_ERR(tty_dev);
+                        fwtty_err(&unit, "register tty device error (%d)", err);
+                        goto unregister_ttys;
+                }
+
+                serial->ports[j]->device = tty_dev;
+        }
+        /* preserve j for error cleanup */
+
+        if (create_loop_dev) {
+                struct device *loop_dev;
+
+                loop_dev = create_loop_device(fwtty_driver,
+                                              serial->ports[0],
+                                              serial->ports[num_ttys],
+                                              card->device);
+                if (IS_ERR(loop_dev)) {
+                        err = PTR_ERR(loop_dev);
+                        fwtty_err(&unit, "create loop device failed (%d)", err);
+                        goto unregister_ttys;
+                }
+                serial->ports[num_ttys]->device = loop_dev;
+                serial->ports[num_ttys]->loopback = true;
+        }
+
+        list_add_rcu(&serial->list, &fwserial_list);
+
+        fwtty_notice(&unit, "TTY over FireWire on device %s (guid %016llx)",
+                     dev_name(card->device), (unsigned long long) card->guid);
+
+        err = fwserial_add_peer(serial, unit);
+        if (!err)
+                return 0;
+
+        fwtty_err(&unit, "unable to add peer unit device (%d)", err);
+
+        /* fall-through to error processing */
+        list_del_rcu(&serial->list);
+unregister_ttys:
+        for (--j; j >= 0; --j)
+                tty_unregister_device(fwtty_driver, serial->ports[j]->index);
+        kref_put(&serial->kref, fwserial_destroy);
+        return err;
+
+free_ports:
+        for (--i; i >= 0; --i)
+                kfree(serial->ports[i]);
+        kfree(serial);
+        return err;
+}
+
+/**
+ * fwserial_probe: bus probe function for firewire 'serial' unit devices
+ *
+ * A 'serial' unit device is created and probed as a result of:
+ * - declaring a ieee1394 bus id table for 'devices' matching a fabricated
+ *   'serial' unit specifier id
+ * - adding a unit directory to the config ROM(s) for a 'serial' unit
+ *
+ * The firewire core registers unit devices by enumerating unit directories
+ * of a node's config ROM after reading the config ROM when a new node is
+ * added to the bus topology after a bus reset.
+ *
+ * The practical implications of this are:
+ * - this probe is called for both local and remote nodes that have a 'serial'
+ *   unit directory in their config ROM (that matches the specifiers in
+ *   fwserial_id_table).
+ * - no specific order is enforced for local vs. remote unit devices
+ *
+ * This unit driver copes with the lack of specific order in the same way the
+ * firewire net driver does -- each probe, for either a local or remote unit
+ * device, is treated as a 'peer' (has a struct fwtty_peer instance) and the
+ * first peer created for a given fw_card (tracked by the global fwserial_list)
+ * creates the underlying TTYs (aggregated in a fw_serial instance).
+ *
+ * NB: an early attempt to differentiate local & remote unit devices by creating
+ *     peers only for remote units and fw_serial instances (with their
+ *     associated TTY devices) only for local units was discarded. Managing
+ *     the peer lifetimes on device removal proved too complicated.
+ *
+ * fwserial_probe/fwserial_remove are effectively serialized by the
+ * fwserial_list_mutex. This is necessary because the addition of the first peer
+ * for a given fw_card will trigger the creation of the fw_serial for that
+ * fw_card, which must not simultaneously contend with the removal of the
+ * last peer for a given fw_card triggering the destruction of the same
+ * fw_serial for the same fw_card.
+ */
+static int fwserial_probe(struct device *dev)
+{
+        struct fw_unit *unit = fw_unit(dev);
+        struct fw_serial *serial;
+        int err;
+
+        mutex_lock(&fwserial_list_mutex);
+        serial = fwserial_lookup(fw_parent_device(unit)->card);
+        if (!serial)
+                err = fwserial_create(unit);
+        else
+                err = fwserial_add_peer(serial, unit);
+        mutex_unlock(&fwserial_list_mutex);
+        return err;
+}
+
+/**
+ * fwserial_remove: bus removal function for firewire 'serial' unit devices
+ *
+ * The corresponding 'peer' for this unit device is removed from the list of
+ * peers for the associated fw_serial (which has a 1:1 correspondence with a
+ * specific fw_card). If this is the last peer being removed, then trigger
+ * the destruction of the underlying TTYs.
+ */
+static int fwserial_remove(struct device *dev)
+{
+        struct fwtty_peer *peer = dev_get_drvdata(dev);
+        struct fw_serial *serial = peer->serial;
+        int i;
+
+        mutex_lock(&fwserial_list_mutex);
+        fwserial_remove_peer(peer);
+
+        if (list_empty(&serial->peer_list)) {
+                /* unlink from the fwserial_list here */
+                list_del_rcu(&serial->list);
+
+                for (i = 0; i < num_ports; ++i)
+                        fwserial_close_port(serial->ports[i]);
+                kref_put(&serial->kref, fwserial_destroy);
+        }
+        mutex_unlock(&fwserial_list_mutex);
+
+        return 0;
+}
+
+/**
+ * fwserial_update: bus update function for 'firewire' serial unit devices
+ *
+ * Updates the new node_id and bus generation for this peer. Note that locking
+ * is unnecessary; but careful memory barrier usage is important to enforce the
+ * load and store order of generation & node_id.
+ *
+ * The fw-core orders the write of node_id before generation in the parent
+ * fw_device to ensure that a stale node_id cannot be used with a current
+ * bus generation. So the generation value must be read before the node_id.
+ *
+ * In turn, this orders the write of node_id before generation in the peer to
+ * also ensure a stale node_id cannot be used with a current bus generation.
+ */
+static void fwserial_update(struct fw_unit *unit)
+{
+        struct fw_device *parent = fw_parent_device(unit);
+        struct fwtty_peer *peer = dev_get_drvdata(&unit->device);
+        int generation;
+
+        generation = parent->generation;
+        smp_rmb();
+        peer->node_id = parent->node_id;
+        smp_wmb();
+        peer->generation = generation;
+}
+
+static const struct ieee1394_device_id fwserial_id_table[] = {
+        {
+                .match_flags  = IEEE1394_MATCH_SPECIFIER_ID |
+                                IEEE1394_MATCH_VERSION,
+                .specifier_id = LINUX_VENDOR_ID,
+                .version      = FWSERIAL_VERSION,
+        },
+        { }
+};
+
+static struct fw_driver fwserial_driver = {
+        .driver = {
+                .owner  = THIS_MODULE,
+                .name   = KBUILD_MODNAME,
+                .bus    = &fw_bus_type,
+                .probe  = fwserial_probe,
+                .remove = fwserial_remove,
+        },
+        .update   = fwserial_update,
+        .id_table = fwserial_id_table,
+};
+
+#define FW_UNIT_SPECIFIER(id)   ((CSR_SPECIFIER_ID << 24) | (id))
+#define FW_UNIT_VERSION(ver)    ((CSR_VERSION << 24) | (ver))
+#define FW_UNIT_ADDRESS(ofs)    (((CSR_OFFSET | CSR_DEPENDENT_INFO) << 24)  \
+                                 | (((ofs) - CSR_REGISTER_BASE) >> 2))
+/* XXX: config ROM definitons could be improved with semi-automated offset
+ * and length calculation
+ */
+#define FW_ROM_DESCRIPTOR(ofs)  (((CSR_LEAF | CSR_DESCRIPTOR) << 24) | (ofs))
+
+struct fwserial_unit_directory_data {
+        u16     crc;
+        u16     len;
+        u32     unit_specifier;
+        u32     unit_sw_version;
+        u32     unit_addr_offset;
+        u32     desc1_ofs;
+        u16     desc1_crc;
+        u16     desc1_len;
+        u32     desc1_data[5];
+} __packed;
+
+static struct fwserial_unit_directory_data fwserial_unit_directory_data = {
+        .len = 4,
+        .unit_specifier = FW_UNIT_SPECIFIER(LINUX_VENDOR_ID),
+        .unit_sw_version = FW_UNIT_VERSION(FWSERIAL_VERSION),
+        .desc1_ofs = FW_ROM_DESCRIPTOR(1),
+        .desc1_len = 5,
+        .desc1_data = {
+                0x00000000,                     /*   type = text            */
+                0x00000000,                     /*   enc = ASCII, lang EN   */
+                0x4c696e75,                     /* 'Linux TTY'              */
+                0x78205454,
+                0x59000000,
+        },
+};
+
+static struct fw_descriptor fwserial_unit_directory = {
+        .length = sizeof(fwserial_unit_directory_data) / sizeof(u32),
+        .key    = (CSR_DIRECTORY | CSR_UNIT) << 24,
+        .data   = (u32 *)&fwserial_unit_directory_data,
+};
+
+/*
+ * The management address is in the unit space region but above other known
+ * address users (to keep wild writes from causing havoc)
+ */
+const struct fw_address_region fwserial_mgmt_addr_region = {
+        .start = CSR_REGISTER_BASE + 0x1e0000ULL,
+        .end = 0x1000000000000ULL,
+};
+
+static struct fw_address_handler fwserial_mgmt_addr_handler;
+
+/**
+ * fwserial_handle_plug_req - handle VIRT_CABLE_PLUG request work
+ * @work: ptr to peer->work
+ *
+ * Attempts to complete the VIRT_CABLE_PLUG handshake sequence for this peer.
+ *
+ * This checks for a collided request-- ie, that a VIRT_CABLE_PLUG request was
+ * already sent to this peer. If so, the collision is resolved by comparing
+ * guid values; the loser sends the plug response.
+ *
+ * Note: if an error prevents a response, don't do anything -- the
+ * remote will timeout its request.
+ */
+static void fwserial_handle_plug_req(struct work_struct *work)
+{
+        struct fwtty_peer *peer = to_peer(work, work);
+        struct virt_plug_params *plug_req = &peer->work_params.plug_req;
+        struct fwtty_port *port;
+        struct fwserial_mgmt_pkt *pkt;
+        int rcode;
+
+        pkt = kmalloc(sizeof(*pkt), GFP_KERNEL);
+        if (!pkt)
+                return;
+
+        port = fwserial_find_port(peer);
+
+        spin_lock_bh(&peer->lock);
+
+        switch (peer->state) {
+        case FWPS_NOT_ATTACHED:
+                if (!port) {
+                        fwtty_err(&peer->unit, "no more ports avail");
+                        fill_plug_rsp_nack(pkt);
+                } else {
+                        peer->port = port;
+                        fill_plug_rsp_ok(pkt, peer->port);
+                        peer_set_state(peer, FWPS_PLUG_RESPONDING);
+                        /* don't release claimed port */
+                        port = NULL;
+                }
+                break;
+
+        case FWPS_PLUG_PENDING:
+                if (peer->serial->card->guid > peer->guid)
+                        goto cleanup;
+
+                /* We lost - hijack the already-claimed port and send ok */
+                del_timer(&peer->timer);
+                fill_plug_rsp_ok(pkt, peer->port);
+                peer_set_state(peer, FWPS_PLUG_RESPONDING);
+                break;
+
+        default:
+                fill_plug_rsp_nack(pkt);
+        }
+
+        spin_unlock_bh(&peer->lock);
+        if (port)
+                fwserial_release_port(port);
+
+        rcode = fwserial_send_mgmt_sync(peer, pkt);
+
+        spin_lock_bh(&peer->lock);
+        if (peer->state == FWPS_PLUG_RESPONDING) {
+                if (rcode == RCODE_COMPLETE) {
+                        struct fwtty_port *tmp = peer->port;
+
+                        fwserial_virt_plug_complete(peer, plug_req);
+                        spin_unlock_bh(&peer->lock);
+
+                        fwtty_write_port_status(tmp);
+                        spin_lock_bh(&peer->lock);
+                } else {
+                        fwtty_err(&peer->unit, "PLUG_RSP error (%d)", rcode);
+                        port = peer_revert_state(peer);
+                }
+        }
+cleanup:
+        spin_unlock_bh(&peer->lock);
+        if (port)
+                fwserial_release_port(port);
+        kfree(pkt);
+        return;
+}
+
+static void fwserial_handle_unplug_req(struct work_struct *work)
+{
+        struct fwtty_peer *peer = to_peer(work, work);
+        struct fwtty_port *port = NULL;
+        struct fwserial_mgmt_pkt *pkt;
+        int rcode;
+
+        pkt = kmalloc(sizeof(*pkt), GFP_KERNEL);
+        if (!pkt)
+                return;
+
+        spin_lock_bh(&peer->lock);
+
+        switch (peer->state) {
+        case FWPS_ATTACHED:
+                fill_unplug_rsp_ok(pkt);
+                peer_set_state(peer, FWPS_UNPLUG_RESPONDING);
+                break;
+
+        case FWPS_UNPLUG_PENDING:
+                if (peer->serial->card->guid > peer->guid)
+                        goto cleanup;
+
+                /* We lost - send unplug rsp */
+                del_timer(&peer->timer);
+                fill_unplug_rsp_ok(pkt);
+                peer_set_state(peer, FWPS_UNPLUG_RESPONDING);
+                break;
+
+        default:
+                fill_unplug_rsp_nack(pkt);
+        }
+
+        spin_unlock_bh(&peer->lock);
+
+        rcode = fwserial_send_mgmt_sync(peer, pkt);
+
+        spin_lock_bh(&peer->lock);
+        if (peer->state == FWPS_UNPLUG_RESPONDING) {
+                if (rcode == RCODE_COMPLETE)
+                        port = peer_revert_state(peer);
+                else
+                        fwtty_err(&peer->unit, "UNPLUG_RSP error (%d)", rcode);
+        }
+cleanup:
+        spin_unlock_bh(&peer->lock);
+        if (port)
+                fwserial_release_port(port);
+        kfree(pkt);
+        return;
+}
+
+static int fwserial_parse_mgmt_write(struct fwtty_peer *peer,
+                                     struct fwserial_mgmt_pkt *pkt,
+                                     unsigned long long addr,
+                                     size_t len)
+{
+        struct fwtty_port *port = NULL;
+        int rcode;
+
+        if (addr != fwserial_mgmt_addr_handler.offset || len < sizeof(pkt->hdr))
+                return RCODE_ADDRESS_ERROR;
+
+        if (len != be16_to_cpu(pkt->hdr.len) ||
+            len != mgmt_pkt_expected_len(pkt->hdr.code))
+                return RCODE_DATA_ERROR;
+
+        spin_lock_bh(&peer->lock);
+        if (peer->state == FWPS_GONE) {
+                /*
+                 * This should never happen - it would mean that the
+                 * remote unit that just wrote this transaction was
+                 * already removed from the bus -- and the removal was
+                 * processed before we rec'd this transaction
+                 */
+                fwtty_err(&peer->unit, "peer already removed");
+                spin_unlock_bh(&peer->lock);
+                return RCODE_ADDRESS_ERROR;
+        }
+
+        rcode = RCODE_COMPLETE;
+
+        fwtty_dbg(&peer->unit, "mgmt: hdr.code: %04hx", pkt->hdr.code);
+
+        switch (be16_to_cpu(pkt->hdr.code) & FWSC_CODE_MASK) {
+        case FWSC_VIRT_CABLE_PLUG:
+                if (work_pending(&peer->work)) {
+                        fwtty_err(&peer->unit, "plug req: busy");
+                        rcode = RCODE_CONFLICT_ERROR;
+
+                } else {
+                        peer->work_params.plug_req = pkt->plug_req;
+                        PREPARE_WORK(&peer->work, fwserial_handle_plug_req);
+                        queue_work(system_unbound_wq, &peer->work);
+                }
+                break;
+
+        case FWSC_VIRT_CABLE_PLUG_RSP:
+                if (peer->state != FWPS_PLUG_PENDING) {
+                        rcode = RCODE_CONFLICT_ERROR;
+
+                } else if (be16_to_cpu(pkt->hdr.code) & FWSC_RSP_NACK) {
+                        fwtty_notice(&peer->unit, "NACK plug rsp");
+                        port = peer_revert_state(peer);
+
+                } else {
+                        struct fwtty_port *tmp = peer->port;
+
+                        fwserial_virt_plug_complete(peer, &pkt->plug_rsp);
+                        spin_unlock_bh(&peer->lock);
+
+                        fwtty_write_port_status(tmp);
+                        spin_lock_bh(&peer->lock);
+                }
+                break;
+
+        case FWSC_VIRT_CABLE_UNPLUG:
+                if (work_pending(&peer->work)) {
+                        fwtty_err(&peer->unit, "unplug req: busy");
+                        rcode = RCODE_CONFLICT_ERROR;
+                } else {
+                        PREPARE_WORK(&peer->work, fwserial_handle_unplug_req);
+                        queue_work(system_unbound_wq, &peer->work);
+                }
+                break;
+
+        case FWSC_VIRT_CABLE_UNPLUG_RSP:
+                if (peer->state != FWPS_UNPLUG_PENDING)
+                        rcode = RCODE_CONFLICT_ERROR;
+                else {
+                        if (be16_to_cpu(pkt->hdr.code) & FWSC_RSP_NACK)
+                                fwtty_notice(&peer->unit, "NACK unplug?");
+                        port = peer_revert_state(peer);
+                }
+                break;
+
+        default:
+                fwtty_err(&peer->unit, "unknown mgmt code %d",
+                          be16_to_cpu(pkt->hdr.code));
+                rcode = RCODE_DATA_ERROR;
+        }
+        spin_unlock_bh(&peer->lock);
+
+        if (port)
+                fwserial_release_port(port);
+
+        return rcode;
+}
+
+/**
+ * fwserial_mgmt_handler: bus address handler for mgmt requests
+ * @parameters: fw_address_callback_t as specified by firewire core interface
+ *
+ * This handler is responsible for handling virtual cable requests from remotes
+ * for all cards.
+ */
+static void fwserial_mgmt_handler(struct fw_card *card,
+                                  struct fw_request *request,
+                                  int tcode, int destination, int source,
+                                  int generation,
+                                  unsigned long long addr,
+                                  void *data, size_t len,
+                                  void *callback_data)
+{
+        struct fwserial_mgmt_pkt *pkt = data;
+        struct fwtty_peer *peer;
+        int rcode;
+
+        rcu_read_lock();
+        peer = __fwserial_peer_by_node_id(card, generation, source);
+        if (!peer) {
+                fwtty_dbg(card, "peer(%d:%x) not found", generation, source);
+                __dump_peer_list(card);
+                rcode = RCODE_CONFLICT_ERROR;
+
+        } else {
+                switch (tcode) {
+                case TCODE_WRITE_BLOCK_REQUEST:
+                        rcode = fwserial_parse_mgmt_write(peer, pkt, addr, len);
+                        break;
+
+                default:
+                        rcode = RCODE_TYPE_ERROR;
+                }
+        }
+
+        rcu_read_unlock();
+        fw_send_response(card, request, rcode);
+}
+
+static int __init fwserial_init(void)
+{
+        int err, num_loops = !!(create_loop_dev);
+
+        /* num_ttys/num_ports must not be set above the static alloc avail */
+        if (num_ttys + num_loops > MAX_CARD_PORTS)
+                num_ttys = MAX_CARD_PORTS - num_loops;
+        num_ports = num_ttys + num_loops;
+
+        fwtty_driver = alloc_tty_driver(MAX_TOTAL_PORTS);
+        if (!fwtty_driver) {
+                err = -ENOMEM;
+                return err;
+        }
+
+        fwtty_driver->driver_name       = KBUILD_MODNAME;
+        fwtty_driver->name              = tty_dev_name;
+        fwtty_driver->major             = 0;
+        fwtty_driver->minor_start       = 0;
+        fwtty_driver->type              = TTY_DRIVER_TYPE_SERIAL;
+        fwtty_driver->subtype           = SERIAL_TYPE_NORMAL;
+        fwtty_driver->flags             = TTY_DRIVER_REAL_RAW |
+                                                TTY_DRIVER_DYNAMIC_DEV;
+
+        fwtty_driver->init_termios          = tty_std_termios;
+        fwtty_driver->init_termios.c_cflag  |= CLOCAL;
+        tty_set_operations(fwtty_driver, &fwtty_ops);
+
+        err = tty_register_driver(fwtty_driver);
+        if (err) {
+                driver_err("register tty driver failed (%d)", err);
+                goto put_tty;
+        }
+
+        fwtty_txn_cache = kmem_cache_create("fwtty_txn_cache",
+                                            sizeof(struct fwtty_transaction),
+                                            0, 0, fwtty_txn_constructor);
+        if (!fwtty_txn_cache) {
+                err = -ENOMEM;
+                goto unregister_driver;
+        }
+
+        /*
+         * Ideally, this address handler would be registered per local node
+         * (rather than the same handler for all local nodes). However,
+         * since the firewire core requires the config rom descriptor *before*
+         * the local unit device(s) are created, a single management handler
+         * must suffice for all local serial units.
+         */
+        fwserial_mgmt_addr_handler.length = sizeof(struct fwserial_mgmt_pkt);
+        fwserial_mgmt_addr_handler.address_callback = fwserial_mgmt_handler;
+
+        err = fw_core_add_address_handler(&fwserial_mgmt_addr_handler,
+                                          &fwserial_mgmt_addr_region);
+        if (err) {
+                driver_err("add management handler failed (%d)", err);
+                goto destroy_cache;
+        }
+
+        fwserial_unit_directory_data.unit_addr_offset =
+                FW_UNIT_ADDRESS(fwserial_mgmt_addr_handler.offset);
+        err = fw_core_add_descriptor(&fwserial_unit_directory);
+        if (err) {
+                driver_err("add unit descriptor failed (%d)", err);
+                goto remove_handler;
+        }
+
+        err = driver_register(&fwserial_driver.driver);
+        if (err) {
+                driver_err("register fwserial driver failed (%d)", err);
+                goto remove_descriptor;
+        }
+
+        return 0;
+
+remove_descriptor:
+        fw_core_remove_descriptor(&fwserial_unit_directory);
+remove_handler:
+        fw_core_remove_address_handler(&fwserial_mgmt_addr_handler);
+destroy_cache:
+        kmem_cache_destroy(fwtty_txn_cache);
+unregister_driver:
+        tty_unregister_driver(fwtty_driver);
+put_tty:
+        put_tty_driver(fwtty_driver);
+        return err;
+}
+
+static void __exit fwserial_exit(void)
+{
+        driver_unregister(&fwserial_driver.driver);
+        fw_core_remove_descriptor(&fwserial_unit_directory);
+        fw_core_remove_address_handler(&fwserial_mgmt_addr_handler);
+        kmem_cache_destroy(fwtty_txn_cache);
+        tty_unregister_driver(fwtty_driver);
+        put_tty_driver(fwtty_driver);
+}
+
+module_init(fwserial_init);
+module_exit(fwserial_exit);
+
+MODULE_AUTHOR("Peter Hurley (peter@hurleysoftware.com)");
+MODULE_DESCRIPTION("FireWire Serial TTY Driver");
+MODULE_LICENSE("GPL");
+MODULE_DEVICE_TABLE(ieee1394, fwserial_id_table);
+MODULE_PARM_DESC(ttys, "Number of ttys to create for each local firewire node");
+MODULE_PARM_DESC(auto, "Auto-connect a tty to each firewire node discovered");
+MODULE_PARM_DESC(loop, "Create a loopback device, fwloop<n>, with ttys");
+MODULE_PARM_DESC(limit_bw, "Limit bandwidth utilization to 20%.");
diff --git a/drivers/staging/fwserial/fwserial.h b/drivers/staging/fwserial/fwserial.h
new file mode 100644
index 000000000000..8b572edf9563
--- /dev/null
+++ b/drivers/staging/fwserial/fwserial.h
@@ -0,0 +1,387 @@
+#ifndef _FIREWIRE_FWSERIAL_H
+#define _FIREWIRE_FWSERIAL_H
+
+#include <linux/kernel.h>
+#include <linux/tty.h>
+#include <linux/tty_driver.h>
+#include <linux/tty_flip.h>
+#include <linux/list.h>
+#include <linux/firewire.h>
+#include <linux/firewire-constants.h>
+#include <linux/spinlock.h>
+#include <linux/rcupdate.h>
+#include <linux/mutex.h>
+#include <linux/serial.h>
+#include <linux/serial_reg.h>
+#include <linux/module.h>
+#include <linux/seq_file.h>
+
+#include "dma_fifo.h"
+
+#ifdef FWTTY_PROFILING
+#define DISTRIBUTION_MAX_SIZE     8192
+#define DISTRIBUTION_MAX_INDEX    (ilog2(DISTRIBUTION_MAX_SIZE) + 1)
+static inline void profile_size_distrib(unsigned stat[], unsigned val)
+{
+        int n = (val) ? min(ilog2(val) + 1, DISTRIBUTION_MAX_INDEX) : 0;
+        ++stat[n];
+}
+#else
+#define DISTRIBUTION_MAX_INDEX    0
+#define profile_size_distrib(st, n)
+#endif
+
+/* Parameters for both VIRT_CABLE_PLUG & VIRT_CABLE_PLUG_RSP mgmt codes */
+struct virt_plug_params {
+        __be32  status_hi;
+        __be32  status_lo;
+        __be32  fifo_hi;
+        __be32  fifo_lo;
+        __be32  fifo_len;
+};
+
+struct peer_work_params {
+        union {
+                struct virt_plug_params plug_req;
+        };
+};
+
+/**
+ * fwtty_peer: structure representing local & remote unit devices
+ * @unit: unit child device of fw_device node
+ * @serial: back pointer to associated fw_serial aggregate
+ * @guid: unique 64-bit guid for this unit device
+ * @generation: most recent bus generation
+ * @node_id: most recent node_id
+ * @speed: link speed of peer (0 = S100, 2 = S400, ... 5 = S3200)
+ * @mgmt_addr: bus addr region to write mgmt packets to
+ * @status_addr: bus addr register to write line status to
+ * @fifo_addr: bus addr region to write serial output to
+ * @fifo_len:  max length for single write to fifo_addr
+ * @list: link for insertion into fw_serial's peer_list
+ * @rcu: for deferring peer reclamation
+ * @lock: spinlock to synchonize changes to state & port fields
+ * @work: only one work item can be queued at any one time
+ *        Note: pending work is canceled prior to removal, so this
+ *        peer is valid for at least the lifetime of the work function
+ * @work_params: parameter block for work functions
+ * @timer: timer for resetting peer state if remote request times out
+ * @state: current state
+ * @connect: work item for auto-connecting
+ * @connect_retries: # of connections already attempted
+ * @port: associated tty_port (usable if state == FWSC_ATTACHED)
+ */
+struct fwtty_peer {
+        struct fw_unit          *unit;
+        struct fw_serial        *serial;
+        u64                     guid;
+        int                     generation;
+        int                     node_id;
+        unsigned                speed;
+        int                     max_payload;
+        u64                     mgmt_addr;
+
+        /* these are usable only if state == FWSC_ATTACHED */
+        u64                     status_addr;
+        u64                     fifo_addr;
+        int                     fifo_len;
+
+        struct list_head        list;
+        struct rcu_head         rcu;
+
+        spinlock_t              lock;
+        struct work_struct      work;
+        struct peer_work_params work_params;
+        struct timer_list       timer;
+        int                     state;
+        struct delayed_work     connect;
+        int                     connect_retries;
+
+        struct fwtty_port       *port;
+};
+
+#define to_peer(ptr, field)     (container_of(ptr, struct fwtty_peer, field))
+
+/* state values for fwtty_peer.state field */
+enum fwtty_peer_state {
+        FWPS_GONE,
+        FWPS_NOT_ATTACHED,
+        FWPS_ATTACHED,
+        FWPS_PLUG_PENDING,
+        FWPS_PLUG_RESPONDING,
+        FWPS_UNPLUG_PENDING,
+        FWPS_UNPLUG_RESPONDING,
+
+        FWPS_NO_MGMT_ADDR = -1,
+};
+
+#define CONNECT_RETRY_DELAY     HZ
+#define MAX_CONNECT_RETRIES     10
+
+/* must be holding peer lock for these state funclets */
+static inline void peer_set_state(struct fwtty_peer *peer, int new)
+{
+        peer->state = new;
+}
+
+static inline struct fwtty_port *peer_revert_state(struct fwtty_peer *peer)
+{
+        struct fwtty_port *port = peer->port;
+
+        peer->port = NULL;
+        peer_set_state(peer, FWPS_NOT_ATTACHED);
+        return port;
+}
+
+struct fwserial_mgmt_pkt {
+        struct {
+                __be16          len;
+                __be16          code;
+        } hdr;
+        union {
+                struct virt_plug_params plug_req;
+                struct virt_plug_params plug_rsp;
+        };
+} __packed;
+
+/* fwserial_mgmt_packet codes */
+#define FWSC_RSP_OK                     0x0000
+#define FWSC_RSP_NACK                   0x8000
+#define FWSC_CODE_MASK                  0x0fff
+
+#define FWSC_VIRT_CABLE_PLUG            1
+#define FWSC_VIRT_CABLE_UNPLUG          2
+#define FWSC_VIRT_CABLE_PLUG_RSP        3
+#define FWSC_VIRT_CABLE_UNPLUG_RSP      4
+
+/* 1 min. plug timeout -- suitable for userland authorization */
+#define VIRT_CABLE_PLUG_TIMEOUT         (60 * HZ)
+
+struct stats {
+        unsigned        xchars;
+        unsigned        dropped;
+        unsigned        tx_stall;
+        unsigned        fifo_errs;
+        unsigned        sent;
+        unsigned        lost;
+        unsigned        throttled;
+        unsigned        watermark;
+        unsigned        reads[DISTRIBUTION_MAX_INDEX + 1];
+        unsigned        writes[DISTRIBUTION_MAX_INDEX + 1];
+        unsigned        txns[DISTRIBUTION_MAX_INDEX + 1];
+        unsigned        unthrottle[DISTRIBUTION_MAX_INDEX + 1];
+};
+
+struct fwconsole_ops {
+        void (*notify)(int code, void *data);
+        void (*stats)(struct stats *stats, void *data);
+        void (*proc_show)(struct seq_file *m, void *data);
+};
+
+/* codes for console ops notify */
+#define FWCON_NOTIFY_ATTACH             1
+#define FWCON_NOTIFY_DETACH             2
+
+struct buffered_rx {
+        struct list_head        list;
+        size_t                  n;
+        unsigned char           data[0];
+};
+
+/**
+ * fwtty_port: structure used to track/represent underlying tty_port
+ * @port: underlying tty_port
+ * @device: tty device
+ * @index: index into port_table for this particular port
+ *    note: minor = index + FWSERIAL_TTY_START_MINOR
+ * @serial: back pointer to the containing fw_serial
+ * @rx_handler: bus address handler for unique addr region used by remotes
+ *              to communicate with this port. Every port uses
+ *              fwtty_port_handler() for per port transactions.
+ * @fwcon_ops: ops for attached fw_console (if any)
+ * @con_data: private data for fw_console
+ * @wait_tx: waitqueue for sleeping until writer/drain completes tx
+ * @emit_breaks: delayed work responsible for generating breaks when the
+ *               break line status is active
+ * @cps : characters per second computed from the termios settings
+ * @break_last: timestamp in jiffies from last emit_breaks
+ * @hangup: work responsible for HUPing when carrier is dropped/lost
+ * @mstatus: loose virtualization of LSR/MSR
+ *         bits 15..0  correspond to TIOCM_* bits
+ *         bits 19..16 reserved for mctrl
+ *         bit 20      OOB_TX_THROTTLE
+ *         bits 23..21 reserved
+ *         bits 31..24 correspond to UART_LSR_* bits
+ * @lock: spinlock for protecting concurrent access to fields below it
+ * @mctrl: loose virtualization of MCR
+ *         bits 15..0  correspond to TIOCM_* bits
+ *         bit 16      OOB_RX_THROTTLE
+ *         bits 19..17 reserved
+ *         bits 31..20 reserved for mstatus
+ * @drain: delayed work scheduled to ensure that writes are flushed.
+ *         The work can race with the writer but concurrent sending is
+ *         prevented with the IN_TX flag. Scheduled under lock to
+ *         limit scheduling when fifo has just been drained.
+ * @push: work responsible for pushing buffered rx to the ldisc.
+ *        rx can become buffered if the tty buffer is filled before the
+ *        ldisc throttles the sender.
+ * @buf_list: list of buffered rx yet to be sent to ldisc
+ * @buffered: byte count of buffered rx
+ * @tx_fifo: fifo used to store & block-up writes for dma to remote
+ * @max_payload: max bytes transmissable per dma (based on peer's max_payload)
+ * @status_mask: UART_LSR_* bitmask significant to rx (based on termios)
+ * @ignore_mask: UART_LSR_* bitmask of states to ignore (also based on termios)
+ * @break_ctl: if set, port is 'sending break' to remote
+ * @write_only: self-explanatory
+ * @overrun: previous rx was lost (partially or completely)
+ * @loopback: if set, port is in loopback mode
+ * @flags: atomic bit flags
+ *         bit 0: IN_TX - gate to allow only one cpu to send from the dma fifo
+ *                        at a time.
+ *         bit 1: STOP_TX - force tx to exit while sending
+ * @peer: rcu-pointer to associated fwtty_peer (if attached)
+ *        NULL if no peer attached
+ * @icount: predefined statistics reported by the TIOCGICOUNT ioctl
+ * @stats: additional statistics reported in /proc/tty/driver/firewire_serial
+ */
+struct fwtty_port {
+        struct tty_port            port;
+        struct device              *device;
+        unsigned                   index;
+        struct fw_serial           *serial;
+        struct fw_address_handler  rx_handler;
+
+        struct fwconsole_ops       *fwcon_ops;
+        void                       *con_data;
+
+        wait_queue_head_t          wait_tx;
+        struct delayed_work        emit_breaks;
+        unsigned                   cps;
+        unsigned long              break_last;
+
+        struct work_struct         hangup;
+
+        unsigned                   mstatus;
+
+        spinlock_t                 lock;
+        unsigned                   mctrl;
+        struct delayed_work        drain;
+        struct work_struct         push;
+        struct list_head           buf_list;
+        int                        buffered;
+        struct dma_fifo            tx_fifo;
+        int                        max_payload;
+        unsigned                   status_mask;
+        unsigned                   ignore_mask;
+        unsigned                   break_ctl:1,
+                                   write_only:1,
+                                   overrun:1,
+                                   loopback:1;
+        unsigned long              flags;
+
+        struct fwtty_peer          *peer;
+
+        struct async_icount        icount;
+        struct stats               stats;
+};
+
+#define to_port(ptr, field)     (container_of(ptr, struct fwtty_port, field))
+
+/* bit #s for flags field */
+#define IN_TX                      0
+#define STOP_TX                    1
+#define BUFFERING_RX               2
+
+/* bitmasks for special mctrl/mstatus bits */
+#define OOB_RX_THROTTLE   0x00010000
+#define MCTRL_RSRVD       0x000e0000
+#define OOB_TX_THROTTLE   0x00100000
+#define MSTATUS_RSRVD     0x00e00000
+
+#define MCTRL_MASK        (TIOCM_DTR | TIOCM_RTS | TIOCM_OUT1 | TIOCM_OUT2 | \
+                           TIOCM_LOOP | OOB_RX_THROTTLE | MCTRL_RSRVD)
+
+/* XXX even every 1/50th secs. may be unnecessarily accurate */
+/* delay in jiffies between brk emits */
+#define FREQ_BREAKS        (HZ / 50)
+
+/* Ports are allocated in blocks of num_ports for each fw_card */
+#define MAX_CARD_PORTS           32     /* max # of ports per card */
+#define MAX_TOTAL_PORTS          64     /* max # of ports total    */
+
+/* tuning parameters */
+#define FWTTY_PORT_TXFIFO_LEN   4096
+#define FWTTY_PORT_MAX_PEND_DMA    8    /* costs a cache line per pend */
+#define DRAIN_THRESHOLD         1024
+#define MAX_ASYNC_PAYLOAD       4096    /* ohci-defined limit          */
+#define WRITER_MINIMUM           128
+/* TODO: how to set watermark to AR context size? see fwtty_rx() */
+#define HIGH_WATERMARK         32768    /* AR context is 32K           */
+
+/*
+ * Size of bus addr region above 4GB used per port as the recv addr
+ * - must be at least as big as the MAX_ASYNC_PAYLOAD
+ */
+#define FWTTY_PORT_RXFIFO_LEN   MAX_ASYNC_PAYLOAD
+
+/**
+ * fw_serial: aggregate used to associate tty ports with specific fw_card
+ * @card: fw_card associated with this fw_serial device (1:1 association)
+ * @kref: reference-counted multi-port management allows delayed destroy
+ * @self: local unit device as 'peer'. Not valid until local unit device
+ *         is enumerated.
+ * @list: link for insertion into fwserial_list
+ * @peer_list: list of local & remote unit devices attached to this card
+ * @ports: fixed array of tty_ports provided by this serial device
+ */
+struct fw_serial {
+        struct fw_card    *card;
+        struct kref       kref;
+
+        struct fwtty_peer *self;
+
+        struct list_head  list;
+        struct list_head  peer_list;
+
+        struct fwtty_port *ports[MAX_CARD_PORTS];
+};
+
+#define to_serial(ptr, field)   (container_of(ptr, struct fw_serial, field))
+
+#define TTY_DEV_NAME                "fwtty"     /* ttyFW was taken           */
+static const char tty_dev_name[] =  TTY_DEV_NAME;
+static const char loop_dev_name[] = "fwloop";
+extern bool limit_bw;
+
+struct tty_driver *fwtty_driver;
+
+#define driver_err(s, v...)     pr_err(KBUILD_MODNAME ": " s, ##v)
+
+struct fwtty_port *fwtty_port_get(unsigned index);
+void fwtty_port_put(struct fwtty_port *port);
+
+static inline void fwtty_bind_console(struct fwtty_port *port,
+                                      struct fwconsole_ops *fwcon_ops,
+                                      void *data)
+{
+        port->con_data = data;
+        port->fwcon_ops = fwcon_ops;
+}
+
+/*
+ * Returns the max send async payload size in bytes based on the unit device
+ * link speed - if set to limit bandwidth to max 20%, use lookup table
+ */
+static inline int link_speed_to_max_payload(unsigned speed)
+{
+        static const int max_async[] = { 307, 614, 1229, 2458, 4916, 9832, };
+        BUILD_BUG_ON(ARRAY_SIZE(max_async) - 1 != SCODE_3200);
+
+        speed = clamp(speed, (unsigned) SCODE_100, (unsigned) SCODE_3200);
+        if (limit_bw)
+                return max_async[speed];
+        else
+                return 1 << (speed + 9);
+}
+
+#endif /* _FIREWIRE_FWSERIAL_H */
diff --git a/drivers/staging/gdm72xx/gdm_qos.c b/drivers/staging/gdm72xx/gdm_qos.c
index e26c6a8b2627..1e6303123722 100644
--- a/drivers/staging/gdm72xx/gdm_qos.c
+++ b/drivers/staging/gdm72xx/gdm_qos.c
@@ -11,6 +11,8 @@
  * GNU General Public License for more details.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/etherdevice.h>
 #include <asm/byteorder.h>
 
@@ -24,15 +26,6 @@
 
 #define B2H(x)          __be16_to_cpu(x)
 
-#undef dprintk
-#define dprintk(fmt, args ...) printk(KERN_DEBUG "[QoS] " fmt, ## args)
-#undef wprintk
-#define wprintk(fmt, args ...) \
-        printk(KERN_WARNING "[QoS WARNING] " fmt, ## args)
-#undef eprintk
-#define eprintk(fmt, args ...) printk(KERN_ERR "[QoS ERROR] " fmt, ## args)
-
-
 #define MAX_FREE_LIST_CNT               32
 static struct {
         struct list_head head;
@@ -95,7 +88,7 @@ static void free_qos_entry_list(struct list_head *free_list)
                 total_free++;
         }
 
-        dprintk("%s: total_free_cnt=%d\n", __func__, total_free);
+        pr_debug("%s: total_free_cnt=%d\n", __func__, total_free);
 }
 
 void gdm_qos_init(void *nic_ptr)
@@ -240,7 +233,9 @@ static u32 extract_qos_list(struct nic *nic, struct list_head *head)
                                         qcb->csr[i].qos_buf_count++;
 
                                         if (!list_empty(&qcb->qos_list[i]))
-                                                wprintk("QoS Index(%d) is piled!!\n", i);
+                                                netdev_warn(nic->netdev,
+                                                            "Index(%d) is piled!!\n",
+                                                            i);
                                 }
                         }
                 }
@@ -280,7 +275,8 @@ int gdm_qos_send_hci_pkt(struct sk_buff *skb, struct net_device *dev)
                         entry = alloc_qos_entry();
                         entry->skb = skb;
                         entry->dev = dev;
-                        dprintk("qcb->qos_list_cnt=%d\n", qcb->qos_list_cnt);
+                        netdev_dbg(dev, "qcb->qos_list_cnt=%d\n",
+                                   qcb->qos_list_cnt);
                 }
 
                 spin_lock_irqsave(&qcb->qos_lock, flags);
@@ -362,7 +358,7 @@ void gdm_recv_qos_hci_packet(void *nic_ptr, u8 *buf, int size)
                         index = get_csr(qcb, SFID, 0);
                         if (index == -1) {
                                 spin_unlock_irqrestore(&qcb->qos_lock, flags);
-                                eprintk("QoS ERROR: No SF\n");
+                                netdev_err(nic->netdev, "QoS ERROR: No SF\n");
                                 return;
                         }
                         qcb->csr[index].qos_buf_count = buf[(i*5)+10];
@@ -383,11 +379,12 @@ void gdm_recv_qos_hci_packet(void *nic_ptr, u8 *buf, int size)
 
                 index = get_csr(qcb, SFID, 1);
                 if (index == -1) {
-                        eprintk("QoS ERROR: csr Update Error\n");
+                        netdev_err(nic->netdev, "QoS ERROR: csr Update Error\n");
                         return;
                 }
 
-                dprintk("QOS_ADD SFID = 0x%x, index=%d\n", SFID, index);
+                netdev_dbg(nic->netdev, "QOS_ADD SFID = 0x%x, index=%d\n",
+                           SFID, index);
 
                 spin_lock_irqsave(&qcb->qos_lock, flags);
                 qcb->csr[index].SFID = SFID;
@@ -435,11 +432,13 @@ void gdm_recv_qos_hci_packet(void *nic_ptr, u8 *buf, int size)
                 SFID += (buf[pos++]);
                 index = get_csr(qcb, SFID, 1);
                 if (index == -1) {
-                        eprintk("QoS ERROR: Wrong index(%d)\n", index);
+                        netdev_err(nic->netdev, "QoS ERROR: Wrong index(%d)\n",
+                                   index);
                         return;
                 }
 
-                dprintk("QOS_CHANGE_DEL SFID = 0x%x, index=%d\n", SFID, index);
+                netdev_dbg(nic->netdev, "QOS_CHANGE_DEL SFID = 0x%x, index=%d\n",
+                           SFID, index);
 
                 INIT_LIST_HEAD(&free_list);
 
diff --git a/drivers/staging/gdm72xx/gdm_sdio.c b/drivers/staging/gdm72xx/gdm_sdio.c
index ca38d719a1f8..8b8ed981d102 100644
--- a/drivers/staging/gdm72xx/gdm_sdio.c
+++ b/drivers/staging/gdm72xx/gdm_sdio.c
@@ -157,7 +157,7 @@ static int init_sdio(struct sdiowm_dev *sdev)
 
         tx->sdu_buf = kmalloc(SDU_TX_BUF_SIZE, GFP_KERNEL);
         if (tx->sdu_buf == NULL) {
-                printk(KERN_ERR "Failed to allocate SDU tx buffer.\n");
+                dev_err(&sdev->func->dev, "Failed to allocate SDU tx buffer.\n");
                 goto fail;
         }
 
@@ -186,7 +186,7 @@ static int init_sdio(struct sdiowm_dev *sdev)
 
         rx->rx_buf = kmalloc(RX_BUF_SIZE, GFP_KERNEL);
         if (rx->rx_buf == NULL) {
-                printk(KERN_ERR "Failed to allocate rx buffer.\n");
+                dev_err(&sdev->func->dev, "Failed to allocate rx buffer.\n");
                 goto fail;
         }
 
@@ -246,7 +246,8 @@ static void send_sdio_pkt(struct sdio_func *func, u8 *data, int len)
                 ret = sdio_memcpy_toio(func, 0, data, n);
                 if (ret < 0) {
                         if (ret != -ENOMEDIUM)
-                                printk(KERN_ERR "gdmwms: %s error: ret = %d\n",
+                                dev_err(&func->dev,
+                                        "gdmwms: %s error: ret = %d\n",
                                         __func__, ret);
                         goto end_io;
                 }
@@ -259,7 +260,8 @@ static void send_sdio_pkt(struct sdio_func *func, u8 *data, int len)
                 ret = sdio_memcpy_toio(func, 0, data + n, remain);
                 if (ret < 0) {
                         if (ret != -ENOMEDIUM)
-                                printk(KERN_ERR "gdmwms: %s error: ret = %d\n",
+                                dev_err(&func->dev,
+                                        "gdmwms: %s error: ret = %d\n",
                                         __func__, ret);
                         goto end_io;
                 }
@@ -522,13 +524,14 @@ static void gdm_sdio_irq(struct sdio_func *func)
 
         ret = sdio_memcpy_fromio(func, hdr, 0x0, TYPE_A_LOOKAHEAD_SIZE);
         if (ret) {
-                printk(KERN_ERR "Cannot read from function %d\n", func->num);
+                dev_err(&func->dev,
+                        "Cannot read from function %d\n", func->num);
                 goto done;
         }
 
         len = (hdr[2] << 16) | (hdr[1] << 8) | hdr[0];
         if (len > (RX_BUF_SIZE - TYPE_A_HEADER_SIZE)) {
-                printk(KERN_ERR "Too big Type-A size: %d\n", len);
+                dev_err(&func->dev, "Too big Type-A size: %d\n", len);
                 goto done;
         }
 
@@ -562,8 +565,8 @@ static void gdm_sdio_irq(struct sdio_func *func)
                 n = blocks * func->cur_blksize;
                 ret = sdio_memcpy_fromio(func, buf, 0x0, n);
                 if (ret) {
-                        printk(KERN_ERR "Cannot read from function %d\n",
-                                func->num);
+                        dev_err(&func->dev,
+                                "Cannot read from function %d\n", func->num);
                         goto done;
                 }
                 buf += n;
@@ -573,8 +576,8 @@ static void gdm_sdio_irq(struct sdio_func *func)
         if (remain) {
                 ret = sdio_memcpy_fromio(func, buf, 0x0, remain);
                 if (ret) {
-                        printk(KERN_ERR "Cannot read from function %d\n",
-                                func->num);
+                        dev_err(&func->dev,
+                                "Cannot read from function %d\n", func->num);
                         goto done;
                 }
         }
@@ -637,9 +640,9 @@ static int sdio_wimax_probe(struct sdio_func *func,
         struct phy_dev *phy_dev = NULL;
         struct sdiowm_dev *sdev = NULL;
 
-        printk(KERN_INFO "Found GDM SDIO VID = 0x%04x PID = 0x%04x...\n",
-                        func->vendor, func->device);
-        printk(KERN_INFO "GCT WiMax driver version %s\n", DRIVER_VERSION);
+        dev_info(&func->dev, "Found GDM SDIO VID = 0x%04x PID = 0x%04x...\n",
+                 func->vendor, func->device);
+        dev_info(&func->dev, "GCT WiMax driver version %s\n", DRIVER_VERSION);
 
         sdio_claim_host(func);
         sdio_enable_func(func);
diff --git a/drivers/staging/gdm72xx/gdm_usb.c b/drivers/staging/gdm72xx/gdm_usb.c
index 0c9e8958009b..bce6104bbab8 100644
--- a/drivers/staging/gdm72xx/gdm_usb.c
+++ b/drivers/staging/gdm72xx/gdm_usb.c
@@ -186,6 +186,7 @@ static int init_usb(struct usbwm_dev *udev)
         struct rx_cxt   *rx = &udev->rx;
         struct usb_tx   *t;
         struct usb_rx   *r;
+        unsigned long flags;
 
         INIT_LIST_HEAD(&tx->free_list);
         INIT_LIST_HEAD(&tx->sdu_list);
@@ -200,14 +201,17 @@ static int init_usb(struct usbwm_dev *udev)
         spin_lock_init(&tx->lock);
         spin_lock_init(&rx->lock);
 
+        spin_lock_irqsave(&tx->lock, flags);
         for (i = 0; i < MAX_NR_SDU_BUF; i++) {
                 t = alloc_tx_struct(tx);
                 if (t == NULL) {
+                        spin_unlock_irqrestore(&tx->lock, flags);
                         ret = -ENOMEM;
                         goto fail;
                 }
                 list_add(&t->list, &tx->free_list);
         }
+        spin_unlock_irqrestore(&tx->lock, flags);
 
         r = alloc_rx_struct(rx);
         if (r == NULL) {
@@ -215,7 +219,9 @@ static int init_usb(struct usbwm_dev *udev)
                 goto fail;
         }
 
+        spin_lock_irqsave(&rx->lock, flags);
         list_add(&r->list, &rx->free_list);
+        spin_unlock_irqrestore(&rx->lock, flags);
         return ret;
 
 fail:
@@ -229,6 +235,9 @@ static void release_usb(struct usbwm_dev *udev)
         struct rx_cxt   *rx = &udev->rx;
         struct usb_tx   *t, *t_next;
         struct usb_rx   *r, *r_next;
+        unsigned long flags;
+
+        spin_lock_irqsave(&tx->lock, flags);
 
         list_for_each_entry_safe(t, t_next, &tx->sdu_list, list) {
                 list_del(&t->list);
@@ -245,6 +254,10 @@ static void release_usb(struct usbwm_dev *udev)
                 free_tx_struct(t);
         }
 
+        spin_unlock_irqrestore(&tx->lock, flags);
+
+        spin_lock_irqsave(&rx->lock, flags);
+
         list_for_each_entry_safe(r, r_next, &rx->free_list, list) {
                 list_del(&r->list);
                 free_rx_struct(r);
@@ -254,6 +267,8 @@ static void release_usb(struct usbwm_dev *udev)
                 list_del(&r->list);
                 free_rx_struct(r);
         }
+
+        spin_unlock_irqrestore(&rx->lock, flags);
 }
 
 static void __gdm_usb_send_complete(struct urb *urb)
@@ -303,9 +318,12 @@ static int gdm_usb_send(void *priv_dev, void *data, int len,
         u8 *pkt = data;
         u16 cmd_evt;
         unsigned long flags;
+#ifdef CONFIG_WIMAX_GDM72XX_K_MODE
+        unsigned long flags2;
+#endif /* CONFIG_WIMAX_GDM72XX_K_MODE */
 
         if (!udev->usbdev) {
-                printk(KERN_ERR "%s: No such device\n", __func__);
+                dev_err(&usbdev->dev, "%s: No such device\n", __func__);
                 return -ENODEV;
         }
 
@@ -371,13 +389,16 @@ static int gdm_usb_send(void *priv_dev, void *data, int len,
 
                 rx = &udev->rx;
 
+                spin_lock_irqsave(&rx->lock, flags2);
                 list_for_each_entry(r, &rx->used_list, list)
                         usb_unlink_urb(r->urb);
+                spin_unlock_irqrestore(&rx->lock, flags2);
+
                 udev->bw_switch = 1;
 
-                spin_lock(&k_lock);
+                spin_lock_irqsave(&k_lock, flags2);
                 list_add_tail(&udev->list, &k_list);
-                spin_unlock(&k_lock);
+                spin_unlock_irqrestore(&k_lock, flags2);
 
                 wake_up(&k_wait);
         }
@@ -416,7 +437,7 @@ static void gdm_usb_rcv_complete(struct urb *urb)
         struct tx_cxt *tx = &udev->tx;
         struct usb_tx *t;
         u16 cmd_evt;
-        unsigned long flags;
+        unsigned long flags, flags2;
 
 #ifdef CONFIG_WIMAX_GDM72XX_USB_PM
         struct usb_device *dev = urb->dev;
@@ -462,9 +483,9 @@ static void gdm_usb_rcv_complete(struct urb *urb)
         if (!urb->status && r->callback)
                 r->callback(r->cb_data, r->buf, urb->actual_length);
 
-        spin_lock(&rx->lock);
+        spin_lock_irqsave(&rx->lock, flags2);
         put_rx_struct(rx, r);
-        spin_unlock(&rx->lock);
+        spin_unlock_irqrestore(&rx->lock, flags2);
 
         spin_unlock_irqrestore(&tx->lock, flags);
 
@@ -484,7 +505,7 @@ static int gdm_usb_receive(void *priv_dev,
         unsigned long flags;
 
         if (!udev->usbdev) {
-                printk(KERN_ERR "%s: No such device\n", __func__);
+                dev_err(&usbdev->dev, "%s: No such device\n", __func__);
                 return -ENODEV;
         }
 
@@ -559,9 +580,9 @@ static int gdm_usb_probe(struct usb_interface *intf,
         idProduct = L2H(usbdev->descriptor.idProduct);
         bcdDevice = L2H(usbdev->descriptor.bcdDevice);
 
-        printk(KERN_INFO "Found GDM USB VID = 0x%04x PID = 0x%04x...\n",
-                idVendor, idProduct);
-        printk(KERN_INFO "GCT WiMax driver version %s\n", DRIVER_VERSION);
+        dev_info(&intf->dev, "Found GDM USB VID = 0x%04x PID = 0x%04x...\n",
+                 idVendor, idProduct);
+        dev_info(&intf->dev, "GCT WiMax driver version %s\n", DRIVER_VERSION);
 
 
         if (idProduct == EMERGENCY_PID) {
@@ -619,8 +640,9 @@ out:
         if (ret) {
                 kfree(phy_dev);
                 kfree(udev);
+        } else {
+                usb_set_intfdata(intf, phy_dev);
         }
-        usb_set_intfdata(intf, phy_dev);
         return ret;
 }
 
@@ -660,14 +682,22 @@ static int gdm_suspend(struct usb_interface *intf, pm_message_t pm_msg)
         struct usbwm_dev *udev;
         struct rx_cxt *rx;
         struct usb_rx *r;
+        unsigned long flags;
 
         phy_dev = usb_get_intfdata(intf);
+        if (!phy_dev)
+                return 0;
+
         udev = phy_dev->priv_dev;
         rx = &udev->rx;
 
+        spin_lock_irqsave(&rx->lock, flags);
+
         list_for_each_entry(r, &rx->used_list, list)
                 usb_unlink_urb(r->urb);
 
+        spin_unlock_irqrestore(&rx->lock, flags);
+
         return 0;
 }
 
@@ -677,14 +707,22 @@ static int gdm_resume(struct usb_interface *intf)
         struct usbwm_dev *udev;
         struct rx_cxt *rx;
         struct usb_rx *r;
+        unsigned long flags;
 
         phy_dev = usb_get_intfdata(intf);
+        if (!phy_dev)
+                return 0;
+
         udev = phy_dev->priv_dev;
         rx = &udev->rx;
 
+        spin_lock_irqsave(&rx->lock, flags);
+
         list_for_each_entry(r, &rx->used_list, list)
                 usb_submit_urb(r->urb, GFP_ATOMIC);
 
+        spin_unlock_irqrestore(&rx->lock, flags);
+
         return 0;
 }
 
@@ -719,9 +757,13 @@ static int k_mode_thread(void *arg)
                         while (jiffies < expire)
                                 schedule_timeout(K_WAIT_TIME);
 
+                        spin_lock_irqsave(&rx->lock, flags);
+
                         list_for_each_entry(r, &rx->used_list, list)
                                 usb_submit_urb(r->urb, GFP_ATOMIC);
 
+                        spin_unlock_irqrestore(&rx->lock, flags);
+
                         spin_lock_irqsave(&tx->lock, flags);
 
                         list_for_each_entry_safe(t, temp, &tx->pending_list,
diff --git a/drivers/staging/gdm72xx/gdm_wimax.c b/drivers/staging/gdm72xx/gdm_wimax.c
index 6cb810701a3e..41efbeeb62f1 100644
--- a/drivers/staging/gdm72xx/gdm_wimax.c
+++ b/drivers/staging/gdm72xx/gdm_wimax.c
@@ -11,6 +11,8 @@
  * GNU General Public License for more details.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/etherdevice.h>
 #include <asm/byteorder.h>
 #include <linux/ip.h>
@@ -166,21 +168,13 @@ static void dump_eth_packet(const char *title, u8 *data, int len)
                 get_ip_protocol_name(ip_protocol),
                 get_port_name(port));
 
-        #if 1
         if (!(data[0] == 0xff && data[1] == 0xff)) {
                 if (protocol == ETH_P_IP) {
-                        printk(KERN_DEBUG "     src=%u.%u.%u.%u\n",
-                                NIPQUAD(ih->saddr));
+                        printk(KERN_DEBUG "     src=%pI4\n", &ih->saddr);
                 } else if (protocol == ETH_P_IPV6) {
-                        #ifdef NIP6
-                        printk(KERN_DEBUG "     src=%x:%x:%x:%x:%x:%x:%x:%x\n",
-                                NIP6(ih->saddr));
-                        #else
                         printk(KERN_DEBUG "     src=%pI6\n", &ih->saddr);
-                        #endif
                 }
         }
-        #endif
 
         #if (DUMP_PACKET & DUMP_SDU_ALL)
         printk_hex(data, len);
@@ -271,7 +265,7 @@ static int gdm_wimax_event_init(void)
                 return 0;
         }
 
-        printk(KERN_ERR "Creating WiMax Event netlink is failed\n");
+        pr_err("Creating WiMax Event netlink is failed\n");
         return -1;
 }
 
@@ -367,7 +361,7 @@ static int gdm_wimax_event_send(struct net_device *dev, char *buf, int size)
 
         e = get_event_entry();
         if (!e) {
-                printk(KERN_ERR "%s: No memory for event\n", __func__);
+                netdev_err(dev, "%s: No memory for event\n", __func__);
                 spin_unlock_irqrestore(&wm_event.evt_lock, flags);
                 return -ENOMEM;
         }
@@ -433,10 +427,10 @@ static int gdm_wimax_tx(struct sk_buff *skb, struct net_device *dev)
 
         #if !defined(LOOPBACK_TEST)
         if (!fsm)
-                printk(KERN_ERR "ASSERTION ERROR: fsm is NULL!!\n");
+                netdev_err(dev, "ASSERTION ERROR: fsm is NULL!!\n");
         else if (fsm->m_status != M_CONNECTED) {
-                printk(KERN_EMERG "ASSERTION ERROR: Device is NOT ready. status=%d\n",
-                        fsm->m_status);
+                netdev_emerg(dev, "ASSERTION ERROR: Device is NOT ready. status=%d\n",
+                             fsm->m_status);
                 kfree_skb(skb);
                 return 0;
         }
@@ -622,9 +616,8 @@ static int gdm_wimax_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
         case SIOCG_DATA:
         case SIOCS_DATA:
                 if (req->data_id >= SIOC_DATA_MAX) {
-                        printk(KERN_ERR
-                                "%s error: data-index(%d) is invalid!!\n",
-                                __func__, req->data_id);
+                        netdev_err(dev, "%s error: data-index(%d) is invalid!!\n",
+                                   __func__, req->data_id);
                         return -EOPNOTSUPP;
                 }
                 if (req->cmd == SIOCG_DATA) {
@@ -646,7 +639,7 @@ static int gdm_wimax_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
                 }
                 break;
         default:
-                printk(KERN_ERR "%s: %x unknown ioctl\n", __func__, cmd);
+                netdev_err(dev, "%s: %x unknown ioctl\n", __func__, cmd);
                 return -EOPNOTSUPP;
         }
 
@@ -692,7 +685,7 @@ static void gdm_wimax_prepare_device(struct net_device *dev)
         hci->length = H2B(len);
         gdm_wimax_send(nic, hci, HCI_HEADER_SIZE+len);
 
-        printk(KERN_INFO "GDM WiMax Set CAPABILITY: 0x%08X\n", DB2H(val));
+        netdev_info(dev, "GDM WiMax Set CAPABILITY: 0x%08X\n", DB2H(val));
 }
 
 static int gdm_wimax_hci_get_tlv(u8 *buf, u8 *T, u16 *L, u8 **V)
@@ -726,28 +719,28 @@ static int gdm_wimax_get_prepared_info(struct net_device *dev, char *buf,
         cmd_len = B2H(*(u16 *)&buf[2]);
 
         if (len < cmd_len + HCI_HEADER_SIZE) {
-                printk(KERN_ERR "%s: invalid length [%d/%d]\n", __func__,
-                        cmd_len + HCI_HEADER_SIZE, len);
+                netdev_err(dev, "%s: invalid length [%d/%d]\n", __func__,
+                           cmd_len + HCI_HEADER_SIZE, len);
                 return -1;
         }
 
         if (cmd_evt == WIMAX_GET_INFO_RESULT) {
                 if (cmd_len < 2) {
-                        printk(KERN_ERR "%s: len is too short [%x/%d]\n",
-                                __func__, cmd_evt, len);
+                        netdev_err(dev, "%s: len is too short [%x/%d]\n",
+                                   __func__, cmd_evt, len);
                         return -1;
                 }
 
                 pos += gdm_wimax_hci_get_tlv(&buf[pos], &T, &L, &V);
                 if (T == TLV_T(T_MAC_ADDRESS)) {
                         if (L != dev->addr_len) {
-                                printk(KERN_ERR
-                                        "%s Invalid inofrmation result T/L "
-                                        "[%x/%d]\n", __func__, T, L);
+                                netdev_err(dev,
+                                           "%s Invalid inofrmation result T/L [%x/%d]\n",
+                                           __func__, T, L);
                                 return -1;
                         }
-                        printk(KERN_INFO "MAC change [%pM]->[%pM]\n",
-                                dev->dev_addr, V);
+                        netdev_info(dev, "MAC change [%pM]->[%pM]\n",
+                                    dev->dev_addr, V);
                         memcpy(dev->dev_addr, V, dev->addr_len);
                         return 1;
                 }
@@ -769,7 +762,7 @@ static void gdm_wimax_netif_rx(struct net_device *dev, char *buf, int len)
 
         skb = dev_alloc_skb(len + 2);
         if (!skb) {
-                printk(KERN_ERR "%s: dev_alloc_skb failed!\n", __func__);
+                netdev_err(dev, "%s: dev_alloc_skb failed!\n", __func__);
                 return;
         }
         skb_reserve(skb, 2);
@@ -784,7 +777,7 @@ static void gdm_wimax_netif_rx(struct net_device *dev, char *buf, int len)
 
         ret = in_interrupt() ? netif_rx(skb) : netif_rx_ni(skb);
         if (ret == NET_RX_DROP)
-                printk(KERN_ERR "%s skb dropped\n", __func__);
+                netdev_err(dev, "%s skb dropped\n", __func__);
 }
 
 static void gdm_wimax_transmit_aggr_pkt(struct net_device *dev, char *buf,
@@ -799,8 +792,8 @@ static void gdm_wimax_transmit_aggr_pkt(struct net_device *dev, char *buf,
                 hci = (struct hci_s *) buf;
 
                 if (B2H(hci->cmd_evt) != WIMAX_RX_SDU) {
-                        printk(KERN_ERR "Wrong cmd_evt(0x%04X)\n",
-                                B2H(hci->cmd_evt));
+                        netdev_err(dev, "Wrong cmd_evt(0x%04X)\n",
+                                   B2H(hci->cmd_evt));
                         break;
                 }
 
@@ -834,8 +827,8 @@ static void gdm_wimax_transmit_pkt(struct net_device *dev, char *buf, int len)
 
         if (len < cmd_len + HCI_HEADER_SIZE) {
                 if (len)
-                        printk(KERN_ERR "%s: invalid length [%d/%d]\n",
-                                __func__, cmd_len + HCI_HEADER_SIZE, len);
+                        netdev_err(dev, "%s: invalid length [%d/%d]\n",
+                                   __func__, cmd_len + HCI_HEADER_SIZE, len);
                 return;
         }
 
@@ -915,7 +908,8 @@ static void prepare_rx_complete(void *arg, void *data, int len)
                 gdm_wimax_rcv_with_cb(nic, rx_complete, nic);
         else {
                 if (ret < 0)
-                        printk(KERN_ERR "get_prepared_info failed(%d)\n", ret);
+                        netdev_err(nic->netdev,
+                                   "get_prepared_info failed(%d)\n", ret);
                 gdm_wimax_rcv_with_cb(nic, prepare_rx_complete, nic);
                 #if 0
                 /* Re-prepare WiMax device */
@@ -949,7 +943,7 @@ int register_wimax_device(struct phy_dev *phy_dev, struct device *pdev)
                                                 "wm%d", ether_setup);
 
         if (dev == NULL) {
-                printk(KERN_ERR "alloc_etherdev failed\n");
+                pr_err("alloc_etherdev failed\n");
                 return -ENOMEM;
         }
 
@@ -969,7 +963,7 @@ int register_wimax_device(struct phy_dev *phy_dev, struct device *pdev)
         /* event socket init */
         ret = gdm_wimax_event_init();
         if (ret < 0) {
-                printk(KERN_ERR "Cannot create event.\n");
+                pr_err("Cannot create event.\n");
                 goto cleanup;
         }
 
@@ -996,7 +990,7 @@ int register_wimax_device(struct phy_dev *phy_dev, struct device *pdev)
         return 0;
 
 cleanup:
-        printk(KERN_ERR "register_netdev failed\n");
+        pr_err("register_netdev failed\n");
         free_netdev(dev);
         return ret;
 }
diff --git a/drivers/staging/gdm72xx/netlink_k.c b/drivers/staging/gdm72xx/netlink_k.c
index 20d0aec52e72..52c25ba5831d 100644
--- a/drivers/staging/gdm72xx/netlink_k.c
+++ b/drivers/staging/gdm72xx/netlink_k.c
@@ -11,6 +11,8 @@
  * GNU General Public License for more details.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/module.h>
 #include <linux/etherdevice.h>
 #include <linux/netlink.h>
@@ -54,8 +56,8 @@ static void netlink_rcv_cb(struct sk_buff *skb)
 
                 if (skb->len < nlh->nlmsg_len ||
                 nlh->nlmsg_len > ND_MAX_MSG_LEN) {
-                        printk(KERN_ERR "Invalid length (%d,%d)\n", skb->len,
-                                nlh->nlmsg_len);
+                        netdev_err(skb->dev, "Invalid length (%d,%d)\n",
+                                   skb->len, nlh->nlmsg_len);
                         return;
                 }
 
@@ -69,10 +71,11 @@ static void netlink_rcv_cb(struct sk_buff *skb)
                                 rcv_cb(dev, nlh->nlmsg_type, msg, mlen);
                                 dev_put(dev);
                         } else
-                                printk(KERN_ERR "dev_get_by_index(%d) "
-                                        "is not found.\n", ifindex);
+                                netdev_err(skb->dev,
+                                           "dev_get_by_index(%d) is not found.\n",
+                                           ifindex);
                 } else
-                        printk(KERN_ERR "Unregistered Callback\n");
+                        netdev_err(skb->dev, "Unregistered Callback\n");
         }
 }
 
@@ -116,14 +119,14 @@ int netlink_send(struct sock *sock, int group, u16 type, void *msg, int len)
         int ret = 0;
 
         if (group > ND_MAX_GROUP) {
-                printk(KERN_ERR "Group %d is invalied.\n", group);
-                printk(KERN_ERR "Valid group is 0 ~ %d.\n", ND_MAX_GROUP);
+                pr_err("Group %d is invalied.\n", group);
+                pr_err("Valid group is 0 ~ %d.\n", ND_MAX_GROUP);
                 return -EINVAL;
         }
 
         skb = alloc_skb(NLMSG_SPACE(len), GFP_ATOMIC);
         if (!skb) {
-                printk(KERN_ERR "netlink_broadcast ret=%d\n", ret);
+                pr_err("netlink_broadcast ret=%d\n", ret);
                 return -ENOMEM;
         }
 
@@ -144,8 +147,8 @@ int netlink_send(struct sock *sock, int group, u16 type, void *msg, int len)
                 return len;
         else {
                 if (ret != -ESRCH) {
-                        printk(KERN_ERR "netlink_broadcast g=%d, t=%d, l=%d, r=%d\n",
-                                group, type, len, ret);
+                        pr_err("netlink_broadcast g=%d, t=%d, l=%d, r=%d\n",
+                               group, type, len, ret);
                 }
                 ret = 0;
         }
diff --git a/drivers/staging/gdm72xx/sdio_boot.c b/drivers/staging/gdm72xx/sdio_boot.c
index 65624bca8b3a..6291829dcdcc 100644
--- a/drivers/staging/gdm72xx/sdio_boot.c
+++ b/drivers/staging/gdm72xx/sdio_boot.c
@@ -24,15 +24,18 @@
 #include <linux/mmc/card.h>
 #include <linux/mmc/sdio_func.h>
 
+#include <linux/firmware.h>
+
 #include "gdm_sdio.h"
 
 #define TYPE_A_HEADER_SIZE      4
 #define TYPE_A_LOOKAHEAD_SIZE   16
-#define YMEM0_SIZE                      0x8000  /* 32kbytes */
+#define YMEM0_SIZE              0x8000  /* 32kbytes */
 #define DOWNLOAD_SIZE           (YMEM0_SIZE - TYPE_A_HEADER_SIZE)
 
-#define KRN_PATH        "/lib/firmware/gdm72xx/gdmskrn.bin"
-#define RFS_PATH        "/lib/firmware/gdm72xx/gdmsrfs.bin"
+#define FW_DIR                  "gdm72xx/"
+#define FW_KRN                  "gdmskrn.bin"
+#define FW_RFS                  "gdmsrfs.bin"
 
 static u8 *tx_buf;
 
@@ -52,106 +55,109 @@ static int ack_ready(struct sdio_func *func)
         return 0;
 }
 
-static int download_image(struct sdio_func *func, char *img_name)
+static int download_image(struct sdio_func *func, const char *img_name)
 {
-        int ret = 0, len, size, pno;
-        struct file *filp = NULL;
-        struct inode *inode = NULL;
+        int ret = 0, len, pno;
         u8 *buf = tx_buf;
         loff_t pos = 0;
-
-        filp = filp_open(img_name, O_RDONLY | O_LARGEFILE, 0);
-        if (IS_ERR(filp)) {
-                printk(KERN_ERR "Can't find %s.\n", img_name);
-                return -ENOENT;
+        int img_len;
+        const struct firmware *firm;
+
+        ret = request_firmware(&firm, img_name, &func->dev);
+        if (ret < 0) {
+                dev_err(&func->dev,
+                        "requesting firmware %s failed with error %d\n",
+                        img_name, ret);
+                return ret;
         }
 
-        inode = filp->f_dentry->d_inode;
-        if (!S_ISREG(inode->i_mode)) {
-                printk(KERN_ERR "Invalid file type: %s\n", img_name);
-                ret = -EINVAL;
-                goto out;
+        buf = kmalloc(DOWNLOAD_SIZE + TYPE_A_HEADER_SIZE, GFP_KERNEL);
+        if (buf == NULL) {
+                dev_err(&func->dev, "Error: kmalloc\n");
+                return -ENOMEM;
         }
 
-        size = i_size_read(inode->i_mapping->host);
-        if (size <= 0) {
-                printk(KERN_ERR "Unable to find file size: %s\n", img_name);
-                ret = size;
+        img_len = firm->size;
+
+        if (img_len <= 0) {
+                ret = -1;
                 goto out;
         }
 
         pno = 0;
-        while ((len = filp->f_op->read(filp, buf + TYPE_A_HEADER_SIZE,
-                                        DOWNLOAD_SIZE, &pos))) {
-                if (len < 0) {
-                        ret = -1;
-                        goto out;
+        while (img_len > 0) {
+                if (img_len > DOWNLOAD_SIZE) {
+                        len = DOWNLOAD_SIZE;
+                        buf[3] = 0;
+                } else {
+                        len = img_len; /* the last packet */
+                        buf[3] = 2;
                 }
 
                 buf[0] = len & 0xff;
                 buf[1] = (len >> 8) & 0xff;
                 buf[2] = (len >> 16) & 0xff;
 
-                if (pos >= size)        /* The last packet */
-                        buf[3] = 2;
-                else
-                        buf[3] = 0;
-
+                memcpy(buf+TYPE_A_HEADER_SIZE, firm->data + pos, len);
                 ret = sdio_memcpy_toio(func, 0, buf, len + TYPE_A_HEADER_SIZE);
                 if (ret < 0) {
-                        printk(KERN_ERR "gdmwm: send image error: "
-                                "packet number = %d ret = %d\n", pno, ret);
+                        dev_err(&func->dev,
+                                "send image error: packet number = %d ret = %d\n",
+                                pno, ret);
                         goto out;
                 }
+
                 if (buf[3] == 2)        /* The last packet */
                         break;
                 if (!ack_ready(func)) {
                         ret = -EIO;
-                        printk(KERN_ERR "gdmwm: Ack is not ready.\n");
+                        dev_err(&func->dev, "Ack is not ready.\n");
                         goto out;
                 }
                 ret = sdio_memcpy_fromio(func, buf, 0, TYPE_A_LOOKAHEAD_SIZE);
                 if (ret < 0) {
-                        printk(KERN_ERR "gdmwm: receive ack error: "
-                                "packet number = %d ret = %d\n", pno, ret);
+                        dev_err(&func->dev,
+                                "receive ack error: packet number = %d ret = %d\n",
+                                pno, ret);
                         goto out;
                 }
                 sdio_writeb(func, 0x01, 0x13, &ret);
                 sdio_writeb(func, 0x00, 0x10, &ret);    /* PCRRT */
 
+                img_len -= DOWNLOAD_SIZE;
+                pos += DOWNLOAD_SIZE;
                 pno++;
         }
+
 out:
-        filp_close(filp, NULL);
+        kfree(buf);
         return ret;
 }
 
 int sdio_boot(struct sdio_func *func)
 {
-        static mm_segment_t fs;
         int ret;
+        const char *krn_name = FW_DIR FW_KRN;
+        const char *rfs_name = FW_DIR FW_RFS;
 
         tx_buf = kmalloc(YMEM0_SIZE, GFP_KERNEL);
         if (tx_buf == NULL) {
-                printk(KERN_ERR "Error: kmalloc: %s %d\n", __func__, __LINE__);
+                dev_err(&func->dev, "Error: kmalloc: %s %d\n",
+                        __func__, __LINE__);
                 return -ENOMEM;
         }
 
-        fs = get_fs();
-        set_fs(get_ds());
-
-        ret = download_image(func, KRN_PATH);
+        ret = download_image(func, krn_name);
         if (ret)
                 goto restore_fs;
-        printk(KERN_INFO "GCT: Kernel download success.\n");
+        dev_info(&func->dev, "GCT: Kernel download success.\n");
 
-        ret = download_image(func, RFS_PATH);
+        ret = download_image(func, rfs_name);
         if (ret)
                 goto restore_fs;
-        printk(KERN_INFO "GCT: Filesystem download success.\n");
+        dev_info(&func->dev, "GCT: Filesystem download success.\n");
 
 restore_fs:
-        set_fs(fs);
         kfree(tx_buf);
         return ret;
 }
diff --git a/drivers/staging/gdm72xx/usb_boot.c b/drivers/staging/gdm72xx/usb_boot.c
index 0787188728aa..3e2103ae4eae 100644
--- a/drivers/staging/gdm72xx/usb_boot.c
+++ b/drivers/staging/gdm72xx/usb_boot.c
@@ -82,7 +82,8 @@ static int gdm_wibro_send(struct usb_device *usbdev, void *data, int len)
                         &actual, 1000);
 
         if (ret < 0) {
-                printk(KERN_ERR "Error : usb_bulk_msg ( result = %d )\n", ret);
+                dev_err(&usbdev->dev, "Error : usb_bulk_msg ( result = %d )\n",
+                        ret);
                 return ret;
         }
         return 0;
@@ -97,8 +98,8 @@ static int gdm_wibro_recv(struct usb_device *usbdev, void *data, int len)
                         &actual, 5000);
 
         if (ret < 0) {
-                printk(KERN_ERR "Error : usb_bulk_msg(recv) ( result = %d )\n",
-                        ret);
+                dev_err(&usbdev->dev,
+                        "Error : usb_bulk_msg(recv) ( result = %d )\n", ret);
                 return ret;
         }
         return 0;
@@ -150,20 +151,20 @@ int usb_boot(struct usb_device *usbdev, u16 pid)
 
         ret = request_firmware(&firm, img_name, &usbdev->dev);
         if (ret < 0) {
-                printk(KERN_ERR
-                       "requesting firmware %s failed with error %d\n",
+                dev_err(&usbdev->dev,
+                        "requesting firmware %s failed with error %d\n",
                         img_name, ret);
                 return ret;
         }
 
         tx_buf = kmalloc(DOWNLOAD_SIZE, GFP_KERNEL);
         if (tx_buf == NULL) {
-                printk(KERN_ERR "Error: kmalloc\n");
+                dev_err(&usbdev->dev, "Error: kmalloc\n");
                 return -ENOMEM;
         }
 
         if (firm->size < sizeof(hdr)) {
-                printk(KERN_ERR "gdmwm: Cannot read the image info.\n");
+                dev_err(&usbdev->dev, "Cannot read the image info.\n");
                 ret = -EIO;
                 goto out;
         }
@@ -172,23 +173,22 @@ int usb_boot(struct usb_device *usbdev, u16 pid)
         array_le32_to_cpu((u32 *)&hdr, 19);
 #if 0
         if (hdr.magic_code != 0x10767fff) {
-                printk(KERN_ERR "gdmwm: Invalid magic code 0x%08x\n",
+                dev_err(&usbdev->dev, "Invalid magic code 0x%08x\n",
                         hdr.magic_code);
                 ret = -EINVAL;
                 goto out;
         }
 #endif
         if (hdr.count > MAX_IMG_CNT) {
-                printk(KERN_ERR "gdmwm: Too many images. %d\n", hdr.count);
+                dev_err(&usbdev->dev, "Too many images. %d\n", hdr.count);
                 ret = -EINVAL;
                 goto out;
         }
 
         for (i = 0; i < hdr.count; i++) {
                 if (hdr.offset[i] > hdr.len) {
-                        printk(KERN_ERR "gdmwm: Invalid offset. "
-                                "Entry = %d Offset = 0x%08x "
-                                "Image length = 0x%08x\n",
+                        dev_err(&usbdev->dev,
+                                "Invalid offset. Entry = %d Offset = 0x%08x Image length = 0x%08x\n",
                                 i, hdr.offset[i], hdr.len);
                         ret = -EINVAL;
                         goto out;
@@ -196,7 +196,7 @@ int usb_boot(struct usb_device *usbdev, u16 pid)
 
                 pos = hdr.offset[i];
                 if (firm->size < sizeof(fw_info) + pos) {
-                        printk(KERN_ERR "gdmwm: Cannot read the FW info.\n");
+                        dev_err(&usbdev->dev, "Cannot read the FW info.\n");
                         ret = -EIO;
                         goto out;
                 }
@@ -205,7 +205,7 @@ int usb_boot(struct usb_device *usbdev, u16 pid)
                 array_le32_to_cpu((u32 *)&fw_info, 8);
 #if 0
                 if ((fw_info.id & 0xfffff000) != 0x10767000) {
-                        printk(KERN_ERR "gdmwm: Invalid FW id. 0x%08x\n",
+                        dev_err(&usbdev->dev, "Invalid FW id. 0x%08x\n",
                                 fw_info.id);
                         ret = -EIO;
                         goto out;
@@ -217,7 +217,7 @@ int usb_boot(struct usb_device *usbdev, u16 pid)
 
                 pos = hdr.offset[i] + fw_info.kernel_offset;
                 if (firm->size < fw_info.kernel_len + pos) {
-                        printk(KERN_ERR "gdmwm: Kernel FW is too small.\n");
+                        dev_err(&usbdev->dev, "Kernel FW is too small.\n");
                         goto out;
                 }
 
@@ -225,24 +225,25 @@ int usb_boot(struct usb_device *usbdev, u16 pid)
                                 fw_info.kernel_len, DN_KERNEL_MAGIC_NUMBER);
                 if (ret < 0)
                         goto out;
-                printk(KERN_INFO "GCT: Kernel download success.\n");
+                dev_info(&usbdev->dev, "GCT: Kernel download success.\n");
 
                 pos = hdr.offset[i] + fw_info.rootfs_offset;
                 if (firm->size < fw_info.rootfs_len + pos) {
-                        printk(KERN_ERR "gdmwm: Filesystem FW is too small.\n");
+                        dev_err(&usbdev->dev, "Filesystem FW is too small.\n");
                         goto out;
                 }
                 ret = download_image(usbdev, firm, pos, fw_info.rootfs_len,
                                 DN_ROOTFS_MAGIC_NUMBER);
                 if (ret < 0)
                         goto out;
-                printk(KERN_INFO "GCT: Filesystem download success.\n");
+                dev_info(&usbdev->dev, "GCT: Filesystem download success.\n");
 
                 break;
         }
 
         if (i == hdr.count) {
-                printk(KERN_ERR "Firmware for gsk%x is not installed.\n", pid);
+                dev_err(&usbdev->dev, "Firmware for gsk%x is not installed.\n",
+                        pid);
                 ret = -EINVAL;
         }
 out:
@@ -293,15 +294,15 @@ static int em_download_image(struct usb_device *usbdev, const char *img_name,
 
         ret = request_firmware(&firm, img_name, &usbdev->dev);
         if (ret < 0) {
-                printk(KERN_ERR
-                       "requesting firmware %s failed with error %d\n",
+                dev_err(&usbdev->dev,
+                        "requesting firmware %s failed with error %d\n",
                         img_name, ret);
                 return ret;
         }
 
         buf = kmalloc(DOWNLOAD_CHUCK + pad_size, GFP_KERNEL);
         if (buf == NULL) {
-                printk(KERN_ERR "Error: kmalloc\n");
+                dev_err(&usbdev->dev, "Error: kmalloc\n");
                 return -ENOMEM;
         }
 
@@ -366,12 +367,12 @@ int usb_emergency(struct usb_device *usbdev)
         ret = em_download_image(usbdev, kern_name, KERNEL_TYPE_STRING);
         if (ret < 0)
                 return ret;
-        printk(KERN_INFO "GCT Emergency: Kernel download success.\n");
+        dev_err(&usbdev->dev, "GCT Emergency: Kernel download success.\n");
 
         ret = em_download_image(usbdev, fs_name, FS_TYPE_STRING);
         if (ret < 0)
                 return ret;
-        printk(KERN_INFO "GCT Emergency: Filesystem download success.\n");
+        dev_info(&usbdev->dev, "GCT Emergency: Filesystem download success.\n");
 
         ret = em_fw_reset(usbdev);
 
diff --git a/drivers/staging/iio/accel/Kconfig b/drivers/staging/iio/accel/Kconfig
index 5ab71670b70f..2b54430f2d99 100644
--- a/drivers/staging/iio/accel/Kconfig
+++ b/drivers/staging/iio/accel/Kconfig
@@ -6,8 +6,8 @@ menu "Accelerometers"
 config ADIS16201
         tristate "Analog Devices ADIS16201 Dual-Axis Digital Inclinometer and Accelerometer"
         depends on SPI
-        select IIO_TRIGGER if IIO_BUFFER
-        select IIO_SW_RING if IIO_BUFFER
+        select IIO_ADIS_LIB
+        select IIO_ADIS_LIB_BUFFER if IIO_BUFFER
         help
           Say yes here to build support for Analog Devices adis16201 dual-axis
           digital inclinometer and accelerometer.
@@ -15,8 +15,8 @@ config ADIS16201
 config ADIS16203
         tristate "Analog Devices ADIS16203 Programmable 360 Degrees Inclinometer"
         depends on SPI
-        select IIO_TRIGGER if IIO_BUFFER
-        select IIO_SW_RING if IIO_BUFFER
+        select IIO_ADIS_LIB
+        select IIO_ADIS_LIB_BUFFER if IIO_BUFFER
         help
           Say yes here to build support for Analog Devices adis16203 Programmable
           360 Degrees Inclinometer.
@@ -24,8 +24,8 @@ config ADIS16203
 config ADIS16204
         tristate "Analog Devices ADIS16204 Programmable High-g Digital Impact Sensor and Recorder"
         depends on SPI
-        select IIO_TRIGGER if IIO_BUFFER
-        select IIO_SW_RING if IIO_BUFFER
+        select IIO_ADIS_LIB
+        select IIO_ADIS_LIB_BUFFER if IIO_BUFFER
         help
           Say yes here to build support for Analog Devices adis16204 Programmable
           High-g Digital Impact Sensor and Recorder.
@@ -33,8 +33,8 @@ config ADIS16204
 config ADIS16209
         tristate "Analog Devices ADIS16209 Dual-Axis Digital Inclinometer and Accelerometer"
         depends on SPI
-        select IIO_TRIGGER if IIO_BUFFER
-        select IIO_SW_RING if IIO_BUFFER
+        select IIO_ADIS_LIB
+        select IIO_ADIS_LIB_BUFFER if IIO_BUFFER
         help
           Say yes here to build support for Analog Devices adis16209 dual-axis digital inclinometer
           and accelerometer.
@@ -42,6 +42,7 @@ config ADIS16209
 config ADIS16220
         tristate "Analog Devices ADIS16220 Programmable Digital Vibration Sensor"
         depends on SPI
+        select IIO_ADIS_LIB
         help
           Say yes here to build support for Analog Devices adis16220 programmable
           digital vibration sensor.
@@ -49,8 +50,8 @@ config ADIS16220
 config ADIS16240
         tristate "Analog Devices ADIS16240 Programmable Impact Sensor and Recorder"
         depends on SPI
-        select IIO_TRIGGER if IIO_BUFFER
-        select IIO_SW_RING if IIO_BUFFER
+        select IIO_ADIS_LIB
+        select IIO_ADIS_LIB_BUFFER if IIO_BUFFER
         help
           Say yes here to build support for Analog Devices adis16240 programmable
           impact Sensor and recorder.
diff --git a/drivers/staging/iio/accel/Makefile b/drivers/staging/iio/accel/Makefile
index 95c66661e702..8e7ee0368519 100644
--- a/drivers/staging/iio/accel/Makefile
+++ b/drivers/staging/iio/accel/Makefile
@@ -3,26 +3,21 @@
 #
 
 adis16201-y             := adis16201_core.o
-adis16201-$(CONFIG_IIO_BUFFER) += adis16201_ring.o adis16201_trigger.o
 obj-$(CONFIG_ADIS16201) += adis16201.o
 
 adis16203-y             := adis16203_core.o
-adis16203-$(CONFIG_IIO_BUFFER) += adis16203_ring.o adis16203_trigger.o
 obj-$(CONFIG_ADIS16203) += adis16203.o
 
 adis16204-y             := adis16204_core.o
-adis16204-$(CONFIG_IIO_BUFFER) += adis16204_ring.o adis16204_trigger.o
 obj-$(CONFIG_ADIS16204) += adis16204.o
 
 adis16209-y             := adis16209_core.o
-adis16209-$(CONFIG_IIO_BUFFER) += adis16209_ring.o adis16209_trigger.o
 obj-$(CONFIG_ADIS16209) += adis16209.o
 
 adis16220-y             := adis16220_core.o
 obj-$(CONFIG_ADIS16220) += adis16220.o
 
 adis16240-y             := adis16240_core.o
-adis16240-$(CONFIG_IIO_BUFFER) += adis16240_ring.o adis16240_trigger.o
 obj-$(CONFIG_ADIS16240) += adis16240.o
 
 obj-$(CONFIG_KXSD9)     += kxsd9.o
diff --git a/drivers/staging/iio/accel/adis16201.h b/drivers/staging/iio/accel/adis16201.h
index 72750f7f3a81..8747de5a9805 100644
--- a/drivers/staging/iio/accel/adis16201.h
+++ b/drivers/staging/iio/accel/adis16201.h
@@ -3,9 +3,6 @@
 
 #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 */
@@ -36,8 +33,6 @@
 #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 */
@@ -47,95 +42,25 @@
 /* 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 */
+#define ADIS16201_DIAG_STAT_SPI_FAIL_BIT   3 /* SPI communications failure */
+#define ADIS16201_DIAG_STAT_FLASH_UPT_BIT  2 /* Flash update failure */
+#define ADIS16201_DIAG_STAT_POWER_HIGH_BIT 1 /* Power supply above 3.625 V */
+#define ADIS16201_DIAG_STAT_POWER_LOW_BIT  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
- * @trig:               data ready trigger registered with iio
- * @tx:                 transmit buffer
- * @rx:                 receive buffer
- * @buf_lock:           mutex to protect tx and rx
- **/
-struct adis16201_state {
-        struct spi_device       *us;
-        struct iio_trigger      *trig;
-        struct mutex            buf_lock;
-        u8                      tx[14] ____cacheline_aligned;
-        u8                      rx[14];
-};
-
-int adis16201_set_irq(struct iio_dev *indio_dev, bool enable);
-
 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,
+        ADIS16201_SCAN_SUPPLY,
+        ADIS16201_SCAN_AUX_ADC,
+        ADIS16201_SCAN_TEMP,
 };
 
-#ifdef CONFIG_IIO_BUFFER
-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);
-
-#else /* CONFIG_IIO_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_BUFFER */
 #endif /* SPI_ADIS16201_H_ */
diff --git a/drivers/staging/iio/accel/adis16201_core.c b/drivers/staging/iio/accel/adis16201_core.c
index b12ca68cd9e4..9e5791ff2a04 100644
--- a/drivers/staging/iio/accel/adis16201_core.c
+++ b/drivers/staging/iio/accel/adis16201_core.c
@@ -18,258 +18,15 @@
 #include <linux/iio/iio.h>
 #include <linux/iio/sysfs.h>
 #include <linux/iio/buffer.h>
+#include <linux/iio/imu/adis.h>
 
 #include "adis16201.h"
 
-enum adis16201_chan {
-        in_supply,
-        temp,
-        accel_x,
-        accel_y,
-        incli_x,
-        incli_y,
-        in_aux,
-};
-
-/**
- * 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 iio_dev *indio_dev,
-                u8 reg_address,
-                u8 val)
-{
-        int ret;
-        struct adis16201_state *st = iio_priv(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
- * @indio_dev: iio device associated with child of actual device
- * @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 iio_dev *indio_dev,
-                                      u8 lower_reg_address,
-                                      u16 value)
-{
-        int ret;
-        struct spi_message msg;
-        struct adis16201_state *st = iio_priv(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,
-                },
-        };
-
-        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
- * @indio_dev: iio device associated with child of actual device
- * @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 iio_dev *indio_dev,
-                u8 lower_reg_address,
-                u16 *val)
-{
-        struct spi_message msg;
-        struct adis16201_state *st = iio_priv(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,
-                        .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 int adis16201_reset(struct iio_dev *indio_dev)
-{
-        int ret;
-        struct adis16201_state *st = iio_priv(indio_dev);
-
-        ret = adis16201_spi_write_reg_8(indio_dev,
-                        ADIS16201_GLOB_CMD,
-                        ADIS16201_GLOB_CMD_SW_RESET);
-        if (ret)
-                dev_err(&st->us->dev, "problem resetting device");
-
-        return ret;
-}
-
-int adis16201_set_irq(struct iio_dev *indio_dev, bool enable)
-{
-        int ret = 0;
-        u16 msc;
-
-        ret = adis16201_spi_read_reg_16(indio_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(indio_dev, ADIS16201_MSC_CTRL, msc);
-
-error_ret:
-        return ret;
-}
-
-static int adis16201_check_status(struct iio_dev *indio_dev)
-{
-        u16 status;
-        int ret;
-
-        ret = adis16201_spi_read_reg_16(indio_dev,
-                                        ADIS16201_DIAG_STAT, &status);
-        if (ret < 0) {
-                dev_err(&indio_dev->dev, "Reading status failed\n");
-                goto error_ret;
-        }
-        ret = status & 0xF;
-        if (ret)
-                ret = -EFAULT;
-
-        if (status & ADIS16201_DIAG_STAT_SPI_FAIL)
-                dev_err(&indio_dev->dev, "SPI failure\n");
-        if (status & ADIS16201_DIAG_STAT_FLASH_UPT)
-                dev_err(&indio_dev->dev, "Flash update failed\n");
-        if (status & ADIS16201_DIAG_STAT_POWER_HIGH)
-                dev_err(&indio_dev->dev, "Power supply above 3.625V\n");
-        if (status & ADIS16201_DIAG_STAT_POWER_LOW)
-                dev_err(&indio_dev->dev, "Power supply below 3.15V\n");
-
-error_ret:
-        return ret;
-}
-
-static int adis16201_self_test(struct iio_dev *indio_dev)
-{
-        int ret;
-        ret = adis16201_spi_write_reg_16(indio_dev,
-                        ADIS16201_MSC_CTRL,
-                        ADIS16201_MSC_CTRL_SELF_TEST_EN);
-        if (ret) {
-                dev_err(&indio_dev->dev, "problem starting self test");
-                goto err_ret;
-        }
-
-        ret = adis16201_check_status(indio_dev);
-
-err_ret:
-        return ret;
-}
-
-static int adis16201_initial_setup(struct iio_dev *indio_dev)
-{
-        int ret;
-        struct device *dev = &indio_dev->dev;
-
-        /* Disable IRQ */
-        ret = adis16201_set_irq(indio_dev, false);
-        if (ret) {
-                dev_err(dev, "disable irq failed");
-                goto err_ret;
-        }
-
-        /* Do self test */
-        ret = adis16201_self_test(indio_dev);
-        if (ret) {
-                dev_err(dev, "self test failure");
-                goto err_ret;
-        }
-
-        /* Read status register to check the result */
-        ret = adis16201_check_status(indio_dev);
-        if (ret) {
-                adis16201_reset(indio_dev);
-                dev_err(dev, "device not playing ball -> reset");
-                msleep(ADIS16201_STARTUP_DELAY);
-                ret = adis16201_check_status(indio_dev);
-                if (ret) {
-                        dev_err(dev, "giving up");
-                        goto err_ret;
-                }
-        }
-
-err_ret:
-        return ret;
-}
-
-static u8 adis16201_addresses[7][2] = {
-        [in_supply] = { ADIS16201_SUPPLY_OUT, },
-        [temp] = { ADIS16201_TEMP_OUT },
-        [accel_x] = { ADIS16201_XACCL_OUT, ADIS16201_XACCL_OFFS },
-        [accel_y] = { ADIS16201_YACCL_OUT, ADIS16201_YACCL_OFFS },
-        [in_aux] = { ADIS16201_AUX_ADC },
-        [incli_x] = { ADIS16201_XINCL_OUT },
-        [incli_y] = { ADIS16201_YINCL_OUT },
+static const u8 adis16201_addresses[] = {
+        [ADIS16201_SCAN_ACC_X] = ADIS16201_XACCL_OFFS,
+        [ADIS16201_SCAN_ACC_Y] = ADIS16201_YACCL_OFFS,
+        [ADIS16201_SCAN_INCLI_X] = ADIS16201_XINCL_OFFS,
+        [ADIS16201_SCAN_INCLI_Y] = ADIS16201_YINCL_OFFS,
 };
 
 static int adis16201_read_raw(struct iio_dev *indio_dev,
@@ -277,6 +34,7 @@ static int adis16201_read_raw(struct iio_dev *indio_dev,
                               int *val, int *val2,
                               long mask)
 {
+        struct adis *st = iio_priv(indio_dev);
         int ret;
         int bits;
         u8 addr;
@@ -284,29 +42,8 @@ static int adis16201_read_raw(struct iio_dev *indio_dev,
 
         switch (mask) {
         case IIO_CHAN_INFO_RAW:
-                mutex_lock(&indio_dev->mlock);
-                addr = adis16201_addresses[chan->address][0];
-                ret = adis16201_spi_read_reg_16(indio_dev, addr, &val16);
-                if (ret) {
-                        mutex_unlock(&indio_dev->mlock);
-                        return ret;
-                }
-
-                if (val16 & ADIS16201_ERROR_ACTIVE) {
-                        ret = adis16201_check_status(indio_dev);
-                        if (ret) {
-                                mutex_unlock(&indio_dev->mlock);
-                                return ret;
-                        }
-                }
-                val16 = val16 & ((1 << chan->scan_type.realbits) - 1);
-                if (chan->scan_type.sign == 's')
-                        val16 = (s16)(val16 <<
-                                      (16 - chan->scan_type.realbits)) >>
-                                (16 - chan->scan_type.realbits);
-                *val = val16;
-                mutex_unlock(&indio_dev->mlock);
-                return IIO_VAL_INT;
+                return adis_single_conversion(indio_dev, chan,
+                                ADIS16201_ERROR_ACTIVE, val);
         case IIO_CHAN_INFO_SCALE:
                 switch (chan->type) {
                 case IIO_VOLTAGE:
@@ -347,10 +84,10 @@ static int adis16201_read_raw(struct iio_dev *indio_dev,
                         break;
                 default:
                         return -EINVAL;
-                };
+                }
                 mutex_lock(&indio_dev->mlock);
-                addr = adis16201_addresses[chan->address][1];
-                ret = adis16201_spi_read_reg_16(indio_dev, addr, &val16);
+                addr = adis16201_addresses[chan->scan_index];
+                ret = adis_read_reg_16(st, addr, &val16);
                 if (ret) {
                         mutex_unlock(&indio_dev->mlock);
                         return ret;
@@ -370,6 +107,7 @@ static int adis16201_write_raw(struct iio_dev *indio_dev,
                                int val2,
                                long mask)
 {
+        struct adis *st = iio_priv(indio_dev);
         int bits;
         s16 val16;
         u8 addr;
@@ -384,126 +122,63 @@ static int adis16201_write_raw(struct iio_dev *indio_dev,
                         break;
                 default:
                         return -EINVAL;
-                };
+                }
                 val16 = val & ((1 << bits) - 1);
-                addr = adis16201_addresses[chan->address][1];
-                return adis16201_spi_write_reg_16(indio_dev, addr, val16);
+                addr = adis16201_addresses[chan->scan_index];
+                return adis_write_reg_16(st, addr, val16);
         }
         return -EINVAL;
 }
 
 static const struct iio_chan_spec adis16201_channels[] = {
-        {
-                .type = IIO_VOLTAGE,
-                .indexed = 1,
-                .channel = 0,
-                .extend_name = "supply",
-                .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |
-                 IIO_CHAN_INFO_SCALE_SEPARATE_BIT,
-                .address = in_supply,
-                .scan_index = ADIS16201_SCAN_SUPPLY,
-                .scan_type = {
-                        .sign = 'u',
-                        .realbits = 12,
-                        .storagebits = 16,
-                },
-        }, {
-                .type = IIO_TEMP,
-                .indexed = 1,
-                .channel = 0,
-                .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |
-                 IIO_CHAN_INFO_SCALE_SEPARATE_BIT |
-                 IIO_CHAN_INFO_OFFSET_SEPARATE_BIT,
-                .address = temp,
-                .scan_index = ADIS16201_SCAN_TEMP,
-                .scan_type = {
-                        .sign = 'u',
-                        .realbits = 12,
-                        .storagebits = 16,
-                },
-        }, {
-                .type = IIO_ACCEL,
-                .modified = 1,
-                .channel2 = IIO_MOD_X,
-                .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |
-                 IIO_CHAN_INFO_SCALE_SHARED_BIT |
-                 IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT,
-                .address = accel_x,
-                .scan_index = ADIS16201_SCAN_ACC_X,
-                .scan_type = {
-                        .sign = 's',
-                        .realbits = 14,
-                        .storagebits = 16,
-                },
-        }, {
-                .type = IIO_ACCEL,
-                .modified = 1,
-                .channel2 = IIO_MOD_Y,
-                .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |
-                 IIO_CHAN_INFO_SCALE_SHARED_BIT |
-                 IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT,
-                .address = accel_y,
-                .scan_index = ADIS16201_SCAN_ACC_Y,
-                .scan_type = {
-                        .sign = 's',
-                        .realbits = 14,
-                        .storagebits = 16,
-                },
-        }, {
-                .type = IIO_VOLTAGE,
-                .indexed = 1,
-                .channel = 1,
-                .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |
-                 IIO_CHAN_INFO_SCALE_SEPARATE_BIT,
-                .address = in_aux,
-                .scan_index = ADIS16201_SCAN_AUX_ADC,
-                .scan_type = {
-                        .sign = 'u',
-                        .realbits = 12,
-                        .storagebits = 16,
-                },
-        }, {
-                .type = IIO_INCLI,
-                .modified = 1,
-                .channel2 = IIO_MOD_X,
-                .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |
-                 IIO_CHAN_INFO_SCALE_SHARED_BIT |
-                 IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT,
-                .address = incli_x,
-                .scan_index = ADIS16201_SCAN_INCLI_X,
-                .scan_type = {
-                        .sign = 's',
-                        .realbits = 14,
-                        .storagebits = 16,
-                },
-        }, {
-                .type = IIO_INCLI,
-                .modified = 1,
-                .channel2 = IIO_MOD_Y,
-                .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |
-                 IIO_CHAN_INFO_SCALE_SHARED_BIT |
-                 IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT,
-                .address = incli_y,
-                .scan_index = ADIS16201_SCAN_INCLI_Y,
-                .scan_type = {
-                        .sign = 's',
-                        .realbits = 14,
-                        .storagebits = 16,
-                },
-        },
+        ADIS_SUPPLY_CHAN(ADIS16201_SUPPLY_OUT, ADIS16201_SCAN_SUPPLY, 12),
+        ADIS_TEMP_CHAN(ADIS16201_TEMP_OUT, ADIS16201_SCAN_TEMP, 12),
+        ADIS_ACCEL_CHAN(X, ADIS16201_XACCL_OUT, ADIS16201_SCAN_ACC_X,
+                IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT, 14),
+        ADIS_ACCEL_CHAN(Y, ADIS16201_YACCL_OUT, ADIS16201_SCAN_ACC_Y,
+                IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT, 14),
+        ADIS_AUX_ADC_CHAN(ADIS16201_AUX_ADC, ADIS16201_SCAN_AUX_ADC, 12),
+        ADIS_INCLI_CHAN(X, ADIS16201_XINCL_OUT, ADIS16201_SCAN_INCLI_X,
+                IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT, 14),
+        ADIS_INCLI_CHAN(X, ADIS16201_YINCL_OUT, ADIS16201_SCAN_INCLI_Y,
+                IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT, 14),
         IIO_CHAN_SOFT_TIMESTAMP(7)
 };
 
 static const struct iio_info adis16201_info = {
         .read_raw = &adis16201_read_raw,
         .write_raw = &adis16201_write_raw,
+        .update_scan_mode = adis_update_scan_mode,
         .driver_module = THIS_MODULE,
 };
 
-static int __devinit adis16201_probe(struct spi_device *spi)
+static const char * const adis16201_status_error_msgs[] = {
+        [ADIS16201_DIAG_STAT_SPI_FAIL_BIT] = "SPI failure",
+        [ADIS16201_DIAG_STAT_FLASH_UPT_BIT] = "Flash update failed",
+        [ADIS16201_DIAG_STAT_POWER_HIGH_BIT] = "Power supply above 3.625V",
+        [ADIS16201_DIAG_STAT_POWER_LOW_BIT] = "Power supply below 3.15V",
+};
+
+static const struct adis_data adis16201_data = {
+        .read_delay = 20,
+        .msc_ctrl_reg = ADIS16201_MSC_CTRL,
+        .glob_cmd_reg = ADIS16201_GLOB_CMD,
+        .diag_stat_reg = ADIS16201_DIAG_STAT,
+
+        .self_test_mask = ADIS16201_MSC_CTRL_SELF_TEST_EN,
+        .startup_delay = ADIS16201_STARTUP_DELAY,
+
+        .status_error_msgs = adis16201_status_error_msgs,
+        .status_error_mask = BIT(ADIS16201_DIAG_STAT_SPI_FAIL_BIT) |
+                BIT(ADIS16201_DIAG_STAT_FLASH_UPT_BIT) |
+                BIT(ADIS16201_DIAG_STAT_POWER_HIGH_BIT) |
+                BIT(ADIS16201_DIAG_STAT_POWER_LOW_BIT),
+};
+
+static int adis16201_probe(struct spi_device *spi)
 {
         int ret;
-        struct adis16201_state *st;
+        struct adis *st;
         struct iio_dev *indio_dev;
 
         /* setup the industrialio driver allocated elements */
@@ -516,9 +191,6 @@ static int __devinit adis16201_probe(struct spi_device *spi)
         /* this is only used for removal purposes */
         spi_set_drvdata(spi, indio_dev);
 
-        st->us = spi;
-        mutex_init(&st->buf_lock);
-
         indio_dev->name = spi->dev.driver->name;
         indio_dev->dev.parent = &spi->dev;
         indio_dev->info = &adis16201_info;
@@ -527,54 +199,38 @@ static int __devinit adis16201_probe(struct spi_device *spi)
         indio_dev->num_channels = ARRAY_SIZE(adis16201_channels);
         indio_dev->modes = INDIO_DIRECT_MODE;
 
-        ret = adis16201_configure_ring(indio_dev);
+        ret = adis_init(st, indio_dev, spi, &adis16201_data);
+        if (ret)
+                goto error_free_dev;
+        ret = adis_setup_buffer_and_trigger(st, indio_dev, NULL);
         if (ret)
                 goto error_free_dev;
-
-        ret = iio_buffer_register(indio_dev,
-                                  adis16201_channels,
-                                  ARRAY_SIZE(adis16201_channels));
-        if (ret) {
-                printk(KERN_ERR "failed to initialize the ring\n");
-                goto error_unreg_ring_funcs;
-        }
-
-        if (spi->irq) {
-                ret = adis16201_probe_trigger(indio_dev);
-                if (ret)
-                        goto error_uninitialize_ring;
-        }
 
         /* Get the device into a sane initial state */
-        ret = adis16201_initial_setup(indio_dev);
+        ret = adis_initial_startup(st);
         if (ret)
-                goto error_remove_trigger;
+                goto error_cleanup_buffer_trigger;
 
         ret = iio_device_register(indio_dev);
         if (ret < 0)
-                goto error_remove_trigger;
+                goto error_cleanup_buffer_trigger;
         return 0;
 
-error_remove_trigger:
-        adis16201_remove_trigger(indio_dev);
-error_uninitialize_ring:
-        iio_buffer_unregister(indio_dev);
-error_unreg_ring_funcs:
-        adis16201_unconfigure_ring(indio_dev);
+error_cleanup_buffer_trigger:
+        adis_cleanup_buffer_and_trigger(st, indio_dev);
 error_free_dev:
         iio_device_free(indio_dev);
 error_ret:
         return ret;
 }
 
-static int __devexit adis16201_remove(struct spi_device *spi)
+static int adis16201_remove(struct spi_device *spi)
 {
         struct iio_dev *indio_dev = spi_get_drvdata(spi);
+        struct adis *st = iio_priv(indio_dev);
 
         iio_device_unregister(indio_dev);
-        adis16201_remove_trigger(indio_dev);
-        iio_buffer_unregister(indio_dev);
-        adis16201_unconfigure_ring(indio_dev);
+        adis_cleanup_buffer_and_trigger(st, indio_dev);
         iio_device_free(indio_dev);
 
         return 0;
@@ -586,7 +242,7 @@ static struct spi_driver adis16201_driver = {
                 .owner = THIS_MODULE,
         },
         .probe = adis16201_probe,
-        .remove = __devexit_p(adis16201_remove),
+        .remove = adis16201_remove,
 };
 module_spi_driver(adis16201_driver);
 
diff --git a/drivers/staging/iio/accel/adis16201_ring.c b/drivers/staging/iio/accel/adis16201_ring.c
deleted file mode 100644
index 97c09f0c26ae..000000000000
--- a/drivers/staging/iio/accel/adis16201_ring.c
+++ /dev/null
@@ -1,136 +0,0 @@
-#include <linux/export.h>
-#include <linux/interrupt.h>
-#include <linux/mutex.h>
-#include <linux/kernel.h>
-#include <linux/spi/spi.h>
-#include <linux/slab.h>
-
-#include <linux/iio/iio.h>
-#include "../ring_sw.h"
-#include <linux/iio/trigger_consumer.h>
-#include "adis16201.h"
-
-
-/**
- * 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 iio_dev *indio_dev, u8 *rx)
-{
-        struct spi_message msg;
-        struct adis16201_state *st = iio_priv(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;
-                if (i < ADIS16201_OUTPUTS) {
-                        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 irqreturn_t adis16201_trigger_handler(int irq, void *p)
-{
-        struct iio_poll_func *pf = p;
-        struct iio_dev *indio_dev = pf->indio_dev;
-        struct adis16201_state *st = iio_priv(indio_dev);
-
-        int i = 0;
-        s16 *data;
-
-        data = kmalloc(indio_dev->scan_bytes, GFP_KERNEL);
-        if (data == NULL) {
-                dev_err(&st->us->dev, "memory alloc failed in ring bh");
-                goto done;
-        }
-
-        if (!bitmap_empty(indio_dev->active_scan_mask, indio_dev->masklength)
-            && adis16201_read_ring_data(indio_dev, st->rx) >= 0)
-                for (; i < bitmap_weight(indio_dev->active_scan_mask,
-                                         indio_dev->masklength); i++)
-                        data[i] = be16_to_cpup((__be16 *)&(st->rx[i*2]));
-
-        /* Guaranteed to be aligned with 8 byte boundary */
-        if (indio_dev->scan_timestamp)
-                *((s64 *)(data + ((i + 3)/4)*4)) = pf->timestamp;
-
-        iio_push_to_buffer(indio_dev->buffer, (u8 *)data);
-
-        kfree(data);
-done:
-        iio_trigger_notify_done(indio_dev->trig);
-
-        return IRQ_HANDLED;
-}
-
-void adis16201_unconfigure_ring(struct iio_dev *indio_dev)
-{
-        iio_dealloc_pollfunc(indio_dev->pollfunc);
-        iio_sw_rb_free(indio_dev->buffer);
-}
-
-static const struct iio_buffer_setup_ops adis16201_ring_setup_ops = {
-        .preenable = &iio_sw_buffer_preenable,
-        .postenable = &iio_triggered_buffer_postenable,
-        .predisable = &iio_triggered_buffer_predisable,
-};
-
-int adis16201_configure_ring(struct iio_dev *indio_dev)
-{
-        int ret = 0;
-        struct iio_buffer *ring;
-
-        ring = iio_sw_rb_allocate(indio_dev);
-        if (!ring) {
-                ret = -ENOMEM;
-                return ret;
-        }
-        indio_dev->buffer = ring;
-        ring->scan_timestamp = true;
-        indio_dev->setup_ops = &adis16201_ring_setup_ops;
-
-        indio_dev->pollfunc = iio_alloc_pollfunc(&iio_pollfunc_store_time,
-                                                 &adis16201_trigger_handler,
-                                                 IRQF_ONESHOT,
-                                                 indio_dev,
-                                                 "adis16201_consumer%d",
-                                                 indio_dev->id);
-        if (indio_dev->pollfunc == NULL) {
-                ret = -ENOMEM;
-                goto error_iio_sw_rb_free;
-        }
-
-        indio_dev->modes |= INDIO_BUFFER_TRIGGERED;
-        return 0;
-error_iio_sw_rb_free:
-        iio_sw_rb_free(indio_dev->buffer);
-        return ret;
-}
diff --git a/drivers/staging/iio/accel/adis16201_trigger.c b/drivers/staging/iio/accel/adis16201_trigger.c
deleted file mode 100644
index 96fdabbac201..000000000000
--- a/drivers/staging/iio/accel/adis16201_trigger.c
+++ /dev/null
@@ -1,71 +0,0 @@
-#include <linux/interrupt.h>
-#include <linux/kernel.h>
-#include <linux/spi/spi.h>
-#include <linux/export.h>
-
-#include <linux/iio/iio.h>
-#include <linux/iio/trigger.h>
-#include "adis16201.h"
-
-/**
- * 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 iio_dev *indio_dev = trig->private_data;
-
-        dev_dbg(&indio_dev->dev, "%s (%d)\n", __func__, state);
-        return adis16201_set_irq(indio_dev, state);
-}
-
-static const struct iio_trigger_ops adis16201_trigger_ops = {
-        .owner = THIS_MODULE,
-        .set_trigger_state = &adis16201_data_rdy_trigger_set_state,
-};
-
-int adis16201_probe_trigger(struct iio_dev *indio_dev)
-{
-        int ret;
-        struct adis16201_state *st = iio_priv(indio_dev);
-
-        st->trig = iio_trigger_alloc("adis16201-dev%d", indio_dev->id);
-        if (st->trig == NULL) {
-                ret = -ENOMEM;
-                goto error_ret;
-        }
-        ret = request_irq(st->us->irq,
-                          &iio_trigger_generic_data_rdy_poll,
-                          IRQF_TRIGGER_RISING,
-                          "adis16201",
-                          st->trig);
-        if (ret)
-                goto error_free_trig;
-        st->trig->dev.parent = &st->us->dev;
-        st->trig->ops = &adis16201_trigger_ops;
-        st->trig->private_data = indio_dev;
-        ret = iio_trigger_register(st->trig);
-
-        /* select default trigger */
-        indio_dev->trig = st->trig;
-        if (ret)
-                goto error_free_irq;
-
-        return 0;
-
-error_free_irq:
-        free_irq(st->us->irq, st->trig);
-error_free_trig:
-        iio_trigger_free(st->trig);
-error_ret:
-        return ret;
-}
-
-void adis16201_remove_trigger(struct iio_dev *indio_dev)
-{
-        struct adis16201_state *state = iio_priv(indio_dev);
-
-        iio_trigger_unregister(state->trig);
-        free_irq(state->us->irq, state->trig);
-        iio_trigger_free(state->trig);
-}
diff --git a/drivers/staging/iio/accel/adis16203.h b/drivers/staging/iio/accel/adis16203.h
index 3f96ad3bbd66..acc688d7ea9e 100644
--- a/drivers/staging/iio/accel/adis16203.h
+++ b/drivers/staging/iio/accel/adis16203.h
@@ -3,9 +3,6 @@
 
 #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 */
@@ -27,8 +24,6 @@
 #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 */
@@ -40,86 +35,25 @@
 /* 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 */
+#define ADIS16203_DIAG_STAT_SELFTEST_FAIL_BIT 5 /* Self-test diagnostic error flag */
+#define ADIS16203_DIAG_STAT_SPI_FAIL_BIT      3 /* SPI communications failure */
+#define ADIS16203_DIAG_STAT_FLASH_UPT_BIT     2 /* Flash update failure */
+#define ADIS16203_DIAG_STAT_POWER_HIGH_BIT    1 /* Power supply above 3.625 V */
+#define ADIS16203_DIAG_STAT_POWER_LOW_BIT     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
- * @trig:               data ready trigger registered with iio
- * @tx:                 transmit buffer
- * @rx:                 receive buffer
- * @buf_lock:           mutex to protect tx and rx
- **/
-struct adis16203_state {
-        struct spi_device       *us;
-        struct iio_trigger      *trig;
-        struct mutex            buf_lock;
-        u8                      tx[ADIS16203_MAX_TX] ____cacheline_aligned;
-        u8                      rx[ADIS16203_MAX_RX];
-};
-
-int adis16203_set_irq(struct iio_dev *indio_dev, bool enable);
-
 enum adis16203_scan {
+        ADIS16203_SCAN_INCLI_X,
+        ADIS16203_SCAN_INCLI_Y,
         ADIS16203_SCAN_SUPPLY,
         ADIS16203_SCAN_AUX_ADC,
         ADIS16203_SCAN_TEMP,
-        ADIS16203_SCAN_INCLI_X,
-        ADIS16203_SCAN_INCLI_Y,
 };
 
-#ifdef CONFIG_IIO_BUFFER
-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);
-
-#else /* CONFIG_IIO_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)
-{
-}
-
-#endif /* CONFIG_IIO_BUFFER */
 #endif /* SPI_ADIS16203_H_ */
diff --git a/drivers/staging/iio/accel/adis16203_core.c b/drivers/staging/iio/accel/adis16203_core.c
index e7b3441115ae..8c235273ff13 100644
--- a/drivers/staging/iio/accel/adis16203_core.c
+++ b/drivers/staging/iio/accel/adis16203_core.c
@@ -1,7 +1,7 @@
 /*
  * ADIS16203 Programmable Digital Vibration Sensor driver
  *
- * Copyright 2010 Analog Devices Inc.
+ * Copyright 2030 Analog Devices Inc.
  *
  * Licensed under the GPL-2 or later.
  */
@@ -18,254 +18,14 @@
 #include <linux/iio/iio.h>
 #include <linux/iio/sysfs.h>
 #include <linux/iio/buffer.h>
+#include <linux/iio/imu/adis.h>
 
 #include "adis16203.h"
 
 #define DRIVER_NAME             "adis16203"
 
-/**
- * adis16203_spi_write_reg_8() - write single byte to a register
- * @indio_dev: iio device associated with child of actual device
- * @reg_address: the address of the register to be written
- * @val: the value to write
- **/
-static int adis16203_spi_write_reg_8(struct iio_dev *indio_dev,
-                                     u8 reg_address,
-                                     u8 val)
-{
-        int ret;
-        struct adis16203_state *st = iio_priv(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
- * @indio_dev: iio device associated with child of actual device
- * @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 iio_dev *indio_dev,
-                                      u8 lower_reg_address,
-                                      u16 value)
-{
-        int ret;
-        struct spi_message msg;
-        struct adis16203_state *st = iio_priv(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,
-                },
-        };
-
-        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
- * @indio_dev: iio device associated with child of actual device
- * @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 iio_dev *indio_dev,
-                u8 lower_reg_address,
-                u16 *val)
-{
-        struct spi_message msg;
-        struct adis16203_state *st = iio_priv(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,
-                        .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 int adis16203_check_status(struct iio_dev *indio_dev)
-{
-        u16 status;
-        int ret;
-
-        ret = adis16203_spi_read_reg_16(indio_dev,
-                                        ADIS16203_DIAG_STAT,
-                                        &status);
-        if (ret < 0) {
-                dev_err(&indio_dev->dev, "Reading status failed\n");
-                goto error_ret;
-        }
-        ret = status & 0x1F;
-
-        if (status & ADIS16203_DIAG_STAT_SELFTEST_FAIL)
-                dev_err(&indio_dev->dev, "Self test failure\n");
-        if (status & ADIS16203_DIAG_STAT_SPI_FAIL)
-                dev_err(&indio_dev->dev, "SPI failure\n");
-        if (status & ADIS16203_DIAG_STAT_FLASH_UPT)
-                dev_err(&indio_dev->dev, "Flash update failed\n");
-        if (status & ADIS16203_DIAG_STAT_POWER_HIGH)
-                dev_err(&indio_dev->dev, "Power supply above 3.625V\n");
-        if (status & ADIS16203_DIAG_STAT_POWER_LOW)
-                dev_err(&indio_dev->dev, "Power supply below 3.15V\n");
-
-error_ret:
-        return ret;
-}
-
-static int adis16203_reset(struct iio_dev *indio_dev)
-{
-        int ret;
-        ret = adis16203_spi_write_reg_8(indio_dev,
-                        ADIS16203_GLOB_CMD,
-                        ADIS16203_GLOB_CMD_SW_RESET);
-        if (ret)
-                dev_err(&indio_dev->dev, "problem resetting device");
-
-        return ret;
-}
-
-int adis16203_set_irq(struct iio_dev *indio_dev, bool enable)
-{
-        int ret = 0;
-        u16 msc;
-
-        ret = adis16203_spi_read_reg_16(indio_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(indio_dev, ADIS16203_MSC_CTRL, msc);
-
-error_ret:
-        return ret;
-}
-
-static int adis16203_self_test(struct iio_dev *indio_dev)
-{
-        int ret;
-        ret = adis16203_spi_write_reg_16(indio_dev,
-                        ADIS16203_MSC_CTRL,
-                        ADIS16203_MSC_CTRL_SELF_TEST_EN);
-        if (ret) {
-                dev_err(&indio_dev->dev, "problem starting self test");
-                goto err_ret;
-        }
-
-        adis16203_check_status(indio_dev);
-
-err_ret:
-        return ret;
-}
-
-static int adis16203_initial_setup(struct iio_dev *indio_dev)
-{
-        int ret;
-
-        /* Disable IRQ */
-        ret = adis16203_set_irq(indio_dev, false);
-        if (ret) {
-                dev_err(&indio_dev->dev, "disable irq failed");
-                goto err_ret;
-        }
-
-        /* Do self test */
-        ret = adis16203_self_test(indio_dev);
-        if (ret) {
-                dev_err(&indio_dev->dev, "self test failure");
-                goto err_ret;
-        }
-
-        /* Read status register to check the result */
-        ret = adis16203_check_status(indio_dev);
-        if (ret) {
-                adis16203_reset(indio_dev);
-                dev_err(&indio_dev->dev, "device not playing ball -> reset");
-                msleep(ADIS16203_STARTUP_DELAY);
-                ret = adis16203_check_status(indio_dev);
-                if (ret) {
-                        dev_err(&indio_dev->dev, "giving up");
-                        goto err_ret;
-                }
-        }
-
-err_ret:
-        return ret;
-}
-
-enum adis16203_chan {
-        in_supply,
-        in_aux,
-        incli_x,
-        incli_y,
-        temp,
-};
-
-static u8 adis16203_addresses[5][2] = {
-        [in_supply] = { ADIS16203_SUPPLY_OUT },
-        [in_aux] = { ADIS16203_AUX_ADC },
-        [incli_x] = { ADIS16203_XINCL_OUT, ADIS16203_INCL_NULL},
-        [incli_y] = { ADIS16203_YINCL_OUT },
-        [temp] = { ADIS16203_TEMP_OUT }
+static const u8 adis16203_addresses[] = {
+        [ADIS16203_SCAN_INCLI_X] = ADIS16203_INCL_NULL,
 };
 
 static int adis16203_write_raw(struct iio_dev *indio_dev,
@@ -274,9 +34,10 @@ static int adis16203_write_raw(struct iio_dev *indio_dev,
                                int val2,
                                long mask)
 {
+        struct adis *st = iio_priv(indio_dev);
         /* currently only one writable parameter which keeps this simple */
-        u8 addr = adis16203_addresses[chan->address][1];
-        return adis16203_spi_write_reg_16(indio_dev, addr, val & 0x3FFF);
+        u8 addr = adis16203_addresses[chan->scan_index];
+        return adis_write_reg_16(st, addr, val & 0x3FFF);
 }
 
 static int adis16203_read_raw(struct iio_dev *indio_dev,
@@ -284,35 +45,15 @@ static int adis16203_read_raw(struct iio_dev *indio_dev,
                               int *val, int *val2,
                               long mask)
 {
+        struct adis *st = iio_priv(indio_dev);
         int ret;
         int bits;
         u8 addr;
         s16 val16;
         switch (mask) {
         case IIO_CHAN_INFO_RAW:
-                mutex_lock(&indio_dev->mlock);
-                addr = adis16203_addresses[chan->address][0];
-                ret = adis16203_spi_read_reg_16(indio_dev, addr, &val16);
-                if (ret) {
-                        mutex_unlock(&indio_dev->mlock);
-                        return ret;
-                }
-
-                if (val16 & ADIS16203_ERROR_ACTIVE) {
-                        ret = adis16203_check_status(indio_dev);
-                        if (ret) {
-                                mutex_unlock(&indio_dev->mlock);
-                                return ret;
-                        }
-                }
-                val16 = val16 & ((1 << chan->scan_type.realbits) - 1);
-                if (chan->scan_type.sign == 's')
-                        val16 = (s16)(val16 <<
-                                      (16 - chan->scan_type.realbits)) >>
-                                (16 - chan->scan_type.realbits);
-                *val = val16;
-                mutex_unlock(&indio_dev->mlock);
-                return IIO_VAL_INT;
+                return adis_single_conversion(indio_dev, chan,
+                                ADIS16203_ERROR_ACTIVE, val);
         case IIO_CHAN_INFO_SCALE:
                 switch (chan->type) {
                 case IIO_VOLTAGE:
@@ -341,8 +82,8 @@ static int adis16203_read_raw(struct iio_dev *indio_dev,
         case IIO_CHAN_INFO_CALIBBIAS:
                 bits = 14;
                 mutex_lock(&indio_dev->mlock);
-                addr = adis16203_addresses[chan->address][1];
-                ret = adis16203_spi_read_reg_16(indio_dev, addr, &val16);
+                addr = adis16203_addresses[chan->scan_index];
+                ret = adis_read_reg_16(st, addr, &val16);
                 if (ret) {
                         mutex_unlock(&indio_dev->mlock);
                         return ret;
@@ -358,89 +99,53 @@ static int adis16203_read_raw(struct iio_dev *indio_dev,
 }
 
 static const struct iio_chan_spec adis16203_channels[] = {
-        {
-                .type = IIO_VOLTAGE,
-                .indexed = 1,
-                .channel = 0,
-                .extend_name = "supply",
-                .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |
-                IIO_CHAN_INFO_SCALE_SEPARATE_BIT,
-                .address = in_supply,
-                .scan_index = ADIS16203_SCAN_SUPPLY,
-                .scan_type = {
-                        .sign = 'u',
-                        .realbits = 12,
-                        .storagebits = 16,
-                },
-        }, {
-                .type = IIO_VOLTAGE,
-                .indexed = 1,
-                .channel = 1,
-                .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |
-                IIO_CHAN_INFO_SCALE_SEPARATE_BIT,
-                .address = in_aux,
-                .scan_index = ADIS16203_SCAN_AUX_ADC,
-                .scan_type = {
-                        .sign = 'u',
-                        .realbits = 12,
-                        .storagebits = 16,
-                },
-        }, {
-                .type = IIO_INCLI,
-                .modified = 1,
-                .channel2 = IIO_MOD_X,
-                .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |
-                IIO_CHAN_INFO_SCALE_SHARED_BIT |
-                IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT,
-                .address = incli_x,
-                .scan_index = ADIS16203_SCAN_INCLI_X,
-                .scan_type = {
-                        .sign = 's',
-                        .realbits = 14,
-                        .storagebits = 16,
-                },
-        }, { /* Fixme: Not what it appears to be - see data sheet */
-                .type = IIO_INCLI,
-                .modified = 1,
-                .channel2 = IIO_MOD_Y,
-                .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |
-                IIO_CHAN_INFO_SCALE_SHARED_BIT,
-                .address = incli_y,
-                .scan_index = ADIS16203_SCAN_INCLI_Y,
-                .scan_type = {
-                        .sign = 's',
-                        .realbits = 14,
-                        .storagebits = 16,
-                },
-        }, {
-                .type = IIO_TEMP,
-                .indexed = 1,
-                .channel = 0,
-                .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |
-                IIO_CHAN_INFO_SCALE_SEPARATE_BIT |
-                IIO_CHAN_INFO_OFFSET_SEPARATE_BIT,
-                .address = temp,
-                .scan_index = ADIS16203_SCAN_TEMP,
-                .scan_type = {
-                        .sign = 'u',
-                        .realbits = 12,
-                        .storagebits = 16,
-                },
-        },
+        ADIS_SUPPLY_CHAN(ADIS16203_SUPPLY_OUT, ADIS16203_SCAN_SUPPLY, 12),
+        ADIS_AUX_ADC_CHAN(ADIS16203_AUX_ADC, ADIS16203_SCAN_AUX_ADC, 12),
+        ADIS_INCLI_CHAN(X, ADIS16203_XINCL_OUT, ADIS16203_SCAN_INCLI_X,
+                IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT, 14),
+        /* Fixme: Not what it appears to be - see data sheet */
+        ADIS_INCLI_CHAN(Y, ADIS16203_YINCL_OUT, ADIS16203_SCAN_INCLI_Y, 0, 14),
+        ADIS_TEMP_CHAN(ADIS16203_TEMP_OUT, ADIS16203_SCAN_TEMP, 12),
         IIO_CHAN_SOFT_TIMESTAMP(5),
 };
 
 static const struct iio_info adis16203_info = {
         .read_raw = &adis16203_read_raw,
         .write_raw = &adis16203_write_raw,
+        .update_scan_mode = adis_update_scan_mode,
         .driver_module = THIS_MODULE,
 };
 
-static int __devinit adis16203_probe(struct spi_device *spi)
+static const char * const adis16203_status_error_msgs[] = {
+        [ADIS16203_DIAG_STAT_SELFTEST_FAIL_BIT] = "Self test failure",
+        [ADIS16203_DIAG_STAT_SPI_FAIL_BIT] = "SPI failure",
+        [ADIS16203_DIAG_STAT_FLASH_UPT_BIT] = "Flash update failed",
+        [ADIS16203_DIAG_STAT_POWER_HIGH_BIT] = "Power supply above 3.625V",
+        [ADIS16203_DIAG_STAT_POWER_LOW_BIT] = "Power supply below 3.15V",
+};
+
+static const struct adis_data adis16203_data = {
+        .read_delay = 20,
+        .msc_ctrl_reg = ADIS16203_MSC_CTRL,
+        .glob_cmd_reg = ADIS16203_GLOB_CMD,
+        .diag_stat_reg = ADIS16203_DIAG_STAT,
+
+        .self_test_mask = ADIS16203_MSC_CTRL_SELF_TEST_EN,
+        .startup_delay = ADIS16203_STARTUP_DELAY,
+
+        .status_error_msgs = adis16203_status_error_msgs,
+        .status_error_mask = BIT(ADIS16203_DIAG_STAT_SELFTEST_FAIL_BIT) |
+                BIT(ADIS16203_DIAG_STAT_SPI_FAIL_BIT) |
+                BIT(ADIS16203_DIAG_STAT_FLASH_UPT_BIT) |
+                BIT(ADIS16203_DIAG_STAT_POWER_HIGH_BIT) |
+                BIT(ADIS16203_DIAG_STAT_POWER_LOW_BIT),
+};
+
+static int adis16203_probe(struct spi_device *spi)
 {
         int ret;
         struct iio_dev *indio_dev;
-        struct adis16203_state *st;
+        struct adis *st;
 
         /* setup the industrialio driver allocated elements */
         indio_dev = iio_device_alloc(sizeof(*st));
@@ -451,8 +156,6 @@ static int __devinit adis16203_probe(struct spi_device *spi)
         st = iio_priv(indio_dev);
         /* this is only used for removal purposes */
         spi_set_drvdata(spi, indio_dev);
-        st->us = spi;
-        mutex_init(&st->buf_lock);
 
         indio_dev->name = spi->dev.driver->name;
         indio_dev->dev.parent = &spi->dev;
@@ -461,55 +164,40 @@ static int __devinit adis16203_probe(struct spi_device *spi)
         indio_dev->info = &adis16203_info;
         indio_dev->modes = INDIO_DIRECT_MODE;
 
-        ret = adis16203_configure_ring(indio_dev);
+        ret = adis_init(st, indio_dev, spi, &adis16203_data);
         if (ret)
                 goto error_free_dev;
 
-        ret = iio_buffer_register(indio_dev,
-                                  adis16203_channels,
-                                  ARRAY_SIZE(adis16203_channels));
-        if (ret) {
-                printk(KERN_ERR "failed to initialize the ring\n");
-                goto error_unreg_ring_funcs;
-        }
-
-        if (spi->irq) {
-                ret = adis16203_probe_trigger(indio_dev);
-                if (ret)
-                        goto error_uninitialize_ring;
-        }
+        ret = adis_setup_buffer_and_trigger(st, indio_dev, NULL);
+        if (ret)
+                goto error_free_dev;
 
         /* Get the device into a sane initial state */
-        ret = adis16203_initial_setup(indio_dev);
+        ret = adis_initial_startup(st);
         if (ret)
-                goto error_remove_trigger;
+                goto error_cleanup_buffer_trigger;
 
         ret = iio_device_register(indio_dev);
         if (ret)
-                goto error_remove_trigger;
+                goto error_cleanup_buffer_trigger;
 
         return 0;
 
-error_remove_trigger:
-        adis16203_remove_trigger(indio_dev);
-error_uninitialize_ring:
-        iio_buffer_unregister(indio_dev);
-error_unreg_ring_funcs:
-        adis16203_unconfigure_ring(indio_dev);
+error_cleanup_buffer_trigger:
+        adis_cleanup_buffer_and_trigger(st, indio_dev);
 error_free_dev:
         iio_device_free(indio_dev);
 error_ret:
         return ret;
 }
 
-static int __devexit adis16203_remove(struct spi_device *spi)
+static int adis16203_remove(struct spi_device *spi)
 {
         struct iio_dev *indio_dev = spi_get_drvdata(spi);
+        struct adis *st = iio_priv(indio_dev);
 
         iio_device_unregister(indio_dev);
-        adis16203_remove_trigger(indio_dev);
-        iio_buffer_unregister(indio_dev);
-        adis16203_unconfigure_ring(indio_dev);
+        adis_cleanup_buffer_and_trigger(st, indio_dev);
         iio_device_free(indio_dev);
 
         return 0;
@@ -521,7 +209,7 @@ static struct spi_driver adis16203_driver = {
                 .owner = THIS_MODULE,
         },
         .probe = adis16203_probe,
-        .remove = __devexit_p(adis16203_remove),
+        .remove = adis16203_remove,
 };
 module_spi_driver(adis16203_driver);
 
diff --git a/drivers/staging/iio/accel/adis16203_ring.c b/drivers/staging/iio/accel/adis16203_ring.c
deleted file mode 100644
index 7507e1a04591..000000000000
--- a/drivers/staging/iio/accel/adis16203_ring.c
+++ /dev/null
@@ -1,136 +0,0 @@
-#include <linux/export.h>
-#include <linux/interrupt.h>
-#include <linux/mutex.h>
-#include <linux/kernel.h>
-#include <linux/spi/spi.h>
-#include <linux/slab.h>
-
-#include <linux/iio/iio.h>
-#include "../ring_sw.h"
-#include <linux/iio/trigger_consumer.h>
-#include "adis16203.h"
-
-/**
- * adis16203_read_ring_data() read data registers which will be placed into ring
- * @indio_dev: the IIO device
- * @rx: somewhere to pass back the value read
- **/
-static int adis16203_read_ring_data(struct iio_dev *indio_dev, u8 *rx)
-{
-        struct spi_message msg;
-        struct adis16203_state *st = iio_priv(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 irqreturn_t adis16203_trigger_handler(int irq, void *p)
-{
-        struct iio_poll_func *pf = p;
-        struct iio_dev *indio_dev = pf->indio_dev;
-        struct adis16203_state *st = iio_priv(indio_dev);
-
-        int i = 0;
-        s16 *data;
-
-        data = kmalloc(indio_dev->scan_bytes, GFP_KERNEL);
-        if (data == NULL) {
-                dev_err(&st->us->dev, "memory alloc failed in ring bh");
-                goto done;
-        }
-
-        if (!bitmap_empty(indio_dev->active_scan_mask, indio_dev->masklength) &&
-            adis16203_read_ring_data(indio_dev, st->rx) >= 0)
-                for (; i < bitmap_weight(indio_dev->active_scan_mask,
-                                         indio_dev->masklength); i++)
-                        data[i] = be16_to_cpup((__be16 *)&(st->rx[i*2]));
-
-        /* Guaranteed to be aligned with 8 byte boundary */
-        if (indio_dev->scan_timestamp)
-                *((s64 *)(data + ((i + 3)/4)*4)) = pf->timestamp;
-
-        iio_push_to_buffer(indio_dev->buffer, (u8 *)data);
-
-        kfree(data);
-done:
-        iio_trigger_notify_done(indio_dev->trig);
-
-        return IRQ_HANDLED;
-}
-
-void adis16203_unconfigure_ring(struct iio_dev *indio_dev)
-{
-        iio_dealloc_pollfunc(indio_dev->pollfunc);
-        iio_sw_rb_free(indio_dev->buffer);
-}
-
-static const struct iio_buffer_setup_ops adis16203_ring_setup_ops = {
-        .preenable = &iio_sw_buffer_preenable,
-        .postenable = &iio_triggered_buffer_postenable,
-        .predisable = &iio_triggered_buffer_predisable,
-};
-
-int adis16203_configure_ring(struct iio_dev *indio_dev)
-{
-        int ret = 0;
-        struct iio_buffer *ring;
-
-        ring = iio_sw_rb_allocate(indio_dev);
-        if (!ring) {
-                ret = -ENOMEM;
-                return ret;
-        }
-        indio_dev->buffer = ring;
-        ring->scan_timestamp = true;
-        indio_dev->setup_ops = &adis16203_ring_setup_ops;
-
-        indio_dev->pollfunc = iio_alloc_pollfunc(&iio_pollfunc_store_time,
-                                                 &adis16203_trigger_handler,
-                                                 IRQF_ONESHOT,
-                                                 indio_dev,
-                                                 "adis16203_consumer%d",
-                                                 indio_dev->id);
-        if (indio_dev->pollfunc == NULL) {
-                ret = -ENOMEM;
-                goto error_iio_sw_rb_free;
-        }
-
-        indio_dev->modes |= INDIO_BUFFER_TRIGGERED;
-        return 0;
-
-error_iio_sw_rb_free:
-        iio_sw_rb_free(indio_dev->buffer);
-        return ret;
-}
diff --git a/drivers/staging/iio/accel/adis16203_trigger.c b/drivers/staging/iio/accel/adis16203_trigger.c
deleted file mode 100644
index b8a04073d6d7..000000000000
--- a/drivers/staging/iio/accel/adis16203_trigger.c
+++ /dev/null
@@ -1,73 +0,0 @@
-#include <linux/interrupt.h>
-#include <linux/kernel.h>
-#include <linux/spi/spi.h>
-#include <linux/export.h>
-
-#include <linux/iio/iio.h>
-#include <linux/iio/trigger.h>
-#include "adis16203.h"
-
-/**
- * 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 iio_dev *indio_dev = trig->private_data;
-
-        dev_dbg(&indio_dev->dev, "%s (%d)\n", __func__, state);
-        return adis16203_set_irq(indio_dev, state);
-}
-
-static const struct iio_trigger_ops adis16203_trigger_ops = {
-        .owner = THIS_MODULE,
-        .set_trigger_state = &adis16203_data_rdy_trigger_set_state,
-};
-
-int adis16203_probe_trigger(struct iio_dev *indio_dev)
-{
-        int ret;
-        struct adis16203_state *st = iio_priv(indio_dev);
-
-        st->trig = iio_trigger_alloc("adis16203-dev%d", indio_dev->id);
-        if (st->trig == NULL) {
-                ret = -ENOMEM;
-                goto error_ret;
-        }
-
-        ret = request_irq(st->us->irq,
-                          &iio_trigger_generic_data_rdy_poll,
-                          IRQF_TRIGGER_RISING,
-                          "adis16203",
-                          st->trig);
-        if (ret)
-                goto error_free_trig;
-
-        st->trig->dev.parent = &st->us->dev;
-        st->trig->ops = &adis16203_trigger_ops;
-        st->trig->private_data = indio_dev;
-        ret = iio_trigger_register(st->trig);
-
-        /* select default trigger */
-        indio_dev->trig = st->trig;
-        if (ret)
-                goto error_free_irq;
-
-        return 0;
-
-error_free_irq:
-        free_irq(st->us->irq, st->trig);
-error_free_trig:
-        iio_trigger_free(st->trig);
-error_ret:
-        return ret;
-}
-
-void adis16203_remove_trigger(struct iio_dev *indio_dev)
-{
-        struct adis16203_state *st = iio_priv(indio_dev);
-
-        iio_trigger_unregister(st->trig);
-        free_irq(st->us->irq, st->trig);
-        iio_trigger_free(st->trig);
-}
diff --git a/drivers/staging/iio/accel/adis16204.h b/drivers/staging/iio/accel/adis16204.h
index 7cf4e91f83ad..9ff950c1e8db 100644
--- a/drivers/staging/iio/accel/adis16204.h
+++ b/drivers/staging/iio/accel/adis16204.h
@@ -3,9 +3,6 @@
 
 #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 */
@@ -35,8 +32,6 @@
 #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 */
@@ -47,87 +42,27 @@
 /* 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,
+#define ADIS16204_DIAG_STAT_SELFTEST_FAIL_BIT 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 */
+#define ADIS16204_DIAG_STAT_SPI_FAIL_BIT      3 /* SPI communications failure */
+#define ADIS16204_DIAG_STAT_FLASH_UPT_BIT     2 /* Flash update failure */
+#define ADIS16204_DIAG_STAT_POWER_HIGH_BIT    1 /* Power supply above 3.625 V */
+#define ADIS16204_DIAG_STAT_POWER_LOW_BIT     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
- * @trig:               data ready trigger registered with iio
- * @tx:                 transmit buffer
- * @rx:                 receive buffer
- * @buf_lock:           mutex to protect tx and rx
- **/
-struct adis16204_state {
-        struct spi_device       *us;
-        struct iio_trigger      *trig;
-        struct mutex            buf_lock;
-        u8                      tx[ADIS16204_MAX_TX] ____cacheline_aligned;
-        u8                      rx[ADIS16204_MAX_RX];
-};
-
-int adis16204_set_irq(struct iio_dev *indio_dev, bool enable);
-
 enum adis16204_scan {
-        ADIS16204_SCAN_SUPPLY,
         ADIS16204_SCAN_ACC_X,
         ADIS16204_SCAN_ACC_Y,
+        ADIS16204_SCAN_ACC_XY,
+        ADIS16204_SCAN_SUPPLY,
         ADIS16204_SCAN_AUX_ADC,
         ADIS16204_SCAN_TEMP,
 };
 
-#ifdef CONFIG_IIO_BUFFER
-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);
-
-#else /* CONFIG_IIO_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)
-{
-}
-
-#endif /* CONFIG_IIO_BUFFER */
 #endif /* SPI_ADIS16204_H_ */
diff --git a/drivers/staging/iio/accel/adis16204_core.c b/drivers/staging/iio/accel/adis16204_core.c
index c6234c2f46aa..f3592668e066 100644
--- a/drivers/staging/iio/accel/adis16204_core.c
+++ b/drivers/staging/iio/accel/adis16204_core.c
@@ -21,261 +21,16 @@
 #include <linux/iio/iio.h>
 #include <linux/iio/sysfs.h>
 #include <linux/iio/buffer.h>
+#include <linux/iio/imu/adis.h>
 
 #include "adis16204.h"
 
-#define DRIVER_NAME             "adis16204"
-
-/**
- * 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 iio_dev *indio_dev,
-                u8 reg_address,
-                u8 val)
-{
-        int ret;
-        struct adis16204_state *st = iio_priv(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
- * @indio_dev: iio device associated with child of actual device
- * @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 iio_dev *indio_dev,
-                u8 lower_reg_address,
-                u16 value)
-{
-        int ret;
-        struct spi_message msg;
-        struct adis16204_state *st = iio_priv(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
- * @indio_dev: iio device associated with child of actual device
- * @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 iio_dev *indio_dev,
-                                     u8 lower_reg_address,
-                                     u16 *val)
-{
-        struct spi_message msg;
-        struct adis16204_state *st = iio_priv(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,
-                        .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 int adis16204_check_status(struct iio_dev *indio_dev)
-{
-        u16 status;
-        int ret;
-
-        ret = adis16204_spi_read_reg_16(indio_dev,
-                                        ADIS16204_DIAG_STAT, &status);
-        if (ret < 0) {
-                dev_err(&indio_dev->dev, "Reading status failed\n");
-                goto error_ret;
-        }
-        ret = status & 0x1F;
-
-        if (status & ADIS16204_DIAG_STAT_SELFTEST_FAIL)
-                dev_err(&indio_dev->dev, "Self test failure\n");
-        if (status & ADIS16204_DIAG_STAT_SPI_FAIL)
-                dev_err(&indio_dev->dev, "SPI failure\n");
-        if (status & ADIS16204_DIAG_STAT_FLASH_UPT)
-                dev_err(&indio_dev->dev, "Flash update failed\n");
-        if (status & ADIS16204_DIAG_STAT_POWER_HIGH)
-                dev_err(&indio_dev->dev, "Power supply above 3.625V\n");
-        if (status & ADIS16204_DIAG_STAT_POWER_LOW)
-                dev_err(&indio_dev->dev, "Power supply below 2.975V\n");
-
-error_ret:
-        return ret;
-}
-
-static int adis16204_reset(struct iio_dev *indio_dev)
-{
-        int ret;
-        ret = adis16204_spi_write_reg_8(indio_dev,
-                        ADIS16204_GLOB_CMD,
-                        ADIS16204_GLOB_CMD_SW_RESET);
-        if (ret)
-                dev_err(&indio_dev->dev, "problem resetting device");
-
-        return ret;
-}
-
-int adis16204_set_irq(struct iio_dev *indio_dev, bool enable)
-{
-        int ret = 0;
-        u16 msc;
-
-        ret = adis16204_spi_read_reg_16(indio_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(indio_dev, ADIS16204_MSC_CTRL, msc);
-
-error_ret:
-        return ret;
-}
-
-static int adis16204_self_test(struct iio_dev *indio_dev)
-{
-        int ret;
-        ret = adis16204_spi_write_reg_16(indio_dev,
-                        ADIS16204_MSC_CTRL,
-                        ADIS16204_MSC_CTRL_SELF_TEST_EN);
-        if (ret) {
-                dev_err(&indio_dev->dev, "problem starting self test");
-                goto err_ret;
-        }
-
-        adis16204_check_status(indio_dev);
-
-err_ret:
-        return ret;
-}
-
-static int adis16204_initial_setup(struct iio_dev *indio_dev)
-{
-        int ret;
-
-        /* Disable IRQ */
-        ret = adis16204_set_irq(indio_dev, false);
-        if (ret) {
-                dev_err(&indio_dev->dev, "disable irq failed");
-                goto err_ret;
-        }
-
-        /* Do self test */
-        ret = adis16204_self_test(indio_dev);
-        if (ret) {
-                dev_err(&indio_dev->dev, "self test failure");
-                goto err_ret;
-        }
-
-        /* Read status register to check the result */
-        ret = adis16204_check_status(indio_dev);
-        if (ret) {
-                adis16204_reset(indio_dev);
-                dev_err(&indio_dev->dev, "device not playing ball -> reset");
-                msleep(ADIS16204_STARTUP_DELAY);
-                ret = adis16204_check_status(indio_dev);
-                if (ret) {
-                        dev_err(&indio_dev->dev, "giving up");
-                        goto err_ret;
-                }
-        }
-
-err_ret:
-        return ret;
-}
-
 /* Unique to this driver currently */
 
-enum adis16204_channel {
-        in_supply,
-        in_aux,
-        temp,
-        accel_x,
-        accel_y,
-        accel_xy,
-};
-
-static u8 adis16204_addresses[6][3] = {
-        [in_supply] = { ADIS16204_SUPPLY_OUT },
-        [in_aux] = { ADIS16204_AUX_ADC },
-        [temp] = { ADIS16204_TEMP_OUT },
-        [accel_x] = { ADIS16204_XACCL_OUT, ADIS16204_XACCL_NULL,
-                      ADIS16204_X_PEAK_OUT },
-        [accel_y] = { ADIS16204_XACCL_OUT, ADIS16204_YACCL_NULL,
-                      ADIS16204_Y_PEAK_OUT },
-        [accel_xy] = { ADIS16204_XY_RSS_OUT, 0,
-                       ADIS16204_XY_PEAK_OUT },
+static const u8 adis16204_addresses[][2] = {
+        [ADIS16204_SCAN_ACC_X] = { ADIS16204_XACCL_NULL, ADIS16204_X_PEAK_OUT },
+        [ADIS16204_SCAN_ACC_Y] = { ADIS16204_YACCL_NULL, ADIS16204_Y_PEAK_OUT },
+        [ADIS16204_SCAN_ACC_XY] = { 0, ADIS16204_XY_PEAK_OUT },
 };
 
 static int adis16204_read_raw(struct iio_dev *indio_dev,
@@ -283,6 +38,7 @@ static int adis16204_read_raw(struct iio_dev *indio_dev,
                               int *val, int *val2,
                               long mask)
 {
+        struct adis *st = iio_priv(indio_dev);
         int ret;
         int bits;
         u8 addr;
@@ -291,29 +47,8 @@ static int adis16204_read_raw(struct iio_dev *indio_dev,
 
         switch (mask) {
         case IIO_CHAN_INFO_RAW:
-                mutex_lock(&indio_dev->mlock);
-                addr = adis16204_addresses[chan->address][0];
-                ret = adis16204_spi_read_reg_16(indio_dev, addr, &val16);
-                if (ret) {
-                        mutex_unlock(&indio_dev->mlock);
-                        return ret;
-                }
-
-                if (val16 & ADIS16204_ERROR_ACTIVE) {
-                        ret = adis16204_check_status(indio_dev);
-                        if (ret) {
-                                mutex_unlock(&indio_dev->mlock);
-                                return ret;
-                        }
-                }
-                val16 = val16 & ((1 << chan->scan_type.realbits) - 1);
-                if (chan->scan_type.sign == 's')
-                        val16 = (s16)(val16 <<
-                                      (16 - chan->scan_type.realbits)) >>
-                                (16 - chan->scan_type.realbits);
-                *val = val16;
-                mutex_unlock(&indio_dev->mlock);
-                return IIO_VAL_INT;
+                return adis_single_conversion(indio_dev, chan,
+                                ADIS16204_ERROR_ACTIVE, val);
         case IIO_CHAN_INFO_SCALE:
                 switch (chan->type) {
                 case IIO_VOLTAGE:
@@ -353,14 +88,14 @@ static int adis16204_read_raw(struct iio_dev *indio_dev,
         case IIO_CHAN_INFO_PEAK:
                 if (mask == IIO_CHAN_INFO_CALIBBIAS) {
                         bits = 12;
-                        addrind = 1;
+                        addrind = 0;
                 } else { /* PEAK_SEPARATE */
                         bits = 14;
-                        addrind = 2;
+                        addrind = 1;
                 }
                 mutex_lock(&indio_dev->mlock);
-                addr = adis16204_addresses[chan->address][addrind];
-                ret = adis16204_spi_read_reg_16(indio_dev, addr, &val16);
+                addr = adis16204_addresses[chan->scan_index][addrind];
+                ret = adis_read_reg_16(st, addr, &val16);
                 if (ret) {
                         mutex_unlock(&indio_dev->mlock);
                         return ret;
@@ -380,6 +115,7 @@ static int adis16204_write_raw(struct iio_dev *indio_dev,
                                int val2,
                                long mask)
 {
+        struct adis *st = iio_priv(indio_dev);
         int bits;
         s16 val16;
         u8 addr;
@@ -391,114 +127,65 @@ static int adis16204_write_raw(struct iio_dev *indio_dev,
                         break;
                 default:
                         return -EINVAL;
-                };
+                }
                 val16 = val & ((1 << bits) - 1);
-                addr = adis16204_addresses[chan->address][1];
-                return adis16204_spi_write_reg_16(indio_dev, addr, val16);
+                addr = adis16204_addresses[chan->scan_index][1];
+                return adis_write_reg_16(st, addr, val16);
         }
         return -EINVAL;
 }
 
 static const struct iio_chan_spec adis16204_channels[] = {
-        {
-                .type = IIO_VOLTAGE,
-                .indexed = 1, /* Note was not previously indexed */
-                .channel = 0,
-                .extend_name = "supply",
-                .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |
-                IIO_CHAN_INFO_SCALE_SEPARATE_BIT,
-                .address = in_supply,
-                .scan_index = ADIS16204_SCAN_SUPPLY,
-                .scan_type = {
-                        .sign = 'u',
-                        .realbits = 12,
-                        .storagebits = 16,
-                },
-        }, {
-                .type = IIO_VOLTAGE,
-                .indexed = 1,
-                .channel = 1,
-                .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |
-                IIO_CHAN_INFO_SCALE_SEPARATE_BIT,
-                .address = in_aux,
-                .scan_index = ADIS16204_SCAN_AUX_ADC,
-                .scan_type = {
-                        .sign = 'u',
-                        .realbits = 12,
-                        .storagebits = 16,
-                },
-        }, {
-                .type = IIO_TEMP,
-                .indexed = 1,
-                .channel = 0,
-                .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |
-                IIO_CHAN_INFO_SCALE_SEPARATE_BIT |
-                IIO_CHAN_INFO_OFFSET_SEPARATE_BIT,
-                .address = temp,
-                .scan_index = ADIS16204_SCAN_TEMP,
-                .scan_type = {
-                        .sign = 'u',
-                        .realbits = 12,
-                        .storagebits = 16,
-                },
-        }, {
-                .type = IIO_ACCEL,
-                .modified = 1,
-                .channel2 = IIO_MOD_X,
-                .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |
-                IIO_CHAN_INFO_SCALE_SEPARATE_BIT |
+        ADIS_SUPPLY_CHAN(ADIS16204_SUPPLY_OUT, ADIS16204_SCAN_SUPPLY, 12),
+        ADIS_AUX_ADC_CHAN(ADIS16204_AUX_ADC, ADIS16204_SCAN_AUX_ADC, 12),
+        ADIS_TEMP_CHAN(ADIS16204_TEMP_OUT, ADIS16204_SCAN_TEMP, 12),
+        ADIS_ACCEL_CHAN(X, ADIS16204_XACCL_OUT, ADIS16204_SCAN_ACC_X,
                 IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT |
-                IIO_CHAN_INFO_PEAK_SEPARATE_BIT,
-                .address = accel_x,
-                .scan_index = ADIS16204_SCAN_ACC_X,
-                .scan_type = {
-                        .sign = 's',
-                        .realbits = 14,
-                        .storagebits = 16,
-                },
-        }, {
-                .type = IIO_ACCEL,
-                .modified = 1,
-                .channel2 = IIO_MOD_Y,
-                .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |
-                IIO_CHAN_INFO_SCALE_SEPARATE_BIT |
+                IIO_CHAN_INFO_PEAK_SEPARATE_BIT, 14),
+        ADIS_ACCEL_CHAN(Y, ADIS16204_YACCL_OUT, ADIS16204_SCAN_ACC_Y,
                 IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT |
-                IIO_CHAN_INFO_PEAK_SEPARATE_BIT,
-                .address = accel_y,
-                .scan_index = ADIS16204_SCAN_ACC_Y,
-                .scan_type = {
-                        .sign = 's',
-                        .realbits = 14,
-                        .storagebits = 16,
-                },
-        },
+                IIO_CHAN_INFO_PEAK_SEPARATE_BIT, 14),
+        ADIS_ACCEL_CHAN(ROOT_SUM_SQUARED_X_Y, ADIS16204_XY_RSS_OUT,
+                ADIS16204_SCAN_ACC_XY, IIO_CHAN_INFO_PEAK_SEPARATE_BIT, 14),
         IIO_CHAN_SOFT_TIMESTAMP(5),
-        {
-                .type = IIO_ACCEL,
-                .modified = 1,
-                .channel2 = IIO_MOD_ROOT_SUM_SQUARED_X_Y,
-                .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |
-                IIO_CHAN_INFO_SCALE_SEPARATE_BIT |
-                IIO_CHAN_INFO_PEAK_SEPARATE_BIT,
-                .address = accel_xy,
-                .scan_type = {
-                        .sign = 'u',
-                        .realbits = 14,
-                        .storagebits = 16,
-                },
-        }
 };
 
 static const struct iio_info adis16204_info = {
         .read_raw = &adis16204_read_raw,
         .write_raw = &adis16204_write_raw,
+        .update_scan_mode = adis_update_scan_mode,
         .driver_module = THIS_MODULE,
 };
 
-static int __devinit adis16204_probe(struct spi_device *spi)
+static const char * const adis16204_status_error_msgs[] = {
+        [ADIS16204_DIAG_STAT_SELFTEST_FAIL_BIT] = "Self test failure",
+        [ADIS16204_DIAG_STAT_SPI_FAIL_BIT] = "SPI failure",
+        [ADIS16204_DIAG_STAT_FLASH_UPT_BIT] = "Flash update failed",
+        [ADIS16204_DIAG_STAT_POWER_HIGH_BIT] = "Power supply above 3.625V",
+        [ADIS16204_DIAG_STAT_POWER_LOW_BIT] = "Power supply below 2.975V",
+};
+
+static const struct adis_data adis16204_data = {
+        .read_delay = 20,
+        .msc_ctrl_reg = ADIS16204_MSC_CTRL,
+        .glob_cmd_reg = ADIS16204_GLOB_CMD,
+        .diag_stat_reg = ADIS16204_DIAG_STAT,
+
+        .self_test_mask = ADIS16204_MSC_CTRL_SELF_TEST_EN,
+        .startup_delay = ADIS16204_STARTUP_DELAY,
+
+        .status_error_msgs = adis16204_status_error_msgs,
+        .status_error_mask = BIT(ADIS16204_DIAG_STAT_SELFTEST_FAIL_BIT) |
+                BIT(ADIS16204_DIAG_STAT_SPI_FAIL_BIT) |
+                BIT(ADIS16204_DIAG_STAT_FLASH_UPT_BIT) |
+                BIT(ADIS16204_DIAG_STAT_POWER_HIGH_BIT) |
+                BIT(ADIS16204_DIAG_STAT_POWER_LOW_BIT),
+};
+
+static int adis16204_probe(struct spi_device *spi)
 {
         int ret;
-        struct adis16204_state *st;
+        struct adis *st;
         struct iio_dev *indio_dev;
 
         /* setup the industrialio driver allocated elements */
@@ -510,8 +197,6 @@ static int __devinit adis16204_probe(struct spi_device *spi)
         st = iio_priv(indio_dev);
         /* this is only used for removal purposes */
         spi_set_drvdata(spi, indio_dev);
-        st->us = spi;
-        mutex_init(&st->buf_lock);
 
         indio_dev->name = spi->dev.driver->name;
         indio_dev->dev.parent = &spi->dev;
@@ -520,54 +205,39 @@ static int __devinit adis16204_probe(struct spi_device *spi)
         indio_dev->num_channels = ARRAY_SIZE(adis16204_channels);
         indio_dev->modes = INDIO_DIRECT_MODE;
 
-        ret = adis16204_configure_ring(indio_dev);
+        ret = adis_init(st, indio_dev, spi, &adis16204_data);
         if (ret)
                 goto error_free_dev;
 
-        ret = iio_buffer_register(indio_dev,
-                                  adis16204_channels,
-                                  6);
-        if (ret) {
-                printk(KERN_ERR "failed to initialize the ring\n");
-                goto error_unreg_ring_funcs;
-        }
-
-        if (spi->irq) {
-                ret = adis16204_probe_trigger(indio_dev);
-                if (ret)
-                        goto error_uninitialize_ring;
-        }
+        ret = adis_setup_buffer_and_trigger(st, indio_dev, NULL);
+        if (ret)
+                goto error_free_dev;
 
         /* Get the device into a sane initial state */
-        ret = adis16204_initial_setup(indio_dev);
+        ret = adis_initial_startup(st);
         if (ret)
-                goto error_remove_trigger;
+                goto error_cleanup_buffer_trigger;
         ret = iio_device_register(indio_dev);
         if (ret)
-                goto error_remove_trigger;
+                goto error_cleanup_buffer_trigger;
 
         return 0;
 
-error_remove_trigger:
-        adis16204_remove_trigger(indio_dev);
-error_uninitialize_ring:
-        iio_buffer_unregister(indio_dev);
-error_unreg_ring_funcs:
-        adis16204_unconfigure_ring(indio_dev);
+error_cleanup_buffer_trigger:
+        adis_cleanup_buffer_and_trigger(st, indio_dev);
 error_free_dev:
         iio_device_free(indio_dev);
 error_ret:
         return ret;
 }
 
-static int __devexit adis16204_remove(struct spi_device *spi)
+static int adis16204_remove(struct spi_device *spi)
 {
         struct iio_dev *indio_dev = spi_get_drvdata(spi);
+        struct adis *st = iio_priv(indio_dev);
 
         iio_device_unregister(indio_dev);
-        adis16204_remove_trigger(indio_dev);
-        iio_buffer_unregister(indio_dev);
-        adis16204_unconfigure_ring(indio_dev);
+        adis_cleanup_buffer_and_trigger(st, indio_dev);
         iio_device_free(indio_dev);
 
         return 0;
@@ -579,7 +249,7 @@ static struct spi_driver adis16204_driver = {
                 .owner = THIS_MODULE,
         },
         .probe = adis16204_probe,
-        .remove = __devexit_p(adis16204_remove),
+        .remove = adis16204_remove,
 };
 module_spi_driver(adis16204_driver);
 
diff --git a/drivers/staging/iio/accel/adis16204_ring.c b/drivers/staging/iio/accel/adis16204_ring.c
deleted file mode 100644
index 4c976bec986b..000000000000
--- a/drivers/staging/iio/accel/adis16204_ring.c
+++ /dev/null
@@ -1,134 +0,0 @@
-#include <linux/export.h>
-#include <linux/interrupt.h>
-#include <linux/mutex.h>
-#include <linux/kernel.h>
-#include <linux/spi/spi.h>
-#include <linux/slab.h>
-
-#include <linux/iio/iio.h>
-#include "../ring_sw.h"
-#include <linux/iio/trigger_consumer.h>
-#include "adis16204.h"
-
-/**
- * adis16204_read_ring_data() read data registers which will be placed into ring
- * @indio_dev: the IIO device
- * @rx: somewhere to pass back the value read
- **/
-static int adis16204_read_ring_data(struct iio_dev *indio_dev, u8 *rx)
-{
-        struct spi_message msg;
-        struct adis16204_state *st = iio_priv(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 irqreturn_t adis16204_trigger_handler(int irq, void *p)
-{
-        struct iio_poll_func *pf = p;
-        struct iio_dev *indio_dev = pf->indio_dev;
-        struct adis16204_state *st = iio_priv(indio_dev);
-        int i = 0;
-        s16 *data;
-
-        data = kmalloc(indio_dev->scan_bytes, GFP_KERNEL);
-        if (data == NULL) {
-                dev_err(&st->us->dev, "memory alloc failed in ring bh");
-                goto done;
-        }
-
-        if (!bitmap_empty(indio_dev->active_scan_mask, indio_dev->masklength) &&
-            adis16204_read_ring_data(indio_dev, st->rx) >= 0)
-                for (; i < bitmap_weight(indio_dev->active_scan_mask,
-                                         indio_dev->masklength); i++)
-                        data[i] = be16_to_cpup((__be16 *)&(st->rx[i*2]));
-
-        /* Guaranteed to be aligned with 8 byte boundary */
-        if (indio_dev->scan_timestamp)
-                *((s64 *)(data + ((i + 3)/4)*4)) = pf->timestamp;
-
-        iio_push_to_buffer(indio_dev->buffer, (u8 *)data);
-
-        kfree(data);
-done:
-        iio_trigger_notify_done(indio_dev->trig);
-
-        return IRQ_HANDLED;
-}
-
-void adis16204_unconfigure_ring(struct iio_dev *indio_dev)
-{
-        iio_dealloc_pollfunc(indio_dev->pollfunc);
-        iio_sw_rb_free(indio_dev->buffer);
-}
-
-static const struct iio_buffer_setup_ops adis16204_ring_setup_ops = {
-        .preenable = &iio_sw_buffer_preenable,
-        .postenable = &iio_triggered_buffer_postenable,
-        .predisable = &iio_triggered_buffer_predisable,
-};
-
-int adis16204_configure_ring(struct iio_dev *indio_dev)
-{
-        int ret = 0;
-        struct iio_buffer *ring;
-
-        ring = iio_sw_rb_allocate(indio_dev);
-        if (!ring) {
-                ret = -ENOMEM;
-                return ret;
-        }
-        indio_dev->buffer = ring;
-        ring->scan_timestamp = true;
-        indio_dev->setup_ops = &adis16204_ring_setup_ops;
-
-        indio_dev->pollfunc = iio_alloc_pollfunc(&iio_pollfunc_store_time,
-                                                 &adis16204_trigger_handler,
-                                                 IRQF_ONESHOT,
-                                                 indio_dev,
-                                                 "%s_consumer%d",
-                                                 indio_dev->name,
-                                                 indio_dev->id);
-        if (indio_dev->pollfunc == NULL) {
-                ret = -ENOMEM;
-                goto error_iio_sw_rb_free;
-        }
-
-        indio_dev->modes |= INDIO_BUFFER_TRIGGERED;
-        return 0;
-
-error_iio_sw_rb_free:
-        iio_sw_rb_free(indio_dev->buffer);
-        return ret;
-}
diff --git a/drivers/staging/iio/accel/adis16204_trigger.c b/drivers/staging/iio/accel/adis16204_trigger.c
deleted file mode 100644
index 408a1682368e..000000000000
--- a/drivers/staging/iio/accel/adis16204_trigger.c
+++ /dev/null
@@ -1,73 +0,0 @@
-#include <linux/interrupt.h>
-#include <linux/kernel.h>
-#include <linux/spi/spi.h>
-#include <linux/export.h>
-
-#include <linux/iio/iio.h>
-#include <linux/iio/trigger.h>
-#include "adis16204.h"
-
-/**
- * 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 iio_dev *indio_dev = trig->private_data;
-
-        dev_dbg(&indio_dev->dev, "%s (%d)\n", __func__, state);
-        return adis16204_set_irq(indio_dev, state);
-}
-
-static const struct iio_trigger_ops adis16204_trigger_ops = {
-        .owner = THIS_MODULE,
-        .set_trigger_state = &adis16204_data_rdy_trigger_set_state,
-};
-
-int adis16204_probe_trigger(struct iio_dev *indio_dev)
-{
-        int ret;
-        struct adis16204_state *st = iio_priv(indio_dev);
-
-        st->trig = iio_trigger_alloc("adis16204-dev%d", indio_dev->id);
-        if (st->trig == NULL) {
-                ret = -ENOMEM;
-                goto error_ret;
-        }
-
-        ret = request_irq(st->us->irq,
-                          &iio_trigger_generic_data_rdy_poll,
-                          IRQF_TRIGGER_RISING,
-                          "adis16204",
-                          st->trig);
-        if (ret)
-                goto error_free_trig;
-
-        st->trig->dev.parent = &st->us->dev;
-        st->trig->ops = &adis16204_trigger_ops;
-        st->trig->private_data = indio_dev;
-        ret = iio_trigger_register(st->trig);
-
-        /* select default trigger */
-        indio_dev->trig = st->trig;
-        if (ret)
-                goto error_free_irq;
-
-        return 0;
-
-error_free_irq:
-        free_irq(st->us->irq, st->trig);
-error_free_trig:
-        iio_trigger_free(st->trig);
-error_ret:
-        return ret;
-}
-
-void adis16204_remove_trigger(struct iio_dev *indio_dev)
-{
-        struct adis16204_state *state = iio_priv(indio_dev);
-
-        iio_trigger_unregister(state->trig);
-        free_irq(state->us->irq, state->trig);
-        iio_trigger_free(state->trig);
-}
diff --git a/drivers/staging/iio/accel/adis16209.h b/drivers/staging/iio/accel/adis16209.h
index 3c88b86e7b81..ad3945a06292 100644
--- a/drivers/staging/iio/accel/adis16209.h
+++ b/drivers/staging/iio/accel/adis16209.h
@@ -3,9 +3,6 @@
 
 #define ADIS16209_STARTUP_DELAY 220 /* ms */
 
-#define ADIS16209_READ_REG(a)    a
-#define ADIS16209_WRITE_REG(a) ((a) | 0x80)
-
 /* Flash memory write count */
 #define ADIS16209_FLASH_CNT      0x00
 /* Output, power supply */
@@ -61,8 +58,6 @@
 /* Operation, system command register */
 #define ADIS16209_GLOB_CMD       0x3E
 
-#define ADIS16209_OUTPUTS        8
-
 /* MSC_CTRL */
 /* Self-test at power-on: 1 = disabled, 0 = enabled */
 #define ADIS16209_MSC_CTRL_PWRUP_SELF_TEST      (1 << 10)
@@ -81,44 +76,23 @@
 /* Alarm 1 status: 1 = alarm active, 0 = alarm inactive */
 #define ADIS16209_DIAG_STAT_ALARM1        (1<<8)
 /* Self-test diagnostic error flag: 1 = error condition, 0 = normal operation */
-#define ADIS16209_DIAG_STAT_SELFTEST_FAIL (1<<5)
+#define ADIS16209_DIAG_STAT_SELFTEST_FAIL_BIT   5
 /* SPI communications failure */
-#define ADIS16209_DIAG_STAT_SPI_FAIL      (1<<3)
+#define ADIS16209_DIAG_STAT_SPI_FAIL_BIT        3
 /* Flash update failure */
-#define ADIS16209_DIAG_STAT_FLASH_UPT     (1<<2)
+#define ADIS16209_DIAG_STAT_FLASH_UPT_BIT       2
 /* Power supply above 3.625 V */
-#define ADIS16209_DIAG_STAT_POWER_HIGH    (1<<1)
+#define ADIS16209_DIAG_STAT_POWER_HIGH_BIT      1
 /* Power supply below 3.15 V */
-#define ADIS16209_DIAG_STAT_POWER_LOW     (1<<0)
+#define ADIS16209_DIAG_STAT_POWER_LOW_BIT       0
 
 /* GLOB_CMD */
 #define ADIS16209_GLOB_CMD_SW_RESET     (1<<7)
 #define ADIS16209_GLOB_CMD_CLEAR_STAT   (1<<4)
 #define ADIS16209_GLOB_CMD_FACTORY_CAL  (1<<1)
 
-#define ADIS16209_MAX_TX 24
-#define ADIS16209_MAX_RX 24
-
 #define ADIS16209_ERROR_ACTIVE          (1<<14)
 
-/**
- * struct adis16209_state - device instance specific data
- * @us:                 actual spi_device
- * @trig:               data ready trigger registered with iio
- * @tx:                 transmit buffer
- * @rx:                 receive buffer
- * @buf_lock:           mutex to protect tx and rx
- **/
-struct adis16209_state {
-        struct spi_device       *us;
-        struct iio_trigger      *trig;
-        struct mutex            buf_lock;
-        u8                      tx[ADIS16209_MAX_TX] ____cacheline_aligned;
-        u8                      rx[ADIS16209_MAX_RX];
-};
-
-int adis16209_set_irq(struct iio_dev *indio_dev, bool enable);
-
 #define ADIS16209_SCAN_SUPPLY   0
 #define ADIS16209_SCAN_ACC_X    1
 #define ADIS16209_SCAN_ACC_Y    2
@@ -128,45 +102,4 @@ int adis16209_set_irq(struct iio_dev *indio_dev, bool enable);
 #define ADIS16209_SCAN_INCLI_Y  6
 #define ADIS16209_SCAN_ROT      7
 
-#ifdef CONFIG_IIO_BUFFER
-
-void adis16209_remove_trigger(struct iio_dev *indio_dev);
-int adis16209_probe_trigger(struct iio_dev *indio_dev);
-
-ssize_t adis16209_read_data_from_ring(struct device *dev,
-                                      struct device_attribute *attr,
-                                      char *buf);
-
-int adis16209_configure_ring(struct iio_dev *indio_dev);
-void adis16209_unconfigure_ring(struct iio_dev *indio_dev);
-
-#else /* CONFIG_IIO_BUFFER */
-
-static inline void adis16209_remove_trigger(struct iio_dev *indio_dev)
-{
-}
-
-static inline int adis16209_probe_trigger(struct iio_dev *indio_dev)
-{
-        return 0;
-}
-
-static inline ssize_t
-adis16209_read_data_from_ring(struct device *dev,
-                              struct device_attribute *attr,
-                              char *buf)
-{
-        return 0;
-}
-
-static int adis16209_configure_ring(struct iio_dev *indio_dev)
-{
-        return 0;
-}
-
-static inline void adis16209_unconfigure_ring(struct iio_dev *indio_dev)
-{
-}
-
-#endif /* CONFIG_IIO_BUFFER */
 #endif /* SPI_ADIS16209_H_ */
diff --git a/drivers/staging/iio/accel/adis16209_core.c b/drivers/staging/iio/accel/adis16209_core.c
index 7ee974b45d7d..69c50ee44ce3 100644
--- a/drivers/staging/iio/accel/adis16209_core.c
+++ b/drivers/staging/iio/accel/adis16209_core.c
@@ -19,262 +19,19 @@
 #include <linux/iio/iio.h>
 #include <linux/iio/sysfs.h>
 #include <linux/iio/buffer.h>
+#include <linux/iio/imu/adis.h>
 
 #include "adis16209.h"
 
-#define DRIVER_NAME             "adis16209"
-
-/**
- * adis16209_spi_write_reg_8() - write single byte to a register
- * @indio_dev: iio device associated with actual device
- * @reg_address: the address of the register to be written
- * @val: the value to write
- **/
-static int adis16209_spi_write_reg_8(struct iio_dev *indio_dev,
-                                     u8 reg_address,
-                                     u8 val)
-{
-        int ret;
-        struct adis16209_state *st = iio_priv(indio_dev);
-
-        mutex_lock(&st->buf_lock);
-        st->tx[0] = ADIS16209_WRITE_REG(reg_address);
-        st->tx[1] = val;
-
-        ret = spi_write(st->us, st->tx, 2);
-        mutex_unlock(&st->buf_lock);
-
-        return ret;
-}
-
-/**
- * adis16209_spi_write_reg_16() - write 2 bytes to a pair of registers
- * @indio_dev: iio device associated actual device
- * @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 adis16209_spi_write_reg_16(struct iio_dev *indio_dev,
-                                      u8 lower_reg_address,
-                                      u16 value)
-{
-        int ret;
-        struct spi_message msg;
-        struct adis16209_state *st = iio_priv(indio_dev);
-        struct spi_transfer xfers[] = {
-                {
-                        .tx_buf = st->tx,
-                        .bits_per_word = 8,
-                        .len = 2,
-                        .cs_change = 1,
-                        .delay_usecs = 30,
-                }, {
-                        .tx_buf = st->tx + 2,
-                        .bits_per_word = 8,
-                        .len = 2,
-                        .delay_usecs = 30,
-                },
-        };
-
-        mutex_lock(&st->buf_lock);
-        st->tx[0] = ADIS16209_WRITE_REG(lower_reg_address);
-        st->tx[1] = value & 0xFF;
-        st->tx[2] = ADIS16209_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;
-}
-
-/**
- * adis16209_spi_read_reg_16() - read 2 bytes from a 16-bit register
- * @indio_dev: iio device associated with device
- * @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 adis16209_spi_read_reg_16(struct iio_dev *indio_dev,
-                                     u8 lower_reg_address,
-                                     u16 *val)
-{
-        struct spi_message msg;
-        struct adis16209_state *st = iio_priv(indio_dev);
-        int ret;
-        struct spi_transfer xfers[] = {
-                {
-                        .tx_buf = st->tx,
-                        .bits_per_word = 8,
-                        .len = 2,
-                        .cs_change = 1,
-                        .delay_usecs = 30,
-                }, {
-                        .rx_buf = st->rx,
-                        .bits_per_word = 8,
-                        .len = 2,
-                        .delay_usecs = 30,
-                },
-        };
-
-        mutex_lock(&st->buf_lock);
-        st->tx[0] = ADIS16209_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 int adis16209_reset(struct iio_dev *indio_dev)
-{
-        int ret;
-        ret = adis16209_spi_write_reg_8(indio_dev,
-                        ADIS16209_GLOB_CMD,
-                        ADIS16209_GLOB_CMD_SW_RESET);
-        if (ret)
-                dev_err(&indio_dev->dev, "problem resetting device");
-
-        return ret;
-}
-
-int adis16209_set_irq(struct iio_dev *indio_dev, bool enable)
-{
-        int ret = 0;
-        u16 msc;
-
-        ret = adis16209_spi_read_reg_16(indio_dev, ADIS16209_MSC_CTRL, &msc);
-        if (ret)
-                goto error_ret;
-
-        msc |= ADIS16209_MSC_CTRL_ACTIVE_HIGH;
-        msc &= ~ADIS16209_MSC_CTRL_DATA_RDY_DIO2;
-        if (enable)
-                msc |= ADIS16209_MSC_CTRL_DATA_RDY_EN;
-        else
-                msc &= ~ADIS16209_MSC_CTRL_DATA_RDY_EN;
-
-        ret = adis16209_spi_write_reg_16(indio_dev, ADIS16209_MSC_CTRL, msc);
-
-error_ret:
-        return ret;
-}
-
-static int adis16209_check_status(struct iio_dev *indio_dev)
-{
-        u16 status;
-        int ret;
-
-        ret = adis16209_spi_read_reg_16(indio_dev,
-                                        ADIS16209_DIAG_STAT, &status);
-        if (ret < 0) {
-                dev_err(&indio_dev->dev, "Reading status failed\n");
-                goto error_ret;
-        }
-        ret = status & 0x1F;
-
-        if (status & ADIS16209_DIAG_STAT_SELFTEST_FAIL)
-                dev_err(&indio_dev->dev, "Self test failure\n");
-        if (status & ADIS16209_DIAG_STAT_SPI_FAIL)
-                dev_err(&indio_dev->dev, "SPI failure\n");
-        if (status & ADIS16209_DIAG_STAT_FLASH_UPT)
-                dev_err(&indio_dev->dev, "Flash update failed\n");
-        if (status & ADIS16209_DIAG_STAT_POWER_HIGH)
-                dev_err(&indio_dev->dev, "Power supply above 3.625V\n");
-        if (status & ADIS16209_DIAG_STAT_POWER_LOW)
-                dev_err(&indio_dev->dev, "Power supply below 3.15V\n");
-
-error_ret:
-        return ret;
-}
-
-static int adis16209_self_test(struct iio_dev *indio_dev)
-{
-        int ret;
-        ret = adis16209_spi_write_reg_16(indio_dev,
-                        ADIS16209_MSC_CTRL,
-                        ADIS16209_MSC_CTRL_SELF_TEST_EN);
-        if (ret) {
-                dev_err(&indio_dev->dev, "problem starting self test");
-                goto err_ret;
-        }
-
-        adis16209_check_status(indio_dev);
-
-err_ret:
-        return ret;
-}
-
-static int adis16209_initial_setup(struct iio_dev *indio_dev)
-{
-        int ret;
-
-        /* Disable IRQ */
-        ret = adis16209_set_irq(indio_dev, false);
-        if (ret) {
-                dev_err(&indio_dev->dev, "disable irq failed");
-                goto err_ret;
-        }
-
-        /* Do self test */
-        ret = adis16209_self_test(indio_dev);
-        if (ret) {
-                dev_err(&indio_dev->dev, "self test failure");
-                goto err_ret;
-        }
-
-        /* Read status register to check the result */
-        ret = adis16209_check_status(indio_dev);
-        if (ret) {
-                adis16209_reset(indio_dev);
-                dev_err(&indio_dev->dev, "device not playing ball -> reset");
-                msleep(ADIS16209_STARTUP_DELAY);
-                ret = adis16209_check_status(indio_dev);
-                if (ret) {
-                        dev_err(&indio_dev->dev, "giving up");
-                        goto err_ret;
-                }
-        }
-
-err_ret:
-        return ret;
-}
-
-enum adis16209_chan {
-        in_supply,
-        temp,
-        accel_x,
-        accel_y,
-        incli_x,
-        incli_y,
-        in_aux,
-        rot,
-};
-
-static const u8 adis16209_addresses[8][2] = {
-        [in_supply] = { ADIS16209_SUPPLY_OUT },
-        [in_aux] = { ADIS16209_AUX_ADC },
-        [accel_x] = { ADIS16209_XACCL_OUT, ADIS16209_XACCL_NULL },
-        [accel_y] = { ADIS16209_YACCL_OUT, ADIS16209_YACCL_NULL },
-        [incli_x] = { ADIS16209_XINCL_OUT, ADIS16209_XINCL_NULL },
-        [incli_y] = { ADIS16209_YINCL_OUT, ADIS16209_YINCL_NULL },
-        [rot] = { ADIS16209_ROT_OUT },
-        [temp] = { ADIS16209_TEMP_OUT },
+static const u8 adis16209_addresses[8][1] = {
+        [ADIS16209_SCAN_SUPPLY] = { },
+        [ADIS16209_SCAN_AUX_ADC] = { },
+        [ADIS16209_SCAN_ACC_X] = { ADIS16209_XACCL_NULL },
+        [ADIS16209_SCAN_ACC_Y] = { ADIS16209_YACCL_NULL },
+        [ADIS16209_SCAN_INCLI_X] = { ADIS16209_XINCL_NULL },
+        [ADIS16209_SCAN_INCLI_Y] = { ADIS16209_YINCL_NULL },
+        [ADIS16209_SCAN_ROT] = { },
+        [ADIS16209_SCAN_TEMP] = { },
 };
 
 static int adis16209_write_raw(struct iio_dev *indio_dev,
@@ -283,6 +40,7 @@ static int adis16209_write_raw(struct iio_dev *indio_dev,
                                int val2,
                                long mask)
 {
+        struct adis *st = iio_priv(indio_dev);
         int bits;
         s16 val16;
         u8 addr;
@@ -295,10 +53,10 @@ static int adis16209_write_raw(struct iio_dev *indio_dev,
                         break;
                 default:
                         return -EINVAL;
-                };
+                }
                 val16 = val & ((1 << bits) - 1);
-                addr = adis16209_addresses[chan->address][1];
-                return adis16209_spi_write_reg_16(indio_dev, addr, val16);
+                addr = adis16209_addresses[chan->scan_index][0];
+                return adis_write_reg_16(st, addr, val16);
         }
         return -EINVAL;
 }
@@ -308,6 +66,7 @@ static int adis16209_read_raw(struct iio_dev *indio_dev,
                               int *val, int *val2,
                               long mask)
 {
+        struct adis *st = iio_priv(indio_dev);
         int ret;
         int bits;
         u8 addr;
@@ -315,29 +74,8 @@ static int adis16209_read_raw(struct iio_dev *indio_dev,
 
         switch (mask) {
         case IIO_CHAN_INFO_RAW:
-                mutex_lock(&indio_dev->mlock);
-                addr = adis16209_addresses[chan->address][0];
-                ret = adis16209_spi_read_reg_16(indio_dev, addr, &val16);
-                if (ret) {
-                        mutex_unlock(&indio_dev->mlock);
-                        return ret;
-                }
-
-                if (val16 & ADIS16209_ERROR_ACTIVE) {
-                        ret = adis16209_check_status(indio_dev);
-                        if (ret) {
-                                mutex_unlock(&indio_dev->mlock);
-                                return ret;
-                        }
-                }
-                val16 = val16 & ((1 << chan->scan_type.realbits) - 1);
-                if (chan->scan_type.sign == 's')
-                        val16 = (s16)(val16 <<
-                                      (16 - chan->scan_type.realbits)) >>
-                                (16 - chan->scan_type.realbits);
-                *val = val16;
-                mutex_unlock(&indio_dev->mlock);
-                return IIO_VAL_INT;
+                return adis_single_conversion(indio_dev, chan,
+                        ADIS16209_ERROR_ACTIVE, val);
         case IIO_CHAN_INFO_SCALE:
                 switch (chan->type) {
                 case IIO_VOLTAGE:
@@ -374,10 +112,10 @@ static int adis16209_read_raw(struct iio_dev *indio_dev,
                         break;
                 default:
                         return -EINVAL;
-                };
+                }
                 mutex_lock(&indio_dev->mlock);
-                addr = adis16209_addresses[chan->address][1];
-                ret = adis16209_spi_read_reg_16(indio_dev, addr, &val16);
+                addr = adis16209_addresses[chan->scan_index][0];
+                ret = adis_read_reg_16(st, addr, &val16);
                 if (ret) {
                         mutex_unlock(&indio_dev->mlock);
                         return ret;
@@ -392,128 +130,56 @@ static int adis16209_read_raw(struct iio_dev *indio_dev,
 }
 
 static const struct iio_chan_spec adis16209_channels[] = {
-        {
-                .type = IIO_VOLTAGE,
-                .indexed = 1,
-                .channel = 0,
-                .extend_name = "supply",
-                .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |
-                IIO_CHAN_INFO_SCALE_SEPARATE_BIT,
-                .address = in_supply,
-                .scan_index = ADIS16209_SCAN_SUPPLY,
-                .scan_type = {
-                        .sign = 'u',
-                        .realbits = 14,
-                        .storagebits = 16,
-                },
-        }, {
-                .type = IIO_TEMP,
-                .indexed = 0,
-                .channel = 0,
-                .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |
-                IIO_CHAN_INFO_SCALE_SEPARATE_BIT |
-                IIO_CHAN_INFO_OFFSET_SEPARATE_BIT,
-                .address = temp,
-                .scan_index = ADIS16209_SCAN_TEMP,
-                .scan_type = {
-                        .sign = 'u',
-                        .realbits = 12,
-                        .storagebits = 16,
-                },
-        }, {
-                .type = IIO_ACCEL,
-                .modified = 1,
-                .channel2 = IIO_MOD_X,
-                .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |
-                IIO_CHAN_INFO_SCALE_SHARED_BIT |
-                IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT,
-                .address = accel_x,
-                .scan_index = ADIS16209_SCAN_ACC_X,
-                .scan_type = {
-                        .sign = 's',
-                        .realbits = 14,
-                        .storagebits = 16,
-                },
-        }, {
-                .type = IIO_ACCEL,
-                .modified = 1,
-                .channel2 = IIO_MOD_Y,
-                .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |
-                IIO_CHAN_INFO_SCALE_SHARED_BIT |
-                IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT,
-                .address = accel_y,
-                .scan_index = ADIS16209_SCAN_ACC_Y,
-                .scan_type = {
-                        .sign = 's',
-                        .realbits = 14,
-                        .storagebits = 16,
-                },
-        }, {
-                .type = IIO_VOLTAGE,
-                .indexed = 1,
-                .channel = 1,
-                .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |
-                IIO_CHAN_INFO_SCALE_SEPARATE_BIT,
-                .address = in_aux,
-                .scan_index = ADIS16209_SCAN_AUX_ADC,
-                .scan_type = {
-                        .sign = 'u',
-                        .realbits = 12,
-                        .storagebits = 16,
-                },
-        }, {
-                .type = IIO_INCLI,
-                .modified = 1,
-                .channel2 = IIO_MOD_X,
-                .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |
-                IIO_CHAN_INFO_SCALE_SHARED_BIT,
-                .address = incli_x,
-                .scan_index = ADIS16209_SCAN_INCLI_X,
-                .scan_type = {
-                        .sign = 's',
-                        .realbits = 14,
-                        .storagebits = 16,
-                },
-        }, {
-                .type = IIO_INCLI,
-                .modified = 1,
-                .channel2 = IIO_MOD_Y,
-                .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |
-                IIO_CHAN_INFO_SCALE_SHARED_BIT,
-                .address = incli_y,
-                .scan_index = ADIS16209_SCAN_INCLI_Y,
-                .scan_type = {
-                        .sign = 's',
-                        .realbits = 14,
-                        .storagebits = 16,
-                },
-        }, {
-                .type = IIO_ROT,
-                .modified = 1,
-                .channel2 = IIO_MOD_X,
-                .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT,
-                IIO_CHAN_INFO_SCALE_SHARED_BIT,
-                .address = rot,
-                .scan_index = ADIS16209_SCAN_ROT,
-                .scan_type = {
-                        .sign = 's',
-                        .realbits = 14,
-                        .storagebits = 16,
-                },
-        },
+        ADIS_SUPPLY_CHAN(ADIS16209_SUPPLY_OUT, ADIS16209_SCAN_SUPPLY, 14),
+        ADIS_TEMP_CHAN(ADIS16209_TEMP_OUT, ADIS16209_SCAN_TEMP, 12),
+        ADIS_ACCEL_CHAN(X, ADIS16209_XACCL_OUT, ADIS16209_SCAN_ACC_X,
+                IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT, 14),
+        ADIS_ACCEL_CHAN(Y, ADIS16209_YACCL_OUT, ADIS16209_SCAN_ACC_Y,
+                IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT, 14),
+        ADIS_AUX_ADC_CHAN(ADIS16209_AUX_ADC, ADIS16209_SCAN_AUX_ADC, 12),
+        ADIS_INCLI_CHAN(X, ADIS16209_XINCL_OUT, ADIS16209_SCAN_INCLI_X, 0, 14),
+        ADIS_INCLI_CHAN(Y, ADIS16209_YINCL_OUT, ADIS16209_SCAN_INCLI_Y, 0, 14),
+        ADIS_ROT_CHAN(X, ADIS16209_ROT_OUT, ADIS16209_SCAN_ROT, 0, 14),
         IIO_CHAN_SOFT_TIMESTAMP(8)
 };
 
 static const struct iio_info adis16209_info = {
         .read_raw = &adis16209_read_raw,
         .write_raw = &adis16209_write_raw,
+        .update_scan_mode = adis_update_scan_mode,
         .driver_module = THIS_MODULE,
 };
 
-static int __devinit adis16209_probe(struct spi_device *spi)
+static const char * const adis16209_status_error_msgs[] = {
+        [ADIS16209_DIAG_STAT_SELFTEST_FAIL_BIT] = "Self test failure",
+        [ADIS16209_DIAG_STAT_SPI_FAIL_BIT] = "SPI failure",
+        [ADIS16209_DIAG_STAT_FLASH_UPT_BIT] = "Flash update failed",
+        [ADIS16209_DIAG_STAT_POWER_HIGH_BIT] = "Power supply above 3.625V",
+        [ADIS16209_DIAG_STAT_POWER_LOW_BIT] = "Power supply below 3.15V",
+};
+
+static const struct adis_data adis16209_data = {
+        .read_delay = 30,
+        .msc_ctrl_reg = ADIS16209_MSC_CTRL,
+        .glob_cmd_reg = ADIS16209_GLOB_CMD,
+        .diag_stat_reg = ADIS16209_DIAG_STAT,
+
+        .self_test_mask = ADIS16209_MSC_CTRL_SELF_TEST_EN,
+        .startup_delay = ADIS16209_STARTUP_DELAY,
+
+        .status_error_msgs = adis16209_status_error_msgs,
+        .status_error_mask = BIT(ADIS16209_DIAG_STAT_SELFTEST_FAIL_BIT) |
+                BIT(ADIS16209_DIAG_STAT_SPI_FAIL_BIT) |
+                BIT(ADIS16209_DIAG_STAT_FLASH_UPT_BIT) |
+                BIT(ADIS16209_DIAG_STAT_POWER_HIGH_BIT) |
+                BIT(ADIS16209_DIAG_STAT_POWER_LOW_BIT),
+};
+
+
+static int adis16209_probe(struct spi_device *spi)
 {
         int ret;
-        struct adis16209_state *st;
+        struct adis *st;
         struct iio_dev *indio_dev;
 
         /* setup the industrialio driver allocated elements */
@@ -525,8 +191,6 @@ static int __devinit adis16209_probe(struct spi_device *spi)
         st = iio_priv(indio_dev);
         /* this is only used for removal purposes */
         spi_set_drvdata(spi, indio_dev);
-        st->us = spi;
-        mutex_init(&st->buf_lock);
 
         indio_dev->name = spi->dev.driver->name;
         indio_dev->dev.parent = &spi->dev;
@@ -535,54 +199,38 @@ static int __devinit adis16209_probe(struct spi_device *spi)
         indio_dev->num_channels = ARRAY_SIZE(adis16209_channels);
         indio_dev->modes = INDIO_DIRECT_MODE;
 
-        ret = adis16209_configure_ring(indio_dev);
+        ret = adis_init(st, indio_dev, spi, &adis16209_data);
+        if (ret)
+                goto error_free_dev;
+        ret = adis_setup_buffer_and_trigger(st, indio_dev, NULL);
         if (ret)
                 goto error_free_dev;
-
-        ret = iio_buffer_register(indio_dev,
-                                  adis16209_channels,
-                                  ARRAY_SIZE(adis16209_channels));
-        if (ret) {
-                printk(KERN_ERR "failed to initialize the ring\n");
-                goto error_unreg_ring_funcs;
-        }
-
-        if (spi->irq) {
-                ret = adis16209_probe_trigger(indio_dev);
-                if (ret)
-                        goto error_uninitialize_ring;
-        }
 
         /* Get the device into a sane initial state */
-        ret = adis16209_initial_setup(indio_dev);
+        ret = adis_initial_startup(st);
         if (ret)
-                goto error_remove_trigger;
+                goto error_cleanup_buffer_trigger;
         ret = iio_device_register(indio_dev);
         if (ret)
-                goto error_remove_trigger;
+                goto error_cleanup_buffer_trigger;
 
         return 0;
 
-error_remove_trigger:
-        adis16209_remove_trigger(indio_dev);
-error_uninitialize_ring:
-        iio_buffer_unregister(indio_dev);
-error_unreg_ring_funcs:
-        adis16209_unconfigure_ring(indio_dev);
+error_cleanup_buffer_trigger:
+        adis_cleanup_buffer_and_trigger(st, indio_dev);
 error_free_dev:
         iio_device_free(indio_dev);
 error_ret:
         return ret;
 }
 
-static int __devexit adis16209_remove(struct spi_device *spi)
+static int adis16209_remove(struct spi_device *spi)
 {
         struct iio_dev *indio_dev = spi_get_drvdata(spi);
+        struct adis *st = iio_priv(indio_dev);
 
         iio_device_unregister(indio_dev);
-        adis16209_remove_trigger(indio_dev);
-        iio_buffer_unregister(indio_dev);
-        adis16209_unconfigure_ring(indio_dev);
+        adis_cleanup_buffer_and_trigger(st, indio_dev);
         iio_device_free(indio_dev);
 
         return 0;
@@ -594,7 +242,7 @@ static struct spi_driver adis16209_driver = {
                 .owner = THIS_MODULE,
         },
         .probe = adis16209_probe,
-        .remove = __devexit_p(adis16209_remove),
+        .remove = adis16209_remove,
 };
 module_spi_driver(adis16209_driver);
 
diff --git a/drivers/staging/iio/accel/adis16209_ring.c b/drivers/staging/iio/accel/adis16209_ring.c
deleted file mode 100644
index f939e29d6c82..000000000000
--- a/drivers/staging/iio/accel/adis16209_ring.c
+++ /dev/null
@@ -1,134 +0,0 @@
-#include <linux/export.h>
-#include <linux/interrupt.h>
-#include <linux/mutex.h>
-#include <linux/kernel.h>
-#include <linux/spi/spi.h>
-#include <linux/slab.h>
-
-#include <linux/iio/iio.h>
-#include "../ring_sw.h"
-#include <linux/iio/trigger_consumer.h>
-#include "adis16209.h"
-
-/**
- * adis16209_read_ring_data() read data registers which will be placed into ring
- * @indio_dev: the IIO device
- * @rx: somewhere to pass back the value read
- **/
-static int adis16209_read_ring_data(struct iio_dev *indio_dev, u8 *rx)
-{
-        struct spi_message msg;
-        struct adis16209_state *st = iio_priv(indio_dev);
-        struct spi_transfer xfers[ADIS16209_OUTPUTS + 1];
-        int ret;
-        int i;
-
-        mutex_lock(&st->buf_lock);
-
-        spi_message_init(&msg);
-
-        memset(xfers, 0, sizeof(xfers));
-        for (i = 0; i <= ADIS16209_OUTPUTS; i++) {
-                xfers[i].bits_per_word = 8;
-                xfers[i].cs_change = 1;
-                xfers[i].len = 2;
-                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);
-                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 irqreturn_t adis16209_trigger_handler(int irq, void *p)
-{
-        struct iio_poll_func *pf = p;
-        struct iio_dev *indio_dev = pf->indio_dev;
-        struct adis16209_state *st = iio_priv(indio_dev);
-        int i = 0;
-        s16 *data;
-
-        data = kmalloc(indio_dev->scan_bytes, GFP_KERNEL);
-        if (data == NULL) {
-                dev_err(&st->us->dev, "memory alloc failed in ring bh");
-                goto done;
-        }
-
-        if (!bitmap_empty(indio_dev->active_scan_mask, indio_dev->masklength) &&
-            adis16209_read_ring_data(indio_dev, st->rx) >= 0)
-                for (; i < bitmap_weight(indio_dev->active_scan_mask,
-                                         indio_dev->masklength); i++)
-                        data[i] = be16_to_cpup((__be16 *)&(st->rx[i*2]));
-
-        /* Guaranteed to be aligned with 8 byte boundary */
-        if (indio_dev->scan_timestamp)
-                *((s64 *)(data + ((i + 3)/4)*4)) = pf->timestamp;
-
-        iio_push_to_buffer(indio_dev->buffer, (u8 *)data);
-
-        kfree(data);
-done:
-        iio_trigger_notify_done(indio_dev->trig);
-
-        return IRQ_HANDLED;
-}
-
-void adis16209_unconfigure_ring(struct iio_dev *indio_dev)
-{
-        iio_dealloc_pollfunc(indio_dev->pollfunc);
-        iio_sw_rb_free(indio_dev->buffer);
-}
-
-static const struct iio_buffer_setup_ops adis16209_ring_setup_ops = {
-        .preenable = &iio_sw_buffer_preenable,
-        .postenable = &iio_triggered_buffer_postenable,
-        .predisable = &iio_triggered_buffer_predisable,
-};
-
-int adis16209_configure_ring(struct iio_dev *indio_dev)
-{
-        int ret = 0;
-        struct iio_buffer *ring;
-
-        ring = iio_sw_rb_allocate(indio_dev);
-        if (!ring) {
-                ret = -ENOMEM;
-                return ret;
-        }
-        indio_dev->buffer = ring;
-        ring->scan_timestamp = true;
-        indio_dev->setup_ops = &adis16209_ring_setup_ops;
-
-        indio_dev->pollfunc = iio_alloc_pollfunc(&iio_pollfunc_store_time,
-                                                 &adis16209_trigger_handler,
-                                                 IRQF_ONESHOT,
-                                                 indio_dev,
-                                                 "%s_consumer%d",
-                                                 indio_dev->name,
-                                                 indio_dev->id);
-        if (indio_dev->pollfunc == NULL) {
-                ret = -ENOMEM;
-                goto error_iio_sw_rb_free;
-        }
-
-        indio_dev->modes |= INDIO_BUFFER_TRIGGERED;
-        return 0;
-
-error_iio_sw_rb_free:
-        iio_sw_rb_free(indio_dev->buffer);
-        return ret;
-}
diff --git a/drivers/staging/iio/accel/adis16209_trigger.c b/drivers/staging/iio/accel/adis16209_trigger.c
deleted file mode 100644
index 2ad93dcaf40d..000000000000
--- a/drivers/staging/iio/accel/adis16209_trigger.c
+++ /dev/null
@@ -1,81 +0,0 @@
-#include <linux/interrupt.h>
-#include <linux/kernel.h>
-#include <linux/spi/spi.h>
-#include <linux/export.h>
-
-#include <linux/iio/iio.h>
-#include <linux/iio/trigger.h>
-#include "adis16209.h"
-
-/**
- * adis16209_data_rdy_trig_poll() the event handler for the data rdy trig
- **/
-static irqreturn_t adis16209_data_rdy_trig_poll(int irq, void *trig)
-{
-        iio_trigger_poll(trig, iio_get_time_ns());
-        return IRQ_HANDLED;
-}
-
-/**
- * adis16209_data_rdy_trigger_set_state() set datardy interrupt state
- **/
-static int adis16209_data_rdy_trigger_set_state(struct iio_trigger *trig,
-                                                bool state)
-{
-        struct iio_dev *indio_dev = trig->private_data;
-
-        dev_dbg(&indio_dev->dev, "%s (%d)\n", __func__, state);
-        return adis16209_set_irq(indio_dev, state);
-}
-
-static const struct iio_trigger_ops adis16209_trigger_ops = {
-        .owner = THIS_MODULE,
-        .set_trigger_state = &adis16209_data_rdy_trigger_set_state,
-};
-
-int adis16209_probe_trigger(struct iio_dev *indio_dev)
-{
-        int ret;
-        struct adis16209_state *st = iio_priv(indio_dev);
-
-        st->trig = iio_trigger_alloc("adis16209-dev%d", indio_dev->id);
-        if (st->trig == NULL) {
-                ret = -ENOMEM;
-                goto error_ret;
-        }
-
-        ret = request_irq(st->us->irq,
-                          adis16209_data_rdy_trig_poll,
-                          IRQF_TRIGGER_RISING,
-                          "adis16209",
-                          st->trig);
-        if (ret)
-                goto error_free_trig;
-        st->trig->dev.parent = &st->us->dev;
-        st->trig->ops = &adis16209_trigger_ops;
-        st->trig->private_data = indio_dev;
-        ret = iio_trigger_register(st->trig);
-
-        /* select default trigger */
-        indio_dev->trig = st->trig;
-        if (ret)
-                goto error_free_irq;
-
-        return 0;
-
-error_free_irq:
-        free_irq(st->us->irq, st->trig);
-error_free_trig:
-        iio_trigger_free(st->trig);
-error_ret:
-        return ret;
-}
-
-void adis16209_remove_trigger(struct iio_dev *indio_dev)
-{
-        struct adis16209_state *st = iio_priv(indio_dev);
-
-        iio_trigger_unregister(st->trig);
-        free_irq(st->us->irq, st->trig);
-        iio_trigger_free(st->trig);
-}
diff --git a/drivers/staging/iio/accel/adis16220.h b/drivers/staging/iio/accel/adis16220.h
index 024313cf5cf0..a894ad7fb26d 100644
--- a/drivers/staging/iio/accel/adis16220.h
+++ b/drivers/staging/iio/accel/adis16220.h
@@ -1,10 +1,9 @@
 #ifndef SPI_ADIS16220_H_
 #define SPI_ADIS16220_H_
 
-#define ADIS16220_STARTUP_DELAY 220 /* ms */
+#include <linux/iio/imu/adis.h>
 
-#define ADIS16220_READ_REG(a)    a
-#define ADIS16220_WRITE_REG(a) ((a) | 0x80)
+#define ADIS16220_STARTUP_DELAY 220 /* ms */
 
 /* Flash memory write count */
 #define ADIS16220_FLASH_CNT     0x00
@@ -102,15 +101,15 @@
 #define ADIS16220_DIAG_STAT_FLASH_CHK   (1<<6)
 #define ADIS16220_DIAG_STAT_SELF_TEST   (1<<5)
 /* Capture period violation/interruption */
-#define ADIS16220_DIAG_STAT_VIOLATION   (1<<4)
+#define ADIS16220_DIAG_STAT_VIOLATION_BIT       4
 /* SPI communications failure */
-#define ADIS16220_DIAG_STAT_SPI_FAIL    (1<<3)
+#define ADIS16220_DIAG_STAT_SPI_FAIL_BIT        3
 /* Flash update failure */
-#define ADIS16220_DIAG_STAT_FLASH_UPT   (1<<2)
+#define ADIS16220_DIAG_STAT_FLASH_UPT_BIT       2
 /* Power supply above 3.625 V */
-#define ADIS16220_DIAG_STAT_POWER_HIGH  (1<<1)
+#define ADIS16220_DIAG_STAT_POWER_HIGH_BIT      1
 /* Power supply below 3.15 V */
-#define ADIS16220_DIAG_STAT_POWER_LOW   (1<<0)
+#define ADIS16220_DIAG_STAT_POWER_LOW_BIT       0
 
 /* GLOB_CMD */
 #define ADIS16220_GLOB_CMD_SW_RESET     (1<<7)
@@ -125,13 +124,14 @@
 
 /**
  * struct adis16220_state - device instance specific data
- * @us:                 actual spi_device
+ * @adis:               adis device
  * @tx:                 transmit buffer
  * @rx:                 receive buffer
  * @buf_lock:           mutex to protect tx and rx
  **/
 struct adis16220_state {
-        struct spi_device       *us;
+        struct adis adis;
+
         struct mutex            buf_lock;
         u8                      tx[ADIS16220_MAX_TX] ____cacheline_aligned;
         u8                      rx[ADIS16220_MAX_RX];
diff --git a/drivers/staging/iio/accel/adis16220_core.c b/drivers/staging/iio/accel/adis16220_core.c
index eaadd9df3f78..370b01aa767a 100644
--- a/drivers/staging/iio/accel/adis16220_core.c
+++ b/drivers/staging/iio/accel/adis16220_core.c
@@ -20,138 +20,19 @@
 
 #include "adis16220.h"
 
-#define DRIVER_NAME             "adis16220"
-
-/**
- * adis16220_spi_write_reg_8() - write single byte to a register
- * @indio_dev: iio device associated with child of actual device
- * @reg_address: the address of the register to be written
- * @val: the value to write
- **/
-static int adis16220_spi_write_reg_8(struct iio_dev *indio_dev,
-                u8 reg_address,
-                u8 val)
-{
-        int ret;
-        struct adis16220_state *st = iio_priv(indio_dev);
-
-        mutex_lock(&st->buf_lock);
-        st->tx[0] = ADIS16220_WRITE_REG(reg_address);
-        st->tx[1] = val;
-
-        ret = spi_write(st->us, st->tx, 2);
-        mutex_unlock(&st->buf_lock);
-
-        return ret;
-}
-
-/**
- * adis16220_spi_write_reg_16() - write 2 bytes to a pair of registers
- * @indio_dev:  iio device associated with child of actual device
- * @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 adis16220_spi_write_reg_16(struct iio_dev *indio_dev,
-                u8 lower_reg_address,
-                u16 value)
-{
-        int ret;
-        struct spi_message msg;
-        struct adis16220_state *st = iio_priv(indio_dev);
-        struct spi_transfer xfers[] = {
-                {
-                        .tx_buf = st->tx,
-                        .bits_per_word = 8,
-                        .len = 2,
-                        .cs_change = 1,
-                        .delay_usecs = 35,
-                }, {
-                        .tx_buf = st->tx + 2,
-                        .bits_per_word = 8,
-                        .len = 2,
-                        .delay_usecs = 35,
-                },
-        };
-
-        mutex_lock(&st->buf_lock);
-        st->tx[0] = ADIS16220_WRITE_REG(lower_reg_address);
-        st->tx[1] = value & 0xFF;
-        st->tx[2] = ADIS16220_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;
-}
-
-/**
- * adis16220_spi_read_reg_16() - read 2 bytes from a 16-bit register
- * @indio_dev: iio device associated with child of actual device
- * @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 adis16220_spi_read_reg_16(struct iio_dev *indio_dev,
-                                     u8 lower_reg_address,
-                                     u16 *val)
-{
-        struct spi_message msg;
-        struct adis16220_state *st = iio_priv(indio_dev);
-        int ret;
-        struct spi_transfer xfers[] = {
-                {
-                        .tx_buf = st->tx,
-                        .bits_per_word = 8,
-                        .len = 2,
-                        .cs_change = 1,
-                        .delay_usecs = 35,
-                }, {
-                        .rx_buf = st->rx,
-                        .bits_per_word = 8,
-                        .len = 2,
-                        .cs_change = 1,
-                        .delay_usecs = 35,
-                },
-        };
-
-        mutex_lock(&st->buf_lock);
-        st->tx[0] = ADIS16220_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 adis16220_read_16bit(struct device *dev,
                 struct device_attribute *attr,
                 char *buf)
 {
         struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
         struct iio_dev *indio_dev = dev_to_iio_dev(dev);
+        struct adis16220_state *st = iio_priv(indio_dev);
         ssize_t ret;
         s16 val = 0;
 
         /* Take the iio_dev status lock */
         mutex_lock(&indio_dev->mlock);
-        ret = adis16220_spi_read_reg_16(indio_dev, this_attr->address,
+        ret = adis_read_reg_16(&st->adis, this_attr->address,
                                         (u16 *)&val);
         mutex_unlock(&indio_dev->mlock);
         if (ret)
@@ -166,13 +47,14 @@ static ssize_t adis16220_write_16bit(struct device *dev,
 {
         struct iio_dev *indio_dev = dev_to_iio_dev(dev);
         struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
+        struct adis16220_state *st = iio_priv(indio_dev);
         int ret;
         u16 val;
 
         ret = kstrtou16(buf, 10, &val);
         if (ret)
                 goto error_ret;
-        ret = adis16220_spi_write_reg_16(indio_dev, this_attr->address, val);
+        ret = adis_write_reg_16(&st->adis, this_attr->address, val);
 
 error_ret:
         return ret ? ret : len;
@@ -180,10 +62,11 @@ error_ret:
 
 static int adis16220_capture(struct iio_dev *indio_dev)
 {
+        struct adis16220_state *st = iio_priv(indio_dev);
         int ret;
-        ret = adis16220_spi_write_reg_16(indio_dev,
-                        ADIS16220_GLOB_CMD,
-                        0xBF08); /* initiates a manual data capture */
+
+         /* initiates a manual data capture */
+        ret = adis_write_reg_16(&st->adis, ADIS16220_GLOB_CMD, 0xBF08);
         if (ret)
                 dev_err(&indio_dev->dev, "problem beginning capture");
 
@@ -192,18 +75,6 @@ static int adis16220_capture(struct iio_dev *indio_dev)
         return ret;
 }
 
-static int adis16220_reset(struct iio_dev *indio_dev)
-{
-        int ret;
-        ret = adis16220_spi_write_reg_8(indio_dev,
-                        ADIS16220_GLOB_CMD,
-                        ADIS16220_GLOB_CMD_SW_RESET);
-        if (ret)
-                dev_err(&indio_dev->dev, "problem resetting device");
-
-        return ret;
-}
-
 static ssize_t adis16220_write_capture(struct device *dev,
                 struct device_attribute *attr,
                 const char *buf, size_t len)
@@ -224,81 +95,6 @@ static ssize_t adis16220_write_capture(struct device *dev,
         return len;
 }
 
-static int adis16220_check_status(struct iio_dev *indio_dev)
-{
-        u16 status;
-        int ret;
-
-        ret = adis16220_spi_read_reg_16(indio_dev, ADIS16220_DIAG_STAT,
-                                        &status);
-
-        if (ret < 0) {
-                dev_err(&indio_dev->dev, "Reading status failed\n");
-                goto error_ret;
-        }
-        ret = status & 0x7F;
-
-        if (status & ADIS16220_DIAG_STAT_VIOLATION)
-                dev_err(&indio_dev->dev,
-                        "Capture period violation/interruption\n");
-        if (status & ADIS16220_DIAG_STAT_SPI_FAIL)
-                dev_err(&indio_dev->dev, "SPI failure\n");
-        if (status & ADIS16220_DIAG_STAT_FLASH_UPT)
-                dev_err(&indio_dev->dev, "Flash update failed\n");
-        if (status & ADIS16220_DIAG_STAT_POWER_HIGH)
-                dev_err(&indio_dev->dev, "Power supply above 3.625V\n");
-        if (status & ADIS16220_DIAG_STAT_POWER_LOW)
-                dev_err(&indio_dev->dev, "Power supply below 3.15V\n");
-
-error_ret:
-        return ret;
-}
-
-static int adis16220_self_test(struct iio_dev *indio_dev)
-{
-        int ret;
-        ret = adis16220_spi_write_reg_16(indio_dev,
-                        ADIS16220_MSC_CTRL,
-                        ADIS16220_MSC_CTRL_SELF_TEST_EN);
-        if (ret) {
-                dev_err(&indio_dev->dev, "problem starting self test");
-                goto err_ret;
-        }
-
-        adis16220_check_status(indio_dev);
-
-err_ret:
-        return ret;
-}
-
-static int adis16220_initial_setup(struct iio_dev *indio_dev)
-{
-        int ret;
-
-        /* Do self test */
-        ret = adis16220_self_test(indio_dev);
-        if (ret) {
-                dev_err(&indio_dev->dev, "self test failure");
-                goto err_ret;
-        }
-
-        /* Read status register to check the result */
-        ret = adis16220_check_status(indio_dev);
-        if (ret) {
-                adis16220_reset(indio_dev);
-                dev_err(&indio_dev->dev, "device not playing ball -> reset");
-                msleep(ADIS16220_STARTUP_DELAY);
-                ret = adis16220_check_status(indio_dev);
-                if (ret) {
-                        dev_err(&indio_dev->dev, "giving up");
-                        goto err_ret;
-                }
-        }
-
-err_ret:
-        return ret;
-}
-
 static ssize_t adis16220_capture_buffer_read(struct iio_dev *indio_dev,
                                         char *buf,
                                         loff_t off,
@@ -335,7 +131,7 @@ static ssize_t adis16220_capture_buffer_read(struct iio_dev *indio_dev,
                 count = ADIS16220_CAPTURE_SIZE - off;
 
         /* write the begin position of capture buffer */
-        ret = adis16220_spi_write_reg_16(indio_dev,
+        ret = adis_write_reg_16(&st->adis,
                                         ADIS16220_CAPT_PNTR,
                                         off > 1);
         if (ret)
@@ -344,8 +140,9 @@ static ssize_t adis16220_capture_buffer_read(struct iio_dev *indio_dev,
         /* read count/2 values from capture buffer */
         mutex_lock(&st->buf_lock);
 
+
         for (i = 0; i < count; i += 2) {
-                st->tx[i] = ADIS16220_READ_REG(addr);
+                st->tx[i] = ADIS_READ_REG(addr);
                 st->tx[i + 1] = 0;
         }
         xfers[1].len = count;
@@ -353,7 +150,7 @@ static ssize_t adis16220_capture_buffer_read(struct iio_dev *indio_dev,
         spi_message_init(&msg);
         spi_message_add_tail(&xfers[0], &msg);
         spi_message_add_tail(&xfers[1], &msg);
-        ret = spi_sync(st->us, &msg);
+        ret = spi_sync(st->adis.spi, &msg);
         if (ret) {
 
                 mutex_unlock(&st->buf_lock);
@@ -474,6 +271,8 @@ static int adis16220_read_raw(struct iio_dev *indio_dev,
                               int *val, int *val2,
                               long mask)
 {
+        struct adis16220_state *st = iio_priv(indio_dev);
+        const struct adis16220_address_spec *addr;
         int ret = -EINVAL;
         int addrind = 0;
         u16 uval;
@@ -518,28 +317,21 @@ static int adis16220_read_raw(struct iio_dev *indio_dev,
         default:
                 return -EINVAL;
         }
-        if (adis16220_addresses[chan->address][addrind].sign) {
-                ret = adis16220_spi_read_reg_16(indio_dev,
-                                                adis16220_addresses[chan
-                                                                    ->address]
-                                                [addrind].addr,
-                                                &sval);
+        addr = &adis16220_addresses[chan->address][addrind];
+        if (addr->sign) {
+                ret = adis_read_reg_16(&st->adis, addr->addr, &sval);
                 if (ret)
                         return ret;
-                bits = adis16220_addresses[chan->address][addrind].bits;
+                bits = addr->bits;
                 sval &= (1 << bits) - 1;
                 sval = (s16)(sval << (16 - bits)) >> (16 - bits);
                 *val = sval;
                 return IIO_VAL_INT;
         } else {
-                ret = adis16220_spi_read_reg_16(indio_dev,
-                                                adis16220_addresses[chan
-                                                                    ->address]
-                                                [addrind].addr,
-                                                &uval);
+                ret = adis_read_reg_16(&st->adis, addr->addr, &uval);
                 if (ret)
                         return ret;
-                bits = adis16220_addresses[chan->address][addrind].bits;
+                bits = addr->bits;
                 uval &= (1 << bits) - 1;
                 *val = uval;
                 return IIO_VAL_INT;
@@ -603,7 +395,33 @@ static const struct iio_info adis16220_info = {
         .read_raw = &adis16220_read_raw,
 };
 
-static int __devinit adis16220_probe(struct spi_device *spi)
+static const char * const adis16220_status_error_msgs[] = {
+        [ADIS16220_DIAG_STAT_VIOLATION_BIT] = "Capture period violation/interruption",
+        [ADIS16220_DIAG_STAT_SPI_FAIL_BIT] = "SPI failure",
+        [ADIS16220_DIAG_STAT_FLASH_UPT_BIT] = "Flash update failed",
+        [ADIS16220_DIAG_STAT_POWER_HIGH_BIT] = "Power supply above 3.625V",
+        [ADIS16220_DIAG_STAT_POWER_LOW_BIT] = "Power supply below 3.15V",
+};
+
+static const struct adis_data adis16220_data = {
+        .read_delay = 35,
+        .write_delay = 35,
+        .msc_ctrl_reg = ADIS16220_MSC_CTRL,
+        .glob_cmd_reg = ADIS16220_GLOB_CMD,
+        .diag_stat_reg = ADIS16220_DIAG_STAT,
+
+        .self_test_mask = ADIS16220_MSC_CTRL_SELF_TEST_EN,
+        .startup_delay = ADIS16220_STARTUP_DELAY,
+
+        .status_error_msgs = adis16220_status_error_msgs,
+        .status_error_mask = BIT(ADIS16220_DIAG_STAT_VIOLATION_BIT) |
+                BIT(ADIS16220_DIAG_STAT_SPI_FAIL_BIT) |
+                BIT(ADIS16220_DIAG_STAT_FLASH_UPT_BIT) |
+                BIT(ADIS16220_DIAG_STAT_POWER_HIGH_BIT) |
+                BIT(ADIS16220_DIAG_STAT_POWER_LOW_BIT),
+};
+
+static int adis16220_probe(struct spi_device *spi)
 {
         int ret;
         struct adis16220_state *st;
@@ -620,9 +438,6 @@ static int __devinit adis16220_probe(struct spi_device *spi)
         /* this is only used for removal purposes */
         spi_set_drvdata(spi, indio_dev);
 
-        st->us = spi;
-        mutex_init(&st->buf_lock);
-
         indio_dev->name = spi->dev.driver->name;
         indio_dev->dev.parent = &spi->dev;
         indio_dev->info = &adis16220_info;
@@ -646,8 +461,11 @@ static int __devinit adis16220_probe(struct spi_device *spi)
         if (ret)
                 goto error_rm_adc1_bin;
 
+        ret = adis_init(&st->adis, indio_dev, spi, &adis16220_data);
+        if (ret)
+                goto error_rm_adc2_bin;
         /* Get the device into a sane initial state */
-        ret = adis16220_initial_setup(indio_dev);
+        ret = adis_initial_startup(&st->adis);
         if (ret)
                 goto error_rm_adc2_bin;
         return 0;
@@ -666,7 +484,7 @@ error_ret:
         return ret;
 }
 
-static int __devexit adis16220_remove(struct spi_device *spi)
+static int adis16220_remove(struct spi_device *spi)
 {
         struct iio_dev *indio_dev = spi_get_drvdata(spi);
 
@@ -685,7 +503,7 @@ static struct spi_driver adis16220_driver = {
                 .owner = THIS_MODULE,
         },
         .probe = adis16220_probe,
-        .remove = __devexit_p(adis16220_remove),
+        .remove = adis16220_remove,
 };
 module_spi_driver(adis16220_driver);
 
diff --git a/drivers/staging/iio/accel/adis16240.h b/drivers/staging/iio/accel/adis16240.h
index 3fabcc0b3471..d442d49f51f4 100644
--- a/drivers/staging/iio/accel/adis16240.h
+++ b/drivers/staging/iio/accel/adis16240.h
@@ -3,9 +3,6 @@
 
 #define ADIS16240_STARTUP_DELAY 220 /* ms */
 
-#define ADIS16240_READ_REG(a)    a
-#define ADIS16240_WRITE_REG(a) ((a) | 0x80)
-
 /* Flash memory write count */
 #define ADIS16240_FLASH_CNT      0x00
 /* Output, power supply */
@@ -75,8 +72,6 @@
 /* System command */
 #define ADIS16240_GLOB_CMD       0x4A
 
-#define ADIS16240_OUTPUTS        6
-
 /* MSC_CTRL */
 /* Enables sum-of-squares output (XYZPEAK_OUT) */
 #define ADIS16240_MSC_CTRL_XYZPEAK_OUT_EN       (1 << 15)
@@ -101,17 +96,17 @@
 /* Flash test, checksum flag: 1 = mismatch, 0 = match */
 #define ADIS16240_DIAG_STAT_CHKSUM      (1<<6)
 /* Power-on, self-test flag: 1 = failure, 0 = pass */
-#define ADIS16240_DIAG_STAT_PWRON_FAIL  (1<<5)
+#define ADIS16240_DIAG_STAT_PWRON_FAIL_BIT  5
 /* Power-on self-test: 1 = in-progress, 0 = complete */
 #define ADIS16240_DIAG_STAT_PWRON_BUSY  (1<<4)
 /* SPI communications failure */
-#define ADIS16240_DIAG_STAT_SPI_FAIL    (1<<3)
+#define ADIS16240_DIAG_STAT_SPI_FAIL_BIT        3
 /* Flash update failure */
-#define ADIS16240_DIAG_STAT_FLASH_UPT   (1<<2)
+#define ADIS16240_DIAG_STAT_FLASH_UPT_BIT       2
 /* Power supply above 3.625 V */
-#define ADIS16240_DIAG_STAT_POWER_HIGH  (1<<1)
+#define ADIS16240_DIAG_STAT_POWER_HIGH_BIT      1
  /* Power supply below 3.15 V */
-#define ADIS16240_DIAG_STAT_POWER_LOW   (1<<0)
+#define ADIS16240_DIAG_STAT_POWER_LOW_BIT       0
 
 /* GLOB_CMD */
 #define ADIS16240_GLOB_CMD_RESUME       (1<<8)
@@ -120,77 +115,15 @@
 
 #define ADIS16240_ERROR_ACTIVE          (1<<14)
 
-#define ADIS16240_MAX_TX 24
-#define ADIS16240_MAX_RX 24
-
-/**
- * struct adis16240_state - device instance specific data
- * @us:                 actual spi_device
- * @trig:               data ready trigger registered with iio
- * @tx:                 transmit buffer
- * @rx:                 receive buffer
- * @buf_lock:           mutex to protect tx and rx
- **/
-struct adis16240_state {
-        struct spi_device       *us;
-        struct iio_trigger      *trig;
-        struct mutex            buf_lock;
-        u8                      tx[ADIS16240_MAX_TX] ____cacheline_aligned;
-        u8                      rx[ADIS16240_MAX_RX];
-};
-
-int adis16240_set_irq(struct iio_dev *indio_dev, bool enable);
-
 /* At the moment triggers are only used for ring buffer
  * filling. This may change!
  */
 
-#define ADIS16240_SCAN_SUPPLY   0
-#define ADIS16240_SCAN_ACC_X    1
-#define ADIS16240_SCAN_ACC_Y    2
-#define ADIS16240_SCAN_ACC_Z    3
+#define ADIS16240_SCAN_ACC_X    0
+#define ADIS16240_SCAN_ACC_Y    1
+#define ADIS16240_SCAN_ACC_Z    2
+#define ADIS16240_SCAN_SUPPLY   3
 #define ADIS16240_SCAN_AUX_ADC  4
 #define ADIS16240_SCAN_TEMP     5
 
-#ifdef CONFIG_IIO_BUFFER
-void adis16240_remove_trigger(struct iio_dev *indio_dev);
-int adis16240_probe_trigger(struct iio_dev *indio_dev);
-
-ssize_t adis16240_read_data_from_ring(struct device *dev,
-                                      struct device_attribute *attr,
-                                      char *buf);
-
-
-int adis16240_configure_ring(struct iio_dev *indio_dev);
-void adis16240_unconfigure_ring(struct iio_dev *indio_dev);
-
-#else /* CONFIG_IIO_BUFFER */
-
-static inline void adis16240_remove_trigger(struct iio_dev *indio_dev)
-{
-}
-
-static inline int adis16240_probe_trigger(struct iio_dev *indio_dev)
-{
-        return 0;
-}
-
-static inline ssize_t
-adis16240_read_data_from_ring(struct device *dev,
-                              struct device_attribute *attr,
-                              char *buf)
-{
-        return 0;
-}
-
-static int adis16240_configure_ring(struct iio_dev *indio_dev)
-{
-        return 0;
-}
-
-static inline void adis16240_unconfigure_ring(struct iio_dev *indio_dev)
-{
-}
-
-#endif /* CONFIG_IIO_BUFFER */
 #endif /* SPI_ADIS16240_H_ */
diff --git a/drivers/staging/iio/accel/adis16240_core.c b/drivers/staging/iio/accel/adis16240_core.c
index 35e093973d5c..e97fa0b0233d 100644
--- a/drivers/staging/iio/accel/adis16240_core.c
+++ b/drivers/staging/iio/accel/adis16240_core.c
@@ -22,151 +22,29 @@
 #include <linux/iio/iio.h>
 #include <linux/iio/sysfs.h>
 #include <linux/iio/buffer.h>
+#include <linux/iio/imu/adis.h>
 
 #include "adis16240.h"
 
-#define DRIVER_NAME             "adis16240"
-
-static int adis16240_check_status(struct iio_dev *indio_dev);
-
-/**
- * adis16240_spi_write_reg_8() - write single byte to a register
- * @indio_dev: iio_dev associated with device
- * @reg_address: the address of the register to be written
- * @val: the value to write
- **/
-static int adis16240_spi_write_reg_8(struct iio_dev *indio_dev,
-                                     u8 reg_address,
-                                     u8 val)
-{
-        int ret;
-        struct adis16240_state *st = iio_priv(indio_dev);
-
-        mutex_lock(&st->buf_lock);
-        st->tx[0] = ADIS16240_WRITE_REG(reg_address);
-        st->tx[1] = val;
-
-        ret = spi_write(st->us, st->tx, 2);
-        mutex_unlock(&st->buf_lock);
-
-        return ret;
-}
-
-/**
- * adis16240_spi_write_reg_16() - write 2 bytes to a pair of registers
- * @indio_dev: iio_dev for this device
- * @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 adis16240_spi_write_reg_16(struct iio_dev *indio_dev,
-                                      u8 lower_reg_address,
-                                      u16 value)
-{
-        int ret;
-        struct spi_message msg;
-        struct adis16240_state *st = iio_priv(indio_dev);
-        struct spi_transfer xfers[] = {
-                {
-                        .tx_buf = st->tx,
-                        .bits_per_word = 8,
-                        .len = 2,
-                        .cs_change = 1,
-                        .delay_usecs = 35,
-                }, {
-                        .tx_buf = st->tx + 2,
-                        .bits_per_word = 8,
-                        .len = 2,
-                        .delay_usecs = 35,
-                },
-        };
-
-        mutex_lock(&st->buf_lock);
-        st->tx[0] = ADIS16240_WRITE_REG(lower_reg_address);
-        st->tx[1] = value & 0xFF;
-        st->tx[2] = ADIS16240_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;
-}
-
-/**
- * adis16240_spi_read_reg_16() - read 2 bytes from a 16-bit register
- * @indio_dev: iio_dev for this device
- * @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 adis16240_spi_read_reg_16(struct iio_dev *indio_dev,
-                u8 lower_reg_address,
-                u16 *val)
-{
-        struct spi_message msg;
-        struct adis16240_state *st = iio_priv(indio_dev);
-        int ret;
-        struct spi_transfer xfers[] = {
-                {
-                        .tx_buf = st->tx,
-                        .bits_per_word = 8,
-                        .len = 2,
-                        .cs_change = 1,
-                        .delay_usecs = 35,
-                }, {
-                        .rx_buf = st->rx,
-                        .bits_per_word = 8,
-                        .len = 2,
-                        .cs_change = 1,
-                        .delay_usecs = 35,
-                },
-        };
-
-        mutex_lock(&st->buf_lock);
-        st->tx[0] = ADIS16240_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;
-}
-
 static ssize_t adis16240_spi_read_signed(struct device *dev,
                 struct device_attribute *attr,
                 char *buf,
                 unsigned bits)
 {
         struct iio_dev *indio_dev = dev_to_iio_dev(dev);
+        struct adis *st = iio_priv(indio_dev);
         int ret;
         s16 val = 0;
         unsigned shift = 16 - bits;
         struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
 
-        ret = adis16240_spi_read_reg_16(indio_dev,
+        ret = adis_read_reg_16(st,
                                         this_attr->address, (u16 *)&val);
         if (ret)
                 return ret;
 
         if (val & ADIS16240_ERROR_ACTIVE)
-                adis16240_check_status(indio_dev);
+                adis_check_status(st);
 
         val = ((s16)(val << shift) >> shift);
         return sprintf(buf, "%d\n", val);
@@ -187,152 +65,16 @@ static ssize_t adis16240_read_12bit_signed(struct device *dev,
         return ret;
 }
 
-static int adis16240_reset(struct iio_dev *indio_dev)
-{
-        int ret;
-        ret = adis16240_spi_write_reg_8(indio_dev,
-                        ADIS16240_GLOB_CMD,
-                        ADIS16240_GLOB_CMD_SW_RESET);
-        if (ret)
-                dev_err(&indio_dev->dev, "problem resetting device");
-
-        return ret;
-}
-
-int adis16240_set_irq(struct iio_dev *indio_dev, bool enable)
-{
-        int ret = 0;
-        u16 msc;
-
-        ret = adis16240_spi_read_reg_16(indio_dev,
-                                        ADIS16240_MSC_CTRL, &msc);
-        if (ret)
-                goto error_ret;
-
-        msc |= ADIS16240_MSC_CTRL_ACTIVE_HIGH;
-        msc &= ~ADIS16240_MSC_CTRL_DATA_RDY_DIO2;
-        if (enable)
-                msc |= ADIS16240_MSC_CTRL_DATA_RDY_EN;
-        else
-                msc &= ~ADIS16240_MSC_CTRL_DATA_RDY_EN;
-
-        ret = adis16240_spi_write_reg_16(indio_dev,
-                                         ADIS16240_MSC_CTRL, msc);
-
-error_ret:
-        return ret;
-}
-
-static int adis16240_self_test(struct iio_dev *indio_dev)
-{
-        int ret;
-        ret = adis16240_spi_write_reg_16(indio_dev,
-                        ADIS16240_MSC_CTRL,
-                        ADIS16240_MSC_CTRL_SELF_TEST_EN);
-        if (ret) {
-                dev_err(&indio_dev->dev, "problem starting self test");
-                goto err_ret;
-        }
-
-        msleep(ADIS16240_STARTUP_DELAY);
-
-        adis16240_check_status(indio_dev);
-
-err_ret:
-        return ret;
-}
-
-static int adis16240_check_status(struct iio_dev *indio_dev)
-{
-        u16 status;
-        int ret;
-        struct device *dev = &indio_dev->dev;
-
-        ret = adis16240_spi_read_reg_16(indio_dev,
-                                        ADIS16240_DIAG_STAT, &status);
-
-        if (ret < 0) {
-                dev_err(dev, "Reading status failed\n");
-                goto error_ret;
-        }
-
-        ret = status & 0x2F;
-        if (status & ADIS16240_DIAG_STAT_PWRON_FAIL)
-                dev_err(dev, "Power-on, self-test fail\n");
-        if (status & ADIS16240_DIAG_STAT_SPI_FAIL)
-                dev_err(dev, "SPI failure\n");
-        if (status & ADIS16240_DIAG_STAT_FLASH_UPT)
-                dev_err(dev, "Flash update failed\n");
-        if (status & ADIS16240_DIAG_STAT_POWER_HIGH)
-                dev_err(dev, "Power supply above 3.625V\n");
-        if (status & ADIS16240_DIAG_STAT_POWER_LOW)
-                dev_err(dev, "Power supply below 2.225V\n");
-
-error_ret:
-        return ret;
-}
-
-static int adis16240_initial_setup(struct iio_dev *indio_dev)
-{
-        int ret;
-        struct device *dev = &indio_dev->dev;
-
-        /* Disable IRQ */
-        ret = adis16240_set_irq(indio_dev, false);
-        if (ret) {
-                dev_err(dev, "disable irq failed");
-                goto err_ret;
-        }
-
-        /* Do self test */
-        ret = adis16240_self_test(indio_dev);
-        if (ret) {
-                dev_err(dev, "self test failure");
-                goto err_ret;
-        }
-
-        /* Read status register to check the result */
-        ret = adis16240_check_status(indio_dev);
-        if (ret) {
-                adis16240_reset(indio_dev);
-                dev_err(dev, "device not playing ball -> reset");
-                msleep(ADIS16240_STARTUP_DELAY);
-                ret = adis16240_check_status(indio_dev);
-                if (ret) {
-                        dev_err(dev, "giving up");
-                        goto err_ret;
-                }
-        }
-
-err_ret:
-        return ret;
-}
-
 static IIO_DEVICE_ATTR(in_accel_xyz_squared_peak_raw, S_IRUGO,
                        adis16240_read_12bit_signed, NULL,
                        ADIS16240_XYZPEAK_OUT);
 
 static IIO_CONST_ATTR_SAMP_FREQ_AVAIL("4096");
 
-enum adis16240_chan {
-        in_supply,
-        in_aux,
-        accel_x,
-        accel_y,
-        accel_z,
-        temp,
-};
-
-static const u8 adis16240_addresses[6][3] = {
-        [in_supply] = { ADIS16240_SUPPLY_OUT },
-        [in_aux] = { ADIS16240_AUX_ADC },
-        [accel_x] = { ADIS16240_XACCL_OUT, ADIS16240_XACCL_OFF,
-                      ADIS16240_XPEAK_OUT },
-        [accel_y] = { ADIS16240_YACCL_OUT, ADIS16240_YACCL_OFF,
-                      ADIS16240_YPEAK_OUT },
-        [accel_z] = { ADIS16240_ZACCL_OUT, ADIS16240_ZACCL_OFF,
-                      ADIS16240_ZPEAK_OUT },
-        [temp] = { ADIS16240_TEMP_OUT },
+static const u8 adis16240_addresses[][2] = {
+        [ADIS16240_SCAN_ACC_X] = { ADIS16240_XACCL_OFF, ADIS16240_XPEAK_OUT },
+        [ADIS16240_SCAN_ACC_Y] = { ADIS16240_YACCL_OFF, ADIS16240_YPEAK_OUT },
+        [ADIS16240_SCAN_ACC_Z] = { ADIS16240_ZACCL_OFF, ADIS16240_ZPEAK_OUT },
 };
 
 static int adis16240_read_raw(struct iio_dev *indio_dev,
@@ -340,6 +82,7 @@ static int adis16240_read_raw(struct iio_dev *indio_dev,
                               int *val, int *val2,
                               long mask)
 {
+        struct adis *st = iio_priv(indio_dev);
         int ret;
         int bits;
         u8 addr;
@@ -347,29 +90,8 @@ static int adis16240_read_raw(struct iio_dev *indio_dev,
 
         switch (mask) {
         case IIO_CHAN_INFO_RAW:
-                mutex_lock(&indio_dev->mlock);
-                addr = adis16240_addresses[chan->address][0];
-                ret = adis16240_spi_read_reg_16(indio_dev, addr, &val16);
-                if (ret) {
-                        mutex_unlock(&indio_dev->mlock);
-                        return ret;
-                }
-
-                if (val16 & ADIS16240_ERROR_ACTIVE) {
-                        ret = adis16240_check_status(indio_dev);
-                        if (ret) {
-                                mutex_unlock(&indio_dev->mlock);
-                                return ret;
-                        }
-                }
-                val16 = val16 & ((1 << chan->scan_type.realbits) - 1);
-                if (chan->scan_type.sign == 's')
-                        val16 = (s16)(val16 <<
-                                      (16 - chan->scan_type.realbits)) >>
-                                (16 - chan->scan_type.realbits);
-                *val = val16;
-                mutex_unlock(&indio_dev->mlock);
-                return IIO_VAL_INT;
+                return adis_single_conversion(indio_dev, chan,
+                                ADIS16240_ERROR_ACTIVE, val);
         case IIO_CHAN_INFO_SCALE:
                 switch (chan->type) {
                 case IIO_VOLTAGE:
@@ -402,8 +124,8 @@ static int adis16240_read_raw(struct iio_dev *indio_dev,
         case IIO_CHAN_INFO_CALIBBIAS:
                 bits = 10;
                 mutex_lock(&indio_dev->mlock);
-                addr = adis16240_addresses[chan->address][1];
-                ret = adis16240_spi_read_reg_16(indio_dev, addr, &val16);
+                addr = adis16240_addresses[chan->scan_index][0];
+                ret = adis_read_reg_16(st, addr, &val16);
                 if (ret) {
                         mutex_unlock(&indio_dev->mlock);
                         return ret;
@@ -416,8 +138,8 @@ static int adis16240_read_raw(struct iio_dev *indio_dev,
         case IIO_CHAN_INFO_PEAK:
                 bits = 10;
                 mutex_lock(&indio_dev->mlock);
-                addr = adis16240_addresses[chan->address][2];
-                ret = adis16240_spi_read_reg_16(indio_dev, addr, &val16);
+                addr = adis16240_addresses[chan->scan_index][1];
+                ret = adis_read_reg_16(st, addr, &val16);
                 if (ret) {
                         mutex_unlock(&indio_dev->mlock);
                         return ret;
@@ -437,104 +159,32 @@ static int adis16240_write_raw(struct iio_dev *indio_dev,
                                int val2,
                                long mask)
 {
+        struct adis *st = iio_priv(indio_dev);
         int bits = 10;
         s16 val16;
         u8 addr;
         switch (mask) {
         case IIO_CHAN_INFO_CALIBBIAS:
                 val16 = val & ((1 << bits) - 1);
-                addr = adis16240_addresses[chan->address][1];
-                return adis16240_spi_write_reg_16(indio_dev, addr, val16);
+                addr = adis16240_addresses[chan->scan_index][0];
+                return adis_write_reg_16(st, addr, val16);
         }
         return -EINVAL;
 }
 
 static const struct iio_chan_spec adis16240_channels[] = {
-        {
-                .type = IIO_VOLTAGE,
-                .indexed = 1,
-                .channel = 0,
-                .extend_name = "supply",
-                .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |
-                IIO_CHAN_INFO_SCALE_SEPARATE_BIT,
-                .address = in_supply,
-                .scan_index = ADIS16240_SCAN_SUPPLY,
-                .scan_type = {
-                        .sign = 'u',
-                        .realbits = 10,
-                        .storagebits = 16,
-                },
-        }, {
-                .type = IIO_VOLTAGE,
-                .indexed = 1,
-                .channel = 1,
-                .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT,
-                .address = in_aux,
-                .scan_index = ADIS16240_SCAN_AUX_ADC,
-                .scan_type = {
-                        .sign = 'u',
-                        .realbits = 10,
-                        .storagebits = 16,
-                },
-        }, {
-                .type = IIO_ACCEL,
-                .modified = 1,
-                .channel2 = IIO_MOD_X,
-                .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |
-                IIO_CHAN_INFO_SCALE_SHARED_BIT |
+        ADIS_SUPPLY_CHAN(ADIS16240_SUPPLY_OUT, ADIS16240_SCAN_SUPPLY, 10),
+        ADIS_AUX_ADC_CHAN(ADIS16240_AUX_ADC, ADIS16240_SCAN_AUX_ADC, 10),
+        ADIS_ACCEL_CHAN(X, ADIS16240_XACCL_OUT, ADIS16240_SCAN_ACC_X,
                 IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT |
-                IIO_CHAN_INFO_PEAK_SEPARATE_BIT,
-                .address = accel_x,
-                .scan_index = ADIS16240_SCAN_ACC_X,
-                .scan_type = {
-                        .sign = 's',
-                        .realbits = 10,
-                        .storagebits = 16,
-                },
-        }, {
-                .type = IIO_ACCEL,
-                .modified = 1,
-                .channel2 = IIO_MOD_Y,
-                .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |
-                IIO_CHAN_INFO_SCALE_SHARED_BIT |
+                IIO_CHAN_INFO_PEAK_SEPARATE_BIT, 10),
+        ADIS_ACCEL_CHAN(Y, ADIS16240_YACCL_OUT, ADIS16240_SCAN_ACC_Y,
                 IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT |
-                IIO_CHAN_INFO_PEAK_SEPARATE_BIT,
-                .address = accel_y,
-                .scan_index = ADIS16240_SCAN_ACC_Y,
-                .scan_type = {
-                        .sign = 's',
-                        .realbits = 10,
-                        .storagebits = 16,
-                },
-        }, {
-                .type = IIO_ACCEL,
-                .modified = 1,
-                .channel2 = IIO_MOD_Z,
-                .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |
-                IIO_CHAN_INFO_SCALE_SHARED_BIT |
+                IIO_CHAN_INFO_PEAK_SEPARATE_BIT, 10),
+        ADIS_ACCEL_CHAN(Z, ADIS16240_ZACCL_OUT, ADIS16240_SCAN_ACC_Z,
                 IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT |
-                IIO_CHAN_INFO_PEAK_SEPARATE_BIT,
-                .address = accel_z,
-                .scan_index = ADIS16240_SCAN_ACC_Z,
-                .scan_type = {
-                        .sign = 's',
-                        .realbits = 10,
-                        .storagebits = 16,
-                },
-        }, {
-                .type = IIO_TEMP,
-                .indexed = 1,
-                .channel = 0,
-                .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |
-                IIO_CHAN_INFO_SCALE_SEPARATE_BIT,
-                .address = temp,
-                .scan_index = ADIS16240_SCAN_TEMP,
-                .scan_type = {
-                        .sign = 'u',
-                        .realbits = 10,
-                        .storagebits = 16,
-                },
-        },
+                IIO_CHAN_INFO_PEAK_SEPARATE_BIT, 10),
+        ADIS_TEMP_CHAN(ADIS16240_TEMP_OUT, ADIS16240_SCAN_TEMP, 10),
         IIO_CHAN_SOFT_TIMESTAMP(6)
 };
 
@@ -552,13 +202,40 @@ static const struct iio_info adis16240_info = {
         .attrs = &adis16240_attribute_group,
         .read_raw = &adis16240_read_raw,
         .write_raw = &adis16240_write_raw,
+        .update_scan_mode = adis_update_scan_mode,
         .driver_module = THIS_MODULE,
 };
 
-static int __devinit adis16240_probe(struct spi_device *spi)
+static const char * const adis16240_status_error_msgs[] = {
+        [ADIS16240_DIAG_STAT_PWRON_FAIL_BIT] = "Power on, self-test failed",
+        [ADIS16240_DIAG_STAT_SPI_FAIL_BIT] = "SPI failure",
+        [ADIS16240_DIAG_STAT_FLASH_UPT_BIT] = "Flash update failed",
+        [ADIS16240_DIAG_STAT_POWER_HIGH_BIT] = "Power supply above 3.625V",
+        [ADIS16240_DIAG_STAT_POWER_LOW_BIT] = "Power supply below 2.225V",
+};
+
+static const struct adis_data adis16240_data = {
+        .write_delay = 35,
+        .read_delay = 35,
+        .msc_ctrl_reg = ADIS16240_MSC_CTRL,
+        .glob_cmd_reg = ADIS16240_GLOB_CMD,
+        .diag_stat_reg = ADIS16240_DIAG_STAT,
+
+        .self_test_mask = ADIS16240_MSC_CTRL_SELF_TEST_EN,
+        .startup_delay = ADIS16240_STARTUP_DELAY,
+
+        .status_error_msgs = adis16240_status_error_msgs,
+        .status_error_mask = BIT(ADIS16240_DIAG_STAT_PWRON_FAIL_BIT) |
+                BIT(ADIS16240_DIAG_STAT_SPI_FAIL_BIT) |
+                BIT(ADIS16240_DIAG_STAT_FLASH_UPT_BIT) |
+                BIT(ADIS16240_DIAG_STAT_POWER_HIGH_BIT) |
+                BIT(ADIS16240_DIAG_STAT_POWER_LOW_BIT),
+};
+
+static int adis16240_probe(struct spi_device *spi)
 {
         int ret;
-        struct adis16240_state *st;
+        struct adis *st;
         struct iio_dev *indio_dev;
 
         /* setup the industrialio driver allocated elements */
@@ -571,9 +248,6 @@ static int __devinit adis16240_probe(struct spi_device *spi)
         /* this is only used for removal purposes */
         spi_set_drvdata(spi, indio_dev);
 
-        st->us = spi;
-        mutex_init(&st->buf_lock);
-
         indio_dev->name = spi->dev.driver->name;
         indio_dev->dev.parent = &spi->dev;
         indio_dev->info = &adis16240_info;
@@ -581,54 +255,37 @@ static int __devinit adis16240_probe(struct spi_device *spi)
         indio_dev->num_channels = ARRAY_SIZE(adis16240_channels);
         indio_dev->modes = INDIO_DIRECT_MODE;
 
-        ret = adis16240_configure_ring(indio_dev);
+        ret = adis_init(st, indio_dev, spi, &adis16240_data);
+        if (ret)
+                goto error_free_dev;
+        ret = adis_setup_buffer_and_trigger(st, indio_dev, NULL);
         if (ret)
                 goto error_free_dev;
-
-        ret = iio_buffer_register(indio_dev,
-                                  adis16240_channels,
-                                  ARRAY_SIZE(adis16240_channels));
-        if (ret) {
-                printk(KERN_ERR "failed to initialize the ring\n");
-                goto error_unreg_ring_funcs;
-        }
-
-        if (spi->irq) {
-                ret = adis16240_probe_trigger(indio_dev);
-                if (ret)
-                        goto error_uninitialize_ring;
-        }
 
         /* Get the device into a sane initial state */
-        ret = adis16240_initial_setup(indio_dev);
+        ret = adis_initial_startup(st);
         if (ret)
-                goto error_remove_trigger;
+                goto error_cleanup_buffer_trigger;
         ret = iio_device_register(indio_dev);
         if (ret)
-                goto error_remove_trigger;
+                goto error_cleanup_buffer_trigger;
         return 0;
 
-error_remove_trigger:
-        adis16240_remove_trigger(indio_dev);
-error_uninitialize_ring:
-        iio_buffer_unregister(indio_dev);
-error_unreg_ring_funcs:
-        adis16240_unconfigure_ring(indio_dev);
+error_cleanup_buffer_trigger:
+        adis_cleanup_buffer_and_trigger(st, indio_dev);
 error_free_dev:
         iio_device_free(indio_dev);
 error_ret:
         return ret;
 }
 
-static int __devexit adis16240_remove(struct spi_device *spi)
+static int adis16240_remove(struct spi_device *spi)
 {
-
         struct iio_dev *indio_dev = spi_get_drvdata(spi);
+        struct adis *st = iio_priv(indio_dev);
 
         iio_device_unregister(indio_dev);
-        adis16240_remove_trigger(indio_dev);
-        iio_buffer_unregister(indio_dev);
-        adis16240_unconfigure_ring(indio_dev);
+        adis_cleanup_buffer_and_trigger(st, indio_dev);
         iio_device_free(indio_dev);
 
         return 0;
@@ -640,7 +297,7 @@ static struct spi_driver adis16240_driver = {
                 .owner = THIS_MODULE,
         },
         .probe = adis16240_probe,
-        .remove = __devexit_p(adis16240_remove),
+        .remove = adis16240_remove,
 };
 module_spi_driver(adis16240_driver);
 
diff --git a/drivers/staging/iio/accel/adis16240_ring.c b/drivers/staging/iio/accel/adis16240_ring.c
deleted file mode 100644
index caff8e25e0a2..000000000000
--- a/drivers/staging/iio/accel/adis16240_ring.c
+++ /dev/null
@@ -1,132 +0,0 @@
-#include <linux/export.h>
-#include <linux/interrupt.h>
-#include <linux/mutex.h>
-#include <linux/kernel.h>
-#include <linux/spi/spi.h>
-#include <linux/slab.h>
-
-#include <linux/iio/iio.h>
-#include "../ring_sw.h"
-#include <linux/iio/trigger_consumer.h>
-#include "adis16240.h"
-
-/**
- * adis16240_read_ring_data() read data registers which will be placed into ring
- * @indio_dev: the IIO device
- * @rx: somewhere to pass back the value read
- **/
-static int adis16240_read_ring_data(struct iio_dev *indio_dev, u8 *rx)
-{
-        struct spi_message msg;
-        struct adis16240_state *st = iio_priv(indio_dev);
-        struct spi_transfer xfers[ADIS16240_OUTPUTS + 1];
-        int ret;
-        int i;
-
-        mutex_lock(&st->buf_lock);
-
-        spi_message_init(&msg);
-
-        memset(xfers, 0, sizeof(xfers));
-        for (i = 0; i <= ADIS16240_OUTPUTS; i++) {
-                xfers[i].bits_per_word = 8;
-                xfers[i].cs_change = 1;
-                xfers[i].len = 2;
-                xfers[i].delay_usecs = 30;
-                xfers[i].tx_buf = st->tx + 2 * i;
-                st->tx[2 * i]
-                        = ADIS16240_READ_REG(ADIS16240_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;
-}
-
-static irqreturn_t adis16240_trigger_handler(int irq, void *p)
-{
-        struct iio_poll_func *pf = p;
-        struct iio_dev *indio_dev = pf->indio_dev;
-        struct adis16240_state *st = iio_priv(indio_dev);
-
-        int i = 0;
-        s16 *data;
-
-        data = kmalloc(indio_dev->scan_bytes, GFP_KERNEL);
-        if (data == NULL) {
-                dev_err(&st->us->dev, "memory alloc failed in ring bh");
-                goto done;
-        }
-
-        if (!bitmap_empty(indio_dev->active_scan_mask, indio_dev->masklength) &&
-            adis16240_read_ring_data(indio_dev, st->rx) >= 0)
-                for (; i < bitmap_weight(indio_dev->active_scan_mask,
-                                         indio_dev->masklength); i++)
-                        data[i] = be16_to_cpup((__be16 *)&(st->rx[i*2]));
-
-        /* Guaranteed to be aligned with 8 byte boundary */
-        if (indio_dev->scan_timestamp)
-                *((s64 *)(data + ((i + 3)/4)*4)) = pf->timestamp;
-
-        iio_push_to_buffer(indio_dev->buffer, (u8 *)data);
-
-        kfree(data);
-done:
-        iio_trigger_notify_done(indio_dev->trig);
-
-        return IRQ_HANDLED;
-}
-
-void adis16240_unconfigure_ring(struct iio_dev *indio_dev)
-{
-        iio_dealloc_pollfunc(indio_dev->pollfunc);
-        iio_sw_rb_free(indio_dev->buffer);
-}
-
-static const struct iio_buffer_setup_ops adis16240_ring_setup_ops = {
-        .preenable = &iio_sw_buffer_preenable,
-        .postenable = &iio_triggered_buffer_postenable,
-        .predisable = &iio_triggered_buffer_predisable,
-};
-
-int adis16240_configure_ring(struct iio_dev *indio_dev)
-{
-        int ret = 0;
-        struct iio_buffer *ring;
-
-        ring = iio_sw_rb_allocate(indio_dev);
-        if (!ring) {
-                ret = -ENOMEM;
-                return ret;
-        }
-        indio_dev->buffer = ring;
-        ring->scan_timestamp = true;
-        indio_dev->setup_ops = &adis16240_ring_setup_ops;
-
-        indio_dev->pollfunc = iio_alloc_pollfunc(&iio_pollfunc_store_time,
-                                                 &adis16240_trigger_handler,
-                                                 IRQF_ONESHOT,
-                                                 indio_dev,
-                                                 "%s_consumer%d",
-                                                 indio_dev->name,
-                                                 indio_dev->id);
-        if (indio_dev->pollfunc == NULL) {
-                ret = -ENOMEM;
-                goto error_iio_sw_rb_free;
-        }
-
-        indio_dev->modes |= INDIO_BUFFER_TRIGGERED;
-        return 0;
-
-error_iio_sw_rb_free:
-        iio_sw_rb_free(indio_dev->buffer);
-        return ret;
-}
diff --git a/drivers/staging/iio/accel/adis16240_trigger.c b/drivers/staging/iio/accel/adis16240_trigger.c
deleted file mode 100644
index fa90a22b143e..000000000000
--- a/drivers/staging/iio/accel/adis16240_trigger.c
+++ /dev/null
@@ -1,82 +0,0 @@
-#include <linux/interrupt.h>
-#include <linux/kernel.h>
-#include <linux/spi/spi.h>
-#include <linux/export.h>
-
-#include <linux/iio/iio.h>
-#include <linux/iio/trigger.h>
-#include "adis16240.h"
-
-/**
- * adis16240_data_rdy_trig_poll() the event handler for the data rdy trig
- **/
-static irqreturn_t adis16240_data_rdy_trig_poll(int irq, void *trig)
-{
-        iio_trigger_poll(trig, iio_get_time_ns());
-        return IRQ_HANDLED;
-}
-
-/**
- * adis16240_data_rdy_trigger_set_state() set datardy interrupt state
- **/
-static int adis16240_data_rdy_trigger_set_state(struct iio_trigger *trig,
-                                                bool state)
-{
-        struct iio_dev *indio_dev = trig->private_data;
-
-        dev_dbg(&indio_dev->dev, "%s (%d)\n", __func__, state);
-        return adis16240_set_irq(indio_dev, state);
-}
-
-static const struct iio_trigger_ops adis16240_trigger_ops = {
-        .owner = THIS_MODULE,
-        .set_trigger_state = &adis16240_data_rdy_trigger_set_state,
-};
-
-int adis16240_probe_trigger(struct iio_dev *indio_dev)
-{
-        int ret;
-        struct adis16240_state *st = iio_priv(indio_dev);
-
-        st->trig = iio_trigger_alloc("adis16240-dev%d", indio_dev->id);
-        if (st->trig == NULL) {
-                ret = -ENOMEM;
-                goto error_ret;
-        }
-
-        ret = request_irq(st->us->irq,
-                          adis16240_data_rdy_trig_poll,
-                          IRQF_TRIGGER_RISING,
-                          "adis16240",
-                          st->trig);
-        if (ret)
-                goto error_free_trig;
-
-        st->trig->dev.parent = &st->us->dev;
-        st->trig->ops = &adis16240_trigger_ops;
-        st->trig->private_data = indio_dev;
-        ret = iio_trigger_register(st->trig);
-
-        /* select default trigger */
-        indio_dev->trig = st->trig;
-        if (ret)
-                goto error_free_irq;
-
-        return 0;
-
-error_free_irq:
-        free_irq(st->us->irq, st->trig);
-error_free_trig:
-        iio_trigger_free(st->trig);
-error_ret:
-        return ret;
-}
-
-void adis16240_remove_trigger(struct iio_dev *indio_dev)
-{
-        struct adis16240_state *st = iio_priv(indio_dev);
-
-        iio_trigger_unregister(st->trig);
-        free_irq(st->us->irq, st->trig);
-        iio_trigger_free(st->trig);
-}
diff --git a/drivers/staging/iio/accel/kxsd9.c b/drivers/staging/iio/accel/kxsd9.c
index fdd5fbded660..318331f08d9c 100644
--- a/drivers/staging/iio/accel/kxsd9.c
+++ b/drivers/staging/iio/accel/kxsd9.c
@@ -171,7 +171,7 @@ static int kxsd9_read_raw(struct iio_dev *indio_dev,
                 *val2 = kxsd9_micro_scales[ret & KXSD9_FS_MASK];
                 ret = IIO_VAL_INT_PLUS_MICRO;
                 break;
-        };
+        }
 
 error_ret:
         return ret;
@@ -200,7 +200,7 @@ static const struct attribute_group kxsd9_attribute_group = {
         .attrs = kxsd9_attributes,
 };
 
-static int __devinit kxsd9_power_up(struct kxsd9_state *st)
+static int kxsd9_power_up(struct kxsd9_state *st)
 {
         int ret;
 
@@ -222,7 +222,7 @@ static const struct iio_info kxsd9_info = {
         .driver_module = THIS_MODULE,
 };
 
-static int __devinit kxsd9_probe(struct spi_device *spi)
+static int kxsd9_probe(struct spi_device *spi)
 {
         struct iio_dev *indio_dev;
         struct kxsd9_state *st;
@@ -261,7 +261,7 @@ error_ret:
         return ret;
 }
 
-static int __devexit kxsd9_remove(struct spi_device *spi)
+static int kxsd9_remove(struct spi_device *spi)
 {
         iio_device_unregister(spi_get_drvdata(spi));
         iio_device_free(spi_get_drvdata(spi));
@@ -281,7 +281,7 @@ static struct spi_driver kxsd9_driver = {
                 .owner = THIS_MODULE,
         },
         .probe = kxsd9_probe,
-        .remove = __devexit_p(kxsd9_remove),
+        .remove = kxsd9_remove,
         .id_table = kxsd9_id,
 };
 module_spi_driver(kxsd9_driver);
diff --git a/drivers/staging/iio/accel/lis3l02dq.h b/drivers/staging/iio/accel/lis3l02dq.h
index f9bcd41f7188..2bac7221837c 100644
--- a/drivers/staging/iio/accel/lis3l02dq.h
+++ b/drivers/staging/iio/accel/lis3l02dq.h
@@ -158,6 +158,7 @@ struct lis3l02dq_state {
         struct spi_device               *us;
         struct iio_trigger              *trig;
         struct mutex                    buf_lock;
+        int                             gpio;
         bool                            trigger_on;
 
         u8      tx[LIS3L02DQ_MAX_RX] ____cacheline_aligned;
diff --git a/drivers/staging/iio/accel/lis3l02dq_core.c b/drivers/staging/iio/accel/lis3l02dq_core.c
index 21b0469f8bc2..37ed1b8ebb6f 100644
--- a/drivers/staging/iio/accel/lis3l02dq_core.c
+++ b/drivers/staging/iio/accel/lis3l02dq_core.c
@@ -15,6 +15,7 @@
 #include <linux/interrupt.h>
 #include <linux/irq.h>
 #include <linux/gpio.h>
+#include <linux/of_gpio.h>
 #include <linux/mutex.h>
 #include <linux/device.h>
 #include <linux/kernel.h>
@@ -674,7 +675,7 @@ static const struct iio_info lis3l02dq_info = {
         .attrs = &lis3l02dq_attribute_group,
 };
 
-static int __devinit lis3l02dq_probe(struct spi_device *spi)
+static int lis3l02dq_probe(struct spi_device *spi)
 {
         int ret;
         struct lis3l02dq_state *st;
@@ -690,6 +691,7 @@ static int __devinit lis3l02dq_probe(struct spi_device *spi)
         spi_set_drvdata(spi, indio_dev);
 
         st->us = spi;
+        st->gpio = of_get_gpio(spi->dev.of_node, 0);
         mutex_init(&st->buf_lock);
         indio_dev->name = spi->dev.driver->name;
         indio_dev->dev.parent = &spi->dev;
@@ -711,7 +713,7 @@ static int __devinit lis3l02dq_probe(struct spi_device *spi)
                 goto error_unreg_buffer_funcs;
         }
 
-        if (spi->irq && gpio_is_valid(irq_to_gpio(spi->irq)) > 0) {
+        if (spi->irq) {
                 ret = request_threaded_irq(st->us->irq,
                                            &lis3l02dq_th,
                                            &lis3l02dq_event_handler,
@@ -738,10 +740,10 @@ static int __devinit lis3l02dq_probe(struct spi_device *spi)
         return 0;
 
 error_remove_trigger:
-        if (spi->irq && gpio_is_valid(irq_to_gpio(spi->irq)))
+        if (spi->irq)
                 lis3l02dq_remove_trigger(indio_dev);
 error_free_interrupt:
-        if (spi->irq && gpio_is_valid(irq_to_gpio(spi->irq)) > 0)
+        if (spi->irq)
                 free_irq(st->us->irq, indio_dev);
 error_uninitialize_buffer:
         iio_buffer_unregister(indio_dev);
@@ -780,7 +782,7 @@ err_ret:
 }
 
 /* fixme, confirm ordering in this function */
-static int __devexit lis3l02dq_remove(struct spi_device *spi)
+static int lis3l02dq_remove(struct spi_device *spi)
 {
         struct iio_dev *indio_dev = spi_get_drvdata(spi);
         struct lis3l02dq_state *st = iio_priv(indio_dev);
@@ -790,7 +792,7 @@ static int __devexit lis3l02dq_remove(struct spi_device *spi)
         lis3l02dq_disable_all_events(indio_dev);
         lis3l02dq_stop_device(indio_dev);
 
-        if (spi->irq && gpio_is_valid(irq_to_gpio(spi->irq)) > 0)
+        if (spi->irq)
                 free_irq(st->us->irq, indio_dev);
 
         lis3l02dq_remove_trigger(indio_dev);
@@ -808,7 +810,7 @@ static struct spi_driver lis3l02dq_driver = {
                 .owner = THIS_MODULE,
         },
         .probe = lis3l02dq_probe,
-        .remove = __devexit_p(lis3l02dq_remove),
+        .remove = lis3l02dq_remove,
 };
 module_spi_driver(lis3l02dq_driver);
 
diff --git a/drivers/staging/iio/accel/lis3l02dq_ring.c b/drivers/staging/iio/accel/lis3l02dq_ring.c
index fa4190d96247..bc38651c315e 100644
--- a/drivers/staging/iio/accel/lis3l02dq_ring.c
+++ b/drivers/staging/iio/accel/lis3l02dq_ring.c
@@ -154,7 +154,7 @@ static irqreturn_t lis3l02dq_trigger_handler(int irq, void *p)
         if (indio_dev->scan_timestamp)
                 *(s64 *)((u8 *)data + ALIGN(len, sizeof(s64)))
                         = pf->timestamp;
-        iio_push_to_buffer(indio_dev->buffer, (u8 *)data);
+        iio_push_to_buffers(indio_dev, (u8 *)data);
 
         kfree(data);
 done:
@@ -237,7 +237,7 @@ static int lis3l02dq_data_rdy_trigger_set_state(struct iio_trigger *trig,
         u8 t;
 
         __lis3l02dq_write_data_ready_config(indio_dev, state);
-        if (state == false) {
+        if (!state) {
                 /*
                  * A possible quirk with the handler is currently worked around
                  * by ensuring outstanding read events are cleared.
@@ -263,7 +263,7 @@ static int lis3l02dq_trig_try_reen(struct iio_trigger *trig)
         /* If gpio still high (or high again)
          * In theory possible we will need to do this several times */
         for (i = 0; i < 5; i++)
-                if (gpio_get_value(irq_to_gpio(st->us->irq)))
+                if (gpio_get_value(st->gpio))
                         lis3l02dq_read_all(indio_dev, NULL);
                 else
                         break;
diff --git a/drivers/staging/iio/accel/sca3000_core.c b/drivers/staging/iio/accel/sca3000_core.c
index ffd1697a9db0..414d3cad55a7 100644
--- a/drivers/staging/iio/accel/sca3000_core.c
+++ b/drivers/staging/iio/accel/sca3000_core.c
@@ -1139,7 +1139,7 @@ static const struct iio_info sca3000_info_with_temp = {
         .driver_module = THIS_MODULE,
 };
 
-static int __devinit sca3000_probe(struct spi_device *spi)
+static int sca3000_probe(struct spi_device *spi)
 {
         int ret;
         struct sca3000_state *st;
@@ -1233,7 +1233,7 @@ error_ret:
         return ret;
 }
 
-static int __devexit sca3000_remove(struct spi_device *spi)
+static int sca3000_remove(struct spi_device *spi)
 {
         struct iio_dev *indio_dev = spi_get_drvdata(spi);
         struct sca3000_state *st = iio_priv(indio_dev);
@@ -1265,7 +1265,7 @@ static struct spi_driver sca3000_driver = {
                 .owner = THIS_MODULE,
         },
         .probe = sca3000_probe,
-        .remove = __devexit_p(sca3000_remove),
+        .remove = sca3000_remove,
         .id_table = sca3000_id,
 };
 module_spi_driver(sca3000_driver);
diff --git a/drivers/staging/iio/adc/Kconfig b/drivers/staging/iio/adc/Kconfig
index a525143ecbea..fb8c239b0c88 100644
--- a/drivers/staging/iio/adc/Kconfig
+++ b/drivers/staging/iio/adc/Kconfig
@@ -10,17 +10,6 @@ config AD7291
           Say yes here to build support for Analog Devices AD7291
           8 Channel ADC with temperature sensor.
 
-config AD7298
-        tristate "Analog Devices AD7298 ADC driver"
-        depends on SPI
-        select IIO_TRIGGERED_BUFFER if IIO_BUFFER
-        help
-          Say yes here to build support for Analog Devices AD7298
-          8 Channel ADC with temperature sensor.
-
-          To compile this driver as a module, choose M here: the
-          module will be called ad7298.
-
 config AD7606
         tristate "Analog Devices AD7606 ADC driver"
         depends on GPIOLIB
@@ -68,19 +57,6 @@ config AD799X_RING_BUFFER
           Say yes here to include ring buffer support in the AD799X
           ADC driver.
 
-config AD7887
-        tristate "Analog Devices AD7887 ADC driver"
-        depends on SPI
-        select IIO_BUFFER
-        select IIO_TRIGGERED_BUFFER
-        help
-          Say yes here to build support for Analog Devices
-          AD7887 SPI analog to digital converter (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 AD7780
         tristate "Analog Devices AD7780 and similar ADCs driver"
         depends on SPI
@@ -94,18 +70,6 @@ config AD7780
           To compile this driver as a module, choose M here: the
           module will be called ad7780.
 
-config AD7793
-        tristate "Analog Devices AD7793 and similar ADCs driver"
-        depends on SPI
-        select AD_SIGMA_DELTA
-        help
-          Say yes here to build support for Analog Devices AD7785, AD7792, AD7793,
-          AD7794 and AD7795 SPI analog to digital converters (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 AD7793.
-
 config AD7816
         tristate "Analog Devices AD7816/7/8 temperature sensor and ADC driver"
         depends on SPI
@@ -126,18 +90,11 @@ config AD7192
           To compile this driver as a module, choose M here: the
           module will be called ad7192.
 
-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
+        tristate "Analog Devices ADT7310/ADT7410 temperature sensor driver"
+        depends on I2C || SPI_MASTER
         help
-          Say yes here to build support for Analog Devices ADT7410
+          Say yes here to build support for Analog Devices ADT7310/ADT7410
           temperature sensors.
 
 config AD7280
@@ -150,30 +107,6 @@ config AD7280
           To compile this driver as a module, choose M here: the
           module will be called ad7280a
 
-config MAX1363
-        tristate "Maxim max1363 ADC driver"
-        depends on I2C
-        select IIO_TRIGGER if IIO_BUFFER
-        select MAX1363_RING_BUFFER
-        help
-          Say yes here to build support for many Maxim i2c analog to digital
-          converters (ADC). (max1361, max1362, max1363, max1364, max1036,
-          max1037, max1038, max1039, max1136, max1136, max1137, max1138,
-          max1139, max1236, max1237, max11238, max1239, max11600, max11601,
-          max11602, max11603, max11604, max11605, max11606, max11607,
-          max11608, max11609, max11610, max11611, max11612, max11613,
-          max11614, max11615, max11616, max11617, max11644, max11645,
-          max11646, max11647) Provides direct access via sysfs.
-
-config MAX1363_RING_BUFFER
-        bool "Maxim max1363: use ring buffer"
-        depends on MAX1363
-        select IIO_BUFFER
-        select IIO_SW_RING
-        help
-          Say yes here to include ring buffer support in the MAX1363
-          ADC driver.
-
 config LPC32XX_ADC
         tristate "NXP LPC32XX ADC"
         depends on ARCH_LPC32XX
diff --git a/drivers/staging/iio/adc/Makefile b/drivers/staging/iio/adc/Makefile
index 62ee02e80cf9..d285596272a0 100644
--- a/drivers/staging/iio/adc/Makefile
+++ b/drivers/staging/iio/adc/Makefile
@@ -2,11 +2,6 @@
 # Makefile for industrial I/O ADC drivers
 #
 
-max1363-y := max1363_core.o
-max1363-y += max1363_ring.o
-
-obj-$(CONFIG_MAX1363) += max1363.o
-
 ad7606-y := ad7606_core.o
 ad7606-$(CONFIG_IIO_BUFFER) += ad7606_ring.o
 ad7606-$(CONFIG_AD7606_IFACE_PARALLEL) += ad7606_par.o
@@ -17,20 +12,10 @@ ad799x-y := ad799x_core.o
 ad799x-$(CONFIG_AD799X_RING_BUFFER) += ad799x_ring.o
 obj-$(CONFIG_AD799X) += ad799x.o
 
-ad7887-y := ad7887_core.o
-ad7887-$(CONFIG_IIO_BUFFER) += ad7887_ring.o
-obj-$(CONFIG_AD7887) += ad7887.o
-
-ad7298-y := ad7298_core.o
-ad7298-$(CONFIG_IIO_BUFFER) += ad7298_ring.o
-obj-$(CONFIG_AD7298) += ad7298.o
-
 obj-$(CONFIG_AD7291) += ad7291.o
 obj-$(CONFIG_AD7780) += ad7780.o
-obj-$(CONFIG_AD7793) += ad7793.o
 obj-$(CONFIG_AD7816) += ad7816.o
 obj-$(CONFIG_AD7192) += ad7192.o
-obj-$(CONFIG_ADT7310) += adt7310.o
 obj-$(CONFIG_ADT7410) += adt7410.o
 obj-$(CONFIG_AD7280) += ad7280a.o
 obj-$(CONFIG_LPC32XX_ADC) += lpc32xx_adc.o
diff --git a/drivers/staging/iio/adc/ad7192.c b/drivers/staging/iio/adc/ad7192.c
index aeaa61d49f51..504701940585 100644
--- a/drivers/staging/iio/adc/ad7192.c
+++ b/drivers/staging/iio/adc/ad7192.c
@@ -606,7 +606,7 @@ static const struct iio_chan_spec ad7192_channels[] = {
         IIO_CHAN_SOFT_TIMESTAMP(8),
 };
 
-static int __devinit ad7192_probe(struct spi_device *spi)
+static int ad7192_probe(struct spi_device *spi)
 {
         const struct ad7192_platform_data *pdata = spi->dev.platform_data;
         struct ad7192_state *st;
@@ -686,7 +686,7 @@ error_put_reg:
         return ret;
 }
 
-static int __devexit ad7192_remove(struct spi_device *spi)
+static int ad7192_remove(struct spi_device *spi)
 {
         struct iio_dev *indio_dev = spi_get_drvdata(spi);
         struct ad7192_state *st = iio_priv(indio_dev);
@@ -716,7 +716,7 @@ static struct spi_driver ad7192_driver = {
                 .owner  = THIS_MODULE,
         },
         .probe          = ad7192_probe,
-        .remove         = __devexit_p(ad7192_remove),
+        .remove         = ad7192_remove,
         .id_table       = ad7192_id,
 };
 module_spi_driver(ad7192_driver);
diff --git a/drivers/staging/iio/adc/ad7280a.c b/drivers/staging/iio/adc/ad7280a.c
index cfc39a703126..fa81a491e790 100644
--- a/drivers/staging/iio/adc/ad7280a.c
+++ b/drivers/staging/iio/adc/ad7280a.c
@@ -117,7 +117,7 @@
  */
 #define POLYNOM         0x2F
 #define POLYNOM_ORDER   8
-#define HIGHBIT         1 << (POLYNOM_ORDER - 1);
+#define HIGHBIT         (1 << (POLYNOM_ORDER - 1))
 
 struct ad7280_state {
         struct spi_device               *spi;
@@ -832,7 +832,7 @@ static const struct ad7280_platform_data ad7793_default_pdata = {
         .thermistor_term_en = true,
 };
 
-static int __devinit ad7280_probe(struct spi_device *spi)
+static int ad7280_probe(struct spi_device *spi)
 {
         const struct ad7280_platform_data *pdata = spi->dev.platform_data;
         struct ad7280_state *st;
@@ -950,7 +950,7 @@ error_free_device:
         return ret;
 }
 
-static int __devexit ad7280_remove(struct spi_device *spi)
+static int ad7280_remove(struct spi_device *spi)
 {
         struct iio_dev *indio_dev = spi_get_drvdata(spi);
         struct ad7280_state *st = iio_priv(indio_dev);
@@ -981,7 +981,7 @@ static struct spi_driver ad7280_driver = {
                 .owner  = THIS_MODULE,
         },
         .probe          = ad7280_probe,
-        .remove         = __devexit_p(ad7280_remove),
+        .remove         = ad7280_remove,
         .id_table       = ad7280_id,
 };
 module_spi_driver(ad7280_driver);
diff --git a/drivers/staging/iio/adc/ad7291.c b/drivers/staging/iio/adc/ad7291.c
index 029b39c0ba60..6e58e36d242c 100644
--- a/drivers/staging/iio/adc/ad7291.c
+++ b/drivers/staging/iio/adc/ad7291.c
@@ -580,7 +580,7 @@ static const struct iio_info ad7291_info = {
         .event_attrs = &ad7291_event_attribute_group,
 };
 
-static int __devinit ad7291_probe(struct i2c_client *client,
+static int ad7291_probe(struct i2c_client *client,
                 const struct i2c_device_id *id)
 {
         struct ad7291_chip_info *chip;
@@ -674,7 +674,7 @@ error_ret:
         return ret;
 }
 
-static int __devexit ad7291_remove(struct i2c_client *client)
+static int ad7291_remove(struct i2c_client *client)
 {
         struct iio_dev *indio_dev = i2c_get_clientdata(client);
         struct ad7291_chip_info *chip = iio_priv(indio_dev);
@@ -706,7 +706,7 @@ static struct i2c_driver ad7291_driver = {
                 .name = KBUILD_MODNAME,
         },
         .probe = ad7291_probe,
-        .remove = __devexit_p(ad7291_remove),
+        .remove = ad7291_remove,
         .id_table = ad7291_id,
 };
 module_i2c_driver(ad7291_driver);
diff --git a/drivers/staging/iio/adc/ad7298.h b/drivers/staging/iio/adc/ad7298.h
deleted file mode 100644
index 18f278723002..000000000000
--- a/drivers/staging/iio/adc/ad7298.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * AD7298 SPI ADC driver
- *
- * Copyright 2011 Analog Devices Inc.
- *
- * Licensed under the GPL-2.
- */
-
-#ifndef IIO_ADC_AD7298_H_
-#define IIO_ADC_AD7298_H_
-
-#define AD7298_WRITE    (1 << 15) /* write to the control register */
-#define AD7298_REPEAT   (1 << 14) /* repeated conversion enable */
-#define AD7298_CH(x)    (1 << (13 - (x))) /* channel select */
-#define AD7298_TSENSE   (1 << 5) /* temperature conversion enable */
-#define AD7298_EXTREF   (1 << 2) /* external reference enable */
-#define AD7298_TAVG     (1 << 1) /* temperature sensor averaging enable */
-#define AD7298_PDD      (1 << 0) /* partial power down enable */
-
-#define AD7298_MAX_CHAN         8
-#define AD7298_BITS             12
-#define AD7298_STORAGE_BITS     16
-#define AD7298_INTREF_mV        2500
-
-#define AD7298_CH_TEMP          9
-
-#define RES_MASK(bits)  ((1 << (bits)) - 1)
-
-/*
- * TODO: struct ad7298_platform_data needs to go into include/linux/iio
- */
-
-struct ad7298_platform_data {
-        /* External Vref voltage applied */
-        u16                             vref_mv;
-};
-
-struct ad7298_state {
-        struct spi_device               *spi;
-        struct regulator                *reg;
-        u16                             int_vref_mv;
-        unsigned                        ext_ref;
-        struct spi_transfer             ring_xfer[10];
-        struct spi_transfer             scan_single_xfer[3];
-        struct spi_message              ring_msg;
-        struct spi_message              scan_single_msg;
-        /*
-         * DMA (thus cache coherency maintenance) requires the
-         * transfer buffers to live in their own cache lines.
-         */
-        unsigned short                  rx_buf[8] ____cacheline_aligned;
-        unsigned short                  tx_buf[2];
-};
-
-#ifdef CONFIG_IIO_BUFFER
-int ad7298_register_ring_funcs_and_init(struct iio_dev *indio_dev);
-void ad7298_ring_cleanup(struct iio_dev *indio_dev);
-int ad7298_update_scan_mode(struct iio_dev *indio_dev,
-        const unsigned long *active_scan_mask);
-#else /* CONFIG_IIO_BUFFER */
-
-static inline int
-ad7298_register_ring_funcs_and_init(struct iio_dev *indio_dev)
-{
-        return 0;
-}
-
-static inline void ad7298_ring_cleanup(struct iio_dev *indio_dev)
-{
-}
-
-#define ad7298_update_scan_mode NULL
-
-#endif /* CONFIG_IIO_BUFFER */
-#endif /* IIO_ADC_AD7298_H_ */
diff --git a/drivers/staging/iio/adc/ad7298_ring.c b/drivers/staging/iio/adc/ad7298_ring.c
deleted file mode 100644
index c2906a85fedb..000000000000
--- a/drivers/staging/iio/adc/ad7298_ring.c
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * AD7298 SPI ADC driver
- *
- * Copyright 2011-2012 Analog Devices Inc.
- *
- * Licensed under the GPL-2.
- */
-
-#include <linux/interrupt.h>
-#include <linux/kernel.h>
-#include <linux/slab.h>
-#include <linux/spi/spi.h>
-
-#include <linux/iio/iio.h>
-#include <linux/iio/buffer.h>
-#include <linux/iio/trigger_consumer.h>
-#include <linux/iio/triggered_buffer.h>
-
-#include "ad7298.h"
-
-/**
- * ad7298_update_scan_mode() setup the spi transfer buffer for the new scan mask
- **/
-int ad7298_update_scan_mode(struct iio_dev *indio_dev,
-        const unsigned long *active_scan_mask)
-{
-        struct ad7298_state *st = iio_priv(indio_dev);
-        int i, m;
-        unsigned short command;
-        int scan_count;
-
-        /* Now compute overall size */
-        scan_count = bitmap_weight(active_scan_mask, indio_dev->masklength);
-
-        command = AD7298_WRITE | st->ext_ref;
-
-        for (i = 0, m = AD7298_CH(0); i < AD7298_MAX_CHAN; i++, m >>= 1)
-                if (test_bit(i, active_scan_mask))
-                        command |= m;
-
-        st->tx_buf[0] = cpu_to_be16(command);
-
-        /* build spi ring message */
-        st->ring_xfer[0].tx_buf = &st->tx_buf[0];
-        st->ring_xfer[0].len = 2;
-        st->ring_xfer[0].cs_change = 1;
-        st->ring_xfer[1].tx_buf = &st->tx_buf[1];
-        st->ring_xfer[1].len = 2;
-        st->ring_xfer[1].cs_change = 1;
-
-        spi_message_init(&st->ring_msg);
-        spi_message_add_tail(&st->ring_xfer[0], &st->ring_msg);
-        spi_message_add_tail(&st->ring_xfer[1], &st->ring_msg);
-
-        for (i = 0; i < scan_count; i++) {
-                st->ring_xfer[i + 2].rx_buf = &st->rx_buf[i];
-                st->ring_xfer[i + 2].len = 2;
-                st->ring_xfer[i + 2].cs_change = 1;
-                spi_message_add_tail(&st->ring_xfer[i + 2], &st->ring_msg);
-        }
-        /* make sure last transfer cs_change is not set */
-        st->ring_xfer[i + 1].cs_change = 0;
-
-        return 0;
-}
-
-/**
- * ad7298_trigger_handler() bh of trigger launched polling to ring buffer
- *
- * Currently there is no option in this driver to disable the saving of
- * timestamps within the ring.
- **/
-static irqreturn_t ad7298_trigger_handler(int irq, void *p)
-{
-        struct iio_poll_func *pf = p;
-        struct iio_dev *indio_dev = pf->indio_dev;
-        struct ad7298_state *st = iio_priv(indio_dev);
-        s64 time_ns = 0;
-        __u16 buf[16];
-        int b_sent, i;
-
-        b_sent = spi_sync(st->spi, &st->ring_msg);
-        if (b_sent)
-                goto done;
-
-        if (indio_dev->scan_timestamp) {
-                time_ns = iio_get_time_ns();
-                memcpy((u8 *)buf + indio_dev->scan_bytes - sizeof(s64),
-                        &time_ns, sizeof(time_ns));
-        }
-
-        for (i = 0; i < bitmap_weight(indio_dev->active_scan_mask,
-                                                 indio_dev->masklength); i++)
-                buf[i] = be16_to_cpu(st->rx_buf[i]);
-
-        iio_push_to_buffer(indio_dev->buffer, (u8 *)buf);
-
-done:
-        iio_trigger_notify_done(indio_dev->trig);
-
-        return IRQ_HANDLED;
-}
-
-int ad7298_register_ring_funcs_and_init(struct iio_dev *indio_dev)
-{
-        return iio_triggered_buffer_setup(indio_dev, NULL,
-                        &ad7298_trigger_handler, NULL);
-}
-
-void ad7298_ring_cleanup(struct iio_dev *indio_dev)
-{
-        iio_triggered_buffer_cleanup(indio_dev);
-}
diff --git a/drivers/staging/iio/adc/ad7606_par.c b/drivers/staging/iio/adc/ad7606_par.c
index a53faafec070..58cfddea9637 100644
--- a/drivers/staging/iio/adc/ad7606_par.c
+++ b/drivers/staging/iio/adc/ad7606_par.c
@@ -47,7 +47,7 @@ static const struct ad7606_bus_ops ad7606_par8_bops = {
         .read_block     = ad7606_par8_read_block,
 };
 
-static int __devinit ad7606_par_probe(struct platform_device *pdev)
+static int ad7606_par_probe(struct platform_device *pdev)
 {
         struct resource *res;
         struct iio_dev *indio_dev;
@@ -100,7 +100,7 @@ out1:
         return ret;
 }
 
-static int __devexit ad7606_par_remove(struct platform_device *pdev)
+static int ad7606_par_remove(struct platform_device *pdev)
 {
         struct iio_dev *indio_dev = platform_get_drvdata(pdev);
         struct resource *res;
@@ -164,7 +164,7 @@ MODULE_DEVICE_TABLE(platform, ad7606_driver_ids);
 
 static struct platform_driver ad7606_driver = {
         .probe = ad7606_par_probe,
-        .remove = __devexit_p(ad7606_par_remove),
+        .remove = ad7606_par_remove,
         .id_table = ad7606_driver_ids,
         .driver = {
                 .name    = "ad7606",
diff --git a/drivers/staging/iio/adc/ad7606_ring.c b/drivers/staging/iio/adc/ad7606_ring.c
index ba04d0ffd4f4..2b25cb07fe41 100644
--- a/drivers/staging/iio/adc/ad7606_ring.c
+++ b/drivers/staging/iio/adc/ad7606_ring.c
@@ -83,7 +83,7 @@ static void ad7606_poll_bh_to_ring(struct work_struct *work_s)
         if (indio_dev->scan_timestamp)
                 *((s64 *)(buf + indio_dev->scan_bytes - sizeof(s64))) = time_ns;
 
-        iio_push_to_buffer(indio_dev->buffer, buf);
+        iio_push_to_buffers(indio_dev, buf);
 done:
         gpio_set_value(st->pdata->gpio_convst, 0);
         iio_trigger_notify_done(indio_dev->trig);
diff --git a/drivers/staging/iio/adc/ad7606_spi.c b/drivers/staging/iio/adc/ad7606_spi.c
index 099d347da52d..6a8ecd73a1a7 100644
--- a/drivers/staging/iio/adc/ad7606_spi.c
+++ b/drivers/staging/iio/adc/ad7606_spi.c
@@ -39,7 +39,7 @@ static const struct ad7606_bus_ops ad7606_spi_bops = {
         .read_block     = ad7606_spi_read_block,
 };
 
-static int __devinit ad7606_spi_probe(struct spi_device *spi)
+static int ad7606_spi_probe(struct spi_device *spi)
 {
         struct iio_dev *indio_dev;
 
@@ -55,7 +55,7 @@ static int __devinit ad7606_spi_probe(struct spi_device *spi)
         return 0;
 }
 
-static int __devexit ad7606_spi_remove(struct spi_device *spi)
+static int ad7606_spi_remove(struct spi_device *spi)
 {
         struct iio_dev *indio_dev = dev_get_drvdata(&spi->dev);
 
@@ -106,7 +106,7 @@ static struct spi_driver ad7606_driver = {
                 .pm    = AD7606_SPI_PM_OPS,
         },
         .probe = ad7606_spi_probe,
-        .remove = __devexit_p(ad7606_spi_remove),
+        .remove = ad7606_spi_remove,
         .id_table = ad7606_id,
 };
 module_spi_driver(ad7606_driver);
diff --git a/drivers/staging/iio/adc/ad7780.c b/drivers/staging/iio/adc/ad7780.c
index 0a1328b8657f..e1f88603d7e0 100644
--- a/drivers/staging/iio/adc/ad7780.c
+++ b/drivers/staging/iio/adc/ad7780.c
@@ -164,7 +164,7 @@ static const struct iio_info ad7780_info = {
         .driver_module = THIS_MODULE,
 };
 
-static int __devinit ad7780_probe(struct spi_device *spi)
+static int ad7780_probe(struct spi_device *spi)
 {
         struct ad7780_platform_data *pdata = spi->dev.platform_data;
         struct ad7780_state *st;
@@ -248,7 +248,7 @@ error_put_reg:
         return ret;
 }
 
-static int __devexit ad7780_remove(struct spi_device *spi)
+static int ad7780_remove(struct spi_device *spi)
 {
         struct iio_dev *indio_dev = spi_get_drvdata(spi);
         struct ad7780_state *st = iio_priv(indio_dev);
@@ -283,7 +283,7 @@ static struct spi_driver ad7780_driver = {
                 .owner  = THIS_MODULE,
         },
         .probe          = ad7780_probe,
-        .remove         = __devexit_p(ad7780_remove),
+        .remove         = ad7780_remove,
         .id_table       = ad7780_id,
 };
 module_spi_driver(ad7780_driver);
diff --git a/drivers/staging/iio/adc/ad7793.h b/drivers/staging/iio/adc/ad7793.h
deleted file mode 100644
index 8fdd450a2cd9..000000000000
--- a/drivers/staging/iio/adc/ad7793.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * AD7792/AD7793 SPI ADC driver
- *
- * Copyright 2011 Analog Devices Inc.
- *
- * Licensed under the GPL-2.
- */
-#ifndef IIO_ADC_AD7793_H_
-#define IIO_ADC_AD7793_H_
-
-/*
- * TODO: struct ad7793_platform_data needs to go into include/linux/iio
- */
-
-/* Registers */
-#define AD7793_REG_COMM         0 /* Communications Register (WO, 8-bit) */
-#define AD7793_REG_STAT         0 /* Status Register         (RO, 8-bit) */
-#define AD7793_REG_MODE         1 /* Mode Register           (RW, 16-bit */
-#define AD7793_REG_CONF         2 /* Configuration Register  (RW, 16-bit) */
-#define AD7793_REG_DATA         3 /* Data Register           (RO, 16-/24-bit) */
-#define AD7793_REG_ID           4 /* ID Register             (RO, 8-bit) */
-#define AD7793_REG_IO           5 /* IO Register             (RO, 8-bit) */
-#define AD7793_REG_OFFSET       6 /* Offset Register         (RW, 16-bit
-                                   * (AD7792)/24-bit (AD7793)) */
-#define AD7793_REG_FULLSALE     7 /* Full-Scale Register
-                                   * (RW, 16-bit (AD7792)/24-bit (AD7793)) */
-
-/* Communications Register Bit Designations (AD7793_REG_COMM) */
-#define AD7793_COMM_WEN         (1 << 7) /* Write Enable */
-#define AD7793_COMM_WRITE       (0 << 6) /* Write Operation */
-#define AD7793_COMM_READ        (1 << 6) /* Read Operation */
-#define AD7793_COMM_ADDR(x)     (((x) & 0x7) << 3) /* Register Address */
-#define AD7793_COMM_CREAD       (1 << 2) /* Continuous Read of Data Register */
-
-/* Status Register Bit Designations (AD7793_REG_STAT) */
-#define AD7793_STAT_RDY         (1 << 7) /* Ready */
-#define AD7793_STAT_ERR         (1 << 6) /* Error (Overrange, Underrange) */
-#define AD7793_STAT_CH3         (1 << 2) /* Channel 3 */
-#define AD7793_STAT_CH2         (1 << 1) /* Channel 2 */
-#define AD7793_STAT_CH1         (1 << 0) /* Channel 1 */
-
-/* Mode Register Bit Designations (AD7793_REG_MODE) */
-#define AD7793_MODE_SEL(x)      (((x) & 0x7) << 13) /* Operation Mode Select */
-#define AD7793_MODE_SEL_MASK    (0x7 << 13) /* Operation Mode Select mask */
-#define AD7793_MODE_CLKSRC(x)   (((x) & 0x3) << 6) /* ADC Clock Source Select */
-#define AD7793_MODE_RATE(x)     ((x) & 0xF) /* Filter Update Rate Select */
-
-#define AD7793_MODE_CONT                0 /* Continuous Conversion Mode */
-#define AD7793_MODE_SINGLE              1 /* Single Conversion Mode */
-#define AD7793_MODE_IDLE                2 /* Idle Mode */
-#define AD7793_MODE_PWRDN               3 /* Power-Down Mode */
-#define AD7793_MODE_CAL_INT_ZERO        4 /* Internal Zero-Scale Calibration */
-#define AD7793_MODE_CAL_INT_FULL        5 /* Internal Full-Scale Calibration */
-#define AD7793_MODE_CAL_SYS_ZERO        6 /* System Zero-Scale Calibration */
-#define AD7793_MODE_CAL_SYS_FULL        7 /* System Full-Scale Calibration */
-
-#define AD7793_CLK_INT          0 /* Internal 64 kHz Clock not
-                                   * available at the CLK pin */
-#define AD7793_CLK_INT_CO       1 /* Internal 64 kHz Clock available
-                                   * at the CLK pin */
-#define AD7793_CLK_EXT          2 /* External 64 kHz Clock */
-#define AD7793_CLK_EXT_DIV2     3 /* External Clock divided by 2 */
-
-/* Configuration Register Bit Designations (AD7793_REG_CONF) */
-#define AD7793_CONF_VBIAS(x)    (((x) & 0x3) << 14) /* Bias Voltage
-                                                     * Generator Enable */
-#define AD7793_CONF_BO_EN       (1 << 13) /* Burnout Current Enable */
-#define AD7793_CONF_UNIPOLAR    (1 << 12) /* Unipolar/Bipolar Enable */
-#define AD7793_CONF_BOOST       (1 << 11) /* Boost Enable */
-#define AD7793_CONF_GAIN(x)     (((x) & 0x7) << 8) /* Gain Select */
-#define AD7793_CONF_REFSEL      (1 << 7) /* INT/EXT Reference Select */
-#define AD7793_CONF_BUF         (1 << 4) /* Buffered Mode Enable */
-#define AD7793_CONF_CHAN(x)     ((x) & 0xf) /* Channel select */
-#define AD7793_CONF_CHAN_MASK   0xf /* Channel select mask */
-
-#define AD7793_CH_AIN1P_AIN1M   0 /* AIN1(+) - AIN1(-) */
-#define AD7793_CH_AIN2P_AIN2M   1 /* AIN2(+) - AIN2(-) */
-#define AD7793_CH_AIN3P_AIN3M   2 /* AIN3(+) - AIN3(-) */
-#define AD7793_CH_AIN1M_AIN1M   3 /* AIN1(-) - AIN1(-) */
-#define AD7793_CH_TEMP          6 /* Temp Sensor */
-#define AD7793_CH_AVDD_MONITOR  7 /* AVDD Monitor */
-
-#define AD7795_CH_AIN4P_AIN4M   4 /* AIN4(+) - AIN4(-) */
-#define AD7795_CH_AIN5P_AIN5M   5 /* AIN5(+) - AIN5(-) */
-#define AD7795_CH_AIN6P_AIN6M   6 /* AIN6(+) - AIN6(-) */
-#define AD7795_CH_AIN1M_AIN1M   8 /* AIN1(-) - AIN1(-) */
-
-/* ID Register Bit Designations (AD7793_REG_ID) */
-#define AD7792_ID               0xA
-#define AD7793_ID               0xB
-#define AD7795_ID               0xF
-#define AD7793_ID_MASK          0xF
-
-/* IO (Excitation Current Sources) Register Bit Designations (AD7793_REG_IO) */
-#define AD7793_IO_IEXC1_IOUT1_IEXC2_IOUT2       0 /* IEXC1 connect to IOUT1,
-                                                   * IEXC2 connect to IOUT2 */
-#define AD7793_IO_IEXC1_IOUT2_IEXC2_IOUT1       1 /* IEXC1 connect to IOUT2,
-                                                   * IEXC2 connect to IOUT1 */
-#define AD7793_IO_IEXC1_IEXC2_IOUT1             2 /* Both current sources
-                                                   * IEXC1,2 connect to IOUT1 */
-#define AD7793_IO_IEXC1_IEXC2_IOUT2             3 /* Both current sources
-                                                   * IEXC1,2 connect to IOUT2 */
-
-#define AD7793_IO_IXCEN_10uA    (1 << 0) /* Excitation Current 10uA */
-#define AD7793_IO_IXCEN_210uA   (2 << 0) /* Excitation Current 210uA */
-#define AD7793_IO_IXCEN_1mA     (3 << 0) /* Excitation Current 1mA */
-
-struct ad7793_platform_data {
-        u16                     vref_mv;
-        u16                     mode;
-        u16                     conf;
-        u8                      io;
-};
-
-#endif /* IIO_ADC_AD7793_H_ */
diff --git a/drivers/staging/iio/adc/ad7816.c b/drivers/staging/iio/adc/ad7816.c
index c5fb9476a2d1..928477146c2f 100644
--- a/drivers/staging/iio/adc/ad7816.c
+++ b/drivers/staging/iio/adc/ad7816.c
@@ -341,7 +341,7 @@ static const struct iio_info ad7816_info = {
  * device probe and remove
  */
 
-static int __devinit ad7816_probe(struct spi_device *spi_dev)
+static int ad7816_probe(struct spi_device *spi_dev)
 {
         struct ad7816_chip_info *chip;
         struct iio_dev *indio_dev;
@@ -431,7 +431,7 @@ error_ret:
         return ret;
 }
 
-static int __devexit ad7816_remove(struct spi_device *spi_dev)
+static int ad7816_remove(struct spi_device *spi_dev)
 {
         struct iio_dev *indio_dev = dev_get_drvdata(&spi_dev->dev);
         struct ad7816_chip_info *chip = iio_priv(indio_dev);
@@ -463,7 +463,7 @@ static struct spi_driver ad7816_driver = {
                 .owner = THIS_MODULE,
         },
         .probe = ad7816_probe,
-        .remove = __devexit_p(ad7816_remove),
+        .remove = ad7816_remove,
         .id_table = ad7816_id,
 };
 module_spi_driver(ad7816_driver);
diff --git a/drivers/staging/iio/adc/ad7887.h b/drivers/staging/iio/adc/ad7887.h
deleted file mode 100644
index 2e09e54fc9c5..000000000000
--- a/drivers/staging/iio/adc/ad7887.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * 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 - chip specifc information
- * @int_vref_mv:        the internal reference voltage
- * @channel:            channel specification
- */
-
-struct ad7887_chip_info {
-        u16                             int_vref_mv;
-        struct iio_chan_spec            channel[3];
-};
-
-struct ad7887_state {
-        struct spi_device               *spi;
-        const struct ad7887_chip_info   *chip_info;
-        struct regulator                *reg;
-        u16                             int_vref_mv;
-        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_BUFFER
-int ad7887_register_ring_funcs_and_init(struct iio_dev *indio_dev);
-void ad7887_ring_cleanup(struct iio_dev *indio_dev);
-#else /* CONFIG_IIO_BUFFER */
-
-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_BUFFER */
-#endif /* IIO_ADC_AD7887_H_ */
diff --git a/drivers/staging/iio/adc/ad7887_ring.c b/drivers/staging/iio/adc/ad7887_ring.c
deleted file mode 100644
index b39923bbeedc..000000000000
--- a/drivers/staging/iio/adc/ad7887_ring.c
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Copyright 2010-2012 Analog Devices Inc.
- * Copyright (C) 2008 Jonathan Cameron
- *
- * Licensed under the GPL-2.
- *
- * ad7887_ring.c
- */
-
-#include <linux/interrupt.h>
-#include <linux/kernel.h>
-#include <linux/slab.h>
-#include <linux/spi/spi.h>
-
-#include <linux/iio/iio.h>
-#include <linux/iio/buffer.h>
-#include <linux/iio/trigger_consumer.h>
-#include <linux/iio/triggered_buffer.h>
-
-#include "ad7887.h"
-
-/**
- * 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 = iio_priv(indio_dev);
-        int ret;
-
-        ret = iio_sw_buffer_preenable(indio_dev);
-        if (ret < 0)
-                return ret;
-
-        /* We know this is a single long so can 'cheat' */
-        switch (*indio_dev->active_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 = iio_priv(indio_dev);
-
-        /* dummy read: restore default CH0 settin */
-        return spi_sync(st->spi, &st->msg[AD7887_CH0]);
-}
-
-/**
- * ad7887_trigger_handler() bh of trigger launched polling to ring buffer
- *
- * Currently there is no option in this driver to disable the saving of
- * timestamps within the ring.
- **/
-static irqreturn_t ad7887_trigger_handler(int irq, void *p)
-{
-        struct iio_poll_func *pf = p;
-        struct iio_dev *indio_dev = pf->indio_dev;
-        struct ad7887_state *st = iio_priv(indio_dev);
-        s64 time_ns;
-        __u8 *buf;
-        int b_sent;
-
-        unsigned int bytes = bitmap_weight(indio_dev->active_scan_mask,
-                                           indio_dev->masklength) *
-                st->chip_info->channel[0].scan_type.storagebits / 8;
-
-        buf = kzalloc(indio_dev->scan_bytes, GFP_KERNEL);
-        if (buf == NULL)
-                goto done;
-
-        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);
-        if (indio_dev->scan_timestamp)
-                memcpy(buf + indio_dev->scan_bytes - sizeof(s64),
-                       &time_ns, sizeof(time_ns));
-
-        iio_push_to_buffer(indio_dev->buffer, buf);
-done:
-        kfree(buf);
-        iio_trigger_notify_done(indio_dev->trig);
-
-        return IRQ_HANDLED;
-}
-
-static const struct iio_buffer_setup_ops ad7887_ring_setup_ops = {
-        .preenable = &ad7887_ring_preenable,
-        .postenable = &iio_triggered_buffer_postenable,
-        .predisable = &iio_triggered_buffer_predisable,
-        .postdisable = &ad7887_ring_postdisable,
-};
-
-int ad7887_register_ring_funcs_and_init(struct iio_dev *indio_dev)
-{
-        return iio_triggered_buffer_setup(indio_dev, &iio_pollfunc_store_time,
-                        &ad7887_trigger_handler, &ad7887_ring_setup_ops);
-}
-
-void ad7887_ring_cleanup(struct iio_dev *indio_dev)
-{
-        iio_triggered_buffer_cleanup(indio_dev);
-}
diff --git a/drivers/staging/iio/adc/ad799x_core.c b/drivers/staging/iio/adc/ad799x_core.c
index 990050700afc..077eedbd0a0c 100644
--- a/drivers/staging/iio/adc/ad799x_core.c
+++ b/drivers/staging/iio/adc/ad799x_core.c
@@ -854,7 +854,7 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = {
         },
 };
 
-static int __devinit ad799x_probe(struct i2c_client *client,
+static int ad799x_probe(struct i2c_client *client,
                                    const struct i2c_device_id *id)
 {
         int ret;
@@ -932,7 +932,7 @@ error_put_reg:
         return ret;
 }
 
-static __devexit int ad799x_remove(struct i2c_client *client)
+static int ad799x_remove(struct i2c_client *client)
 {
         struct iio_dev *indio_dev = i2c_get_clientdata(client);
         struct ad799x_state *st = iio_priv(indio_dev);
@@ -970,7 +970,7 @@ static struct i2c_driver ad799x_driver = {
                 .name = "ad799x",
         },
         .probe = ad799x_probe,
-        .remove = __devexit_p(ad799x_remove),
+        .remove = ad799x_remove,
         .id_table = ad799x_id,
 };
 module_i2c_driver(ad799x_driver);
diff --git a/drivers/staging/iio/adc/ad799x_ring.c b/drivers/staging/iio/adc/ad799x_ring.c
index 86026d9b20bc..2c5f38475a8e 100644
--- a/drivers/staging/iio/adc/ad799x_ring.c
+++ b/drivers/staging/iio/adc/ad799x_ring.c
@@ -77,7 +77,7 @@ static irqreturn_t ad799x_trigger_handler(int irq, void *p)
                 memcpy(rxbuf + indio_dev->scan_bytes - sizeof(s64),
                         &time_ns, sizeof(time_ns));
 
-        iio_push_to_buffer(indio_dev->buffer, rxbuf);
+        iio_push_to_buffers(indio_dev, rxbuf);
 done:
         kfree(rxbuf);
 out:
diff --git a/drivers/staging/iio/adc/adt7310.c b/drivers/staging/iio/adc/adt7310.c
deleted file mode 100644
index 72460b6dc2f4..000000000000
--- a/drivers/staging/iio/adc/adt7310.c
+++ /dev/null
@@ -1,881 +0,0 @@
-/*
- * 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/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/module.h>
-
-#include <linux/iio/iio.h>
-#include <linux/iio/sysfs.h>
-#include <linux/iio/events.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 {
-        struct spi_device *spi_dev;
-        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_to_iio_dev(dev);
-        struct adt7310_chip_info *chip = iio_priv(dev_info);
-        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_to_iio_dev(dev);
-        struct adt7310_chip_info *chip = iio_priv(dev_info);
-        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_to_iio_dev(dev);
-        struct adt7310_chip_info *chip = iio_priv(dev_info);
-        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_to_iio_dev(dev);
-        struct adt7310_chip_info *chip = iio_priv(dev_info);
-        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_to_iio_dev(dev);
-        struct adt7310_chip_info *chip = iio_priv(dev_info);
-        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_to_iio_dev(dev);
-        struct adt7310_chip_info *chip = iio_priv(dev_info);
-        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 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,
-        NULL,
-};
-
-static const struct attribute_group adt7310_attribute_group = {
-        .attrs = adt7310_attributes,
-};
-
-static irqreturn_t adt7310_event_handler(int irq, void *private)
-{
-        struct iio_dev *indio_dev = private;
-        struct adt7310_chip_info *chip = iio_priv(indio_dev);
-        s64 timestamp = iio_get_time_ns();
-        u8 status;
-        int ret;
-
-        ret = adt7310_spi_read_byte(chip, ADT7310_STATUS, &status);
-        if (ret)
-                goto done;
-
-        if (status & ADT7310_STAT_T_HIGH)
-                iio_push_event(indio_dev,
-                               IIO_UNMOD_EVENT_CODE(IIO_TEMP, 0,
-                                                    IIO_EV_TYPE_THRESH,
-                                                    IIO_EV_DIR_RISING),
-                               timestamp);
-        if (status & ADT7310_STAT_T_LOW)
-                iio_push_event(indio_dev,
-                               IIO_UNMOD_EVENT_CODE(IIO_TEMP, 0,
-                                                    IIO_EV_TYPE_THRESH,
-                                                    IIO_EV_DIR_FALLING),
-                               timestamp);
-        if (status & ADT7310_STAT_T_CRIT)
-                iio_push_event(indio_dev,
-                               IIO_UNMOD_EVENT_CODE(IIO_TEMP, 0,
-                                                    IIO_EV_TYPE_THRESH,
-                                                    IIO_EV_DIR_RISING),
-                        timestamp);
-
-done:
-        return IRQ_HANDLED;
-}
-
-static ssize_t adt7310_show_event_mode(struct device *dev,
-                struct device_attribute *attr,
-                char *buf)
-{
-        struct iio_dev *dev_info = dev_to_iio_dev(dev);
-        struct adt7310_chip_info *chip = iio_priv(dev_info);
-        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_to_iio_dev(dev);
-        struct adt7310_chip_info *chip = iio_priv(dev_info);
-        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_to_iio_dev(dev);
-        struct adt7310_chip_info *chip = iio_priv(dev_info);
-        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_to_iio_dev(dev);
-        struct adt7310_chip_info *chip = iio_priv(dev_info);
-        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_to_iio_dev(dev);
-        struct adt7310_chip_info *chip = iio_priv(dev_info);
-        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_to_iio_dev(dev);
-        struct adt7310_chip_info *chip = iio_priv(dev_info);
-        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_to_iio_dev(dev);
-        struct adt7310_chip_info *chip = iio_priv(dev_info);
-        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_to_iio_dev(dev);
-        struct adt7310_chip_info *chip = iio_priv(dev_info);
-        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;
-}
-
-static IIO_DEVICE_ATTR(event_mode,
-                       S_IRUGO | S_IWUSR,
-                       adt7310_show_event_mode, adt7310_set_event_mode, 0);
-static IIO_DEVICE_ATTR(available_event_modes,
-                       S_IRUGO | S_IWUSR,
-                       adt7310_show_available_event_modes, NULL, 0);
-static IIO_DEVICE_ATTR(fault_queue,
-                       S_IRUGO | S_IWUSR,
-                       adt7310_show_fault_queue, adt7310_set_fault_queue, 0);
-static IIO_DEVICE_ATTR(t_alarm_high,
-                       S_IRUGO | S_IWUSR,
-                       adt7310_show_t_alarm_high, adt7310_set_t_alarm_high, 0);
-static IIO_DEVICE_ATTR(t_alarm_low,
-                       S_IRUGO | S_IWUSR,
-                       adt7310_show_t_alarm_low, adt7310_set_t_alarm_low, 0);
-static IIO_DEVICE_ATTR(t_crit,
-                       S_IRUGO | S_IWUSR,
-                       adt7310_show_t_crit, adt7310_set_t_crit, 0);
-static IIO_DEVICE_ATTR(t_hyst,
-                       S_IRUGO | S_IWUSR,
-                       adt7310_show_t_hyst, adt7310_set_t_hyst, 0);
-
-static struct attribute *adt7310_event_int_attributes[] = {
-        &iio_dev_attr_event_mode.dev_attr.attr,
-        &iio_dev_attr_available_event_modes.dev_attr.attr,
-        &iio_dev_attr_fault_queue.dev_attr.attr,
-        &iio_dev_attr_t_alarm_high.dev_attr.attr,
-        &iio_dev_attr_t_alarm_low.dev_attr.attr,
-        &iio_dev_attr_t_crit.dev_attr.attr,
-        &iio_dev_attr_t_hyst.dev_attr.attr,
-        NULL,
-};
-
-static struct attribute_group adt7310_event_attribute_group = {
-        .attrs = adt7310_event_int_attributes,
-        .name = "events",
-};
-
-static const struct iio_info adt7310_info = {
-        .attrs = &adt7310_attribute_group,
-        .event_attrs = &adt7310_event_attribute_group,
-        .driver_module = THIS_MODULE,
-};
-
-/*
- * device probe and remove
- */
-
-static int __devinit adt7310_probe(struct spi_device *spi_dev)
-{
-        struct adt7310_chip_info *chip;
-        struct iio_dev *indio_dev;
-        int ret = 0;
-        unsigned long *adt7310_platform_data = spi_dev->dev.platform_data;
-        unsigned long irq_flags;
-
-        indio_dev = iio_device_alloc(sizeof(*chip));
-        if (indio_dev == NULL) {
-                ret = -ENOMEM;
-                goto error_ret;
-        }
-        chip = iio_priv(indio_dev);
-        /* this is only used for device removal purposes */
-        dev_set_drvdata(&spi_dev->dev, indio_dev);
-
-        chip->spi_dev = spi_dev;
-
-        indio_dev->dev.parent = &spi_dev->dev;
-        indio_dev->name = spi_get_device_id(spi_dev)->name;
-        indio_dev->info = &adt7310_info;
-        indio_dev->modes = INDIO_DIRECT_MODE;
-
-        /* 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 = request_threaded_irq(spi_dev->irq,
-                                           NULL,
-                                           &adt7310_event_handler,
-                                           irq_flags | IRQF_ONESHOT,
-                                           indio_dev->name,
-                                           indio_dev);
-                if (ret)
-                        goto error_free_dev;
-        }
-
-        /* INT bound temperature alarm event. line 1 */
-        if (adt7310_platform_data[0]) {
-                ret = request_threaded_irq(adt7310_platform_data[0],
-                                           NULL,
-                                           &adt7310_event_handler,
-                                           adt7310_platform_data[1] |
-                                           IRQF_ONESHOT,
-                                           indio_dev->name,
-                                           indio_dev);
-                if (ret)
-                        goto error_unreg_ct_irq;
-        }
-
-        if (spi_dev->irq && adt7310_platform_data[0]) {
-                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;
-                }
-        }
-
-        ret = iio_device_register(indio_dev);
-        if (ret)
-                goto error_unreg_int_irq;
-
-        dev_info(&spi_dev->dev, "%s temperature sensor registered.\n",
-                        indio_dev->name);
-
-        return 0;
-
-error_unreg_int_irq:
-        free_irq(adt7310_platform_data[0], indio_dev);
-error_unreg_ct_irq:
-        free_irq(spi_dev->irq, indio_dev);
-error_free_dev:
-        iio_device_free(indio_dev);
-error_ret:
-        return ret;
-}
-
-static int __devexit adt7310_remove(struct spi_device *spi_dev)
-{
-        struct iio_dev *indio_dev = dev_get_drvdata(&spi_dev->dev);
-        unsigned long *adt7310_platform_data = spi_dev->dev.platform_data;
-
-        iio_device_unregister(indio_dev);
-        dev_set_drvdata(&spi_dev->dev, NULL);
-        if (adt7310_platform_data[0])
-                free_irq(adt7310_platform_data[0], indio_dev);
-        if (spi_dev->irq)
-                free_irq(spi_dev->irq, indio_dev);
-        iio_device_free(indio_dev);
-
-        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",
-                .owner = THIS_MODULE,
-        },
-        .probe = adt7310_probe,
-        .remove = __devexit_p(adt7310_remove),
-        .id_table = adt7310_id,
-};
-module_spi_driver(adt7310_driver);
-
-MODULE_AUTHOR("Sonic Zhang <sonic.zhang@analog.com>");
-MODULE_DESCRIPTION("Analog Devices ADT7310 digital"
-                        " temperature sensor driver");
-MODULE_LICENSE("GPL v2");
diff --git a/drivers/staging/iio/adc/adt7410.c b/drivers/staging/iio/adc/adt7410.c
index 4157596ea3b0..35455e160945 100644
--- a/drivers/staging/iio/adc/adt7410.c
+++ b/drivers/staging/iio/adc/adt7410.c
@@ -1,5 +1,5 @@
 /*
- * ADT7410 digital temperature sensor driver supporting ADT7410
+ * ADT7410 digital temperature sensor driver supporting ADT7310/ADT7410
  *
  * Copyright 2010 Analog Devices Inc.
  *
@@ -13,6 +13,7 @@
 #include <linux/sysfs.h>
 #include <linux/list.h>
 #include <linux/i2c.h>
+#include <linux/spi/spi.h>
 #include <linux/module.h>
 
 #include <linux/iio/iio.h>
@@ -34,6 +35,19 @@
 #define ADT7410_RESET                   0x2F
 
 /*
+ * 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
+
+/*
  * ADT7410 status
  */
 #define ADT7410_STAT_T_LOW              0x10
@@ -69,75 +83,52 @@
 #define ADT7410_MANUFACTORY_ID_MASK             0xF0
 #define ADT7410_MANUFACTORY_ID_OFFSET           4
 
+
+#define ADT7310_CMD_REG_MASK                    0x28
+#define ADT7310_CMD_REG_OFFSET                  3
+#define ADT7310_CMD_READ                        0x40
+#define ADT7310_CMD_CON_READ                    0x4
+
 #define ADT7410_IRQS                            2
 
 /*
  * struct adt7410_chip_info - chip specifc information
  */
 
+struct adt7410_chip_info;
+
+struct adt7410_ops {
+        int (*read_word)(struct adt7410_chip_info *, u8 reg, u16 *data);
+        int (*write_word)(struct adt7410_chip_info *, u8 reg, u16 data);
+        int (*read_byte)(struct adt7410_chip_info *, u8 reg, u8 *data);
+        int (*write_byte)(struct adt7410_chip_info *, u8 reg, u8 data);
+};
+
 struct adt7410_chip_info {
-        struct i2c_client *client;
+        struct device *dev;
         u8  config;
-};
 
-/*
- * adt7410 register access by I2C
- */
+        const struct adt7410_ops *ops;
+};
 
-static int adt7410_i2c_read_word(struct adt7410_chip_info *chip, u8 reg, u16 *data)
+static int adt7410_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;
+        return chip->ops->read_word(chip, reg, data);
 }
 
-static int adt7410_i2c_write_word(struct adt7410_chip_info *chip, u8 reg, u16 data)
+static int adt7410_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;
+        return chip->ops->write_word(chip, reg, data);
 }
 
-static int adt7410_i2c_read_byte(struct adt7410_chip_info *chip, u8 reg, u8 *data)
+static int adt7410_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;
+        return chip->ops->read_byte(chip, reg, data);
 }
 
-static int adt7410_i2c_write_byte(struct adt7410_chip_info *chip, u8 reg, u8 data)
+static int adt7410_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;
+        return chip->ops->write_byte(chip, reg, data);
 }
 
 static ssize_t adt7410_show_mode(struct device *dev,
@@ -172,7 +163,7 @@ static ssize_t adt7410_store_mode(struct device *dev,
         u16 config;
         int ret;
 
-        ret = adt7410_i2c_read_byte(chip, ADT7410_CONFIG, &chip->config);
+        ret = adt7410_read_byte(chip, ADT7410_CONFIG, &chip->config);
         if (ret)
                 return -EIO;
 
@@ -184,13 +175,13 @@ static ssize_t adt7410_store_mode(struct device *dev,
         else if (strcmp(buf, "sps"))
                 config |= ADT7410_SPS;
 
-        ret = adt7410_i2c_write_byte(chip, ADT7410_CONFIG, config);
+        ret = adt7410_write_byte(chip, ADT7410_CONFIG, config);
         if (ret)
                 return -EIO;
 
         chip->config = config;
 
-        return ret;
+        return len;
 }
 
 static IIO_DEVICE_ATTR(mode, S_IRUGO | S_IWUSR,
@@ -216,7 +207,7 @@ static ssize_t adt7410_show_resolution(struct device *dev,
         int ret;
         int bits;
 
-        ret = adt7410_i2c_read_byte(chip, ADT7410_CONFIG, &chip->config);
+        ret = adt7410_read_byte(chip, ADT7410_CONFIG, &chip->config);
         if (ret)
                 return -EIO;
 
@@ -243,7 +234,7 @@ static ssize_t adt7410_store_resolution(struct device *dev,
         if (ret)
                 return -EINVAL;
 
-        ret = adt7410_i2c_read_byte(chip, ADT7410_CONFIG, &chip->config);
+        ret = adt7410_read_byte(chip, ADT7410_CONFIG, &chip->config);
         if (ret)
                 return -EIO;
 
@@ -251,7 +242,7 @@ static ssize_t adt7410_store_resolution(struct device *dev,
         if (data)
                 config |= ADT7410_RESOLUTION;
 
-        ret = adt7410_i2c_write_byte(chip, ADT7410_CONFIG, config);
+        ret = adt7410_write_byte(chip, ADT7410_CONFIG, config);
         if (ret)
                 return -EIO;
 
@@ -274,7 +265,7 @@ static ssize_t adt7410_show_id(struct device *dev,
         u8 id;
         int ret;
 
-        ret = adt7410_i2c_read_byte(chip, ADT7410_ID, &id);
+        ret = adt7410_read_byte(chip, ADT7410_ID, &id);
         if (ret)
                 return -EIO;
 
@@ -317,7 +308,7 @@ static ssize_t adt7410_show_value(struct device *dev,
         int ret, i = 0;
 
         do {
-                ret = adt7410_i2c_read_byte(chip, ADT7410_STATUS, &status);
+                ret = adt7410_read_byte(chip, ADT7410_STATUS, &status);
                 if (ret)
                         return -EIO;
                 i++;
@@ -325,7 +316,7 @@ static ssize_t adt7410_show_value(struct device *dev,
                         return -EIO;
         } while (status & ADT7410_STAT_NOT_RDY);
 
-        ret = adt7410_i2c_read_word(chip, ADT7410_TEMPERATURE, &data);
+        ret = adt7410_read_word(chip, ADT7410_TEMPERATURE, &data);
         if (ret)
                 return -EIO;
 
@@ -354,7 +345,7 @@ static irqreturn_t adt7410_event_handler(int irq, void *private)
         s64 timestamp = iio_get_time_ns();
         u8 status;
 
-        if (adt7410_i2c_read_byte(chip, ADT7410_STATUS, &status))
+        if (adt7410_read_byte(chip, ADT7410_STATUS, &status))
                 return IRQ_HANDLED;
 
         if (status & ADT7410_STAT_T_HIGH)
@@ -387,7 +378,7 @@ static ssize_t adt7410_show_event_mode(struct device *dev,
         struct adt7410_chip_info *chip = iio_priv(dev_info);
         int ret;
 
-        ret = adt7410_i2c_read_byte(chip, ADT7410_CONFIG, &chip->config);
+        ret = adt7410_read_byte(chip, ADT7410_CONFIG, &chip->config);
         if (ret)
                 return -EIO;
 
@@ -407,7 +398,7 @@ static ssize_t adt7410_set_event_mode(struct device *dev,
         u16 config;
         int ret;
 
-        ret = adt7410_i2c_read_byte(chip, ADT7410_CONFIG, &chip->config);
+        ret = adt7410_read_byte(chip, ADT7410_CONFIG, &chip->config);
         if (ret)
                 return -EIO;
 
@@ -415,7 +406,7 @@ static ssize_t adt7410_set_event_mode(struct device *dev,
         if (strcmp(buf, "comparator") != 0)
                 config |= ADT7410_EVENT_MODE;
 
-        ret = adt7410_i2c_write_byte(chip, ADT7410_CONFIG, config);
+        ret = adt7410_write_byte(chip, ADT7410_CONFIG, config);
         if (ret)
                 return -EIO;
 
@@ -439,7 +430,7 @@ static ssize_t adt7410_show_fault_queue(struct device *dev,
         struct adt7410_chip_info *chip = iio_priv(dev_info);
         int ret;
 
-        ret = adt7410_i2c_read_byte(chip, ADT7410_CONFIG, &chip->config);
+        ret = adt7410_read_byte(chip, ADT7410_CONFIG, &chip->config);
         if (ret)
                 return -EIO;
 
@@ -461,13 +452,13 @@ static ssize_t adt7410_set_fault_queue(struct device *dev,
         if (ret || data > 3)
                 return -EINVAL;
 
-        ret = adt7410_i2c_read_byte(chip, ADT7410_CONFIG, &chip->config);
+        ret = adt7410_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);
+        ret = adt7410_write_byte(chip, ADT7410_CONFIG, config);
         if (ret)
                 return -EIO;
 
@@ -486,7 +477,7 @@ static inline ssize_t adt7410_show_t_bound(struct device *dev,
         u16 data;
         int ret;
 
-        ret = adt7410_i2c_read_word(chip, bound_reg, &data);
+        ret = adt7410_read_word(chip, bound_reg, &data);
         if (ret)
                 return -EIO;
 
@@ -557,7 +548,7 @@ static inline ssize_t adt7410_set_t_bound(struct device *dev,
                 data <<= ADT7410_T13_VALUE_OFFSET;
         }
 
-        ret = adt7410_i2c_write_word(chip, bound_reg, data);
+        ret = adt7410_write_word(chip, bound_reg, data);
         if (ret)
                 return -EIO;
 
@@ -624,7 +615,7 @@ static ssize_t adt7410_show_t_hyst(struct device *dev,
         int ret;
         u8 t_hyst;
 
-        ret = adt7410_i2c_read_byte(chip, ADT7410_T_HYST, &t_hyst);
+        ret = adt7410_read_byte(chip, ADT7410_T_HYST, &t_hyst);
         if (ret)
                 return -EIO;
 
@@ -649,7 +640,7 @@ static inline ssize_t adt7410_set_t_hyst(struct device *dev,
 
         t_hyst = (u8)data;
 
-        ret = adt7410_i2c_write_byte(chip, ADT7410_T_HYST, t_hyst);
+        ret = adt7410_write_byte(chip, ADT7410_T_HYST, t_hyst);
         if (ret)
                 return -EIO;
 
@@ -704,14 +695,14 @@ static const struct iio_info adt7410_info = {
  * device probe and remove
  */
 
-static int __devinit adt7410_probe(struct i2c_client *client,
-                const struct i2c_device_id *id)
+static int adt7410_probe(struct device *dev, int irq,
+        const char *name, const struct adt7410_ops *ops)
 {
+        unsigned long *adt7410_platform_data = dev->platform_data;
+        unsigned long local_pdata[] = {0, 0};
         struct adt7410_chip_info *chip;
         struct iio_dev *indio_dev;
         int ret = 0;
-        unsigned long *adt7410_platform_data = client->dev.platform_data;
-        unsigned long local_pdata[] = {0, 0};
 
         indio_dev = iio_device_alloc(sizeof(*chip));
         if (indio_dev == NULL) {
@@ -720,12 +711,13 @@ static int __devinit adt7410_probe(struct i2c_client *client,
         }
         chip = iio_priv(indio_dev);
         /* this is only used for device removal purposes */
-        i2c_set_clientdata(client, indio_dev);
+        dev_set_drvdata(dev, indio_dev);
 
-        chip->client = client;
+        chip->dev = dev;
+        chip->ops = ops;
 
-        indio_dev->name = id->name;
-        indio_dev->dev.parent = &client->dev;
+        indio_dev->name = name;
+        indio_dev->dev.parent = dev;
         indio_dev->info = &adt7410_info;
         indio_dev->modes = INDIO_DIRECT_MODE;
 
@@ -733,12 +725,12 @@ static int __devinit adt7410_probe(struct i2c_client *client,
                 adt7410_platform_data = local_pdata;
 
         /* CT critcal temperature event. line 0 */
-        if (client->irq) {
-                ret = request_threaded_irq(client->irq,
+        if (irq) {
+                ret = request_threaded_irq(irq,
                                            NULL,
                                            &adt7410_event_handler,
                                            IRQF_TRIGGER_LOW | IRQF_ONESHOT,
-                                           id->name,
+                                           name,
                                            indio_dev);
                 if (ret)
                         goto error_free_dev;
@@ -751,13 +743,13 @@ static int __devinit adt7410_probe(struct i2c_client *client,
                                            &adt7410_event_handler,
                                            adt7410_platform_data[1] |
                                            IRQF_ONESHOT,
-                                           id->name,
+                                           name,
                                            indio_dev);
                 if (ret)
                         goto error_unreg_ct_irq;
         }
 
-        ret = adt7410_i2c_read_byte(chip, ADT7410_CONFIG, &chip->config);
+        ret = adt7410_read_byte(chip, ADT7410_CONFIG, &chip->config);
         if (ret) {
                 ret = -EIO;
                 goto error_unreg_int_irq;
@@ -765,7 +757,7 @@ static int __devinit adt7410_probe(struct i2c_client *client,
 
         chip->config |= ADT7410_RESOLUTION;
 
-        if (client->irq && adt7410_platform_data[0]) {
+        if (irq && adt7410_platform_data[0]) {
 
                 /* set irq polarity low level */
                 chip->config &= ~ADT7410_CT_POLARITY;
@@ -776,7 +768,7 @@ static int __devinit adt7410_probe(struct i2c_client *client,
                         chip->config &= ~ADT7410_INT_POLARITY;
         }
 
-        ret = adt7410_i2c_write_byte(chip, ADT7410_CONFIG, chip->config);
+        ret = adt7410_write_byte(chip, ADT7410_CONFIG, chip->config);
         if (ret) {
                 ret = -EIO;
                 goto error_unreg_int_irq;
@@ -785,36 +777,117 @@ static int __devinit adt7410_probe(struct i2c_client *client,
         if (ret)
                 goto error_unreg_int_irq;
 
-        dev_info(&client->dev, "%s temperature sensor registered.\n",
-                         id->name);
+        dev_info(dev, "%s temperature sensor registered.\n",
+                         name);
 
         return 0;
 
 error_unreg_int_irq:
         free_irq(adt7410_platform_data[0], indio_dev);
 error_unreg_ct_irq:
-        free_irq(client->irq, indio_dev);
+        free_irq(irq, indio_dev);
 error_free_dev:
         iio_device_free(indio_dev);
 error_ret:
         return ret;
 }
 
-static int __devexit adt7410_remove(struct i2c_client *client)
+static int adt7410_remove(struct device *dev, int irq)
 {
-        struct iio_dev *indio_dev = i2c_get_clientdata(client);
-        unsigned long *adt7410_platform_data = client->dev.platform_data;
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        unsigned long *adt7410_platform_data = dev->platform_data;
 
         iio_device_unregister(indio_dev);
         if (adt7410_platform_data[0])
                 free_irq(adt7410_platform_data[0], indio_dev);
-        if (client->irq)
-                free_irq(client->irq, indio_dev);
+        if (irq)
+                free_irq(irq, indio_dev);
         iio_device_free(indio_dev);
 
         return 0;
 }
 
+#if IS_ENABLED(CONFIG_I2C)
+
+static int adt7410_i2c_read_word(struct adt7410_chip_info *chip, u8 reg,
+        u16 *data)
+{
+        struct i2c_client *client = to_i2c_client(chip->dev);
+        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 = to_i2c_client(chip->dev);
+        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 = to_i2c_client(chip->dev);
+        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 = to_i2c_client(chip->dev);
+        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 const struct adt7410_ops adt7410_i2c_ops = {
+        .read_word = adt7410_i2c_read_word,
+        .write_word = adt7410_i2c_write_word,
+        .read_byte = adt7410_i2c_read_byte,
+        .write_byte = adt7410_i2c_write_byte,
+};
+
+static int adt7410_i2c_probe(struct i2c_client *client,
+        const struct i2c_device_id *id)
+{
+        return adt7410_probe(&client->dev, client->irq, id->name,
+                &adt7410_i2c_ops);
+}
+
+static int adt7410_i2c_remove(struct i2c_client *client)
+{
+        return adt7410_remove(&client->dev, client->irq);
+}
+
 static const struct i2c_device_id adt7410_id[] = {
         { "adt7410", 0 },
         {}
@@ -826,13 +899,204 @@ static struct i2c_driver adt7410_driver = {
         .driver = {
                 .name = "adt7410",
         },
-        .probe = adt7410_probe,
-        .remove = __devexit_p(adt7410_remove),
+        .probe = adt7410_i2c_probe,
+        .remove = adt7410_i2c_remove,
         .id_table = adt7410_id,
 };
-module_i2c_driver(adt7410_driver);
+
+static int __init adt7410_i2c_init(void)
+{
+        return i2c_add_driver(&adt7410_driver);
+}
+
+static void __exit adt7410_i2c_exit(void)
+{
+        i2c_del_driver(&adt7410_driver);
+}
+
+#else
+
+static int  __init adt7410_i2c_init(void) { return 0; };
+static void __exit adt7410_i2c_exit(void) {};
+
+#endif
+
+#if IS_ENABLED(CONFIG_SPI_MASTER)
+
+static const u8 adt7371_reg_table[] = {
+        [ADT7410_TEMPERATURE]   = ADT7310_TEMPERATURE,
+        [ADT7410_STATUS]        = ADT7310_STATUS,
+        [ADT7410_CONFIG]        = ADT7310_CONFIG,
+        [ADT7410_T_ALARM_HIGH]  = ADT7310_T_ALARM_HIGH,
+        [ADT7410_T_ALARM_LOW]   = ADT7310_T_ALARM_LOW,
+        [ADT7410_T_CRIT]        = ADT7310_T_CRIT,
+        [ADT7410_T_HYST]        = ADT7310_T_HYST,
+        [ADT7410_ID]            = ADT7310_ID,
+};
+
+#define AD7310_COMMAND(reg) (adt7371_reg_table[(reg)] << ADT7310_CMD_REG_OFFSET)
+
+static int adt7310_spi_read_word(struct adt7410_chip_info *chip,
+        u8 reg, u16 *data)
+{
+        struct spi_device *spi = to_spi_device(chip->dev);
+        u8 command = AD7310_COMMAND(reg);
+        int ret = 0;
+
+        command |= ADT7310_CMD_READ;
+        ret = spi_write(spi, &command, sizeof(command));
+        if (ret < 0) {
+                dev_err(&spi->dev, "SPI write command error\n");
+                return ret;
+        }
+
+        ret = spi_read(spi, (u8 *)data, sizeof(*data));
+        if (ret < 0) {
+                dev_err(&spi->dev, "SPI read word error\n");
+                return ret;
+        }
+
+        *data = be16_to_cpu(*data);
+
+        return 0;
+}
+
+static int adt7310_spi_write_word(struct adt7410_chip_info *chip, u8 reg,
+        u16 data)
+{
+        struct spi_device *spi = to_spi_device(chip->dev);
+        u8 buf[3];
+        int ret = 0;
+
+        buf[0] = AD7310_COMMAND(reg);
+        buf[1] = (u8)(data >> 8);
+        buf[2] = (u8)(data & 0xFF);
+
+        ret = spi_write(spi, buf, 3);
+        if (ret < 0) {
+                dev_err(&spi->dev, "SPI write word error\n");
+                return ret;
+        }
+
+        return ret;
+}
+
+static int adt7310_spi_read_byte(struct adt7410_chip_info *chip, u8 reg,
+        u8 *data)
+{
+        struct spi_device *spi = to_spi_device(chip->dev);
+        u8 command = AD7310_COMMAND(reg);
+        int ret = 0;
+
+        command |= ADT7310_CMD_READ;
+        ret = spi_write(spi, &command, sizeof(command));
+        if (ret < 0) {
+                dev_err(&spi->dev, "SPI write command error\n");
+                return ret;
+        }
+
+        ret = spi_read(spi, data, sizeof(*data));
+        if (ret < 0) {
+                dev_err(&spi->dev, "SPI read byte error\n");
+                return ret;
+        }
+
+        return 0;
+}
+
+static int adt7310_spi_write_byte(struct adt7410_chip_info *chip, u8 reg,
+        u8 data)
+{
+        struct spi_device *spi = to_spi_device(chip->dev);
+        u8 buf[2];
+        int ret = 0;
+
+        buf[0] = AD7310_COMMAND(reg);
+        buf[1] = data;
+
+        ret = spi_write(spi, buf, 2);
+        if (ret < 0) {
+                dev_err(&spi->dev, "SPI write byte error\n");
+                return ret;
+        }
+
+        return ret;
+}
+
+static const struct adt7410_ops adt7310_spi_ops = {
+        .read_word = adt7310_spi_read_word,
+        .write_word = adt7310_spi_write_word,
+        .read_byte = adt7310_spi_read_byte,
+        .write_byte = adt7310_spi_write_byte,
+};
+
+static int adt7310_spi_probe(struct spi_device *spi)
+{
+        return adt7410_probe(&spi->dev, spi->irq,
+                spi_get_device_id(spi)->name, &adt7310_spi_ops);
+}
+
+static int adt7310_spi_remove(struct spi_device *spi)
+{
+        return adt7410_remove(&spi->dev, spi->irq);
+}
+
+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",
+                .owner = THIS_MODULE,
+        },
+        .probe = adt7310_spi_probe,
+        .remove = adt7310_spi_remove,
+        .id_table = adt7310_id,
+};
+
+static int __init adt7310_spi_init(void)
+{
+        return spi_register_driver(&adt7310_driver);
+}
+
+static void adt7310_spi_exit(void)
+{
+        spi_unregister_driver(&adt7310_driver);
+}
+
+#else
+
+static int __init adt7310_spi_init(void) { return 0; };
+static void adt7310_spi_exit(void) {};
+
+#endif
+
+static int __init adt7410_init(void)
+{
+        int ret;
+
+        ret = adt7310_spi_init();
+        if (ret)
+                return ret;
+
+        ret = adt7410_i2c_init();
+        if (ret)
+                adt7310_spi_exit();
+
+        return ret;
+}
+module_init(adt7410_init);
+
+static void __exit adt7410_exit(void)
+{
+        adt7410_i2c_exit();
+        adt7310_spi_exit();
+}
+module_exit(adt7410_exit);
 
 MODULE_AUTHOR("Sonic Zhang <sonic.zhang@analog.com>");
-MODULE_DESCRIPTION("Analog Devices ADT7410 digital"
-                        " temperature sensor driver");
+MODULE_DESCRIPTION("Analog Devices ADT7310/ADT7410 digital temperature sensor driver");
 MODULE_LICENSE("GPL v2");
diff --git a/drivers/staging/iio/adc/lpc32xx_adc.c b/drivers/staging/iio/adc/lpc32xx_adc.c
index 7e9bd0001cc7..0bf2a6cc79e0 100644
--- a/drivers/staging/iio/adc/lpc32xx_adc.c
+++ b/drivers/staging/iio/adc/lpc32xx_adc.c
@@ -126,7 +126,7 @@ static irqreturn_t lpc32xx_adc_isr(int irq, void *dev_id)
         return IRQ_HANDLED;
 }
 
-static int __devinit lpc32xx_adc_probe(struct platform_device *pdev)
+static int lpc32xx_adc_probe(struct platform_device *pdev)
 {
         struct lpc32xx_adc_info *info = NULL;
         struct resource *res;
@@ -150,7 +150,7 @@ static int __devinit lpc32xx_adc_probe(struct platform_device *pdev)
 
         info = iio_priv(iodev);
 
-        info->adc_base = ioremap(res->start, res->end - res->start + 1);
+        info->adc_base = ioremap(res->start, resource_size(res));
         if (!info->adc_base) {
                 dev_err(&pdev->dev, "failed mapping memory\n");
                 retval = -EBUSY;
@@ -207,7 +207,7 @@ errout1:
         return retval;
 }
 
-static int __devexit lpc32xx_adc_remove(struct platform_device *pdev)
+static int lpc32xx_adc_remove(struct platform_device *pdev)
 {
         struct iio_dev *iodev = platform_get_drvdata(pdev);
         struct lpc32xx_adc_info *info = iio_priv(iodev);
@@ -233,7 +233,7 @@ MODULE_DEVICE_TABLE(of, lpc32xx_adc_match);
 
 static struct platform_driver lpc32xx_adc_driver = {
         .probe          = lpc32xx_adc_probe,
-        .remove         = __devexit_p(lpc32xx_adc_remove),
+        .remove         = lpc32xx_adc_remove,
         .driver         = {
                 .name   = MOD_NAME,
                 .owner  = THIS_MODULE,
diff --git a/drivers/staging/iio/adc/max1363.h b/drivers/staging/iio/adc/max1363.h
deleted file mode 100644
index c746918683f1..000000000000
--- a/drivers/staging/iio/adc/max1363.h
+++ /dev/null
@@ -1,177 +0,0 @@
-#ifndef _MAX1363_H_
-#define  _MAX1363_H_
-
-#define MAX1363_SETUP_BYTE(a) ((a) | 0x80)
-
-/* There is a fair bit more defined here than currently
- * used, but the intention is to support everything these
- * chips do in the long run */
-
-/* see data sheets */
-/* max1363 and max1236, max1237, max1238, max1239 */
-#define MAX1363_SETUP_AIN3_IS_AIN3_REF_IS_VDD   0x00
-#define MAX1363_SETUP_AIN3_IS_REF_EXT_TO_REF    0x20
-#define MAX1363_SETUP_AIN3_IS_AIN3_REF_IS_INT   0x40
-#define MAX1363_SETUP_AIN3_IS_REF_REF_IS_INT    0x60
-#define MAX1363_SETUP_POWER_UP_INT_REF          0x10
-#define MAX1363_SETUP_POWER_DOWN_INT_REF        0x00
-
-/* think about includeing max11600 etc - more settings */
-#define MAX1363_SETUP_EXT_CLOCK                 0x08
-#define MAX1363_SETUP_INT_CLOCK                 0x00
-#define MAX1363_SETUP_UNIPOLAR                  0x00
-#define MAX1363_SETUP_BIPOLAR                   0x04
-#define MAX1363_SETUP_RESET                     0x00
-#define MAX1363_SETUP_NORESET                   0x02
-/* max1363 only - though don't care on others.
- * For now monitor modes are not implemented as the relevant
- * line is not connected on my test board.
- * The definitions are here as I intend to add this soon.
- */
-#define MAX1363_SETUP_MONITOR_SETUP             0x01
-
-/* Specific to the max1363 */
-#define MAX1363_MON_RESET_CHAN(a) (1 << ((a) + 4))
-#define MAX1363_MON_INT_ENABLE                  0x01
-
-/* defined for readability reasons */
-/* All chips */
-#define MAX1363_CONFIG_BYTE(a) ((a))
-
-#define MAX1363_CONFIG_SE                       0x01
-#define MAX1363_CONFIG_DE                       0x00
-#define MAX1363_CONFIG_SCAN_TO_CS               0x00
-#define MAX1363_CONFIG_SCAN_SINGLE_8            0x20
-#define MAX1363_CONFIG_SCAN_MONITOR_MODE        0x40
-#define MAX1363_CONFIG_SCAN_SINGLE_1            0x60
-/* max123{6-9} only */
-#define MAX1236_SCAN_MID_TO_CHANNEL             0x40
-
-/* max1363 only - merely part of channel selects or don't care for others*/
-#define MAX1363_CONFIG_EN_MON_MODE_READ 0x18
-
-#define MAX1363_CHANNEL_SEL(a) ((a) << 1)
-
-/* max1363 strictly 0x06 - but doesn't matter */
-#define MAX1363_CHANNEL_SEL_MASK                0x1E
-#define MAX1363_SCAN_MASK                       0x60
-#define MAX1363_SE_DE_MASK                      0x01
-
-#define MAX1363_MAX_CHANNELS 25
-/**
- * struct max1363_mode - scan mode information
- * @conf:       The corresponding value of the configuration register
- * @modemask:   Bit mask corresponding to channels enabled in this mode
- */
-struct max1363_mode {
-        int8_t          conf;
-        DECLARE_BITMAP(modemask, MAX1363_MAX_CHANNELS);
-};
-
-/* This must be maintained along side the max1363_mode_table in max1363_core */
-enum max1363_modes {
-        /* Single read of a single channel */
-        _s0, _s1, _s2, _s3, _s4, _s5, _s6, _s7, _s8, _s9, _s10, _s11,
-        /* Differential single read */
-        d0m1, d2m3, d4m5, d6m7, d8m9, d10m11,
-        d1m0, d3m2, d5m4, d7m6, d9m8, d11m10,
-        /* Scan to channel and mid to channel where overlapping */
-        s0to1, s0to2, s2to3, s0to3, s0to4, s0to5, s0to6,
-        s6to7, s0to7, s6to8, s0to8, s6to9,
-        s0to9, s6to10, s0to10, s6to11, s0to11,
-        /* Differential scan to channel and mid to channel where overlapping */
-        d0m1to2m3, d0m1to4m5, d0m1to6m7, d6m7to8m9,
-        d0m1to8m9, d6m7to10m11, d0m1to10m11, d1m0to3m2,
-        d1m0to5m4, d1m0to7m6, d7m6to9m8, d1m0to9m8,
-        d7m6to11m10, d1m0to11m10,
-};
-
-/**
- * struct max1363_chip_info - chip specifc information
- * @name:               indentification string for chip
- * @bits:               accuracy of the adc in bits
- * @int_vref_mv:        the internal reference voltage
- * @info:               iio core function callbacks structure
- * @mode_list:          array of available scan modes
- * @num_modes:          the number of scan modes available
- * @default_mode:       the scan mode in which the chip starts up
- * @channel:            channel specification
- * @num_channels:       number of channels
- */
-struct max1363_chip_info {
-        const struct iio_info           *info;
-        const struct iio_chan_spec *channels;
-        int num_channels;
-        const enum max1363_modes        *mode_list;
-        enum max1363_modes              default_mode;
-        u16                             int_vref_mv;
-        u8                              num_modes;
-        u8                              bits;
-};
-
-/**
- * struct max1363_state - driver instance specific data
- * @client:             i2c_client
- * @setupbyte:          cache of current device setup byte
- * @configbyte:         cache of current device config byte
- * @chip_info:          chip model specific constants, available modes etc
- * @current_mode:       the scan mode of this chip
- * @requestedmask:      a valid requested set of channels
- * @reg:                supply regulator
- * @monitor_on:         whether monitor mode is enabled
- * @monitor_speed:      parameter corresponding to device monitor speed setting
- * @mask_high:          bitmask for enabled high thresholds
- * @mask_low:           bitmask for enabled low thresholds
- * @thresh_high:        high threshold values
- * @thresh_low:         low threshold values
- */
-struct max1363_state {
-        struct i2c_client               *client;
-        u8                              setupbyte;
-        u8                              configbyte;
-        const struct max1363_chip_info  *chip_info;
-        const struct max1363_mode       *current_mode;
-        u32                             requestedmask;
-        struct regulator                *reg;
-
-        /* Using monitor modes and buffer at the same time is
-           currently not supported */
-        bool                            monitor_on;
-        unsigned int                    monitor_speed:3;
-        u8                              mask_high;
-        u8                              mask_low;
-        /* 4x unipolar first then the fours bipolar ones */
-        s16                             thresh_high[8];
-        s16                             thresh_low[8];
-};
-
-const struct max1363_mode
-*max1363_match_mode(const unsigned long *mask,
-                    const struct max1363_chip_info *ci);
-
-int max1363_set_scan_mode(struct max1363_state *st);
-
-#ifdef CONFIG_MAX1363_RING_BUFFER
-int max1363_update_scan_mode(struct iio_dev *indio_dev,
-                             const unsigned long *scan_mask);
-int max1363_register_ring_funcs_and_init(struct iio_dev *indio_dev);
-void max1363_ring_cleanup(struct iio_dev *indio_dev);
-
-#else /* CONFIG_MAX1363_RING_BUFFER */
-int max1363_update_scan_mode(struct iio_dev *indio_dev,
-                             const long *scan_mask)
-{
-        return 0;
-}
-
-static inline int
-max1363_register_ring_funcs_and_init(struct iio_dev *indio_dev)
-{
-        return 0;
-}
-
-static inline void max1363_ring_cleanup(struct iio_dev *indio_dev)
-{
-}
-#endif /* CONFIG_MAX1363_RING_BUFFER */
-#endif /* _MAX1363_H_ */
diff --git a/drivers/staging/iio/adc/max1363_ring.c b/drivers/staging/iio/adc/max1363_ring.c
deleted file mode 100644
index 5f74f3b7671a..000000000000
--- a/drivers/staging/iio/adc/max1363_ring.c
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * Copyright (C) 2008 Jonathan Cameron
- *
- * 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.
- *
- * max1363_ring.c
- */
-
-#include <linux/interrupt.h>
-#include <linux/slab.h>
-#include <linux/kernel.h>
-#include <linux/i2c.h>
-#include <linux/bitops.h>
-
-#include <linux/iio/iio.h>
-#include <linux/iio/buffer.h>
-#include "../ring_sw.h"
-#include <linux/iio/trigger_consumer.h>
-
-#include "max1363.h"
-
-int max1363_update_scan_mode(struct iio_dev *indio_dev,
-                             const unsigned long *scan_mask)
-{
-        struct max1363_state *st = iio_priv(indio_dev);
-
-        /*
-         * Need to figure out the current mode based upon the requested
-         * scan mask in iio_dev
-         */
-        st->current_mode = max1363_match_mode(scan_mask, st->chip_info);
-        if (!st->current_mode)
-                return -EINVAL;
-        max1363_set_scan_mode(st);
-        return 0;
-}
-
-static irqreturn_t max1363_trigger_handler(int irq, void *p)
-{
-        struct iio_poll_func *pf = p;
-        struct iio_dev *indio_dev = pf->indio_dev;
-        struct max1363_state *st = iio_priv(indio_dev);
-        s64 time_ns;
-        __u8 *rxbuf;
-        int b_sent;
-        size_t d_size;
-        unsigned long numvals = bitmap_weight(st->current_mode->modemask,
-                                              MAX1363_MAX_CHANNELS);
-
-        /* Ensure the timestamp is 8 byte aligned */
-        if (st->chip_info->bits != 8)
-                d_size = numvals*2;
-        else
-                d_size = numvals;
-        if (indio_dev->scan_timestamp) {
-                d_size += sizeof(s64);
-                if (d_size % sizeof(s64))
-                        d_size += sizeof(s64) - (d_size % sizeof(s64));
-        }
-        /* Monitor mode prevents reading. Whilst not currently implemented
-         * might as well have this test in here in the meantime as it does
-         * no harm.
-         */
-        if (numvals == 0)
-                goto done;
-
-        rxbuf = kmalloc(d_size, GFP_KERNEL);
-        if (rxbuf == NULL)
-                goto done;
-        if (st->chip_info->bits != 8)
-                b_sent = i2c_master_recv(st->client, rxbuf, numvals*2);
-        else
-                b_sent = i2c_master_recv(st->client, rxbuf, numvals);
-        if (b_sent < 0)
-                goto done_free;
-
-        time_ns = iio_get_time_ns();
-
-        if (indio_dev->scan_timestamp)
-                memcpy(rxbuf + d_size - sizeof(s64), &time_ns, sizeof(time_ns));
-        iio_push_to_buffer(indio_dev->buffer, rxbuf);
-
-done_free:
-        kfree(rxbuf);
-done:
-        iio_trigger_notify_done(indio_dev->trig);
-
-        return IRQ_HANDLED;
-}
-
-static const struct iio_buffer_setup_ops max1363_ring_setup_ops = {
-        .postenable = &iio_triggered_buffer_postenable,
-        .preenable = &iio_sw_buffer_preenable,
-        .predisable = &iio_triggered_buffer_predisable,
-};
-
-int max1363_register_ring_funcs_and_init(struct iio_dev *indio_dev)
-{
-        struct max1363_state *st = iio_priv(indio_dev);
-        int ret = 0;
-
-        indio_dev->buffer = iio_sw_rb_allocate(indio_dev);
-        if (!indio_dev->buffer) {
-                ret = -ENOMEM;
-                goto error_ret;
-        }
-        indio_dev->pollfunc = iio_alloc_pollfunc(NULL,
-                                                 &max1363_trigger_handler,
-                                                 IRQF_ONESHOT,
-                                                 indio_dev,
-                                                 "%s_consumer%d",
-                                                 st->client->name,
-                                                 indio_dev->id);
-        if (indio_dev->pollfunc == NULL) {
-                ret = -ENOMEM;
-                goto error_deallocate_sw_rb;
-        }
-        /* Ring buffer functions - here trigger setup related */
-        indio_dev->setup_ops = &max1363_ring_setup_ops;
-
-        /* Flag that polled ring buffering is possible */
-        indio_dev->modes |= INDIO_BUFFER_TRIGGERED;
-
-        return 0;
-
-error_deallocate_sw_rb:
-        iio_sw_rb_free(indio_dev->buffer);
-error_ret:
-        return ret;
-}
-
-void max1363_ring_cleanup(struct iio_dev *indio_dev)
-{
-        /* ensure that the trigger has been detached */
-        iio_dealloc_pollfunc(indio_dev->pollfunc);
-        iio_sw_rb_free(indio_dev->buffer);
-}
diff --git a/drivers/staging/iio/adc/mxs-lradc.c b/drivers/staging/iio/adc/mxs-lradc.c
index ca7c1fa88e71..fb31b457a56a 100644
--- a/drivers/staging/iio/adc/mxs-lradc.c
+++ b/drivers/staging/iio/adc/mxs-lradc.c
@@ -237,7 +237,6 @@ static irqreturn_t mxs_lradc_trigger_handler(int irq, void *p)
         struct iio_poll_func *pf = p;
         struct iio_dev *iio = pf->indio_dev;
         struct mxs_lradc *lradc = iio_priv(iio);
-        struct iio_buffer *buffer = iio->buffer;
         const uint32_t chan_value = LRADC_CH_ACCUMULATE |
                 ((LRADC_DELAY_TIMER_LOOP - 1) << LRADC_CH_NUM_SAMPLES_OFFSET);
         int i, j = 0;
@@ -256,7 +255,7 @@ static irqreturn_t mxs_lradc_trigger_handler(int irq, void *p)
                 *timestamp = pf->timestamp;
         }
 
-        iio_push_to_buffer(buffer, (u8 *)lradc->buffer);
+        iio_push_to_buffers(iio, (u8 *)lradc->buffer);
 
         iio_trigger_notify_done(iio->trig);
 
@@ -351,7 +350,7 @@ static int mxs_lradc_buffer_preenable(struct iio_dev *iio)
                 writel(chan_value, lradc->base + LRADC_CH(ofs));
                 enable |= 1 << ofs;
                 ofs++;
-        };
+        }
 
         writel(LRADC_DELAY_TRIGGER_LRADCS_MASK | LRADC_DELAY_KICK,
                 lradc->base + LRADC_DELAY(0) + STMP_OFFSET_REG_CLR);
@@ -467,7 +466,7 @@ static void mxs_lradc_hw_stop(struct mxs_lradc *lradc)
                 writel(0, lradc->base + LRADC_DELAY(i));
 }
 
-static int __devinit mxs_lradc_probe(struct platform_device *pdev)
+static int mxs_lradc_probe(struct platform_device *pdev)
 {
         struct device *dev = &pdev->dev;
         struct mxs_lradc *lradc;
@@ -552,7 +551,7 @@ err_addr:
         return ret;
 }
 
-static int __devexit mxs_lradc_remove(struct platform_device *pdev)
+static int mxs_lradc_remove(struct platform_device *pdev)
 {
         struct iio_dev *iio = platform_get_drvdata(pdev);
         struct mxs_lradc *lradc = iio_priv(iio);
@@ -580,7 +579,7 @@ static struct platform_driver mxs_lradc_driver = {
                 .of_match_table = mxs_lradc_dt_ids,
         },
         .probe  = mxs_lradc_probe,
-        .remove = __devexit_p(mxs_lradc_remove),
+        .remove = mxs_lradc_remove,
 };
 
 module_platform_driver(mxs_lradc_driver);
diff --git a/drivers/staging/iio/adc/spear_adc.c b/drivers/staging/iio/adc/spear_adc.c
index 0b83e2e1f410..13052ceb2f2b 100644
--- a/drivers/staging/iio/adc/spear_adc.c
+++ b/drivers/staging/iio/adc/spear_adc.c
@@ -291,7 +291,7 @@ static const struct iio_info spear_adc_iio_info = {
         .driver_module = THIS_MODULE,
 };
 
-static int __devinit spear_adc_probe(struct platform_device *pdev)
+static int spear_adc_probe(struct platform_device *pdev)
 {
         struct device_node *np = pdev->dev.of_node;
         struct device *dev = &pdev->dev;
@@ -401,7 +401,7 @@ errout1:
         return ret;
 }
 
-static int __devexit spear_adc_remove(struct platform_device *pdev)
+static int spear_adc_remove(struct platform_device *pdev)
 {
         struct iio_dev *iodev = platform_get_drvdata(pdev);
         struct spear_adc_info *info = iio_priv(iodev);
@@ -424,7 +424,7 @@ MODULE_DEVICE_TABLE(of, spear_adc_dt_ids);
 
 static struct platform_driver spear_adc_driver = {
         .probe          = spear_adc_probe,
-        .remove         = __devexit_p(spear_adc_remove),
+        .remove         = spear_adc_remove,
         .driver         = {
                 .name   = MOD_NAME,
                 .owner  = THIS_MODULE,
diff --git a/drivers/staging/iio/addac/adt7316-i2c.c b/drivers/staging/iio/addac/adt7316-i2c.c
index 9e128dd7d457..ce7d91cb331c 100644
--- a/drivers/staging/iio/addac/adt7316-i2c.c
+++ b/drivers/staging/iio/addac/adt7316-i2c.c
@@ -92,7 +92,7 @@ static int adt7316_i2c_multi_write(void *client, u8 reg, u8 count, u8 *data)
  * device probe and remove
  */
 
-static int __devinit adt7316_i2c_probe(struct i2c_client *client,
+static int adt7316_i2c_probe(struct i2c_client *client,
                 const struct i2c_device_id *id)
 {
         struct adt7316_bus bus = {
@@ -108,7 +108,7 @@ static int __devinit adt7316_i2c_probe(struct i2c_client *client,
         return adt7316_probe(&client->dev, &bus, id->name);
 }
 
-static int __devexit adt7316_i2c_remove(struct i2c_client *client)
+static int adt7316_i2c_remove(struct i2c_client *client)
 {
         return adt7316_remove(&client->dev);
 }
@@ -132,7 +132,7 @@ static struct i2c_driver adt7316_driver = {
                 .owner  = THIS_MODULE,
         },
         .probe = adt7316_i2c_probe,
-        .remove = __devexit_p(adt7316_i2c_remove),
+        .remove = adt7316_i2c_remove,
         .id_table = adt7316_i2c_id,
 };
 module_i2c_driver(adt7316_driver);
diff --git a/drivers/staging/iio/addac/adt7316-spi.c b/drivers/staging/iio/addac/adt7316-spi.c
index 985f7d8a6eb2..0db8ef5835a0 100644
--- a/drivers/staging/iio/addac/adt7316-spi.c
+++ b/drivers/staging/iio/addac/adt7316-spi.c
@@ -89,7 +89,7 @@ static int adt7316_spi_write(void *client, u8 reg, u8 val)
  * device probe and remove
  */
 
-static int __devinit adt7316_spi_probe(struct spi_device *spi_dev)
+static int adt7316_spi_probe(struct spi_device *spi_dev)
 {
         struct adt7316_bus bus = {
                 .client = spi_dev,
@@ -116,7 +116,7 @@ static int __devinit adt7316_spi_probe(struct spi_device *spi_dev)
         return adt7316_probe(&spi_dev->dev, &bus, spi_dev->modalias);
 }
 
-static int __devexit adt7316_spi_remove(struct spi_device *spi_dev)
+static int adt7316_spi_remove(struct spi_device *spi_dev)
 {
         return adt7316_remove(&spi_dev->dev);
 }
@@ -140,7 +140,7 @@ static struct spi_driver adt7316_driver = {
                 .owner = THIS_MODULE,
         },
         .probe = adt7316_spi_probe,
-        .remove = __devexit_p(adt7316_spi_remove),
+        .remove = adt7316_spi_remove,
         .id_table = adt7316_spi_id,
 };
 module_spi_driver(adt7316_driver);
diff --git a/drivers/staging/iio/addac/adt7316.c b/drivers/staging/iio/addac/adt7316.c
index 8fb014a046a2..0b431bc4f627 100644
--- a/drivers/staging/iio/addac/adt7316.c
+++ b/drivers/staging/iio/addac/adt7316.c
@@ -2125,7 +2125,7 @@ static const struct iio_info adt7516_info = {
 /*
  * device probe and remove
  */
-int __devinit adt7316_probe(struct device *dev, struct adt7316_bus *bus,
+int adt7316_probe(struct device *dev, struct adt7316_bus *bus,
                 const char *name)
 {
         struct adt7316_chip_info *chip;
@@ -2216,7 +2216,7 @@ error_ret:
 }
 EXPORT_SYMBOL(adt7316_probe);
 
-int __devexit adt7316_remove(struct device *dev)
+int adt7316_remove(struct device *dev)
 {
         struct iio_dev *indio_dev = dev_get_drvdata(dev);
         struct adt7316_chip_info *chip = iio_priv(indio_dev);
diff --git a/drivers/staging/iio/cdc/ad7150.c b/drivers/staging/iio/cdc/ad7150.c
index 6a4041417d4e..3c608c14dd99 100644
--- a/drivers/staging/iio/cdc/ad7150.c
+++ b/drivers/staging/iio/cdc/ad7150.c
@@ -156,7 +156,7 @@ static int ad7150_read_event_config(struct iio_dev *indio_dev, u64 event_code)
                         return !adaptive && (threshtype == 0x1);
                 else
                         return !adaptive && (threshtype == 0x0);
-        };
+        }
         return -EINVAL;
 }
 
@@ -194,7 +194,7 @@ static int ad7150_write_event_params(struct iio_dev *indio_dev, u64 event_code)
                 break;
         default:
                 return -EINVAL;
-        };
+        }
         ret = i2c_smbus_write_byte_data(chip->client,
                                         ad7150_addresses[chan][4],
                                         sens);
@@ -257,7 +257,7 @@ static int ad7150_write_event_config(struct iio_dev *indio_dev,
         default:
                 ret = -EINVAL;
                 goto error_ret;
-        };
+        }
 
         cfg |= (!adaptive << 7) | (thresh_type << 5);
 
@@ -327,7 +327,7 @@ static int ad7150_write_event_value(struct iio_dev *indio_dev,
         default:
                 ret = -EINVAL;
                 goto error_ret;
-        };
+        }
 
         /* write back if active */
         ret = ad7150_write_event_params(indio_dev, event_code);
@@ -360,7 +360,7 @@ static ssize_t ad7150_show_timeout(struct device *dev,
                 break;
         default:
                 return -EINVAL;
-        };
+        }
 
         return sprintf(buf, "%d\n", value);
 }
@@ -394,7 +394,7 @@ static ssize_t ad7150_store_timeout(struct device *dev,
         default:
                 ret = -EINVAL;
                 goto error_ret;
-        };
+        }
 
         ret = ad7150_write_event_params(indio_dev, this_attr->address);
 error_ret:
@@ -551,7 +551,7 @@ static const struct iio_info ad7150_info = {
  * device probe and remove
  */
 
-static int __devinit ad7150_probe(struct i2c_client *client,
+static int ad7150_probe(struct i2c_client *client,
                 const struct i2c_device_id *id)
 {
         int ret;
@@ -628,7 +628,7 @@ error_ret:
         return ret;
 }
 
-static int __devexit ad7150_remove(struct i2c_client *client)
+static int ad7150_remove(struct i2c_client *client)
 {
         struct iio_dev *indio_dev = i2c_get_clientdata(client);
 
@@ -658,7 +658,7 @@ static struct i2c_driver ad7150_driver = {
                 .name = "ad7150",
         },
         .probe = ad7150_probe,
-        .remove = __devexit_p(ad7150_remove),
+        .remove = ad7150_remove,
         .id_table = ad7150_id,
 };
 module_i2c_driver(ad7150_driver);
diff --git a/drivers/staging/iio/cdc/ad7152.c b/drivers/staging/iio/cdc/ad7152.c
index 98c3015116aa..3c92ba3722a8 100644
--- a/drivers/staging/iio/cdc/ad7152.c
+++ b/drivers/staging/iio/cdc/ad7152.c
@@ -405,7 +405,7 @@ static int ad7152_read_raw(struct iio_dev *indio_dev,
                 break;
         default:
                 ret = -EINVAL;
-        };
+        }
 out:
         mutex_unlock(&indio_dev->mlock);
         return ret;
@@ -474,7 +474,7 @@ static const struct iio_chan_spec ad7152_channels[] = {
  * device probe and remove
  */
 
-static int __devinit ad7152_probe(struct i2c_client *client,
+static int ad7152_probe(struct i2c_client *client,
                 const struct i2c_device_id *id)
 {
         int ret = 0;
@@ -518,7 +518,7 @@ error_ret:
         return ret;
 }
 
-static int __devexit ad7152_remove(struct i2c_client *client)
+static int ad7152_remove(struct i2c_client *client)
 {
         struct iio_dev *indio_dev = i2c_get_clientdata(client);
 
@@ -541,7 +541,7 @@ static struct i2c_driver ad7152_driver = {
                 .name = KBUILD_MODNAME,
         },
         .probe = ad7152_probe,
-        .remove = __devexit_p(ad7152_remove),
+        .remove = ad7152_remove,
         .id_table = ad7152_id,
 };
 module_i2c_driver(ad7152_driver);
diff --git a/drivers/staging/iio/cdc/ad7746.c b/drivers/staging/iio/cdc/ad7746.c
index 754e11e87193..466b82ecfbe0 100644
--- a/drivers/staging/iio/cdc/ad7746.c
+++ b/drivers/staging/iio/cdc/ad7746.c
@@ -677,7 +677,7 @@ static int ad7746_read_raw(struct iio_dev *indio_dev,
                 break;
         default:
                 ret = -EINVAL;
-        };
+        }
 out:
         mutex_unlock(&indio_dev->mlock);
         return ret;
@@ -694,7 +694,7 @@ static const struct iio_info ad7746_info = {
  * device probe and remove
  */
 
-static int __devinit ad7746_probe(struct i2c_client *client,
+static int ad7746_probe(struct i2c_client *client,
                 const struct i2c_device_id *id)
 {
         struct ad7746_platform_data *pdata = client->dev.platform_data;
@@ -768,7 +768,7 @@ error_ret:
         return ret;
 }
 
-static int __devexit ad7746_remove(struct i2c_client *client)
+static int ad7746_remove(struct i2c_client *client)
 {
         struct iio_dev *indio_dev = i2c_get_clientdata(client);
 
@@ -792,7 +792,7 @@ static struct i2c_driver ad7746_driver = {
                 .name = KBUILD_MODNAME,
         },
         .probe = ad7746_probe,
-        .remove = __devexit_p(ad7746_remove),
+        .remove = ad7746_remove,
         .id_table = ad7746_id,
 };
 module_i2c_driver(ad7746_driver);
diff --git a/drivers/staging/iio/frequency/ad5930.c b/drivers/staging/iio/frequency/ad5930.c
index 2d541d0eebef..23777be38b18 100644
--- a/drivers/staging/iio/frequency/ad5930.c
+++ b/drivers/staging/iio/frequency/ad5930.c
@@ -91,7 +91,7 @@ static const struct iio_info ad5930_info = {
         .driver_module = THIS_MODULE,
 };
 
-static int __devinit ad5930_probe(struct spi_device *spi)
+static int ad5930_probe(struct spi_device *spi)
 {
         struct ad5930_state *st;
         struct iio_dev *idev;
@@ -127,7 +127,7 @@ error_ret:
         return ret;
 }
 
-static int __devexit ad5930_remove(struct spi_device *spi)
+static int ad5930_remove(struct spi_device *spi)
 {
         iio_device_unregister(spi_get_drvdata(spi));
         iio_device_free(spi_get_drvdata(spi));
@@ -141,7 +141,7 @@ static struct spi_driver ad5930_driver = {
                 .owner = THIS_MODULE,
         },
         .probe = ad5930_probe,
-        .remove = __devexit_p(ad5930_remove),
+        .remove = ad5930_remove,
 };
 module_spi_driver(ad5930_driver);
 
diff --git a/drivers/staging/iio/frequency/ad9832.c b/drivers/staging/iio/frequency/ad9832.c
index fed39404e34a..4e18380c5141 100644
--- a/drivers/staging/iio/frequency/ad9832.c
+++ b/drivers/staging/iio/frequency/ad9832.c
@@ -201,7 +201,7 @@ static const struct iio_info ad9832_info = {
         .driver_module = THIS_MODULE,
 };
 
-static int __devinit ad9832_probe(struct spi_device *spi)
+static int ad9832_probe(struct spi_device *spi)
 {
         struct ad9832_platform_data *pdata = spi->dev.platform_data;
         struct iio_dev *indio_dev;
@@ -324,7 +324,7 @@ error_put_reg:
         return ret;
 }
 
-static int __devexit ad9832_remove(struct spi_device *spi)
+static int ad9832_remove(struct spi_device *spi)
 {
         struct iio_dev *indio_dev = spi_get_drvdata(spi);
         struct ad9832_state *st = iio_priv(indio_dev);
@@ -352,7 +352,7 @@ static struct spi_driver ad9832_driver = {
                 .owner  = THIS_MODULE,
         },
         .probe          = ad9832_probe,
-        .remove         = __devexit_p(ad9832_remove),
+        .remove         = ad9832_remove,
         .id_table       = ad9832_id,
 };
 module_spi_driver(ad9832_driver);
diff --git a/drivers/staging/iio/frequency/ad9834.c b/drivers/staging/iio/frequency/ad9834.c
index 1b2dc741d2ce..5cba3c01f417 100644
--- a/drivers/staging/iio/frequency/ad9834.c
+++ b/drivers/staging/iio/frequency/ad9834.c
@@ -314,7 +314,7 @@ static const struct iio_info ad9833_info = {
         .driver_module = THIS_MODULE,
 };
 
-static int __devinit ad9834_probe(struct spi_device *spi)
+static int ad9834_probe(struct spi_device *spi)
 {
         struct ad9834_platform_data *pdata = spi->dev.platform_data;
         struct ad9834_state *st;
@@ -424,7 +424,7 @@ error_put_reg:
         return ret;
 }
 
-static int __devexit ad9834_remove(struct spi_device *spi)
+static int ad9834_remove(struct spi_device *spi)
 {
         struct iio_dev *indio_dev = spi_get_drvdata(spi);
         struct ad9834_state *st = iio_priv(indio_dev);
@@ -454,7 +454,7 @@ static struct spi_driver ad9834_driver = {
                 .owner  = THIS_MODULE,
         },
         .probe          = ad9834_probe,
-        .remove         = __devexit_p(ad9834_remove),
+        .remove         = ad9834_remove,
         .id_table       = ad9834_id,
 };
 module_spi_driver(ad9834_driver);
diff --git a/drivers/staging/iio/frequency/ad9850.c b/drivers/staging/iio/frequency/ad9850.c
index 74abee054ac0..104f7a4905a3 100644
--- a/drivers/staging/iio/frequency/ad9850.c
+++ b/drivers/staging/iio/frequency/ad9850.c
@@ -77,7 +77,7 @@ static const struct iio_info ad9850_info = {
         .driver_module = THIS_MODULE,
 };
 
-static int __devinit ad9850_probe(struct spi_device *spi)
+static int ad9850_probe(struct spi_device *spi)
 {
         struct ad9850_state *st;
         struct iio_dev *idev;
@@ -113,7 +113,7 @@ error_ret:
         return ret;
 }
 
-static int __devexit ad9850_remove(struct spi_device *spi)
+static int ad9850_remove(struct spi_device *spi)
 {
         iio_device_unregister(spi_get_drvdata(spi));
         iio_device_free(spi_get_drvdata(spi));
@@ -127,7 +127,7 @@ static struct spi_driver ad9850_driver = {
                 .owner = THIS_MODULE,
         },
         .probe = ad9850_probe,
-        .remove = __devexit_p(ad9850_remove),
+        .remove = ad9850_remove,
 };
 module_spi_driver(ad9850_driver);
 
diff --git a/drivers/staging/iio/frequency/ad9852.c b/drivers/staging/iio/frequency/ad9852.c
index fd9d14a413a5..17ac825b3d26 100644
--- a/drivers/staging/iio/frequency/ad9852.c
+++ b/drivers/staging/iio/frequency/ad9852.c
@@ -226,7 +226,7 @@ static const struct iio_info ad9852_info = {
         .driver_module = THIS_MODULE,
 };
 
-static int __devinit ad9852_probe(struct spi_device *spi)
+static int ad9852_probe(struct spi_device *spi)
 {
         struct ad9852_state *st;
         struct iio_dev *idev;
@@ -264,7 +264,7 @@ error_ret:
         return ret;
 }
 
-static int __devexit ad9852_remove(struct spi_device *spi)
+static int ad9852_remove(struct spi_device *spi)
 {
         iio_device_unregister(spi_get_drvdata(spi));
         iio_device_free(spi_get_drvdata(spi));
@@ -278,7 +278,7 @@ static struct spi_driver ad9852_driver = {
                 .owner = THIS_MODULE,
         },
         .probe = ad9852_probe,
-        .remove = __devexit_p(ad9852_remove),
+        .remove = ad9852_remove,
 };
 module_spi_driver(ad9852_driver);
 
diff --git a/drivers/staging/iio/frequency/ad9910.c b/drivers/staging/iio/frequency/ad9910.c
index 5a7ba305b75a..e48f874c1fc2 100644
--- a/drivers/staging/iio/frequency/ad9910.c
+++ b/drivers/staging/iio/frequency/ad9910.c
@@ -361,7 +361,7 @@ static const struct iio_info ad9910_info = {
         .driver_module = THIS_MODULE,
 };
 
-static int __devinit ad9910_probe(struct spi_device *spi)
+static int ad9910_probe(struct spi_device *spi)
 {
         struct ad9910_state *st;
         struct iio_dev *idev;
@@ -397,7 +397,7 @@ error_ret:
         return ret;
 }
 
-static int __devexit ad9910_remove(struct spi_device *spi)
+static int ad9910_remove(struct spi_device *spi)
 {
         iio_device_unregister(spi_get_drvdata(spi));
         iio_device_free(spi_get_drvdata(spi));
@@ -411,7 +411,7 @@ static struct spi_driver ad9910_driver = {
                 .owner = THIS_MODULE,
         },
         .probe = ad9910_probe,
-        .remove = __devexit_p(ad9910_remove),
+        .remove = ad9910_remove,
 };
 module_spi_driver(ad9910_driver);
 
diff --git a/drivers/staging/iio/frequency/ad9951.c b/drivers/staging/iio/frequency/ad9951.c
index ba6f49ff09ae..8234e3c915c4 100644
--- a/drivers/staging/iio/frequency/ad9951.c
+++ b/drivers/staging/iio/frequency/ad9951.c
@@ -170,7 +170,7 @@ static const struct iio_info ad9951_info = {
         .driver_module = THIS_MODULE,
 };
 
-static int __devinit ad9951_probe(struct spi_device *spi)
+static int ad9951_probe(struct spi_device *spi)
 {
         struct ad9951_state *st;
         struct iio_dev *idev;
@@ -208,7 +208,7 @@ error_ret:
         return ret;
 }
 
-static int __devexit ad9951_remove(struct spi_device *spi)
+static int ad9951_remove(struct spi_device *spi)
 {
         iio_device_unregister(spi_get_drvdata(spi));
         iio_device_free(spi_get_drvdata(spi));
@@ -222,7 +222,7 @@ static struct spi_driver ad9951_driver = {
                 .owner = THIS_MODULE,
         },
         .probe = ad9951_probe,
-        .remove = __devexit_p(ad9951_remove),
+        .remove = ad9951_remove,
 };
 module_spi_driver(ad9951_driver);
 
diff --git a/drivers/staging/iio/gyro/Makefile b/drivers/staging/iio/gyro/Makefile
index 9ba5ec151705..1303569e5c8a 100644
--- a/drivers/staging/iio/gyro/Makefile
+++ b/drivers/staging/iio/gyro/Makefile
@@ -12,7 +12,6 @@ adis16130-y             := adis16130_core.o
 obj-$(CONFIG_ADIS16130) += adis16130.o
 
 adis16260-y             := adis16260_core.o
-adis16260-$(CONFIG_IIO_BUFFER) += adis16260_ring.o adis16260_trigger.o
 obj-$(CONFIG_ADIS16260) += adis16260.o
 
 adis16251-y             := adis16251_core.o
diff --git a/drivers/staging/iio/gyro/adis16060_core.c b/drivers/staging/iio/gyro/adis16060_core.c
index 87151a7cff04..687c151f9847 100644
--- a/drivers/staging/iio/gyro/adis16060_core.c
+++ b/drivers/staging/iio/gyro/adis16060_core.c
@@ -145,7 +145,7 @@ static const struct iio_chan_spec adis16060_channels[] = {
         }
 };
 
-static int __devinit adis16060_r_probe(struct spi_device *spi)
+static int adis16060_r_probe(struct spi_device *spi)
 {
         int ret;
         struct adis16060_state *st;
@@ -184,7 +184,7 @@ error_ret:
 }
 
 /* fixme, confirm ordering in this function */
-static int __devexit adis16060_r_remove(struct spi_device *spi)
+static int adis16060_r_remove(struct spi_device *spi)
 {
         iio_device_unregister(spi_get_drvdata(spi));
         iio_device_free(spi_get_drvdata(spi));
@@ -192,7 +192,7 @@ static int __devexit adis16060_r_remove(struct spi_device *spi)
         return 0;
 }
 
-static int __devinit adis16060_w_probe(struct spi_device *spi)
+static int adis16060_w_probe(struct spi_device *spi)
 {
         int ret;
         struct iio_dev *indio_dev = adis16060_iio_dev;
@@ -210,7 +210,7 @@ error_ret:
         return ret;
 }
 
-static int __devexit adis16060_w_remove(struct spi_device *spi)
+static int adis16060_w_remove(struct spi_device *spi)
 {
         return 0;
 }
@@ -221,7 +221,7 @@ static struct spi_driver adis16060_r_driver = {
                 .owner = THIS_MODULE,
         },
         .probe = adis16060_r_probe,
-        .remove = __devexit_p(adis16060_r_remove),
+        .remove = adis16060_r_remove,
 };
 
 static struct spi_driver adis16060_w_driver = {
@@ -230,7 +230,7 @@ static struct spi_driver adis16060_w_driver = {
                 .owner = THIS_MODULE,
         },
         .probe = adis16060_w_probe,
-        .remove = __devexit_p(adis16060_w_remove),
+        .remove = adis16060_w_remove,
 };
 
 static __init int adis16060_init(void)
diff --git a/drivers/staging/iio/gyro/adis16080_core.c b/drivers/staging/iio/gyro/adis16080_core.c
index a73902573f79..3525a68d6a75 100644
--- a/drivers/staging/iio/gyro/adis16080_core.c
+++ b/drivers/staging/iio/gyro/adis16080_core.c
@@ -138,7 +138,7 @@ static const struct iio_info adis16080_info = {
         .driver_module = THIS_MODULE,
 };
 
-static int __devinit adis16080_probe(struct spi_device *spi)
+static int adis16080_probe(struct spi_device *spi)
 {
         int ret;
         struct adis16080_state *st;
@@ -177,7 +177,7 @@ error_ret:
 }
 
 /* fixme, confirm ordering in this function */
-static int __devexit adis16080_remove(struct spi_device *spi)
+static int adis16080_remove(struct spi_device *spi)
 {
         iio_device_unregister(spi_get_drvdata(spi));
         iio_device_free(spi_get_drvdata(spi));
@@ -191,7 +191,7 @@ static struct spi_driver adis16080_driver = {
                 .owner = THIS_MODULE,
         },
         .probe = adis16080_probe,
-        .remove = __devexit_p(adis16080_remove),
+        .remove = adis16080_remove,
 };
 module_spi_driver(adis16080_driver);
 
diff --git a/drivers/staging/iio/gyro/adis16130_core.c b/drivers/staging/iio/gyro/adis16130_core.c
index fbf96b0b6ee8..835801ee7e80 100644
--- a/drivers/staging/iio/gyro/adis16130_core.c
+++ b/drivers/staging/iio/gyro/adis16130_core.c
@@ -116,7 +116,7 @@ static const struct iio_info adis16130_info = {
         .driver_module = THIS_MODULE,
 };
 
-static int __devinit adis16130_probe(struct spi_device *spi)
+static int adis16130_probe(struct spi_device *spi)
 {
         int ret;
         struct adis16130_state *st;
@@ -154,7 +154,7 @@ error_ret:
 }
 
 /* fixme, confirm ordering in this function */
-static int __devexit adis16130_remove(struct spi_device *spi)
+static int adis16130_remove(struct spi_device *spi)
 {
         iio_device_unregister(spi_get_drvdata(spi));
         iio_device_free(spi_get_drvdata(spi));
@@ -168,7 +168,7 @@ static struct spi_driver adis16130_driver = {
                 .owner = THIS_MODULE,
         },
         .probe = adis16130_probe,
-        .remove = __devexit_p(adis16130_remove),
+        .remove = adis16130_remove,
 };
 module_spi_driver(adis16130_driver);
 
diff --git a/drivers/staging/iio/gyro/adis16260.h b/drivers/staging/iio/gyro/adis16260.h
index 4c4b25129c6c..df3c0b7e954a 100644
--- a/drivers/staging/iio/gyro/adis16260.h
+++ b/drivers/staging/iio/gyro/adis16260.h
@@ -1,12 +1,11 @@
 #ifndef SPI_ADIS16260_H_
 #define SPI_ADIS16260_H_
+
 #include "adis16260_platform_data.h"
+#include <linux/iio/imu/adis.h>
 
 #define ADIS16260_STARTUP_DELAY 220 /* ms */
 
-#define ADIS16260_READ_REG(a)    a
-#define ADIS16260_WRITE_REG(a) ((a) | 0x80)
-
 #define ADIS16260_FLASH_CNT  0x00 /* Flash memory write count */
 #define ADIS16260_SUPPLY_OUT 0x02 /* Power supply measurement */
 #define ADIS16260_GYRO_OUT   0x04 /* X-axis gyroscope output */
@@ -34,8 +33,6 @@
                                    * convert to decimal = 16,265/16,260 */
 #define ADIS16260_SERIAL_NUM 0x58 /* Serial number */
 
-#define ADIS16260_OUTPUTS    5
-
 #define ADIS16260_ERROR_ACTIVE                  (1<<14)
 #define ADIS16260_NEW_DATA                      (1<<15)
 
@@ -60,13 +57,13 @@
 /* DIAG_STAT */
 #define ADIS16260_DIAG_STAT_ALARM2      (1<<9)
 #define ADIS16260_DIAG_STAT_ALARM1      (1<<8)
-#define ADIS16260_DIAG_STAT_FLASH_CHK   (1<<6)
-#define ADIS16260_DIAG_STAT_SELF_TEST   (1<<5)
-#define ADIS16260_DIAG_STAT_OVERFLOW    (1<<4)
-#define ADIS16260_DIAG_STAT_SPI_FAIL    (1<<3)
-#define ADIS16260_DIAG_STAT_FLASH_UPT   (1<<2)
-#define ADIS16260_DIAG_STAT_POWER_HIGH  (1<<1)
-#define ADIS16260_DIAG_STAT_POWER_LOW   (1<<0)
+#define ADIS16260_DIAG_STAT_FLASH_CHK_BIT       6
+#define ADIS16260_DIAG_STAT_SELF_TEST_BIT       5
+#define ADIS16260_DIAG_STAT_OVERFLOW_BIT        4
+#define ADIS16260_DIAG_STAT_SPI_FAIL_BIT        3
+#define ADIS16260_DIAG_STAT_FLASH_UPT_BIT       2
+#define ADIS16260_DIAG_STAT_POWER_HIGH_BIT      1
+#define ADIS16260_DIAG_STAT_POWER_LOW_BIT       0
 
 /* GLOB_CMD */
 #define ADIS16260_GLOB_CMD_SW_RESET     (1<<7)
@@ -75,82 +72,27 @@
 #define ADIS16260_GLOB_CMD_FAC_CALIB    (1<<1)
 #define ADIS16260_GLOB_CMD_AUTO_NULL    (1<<0)
 
-#define ADIS16260_MAX_TX 24
-#define ADIS16260_MAX_RX 24
-
 #define ADIS16260_SPI_SLOW      (u32)(300 * 1000)
 #define ADIS16260_SPI_BURST     (u32)(1000 * 1000)
 #define ADIS16260_SPI_FAST      (u32)(2000 * 1000)
 
 /**
  * struct adis16260_state - device instance specific data
- * @us:                 actual spi_device
- * @trig:               data ready trigger registered with iio
- * @buf_lock:           mutex to protect tx and rx
  * @negate:             negate the scale parameter
- * @tx:                 transmit buffer
- * @rx:                 receive buffer
  **/
 struct adis16260_state {
-        struct spi_device       *us;
-        struct iio_trigger      *trig;
-        struct mutex            buf_lock;
-        unsigned                negate:1;
-        u8                      tx[ADIS16260_MAX_TX] ____cacheline_aligned;
-        u8                      rx[ADIS16260_MAX_RX];
+        unsigned        negate:1;
+        struct adis     adis;
 };
 
-int adis16260_set_irq(struct iio_dev *indio_dev, bool enable);
-
 /* At the moment triggers are only used for ring buffer
  * filling. This may change!
  */
 
-#define ADIS16260_SCAN_SUPPLY   0
-#define ADIS16260_SCAN_GYRO     1
+#define ADIS16260_SCAN_GYRO     0
+#define ADIS16260_SCAN_SUPPLY   1
 #define ADIS16260_SCAN_AUX_ADC  2
 #define ADIS16260_SCAN_TEMP     3
 #define ADIS16260_SCAN_ANGL     4
 
-#ifdef CONFIG_IIO_BUFFER
-void adis16260_remove_trigger(struct iio_dev *indio_dev);
-int adis16260_probe_trigger(struct iio_dev *indio_dev);
-
-ssize_t adis16260_read_data_from_ring(struct device *dev,
-                                      struct device_attribute *attr,
-                                      char *buf);
-
-
-int adis16260_configure_ring(struct iio_dev *indio_dev);
-void adis16260_unconfigure_ring(struct iio_dev *indio_dev);
-
-#else /* CONFIG_IIO_BUFFER */
-
-static inline void adis16260_remove_trigger(struct iio_dev *indio_dev)
-{
-}
-
-static inline int adis16260_probe_trigger(struct iio_dev *indio_dev)
-{
-        return 0;
-}
-
-static inline ssize_t
-adis16260_read_data_from_ring(struct device *dev,
-                              struct device_attribute *attr,
-                              char *buf)
-{
-        return 0;
-}
-
-static int adis16260_configure_ring(struct iio_dev *indio_dev)
-{
-        return 0;
-}
-
-static inline void adis16260_unconfigure_ring(struct iio_dev *indio_dev)
-{
-}
-
-#endif /* CONFIG_IIO_BUFFER */
 #endif /* SPI_ADIS16260_H_ */
diff --git a/drivers/staging/iio/gyro/adis16260_core.c b/drivers/staging/iio/gyro/adis16260_core.c
index aa964a2d8290..6e80b8c768ae 100644
--- a/drivers/staging/iio/gyro/adis16260_core.c
+++ b/drivers/staging/iio/gyro/adis16260_core.c
@@ -24,134 +24,13 @@
 
 #include "adis16260.h"
 
-#define DRIVER_NAME             "adis16260"
-
-static int adis16260_check_status(struct iio_dev *indio_dev);
-
-/**
- * adis16260_spi_write_reg_8() - write single byte to a register
- * @indio_dev: iio_dev for the device
- * @reg_address: the address of the register to be written
- * @val: the value to write
- **/
-static int adis16260_spi_write_reg_8(struct iio_dev *indio_dev,
-                u8 reg_address,
-                u8 val)
-{
-        int ret;
-        struct adis16260_state *st = iio_priv(indio_dev);
-
-        mutex_lock(&st->buf_lock);
-        st->tx[0] = ADIS16260_WRITE_REG(reg_address);
-        st->tx[1] = val;
-
-        ret = spi_write(st->us, st->tx, 2);
-        mutex_unlock(&st->buf_lock);
-
-        return ret;
-}
-
-/**
- * adis16260_spi_write_reg_16() - write 2 bytes to a pair of registers
- * @indio_dev: iio_dev for the device
- * @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 adis16260_spi_write_reg_16(struct iio_dev *indio_dev,
-                u8 lower_reg_address,
-                u16 value)
-{
-        int ret;
-        struct spi_message msg;
-        struct adis16260_state *st = iio_priv(indio_dev);
-        struct spi_transfer xfers[] = {
-                {
-                        .tx_buf = st->tx,
-                        .bits_per_word = 8,
-                        .len = 2,
-                        .cs_change = 1,
-                        .delay_usecs = 20,
-                }, {
-                        .tx_buf = st->tx + 2,
-                        .bits_per_word = 8,
-                        .len = 2,
-                        .delay_usecs = 20,
-                },
-        };
-
-        mutex_lock(&st->buf_lock);
-        st->tx[0] = ADIS16260_WRITE_REG(lower_reg_address);
-        st->tx[1] = value & 0xFF;
-        st->tx[2] = ADIS16260_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;
-}
-
-/**
- * adis16260_spi_read_reg_16() - read 2 bytes from a 16-bit register
- * @indio_dev: iio_dev for the device
- * @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 adis16260_spi_read_reg_16(struct iio_dev *indio_dev,
-                u8 lower_reg_address,
-                u16 *val)
-{
-        struct spi_message msg;
-        struct adis16260_state *st = iio_priv(indio_dev);
-        int ret;
-        struct spi_transfer xfers[] = {
-                {
-                        .tx_buf = st->tx,
-                        .bits_per_word = 8,
-                        .len = 2,
-                        .cs_change = 1,
-                        .delay_usecs = 30,
-                }, {
-                        .rx_buf = st->rx,
-                        .bits_per_word = 8,
-                        .len = 2,
-                        .delay_usecs = 30,
-                },
-        };
-
-        mutex_lock(&st->buf_lock);
-        st->tx[0] = ADIS16260_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 adis16260_read_frequency_available(struct device *dev,
                                                   struct device_attribute *attr,
                                                   char *buf)
 {
         struct iio_dev *indio_dev = dev_to_iio_dev(dev);
         struct adis16260_state *st = iio_priv(indio_dev);
-        if (spi_get_device_id(st->us)->driver_data)
+        if (spi_get_device_id(st->adis.spi)->driver_data)
                 return sprintf(buf, "%s\n", "0.129 ~ 256");
         else
                 return sprintf(buf, "%s\n", "256 2048");
@@ -166,13 +45,11 @@ static ssize_t adis16260_read_frequency(struct device *dev,
         int ret, len = 0;
         u16 t;
         int sps;
-        ret = adis16260_spi_read_reg_16(indio_dev,
-                        ADIS16260_SMPL_PRD,
-                        &t);
+        ret = adis_read_reg_16(&st->adis, ADIS16260_SMPL_PRD, &t);
         if (ret)
                 return ret;
 
-        if (spi_get_device_id(st->us)->driver_data) /* If an adis16251 */
+        if (spi_get_device_id(st->adis.spi)->driver_data) /* If an adis16251 */
                 sps =  (t & ADIS16260_SMPL_PRD_TIME_BASE) ? 8 : 256;
         else
                 sps =  (t & ADIS16260_SMPL_PRD_TIME_BASE) ? 66 : 2048;
@@ -199,7 +76,7 @@ static ssize_t adis16260_write_frequency(struct device *dev,
                 return -EINVAL;
 
         mutex_lock(&indio_dev->mlock);
-        if (spi_get_device_id(st->us)) {
+        if (spi_get_device_id(st->adis.spi)->driver_data) {
                 t = (256 / val);
                 if (t > 0)
                         t--;
@@ -211,10 +88,10 @@ static ssize_t adis16260_write_frequency(struct device *dev,
                 t &= ADIS16260_SMPL_PRD_DIV_MASK;
         }
         if ((t & ADIS16260_SMPL_PRD_DIV_MASK) >= 0x0A)
-                st->us->max_speed_hz = ADIS16260_SPI_SLOW;
+                st->adis.spi->max_speed_hz = ADIS16260_SPI_SLOW;
         else
-                st->us->max_speed_hz = ADIS16260_SPI_FAST;
-        ret = adis16260_spi_write_reg_8(indio_dev,
+                st->adis.spi->max_speed_hz = ADIS16260_SPI_FAST;
+        ret = adis_write_reg_8(&st->adis,
                         ADIS16260_SMPL_PRD,
                         t);
 
@@ -223,140 +100,20 @@ static ssize_t adis16260_write_frequency(struct device *dev,
         return ret ? ret : len;
 }
 
-static int adis16260_reset(struct iio_dev *indio_dev)
-{
-        int ret;
-        ret = adis16260_spi_write_reg_8(indio_dev,
-                        ADIS16260_GLOB_CMD,
-                        ADIS16260_GLOB_CMD_SW_RESET);
-        if (ret)
-                dev_err(&indio_dev->dev, "problem resetting device");
-
-        return ret;
-}
-
-int adis16260_set_irq(struct iio_dev *indio_dev, bool enable)
-{
-        int ret;
-        u16 msc;
-        ret = adis16260_spi_read_reg_16(indio_dev, ADIS16260_MSC_CTRL, &msc);
-        if (ret)
-                goto error_ret;
-
-        msc |= ADIS16260_MSC_CTRL_DATA_RDY_POL_HIGH;
-        if (enable)
-                msc |= ADIS16260_MSC_CTRL_DATA_RDY_EN;
-        else
-                msc &= ~ADIS16260_MSC_CTRL_DATA_RDY_EN;
-
-        ret = adis16260_spi_write_reg_16(indio_dev, ADIS16260_MSC_CTRL, msc);
-        if (ret)
-                goto error_ret;
-
-error_ret:
-        return ret;
-}
-
 /* Power down the device */
 static int adis16260_stop_device(struct iio_dev *indio_dev)
 {
+        struct adis16260_state *st = iio_priv(indio_dev);
         int ret;
         u16 val = ADIS16260_SLP_CNT_POWER_OFF;
 
-        ret = adis16260_spi_write_reg_16(indio_dev, ADIS16260_SLP_CNT, val);
+        ret = adis_write_reg_16(&st->adis, ADIS16260_SLP_CNT, val);
         if (ret)
                 dev_err(&indio_dev->dev, "problem with turning device off: SLP_CNT");
 
         return ret;
 }
 
-static int adis16260_self_test(struct iio_dev *indio_dev)
-{
-        int ret;
-        ret = adis16260_spi_write_reg_16(indio_dev,
-                        ADIS16260_MSC_CTRL,
-                        ADIS16260_MSC_CTRL_MEM_TEST);
-        if (ret) {
-                dev_err(&indio_dev->dev, "problem starting self test");
-                goto err_ret;
-        }
-
-        adis16260_check_status(indio_dev);
-
-err_ret:
-        return ret;
-}
-
-static int adis16260_check_status(struct iio_dev *indio_dev)
-{
-        u16 status;
-        int ret;
-        struct device *dev = &indio_dev->dev;
-
-        ret = adis16260_spi_read_reg_16(indio_dev,
-                                        ADIS16260_DIAG_STAT,
-                                        &status);
-
-        if (ret < 0) {
-                dev_err(dev, "Reading status failed\n");
-                goto error_ret;
-        }
-        ret = status & 0x7F;
-        if (status & ADIS16260_DIAG_STAT_FLASH_CHK)
-                dev_err(dev, "Flash checksum error\n");
-        if (status & ADIS16260_DIAG_STAT_SELF_TEST)
-                dev_err(dev, "Self test error\n");
-        if (status & ADIS16260_DIAG_STAT_OVERFLOW)
-                dev_err(dev, "Sensor overrange\n");
-        if (status & ADIS16260_DIAG_STAT_SPI_FAIL)
-                dev_err(dev, "SPI failure\n");
-        if (status & ADIS16260_DIAG_STAT_FLASH_UPT)
-                dev_err(dev, "Flash update failed\n");
-        if (status & ADIS16260_DIAG_STAT_POWER_HIGH)
-                dev_err(dev, "Power supply above 5.25V\n");
-        if (status & ADIS16260_DIAG_STAT_POWER_LOW)
-                dev_err(dev, "Power supply below 4.75V\n");
-
-error_ret:
-        return ret;
-}
-
-static int adis16260_initial_setup(struct iio_dev *indio_dev)
-{
-        int ret;
-        struct device *dev = &indio_dev->dev;
-
-        /* Disable IRQ */
-        ret = adis16260_set_irq(indio_dev, false);
-        if (ret) {
-                dev_err(dev, "disable irq failed");
-                goto err_ret;
-        }
-
-        /* Do self test */
-        ret = adis16260_self_test(indio_dev);
-        if (ret) {
-                dev_err(dev, "self test failure");
-                goto err_ret;
-        }
-
-        /* Read status register to check the result */
-        ret = adis16260_check_status(indio_dev);
-        if (ret) {
-                adis16260_reset(indio_dev);
-                dev_err(dev, "device not playing ball -> reset");
-                msleep(ADIS16260_STARTUP_DELAY);
-                ret = adis16260_check_status(indio_dev);
-                if (ret) {
-                        dev_err(dev, "giving up");
-                        goto err_ret;
-                }
-        }
-
-err_ret:
-        return ret;
-}
-
 static IIO_DEV_ATTR_SAMP_FREQ(S_IWUSR | S_IRUGO,
                 adis16260_read_frequency,
                 adis16260_write_frequency);
@@ -364,100 +121,26 @@ static IIO_DEV_ATTR_SAMP_FREQ(S_IWUSR | S_IRUGO,
 static IIO_DEVICE_ATTR(sampling_frequency_available,
                        S_IRUGO, adis16260_read_frequency_available, NULL, 0);
 
-enum adis16260_channel {
-        gyro,
-        temp,
-        in_supply,
-        in_aux,
-        angle,
-};
 #define ADIS16260_GYRO_CHANNEL_SET(axis, mod)                           \
-        struct iio_chan_spec adis16260_channels_##axis[] = {            \
-                {                                                       \
-                        .type = IIO_ANGL_VEL,                           \
-                        .modified = 1,                                  \
-                        .channel2 = mod,                                \
-                        .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |   \
-                        IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT |          \
-                        IIO_CHAN_INFO_CALIBSCALE_SEPARATE_BIT |         \
-                        IIO_CHAN_INFO_SCALE_SEPARATE_BIT,               \
-                        .address = gyro,                                \
-                        .scan_index = ADIS16260_SCAN_GYRO,              \
-                        .scan_type = {                                  \
-                                .sign = 's',                            \
-                                .realbits = 14,                         \
-                                .storagebits = 16,                      \
-                        },                                              \
-                }, {                                                    \
-                        .type = IIO_ANGL,                               \
-                        .modified = 1,                                  \
-                        .channel2 = mod,                                \
-                        .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT,    \
-                        .address = angle,                               \
-                        .scan_index = ADIS16260_SCAN_ANGL,              \
-                        .scan_type = {                                  \
-                                .sign = 'u',                            \
-                                .realbits = 14,                         \
-                                .storagebits = 16,                      \
-                        },                                              \
-                }, {                                                    \
-                        .type = IIO_TEMP,                               \
-                        .indexed = 1,                                   \
-                        .channel = 0,                                   \
-                        .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |   \
-                        IIO_CHAN_INFO_OFFSET_SEPARATE_BIT |             \
-                        IIO_CHAN_INFO_SCALE_SEPARATE_BIT,               \
-                        .address = temp,                                \
-                        .scan_index = ADIS16260_SCAN_TEMP,              \
-                        .scan_type = {                                  \
-                                .sign = 'u',                            \
-                                .realbits = 12,                         \
-                                .storagebits = 16,                      \
-                        },                                              \
-                }, {                                                    \
-                        .type = IIO_VOLTAGE,                            \
-                        .indexed = 1,                                   \
-                        .channel = 0,                                   \
-                        .extend_name = "supply",                        \
-                        .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |   \
-                        IIO_CHAN_INFO_SCALE_SEPARATE_BIT,               \
-                        .address = in_supply,                           \
-                        .scan_index = ADIS16260_SCAN_SUPPLY,            \
-                        .scan_type = {                                  \
-                                .sign = 'u',                            \
-                                .realbits = 12,                         \
-                                .storagebits = 16,                      \
-                        },                                              \
-                }, {                                                    \
-                        .type = IIO_VOLTAGE,                            \
-                        .indexed = 1,                                   \
-                        .channel = 1,                                   \
-                        .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |   \
-                        IIO_CHAN_INFO_SCALE_SEPARATE_BIT,               \
-                        .address = in_aux,                              \
-                        .scan_index = ADIS16260_SCAN_AUX_ADC,           \
-                        .scan_type = {                                  \
-                                .sign = 'u',                            \
-                                .realbits = 12,                         \
-                                .storagebits = 16,                      \
-                        },                                              \
-                },                                                      \
-                IIO_CHAN_SOFT_TIMESTAMP(5),                             \
-        }
+struct iio_chan_spec adis16260_channels_##axis[] = {            \
+        ADIS_GYRO_CHAN(mod, ADIS16260_GYRO_OUT, ADIS16260_SCAN_GYRO, \
+                IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT | \
+                IIO_CHAN_INFO_CALIBSCALE_SEPARATE_BIT, 14), \
+        ADIS_INCLI_CHAN(mod, ADIS16260_ANGL_OUT, ADIS16260_SCAN_ANGL, 0, 14), \
+        ADIS_TEMP_CHAN(ADIS16260_TEMP_OUT, ADIS16260_SCAN_TEMP, 12), \
+        ADIS_SUPPLY_CHAN(ADIS16260_SUPPLY_OUT, ADIS16260_SCAN_SUPPLY, 12), \
+        ADIS_AUX_ADC_CHAN(ADIS16260_AUX_ADC, ADIS16260_SCAN_AUX_ADC, 12), \
+        IIO_CHAN_SOFT_TIMESTAMP(5),                             \
+}
+
+static const ADIS16260_GYRO_CHANNEL_SET(x, X);
+static const ADIS16260_GYRO_CHANNEL_SET(y, Y);
+static const ADIS16260_GYRO_CHANNEL_SET(z, Z);
 
-static const ADIS16260_GYRO_CHANNEL_SET(x, IIO_MOD_X);
-static const ADIS16260_GYRO_CHANNEL_SET(y, IIO_MOD_Y);
-static const ADIS16260_GYRO_CHANNEL_SET(z, IIO_MOD_Z);
-
-static const u8 adis16260_addresses[5][3] = {
-        [gyro] = { ADIS16260_GYRO_OUT,
-                   ADIS16260_GYRO_OFF,
-                   ADIS16260_GYRO_SCALE },
-        [angle] = { ADIS16260_ANGL_OUT },
-        [in_supply] = { ADIS16260_SUPPLY_OUT },
-        [in_aux] = { ADIS16260_AUX_ADC },
-        [temp] = { ADIS16260_TEMP_OUT },
+static const u8 adis16260_addresses[][2] = {
+        [ADIS16260_SCAN_GYRO] = { ADIS16260_GYRO_OFF, ADIS16260_GYRO_SCALE },
 };
+
 static int adis16260_read_raw(struct iio_dev *indio_dev,
                               struct iio_chan_spec const *chan,
                               int *val, int *val2,
@@ -471,34 +154,13 @@ static int adis16260_read_raw(struct iio_dev *indio_dev,
 
         switch (mask) {
         case IIO_CHAN_INFO_RAW:
-                mutex_lock(&indio_dev->mlock);
-                addr = adis16260_addresses[chan->address][0];
-                ret = adis16260_spi_read_reg_16(indio_dev, addr, &val16);
-                if (ret) {
-                        mutex_unlock(&indio_dev->mlock);
-                        return ret;
-                }
-
-                if (val16 & ADIS16260_ERROR_ACTIVE) {
-                        ret = adis16260_check_status(indio_dev);
-                        if (ret) {
-                                mutex_unlock(&indio_dev->mlock);
-                                return ret;
-                        }
-                }
-                val16 = val16 & ((1 << chan->scan_type.realbits) - 1);
-                if (chan->scan_type.sign == 's')
-                        val16 = (s16)(val16 <<
-                                      (16 - chan->scan_type.realbits)) >>
-                                (16 - chan->scan_type.realbits);
-                *val = val16;
-                mutex_unlock(&indio_dev->mlock);
-                return IIO_VAL_INT;
+                return adis_single_conversion(indio_dev, chan,
+                                ADIS16260_ERROR_ACTIVE, val);
         case IIO_CHAN_INFO_SCALE:
                 switch (chan->type) {
                 case IIO_ANGL_VEL:
                         *val = 0;
-                        if (spi_get_device_id(st->us)->driver_data) {
+                        if (spi_get_device_id(st->adis.spi)->driver_data) {
                                 /* 0.01832 degree / sec */
                                 *val2 = IIO_DEGREE_TO_RAD(18320);
                         } else {
@@ -533,10 +195,10 @@ static int adis16260_read_raw(struct iio_dev *indio_dev,
                         break;
                 default:
                         return -EINVAL;
-                };
+                }
                 mutex_lock(&indio_dev->mlock);
-                addr = adis16260_addresses[chan->address][1];
-                ret = adis16260_spi_read_reg_16(indio_dev, addr, &val16);
+                addr = adis16260_addresses[chan->scan_index][0];
+                ret = adis_read_reg_16(&st->adis, addr, &val16);
                 if (ret) {
                         mutex_unlock(&indio_dev->mlock);
                         return ret;
@@ -553,10 +215,10 @@ static int adis16260_read_raw(struct iio_dev *indio_dev,
                         break;
                 default:
                         return -EINVAL;
-                };
+                }
                 mutex_lock(&indio_dev->mlock);
-                addr = adis16260_addresses[chan->address][2];
-                ret = adis16260_spi_read_reg_16(indio_dev, addr, &val16);
+                addr = adis16260_addresses[chan->scan_index][1];
+                ret = adis_read_reg_16(&st->adis, addr, &val16);
                 if (ret) {
                         mutex_unlock(&indio_dev->mlock);
                         return ret;
@@ -574,18 +236,19 @@ static int adis16260_write_raw(struct iio_dev *indio_dev,
                                int val2,
                                long mask)
 {
+        struct adis16260_state *st = iio_priv(indio_dev);
         int bits = 12;
         s16 val16;
         u8 addr;
         switch (mask) {
         case IIO_CHAN_INFO_CALIBBIAS:
                 val16 = val & ((1 << bits) - 1);
-                addr = adis16260_addresses[chan->address][1];
-                return adis16260_spi_write_reg_16(indio_dev, addr, val16);
+                addr = adis16260_addresses[chan->scan_index][0];
+                return adis_write_reg_16(&st->adis, addr, val16);
         case IIO_CHAN_INFO_CALIBSCALE:
                 val16 = val & ((1 << bits) - 1);
-                addr = adis16260_addresses[chan->address][2];
-                return adis16260_spi_write_reg_16(indio_dev, addr, val16);
+                addr = adis16260_addresses[chan->scan_index][1];
+                return adis_write_reg_16(&st->adis, addr, val16);
         }
         return -EINVAL;
 }
@@ -604,10 +267,41 @@ static const struct iio_info adis16260_info = {
         .attrs = &adis16260_attribute_group,
         .read_raw = &adis16260_read_raw,
         .write_raw = &adis16260_write_raw,
+        .update_scan_mode = adis_update_scan_mode,
         .driver_module = THIS_MODULE,
 };
 
-static int __devinit adis16260_probe(struct spi_device *spi)
+static const char * const adis1620_status_error_msgs[] = {
+        [ADIS16260_DIAG_STAT_FLASH_CHK_BIT] = "Flash checksum error",
+        [ADIS16260_DIAG_STAT_SELF_TEST_BIT] = "Self test error",
+        [ADIS16260_DIAG_STAT_OVERFLOW_BIT] = "Sensor overrange",
+        [ADIS16260_DIAG_STAT_SPI_FAIL_BIT] = "SPI failure",
+        [ADIS16260_DIAG_STAT_FLASH_UPT_BIT] = "Flash update failed",
+        [ADIS16260_DIAG_STAT_POWER_HIGH_BIT] = "Power supply above 5.25",
+        [ADIS16260_DIAG_STAT_POWER_LOW_BIT] = "Power supply below 4.75",
+};
+
+static const struct adis_data adis16260_data = {
+        .write_delay = 30,
+        .read_delay = 30,
+        .msc_ctrl_reg = ADIS16260_MSC_CTRL,
+        .glob_cmd_reg = ADIS16260_GLOB_CMD,
+        .diag_stat_reg = ADIS16260_DIAG_STAT,
+
+        .self_test_mask = ADIS16260_MSC_CTRL_MEM_TEST,
+        .startup_delay = ADIS16260_STARTUP_DELAY,
+
+        .status_error_msgs = adis1620_status_error_msgs,
+        .status_error_mask = BIT(ADIS16260_DIAG_STAT_FLASH_CHK_BIT) |
+                BIT(ADIS16260_DIAG_STAT_SELF_TEST_BIT) |
+                BIT(ADIS16260_DIAG_STAT_OVERFLOW_BIT) |
+                BIT(ADIS16260_DIAG_STAT_SPI_FAIL_BIT) |
+                BIT(ADIS16260_DIAG_STAT_FLASH_UPT_BIT) |
+                BIT(ADIS16260_DIAG_STAT_POWER_HIGH_BIT) |
+                BIT(ADIS16260_DIAG_STAT_POWER_LOW_BIT),
+};
+
+static int adis16260_probe(struct spi_device *spi)
 {
         int ret;
         struct adis16260_platform_data *pd = spi->dev.platform_data;
@@ -626,10 +320,7 @@ static int __devinit adis16260_probe(struct spi_device *spi)
         /* this is only used for removal purposes */
         spi_set_drvdata(spi, indio_dev);
 
-        st->us = spi;
-        mutex_init(&st->buf_lock);
-
-        indio_dev->name = spi_get_device_id(st->us)->name;
+        indio_dev->name = spi_get_device_id(spi)->name;
         indio_dev->dev.parent = &spi->dev;
         indio_dev->info = &adis16260_info;
         indio_dev->num_channels
@@ -653,17 +344,14 @@ static int __devinit adis16260_probe(struct spi_device *spi)
         indio_dev->num_channels = ARRAY_SIZE(adis16260_channels_x);
         indio_dev->modes = INDIO_DIRECT_MODE;
 
-        ret = adis16260_configure_ring(indio_dev);
+        ret = adis_init(&st->adis, indio_dev, spi, &adis16260_data);
+        if (ret)
+                goto error_free_dev;
+
+        ret = adis_setup_buffer_and_trigger(&st->adis, indio_dev, NULL);
         if (ret)
                 goto error_free_dev;
 
-        ret = iio_buffer_register(indio_dev,
-                                  indio_dev->channels,
-                                  ARRAY_SIZE(adis16260_channels_x));
-        if (ret) {
-                printk(KERN_ERR "failed to initialize the ring\n");
-                goto error_unreg_ring_funcs;
-        }
         if (indio_dev->buffer) {
                 /* Set default scan mode */
                 iio_scan_mask_set(indio_dev, indio_dev->buffer,
@@ -677,43 +365,33 @@ static int __devinit adis16260_probe(struct spi_device *spi)
                 iio_scan_mask_set(indio_dev, indio_dev->buffer,
                                   ADIS16260_SCAN_ANGL);
         }
-        if (spi->irq) {
-                ret = adis16260_probe_trigger(indio_dev);
-                if (ret)
-                        goto error_uninitialize_ring;
-        }
 
         /* Get the device into a sane initial state */
-        ret = adis16260_initial_setup(indio_dev);
+        ret = adis_initial_startup(&st->adis);
         if (ret)
-                goto error_remove_trigger;
+                goto error_cleanup_buffer_trigger;
         ret = iio_device_register(indio_dev);
         if (ret)
-                goto error_remove_trigger;
+                goto error_cleanup_buffer_trigger;
 
         return 0;
 
-error_remove_trigger:
-        adis16260_remove_trigger(indio_dev);
-error_uninitialize_ring:
-        iio_buffer_unregister(indio_dev);
-error_unreg_ring_funcs:
-        adis16260_unconfigure_ring(indio_dev);
+error_cleanup_buffer_trigger:
+        adis_cleanup_buffer_and_trigger(&st->adis, indio_dev);
 error_free_dev:
         iio_device_free(indio_dev);
 error_ret:
         return ret;
 }
 
-static int __devexit adis16260_remove(struct spi_device *spi)
+static int adis16260_remove(struct spi_device *spi)
 {
         struct iio_dev *indio_dev = spi_get_drvdata(spi);
+        struct adis16260_state *st = iio_priv(indio_dev);
 
         iio_device_unregister(indio_dev);
         adis16260_stop_device(indio_dev);
-        adis16260_remove_trigger(indio_dev);
-        iio_buffer_unregister(indio_dev);
-        adis16260_unconfigure_ring(indio_dev);
+        adis_cleanup_buffer_and_trigger(&st->adis, indio_dev);
         iio_device_free(indio_dev);
 
         return 0;
@@ -739,7 +417,7 @@ static struct spi_driver adis16260_driver = {
                 .owner = THIS_MODULE,
         },
         .probe = adis16260_probe,
-        .remove = __devexit_p(adis16260_remove),
+        .remove = adis16260_remove,
         .id_table = adis16260_id,
 };
 module_spi_driver(adis16260_driver);
diff --git a/drivers/staging/iio/gyro/adis16260_ring.c b/drivers/staging/iio/gyro/adis16260_ring.c
deleted file mode 100644
index e294cb49736d..000000000000
--- a/drivers/staging/iio/gyro/adis16260_ring.c
+++ /dev/null
@@ -1,136 +0,0 @@
-#include <linux/export.h>
-#include <linux/interrupt.h>
-#include <linux/mutex.h>
-#include <linux/kernel.h>
-#include <linux/spi/spi.h>
-#include <linux/slab.h>
-
-#include <linux/iio/iio.h>
-#include "../ring_sw.h"
-#include <linux/iio/trigger_consumer.h>
-#include "adis16260.h"
-
-/**
- * adis16260_read_ring_data() read data registers which will be placed into ring
- * @indio_dev: the IIO device
- * @rx: somewhere to pass back the value read
- **/
-static int adis16260_read_ring_data(struct iio_dev *indio_dev, u8 *rx)
-{
-        struct spi_message msg;
-        struct adis16260_state *st = iio_priv(indio_dev);
-        struct spi_transfer xfers[ADIS16260_OUTPUTS + 1];
-        int ret;
-        int i;
-
-        mutex_lock(&st->buf_lock);
-
-        spi_message_init(&msg);
-
-        memset(xfers, 0, sizeof(xfers));
-        for (i = 0; i <= ADIS16260_OUTPUTS; i++) {
-                xfers[i].bits_per_word = 8;
-                xfers[i].cs_change = 1;
-                xfers[i].len = 2;
-                xfers[i].delay_usecs = 30;
-                xfers[i].tx_buf = st->tx + 2 * i;
-                if (i < 2) /* SUPPLY_OUT:0x02 GYRO_OUT:0x04 */
-                        st->tx[2 * i]
-                                = ADIS16260_READ_REG(ADIS16260_SUPPLY_OUT
-                                                + 2 * i);
-                else /* 0x06 to 0x09 is reserved */
-                        st->tx[2 * i]
-                                = ADIS16260_READ_REG(ADIS16260_SUPPLY_OUT
-                                                + 2 * i + 4);
-                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;
-}
-
-static irqreturn_t adis16260_trigger_handler(int irq, void *p)
-{
-        struct iio_poll_func *pf = p;
-        struct iio_dev *indio_dev = pf->indio_dev;
-        struct adis16260_state *st = iio_priv(indio_dev);
-        int i = 0;
-        s16 *data;
-
-        data = kmalloc(indio_dev->scan_bytes, GFP_KERNEL);
-        if (data == NULL) {
-                dev_err(&st->us->dev, "memory alloc failed in ring bh");
-                goto done;
-        }
-
-        if (!bitmap_empty(indio_dev->active_scan_mask, indio_dev->masklength) &&
-            adis16260_read_ring_data(indio_dev, st->rx) >= 0)
-                for (; i < bitmap_weight(indio_dev->active_scan_mask,
-                                         indio_dev->masklength); i++)
-                        data[i] = be16_to_cpup((__be16 *)&(st->rx[i*2]));
-
-        /* Guaranteed to be aligned with 8 byte boundary */
-        if (indio_dev->scan_timestamp)
-                *((s64 *)(data + ((i + 3)/4)*4)) = pf->timestamp;
-
-        iio_push_to_buffer(indio_dev->buffer, (u8 *)data);
-
-        kfree(data);
-done:
-        iio_trigger_notify_done(indio_dev->trig);
-
-        return IRQ_HANDLED;
-}
-
-void adis16260_unconfigure_ring(struct iio_dev *indio_dev)
-{
-        iio_dealloc_pollfunc(indio_dev->pollfunc);
-        iio_sw_rb_free(indio_dev->buffer);
-}
-
-static const struct iio_buffer_setup_ops adis16260_ring_setup_ops = {
-        .preenable = &iio_sw_buffer_preenable,
-        .postenable = &iio_triggered_buffer_postenable,
-        .predisable = &iio_triggered_buffer_predisable,
-};
-
-int adis16260_configure_ring(struct iio_dev *indio_dev)
-{
-        int ret = 0;
-        struct iio_buffer *ring;
-
-        ring = iio_sw_rb_allocate(indio_dev);
-        if (!ring) {
-                ret = -ENOMEM;
-                return ret;
-        }
-        indio_dev->buffer = ring;
-        ring->scan_timestamp = true;
-        indio_dev->setup_ops = &adis16260_ring_setup_ops;
-
-        indio_dev->pollfunc = iio_alloc_pollfunc(&iio_pollfunc_store_time,
-                                                 &adis16260_trigger_handler,
-                                                 IRQF_ONESHOT,
-                                                 indio_dev,
-                                                 "adis16260_consumer%d",
-                                                 indio_dev->id);
-        if (indio_dev->pollfunc == NULL) {
-                ret = -ENOMEM;
-                goto error_iio_sw_rb_free;
-        }
-
-        indio_dev->modes |= INDIO_BUFFER_TRIGGERED;
-        return 0;
-
-error_iio_sw_rb_free:
-        iio_sw_rb_free(indio_dev->buffer);
-        return ret;
-}
diff --git a/drivers/staging/iio/gyro/adis16260_trigger.c b/drivers/staging/iio/gyro/adis16260_trigger.c
deleted file mode 100644
index 034559e4d5b9..000000000000
--- a/drivers/staging/iio/gyro/adis16260_trigger.c
+++ /dev/null
@@ -1,75 +0,0 @@
-#include <linux/interrupt.h>
-#include <linux/kernel.h>
-#include <linux/spi/spi.h>
-#include <linux/export.h>
-
-#include <linux/iio/iio.h>
-#include <linux/iio/trigger.h>
-#include "adis16260.h"
-
-/**
- * adis16260_data_rdy_trigger_set_state() set datardy interrupt state
- **/
-static int adis16260_data_rdy_trigger_set_state(struct iio_trigger *trig,
-                                                bool state)
-{
-        struct iio_dev *indio_dev = trig->private_data;
-
-        dev_dbg(&indio_dev->dev, "%s (%d)\n", __func__, state);
-        return adis16260_set_irq(indio_dev, state);
-}
-
-static const struct iio_trigger_ops adis16260_trigger_ops = {
-        .owner = THIS_MODULE,
-        .set_trigger_state = &adis16260_data_rdy_trigger_set_state,
-};
-
-int adis16260_probe_trigger(struct iio_dev *indio_dev)
-{
-        int ret;
-        struct adis16260_state *st = iio_priv(indio_dev);
-
-        st->trig = iio_trigger_alloc("%s-dev%d",
-                                        spi_get_device_id(st->us)->name,
-                                        indio_dev->id);
-        if (st->trig == NULL) {
-                ret = -ENOMEM;
-                goto error_ret;
-        }
-
-        ret = request_irq(st->us->irq,
-                          &iio_trigger_generic_data_rdy_poll,
-                          IRQF_TRIGGER_RISING,
-                          "adis16260",
-                          st->trig);
-        if (ret)
-                goto error_free_trig;
-
-        st->trig->dev.parent = &st->us->dev;
-        st->trig->ops = &adis16260_trigger_ops;
-        st->trig->private_data = indio_dev;
-        ret = iio_trigger_register(st->trig);
-
-        /* select default trigger */
-        indio_dev->trig = st->trig;
-        if (ret)
-                goto error_free_irq;
-
-        return 0;
-
-error_free_irq:
-        free_irq(st->us->irq, st->trig);
-error_free_trig:
-        iio_trigger_free(st->trig);
-error_ret:
-        return ret;
-}
-
-void adis16260_remove_trigger(struct iio_dev *indio_dev)
-{
-        struct adis16260_state *st = iio_priv(indio_dev);
-
-        iio_trigger_unregister(st->trig);
-        free_irq(st->us->irq, st->trig);
-        iio_trigger_free(st->trig);
-}
diff --git a/drivers/staging/iio/gyro/adxrs450_core.c b/drivers/staging/iio/gyro/adxrs450_core.c
index d93527d15917..f0ce81da8aca 100644
--- a/drivers/staging/iio/gyro/adxrs450_core.c
+++ b/drivers/staging/iio/gyro/adxrs450_core.c
@@ -365,7 +365,7 @@ static const struct iio_info adxrs450_info = {
         .write_raw = &adxrs450_write_raw,
 };
 
-static int __devinit adxrs450_probe(struct spi_device *spi)
+static int adxrs450_probe(struct spi_device *spi)
 {
         int ret;
         struct adxrs450_state *st;
@@ -409,7 +409,7 @@ error_ret:
         return ret;
 }
 
-static int __devexit adxrs450_remove(struct spi_device *spi)
+static int adxrs450_remove(struct spi_device *spi)
 {
         iio_device_unregister(spi_get_drvdata(spi));
         iio_device_free(spi_get_drvdata(spi));
@@ -430,7 +430,7 @@ static struct spi_driver adxrs450_driver = {
                 .owner = THIS_MODULE,
         },
         .probe = adxrs450_probe,
-        .remove = __devexit_p(adxrs450_remove),
+        .remove = adxrs450_remove,
         .id_table       = adxrs450_id,
 };
 module_spi_driver(adxrs450_driver);
diff --git a/drivers/staging/iio/iio_dummy_evgen.c b/drivers/staging/iio/iio_dummy_evgen.c
index 74e24e8aa876..132d278c5010 100644
--- a/drivers/staging/iio/iio_dummy_evgen.c
+++ b/drivers/staging/iio/iio_dummy_evgen.c
@@ -108,7 +108,7 @@ int iio_dummy_evgen_get_irq(void)
 
         mutex_lock(&iio_evgen->lock);
         for (i = 0; i < IIO_EVENTGEN_NO; i++)
-                if (iio_evgen->inuse[i] == false) {
+                if (!iio_evgen->inuse[i]) {
                         ret = iio_evgen->base + i;
                         iio_evgen->inuse[i] = true;
                         break;
diff --git a/drivers/staging/iio/iio_hwmon.c b/drivers/staging/iio/iio_hwmon.c
index 5d491227e01b..c7a5f97576c7 100644
--- a/drivers/staging/iio/iio_hwmon.c
+++ b/drivers/staging/iio/iio_hwmon.c
@@ -69,7 +69,7 @@ static void iio_hwmon_free_attrs(struct iio_hwmon_state *st)
                 }
 }
 
-static int __devinit iio_hwmon_probe(struct platform_device *pdev)
+static int iio_hwmon_probe(struct platform_device *pdev)
 {
         struct iio_hwmon_state *st;
         struct sensor_device_attribute *a;
@@ -170,7 +170,7 @@ error_ret:
         return ret;
 }
 
-static int __devexit iio_hwmon_remove(struct platform_device *pdev)
+static int iio_hwmon_remove(struct platform_device *pdev)
 {
         struct iio_hwmon_state *st = platform_get_drvdata(pdev);
 
@@ -189,7 +189,7 @@ static struct platform_driver __refdata iio_hwmon_driver = {
                 .owner = THIS_MODULE,
         },
         .probe = iio_hwmon_probe,
-        .remove = __devexit_p(iio_hwmon_remove),
+        .remove = iio_hwmon_remove,
 };
 
 module_platform_driver(iio_hwmon_driver);
diff --git a/drivers/staging/iio/iio_simple_dummy.c b/drivers/staging/iio/iio_simple_dummy.c
index dc6c728ea47a..a865adf81938 100644
--- a/drivers/staging/iio/iio_simple_dummy.c
+++ b/drivers/staging/iio/iio_simple_dummy.c
@@ -378,7 +378,7 @@ static int iio_dummy_init_device(struct iio_dev *indio_dev)
  *                      const struct i2c_device_id *id)
  * SPI: iio_dummy_probe(struct spi_device *spi)
  */
-static int __devinit iio_dummy_probe(int index)
+static int iio_dummy_probe(int index)
 {
         int ret;
         struct iio_dev *indio_dev;
diff --git a/drivers/staging/iio/iio_simple_dummy_buffer.c b/drivers/staging/iio/iio_simple_dummy_buffer.c
index 697d9700db2f..dee16f0e7570 100644
--- a/drivers/staging/iio/iio_simple_dummy_buffer.c
+++ b/drivers/staging/iio/iio_simple_dummy_buffer.c
@@ -46,7 +46,6 @@ static irqreturn_t iio_simple_dummy_trigger_h(int irq, void *p)
 {
         struct iio_poll_func *pf = p;
         struct iio_dev *indio_dev = pf->indio_dev;
-        struct iio_buffer *buffer = indio_dev->buffer;
         int len = 0;
         u16 *data;
 
@@ -76,7 +75,7 @@ static irqreturn_t iio_simple_dummy_trigger_h(int irq, void *p)
                      i < bitmap_weight(indio_dev->active_scan_mask,
                                        indio_dev->masklength);
                      i++, j++) {
-                        j = find_next_bit(buffer->scan_mask,
+                        j = find_next_bit(indio_dev->active_scan_mask,
                                           indio_dev->masklength, j);
                         /* random access read from the 'device' */
                         data[i] = fakedata[j];
@@ -87,7 +86,7 @@ static irqreturn_t iio_simple_dummy_trigger_h(int irq, void *p)
         if (indio_dev->scan_timestamp)
                 *(s64 *)((u8 *)data + ALIGN(len, sizeof(s64)))
                         = iio_get_time_ns();
-        iio_push_to_buffer(buffer, (u8 *)data);
+        iio_push_to_buffers(indio_dev, (u8 *)data);
 
         kfree(data);
 
diff --git a/drivers/staging/iio/impedance-analyzer/ad5933.c b/drivers/staging/iio/impedance-analyzer/ad5933.c
index de21d47f33e9..779243d24dec 100644
--- a/drivers/staging/iio/impedance-analyzer/ad5933.c
+++ b/drivers/staging/iio/impedance-analyzer/ad5933.c
@@ -647,7 +647,6 @@ static void ad5933_work(struct work_struct *work)
         struct ad5933_state *st = container_of(work,
                 struct ad5933_state, work.work);
         struct iio_dev *indio_dev = i2c_get_clientdata(st->client);
-        struct iio_buffer *ring = indio_dev->buffer;
         signed short buf[2];
         unsigned char status;
 
@@ -677,8 +676,7 @@ static void ad5933_work(struct work_struct *work)
                 } else {
                         buf[0] = be16_to_cpu(buf[0]);
                 }
-                /* save datum to the ring */
-                iio_push_to_buffer(ring, (u8 *)buf);
+                iio_push_to_buffers(indio_dev, (u8 *)buf);
         } else {
                 /* no data available - try again later */
                 schedule_delayed_work(&st->work, st->poll_time_jiffies);
@@ -699,7 +697,7 @@ static void ad5933_work(struct work_struct *work)
         mutex_unlock(&indio_dev->mlock);
 }
 
-static int __devinit ad5933_probe(struct i2c_client *client,
+static int ad5933_probe(struct i2c_client *client,
                                    const struct i2c_device_id *id)
 {
         int ret, voltage_uv = 0;
@@ -789,7 +787,7 @@ error_put_reg:
         return ret;
 }
 
-static __devexit int ad5933_remove(struct i2c_client *client)
+static int ad5933_remove(struct i2c_client *client)
 {
         struct iio_dev *indio_dev = i2c_get_clientdata(client);
         struct ad5933_state *st = iio_priv(indio_dev);
@@ -819,7 +817,7 @@ static struct i2c_driver ad5933_driver = {
                 .name = "ad5933",
         },
         .probe = ad5933_probe,
-        .remove = __devexit_p(ad5933_remove),
+        .remove = ad5933_remove,
         .id_table = ad5933_id,
 };
 module_i2c_driver(ad5933_driver);
diff --git a/drivers/staging/iio/imu/adis16400.h b/drivers/staging/iio/imu/adis16400.h
index 77c601da1846..7a105e966464 100644
--- a/drivers/staging/iio/imu/adis16400.h
+++ b/drivers/staging/iio/imu/adis16400.h
@@ -123,6 +123,9 @@
 /* SLP_CNT */
 #define ADIS16400_SLP_CNT_POWER_OFF     (1<<8)
 
+#define ADIS16334_RATE_DIV_SHIFT 8
+#define ADIS16334_RATE_INT_CLK BIT(0)
+
 #define ADIS16400_MAX_TX 24
 #define ADIS16400_MAX_RX 24
 
@@ -130,18 +133,21 @@
 #define ADIS16400_SPI_BURST     (u32)(1000 * 1000)
 #define ADIS16400_SPI_FAST      (u32)(2000 * 1000)
 
-#define ADIS16400_HAS_PROD_ID 1
-#define ADIS16400_NO_BURST 2
+#define ADIS16400_HAS_PROD_ID           BIT(0)
+#define ADIS16400_NO_BURST              BIT(1)
+#define ADIS16400_HAS_SLOW_MODE         BIT(2)
+
 struct adis16400_chip_info {
         const struct iio_chan_spec *channels;
         const int num_channels;
-        const int product_id;
         const long flags;
         unsigned int gyro_scale_micro;
         unsigned int accel_scale_micro;
         int temp_scale_nano;
         int temp_offset;
         unsigned long default_scan_mask;
+        int (*set_freq)(struct iio_dev *indio_dev, unsigned int freq);
+        int (*get_freq)(struct iio_dev *indio_dev);
 };
 
 /**
diff --git a/drivers/staging/iio/imu/adis16400_core.c b/drivers/staging/iio/imu/adis16400_core.c
index 3144a7b1e1c4..9c8f5ab7e13b 100644
--- a/drivers/staging/iio/imu/adis16400_core.c
+++ b/drivers/staging/iio/imu/adis16400_core.c
@@ -38,7 +38,6 @@ enum adis16400_chip_variant {
         ADIS16360,
         ADIS16362,
         ADIS16364,
-        ADIS16365,
         ADIS16400,
 };
 
@@ -161,10 +160,39 @@ error_ret:
         return ret;
 }
 
-static int adis16400_get_freq(struct iio_dev *indio_dev)
+static int adis16334_get_freq(struct iio_dev *indio_dev)
 {
+        int ret;
         u16 t;
+
+        ret = adis16400_spi_read_reg_16(indio_dev, ADIS16400_SMPL_PRD, &t);
+        if (ret < 0)
+                return ret;
+
+        t >>= ADIS16334_RATE_DIV_SHIFT;
+
+        return (8192 >> t) / 10;
+}
+
+static int adis16334_set_freq(struct iio_dev *indio_dev, unsigned int freq)
+{
+        unsigned int t;
+
+        t = ilog2(8192 / (freq * 10));
+
+        if (t > 0x31)
+                t = 0x31;
+
+        t <<= ADIS16334_RATE_DIV_SHIFT;
+        t |= ADIS16334_RATE_INT_CLK;
+
+        return adis16400_spi_write_reg_16(indio_dev, ADIS16400_SMPL_PRD, t);
+}
+
+static int adis16400_get_freq(struct iio_dev *indio_dev)
+{
         int sps, ret;
+        u16 t;
 
         ret = adis16400_spi_read_reg_16(indio_dev, ADIS16400_SMPL_PRD, &t);
         if (ret < 0)
@@ -175,13 +203,33 @@ static int adis16400_get_freq(struct iio_dev *indio_dev)
         return sps;
 }
 
+static int adis16400_set_freq(struct iio_dev *indio_dev, unsigned int freq)
+{
+        struct adis16400_state *st = iio_priv(indio_dev);
+        unsigned int t;
+
+        t = 1638 / freq;
+        if (t > 0)
+                t--;
+        t &= ADIS16400_SMPL_PRD_DIV_MASK;
+        if ((t & ADIS16400_SMPL_PRD_DIV_MASK) >= 0x0A)
+                st->us->max_speed_hz = ADIS16400_SPI_SLOW;
+        else
+                st->us->max_speed_hz = ADIS16400_SPI_FAST;
+
+        return adis16400_spi_write_reg_8(indio_dev,
+                        ADIS16400_SMPL_PRD, t);
+}
+
 static ssize_t adis16400_read_frequency(struct device *dev,
                 struct device_attribute *attr,
                 char *buf)
 {
         struct iio_dev *indio_dev = dev_to_iio_dev(dev);
+        struct adis16400_state *st = iio_priv(indio_dev);
         int ret, len = 0;
-        ret = adis16400_get_freq(indio_dev);
+
+        ret = st->variant->get_freq(indio_dev);
         if (ret < 0)
                 return ret;
         len = sprintf(buf, "%d SPS\n", ret);
@@ -229,7 +277,6 @@ static ssize_t adis16400_write_frequency(struct device *dev,
         struct adis16400_state *st = iio_priv(indio_dev);
         long val;
         int ret;
-        u8 t;
 
         ret = strict_strtol(buf, 10, &val);
         if (ret)
@@ -239,18 +286,7 @@ static ssize_t adis16400_write_frequency(struct device *dev,
 
         mutex_lock(&indio_dev->mlock);
 
-        t = (1638 / val);
-        if (t > 0)
-                t--;
-        t &= ADIS16400_SMPL_PRD_DIV_MASK;
-        if ((t & ADIS16400_SMPL_PRD_DIV_MASK) >= 0x0A)
-                st->us->max_speed_hz = ADIS16400_SPI_SLOW;
-        else
-                st->us->max_speed_hz = ADIS16400_SPI_FAST;
-
-        ret = adis16400_spi_write_reg_8(indio_dev,
-                        ADIS16400_SMPL_PRD,
-                        t);
+        st->variant->set_freq(indio_dev, val);
 
         /* Also update the filter */
         mutex_unlock(&indio_dev->mlock);
@@ -378,10 +414,14 @@ static int adis16400_initial_setup(struct iio_dev *indio_dev)
 {
         int ret;
         u16 prod_id, smp_prd;
+        unsigned int device_id;
         struct adis16400_state *st = iio_priv(indio_dev);
 
-        /* use low spi speed for init */
-        st->us->max_speed_hz = ADIS16400_SPI_SLOW;
+        /* use low spi speed for init if the device has a slow mode */
+        if (st->variant->flags & ADIS16400_HAS_SLOW_MODE)
+                st->us->max_speed_hz = ADIS16400_SPI_SLOW;
+        else
+                st->us->max_speed_hz = ADIS16400_SPI_FAST;
         st->us->mode = SPI_MODE_3;
         spi_setup(st->us);
 
@@ -414,19 +454,27 @@ static int adis16400_initial_setup(struct iio_dev *indio_dev)
                 if (ret)
                         goto err_ret;
 
-                if ((prod_id & 0xF000) != st->variant->product_id)
-                        dev_warn(&indio_dev->dev, "incorrect id");
+                sscanf(indio_dev->name, "adis%u\n", &device_id);
+
+                if (prod_id != device_id)
+                        dev_warn(&indio_dev->dev, "Device ID(%u) and product ID(%u) do not match.",
+                                        device_id, prod_id);
 
                 dev_info(&indio_dev->dev, "%s: prod_id 0x%04x at CS%d (irq %d)\n",
                        indio_dev->name, prod_id,
                        st->us->chip_select, st->us->irq);
         }
         /* use high spi speed if possible */
-        ret = adis16400_spi_read_reg_16(indio_dev,
-                                        ADIS16400_SMPL_PRD, &smp_prd);
-        if (!ret && (smp_prd & ADIS16400_SMPL_PRD_DIV_MASK) < 0x0A) {
-                st->us->max_speed_hz = ADIS16400_SPI_SLOW;
-                spi_setup(st->us);
+        if (st->variant->flags & ADIS16400_HAS_SLOW_MODE) {
+                ret = adis16400_spi_read_reg_16(indio_dev,
+                                                ADIS16400_SMPL_PRD, &smp_prd);
+                if (ret)
+                        goto err_ret;
+
+                if ((smp_prd & ADIS16400_SMPL_PRD_DIV_MASK) < 0x0A) {
+                        st->us->max_speed_hz = ADIS16400_SPI_FAST;
+                        spi_setup(st->us);
+                }
         }
 
 err_ret:
@@ -503,7 +551,7 @@ static int adis16400_write_raw(struct iio_dev *indio_dev,
                 mutex_lock(&indio_dev->mlock);
                 st->filt_int = val;
                 /* Work out update to current value */
-                sps = adis16400_get_freq(indio_dev);
+                sps = st->variant->get_freq(indio_dev);
                 if (sps < 0) {
                         mutex_unlock(&indio_dev->mlock);
                         return sps;
@@ -601,7 +649,7 @@ static int adis16400_read_raw(struct iio_dev *indio_dev,
                         mutex_unlock(&indio_dev->mlock);
                         return ret;
                 }
-                ret = adis16400_get_freq(indio_dev);
+                val16 = st->variant->get_freq(indio_dev);
                 if (ret > 0)
                         *val = ret/adis16400_3db_divisors[val16 & 0x03];
                 *val2 = 0;
@@ -624,7 +672,7 @@ static const struct iio_chan_spec adis16400_channels[] = {
                 IIO_CHAN_INFO_SCALE_SEPARATE_BIT,
                 .address = in_supply,
                 .scan_index = ADIS16400_SCAN_SUPPLY,
-                .scan_type = IIO_ST('u', 14, 16, 0)
+                .scan_type = IIO_ST('u', 14, 16, 0),
         }, {
                 .type = IIO_ANGL_VEL,
                 .modified = 1,
@@ -635,7 +683,7 @@ static const struct iio_chan_spec adis16400_channels[] = {
                 IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY_SHARED_BIT,
                 .address = gyro_x,
                 .scan_index = ADIS16400_SCAN_GYRO_X,
-                .scan_type = IIO_ST('s', 14, 16, 0)
+                .scan_type = IIO_ST('s', 14, 16, 0),
         }, {
                 .type = IIO_ANGL_VEL,
                 .modified = 1,
@@ -754,7 +802,7 @@ static const struct iio_chan_spec adis16350_channels[] = {
                 IIO_CHAN_INFO_SCALE_SEPARATE_BIT,
                 .address = in_supply,
                 .scan_index = ADIS16400_SCAN_SUPPLY,
-                .scan_type = IIO_ST('u', 12, 16, 0)
+                .scan_type = IIO_ST('u', 12, 16, 0),
         }, {
                 .type = IIO_ANGL_VEL,
                 .modified = 1,
@@ -765,7 +813,7 @@ static const struct iio_chan_spec adis16350_channels[] = {
                 IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY_SHARED_BIT,
                 .address = gyro_x,
                 .scan_index = ADIS16400_SCAN_GYRO_X,
-                .scan_type = IIO_ST('s', 14, 16, 0)
+                .scan_type = IIO_ST('s', 14, 16, 0),
         }, {
                 .type = IIO_ANGL_VEL,
                 .modified = 1,
@@ -879,7 +927,7 @@ static const struct iio_chan_spec adis16300_channels[] = {
                 IIO_CHAN_INFO_SCALE_SEPARATE_BIT,
                 .address = in_supply,
                 .scan_index = ADIS16400_SCAN_SUPPLY,
-                .scan_type = IIO_ST('u', 12, 16, 0)
+                .scan_type = IIO_ST('u', 12, 16, 0),
         }, {
                 .type = IIO_ANGL_VEL,
                 .modified = 1,
@@ -1060,6 +1108,7 @@ static struct adis16400_chip_info adis16400_chips[] = {
         [ADIS16300] = {
                 .channels = adis16300_channels,
                 .num_channels = ARRAY_SIZE(adis16300_channels),
+                .flags = ADIS16400_HAS_SLOW_MODE,
                 .gyro_scale_micro = IIO_DEGREE_TO_RAD(50000), /* 0.05 deg/s */
                 .accel_scale_micro = 5884,
                 .temp_scale_nano = 140000000, /* 0.14 C */
@@ -1070,10 +1119,13 @@ static struct adis16400_chip_info adis16400_chips[] = {
                 (1 << ADIS16400_SCAN_TEMP) | (1 << ADIS16400_SCAN_ADC_0) |
                 (1 << ADIS16300_SCAN_INCLI_X) | (1 << ADIS16300_SCAN_INCLI_Y) |
                 (1 << 14),
+                .set_freq = adis16400_set_freq,
+                .get_freq = adis16400_get_freq,
         },
         [ADIS16334] = {
                 .channels = adis16334_channels,
                 .num_channels = ARRAY_SIZE(adis16334_channels),
+                .flags = ADIS16400_HAS_PROD_ID,
                 .gyro_scale_micro = IIO_DEGREE_TO_RAD(50000), /* 0.05 deg/s */
                 .accel_scale_micro = IIO_G_TO_M_S_2(1000), /* 1 mg */
                 .temp_scale_nano = 67850000, /* 0.06785 C */
@@ -1082,6 +1134,8 @@ static struct adis16400_chip_info adis16400_chips[] = {
                 (1 << ADIS16400_SCAN_GYRO_Y) | (1 << ADIS16400_SCAN_GYRO_Z) |
                 (1 << ADIS16400_SCAN_ACC_X) | (1 << ADIS16400_SCAN_ACC_Y) |
                 (1 << ADIS16400_SCAN_ACC_Z),
+                .set_freq = adis16334_set_freq,
+                .get_freq = adis16334_get_freq,
         },
         [ADIS16350] = {
                 .channels = adis16350_channels,
@@ -1091,62 +1145,57 @@ static struct adis16400_chip_info adis16400_chips[] = {
                 .temp_scale_nano = 145300000, /* 0.1453 C */
                 .temp_offset = 25000000 / 145300, /* 25 C = 0x00 */
                 .default_scan_mask = 0x7FF,
-                .flags = ADIS16400_NO_BURST,
+                .flags = ADIS16400_NO_BURST | ADIS16400_HAS_SLOW_MODE,
+                .set_freq = adis16400_set_freq,
+                .get_freq = adis16400_get_freq,
         },
         [ADIS16360] = {
                 .channels = adis16350_channels,
                 .num_channels = ARRAY_SIZE(adis16350_channels),
-                .flags = ADIS16400_HAS_PROD_ID,
-                .product_id = 0x3FE8,
+                .flags = ADIS16400_HAS_PROD_ID | ADIS16400_HAS_SLOW_MODE,
                 .gyro_scale_micro = IIO_DEGREE_TO_RAD(50000), /* 0.05 deg/s */
                 .accel_scale_micro = IIO_G_TO_M_S_2(3333), /* 3.333 mg */
                 .temp_scale_nano = 136000000, /* 0.136 C */
                 .temp_offset = 25000000 / 136000, /* 25 C = 0x00 */
                 .default_scan_mask = 0x7FF,
+                .set_freq = adis16400_set_freq,
+                .get_freq = adis16400_get_freq,
         },
         [ADIS16362] = {
                 .channels = adis16350_channels,
                 .num_channels = ARRAY_SIZE(adis16350_channels),
-                .flags = ADIS16400_HAS_PROD_ID,
-                .product_id = 0x3FEA,
+                .flags = ADIS16400_HAS_PROD_ID | ADIS16400_HAS_SLOW_MODE,
                 .gyro_scale_micro = IIO_DEGREE_TO_RAD(50000), /* 0.05 deg/s */
                 .accel_scale_micro = IIO_G_TO_M_S_2(333), /* 0.333 mg */
                 .temp_scale_nano = 136000000, /* 0.136 C */
                 .temp_offset = 25000000 / 136000, /* 25 C = 0x00 */
                 .default_scan_mask = 0x7FF,
+                .set_freq = adis16400_set_freq,
+                .get_freq = adis16400_get_freq,
         },
         [ADIS16364] = {
                 .channels = adis16350_channels,
                 .num_channels = ARRAY_SIZE(adis16350_channels),
-                .flags = ADIS16400_HAS_PROD_ID,
-                .product_id = 0x3FEC,
-                .gyro_scale_micro = IIO_DEGREE_TO_RAD(50000), /* 0.05 deg/s */
-                .accel_scale_micro = IIO_G_TO_M_S_2(1000), /* 1 mg */
-                .temp_scale_nano = 136000000, /* 0.136 C */
-                .temp_offset = 25000000 / 136000, /* 25 C = 0x00 */
-                .default_scan_mask = 0x7FF,
-        },
-        [ADIS16365] = {
-                .channels = adis16350_channels,
-                .num_channels = ARRAY_SIZE(adis16350_channels),
-                .flags = ADIS16400_HAS_PROD_ID,
-                .product_id = 0x3FED,
+                .flags = ADIS16400_HAS_PROD_ID | ADIS16400_HAS_SLOW_MODE,
                 .gyro_scale_micro = IIO_DEGREE_TO_RAD(50000), /* 0.05 deg/s */
                 .accel_scale_micro = IIO_G_TO_M_S_2(1000), /* 1 mg */
                 .temp_scale_nano = 136000000, /* 0.136 C */
                 .temp_offset = 25000000 / 136000, /* 25 C = 0x00 */
                 .default_scan_mask = 0x7FF,
+                .set_freq = adis16400_set_freq,
+                .get_freq = adis16400_get_freq,
         },
         [ADIS16400] = {
                 .channels = adis16400_channels,
                 .num_channels = ARRAY_SIZE(adis16400_channels),
-                .flags = ADIS16400_HAS_PROD_ID,
-                .product_id = 0x4015,
+                .flags = ADIS16400_HAS_PROD_ID | ADIS16400_HAS_SLOW_MODE,
                 .gyro_scale_micro = IIO_DEGREE_TO_RAD(50000), /* 0.05 deg/s */
                 .accel_scale_micro = IIO_G_TO_M_S_2(3333), /* 3.333 mg */
                 .default_scan_mask = 0xFFF,
                 .temp_scale_nano = 140000000, /* 0.14 C */
                 .temp_offset = 25000000 / 140000, /* 25 C = 0x00 */
+                .set_freq = adis16400_set_freq,
+                .get_freq = adis16400_get_freq,
         }
 };
 
@@ -1157,7 +1206,7 @@ static const struct iio_info adis16400_info = {
         .attrs = &adis16400_attribute_group,
 };
 
-static int __devinit adis16400_probe(struct spi_device *spi)
+static int adis16400_probe(struct spi_device *spi)
 {
         int ret;
         struct adis16400_state *st;
@@ -1224,7 +1273,7 @@ error_ret:
 }
 
 /* fixme, confirm ordering in this function */
-static int __devexit adis16400_remove(struct spi_device *spi)
+static int adis16400_remove(struct spi_device *spi)
 {
         struct iio_dev *indio_dev =  spi_get_drvdata(spi);
 
@@ -1248,7 +1297,7 @@ static const struct spi_device_id adis16400_id[] = {
         {"adis16360", ADIS16360},
         {"adis16362", ADIS16362},
         {"adis16364", ADIS16364},
-        {"adis16365", ADIS16365},
+        {"adis16365", ADIS16360},
         {"adis16400", ADIS16400},
         {"adis16405", ADIS16400},
         {}
@@ -1262,7 +1311,7 @@ static struct spi_driver adis16400_driver = {
         },
         .id_table = adis16400_id,
         .probe = adis16400_probe,
-        .remove = __devexit_p(adis16400_remove),
+        .remove = adis16400_remove,
 };
 module_spi_driver(adis16400_driver);
 
diff --git a/drivers/staging/iio/imu/adis16400_ring.c b/drivers/staging/iio/imu/adis16400_ring.c
index 260bdd1a4681..d46c1e38cf7b 100644
--- a/drivers/staging/iio/imu/adis16400_ring.c
+++ b/drivers/staging/iio/imu/adis16400_ring.c
@@ -114,7 +114,6 @@ static irqreturn_t adis16400_trigger_handler(int irq, void *p)
         struct iio_poll_func *pf = p;
         struct iio_dev *indio_dev = pf->indio_dev;
         struct adis16400_state *st = iio_priv(indio_dev);
-        struct iio_buffer *ring = indio_dev->buffer;
         int i = 0, j, ret = 0;
         s16 *data;
 
@@ -148,9 +147,9 @@ static irqreturn_t adis16400_trigger_handler(int irq, void *p)
                 }
         }
         /* Guaranteed to be aligned with 8 byte boundary */
-        if (ring->scan_timestamp)
+        if (indio_dev->scan_timestamp)
                 *((s64 *)(data + ((i + 3)/4)*4)) = pf->timestamp;
-        iio_push_to_buffer(ring, (u8 *) data);
+        iio_push_to_buffers(indio_dev, (u8 *) data);
 
 done:
         kfree(data);
diff --git a/drivers/staging/iio/light/isl29018.c b/drivers/staging/iio/light/isl29018.c
index 6ee5567d9813..b0adac0bf5d5 100644
--- a/drivers/staging/iio/light/isl29018.c
+++ b/drivers/staging/iio/light/isl29018.c
@@ -67,6 +67,7 @@ struct isl29018_chip {
         unsigned int            range;
         unsigned int            adc_bit;
         int                     prox_scheme;
+        bool                    suspended;
 };
 
 static int isl29018_set_range(struct isl29018_chip *chip, unsigned long range,
@@ -355,7 +356,7 @@ static int isl29018_write_raw(struct iio_dev *indio_dev,
         }
         mutex_unlock(&chip->lock);
 
-        return 0;
+        return ret;
 }
 
 static int isl29018_read_raw(struct iio_dev *indio_dev,
@@ -368,6 +369,10 @@ static int isl29018_read_raw(struct iio_dev *indio_dev,
         struct isl29018_chip *chip = iio_priv(indio_dev);
 
         mutex_lock(&chip->lock);
+        if (chip->suspended) {
+                mutex_unlock(&chip->lock);
+                return -EBUSY;
+        }
         switch (mask) {
         case IIO_CHAN_INFO_RAW:
         case IIO_CHAN_INFO_PROCESSED:
@@ -538,7 +543,7 @@ static const struct regmap_config isl29018_regmap_config = {
         .cache_type = REGCACHE_RBTREE,
 };
 
-static int __devinit isl29018_probe(struct i2c_client *client,
+static int isl29018_probe(struct i2c_client *client,
                          const struct i2c_device_id *id)
 {
         struct isl29018_chip *chip;
@@ -561,6 +566,7 @@ static int __devinit isl29018_probe(struct i2c_client *client,
         chip->lux_scale = 1;
         chip->range = 1000;
         chip->adc_bit = 16;
+        chip->suspended = false;
 
         chip->regmap = devm_regmap_init_i2c(client, &isl29018_regmap_config);
         if (IS_ERR(chip->regmap)) {
@@ -592,7 +598,7 @@ exit:
         return err;
 }
 
-static int __devexit isl29018_remove(struct i2c_client *client)
+static int isl29018_remove(struct i2c_client *client)
 {
         struct iio_dev *indio_dev = i2c_get_clientdata(client);
 
@@ -603,6 +609,44 @@ static int __devexit isl29018_remove(struct i2c_client *client)
         return 0;
 }
 
+#ifdef CONFIG_PM_SLEEP
+static int isl29018_suspend(struct device *dev)
+{
+        struct isl29018_chip *chip = iio_priv(dev_get_drvdata(dev));
+
+        mutex_lock(&chip->lock);
+
+        /* Since this driver uses only polling commands, we are by default in
+         * auto shutdown (ie, power-down) mode.
+         * So we do not have much to do here.
+         */
+        chip->suspended = true;
+
+        mutex_unlock(&chip->lock);
+        return 0;
+}
+
+static int isl29018_resume(struct device *dev)
+{
+        struct isl29018_chip *chip = iio_priv(dev_get_drvdata(dev));
+        int err;
+
+        mutex_lock(&chip->lock);
+
+        err = isl29018_chip_init(chip);
+        if (!err)
+                chip->suspended = false;
+
+        mutex_unlock(&chip->lock);
+        return err;
+}
+
+static SIMPLE_DEV_PM_OPS(isl29018_pm_ops, isl29018_suspend, isl29018_resume);
+#define ISL29018_PM_OPS (&isl29018_pm_ops)
+#else
+#define ISL29018_PM_OPS NULL
+#endif
+
 static const struct i2c_device_id isl29018_id[] = {
         {"isl29018", 0},
         {}
@@ -620,11 +664,12 @@ static struct i2c_driver isl29018_driver = {
         .class  = I2C_CLASS_HWMON,
         .driver  = {
                         .name = "isl29018",
+                        .pm = ISL29018_PM_OPS,
                         .owner = THIS_MODULE,
                         .of_match_table = isl29018_of_match,
                     },
         .probe   = isl29018_probe,
-        .remove  = __devexit_p(isl29018_remove),
+        .remove  = isl29018_remove,
         .id_table = isl29018_id,
 };
 module_i2c_driver(isl29018_driver);
diff --git a/drivers/staging/iio/light/isl29028.c b/drivers/staging/iio/light/isl29028.c
index 33a4c3f94a14..e52af77f7782 100644
--- a/drivers/staging/iio/light/isl29028.c
+++ b/drivers/staging/iio/light/isl29028.c
@@ -475,7 +475,7 @@ static const struct regmap_config isl29028_regmap_config = {
         .cache_type = REGCACHE_RBTREE,
 };
 
-static int __devinit isl29028_probe(struct i2c_client *client,
+static int isl29028_probe(struct i2c_client *client,
         const struct i2c_device_id *id)
 {
         struct isl29028_chip *chip;
@@ -526,7 +526,7 @@ exit_iio_free:
         return ret;
 }
 
-static int __devexit isl29028_remove(struct i2c_client *client)
+static int isl29028_remove(struct i2c_client *client)
 {
         struct iio_dev *indio_dev = i2c_get_clientdata(client);
 
@@ -555,7 +555,7 @@ static struct i2c_driver isl29028_driver = {
                 .of_match_table = isl29028_of_match,
         },
         .probe   = isl29028_probe,
-        .remove  = __devexit_p(isl29028_remove),
+        .remove  = isl29028_remove,
         .id_table = isl29028_id,
 };
 
diff --git a/drivers/staging/iio/light/tsl2563.c b/drivers/staging/iio/light/tsl2563.c
index 954ca2c172c6..1a9adc020f64 100644
--- a/drivers/staging/iio/light/tsl2563.c
+++ b/drivers/staging/iio/light/tsl2563.c
@@ -652,7 +652,7 @@ static int tsl2563_write_interrupt_config(struct iio_dev *indio_dev,
         }
 
         if (!state && (chip->intr & 0x30)) {
-                chip->intr |= ~0x30;
+                chip->intr &= ~0x30;
                 ret = i2c_smbus_write_byte_data(chip->client,
                                                 TSL2563_CMD | TSL2563_REG_INT,
                                                 chip->intr);
@@ -705,7 +705,7 @@ static const struct iio_info tsl2563_info = {
         .write_event_config = &tsl2563_write_interrupt_config,
 };
 
-static int __devinit tsl2563_probe(struct i2c_client *client,
+static int tsl2563_probe(struct i2c_client *client,
                                 const struct i2c_device_id *device_id)
 {
         struct iio_dev *indio_dev;
@@ -805,7 +805,7 @@ fail1:
         return err;
 }
 
-static int __devexit tsl2563_remove(struct i2c_client *client)
+static int tsl2563_remove(struct i2c_client *client)
 {
         struct tsl2563_chip *chip = i2c_get_clientdata(client);
         struct iio_dev *indio_dev = iio_priv_to_dev(chip);
@@ -814,7 +814,7 @@ static int __devexit tsl2563_remove(struct i2c_client *client)
         if (!chip->int_enabled)
                 cancel_delayed_work(&chip->poweroff_work);
         /* Ensure that interrupts are disabled - then flush any bottom halves */
-        chip->intr |= ~0x30;
+        chip->intr &= ~0x30;
         i2c_smbus_write_byte_data(chip->client, TSL2563_CMD | TSL2563_REG_INT,
                                   chip->intr);
         flush_scheduled_work();
@@ -889,7 +889,7 @@ static struct i2c_driver tsl2563_i2c_driver = {
                 .pm     = TSL2563_PM_OPS,
         },
         .probe          = tsl2563_probe,
-        .remove         = __devexit_p(tsl2563_remove),
+        .remove         = tsl2563_remove,
         .id_table       = tsl2563_id,
 };
 module_i2c_driver(tsl2563_i2c_driver);
diff --git a/drivers/staging/iio/light/tsl2583.c b/drivers/staging/iio/light/tsl2583.c
index 6d2f4c659e56..b377dd3b76ad 100644
--- a/drivers/staging/iio/light/tsl2583.c
+++ b/drivers/staging/iio/light/tsl2583.c
@@ -799,7 +799,7 @@ static const struct iio_info tsl2583_info = {
  * Client probe function - When a valid device is found, the driver's device
  * data structure is updated, and initialization completes successfully.
  */
-static int __devinit taos_probe(struct i2c_client *clientp,
+static int taos_probe(struct i2c_client *clientp,
                       const struct i2c_device_id *idp)
 {
         int i, ret;
@@ -923,7 +923,7 @@ static SIMPLE_DEV_PM_OPS(taos_pm_ops, taos_suspend, taos_resume);
 #define TAOS_PM_OPS NULL
 #endif
 
-static int __devexit taos_remove(struct i2c_client *client)
+static int taos_remove(struct i2c_client *client)
 {
         iio_device_unregister(i2c_get_clientdata(client));
         iio_device_free(i2c_get_clientdata(client));
@@ -947,7 +947,7 @@ static struct i2c_driver taos_driver = {
         },
         .id_table = taos_idtable,
         .probe = taos_probe,
-        .remove = __devexit_p(taos_remove),
+        .remove = taos_remove,
 };
 module_i2c_driver(taos_driver);
 
diff --git a/drivers/staging/iio/light/tsl2x7x_core.c b/drivers/staging/iio/light/tsl2x7x_core.c
index 497a977ae411..9e50fbbadf9d 100644
--- a/drivers/staging/iio/light/tsl2x7x_core.c
+++ b/drivers/staging/iio/light/tsl2x7x_core.c
@@ -1897,7 +1897,7 @@ static const struct tsl2x7x_chip_info tsl2x7x_chip_info_tbl[] = {
         },
 };
 
-static int __devinit tsl2x7x_probe(struct i2c_client *clientp,
+static int tsl2x7x_probe(struct i2c_client *clientp,
         const struct i2c_device_id *id)
 {
         int ret;
@@ -2026,7 +2026,7 @@ static int tsl2x7x_resume(struct device *dev)
         return ret;
 }
 
-static int __devexit tsl2x7x_remove(struct i2c_client *client)
+static int tsl2x7x_remove(struct i2c_client *client)
 {
         struct iio_dev *indio_dev = i2c_get_clientdata(client);
 
@@ -2070,7 +2070,7 @@ static struct i2c_driver tsl2x7x_driver = {
         },
         .id_table = tsl2x7x_idtable,
         .probe = tsl2x7x_probe,
-        .remove = __devexit_p(tsl2x7x_remove),
+        .remove = tsl2x7x_remove,
 };
 
 module_i2c_driver(tsl2x7x_driver);
diff --git a/drivers/staging/iio/magnetometer/ak8975.c b/drivers/staging/iio/magnetometer/ak8975.c
index 01b4b07c227b..28f080e9eeee 100644
--- a/drivers/staging/iio/magnetometer/ak8975.c
+++ b/drivers/staging/iio/magnetometer/ak8975.c
@@ -409,7 +409,7 @@ static const struct iio_info ak8975_info = {
         .driver_module = THIS_MODULE,
 };
 
-static int __devinit ak8975_probe(struct i2c_client *client,
+static int ak8975_probe(struct i2c_client *client,
                         const struct i2c_device_id *id)
 {
         struct ak8975_data *data;
@@ -475,7 +475,7 @@ exit:
         return err;
 }
 
-static int __devexit ak8975_remove(struct i2c_client *client)
+static int ak8975_remove(struct i2c_client *client)
 {
         struct iio_dev *indio_dev = i2c_get_clientdata(client);
         struct ak8975_data *data = iio_priv(indio_dev);
@@ -510,7 +510,7 @@ static struct i2c_driver ak8975_driver = {
                 .of_match_table = ak8975_of_match,
         },
         .probe          = ak8975_probe,
-        .remove         = __devexit_p(ak8975_remove),
+        .remove         = ak8975_remove,
         .id_table       = ak8975_id,
 };
 module_i2c_driver(ak8975_driver);
diff --git a/drivers/staging/iio/magnetometer/hmc5843.c b/drivers/staging/iio/magnetometer/hmc5843.c
index 10e095486e54..1a520ecfa3e2 100644
--- a/drivers/staging/iio/magnetometer/hmc5843.c
+++ b/drivers/staging/iio/magnetometer/hmc5843.c
@@ -555,7 +555,7 @@ static int hmc5843_read_raw(struct iio_dev *indio_dev,
                 *val = 0;
                 *val2 = data->variant->regval_to_nanoscale[data->range];
                 return IIO_VAL_INT_PLUS_NANO;
-        };
+        }
         return -EINVAL;
 }
 
@@ -665,7 +665,7 @@ static const struct iio_info hmc5843_info = {
         .driver_module = THIS_MODULE,
 };
 
-static int __devinit hmc5843_probe(struct i2c_client *client,
+static int hmc5843_probe(struct i2c_client *client,
                          const struct i2c_device_id *id)
 {
         struct hmc5843_data *data;
@@ -704,7 +704,7 @@ exit:
         return err;
 }
 
-static int __devexit hmc5843_remove(struct i2c_client *client)
+static int hmc5843_remove(struct i2c_client *client)
 {
         struct iio_dev *indio_dev = i2c_get_clientdata(client);
 
@@ -755,7 +755,7 @@ static struct i2c_driver hmc5843_driver = {
         },
         .id_table       = hmc5843_id,
         .probe          = hmc5843_probe,
-        .remove         = __devexit_p(hmc5843_remove),
+        .remove         = hmc5843_remove,
         .detect         = hmc5843_detect,
         .address_list   = normal_i2c,
 };
diff --git a/drivers/staging/iio/meter/ade7753.c b/drivers/staging/iio/meter/ade7753.c
index 8b9eceb66b37..51c3bdece785 100644
--- a/drivers/staging/iio/meter/ade7753.c
+++ b/drivers/staging/iio/meter/ade7753.c
@@ -512,7 +512,7 @@ static const struct iio_info ade7753_info = {
         .driver_module = THIS_MODULE,
 };
 
-static int __devinit ade7753_probe(struct spi_device *spi)
+static int ade7753_probe(struct spi_device *spi)
 {
         int ret;
         struct ade7753_state *st;
@@ -555,7 +555,7 @@ error_ret:
 }
 
 /* fixme, confirm ordering in this function */
-static int __devexit ade7753_remove(struct spi_device *spi)
+static int ade7753_remove(struct spi_device *spi)
 {
         struct iio_dev *indio_dev = spi_get_drvdata(spi);
 
@@ -572,7 +572,7 @@ static struct spi_driver ade7753_driver = {
                 .owner = THIS_MODULE,
         },
         .probe = ade7753_probe,
-        .remove = __devexit_p(ade7753_remove),
+        .remove = ade7753_remove,
 };
 module_spi_driver(ade7753_driver);
 
diff --git a/drivers/staging/iio/meter/ade7753.h b/drivers/staging/iio/meter/ade7753.h
index 3f059d3d9392..a9d93cc1c414 100644
--- a/drivers/staging/iio/meter/ade7753.h
+++ b/drivers/staging/iio/meter/ade7753.h
@@ -55,8 +55,6 @@
 #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
diff --git a/drivers/staging/iio/meter/ade7754.c b/drivers/staging/iio/meter/ade7754.c
index 76e0adee96ea..b50c89e93993 100644
--- a/drivers/staging/iio/meter/ade7754.c
+++ b/drivers/staging/iio/meter/ade7754.c
@@ -535,7 +535,7 @@ static const struct iio_info ade7754_info = {
         .driver_module = THIS_MODULE,
 };
 
-static int __devinit ade7754_probe(struct spi_device *spi)
+static int ade7754_probe(struct spi_device *spi)
 {
         int ret;
         struct ade7754_state *st;
@@ -577,7 +577,7 @@ error_ret:
 }
 
 /* fixme, confirm ordering in this function */
-static int __devexit ade7754_remove(struct spi_device *spi)
+static int ade7754_remove(struct spi_device *spi)
 {
         struct iio_dev *indio_dev = spi_get_drvdata(spi);
 
@@ -594,7 +594,7 @@ static struct spi_driver ade7754_driver = {
                 .owner = THIS_MODULE,
         },
         .probe = ade7754_probe,
-        .remove = __devexit_p(ade7754_remove),
+        .remove = ade7754_remove,
 };
 module_spi_driver(ade7754_driver);
 
diff --git a/drivers/staging/iio/meter/ade7754.h b/drivers/staging/iio/meter/ade7754.h
index 6121125520f6..e42ffc387a14 100644
--- a/drivers/staging/iio/meter/ade7754.h
+++ b/drivers/staging/iio/meter/ade7754.h
@@ -73,8 +73,6 @@
 #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
diff --git a/drivers/staging/iio/meter/ade7758.h b/drivers/staging/iio/meter/ade7758.h
index 1e11ad5ae5a4..07318203a836 100644
--- a/drivers/staging/iio/meter/ade7758.h
+++ b/drivers/staging/iio/meter/ade7758.h
@@ -105,9 +105,6 @@
 #define AD7758_APP_PWR          4
 #define AD7758_WT(p, w)         (((w) << 2) | (p))
 
-#define DRIVER_NAME             "ade7758"
-
-
 /**
  * struct ade7758_state - device instance specific data
  * @us:                 actual spi_device
diff --git a/drivers/staging/iio/meter/ade7758_core.c b/drivers/staging/iio/meter/ade7758_core.c
index a0fef77d8e5e..3454e5154ed2 100644
--- a/drivers/staging/iio/meter/ade7758_core.c
+++ b/drivers/staging/iio/meter/ade7758_core.c
@@ -881,7 +881,7 @@ static const struct iio_info ade7758_info = {
         .driver_module = THIS_MODULE,
 };
 
-static int __devinit ade7758_probe(struct spi_device *spi)
+static int ade7758_probe(struct spi_device *spi)
 {
         int ret;
         struct ade7758_state *st;
@@ -962,7 +962,7 @@ error_ret:
         return ret;
 }
 
-static int __devexit ade7758_remove(struct spi_device *spi)
+static int ade7758_remove(struct spi_device *spi)
 {
         struct iio_dev *indio_dev = spi_get_drvdata(spi);
         struct ade7758_state *st = iio_priv(indio_dev);
@@ -992,7 +992,7 @@ static struct spi_driver ade7758_driver = {
                 .owner = THIS_MODULE,
         },
         .probe = ade7758_probe,
-        .remove = __devexit_p(ade7758_remove),
+        .remove = ade7758_remove,
         .id_table = ade7758_id,
 };
 module_spi_driver(ade7758_driver);
diff --git a/drivers/staging/iio/meter/ade7758_ring.c b/drivers/staging/iio/meter/ade7758_ring.c
index 9e49baccf660..4552a4c7fe33 100644
--- a/drivers/staging/iio/meter/ade7758_ring.c
+++ b/drivers/staging/iio/meter/ade7758_ring.c
@@ -73,7 +73,7 @@ static irqreturn_t ade7758_trigger_handler(int irq, void *p)
         if (indio_dev->scan_timestamp)
                 dat64[1] = pf->timestamp;
 
-        iio_push_to_buffer(indio_dev->buffer, (u8 *)dat64);
+        iio_push_to_buffers(indio_dev, (u8 *)dat64);
 
         iio_trigger_notify_done(indio_dev->trig);
 
diff --git a/drivers/staging/iio/meter/ade7759.c b/drivers/staging/iio/meter/ade7759.c
index cb0707cbc347..10b911bd3853 100644
--- a/drivers/staging/iio/meter/ade7759.c
+++ b/drivers/staging/iio/meter/ade7759.c
@@ -458,7 +458,7 @@ static const struct iio_info ade7759_info = {
         .driver_module = THIS_MODULE,
 };
 
-static int __devinit ade7759_probe(struct spi_device *spi)
+static int ade7759_probe(struct spi_device *spi)
 {
         int ret;
         struct ade7759_state *st;
@@ -499,7 +499,7 @@ error_ret:
 }
 
 /* fixme, confirm ordering in this function */
-static int __devexit ade7759_remove(struct spi_device *spi)
+static int ade7759_remove(struct spi_device *spi)
 {
         struct iio_dev *indio_dev = spi_get_drvdata(spi);
 
@@ -516,7 +516,7 @@ static struct spi_driver ade7759_driver = {
                 .owner = THIS_MODULE,
         },
         .probe = ade7759_probe,
-        .remove = __devexit_p(ade7759_remove),
+        .remove = ade7759_remove,
 };
 module_spi_driver(ade7759_driver);
 
diff --git a/drivers/staging/iio/meter/ade7759.h b/drivers/staging/iio/meter/ade7759.h
index c81d23d730d2..f9ff1f8e7372 100644
--- a/drivers/staging/iio/meter/ade7759.h
+++ b/drivers/staging/iio/meter/ade7759.h
@@ -36,8 +36,6 @@
 #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
diff --git a/drivers/staging/iio/meter/ade7854-i2c.c b/drivers/staging/iio/meter/ade7854-i2c.c
index 06090465fa5f..db9ef6c86c1e 100644
--- a/drivers/staging/iio/meter/ade7854-i2c.c
+++ b/drivers/staging/iio/meter/ade7854-i2c.c
@@ -201,7 +201,7 @@ out:
         return ret;
 }
 
-static int __devinit ade7854_i2c_probe(struct i2c_client *client,
+static int ade7854_i2c_probe(struct i2c_client *client,
                 const struct i2c_device_id *id)
 {
         int ret;
@@ -231,7 +231,7 @@ static int __devinit ade7854_i2c_probe(struct i2c_client *client,
         return ret;
 }
 
-static int __devexit ade7854_i2c_remove(struct i2c_client *client)
+static int ade7854_i2c_remove(struct i2c_client *client)
 {
         return ade7854_remove(i2c_get_clientdata(client));
 }
@@ -250,7 +250,7 @@ static struct i2c_driver ade7854_i2c_driver = {
                 .name = "ade7854",
         },
         .probe    = ade7854_i2c_probe,
-        .remove   = __devexit_p(ade7854_i2c_remove),
+        .remove   = ade7854_i2c_remove,
         .id_table = ade7854_id,
 };
 module_i2c_driver(ade7854_i2c_driver);
diff --git a/drivers/staging/iio/meter/ade7854-spi.c b/drivers/staging/iio/meter/ade7854-spi.c
index 7dae03573428..f0984fa1cbb9 100644
--- a/drivers/staging/iio/meter/ade7854-spi.c
+++ b/drivers/staging/iio/meter/ade7854-spi.c
@@ -300,7 +300,7 @@ error_ret:
         return ret;
 }
 
-static int __devinit ade7854_spi_probe(struct spi_device *spi)
+static int ade7854_spi_probe(struct spi_device *spi)
 {
         int ret;
         struct ade7854_state *st;
@@ -330,7 +330,7 @@ static int __devinit ade7854_spi_probe(struct spi_device *spi)
         return 0;
 }
 
-static int __devexit ade7854_spi_remove(struct spi_device *spi)
+static int ade7854_spi_remove(struct spi_device *spi)
 {
         ade7854_remove(spi_get_drvdata(spi));
 
@@ -351,7 +351,7 @@ static struct spi_driver ade7854_driver = {
                 .owner = THIS_MODULE,
         },
         .probe = ade7854_spi_probe,
-        .remove = __devexit_p(ade7854_spi_remove),
+        .remove = ade7854_spi_remove,
         .id_table = ade7854_id,
 };
 module_spi_driver(ade7854_driver);
diff --git a/drivers/staging/iio/meter/ade7854.h b/drivers/staging/iio/meter/ade7854.h
index 2c96e8695d57..06534577f6c3 100644
--- a/drivers/staging/iio/meter/ade7854.h
+++ b/drivers/staging/iio/meter/ade7854.h
@@ -142,8 +142,6 @@
 #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
diff --git a/drivers/staging/iio/resolver/ad2s1200.c b/drivers/staging/iio/resolver/ad2s1200.c
index 8b71eb0e16f5..4fe349914f9a 100644
--- a/drivers/staging/iio/resolver/ad2s1200.c
+++ b/drivers/staging/iio/resolver/ad2s1200.c
@@ -99,7 +99,7 @@ static const struct iio_info ad2s1200_info = {
         .driver_module = THIS_MODULE,
 };
 
-static int __devinit ad2s1200_probe(struct spi_device *spi)
+static int ad2s1200_probe(struct spi_device *spi)
 {
         struct ad2s1200_state *st;
         struct iio_dev *indio_dev;
@@ -149,7 +149,7 @@ error_ret:
         return ret;
 }
 
-static int __devexit ad2s1200_remove(struct spi_device *spi)
+static int ad2s1200_remove(struct spi_device *spi)
 {
         iio_device_unregister(spi_get_drvdata(spi));
         iio_device_free(spi_get_drvdata(spi));
@@ -170,7 +170,7 @@ static struct spi_driver ad2s1200_driver = {
                 .owner = THIS_MODULE,
         },
         .probe = ad2s1200_probe,
-        .remove = __devexit_p(ad2s1200_remove),
+        .remove = ad2s1200_remove,
         .id_table = ad2s1200_id,
 };
 module_spi_driver(ad2s1200_driver);
diff --git a/drivers/staging/iio/resolver/ad2s1210.c b/drivers/staging/iio/resolver/ad2s1210.c
index 4ba4d05ed423..ed07a348eb55 100644
--- a/drivers/staging/iio/resolver/ad2s1210.c
+++ b/drivers/staging/iio/resolver/ad2s1210.c
@@ -610,7 +610,7 @@ static const struct attribute_group ad2s1210_attribute_group = {
         .attrs = ad2s1210_attributes,
 };
 
-static int __devinit ad2s1210_initial(struct ad2s1210_state *st)
+static int ad2s1210_initial(struct ad2s1210_state *st)
 {
         unsigned char data;
         int ret;
@@ -681,7 +681,7 @@ static void ad2s1210_free_gpios(struct ad2s1210_state *st)
         gpio_free_array(ad2s1210_gpios, ARRAY_SIZE(ad2s1210_gpios));
 }
 
-static int __devinit ad2s1210_probe(struct spi_device *spi)
+static int ad2s1210_probe(struct spi_device *spi)
 {
         struct iio_dev *indio_dev;
         struct ad2s1210_state *st;
@@ -736,7 +736,7 @@ error_ret:
         return ret;
 }
 
-static int __devexit ad2s1210_remove(struct spi_device *spi)
+static int ad2s1210_remove(struct spi_device *spi)
 {
         struct iio_dev *indio_dev = spi_get_drvdata(spi);
 
@@ -759,7 +759,7 @@ static struct spi_driver ad2s1210_driver = {
                 .owner = THIS_MODULE,
         },
         .probe = ad2s1210_probe,
-        .remove = __devexit_p(ad2s1210_remove),
+        .remove = ad2s1210_remove,
         .id_table = ad2s1210_id,
 };
 module_spi_driver(ad2s1210_driver);
diff --git a/drivers/staging/iio/resolver/ad2s90.c b/drivers/staging/iio/resolver/ad2s90.c
index a8057228dca1..0aecfbcdb992 100644
--- a/drivers/staging/iio/resolver/ad2s90.c
+++ b/drivers/staging/iio/resolver/ad2s90.c
@@ -58,7 +58,7 @@ static const struct iio_chan_spec ad2s90_chan = {
         .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT,
 };
 
-static int __devinit ad2s90_probe(struct spi_device *spi)
+static int ad2s90_probe(struct spi_device *spi)
 {
         struct iio_dev *indio_dev;
         struct ad2s90_state *st;
@@ -98,7 +98,7 @@ error_ret:
         return ret;
 }
 
-static int __devexit ad2s90_remove(struct spi_device *spi)
+static int ad2s90_remove(struct spi_device *spi)
 {
         iio_device_unregister(spi_get_drvdata(spi));
         iio_device_free(spi_get_drvdata(spi));
@@ -118,7 +118,7 @@ static struct spi_driver ad2s90_driver = {
                 .owner = THIS_MODULE,
         },
         .probe = ad2s90_probe,
-        .remove = __devexit_p(ad2s90_remove),
+        .remove = ad2s90_remove,
         .id_table = ad2s90_id,
 };
 module_spi_driver(ad2s90_driver);
diff --git a/drivers/staging/iio/trigger/iio-trig-bfin-timer.c b/drivers/staging/iio/trigger/iio-trig-bfin-timer.c
index 52062d786f84..42798da575c0 100644
--- a/drivers/staging/iio/trigger/iio-trig-bfin-timer.c
+++ b/drivers/staging/iio/trigger/iio-trig-bfin-timer.c
@@ -180,7 +180,7 @@ static const struct iio_trigger_ops iio_bfin_tmr_trigger_ops = {
         .set_trigger_state = iio_bfin_tmr_set_state,
 };
 
-static int __devinit iio_bfin_tmr_trigger_probe(struct platform_device *pdev)
+static int iio_bfin_tmr_trigger_probe(struct platform_device *pdev)
 {
         struct iio_bfin_timer_trigger_pdata *pdata = pdev->dev.platform_data;
         struct bfin_tmr_state *st;
@@ -275,7 +275,7 @@ out:
         return ret;
 }
 
-static int __devexit iio_bfin_tmr_trigger_remove(struct platform_device *pdev)
+static int iio_bfin_tmr_trigger_remove(struct platform_device *pdev)
 {
         struct bfin_tmr_state *st = platform_get_drvdata(pdev);
 
@@ -296,7 +296,7 @@ static struct platform_driver iio_bfin_tmr_trigger_driver = {
                 .owner = THIS_MODULE,
         },
         .probe = iio_bfin_tmr_trigger_probe,
-        .remove = __devexit_p(iio_bfin_tmr_trigger_remove),
+        .remove = iio_bfin_tmr_trigger_remove,
 };
 
 module_platform_driver(iio_bfin_tmr_trigger_driver);
diff --git a/drivers/staging/iio/trigger/iio-trig-gpio.c b/drivers/staging/iio/trigger/iio-trig-gpio.c
index 5ff4d7fa20fa..fcc4cb048c9a 100644
--- a/drivers/staging/iio/trigger/iio-trig-gpio.c
+++ b/drivers/staging/iio/trigger/iio-trig-gpio.c
@@ -51,7 +51,7 @@ static const struct iio_trigger_ops iio_gpio_trigger_ops = {
         .owner = THIS_MODULE,
 };
 
-static int __devinit iio_gpio_trigger_probe(struct platform_device *pdev)
+static int iio_gpio_trigger_probe(struct platform_device *pdev)
 {
         struct iio_gpio_trigger_info *trig_info;
         struct iio_trigger *trig, *trig2;
@@ -130,7 +130,7 @@ error_free_completed_registrations:
         return ret;
 }
 
-static int __devexit iio_gpio_trigger_remove(struct platform_device *pdev)
+static int iio_gpio_trigger_remove(struct platform_device *pdev)
 {
         struct iio_trigger *trig, *trig2;
         struct iio_gpio_trigger_info *trig_info;
@@ -153,7 +153,7 @@ static int __devexit iio_gpio_trigger_remove(struct platform_device *pdev)
 
 static struct platform_driver iio_gpio_trigger_driver = {
         .probe = iio_gpio_trigger_probe,
-        .remove = __devexit_p(iio_gpio_trigger_remove),
+        .remove = iio_gpio_trigger_remove,
         .driver = {
                 .name = "iio_gpio_trigger",
                 .owner = THIS_MODULE,
diff --git a/drivers/staging/iio/trigger/iio-trig-periodic-rtc.c b/drivers/staging/iio/trigger/iio-trig-periodic-rtc.c
index a3de76d70cdc..9102b1ba2530 100644
--- a/drivers/staging/iio/trigger/iio-trig-periodic-rtc.c
+++ b/drivers/staging/iio/trigger/iio-trig-periodic-rtc.c
@@ -101,7 +101,7 @@ static const struct iio_trigger_ops iio_prtc_trigger_ops = {
         .set_trigger_state = &iio_trig_periodic_rtc_set_state,
 };
 
-static int __devinit iio_trig_periodic_rtc_probe(struct platform_device *dev)
+static int iio_trig_periodic_rtc_probe(struct platform_device *dev)
 {
         char **pdata = dev->dev.platform_data;
         struct iio_prtc_trigger_info *trig_info;
@@ -167,7 +167,7 @@ error_free_completed_registrations:
         return ret;
 }
 
-static int __devexit iio_trig_periodic_rtc_remove(struct platform_device *dev)
+static int iio_trig_periodic_rtc_remove(struct platform_device *dev)
 {
         struct iio_trigger *trig, *trig2;
         struct iio_prtc_trigger_info *trig_info;
@@ -188,7 +188,7 @@ static int __devexit iio_trig_periodic_rtc_remove(struct platform_device *dev)
 
 static struct platform_driver iio_trig_periodic_rtc_driver = {
         .probe = iio_trig_periodic_rtc_probe,
-        .remove = __devexit_p(iio_trig_periodic_rtc_remove),
+        .remove = iio_trig_periodic_rtc_remove,
         .driver = {
                 .name = "iio_prtc_trigger",
                 .owner = THIS_MODULE,
diff --git a/drivers/staging/imx-drm/Kconfig b/drivers/staging/imx-drm/Kconfig
index 14b4449df234..be7e2e30ac14 100644
--- a/drivers/staging/imx-drm/Kconfig
+++ b/drivers/staging/imx-drm/Kconfig
@@ -3,7 +3,7 @@ config DRM_IMX
         select DRM_KMS_HELPER
         select DRM_GEM_CMA_HELPER
         select DRM_KMS_CMA_HELPER
-        depends on DRM && ARCH_MXC
+        depends on DRM && (ARCH_MXC || ARCH_MULTIPLATFORM)
         help
           enable i.MX graphics support
 
diff --git a/drivers/staging/imx-drm/imx-drm-core.c b/drivers/staging/imx-drm/imx-drm-core.c
index 1913199ba16e..ecf0f44bc70e 100644
--- a/drivers/staging/imx-drm/imx-drm-core.c
+++ b/drivers/staging/imx-drm/imx-drm-core.c
@@ -824,7 +824,7 @@ static int imx_drm_platform_remove(struct platform_device *pdev)
 
 static struct platform_driver imx_drm_pdrv = {
         .probe          = imx_drm_platform_probe,
-        .remove         = __devexit_p(imx_drm_platform_remove),
+        .remove         = imx_drm_platform_remove,
         .driver         = {
                 .owner  = THIS_MODULE,
                 .name   = "imx-drm",
diff --git a/drivers/staging/imx-drm/ipu-v3/imx-ipu-v3.h b/drivers/staging/imx-drm/ipu-v3/imx-ipu-v3.h
index 74158dd73758..99d1cceaa3de 100644
--- a/drivers/staging/imx-drm/ipu-v3/imx-ipu-v3.h
+++ b/drivers/staging/imx-drm/ipu-v3/imx-ipu-v3.h
@@ -16,7 +16,6 @@
 #include <linux/videodev2.h>
 #include <linux/bitmap.h>
 #include <linux/fb.h>
-#include <linux/videodev2.h>
 
 struct ipu_soc;
 
@@ -293,6 +292,7 @@ static inline void ipu_cpmem_interlaced_scan(struct ipu_ch_param *p,
 
 void ipu_cpmem_set_yuv_planar(struct ipu_ch_param __iomem *p, u32 pixel_format,
                         int stride, int height);
+void ipu_cpmem_set_yuv_interleaved(struct ipu_ch_param *p, u32 pixel_format);
 void ipu_cpmem_set_yuv_planar_full(struct ipu_ch_param __iomem *p,
                 u32 pixel_format, int stride, int u_offset, int v_offset);
 int ipu_cpmem_set_fmt(struct ipu_ch_param __iomem *cpmem, u32 pixelformat);
diff --git a/drivers/staging/imx-drm/ipu-v3/ipu-common.c b/drivers/staging/imx-drm/ipu-v3/ipu-common.c
index f381960f42b0..677e665ca86d 100644
--- a/drivers/staging/imx-drm/ipu-v3/ipu-common.c
+++ b/drivers/staging/imx-drm/ipu-v3/ipu-common.c
@@ -225,6 +225,23 @@ int ipu_cpmem_set_format_passthrough(struct ipu_ch_param __iomem *p,
 }
 EXPORT_SYMBOL_GPL(ipu_cpmem_set_format_passthrough);
 
+void ipu_cpmem_set_yuv_interleaved(struct ipu_ch_param *p, u32 pixel_format)
+{
+        switch (pixel_format) {
+        case V4L2_PIX_FMT_UYVY:
+                ipu_ch_param_write_field(p, IPU_FIELD_BPP, 3);    /* bits/pixel */
+                ipu_ch_param_write_field(p, IPU_FIELD_PFS, 0xA);  /* pix format */
+                ipu_ch_param_write_field(p, IPU_FIELD_NPB, 31);   /* burst size */
+                break;
+        case V4L2_PIX_FMT_YUYV:
+                ipu_ch_param_write_field(p, IPU_FIELD_BPP, 3);    /* bits/pixel */
+                ipu_ch_param_write_field(p, IPU_FIELD_PFS, 0x8);  /* pix format */
+                ipu_ch_param_write_field(p, IPU_FIELD_NPB, 31);   /* burst size */
+                break;
+        }
+}
+EXPORT_SYMBOL_GPL(ipu_cpmem_set_yuv_interleaved);
+
 void ipu_cpmem_set_yuv_planar_full(struct ipu_ch_param __iomem *p,
                 u32 pixel_format, int stride, int u_offset, int v_offset)
 {
@@ -234,6 +251,11 @@ void ipu_cpmem_set_yuv_planar_full(struct ipu_ch_param __iomem *p,
                 ipu_ch_param_write_field(p, IPU_FIELD_UBO, u_offset / 8);
                 ipu_ch_param_write_field(p, IPU_FIELD_VBO, v_offset / 8);
                 break;
+        case V4L2_PIX_FMT_YVU420:
+                ipu_ch_param_write_field(p, IPU_FIELD_SLUV, (stride / 2) - 1);
+                ipu_ch_param_write_field(p, IPU_FIELD_UBO, v_offset / 8);
+                ipu_ch_param_write_field(p, IPU_FIELD_VBO, u_offset / 8);
+                break;
         }
 }
 EXPORT_SYMBOL_GPL(ipu_cpmem_set_yuv_planar_full);
@@ -246,10 +268,11 @@ void ipu_cpmem_set_yuv_planar(struct ipu_ch_param __iomem *p, u32 pixel_format,
 
         switch (pixel_format) {
         case V4L2_PIX_FMT_YUV420:
+        case V4L2_PIX_FMT_YVU420:
                 uv_stride = stride / 2;
                 u_offset = stride * height;
                 v_offset = u_offset + (uv_stride * height / 2);
-                ipu_cpmem_set_yuv_planar_full(p, V4L2_PIX_FMT_YUV420, stride,
+                ipu_cpmem_set_yuv_planar_full(p, pixel_format, stride,
                                 u_offset, v_offset);
                 break;
         }
@@ -307,6 +330,7 @@ int ipu_cpmem_set_fmt(struct ipu_ch_param __iomem *cpmem, u32 pixelformat)
 {
         switch (pixelformat) {
         case V4L2_PIX_FMT_YUV420:
+        case V4L2_PIX_FMT_YVU420:
                 /* pix format */
                 ipu_ch_param_write_field(cpmem, IPU_FIELD_PFS, 2);
                 /* burst size */
@@ -369,6 +393,7 @@ int ipu_cpmem_set_image(struct ipu_ch_param __iomem *cpmem,
 
         switch (pix->pixelformat) {
         case V4L2_PIX_FMT_YUV420:
+        case V4L2_PIX_FMT_YVU420:
                 y_offset = Y_OFFSET(pix, image->rect.left, image->rect.top);
                 u_offset = U_OFFSET(pix, image->rect.left,
                                 image->rect.top) - y_offset;
@@ -380,6 +405,7 @@ int ipu_cpmem_set_image(struct ipu_ch_param __iomem *cpmem,
                 ipu_cpmem_set_buffer(cpmem, 0, image->phys + y_offset);
                 break;
         case V4L2_PIX_FMT_UYVY:
+        case V4L2_PIX_FMT_YUYV:
                 ipu_cpmem_set_buffer(cpmem, 0, image->phys +
                                 image->rect.left * 2 +
                                 image->rect.top * image->pix.bytesperline);
@@ -413,8 +439,9 @@ enum ipu_color_space ipu_pixelformat_to_colorspace(u32 pixelformat)
 {
         switch (pixelformat) {
         case V4L2_PIX_FMT_YUV420:
+        case V4L2_PIX_FMT_YVU420:
         case V4L2_PIX_FMT_UYVY:
-        case V4L2_PIX_FMT_YVYU:
+        case V4L2_PIX_FMT_YUYV:
                 return IPUV3_COLORSPACE_YUV;
         case V4L2_PIX_FMT_RGB32:
         case V4L2_PIX_FMT_BGR32:
@@ -646,8 +673,6 @@ static int ipu_reset(struct ipu_soc *ipu)
                 cpu_relax();
         }
 
-        mdelay(300);
-
         return 0;
 }
 
@@ -988,7 +1013,7 @@ static void ipu_irq_exit(struct ipu_soc *ipu)
         irq_free_descs(ipu->irq_start, IPU_NUM_IRQS);
 }
 
-static int __devinit ipu_probe(struct platform_device *pdev)
+static int ipu_probe(struct platform_device *pdev)
 {
         const struct of_device_id *of_id =
                         of_match_device(imx_ipu_dt_ids, &pdev->dev);
@@ -1000,13 +1025,11 @@ static int __devinit ipu_probe(struct platform_device *pdev)
 
         devtype = of_id->data;
 
-        dev_info(&pdev->dev, "Initializing %s\n", devtype->name);
-
         irq_sync = platform_get_irq(pdev, 0);
         irq_err = platform_get_irq(pdev, 1);
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 
-        dev_info(&pdev->dev, "irq_sync: %d irq_err: %d\n",
+        dev_dbg(&pdev->dev, "irq_sync: %d irq_err: %d\n",
                         irq_sync, irq_err);
 
         if (!res || irq_sync < 0 || irq_err < 0)
@@ -1026,27 +1049,27 @@ static int __devinit ipu_probe(struct platform_device *pdev)
         spin_lock_init(&ipu->lock);
         mutex_init(&ipu->channel_lock);
 
-        dev_info(&pdev->dev, "cm_reg:   0x%08lx\n",
+        dev_dbg(&pdev->dev, "cm_reg:   0x%08lx\n",
                         ipu_base + devtype->cm_ofs);
-        dev_info(&pdev->dev, "idmac:    0x%08lx\n",
+        dev_dbg(&pdev->dev, "idmac:    0x%08lx\n",
                         ipu_base + devtype->cm_ofs + IPU_CM_IDMAC_REG_OFS);
-        dev_info(&pdev->dev, "cpmem:    0x%08lx\n",
+        dev_dbg(&pdev->dev, "cpmem:    0x%08lx\n",
                         ipu_base + devtype->cpmem_ofs);
-        dev_info(&pdev->dev, "disp0:    0x%08lx\n",
+        dev_dbg(&pdev->dev, "disp0:    0x%08lx\n",
                         ipu_base + devtype->disp0_ofs);
-        dev_info(&pdev->dev, "disp1:    0x%08lx\n",
+        dev_dbg(&pdev->dev, "disp1:    0x%08lx\n",
                         ipu_base + devtype->disp1_ofs);
-        dev_info(&pdev->dev, "srm:      0x%08lx\n",
+        dev_dbg(&pdev->dev, "srm:      0x%08lx\n",
                         ipu_base + devtype->srm_ofs);
-        dev_info(&pdev->dev, "tpm:      0x%08lx\n",
+        dev_dbg(&pdev->dev, "tpm:      0x%08lx\n",
                         ipu_base + devtype->tpm_ofs);
-        dev_info(&pdev->dev, "dc:       0x%08lx\n",
+        dev_dbg(&pdev->dev, "dc:       0x%08lx\n",
                         ipu_base + devtype->cm_ofs + IPU_CM_DC_REG_OFS);
-        dev_info(&pdev->dev, "ic:       0x%08lx\n",
+        dev_dbg(&pdev->dev, "ic:       0x%08lx\n",
                         ipu_base + devtype->cm_ofs + IPU_CM_IC_REG_OFS);
-        dev_info(&pdev->dev, "dmfc:     0x%08lx\n",
+        dev_dbg(&pdev->dev, "dmfc:     0x%08lx\n",
                         ipu_base + devtype->cm_ofs + IPU_CM_DMFC_REG_OFS);
-        dev_info(&pdev->dev, "vdi:      0x%08lx\n",
+        dev_dbg(&pdev->dev, "vdi:      0x%08lx\n",
                         ipu_base + devtype->vdi_ofs);
 
         ipu->cm_reg = devm_ioremap(&pdev->dev,
@@ -1098,6 +1121,8 @@ static int __devinit ipu_probe(struct platform_device *pdev)
                 goto failed_add_clients;
         }
 
+        dev_info(&pdev->dev, "%s probed\n", devtype->name);
+
         return 0;
 
 failed_add_clients:
@@ -1111,7 +1136,7 @@ failed_ioremap:
         return ret;
 }
 
-static int __devexit ipu_remove(struct platform_device *pdev)
+static int ipu_remove(struct platform_device *pdev)
 {
         struct ipu_soc *ipu = platform_get_drvdata(pdev);
         struct resource *res;
@@ -1133,7 +1158,7 @@ static struct platform_driver imx_ipu_driver = {
                 .of_match_table = imx_ipu_dt_ids,
         },
         .probe = ipu_probe,
-        .remove = __devexit_p(ipu_remove),
+        .remove = ipu_remove,
 };
 
 module_platform_driver(imx_ipu_driver);
diff --git a/drivers/staging/imx-drm/ipuv3-crtc.c b/drivers/staging/imx-drm/ipuv3-crtc.c
index 78d3edac75c1..1892006526b5 100644
--- a/drivers/staging/imx-drm/ipuv3-crtc.c
+++ b/drivers/staging/imx-drm/ipuv3-crtc.c
@@ -116,7 +116,7 @@ static void ipu_crtc_dpms(struct drm_crtc *crtc, int mode)
 {
         struct ipu_crtc *ipu_crtc = to_ipu_crtc(crtc);
 
-        dev_info(ipu_crtc->dev, "%s mode: %d\n", __func__, mode);
+        dev_dbg(ipu_crtc->dev, "%s mode: %d\n", __func__, mode);
 
         switch (mode) {
         case DRM_MODE_DPMS_ON:
@@ -530,7 +530,7 @@ err_put_resources:
         return ret;
 }
 
-static int __devinit ipu_drm_probe(struct platform_device *pdev)
+static int ipu_drm_probe(struct platform_device *pdev)
 {
         struct ipu_client_platformdata *pdata = pdev->dev.platform_data;
         struct ipu_crtc *ipu_crtc;
@@ -554,7 +554,7 @@ static int __devinit ipu_drm_probe(struct platform_device *pdev)
         return 0;
 }
 
-static int __devexit ipu_drm_remove(struct platform_device *pdev)
+static int ipu_drm_remove(struct platform_device *pdev)
 {
         struct ipu_crtc *ipu_crtc = platform_get_drvdata(pdev);
 
@@ -570,7 +570,7 @@ static struct platform_driver ipu_drm_driver = {
                 .name = "imx-ipuv3-crtc",
         },
         .probe = ipu_drm_probe,
-        .remove = __devexit_p(ipu_drm_remove),
+        .remove = ipu_drm_remove,
 };
 module_platform_driver(ipu_drm_driver);
 
diff --git a/drivers/staging/imx-drm/parallel-display.c b/drivers/staging/imx-drm/parallel-display.c
index 9b51d732eefa..a8064fcc03d1 100644
--- a/drivers/staging/imx-drm/parallel-display.c
+++ b/drivers/staging/imx-drm/parallel-display.c
@@ -23,6 +23,7 @@
 #include <drm/drm_fb_helper.h>
 #include <drm/drm_crtc_helper.h>
 #include <linux/videodev2.h>
+#include <linux/pinctrl/consumer.h>
 
 #include "imx-drm.h"
 
@@ -188,18 +189,27 @@ static int imx_pd_register(struct imx_parallel_display *imxpd)
         return 0;
 }
 
-static int __devinit imx_pd_probe(struct platform_device *pdev)
+static int imx_pd_probe(struct platform_device *pdev)
 {
         struct device_node *np = pdev->dev.of_node;
         const u8 *edidp;
         struct imx_parallel_display *imxpd;
         int ret;
         const char *fmt;
+        struct pinctrl *pinctrl;
 
         imxpd = devm_kzalloc(&pdev->dev, sizeof(*imxpd), GFP_KERNEL);
         if (!imxpd)
                 return -ENOMEM;
 
+        pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
+        if (IS_ERR(pinctrl)) {
+                ret = PTR_ERR(pinctrl);
+                dev_warn(&pdev->dev, "pinctrl_get_select_default failed with %d",
+                                ret);
+                return ret;
+        }
+
         edidp = of_get_property(np, "edid", &imxpd->edid_len);
         if (edidp)
                 imxpd->edid = kmemdup(edidp, imxpd->edid_len, GFP_KERNEL);
@@ -225,7 +235,7 @@ static int __devinit imx_pd_probe(struct platform_device *pdev)
         return 0;
 }
 
-static int __devexit imx_pd_remove(struct platform_device *pdev)
+static int imx_pd_remove(struct platform_device *pdev)
 {
         struct imx_parallel_display *imxpd = platform_get_drvdata(pdev);
         struct drm_connector *connector = &imxpd->connector;
@@ -246,7 +256,7 @@ static const struct of_device_id imx_pd_dt_ids[] = {
 
 static struct platform_driver imx_pd_driver = {
         .probe          = imx_pd_probe,
-        .remove         = __devexit_p(imx_pd_remove),
+        .remove         = imx_pd_remove,
         .driver         = {
                 .of_match_table = imx_pd_dt_ids,
                 .name   = "imx-parallel-display",
diff --git a/drivers/staging/ipack/Kconfig b/drivers/staging/ipack/Kconfig
deleted file mode 100644
index 4cf47066140c..000000000000
--- a/drivers/staging/ipack/Kconfig
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# IPACK configuration.
-#
-
-menuconfig IPACK_BUS
-        tristate "IndustryPack bus support"
-        depends on HAS_IOMEM
-        ---help---
-          If you say Y here you get support for the IndustryPack Framework
-          for drivers for many types of boards that support this industrial
-          bus. The IndustryPack Framework is a virtual bus allowing to
-          communicate between carrier and mezzanine cards connected through
-          this bus.
-
-if IPACK_BUS
-
-source "drivers/staging/ipack/bridges/Kconfig"
-
-source "drivers/staging/ipack/devices/Kconfig"
-
-endif # IPACK
diff --git a/drivers/staging/ipack/TODO b/drivers/staging/ipack/TODO
deleted file mode 100644
index ffafe6911a77..000000000000
--- a/drivers/staging/ipack/TODO
+++ /dev/null
@@ -1,22 +0,0 @@
-                                TODO
-                                ====
-Introduction
-============
-
-These drivers add support for IndustryPack devices: carrier and IP module
-boards.
-
-The ipack driver is just an abstraction of the bus providing the common
-operations between the two kind of boards.
-
-TODO
-====
-
-checkpatch.pl warnings
-cleanup
-
-Contact
-=======
-
-Contact: Samuel Iglesias Gonsalvez <siglesias@igalia.com>
-Mailing List: industrypack-devel@lists.sourceforge.net
diff --git a/drivers/staging/ipack/bridges/Kconfig b/drivers/staging/ipack/bridges/Kconfig
deleted file mode 100644
index 97c837ea7a03..000000000000
--- a/drivers/staging/ipack/bridges/Kconfig
+++ /dev/null
@@ -1,8 +0,0 @@
-config BOARD_TPCI200
-        tristate "TEWS TPCI-200 support for IndustryPack bus"
-        depends on IPACK_BUS
-        depends on PCI
-        help
-          This driver supports the TEWS TPCI200 device for the IndustryPack bus.
-        default n
-
diff --git a/drivers/staging/ipack/ipack.h b/drivers/staging/ipack/ipack.h
deleted file mode 100644
index d8e3bb6feac8..000000000000
--- a/drivers/staging/ipack/ipack.h
+++ /dev/null
@@ -1,217 +0,0 @@
-/*
- * Industry-pack bus.
- *
- * (C) 2011 Samuel Iglesias Gonsalvez <siglesia@cern.ch>, CERN
- * (C) 2012 Samuel Iglesias Gonsalvez <siglesias@igalia.com>, Igalia
- *
- * 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.
- */
-
-#include <linux/mod_devicetable.h>
-#include <linux/device.h>
-#include <linux/interrupt.h>
-
-#include "ipack_ids.h"
-
-#define IPACK_IDPROM_OFFSET_I                   0x01
-#define IPACK_IDPROM_OFFSET_P                   0x03
-#define IPACK_IDPROM_OFFSET_A                   0x05
-#define IPACK_IDPROM_OFFSET_C                   0x07
-#define IPACK_IDPROM_OFFSET_MANUFACTURER_ID     0x09
-#define IPACK_IDPROM_OFFSET_MODEL               0x0B
-#define IPACK_IDPROM_OFFSET_REVISION            0x0D
-#define IPACK_IDPROM_OFFSET_RESERVED            0x0F
-#define IPACK_IDPROM_OFFSET_DRIVER_ID_L         0x11
-#define IPACK_IDPROM_OFFSET_DRIVER_ID_H         0x13
-#define IPACK_IDPROM_OFFSET_NUM_BYTES           0x15
-#define IPACK_IDPROM_OFFSET_CRC                 0x17
-
-struct ipack_bus_ops;
-struct ipack_driver;
-
-enum ipack_space {
-        IPACK_IO_SPACE    = 0,
-        IPACK_ID_SPACE    = 1,
-        IPACK_MEM_SPACE   = 2,
-        IPACK_INT_SPACE,
-};
-
-/**
- *      struct ipack_addr_space - Virtual address space mapped for a specified type.
- *
- *      @address: virtual address
- *      @size: size of the mapped space
- */
-struct ipack_addr_space {
-        void __iomem *address;
-        unsigned int size;
-};
-
-/**
- *      struct ipack_device
- *
- *      @bus_nr: IP bus number where the device is plugged
- *      @slot: Slot where the device is plugged in the carrier board
- *      @bus: ipack_bus_device where the device is plugged to.
- *      @id_space: Virtual address to ID space.
- *      @io_space: Virtual address to IO space.
- *      @mem_space: Virtual address to MEM space.
- *      @dev: device in kernel representation.
- *
- * Warning: Direct access to mapped memory is possible but the endianness
- * is not the same with PCI carrier or VME carrier. The endianness is managed
- * by the carrier board throught bus->ops.
- */
-struct ipack_device {
-        unsigned int bus_nr;
-        unsigned int slot;
-        struct ipack_bus_device *bus;
-        struct ipack_addr_space id_space;
-        struct ipack_addr_space io_space;
-        struct ipack_addr_space int_space;
-        struct ipack_addr_space mem_space;
-        struct device dev;
-        u8                      *id;
-        size_t                   id_avail;
-        u32                      id_vendor;
-        u32                      id_device;
-        u8                       id_format;
-        unsigned int             id_crc_correct:1;
-        unsigned int             speed_8mhz:1;
-        unsigned int             speed_32mhz:1;
-};
-
-/**
- *      struct ipack_driver_ops -- callbacks to mezzanine driver for installing/removing one device
- *
- *      @probe: Probe function
- *      @remove: tell the driver that the carrier board wants to remove one device
- */
-
-struct ipack_driver_ops {
-        int (*probe) (struct ipack_device *dev);
-        void (*remove) (struct ipack_device *dev);
-};
-
-/**
- *      struct ipack_driver -- Specific data to each ipack board driver
- *
- *      @driver: Device driver kernel representation
- *      @ops: Mezzanine driver operations specific for the ipack bus.
- */
-struct ipack_driver {
-        struct device_driver driver;
-        const struct ipack_device_id *id_table;
-        const struct ipack_driver_ops *ops;
-};
-
-/**
- *      struct ipack_bus_ops - available operations on a bridge module
- *
- *      @map_space: map IP address space
- *      @unmap_space: unmap IP address space
- *      @request_irq: request IRQ
- *      @free_irq: free IRQ
- *      @get_clockrate: Returns the clockrate the carrier is currently
- *              communicating with the device at.
- *      @set_clockrate: Sets the clock-rate for carrier / module communication.
- *              Should return -EINVAL if the requested speed is not supported.
- *      @get_error: Returns the error state for the slot the device is attached
- *              to.
- *      @get_timeout: Returns 1 if the communication with the device has
- *              previously timed out.
- *      @reset_timeout: Resets the state returned by get_timeout.
- */
-struct ipack_bus_ops {
-        int (*map_space) (struct ipack_device *dev, unsigned int memory_size, int space);
-        int (*unmap_space) (struct ipack_device *dev, int space);
-        int (*request_irq) (struct ipack_device *dev,
-                            irqreturn_t (*handler)(void *), void *arg);
-        int (*free_irq) (struct ipack_device *dev);
-        int (*get_clockrate) (struct ipack_device *dev);
-        int (*set_clockrate) (struct ipack_device *dev, int mherz);
-        int (*get_error) (struct ipack_device *dev);
-        int (*get_timeout) (struct ipack_device *dev);
-        int (*reset_timeout) (struct ipack_device *dev);
-};
-
-/**
- *      struct ipack_bus_device
- *
- *      @dev: pointer to carrier device
- *      @slots: number of slots available
- *      @bus_nr: ipack bus number
- *      @ops: bus operations for the mezzanine drivers
- */
-struct ipack_bus_device {
-        struct device *parent;
-        int slots;
-        int bus_nr;
-        const struct ipack_bus_ops *ops;
-};
-
-/**
- *      ipack_bus_register -- register a new ipack bus
- *
- * @parent: pointer to the parent device, if any.
- * @slots: number of slots available in the bus device.
- * @ops: bus operations for the mezzanine drivers.
- *
- * The carrier board device should call this function to register itself as
- * available bus device in ipack.
- */
-struct ipack_bus_device *ipack_bus_register(struct device *parent, int slots,
-                                            const struct ipack_bus_ops *ops);
-
-/**
- *      ipack_bus_unregister -- unregister an ipack bus
- */
-int ipack_bus_unregister(struct ipack_bus_device *bus);
-
-/**
- *      ipack_driver_register -- Register a new driver
- *
- * Called by a ipack driver to register itself as a driver
- * that can manage ipack devices.
- */
-int ipack_driver_register(struct ipack_driver *edrv, struct module *owner,
-                          const char *name);
-void ipack_driver_unregister(struct ipack_driver *edrv);
-
-/**
- *      ipack_device_register -- register a new mezzanine device
- *
- * @bus: ipack bus device it is plugged to.
- * @slot: slot position in the bus device.
- *
- * Register a new ipack device (mezzanine device). The call is done by
- * the carrier device driver.
- */
-struct ipack_device *ipack_device_register(struct ipack_bus_device *bus, int slot);
-void ipack_device_unregister(struct ipack_device *dev);
-
-/**
- * DEFINE_IPACK_DEVICE_TABLE - macro used to describe a IndustryPack table
- * @_table: device table name
- *
- * This macro is used to create a struct ipack_device_id array (a device table)
- * in a generic manner.
- */
-#define DEFINE_IPACK_DEVICE_TABLE(_table) \
-        const struct ipack_device_id _table[] __devinitconst
-
-/**
- * IPACK_DEVICE - macro used to describe a specific IndustryPack device
- * @_format: the format version (currently either 1 or 2, 8 bit value)
- * @vend:    the 8 or 24 bit IndustryPack Vendor ID
- * @dev:     the 8 or 16  bit IndustryPack Device ID
- *
- * This macro is used to create a struct ipack_device_id that matches a specific
- * device.
- */
-#define IPACK_DEVICE(_format, vend, dev) \
-         .format = (_format), \
-         .vendor = (vend), \
-         .device = (dev)
diff --git a/drivers/staging/ipack/ipack_ids.h b/drivers/staging/ipack/ipack_ids.h
deleted file mode 100644
index 8153fee3f2f7..000000000000
--- a/drivers/staging/ipack/ipack_ids.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * IndustryPack Fromat, Vendor and Device IDs.
- */
-
-/* ID section format versions */
-#define IPACK_ID_VERSION_INVALID        0x00
-#define IPACK_ID_VERSION_1              0x01
-#define IPACK_ID_VERSION_2              0x02
-
-/* Vendors and devices. Sort key: vendor first, device next. */
-#define IPACK1_VENDOR_ID_RESERVED1      0x00
-#define IPACK1_VENDOR_ID_RESERVED2      0xFF
-#define IPACK1_VENDOR_ID_UNREGISTRED01  0x01
-#define IPACK1_VENDOR_ID_UNREGISTRED02  0x02
-#define IPACK1_VENDOR_ID_UNREGISTRED03  0x03
-#define IPACK1_VENDOR_ID_UNREGISTRED04  0x04
-#define IPACK1_VENDOR_ID_UNREGISTRED05  0x05
-#define IPACK1_VENDOR_ID_UNREGISTRED06  0x06
-#define IPACK1_VENDOR_ID_UNREGISTRED07  0x07
-#define IPACK1_VENDOR_ID_UNREGISTRED08  0x08
-#define IPACK1_VENDOR_ID_UNREGISTRED09  0x09
-#define IPACK1_VENDOR_ID_UNREGISTRED10  0x0A
-#define IPACK1_VENDOR_ID_UNREGISTRED11  0x0B
-#define IPACK1_VENDOR_ID_UNREGISTRED12  0x0C
-#define IPACK1_VENDOR_ID_UNREGISTRED13  0x0D
-#define IPACK1_VENDOR_ID_UNREGISTRED14  0x0E
-#define IPACK1_VENDOR_ID_UNREGISTRED15  0x0F
-
-#define IPACK1_VENDOR_ID_SBS            0xF0
-#define IPACK1_DEVICE_ID_SBS_OCTAL_232  0x22
-#define IPACK1_DEVICE_ID_SBS_OCTAL_422  0x2A
-#define IPACK1_DEVICE_ID_SBS_OCTAL_485  0x48
diff --git a/drivers/staging/line6/Kconfig b/drivers/staging/line6/Kconfig
index 43120ff2ab78..b63543658b2e 100644
--- a/drivers/staging/line6/Kconfig
+++ b/drivers/staging/line6/Kconfig
@@ -23,32 +23,6 @@ menuconfig LINE6_USB
 
 if LINE6_USB
 
-config LINE6_USB_DEBUG
-        bool "print debug messages"
-        default n
-        help
-          Say Y here to write debug messages to the syslog.
-
-          If unsure, say N.
-
-config LINE6_USB_DUMP_CTRL
-        bool "dump control messages"
-        default n
-        help
-          Say Y here to write control messages sent to and received from
-          Line6 devices to the syslog.
-
-          If unsure, say N.
-
-config LINE6_USB_DUMP_MIDI
-        bool "dump MIDI messages"
-        default n
-        help
-          Say Y here to write MIDI messages sent to and received from
-          Line6 devices to the syslog.
-
-          If unsure, say N.
-
 config LINE6_USB_DUMP_PCM
         bool "dump PCM data"
         default n
@@ -59,17 +33,6 @@ config LINE6_USB_DUMP_PCM
 
           If unsure, say N.
 
-config LINE6_USB_RAW
-        bool "raw data communication"
-        default n
-        help
-          Say Y here to create special files which allow to send raw data
-          to the device. This bypasses any sanity checks, so if you discover
-          the code to erase the firmware, feel free to render your device
-          useless, but only after reading the GPL section "NO WARRANTY".
-
-          If unsure, say N.
-
 config LINE6_USB_IMPULSE_RESPONSE
         bool "measure impulse response"
         default n
diff --git a/drivers/staging/line6/Makefile b/drivers/staging/line6/Makefile
index 34a2ddacc7e9..ae5c374b0f87 100644
--- a/drivers/staging/line6/Makefile
+++ b/drivers/staging/line6/Makefile
@@ -3,9 +3,7 @@ obj-$(CONFIG_LINE6_USB)		+= line6usb.o
 line6usb-y :=           \
                 audio.o         \
                 capture.o       \
-                control.o       \
                 driver.o        \
-                dumprequest.o   \
                 midi.o          \
                 midibuf.o       \
                 pcm.o           \
diff --git a/drivers/staging/line6/audio.c b/drivers/staging/line6/audio.c
index 8e7398393a59..a92e21f7d55b 100644
--- a/drivers/staging/line6/audio.c
+++ b/drivers/staging/line6/audio.c
@@ -16,20 +16,16 @@
 #include "driver.h"
 #include "audio.h"
 
-static int line6_index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;
-static char *line6_id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;
-
 /*
         Initialize the Line6 USB audio system.
 */
 int line6_init_audio(struct usb_line6 *line6)
 {
-        static int dev;
         struct snd_card *card;
         int err;
 
-        err = snd_card_create(line6_index[dev], line6_id[dev], THIS_MODULE, 0,
-                              &card);
+        err = snd_card_create(SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1,
+                              THIS_MODULE, 0, &card);
         if (err < 0)
                 return err;
 
diff --git a/drivers/staging/line6/capture.c b/drivers/staging/line6/capture.c
index c85c5b6bffb7..389c41fd1b74 100644
--- a/drivers/staging/line6/capture.c
+++ b/drivers/staging/line6/capture.c
@@ -256,8 +256,8 @@ static void audio_in_callback(struct urb *urb)
 #ifdef CONFIG_LINE6_USB_IMPULSE_RESPONSE
                 if (!(line6pcm->flags & LINE6_BITS_PCM_IMPULSE))
 #endif
-                        if (test_bit(LINE6_INDEX_PCM_ALSA_CAPTURE_STREAM, &line6pcm->flags)
-                            && (fsize > 0))
+                        if (test_bit(LINE6_INDEX_PCM_ALSA_CAPTURE_STREAM,
+                                     &line6pcm->flags) && (fsize > 0))
                                 line6_capture_copy(line6pcm, fbuf, fsize);
         }
 
@@ -274,7 +274,8 @@ static void audio_in_callback(struct urb *urb)
 #ifdef CONFIG_LINE6_USB_IMPULSE_RESPONSE
                 if (!(line6pcm->flags & LINE6_BITS_PCM_IMPULSE))
 #endif
-                        if (test_bit(LINE6_INDEX_PCM_ALSA_CAPTURE_STREAM, &line6pcm->flags))
+                        if (test_bit(LINE6_INDEX_PCM_ALSA_CAPTURE_STREAM,
+                                     &line6pcm->flags))
                                 line6_capture_check_period(line6pcm, length);
         }
 }
@@ -356,7 +357,8 @@ int snd_line6_capture_trigger(struct snd_line6_pcm *line6pcm, int cmd)
 #ifdef CONFIG_PM
         case SNDRV_PCM_TRIGGER_RESUME:
 #endif
-                err = line6_pcm_acquire(line6pcm, LINE6_BIT_PCM_ALSA_CAPTURE_STREAM);
+                err = line6_pcm_acquire(line6pcm,
+                                        LINE6_BIT_PCM_ALSA_CAPTURE_STREAM);
 
                 if (err < 0)
                         return err;
@@ -367,7 +369,8 @@ int snd_line6_capture_trigger(struct snd_line6_pcm *line6pcm, int cmd)
 #ifdef CONFIG_PM
         case SNDRV_PCM_TRIGGER_SUSPEND:
 #endif
-                err = line6_pcm_release(line6pcm, LINE6_BIT_PCM_ALSA_CAPTURE_STREAM);
+                err = line6_pcm_release(line6pcm,
+                                        LINE6_BIT_PCM_ALSA_CAPTURE_STREAM);
 
                 if (err < 0)
                         return err;
diff --git a/drivers/staging/line6/control.c b/drivers/staging/line6/control.c
deleted file mode 100644
index f8326f587e38..000000000000
--- a/drivers/staging/line6/control.c
+++ /dev/null
@@ -1,995 +0,0 @@
-/*
- * Line6 Linux USB driver - 0.9.1beta
- *
- * Copyright (C) 2004-2010 Markus Grabner (grabner@icg.tugraz.at)
- *
- *      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.
- *
- */
-
-#include <linux/usb.h>
-
-#include "control.h"
-#include "driver.h"
-#include "pod.h"
-#include "usbdefs.h"
-#include "variax.h"
-
-#define DEVICE_ATTR2(_name1, _name2, _mode, _show, _store) \
-struct device_attribute dev_attr_##_name1 = __ATTR(_name2, _mode, _show, _store)
-
-#define LINE6_PARAM_R(PREFIX, prefix, type, param) \
-static ssize_t prefix##_get_##param(struct device *dev, \
-                        struct device_attribute *attr, char *buf) \
-{ \
-        return prefix##_get_param_##type(dev, buf, PREFIX##_##param); \
-}
-
-#define LINE6_PARAM_RW(PREFIX, prefix, type, param) \
-LINE6_PARAM_R(PREFIX, prefix, type, param); \
-static ssize_t prefix##_set_##param(struct device *dev, \
-                struct device_attribute *attr, const char *buf, size_t count) \
-{ \
-        return prefix##_set_param_##type(dev, buf, count, PREFIX##_##param); \
-}
-
-#define POD_PARAM_R(type, param) LINE6_PARAM_R(POD, pod, type, param)
-#define POD_PARAM_RW(type, param) LINE6_PARAM_RW(POD, pod, type, param)
-#define VARIAX_PARAM_R(type, param) LINE6_PARAM_R(VARIAX, variax, type, param)
-#define VARIAX_PARAM_RW(type, param) LINE6_PARAM_RW(VARIAX, variax, type, param)
-
-static ssize_t pod_get_param_int(struct device *dev, char *buf, int param)
-{
-        struct usb_interface *interface = to_usb_interface(dev);
-        struct usb_line6_pod *pod = usb_get_intfdata(interface);
-        int retval = line6_dump_wait_interruptible(&pod->dumpreq);
-        if (retval < 0)
-                return retval;
-        return sprintf(buf, "%d\n", pod->prog_data.control[param]);
-}
-
-static ssize_t pod_set_param_int(struct device *dev, const char *buf,
-                                 size_t count, int param)
-{
-        struct usb_interface *interface = to_usb_interface(dev);
-        struct usb_line6_pod *pod = usb_get_intfdata(interface);
-        u8 value;
-        int retval;
-
-        retval = kstrtou8(buf, 10, &value);
-        if (retval)
-                return retval;
-
-        line6_pod_transmit_parameter(pod, param, value);
-        return count;
-}
-
-static ssize_t variax_get_param_int(struct device *dev, char *buf, int param)
-{
-        struct usb_interface *interface = to_usb_interface(dev);
-        struct usb_line6_variax *variax = usb_get_intfdata(interface);
-        int retval = line6_dump_wait_interruptible(&variax->dumpreq);
-        if (retval < 0)
-                return retval;
-        return sprintf(buf, "%d\n", variax->model_data.control[param]);
-}
-
-static ssize_t variax_get_param_float(struct device *dev, char *buf, int param)
-{
-        /*
-           We do our own floating point handling here since at the time
-           this code was written (Jan 2006) it was highly discouraged to
-           use floating point arithmetic in the kernel. If you think that
-           this no longer applies, feel free to replace this by generic
-           floating point code.
-         */
-
-        static const int BIAS = 0x7f;
-        static const int OFFSET = 0xf;
-        static const int PRECISION = 1000;
-
-        int len = 0;
-        unsigned part_int, part_frac;
-        struct usb_interface *interface = to_usb_interface(dev);
-        struct usb_line6_variax *variax = usb_get_intfdata(interface);
-        const unsigned char *p = variax->model_data.control + param;
-        int retval = line6_dump_wait_interruptible(&variax->dumpreq);
-        if (retval < 0)
-                return retval;
-
-        if ((p[0] == 0) && (p[1] == 0) && (p[2] == 0))
-                part_int = part_frac = 0;
-        else {
-                int exponent = (((p[0] & 0x7f) << 1) | (p[1] >> 7)) - BIAS;
-                unsigned mantissa = (p[1] << 8) | p[2] | 0x8000;
-                exponent -= OFFSET;
-
-                if (exponent >= 0) {
-                        part_int = mantissa << exponent;
-                        part_frac = 0;
-                } else {
-                        part_int = mantissa >> -exponent;
-                        part_frac = (mantissa << (32 + exponent)) & 0xffffffff;
-                }
-
-                part_frac =
-                    (part_frac / ((1UL << 31) / (PRECISION / 2 * 10)) + 5) / 10;
-        }
-
-        len +=
-            sprintf(buf + len, "%s%d.%03d\n", ((p[0] & 0x80) ? "-" : ""),
-                    part_int, part_frac);
-        return len;
-}
-
-POD_PARAM_RW(int, tweak);
-POD_PARAM_RW(int, wah_position);
-POD_PARAM_RW(int, compression_gain);
-POD_PARAM_RW(int, vol_pedal_position);
-POD_PARAM_RW(int, compression_threshold);
-POD_PARAM_RW(int, pan);
-POD_PARAM_RW(int, amp_model_setup);
-POD_PARAM_RW(int, amp_model);
-POD_PARAM_RW(int, drive);
-POD_PARAM_RW(int, bass);
-POD_PARAM_RW(int, mid);
-POD_PARAM_RW(int, lowmid);
-POD_PARAM_RW(int, treble);
-POD_PARAM_RW(int, highmid);
-POD_PARAM_RW(int, chan_vol);
-POD_PARAM_RW(int, reverb_mix);
-POD_PARAM_RW(int, effect_setup);
-POD_PARAM_RW(int, band_1_frequency);
-POD_PARAM_RW(int, presence);
-POD_PARAM_RW(int, treble__bass);
-POD_PARAM_RW(int, noise_gate_enable);
-POD_PARAM_RW(int, gate_threshold);
-POD_PARAM_RW(int, gate_decay_time);
-POD_PARAM_RW(int, stomp_enable);
-POD_PARAM_RW(int, comp_enable);
-POD_PARAM_RW(int, stomp_time);
-POD_PARAM_RW(int, delay_enable);
-POD_PARAM_RW(int, mod_param_1);
-POD_PARAM_RW(int, delay_param_1);
-POD_PARAM_RW(int, delay_param_1_note_value);
-POD_PARAM_RW(int, band_2_frequency__bass);
-POD_PARAM_RW(int, delay_param_2);
-POD_PARAM_RW(int, delay_volume_mix);
-POD_PARAM_RW(int, delay_param_3);
-POD_PARAM_RW(int, reverb_enable);
-POD_PARAM_RW(int, reverb_type);
-POD_PARAM_RW(int, reverb_decay);
-POD_PARAM_RW(int, reverb_tone);
-POD_PARAM_RW(int, reverb_pre_delay);
-POD_PARAM_RW(int, reverb_pre_post);
-POD_PARAM_RW(int, band_2_frequency);
-POD_PARAM_RW(int, band_3_frequency__bass);
-POD_PARAM_RW(int, wah_enable);
-POD_PARAM_RW(int, modulation_lo_cut);
-POD_PARAM_RW(int, delay_reverb_lo_cut);
-POD_PARAM_RW(int, volume_pedal_minimum);
-POD_PARAM_RW(int, eq_pre_post);
-POD_PARAM_RW(int, volume_pre_post);
-POD_PARAM_RW(int, di_model);
-POD_PARAM_RW(int, di_delay);
-POD_PARAM_RW(int, mod_enable);
-POD_PARAM_RW(int, mod_param_1_note_value);
-POD_PARAM_RW(int, mod_param_2);
-POD_PARAM_RW(int, mod_param_3);
-POD_PARAM_RW(int, mod_param_4);
-POD_PARAM_RW(int, mod_param_5);
-POD_PARAM_RW(int, mod_volume_mix);
-POD_PARAM_RW(int, mod_pre_post);
-POD_PARAM_RW(int, modulation_model);
-POD_PARAM_RW(int, band_3_frequency);
-POD_PARAM_RW(int, band_4_frequency__bass);
-POD_PARAM_RW(int, mod_param_1_double_precision);
-POD_PARAM_RW(int, delay_param_1_double_precision);
-POD_PARAM_RW(int, eq_enable);
-POD_PARAM_RW(int, tap);
-POD_PARAM_RW(int, volume_tweak_pedal_assign);
-POD_PARAM_RW(int, band_5_frequency);
-POD_PARAM_RW(int, tuner);
-POD_PARAM_RW(int, mic_selection);
-POD_PARAM_RW(int, cabinet_model);
-POD_PARAM_RW(int, stomp_model);
-POD_PARAM_RW(int, roomlevel);
-POD_PARAM_RW(int, band_4_frequency);
-POD_PARAM_RW(int, band_6_frequency);
-POD_PARAM_RW(int, stomp_param_1_note_value);
-POD_PARAM_RW(int, stomp_param_2);
-POD_PARAM_RW(int, stomp_param_3);
-POD_PARAM_RW(int, stomp_param_4);
-POD_PARAM_RW(int, stomp_param_5);
-POD_PARAM_RW(int, stomp_param_6);
-POD_PARAM_RW(int, amp_switch_select);
-POD_PARAM_RW(int, delay_param_4);
-POD_PARAM_RW(int, delay_param_5);
-POD_PARAM_RW(int, delay_pre_post);
-POD_PARAM_RW(int, delay_model);
-POD_PARAM_RW(int, delay_verb_model);
-POD_PARAM_RW(int, tempo_msb);
-POD_PARAM_RW(int, tempo_lsb);
-POD_PARAM_RW(int, wah_model);
-POD_PARAM_RW(int, bypass_volume);
-POD_PARAM_RW(int, fx_loop_on_off);
-POD_PARAM_RW(int, tweak_param_select);
-POD_PARAM_RW(int, amp1_engage);
-POD_PARAM_RW(int, band_1_gain);
-POD_PARAM_RW(int, band_2_gain__bass);
-POD_PARAM_RW(int, band_2_gain);
-POD_PARAM_RW(int, band_3_gain__bass);
-POD_PARAM_RW(int, band_3_gain);
-POD_PARAM_RW(int, band_4_gain__bass);
-POD_PARAM_RW(int, band_5_gain__bass);
-POD_PARAM_RW(int, band_4_gain);
-POD_PARAM_RW(int, band_6_gain__bass);
-VARIAX_PARAM_R(int, body);
-VARIAX_PARAM_R(int, pickup1_enable);
-VARIAX_PARAM_R(int, pickup1_type);
-VARIAX_PARAM_R(float, pickup1_position);
-VARIAX_PARAM_R(float, pickup1_angle);
-VARIAX_PARAM_R(float, pickup1_level);
-VARIAX_PARAM_R(int, pickup2_enable);
-VARIAX_PARAM_R(int, pickup2_type);
-VARIAX_PARAM_R(float, pickup2_position);
-VARIAX_PARAM_R(float, pickup2_angle);
-VARIAX_PARAM_R(float, pickup2_level);
-VARIAX_PARAM_R(int, pickup_phase);
-VARIAX_PARAM_R(float, capacitance);
-VARIAX_PARAM_R(float, tone_resistance);
-VARIAX_PARAM_R(float, volume_resistance);
-VARIAX_PARAM_R(int, taper);
-VARIAX_PARAM_R(float, tone_dump);
-VARIAX_PARAM_R(int, save_tone);
-VARIAX_PARAM_R(float, volume_dump);
-VARIAX_PARAM_R(int, tuning_enable);
-VARIAX_PARAM_R(int, tuning6);
-VARIAX_PARAM_R(int, tuning5);
-VARIAX_PARAM_R(int, tuning4);
-VARIAX_PARAM_R(int, tuning3);
-VARIAX_PARAM_R(int, tuning2);
-VARIAX_PARAM_R(int, tuning1);
-VARIAX_PARAM_R(float, detune6);
-VARIAX_PARAM_R(float, detune5);
-VARIAX_PARAM_R(float, detune4);
-VARIAX_PARAM_R(float, detune3);
-VARIAX_PARAM_R(float, detune2);
-VARIAX_PARAM_R(float, detune1);
-VARIAX_PARAM_R(float, mix6);
-VARIAX_PARAM_R(float, mix5);
-VARIAX_PARAM_R(float, mix4);
-VARIAX_PARAM_R(float, mix3);
-VARIAX_PARAM_R(float, mix2);
-VARIAX_PARAM_R(float, mix1);
-VARIAX_PARAM_R(int, pickup_wiring);
-
-static DEVICE_ATTR(tweak, S_IWUSR | S_IRUGO, pod_get_tweak, pod_set_tweak);
-static DEVICE_ATTR(wah_position, S_IWUSR | S_IRUGO, pod_get_wah_position,
-                   pod_set_wah_position);
-static DEVICE_ATTR(compression_gain, S_IWUSR | S_IRUGO,
-                   pod_get_compression_gain, pod_set_compression_gain);
-static DEVICE_ATTR(vol_pedal_position, S_IWUSR | S_IRUGO,
-                   pod_get_vol_pedal_position, pod_set_vol_pedal_position);
-static DEVICE_ATTR(compression_threshold, S_IWUSR | S_IRUGO,
-                   pod_get_compression_threshold,
-                   pod_set_compression_threshold);
-static DEVICE_ATTR(pan, S_IWUSR | S_IRUGO, pod_get_pan, pod_set_pan);
-static DEVICE_ATTR(amp_model_setup, S_IWUSR | S_IRUGO, pod_get_amp_model_setup,
-                   pod_set_amp_model_setup);
-static DEVICE_ATTR(amp_model, S_IWUSR | S_IRUGO, pod_get_amp_model,
-                   pod_set_amp_model);
-static DEVICE_ATTR(drive, S_IWUSR | S_IRUGO, pod_get_drive, pod_set_drive);
-static DEVICE_ATTR(bass, S_IWUSR | S_IRUGO, pod_get_bass, pod_set_bass);
-static DEVICE_ATTR(mid, S_IWUSR | S_IRUGO, pod_get_mid, pod_set_mid);
-static DEVICE_ATTR(lowmid, S_IWUSR | S_IRUGO, pod_get_lowmid, pod_set_lowmid);
-static DEVICE_ATTR(treble, S_IWUSR | S_IRUGO, pod_get_treble, pod_set_treble);
-static DEVICE_ATTR(highmid, S_IWUSR | S_IRUGO, pod_get_highmid,
-                   pod_set_highmid);
-static DEVICE_ATTR(chan_vol, S_IWUSR | S_IRUGO, pod_get_chan_vol,
-                   pod_set_chan_vol);
-static DEVICE_ATTR(reverb_mix, S_IWUSR | S_IRUGO, pod_get_reverb_mix,
-                   pod_set_reverb_mix);
-static DEVICE_ATTR(effect_setup, S_IWUSR | S_IRUGO, pod_get_effect_setup,
-                   pod_set_effect_setup);
-static DEVICE_ATTR(band_1_frequency, S_IWUSR | S_IRUGO,
-                   pod_get_band_1_frequency, pod_set_band_1_frequency);
-static DEVICE_ATTR(presence, S_IWUSR | S_IRUGO, pod_get_presence,
-                   pod_set_presence);
-static DEVICE_ATTR2(treble__bass, treble, S_IWUSR | S_IRUGO,
-                    pod_get_treble__bass, pod_set_treble__bass);
-static DEVICE_ATTR(noise_gate_enable, S_IWUSR | S_IRUGO,
-                   pod_get_noise_gate_enable, pod_set_noise_gate_enable);
-static DEVICE_ATTR(gate_threshold, S_IWUSR | S_IRUGO, pod_get_gate_threshold,
-                   pod_set_gate_threshold);
-static DEVICE_ATTR(gate_decay_time, S_IWUSR | S_IRUGO, pod_get_gate_decay_time,
-                   pod_set_gate_decay_time);
-static DEVICE_ATTR(stomp_enable, S_IWUSR | S_IRUGO, pod_get_stomp_enable,
-                   pod_set_stomp_enable);
-static DEVICE_ATTR(comp_enable, S_IWUSR | S_IRUGO, pod_get_comp_enable,
-                   pod_set_comp_enable);
-static DEVICE_ATTR(stomp_time, S_IWUSR | S_IRUGO, pod_get_stomp_time,
-                   pod_set_stomp_time);
-static DEVICE_ATTR(delay_enable, S_IWUSR | S_IRUGO, pod_get_delay_enable,
-                   pod_set_delay_enable);
-static DEVICE_ATTR(mod_param_1, S_IWUSR | S_IRUGO, pod_get_mod_param_1,
-                   pod_set_mod_param_1);
-static DEVICE_ATTR(delay_param_1, S_IWUSR | S_IRUGO, pod_get_delay_param_1,
-                   pod_set_delay_param_1);
-static DEVICE_ATTR(delay_param_1_note_value, S_IWUSR | S_IRUGO,
-                   pod_get_delay_param_1_note_value,
-                   pod_set_delay_param_1_note_value);
-static DEVICE_ATTR2(band_2_frequency__bass, band_2_frequency, S_IWUSR | S_IRUGO,
-                    pod_get_band_2_frequency__bass,
-                    pod_set_band_2_frequency__bass);
-static DEVICE_ATTR(delay_param_2, S_IWUSR | S_IRUGO, pod_get_delay_param_2,
-                   pod_set_delay_param_2);
-static DEVICE_ATTR(delay_volume_mix, S_IWUSR | S_IRUGO,
-                   pod_get_delay_volume_mix, pod_set_delay_volume_mix);
-static DEVICE_ATTR(delay_param_3, S_IWUSR | S_IRUGO, pod_get_delay_param_3,
-                   pod_set_delay_param_3);
-static DEVICE_ATTR(reverb_enable, S_IWUSR | S_IRUGO, pod_get_reverb_enable,
-                   pod_set_reverb_enable);
-static DEVICE_ATTR(reverb_type, S_IWUSR | S_IRUGO, pod_get_reverb_type,
-                   pod_set_reverb_type);
-static DEVICE_ATTR(reverb_decay, S_IWUSR | S_IRUGO, pod_get_reverb_decay,
-                   pod_set_reverb_decay);
-static DEVICE_ATTR(reverb_tone, S_IWUSR | S_IRUGO, pod_get_reverb_tone,
-                   pod_set_reverb_tone);
-static DEVICE_ATTR(reverb_pre_delay, S_IWUSR | S_IRUGO,
-                   pod_get_reverb_pre_delay, pod_set_reverb_pre_delay);
-static DEVICE_ATTR(reverb_pre_post, S_IWUSR | S_IRUGO, pod_get_reverb_pre_post,
-                   pod_set_reverb_pre_post);
-static DEVICE_ATTR(band_2_frequency, S_IWUSR | S_IRUGO,
-                   pod_get_band_2_frequency, pod_set_band_2_frequency);
-static DEVICE_ATTR2(band_3_frequency__bass, band_3_frequency, S_IWUSR | S_IRUGO,
-                    pod_get_band_3_frequency__bass,
-                    pod_set_band_3_frequency__bass);
-static DEVICE_ATTR(wah_enable, S_IWUSR | S_IRUGO, pod_get_wah_enable,
-                   pod_set_wah_enable);
-static DEVICE_ATTR(modulation_lo_cut, S_IWUSR | S_IRUGO,
-                   pod_get_modulation_lo_cut, pod_set_modulation_lo_cut);
-static DEVICE_ATTR(delay_reverb_lo_cut, S_IWUSR | S_IRUGO,
-                   pod_get_delay_reverb_lo_cut, pod_set_delay_reverb_lo_cut);
-static DEVICE_ATTR(volume_pedal_minimum, S_IWUSR | S_IRUGO,
-                   pod_get_volume_pedal_minimum, pod_set_volume_pedal_minimum);
-static DEVICE_ATTR(eq_pre_post, S_IWUSR | S_IRUGO, pod_get_eq_pre_post,
-                   pod_set_eq_pre_post);
-static DEVICE_ATTR(volume_pre_post, S_IWUSR | S_IRUGO, pod_get_volume_pre_post,
-                   pod_set_volume_pre_post);
-static DEVICE_ATTR(di_model, S_IWUSR | S_IRUGO, pod_get_di_model,
-                   pod_set_di_model);
-static DEVICE_ATTR(di_delay, S_IWUSR | S_IRUGO, pod_get_di_delay,
-                   pod_set_di_delay);
-static DEVICE_ATTR(mod_enable, S_IWUSR | S_IRUGO, pod_get_mod_enable,
-                   pod_set_mod_enable);
-static DEVICE_ATTR(mod_param_1_note_value, S_IWUSR | S_IRUGO,
-                   pod_get_mod_param_1_note_value,
-                   pod_set_mod_param_1_note_value);
-static DEVICE_ATTR(mod_param_2, S_IWUSR | S_IRUGO, pod_get_mod_param_2,
-                   pod_set_mod_param_2);
-static DEVICE_ATTR(mod_param_3, S_IWUSR | S_IRUGO, pod_get_mod_param_3,
-                   pod_set_mod_param_3);
-static DEVICE_ATTR(mod_param_4, S_IWUSR | S_IRUGO, pod_get_mod_param_4,
-                   pod_set_mod_param_4);
-static DEVICE_ATTR(mod_param_5, S_IWUSR | S_IRUGO, pod_get_mod_param_5,
-                   pod_set_mod_param_5);
-static DEVICE_ATTR(mod_volume_mix, S_IWUSR | S_IRUGO, pod_get_mod_volume_mix,
-                   pod_set_mod_volume_mix);
-static DEVICE_ATTR(mod_pre_post, S_IWUSR | S_IRUGO, pod_get_mod_pre_post,
-                   pod_set_mod_pre_post);
-static DEVICE_ATTR(modulation_model, S_IWUSR | S_IRUGO,
-                   pod_get_modulation_model, pod_set_modulation_model);
-static DEVICE_ATTR(band_3_frequency, S_IWUSR | S_IRUGO,
-                   pod_get_band_3_frequency, pod_set_band_3_frequency);
-static DEVICE_ATTR2(band_4_frequency__bass, band_4_frequency, S_IWUSR | S_IRUGO,
-                    pod_get_band_4_frequency__bass,
-                    pod_set_band_4_frequency__bass);
-static DEVICE_ATTR(mod_param_1_double_precision, S_IWUSR | S_IRUGO,
-                   pod_get_mod_param_1_double_precision,
-                   pod_set_mod_param_1_double_precision);
-static DEVICE_ATTR(delay_param_1_double_precision, S_IWUSR | S_IRUGO,
-                   pod_get_delay_param_1_double_precision,
-                   pod_set_delay_param_1_double_precision);
-static DEVICE_ATTR(eq_enable, S_IWUSR | S_IRUGO, pod_get_eq_enable,
-                   pod_set_eq_enable);
-static DEVICE_ATTR(tap, S_IWUSR | S_IRUGO, pod_get_tap, pod_set_tap);
-static DEVICE_ATTR(volume_tweak_pedal_assign, S_IWUSR | S_IRUGO,
-                   pod_get_volume_tweak_pedal_assign,
-                   pod_set_volume_tweak_pedal_assign);
-static DEVICE_ATTR(band_5_frequency, S_IWUSR | S_IRUGO,
-                   pod_get_band_5_frequency, pod_set_band_5_frequency);
-static DEVICE_ATTR(tuner, S_IWUSR | S_IRUGO, pod_get_tuner, pod_set_tuner);
-static DEVICE_ATTR(mic_selection, S_IWUSR | S_IRUGO, pod_get_mic_selection,
-                   pod_set_mic_selection);
-static DEVICE_ATTR(cabinet_model, S_IWUSR | S_IRUGO, pod_get_cabinet_model,
-                   pod_set_cabinet_model);
-static DEVICE_ATTR(stomp_model, S_IWUSR | S_IRUGO, pod_get_stomp_model,
-                   pod_set_stomp_model);
-static DEVICE_ATTR(roomlevel, S_IWUSR | S_IRUGO, pod_get_roomlevel,
-                   pod_set_roomlevel);
-static DEVICE_ATTR(band_4_frequency, S_IWUSR | S_IRUGO,
-                   pod_get_band_4_frequency, pod_set_band_4_frequency);
-static DEVICE_ATTR(band_6_frequency, S_IWUSR | S_IRUGO,
-                   pod_get_band_6_frequency, pod_set_band_6_frequency);
-static DEVICE_ATTR(stomp_param_1_note_value, S_IWUSR | S_IRUGO,
-                   pod_get_stomp_param_1_note_value,
-                   pod_set_stomp_param_1_note_value);
-static DEVICE_ATTR(stomp_param_2, S_IWUSR | S_IRUGO, pod_get_stomp_param_2,
-                   pod_set_stomp_param_2);
-static DEVICE_ATTR(stomp_param_3, S_IWUSR | S_IRUGO, pod_get_stomp_param_3,
-                   pod_set_stomp_param_3);
-static DEVICE_ATTR(stomp_param_4, S_IWUSR | S_IRUGO, pod_get_stomp_param_4,
-                   pod_set_stomp_param_4);
-static DEVICE_ATTR(stomp_param_5, S_IWUSR | S_IRUGO, pod_get_stomp_param_5,
-                   pod_set_stomp_param_5);
-static DEVICE_ATTR(stomp_param_6, S_IWUSR | S_IRUGO, pod_get_stomp_param_6,
-                   pod_set_stomp_param_6);
-static DEVICE_ATTR(amp_switch_select, S_IWUSR | S_IRUGO,
-                   pod_get_amp_switch_select, pod_set_amp_switch_select);
-static DEVICE_ATTR(delay_param_4, S_IWUSR | S_IRUGO, pod_get_delay_param_4,
-                   pod_set_delay_param_4);
-static DEVICE_ATTR(delay_param_5, S_IWUSR | S_IRUGO, pod_get_delay_param_5,
-                   pod_set_delay_param_5);
-static DEVICE_ATTR(delay_pre_post, S_IWUSR | S_IRUGO, pod_get_delay_pre_post,
-                   pod_set_delay_pre_post);
-static DEVICE_ATTR(delay_model, S_IWUSR | S_IRUGO, pod_get_delay_model,
-                   pod_set_delay_model);
-static DEVICE_ATTR(delay_verb_model, S_IWUSR | S_IRUGO,
-                   pod_get_delay_verb_model, pod_set_delay_verb_model);
-static DEVICE_ATTR(tempo_msb, S_IWUSR | S_IRUGO, pod_get_tempo_msb,
-                   pod_set_tempo_msb);
-static DEVICE_ATTR(tempo_lsb, S_IWUSR | S_IRUGO, pod_get_tempo_lsb,
-                   pod_set_tempo_lsb);
-static DEVICE_ATTR(wah_model, S_IWUSR | S_IRUGO, pod_get_wah_model,
-                   pod_set_wah_model);
-static DEVICE_ATTR(bypass_volume, S_IWUSR | S_IRUGO, pod_get_bypass_volume,
-                   pod_set_bypass_volume);
-static DEVICE_ATTR(fx_loop_on_off, S_IWUSR | S_IRUGO, pod_get_fx_loop_on_off,
-                   pod_set_fx_loop_on_off);
-static DEVICE_ATTR(tweak_param_select, S_IWUSR | S_IRUGO,
-                   pod_get_tweak_param_select, pod_set_tweak_param_select);
-static DEVICE_ATTR(amp1_engage, S_IWUSR | S_IRUGO, pod_get_amp1_engage,
-                   pod_set_amp1_engage);
-static DEVICE_ATTR(band_1_gain, S_IWUSR | S_IRUGO, pod_get_band_1_gain,
-                   pod_set_band_1_gain);
-static DEVICE_ATTR2(band_2_gain__bass, band_2_gain, S_IWUSR | S_IRUGO,
-                    pod_get_band_2_gain__bass, pod_set_band_2_gain__bass);
-static DEVICE_ATTR(band_2_gain, S_IWUSR | S_IRUGO, pod_get_band_2_gain,
-                   pod_set_band_2_gain);
-static DEVICE_ATTR2(band_3_gain__bass, band_3_gain, S_IWUSR | S_IRUGO,
-                    pod_get_band_3_gain__bass, pod_set_band_3_gain__bass);
-static DEVICE_ATTR(band_3_gain, S_IWUSR | S_IRUGO, pod_get_band_3_gain,
-                   pod_set_band_3_gain);
-static DEVICE_ATTR2(band_4_gain__bass, band_4_gain, S_IWUSR | S_IRUGO,
-                    pod_get_band_4_gain__bass, pod_set_band_4_gain__bass);
-static DEVICE_ATTR2(band_5_gain__bass, band_5_gain, S_IWUSR | S_IRUGO,
-                    pod_get_band_5_gain__bass, pod_set_band_5_gain__bass);
-static DEVICE_ATTR(band_4_gain, S_IWUSR | S_IRUGO, pod_get_band_4_gain,
-                   pod_set_band_4_gain);
-static DEVICE_ATTR2(band_6_gain__bass, band_6_gain, S_IWUSR | S_IRUGO,
-                    pod_get_band_6_gain__bass, pod_set_band_6_gain__bass);
-static DEVICE_ATTR(body, S_IRUGO, variax_get_body, line6_nop_write);
-static DEVICE_ATTR(pickup1_enable, S_IRUGO, variax_get_pickup1_enable,
-                   line6_nop_write);
-static DEVICE_ATTR(pickup1_type, S_IRUGO, variax_get_pickup1_type,
-                   line6_nop_write);
-static DEVICE_ATTR(pickup1_position, S_IRUGO, variax_get_pickup1_position,
-                   line6_nop_write);
-static DEVICE_ATTR(pickup1_angle, S_IRUGO, variax_get_pickup1_angle,
-                   line6_nop_write);
-static DEVICE_ATTR(pickup1_level, S_IRUGO, variax_get_pickup1_level,
-                   line6_nop_write);
-static DEVICE_ATTR(pickup2_enable, S_IRUGO, variax_get_pickup2_enable,
-                   line6_nop_write);
-static DEVICE_ATTR(pickup2_type, S_IRUGO, variax_get_pickup2_type,
-                   line6_nop_write);
-static DEVICE_ATTR(pickup2_position, S_IRUGO, variax_get_pickup2_position,
-                   line6_nop_write);
-static DEVICE_ATTR(pickup2_angle, S_IRUGO, variax_get_pickup2_angle,
-                   line6_nop_write);
-static DEVICE_ATTR(pickup2_level, S_IRUGO, variax_get_pickup2_level,
-                   line6_nop_write);
-static DEVICE_ATTR(pickup_phase, S_IRUGO, variax_get_pickup_phase,
-                   line6_nop_write);
-static DEVICE_ATTR(capacitance, S_IRUGO, variax_get_capacitance,
-                   line6_nop_write);
-static DEVICE_ATTR(tone_resistance, S_IRUGO, variax_get_tone_resistance,
-                   line6_nop_write);
-static DEVICE_ATTR(volume_resistance, S_IRUGO, variax_get_volume_resistance,
-                   line6_nop_write);
-static DEVICE_ATTR(taper, S_IRUGO, variax_get_taper, line6_nop_write);
-static DEVICE_ATTR(tone_dump, S_IRUGO, variax_get_tone_dump, line6_nop_write);
-static DEVICE_ATTR(save_tone, S_IRUGO, variax_get_save_tone, line6_nop_write);
-static DEVICE_ATTR(volume_dump, S_IRUGO, variax_get_volume_dump,
-                   line6_nop_write);
-static DEVICE_ATTR(tuning_enable, S_IRUGO, variax_get_tuning_enable,
-                   line6_nop_write);
-static DEVICE_ATTR(tuning6, S_IRUGO, variax_get_tuning6, line6_nop_write);
-static DEVICE_ATTR(tuning5, S_IRUGO, variax_get_tuning5, line6_nop_write);
-static DEVICE_ATTR(tuning4, S_IRUGO, variax_get_tuning4, line6_nop_write);
-static DEVICE_ATTR(tuning3, S_IRUGO, variax_get_tuning3, line6_nop_write);
-static DEVICE_ATTR(tuning2, S_IRUGO, variax_get_tuning2, line6_nop_write);
-static DEVICE_ATTR(tuning1, S_IRUGO, variax_get_tuning1, line6_nop_write);
-static DEVICE_ATTR(detune6, S_IRUGO, variax_get_detune6, line6_nop_write);
-static DEVICE_ATTR(detune5, S_IRUGO, variax_get_detune5, line6_nop_write);
-static DEVICE_ATTR(detune4, S_IRUGO, variax_get_detune4, line6_nop_write);
-static DEVICE_ATTR(detune3, S_IRUGO, variax_get_detune3, line6_nop_write);
-static DEVICE_ATTR(detune2, S_IRUGO, variax_get_detune2, line6_nop_write);
-static DEVICE_ATTR(detune1, S_IRUGO, variax_get_detune1, line6_nop_write);
-static DEVICE_ATTR(mix6, S_IRUGO, variax_get_mix6, line6_nop_write);
-static DEVICE_ATTR(mix5, S_IRUGO, variax_get_mix5, line6_nop_write);
-static DEVICE_ATTR(mix4, S_IRUGO, variax_get_mix4, line6_nop_write);
-static DEVICE_ATTR(mix3, S_IRUGO, variax_get_mix3, line6_nop_write);
-static DEVICE_ATTR(mix2, S_IRUGO, variax_get_mix2, line6_nop_write);
-static DEVICE_ATTR(mix1, S_IRUGO, variax_get_mix1, line6_nop_write);
-static DEVICE_ATTR(pickup_wiring, S_IRUGO, variax_get_pickup_wiring,
-                   line6_nop_write);
-
-int line6_pod_create_files(int firmware, int type, struct device *dev)
-{
-        int err;
-        CHECK_RETURN(device_create_file(dev, &dev_attr_tweak));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_wah_position));
-        if ((type & (LINE6_BITS_PODXTALL)) != 0)
-                CHECK_RETURN(device_create_file
-                             (dev, &dev_attr_compression_gain));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_vol_pedal_position));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_compression_threshold));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_pan));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_amp_model_setup));
-        if (firmware >= 200)
-                CHECK_RETURN(device_create_file(dev, &dev_attr_amp_model));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_drive));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_bass));
-        if ((type & (LINE6_BITS_PODXTALL)) != 0)
-                CHECK_RETURN(device_create_file(dev, &dev_attr_mid));
-        if ((type & (LINE6_BITS_BASSPODXTALL)) != 0)
-                CHECK_RETURN(device_create_file(dev, &dev_attr_lowmid));
-        if ((type & (LINE6_BITS_PODXTALL)) != 0)
-                CHECK_RETURN(device_create_file(dev, &dev_attr_treble));
-        if ((type & (LINE6_BITS_BASSPODXTALL)) != 0)
-                CHECK_RETURN(device_create_file(dev, &dev_attr_highmid));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_chan_vol));
-        if ((type & (LINE6_BITS_PODXTALL)) != 0)
-                CHECK_RETURN(device_create_file(dev, &dev_attr_reverb_mix));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_effect_setup));
-        if (firmware >= 200)
-                CHECK_RETURN(device_create_file
-                             (dev, &dev_attr_band_1_frequency));
-        if ((type & (LINE6_BITS_PODXTALL)) != 0)
-                CHECK_RETURN(device_create_file(dev, &dev_attr_presence));
-        if ((type & (LINE6_BITS_BASSPODXTALL)) != 0)
-                CHECK_RETURN(device_create_file(dev, &dev_attr_treble__bass));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_noise_gate_enable));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_gate_threshold));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_gate_decay_time));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_stomp_enable));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_comp_enable));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_stomp_time));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_delay_enable));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_mod_param_1));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_delay_param_1));
-        CHECK_RETURN(device_create_file
-                     (dev, &dev_attr_delay_param_1_note_value));
-        if ((type & (LINE6_BITS_BASSPODXTALL)) != 0)
-                if (firmware >= 200)
-                        CHECK_RETURN(device_create_file
-                                     (dev, &dev_attr_band_2_frequency__bass));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_delay_param_2));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_delay_volume_mix));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_delay_param_3));
-        if ((type & (LINE6_BITS_PODXTALL)) != 0)
-                CHECK_RETURN(device_create_file(dev, &dev_attr_reverb_enable));
-        if ((type & (LINE6_BITS_PODXTALL)) != 0)
-                CHECK_RETURN(device_create_file(dev, &dev_attr_reverb_type));
-        if ((type & (LINE6_BITS_PODXTALL)) != 0)
-                CHECK_RETURN(device_create_file(dev, &dev_attr_reverb_decay));
-        if ((type & (LINE6_BITS_PODXTALL)) != 0)
-                CHECK_RETURN(device_create_file(dev, &dev_attr_reverb_tone));
-        if ((type & (LINE6_BITS_PODXTALL)) != 0)
-                CHECK_RETURN(device_create_file
-                             (dev, &dev_attr_reverb_pre_delay));
-        if ((type & (LINE6_BITS_PODXTALL)) != 0)
-                CHECK_RETURN(device_create_file
-                             (dev, &dev_attr_reverb_pre_post));
-        if ((type & (LINE6_BITS_PODXTALL)) != 0)
-                if (firmware >= 200)
-                        CHECK_RETURN(device_create_file
-                                     (dev, &dev_attr_band_2_frequency));
-        if ((type & (LINE6_BITS_BASSPODXTALL)) != 0)
-                if (firmware >= 200)
-                        CHECK_RETURN(device_create_file
-                                     (dev, &dev_attr_band_3_frequency__bass));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_wah_enable));
-        if ((type & (LINE6_BITS_BASSPODXTALL)) != 0)
-                CHECK_RETURN(device_create_file
-                             (dev, &dev_attr_modulation_lo_cut));
-        if ((type & (LINE6_BITS_BASSPODXTALL)) != 0)
-                CHECK_RETURN(device_create_file
-                             (dev, &dev_attr_delay_reverb_lo_cut));
-        if ((type & (LINE6_BITS_PODXTALL)) != 0)
-                if (firmware >= 200)
-                        CHECK_RETURN(device_create_file
-                                     (dev, &dev_attr_volume_pedal_minimum));
-        if ((type & (LINE6_BITS_BASSPODXTALL)) != 0)
-                if (firmware >= 200)
-                        CHECK_RETURN(device_create_file
-                                     (dev, &dev_attr_eq_pre_post));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_volume_pre_post));
-        if ((type & (LINE6_BITS_BASSPODXTALL)) != 0)
-                CHECK_RETURN(device_create_file(dev, &dev_attr_di_model));
-        if ((type & (LINE6_BITS_BASSPODXTALL)) != 0)
-                CHECK_RETURN(device_create_file(dev, &dev_attr_di_delay));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_mod_enable));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_mod_param_1_note_value));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_mod_param_2));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_mod_param_3));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_mod_param_4));
-        if ((type & (LINE6_BITS_BASSPODXTALL)) != 0)
-                CHECK_RETURN(device_create_file(dev, &dev_attr_mod_param_5));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_mod_volume_mix));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_mod_pre_post));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_modulation_model));
-        if ((type & (LINE6_BITS_PODXTALL)) != 0)
-                if (firmware >= 200)
-                        CHECK_RETURN(device_create_file
-                                     (dev, &dev_attr_band_3_frequency));
-        if ((type & (LINE6_BITS_BASSPODXTALL)) != 0)
-                if (firmware >= 200)
-                        CHECK_RETURN(device_create_file
-                                     (dev, &dev_attr_band_4_frequency__bass));
-        CHECK_RETURN(device_create_file
-                     (dev, &dev_attr_mod_param_1_double_precision));
-        CHECK_RETURN(device_create_file
-                     (dev, &dev_attr_delay_param_1_double_precision));
-        if (firmware >= 200)
-                CHECK_RETURN(device_create_file(dev, &dev_attr_eq_enable));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_tap));
-        CHECK_RETURN(device_create_file
-                     (dev, &dev_attr_volume_tweak_pedal_assign));
-        if ((type & (LINE6_BITS_BASSPODXTALL)) != 0)
-                if (firmware >= 200)
-                        CHECK_RETURN(device_create_file
-                                     (dev, &dev_attr_band_5_frequency));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_tuner));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_mic_selection));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_cabinet_model));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_stomp_model));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_roomlevel));
-        if ((type & (LINE6_BITS_PODXTALL)) != 0)
-                if (firmware >= 200)
-                        CHECK_RETURN(device_create_file
-                                     (dev, &dev_attr_band_4_frequency));
-        if ((type & (LINE6_BITS_BASSPODXTALL)) != 0)
-                if (firmware >= 200)
-                        CHECK_RETURN(device_create_file
-                                     (dev, &dev_attr_band_6_frequency));
-        CHECK_RETURN(device_create_file
-                     (dev, &dev_attr_stomp_param_1_note_value));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_stomp_param_2));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_stomp_param_3));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_stomp_param_4));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_stomp_param_5));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_stomp_param_6));
-        if ((type & (LINE6_BITS_LIVE)) != 0)
-                CHECK_RETURN(device_create_file
-                             (dev, &dev_attr_amp_switch_select));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_delay_param_4));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_delay_param_5));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_delay_pre_post));
-        if ((type & (LINE6_BITS_PODXTALL)) != 0)
-                CHECK_RETURN(device_create_file(dev, &dev_attr_delay_model));
-        if ((type & (LINE6_BITS_BASSPODXTALL)) != 0)
-                CHECK_RETURN(device_create_file
-                             (dev, &dev_attr_delay_verb_model));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_tempo_msb));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_tempo_lsb));
-        if (firmware >= 300)
-                CHECK_RETURN(device_create_file(dev, &dev_attr_wah_model));
-        if (firmware >= 214)
-                CHECK_RETURN(device_create_file(dev, &dev_attr_bypass_volume));
-        if ((type & (LINE6_BITS_PRO)) != 0)
-                CHECK_RETURN(device_create_file(dev, &dev_attr_fx_loop_on_off));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_tweak_param_select));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_amp1_engage));
-        if (firmware >= 200)
-                CHECK_RETURN(device_create_file(dev, &dev_attr_band_1_gain));
-        if ((type & (LINE6_BITS_BASSPODXTALL)) != 0)
-                if (firmware >= 200)
-                        CHECK_RETURN(device_create_file
-                                     (dev, &dev_attr_band_2_gain__bass));
-        if ((type & (LINE6_BITS_PODXTALL)) != 0)
-                if (firmware >= 200)
-                        CHECK_RETURN(device_create_file
-                                     (dev, &dev_attr_band_2_gain));
-        if ((type & (LINE6_BITS_BASSPODXTALL)) != 0)
-                if (firmware >= 200)
-                        CHECK_RETURN(device_create_file
-                                     (dev, &dev_attr_band_3_gain__bass));
-        if ((type & (LINE6_BITS_PODXTALL)) != 0)
-                if (firmware >= 200)
-                        CHECK_RETURN(device_create_file
-                                     (dev, &dev_attr_band_3_gain));
-        if ((type & (LINE6_BITS_BASSPODXTALL)) != 0)
-                if (firmware >= 200)
-                        CHECK_RETURN(device_create_file
-                                     (dev, &dev_attr_band_4_gain__bass));
-        if ((type & (LINE6_BITS_BASSPODXTALL)) != 0)
-                if (firmware >= 200)
-                        CHECK_RETURN(device_create_file
-                                     (dev, &dev_attr_band_5_gain__bass));
-        if ((type & (LINE6_BITS_PODXTALL)) != 0)
-                if (firmware >= 200)
-                        CHECK_RETURN(device_create_file
-                                     (dev, &dev_attr_band_4_gain));
-        if ((type & (LINE6_BITS_BASSPODXTALL)) != 0)
-                if (firmware >= 200)
-                        CHECK_RETURN(device_create_file
-                                     (dev, &dev_attr_band_6_gain__bass));
-        return 0;
-}
-
-void line6_pod_remove_files(int firmware, int type, struct device *dev)
-{
-        device_remove_file(dev, &dev_attr_tweak);
-        device_remove_file(dev, &dev_attr_wah_position);
-        if ((type & (LINE6_BITS_PODXTALL)) != 0)
-                device_remove_file(dev, &dev_attr_compression_gain);
-        device_remove_file(dev, &dev_attr_vol_pedal_position);
-        device_remove_file(dev, &dev_attr_compression_threshold);
-        device_remove_file(dev, &dev_attr_pan);
-        device_remove_file(dev, &dev_attr_amp_model_setup);
-        if (firmware >= 200)
-                device_remove_file(dev, &dev_attr_amp_model);
-        device_remove_file(dev, &dev_attr_drive);
-        device_remove_file(dev, &dev_attr_bass);
-        if ((type & (LINE6_BITS_PODXTALL)) != 0)
-                device_remove_file(dev, &dev_attr_mid);
-        if ((type & (LINE6_BITS_BASSPODXTALL)) != 0)
-                device_remove_file(dev, &dev_attr_lowmid);
-        if ((type & (LINE6_BITS_PODXTALL)) != 0)
-                device_remove_file(dev, &dev_attr_treble);
-        if ((type & (LINE6_BITS_BASSPODXTALL)) != 0)
-                device_remove_file(dev, &dev_attr_highmid);
-        device_remove_file(dev, &dev_attr_chan_vol);
-        if ((type & (LINE6_BITS_PODXTALL)) != 0)
-                device_remove_file(dev, &dev_attr_reverb_mix);
-        device_remove_file(dev, &dev_attr_effect_setup);
-        if (firmware >= 200)
-                device_remove_file(dev, &dev_attr_band_1_frequency);
-        if ((type & (LINE6_BITS_PODXTALL)) != 0)
-                device_remove_file(dev, &dev_attr_presence);
-        if ((type & (LINE6_BITS_BASSPODXTALL)) != 0)
-                device_remove_file(dev, &dev_attr_treble__bass);
-        device_remove_file(dev, &dev_attr_noise_gate_enable);
-        device_remove_file(dev, &dev_attr_gate_threshold);
-        device_remove_file(dev, &dev_attr_gate_decay_time);
-        device_remove_file(dev, &dev_attr_stomp_enable);
-        device_remove_file(dev, &dev_attr_comp_enable);
-        device_remove_file(dev, &dev_attr_stomp_time);
-        device_remove_file(dev, &dev_attr_delay_enable);
-        device_remove_file(dev, &dev_attr_mod_param_1);
-        device_remove_file(dev, &dev_attr_delay_param_1);
-        device_remove_file(dev, &dev_attr_delay_param_1_note_value);
-        if ((type & (LINE6_BITS_BASSPODXTALL)) != 0)
-                if (firmware >= 200)
-                        device_remove_file(dev,
-                                           &dev_attr_band_2_frequency__bass);
-        device_remove_file(dev, &dev_attr_delay_param_2);
-        device_remove_file(dev, &dev_attr_delay_volume_mix);
-        device_remove_file(dev, &dev_attr_delay_param_3);
-        if ((type & (LINE6_BITS_PODXTALL)) != 0)
-                device_remove_file(dev, &dev_attr_reverb_enable);
-        if ((type & (LINE6_BITS_PODXTALL)) != 0)
-                device_remove_file(dev, &dev_attr_reverb_type);
-        if ((type & (LINE6_BITS_PODXTALL)) != 0)
-                device_remove_file(dev, &dev_attr_reverb_decay);
-        if ((type & (LINE6_BITS_PODXTALL)) != 0)
-                device_remove_file(dev, &dev_attr_reverb_tone);
-        if ((type & (LINE6_BITS_PODXTALL)) != 0)
-                device_remove_file(dev, &dev_attr_reverb_pre_delay);
-        if ((type & (LINE6_BITS_PODXTALL)) != 0)
-                device_remove_file(dev, &dev_attr_reverb_pre_post);
-        if ((type & (LINE6_BITS_PODXTALL)) != 0)
-                if (firmware >= 200)
-                        device_remove_file(dev, &dev_attr_band_2_frequency);
-        if ((type & (LINE6_BITS_BASSPODXTALL)) != 0)
-                if (firmware >= 200)
-                        device_remove_file(dev,
-                                           &dev_attr_band_3_frequency__bass);
-        device_remove_file(dev, &dev_attr_wah_enable);
-        if ((type & (LINE6_BITS_BASSPODXTALL)) != 0)
-                device_remove_file(dev, &dev_attr_modulation_lo_cut);
-        if ((type & (LINE6_BITS_BASSPODXTALL)) != 0)
-                device_remove_file(dev, &dev_attr_delay_reverb_lo_cut);
-        if ((type & (LINE6_BITS_PODXTALL)) != 0)
-                if (firmware >= 200)
-                        device_remove_file(dev, &dev_attr_volume_pedal_minimum);
-        if ((type & (LINE6_BITS_BASSPODXTALL)) != 0)
-                if (firmware >= 200)
-                        device_remove_file(dev, &dev_attr_eq_pre_post);
-        device_remove_file(dev, &dev_attr_volume_pre_post);
-        if ((type & (LINE6_BITS_BASSPODXTALL)) != 0)
-                device_remove_file(dev, &dev_attr_di_model);
-        if ((type & (LINE6_BITS_BASSPODXTALL)) != 0)
-                device_remove_file(dev, &dev_attr_di_delay);
-        device_remove_file(dev, &dev_attr_mod_enable);
-        device_remove_file(dev, &dev_attr_mod_param_1_note_value);
-        device_remove_file(dev, &dev_attr_mod_param_2);
-        device_remove_file(dev, &dev_attr_mod_param_3);
-        device_remove_file(dev, &dev_attr_mod_param_4);
-        if ((type & (LINE6_BITS_BASSPODXTALL)) != 0)
-                device_remove_file(dev, &dev_attr_mod_param_5);
-        device_remove_file(dev, &dev_attr_mod_volume_mix);
-        device_remove_file(dev, &dev_attr_mod_pre_post);
-        device_remove_file(dev, &dev_attr_modulation_model);
-        if ((type & (LINE6_BITS_PODXTALL)) != 0)
-                if (firmware >= 200)
-                        device_remove_file(dev, &dev_attr_band_3_frequency);
-        if ((type & (LINE6_BITS_BASSPODXTALL)) != 0)
-                if (firmware >= 200)
-                        device_remove_file(dev,
-                                           &dev_attr_band_4_frequency__bass);
-        device_remove_file(dev, &dev_attr_mod_param_1_double_precision);
-        device_remove_file(dev, &dev_attr_delay_param_1_double_precision);
-        if (firmware >= 200)
-                device_remove_file(dev, &dev_attr_eq_enable);
-        device_remove_file(dev, &dev_attr_tap);
-        device_remove_file(dev, &dev_attr_volume_tweak_pedal_assign);
-        if ((type & (LINE6_BITS_BASSPODXTALL)) != 0)
-                if (firmware >= 200)
-                        device_remove_file(dev, &dev_attr_band_5_frequency);
-        device_remove_file(dev, &dev_attr_tuner);
-        device_remove_file(dev, &dev_attr_mic_selection);
-        device_remove_file(dev, &dev_attr_cabinet_model);
-        device_remove_file(dev, &dev_attr_stomp_model);
-        device_remove_file(dev, &dev_attr_roomlevel);
-        if ((type & (LINE6_BITS_PODXTALL)) != 0)
-                if (firmware >= 200)
-                        device_remove_file(dev, &dev_attr_band_4_frequency);
-        if ((type & (LINE6_BITS_BASSPODXTALL)) != 0)
-                if (firmware >= 200)
-                        device_remove_file(dev, &dev_attr_band_6_frequency);
-        device_remove_file(dev, &dev_attr_stomp_param_1_note_value);
-        device_remove_file(dev, &dev_attr_stomp_param_2);
-        device_remove_file(dev, &dev_attr_stomp_param_3);
-        device_remove_file(dev, &dev_attr_stomp_param_4);
-        device_remove_file(dev, &dev_attr_stomp_param_5);
-        device_remove_file(dev, &dev_attr_stomp_param_6);
-        if ((type & (LINE6_BITS_LIVE)) != 0)
-                device_remove_file(dev, &dev_attr_amp_switch_select);
-        device_remove_file(dev, &dev_attr_delay_param_4);
-        device_remove_file(dev, &dev_attr_delay_param_5);
-        device_remove_file(dev, &dev_attr_delay_pre_post);
-        if ((type & (LINE6_BITS_PODXTALL)) != 0)
-                device_remove_file(dev, &dev_attr_delay_model);
-        if ((type & (LINE6_BITS_BASSPODXTALL)) != 0)
-                device_remove_file(dev, &dev_attr_delay_verb_model);
-        device_remove_file(dev, &dev_attr_tempo_msb);
-        device_remove_file(dev, &dev_attr_tempo_lsb);
-        if (firmware >= 300)
-                device_remove_file(dev, &dev_attr_wah_model);
-        if (firmware >= 214)
-                device_remove_file(dev, &dev_attr_bypass_volume);
-        if ((type & (LINE6_BITS_PRO)) != 0)
-                device_remove_file(dev, &dev_attr_fx_loop_on_off);
-        device_remove_file(dev, &dev_attr_tweak_param_select);
-        device_remove_file(dev, &dev_attr_amp1_engage);
-        if (firmware >= 200)
-                device_remove_file(dev, &dev_attr_band_1_gain);
-        if ((type & (LINE6_BITS_BASSPODXTALL)) != 0)
-                if (firmware >= 200)
-                        device_remove_file(dev, &dev_attr_band_2_gain__bass);
-        if ((type & (LINE6_BITS_PODXTALL)) != 0)
-                if (firmware >= 200)
-                        device_remove_file(dev, &dev_attr_band_2_gain);
-        if ((type & (LINE6_BITS_BASSPODXTALL)) != 0)
-                if (firmware >= 200)
-                        device_remove_file(dev, &dev_attr_band_3_gain__bass);
-        if ((type & (LINE6_BITS_PODXTALL)) != 0)
-                if (firmware >= 200)
-                        device_remove_file(dev, &dev_attr_band_3_gain);
-        if ((type & (LINE6_BITS_BASSPODXTALL)) != 0)
-                if (firmware >= 200)
-                        device_remove_file(dev, &dev_attr_band_4_gain__bass);
-        if ((type & (LINE6_BITS_BASSPODXTALL)) != 0)
-                if (firmware >= 200)
-                        device_remove_file(dev, &dev_attr_band_5_gain__bass);
-        if ((type & (LINE6_BITS_PODXTALL)) != 0)
-                if (firmware >= 200)
-                        device_remove_file(dev, &dev_attr_band_4_gain);
-        if ((type & (LINE6_BITS_BASSPODXTALL)) != 0)
-                if (firmware >= 200)
-                        device_remove_file(dev, &dev_attr_band_6_gain__bass);
-}
-
-int line6_variax_create_files(int firmware, int type, struct device *dev)
-{
-        int err;
-        CHECK_RETURN(device_create_file(dev, &dev_attr_body));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_pickup1_enable));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_pickup1_type));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_pickup1_position));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_pickup1_angle));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_pickup1_level));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_pickup2_enable));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_pickup2_type));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_pickup2_position));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_pickup2_angle));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_pickup2_level));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_pickup_phase));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_capacitance));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_tone_resistance));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_volume_resistance));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_taper));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_tone_dump));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_save_tone));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_volume_dump));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_tuning_enable));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_tuning6));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_tuning5));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_tuning4));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_tuning3));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_tuning2));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_tuning1));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_detune6));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_detune5));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_detune4));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_detune3));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_detune2));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_detune1));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_mix6));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_mix5));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_mix4));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_mix3));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_mix2));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_mix1));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_pickup_wiring));
-        return 0;
-}
-
-void line6_variax_remove_files(int firmware, int type, struct device *dev)
-{
-        device_remove_file(dev, &dev_attr_body);
-        device_remove_file(dev, &dev_attr_pickup1_enable);
-        device_remove_file(dev, &dev_attr_pickup1_type);
-        device_remove_file(dev, &dev_attr_pickup1_position);
-        device_remove_file(dev, &dev_attr_pickup1_angle);
-        device_remove_file(dev, &dev_attr_pickup1_level);
-        device_remove_file(dev, &dev_attr_pickup2_enable);
-        device_remove_file(dev, &dev_attr_pickup2_type);
-        device_remove_file(dev, &dev_attr_pickup2_position);
-        device_remove_file(dev, &dev_attr_pickup2_angle);
-        device_remove_file(dev, &dev_attr_pickup2_level);
-        device_remove_file(dev, &dev_attr_pickup_phase);
-        device_remove_file(dev, &dev_attr_capacitance);
-        device_remove_file(dev, &dev_attr_tone_resistance);
-        device_remove_file(dev, &dev_attr_volume_resistance);
-        device_remove_file(dev, &dev_attr_taper);
-        device_remove_file(dev, &dev_attr_tone_dump);
-        device_remove_file(dev, &dev_attr_save_tone);
-        device_remove_file(dev, &dev_attr_volume_dump);
-        device_remove_file(dev, &dev_attr_tuning_enable);
-        device_remove_file(dev, &dev_attr_tuning6);
-        device_remove_file(dev, &dev_attr_tuning5);
-        device_remove_file(dev, &dev_attr_tuning4);
-        device_remove_file(dev, &dev_attr_tuning3);
-        device_remove_file(dev, &dev_attr_tuning2);
-        device_remove_file(dev, &dev_attr_tuning1);
-        device_remove_file(dev, &dev_attr_detune6);
-        device_remove_file(dev, &dev_attr_detune5);
-        device_remove_file(dev, &dev_attr_detune4);
-        device_remove_file(dev, &dev_attr_detune3);
-        device_remove_file(dev, &dev_attr_detune2);
-        device_remove_file(dev, &dev_attr_detune1);
-        device_remove_file(dev, &dev_attr_mix6);
-        device_remove_file(dev, &dev_attr_mix5);
-        device_remove_file(dev, &dev_attr_mix4);
-        device_remove_file(dev, &dev_attr_mix3);
-        device_remove_file(dev, &dev_attr_mix2);
-        device_remove_file(dev, &dev_attr_mix1);
-        device_remove_file(dev, &dev_attr_pickup_wiring);
-}
diff --git a/drivers/staging/line6/control.h b/drivers/staging/line6/control.h
deleted file mode 100644
index e4c5d2ce2aae..000000000000
--- a/drivers/staging/line6/control.h
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
- * Line6 Linux USB driver - 0.9.1beta
- *
- * Copyright (C) 2004-2010 Markus Grabner (grabner@icg.tugraz.at)
- *
- *      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.
- *
- */
-
-#ifndef LINE6_CONTROL_H
-#define LINE6_CONTROL_H
-
-/**
-   List of PODxt Pro controls.
-   See Appendix C of the "PODxt (Pro) Pilot's Handbook" by Line6.
-   Comments after the number refer to the PODxt Pro firmware version required
-   for this feature.
-
-   Please *don't* reformat this file since "control.c" is created automatically
-   from "control.h", and this process depends on the exact formatting of the
-   code and the comments below!
-*/
-
-/* *INDENT-OFF* */
-
-enum {
-        POD_tweak                          =   1,
-        POD_wah_position                   =   4,
-        POD_compression_gain               =   5,  /* device: LINE6_BITS_PODXTALL */
-        POD_vol_pedal_position             =   7,
-        POD_compression_threshold          =   9,
-        POD_pan                            =  10,
-        POD_amp_model_setup                =  11,
-        POD_amp_model                      =  12,  /* firmware: 2.0 */
-        POD_drive                          =  13,
-        POD_bass                           =  14,
-        POD_mid                            =  15,  /* device: LINE6_BITS_PODXTALL */
-        POD_lowmid                         =  15,  /* device: LINE6_BITS_BASSPODXTALL */
-        POD_treble                         =  16,  /* device: LINE6_BITS_PODXTALL */
-        POD_highmid                        =  16,  /* device: LINE6_BITS_BASSPODXTALL */
-        POD_chan_vol                       =  17,
-        POD_reverb_mix                     =  18,  /* device: LINE6_BITS_PODXTALL */
-        POD_effect_setup                   =  19,
-        POD_band_1_frequency               =  20,  /* firmware: 2.0 */
-        POD_presence                       =  21,  /* device: LINE6_BITS_PODXTALL */
-        POD_treble__bass                   =  21,  /* device: LINE6_BITS_BASSPODXTALL */
-        POD_noise_gate_enable              =  22,
-        POD_gate_threshold                 =  23,
-        POD_gate_decay_time                =  24,
-        POD_stomp_enable                   =  25,
-        POD_comp_enable                    =  26,
-        POD_stomp_time                     =  27,
-        POD_delay_enable                   =  28,
-        POD_mod_param_1                    =  29,
-        POD_delay_param_1                  =  30,
-        POD_delay_param_1_note_value       =  31,
-        POD_band_2_frequency__bass         =  32,  /* device: LINE6_BITS_BASSPODXTALL */ /* firmware: 2.0 */
-        POD_delay_param_2                  =  33,
-        POD_delay_volume_mix               =  34,
-        POD_delay_param_3                  =  35,
-        POD_reverb_enable                  =  36,  /* device: LINE6_BITS_PODXTALL */
-        POD_reverb_type                    =  37,  /* device: LINE6_BITS_PODXTALL */
-        POD_reverb_decay                   =  38,  /* device: LINE6_BITS_PODXTALL */
-        POD_reverb_tone                    =  39,  /* device: LINE6_BITS_PODXTALL */
-        POD_reverb_pre_delay               =  40,  /* device: LINE6_BITS_PODXTALL */
-        POD_reverb_pre_post                =  41,  /* device: LINE6_BITS_PODXTALL */
-        POD_band_2_frequency               =  42,  /* device: LINE6_BITS_PODXTALL */     /* firmware: 2.0 */
-        POD_band_3_frequency__bass         =  42,  /* device: LINE6_BITS_BASSPODXTALL */ /* firmware: 2.0 */
-        POD_wah_enable                     =  43,
-        POD_modulation_lo_cut              =  44,  /* device: LINE6_BITS_BASSPODXTALL */
-        POD_delay_reverb_lo_cut            =  45,  /* device: LINE6_BITS_BASSPODXTALL */
-        POD_volume_pedal_minimum           =  46,  /* device: LINE6_BITS_PODXTALL */     /* firmware: 2.0 */
-        POD_eq_pre_post                    =  46,  /* device: LINE6_BITS_BASSPODXTALL */ /* firmware: 2.0 */
-        POD_volume_pre_post                =  47,
-        POD_di_model                       =  48,  /* device: LINE6_BITS_BASSPODXTALL */
-        POD_di_delay                       =  49,  /* device: LINE6_BITS_BASSPODXTALL */
-        POD_mod_enable                     =  50,
-        POD_mod_param_1_note_value         =  51,
-        POD_mod_param_2                    =  52,
-        POD_mod_param_3                    =  53,
-        POD_mod_param_4                    =  54,
-        POD_mod_param_5                    =  55,  /* device: LINE6_BITS_BASSPODXTALL */
-        POD_mod_volume_mix                 =  56,
-        POD_mod_pre_post                   =  57,
-        POD_modulation_model               =  58,
-        POD_band_3_frequency               =  60,  /* device: LINE6_BITS_PODXTALL */     /* firmware: 2.0 */
-        POD_band_4_frequency__bass         =  60,  /* device: LINE6_BITS_BASSPODXTALL */ /* firmware: 2.0 */
-        POD_mod_param_1_double_precision   =  61,
-        POD_delay_param_1_double_precision =  62,
-        POD_eq_enable                      =  63,  /* firmware: 2.0 */
-        POD_tap                            =  64,
-        POD_volume_tweak_pedal_assign      =  65,
-        POD_band_5_frequency               =  68,  /* device: LINE6_BITS_BASSPODXTALL */ /* firmware: 2.0 */
-        POD_tuner                          =  69,
-        POD_mic_selection                  =  70,
-        POD_cabinet_model                  =  71,
-        POD_stomp_model                    =  75,
-        POD_roomlevel                      =  76,
-        POD_band_4_frequency               =  77,  /* device: LINE6_BITS_PODXTALL */     /* firmware: 2.0 */
-        POD_band_6_frequency               =  77,  /* device: LINE6_BITS_BASSPODXTALL */ /* firmware: 2.0 */
-        POD_stomp_param_1_note_value       =  78,
-        POD_stomp_param_2                  =  79,
-        POD_stomp_param_3                  =  80,
-        POD_stomp_param_4                  =  81,
-        POD_stomp_param_5                  =  82,
-        POD_stomp_param_6                  =  83,
-        POD_amp_switch_select              =  84,  /* device: LINE6_BITS_LIVE */
-        POD_delay_param_4                  =  85,
-        POD_delay_param_5                  =  86,
-        POD_delay_pre_post                 =  87,
-        POD_delay_model                    =  88,  /* device: LINE6_BITS_PODXTALL */
-        POD_delay_verb_model               =  88,  /* device: LINE6_BITS_BASSPODXTALL */
-        POD_tempo_msb                      =  89,
-        POD_tempo_lsb                      =  90,
-        POD_wah_model                      =  91,  /* firmware: 3.0 */
-        POD_bypass_volume                  = 105,  /* firmware: 2.14 */
-        POD_fx_loop_on_off                 = 107,  /* device: LINE6_BITS_PRO */
-        POD_tweak_param_select             = 108,
-        POD_amp1_engage                    = 111,
-        POD_band_1_gain                    = 114,  /* firmware: 2.0 */
-        POD_band_2_gain__bass              = 115,  /* device: LINE6_BITS_BASSPODXTALL */ /* firmware: 2.0 */
-        POD_band_2_gain                    = 116,  /* device: LINE6_BITS_PODXTALL */     /* firmware: 2.0 */
-        POD_band_3_gain__bass              = 116,  /* device: LINE6_BITS_BASSPODXTALL */ /* firmware: 2.0 */
-        POD_band_3_gain                    = 117,  /* device: LINE6_BITS_PODXTALL */     /* firmware: 2.0 */
-        POD_band_4_gain__bass              = 117,  /* device: LINE6_BITS_BASSPODXTALL */ /* firmware: 2.0 */
-        POD_band_5_gain__bass              = 118,  /* device: LINE6_BITS_BASSPODXTALL */ /* firmware: 2.0 */
-        POD_band_4_gain                    = 119,  /* device: LINE6_BITS_PODXTALL */     /* firmware: 2.0 */
-        POD_band_6_gain__bass              = 119   /* device: LINE6_BITS_BASSPODXTALL */ /* firmware: 2.0 */
-};
-
-/**
-   List of Variax workbench controls (dump).
-*/
-enum {
-        VARIAX_body                        =   3,
-        VARIAX_pickup1_enable              =   4,  /* 0: enabled, 1: disabled */
-        VARIAX_pickup1_type                =   8,
-        VARIAX_pickup1_position            =   9,  /* type: 24 bit float */
-        VARIAX_pickup1_angle               =  12,  /* type: 24 bit float */
-        VARIAX_pickup1_level               =  15,  /* type: 24 bit float */
-        VARIAX_pickup2_enable              =  18,  /* 0: enabled, 1: disabled */
-        VARIAX_pickup2_type                =  22,
-        VARIAX_pickup2_position            =  23,  /* type: 24 bit float */
-        VARIAX_pickup2_angle               =  26,  /* type: 24 bit float */
-        VARIAX_pickup2_level               =  29,  /* type: 24 bit float */
-        VARIAX_pickup_phase                =  32,  /* 0: in phase, 1: out of phase */
-        VARIAX_capacitance                 =  33,  /* type: 24 bit float */
-        VARIAX_tone_resistance             =  36,  /* type: 24 bit float */
-        VARIAX_volume_resistance           =  39,  /* type: 24 bit float */
-        VARIAX_taper                       =  42,  /* 0: Linear, 1: Audio */
-        VARIAX_tone_dump                   =  43,  /* type: 24 bit float */
-        VARIAX_save_tone                   =  46,
-        VARIAX_volume_dump                 =  47,  /* type: 24 bit float */
-        VARIAX_tuning_enable               =  50,
-        VARIAX_tuning6                     =  51,
-        VARIAX_tuning5                     =  52,
-        VARIAX_tuning4                     =  53,
-        VARIAX_tuning3                     =  54,
-        VARIAX_tuning2                     =  55,
-        VARIAX_tuning1                     =  56,
-        VARIAX_detune6                     =  57,  /* type: 24 bit float */
-        VARIAX_detune5                     =  60,  /* type: 24 bit float */
-        VARIAX_detune4                     =  63,  /* type: 24 bit float */
-        VARIAX_detune3                     =  66,  /* type: 24 bit float */
-        VARIAX_detune2                     =  69,  /* type: 24 bit float */
-        VARIAX_detune1                     =  72,  /* type: 24 bit float */
-        VARIAX_mix6                        =  75,  /* type: 24 bit float */
-        VARIAX_mix5                        =  78,  /* type: 24 bit float */
-        VARIAX_mix4                        =  81,  /* type: 24 bit float */
-        VARIAX_mix3                        =  84,  /* type: 24 bit float */
-        VARIAX_mix2                        =  87,  /* type: 24 bit float */
-        VARIAX_mix1                        =  90,  /* type: 24 bit float */
-        VARIAX_pickup_wiring               =  96   /* 0: parallel, 1: series */
-};
-
-/**
-   List of Variax workbench controls (MIDI).
-*/
-enum {
-        VARIAXMIDI_volume                  =   7,
-        VARIAXMIDI_tone                    =  79,
-};
-
-/* *INDENT-ON* */
-
-extern int line6_pod_create_files(int firmware, int type, struct device *dev);
-extern void line6_pod_remove_files(int firmware, int type, struct device *dev);
-extern int line6_variax_create_files(int firmware, int type,
-                                     struct device *dev);
-extern void line6_variax_remove_files(int firmware, int type,
-                                      struct device *dev);
-
-#endif
diff --git a/drivers/staging/line6/driver.c b/drivers/staging/line6/driver.c
index b8358ca71bdd..1e4ce50069a9 100644
--- a/drivers/staging/line6/driver.c
+++ b/drivers/staging/line6/driver.c
@@ -16,7 +16,6 @@
 
 #include "audio.h"
 #include "capture.h"
-#include "control.h"
 #include "driver.h"
 #include "midi.h"
 #include "playback.h"
@@ -96,8 +95,6 @@ static const char line6_request_version[] = {
         0xf0, 0x7e, 0x7f, 0x06, 0x01, 0xf7
 };
 
-struct usb_line6 *line6_devices[LINE6_MAX_DEVICES];
-
 /**
          Class for asynchronous messages.
 */
@@ -179,22 +176,6 @@ void line6_write_hexdump(struct usb_line6 *line6, char dir,
 }
 #endif
 
-#ifdef CONFIG_LINE6_USB_DUMP_CTRL
-/*
-        Dump URB data to syslog.
-*/
-static void line6_dump_urb(struct urb *urb)
-{
-        struct usb_line6 *line6 = (struct usb_line6 *)urb->context;
-
-        if (urb->status < 0)
-                return;
-
-        line6_write_hexdump(line6, 'R', (unsigned char *)urb->transfer_buffer,
-                            urb->actual_length);
-}
-#endif
-
 /*
         Send raw message in pieces of wMaxPacketSize bytes.
 */
@@ -203,10 +184,6 @@ int line6_send_raw_message(struct usb_line6 *line6, const char *buffer,
 {
         int i, done = 0;
 
-#ifdef CONFIG_LINE6_USB_DUMP_CTRL
-        line6_write_hexdump(line6, 'S', buffer, size);
-#endif
-
         for (i = 0; i < size; i += line6->max_packet_size) {
                 int partial;
                 const char *frag_buf = buffer + i;
@@ -261,10 +238,6 @@ static int line6_send_raw_message_async_part(struct message *msg,
                          (char *)msg->buffer + done, bytes,
                          line6_async_request_sent, msg, line6->interval);
 
-#ifdef CONFIG_LINE6_USB_DUMP_CTRL
-        line6_write_hexdump(line6, 'S', (char *)msg->buffer + done, bytes);
-#endif
-
         msg->done += bytes;
         retval = usb_submit_urb(urb, GFP_ATOMIC);
 
@@ -405,19 +378,13 @@ static void line6_data_received(struct urb *urb)
         if (urb->status == -ESHUTDOWN)
                 return;
 
-#ifdef CONFIG_LINE6_USB_DUMP_CTRL
-        line6_dump_urb(urb);
-#endif
-
         done =
             line6_midibuf_write(mb, urb->transfer_buffer, urb->actual_length);
 
         if (done < urb->actual_length) {
                 line6_midibuf_ignore(mb, done);
-                DEBUG_MESSAGES(dev_err
-                               (line6->ifcdev,
-                                "%d %d buffer overflow - message skipped\n",
-                                done, urb->actual_length));
+                dev_dbg(line6->ifcdev, "%d %d buffer overflow - message skipped\n",
+                        done, urb->actual_length);
         }
 
         for (;;) {
@@ -428,15 +395,7 @@ static void line6_data_received(struct urb *urb)
                 if (done == 0)
                         break;
 
-                /* MIDI input filter */
-                if (line6_midibuf_skip_message
-                    (mb, line6->line6midi->midi_mask_receive))
-                        continue;
-
                 line6->message_length = done;
-#ifdef CONFIG_LINE6_USB_DUMP_MIDI
-                line6_write_hexdump(line6, 'r', line6->buffer_message, done);
-#endif
                 line6_midi_receive(line6, line6->buffer_message, done);
 
                 switch (line6->usbdev->descriptor.idProduct) {
@@ -506,10 +465,6 @@ int line6_send_program(struct usb_line6 *line6, u8 value)
         buffer[0] = LINE6_PROGRAM_CHANGE | LINE6_CHANNEL_HOST;
         buffer[1] = value;
 
-#ifdef CONFIG_LINE6_USB_DUMP_CTRL
-        line6_write_hexdump(line6, 'S', buffer, 2);
-#endif
-
         retval = usb_interrupt_msg(line6->usbdev,
                                    usb_sndintpipe(line6->usbdev,
                                                   line6->ep_control_write),
@@ -543,10 +498,6 @@ int line6_transmit_parameter(struct usb_line6 *line6, int param, u8 value)
         buffer[1] = param;
         buffer[2] = value;
 
-#ifdef CONFIG_LINE6_USB_DUMP_CTRL
-        line6_write_hexdump(line6, 'S', buffer, 3);
-#endif
-
         retval = usb_interrupt_msg(line6->usbdev,
                                    usb_sndintpipe(line6->usbdev,
                                                   line6->ep_control_write),
@@ -690,20 +641,6 @@ ssize_t line6_nop_write(struct device *dev, struct device_attribute *attr,
 }
 
 /*
-        "write" request on "raw" special file.
-*/
-#ifdef CONFIG_LINE6_USB_RAW
-ssize_t line6_set_raw(struct device *dev, struct device_attribute *attr,
-                      const char *buf, size_t count)
-{
-        struct usb_interface *interface = to_usb_interface(dev);
-        struct usb_line6 *line6 = usb_get_intfdata(interface);
-        line6_send_raw_message(line6, buf, count);
-        return count;
-}
-#endif
-
-/*
         Generic destructor.
 */
 static void line6_destruct(struct usb_interface *interface)
@@ -740,7 +677,6 @@ static int line6_probe(struct usb_interface *interface,
         struct usb_device *usbdev;
         struct usb_line6 *line6;
         const struct line6_properties *properties;
-        int devnum;
         int interface_number, alternate = 0;
         int product;
         int size = 0;
@@ -774,16 +710,6 @@ static int line6_probe(struct usb_interface *interface,
                 goto err_put;
         }
 
-        /* find free slot in device table: */
-        for (devnum = 0; devnum < LINE6_MAX_DEVICES; ++devnum)
-                if (line6_devices[devnum] == NULL)
-                        break;
-
-        if (devnum == LINE6_MAX_DEVICES) {
-                ret = -ENODEV;
-                goto err_put;
-        }
-
         /* initialize device info: */
         properties = &line6_properties_table[devtype];
         dev_info(&interface->dev, "Line6 %s found\n", properties->name);
@@ -1112,7 +1038,6 @@ static int line6_probe(struct usb_interface *interface,
 
         dev_info(&interface->dev, "Line6 %s now attached\n",
                  line6->properties->name);
-        line6_devices[devnum] = line6;
 
         switch (product) {
         case LINE6_DEVID_PODX3:
@@ -1141,7 +1066,7 @@ static void line6_disconnect(struct usb_interface *interface)
 {
         struct usb_line6 *line6;
         struct usb_device *usbdev;
-        int interface_number, i;
+        int interface_number;
 
         if (interface == NULL)
                 return;
@@ -1214,10 +1139,6 @@ static void line6_disconnect(struct usb_interface *interface)
 
                 dev_info(&interface->dev, "Line6 %s now disconnected\n",
                          line6->properties->name);
-
-                for (i = LINE6_MAX_DEVICES; i--;)
-                        if (line6_devices[i] == line6)
-                                line6_devices[i] = NULL;
         }
 
         line6_destruct(interface);
diff --git a/drivers/staging/line6/driver.h b/drivers/staging/line6/driver.h
index a3029eb223d6..f0be5a2adaba 100644
--- a/drivers/staging/line6/driver.h
+++ b/drivers/staging/line6/driver.h
@@ -20,12 +20,11 @@
 
 #define DRIVER_NAME "line6usb"
 
-#if defined(CONFIG_LINE6_USB_DUMP_CTRL) || defined(CONFIG_LINE6_USB_DUMP_MIDI) || defined(CONFIG_LINE6_USB_DUMP_PCM)
+#if defined(CONFIG_LINE6_USB_DUMP_PCM)
 #define CONFIG_LINE6_USB_DUMP_ANY
 #endif
 
 #define LINE6_TIMEOUT 1
-#define LINE6_MAX_DEVICES 8
 #define LINE6_BUFSIZE_LISTEN 32
 #define LINE6_MESSAGE_MAXLEN 256
 
@@ -53,12 +52,6 @@
 
 #define LINE6_CHANNEL_MASK 0x0f
 
-#ifdef CONFIG_LINE6_USB_DEBUG
-#define DEBUG_MESSAGES(x) (x)
-#else
-#define DEBUG_MESSAGES(x)
-#endif
-
 #define MISSING_CASE    \
         printk(KERN_ERR "line6usb driver bug: missing case in %s:%d\n", \
                 __FILE__, __LINE__)
@@ -78,7 +71,6 @@ do {					\
 } while (0)
 
 extern const unsigned char line6_midi_id[3];
-extern struct usb_line6 *line6_devices[LINE6_MAX_DEVICES];
 
 static const int SYSEX_DATA_OFS = sizeof(line6_midi_id) + 3;
 static const int SYSEX_EXTRA_SIZE = sizeof(line6_midi_id) + 4;
diff --git a/drivers/staging/line6/dumprequest.c b/drivers/staging/line6/dumprequest.c
deleted file mode 100644
index 60c7bae3ad3c..000000000000
--- a/drivers/staging/line6/dumprequest.c
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Line6 Linux USB driver - 0.9.1beta
- *
- * Copyright (C) 2004-2010 Markus Grabner (grabner@icg.tugraz.at)
- *
- *      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.
- *
- */
-
-#include <linux/slab.h>
-
-#include "driver.h"
-#include "dumprequest.h"
-
-/*
-        Set "dump in progress" flag.
-*/
-void line6_dump_started(struct line6_dump_request *l6dr, int dest)
-{
-        l6dr->in_progress = dest;
-}
-
-/*
-        Invalidate current channel, i.e., set "dump in progress" flag.
-        Reading from the "dump" special file blocks until dump is completed.
-*/
-void line6_invalidate_current(struct line6_dump_request *l6dr)
-{
-        line6_dump_started(l6dr, LINE6_DUMP_CURRENT);
-}
-
-/*
-        Clear "dump in progress" flag and notify waiting processes.
-*/
-void line6_dump_finished(struct line6_dump_request *l6dr)
-{
-        l6dr->in_progress = LINE6_DUMP_NONE;
-        wake_up(&l6dr->wait);
-}
-
-/*
-        Send an asynchronous channel dump request.
-*/
-int line6_dump_request_async(struct line6_dump_request *l6dr,
-                             struct usb_line6 *line6, int num, int dest)
-{
-        int ret;
-        line6_dump_started(l6dr, dest);
-        ret = line6_send_raw_message_async(line6, l6dr->reqbufs[num].buffer,
-                                           l6dr->reqbufs[num].length);
-
-        if (ret < 0)
-                line6_dump_finished(l6dr);
-
-        return ret;
-}
-
-/*
-        Wait for completion (interruptible).
-*/
-int line6_dump_wait_interruptible(struct line6_dump_request *l6dr)
-{
-        return wait_event_interruptible(l6dr->wait,
-                                        l6dr->in_progress == LINE6_DUMP_NONE);
-}
-
-/*
-        Wait for completion.
-*/
-void line6_dump_wait(struct line6_dump_request *l6dr)
-{
-        wait_event(l6dr->wait, l6dr->in_progress == LINE6_DUMP_NONE);
-}
-
-/*
-        Wait for completion (with timeout).
-*/
-int line6_dump_wait_timeout(struct line6_dump_request *l6dr, long timeout)
-{
-        return wait_event_timeout(l6dr->wait,
-                                  l6dr->in_progress == LINE6_DUMP_NONE,
-                                  timeout);
-}
-
-/*
-        Initialize dump request buffer.
-*/
-int line6_dumpreq_initbuf(struct line6_dump_request *l6dr, const void *buf,
-                          size_t len, int num)
-{
-        l6dr->reqbufs[num].buffer = kmemdup(buf, len, GFP_KERNEL);
-        if (l6dr->reqbufs[num].buffer == NULL)
-                return -ENOMEM;
-        l6dr->reqbufs[num].length = len;
-        return 0;
-}
-
-/*
-        Initialize dump request data structure (including one buffer).
-*/
-int line6_dumpreq_init(struct line6_dump_request *l6dr, const void *buf,
-                       size_t len)
-{
-        int ret;
-        ret = line6_dumpreq_initbuf(l6dr, buf, len, 0);
-        if (ret < 0)
-                return ret;
-        init_waitqueue_head(&l6dr->wait);
-        return 0;
-}
-
-/*
-        Destruct dump request data structure.
-*/
-void line6_dumpreq_destructbuf(struct line6_dump_request *l6dr, int num)
-{
-        if (l6dr == NULL)
-                return;
-        if (l6dr->reqbufs[num].buffer == NULL)
-                return;
-        kfree(l6dr->reqbufs[num].buffer);
-        l6dr->reqbufs[num].buffer = NULL;
-}
-
-/*
-        Destruct dump request data structure.
-*/
-void line6_dumpreq_destruct(struct line6_dump_request *l6dr)
-{
-        if (l6dr->reqbufs[0].buffer == NULL)
-                return;
-        line6_dumpreq_destructbuf(l6dr, 0);
-}
diff --git a/drivers/staging/line6/dumprequest.h b/drivers/staging/line6/dumprequest.h
deleted file mode 100644
index c17a262fad2e..000000000000
--- a/drivers/staging/line6/dumprequest.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Line6 Linux USB driver - 0.9.1beta
- *
- * Copyright (C) 2004-2010 Markus Grabner (grabner@icg.tugraz.at)
- *
- *      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.
- *
- */
-
-#ifndef DUMPREQUEST_H
-#define DUMPREQUEST_H
-
-#include <linux/usb.h>
-#include <linux/wait.h>
-#include <sound/core.h>
-
-enum {
-        LINE6_DUMP_NONE,
-        LINE6_DUMP_CURRENT
-};
-
-struct line6_dump_reqbuf {
-        /**
-                 Buffer for dump requests.
-        */
-        unsigned char *buffer;
-
-        /**
-                 Size of dump request.
-        */
-        size_t length;
-};
-
-/**
-         Provides the functionality to request channel/model/... dump data from a
-         Line6 device.
-*/
-struct line6_dump_request {
-        /**
-                 Wait queue for access to program dump data.
-        */
-        wait_queue_head_t wait;
-
-        /**
-                 Indicates an unfinished program dump request.
-                 0: no dump
-                 1: dump current settings
-                 Other device-specific values are also allowed.
-        */
-        int in_progress;
-
-        /**
-                 Dump request buffers
-        */
-        struct line6_dump_reqbuf reqbufs[1];
-};
-
-extern void line6_dump_finished(struct line6_dump_request *l6dr);
-extern int line6_dump_request_async(struct line6_dump_request *l6dr,
-                                    struct usb_line6 *line6, int num, int dest);
-extern void line6_dump_started(struct line6_dump_request *l6dr, int dest);
-extern void line6_dumpreq_destruct(struct line6_dump_request *l6dr);
-extern void line6_dumpreq_destructbuf(struct line6_dump_request *l6dr, int num);
-extern int line6_dumpreq_init(struct line6_dump_request *l6dr, const void *buf,
-                              size_t len);
-extern int line6_dumpreq_initbuf(struct line6_dump_request *l6dr,
-                                 const void *buf, size_t len, int num);
-extern void line6_invalidate_current(struct line6_dump_request *l6dr);
-extern void line6_dump_wait(struct line6_dump_request *l6dr);
-extern int line6_dump_wait_interruptible(struct line6_dump_request *l6dr);
-extern int line6_dump_wait_timeout(struct line6_dump_request *l6dr,
-                                   long timeout);
-
-#endif
diff --git a/drivers/staging/line6/midi.c b/drivers/staging/line6/midi.c
index 50407294fbd4..6982eca661bd 100644
--- a/drivers/staging/line6/midi.c
+++ b/drivers/staging/line6/midi.c
@@ -59,9 +59,6 @@ static void line6_midi_transmit(struct snd_rawmidi_substream *substream)
                 if (done == 0)
                         break;
 
-#ifdef CONFIG_LINE6_USB_DUMP_MIDI
-                line6_write_hexdump(line6, 's', chunk, done);
-#endif
                 line6_midibuf_write(mb, chunk, done);
                 snd_rawmidi_transmit_ack(substream, done);
         }
@@ -72,10 +69,6 @@ static void line6_midi_transmit(struct snd_rawmidi_substream *substream)
                 if (done == 0)
                         break;
 
-                if (line6_midibuf_skip_message
-                    (mb, line6midi->midi_mask_transmit))
-                        continue;
-
                 send_midi_async(line6, chunk, done);
         }
 
@@ -131,9 +124,6 @@ static int send_midi_async(struct usb_line6 *line6, unsigned char *data,
                 dev_err(line6->ifcdev, "Out of memory\n");
                 return -ENOMEM;
         }
-#ifdef CONFIG_LINE6_USB_DUMP_CTRL
-        line6_write_hexdump(line6, 'S', data, length);
-#endif
 
         transfer_buffer = kmemdup(data, length, GFP_ATOMIC);
 
@@ -158,28 +148,6 @@ static int send_midi_async(struct usb_line6 *line6, unsigned char *data,
         }
 
         ++line6->line6midi->num_active_send_urbs;
-
-        switch (line6->usbdev->descriptor.idProduct) {
-        case LINE6_DEVID_BASSPODXT:
-        case LINE6_DEVID_BASSPODXTLIVE:
-        case LINE6_DEVID_BASSPODXTPRO:
-        case LINE6_DEVID_PODXT:
-        case LINE6_DEVID_PODXTLIVE:
-        case LINE6_DEVID_PODXTPRO:
-        case LINE6_DEVID_POCKETPOD:
-                line6_pod_midi_postprocess((struct usb_line6_pod *)line6, data,
-                                           length);
-                break;
-
-        case LINE6_DEVID_VARIAX:
-        case LINE6_DEVID_PODHD300:
-        case LINE6_DEVID_PODHD500:
-                break;
-
-        default:
-                MISSING_CASE;
-        }
-
         return 0;
 }
 
@@ -287,83 +255,10 @@ static int snd_line6_new_midi(struct snd_line6_midi *line6midi)
         return 0;
 }
 
-/*
-        "read" request on "midi_mask_transmit" special file.
-*/
-static ssize_t midi_get_midi_mask_transmit(struct device *dev,
-                                           struct device_attribute *attr,
-                                           char *buf)
-{
-        struct usb_interface *interface = to_usb_interface(dev);
-        struct usb_line6 *line6 = usb_get_intfdata(interface);
-        return sprintf(buf, "%d\n", line6->line6midi->midi_mask_transmit);
-}
-
-/*
-        "write" request on "midi_mask" special file.
-*/
-static ssize_t midi_set_midi_mask_transmit(struct device *dev,
-                                           struct device_attribute *attr,
-                                           const char *buf, size_t count)
-{
-        struct usb_interface *interface = to_usb_interface(dev);
-        struct usb_line6 *line6 = usb_get_intfdata(interface);
-        unsigned short value;
-        int ret;
-
-        ret = kstrtou16(buf, 10, &value);
-        if (ret)
-                return ret;
-
-        line6->line6midi->midi_mask_transmit = value;
-        return count;
-}
-
-/*
-        "read" request on "midi_mask_receive" special file.
-*/
-static ssize_t midi_get_midi_mask_receive(struct device *dev,
-                                          struct device_attribute *attr,
-                                          char *buf)
-{
-        struct usb_interface *interface = to_usb_interface(dev);
-        struct usb_line6 *line6 = usb_get_intfdata(interface);
-        return sprintf(buf, "%d\n", line6->line6midi->midi_mask_receive);
-}
-
-/*
-        "write" request on "midi_mask" special file.
-*/
-static ssize_t midi_set_midi_mask_receive(struct device *dev,
-                                          struct device_attribute *attr,
-                                          const char *buf, size_t count)
-{
-        struct usb_interface *interface = to_usb_interface(dev);
-        struct usb_line6 *line6 = usb_get_intfdata(interface);
-        unsigned short value;
-        int ret;
-
-        ret = kstrtou16(buf, 10, &value);
-        if (ret)
-                return ret;
-
-        line6->line6midi->midi_mask_receive = value;
-        return count;
-}
-
-static DEVICE_ATTR(midi_mask_transmit, S_IWUSR | S_IRUGO,
-                   midi_get_midi_mask_transmit, midi_set_midi_mask_transmit);
-static DEVICE_ATTR(midi_mask_receive, S_IWUSR | S_IRUGO,
-                   midi_get_midi_mask_receive, midi_set_midi_mask_receive);
-
 /* MIDI device destructor */
 static int snd_line6_midi_free(struct snd_device *device)
 {
         struct snd_line6_midi *line6midi = device->device_data;
-        device_remove_file(line6midi->line6->ifcdev,
-                           &dev_attr_midi_mask_transmit);
-        device_remove_file(line6midi->line6->ifcdev,
-                           &dev_attr_midi_mask_receive);
         line6_midibuf_destroy(&line6midi->midibuf_in);
         line6_midibuf_destroy(&line6midi->midibuf_out);
         return 0;
@@ -405,19 +300,6 @@ int line6_init_midi(struct usb_line6 *line6)
         }
 
         line6midi->line6 = line6;
-
-        switch (line6->product) {
-        case LINE6_DEVID_PODHD300:
-        case LINE6_DEVID_PODHD500:
-                line6midi->midi_mask_transmit = 1;
-                line6midi->midi_mask_receive = 1;
-                break;
-
-        default:
-                line6midi->midi_mask_transmit = 1;
-                line6midi->midi_mask_receive = 4;
-        }
-
         line6->line6midi = line6midi;
 
         err = snd_device_new(line6->card, SNDRV_DEV_RAWMIDI, line6midi,
@@ -431,14 +313,6 @@ int line6_init_midi(struct usb_line6 *line6)
         if (err < 0)
                 return err;
 
-        err = device_create_file(line6->ifcdev, &dev_attr_midi_mask_transmit);
-        if (err < 0)
-                return err;
-
-        err = device_create_file(line6->ifcdev, &dev_attr_midi_mask_receive);
-        if (err < 0)
-                return err;
-
         init_waitqueue_head(&line6midi->send_wait);
         spin_lock_init(&line6midi->send_urb_lock);
         spin_lock_init(&line6midi->midi_transmit_lock);
diff --git a/drivers/staging/line6/midi.h b/drivers/staging/line6/midi.h
index 4a9e9f947297..19dabd54051a 100644
--- a/drivers/staging/line6/midi.h
+++ b/drivers/staging/line6/midi.h
@@ -55,16 +55,6 @@ struct snd_line6_midi {
         wait_queue_head_t send_wait;
 
         /**
-                 Bit mask for output MIDI channels.
-        */
-        unsigned short midi_mask_transmit;
-
-        /**
-                 Bit mask for input MIDI channels.
-        */
-        unsigned short midi_mask_receive;
-
-        /**
                  Buffer for incoming MIDI stream.
         */
         struct MidiBuffer midibuf_in;
diff --git a/drivers/staging/line6/midibuf.c b/drivers/staging/line6/midibuf.c
index 836e8c847c52..968e0de83dab 100644
--- a/drivers/staging/line6/midibuf.c
+++ b/drivers/staging/line6/midibuf.c
@@ -64,9 +64,9 @@ int line6_midibuf_init(struct MidiBuffer *this, int size, int split)
 
 void line6_midibuf_status(struct MidiBuffer *this)
 {
-        pr_debug("midibuf size=%d split=%d pos_read=%d pos_write=%d "
-               "full=%d command_prev=%02x\n", this->size, this->split,
-               this->pos_read, this->pos_write, this->full, this->command_prev);
+        pr_debug("midibuf size=%d split=%d pos_read=%d pos_write=%d full=%d command_prev=%02x\n",
+                 this->size, this->split, this->pos_read, this->pos_write,
+                 this->full, this->command_prev);
 }
 
 int line6_midibuf_bytes_free(struct MidiBuffer *this)
diff --git a/drivers/staging/line6/pcm.c b/drivers/staging/line6/pcm.c
index 7fe44a6fd0ed..6c1e31335d19 100644
--- a/drivers/staging/line6/pcm.c
+++ b/drivers/staging/line6/pcm.c
@@ -109,7 +109,7 @@ int line6_pcm_acquire(struct snd_line6_pcm *line6pcm, int channels)
         line6pcm->prev_fbuf = NULL;
 
         if (test_flags(flags_old, flags_new, LINE6_BITS_CAPTURE_BUFFER)) {
-                /* We may be invoked multiple times in a row so allocate once only */
+                /* Invoked multiple times in a row so allocate once only */
                 if (!line6pcm->buffer_in) {
                         line6pcm->buffer_in =
                                 kmalloc(LINE6_ISO_BUFFERS * LINE6_ISO_PACKETS *
@@ -148,7 +148,7 @@ int line6_pcm_acquire(struct snd_line6_pcm *line6pcm, int channels)
         }
 
         if (test_flags(flags_old, flags_new, LINE6_BITS_PLAYBACK_BUFFER)) {
-                /* We may be invoked multiple times in a row so allocate once only */
+                /* Invoked multiple times in a row so allocate once only */
                 if (!line6pcm->buffer_out) {
                         line6pcm->buffer_out =
                                 kmalloc(LINE6_ISO_BUFFERS * LINE6_ISO_PACKETS *
diff --git a/drivers/staging/line6/pcm.h b/drivers/staging/line6/pcm.h
index 5210ec8dbe16..6aa0d46a2890 100644
--- a/drivers/staging/line6/pcm.h
+++ b/drivers/staging/line6/pcm.h
@@ -167,7 +167,7 @@ enum {
 #endif
             LINE6_BIT_PCM_ALSA_CAPTURE_STREAM |
             LINE6_BIT_PCM_MONITOR_CAPTURE_STREAM,
-        
+
         LINE6_BITS_STREAM =
             LINE6_BITS_PLAYBACK_STREAM |
             LINE6_BITS_CAPTURE_STREAM
diff --git a/drivers/staging/line6/playback.c b/drivers/staging/line6/playback.c
index a0ab9d0493fa..4cf23af9c627 100644
--- a/drivers/staging/line6/playback.c
+++ b/drivers/staging/line6/playback.c
@@ -185,7 +185,7 @@ static int submit_audio_out_urb(struct snd_line6_pcm *line6pcm)
         if (urb_size == 0) {
                 /* can't determine URB size */
                 spin_unlock_irqrestore(&line6pcm->lock_audio_out, flags);
-                dev_err(line6pcm->line6->ifcdev, "driver bug: urb_size = 0\n"); /* this is somewhat paranoid */
+                dev_err(line6pcm->line6->ifcdev, "driver bug: urb_size = 0\n");
                 return -EINVAL;
         }
 
@@ -218,7 +218,8 @@ static int submit_audio_out_urb(struct snd_line6_pcm *line6pcm)
                                        len * bytes_per_frame, runtime->dma_area,
                                        (urb_frames - len) * bytes_per_frame);
                         } else
-                                dev_err(line6pcm->line6->ifcdev, "driver bug: len = %d\n", len);        /* this is somewhat paranoid */
+                                dev_err(line6pcm->line6->ifcdev, "driver bug: len = %d\n",
+                                        len);
                 } else {
                         memcpy(urb_out->transfer_buffer,
                                runtime->dma_area +
@@ -319,7 +320,8 @@ void line6_unlink_audio_out_urbs(struct snd_line6_pcm *line6pcm)
 }
 
 /*
-        Wait until unlinking of all currently active playback URBs has been finished.
+        Wait until unlinking of all currently active playback URBs has been
+        finished.
 */
 void line6_wait_clear_audio_out_urbs(struct snd_line6_pcm *line6pcm)
 {
@@ -413,7 +415,8 @@ static void audio_out_callback(struct urb *urb)
         if (!shutdown) {
                 submit_audio_out_urb(line6pcm);
 
-                if (test_bit(LINE6_INDEX_PCM_ALSA_PLAYBACK_STREAM, &line6pcm->flags)) {
+                if (test_bit(LINE6_INDEX_PCM_ALSA_PLAYBACK_STREAM,
+                             &line6pcm->flags)) {
                         line6pcm->bytes_out += length;
                         if (line6pcm->bytes_out >= line6pcm->period_out) {
                                 line6pcm->bytes_out %= line6pcm->period_out;
@@ -499,7 +502,8 @@ int snd_line6_playback_trigger(struct snd_line6_pcm *line6pcm, int cmd)
 #ifdef CONFIG_PM
         case SNDRV_PCM_TRIGGER_RESUME:
 #endif
-                err = line6_pcm_acquire(line6pcm, LINE6_BIT_PCM_ALSA_PLAYBACK_STREAM);
+                err = line6_pcm_acquire(line6pcm,
+                                        LINE6_BIT_PCM_ALSA_PLAYBACK_STREAM);
 
                 if (err < 0)
                         return err;
@@ -510,7 +514,8 @@ int snd_line6_playback_trigger(struct snd_line6_pcm *line6pcm, int cmd)
 #ifdef CONFIG_PM
         case SNDRV_PCM_TRIGGER_SUSPEND:
 #endif
-                err = line6_pcm_release(line6pcm, LINE6_BIT_PCM_ALSA_PLAYBACK_STREAM);
+                err = line6_pcm_release(line6pcm,
+                                        LINE6_BIT_PCM_ALSA_PLAYBACK_STREAM);
 
                 if (err < 0)
                         return err;
diff --git a/drivers/staging/line6/pod.c b/drivers/staging/line6/pod.c
index 9edd053fb9ae..e542540d0db3 100644
--- a/drivers/staging/line6/pod.c
+++ b/drivers/staging/line6/pod.c
@@ -15,7 +15,6 @@
 
 #include "audio.h"
 #include "capture.h"
-#include "control.h"
 #include "driver.h"
 #include "playback.h"
 #include "pod.h"
@@ -26,7 +25,6 @@
 /* *INDENT-OFF* */
 
 enum {
-        POD_SYSEX_CLIP      = 0x0f,
         POD_SYSEX_SAVE      = 0x24,
         POD_SYSEX_SYSTEM    = 0x56,
         POD_SYSEX_SYSTEMREQ = 0x57,
@@ -41,11 +39,6 @@ enum {
 
 enum {
         POD_monitor_level  = 0x04,
-        POD_routing        = 0x05,
-        POD_tuner_mute     = 0x13,
-        POD_tuner_freq     = 0x15,
-        POD_tuner_note     = 0x16,
-        POD_tuner_pitch    = 0x17,
         POD_system_invalid = 0x10000
 };
 
@@ -118,10 +111,6 @@ static struct line6_pcm_properties pod_pcm_properties = {
         .bytes_per_frame = POD_BYTES_PER_FRAME
 };
 
-static const char pod_request_channel[] = {
-        0xf0, 0x00, 0x01, 0x0c, 0x03, 0x75, 0xf7
-};
-
 static const char pod_version_header[] = {
         0xf2, 0x7e, 0x7f, 0x06, 0x02
 };
@@ -129,18 +118,6 @@ static const char pod_version_header[] = {
 /* forward declarations: */
 static void pod_startup2(unsigned long data);
 static void pod_startup3(struct usb_line6_pod *pod);
-static void pod_startup4(struct usb_line6_pod *pod);
-
-/*
-        Mark all parameters as dirty and notify waiting processes.
-*/
-static void pod_mark_batch_all_dirty(struct usb_line6_pod *pod)
-{
-        int i;
-
-        for (i = 0; i < POD_CONTROL_SIZE; i++)
-                set_bit(i, pod->param_dirty);
-}
 
 static char *pod_alloc_sysex_buffer(struct usb_line6_pod *pod, int code,
                                     int size)
@@ -150,45 +127,6 @@ static char *pod_alloc_sysex_buffer(struct usb_line6_pod *pod, int code,
 }
 
 /*
-        Send channel dump data to the PODxt Pro.
-*/
-static void pod_dump(struct usb_line6_pod *pod, const unsigned char *data)
-{
-        int size = 1 + sizeof(pod->prog_data);
-        char *sysex = pod_alloc_sysex_buffer(pod, POD_SYSEX_DUMP, size);
-        if (!sysex)
-                return;
-        /* Don't know what this is good for, but PODxt Pro transmits it, so we
-         * also do... */
-        sysex[SYSEX_DATA_OFS] = 5;
-        memcpy(sysex + SYSEX_DATA_OFS + 1, data, sizeof(pod->prog_data));
-        line6_send_sysex_message(&pod->line6, sysex, size);
-        memcpy(&pod->prog_data, data, sizeof(pod->prog_data));
-        pod_mark_batch_all_dirty(pod);
-        kfree(sysex);
-}
-
-/*
-        Store parameter value in driver memory and mark it as dirty.
-*/
-static void pod_store_parameter(struct usb_line6_pod *pod, int param, int value)
-{
-        pod->prog_data.control[param] = value;
-        set_bit(param, pod->param_dirty);
-        pod->dirty = 1;
-}
-
-/*
-        Handle SAVE button.
-*/
-static void pod_save_button_pressed(struct usb_line6_pod *pod, int type,
-                                    int index)
-{
-        pod->dirty = 0;
-        set_bit(POD_SAVE_PRESSED, &pod->atomic_flags);
-}
-
-/*
         Process a completely received message.
 */
 void line6_pod_process_message(struct usb_line6_pod *pod)
@@ -209,25 +147,11 @@ void line6_pod_process_message(struct usb_line6_pod *pod)
         /* process all remaining messages */
         switch (buf[0]) {
         case LINE6_PARAM_CHANGE | LINE6_CHANNEL_DEVICE:
-                pod_store_parameter(pod, buf[1], buf[2]);
-                /* intentionally no break here! */
-
         case LINE6_PARAM_CHANGE | LINE6_CHANNEL_HOST:
-                if ((buf[1] == POD_amp_model_setup) ||
-                    (buf[1] == POD_effect_setup))
-                        /* these also affect other settings */
-                        line6_dump_request_async(&pod->dumpreq, &pod->line6, 0,
-                                                 LINE6_DUMP_CURRENT);
-
                 break;
 
         case LINE6_PROGRAM_CHANGE | LINE6_CHANNEL_DEVICE:
         case LINE6_PROGRAM_CHANGE | LINE6_CHANNEL_HOST:
-                pod->channel_num = buf[1];
-                pod->dirty = 0;
-                set_bit(POD_CHANNEL_DIRTY, &pod->atomic_flags);
-                line6_dump_request_async(&pod->dumpreq, &pod->line6, 0,
-                                         LINE6_DUMP_CURRENT);
                 break;
 
         case LINE6_SYSEX_BEGIN | LINE6_CHANNEL_DEVICE:
@@ -235,43 +159,6 @@ void line6_pod_process_message(struct usb_line6_pod *pod)
                 if (memcmp(buf + 1, line6_midi_id, sizeof(line6_midi_id)) == 0) {
                         switch (buf[5]) {
                         case POD_SYSEX_DUMP:
-                                if (pod->line6.message_length ==
-                                    sizeof(pod->prog_data) + 7) {
-                                        switch (pod->dumpreq.in_progress) {
-                                        case LINE6_DUMP_CURRENT:
-                                                memcpy(&pod->prog_data, buf + 7,
-                                                       sizeof(pod->prog_data));
-                                                pod_mark_batch_all_dirty(pod);
-                                                break;
-
-                                        case POD_DUMP_MEMORY:
-                                                memcpy(&pod->prog_data_buf,
-                                                       buf + 7,
-                                                       sizeof
-                                                       (pod->prog_data_buf));
-                                                break;
-
-                                        default:
-                                                DEBUG_MESSAGES(dev_err
-                                                               (pod->
-                                                                line6.ifcdev,
-                                                                "unknown dump code %02X\n",
-                                                                pod->
-                                                                dumpreq.in_progress));
-                                        }
-
-                                        line6_dump_finished(&pod->dumpreq);
-                                        pod_startup3(pod);
-                                } else
-                                        DEBUG_MESSAGES(dev_err
-                                                       (pod->line6.ifcdev,
-                                                        "wrong size of channel dump message (%d instead of %d)\n",
-                                                        pod->
-                                                        line6.message_length,
-                                                        (int)
-                                                        sizeof(pod->prog_data) +
-                                                        7));
-
                                 break;
 
                         case POD_SYSEX_SYSTEM:{
@@ -280,35 +167,8 @@ void line6_pod_process_message(struct usb_line6_pod *pod)
                                                                    << 8) |
                                             ((int)buf[9] << 4) | (int)buf[10];
 
-#define PROCESS_SYSTEM_PARAM(x) \
-                                        case POD_ ## x: \
-                                                pod->x.value = value; \
-                                                wake_up(&pod->x.wait); \
-                                                break;
-
-                                        switch (buf[6]) {
-                                                PROCESS_SYSTEM_PARAM
-                                                    (monitor_level);
-                                                PROCESS_SYSTEM_PARAM(routing);
-                                                PROCESS_SYSTEM_PARAM
-                                                    (tuner_mute);
-                                                PROCESS_SYSTEM_PARAM
-                                                    (tuner_freq);
-                                                PROCESS_SYSTEM_PARAM
-                                                    (tuner_note);
-                                                PROCESS_SYSTEM_PARAM
-                                                    (tuner_pitch);
-
-#undef PROCESS_SYSTEM_PARAM
-
-                                        default:
-                                                DEBUG_MESSAGES(dev_err
-                                                               (pod->
-                                                                line6.ifcdev,
-                                                                "unknown tuner/system response %02X\n",
-                                                                buf[6]));
-                                        }
-
+                                        if (buf[6] == POD_monitor_level)
+                                                pod->monitor_level = value;
                                         break;
                                 }
 
@@ -317,29 +177,18 @@ void line6_pod_process_message(struct usb_line6_pod *pod)
                                 break;
 
                         case POD_SYSEX_SAVE:
-                                pod_save_button_pressed(pod, buf[6], buf[7]);
-                                break;
-
-                        case POD_SYSEX_CLIP:
-                                DEBUG_MESSAGES(dev_err
-                                               (pod->line6.ifcdev,
-                                                "audio clipped\n"));
-                                pod->clipping.value = 1;
-                                wake_up(&pod->clipping.wait);
                                 break;
 
                         case POD_SYSEX_STORE:
-                                DEBUG_MESSAGES(dev_err
-                                               (pod->line6.ifcdev,
-                                                "message %02X not yet implemented\n",
-                                                buf[5]));
+                                dev_dbg(pod->line6.ifcdev,
+                                        "message %02X not yet implemented\n",
+                                        buf[5]);
                                 break;
 
                         default:
-                                DEBUG_MESSAGES(dev_err
-                                               (pod->line6.ifcdev,
-                                                "unknown sysex message %02X\n",
-                                                buf[5]));
+                                dev_dbg(pod->line6.ifcdev,
+                                        "unknown sysex message %02X\n",
+                                        buf[5]);
                         }
                 } else
                     if (memcmp
@@ -350,11 +199,9 @@ void line6_pod_process_message(struct usb_line6_pod *pod)
                         pod->device_id =
                             ((int)buf[8] << 16) | ((int)buf[9] << 8) | (int)
                             buf[10];
-                        pod_startup4(pod);
+                        pod_startup3(pod);
                 } else
-                        DEBUG_MESSAGES(dev_err
-                                       (pod->line6.ifcdev,
-                                        "unknown sysex header\n"));
+                        dev_dbg(pod->line6.ifcdev, "unknown sysex header\n");
 
                 break;
 
@@ -362,349 +209,22 @@ void line6_pod_process_message(struct usb_line6_pod *pod)
                 break;
 
         default:
-                DEBUG_MESSAGES(dev_err
-                               (pod->line6.ifcdev,
-                                "POD: unknown message %02X\n", buf[0]));
+                dev_dbg(pod->line6.ifcdev, "POD: unknown message %02X\n",
+                        buf[0]);
         }
 }
 
 /*
-        Detect some cases that require a channel dump after sending a command to the
-        device. Important notes:
-        *) The actual dump request can not be sent here since we are not allowed to
-        wait for the completion of the first message in this context, and sending
-        the dump request before completion of the previous message leaves the POD
-        in an undefined state. The dump request will be sent when the echoed
-        commands are received.
-        *) This method fails if a param change message is "chopped" after the first
-        byte.
-*/
-void line6_pod_midi_postprocess(struct usb_line6_pod *pod, unsigned char *data,
-                                int length)
-{
-        int i;
-
-        if (!pod->midi_postprocess)
-                return;
-
-        for (i = 0; i < length; ++i) {
-                if (data[i] == (LINE6_PROGRAM_CHANGE | LINE6_CHANNEL_HOST)) {
-                        line6_invalidate_current(&pod->dumpreq);
-                        break;
-                } else
-                    if ((data[i] == (LINE6_PARAM_CHANGE | LINE6_CHANNEL_HOST))
-                        && (i < length - 1))
-                        if ((data[i + 1] == POD_amp_model_setup)
-                            || (data[i + 1] == POD_effect_setup)) {
-                                line6_invalidate_current(&pod->dumpreq);
-                                break;
-                        }
-        }
-}
-
-/*
-        Send channel number (i.e., switch to a different sound).
-*/
-static void pod_send_channel(struct usb_line6_pod *pod, u8 value)
-{
-        line6_invalidate_current(&pod->dumpreq);
-
-        if (line6_send_program(&pod->line6, value) == 0)
-                pod->channel_num = value;
-        else
-                line6_dump_finished(&pod->dumpreq);
-}
-
-/*
         Transmit PODxt Pro control parameter.
 */
 void line6_pod_transmit_parameter(struct usb_line6_pod *pod, int param,
                                   u8 value)
 {
-        if (line6_transmit_parameter(&pod->line6, param, value) == 0)
-                pod_store_parameter(pod, param, value);
-
-        if ((param == POD_amp_model_setup) || (param == POD_effect_setup))      /* these also affect other settings */
-                line6_invalidate_current(&pod->dumpreq);
-}
-
-/*
-        Resolve value to memory location.
-*/
-static int pod_resolve(const char *buf, short block0, short block1,
-                       unsigned char *location)
-{
-        u8 value;
-        short block;
-        int ret;
-
-        ret = kstrtou8(buf, 10, &value);
-        if (ret)
-                return ret;
-
-        block = (value < 0x40) ? block0 : block1;
-        value &= 0x3f;
-        location[0] = block >> 7;
-        location[1] = value | (block & 0x7f);
-        return 0;
-}
-
-/*
-        Send command to store channel/effects setup/amp setup to PODxt Pro.
-*/
-static ssize_t pod_send_store_command(struct device *dev, const char *buf,
-                                      size_t count, short block0, short block1)
-{
-        struct usb_interface *interface = to_usb_interface(dev);
-        struct usb_line6_pod *pod = usb_get_intfdata(interface);
-        int ret;
-        int size = 3 + sizeof(pod->prog_data_buf);
-        char *sysex = pod_alloc_sysex_buffer(pod, POD_SYSEX_STORE, size);
-
-        if (!sysex)
-                return 0;
-
-        sysex[SYSEX_DATA_OFS] = 5;      /* see pod_dump() */
-        ret = pod_resolve(buf, block0, block1, sysex + SYSEX_DATA_OFS + 1);
-        if (ret) {
-                kfree(sysex);
-                return ret;
-        }
-
-        memcpy(sysex + SYSEX_DATA_OFS + 3, &pod->prog_data_buf,
-               sizeof(pod->prog_data_buf));
-
-        line6_send_sysex_message(&pod->line6, sysex, size);
-        kfree(sysex);
-        /* needs some delay here on AMD64 platform */
-        return count;
-}
-
-/*
-        Send command to retrieve channel/effects setup/amp setup to PODxt Pro.
-*/
-static ssize_t pod_send_retrieve_command(struct device *dev, const char *buf,
-                                         size_t count, short block0,
-                                         short block1)
-{
-        struct usb_interface *interface = to_usb_interface(dev);
-        struct usb_line6_pod *pod = usb_get_intfdata(interface);
-        int ret;
-        int size = 4;
-        char *sysex = pod_alloc_sysex_buffer(pod, POD_SYSEX_DUMPMEM, size);
-
-        if (!sysex)
-                return 0;
-
-        ret = pod_resolve(buf, block0, block1, sysex + SYSEX_DATA_OFS);
-        if (ret) {
-                kfree(sysex);
-                return ret;
-        }
-        sysex[SYSEX_DATA_OFS + 2] = 0;
-        sysex[SYSEX_DATA_OFS + 3] = 0;
-        line6_dump_started(&pod->dumpreq, POD_DUMP_MEMORY);
-
-        if (line6_send_sysex_message(&pod->line6, sysex, size) < size)
-                line6_dump_finished(&pod->dumpreq);
-
-        kfree(sysex);
-        /* needs some delay here on AMD64 platform */
-        return count;
-}
-
-/*
-        Generic get name function.
-*/
-static ssize_t get_name_generic(struct usb_line6_pod *pod, const char *str,
-                                char *buf)
-{
-        int length = 0;
-        const char *p1;
-        char *p2;
-        char *last_non_space = buf;
-
-        int retval = line6_dump_wait_interruptible(&pod->dumpreq);
-        if (retval < 0)
-                return retval;
-
-        for (p1 = str, p2 = buf; *p1; ++p1, ++p2) {
-                *p2 = *p1;
-                if (*p2 != ' ')
-                        last_non_space = p2;
-                if (++length == POD_NAME_LENGTH)
-                        break;
-        }
-
-        *(last_non_space + 1) = '\n';
-        return last_non_space - buf + 2;
-}
-
-/*
-        "read" request on "channel" special file.
-*/
-static ssize_t pod_get_channel(struct device *dev,
-                               struct device_attribute *attr, char *buf)
-{
-        struct usb_interface *interface = to_usb_interface(dev);
-        struct usb_line6_pod *pod = usb_get_intfdata(interface);
-        return sprintf(buf, "%d\n", pod->channel_num);
-}
-
-/*
-        "write" request on "channel" special file.
-*/
-static ssize_t pod_set_channel(struct device *dev,
-                               struct device_attribute *attr,
-                               const char *buf, size_t count)
-{
-        struct usb_interface *interface = to_usb_interface(dev);
-        struct usb_line6_pod *pod = usb_get_intfdata(interface);
-        u8 value;
-        int ret;
-
-        ret = kstrtou8(buf, 10, &value);
-        if (ret)
-                return ret;
-
-        pod_send_channel(pod, value);
-        return count;
-}
-
-/*
-        "read" request on "name" special file.
-*/
-static ssize_t pod_get_name(struct device *dev, struct device_attribute *attr,
-                            char *buf)
-{
-        struct usb_interface *interface = to_usb_interface(dev);
-        struct usb_line6_pod *pod = usb_get_intfdata(interface);
-        return get_name_generic(pod, pod->prog_data.header + POD_NAME_OFFSET,
-                                buf);
-}
-
-/*
-        "read" request on "name" special file.
-*/
-static ssize_t pod_get_name_buf(struct device *dev,
-                                struct device_attribute *attr, char *buf)
-{
-        struct usb_interface *interface = to_usb_interface(dev);
-        struct usb_line6_pod *pod = usb_get_intfdata(interface);
-        return get_name_generic(pod,
-                                pod->prog_data_buf.header + POD_NAME_OFFSET,
-                                buf);
-}
-
-/*
-        "read" request on "dump" special file.
-*/
-static ssize_t pod_get_dump(struct device *dev, struct device_attribute *attr,
-                            char *buf)
-{
-        struct usb_interface *interface = to_usb_interface(dev);
-        struct usb_line6_pod *pod = usb_get_intfdata(interface);
-        int retval = line6_dump_wait_interruptible(&pod->dumpreq);
-        if (retval < 0)
-                return retval;
-        memcpy(buf, &pod->prog_data, sizeof(pod->prog_data));
-        return sizeof(pod->prog_data);
-}
-
-/*
-        "write" request on "dump" special file.
-*/
-static ssize_t pod_set_dump(struct device *dev, struct device_attribute *attr,
-                            const char *buf, size_t count)
-{
-        struct usb_interface *interface = to_usb_interface(dev);
-        struct usb_line6_pod *pod = usb_get_intfdata(interface);
-
-        if (count != sizeof(pod->prog_data)) {
-                dev_err(pod->line6.ifcdev,
-                        "data block must be exactly %d bytes\n",
-                        (int)sizeof(pod->prog_data));
-                return -EINVAL;
-        }
-
-        pod_dump(pod, buf);
-        return sizeof(pod->prog_data);
-}
-
-/*
-        Identify system parameters related to the tuner.
-*/
-static bool pod_is_tuner(int code)
-{
-        return
-            (code == POD_tuner_mute) ||
-            (code == POD_tuner_freq) ||
-            (code == POD_tuner_note) || (code == POD_tuner_pitch);
-}
-
-/*
-        Get system parameter (as integer).
-        @param tuner non-zero, if code refers to a tuner parameter
-*/
-static int pod_get_system_param_int(struct usb_line6_pod *pod, int *value,
-                                    int code, struct ValueWait *param, int sign)
-{
-        char *sysex;
-        static const int size = 1;
-        int retval = 0;
-
-        if (((pod->prog_data.control[POD_tuner] & 0x40) == 0)
-            && pod_is_tuner(code))
-                return -ENODEV;
-
-        /* send value request to device: */
-        param->value = POD_system_invalid;
-        sysex = pod_alloc_sysex_buffer(pod, POD_SYSEX_SYSTEMREQ, size);
-
-        if (!sysex)
-                return -ENOMEM;
-
-        sysex[SYSEX_DATA_OFS] = code;
-        line6_send_sysex_message(&pod->line6, sysex, size);
-        kfree(sysex);
-
-        /* wait for device to respond: */
-        retval =
-            wait_event_interruptible(param->wait,
-                                     param->value != POD_system_invalid);
-
-        if (retval < 0)
-                return retval;
-
-        *value = sign ? (int)(signed short)param->value : (int)(unsigned short)
-            param->value;
-
-        if (*value == POD_system_invalid)
-                *value = 0;     /* don't report uninitialized values */
-
-        return 0;
-}
-
-/*
-        Get system parameter (as string).
-        @param tuner non-zero, if code refers to a tuner parameter
-*/
-static ssize_t pod_get_system_param_string(struct usb_line6_pod *pod, char *buf,
-                                           int code, struct ValueWait *param,
-                                           int sign)
-{
-        int retval, value = 0;
-        retval = pod_get_system_param_int(pod, &value, code, param, sign);
-
-        if (retval < 0)
-                return retval;
-
-        return sprintf(buf, "%d\n", value);
+        line6_transmit_parameter(&pod->line6, param, value);
 }
 
 /*
         Send system parameter (from integer).
-        @param tuner non-zero, if code refers to a tuner parameter
 */
 static int pod_set_system_param_int(struct usb_line6_pod *pod, int value,
                                     int code)
@@ -712,11 +232,6 @@ static int pod_set_system_param_int(struct usb_line6_pod *pod, int value,
         char *sysex;
         static const int size = 5;
 
-        if (((pod->prog_data.control[POD_tuner] & 0x40) == 0)
-            && pod_is_tuner(code))
-                return -EINVAL;
-
-        /* send value to tuner: */
         sysex = pod_alloc_sysex_buffer(pod, POD_SYSEX_SYSTEM, size);
         if (!sysex)
                 return -ENOMEM;
@@ -731,179 +246,6 @@ static int pod_set_system_param_int(struct usb_line6_pod *pod, int value,
 }
 
 /*
-        Send system parameter (from string).
-        @param tuner non-zero, if code refers to a tuner parameter
-*/
-static ssize_t pod_set_system_param_string(struct usb_line6_pod *pod,
-                                           const char *buf, int count, int code,
-                                           unsigned short mask)
-{
-        int retval;
-        unsigned short value = simple_strtoul(buf, NULL, 10) & mask;
-        retval = pod_set_system_param_int(pod, value, code);
-        return (retval < 0) ? retval : count;
-}
-
-/*
-        "read" request on "dump_buf" special file.
-*/
-static ssize_t pod_get_dump_buf(struct device *dev,
-                                struct device_attribute *attr, char *buf)
-{
-        struct usb_interface *interface = to_usb_interface(dev);
-        struct usb_line6_pod *pod = usb_get_intfdata(interface);
-        int retval = line6_dump_wait_interruptible(&pod->dumpreq);
-        if (retval < 0)
-                return retval;
-        memcpy(buf, &pod->prog_data_buf, sizeof(pod->prog_data_buf));
-        return sizeof(pod->prog_data_buf);
-}
-
-/*
-        "write" request on "dump_buf" special file.
-*/
-static ssize_t pod_set_dump_buf(struct device *dev,
-                                struct device_attribute *attr,
-                                const char *buf, size_t count)
-{
-        struct usb_interface *interface = to_usb_interface(dev);
-        struct usb_line6_pod *pod = usb_get_intfdata(interface);
-
-        if (count != sizeof(pod->prog_data)) {
-                dev_err(pod->line6.ifcdev,
-                        "data block must be exactly %d bytes\n",
-                        (int)sizeof(pod->prog_data));
-                return -EINVAL;
-        }
-
-        memcpy(&pod->prog_data_buf, buf, sizeof(pod->prog_data));
-        return sizeof(pod->prog_data);
-}
-
-/*
-        "write" request on "finish" special file.
-*/
-static ssize_t pod_set_finish(struct device *dev,
-                              struct device_attribute *attr,
-                              const char *buf, size_t count)
-{
-        struct usb_interface *interface = to_usb_interface(dev);
-        struct usb_line6_pod *pod = usb_get_intfdata(interface);
-        int size = 0;
-        char *sysex = pod_alloc_sysex_buffer(pod, POD_SYSEX_FINISH, size);
-        if (!sysex)
-                return 0;
-        line6_send_sysex_message(&pod->line6, sysex, size);
-        kfree(sysex);
-        return count;
-}
-
-/*
-        "write" request on "store_channel" special file.
-*/
-static ssize_t pod_set_store_channel(struct device *dev,
-                                     struct device_attribute *attr,
-                                     const char *buf, size_t count)
-{
-        return pod_send_store_command(dev, buf, count, 0x0000, 0x00c0);
-}
-
-/*
-        "write" request on "store_effects_setup" special file.
-*/
-static ssize_t pod_set_store_effects_setup(struct device *dev,
-                                           struct device_attribute *attr,
-                                           const char *buf, size_t count)
-{
-        return pod_send_store_command(dev, buf, count, 0x0080, 0x0080);
-}
-
-/*
-        "write" request on "store_amp_setup" special file.
-*/
-static ssize_t pod_set_store_amp_setup(struct device *dev,
-                                       struct device_attribute *attr,
-                                       const char *buf, size_t count)
-{
-        return pod_send_store_command(dev, buf, count, 0x0040, 0x0100);
-}
-
-/*
-        "write" request on "retrieve_channel" special file.
-*/
-static ssize_t pod_set_retrieve_channel(struct device *dev,
-                                        struct device_attribute *attr,
-                                        const char *buf, size_t count)
-{
-        return pod_send_retrieve_command(dev, buf, count, 0x0000, 0x00c0);
-}
-
-/*
-        "write" request on "retrieve_effects_setup" special file.
-*/
-static ssize_t pod_set_retrieve_effects_setup(struct device *dev,
-                                              struct device_attribute *attr,
-                                              const char *buf, size_t count)
-{
-        return pod_send_retrieve_command(dev, buf, count, 0x0080, 0x0080);
-}
-
-/*
-        "write" request on "retrieve_amp_setup" special file.
-*/
-static ssize_t pod_set_retrieve_amp_setup(struct device *dev,
-                                          struct device_attribute *attr,
-                                          const char *buf, size_t count)
-{
-        return pod_send_retrieve_command(dev, buf, count, 0x0040, 0x0100);
-}
-
-/*
-        "read" request on "dirty" special file.
-*/
-static ssize_t pod_get_dirty(struct device *dev, struct device_attribute *attr,
-                             char *buf)
-{
-        struct usb_interface *interface = to_usb_interface(dev);
-        struct usb_line6_pod *pod = usb_get_intfdata(interface);
-        buf[0] = pod->dirty ? '1' : '0';
-        buf[1] = '\n';
-        return 2;
-}
-
-/*
-        "read" request on "midi_postprocess" special file.
-*/
-static ssize_t pod_get_midi_postprocess(struct device *dev,
-                                        struct device_attribute *attr,
-                                        char *buf)
-{
-        struct usb_interface *interface = to_usb_interface(dev);
-        struct usb_line6_pod *pod = usb_get_intfdata(interface);
-        return sprintf(buf, "%d\n", pod->midi_postprocess);
-}
-
-/*
-        "write" request on "midi_postprocess" special file.
-*/
-static ssize_t pod_set_midi_postprocess(struct device *dev,
-                                        struct device_attribute *attr,
-                                        const char *buf, size_t count)
-{
-        struct usb_interface *interface = to_usb_interface(dev);
-        struct usb_line6_pod *pod = usb_get_intfdata(interface);
-        u8 value;
-        int ret;
-
-        ret = kstrtou8(buf, 10, &value);
-        if (ret)
-                return ret;
-
-        pod->midi_postprocess = value ? 1 : 0;
-        return count;
-}
-
-/*
         "read" request on "serial_number" special file.
 */
 static ssize_t pod_get_serial_number(struct device *dev,
@@ -939,18 +281,6 @@ static ssize_t pod_get_device_id(struct device *dev,
 }
 
 /*
-        "read" request on "clip" special file.
-*/
-static ssize_t pod_wait_for_clip(struct device *dev,
-                                 struct device_attribute *attr, char *buf)
-{
-        struct usb_interface *interface = to_usb_interface(dev);
-        struct usb_line6_pod *pod = usb_get_intfdata(interface);
-        return wait_event_interruptible(pod->clipping.wait,
-                                        pod->clipping.value != 0);
-}
-
-/*
         POD startup procedure.
         This is a sequence of functions with special requirements (e.g., must
         not run immediately after initialization, must not run in interrupt
@@ -969,22 +299,6 @@ static void pod_startup1(struct usb_line6_pod *pod)
 static void pod_startup2(unsigned long data)
 {
         struct usb_line6_pod *pod = (struct usb_line6_pod *)data;
-
-        /* schedule another startup procedure until startup is complete: */
-        if (pod->startup_progress >= POD_STARTUP_LAST)
-                return;
-
-        pod->startup_progress = POD_STARTUP_DUMPREQ;
-        line6_start_timer(&pod->startup_timer, POD_STARTUP_DELAY, pod_startup2,
-                          (unsigned long)pod);
-
-        /* current channel dump: */
-        line6_dump_request_async(&pod->dumpreq, &pod->line6, 0,
-                                 LINE6_DUMP_CURRENT);
-}
-
-static void pod_startup3(struct usb_line6_pod *pod)
-{
         struct usb_line6 *line6 = &pod->line6;
         CHECK_STARTUP_PROGRESS(pod->startup_progress, POD_STARTUP_VERSIONREQ);
 
@@ -992,7 +306,7 @@ static void pod_startup3(struct usb_line6_pod *pod)
         line6_version_request_async(line6);
 }
 
-static void pod_startup4(struct usb_line6_pod *pod)
+static void pod_startup3(struct usb_line6_pod *pod)
 {
         CHECK_STARTUP_PROGRESS(pod->startup_progress, POD_STARTUP_WORKQUEUE);
 
@@ -1000,7 +314,7 @@ static void pod_startup4(struct usb_line6_pod *pod)
         schedule_work(&pod->startup_work);
 }
 
-static void pod_startup5(struct work_struct *work)
+static void pod_startup4(struct work_struct *work)
 {
         struct usb_line6_pod *pod =
             container_of(work, struct usb_line6_pod, startup_work);
@@ -1013,87 +327,14 @@ static void pod_startup5(struct work_struct *work)
 
         /* ALSA audio interface: */
         line6_register_audio(line6);
-
-        /* device files: */
-        line6_pod_create_files(pod->firmware_version,
-                               line6->properties->device_bit, line6->ifcdev);
-}
-
-#define POD_GET_SYSTEM_PARAM(code, sign) \
-static ssize_t pod_get_ ## code(struct device *dev, \
-                                struct device_attribute *attr, char *buf) \
-{ \
-        struct usb_interface *interface = to_usb_interface(dev); \
-        struct usb_line6_pod *pod = usb_get_intfdata(interface); \
-        return pod_get_system_param_string(pod, buf, POD_ ## code,      \
-                                           &pod->code, sign);           \
-}
-
-#define POD_GET_SET_SYSTEM_PARAM(code, mask, sign) \
-POD_GET_SYSTEM_PARAM(code, sign) \
-static ssize_t pod_set_ ## code(struct device *dev, \
-                                struct device_attribute *attr, \
-                                const char *buf, size_t count) \
-{ \
-        struct usb_interface *interface = to_usb_interface(dev); \
-        struct usb_line6_pod *pod = usb_get_intfdata(interface); \
-        return pod_set_system_param_string(pod, buf, count, POD_ ## code, mask); \
 }
 
-POD_GET_SET_SYSTEM_PARAM(monitor_level, 0xffff, 0);
-POD_GET_SET_SYSTEM_PARAM(routing, 0x0003, 0);
-POD_GET_SET_SYSTEM_PARAM(tuner_mute, 0x0001, 0);
-POD_GET_SET_SYSTEM_PARAM(tuner_freq, 0xffff, 0);
-POD_GET_SYSTEM_PARAM(tuner_note, 1);
-POD_GET_SYSTEM_PARAM(tuner_pitch, 1);
-
-#undef GET_SET_SYSTEM_PARAM
-#undef GET_SYSTEM_PARAM
-
 /* POD special files: */
-static DEVICE_ATTR(channel, S_IWUSR | S_IRUGO, pod_get_channel,
-                   pod_set_channel);
-static DEVICE_ATTR(clip, S_IRUGO, pod_wait_for_clip, line6_nop_write);
 static DEVICE_ATTR(device_id, S_IRUGO, pod_get_device_id, line6_nop_write);
-static DEVICE_ATTR(dirty, S_IRUGO, pod_get_dirty, line6_nop_write);
-static DEVICE_ATTR(dump, S_IWUSR | S_IRUGO, pod_get_dump, pod_set_dump);
-static DEVICE_ATTR(dump_buf, S_IWUSR | S_IRUGO, pod_get_dump_buf,
-                   pod_set_dump_buf);
-static DEVICE_ATTR(finish, S_IWUSR, line6_nop_read, pod_set_finish);
 static DEVICE_ATTR(firmware_version, S_IRUGO, pod_get_firmware_version,
                    line6_nop_write);
-static DEVICE_ATTR(midi_postprocess, S_IWUSR | S_IRUGO,
-                   pod_get_midi_postprocess, pod_set_midi_postprocess);
-static DEVICE_ATTR(monitor_level, S_IWUSR | S_IRUGO, pod_get_monitor_level,
-                   pod_set_monitor_level);
-static DEVICE_ATTR(name, S_IRUGO, pod_get_name, line6_nop_write);
-static DEVICE_ATTR(name_buf, S_IRUGO, pod_get_name_buf, line6_nop_write);
-static DEVICE_ATTR(retrieve_amp_setup, S_IWUSR, line6_nop_read,
-                   pod_set_retrieve_amp_setup);
-static DEVICE_ATTR(retrieve_channel, S_IWUSR, line6_nop_read,
-                   pod_set_retrieve_channel);
-static DEVICE_ATTR(retrieve_effects_setup, S_IWUSR, line6_nop_read,
-                   pod_set_retrieve_effects_setup);
-static DEVICE_ATTR(routing, S_IWUSR | S_IRUGO, pod_get_routing,
-                   pod_set_routing);
 static DEVICE_ATTR(serial_number, S_IRUGO, pod_get_serial_number,
                    line6_nop_write);
-static DEVICE_ATTR(store_amp_setup, S_IWUSR, line6_nop_read,
-                   pod_set_store_amp_setup);
-static DEVICE_ATTR(store_channel, S_IWUSR, line6_nop_read,
-                   pod_set_store_channel);
-static DEVICE_ATTR(store_effects_setup, S_IWUSR, line6_nop_read,
-                   pod_set_store_effects_setup);
-static DEVICE_ATTR(tuner_freq, S_IWUSR | S_IRUGO, pod_get_tuner_freq,
-                   pod_set_tuner_freq);
-static DEVICE_ATTR(tuner_mute, S_IWUSR | S_IRUGO, pod_get_tuner_mute,
-                   pod_set_tuner_mute);
-static DEVICE_ATTR(tuner_note, S_IRUGO, pod_get_tuner_note, line6_nop_write);
-static DEVICE_ATTR(tuner_pitch, S_IRUGO, pod_get_tuner_pitch, line6_nop_write);
-
-#ifdef CONFIG_LINE6_USB_RAW
-static DEVICE_ATTR(raw, S_IWUSR, line6_nop_read, line6_set_raw);
-#endif
 
 /* control info callback */
 static int snd_pod_control_monitor_info(struct snd_kcontrol *kcontrol,
@@ -1112,7 +353,7 @@ static int snd_pod_control_monitor_get(struct snd_kcontrol *kcontrol,
 {
         struct snd_line6_pcm *line6pcm = snd_kcontrol_chip(kcontrol);
         struct usb_line6_pod *pod = (struct usb_line6_pod *)line6pcm->line6;
-        ucontrol->value.integer.value[0] = pod->monitor_level.value;
+        ucontrol->value.integer.value[0] = pod->monitor_level;
         return 0;
 }
 
@@ -1123,10 +364,10 @@ static int snd_pod_control_monitor_put(struct snd_kcontrol *kcontrol,
         struct snd_line6_pcm *line6pcm = snd_kcontrol_chip(kcontrol);
         struct usb_line6_pod *pod = (struct usb_line6_pod *)line6pcm->line6;
 
-        if (ucontrol->value.integer.value[0] == pod->monitor_level.value)
+        if (ucontrol->value.integer.value[0] == pod->monitor_level)
                 return 0;
 
-        pod->monitor_level.value = ucontrol->value.integer.value[0];
+        pod->monitor_level = ucontrol->value.integer.value[0];
         pod_set_system_param_int(pod, ucontrol->value.integer.value[0],
                                  POD_monitor_level);
         return 1;
@@ -1156,9 +397,6 @@ static void pod_destruct(struct usb_interface *interface)
 
         del_timer(&pod->startup_timer);
         cancel_work_sync(&pod->startup_work);
-
-        /* free dump request data: */
-        line6_dumpreq_destruct(&pod->dumpreq);
 }
 
 /*
@@ -1168,35 +406,9 @@ static int pod_create_files2(struct device *dev)
 {
         int err;
 
-        CHECK_RETURN(device_create_file(dev, &dev_attr_channel));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_clip));
         CHECK_RETURN(device_create_file(dev, &dev_attr_device_id));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_dirty));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_dump));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_dump_buf));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_finish));
         CHECK_RETURN(device_create_file(dev, &dev_attr_firmware_version));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_midi_postprocess));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_monitor_level));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_name));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_name_buf));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_retrieve_amp_setup));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_retrieve_channel));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_retrieve_effects_setup));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_routing));
         CHECK_RETURN(device_create_file(dev, &dev_attr_serial_number));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_store_amp_setup));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_store_channel));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_store_effects_setup));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_tuner_freq));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_tuner_mute));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_tuner_note));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_tuner_pitch));
-
-#ifdef CONFIG_LINE6_USB_RAW
-        CHECK_RETURN(device_create_file(dev, &dev_attr_raw));
-#endif
-
         return 0;
 }
 
@@ -1210,32 +422,11 @@ static int pod_try_init(struct usb_interface *interface,
         struct usb_line6 *line6 = &pod->line6;
 
         init_timer(&pod->startup_timer);
-        INIT_WORK(&pod->startup_work, pod_startup5);
+        INIT_WORK(&pod->startup_work, pod_startup4);
 
         if ((interface == NULL) || (pod == NULL))
                 return -ENODEV;
 
-        pod->channel_num = 255;
-
-        /* initialize wait queues: */
-        init_waitqueue_head(&pod->monitor_level.wait);
-        init_waitqueue_head(&pod->routing.wait);
-        init_waitqueue_head(&pod->tuner_mute.wait);
-        init_waitqueue_head(&pod->tuner_freq.wait);
-        init_waitqueue_head(&pod->tuner_note.wait);
-        init_waitqueue_head(&pod->tuner_pitch.wait);
-        init_waitqueue_head(&pod->clipping.wait);
-
-        memset(pod->param_dirty, 0xff, sizeof(pod->param_dirty));
-
-        /* initialize USB buffers: */
-        err = line6_dumpreq_init(&pod->dumpreq, pod_request_channel,
-                                 sizeof(pod_request_channel));
-        if (err < 0) {
-                dev_err(&interface->dev, "Out of memory\n");
-                return -ENOMEM;
-        }
-
         /* create sysfs entries: */
         err = pod_create_files2(&interface->dev);
         if (err < 0)
@@ -1269,7 +460,7 @@ static int pod_try_init(struct usb_interface *interface,
          */
 
         if (pod->line6.properties->capabilities & LINE6_BIT_CONTROL) {
-                pod->monitor_level.value = POD_system_invalid;
+                pod->monitor_level = POD_system_invalid;
 
                 /* initiate startup procedure: */
                 pod_startup1(pod);
@@ -1311,39 +502,9 @@ void line6_pod_disconnect(struct usb_interface *interface)
 
                 if (dev != NULL) {
                         /* remove sysfs entries: */
-                        line6_pod_remove_files(pod->firmware_version,
-                                               pod->line6.
-                                               properties->device_bit, dev);
-
-                        device_remove_file(dev, &dev_attr_channel);
-                        device_remove_file(dev, &dev_attr_clip);
                         device_remove_file(dev, &dev_attr_device_id);
-                        device_remove_file(dev, &dev_attr_dirty);
-                        device_remove_file(dev, &dev_attr_dump);
-                        device_remove_file(dev, &dev_attr_dump_buf);
-                        device_remove_file(dev, &dev_attr_finish);
                         device_remove_file(dev, &dev_attr_firmware_version);
-                        device_remove_file(dev, &dev_attr_midi_postprocess);
-                        device_remove_file(dev, &dev_attr_monitor_level);
-                        device_remove_file(dev, &dev_attr_name);
-                        device_remove_file(dev, &dev_attr_name_buf);
-                        device_remove_file(dev, &dev_attr_retrieve_amp_setup);
-                        device_remove_file(dev, &dev_attr_retrieve_channel);
-                        device_remove_file(dev,
-                                           &dev_attr_retrieve_effects_setup);
-                        device_remove_file(dev, &dev_attr_routing);
                         device_remove_file(dev, &dev_attr_serial_number);
-                        device_remove_file(dev, &dev_attr_store_amp_setup);
-                        device_remove_file(dev, &dev_attr_store_channel);
-                        device_remove_file(dev, &dev_attr_store_effects_setup);
-                        device_remove_file(dev, &dev_attr_tuner_freq);
-                        device_remove_file(dev, &dev_attr_tuner_mute);
-                        device_remove_file(dev, &dev_attr_tuner_note);
-                        device_remove_file(dev, &dev_attr_tuner_pitch);
-
-#ifdef CONFIG_LINE6_USB_RAW
-                        device_remove_file(dev, &dev_attr_raw);
-#endif
                 }
         }
 
diff --git a/drivers/staging/line6/pod.h b/drivers/staging/line6/pod.h
index 47e0d1a1c4b9..3e3f1671337a 100644
--- a/drivers/staging/line6/pod.h
+++ b/drivers/staging/line6/pod.h
@@ -15,12 +15,10 @@
 #include <linux/interrupt.h>
 #include <linux/spinlock.h>
 #include <linux/usb.h>
-#include <linux/wait.h>
 
 #include <sound/core.h>
 
 #include "driver.h"
-#include "dumprequest.h"
 
 /*
         PODxt Live interfaces
@@ -46,37 +44,12 @@
 */
 enum {
         POD_STARTUP_INIT = 1,
-        POD_STARTUP_DUMPREQ,
         POD_STARTUP_VERSIONREQ,
         POD_STARTUP_WORKQUEUE,
         POD_STARTUP_SETUP,
         POD_STARTUP_LAST = POD_STARTUP_SETUP - 1
 };
 
-/**
-        Data structure for values that need to be requested explicitly.
-        This is the case for system and tuner settings.
-*/
-struct ValueWait {
-        int value;
-        wait_queue_head_t wait;
-};
-
-/**
-        Binary PODxt Pro program dump
-*/
-struct pod_program {
-        /**
-                Header information (including program name).
-        */
-        unsigned char header[0x20];
-
-        /**
-                Program parameters.
-        */
-        unsigned char control[POD_CONTROL_SIZE];
-};
-
 struct usb_line6_pod {
         /**
                 Generic Line6 USB data.
@@ -84,63 +57,9 @@ struct usb_line6_pod {
         struct usb_line6 line6;
 
         /**
-                Dump request structure.
-        */
-        struct line6_dump_request dumpreq;
-
-        /**
-                Current program number.
-        */
-        unsigned char channel_num;
-
-        /**
-                Current program settings.
-        */
-        struct pod_program prog_data;
-
-        /**
-                Buffer for data retrieved from or to be stored on PODxt Pro.
-        */
-        struct pod_program prog_data_buf;
-
-        /**
-                Tuner mute mode.
-        */
-        struct ValueWait tuner_mute;
-
-        /**
-                Tuner base frequency (typically 440Hz).
-        */
-        struct ValueWait tuner_freq;
-
-        /**
-                Note received from tuner.
-        */
-        struct ValueWait tuner_note;
-
-        /**
-                Pitch value received from tuner.
-        */
-        struct ValueWait tuner_pitch;
-
-        /**
                 Instrument monitor level.
         */
-        struct ValueWait monitor_level;
-
-        /**
-                Audio routing mode.
-                0: send processed guitar
-                1: send clean guitar
-                2: send clean guitar re-amp playback
-                3: send re-amp playback
-        */
-        struct ValueWait routing;
-
-        /**
-                Wait for audio clipping event.
-        */
-        struct ValueWait clipping;
+        int monitor_level;
 
         /**
                 Timer for device initializaton.
@@ -158,16 +77,6 @@ struct usb_line6_pod {
         int startup_progress;
 
         /**
-                Dirty flags for access to parameter data.
-        */
-        unsigned long param_dirty[POD_CONTROL_SIZE / sizeof(unsigned long)];
-
-        /**
-                Some atomic flags.
-        */
-        unsigned long atomic_flags;
-
-        /**
                 Serial number of device.
         */
         int serial_number;
@@ -181,23 +90,11 @@ struct usb_line6_pod {
                 Device ID.
         */
         int device_id;
-
-        /**
-                Flag to indicate modification of current program settings.
-        */
-        char dirty;
-
-        /**
-                Flag to enable MIDI postprocessing.
-        */
-        char midi_postprocess;
 };
 
 extern void line6_pod_disconnect(struct usb_interface *interface);
 extern int line6_pod_init(struct usb_interface *interface,
                           struct usb_line6_pod *pod);
-extern void line6_pod_midi_postprocess(struct usb_line6_pod *pod,
-                                       unsigned char *data, int length);
 extern void line6_pod_process_message(struct usb_line6_pod *pod);
 extern void line6_pod_transmit_parameter(struct usb_line6_pod *pod, int param,
                                          u8 value);
diff --git a/drivers/staging/line6/toneport.c b/drivers/staging/line6/toneport.c
index 31b624b63425..a529dd3d604e 100644
--- a/drivers/staging/line6/toneport.c
+++ b/drivers/staging/line6/toneport.c
@@ -127,13 +127,11 @@ static ssize_t toneport_set_led_red(struct device *dev,
                                     const char *buf, size_t count)
 {
         int retval;
-        long value;
 
-        retval = strict_strtol(buf, 10, &value);
+        retval = kstrtoint(buf, 10, &led_red);
         if (retval)
                 return retval;
 
-        led_red = value;
         toneport_update_led(dev);
         return count;
 }
@@ -143,13 +141,11 @@ static ssize_t toneport_set_led_green(struct device *dev,
                                       const char *buf, size_t count)
 {
         int retval;
-        long value;
 
-        retval = strict_strtol(buf, 10, &value);
+        retval = kstrtoint(buf, 10, &led_green);
         if (retval)
                 return retval;
 
-        led_green = value;
         toneport_update_led(dev);
         return count;
 }
diff --git a/drivers/staging/line6/usbdefs.h b/drivers/staging/line6/usbdefs.h
index 353d59d77b04..43eb54008a2b 100644
--- a/drivers/staging/line6/usbdefs.h
+++ b/drivers/staging/line6/usbdefs.h
@@ -83,11 +83,15 @@ enum {
         LINE6_BIT(VARIAX),
 
         LINE6_BITS_PRO = LINE6_BIT_BASSPODXTPRO | LINE6_BIT_PODXTPRO,
-        LINE6_BITS_LIVE = LINE6_BIT_BASSPODXTLIVE | LINE6_BIT_PODXTLIVE | LINE6_BIT_PODX3LIVE,
-        LINE6_BITS_PODXTALL = LINE6_BIT_PODXT | LINE6_BIT_PODXTLIVE | LINE6_BIT_PODXTPRO,
+        LINE6_BITS_LIVE = LINE6_BIT_BASSPODXTLIVE | LINE6_BIT_PODXTLIVE |
+                          LINE6_BIT_PODX3LIVE,
+        LINE6_BITS_PODXTALL = LINE6_BIT_PODXT | LINE6_BIT_PODXTLIVE |
+                              LINE6_BIT_PODXTPRO,
         LINE6_BITS_PODX3ALL = LINE6_BIT_PODX3 | LINE6_BIT_PODX3LIVE,
         LINE6_BITS_PODHDALL = LINE6_BIT_PODHD300 | LINE6_BIT_PODHD500,
-        LINE6_BITS_BASSPODXTALL = LINE6_BIT_BASSPODXT | LINE6_BIT_BASSPODXTLIVE | LINE6_BIT_BASSPODXTPRO
+        LINE6_BITS_BASSPODXTALL = LINE6_BIT_BASSPODXT |
+                                  LINE6_BIT_BASSPODXTLIVE |
+                                  LINE6_BIT_BASSPODXTPRO
 };
 
 /* device supports settings parameter via USB */
diff --git a/drivers/staging/line6/variax.c b/drivers/staging/line6/variax.c
index f97416b1de54..4fca58f11245 100644
--- a/drivers/staging/line6/variax.c
+++ b/drivers/staging/line6/variax.c
@@ -12,28 +12,13 @@
 #include <linux/slab.h>
 
 #include "audio.h"
-#include "control.h"
 #include "driver.h"
 #include "variax.h"
 
-#define VARIAX_SYSEX_CODE 7
-#define VARIAX_SYSEX_PARAM 0x3b
-#define VARIAX_SYSEX_ACTIVATE 0x2a
-#define VARIAX_MODEL_HEADER_LENGTH 7
-#define VARIAX_MODEL_MESSAGE_LENGTH 199
 #define VARIAX_OFFSET_ACTIVATE 7
 
 /*
         This message is sent by the device during initialization and identifies
-        the connected guitar model.
-*/
-static const char variax_init_model[] = {
-        0xf0, 0x00, 0x01, 0x0c, 0x07, 0x00, 0x69, 0x02,
-        0x00
-};
-
-/*
-        This message is sent by the device during initialization and identifies
         the connected guitar version.
 */
 static const char variax_init_version[] = {
@@ -53,43 +38,11 @@ static const char variax_activate[] = {
         0xf7
 };
 
-static const char variax_request_bank[] = {
-        0xf0, 0x00, 0x01, 0x0c, 0x07, 0x00, 0x6d, 0xf7
-};
-
-static const char variax_request_model1[] = {
-        0xf0, 0x00, 0x01, 0x0c, 0x07, 0x00, 0x3c, 0x00,
-        0x02, 0x00, 0x00, 0x00, 0x00, 0x03, 0x05, 0x03,
-        0x00, 0x00, 0x00, 0xf7
-};
-
-static const char variax_request_model2[] = {
-        0xf0, 0x00, 0x01, 0x0c, 0x07, 0x00, 0x3c, 0x00,
-        0x02, 0x00, 0x00, 0x00, 0x00, 0x03, 0x07, 0x03,
-        0x00, 0x00, 0x00, 0xf7
-};
-
 /* forward declarations: */
-static int variax_create_files2(struct device *dev);
 static void variax_startup2(unsigned long data);
 static void variax_startup4(unsigned long data);
 static void variax_startup5(unsigned long data);
 
-/*
-        Decode data transmitted by workbench.
-*/
-static void variax_decode(const unsigned char *raw_data, unsigned char *data,
-                          int raw_size)
-{
-        for (; raw_size > 0; raw_size -= 6) {
-                data[2] = raw_data[0] | (raw_data[1] << 4);
-                data[1] = raw_data[2] | (raw_data[3] << 4);
-                data[0] = raw_data[4] | (raw_data[5] << 4);
-                raw_data += 6;
-                data += 3;
-        }
-}
-
 static void variax_activate_async(struct usb_line6_variax *variax, int a)
 {
         variax->buffer_activate[VARIAX_OFFSET_ACTIVATE] = a;
@@ -155,37 +108,21 @@ static void variax_startup5(unsigned long data)
 {
         struct usb_line6_variax *variax = (struct usb_line6_variax *)data;
         CHECK_STARTUP_PROGRESS(variax->startup_progress,
-                               VARIAX_STARTUP_DUMPREQ);
-
-        /* current model dump: */
-        line6_dump_request_async(&variax->dumpreq, &variax->line6, 0,
-                                 VARIAX_DUMP_PASS1);
-        /* passes 2 and 3 are performed implicitly before entering variax_startup6 */
-}
-
-static void variax_startup6(struct usb_line6_variax *variax)
-{
-        CHECK_STARTUP_PROGRESS(variax->startup_progress,
                                VARIAX_STARTUP_WORKQUEUE);
 
         /* schedule work for global work queue: */
         schedule_work(&variax->startup_work);
 }
 
-static void variax_startup7(struct work_struct *work)
+static void variax_startup6(struct work_struct *work)
 {
         struct usb_line6_variax *variax =
             container_of(work, struct usb_line6_variax, startup_work);
-        struct usb_line6 *line6 = &variax->line6;
 
         CHECK_STARTUP_PROGRESS(variax->startup_progress, VARIAX_STARTUP_SETUP);
 
         /* ALSA audio interface: */
         line6_register_audio(&variax->line6);
-
-        /* device files: */
-        line6_variax_create_files(0, 0, line6->ifcdev);
-        variax_create_files2(line6->ifcdev);
 }
 
 /*
@@ -197,22 +134,10 @@ void line6_variax_process_message(struct usb_line6_variax *variax)
 
         switch (buf[0]) {
         case LINE6_PARAM_CHANGE | LINE6_CHANNEL_HOST:
-                switch (buf[1]) {
-                case VARIAXMIDI_volume:
-                        variax->volume = buf[2];
-                        break;
-
-                case VARIAXMIDI_tone:
-                        variax->tone = buf[2];
-                }
-
                 break;
 
         case LINE6_PROGRAM_CHANGE | LINE6_CHANNEL_DEVICE:
         case LINE6_PROGRAM_CHANGE | LINE6_CHANNEL_HOST:
-                variax->model = buf[1];
-                line6_dump_request_async(&variax->dumpreq, &variax->line6, 0,
-                                         VARIAX_DUMP_PASS1);
                 break;
 
         case LINE6_RESET:
@@ -220,352 +145,25 @@ void line6_variax_process_message(struct usb_line6_variax *variax)
                 break;
 
         case LINE6_SYSEX_BEGIN:
-                if (memcmp(buf + 1, variax_request_model1 + 1,
-                           VARIAX_MODEL_HEADER_LENGTH - 1) == 0) {
-                        if (variax->line6.message_length ==
-                            VARIAX_MODEL_MESSAGE_LENGTH) {
-                                switch (variax->dumpreq.in_progress) {
-                                case VARIAX_DUMP_PASS1:
-                                        variax_decode(buf +
-                                                      VARIAX_MODEL_HEADER_LENGTH,
-                                                      (unsigned char *)
-                                                      &variax->model_data,
-                                                      (sizeof
-                                                       (variax->model_data.
-                                                        name) +
-                                                       sizeof(variax->
-                                                              model_data.
-                                                              control)
-                                                       / 2) * 2);
-                                        line6_dump_request_async
-                                            (&variax->dumpreq, &variax->line6,
-                                             1, VARIAX_DUMP_PASS2);
-                                        break;
-
-                                case VARIAX_DUMP_PASS2:
-                                        /* model name is transmitted twice, so skip it here: */
-                                        variax_decode(buf +
-                                                      VARIAX_MODEL_HEADER_LENGTH,
-                                                      (unsigned char *)
-                                                      &variax->
-                                                      model_data.control +
-                                                      sizeof(variax->model_data.
-                                                             control)
-                                                      / 2,
-                                                      sizeof(variax->model_data.
-                                                             control)
-                                                      / 2 * 2);
-                                        line6_dump_request_async
-                                            (&variax->dumpreq, &variax->line6,
-                                             2, VARIAX_DUMP_PASS3);
-                                }
-                        } else {
-                                DEBUG_MESSAGES(dev_err
-                                               (variax->line6.ifcdev,
-                                                "illegal length %d of model data\n",
-                                                variax->line6.message_length));
-                                line6_dump_finished(&variax->dumpreq);
-                        }
-                } else if (memcmp(buf + 1, variax_request_bank + 1,
-                                  sizeof(variax_request_bank) - 2) == 0) {
-                        memcpy(variax->bank,
-                               buf + sizeof(variax_request_bank) - 1,
-                               sizeof(variax->bank));
-                        line6_dump_finished(&variax->dumpreq);
-                        variax_startup6(variax);
-                } else if (memcmp(buf + 1, variax_init_model + 1,
-                                  sizeof(variax_init_model) - 1) == 0) {
-                        memcpy(variax->guitar,
-                               buf + sizeof(variax_init_model),
-                               sizeof(variax->guitar));
-                } else if (memcmp(buf + 1, variax_init_version + 1,
-                                  sizeof(variax_init_version) - 1) == 0) {
+                if (memcmp(buf + 1, variax_init_version + 1,
+                           sizeof(variax_init_version) - 1) == 0) {
                         variax_startup3(variax);
                 } else if (memcmp(buf + 1, variax_init_done + 1,
                                   sizeof(variax_init_done) - 1) == 0) {
                         /* notify of complete initialization: */
                         variax_startup4((unsigned long)variax);
                 }
-
                 break;
 
         case LINE6_SYSEX_END:
                 break;
 
         default:
-                DEBUG_MESSAGES(dev_err
-                               (variax->line6.ifcdev,
-                                "Variax: unknown message %02X\n", buf[0]));
-        }
-}
-
-/*
-        "read" request on "volume" special file.
-*/
-static ssize_t variax_get_volume(struct device *dev,
-                                 struct device_attribute *attr, char *buf)
-{
-        struct usb_line6_variax *variax =
-            usb_get_intfdata(to_usb_interface(dev));
-        return sprintf(buf, "%d\n", variax->volume);
-}
-
-/*
-        "write" request on "volume" special file.
-*/
-static ssize_t variax_set_volume(struct device *dev,
-                                 struct device_attribute *attr,
-                                 const char *buf, size_t count)
-{
-        struct usb_line6_variax *variax =
-            usb_get_intfdata(to_usb_interface(dev));
-        u8 value;
-        int ret;
-
-        ret = kstrtou8(buf, 10, &value);
-        if (ret)
-                return ret;
-
-        if (line6_transmit_parameter(&variax->line6, VARIAXMIDI_volume,
-                                     value) == 0)
-                variax->volume = value;
-
-        return count;
-}
-
-/*
-        "read" request on "model" special file.
-*/
-static ssize_t variax_get_model(struct device *dev,
-                                struct device_attribute *attr, char *buf)
-{
-        struct usb_line6_variax *variax =
-            usb_get_intfdata(to_usb_interface(dev));
-        return sprintf(buf, "%d\n", variax->model);
-}
-
-/*
-        "write" request on "model" special file.
-*/
-static ssize_t variax_set_model(struct device *dev,
-                                struct device_attribute *attr,
-                                const char *buf, size_t count)
-{
-        struct usb_line6_variax *variax =
-            usb_get_intfdata(to_usb_interface(dev));
-        u8 value;
-        int ret;
-
-        ret = kstrtou8(buf, 10, &value);
-        if (ret)
-                return ret;
-
-        if (line6_send_program(&variax->line6, value) == 0)
-                variax->model = value;
-
-        return count;
-}
-
-/*
-        "read" request on "active" special file.
-*/
-static ssize_t variax_get_active(struct device *dev,
-                                 struct device_attribute *attr, char *buf)
-{
-        struct usb_line6_variax *variax =
-            usb_get_intfdata(to_usb_interface(dev));
-        return sprintf(buf, "%d\n",
-                       variax->buffer_activate[VARIAX_OFFSET_ACTIVATE]);
-}
-
-/*
-        "write" request on "active" special file.
-*/
-static ssize_t variax_set_active(struct device *dev,
-                                 struct device_attribute *attr,
-                                 const char *buf, size_t count)
-{
-        struct usb_line6_variax *variax =
-            usb_get_intfdata(to_usb_interface(dev));
-        u8 value;
-        int ret;
-
-        ret = kstrtou8(buf, 10, &value);
-        if (ret)
-                return ret;
-
-        variax_activate_async(variax, value ? 1 : 0);
-        return count;
-}
-
-/*
-        "read" request on "tone" special file.
-*/
-static ssize_t variax_get_tone(struct device *dev,
-                               struct device_attribute *attr, char *buf)
-{
-        struct usb_line6_variax *variax =
-            usb_get_intfdata(to_usb_interface(dev));
-        return sprintf(buf, "%d\n", variax->tone);
-}
-
-/*
-        "write" request on "tone" special file.
-*/
-static ssize_t variax_set_tone(struct device *dev,
-                               struct device_attribute *attr,
-                               const char *buf, size_t count)
-{
-        struct usb_line6_variax *variax =
-            usb_get_intfdata(to_usb_interface(dev));
-        u8 value;
-        int ret;
-
-        ret = kstrtou8(buf, 10, &value);
-        if (ret)
-                return ret;
-
-        if (line6_transmit_parameter(&variax->line6, VARIAXMIDI_tone,
-                                     value) == 0)
-                variax->tone = value;
-
-        return count;
-}
-
-static ssize_t get_string(char *buf, const char *data, int length)
-{
-        int i;
-        memcpy(buf, data, length);
-
-        for (i = length; i--;) {
-                char c = buf[i];
-
-                if ((c != 0) && (c != ' '))
-                        break;
-        }
-
-        buf[i + 1] = '\n';
-        return i + 2;
-}
-
-/*
-        "read" request on "name" special file.
-*/
-static ssize_t variax_get_name(struct device *dev,
-                               struct device_attribute *attr, char *buf)
-{
-        struct usb_line6_variax *variax =
-            usb_get_intfdata(to_usb_interface(dev));
-        line6_dump_wait_interruptible(&variax->dumpreq);
-        return get_string(buf, variax->model_data.name,
-                          sizeof(variax->model_data.name));
-}
-
-/*
-        "read" request on "bank" special file.
-*/
-static ssize_t variax_get_bank(struct device *dev,
-                               struct device_attribute *attr, char *buf)
-{
-        struct usb_line6_variax *variax =
-            usb_get_intfdata(to_usb_interface(dev));
-        line6_dump_wait_interruptible(&variax->dumpreq);
-        return get_string(buf, variax->bank, sizeof(variax->bank));
-}
-
-/*
-        "read" request on "dump" special file.
-*/
-static ssize_t variax_get_dump(struct device *dev,
-                               struct device_attribute *attr, char *buf)
-{
-        struct usb_line6_variax *variax =
-            usb_get_intfdata(to_usb_interface(dev));
-        int retval;
-        retval = line6_dump_wait_interruptible(&variax->dumpreq);
-        if (retval < 0)
-                return retval;
-        memcpy(buf, &variax->model_data.control,
-               sizeof(variax->model_data.control));
-        return sizeof(variax->model_data.control);
-}
-
-/*
-        "read" request on "guitar" special file.
-*/
-static ssize_t variax_get_guitar(struct device *dev,
-                                 struct device_attribute *attr, char *buf)
-{
-        struct usb_line6_variax *variax =
-            usb_get_intfdata(to_usb_interface(dev));
-        return sprintf(buf, "%s\n", variax->guitar);
-}
-
-#ifdef CONFIG_LINE6_USB_RAW
-
-static char *variax_alloc_sysex_buffer(struct usb_line6_variax *variax,
-                                       int code, int size)
-{
-        return line6_alloc_sysex_buffer(&variax->line6, VARIAX_SYSEX_CODE, code,
-                                        size);
-}
-
-/*
-        "write" request on "raw" special file.
-*/
-static ssize_t variax_set_raw2(struct device *dev,
-                               struct device_attribute *attr,
-                               const char *buf, size_t count)
-{
-        struct usb_line6_variax *variax =
-            usb_get_intfdata(to_usb_interface(dev));
-        int size;
-        int i;
-        char *sysex;
-
-        count -= count % 3;
-        size = count * 2;
-        sysex = variax_alloc_sysex_buffer(variax, VARIAX_SYSEX_PARAM, size);
-
-        if (!sysex)
-                return 0;
-
-        for (i = 0; i < count; i += 3) {
-                const unsigned char *p1 = buf + i;
-                char *p2 = sysex + SYSEX_DATA_OFS + i * 2;
-                p2[0] = p1[2] & 0x0f;
-                p2[1] = p1[2] >> 4;
-                p2[2] = p1[1] & 0x0f;
-                p2[3] = p1[1] >> 4;
-                p2[4] = p1[0] & 0x0f;
-                p2[5] = p1[0] >> 4;
+                dev_dbg(variax->line6.ifcdev,
+                        "Variax: unknown message %02X\n", buf[0]);
         }
-
-        line6_send_sysex_message(&variax->line6, sysex, size);
-        kfree(sysex);
-        return count;
 }
 
-#endif
-
-/* Variax workbench special files: */
-static DEVICE_ATTR(model, S_IWUSR | S_IRUGO, variax_get_model,
-                   variax_set_model);
-static DEVICE_ATTR(volume, S_IWUSR | S_IRUGO, variax_get_volume,
-                   variax_set_volume);
-static DEVICE_ATTR(tone, S_IWUSR | S_IRUGO, variax_get_tone, variax_set_tone);
-static DEVICE_ATTR(name, S_IRUGO, variax_get_name, line6_nop_write);
-static DEVICE_ATTR(bank, S_IRUGO, variax_get_bank, line6_nop_write);
-static DEVICE_ATTR(dump, S_IRUGO, variax_get_dump, line6_nop_write);
-static DEVICE_ATTR(active, S_IWUSR | S_IRUGO, variax_get_active,
-                   variax_set_active);
-static DEVICE_ATTR(guitar, S_IRUGO, variax_get_guitar, line6_nop_write);
-
-#ifdef CONFIG_LINE6_USB_RAW
-static DEVICE_ATTR(raw, S_IWUSR, line6_nop_read, line6_set_raw);
-static DEVICE_ATTR(raw2, S_IWUSR, line6_nop_read, variax_set_raw2);
-#endif
-
 /*
         Variax destructor.
 */
@@ -581,36 +179,10 @@ static void variax_destruct(struct usb_interface *interface)
         del_timer(&variax->startup_timer2);
         cancel_work_sync(&variax->startup_work);
 
-        /* free dump request data: */
-        line6_dumpreq_destructbuf(&variax->dumpreq, 2);
-        line6_dumpreq_destructbuf(&variax->dumpreq, 1);
-        line6_dumpreq_destruct(&variax->dumpreq);
-
         kfree(variax->buffer_activate);
 }
 
 /*
-        Create sysfs entries.
-*/
-static int variax_create_files2(struct device *dev)
-{
-        int err;
-        CHECK_RETURN(device_create_file(dev, &dev_attr_model));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_volume));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_tone));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_name));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_bank));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_dump));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_active));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_guitar));
-#ifdef CONFIG_LINE6_USB_RAW
-        CHECK_RETURN(device_create_file(dev, &dev_attr_raw));
-        CHECK_RETURN(device_create_file(dev, &dev_attr_raw2));
-#endif
-        return 0;
-}
-
-/*
          Try to init workbench device.
 */
 static int variax_try_init(struct usb_interface *interface,
@@ -620,36 +192,12 @@ static int variax_try_init(struct usb_interface *interface,
 
         init_timer(&variax->startup_timer1);
         init_timer(&variax->startup_timer2);
-        INIT_WORK(&variax->startup_work, variax_startup7);
+        INIT_WORK(&variax->startup_work, variax_startup6);
 
         if ((interface == NULL) || (variax == NULL))
                 return -ENODEV;
 
         /* initialize USB buffers: */
-        err = line6_dumpreq_init(&variax->dumpreq, variax_request_model1,
-                                 sizeof(variax_request_model1));
-
-        if (err < 0) {
-                dev_err(&interface->dev, "Out of memory\n");
-                return err;
-        }
-
-        err = line6_dumpreq_initbuf(&variax->dumpreq, variax_request_model2,
-                                    sizeof(variax_request_model2), 1);
-
-        if (err < 0) {
-                dev_err(&interface->dev, "Out of memory\n");
-                return err;
-        }
-
-        err = line6_dumpreq_initbuf(&variax->dumpreq, variax_request_bank,
-                                    sizeof(variax_request_bank), 2);
-
-        if (err < 0) {
-                dev_err(&interface->dev, "Out of memory\n");
-                return err;
-        }
-
         variax->buffer_activate = kmemdup(variax_activate,
                                           sizeof(variax_activate), GFP_KERNEL);
 
@@ -692,28 +240,8 @@ int line6_variax_init(struct usb_interface *interface,
 */
 void line6_variax_disconnect(struct usb_interface *interface)
 {
-        struct device *dev;
-
         if (interface == NULL)
                 return;
-        dev = &interface->dev;
-
-        if (dev != NULL) {
-                /* remove sysfs entries: */
-                line6_variax_remove_files(0, 0, dev);
-                device_remove_file(dev, &dev_attr_model);
-                device_remove_file(dev, &dev_attr_volume);
-                device_remove_file(dev, &dev_attr_tone);
-                device_remove_file(dev, &dev_attr_name);
-                device_remove_file(dev, &dev_attr_bank);
-                device_remove_file(dev, &dev_attr_dump);
-                device_remove_file(dev, &dev_attr_active);
-                device_remove_file(dev, &dev_attr_guitar);
-#ifdef CONFIG_LINE6_USB_RAW
-                device_remove_file(dev, &dev_attr_raw);
-                device_remove_file(dev, &dev_attr_raw2);
-#endif
-        }
 
         variax_destruct(interface);
 }
diff --git a/drivers/staging/line6/variax.h b/drivers/staging/line6/variax.h
index e2999ab41b08..24de79620d89 100644
--- a/drivers/staging/line6/variax.h
+++ b/drivers/staging/line6/variax.h
@@ -18,7 +18,6 @@
 #include <sound/core.h>
 
 #include "driver.h"
-#include "dumprequest.h"
 
 #define VARIAX_STARTUP_DELAY1 1000
 #define VARIAX_STARTUP_DELAY3 100
@@ -32,33 +31,11 @@ enum {
         VARIAX_STARTUP_VERSIONREQ,
         VARIAX_STARTUP_WAIT,
         VARIAX_STARTUP_ACTIVATE,
-        VARIAX_STARTUP_DUMPREQ,
         VARIAX_STARTUP_WORKQUEUE,
         VARIAX_STARTUP_SETUP,
         VARIAX_STARTUP_LAST = VARIAX_STARTUP_SETUP - 1
 };
 
-enum {
-        VARIAX_DUMP_PASS1 = LINE6_DUMP_CURRENT,
-        VARIAX_DUMP_PASS2,
-        VARIAX_DUMP_PASS3
-};
-
-/**
-        Binary Variax model dump
-*/
-struct variax_model {
-        /**
-                Header information (including program name).
-        */
-        unsigned char name[18];
-
-        /**
-                Model parameters.
-        */
-        unsigned char control[78 * 2];
-};
-
 struct usb_line6_variax {
         /**
                 Generic Line6 USB data.
@@ -66,48 +43,11 @@ struct usb_line6_variax {
         struct usb_line6 line6;
 
         /**
-                Dump request structure.
-                Append two extra buffers for 3-pass data query.
-        */
-        struct line6_dump_request dumpreq;
-        struct line6_dump_reqbuf extrabuf[2];
-
-        /**
                 Buffer for activation code.
         */
         unsigned char *buffer_activate;
 
         /**
-                Model number.
-        */
-        int model;
-
-        /**
-                Current model settings.
-        */
-        struct variax_model model_data;
-
-        /**
-                Name of connected guitar.
-        */
-        unsigned char guitar[18];
-
-        /**
-                Name of current model bank.
-        */
-        unsigned char bank[18];
-
-        /**
-                Position of volume dial.
-        */
-        int volume;
-
-        /**
-                Position of tone control dial.
-        */
-        int tone;
-
-        /**
                 Handler for device initializaton.
         */
         struct work_struct startup_work;
diff --git a/drivers/staging/media/dt3155v4l/dt3155v4l.c b/drivers/staging/media/dt3155v4l/dt3155v4l.c
index 2e7b711c8501..238910373f5c 100644
--- a/drivers/staging/media/dt3155v4l/dt3155v4l.c
+++ b/drivers/staging/media/dt3155v4l/dt3155v4l.c
@@ -718,7 +718,7 @@ static const struct v4l2_ioctl_ops dt3155_ioctl_ops = {
 */
 };
 
-static int __devinit
+static int
 dt3155_init_board(struct pci_dev *pdev)
 {
         struct dt3155_priv *pd = pci_get_drvdata(pdev);
@@ -836,7 +836,7 @@ struct dma_coherent_mem {
         unsigned long   *bitmap;
 };
 
-static int __devinit
+static int
 dt3155_alloc_coherent(struct device *dev, size_t size, int flags)
 {
         struct dma_coherent_mem *mem;
@@ -877,7 +877,7 @@ out:
         return 0;
 }
 
-static void __devexit
+static void
 dt3155_free_coherent(struct device *dev)
 {
         struct dma_coherent_mem *mem = dev->dma_mem;
@@ -891,7 +891,7 @@ dt3155_free_coherent(struct device *dev)
         kfree(mem);
 }
 
-static int __devinit
+static int
 dt3155_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 {
         int err;
@@ -956,7 +956,7 @@ err_video_device_alloc:
         return err;
 }
 
-static void __devexit
+static void
 dt3155_remove(struct pci_dev *pdev)
 {
         struct dt3155_priv *pd = pci_get_drvdata(pdev);
@@ -983,7 +983,7 @@ static struct pci_driver pci_driver = {
         .name = DT3155_NAME,
         .id_table = pci_ids,
         .probe = dt3155_probe,
-        .remove = __devexit_p(dt3155_remove),
+        .remove = dt3155_remove,
 };
 
 module_pci_driver(pci_driver);
diff --git a/drivers/staging/media/lirc/lirc_parallel.c b/drivers/staging/media/lirc/lirc_parallel.c
index dd2bca7b56fa..ec14bc81851b 100644
--- a/drivers/staging/media/lirc/lirc_parallel.c
+++ b/drivers/staging/media/lirc/lirc_parallel.c
@@ -583,12 +583,12 @@ static struct lirc_driver driver = {
 
 static struct platform_device *lirc_parallel_dev;
 
-static int __devinit lirc_parallel_probe(struct platform_device *dev)
+static int lirc_parallel_probe(struct platform_device *dev)
 {
         return 0;
 }
 
-static int __devexit lirc_parallel_remove(struct platform_device *dev)
+static int lirc_parallel_remove(struct platform_device *dev)
 {
         return 0;
 }
@@ -606,7 +606,7 @@ static int lirc_parallel_resume(struct platform_device *dev)
 
 static struct platform_driver lirc_parallel_driver = {
         .probe  = lirc_parallel_probe,
-        .remove = __devexit_p(lirc_parallel_remove),
+        .remove = lirc_parallel_remove,
         .suspend        = lirc_parallel_suspend,
         .resume = lirc_parallel_resume,
         .driver = {
diff --git a/drivers/staging/media/lirc/lirc_serial.c b/drivers/staging/media/lirc/lirc_serial.c
index 97ef67036e3f..71e3bf2937f9 100644
--- a/drivers/staging/media/lirc/lirc_serial.c
+++ b/drivers/staging/media/lirc/lirc_serial.c
@@ -841,7 +841,7 @@ static int hardware_init_port(void)
         return 0;
 }
 
-static int __devinit lirc_serial_probe(struct platform_device *dev)
+static int lirc_serial_probe(struct platform_device *dev)
 {
         int i, nlow, nhigh, result;
 
@@ -927,7 +927,7 @@ exit_free_irq:
         return result;
 }
 
-static int __devexit lirc_serial_remove(struct platform_device *dev)
+static int lirc_serial_remove(struct platform_device *dev)
 {
         free_irq(irq, (void *)&hardware);
 
@@ -1148,7 +1148,7 @@ static int lirc_serial_resume(struct platform_device *dev)
 
 static struct platform_driver lirc_serial_driver = {
         .probe          = lirc_serial_probe,
-        .remove         = __devexit_p(lirc_serial_remove),
+        .remove         = lirc_serial_remove,
         .suspend        = lirc_serial_suspend,
         .resume         = lirc_serial_resume,
         .driver         = {
diff --git a/drivers/staging/media/lirc/lirc_sir.c b/drivers/staging/media/lirc/lirc_sir.c
index 4afc3b419738..a45799874a21 100644
--- a/drivers/staging/media/lirc/lirc_sir.c
+++ b/drivers/staging/media/lirc/lirc_sir.c
@@ -1218,19 +1218,19 @@ static int init_lirc_sir(void)
         return 0;
 }
 
-static int __devinit lirc_sir_probe(struct platform_device *dev)
+static int lirc_sir_probe(struct platform_device *dev)
 {
         return 0;
 }
 
-static int __devexit lirc_sir_remove(struct platform_device *dev)
+static int lirc_sir_remove(struct platform_device *dev)
 {
         return 0;
 }
 
 static struct platform_driver lirc_sir_driver = {
         .probe          = lirc_sir_probe,
-        .remove         = __devexit_p(lirc_sir_remove),
+        .remove         = lirc_sir_remove,
         .driver         = {
                 .name   = "lirc_sir",
                 .owner  = THIS_MODULE,
diff --git a/drivers/staging/media/solo6x10/core.c b/drivers/staging/media/solo6x10/core.c
index 3ee9b125797f..fd83d6d028bf 100644
--- a/drivers/staging/media/solo6x10/core.c
+++ b/drivers/staging/media/solo6x10/core.c
@@ -129,7 +129,7 @@ static void free_solo_dev(struct solo_dev *solo_dev)
         kfree(solo_dev);
 }
 
-static int __devinit solo_pci_probe(struct pci_dev *pdev,
+static int solo_pci_probe(struct pci_dev *pdev,
                                     const struct pci_device_id *id)
 {
         struct solo_dev *solo_dev;
@@ -284,7 +284,7 @@ fail_probe:
         return ret;
 }
 
-static void __devexit solo_pci_remove(struct pci_dev *pdev)
+static void solo_pci_remove(struct pci_dev *pdev)
 {
         struct solo_dev *solo_dev = pci_get_drvdata(pdev);
 
diff --git a/drivers/staging/net/pc300_drv.c b/drivers/staging/net/pc300_drv.c
index cb0f8d932b0c..7281797ffe9d 100644
--- a/drivers/staging/net/pc300_drv.c
+++ b/drivers/staging/net/pc300_drv.c
@@ -3409,7 +3409,7 @@ static void cpc_init_card(pc300_t * card)
         board_nbr++;
 }
 
-static int __devinit
+static int
 cpc_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
         int err, eeprom_outdated = 0;
@@ -3607,7 +3607,7 @@ err_disable_dev:
         return err;
 }
 
-static void __devexit cpc_remove_one(struct pci_dev *pdev)
+static void cpc_remove_one(struct pci_dev *pdev)
 {
         pc300_t *card = pci_get_drvdata(pdev);
 
@@ -3646,7 +3646,7 @@ static struct pci_driver cpc_driver = {
         .name           = "pc300",
         .id_table       = cpc_pci_dev_id,
         .probe          = cpc_init_one,
-        .remove         = __devexit_p(cpc_remove_one),
+        .remove         = cpc_remove_one,
 };
 
 static int __init cpc_init(void)
diff --git a/drivers/staging/nvec/Kconfig b/drivers/staging/nvec/Kconfig
index 1235a7897d04..f779fdc34279 100644
--- a/drivers/staging/nvec/Kconfig
+++ b/drivers/staging/nvec/Kconfig
@@ -1,6 +1,7 @@
 config MFD_NVEC
         bool "NV Tegra Embedded Controller SMBus Interface"
         depends on I2C && GPIOLIB && ARCH_TEGRA
+        select MFD_CORE
         help
             Say Y here to enable support for a nVidia compliant embedded
             controller.
diff --git a/drivers/staging/nvec/nvec.c b/drivers/staging/nvec/nvec.c
index 094fdc366f30..c59b7b299d37 100644
--- a/drivers/staging/nvec/nvec.c
+++ b/drivers/staging/nvec/nvec.c
@@ -716,7 +716,7 @@ static void nvec_power_off(void)
         nvec_write_async(nvec_power_handle, "\x04\x01", 2);
 }
 
-static int __devinit tegra_nvec_probe(struct platform_device *pdev)
+static int tegra_nvec_probe(struct platform_device *pdev)
 {
         int err, ret;
         struct clk *i2c_clk;
@@ -853,7 +853,7 @@ static int __devinit tegra_nvec_probe(struct platform_device *pdev)
         return 0;
 }
 
-static int __devexit tegra_nvec_remove(struct platform_device *pdev)
+static int tegra_nvec_remove(struct platform_device *pdev)
 {
         struct nvec_chip *nvec = platform_get_drvdata(pdev);
 
@@ -901,7 +901,7 @@ static int nvec_resume(struct device *dev)
 static const SIMPLE_DEV_PM_OPS(nvec_pm_ops, nvec_suspend, nvec_resume);
 
 /* Match table for of_platform binding */
-static const struct of_device_id nvidia_nvec_of_match[] __devinitconst = {
+static const struct of_device_id nvidia_nvec_of_match[] = {
         { .compatible = "nvidia,nvec", },
         {},
 };
@@ -909,7 +909,7 @@ MODULE_DEVICE_TABLE(of, nvidia_nvec_of_match);
 
 static struct platform_driver nvec_device_driver = {
         .probe   = tegra_nvec_probe,
-        .remove  = __devexit_p(tegra_nvec_remove),
+        .remove  = tegra_nvec_remove,
         .driver  = {
                 .name = "nvec",
                 .owner = THIS_MODULE,
diff --git a/drivers/staging/nvec/nvec_kbd.c b/drivers/staging/nvec/nvec_kbd.c
index 6cc30dcd8306..7cb149bf3d3f 100644
--- a/drivers/staging/nvec/nvec_kbd.c
+++ b/drivers/staging/nvec/nvec_kbd.c
@@ -100,7 +100,7 @@ static int nvec_kbd_event(struct input_dev *dev, unsigned int type,
         return 0;
 }
 
-static int __devinit nvec_kbd_probe(struct platform_device *pdev)
+static int nvec_kbd_probe(struct platform_device *pdev)
 {
         struct nvec_chip *nvec = dev_get_drvdata(pdev->dev.parent);
         int i, j, err;
@@ -159,7 +159,7 @@ fail:
         return err;
 }
 
-static int __devexit nvec_kbd_remove(struct platform_device *pdev)
+static int nvec_kbd_remove(struct platform_device *pdev)
 {
         input_unregister_device(keys_dev.input);
         input_free_device(keys_dev.input);
@@ -169,7 +169,7 @@ static int __devexit nvec_kbd_remove(struct platform_device *pdev)
 
 static struct platform_driver nvec_kbd_driver = {
         .probe  = nvec_kbd_probe,
-        .remove = __devexit_p(nvec_kbd_remove),
+        .remove = nvec_kbd_remove,
         .driver = {
                 .name = "nvec-kbd",
                 .owner = THIS_MODULE,
diff --git a/drivers/staging/nvec/nvec_paz00.c b/drivers/staging/nvec/nvec_paz00.c
index b747e39ff94d..934b796222a2 100644
--- a/drivers/staging/nvec/nvec_paz00.c
+++ b/drivers/staging/nvec/nvec_paz00.c
@@ -43,7 +43,7 @@ static void nvec_led_brightness_set(struct led_classdev *led_cdev,
 
 }
 
-static int __devinit nvec_paz00_probe(struct platform_device *pdev)
+static int nvec_paz00_probe(struct platform_device *pdev)
 {
         struct nvec_chip *nvec = dev_get_drvdata(pdev->dev.parent);
         struct nvec_led *led;
@@ -72,7 +72,7 @@ static int __devinit nvec_paz00_probe(struct platform_device *pdev)
         return 0;
 }
 
-static int __devexit nvec_paz00_remove(struct platform_device *pdev)
+static int nvec_paz00_remove(struct platform_device *pdev)
 {
         struct nvec_led *led = platform_get_drvdata(pdev);
 
@@ -83,7 +83,7 @@ static int __devexit nvec_paz00_remove(struct platform_device *pdev)
 
 static struct platform_driver nvec_paz00_driver = {
         .probe  = nvec_paz00_probe,
-        .remove = __devexit_p(nvec_paz00_remove),
+        .remove = nvec_paz00_remove,
         .driver = {
                 .name  = "nvec-paz00",
                 .owner = THIS_MODULE,
diff --git a/drivers/staging/nvec/nvec_power.c b/drivers/staging/nvec/nvec_power.c
index cc8ccd75e7f4..b7b6d54f58ec 100644
--- a/drivers/staging/nvec/nvec_power.c
+++ b/drivers/staging/nvec/nvec_power.c
@@ -368,7 +368,7 @@ static void nvec_power_poll(struct work_struct *work)
         schedule_delayed_work(to_delayed_work(work), msecs_to_jiffies(5000));
 };
 
-static int __devinit nvec_power_probe(struct platform_device *pdev)
+static int nvec_power_probe(struct platform_device *pdev)
 {
         struct power_supply *psy;
         struct nvec_power *power;
@@ -407,7 +407,7 @@ static int __devinit nvec_power_probe(struct platform_device *pdev)
         return power_supply_register(&pdev->dev, psy);
 }
 
-static int __devexit nvec_power_remove(struct platform_device *pdev)
+static int nvec_power_remove(struct platform_device *pdev)
 {
         struct nvec_power *power = platform_get_drvdata(pdev);
 
@@ -425,7 +425,7 @@ static int __devexit nvec_power_remove(struct platform_device *pdev)
 
 static struct platform_driver nvec_power_driver = {
         .probe = nvec_power_probe,
-        .remove = __devexit_p(nvec_power_remove),
+        .remove = nvec_power_remove,
         .driver = {
                    .name = "nvec-power",
                    .owner = THIS_MODULE,
diff --git a/drivers/staging/nvec/nvec_ps2.c b/drivers/staging/nvec/nvec_ps2.c
index d7c651102131..88dd288bf3d7 100644
--- a/drivers/staging/nvec/nvec_ps2.c
+++ b/drivers/staging/nvec/nvec_ps2.c
@@ -93,7 +93,7 @@ static int nvec_ps2_notifier(struct notifier_block *nb,
         return NOTIFY_DONE;
 }
 
-static int __devinit nvec_mouse_probe(struct platform_device *pdev)
+static int nvec_mouse_probe(struct platform_device *pdev)
 {
         struct nvec_chip *nvec = dev_get_drvdata(pdev->dev.parent);
         struct serio *ser_dev;
@@ -123,7 +123,7 @@ static int __devinit nvec_mouse_probe(struct platform_device *pdev)
         return 0;
 }
 
-static int __devexit nvec_mouse_remove(struct platform_device *pdev)
+static int nvec_mouse_remove(struct platform_device *pdev)
 {
         serio_unregister_port(ps2_dev.ser_dev);
 
@@ -164,7 +164,7 @@ static const SIMPLE_DEV_PM_OPS(nvec_mouse_pm_ops, nvec_mouse_suspend,
 
 static struct platform_driver nvec_mouse_driver = {
         .probe  = nvec_mouse_probe,
-        .remove = __devexit_p(nvec_mouse_remove),
+        .remove = nvec_mouse_remove,
         .driver = {
                 .name = "nvec-mouse",
                 .owner = THIS_MODULE,
diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c
index 683bedc74dde..ef32dc1bbc80 100644
--- a/drivers/staging/octeon/ethernet.c
+++ b/drivers/staging/octeon/ethernet.c
@@ -169,7 +169,7 @@ static void cvm_oct_periodic_worker(struct work_struct *work)
                 queue_delayed_work(cvm_oct_poll_queue, &priv->port_periodic_work, HZ);
  }
 
-static __devinit void cvm_oct_configure_common_hw(void)
+static void cvm_oct_configure_common_hw(void)
 {
         /* Setup the FPA */
         cvmx_fpa_enable();
@@ -586,7 +586,7 @@ static const struct net_device_ops cvm_oct_pow_netdev_ops = {
 
 extern void octeon_mdiobus_force_mod_depencency(void);
 
-static struct device_node * __devinit cvm_oct_of_get_child(const struct device_node *parent,
+static struct device_node *cvm_oct_of_get_child(const struct device_node *parent,
                                                            int reg_val)
 {
         struct device_node *node = NULL;
@@ -604,7 +604,7 @@ static struct device_node * __devinit cvm_oct_of_get_child(const struct device_n
         return node;
 }
 
-static struct device_node * __devinit cvm_oct_node_for_port(struct device_node *pip,
+static struct device_node *cvm_oct_node_for_port(struct device_node *pip,
                                                             int interface, int port)
 {
         struct device_node *ni, *np;
@@ -619,7 +619,7 @@ static struct device_node * __devinit cvm_oct_node_for_port(struct device_node *
         return np;
 }
 
-static int __devinit cvm_oct_probe(struct platform_device *pdev)
+static int cvm_oct_probe(struct platform_device *pdev)
 {
         int num_interfaces;
         int interface;
@@ -813,7 +813,7 @@ static int __devinit cvm_oct_probe(struct platform_device *pdev)
         return 0;
 }
 
-static int __devexit cvm_oct_remove(struct platform_device *pdev)
+static int cvm_oct_remove(struct platform_device *pdev)
 {
         int port;
 
@@ -874,7 +874,7 @@ MODULE_DEVICE_TABLE(of, cvm_oct_match);
 
 static struct platform_driver cvm_oct_driver = {
         .probe          = cvm_oct_probe,
-        .remove         = __devexit_p(cvm_oct_remove),
+        .remove         = cvm_oct_remove,
         .driver         = {
                 .owner  = THIS_MODULE,
                 .name   = KBUILD_MODNAME,
diff --git a/drivers/staging/olpc_dcon/olpc_dcon.c b/drivers/staging/olpc_dcon/olpc_dcon.c
index d49c32a95690..54ed6f69e3d4 100644
--- a/drivers/staging/olpc_dcon/olpc_dcon.c
+++ b/drivers/staging/olpc_dcon/olpc_dcon.c
@@ -39,10 +39,6 @@
 static ushort resumeline = 898;
 module_param(resumeline, ushort, 0444);
 
-/* Default off since it doesn't work on DCON ASIC in B-test OLPC board */
-static int useaa = 1;
-module_param(useaa, int, 0444);
-
 static struct dcon_platform_data *pdata;
 
 /* I2C structures */
@@ -50,8 +46,6 @@ static struct dcon_platform_data *pdata;
 /* Platform devices */
 static struct platform_device *dcon_device;
 
-static DECLARE_WAIT_QUEUE_HEAD(dcon_wait_queue);
-
 static unsigned short normal_i2c[] = { 0x0d, I2C_CLIENT_END };
 
 static s32 dcon_write(struct dcon_priv *dcon, u8 reg, u16 val)
@@ -103,9 +97,7 @@ static int dcon_hw_init(struct dcon_priv *dcon, int is_init)
         /* Colour swizzle, AA, no passthrough, backlight */
         if (is_init) {
                 dcon->disp_mode = MODE_PASSTHRU | MODE_BL_ENABLE |
-                                MODE_CSWIZZLE;
-                if (useaa)
-                        dcon->disp_mode |= MODE_COL_AA;
+                                MODE_CSWIZZLE | MODE_COL_AA;
         }
         dcon_write(dcon, DCON_REG_MODE, dcon->disp_mode);
 
@@ -191,9 +183,7 @@ static int dcon_set_mono_mode(struct dcon_priv *dcon, bool enable_mono)
                 dcon->disp_mode |= MODE_MONO_LUMA;
         } else {
                 dcon->disp_mode &= ~(MODE_MONO_LUMA);
-                dcon->disp_mode |= MODE_CSWIZZLE;
-                if (useaa)
-                        dcon->disp_mode |= MODE_COL_AA;
+                dcon->disp_mode |= MODE_CSWIZZLE | MODE_COL_AA;
         }
 
         dcon_write(dcon, DCON_REG_MODE, dcon->disp_mode);
@@ -288,7 +278,6 @@ static void dcon_source_switch(struct work_struct *work)
 {
         struct dcon_priv *dcon = container_of(work, struct dcon_priv,
                         switch_source);
-        DECLARE_WAITQUEUE(wait, current);
         int source = dcon->pending_src;
 
         if (dcon->curr_src == source)
@@ -305,11 +294,9 @@ static void dcon_source_switch(struct work_struct *work)
                 if (dcon_write(dcon, DCON_REG_MODE,
                                 dcon->disp_mode | MODE_SCAN_INT))
                         pr_err("couldn't enable scanline interrupt!\n");
-                else {
+                else
                         /* Wait up to one second for the scanline interrupt */
-                        wait_event_timeout(dcon_wait_queue,
-                                           dcon->switched == true, HZ);
-                }
+                        wait_event_timeout(dcon->waitq, dcon->switched, HZ);
 
                 if (!dcon->switched)
                         pr_err("Timeout entering CPU mode; expect a screen glitch.\n");
@@ -340,21 +327,15 @@ static void dcon_source_switch(struct work_struct *work)
                 break;
         case DCON_SOURCE_DCON:
         {
-                int t;
                 struct timespec delta_t;
 
                 pr_info("dcon_source_switch to DCON\n");
 
-                add_wait_queue(&dcon_wait_queue, &wait);
-                set_current_state(TASK_UNINTERRUPTIBLE);
-
                 /* Clear DCONLOAD - this implies that the DCON is in control */
                 pdata->set_dconload(0);
                 getnstimeofday(&dcon->load_time);
 
-                t = schedule_timeout(HZ/2);
-                remove_wait_queue(&dcon_wait_queue, &wait);
-                set_current_state(TASK_RUNNING);
+                wait_event_timeout(dcon->waitq, dcon->switched, HZ/2);
 
                 if (!dcon->switched) {
                         pr_err("Timeout entering DCON mode; expect a screen glitch.\n");
@@ -539,6 +520,10 @@ static int dcon_bl_update(struct backlight_device *dev)
         if (level != dcon->bl_val)
                 dcon_set_backlight(dcon, level);
 
+        /* power down the DCON when the screen is blanked */
+        if (!dcon->ignore_fb_events)
+                dcon_sleep(dcon, !!(dev->props.state & BL_CORE_FBBLANK));
+
         return 0;
 }
 
@@ -584,24 +569,6 @@ static struct notifier_block dcon_panic_nb = {
         .notifier_call = unfreeze_on_panic,
 };
 
-/*
- * When the framebuffer sleeps due to external sources (e.g. user idle), power
- * down the DCON as well.  Power it back up when the fb comes back to life.
- */
-static int dcon_fb_notifier(struct notifier_block *self,
-                                unsigned long event, void *data)
-{
-        struct fb_event *evdata = data;
-        struct dcon_priv *dcon = container_of(self, struct dcon_priv,
-                        fbevent_nb);
-        int *blank = (int *)evdata->data;
-        if (((event != FB_EVENT_BLANK) && (event != FB_EVENT_CONBLANK)) ||
-                        dcon->ignore_fb_events)
-                return 0;
-        dcon_sleep(dcon, *blank ? true : false);
-        return 0;
-}
-
 static int dcon_detect(struct i2c_client *client, struct i2c_board_info *info)
 {
         strlcpy(info->type, "olpc_dcon", I2C_NAME_SIZE);
@@ -622,10 +589,10 @@ static int dcon_probe(struct i2c_client *client, const struct i2c_device_id *id)
                 return -ENOMEM;
 
         dcon->client = client;
+        init_waitqueue_head(&dcon->waitq);
         INIT_WORK(&dcon->switch_source, dcon_source_switch);
         dcon->reboot_nb.notifier_call = dcon_reboot_notify;
         dcon->reboot_nb.priority = -1;
-        dcon->fbevent_nb.notifier_call = dcon_fb_notifier;
 
         i2c_set_clientdata(client, dcon);
 
@@ -680,7 +647,6 @@ static int dcon_probe(struct i2c_client *client, const struct i2c_device_id *id)
 
         register_reboot_notifier(&dcon->reboot_nb);
         atomic_notifier_chain_register(&panic_notifier_list, &dcon_panic_nb);
-        fb_register_client(&dcon->fbevent_nb);
 
         return 0;
 
@@ -701,7 +667,6 @@ static int dcon_remove(struct i2c_client *client)
 {
         struct dcon_priv *dcon = i2c_get_clientdata(client);
 
-        fb_unregister_client(&dcon->fbevent_nb);
         unregister_reboot_notifier(&dcon->reboot_nb);
         atomic_notifier_chain_unregister(&panic_notifier_list, &dcon_panic_nb);
 
@@ -720,8 +685,9 @@ static int dcon_remove(struct i2c_client *client)
 }
 
 #ifdef CONFIG_PM
-static int dcon_suspend(struct i2c_client *client, pm_message_t state)
+static int dcon_suspend(struct device *dev)
 {
+        struct i2c_client *client = to_i2c_client(dev);
         struct dcon_priv *dcon = i2c_get_clientdata(client);
 
         if (!dcon->asleep) {
@@ -732,8 +698,9 @@ static int dcon_suspend(struct i2c_client *client, pm_message_t state)
         return 0;
 }
 
-static int dcon_resume(struct i2c_client *client)
+static int dcon_resume(struct device *dev)
 {
+        struct i2c_client *client = to_i2c_client(dev);
         struct dcon_priv *dcon = i2c_get_clientdata(client);
 
         if (!dcon->asleep) {
@@ -744,7 +711,12 @@ static int dcon_resume(struct i2c_client *client)
         return 0;
 }
 
-#endif
+#else
+
+#define dcon_suspend NULL
+#define dcon_resume NULL
+
+#endif /* CONFIG_PM */
 
 
 irqreturn_t dcon_interrupt(int irq, void *id)
@@ -764,7 +736,7 @@ irqreturn_t dcon_interrupt(int irq, void *id)
         case 1: /* switch to CPU mode */
                 dcon->switched = true;
                 getnstimeofday(&dcon->irq_time);
-                wake_up(&dcon_wait_queue);
+                wake_up(&dcon->waitq);
                 break;
 
         case 0:
@@ -778,7 +750,7 @@ irqreturn_t dcon_interrupt(int irq, void *id)
                 if (dcon->curr_src != dcon->pending_src && !dcon->switched) {
                         dcon->switched = true;
                         getnstimeofday(&dcon->irq_time);
-                        wake_up(&dcon_wait_queue);
+                        wake_up(&dcon->waitq);
                         pr_debug("switching w/ status 0/0\n");
                 } else {
                         pr_debug("scanline interrupt w/CPU\n");
@@ -788,27 +760,28 @@ irqreturn_t dcon_interrupt(int irq, void *id)
         return IRQ_HANDLED;
 }
 
+static const struct dev_pm_ops dcon_pm_ops = {
+        .suspend = dcon_suspend,
+        .resume = dcon_resume,
+};
+
 static const struct i2c_device_id dcon_idtable[] = {
         { "olpc_dcon",  0 },
         { }
 };
-
 MODULE_DEVICE_TABLE(i2c, dcon_idtable);
 
 struct i2c_driver dcon_driver = {
         .driver = {
                 .name   = "olpc_dcon",
+                .pm = &dcon_pm_ops,
         },
         .class = I2C_CLASS_DDC | I2C_CLASS_HWMON,
         .id_table = dcon_idtable,
         .probe = dcon_probe,
-        .remove = __devexit_p(dcon_remove),
+        .remove = dcon_remove,
         .detect = dcon_detect,
         .address_list = normal_i2c,
-#ifdef CONFIG_PM
-        .suspend = dcon_suspend,
-        .resume = dcon_resume,
-#endif
 };
 
 static int __init olpc_dcon_init(void)
diff --git a/drivers/staging/olpc_dcon/olpc_dcon.h b/drivers/staging/olpc_dcon/olpc_dcon.h
index 167a41778be6..997bded2949f 100644
--- a/drivers/staging/olpc_dcon/olpc_dcon.h
+++ b/drivers/staging/olpc_dcon/olpc_dcon.h
@@ -52,9 +52,9 @@ struct dcon_priv {
         struct fb_info *fbinfo;
         struct backlight_device *bl_dev;
 
+        wait_queue_head_t waitq;
         struct work_struct switch_source;
         struct notifier_block reboot_nb;
-        struct notifier_block fbevent_nb;
 
         /* Shadow register for the DCON_REG_MODE register */
         u8 disp_mode;
diff --git a/drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c b/drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c
index 352dd3db0132..6a4d379c16a3 100644
--- a/drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c
+++ b/drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c
@@ -10,7 +10,6 @@
 
 #include <linux/acpi.h>
 #include <linux/delay.h>
-#include <linux/pci.h>
 #include <linux/gpio.h>
 #include <asm/olpc.h>
 
@@ -62,33 +61,6 @@ static int dcon_was_irq(void)
 static int dcon_init_xo_1_5(struct dcon_priv *dcon)
 {
         unsigned int irq;
-        u_int8_t tmp;
-        struct pci_dev *pdev;
-
-        pdev = pci_get_device(PCI_VENDOR_ID_VIA,
-                              PCI_DEVICE_ID_VIA_VX855, NULL);
-        if (!pdev) {
-                pr_err("cannot find VX855 PCI ID\n");
-                return 1;
-        }
-
-        pci_read_config_byte(pdev, 0x95, &tmp);
-        pci_write_config_byte(pdev, 0x95, tmp|0x0c);
-
-        /* Set GPIO8 to GPIO mode, not SSPICLK */
-        pci_read_config_byte(pdev, 0xe3, &tmp);
-        pci_write_config_byte(pdev, 0xe3, tmp | 0x04);
-
-        /* Set GPI10/GPI11 to GPI mode, not SSPISDI/SSPISS */
-        pci_read_config_byte(pdev, 0xe4, &tmp);
-        pci_write_config_byte(pdev, 0xe4, tmp|0x08);
-
-        /* clear PMU_RxE1[6] to select SCI on GPIO12 */
-        /* clear PMU_RxE0[6] to choose falling edge */
-        pci_read_config_byte(pdev, 0xe1, &tmp);
-        pci_write_config_byte(pdev, 0xe1, tmp & ~BIT_GPIO12);
-        pci_read_config_byte(pdev, 0xe0, &tmp);
-        pci_write_config_byte(pdev, 0xe0, tmp & ~BIT_GPIO12);
 
         dcon_clear_irq();
 
@@ -101,8 +73,6 @@ static int dcon_init_xo_1_5(struct dcon_priv *dcon)
                         DCON_SOURCE_CPU : DCON_SOURCE_DCON;
         dcon->pending_src = dcon->curr_src;
 
-        pci_dev_put(pdev);
-
         /* we're sharing the IRQ with ACPI */
         irq = acpi_gbl_FADT.sci_interrupt;
         if (request_irq(irq, &dcon_interrupt, IRQF_SHARED, "DCON", dcon)) {
diff --git a/drivers/staging/omap-thermal/omap-bandgap.c b/drivers/staging/omap-thermal/omap-bandgap.c
index 368a2e19b2d4..8346e3450f83 100644
--- a/drivers/staging/omap-thermal/omap-bandgap.c
+++ b/drivers/staging/omap-thermal/omap-bandgap.c
@@ -38,6 +38,7 @@
 #include <linux/of_device.h>
 #include <linux/of_platform.h>
 #include <linux/of_irq.h>
+#include <linux/io.h>
 
 #include "omap-bandgap.h"
 
@@ -112,6 +113,11 @@ static irqreturn_t talert_irq_handler(int irq, void *data)
 
                 omap_bandgap_writel(bg_ptr, ctrl, tsr->bgap_mask_ctrl);
 
+                dev_dbg(bg_ptr->dev,
+                        "%s: IRQ from %s sensor: hotevent %d coldevent %d\n",
+                        __func__, bg_ptr->conf->sensors[i].domain,
+                        t_hot, t_cold);
+
                 /* read temperature */
                 temp = omap_bandgap_readl(bg_ptr, tsr->temp_sensor_ctrl);
                 temp &= tsr->bgap_dtemp_mask;
@@ -843,7 +849,7 @@ static struct omap_bandgap *omap_bandgap_build(struct platform_device *pdev)
 }
 
 static
-int __devinit omap_bandgap_probe(struct platform_device *pdev)
+int omap_bandgap_probe(struct platform_device *pdev)
 {
         struct omap_bandgap *bg_ptr;
         int clk_rate, ret = 0, i;
@@ -992,7 +998,7 @@ free_irqs:
 }
 
 static
-int __devexit omap_bandgap_remove(struct platform_device *pdev)
+int omap_bandgap_remove(struct platform_device *pdev)
 {
         struct omap_bandgap *bg_ptr = platform_get_drvdata(pdev);
         int i;
@@ -1059,7 +1065,6 @@ static int omap_bandgap_save_ctxt(struct omap_bandgap *bg_ptr)
 static int omap_bandgap_restore_ctxt(struct omap_bandgap *bg_ptr)
 {
         int i;
-        u32 temp = 0;
 
         for (i = 0; i < bg_ptr->conf->sensor_count; i++) {
                 struct temp_sensor_registers *tsr;
@@ -1072,41 +1077,27 @@ static int omap_bandgap_restore_ctxt(struct omap_bandgap *bg_ptr)
                 if (OMAP_BANDGAP_HAS(bg_ptr, COUNTER))
                         val = omap_bandgap_readl(bg_ptr, tsr->bgap_counter);
 
-                if (val == 0) {
-                        if (OMAP_BANDGAP_HAS(bg_ptr, TSHUT_CONFIG))
-                                omap_bandgap_writel(bg_ptr,
-                                        rval->tshut_threshold,
-                                                   tsr->tshut_threshold);
-                        /* Force immediate temperature measurement and update
-                         * of the DTEMP field
-                         */
-                        omap_bandgap_force_single_read(bg_ptr, i);
-
-                        if (OMAP_BANDGAP_HAS(bg_ptr, COUNTER))
-                                omap_bandgap_writel(bg_ptr, rval->bg_counter,
-                                                           tsr->bgap_counter);
-                        if (OMAP_BANDGAP_HAS(bg_ptr, MODE_CONFIG))
-                                omap_bandgap_writel(bg_ptr, rval->bg_mode_ctrl,
-                                                           tsr->bgap_mode_ctrl);
-                        if (OMAP_BANDGAP_HAS(bg_ptr, TALERT)) {
-                                omap_bandgap_writel(bg_ptr,
-                                                           rval->bg_threshold,
-                                                           tsr->bgap_threshold);
-                                omap_bandgap_writel(bg_ptr, rval->bg_ctrl,
-                                                           tsr->bgap_mask_ctrl);
-                        }
-                } else {
-                        temp = omap_bandgap_readl(bg_ptr,
-                                                  tsr->temp_sensor_ctrl);
-                        temp &= (tsr->bgap_dtemp_mask);
-                        omap_bandgap_force_single_read(bg_ptr, i);
-                        if (temp == 0 && OMAP_BANDGAP_HAS(bg_ptr, TALERT)) {
-                                temp = omap_bandgap_readl(bg_ptr,
-                                                          tsr->bgap_mask_ctrl);
-                                temp |= 1 << __ffs(tsr->mode_ctrl_mask);
-                                omap_bandgap_writel(bg_ptr, temp,
-                                                           tsr->bgap_mask_ctrl);
-                        }
+                if (OMAP_BANDGAP_HAS(bg_ptr, TSHUT_CONFIG))
+                        omap_bandgap_writel(bg_ptr,
+                                rval->tshut_threshold,
+                                           tsr->tshut_threshold);
+                /* Force immediate temperature measurement and update
+                 * of the DTEMP field
+                 */
+                omap_bandgap_force_single_read(bg_ptr, i);
+
+                if (OMAP_BANDGAP_HAS(bg_ptr, COUNTER))
+                        omap_bandgap_writel(bg_ptr, rval->bg_counter,
+                                                   tsr->bgap_counter);
+                if (OMAP_BANDGAP_HAS(bg_ptr, MODE_CONFIG))
+                        omap_bandgap_writel(bg_ptr, rval->bg_mode_ctrl,
+                                                   tsr->bgap_mode_ctrl);
+                if (OMAP_BANDGAP_HAS(bg_ptr, TALERT)) {
+                        omap_bandgap_writel(bg_ptr,
+                                                   rval->bg_threshold,
+                                                   tsr->bgap_threshold);
+                        omap_bandgap_writel(bg_ptr, rval->bg_ctrl,
+                                                   tsr->bgap_mask_ctrl);
                 }
         }
 
diff --git a/drivers/staging/omap-thermal/omap-bandgap.h b/drivers/staging/omap-thermal/omap-bandgap.h
index 78aed7535f47..2bb14bd7c6d9 100644
--- a/drivers/staging/omap-thermal/omap-bandgap.h
+++ b/drivers/staging/omap-thermal/omap-bandgap.h
@@ -336,14 +336,6 @@ struct temp_sensor_regval {
 };
 
 /**
- * struct thermal_cooling_conf - description on how to cool a thermal zone
- * @freq_clip_count: size of freq_data
- */
-struct thermal_cooling_conf {
-        int freq_clip_count;
-};
-
-/**
  * struct omap_temp_sensor - bandgap temperature sensor platform data
  * @ts_data: pointer to struct with thresholds, limits of temperature sensor
  * @registers: pointer to the list of register offsets and bitfields
@@ -365,7 +357,6 @@ struct omap_temp_sensor {
         struct temp_sensor_registers    *registers;
         struct temp_sensor_regval       regval;
         char                            *domain;
-        struct thermal_cooling_conf     cooling_data;
         /* for hotspot extrapolation */
         const int                       slope;
         const int                       constant;
diff --git a/drivers/staging/omap-thermal/omap-thermal-common.c b/drivers/staging/omap-thermal/omap-thermal-common.c
index 5c0c203b887f..15e9723ba4d6 100644
--- a/drivers/staging/omap-thermal/omap-thermal-common.c
+++ b/drivers/staging/omap-thermal/omap-thermal-common.c
@@ -29,6 +29,7 @@
 #include <linux/workqueue.h>
 #include <linux/thermal.h>
 #include <linux/cpufreq.h>
+#include <linux/cpumask.h>
 #include <linux/cpu_cooling.h>
 
 #include "omap-thermal.h"
@@ -112,7 +113,7 @@ static int omap_thermal_bind(struct thermal_zone_device *thermal,
                               struct thermal_cooling_device *cdev)
 {
         struct omap_thermal_data *data = thermal->devdata;
-        int max, id;
+        int id;
 
         if (IS_ERR_OR_NULL(data))
                 return -ENODEV;
@@ -122,7 +123,6 @@ static int omap_thermal_bind(struct thermal_zone_device *thermal,
                 return 0;
 
         id = data->sensor_id;
-        max = data->bg_ptr->conf->sensors[id].cooling_data.freq_clip_count;
 
         /* TODO: bind with min and max states */
         /* Simple thing, two trips, one passive another critical */
@@ -256,12 +256,12 @@ static struct omap_thermal_data
 int omap_thermal_expose_sensor(struct omap_bandgap *bg_ptr, int id,
                                char *domain)
 {
-        struct omap_thermal_pdata pdata;
+        struct omap_thermal_data *data;
 
         data = omap_bandgap_get_sensor_data(bg_ptr, id);
 
         if (!data)
-                data = omap_thermal_build_pdata(bg_ptr, id);
+                data = omap_thermal_build_data(bg_ptr, id);
 
         if (!data)
                 return -EINVAL;
@@ -304,81 +304,24 @@ int omap_thermal_report_sensor_temperature(struct omap_bandgap *bg_ptr, int id)
         return 0;
 }
 
-static int omap_thermal_build_cpufreq_clip(struct omap_bandgap *bg_ptr,
-                                           struct freq_clip_table **tab_ptr,
-                                           int *tab_size)
-{
-        struct cpufreq_frequency_table *freq_table;
-        struct freq_clip_table *tab;
-        int i, count = 0;
-
-        freq_table = cpufreq_frequency_get_table(0);
-        if (IS_ERR_OR_NULL(freq_table)) {
-                dev_err(bg_ptr->dev,
-                        "%s: failed to get cpufreq table (%p)\n",
-                        __func__, freq_table);
-                return -EINVAL;
-        }
-
-        for (i = 0; freq_table[i].frequency != CPUFREQ_TABLE_END; i++) {
-                unsigned int freq = freq_table[i].frequency;
-                if (freq == CPUFREQ_ENTRY_INVALID)
-                        continue;
-                count++;
-        }
-
-        tab = devm_kzalloc(bg_ptr->dev, sizeof(*tab) * count, GFP_KERNEL);
-        if (!tab) {
-                dev_err(bg_ptr->dev,
-                        "%s: no memory available\n", __func__);
-                return -ENOMEM;
-        }
-
-        for (i = 0; freq_table[i].frequency != CPUFREQ_TABLE_END; i++) {
-                unsigned int freq = freq_table[i].frequency;
-
-                if (freq == CPUFREQ_ENTRY_INVALID)
-                        continue;
-
-                tab[count - i - 1].freq_clip_max = freq;
-                tab[count - i - 1].temp_level = OMAP_TRIP_HOT;
-                tab[count - i - 1].mask_val = cpumask_of(0);
-        }
-
-        *tab_ptr = tab;
-        *tab_size = count;
-
-        return 0;
-}
-
 int omap_thermal_register_cpu_cooling(struct omap_bandgap *bg_ptr, int id)
 {
         struct omap_thermal_data *data;
-        struct freq_clip_table *tab_ptr;
-        int tab_size, ret;
 
         data = omap_bandgap_get_sensor_data(bg_ptr, id);
         if (!data)
-                data = omap_thermal_build_pdata(bg_ptr, id);
+                data = omap_thermal_build_data(bg_ptr, id);
 
         if (!data)
                 return -EINVAL;
 
-        ret = omap_thermal_build_cpufreq_clip(bg_ptr, &tab_ptr, &tab_size);
-        if (ret < 0) {
-                dev_err(bg_ptr->dev,
-                        "%s: failed to build cpufreq clip table\n", __func__);
-                return ret;
-        }
-
         /* Register cooling device */
-        data->cool_dev = cpufreq_cooling_register(tab_ptr, tab_size);
+        data->cool_dev = cpufreq_cooling_register(cpu_present_mask);
         if (IS_ERR_OR_NULL(data->cool_dev)) {
                 dev_err(bg_ptr->dev,
                         "Failed to register cpufreq cooling device\n");
                 return PTR_ERR(data->cool_dev);
         }
-        bg_ptr->conf->sensors[id].cooling_data.freq_clip_count = tab_size;
         omap_bandgap_set_sensor_data(bg_ptr, id, data);
 
         return 0;
diff --git a/drivers/staging/omapdrm/Kconfig b/drivers/staging/omapdrm/Kconfig
index 81a7cba4a0c5..b724a4131435 100644
--- a/drivers/staging/omapdrm/Kconfig
+++ b/drivers/staging/omapdrm/Kconfig
@@ -2,7 +2,7 @@
 config DRM_OMAP
         tristate "OMAP DRM"
         depends on DRM && !CONFIG_FB_OMAP2
-        depends on ARCH_OMAP2PLUS
+        depends on ARCH_OMAP2PLUS || ARCH_MULTIPLATFORM
         select DRM_KMS_HELPER
         select OMAP2_DSS
         select FB_SYS_FILLRECT
diff --git a/drivers/staging/omapdrm/omap_connector.c b/drivers/staging/omapdrm/omap_connector.c
index 38be186c249a..91edb3f96972 100644
--- a/drivers/staging/omapdrm/omap_connector.c
+++ b/drivers/staging/omapdrm/omap_connector.c
@@ -146,11 +146,10 @@ enum drm_connector_status omap_connector_detect(
         enum drm_connector_status ret;
 
         if (dssdrv->detect) {
-                if (dssdrv->detect(dssdev)) {
+                if (dssdrv->detect(dssdev))
                         ret = connector_status_connected;
-                } else {
+                else
                         ret = connector_status_disconnected;
-                }
         } else {
                 ret = connector_status_unknown;
         }
@@ -383,9 +382,8 @@ struct drm_connector *omap_connector_init(struct drm_device *dev,
         return connector;
 
 fail:
-        if (connector) {
+        if (connector)
                 omap_connector_destroy(connector);
-        }
 
         return NULL;
 }
diff --git a/drivers/staging/omapdrm/omap_crtc.c b/drivers/staging/omapdrm/omap_crtc.c
index 732f2ad34036..d87bd84257bd 100644
--- a/drivers/staging/omapdrm/omap_crtc.c
+++ b/drivers/staging/omapdrm/omap_crtc.c
@@ -19,7 +19,7 @@
 
 #include "omap_drv.h"
 
-#include "drm_mode.h"
+#include <drm/drm_mode.h>
 #include "drm_crtc.h"
 #include "drm_crtc_helper.h"
 
@@ -114,7 +114,7 @@ static void omap_crtc_load_lut(struct drm_crtc *crtc)
 
 static void vblank_cb(void *arg)
 {
-        static uint32_t sequence = 0;
+        static uint32_t sequence;
         struct drm_crtc *crtc = arg;
         struct drm_device *dev = crtc->dev;
         struct omap_crtc *omap_crtc = to_omap_crtc(crtc);
@@ -263,8 +263,8 @@ struct drm_crtc *omap_crtc_init(struct drm_device *dev,
         return crtc;
 
 fail:
-        if (crtc) {
+        if (crtc)
                 omap_crtc_destroy(crtc);
-        }
+
         return NULL;
 }
diff --git a/drivers/staging/omapdrm/omap_dmm_priv.h b/drivers/staging/omapdrm/omap_dmm_priv.h
index 08b22e9f0ed7..273ec12c028a 100644
--- a/drivers/staging/omapdrm/omap_dmm_priv.h
+++ b/drivers/staging/omapdrm/omap_dmm_priv.h
@@ -141,8 +141,7 @@ struct refill_engine {
         /* only one trans per engine for now */
         struct dmm_txn txn;
 
-        /* offset to lut associated with container */
-        u32 *lut_offset;
+        bool async;
 
         wait_queue_head_t wait_for_refill;
 
@@ -161,10 +160,11 @@ struct dmm {
         dma_addr_t refill_pa;
 
         /* refill engines */
-        struct semaphore engine_sem;
+        wait_queue_head_t engine_queue;
         struct list_head idle_head;
         struct refill_engine *engines;
         int num_engines;
+        atomic_t engine_counter;
 
         /* container information */
         int container_width;
@@ -176,9 +176,6 @@ struct dmm {
         /* array of LUT - TCM containers */
         struct tcm **tcm;
 
-        /* LUT table storage */
-        u32 *lut;
-
         /* allocation list and lock */
         struct list_head alloc_head;
 };
diff --git a/drivers/staging/omapdrm/omap_dmm_tiler.c b/drivers/staging/omapdrm/omap_dmm_tiler.c
index 3ae39554df18..59bf43899fc0 100644
--- a/drivers/staging/omapdrm/omap_dmm_tiler.c
+++ b/drivers/staging/omapdrm/omap_dmm_tiler.c
@@ -29,7 +29,6 @@
 #include <linux/mm.h>
 #include <linux/time.h>
 #include <linux/list.h>
-#include <linux/semaphore.h>
 
 #include "omap_dmm_tiler.h"
 #include "omap_dmm_priv.h"
@@ -120,6 +119,18 @@ static int wait_status(struct refill_engine *engine, uint32_t wait_mask)
         return 0;
 }
 
+static void release_engine(struct refill_engine *engine)
+{
+        unsigned long flags;
+
+        spin_lock_irqsave(&list_lock, flags);
+        list_add(&engine->idle_node, &omap_dmm->idle_head);
+        spin_unlock_irqrestore(&list_lock, flags);
+
+        atomic_inc(&omap_dmm->engine_counter);
+        wake_up_interruptible(&omap_dmm->engine_queue);
+}
+
 static irqreturn_t omap_dmm_irq_handler(int irq, void *arg)
 {
         struct dmm *dmm = arg;
@@ -130,9 +141,13 @@ static irqreturn_t omap_dmm_irq_handler(int irq, void *arg)
         writel(status, dmm->base + DMM_PAT_IRQSTATUS);
 
         for (i = 0; i < dmm->num_engines; i++) {
-                if (status & DMM_IRQSTAT_LST)
+                if (status & DMM_IRQSTAT_LST) {
                         wake_up_interruptible(&dmm->engines[i].wait_for_refill);
 
+                        if (dmm->engines[i].async)
+                                release_engine(&dmm->engines[i]);
+                }
+
                 status >>= 8;
         }
 
@@ -146,17 +161,24 @@ static struct dmm_txn *dmm_txn_init(struct dmm *dmm, struct tcm *tcm)
 {
         struct dmm_txn *txn = NULL;
         struct refill_engine *engine = NULL;
+        int ret;
+        unsigned long flags;
 
-        down(&dmm->engine_sem);
+
+        /* wait until an engine is available */
+        ret = wait_event_interruptible(omap_dmm->engine_queue,
+                atomic_add_unless(&omap_dmm->engine_counter, -1, 0));
+        if (ret)
+                return ERR_PTR(ret);
 
         /* grab an idle engine */
-        spin_lock(&list_lock);
+        spin_lock_irqsave(&list_lock, flags);
         if (!list_empty(&dmm->idle_head)) {
                 engine = list_entry(dmm->idle_head.next, struct refill_engine,
                                         idle_node);
                 list_del(&engine->idle_node);
         }
-        spin_unlock(&list_lock);
+        spin_unlock_irqrestore(&list_lock, flags);
 
         BUG_ON(!engine);
 
@@ -174,7 +196,7 @@ static struct dmm_txn *dmm_txn_init(struct dmm *dmm, struct tcm *tcm)
  * Add region to DMM transaction.  If pages or pages[i] is NULL, then the
  * corresponding slot is cleared (ie. dummy_pa is programmed)
  */
-static int dmm_txn_append(struct dmm_txn *txn, struct pat_area *area,
+static void dmm_txn_append(struct dmm_txn *txn, struct pat_area *area,
                 struct page **pages, uint32_t npages, uint32_t roll)
 {
         dma_addr_t pat_pa = 0;
@@ -184,9 +206,6 @@ static int dmm_txn_append(struct dmm_txn *txn, struct pat_area *area,
         int columns = (1 + area->x1 - area->x0);
         int rows = (1 + area->y1 - area->y0);
         int i = columns*rows;
-        u32 *lut = omap_dmm->lut + (engine->tcm->lut_id * omap_dmm->lut_width *
-                        omap_dmm->lut_height) +
-                        (area->y0 * omap_dmm->lut_width) + area->x0;
 
         pat = alloc_dma(txn, sizeof(struct pat), &pat_pa);
 
@@ -209,13 +228,9 @@ static int dmm_txn_append(struct dmm_txn *txn, struct pat_area *area,
                         page_to_phys(pages[n]) : engine->dmm->dummy_pa;
         }
 
-        /* fill in lut with new addresses */
-        for (i = 0; i < rows; i++, lut += omap_dmm->lut_width)
-                memcpy(lut, &data[i*columns], columns * sizeof(u32));
-
         txn->last_pat = pat;
 
-        return 0;
+        return;
 }
 
 /**
@@ -245,6 +260,9 @@ static int dmm_txn_commit(struct dmm_txn *txn, bool wait)
                 goto cleanup;
         }
 
+        /* mark whether it is async to denote list management in IRQ handler */
+        engine->async = wait ? false : true;
+
         /* kick reload */
         writel(engine->refill_pa,
                 dmm->base + reg[PAT_DESCR][engine->id]);
@@ -259,11 +277,10 @@ static int dmm_txn_commit(struct dmm_txn *txn, bool wait)
         }
 
 cleanup:
-        spin_lock(&list_lock);
-        list_add(&engine->idle_node, &dmm->idle_head);
-        spin_unlock(&list_lock);
+        /* only place engine back on list if we are done with it */
+        if (ret || wait)
+                release_engine(engine);
 
-        up(&omap_dmm->engine_sem);
         return ret;
 }
 
@@ -279,7 +296,7 @@ static int fill(struct tcm_area *area, struct page **pages,
 
         txn = dmm_txn_init(omap_dmm, area->tcm);
         if (IS_ERR_OR_NULL(txn))
-                return PTR_ERR(txn);
+                return -ENOMEM;
 
         tcm_for_each_slice(slice, *area, area_s) {
                 struct pat_area p_area = {
@@ -287,16 +304,13 @@ static int fill(struct tcm_area *area, struct page **pages,
                                 .x1 = slice.p1.x,  .y1 = slice.p1.y,
                 };
 
-                ret = dmm_txn_append(txn, &p_area, pages, npages, roll);
-                if (ret)
-                        goto fail;
+                dmm_txn_append(txn, &p_area, pages, npages, roll);
 
                 roll += tcm_sizeof(slice);
         }
 
         ret = dmm_txn_commit(txn, wait);
 
-fail:
         return ret;
 }
 
@@ -333,6 +347,7 @@ struct tiler_block *tiler_reserve_2d(enum tiler_fmt fmt, uint16_t w,
         struct tiler_block *block = kzalloc(sizeof(*block), GFP_KERNEL);
         u32 min_align = 128;
         int ret;
+        unsigned long flags;
 
         BUG_ON(!validfmt(fmt));
 
@@ -354,9 +369,9 @@ struct tiler_block *tiler_reserve_2d(enum tiler_fmt fmt, uint16_t w,
         }
 
         /* add to allocation list */
-        spin_lock(&list_lock);
+        spin_lock_irqsave(&list_lock, flags);
         list_add(&block->alloc_node, &omap_dmm->alloc_head);
-        spin_unlock(&list_lock);
+        spin_unlock_irqrestore(&list_lock, flags);
 
         return block;
 }
@@ -365,6 +380,7 @@ struct tiler_block *tiler_reserve_1d(size_t size)
 {
         struct tiler_block *block = kzalloc(sizeof(*block), GFP_KERNEL);
         int num_pages = (size + PAGE_SIZE - 1) >> PAGE_SHIFT;
+        unsigned long flags;
 
         if (!block)
                 return ERR_PTR(-ENOMEM);
@@ -377,9 +393,9 @@ struct tiler_block *tiler_reserve_1d(size_t size)
                 return ERR_PTR(-ENOMEM);
         }
 
-        spin_lock(&list_lock);
+        spin_lock_irqsave(&list_lock, flags);
         list_add(&block->alloc_node, &omap_dmm->alloc_head);
-        spin_unlock(&list_lock);
+        spin_unlock_irqrestore(&list_lock, flags);
 
         return block;
 }
@@ -388,13 +404,14 @@ struct tiler_block *tiler_reserve_1d(size_t size)
 int tiler_release(struct tiler_block *block)
 {
         int ret = tcm_free(&block->area);
+        unsigned long flags;
 
         if (block->area.tcm)
                 dev_err(omap_dmm->dev, "failed to release block\n");
 
-        spin_lock(&list_lock);
+        spin_lock_irqsave(&list_lock, flags);
         list_del(&block->alloc_node);
-        spin_unlock(&list_lock);
+        spin_unlock_irqrestore(&list_lock, flags);
 
         kfree(block);
         return ret;
@@ -505,7 +522,7 @@ size_t tiler_vsize(enum tiler_fmt fmt, uint16_t w, uint16_t h)
         return round_up(geom[fmt].cpp * w, PAGE_SIZE) * h;
 }
 
-bool dmm_is_initialized(void)
+bool dmm_is_available(void)
 {
         return omap_dmm ? true : false;
 }
@@ -514,16 +531,17 @@ static int omap_dmm_remove(struct platform_device *dev)
 {
         struct tiler_block *block, *_block;
         int i;
+        unsigned long flags;
 
         if (omap_dmm) {
                 /* free all area regions */
-                spin_lock(&list_lock);
+                spin_lock_irqsave(&list_lock, flags);
                 list_for_each_entry_safe(block, _block, &omap_dmm->alloc_head,
                                         alloc_node) {
                         list_del(&block->alloc_node);
                         kfree(block);
                 }
-                spin_unlock(&list_lock);
+                spin_unlock_irqrestore(&list_lock, flags);
 
                 for (i = 0; i < omap_dmm->num_lut; i++)
                         if (omap_dmm->tcm && omap_dmm->tcm[i])
@@ -532,15 +550,13 @@ static int omap_dmm_remove(struct platform_device *dev)
 
                 kfree(omap_dmm->engines);
                 if (omap_dmm->refill_va)
-                        dma_free_coherent(omap_dmm->dev,
+                        dma_free_writecombine(omap_dmm->dev,
                                 REFILL_BUFFER_SIZE * omap_dmm->num_engines,
                                 omap_dmm->refill_va,
                                 omap_dmm->refill_pa);
                 if (omap_dmm->dummy_page)
                         __free_page(omap_dmm->dummy_page);
 
-                vfree(omap_dmm->lut);
-
                 if (omap_dmm->irq > 0)
                         free_irq(omap_dmm->irq, omap_dmm);
 
@@ -556,7 +572,7 @@ static int omap_dmm_probe(struct platform_device *dev)
 {
         int ret = -EFAULT, i;
         struct tcm_area area = {0};
-        u32 hwinfo, pat_geom, lut_table_size;
+        u32 hwinfo, pat_geom;
         struct resource *mem;
 
         omap_dmm = kzalloc(sizeof(*omap_dmm), GFP_KERNEL);
@@ -569,6 +585,8 @@ static int omap_dmm_probe(struct platform_device *dev)
         INIT_LIST_HEAD(&omap_dmm->alloc_head);
         INIT_LIST_HEAD(&omap_dmm->idle_head);
 
+        init_waitqueue_head(&omap_dmm->engine_queue);
+
         /* lookup hwmod data - base address and irq */
         mem = platform_get_resource(dev, IORESOURCE_MEM, 0);
         if (!mem) {
@@ -597,6 +615,8 @@ static int omap_dmm_probe(struct platform_device *dev)
         omap_dmm->container_width = 256;
         omap_dmm->container_height = 128;
 
+        atomic_set(&omap_dmm->engine_counter, omap_dmm->num_engines);
+
         /* read out actual LUT width and height */
         pat_geom = readl(omap_dmm->base + DMM_PAT_GEOMETRY);
         omap_dmm->lut_width = ((pat_geom >> 16) & 0xF) << 5;
@@ -628,16 +648,6 @@ static int omap_dmm_probe(struct platform_device *dev)
          */
         writel(0x7e7e7e7e, omap_dmm->base + DMM_PAT_IRQENABLE_SET);
 
-        lut_table_size = omap_dmm->lut_width * omap_dmm->lut_height *
-                        omap_dmm->num_lut;
-
-        omap_dmm->lut = vmalloc(lut_table_size * sizeof(*omap_dmm->lut));
-        if (!omap_dmm->lut) {
-                dev_err(&dev->dev, "could not allocate lut table\n");
-                ret = -ENOMEM;
-                goto fail;
-        }
-
         omap_dmm->dummy_page = alloc_page(GFP_KERNEL | __GFP_DMA32);
         if (!omap_dmm->dummy_page) {
                 dev_err(&dev->dev, "could not allocate dummy page\n");
@@ -652,7 +662,7 @@ static int omap_dmm_probe(struct platform_device *dev)
         omap_dmm->dummy_pa = page_to_phys(omap_dmm->dummy_page);
 
         /* alloc refill memory */
-        omap_dmm->refill_va = dma_alloc_coherent(&dev->dev,
+        omap_dmm->refill_va = dma_alloc_writecombine(&dev->dev,
                                 REFILL_BUFFER_SIZE * omap_dmm->num_engines,
                                 &omap_dmm->refill_pa, GFP_KERNEL);
         if (!omap_dmm->refill_va) {
@@ -670,7 +680,6 @@ static int omap_dmm_probe(struct platform_device *dev)
                 goto fail;
         }
 
-        sema_init(&omap_dmm->engine_sem, omap_dmm->num_engines);
         for (i = 0; i < omap_dmm->num_engines; i++) {
                 omap_dmm->engines[i].id = i;
                 omap_dmm->engines[i].dmm = omap_dmm;
@@ -720,9 +729,6 @@ static int omap_dmm_probe(struct platform_device *dev)
                 .p1.y = omap_dmm->container_height - 1,
         };
 
-        for (i = 0; i < lut_table_size; i++)
-                omap_dmm->lut[i] = omap_dmm->dummy_pa;
-
         /* initialize all LUTs to dummy page entries */
         for (i = 0; i < omap_dmm->num_lut; i++) {
                 area.tcm = omap_dmm->tcm[i];
diff --git a/drivers/staging/omapdrm/omap_dmm_tiler.h b/drivers/staging/omapdrm/omap_dmm_tiler.h
index 740911df5fc3..4fdd61e54bd2 100644
--- a/drivers/staging/omapdrm/omap_dmm_tiler.h
+++ b/drivers/staging/omapdrm/omap_dmm_tiler.h
@@ -16,7 +16,6 @@
 #ifndef OMAP_DMM_TILER_H
 #define OMAP_DMM_TILER_H
 
-#include <plat/cpu.h>
 #include "omap_drv.h"
 #include "tcm.h"
 
@@ -107,7 +106,7 @@ uint32_t tiler_stride(enum tiler_fmt fmt, uint32_t orient);
 size_t tiler_size(enum tiler_fmt fmt, uint16_t w, uint16_t h);
 size_t tiler_vsize(enum tiler_fmt fmt, uint16_t w, uint16_t h);
 void tiler_align(enum tiler_fmt fmt, uint16_t *w, uint16_t *h);
-bool dmm_is_initialized(void);
+bool dmm_is_available(void);
 
 extern struct platform_driver omap_dmm_driver;
 
@@ -139,9 +138,4 @@ static inline bool validfmt(enum tiler_fmt fmt)
         }
 }
 
-static inline int dmm_is_available(void)
-{
-        return cpu_is_omap44xx();
-}
-
 #endif
diff --git a/drivers/staging/omapdrm/omap_drv.c b/drivers/staging/omapdrm/omap_drv.c
index ebdb0b676737..d4823fd67768 100644
--- a/drivers/staging/omapdrm/omap_drv.c
+++ b/drivers/staging/omapdrm/omap_drv.c
@@ -30,8 +30,6 @@
 #define DRIVER_MINOR            0
 #define DRIVER_PATCHLEVEL       0
 
-struct drm_device *drm_device;
-
 static int num_crtc = CONFIG_DRM_OMAP_NUM_CRTCS;
 
 MODULE_PARM_DESC(num_crtc, "Number of overlays to use as CRTCs");
@@ -53,9 +51,8 @@ static void omap_fb_output_poll_changed(struct drm_device *dev)
 {
         struct omap_drm_private *priv = dev->dev_private;
         DBG("dev=%p", dev);
-        if (priv->fbdev) {
+        if (priv->fbdev)
                 drm_fb_helper_hotplug_event(priv->fbdev);
-        }
 }
 
 static const struct drm_mode_config_funcs omap_mode_config_funcs = {
@@ -87,9 +84,9 @@ static int omap_drm_notifier(struct notifier_block *nb,
         case OMAP_DSS_HOTPLUG_DISCONNECT: {
                 struct drm_device *dev = drm_device;
                 DBG("hotplug event: evt=%d, dev=%p", evt, dev);
-                if (dev) {
+                if (dev)
                         drm_sysfs_hotplug_event(dev);
-                }
+
                 return NOTIFY_OK;
         }
         default:  /* don't care about other events for now */
@@ -213,9 +210,9 @@ static int create_crtc(struct drm_device *dev, struct omap_overlay *ovl,
                         struct drm_encoder *encoder =
                                 omap_connector_attached_encoder(
                                                 priv->connectors[*j]);
-                        if (encoder) {
+                        if (encoder)
                                 mgr = omap_encoder_get_manager(encoder);
-                        }
+
                 }
                 (*j)++;
         }
@@ -234,9 +231,9 @@ static int create_crtc(struct drm_device *dev, struct omap_overlay *ovl,
                         struct drm_encoder *encoder =
                                 omap_connector_attached_encoder(
                                                 priv->connectors[idx]);
-                        if (encoder) {
+                        if (encoder)
                                 mgr = omap_encoder_get_manager(encoder);
-                        }
+
                 }
                 (*j)++;
         }
@@ -355,9 +352,8 @@ static int omap_modeset_init(struct drm_device *dev)
                  */
                 int max_overlays = min(omap_dss_get_num_overlays(), num_crtc);
 
-                for (i = 0; i < omap_dss_get_num_overlay_managers(); i++) {
+                for (i = 0; i < omap_dss_get_num_overlay_managers(); i++)
                         create_encoder(dev, omap_dss_get_overlay_manager(i));
-                }
 
                 for_each_dss_dev(dssdev) {
                         create_connector(dev, dssdev);
@@ -419,13 +415,14 @@ static void omap_modeset_free(struct drm_device *dev)
 static int ioctl_get_param(struct drm_device *dev, void *data,
                 struct drm_file *file_priv)
 {
+        struct omap_drm_private *priv = dev->dev_private;
         struct drm_omap_param *args = data;
 
         DBG("%p: param=%llu", dev, args->param);
 
         switch (args->param) {
         case OMAP_PARAM_CHIPSET_ID:
-                args->value = GET_OMAP_TYPE;
+                args->value = priv->omaprev;
                 break;
         default:
                 DBG("unknown parameter %lld", args->param);
@@ -469,15 +466,13 @@ static int ioctl_gem_cpu_prep(struct drm_device *dev, void *data,
         VERB("%p:%p: handle=%d, op=%x", dev, file_priv, args->handle, args->op);
 
         obj = drm_gem_object_lookup(dev, file_priv, args->handle);
-        if (!obj) {
+        if (!obj)
                 return -ENOENT;
-        }
 
         ret = omap_gem_op_sync(obj, args->op);
 
-        if (!ret) {
+        if (!ret)
                 ret = omap_gem_op_start(obj, args->op);
-        }
 
         drm_gem_object_unreference_unlocked(obj);
 
@@ -494,16 +489,14 @@ static int ioctl_gem_cpu_fini(struct drm_device *dev, void *data,
         VERB("%p:%p: handle=%d", dev, file_priv, args->handle);
 
         obj = drm_gem_object_lookup(dev, file_priv, args->handle);
-        if (!obj) {
+        if (!obj)
                 return -ENOENT;
-        }
 
         /* XXX flushy, flushy */
         ret = 0;
 
-        if (!ret) {
+        if (!ret)
                 ret = omap_gem_op_finish(obj, args->op);
-        }
 
         drm_gem_object_unreference_unlocked(obj);
 
@@ -520,9 +513,8 @@ static int ioctl_gem_info(struct drm_device *dev, void *data,
         DBG("%p:%p: handle=%d", dev, file_priv, args->handle);
 
         obj = drm_gem_object_lookup(dev, file_priv, args->handle);
-        if (!obj) {
+        if (!obj)
                 return -ENOENT;
-        }
 
         args->size = omap_gem_mmap_size(obj);
         args->offset = omap_gem_mmap_offset(obj);
@@ -557,19 +549,20 @@ struct drm_ioctl_desc ioctls[DRM_COMMAND_END - DRM_COMMAND_BASE] = {
  */
 static int dev_load(struct drm_device *dev, unsigned long flags)
 {
+        struct omap_drm_platform_data *pdata = dev->dev->platform_data;
         struct omap_drm_private *priv;
         int ret;
 
         DBG("load: dev=%p", dev);
 
-        drm_device = dev;
-
         priv = kzalloc(sizeof(*priv), GFP_KERNEL);
         if (!priv) {
                 dev_err(dev->dev, "could not allocate priv\n");
                 return -ENOMEM;
         }
 
+        priv->omaprev = pdata->omaprev;
+
         dev->dev_private = priv;
 
         priv->wq = alloc_ordered_workqueue("omapdrm", 0);
@@ -595,9 +588,8 @@ static int dev_load(struct drm_device *dev, unsigned long flags)
         drm_kms_helper_poll_init(dev);
 
         ret = drm_vblank_init(dev, priv->num_crtcs);
-        if (ret) {
+        if (ret)
                 dev_warn(dev->dev, "could not init vblank\n");
-        }
 
         return 0;
 }
@@ -659,19 +651,22 @@ static void dev_lastclose(struct drm_device *dev)
 
         DBG("lastclose: dev=%p", dev);
 
-        /* need to restore default rotation state.. not sure if there is
-         * a cleaner way to restore properties to default state?  Maybe
-         * a flag that properties should automatically be restored to
-         * default state on lastclose?
-         */
-        for (i = 0; i < priv->num_crtcs; i++) {
-                drm_object_property_set_value(&priv->crtcs[i]->base,
-                                priv->rotation_prop, 0);
-        }
+        if (priv->rotation_prop) {
+                /* need to restore default rotation state.. not sure
+                 * if there is a cleaner way to restore properties to
+                 * default state?  Maybe a flag that properties should
+                 * automatically be restored to default state on
+                 * lastclose?
+                 */
+                for (i = 0; i < priv->num_crtcs; i++) {
+                        drm_object_property_set_value(&priv->crtcs[i]->base,
+                                        priv->rotation_prop, 0);
+                }
 
-        for (i = 0; i < priv->num_planes; i++) {
-                drm_object_property_set_value(&priv->planes[i]->base,
-                                priv->rotation_prop, 0);
+                for (i = 0; i < priv->num_planes; i++) {
+                        drm_object_property_set_value(&priv->planes[i]->base,
+                                        priv->rotation_prop, 0);
+                }
         }
 
         ret = drm_fb_helper_restore_fbdev_mode(priv->fbdev);
diff --git a/drivers/staging/omapdrm/omap_drv.h b/drivers/staging/omapdrm/omap_drv.h
index 9dc72d143ff3..1d4aea53b75d 100644
--- a/drivers/staging/omapdrm/omap_drv.h
+++ b/drivers/staging/omapdrm/omap_drv.h
@@ -40,6 +40,8 @@
 #define MAX_MAPPERS 2
 
 struct omap_drm_private {
+        uint32_t omaprev;
+
         unsigned int num_crtcs;
         struct drm_crtc *crtcs[8];
 
@@ -189,9 +191,9 @@ size_t omap_gem_mmap_size(struct drm_gem_object *obj);
 int omap_gem_tiled_size(struct drm_gem_object *obj, uint16_t *w, uint16_t *h);
 int omap_gem_tiled_stride(struct drm_gem_object *obj, uint32_t orient);
 
-struct dma_buf * omap_gem_prime_export(struct drm_device *dev,
+struct dma_buf *omap_gem_prime_export(struct drm_device *dev,
                 struct drm_gem_object *obj, int flags);
-struct drm_gem_object * omap_gem_prime_import(struct drm_device *dev,
+struct drm_gem_object *omap_gem_prime_import(struct drm_device *dev,
                 struct dma_buf *buffer);
 
 static inline int align_pitch(int pitch, int width, int bpp)
@@ -216,17 +218,17 @@ static inline int objects_lookup(struct drm_device *dev,
 
         for (i = 0; i < n; i++) {
                 bos[i] = drm_gem_object_lookup(dev, filp, handles[i]);
-                if (!bos[i]) {
+                if (!bos[i])
                         goto fail;
-                }
+
         }
 
         return 0;
 
 fail:
-        while (--i > 0) {
+        while (--i > 0)
                 drm_gem_object_unreference_unlocked(bos[i]);
-        }
+
         return -ENOENT;
 }
 
diff --git a/drivers/staging/omapdrm/omap_encoder.c b/drivers/staging/omapdrm/omap_encoder.c
index 31c735d39217..5341d5e3e317 100644
--- a/drivers/staging/omapdrm/omap_encoder.c
+++ b/drivers/staging/omapdrm/omap_encoder.c
@@ -72,9 +72,9 @@ static void omap_encoder_mode_set(struct drm_encoder *encoder,
 
         for (i = 0; i < priv->num_connectors; i++) {
                 struct drm_connector *connector = priv->connectors[i];
-                if (connector->encoder == encoder) {
+                if (connector->encoder == encoder)
                         omap_connector_mode_set(connector, mode);
-                }
+
         }
 }
 
@@ -163,9 +163,8 @@ struct drm_encoder *omap_encoder_init(struct drm_device *dev,
         return encoder;
 
 fail:
-        if (encoder) {
+        if (encoder)
                 omap_encoder_destroy(encoder);
-        }
 
         return NULL;
 }
diff --git a/drivers/staging/omapdrm/omap_fb.c b/drivers/staging/omapdrm/omap_fb.c
index 446801d63007..09028e9c1093 100644
--- a/drivers/staging/omapdrm/omap_fb.c
+++ b/drivers/staging/omapdrm/omap_fb.c
@@ -253,6 +253,7 @@ int omap_framebuffer_replace(struct drm_framebuffer *a,
         int ret = 0, i, na, nb;
         struct omap_framebuffer *ofba = to_omap_framebuffer(a);
         struct omap_framebuffer *ofbb = to_omap_framebuffer(b);
+        uint32_t pinned_mask = 0;
 
         na = a ? drm_format_num_planes(a->pixel_format) : 0;
         nb = b ? drm_format_num_planes(b->pixel_format) : 0;
@@ -263,25 +264,24 @@ int omap_framebuffer_replace(struct drm_framebuffer *a,
                 pa = (i < na) ? &ofba->planes[i] : NULL;
                 pb = (i < nb) ? &ofbb->planes[i] : NULL;
 
-                if (pa) {
+                if (pa)
                         unpin(arg, pa->bo);
-                        pa->paddr = 0;
-                }
 
                 if (pb && !ret) {
                         ret = omap_gem_get_paddr(pb->bo, &pb->paddr, true);
-                        if (!ret)
+                        if (!ret) {
                                 omap_gem_dma_sync(pb->bo, DMA_TO_DEVICE);
+                                pinned_mask |= (1 << i);
+                        }
                 }
         }
 
         if (ret) {
                 /* something went wrong.. unpin what has been pinned */
                 for (i = 0; i < nb; i++) {
-                        struct plane *pb = &ofba->planes[i];
-                        if (pb->paddr) {
+                        if (pinned_mask & (1 << i)) {
+                                struct plane *pb = &ofba->planes[i];
                                 unpin(arg, pb->bo);
-                                pb->paddr = 0;
                         }
                 }
         }
@@ -307,17 +307,16 @@ struct drm_connector *omap_framebuffer_get_next_connector(
         struct list_head *connector_list = &dev->mode_config.connector_list;
         struct drm_connector *connector = from;
 
-        if (!from) {
+        if (!from)
                 return list_first_entry(connector_list, typeof(*from), head);
-        }
 
         list_for_each_entry_from(connector, connector_list, head) {
                 if (connector != from) {
                         struct drm_encoder *encoder = connector->encoder;
                         struct drm_crtc *crtc = encoder ? encoder->crtc : NULL;
-                        if (crtc && crtc->fb == fb) {
+                        if (crtc && crtc->fb == fb)
                                 return connector;
-                        }
+
                 }
         }
 
@@ -466,8 +465,8 @@ struct drm_framebuffer *omap_framebuffer_init(struct drm_device *dev,
         return fb;
 
 fail:
-        if (fb) {
+        if (fb)
                 omap_framebuffer_destroy(fb);
-        }
+
         return ERR_PTR(ret);
 }
diff --git a/drivers/staging/omapdrm/omap_gem.c b/drivers/staging/omapdrm/omap_gem.c
index 66e2c2f8a239..c38992b76fc9 100644
--- a/drivers/staging/omapdrm/omap_gem.c
+++ b/drivers/staging/omapdrm/omap_gem.c
@@ -25,7 +25,7 @@
 #include "omap_dmm_tiler.h"
 
 /* remove these once drm core helpers are merged */
-struct page ** _drm_gem_get_pages(struct drm_gem_object *obj, gfp_t gfpmask);
+struct page **_drm_gem_get_pages(struct drm_gem_object *obj, gfp_t gfpmask);
 void _drm_gem_put_pages(struct drm_gem_object *obj, struct page **pages,
                 bool dirty, bool accessed);
 int _drm_gem_create_mmap_offset_size(struct drm_gem_object *obj, size_t size);
@@ -521,9 +521,8 @@ int omap_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
 
         /* if a shmem backed object, make sure we have pages attached now */
         ret = get_pages(obj, &pages);
-        if (ret) {
+        if (ret)
                 goto fail;
-        }
 
         /* where should we do corresponding put_pages().. we are mapping
          * the original page, rather than thru a GART, so we can't rely
@@ -953,7 +952,7 @@ int omap_gem_put_pages(struct drm_gem_object *obj)
 void *omap_gem_vaddr(struct drm_gem_object *obj)
 {
         struct omap_gem_object *omap_obj = to_omap_bo(obj);
-        WARN_ON(! mutex_is_locked(&obj->dev->struct_mutex));
+        WARN_ON(!mutex_is_locked(&obj->dev->struct_mutex));
         if (!omap_obj->vaddr) {
                 struct page **pages;
                 int ret = get_pages(obj, &pages);
@@ -972,7 +971,7 @@ void omap_gem_describe(struct drm_gem_object *obj, struct seq_file *m)
         struct omap_gem_object *omap_obj = to_omap_bo(obj);
         uint64_t off = 0;
 
-        WARN_ON(! mutex_is_locked(&dev->struct_mutex));
+        WARN_ON(!mutex_is_locked(&dev->struct_mutex));
 
         if (obj->map_list.map)
                 off = (uint64_t)obj->map_list.hash.key;
@@ -1146,9 +1145,8 @@ int omap_gem_op_sync(struct drm_gem_object *obj, enum omap_gem_op op)
                 struct omap_gem_sync_waiter *waiter =
                                 kzalloc(sizeof(*waiter), GFP_KERNEL);
 
-                if (!waiter) {
+                if (!waiter)
                         return -ENOMEM;
-                }
 
                 waiter->omap_obj = omap_obj;
                 waiter->op = op;
@@ -1177,9 +1175,8 @@ int omap_gem_op_sync(struct drm_gem_object *obj, enum omap_gem_op op)
                 }
                 spin_unlock(&sync_lock);
 
-                if (waiter) {
+                if (waiter)
                         kfree(waiter);
-                }
         }
         return ret;
 }
@@ -1201,9 +1198,8 @@ int omap_gem_op_async(struct drm_gem_object *obj, enum omap_gem_op op,
                 struct omap_gem_sync_waiter *waiter =
                                 kzalloc(sizeof(*waiter), GFP_ATOMIC);
 
-                if (!waiter) {
+                if (!waiter)
                         return -ENOMEM;
-                }
 
                 waiter->omap_obj = omap_obj;
                 waiter->op = op;
@@ -1285,9 +1281,8 @@ void omap_gem_free_object(struct drm_gem_object *obj)
 
         list_del(&omap_obj->mm_list);
 
-        if (obj->map_list.map) {
+        if (obj->map_list.map)
                 drm_gem_free_mmap_offset(obj);
-        }
 
         /* this means the object is still pinned.. which really should
          * not happen.  I think..
@@ -1296,9 +1291,9 @@ void omap_gem_free_object(struct drm_gem_object *obj)
 
         /* don't free externally allocated backing memory */
         if (!(omap_obj->flags & OMAP_BO_EXT_MEM)) {
-                if (omap_obj->pages) {
+                if (omap_obj->pages)
                         omap_gem_detach_pages(obj);
-                }
+
                 if (!is_shmem(obj)) {
                         dma_free_writecombine(dev->dev, obj->size,
                                         omap_obj->vaddr, omap_obj->paddr);
@@ -1308,9 +1303,8 @@ void omap_gem_free_object(struct drm_gem_object *obj)
         }
 
         /* don't free externally allocated syncobj */
-        if (!(omap_obj->flags & OMAP_BO_EXT_SYNC)) {
+        if (!(omap_obj->flags & OMAP_BO_EXT_SYNC))
                 kfree(omap_obj->sync);
-        }
 
         drm_gem_object_release(obj);
 
@@ -1395,9 +1389,9 @@ struct drm_gem_object *omap_gem_new(struct drm_device *dev,
                  */
                 omap_obj->vaddr =  dma_alloc_writecombine(dev->dev, size,
                                 &omap_obj->paddr, GFP_KERNEL);
-                if (omap_obj->vaddr) {
+                if (omap_obj->vaddr)
                         flags |= OMAP_BO_DMA;
-                }
+
         }
 
         omap_obj->flags = flags;
@@ -1407,22 +1401,20 @@ struct drm_gem_object *omap_gem_new(struct drm_device *dev,
                 omap_obj->height = gsize.tiled.height;
         }
 
-        if (flags & (OMAP_BO_DMA|OMAP_BO_EXT_MEM)) {
+        if (flags & (OMAP_BO_DMA|OMAP_BO_EXT_MEM))
                 ret = drm_gem_private_object_init(dev, obj, size);
-        } else {
+        else
                 ret = drm_gem_object_init(dev, obj, size);
-        }
 
-        if (ret) {
+        if (ret)
                 goto fail;
-        }
 
         return obj;
 
 fail:
-        if (obj) {
+        if (obj)
                 omap_gem_free_object(obj);
-        }
+
         return NULL;
 }
 
@@ -1435,7 +1427,7 @@ void omap_gem_init(struct drm_device *dev)
         };
         int i, j;
 
-        if (!dmm_is_initialized()) {
+        if (!dmm_is_available()) {
                 /* DMM only supported on OMAP4 and later, so this isn't fatal */
                 dev_warn(dev->dev, "DMM not available, disable DMM support\n");
                 return;
diff --git a/drivers/staging/omapdrm/omap_gem_dmabuf.c b/drivers/staging/omapdrm/omap_gem_dmabuf.c
index c6f3ef6f57b9..9a302062b031 100644
--- a/drivers/staging/omapdrm/omap_gem_dmabuf.c
+++ b/drivers/staging/omapdrm/omap_gem_dmabuf.c
@@ -191,13 +191,13 @@ struct dma_buf_ops omap_dmabuf_ops = {
                 .mmap = omap_gem_dmabuf_mmap,
 };
 
-struct dma_buf * omap_gem_prime_export(struct drm_device *dev,
+struct dma_buf *omap_gem_prime_export(struct drm_device *dev,
                 struct drm_gem_object *obj, int flags)
 {
         return dma_buf_export(obj, &omap_dmabuf_ops, obj->size, 0600);
 }
 
-struct drm_gem_object * omap_gem_prime_import(struct drm_device *dev,
+struct drm_gem_object *omap_gem_prime_import(struct drm_device *dev,
                 struct dma_buf *buffer)
 {
         struct drm_gem_object *obj;
diff --git a/drivers/staging/omapdrm/omap_gem_helpers.c b/drivers/staging/omapdrm/omap_gem_helpers.c
index f895363a5e54..ffb8cceaeb46 100644
--- a/drivers/staging/omapdrm/omap_gem_helpers.c
+++ b/drivers/staging/omapdrm/omap_gem_helpers.c
@@ -32,7 +32,7 @@
  * @obj: obj in question
  * @gfpmask: gfp mask of requested pages
  */
-struct page ** _drm_gem_get_pages(struct drm_gem_object *obj, gfp_t gfpmask)
+struct page **_drm_gem_get_pages(struct drm_gem_object *obj, gfp_t gfpmask)
 {
         struct inode *inode;
         struct address_space *mapping;
@@ -80,9 +80,9 @@ struct page ** _drm_gem_get_pages(struct drm_gem_object *obj, gfp_t gfpmask)
         return pages;
 
 fail:
-        while (i--) {
+        while (i--)
                 page_cache_release(pages[i]);
-        }
+
         drm_free_large(pages);
         return ERR_CAST(p);
 }
diff --git a/drivers/staging/omapdrm/omap_plane.c b/drivers/staging/omapdrm/omap_plane.c
index 4bde639dd02c..2a8e5bab49c9 100644
--- a/drivers/staging/omapdrm/omap_plane.c
+++ b/drivers/staging/omapdrm/omap_plane.c
@@ -416,26 +416,28 @@ void omap_plane_install_properties(struct drm_plane *plane,
         struct omap_drm_private *priv = dev->dev_private;
         struct drm_property *prop;
 
-        prop = priv->rotation_prop;
-        if (!prop) {
-                const struct drm_prop_enum_list props[] = {
-                                { DRM_ROTATE_0,   "rotate-0" },
-                                { DRM_ROTATE_90,  "rotate-90" },
-                                { DRM_ROTATE_180, "rotate-180" },
-                                { DRM_ROTATE_270, "rotate-270" },
-                                { DRM_REFLECT_X,  "reflect-x" },
-                                { DRM_REFLECT_Y,  "reflect-y" },
-                };
-                prop = drm_property_create_bitmask(dev, 0, "rotation",
-                                props, ARRAY_SIZE(props));
-                if (prop == NULL)
-                        return;
-                priv->rotation_prop = prop;
+        if (priv->has_dmm) {
+                prop = priv->rotation_prop;
+                if (!prop) {
+                        const struct drm_prop_enum_list props[] = {
+                                        { DRM_ROTATE_0,   "rotate-0" },
+                                        { DRM_ROTATE_90,  "rotate-90" },
+                                        { DRM_ROTATE_180, "rotate-180" },
+                                        { DRM_ROTATE_270, "rotate-270" },
+                                        { DRM_REFLECT_X,  "reflect-x" },
+                                        { DRM_REFLECT_Y,  "reflect-y" },
+                        };
+                        prop = drm_property_create_bitmask(dev, 0, "rotation",
+                                        props, ARRAY_SIZE(props));
+                        if (prop == NULL)
+                                return;
+                        priv->rotation_prop = prop;
+                }
+                drm_object_attach_property(obj, prop, 0);
         }
-        drm_object_attach_property(obj, prop, 0);
 
-        prop = priv->zorder_prop;
-        if (!prop) {
+        prop = priv->zorder_prop;
+        if (!prop) {
                 prop = drm_property_create_range(dev, 0, "zorder", 0, 3);
                 if (prop == NULL)
                         return;
@@ -549,8 +551,8 @@ struct drm_plane *omap_plane_init(struct drm_device *dev,
         return plane;
 
 fail:
-        if (plane) {
+        if (plane)
                 omap_plane_destroy(plane);
-        }
+
         return NULL;
 }
diff --git a/drivers/staging/ozwpan/ozevent.c b/drivers/staging/ozwpan/ozevent.c
index a48498bd9b5f..50578ba0061c 100644
--- a/drivers/staging/ozwpan/ozevent.c
+++ b/drivers/staging/ozwpan/ozevent.c
@@ -79,6 +79,7 @@ void oz_event_log2(u8 evt, u8 ctx1, u16 ctx2, void *ctx3, unsigned ctx4)
 /*------------------------------------------------------------------------------
  * Context: process
  */
+#ifdef CONFIG_DEBUG_FS
 static void oz_events_clear(struct oz_evtdev *dev)
 {
         unsigned long irqstate;
@@ -88,7 +89,6 @@ static void oz_events_clear(struct oz_evtdev *dev)
         dev->missed_events = 0;
         spin_unlock_irqrestore(&dev->lock, irqstate);
 }
-#ifdef CONFIG_DEBUG_FS
 /*------------------------------------------------------------------------------
  * Context: process
  */
diff --git a/drivers/staging/ozwpan/ozhcd.c b/drivers/staging/ozwpan/ozhcd.c
index 2e087acf1578..b2d77df2a526 100644
--- a/drivers/staging/ozwpan/ozhcd.c
+++ b/drivers/staging/ozwpan/ozhcd.c
@@ -278,8 +278,7 @@ static void oz_free_urb_link(struct oz_urb_link *urbl)
                         g_link_pool_size++;
                 }
                 spin_unlock_irqrestore(&g_link_lock, irq_state);
-                if (urbl)
-                        kfree(urbl);
+                kfree(urbl);
         }
 }
 /*------------------------------------------------------------------------------
@@ -2304,8 +2303,8 @@ error:
  */
 void oz_hcd_term(void)
 {
-        tasklet_disable(&g_urb_process_tasklet);
-        tasklet_disable(&g_urb_cancel_tasklet);
+        tasklet_kill(&g_urb_process_tasklet);
+        tasklet_kill(&g_urb_cancel_tasklet);
         platform_device_unregister(g_plat_dev);
         platform_driver_unregister(&g_oz_plat_drv);
         oz_trace("Pending urbs:%d\n", atomic_read(&g_pending_urbs));
diff --git a/drivers/staging/ozwpan/ozpd.c b/drivers/staging/ozwpan/ozpd.c
index 0b3648ce9687..118a4db74dec 100644
--- a/drivers/staging/ozwpan/ozpd.c
+++ b/drivers/staging/ozwpan/ozpd.c
@@ -402,8 +402,7 @@ static void oz_tx_frame_free(struct oz_pd *pd, struct oz_tx_frame *f)
                 f = 0;
         }
         spin_unlock_bh(&pd->tx_frame_lock);
-        if (f)
-                kfree(f);
+        kfree(f);
 }
 /*------------------------------------------------------------------------------
  * Context: softirq-serialized
@@ -737,8 +736,7 @@ int oz_isoc_stream_create(struct oz_pd *pd, u8 ep_num)
                 st = 0;
         }
         spin_unlock_bh(&pd->stream_lock);
-        if (st)
-                kfree(st);
+        kfree(st);
         return 0;
 }
 /*------------------------------------------------------------------------------
diff --git a/drivers/staging/ozwpan/ozproto.c b/drivers/staging/ozwpan/ozproto.c
index cfb5160d1ebe..e00a53915daa 100644
--- a/drivers/staging/ozwpan/ozproto.c
+++ b/drivers/staging/ozwpan/ozproto.c
@@ -566,8 +566,7 @@ static void oz_protocol_timer(unsigned long arg)
                 }
                 spin_unlock_bh(&g_polling_lock);
                 oz_pd_put(pd);
-                if (t)
-                        kfree(t);
+                kfree(t);
                 t = t2;
         } while (t);
         g_timer_state = OZ_TIMER_IDLE;
diff --git a/drivers/staging/panel/panel.c b/drivers/staging/panel/panel.c
index 6e9f7090c451..e3113ecefefd 100644
--- a/drivers/staging/panel/panel.c
+++ b/drivers/staging/panel/panel.c
@@ -1758,7 +1758,7 @@ static inline int input_state_high(struct logical_input *input)
                                 char *press_str = input->u.kbd.press_str;
                                 if (press_str[0])
                                         keypad_send_key(press_str,
-                                                        sizeof(press_str));
+                                                        sizeof(input->u.kbd.press_str));
                         }
 
                         if (input->u.kbd.repeat_str[0]) {
@@ -1766,7 +1766,7 @@ static inline int input_state_high(struct logical_input *input)
                                 if (input->high_timer >= KEYPAD_REP_START) {
                                         input->high_timer -= KEYPAD_REP_DELAY;
                                         keypad_send_key(repeat_str,
-                                                        sizeof(repeat_str));
+                                                        sizeof(input->u.kbd.repeat_str));
                                 }
                                 /* we will need to come back here soon */
                                 inputs_stable = 0;
@@ -1805,7 +1805,7 @@ static inline void input_state_falling(struct logical_input *input)
                                 if (input->high_timer >= KEYPAD_REP_START)
                                         input->high_timer -= KEYPAD_REP_DELAY;
                                         keypad_send_key(repeat_str,
-                                                        sizeof(repeat_str));
+                                                        sizeof(input->u.kbd.repeat_str));
                                 /* we will need to come back here soon */
                                 inputs_stable = 0;
                         }
@@ -1824,7 +1824,7 @@ static inline void input_state_falling(struct logical_input *input)
                         char *release_str = input->u.kbd.release_str;
                         if (release_str[0])
                                 keypad_send_key(release_str,
-                                                sizeof(release_str));
+                                                sizeof(input->u.kbd.release_str));
                 }
 
                 input->state = INPUT_ST_LOW;
diff --git a/drivers/staging/rtl8187se/ieee80211/ieee80211.h b/drivers/staging/rtl8187se/ieee80211/ieee80211.h
index 5f5a30223d56..8fc9f588b056 100644
--- a/drivers/staging/rtl8187se/ieee80211/ieee80211.h
+++ b/drivers/staging/rtl8187se/ieee80211/ieee80211.h
@@ -1221,7 +1221,7 @@ static inline void *ieee80211_priv(struct net_device *dev)
         return ((struct ieee80211_device *)netdev_priv(dev))->priv;
 }
 
-extern inline int ieee80211_is_empty_essid(const char *essid, int essid_len)
+static inline int ieee80211_is_empty_essid(const char *essid, int essid_len)
 {
         /* Single white space is for Linksys APs */
         if (essid_len == 1 && essid[0] == ' ')
@@ -1237,7 +1237,7 @@ extern inline int ieee80211_is_empty_essid(const char *essid, int essid_len)
         return 1;
 }
 
-extern inline int ieee80211_is_valid_mode(struct ieee80211_device *ieee, int mode)
+static inline int ieee80211_is_valid_mode(struct ieee80211_device *ieee, int mode)
 {
         /*
          * It is possible for both access points and our device to support
@@ -1263,7 +1263,7 @@ extern inline int ieee80211_is_valid_mode(struct ieee80211_device *ieee, int mod
         return 0;
 }
 
-extern inline int ieee80211_get_hdrlen(u16 fc)
+static inline int ieee80211_get_hdrlen(u16 fc)
 {
         int hdrlen = 24;
 
diff --git a/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt.c b/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt.c
index b3882ae9d974..694eae3d4fda 100644
--- a/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt.c
+++ b/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt.c
@@ -11,12 +11,14 @@
  *
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 //#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>
-#include <asm/string.h>
-#include <asm/errno.h>
+#include <linux/string.h>
+#include <linux/errno.h>
 
 #include "ieee80211.h"
 
@@ -66,8 +68,7 @@ void ieee80211_crypt_deinit_handler(unsigned long data)
         spin_lock_irqsave(&ieee->lock, flags);
         ieee80211_crypt_deinit_entries(ieee, 0);
         if (!list_empty(&ieee->crypt_deinit_list)) {
-                printk(KERN_DEBUG "%s: entries remaining in delayed crypt "
-                       "deletion list\n", ieee->dev->name);
+                pr_debug("entries remaining in delayed crypt deletion list\n");
                 ieee->crypt_deinit_timer.expires = jiffies + HZ;
                 add_timer(&ieee->crypt_deinit_timer);
         }
@@ -118,8 +119,7 @@ int ieee80211_register_crypto_ops(struct ieee80211_crypto_ops *ops)
         list_add(&alg->list, &hcrypt->algs);
         spin_unlock_irqrestore(&hcrypt->lock, flags);
 
-        printk(KERN_DEBUG "ieee80211_crypt: registered algorithm '%s'\n",
-               ops->name);
+        pr_debug("registered algorithm '%s'\n", ops->name);
 
         return 0;
 }
@@ -146,8 +146,7 @@ int ieee80211_unregister_crypto_ops(struct ieee80211_crypto_ops *ops)
         spin_unlock_irqrestore(&hcrypt->lock, flags);
 
         if (del_alg) {
-                printk(KERN_DEBUG "ieee80211_crypt: unregistered algorithm "
-                       "'%s'\n", ops->name);
+                pr_debug("unregistered algorithm '%s'\n", ops->name);
                 kfree(del_alg);
         }
 
@@ -155,7 +154,7 @@ int ieee80211_unregister_crypto_ops(struct ieee80211_crypto_ops *ops)
 }
 
 
-struct ieee80211_crypto_ops * ieee80211_get_crypto_ops(const char *name)
+struct ieee80211_crypto_ops *ieee80211_get_crypto_ops(const char *name)
 {
         unsigned long flags;
         struct list_head *ptr;
@@ -182,7 +181,7 @@ struct ieee80211_crypto_ops * ieee80211_get_crypto_ops(const char *name)
 }
 
 
-static void * ieee80211_crypt_null_init(int keyidx) { return (void *) 1; }
+static void *ieee80211_crypt_null_init(int keyidx) { return (void *) 1; }
 static void ieee80211_crypt_null_deinit(void *priv) {}
 
 static struct ieee80211_crypto_ops ieee80211_crypt_null = {
@@ -234,9 +233,8 @@ void ieee80211_crypto_deinit(void)
                 alg = list_entry(ptr, struct ieee80211_crypto_alg, list);
                 if (alg) {
                         list_del(ptr);
-                        printk(KERN_DEBUG
-                               "ieee80211_crypt: unregistered algorithm '%s' (deinit)\n",
-                               alg->ops->name);
+                        pr_debug("unregistered algorithm '%s' (deinit)\n",
+                                 alg->ops->name);
                         kfree(alg);
                 }
         }
diff --git a/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt.h b/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt.h
index b58a3bcc0dc0..0b4ea431982d 100644
--- a/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt.h
+++ b/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt.h
@@ -77,7 +77,7 @@ struct ieee80211_crypt_data {
 
 int ieee80211_register_crypto_ops(struct ieee80211_crypto_ops *ops);
 int ieee80211_unregister_crypto_ops(struct ieee80211_crypto_ops *ops);
-struct ieee80211_crypto_ops * ieee80211_get_crypto_ops(const char *name);
+struct ieee80211_crypto_ops *ieee80211_get_crypto_ops(const char *name);
 void ieee80211_crypt_deinit_entries(struct ieee80211_device *, int);
 void ieee80211_crypt_deinit_handler(unsigned long);
 void ieee80211_crypt_delayed_deinit(struct ieee80211_device *ieee,
diff --git a/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_ccmp.c b/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_ccmp.c
index 6aaaa2fd57f4..f5949e89e5c2 100644
--- a/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_ccmp.c
+++ b/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_ccmp.c
@@ -9,6 +9,8 @@
  * more details.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 //#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
@@ -18,7 +20,7 @@
 #include <linux/netdevice.h>
 #include <linux/if_ether.h>
 #include <linux/if_arp.h>
-#include <asm/string.h>
+#include <linux/string.h>
 #include <linux/wireless.h>
 
 #include "ieee80211.h"
@@ -64,7 +66,7 @@ void ieee80211_ccmp_aes_encrypt(struct crypto_tfm *tfm,
         crypto_cipher_encrypt_one((void *)tfm, ct, pt);
 }
 
-static void * ieee80211_ccmp_init(int key_idx)
+static void *ieee80211_ccmp_init(int key_idx)
 {
         struct ieee80211_ccmp_data *priv;
 
@@ -75,8 +77,7 @@ static void * ieee80211_ccmp_init(int key_idx)
 
         priv->tfm = (void *)crypto_alloc_cipher("aes", 0, CRYPTO_ALG_ASYNC);
         if (IS_ERR(priv->tfm)) {
-                printk(KERN_DEBUG "ieee80211_crypt_ccmp: could not allocate "
-                       "crypto API aes\n");
+                pr_debug("could not allocate crypto API aes\n");
                 priv->tfm = NULL;
                 goto fail;
         }
@@ -128,7 +129,7 @@ static void ccmp_init_blocks(struct crypto_tfm *tfm,
         /*
         qc_included = ((WLAN_FC_GET_TYPE(fc) == IEEE80211_FTYPE_DATA) &&
                        (WLAN_FC_GET_STYPE(fc) & 0x08));
-        */
+        */
         // fixed by David :2006.9.6
         qc_included = ((WLAN_FC_GET_TYPE(fc) == IEEE80211_FTYPE_DATA) &&
                        (WLAN_FC_GET_STYPE(fc) & 0x80));
@@ -282,23 +283,22 @@ static int ieee80211_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
         keyidx = pos[3];
         if (!(keyidx & (1 << 5))) {
                 if (net_ratelimit()) {
-                        printk(KERN_DEBUG "CCMP: received packet without ExtIV"
-                               " flag from %pM\n", hdr->addr2);
+                        pr_debug("received packet without ExtIV flag from %pM\n",
+                                 hdr->addr2);
                 }
                 key->dot11RSNAStatsCCMPFormatErrors++;
                 return -2;
         }
         keyidx >>= 6;
         if (key->key_idx != keyidx) {
-                printk(KERN_DEBUG "CCMP: RX tkey->key_idx=%d frame "
-                       "keyidx=%d priv=%p\n", key->key_idx, keyidx, priv);
+                pr_debug("RX tkey->key_idx=%d frame keyidx=%d priv=%p\n",
+                         key->key_idx, keyidx, priv);
                 return -6;
         }
         if (!key->key_set) {
                 if (net_ratelimit()) {
-                        printk(KERN_DEBUG "CCMP: received packet from %pM"
-                               " with keyid=%d that does not have a configured"
-                               " key\n", hdr->addr2, keyidx);
+                        pr_debug("received packet from %pM with keyid=%d that does not have a configured key\n",
+                                 hdr->addr2, keyidx);
                 }
                 return -3;
         }
@@ -313,9 +313,8 @@ static int ieee80211_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
 
         if (memcmp(pn, key->rx_pn, CCMP_PN_LEN) <= 0) {
                 if (net_ratelimit()) {
-                        printk(KERN_DEBUG "CCMP: replay detected: STA=%pM"
-                               " previous PN %pm received PN %pm\n",
-                               hdr->addr2, key->rx_pn, pn);
+                        pr_debug("replay detected: STA=%pM previous PN %pm received PN %pm\n",
+                                 hdr->addr2, key->rx_pn, pn);
                 }
                 key->dot11RSNAStatsCCMPReplays++;
                 return -4;
@@ -341,10 +340,9 @@ static int ieee80211_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
         }
 
         if (memcmp(mic, a, CCMP_MIC_LEN) != 0) {
-                if (net_ratelimit()) {
-                        printk(KERN_DEBUG "CCMP: decrypt failed: STA="
-                               "%pM\n", hdr->addr2);
-                }
+                if (net_ratelimit())
+                        pr_debug("decrypt failed: STA=%pM\n", hdr->addr2);
+
                 key->dot11RSNAStatsCCMPDecryptErrors++;
                 return -5;
         }
@@ -415,7 +413,7 @@ static int ieee80211_ccmp_get_key(void *key, int len, u8 *seq, void *priv)
 }
 
 
-static char * ieee80211_ccmp_print_stats(char *p, void *priv)
+static char *ieee80211_ccmp_print_stats(char *p, void *priv)
 {
         struct ieee80211_ccmp_data *ccmp = priv;
         p += sprintf(p, "key[%d] alg=CCMP key_set=%d "
diff --git a/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_wep.c b/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_wep.c
index 58f3eeb2143e..bba77141d9a3 100644
--- a/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_wep.c
+++ b/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_wep.c
@@ -9,13 +9,15 @@
  * more details.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 //#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/random.h>
 #include <linux/skbuff.h>
-#include <asm/string.h>
+#include <linux/string.h>
 
 #include "ieee80211.h"
 
@@ -40,7 +42,7 @@ struct prism2_wep_data {
 };
 
 
-static void * prism2_wep_init(int keyidx)
+static void *prism2_wep_init(int keyidx)
 {
         struct prism2_wep_data *priv;
 
@@ -50,15 +52,13 @@ static void * prism2_wep_init(int keyidx)
         priv->key_idx = keyidx;
         priv->tx_tfm = crypto_alloc_blkcipher("ecb(arc4)", 0, CRYPTO_ALG_ASYNC);
         if (IS_ERR(priv->tx_tfm)) {
-                printk(KERN_DEBUG "ieee80211_crypt_wep: could not allocate "
-                       "crypto API arc4\n");
+                pr_debug("could not allocate crypto API arc4\n");
                 priv->tx_tfm = NULL;
                 goto fail;
         }
         priv->rx_tfm = crypto_alloc_blkcipher("ecb(arc4)", 0, CRYPTO_ALG_ASYNC);
         if (IS_ERR(priv->rx_tfm)) {
-                printk(KERN_DEBUG "ieee80211_crypt_wep: could not allocate "
-                       "crypto API arc4\n");
+                pr_debug("could not allocate crypto API arc4\n");
                 priv->rx_tfm = NULL;
                 goto fail;
         }
@@ -217,7 +217,7 @@ static int prism2_wep_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
         memmove(skb->data + 4, skb->data, hdr_len);
         skb_pull(skb, 4);
         skb_trim(skb, skb->len - 4);
-        return 0;
+        return 0;
 }
 
 
@@ -248,7 +248,7 @@ static int prism2_wep_get_key(void *key, int len, u8 *seq, void *priv)
 }
 
 
-static char * prism2_wep_print_stats(char *p, void *priv)
+static char *prism2_wep_print_stats(char *p, void *priv)
 {
         struct prism2_wep_data *wep = priv;
         p += sprintf(p, "key[%d] alg=WEP len=%d\n",
@@ -289,5 +289,5 @@ void ieee80211_crypto_wep_exit(void)
 void ieee80211_wep_null(void)
 {
 //      printk("============>%s()\n", __func__);
-        return;
+        return;
 }
diff --git a/drivers/staging/rtl8187se/ieee80211/ieee80211_module.c b/drivers/staging/rtl8187se/ieee80211/ieee80211_module.c
index 9422573bfeaa..4358c4b0ca60 100644
--- a/drivers/staging/rtl8187se/ieee80211/ieee80211_module.c
+++ b/drivers/staging/rtl8187se/ieee80211/ieee80211_module.c
@@ -48,7 +48,7 @@
 #include <linux/types.h>
 #include <linux/wireless.h>
 #include <linux/etherdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 #include <net/arp.h>
 #include <net/net_namespace.h>
 
@@ -69,8 +69,7 @@ static inline int ieee80211_networks_allocate(struct ieee80211_device *ieee)
                 MAX_NETWORK_COUNT, sizeof(struct ieee80211_network),
                 GFP_KERNEL);
         if (!ieee->networks) {
-                printk(KERN_WARNING "%s: Out of memory allocating beacons\n",
-                       ieee->dev->name);
+                netdev_warn(ieee->dev,  "Out of memory allocating beacons\n");
                 return -ENOMEM;
         }
 
@@ -100,7 +99,7 @@ struct net_device *alloc_ieee80211(int sizeof_priv)
 {
         struct ieee80211_device *ieee;
         struct net_device *dev;
-        int i,err;
+        int i, err;
 
         IEEE80211_DEBUG_INFO("Initializing...\n");
 
@@ -140,11 +139,11 @@ struct net_device *alloc_ieee80211(int sizeof_priv)
         spin_lock_init(&ieee->wpax_suitlist_lock);
 
         ieee->wpax_type_set = 0;
-        ieee->wpa_enabled = 0;
-        ieee->tkip_countermeasures = 0;
-        ieee->drop_unencrypted = 0;
-        ieee->privacy_invoked = 0;
-        ieee->ieee802_1x = 1;
+        ieee->wpa_enabled = 0;
+        ieee->tkip_countermeasures = 0;
+        ieee->drop_unencrypted = 0;
+        ieee->privacy_invoked = 0;
+        ieee->ieee802_1x = 1;
         ieee->raw_tx = 0;
 
         ieee80211_softmac_init(ieee);
@@ -153,9 +152,9 @@ struct net_device *alloc_ieee80211(int sizeof_priv)
                 INIT_LIST_HEAD(&ieee->ibss_mac_hash[i]);
 
         for (i = 0; i < 17; i++) {
-          ieee->last_rxseq_num[i] = -1;
-          ieee->last_rxfrag_num[i] = -1;
-          ieee->last_packet_time[i] = 0;
+                ieee->last_rxseq_num[i] = -1;
+                ieee->last_rxfrag_num[i] = -1;
+                ieee->last_packet_time[i] = 0;
         }
 //These function were added to load crypte module autoly
         ieee80211_tkip_null();
diff --git a/drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c b/drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c
index 3a724496e748..446f15ec6396 100644
--- a/drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c
+++ b/drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c
@@ -39,7 +39,7 @@
 #include <linux/types.h>
 #include <linux/wireless.h>
 #include <linux/etherdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 #include <linux/ctype.h>
 
 #include "ieee80211.h"
@@ -65,7 +65,7 @@ static inline void ieee80211_monitor_rx(struct ieee80211_device *ieee,
 /* Called only as a tasklet (software IRQ) */
 static struct ieee80211_frag_entry *
 ieee80211_frag_cache_find(struct ieee80211_device *ieee, unsigned int seq,
-                          unsigned int frag, u8 tid,u8 *src, u8 *dst)
+                          unsigned int frag, u8 tid, u8 *src, u8 *dst)
 {
         struct ieee80211_frag_entry *entry;
         int i;
@@ -107,18 +107,18 @@ ieee80211_frag_cache_get(struct ieee80211_device *ieee,
         struct ieee80211_hdr_4addrqos *hdr_4addrqos;
         u8 tid;
 
-        if (((fc & IEEE80211_FCTL_DSTODS) == IEEE80211_FCTL_DSTODS)&&IEEE80211_QOS_HAS_SEQ(fc)) {
-          hdr_4addrqos = (struct ieee80211_hdr_4addrqos *)hdr;
-          tid = le16_to_cpu(hdr_4addrqos->qos_ctl) & IEEE80211_QOS_TID;
-          tid = UP2AC(tid);
-          tid ++;
+        if (((fc & IEEE80211_FCTL_DSTODS) == IEEE80211_FCTL_DSTODS) && IEEE80211_QOS_HAS_SEQ(fc)) {
+                hdr_4addrqos = (struct ieee80211_hdr_4addrqos *)hdr;
+                tid = le16_to_cpu(hdr_4addrqos->qos_ctl) & IEEE80211_QOS_TID;
+                tid = UP2AC(tid);
+                tid++;
         } else if (IEEE80211_QOS_HAS_SEQ(fc)) {
-          hdr_3addrqos = (struct ieee80211_hdr_3addrqos *)hdr;
-          tid = le16_to_cpu(hdr_3addrqos->qos_ctl) & IEEE80211_QOS_TID;
-          tid = UP2AC(tid);
-          tid ++;
+                hdr_3addrqos = (struct ieee80211_hdr_3addrqos *)hdr;
+                tid = le16_to_cpu(hdr_3addrqos->qos_ctl) & IEEE80211_QOS_TID;
+                tid = UP2AC(tid);
+                tid++;
         } else {
-          tid = 0;
+                tid = 0;
         }
 
         if (frag == 0) {
@@ -129,7 +129,7 @@ ieee80211_frag_cache_get(struct ieee80211_device *ieee,
                                     2 /* alignment */ +
                                     8 /* WEP */ +
                                     ETH_ALEN /* WDS */ +
-                                    (IEEE80211_QOS_HAS_SEQ(fc)?2:0) /* QOS Control */);
+                                    (IEEE80211_QOS_HAS_SEQ(fc) ? 2 : 0) /* QOS Control */);
                 if (skb == NULL)
                         return NULL;
 
@@ -150,7 +150,7 @@ ieee80211_frag_cache_get(struct ieee80211_device *ieee,
         } else {
                 /* received a fragment of a frame for which the head fragment
                  * should have already been received */
-                entry = ieee80211_frag_cache_find(ieee, seq, frag, tid,hdr->addr2,
+                entry = ieee80211_frag_cache_find(ieee, seq, frag, tid, hdr->addr2,
                                                   hdr->addr1);
                 if (entry != NULL) {
                         entry->last_frag = frag;
@@ -174,21 +174,21 @@ static int ieee80211_frag_cache_invalidate(struct ieee80211_device *ieee,
         struct ieee80211_hdr_4addrqos *hdr_4addrqos;
         u8 tid;
 
-        if(((fc & IEEE80211_FCTL_DSTODS) == IEEE80211_FCTL_DSTODS)&&IEEE80211_QOS_HAS_SEQ(fc)) {
-          hdr_4addrqos = (struct ieee80211_hdr_4addrqos *)hdr;
-          tid = le16_to_cpu(hdr_4addrqos->qos_ctl) & IEEE80211_QOS_TID;
-          tid = UP2AC(tid);
-          tid ++;
+        if (((fc & IEEE80211_FCTL_DSTODS) == IEEE80211_FCTL_DSTODS) && IEEE80211_QOS_HAS_SEQ(fc)) {
+                hdr_4addrqos = (struct ieee80211_hdr_4addrqos *)hdr;
+                tid = le16_to_cpu(hdr_4addrqos->qos_ctl) & IEEE80211_QOS_TID;
+                tid = UP2AC(tid);
+                tid++;
         } else if (IEEE80211_QOS_HAS_SEQ(fc)) {
-          hdr_3addrqos = (struct ieee80211_hdr_3addrqos *)hdr;
-          tid = le16_to_cpu(hdr_3addrqos->qos_ctl) & IEEE80211_QOS_TID;
-          tid = UP2AC(tid);
-          tid ++;
+                hdr_3addrqos = (struct ieee80211_hdr_3addrqos *)hdr;
+                tid = le16_to_cpu(hdr_3addrqos->qos_ctl) & IEEE80211_QOS_TID;
+                tid = UP2AC(tid);
+                tid++;
         } else {
-          tid = 0;
+                tid = 0;
         }
 
-        entry = ieee80211_frag_cache_find(ieee, seq, -1, tid,hdr->addr2,
+        entry = ieee80211_frag_cache_find(ieee, seq, -1, tid, hdr->addr2,
                                           hdr->addr1);
 
         if (entry == NULL) {
@@ -227,7 +227,7 @@ ieee80211_rx_frame_mgmt(struct ieee80211_device *ieee, struct sk_buff *skb,
         ieee80211_rx_mgt(ieee, (struct ieee80211_hdr_4addr *)skb->data,
                          rx_stats);
 
-        if((ieee->state == IEEE80211_LINKED)&&(memcmp(hdr->addr3,ieee->current_network.bssid,ETH_ALEN))) {
+        if ((ieee->state == IEEE80211_LINKED) && (memcmp(hdr->addr3, ieee->current_network.bssid, ETH_ALEN))) {
                 dev_kfree_skb_any(skb);
                 return 0;
         }
@@ -244,11 +244,9 @@ ieee80211_rx_frame_mgmt(struct ieee80211_device *ieee, struct sk_buff *skb,
 
 /* See IEEE 802.1H for LLC/SNAP encapsulation/decapsulation */
 /* Ethernet-II snap header (RFC1042 for most EtherTypes) */
-static unsigned char rfc1042_header[] =
-{ 0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00 };
+static unsigned char rfc1042_header[] = { 0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00 };
 /* Bridge-Tunnel header (for EtherTypes ETH_P_AARP and ETH_P_IPX) */
-static unsigned char bridge_tunnel_header[] =
-{ 0xaa, 0xaa, 0x03, 0x00, 0x00, 0xf8 };
+static unsigned char bridge_tunnel_header[] = { 0xaa, 0xaa, 0x03, 0x00, 0x00, 0xf8 };
 /* No encapsulation header if EtherType < 0x600 (=length) */
 
 /* Called by ieee80211_rx_frame_decrypt */
@@ -294,7 +292,7 @@ static int ieee80211_is_eapol_frame(struct ieee80211_device *ieee,
 
 /* Called only as a tasklet (software IRQ), by ieee80211_rx */
 static inline int
-ieee80211_rx_frame_decrypt(struct ieee80211_device* ieee, struct sk_buff *skb,
+ieee80211_rx_frame_decrypt(struct ieee80211_device *ieee, struct sk_buff *skb,
                            struct ieee80211_crypt_data *crypt)
 {
         struct ieee80211_hdr_4addr *hdr;
@@ -310,9 +308,9 @@ ieee80211_rx_frame_decrypt(struct ieee80211_device* ieee, struct sk_buff *skb,
         if (ieee->tkip_countermeasures &&
             strcmp(crypt->ops->name, "TKIP") == 0) {
                 if (net_ratelimit()) {
-                        printk(KERN_DEBUG "%s: TKIP countermeasures: dropped "
-                               "received packet from %pM\n",
-                               ieee->dev->name, hdr->addr2);
+                        netdev_dbg(ieee->dev,
+                                   "TKIP countermeasures: dropped received packet from %pM\n",
+                                   ieee->dev->name, hdr->addr2);
                 }
                 return -1;
         }
@@ -339,7 +337,7 @@ ieee80211_rx_frame_decrypt(struct ieee80211_device* ieee, struct sk_buff *skb,
 
 /* Called only as a tasklet (software IRQ), by ieee80211_rx */
 static inline int
-ieee80211_rx_frame_decrypt_msdu(struct ieee80211_device* ieee, struct sk_buff *skb,
+ieee80211_rx_frame_decrypt_msdu(struct ieee80211_device *ieee, struct sk_buff *skb,
                              int keyidx, struct ieee80211_crypt_data *crypt)
 {
         struct ieee80211_hdr_4addr *hdr;
@@ -355,9 +353,9 @@ ieee80211_rx_frame_decrypt_msdu(struct ieee80211_device* ieee, struct sk_buff *s
         res = crypt->ops->decrypt_msdu(skb, keyidx, hdrlen, crypt->priv);
         atomic_dec(&crypt->refcnt);
         if (res < 0) {
-                printk(KERN_DEBUG "%s: MSDU decryption/MIC verification failed"
-                       " (SA=%pM keyidx=%d)\n",
-                       ieee->dev->name, hdr->addr2, keyidx);
+                netdev_dbg(ieee->dev,
+                           "MSDU decryption/MIC verification failed (SA=%pM keyidx=%d)\n",
+                           hdr->addr2, keyidx);
                 return -1;
         }
 
@@ -381,18 +379,18 @@ static int is_duplicate_packet(struct ieee80211_device *ieee,
         u8 tid;
 
         //TO2DS and QoS
-        if(((fc & IEEE80211_FCTL_DSTODS) == IEEE80211_FCTL_DSTODS)&&IEEE80211_QOS_HAS_SEQ(fc)) {
-          hdr_4addrqos = (struct ieee80211_hdr_4addrqos *)header;
-          tid = le16_to_cpu(hdr_4addrqos->qos_ctl) & IEEE80211_QOS_TID;
-          tid = UP2AC(tid);
-          tid ++;
-        } else if(IEEE80211_QOS_HAS_SEQ(fc)) { //QoS
-          hdr_3addrqos = (struct ieee80211_hdr_3addrqos *)header;
-          tid = le16_to_cpu(hdr_3addrqos->qos_ctl) & IEEE80211_QOS_TID;
-          tid = UP2AC(tid);
-          tid ++;
+        if (((fc & IEEE80211_FCTL_DSTODS) == IEEE80211_FCTL_DSTODS) && IEEE80211_QOS_HAS_SEQ(fc)) {
+                hdr_4addrqos = (struct ieee80211_hdr_4addrqos *)header;
+                tid = le16_to_cpu(hdr_4addrqos->qos_ctl) & IEEE80211_QOS_TID;
+                tid = UP2AC(tid);
+                tid++;
+        } else if (IEEE80211_QOS_HAS_SEQ(fc)) { //QoS
+                hdr_3addrqos = (struct ieee80211_hdr_3addrqos *)header;
+                tid = le16_to_cpu(hdr_3addrqos->qos_ctl) & IEEE80211_QOS_TID;
+                tid = UP2AC(tid);
+                tid++;
         } else { // no QoS
-          tid = 0;
+                tid = 0;
         }
         switch (ieee->iw_mode) {
         case IW_MODE_ADHOC:
@@ -411,7 +409,8 @@ static int is_duplicate_packet(struct ieee80211_device *ieee,
                 if (p == &ieee->ibss_mac_hash[index]) {
                         entry = kmalloc(sizeof(struct ieee_ibss_seq), GFP_ATOMIC);
                         if (!entry) {
-                                printk(KERN_WARNING "Cannot malloc new mac entry\n");
+                                netdev_warn(ieee->dev,
+                                            "Cannot malloc new mac entry\n");
                                 return 0;
                         }
                         memcpy(entry->mac, mac, ETH_ALEN);
@@ -442,7 +441,7 @@ static int is_duplicate_packet(struct ieee80211_device *ieee,
 //      }
         if ((*last_seq == seq) &&
             time_after(*last_time + IEEE_PACKET_RETRY_TIME, jiffies)) {
-                if (*last_frag == frag){
+                if (*last_frag == frag) {
                         //printk(KERN_WARNING "[1] go drop!\n");
                         goto drop;
 
@@ -493,8 +492,7 @@ int ieee80211_rtl_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
         stats = &ieee->stats;
 
         if (skb->len < 10) {
-                printk(KERN_INFO "%s: SKB length < 10\n",
-                       dev->name);
+                netdev_info(ieee->dev, "SKB length < 10\n");
                 goto rx_dropped;
         }
 
@@ -506,19 +504,12 @@ int ieee80211_rtl_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
         frag = WLAN_GET_SEQ_FRAG(sc);
 
 //YJ,add,080828,for keep alive
-        if((fc & IEEE80211_FCTL_TODS) != IEEE80211_FCTL_TODS)
-        {
-                if(!memcmp(hdr->addr1,dev->dev_addr, ETH_ALEN))
-                {
+        if ((fc & IEEE80211_FCTL_TODS) != IEEE80211_FCTL_TODS) {
+                if (!memcmp(hdr->addr1, dev->dev_addr, ETH_ALEN))
                         ieee->NumRxUnicast++;
-                }
-        }
-        else
-        {
-                if(!memcmp(hdr->addr3, dev->dev_addr, ETH_ALEN))
-                {
+        } else {
+                if (!memcmp(hdr->addr3, dev->dev_addr, ETH_ALEN))
                         ieee->NumRxUnicast++;
-                }
         }
 //YJ,add,080828,for keep alive,end
 
@@ -577,12 +568,12 @@ int ieee80211_rtl_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
         case IEEE80211_FCTL_FROMDS:
                 memcpy(dst, hdr->addr1, ETH_ALEN);
                 memcpy(src, hdr->addr3, ETH_ALEN);
-                memcpy(bssid,hdr->addr2,ETH_ALEN);
+                memcpy(bssid, hdr->addr2, ETH_ALEN);
                 break;
         case IEEE80211_FCTL_TODS:
                 memcpy(dst, hdr->addr3, ETH_ALEN);
                 memcpy(src, hdr->addr2, ETH_ALEN);
-                memcpy(bssid,hdr->addr1,ETH_ALEN);
+                memcpy(bssid, hdr->addr1, ETH_ALEN);
                 break;
         case IEEE80211_FCTL_FROMDS | IEEE80211_FCTL_TODS:
                 if (skb->len < IEEE80211_DATA_HDR4_LEN)
@@ -594,7 +585,7 @@ int ieee80211_rtl_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
         case 0:
                 memcpy(dst, hdr->addr1, ETH_ALEN);
                 memcpy(src, hdr->addr2, ETH_ALEN);
-                memcpy(bssid,hdr->addr3,ETH_ALEN);
+                memcpy(bssid, hdr->addr3, ETH_ALEN);
                 break;
         }
 
@@ -607,7 +598,7 @@ int ieee80211_rtl_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
         if (stype != IEEE80211_STYPE_DATA &&
             stype != IEEE80211_STYPE_DATA_CFACK &&
             stype != IEEE80211_STYPE_DATA_CFPOLL &&
-            stype != IEEE80211_STYPE_DATA_CFACKPOLL&&
+            stype != IEEE80211_STYPE_DATA_CFACKPOLL &&
             stype != IEEE80211_STYPE_QOS_DATA//add by David,2006.8.4
             ) {
                 if (stype != IEEE80211_STYPE_NULLFUNC)
@@ -618,9 +609,8 @@ int ieee80211_rtl_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
                                 type, stype, skb->len);
                 goto rx_dropped;
         }
-        if(memcmp(bssid,ieee->current_network.bssid,ETH_ALEN)) {
+        if (memcmp(bssid, ieee->current_network.bssid, ETH_ALEN))
                 goto rx_dropped;
-        }
 
         ieee->NumRxDataInPeriod++;
         ieee->NumRxOkTotal++;
@@ -653,9 +643,8 @@ int ieee80211_rtl_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
                         flen -= hdrlen;
 
                 if (frag_skb->tail + flen > frag_skb->end) {
-                        printk(KERN_WARNING "%s: host decrypted and "
-                               "reassembled frame did not fit skb\n",
-                               dev->name);
+                        netdev_warn(ieee->dev,
+                                    "host decrypted and reassembled frame did not fit skb\n");
                         ieee80211_frag_cache_invalidate(ieee, hdr);
                         goto rx_dropped;
                 }
@@ -804,7 +793,7 @@ static inline int ieee80211_is_ofdm_rate(u8 rate)
         case IEEE80211_OFDM_RATE_54MB:
                 return 1;
         }
-        return 0;
+        return 0;
 }
 
 static inline int ieee80211_SignalStrengthTranslate(
@@ -814,46 +803,27 @@ static inline int ieee80211_SignalStrengthTranslate(
         int RetSS;
 
         // Step 1. Scale mapping.
-        if(CurrSS >= 71 && CurrSS <= 100)
-        {
+        if (CurrSS >= 71 && CurrSS <= 100)
                 RetSS = 90 + ((CurrSS - 70) / 3);
-        }
-        else if(CurrSS >= 41 && CurrSS <= 70)
-        {
+        else if (CurrSS >= 41 && CurrSS <= 70)
                 RetSS = 78 + ((CurrSS - 40) / 3);
-        }
-        else if(CurrSS >= 31 && CurrSS <= 40)
-        {
+        else if (CurrSS >= 31 && CurrSS <= 40)
                 RetSS = 66 + (CurrSS - 30);
-        }
-        else if(CurrSS >= 21 && CurrSS <= 30)
-        {
+        else if (CurrSS >= 21 && CurrSS <= 30)
                 RetSS = 54 + (CurrSS - 20);
-        }
-        else if(CurrSS >= 5 && CurrSS <= 20)
-        {
+        else if (CurrSS >= 5 && CurrSS <= 20)
                 RetSS = 42 + (((CurrSS - 5) * 2) / 3);
-        }
-        else if(CurrSS == 4)
-        {
+        else if (CurrSS == 4)
                 RetSS = 36;
-        }
-        else if(CurrSS == 3)
-        {
+        else if (CurrSS == 3)
                 RetSS = 27;
-        }
-        else if(CurrSS == 2)
-        {
+        else if (CurrSS == 2)
                 RetSS = 18;
-        }
-        else if(CurrSS == 1)
-        {
+        else if (CurrSS == 1)
                 RetSS = 9;
-        }
         else
-        {
                 RetSS = CurrSS;
-        }
+
         //RT_TRACE(COMP_DBG, DBG_LOUD, ("##### After Mapping:  LastSS: %d, CurrSS: %d, RetSS: %d\n", LastSS, CurrSS, RetSS));
 
         // Step 2. Smoothing.
@@ -867,20 +837,16 @@ static inline void ieee80211_extract_country_ie(
         struct ieee80211_device *ieee,
         struct ieee80211_info_element *info_element,
         struct ieee80211_network *network,
-        u8 * addr2
+        u8 *addr2
 )
 {
-        if(IS_DOT11D_ENABLE(ieee))
-        {
-                if(info_element->len!= 0)
-                {
+        if (IS_DOT11D_ENABLE(ieee)) {
+                if (info_element->len != 0) {
                         memcpy(network->CountryIeBuf, info_element->data, info_element->len);
                         network->CountryIeLen = info_element->len;
 
-                        if(!IS_COUNTRY_IE_VALID(ieee))
-                        {
+                        if (!IS_COUNTRY_IE_VALID(ieee))
                                 Dot11d_UpdateCountryIe(ieee, addr2, info_element->len, info_element->data);
-                        }
                 }
 
                 //
@@ -888,10 +854,8 @@ static inline void ieee80211_extract_country_ie(
                 // some AP (e.g. Cisco 1242) don't include country IE in their
                 // probe response frame.
                 //
-                if(IS_EQUAL_CIE_SRC(ieee, addr2) )
-                {
+                if (IS_EQUAL_CIE_SRC(ieee, addr2))
                         UPDATE_CIE_WATCHDOG(ieee);
-                }
         }
 
 }
@@ -920,10 +884,10 @@ inline int ieee80211_network_init(
         char *p;
 #endif
         struct ieee80211_info_element *info_element;
-        u16 left;
+        u16 left;
         u8 i;
         short offset;
-        u8 curRate = 0,hOpRate = 0,curRate_ex = 0;
+        u8 curRate = 0, hOpRate = 0, curRate_ex = 0;
 
         /* Pull out fixed field data */
         memcpy(network->bssid, beacon->header.addr3, ETH_ALEN);
@@ -953,10 +917,10 @@ inline int ieee80211_network_init(
         } else
                 network->flags |= NETWORK_HAS_CCK;
 
-        network->wpa_ie_len = 0;
-        network->rsn_ie_len = 0;
+        network->wpa_ie_len = 0;
+        network->rsn_ie_len = 0;
 
-        info_element = &beacon->info_element;
+        info_element = &beacon->info_element;
         left = stats->len - ((void *)info_element - (void *)beacon);
         while (left >= sizeof(struct ieee80211_info_element_hdr)) {
                 if (sizeof(struct ieee80211_info_element_hdr) + info_element->len > left) {
@@ -964,7 +928,7 @@ inline int ieee80211_network_init(
                                              info_element->len + sizeof(struct ieee80211_info_element),
                                              left);
                         return 1;
-                }
+                }
 
                 switch (info_element->id) {
                 case MFIE_TYPE_SSID:
@@ -977,8 +941,8 @@ inline int ieee80211_network_init(
                         network->ssid_len = min(info_element->len,
                                                 (u8)IW_ESSID_MAX_SIZE);
                         memcpy(network->ssid, info_element->data, network->ssid_len);
-                        if (network->ssid_len < IW_ESSID_MAX_SIZE)
-                                memset(network->ssid + network->ssid_len, 0,
+                        if (network->ssid_len < IW_ESSID_MAX_SIZE)
+                                memset(network->ssid + network->ssid_len, 0,
                                        IW_ESSID_MAX_SIZE - network->ssid_len);
 
                         IEEE80211_DEBUG_SCAN("MFIE_TYPE_SSID: '%s' len=%d.\n",
@@ -993,7 +957,7 @@ inline int ieee80211_network_init(
                         for (i = 0; i < network->rates_len; i++) {
                                 network->rates[i] = info_element->data[i];
                                 curRate = network->rates[i] & 0x7f;
-                                if( hOpRate < curRate )
+                                if (hOpRate < curRate)
                                         hOpRate = curRate;
 #ifdef CONFIG_IEEE80211_DEBUG
                                 p += snprintf(p, sizeof(rates_str) - (p - rates_str), "%02X ", network->rates[i]);
@@ -1019,7 +983,7 @@ inline int ieee80211_network_init(
                         for (i = 0; i < network->rates_ex_len; i++) {
                                 network->rates_ex[i] = info_element->data[i];
                                 curRate_ex = network->rates_ex[i] & 0x7f;
-                                if( hOpRate < curRate_ex )
+                                if (hOpRate < curRate_ex)
                                         hOpRate = curRate_ex;
 #ifdef CONFIG_IEEE80211_DEBUG
                                 p += snprintf(p, sizeof(rates_str) - (p - rates_str), "%02X ", network->rates[i]);
@@ -1038,14 +1002,14 @@ inline int ieee80211_network_init(
                         break;
 
                 case MFIE_TYPE_DS_SET:
-                        IEEE80211_DEBUG_SCAN("MFIE_TYPE_DS_SET: %d\n",
+                        IEEE80211_DEBUG_SCAN("MFIE_TYPE_DS_SET: %d\n",
                                              info_element->data[0]);
                         if (stats->freq == IEEE80211_24GHZ_BAND)
                                 network->channel = info_element->data[0];
                         break;
 
-                case MFIE_TYPE_FH_SET:
-                        IEEE80211_DEBUG_SCAN("MFIE_TYPE_FH_SET: ignored\n");
+                case MFIE_TYPE_FH_SET:
+                        IEEE80211_DEBUG_SCAN("MFIE_TYPE_FH_SET: ignored\n");
                         break;
 
                 case MFIE_TYPE_CF_SET:
@@ -1054,12 +1018,12 @@ inline int ieee80211_network_init(
 
                 case MFIE_TYPE_TIM:
 
-                        if(info_element->len < 4)
+                        if (info_element->len < 4)
                                 break;
 
                         network->dtim_period = info_element->data[1];
 
-                        if(ieee->state != IEEE80211_LINKED)
+                        if (ieee->state != IEEE80211_LINKED)
                                 break;
 
                         network->last_dtim_sta_time[0] = jiffies;
@@ -1067,10 +1031,10 @@ inline int ieee80211_network_init(
 
                         network->dtim_data = IEEE80211_DTIM_VALID;
 
-                        if(info_element->data[0] != 0)
+                        if (info_element->data[0] != 0)
                                 break;
 
-                        if(info_element->data[2] & 1)
+                        if (info_element->data[2] & 1)
                                 network->dtim_data |= IEEE80211_DTIM_MBCAST;
 
                         offset = (info_element->data[2] >> 1)*2;
@@ -1078,8 +1042,8 @@ inline int ieee80211_network_init(
                         //printk("offset1:%x aid:%x\n",offset, ieee->assoc_id);
 
                         /* add and modified for ps 2008.1.22 */
-                        if(ieee->assoc_id < 8*offset ||
-                                ieee->assoc_id > 8*(offset + info_element->len -3)) {
+                        if (ieee->assoc_id < 8*offset ||
+                                ieee->assoc_id > 8*(offset + info_element->len - 3)) {
                                 break;
                         }
 
@@ -1089,9 +1053,9 @@ inline int ieee80211_network_init(
                         //      info_element->data[3+offset] ,
                         //      info_element->data[3+offset] & (1<<(ieee->assoc_id%8)));
 
-                        if(info_element->data[3+offset] & (1<<(ieee->assoc_id%8))) {
+                        if (info_element->data[3+offset] & (1<<(ieee->assoc_id%8)))
                                 network->dtim_data |= IEEE80211_DTIM_UCAST;
-                        }
+
                         break;
 
                 case MFIE_TYPE_IBSS_SET:
@@ -1125,9 +1089,8 @@ inline int ieee80211_network_init(
                             info_element->data[4] == 0x02) {
                                 network->Turbo_Enable = 1;
                         }
-                        if (1 == stats->nic_type) {//nic 87
+                        if (1 == stats->nic_type) //nic 87
                                 break;
-                        }
 
                         if (info_element->len >= 5  &&
                             info_element->data[0] == 0x00 &&
@@ -1152,7 +1115,7 @@ inline int ieee80211_network_init(
                                 //printk(KERN_WARNING "wmm info&param updated: %x\n", info_element->data[6]);
                                 network->wmm_info = info_element->data[6];
                                 //WMM Parameter Element
-                                memcpy(network->wmm_param, (u8 *)(info_element->data + 8),(info_element->len - 8));
+                                memcpy(network->wmm_param, (u8 *)(info_element->data + 8), (info_element->len - 8));
                                 network->QoS_Enable = 1;
                         }
                         break;
@@ -1174,14 +1137,14 @@ inline int ieee80211_network_init(
                 default:
                         IEEE80211_DEBUG_SCAN("unsupported IE %d\n",
                                              info_element->id);
-                        break;
-                }
+                        break;
+                }
 
                 left -= sizeof(struct ieee80211_info_element_hdr) +
                         info_element->len;
                 info_element = (struct ieee80211_info_element *)
-                        &info_element->data[info_element->len];
-        }
+                        &info_element->data[info_element->len];
+        }
 //by amy 080312
         network->HighestOperaRate = hOpRate;
 //by amy 080312
@@ -1217,7 +1180,7 @@ inline int ieee80211_network_init(
 
 static inline int is_same_network(struct ieee80211_network *src,
                                   struct ieee80211_network *dst,
-                                  struct ieee80211_device * ieee)
+                                  struct ieee80211_device *ieee)
 {
         /* A network is only a duplicate if the channel, BSSID, ESSID
          * and the capability field (in particular IBSS and BSS) all match.
@@ -1241,12 +1204,11 @@ inline void update_network(struct ieee80211_network *dst,
         unsigned char quality = src->stats.signalstrength;
         unsigned char signal = 0;
         unsigned char noise = 0;
-        if(dst->stats.signalstrength > 0) {
-                quality = (dst->stats.signalstrength * 5 + src->stats.signalstrength + 5)/6;
-        }
+        if (dst->stats.signalstrength > 0)
+                quality = (dst->stats.signalstrength * 5 + src->stats.signalstrength + 5)/6;
         signal = ieee80211_TranslateToDbm(quality);
         //noise = signal - src->stats.noise;
-        if(dst->stats.noise > 0)
+        if (dst->stats.noise > 0)
                 noise = (dst->stats.noise * 5 + src->stats.noise)/6;
         //if(strcmp(dst->ssid, "linksys_lzm000") == 0)
 //      printk("ssid:%s, quality:%d, signal:%d\n", dst->ssid, quality, signal);
@@ -1262,12 +1224,11 @@ inline void update_network(struct ieee80211_network *dst,
         dst->rates_len = src->rates_len;
         memcpy(dst->rates_ex, src->rates_ex, src->rates_ex_len);
         dst->rates_ex_len = src->rates_ex_len;
-        dst->HighestOperaRate= src->HighestOperaRate;
+        dst->HighestOperaRate = src->HighestOperaRate;
         //printk("==========>in %s: src->ssid is %s,chan is %d\n",__func__,src->ssid,src->channel);
 
         //YJ,add,080819,for hidden ap
-        if(src->ssid_len > 0)
-        {
+        if (src->ssid_len > 0) {
                 //if(src->ssid_len == 13)
                 //      printk("=====================>>>>>>>> Dst ssid: %s Src ssid: %s\n", dst->ssid, src->ssid);
                 memset(dst->ssid, 0, dst->ssid_len);
@@ -1305,11 +1266,11 @@ inline void update_network(struct ieee80211_network *dst,
           memcpy(dst->wmm_param, src->wmm_param, IEEE80211_AC_PRAM_LEN);
         }
 */
-        if(src->wmm_param[0].ac_aci_acm_aifsn|| \
-           src->wmm_param[1].ac_aci_acm_aifsn|| \
-           src->wmm_param[2].ac_aci_acm_aifsn|| \
+        if (src->wmm_param[0].ac_aci_acm_aifsn || \
+           src->wmm_param[1].ac_aci_acm_aifsn || \
+           src->wmm_param[2].ac_aci_acm_aifsn || \
            src->wmm_param[3].ac_aci_acm_aifsn) {
-          memcpy(dst->wmm_param, src->wmm_param, WME_AC_PRAM_LEN);
+                memcpy(dst->wmm_param, src->wmm_param, WME_AC_PRAM_LEN);
         }
         dst->QoS_Enable = src->QoS_Enable;
 #else
@@ -1336,7 +1297,7 @@ inline void ieee80211_process_probe_response(
         unsigned long flags;
         short renew;
         u8 wmm_info;
-        u8 is_beacon = (WLAN_FC_GET_STYPE(beacon->header.frame_ctl) == IEEE80211_STYPE_BEACON)? 1:0;  //YJ,add,080819,for hidden ap
+        u8 is_beacon = (WLAN_FC_GET_STYPE(beacon->header.frame_ctl) == IEEE80211_STYPE_BEACON) ? 1 : 0;  //YJ,add,080819,for hidden ap
 
         memset(&network, 0, sizeof(struct ieee80211_network));
 
@@ -1378,48 +1339,36 @@ inline void ieee80211_process_probe_response(
         // (2)  If there is no any country code in beacon,
         //       then wireless adapter should do active scan from ch1~11 and
         //       passive scan from ch12~14
-        if(ieee->bGlobalDomain)
-        {
-                if (WLAN_FC_GET_STYPE(beacon->header.frame_ctl) == IEEE80211_STYPE_PROBE_RESP)
-                {
+        if (ieee->bGlobalDomain) {
+                if (WLAN_FC_GET_STYPE(beacon->header.frame_ctl) == IEEE80211_STYPE_PROBE_RESP) {
                         // Case 1: Country code
-                        if(IS_COUNTRY_IE_VALID(ieee) )
-                        {
-                                if( !IsLegalChannel(ieee, network.channel) )
-                                {
+                        if (IS_COUNTRY_IE_VALID(ieee)) {
+                                if (!IsLegalChannel(ieee, network.channel)) {
                                         printk("GetScanInfo(): For Country code, filter probe response at channel(%d).\n", network.channel);
                                         return;
                                 }
                         }
                         // Case 2: No any country code.
-                        else
-                        {
+                        else {
                                 // Filter over channel ch12~14
-                                if(network.channel > 11)
-                                {
+                                if (network.channel > 11) {
                                         printk("GetScanInfo(): For Global Domain, filter probe response at channel(%d).\n", network.channel);
                                         return;
                                 }
                         }
-                }
-                else
-                {
+                } else {
                         // Case 1: Country code
-                        if(IS_COUNTRY_IE_VALID(ieee) )
-                        {
-                                if( !IsLegalChannel(ieee, network.channel) )
-                                {
-                                        printk("GetScanInfo(): For Country code, filter beacon at channel(%d).\n",network.channel);
+                        if (IS_COUNTRY_IE_VALID(ieee)) {
+                                if (!IsLegalChannel(ieee, network.channel)) {
+                                        printk("GetScanInfo(): For Country code, filter beacon at channel(%d).\n", network.channel);
                                         return;
                                 }
                         }
                         // Case 2: No any country code.
-                        else
-                        {
+                        else {
                                 // Filter over channel ch12~14
-                                if(network.channel > 14)
-                                {
-                                        printk("GetScanInfo(): For Global Domain, filter beacon at channel(%d).\n",network.channel);
+                                if (network.channel > 14) {
+                                        printk("GetScanInfo(): For Global Domain, filter beacon at channel(%d).\n", network.channel);
                                         return;
                                 }
                         }
@@ -1437,12 +1386,12 @@ inline void ieee80211_process_probe_response(
 
         spin_lock_irqsave(&ieee->lock, flags);
 
-        if(is_same_network(&ieee->current_network, &network, ieee)) {
+        if (is_same_network(&ieee->current_network, &network, ieee)) {
                 wmm_info = ieee->current_network.wmm_info;
                 //YJ,add,080819,for hidden ap
-                if(is_beacon == 0)
+                if (is_beacon == 0)
                         network.flags = (~NETWORK_EMPTY_ESSID & network.flags)|(NETWORK_EMPTY_ESSID & ieee->current_network.flags);
-                else if(ieee->state == IEEE80211_LINKED)
+                else if (ieee->state == IEEE80211_LINKED)
                         ieee->NumRxBcnInPeriod++;
                 //YJ,add,080819,for hidden ap,end
                 //printk("====>network.ssid=%s cur_ssid=%s\n", network.ssid, ieee->current_network.ssid);
@@ -1504,13 +1453,13 @@ inline void ieee80211_process_probe_response(
                  */
                 renew = !time_after(target->last_scanned + ieee->scan_age, jiffies);
                 //YJ,add,080819,for hidden ap
-                if(is_beacon == 0)
+                if (is_beacon == 0)
                         network.flags = (~NETWORK_EMPTY_ESSID & network.flags)|(NETWORK_EMPTY_ESSID & target->flags);
                 //if(strncmp(network.ssid, "linksys-c",9) == 0)
                 //      printk("====>2 network.ssid=%s FLAG=%d target.ssid=%s FLAG=%d\n", network.ssid, network.flags, target->ssid, target->flags);
-                if(((network.flags & NETWORK_EMPTY_ESSID) == NETWORK_EMPTY_ESSID) \
+                if (((network.flags & NETWORK_EMPTY_ESSID) == NETWORK_EMPTY_ESSID) \
                     && (((network.ssid_len > 0) && (strncmp(target->ssid, network.ssid, network.ssid_len)))\
-                    ||((ieee->current_network.ssid_len == network.ssid_len)&&(strncmp(ieee->current_network.ssid, network.ssid, network.ssid_len) == 0)&&(ieee->state == IEEE80211_NOLINK))))
+                    || ((ieee->current_network.ssid_len == network.ssid_len) && (strncmp(ieee->current_network.ssid, network.ssid, network.ssid_len) == 0) && (ieee->state == IEEE80211_NOLINK))))
                         renew = 1;
                 //YJ,add,080819,for hidden ap,end
                 update_network(target, &network);
diff --git a/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac_wx.c b/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac_wx.c
index 1ef8fd612732..d9add5305e29 100644
--- a/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac_wx.c
+++ b/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac_wx.c
@@ -32,11 +32,11 @@ int ieee80211_wx_set_freq(struct ieee80211_device *ieee, struct iw_request_info
                              union iwreq_data *wrqu, char *b)
 {
         int ret;
-        struct iw_freq *fwrq = & wrqu->freq;
+        struct iw_freq *fwrq = &wrqu->freq;
 //      printk("in %s\n",__func__);
         down(&ieee->wx_sem);
 
-        if(ieee->iw_mode == IW_MODE_INFRA){
+        if (ieee->iw_mode == IW_MODE_INFRA) {
                 ret = -EOPNOTSUPP;
                 goto out;
         }
@@ -57,21 +57,20 @@ int ieee80211_wx_set_freq(struct ieee80211_device *ieee, struct iw_request_info
                 }
         }
 
-        if (fwrq->e > 0 || fwrq->m > 14 || fwrq->m < 1 ){
+        if (fwrq->e > 0 || fwrq->m > 14 || fwrq->m < 1) {
                 ret = -EOPNOTSUPP;
                 goto out;
 
-        }else { /* Set the channel */
+        } else { /* Set the channel */
 
 
                 ieee->current_network.channel = fwrq->m;
                 ieee->set_chan(ieee->dev, ieee->current_network.channel);
 
-                if(ieee->iw_mode == IW_MODE_ADHOC || ieee->iw_mode == IW_MODE_MASTER)
-                        if(ieee->state == IEEE80211_LINKED){
-
-                        ieee80211_stop_send_beacons(ieee);
-                        ieee80211_start_send_beacons(ieee);
+                if (ieee->iw_mode == IW_MODE_ADHOC || ieee->iw_mode == IW_MODE_MASTER)
+                        if (ieee->state == IEEE80211_LINKED) {
+                                ieee80211_stop_send_beacons(ieee);
+                                ieee80211_start_send_beacons(ieee);
                         }
         }
 
@@ -86,7 +85,7 @@ int ieee80211_wx_get_freq(struct ieee80211_device *ieee,
                              struct iw_request_info *a,
                              union iwreq_data *wrqu, char *b)
 {
-        struct iw_freq *fwrq = & wrqu->freq;
+        struct iw_freq *fwrq = &wrqu->freq;
 
         if (ieee->current_network.channel == 0)
                 return -1;
@@ -143,12 +142,12 @@ int ieee80211_wx_set_wap(struct ieee80211_device *ieee,
 
         down(&ieee->wx_sem);
         /* use ifconfig hw ether */
-        if (ieee->iw_mode == IW_MODE_MASTER){
+        if (ieee->iw_mode == IW_MODE_MASTER) {
                 ret = -1;
                 goto out;
         }
 
-        if (temp->sa_family != ARPHRD_ETHER){
+        if (temp->sa_family != ARPHRD_ETHER) {
                 ret = -EINVAL;
                 goto out;
         }
@@ -175,9 +174,10 @@ out:
         return ret;
 }
 
- int ieee80211_wx_get_essid(struct ieee80211_device *ieee, struct iw_request_info *a,union iwreq_data *wrqu,char *b)
+int ieee80211_wx_get_essid(struct ieee80211_device *ieee, struct iw_request_info *a,
+                            union iwreq_data *wrqu, char *b)
 {
-        int len,ret = 0;
+        int len, ret = 0;
         unsigned long flags;
 
         if (ieee->iw_mode == IW_MODE_MONITOR)
@@ -200,7 +200,7 @@ out:
         }
         len = ieee->current_network.ssid_len;
         wrqu->essid.length = len;
-        strncpy(b,ieee->current_network.ssid,len);
+        strncpy(b, ieee->current_network.ssid, len);
         wrqu->essid.flags = 1;
 
 out:
@@ -218,11 +218,11 @@ int ieee80211_wx_set_rate(struct ieee80211_device *ieee,
         u32 target_rate = wrqu->bitrate.value;
 
         //added by lizhaoming for auto mode
-        if(target_rate == -1){
-        ieee->rate = 110;
-        } else {
-        ieee->rate = target_rate/100000;
-        }
+        if (target_rate == -1)
+                ieee->rate = 110;
+        else
+                ieee->rate = target_rate/100000;
+
         //FIXME: we might want to limit rate also in management protocols.
         return 0;
 }
@@ -250,16 +250,14 @@ int ieee80211_wx_set_mode(struct ieee80211_device *ieee, struct iw_request_info
         if (wrqu->mode == ieee->iw_mode)
                 goto out;
 
-        if (wrqu->mode == IW_MODE_MONITOR){
-
+        if (wrqu->mode == IW_MODE_MONITOR)
                 ieee->dev->type = ARPHRD_IEEE80211;
-        }else{
+        else
                 ieee->dev->type = ARPHRD_ETHER;
-        }
 
-        if (!ieee->proto_started){
+        if (!ieee->proto_started) {
                 ieee->iw_mode = wrqu->mode;
-        }else{
+        } else {
                 ieee80211_stop_protocol(ieee);
                 ieee->iw_mode = wrqu->mode;
                 ieee80211_start_protocol(ieee);
@@ -296,7 +294,7 @@ void ieee80211_wx_sync_scan_wq(struct work_struct *work)
         if (ieee->data_hard_resume)
                 ieee->data_hard_resume(ieee->dev);
 
-        if(ieee->iw_mode == IW_MODE_ADHOC || ieee->iw_mode == IW_MODE_MASTER)
+        if (ieee->iw_mode == IW_MODE_ADHOC || ieee->iw_mode == IW_MODE_MASTER)
                 ieee80211_start_send_beacons(ieee);
 
         //YJ,add,080828, In prevent of lossing ping packet during scanning
@@ -314,7 +312,7 @@ int ieee80211_wx_set_scan(struct ieee80211_device *ieee, struct iw_request_info
 
         down(&ieee->wx_sem);
 
-        if (ieee->iw_mode == IW_MODE_MONITOR || !(ieee->proto_started)){
+        if (ieee->iw_mode == IW_MODE_MONITOR || !(ieee->proto_started)) {
                 ret = -1;
                 goto out;
         }
@@ -323,7 +321,7 @@ int ieee80211_wx_set_scan(struct ieee80211_device *ieee, struct iw_request_info
         //ieee80211_sta_ps_send_null_frame(ieee, true);
         //YJ,add,080828,end
 
-        if ( ieee->state == IEEE80211_LINKED){
+        if (ieee->state == IEEE80211_LINKED) {
                 queue_work(ieee->wq, &ieee->wx_sync_scan_wq);
                 /* intentionally forget to up sem */
                 return 0;
@@ -339,7 +337,7 @@ int ieee80211_wx_set_essid(struct ieee80211_device *ieee,
                               union iwreq_data *wrqu, char *extra)
 {
 
-        int ret=0,len;
+        int ret = 0, len;
         short proto_started;
         unsigned long flags;
 
@@ -349,17 +347,17 @@ int ieee80211_wx_set_essid(struct ieee80211_device *ieee,
 
         proto_started = ieee->proto_started;
 
-        if (wrqu->essid.length > IW_ESSID_MAX_SIZE){
-                ret= -E2BIG;
+        if (wrqu->essid.length > IW_ESSID_MAX_SIZE) {
+                ret = -E2BIG;
                 goto out;
         }
 
-        if (ieee->iw_mode == IW_MODE_MONITOR){
-                ret= -1;
+        if (ieee->iw_mode == IW_MODE_MONITOR) {
+                ret = -1;
                 goto out;
         }
 
-        if(proto_started)
+        if (proto_started)
                 ieee80211_stop_protocol(ieee);
 
         /* this is just to be sure that the GET wx callback
@@ -377,13 +375,12 @@ int ieee80211_wx_set_essid(struct ieee80211_device *ieee,
 //YJ,modified,080819,end
 
                 //YJ,add,080819,for hidden ap
-                if(len == 0){
+                if (len == 0) {
                         memset(ieee->current_network.bssid, 0, ETH_ALEN);
                         ieee->current_network.capability = 0;
                 }
                 //YJ,add,080819,for hidden ap,end
-        }
-        else{
+        } else {
                 ieee->ssid_set = 0;
                 ieee->current_network.ssid[0] = '\0';
                 ieee->current_network.ssid_len = 0;
@@ -398,7 +395,7 @@ out:
         return ret;
 }
 
- int ieee80211_wx_get_mode(struct ieee80211_device *ieee, struct iw_request_info *a,
+int ieee80211_wx_get_mode(struct ieee80211_device *ieee, struct iw_request_info *a,
                              union iwreq_data *wrqu, char *b)
 {
 
@@ -406,7 +403,7 @@ out:
         return 0;
 }
 
- int ieee80211_wx_set_rawtx(struct ieee80211_device *ieee,
+int ieee80211_wx_set_rawtx(struct ieee80211_device *ieee,
                                struct iw_request_info *info,
                                union iwreq_data *wrqu, char *extra)
 {
@@ -417,24 +414,23 @@ out:
 
         down(&ieee->wx_sem);
 
-        if(enable)
+        if (enable)
                 ieee->raw_tx = 1;
         else
                 ieee->raw_tx = 0;
 
-        printk(KERN_INFO"raw TX is %s\n",
-              ieee->raw_tx ? "enabled" : "disabled");
+        netdev_info(ieee->dev, "raw TX is %s\n",
+                    ieee->raw_tx ? "enabled" : "disabled");
 
-        if(ieee->iw_mode == IW_MODE_MONITOR)
-        {
-                if(prev == 0 && ieee->raw_tx){
+        if (ieee->iw_mode == IW_MODE_MONITOR) {
+                if (prev == 0 && ieee->raw_tx) {
                         if (ieee->data_hard_resume)
                                 ieee->data_hard_resume(ieee->dev);
 
                         netif_carrier_on(ieee->dev);
                 }
 
-                if(prev && ieee->raw_tx == 1)
+                if (prev && ieee->raw_tx == 1)
                         netif_carrier_off(ieee->dev);
         }
 
@@ -448,18 +444,18 @@ int ieee80211_wx_get_name(struct ieee80211_device *ieee,
                              union iwreq_data *wrqu, char *extra)
 {
         strlcpy(wrqu->name, "802.11", IFNAMSIZ);
-        if(ieee->modulation & IEEE80211_CCK_MODULATION){
+        if (ieee->modulation & IEEE80211_CCK_MODULATION) {
                 strlcat(wrqu->name, "b", IFNAMSIZ);
-                if(ieee->modulation & IEEE80211_OFDM_MODULATION)
+                if (ieee->modulation & IEEE80211_OFDM_MODULATION)
                         strlcat(wrqu->name, "/g", IFNAMSIZ);
-        }else if(ieee->modulation & IEEE80211_OFDM_MODULATION)
+        } else if (ieee->modulation & IEEE80211_OFDM_MODULATION)
                 strlcat(wrqu->name, "g", IFNAMSIZ);
 
-        if((ieee->state == IEEE80211_LINKED) ||
+        if ((ieee->state == IEEE80211_LINKED) ||
                 (ieee->state == IEEE80211_LINKED_SCANNING))
-                strlcat(wrqu->name,"  link", IFNAMSIZ);
-        else if(ieee->state != IEEE80211_NOLINK)
-                strlcat(wrqu->name," .....", IFNAMSIZ);
+                strlcat(wrqu->name, "  link", IFNAMSIZ);
+        else if (ieee->state != IEEE80211_NOLINK)
+                strlcat(wrqu->name, " .....", IFNAMSIZ);
 
 
         return 0;
@@ -473,11 +469,10 @@ int ieee80211_wx_set_power(struct ieee80211_device *ieee,
 {
         int ret = 0;
 
-        if(
-                (!ieee->sta_wake_up) ||
-                (!ieee->ps_request_tx_ack) ||
-                (!ieee->enter_sleep_state) ||
-                (!ieee->ps_is_queue_empty)){
+        if ((!ieee->sta_wake_up) ||
+            (!ieee->ps_request_tx_ack) ||
+            (!ieee->enter_sleep_state) ||
+            (!ieee->ps_is_queue_empty)) {
 
                 printk("ERROR. PS mode tried to be use but driver missed a callback\n\n");
 
@@ -486,7 +481,7 @@ int ieee80211_wx_set_power(struct ieee80211_device *ieee,
 
         down(&ieee->wx_sem);
 
-        if (wrqu->power.disabled){
+        if (wrqu->power.disabled) {
                 ieee->ps = IEEE80211_PS_DISABLED;
 
                 goto exit;
@@ -512,7 +507,7 @@ int ieee80211_wx_set_power(struct ieee80211_device *ieee,
         if (wrqu->power.flags & IW_POWER_TIMEOUT) {
 
                 ieee->ps_timeout = wrqu->power.value / 1000;
-                printk("Timeout %d\n",ieee->ps_timeout);
+                printk("Timeout %d\n", ieee->ps_timeout);
         }
 
         if (wrqu->power.flags & IW_POWER_PERIOD) {
@@ -533,11 +528,11 @@ int ieee80211_wx_get_power(struct ieee80211_device *ieee,
                                  struct iw_request_info *info,
                                  union iwreq_data *wrqu, char *extra)
 {
-        int ret =0;
+        int ret = 0;
 
         down(&ieee->wx_sem);
 
-        if(ieee->ps == IEEE80211_PS_DISABLED){
+        if (ieee->ps == IEEE80211_PS_DISABLED) {
                 wrqu->power.disabled = 1;
                 goto exit;
         }
diff --git a/drivers/staging/rtl8187se/r8180.h b/drivers/staging/rtl8187se/r8180.h
index 2682afbac4ff..70ea4145b4c8 100644
--- a/drivers/staging/rtl8187se/r8180.h
+++ b/drivers/staging/rtl8187se/r8180.h
@@ -327,12 +327,8 @@ typedef struct r8180_priv
         int irq;
         struct ieee80211_device *ieee80211;
 
-        short phy_ver; /* meaningful for rtl8225 1:A 2:B 3:C */
-        short enable_gpio0;
-        short hw_plcp_len;
         short plcp_preamble_mode; // 0:auto 1:short 2:long
 
-        spinlock_t irq_lock;
         spinlock_t irq_th_lock;
         spinlock_t tx_lock;
         spinlock_t ps_lock;
@@ -350,7 +346,6 @@ typedef struct r8180_priv
         u8 channel_plan;  // it's the channel plan index
         short up;
         short crcmon; //if 1 allow bad crc frame reception in monitor mode
-        short prism_hdr;
 
         struct timer_list scan_timer;
         /*short scanpending;
@@ -359,14 +354,11 @@ typedef struct r8180_priv
         u8 active_probe;
         //u8 active_scan_num;
         struct semaphore wx_sem;
-        struct semaphore rf_state;
         short hw_wep;
 
         short digphy;
         short antb;
         short diversity;
-        u8 cs_treshold;
-        short rcr_csense;
         u32 key0[4];
         short (*rf_set_sens)(struct net_device *dev,short sens);
         void (*rf_set_chan)(struct net_device *dev,short ch);
@@ -491,7 +483,6 @@ typedef struct r8180_priv
         RT_RF_POWER_STATE eRFPowerState;
         u32 RfOffReason;
         bool RFChangeInProgress;
-        bool bInHctTest;
         bool SetRFPowerStateInProgress;
         u8   RFProgType;
         bool bLeisurePs;
@@ -618,17 +609,11 @@ typedef struct r8180_priv
 //      struct workqueue_struct *workqueue;
         struct work_struct reset_wq;
         struct work_struct watch_dog_wq;
-        struct work_struct tx_irq_wq;
         short ack_tx_to_ieee;
 
-        u8 PowerProfile;
-        u32 CSMethod;
-        u8 cck_txpwr_base;
-        u8 ofdm_txpwr_base;
         u8 dma_poll_stop_mask;
 
         //u8 RegThreeWireMode;
-        u8 MWIEnable;
         u16 ShortRetryLimit;
         u16 LongRetryLimit;
         u16 EarlyRxThreshold;
@@ -667,35 +652,22 @@ void write_nic_dword(struct net_device *dev, int x,u32 y);
 void force_pci_posting(struct net_device *dev);
 
 void rtl8180_rtx_disable(struct net_device *);
-void rtl8180_rx_enable(struct net_device *);
-void rtl8180_tx_enable(struct net_device *);
-void rtl8180_start_scanning(struct net_device *dev);
-void rtl8180_start_scanning_s(struct net_device *dev);
-void rtl8180_stop_scanning(struct net_device *dev);
-void rtl8180_disassociate(struct net_device *dev);
-//void fix_rx_fifo(struct net_device *dev);
 void rtl8180_set_anaparam(struct net_device *dev,u32 a);
 void rtl8185_set_anaparam2(struct net_device *dev,u32 a);
 void rtl8180_set_hw_wep(struct net_device *dev);
 void rtl8180_no_hw_wep(struct net_device *dev);
 void rtl8180_update_msr(struct net_device *dev);
-//void rtl8180_BSS_create(struct net_device *dev);
 void rtl8180_beacon_tx_disable(struct net_device *dev);
 void rtl8180_beacon_rx_disable(struct net_device *dev);
-void rtl8180_conttx_enable(struct net_device *dev);
-void rtl8180_conttx_disable(struct net_device *dev);
 int rtl8180_down(struct net_device *dev);
 int rtl8180_up(struct net_device *dev);
 void rtl8180_commit(struct net_device *dev);
 void rtl8180_set_chan(struct net_device *dev,short ch);
-void rtl8180_set_master_essid(struct net_device *dev,char *essid);
-void rtl8180_update_beacon_security(struct net_device *dev);
 void write_phy(struct net_device *dev, u8 adr, u8 data);
 void write_phy_cck(struct net_device *dev, u8 adr, u32 data);
 void write_phy_ofdm(struct net_device *dev, u8 adr, u32 data);
 void rtl8185_tx_antenna(struct net_device *dev, u8 ant);
 void rtl8185_rf_pins_enable(struct net_device *dev);
-void IBSS_randomize_cell(struct net_device *dev);
 void IPSEnter(struct net_device *dev);
 void IPSLeave(struct net_device *dev);
 int get_curr_tx_free_desc(struct net_device *dev, int priority);
diff --git a/drivers/staging/rtl8187se/r8180_core.c b/drivers/staging/rtl8187se/r8180_core.c
index 20e5fb58f52f..ae38475854b5 100644
--- a/drivers/staging/rtl8187se/r8180_core.c
+++ b/drivers/staging/rtl8187se/r8180_core.c
@@ -27,6 +27,8 @@
    Written by Mariusz Matuszek.
 */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #undef RX_DONT_PASS_UL
 #undef DUMMY_RX
 
@@ -44,7 +46,7 @@
 
 #include "ieee80211/dot11d.h"
 
-static struct pci_device_id rtl8180_pci_id_tbl[] __devinitdata = {
+static struct pci_device_id rtl8180_pci_id_tbl[] = {
         {
                 .vendor = PCI_VENDOR_ID_REALTEK,
                 .device = 0x8199,
@@ -61,33 +63,23 @@ static struct pci_device_id rtl8180_pci_id_tbl[] __devinitdata = {
         }
 };
 
-
 static char ifname[IFNAMSIZ] = "wlan%d";
-static int hwseqnum = 0;
-static int hwwep = 0;
-static int channels = 0x3fff;
+static int hwwep;
 
 MODULE_LICENSE("GPL");
 MODULE_DEVICE_TABLE(pci, rtl8180_pci_id_tbl);
 MODULE_AUTHOR("Andrea Merello <andreamrl@tiscali.it>");
-MODULE_DESCRIPTION("Linux driver for Realtek RTL8180 / RTL8185 WiFi cards");
-
+MODULE_DESCRIPTION("Linux driver for Realtek RTL8187SE WiFi cards");
 
 module_param_string(ifname, ifname, sizeof(ifname), S_IRUGO|S_IWUSR);
-module_param(hwseqnum, int, S_IRUGO|S_IWUSR);
 module_param(hwwep, int, S_IRUGO|S_IWUSR);
-module_param(channels, int, S_IRUGO|S_IWUSR);
 
-MODULE_PARM_DESC(devname, " Net interface name, wlan%d=default");
-MODULE_PARM_DESC(hwseqnum, " Try to use hardware 802.11 header sequence numbers. Zero=default");
 MODULE_PARM_DESC(hwwep, " Try to use hardware WEP support. Still broken and not available on all cards");
-MODULE_PARM_DESC(channels, " Channel bitmask for specific locales. NYI");
 
-
-static int __devinit rtl8180_pci_probe(struct pci_dev *pdev,
+static int rtl8180_pci_probe(struct pci_dev *pdev,
                                        const struct pci_device_id *id);
 
-static void __devexit rtl8180_pci_remove(struct pci_dev *pdev);
+static void rtl8180_pci_remove(struct pci_dev *pdev);
 
 static void rtl8180_shutdown(struct pci_dev *pdev)
 {
@@ -126,8 +118,7 @@ static int rtl8180_resume(struct pci_dev *pdev)
 
         err = pci_enable_device(pdev);
         if (err) {
-                printk(KERN_ERR "%s: pci_enable_device failed on resume\n",
-                                dev->name);
+                dev_err(&pdev->dev, "pci_enable_device failed on resume\n");
 
                 return err;
         }
@@ -159,7 +150,7 @@ static struct pci_driver rtl8180_pci_driver = {
         .name           = RTL8180_MODULE_NAME,
         .id_table       = rtl8180_pci_id_tbl,
         .probe          = rtl8180_pci_probe,
-        .remove         = __devexit_p(rtl8180_pci_remove),
+        .remove         = rtl8180_pci_remove,
         .suspend        = rtl8180_suspend,
         .resume         = rtl8180_resume,
         .shutdown       = rtl8180_shutdown,
@@ -211,7 +202,7 @@ static struct net_device_stats *rtl8180_stats(struct net_device *dev);
 void rtl8180_commit(struct net_device *dev);
 void rtl8180_start_tx_beacon(struct net_device *dev);
 
-static struct proc_dir_entry *rtl8180_proc = NULL;
+static struct proc_dir_entry *rtl8180_proc;
 
 static int proc_get_registers(char *page, char **start,
                           off_t offset, int count,
@@ -323,7 +314,6 @@ void rtl8180_proc_remove_one(struct net_device *dev)
                 remove_proc_entry("stats-tx", priv->dir_dev);
                 remove_proc_entry("stats-rx", priv->dir_dev);
                 remove_proc_entry("registers", priv->dir_dev);
-                remove_proc_entry(dev->name, rtl8180_proc);
                 priv->dir_dev = NULL;
         }
 }
@@ -444,24 +434,6 @@ void buffer_free(struct net_device *dev, struct buffer **buffer, int len, short
         *buffer = NULL;
 }
 
-void print_buffer(u32 *buffer, int len)
-{
-        int i;
-        u8 *buf = (u8 *)buffer;
-
-        printk("ASCII BUFFER DUMP (len: %x):\n", len);
-
-        for (i = 0; i < len; i++)
-                printk("%c", buf[i]);
-
-        printk("\nBINARY BUFFER DUMP (len: %x):\n", len);
-
-        for (i = 0; i < len; i++)
-                printk("%02x", buf[i]);
-
-        printk("\n");
-}
-
 int get_curr_tx_free_desc(struct net_device *dev, int priority)
 {
         struct r8180_priv *priv = ieee80211_priv(dev);
@@ -635,74 +607,6 @@ void fix_rx_fifo(struct net_device *dev)
         set_nic_rxring(dev);
 }
 
-unsigned char QUALITY_MAP[] = {
-        0x64, 0x64, 0x64, 0x63, 0x63, 0x62, 0x62, 0x61,
-        0x61, 0x60, 0x60, 0x5f, 0x5f, 0x5e, 0x5d, 0x5c,
-        0x5b, 0x5a, 0x59, 0x57, 0x56, 0x54, 0x52, 0x4f,
-        0x4c, 0x49, 0x45, 0x41, 0x3c, 0x37, 0x31, 0x29,
-        0x24, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22,
-        0x22, 0x22, 0x21, 0x21, 0x21, 0x21, 0x21, 0x20,
-        0x20, 0x20, 0x20, 0x1f, 0x1f, 0x1e, 0x1e, 0x1e,
-        0x1d, 0x1d, 0x1c, 0x1c, 0x1b, 0x1a, 0x19, 0x19,
-        0x18, 0x17, 0x16, 0x15, 0x14, 0x12, 0x11, 0x0f,
-        0x0e, 0x0c, 0x0a, 0x08, 0x06, 0x04, 0x01, 0x00
-};
-
-unsigned char STRENGTH_MAP[] = {
-        0x64, 0x64, 0x63, 0x62, 0x61, 0x60, 0x5f, 0x5e,
-        0x5d, 0x5c, 0x5b, 0x5a, 0x57, 0x54, 0x52, 0x50,
-        0x4e, 0x4c, 0x4a, 0x48, 0x46, 0x44, 0x41, 0x3f,
-        0x3c, 0x3a, 0x37, 0x36, 0x36, 0x1c, 0x1c, 0x1b,
-        0x1b, 0x1a, 0x1a, 0x19, 0x19, 0x18, 0x18, 0x17,
-        0x17, 0x16, 0x16, 0x15, 0x15, 0x14, 0x14, 0x13,
-        0x13, 0x12, 0x12, 0x11, 0x11, 0x10, 0x10, 0x0f,
-        0x0f, 0x0e, 0x0e, 0x0d, 0x0d, 0x0c, 0x0c, 0x0b,
-        0x0b, 0x0a, 0x0a, 0x09, 0x09, 0x08, 0x08, 0x07,
-        0x07, 0x06, 0x06, 0x05, 0x04, 0x03, 0x02, 0x00
-};
-
-void rtl8180_RSSI_calc(struct net_device *dev, u8 *rssi, u8 *qual)
-{
-        u32 temp;
-        u32 temp2;
-        u32 q;
-        u32 orig_qual;
-        u8  _rssi;
-
-        q = *qual;
-        orig_qual = *qual;
-        _rssi = 0; /* avoid gcc complains.. */
-
-        if (q <= 0x4e) {
-                temp = QUALITY_MAP[q];
-        } else {
-                if (q & 0x80)
-                        temp = 0x32;
-                else
-                        temp = 1;
-        }
-
-        *qual = temp;
-        temp2 = *rssi;
-
-        if (_rssi < 0x64) {
-                if (_rssi == 0)
-                        *rssi = 1;
-        } else {
-                *rssi = 0x64;
-        }
-
-        return;
-}
-
-void rtl8180_irq_enable(struct net_device *dev)
-{
-        struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev);
-
-        priv->irq_enabled = 1;
-        write_nic_word(dev, INTA_MASK, priv->irq_mask);
-}
-
 void rtl8180_irq_disable(struct net_device *dev)
 {
         struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev);
@@ -724,7 +628,6 @@ void rtl8180_set_mode(struct net_device *dev, int mode)
         write_nic_byte(dev, EPROM_CMD, ecmd);
 }
 
-void rtl8180_adapter_start(struct net_device *dev);
 void rtl8180_beacon_tx_enable(struct net_device *dev);
 
 void rtl8180_update_msr(struct net_device *dev)
@@ -771,57 +674,6 @@ void rtl8180_set_chan(struct net_device *dev, short ch)
         priv->rf_set_chan(dev, priv->chan);
 }
 
-void rtl8180_rx_enable(struct net_device *dev)
-{
-        u8 cmd;
-        u32 rxconf;
-        /* for now we accept data, management & ctl frame*/
-        struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev);
-
-        rxconf = read_nic_dword(dev, RX_CONF);
-        rxconf = rxconf & ~MAC_FILTER_MASK;
-        rxconf = rxconf | (1<<ACCEPT_MNG_FRAME_SHIFT);
-        rxconf = rxconf | (1<<ACCEPT_DATA_FRAME_SHIFT);
-        rxconf = rxconf | (1<<ACCEPT_BCAST_FRAME_SHIFT);
-        rxconf = rxconf | (1<<ACCEPT_MCAST_FRAME_SHIFT);
-        if (dev->flags & IFF_PROMISC)
-                DMESG("NIC in promisc mode");
-
-        if (priv->ieee80211->iw_mode == IW_MODE_MONITOR || \
-           dev->flags & IFF_PROMISC) {
-                rxconf = rxconf | (1<<ACCEPT_ALLMAC_FRAME_SHIFT);
-        } else {
-                rxconf = rxconf | (1<<ACCEPT_NICMAC_FRAME_SHIFT);
-        }
-
-        if (priv->ieee80211->iw_mode == IW_MODE_MONITOR) {
-                rxconf = rxconf | (1<<ACCEPT_CTL_FRAME_SHIFT);
-                rxconf = rxconf | (1<<ACCEPT_ICVERR_FRAME_SHIFT);
-                rxconf = rxconf | (1<<ACCEPT_PWR_FRAME_SHIFT);
-        }
-
-        if (priv->crcmon == 1 && priv->ieee80211->iw_mode == IW_MODE_MONITOR)
-                rxconf = rxconf | (1<<ACCEPT_CRCERR_FRAME_SHIFT);
-
-        rxconf = rxconf & ~RX_FIFO_THRESHOLD_MASK;
-        rxconf = rxconf | (RX_FIFO_THRESHOLD_NONE << RX_FIFO_THRESHOLD_SHIFT);
-
-        rxconf = rxconf | (1<<RX_AUTORESETPHY_SHIFT);
-        rxconf = rxconf & ~MAX_RX_DMA_MASK;
-        rxconf = rxconf | (MAX_RX_DMA_2048<<MAX_RX_DMA_SHIFT);
-
-        rxconf = rxconf | RCR_ONLYERLPKT;
-
-        rxconf = rxconf & ~RCR_CS_MASK;
-
-        write_nic_dword(dev, RX_CONF, rxconf);
-
-        fix_rx_fifo(dev);
-
-        cmd = read_nic_byte(dev, CMD);
-        write_nic_byte(dev, CMD, cmd | (1<<CMD_RX_ENABLE_SHIFT));
-}
-
 void set_nic_txring(struct net_device *dev)
 {
         struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev);
@@ -835,80 +687,6 @@ void set_nic_txring(struct net_device *dev)
         write_nic_dword(dev, TX_BEACON_RING_ADDR, priv->txbeaconringdma);
 }
 
-void rtl8180_conttx_enable(struct net_device *dev)
-{
-        u32 txconf;
-
-        txconf = read_nic_dword(dev, TX_CONF);
-        txconf = txconf & ~TX_LOOPBACK_MASK;
-        txconf = txconf | (TX_LOOPBACK_CONTINUE<<TX_LOOPBACK_SHIFT);
-        write_nic_dword(dev, TX_CONF, txconf);
-}
-
-void rtl8180_conttx_disable(struct net_device *dev)
-{
-        u32 txconf;
-
-        txconf = read_nic_dword(dev, TX_CONF);
-        txconf = txconf & ~TX_LOOPBACK_MASK;
-        txconf = txconf | (TX_LOOPBACK_NONE<<TX_LOOPBACK_SHIFT);
-        write_nic_dword(dev, TX_CONF, txconf);
-}
-
-void rtl8180_tx_enable(struct net_device *dev)
-{
-        u8 cmd;
-        u8 tx_agc_ctl;
-        u8 byte;
-        u32 txconf;
-        struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev);
-
-        txconf = read_nic_dword(dev, TX_CONF);
-
-        byte = read_nic_byte(dev, CW_CONF);
-        byte &= ~(1<<CW_CONF_PERPACKET_CW_SHIFT);
-        byte &= ~(1<<CW_CONF_PERPACKET_RETRY_SHIFT);
-        write_nic_byte(dev, CW_CONF, byte);
-
-        tx_agc_ctl = read_nic_byte(dev, TX_AGC_CTL);
-        tx_agc_ctl &= ~(1<<TX_AGC_CTL_PERPACKET_GAIN_SHIFT);
-        tx_agc_ctl &= ~(1<<TX_AGC_CTL_PERPACKET_ANTSEL_SHIFT);
-        tx_agc_ctl |= (1<<TX_AGC_CTL_FEEDBACK_ANT);
-        write_nic_byte(dev, TX_AGC_CTL, tx_agc_ctl);
-        write_nic_byte(dev, 0xec, 0x3f); /* Disable early TX */
-
-        txconf = txconf & ~(1<<TCR_PROBE_NOTIMESTAMP_SHIFT);
-
-        txconf = txconf & ~TX_LOOPBACK_MASK;
-        txconf = txconf | (TX_LOOPBACK_NONE<<TX_LOOPBACK_SHIFT);
-        txconf = txconf & ~TCR_DPRETRY_MASK;
-        txconf = txconf & ~TCR_RTSRETRY_MASK;
-        txconf = txconf | (priv->retry_data<<TX_DPRETRY_SHIFT);
-        txconf = txconf | (priv->retry_rts<<TX_RTSRETRY_SHIFT);
-        txconf = txconf & ~(1<<TX_NOCRC_SHIFT);
-
-        if (priv->hw_plcp_len)
-                txconf = txconf & ~TCR_PLCP_LEN;
-        else
-                txconf = txconf | TCR_PLCP_LEN;
-
-        txconf = txconf & ~TCR_MXDMA_MASK;
-        txconf = txconf | (TCR_MXDMA_2048<<TCR_MXDMA_SHIFT);
-        txconf = txconf | TCR_CWMIN;
-        txconf = txconf | TCR_DISCW;
-
-        txconf = txconf | (1 << TX_NOICV_SHIFT);
-
-        write_nic_dword(dev, TX_CONF, txconf);
-
-        fix_tx_fifo(dev);
-
-        cmd = read_nic_byte(dev, CMD);
-        write_nic_byte(dev, CMD, cmd | (1<<CMD_TX_ENABLE_SHIFT));
-
-        write_nic_dword(dev, TX_CONF, txconf);
-}
-
 void rtl8180_beacon_tx_enable(struct net_device *dev)
 {
         struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev);
@@ -936,8 +714,8 @@ void rtl8180_rtx_disable(struct net_device *dev)
         struct r8180_priv *priv = ieee80211_priv(dev);
 
         cmd = read_nic_byte(dev, CMD);
-        write_nic_byte(dev, CMD, cmd & ~\
-                       ((1<<CMD_RX_ENABLE_SHIFT)|(1<<CMD_TX_ENABLE_SHIFT)));
+        write_nic_byte(dev, CMD, cmd &
+                       ~((1<<CMD_RX_ENABLE_SHIFT)|(1<<CMD_TX_ENABLE_SHIFT)));
         force_pci_posting(dev);
         mdelay(10);
 
@@ -1481,8 +1259,7 @@ void rtl8180_rx(struct net_device *dev)
 
                 pci_dma_sync_single_for_cpu(priv->pdev,
                                     priv->rxbuffer->dma,
-                                    priv->rxbuffersize * \
-                                    sizeof(u8),
+                                    priv->rxbuffersize * sizeof(u8),
                                     PCI_DMA_FROMDEVICE);
 
                 first = *(priv->rxringtail) & (1<<29) ? 1 : 0;
@@ -1660,14 +1437,9 @@ void rtl8180_rx(struct net_device *dev)
                                 dev_kfree_skb_any(priv->rx_skb);
                                 priv->stats.rxnolast++;
                         }
-                        /* support for prism header has been originally added by Christian */
-                        if (priv->prism_hdr && priv->ieee80211->iw_mode == IW_MODE_MONITOR) {
-
-                        } else {
-                                priv->rx_skb = dev_alloc_skb(len+2);
-                                if (!priv->rx_skb)
-                                        goto drop;
-                        }
+                        priv->rx_skb = dev_alloc_skb(len+2);
+                        if (!priv->rx_skb)
+                                goto drop;
 
                         priv->rx_skb_complete = 0;
                         priv->rx_skb->dev = dev;
@@ -1718,8 +1490,7 @@ void rtl8180_rx(struct net_device *dev)
 
                 pci_dma_sync_single_for_device(priv->pdev,
                                     priv->rxbuffer->dma,
-                                    priv->rxbuffersize * \
-                                    sizeof(u8),
+                                    priv->rxbuffersize * sizeof(u8),
                                     PCI_DMA_FROMDEVICE);
 
 drop: /* this is used when we have not enough mem */
@@ -1929,7 +1700,7 @@ void rtl8180_prepare_beacon(struct net_device *dev)
  * descriptor in the ring buffer, copyes the frame in a TX buffer
  * and kicks the NIC to ensure it does the DMA transfer.
  */
-short rtl8180_tx(struct net_device *dev, u8* txbuf, int len, int priority,
+short rtl8180_tx(struct net_device *dev, u8 *txbuf, int len, int priority,
                  short morefrag, short descfrag, int rate)
 {
         struct r8180_priv *priv = ieee80211_priv(dev);
@@ -1940,8 +1711,6 @@ short rtl8180_tx(struct net_device *dev, u8* txbuf, int len, int priority,
         int remain;
         int buflen;
         int count;
-        u16 duration;
-        short ext;
         struct buffer *buflist;
         struct ieee80211_hdr_3addr *frag_hdr = (struct ieee80211_hdr_3addr *)txbuf;
         u8 dest[ETH_ALEN];
@@ -2137,15 +1906,6 @@ short rtl8180_tx(struct net_device *dev, u8* txbuf, int len, int priority,
 
                 *tail = *tail | ((rate&0xf) << 24);
 
-                /* hw_plcp_len is not used for rtl8180 chip */
-                /* FIXME */
-                if (!priv->hw_plcp_len) {
-                        duration = rtl8180_len2duration(len, rate, &ext);
-                        *(tail+1) = *(tail+1) | ((duration & 0x7fff)<<16);
-                        if (ext)
-                                *(tail+1) = *(tail+1) | (1<<31); /* plcp length extension */
-                }
-
                 if (morefrag)
                         *tail = (*tail) | (1<<17); /* more fragment */
                 if (!remain)
@@ -2223,10 +1983,10 @@ void rtl8180_link_change(struct net_device *dev)
         write_nic_dword(dev, BSSID, ((u32 *)net->bssid)[0]);
         write_nic_word(dev, BSSID+4, ((u16 *)net->bssid)[2]);
 
-        beacon_interval  = read_nic_dword(dev, BEACON_INTERVAL);
+        beacon_interval  = read_nic_word(dev, BEACON_INTERVAL);
         beacon_interval &= ~BEACON_INTERVAL_MASK;
         beacon_interval |= net->beacon_interval;
-        write_nic_dword(dev, BEACON_INTERVAL, beacon_interval);
+        write_nic_word(dev, BEACON_INTERVAL, beacon_interval);
 
         rtl8180_set_mode(dev, EPROM_CMD_NORMAL);
 
@@ -2279,8 +2039,6 @@ short rtl8180_is_tx_queue_empty(struct net_device *dev)
                                 return 0;
         return 1;
 }
-/* FIXME FIXME 5msecs is random */
-#define HW_WAKE_DELAY 5
 
 void rtl8180_hw_wakeup(struct net_device *dev)
 {
@@ -2397,7 +2155,8 @@ void rtl8180_wmm_param_update(struct work_struct *work)
                                         write_nic_dword(dev, AC_VO_PARAM, u4bAcParam);
                                         break;
                                 default:
-                                        printk(KERN_WARNING "SetHwReg8185():invalid ACI: %d!\n", eACI);
+                                        pr_warn("SetHwReg8185():invalid ACI: %d!\n",
+                                                eACI);
                                         break;
                                 }
                         }
@@ -2436,7 +2195,8 @@ void rtl8180_wmm_param_update(struct work_struct *work)
                                 write_nic_dword(dev, AC_VO_PARAM, u4bAcParam);
                                 break;
                         default:
-                                printk(KERN_WARNING "SetHwReg8185(): invalid ACI: %d !\n", eACI);
+                                pr_warn("SetHwReg8185(): invalid ACI: %d !\n",
+                                        eACI);
                                 break;
                         }
                 }
@@ -2444,7 +2204,6 @@ void rtl8180_wmm_param_update(struct work_struct *work)
         }
 }
 
-void rtl8180_tx_irq_wq(struct work_struct *work);
 void rtl8180_restart_wq(struct work_struct *work);
 /* void rtl8180_rq_tx_ack(struct work_struct *work); */
 void rtl8180_watch_dog_wq(struct work_struct *work);
@@ -2455,7 +2214,7 @@ void rtl8180_watch_dog(struct net_device *dev);
 
 void watch_dog_adaptive(unsigned long data)
 {
-        struct r8180_priv* priv = ieee80211_priv((struct net_device *)data);
+        struct r8180_priv *priv = ieee80211_priv((struct net_device *)data);
 
         if (!priv->up) {
                 DMESG("<----watch_dog_adaptive():driver is not up!\n");
@@ -2601,8 +2360,7 @@ short rtl8180_init(struct net_device *dev)
 {
         struct r8180_priv *priv = ieee80211_priv(dev);
         u16 word;
-        u16 version;
-        u32 usValue;
+        u16 usValue;
         u16 tmpu16;
         int i, j;
         struct eeprom_93cx6 eeprom;
@@ -2634,7 +2392,6 @@ short rtl8180_init(struct net_device *dev)
         priv->RFChangeInProgress = false;
         priv->SetRFPowerStateInProgress = false;
         priv->RFProgType = 0;
-        priv->bInHctTest = false;
 
         priv->irq_enabled = 0;
 
@@ -2658,14 +2415,12 @@ short rtl8180_init(struct net_device *dev)
         priv->ieee80211->ps_is_queue_empty = rtl8180_is_tx_queue_empty;
 
         priv->hw_wep = hwwep;
-        priv->prism_hdr = 0;
         priv->dev = dev;
         priv->retry_rts = DEFAULT_RETRY_RTS;
         priv->retry_data = DEFAULT_RETRY_DATA;
         priv->RFChangeInProgress = false;
         priv->SetRFPowerStateInProgress = false;
         priv->RFProgType = 0;
-        priv->bInHctTest = false;
         priv->bInactivePs = true; /* false; */
         priv->ieee80211->bInactivePs = priv->bInactivePs;
         priv->bSwRfProcessing = false;
@@ -2726,7 +2481,6 @@ short rtl8180_init(struct net_device *dev)
         priv->NumTxOkTotal = 0;
         priv->NumTxUnicast = 0;
         priv->keepAliveLevel = DEFAULT_KEEP_ALIVE_LEVEL;
-        priv->PowerProfile = POWER_PROFILE_AC;
         priv->CurrRetryCnt = 0;
         priv->LastRetryCnt = 0;
         priv->LastTxokCnt = 0;
@@ -2748,15 +2502,12 @@ short rtl8180_init(struct net_device *dev)
         priv->RegBModeGainStage = 1;
 
         priv->promisc = (dev->flags & IFF_PROMISC) ? 1 : 0;
-        spin_lock_init(&priv->irq_lock);
         spin_lock_init(&priv->irq_th_lock);
         spin_lock_init(&priv->tx_lock);
         spin_lock_init(&priv->ps_lock);
         spin_lock_init(&priv->rf_ps_lock);
         sema_init(&priv->wx_sem, 1);
-        sema_init(&priv->rf_state, 1);
         INIT_WORK(&priv->reset_wq, (void *)rtl8180_restart_wq);
-        INIT_WORK(&priv->tx_irq_wq, (void *)rtl8180_tx_irq_wq);
         INIT_DELAYED_WORK(&priv->ieee80211->hw_wakeup_wq,
                           (void *)rtl8180_hw_wakeup_wq);
         INIT_DELAYED_WORK(&priv->ieee80211->hw_sleep_wq,
@@ -2798,19 +2549,14 @@ short rtl8180_init(struct net_device *dev)
         priv->ieee80211->stop_send_beacons = rtl8180_beacon_tx_disable;
         priv->ieee80211->fts = DEFAULT_FRAG_THRESHOLD;
 
-        priv->MWIEnable = 0;
-
         priv->ShortRetryLimit = 7;
         priv->LongRetryLimit = 7;
         priv->EarlyRxThreshold = 7;
 
-        priv->CSMethod = (0x01 << 29);
-
-        priv->TransmitConfig =  TCR_DurProcMode_OFFSET |
+        priv->TransmitConfig =  (1<<TCR_DurProcMode_OFFSET) |
                                 (7<<TCR_MXDMA_OFFSET) |
                                 (priv->ShortRetryLimit<<TCR_SRL_OFFSET) |
-                                (priv->LongRetryLimit<<TCR_LRL_OFFSET) |
-                                (0 ? TCR_SAT : 0);
+                                (priv->LongRetryLimit<<TCR_LRL_OFFSET);
 
         priv->ReceiveConfig =   RCR_AMF | RCR_ADF | RCR_ACF |
                                 RCR_AB | RCR_AM | RCR_APM |
@@ -2832,47 +2578,35 @@ short rtl8180_init(struct net_device *dev)
         priv->InitialGain = 6;
 
         DMESG("MAC controller is a RTL8187SE b/g");
-        priv->phy_ver = 2;
 
         priv->ieee80211->modulation |= IEEE80211_OFDM_MODULATION;
         priv->ieee80211->short_slot = 1;
 
-        /* just for sync 85 */
-        priv->enable_gpio0 = 0;
-
-        eeprom_93cx6_read(&eeprom, EEPROM_SW_REVD_OFFSET, &eeprom_val);
-        usValue = eeprom_val;
-        DMESG("usValue is 0x%x\n", usValue);
+        eeprom_93cx6_read(&eeprom, EEPROM_SW_REVD_OFFSET, &usValue);
+        DMESG("usValue is %#hx\n", usValue);
         /* 3Read AntennaDiversity */
 
         /* SW Antenna Diversity. */
-        if ((usValue & EEPROM_SW_AD_MASK) != EEPROM_SW_AD_ENABLE)
-                priv->EEPROMSwAntennaDiversity = false;
-        else
-                priv->EEPROMSwAntennaDiversity = true;
+        priv->EEPROMSwAntennaDiversity = (usValue & EEPROM_SW_AD_MASK) ==
+                EEPROM_SW_AD_ENABLE;
 
         /* Default Antenna to use. */
-        if ((usValue & EEPROM_DEF_ANT_MASK) != EEPROM_DEF_ANT_1)
-                priv->EEPROMDefaultAntenna1 = false;
-        else
-                priv->EEPROMDefaultAntenna1 = true;
+        priv->EEPROMDefaultAntenna1 = (usValue & EEPROM_DEF_ANT_MASK) ==
+                EEPROM_DEF_ANT_1;
 
         if (priv->RegSwAntennaDiversityMechanism == 0) /* Auto */
                 /* 0: default from EEPROM. */
                 priv->bSwAntennaDiverity = priv->EEPROMSwAntennaDiversity;
         else
                 /* 1:disable antenna diversity, 2: enable antenna diversity. */
-                priv->bSwAntennaDiverity = ((priv->RegSwAntennaDiversityMechanism == 1) ? false : true);
+                priv->bSwAntennaDiverity = priv->RegSwAntennaDiversityMechanism == 2;
 
         if (priv->RegDefaultAntenna == 0)
                 /* 0: default from EEPROM. */
                 priv->bDefaultAntenna1 = priv->EEPROMDefaultAntenna1;
         else
                 /* 1: main, 2: aux. */
-                priv->bDefaultAntenna1 = ((priv->RegDefaultAntenna == 2) ? true : false);
-
-        /* rtl8185 can calc plcp len in HW. */
-        priv->hw_plcp_len = 1;
+                priv->bDefaultAntenna1 = priv->RegDefaultAntenna == 2;
 
         priv->plcp_preamble_mode = 2;
         /* the eeprom type is stored in RCR register bit #6 */
@@ -2909,18 +2643,6 @@ short rtl8180_init(struct net_device *dev)
         if ((tmpu16 & EEPROM_THERMAL_METER_ENABLE) >> 13)
                 priv->bTxPowerTrack = true;
 
-        eeprom_93cx6_read(&eeprom, EPROM_TXPW_BASE, &word);
-        priv->cck_txpwr_base = word & 0xf;
-        priv->ofdm_txpwr_base = (word>>4) & 0xf;
-
-        eeprom_93cx6_read(&eeprom, EPROM_VERSION, &version);
-        DMESG("EEPROM version %x", version);
-        priv->rcr_csense = 3;
-
-        eeprom_93cx6_read(&eeprom, ENERGY_TRESHOLD, &eeprom_val);
-        priv->cs_treshold = (eeprom_val & 0xff00) >> 8;
-
-        eeprom_93cx6_read(&eeprom, RFCHIPID, &eeprom_val);
         priv->rf_sleep = rtl8225z4_rf_sleep;
         priv->rf_wakeup = rtl8225z4_rf_wakeup;
         DMESGW("**PLEASE** REPORT SUCCESSFUL/UNSUCCESSFUL TO Realtek!");
@@ -3084,100 +2806,6 @@ void write_phy_cck(struct net_device *dev, u8 adr, u32 data)
         rtl8185_write_phy(dev, adr, data | 0x10000);
 }
 
-void rtl8185_set_rate(struct net_device *dev)
-{
-        int i;
-        u16 word;
-        int basic_rate, min_rr_rate, max_rr_rate;
-
-        basic_rate = ieeerate2rtlrate(240);
-        min_rr_rate = ieeerate2rtlrate(60);
-        max_rr_rate = ieeerate2rtlrate(240);
-
-        write_nic_byte(dev, RESP_RATE,
-                       max_rr_rate<<MAX_RESP_RATE_SHIFT |
-                       min_rr_rate<<MIN_RESP_RATE_SHIFT);
-
-        word  = read_nic_word(dev, BRSR);
-        word &= ~BRSR_MBR_8185;
-
-        for (i = 0; i <= basic_rate; i++)
-                word |= (1<<i);
-
-        write_nic_word(dev, BRSR, word);
-}
-
-void rtl8180_adapter_start(struct net_device *dev)
-{
-        struct r8180_priv *priv = ieee80211_priv(dev);
-
-        rtl8180_rtx_disable(dev);
-        rtl8180_reset(dev);
-
-        /* enable beacon timeout, beacon TX ok and err
-         * LP tx ok and err, HP TX ok and err, NP TX ok and err,
-         * RX ok and ERR, and GP timer
-         */
-        priv->irq_mask = 0x6fcf;
-
-        priv->dma_poll_mask = 0;
-
-        rtl8180_beacon_tx_disable(dev);
-
-        rtl8180_set_mode(dev, EPROM_CMD_CONFIG);
-        write_nic_dword(dev, MAC0, ((u32 *)dev->dev_addr)[0]);
-        write_nic_word(dev, MAC4, ((u32 *)dev->dev_addr)[1] & 0xffff);
-        rtl8180_set_mode(dev, EPROM_CMD_NORMAL);
-
-        rtl8180_update_msr(dev);
-
-        /* These might be unnecessary since we do in rx_enable / tx_enable */
-        fix_rx_fifo(dev);
-        fix_tx_fifo(dev);
-
-        rtl8180_set_mode(dev, EPROM_CMD_CONFIG);
-
-        /*
-         * The following is very strange. seems to be that 1 means test mode,
-         * but we need to acknowledges the nic when a packet is ready
-         * although we set it to 0
-         */
-
-        write_nic_byte(dev,
-                       CONFIG2, read_nic_byte(dev, CONFIG2) & ~\
-                       (1<<CONFIG2_DMA_POLLING_MODE_SHIFT));
-        /* ^the nic isn't in test mode */
-        write_nic_byte(dev,
-                       CONFIG2, read_nic_byte(dev, CONFIG2)|(1<<4));
-
-        rtl8180_set_mode(dev, EPROM_CMD_NORMAL);
-
-        write_nic_dword(dev, INT_TIMEOUT, 0);
-
-        write_nic_byte(dev, WPA_CONFIG, 0);
-
-        rtl8180_no_hw_wep(dev);
-
-        rtl8185_set_rate(dev);
-        write_nic_byte(dev, RATE_FALLBACK, 0x81);
-
-        write_nic_byte(dev, GP_ENABLE, read_nic_byte(dev, GP_ENABLE) & ~(1<<6));
-
-        /* FIXME cfg 3 ClkRun enable - isn't it ReadOnly ? */
-        rtl8180_set_mode(dev, EPROM_CMD_CONFIG);
-        write_nic_byte(dev, CONFIG3, read_nic_byte(dev, CONFIG3)
-                       | (1 << CONFIG3_CLKRUN_SHIFT));
-        rtl8180_set_mode(dev, EPROM_CMD_NORMAL);
-
-        priv->rf_init(dev);
-
-        if (priv->rf_set_sens != NULL)
-                priv->rf_set_sens(dev, priv->sens);
-        rtl8180_irq_enable(dev);
-
-        netif_start_queue(dev);
-}
-
 /*
  * This configures registers for beacon tx and enables it via
  * rtl8180_beacon_tx_enable(). rtl8180_beacon_tx_disable() might
@@ -3299,8 +2927,6 @@ static void MgntLinkKeepAlive(struct r8180_priv *priv)
         }
 }
 
-static u8 read_acadapter_file(char *filename);
-
 void rtl8180_watch_dog(struct net_device *dev)
 {
         struct r8180_priv *priv = ieee80211_priv(dev);
@@ -3333,12 +2959,7 @@ void rtl8180_watch_dog(struct net_device *dev)
         MgntLinkKeepAlive(priv);
 
         /* YJ,add,080828,for LPS */
-        if (priv->PowerProfile == POWER_PROFILE_BATTERY)
-                priv->bLeisurePs = true;
-        else if (priv->PowerProfile == POWER_PROFILE_AC) {
-                LeisurePSLeave(priv);
-                priv->bLeisurePs = false;
-        }
+        LeisurePSLeave(priv);
 
         if (priv->ieee80211->state == IEEE80211_LINKED) {
                 priv->link_detect.NumRxOkInPeriod = priv->ieee80211->NumRxDataInPeriod;
@@ -3555,7 +3176,7 @@ static const struct net_device_ops rtl8180_netdev_ops = {
         .ndo_start_xmit         = ieee80211_rtl_xmit,
 };
 
-static int __devinit rtl8180_pci_probe(struct pci_dev *pdev,
+static int rtl8180_pci_probe(struct pci_dev *pdev,
                                        const struct pci_device_id *id)
 {
         unsigned long ioaddr = 0;
@@ -3638,7 +3259,8 @@ static int __devinit rtl8180_pci_probe(struct pci_dev *pdev,
 
         netif_carrier_off(dev);
 
-        register_netdev(dev);
+        if (register_netdev(dev))
+                goto fail1;
 
         rtl8180_proc_init_one(dev);
 
@@ -3667,7 +3289,7 @@ fail_free:
         return ret;
 }
 
-static void __devexit rtl8180_pci_remove(struct pci_dev *pdev)
+static void rtl8180_pci_remove(struct pci_dev *pdev)
 {
         struct r8180_priv *priv;
         struct net_device *dev = pci_get_drvdata(pdev);
@@ -3721,27 +3343,27 @@ static int __init rtl8180_pci_module_init(void)
 
         ret = ieee80211_crypto_init();
         if (ret) {
-                printk(KERN_ERR "ieee80211_crypto_init() failed %d\n", ret);
+                pr_err("ieee80211_crypto_init() failed %d\n", ret);
                 return ret;
         }
         ret = ieee80211_crypto_tkip_init();
         if (ret) {
-                printk(KERN_ERR "ieee80211_crypto_tkip_init() failed %d\n", ret);
+                pr_err("ieee80211_crypto_tkip_init() failed %d\n", ret);
                 return ret;
         }
         ret = ieee80211_crypto_ccmp_init();
         if (ret) {
-                printk(KERN_ERR "ieee80211_crypto_ccmp_init() failed %d\n", ret);
+                pr_err("ieee80211_crypto_ccmp_init() failed %d\n", ret);
                 return ret;
         }
         ret = ieee80211_crypto_wep_init();
         if (ret) {
-                printk(KERN_ERR "ieee80211_crypto_wep_init() failed %d\n", ret);
+                pr_err("ieee80211_crypto_wep_init() failed %d\n", ret);
                 return ret;
         }
 
-        printk(KERN_INFO "\nLinux kernel driver for RTL8180 / RTL8185 based WLAN cards\n");
-        printk(KERN_INFO "Copyright (c) 2004-2005, Andrea Merello\n");
+        pr_info("\nLinux kernel driver for RTL8180 / RTL8185 based WLAN cards\n");
+        pr_info("Copyright (c) 2004-2005, Andrea Merello\n");
         DMESG("Initializing module");
         DMESG("Wireless extensions version %d", WIRELESS_EXT);
         rtl8180_proc_module_init();
@@ -3844,7 +3466,7 @@ void rtl8180_tx_isr(struct net_device *dev, int pri, short error)
                 return ;
         }
 
-        nicv = (u32 *)((nic - nicbegin) + (u8*)begin);
+        nicv = (u32 *)((nic - nicbegin) + (u8 *)begin);
         if ((head <= tail && (nicv > tail || nicv < head)) ||
                 (head > tail && (nicv > tail && nicv < head))) {
                         DMESGW("nic has lost pointer");
@@ -3932,15 +3554,6 @@ void rtl8180_tx_isr(struct net_device *dev, int pri, short error)
         spin_unlock_irqrestore(&priv->tx_lock, flag);
 }
 
-void rtl8180_tx_irq_wq(struct work_struct *work)
-{
-        struct delayed_work *dwork = to_delayed_work(work);
-        struct ieee80211_device * ieee = (struct ieee80211_device *)
-                container_of(dwork, struct ieee80211_device, watch_dog_wq);
-        struct net_device *dev = ieee->dev;
-
-        rtl8180_tx_isr(dev, MANAGE_PRIORITY, 0);
-}
 irqreturn_t rtl8180_interrupt(int irq, void *netdev, struct pt_regs *regs)
 {
         struct net_device *dev = (struct net_device *) netdev;
@@ -4013,7 +3626,7 @@ irqreturn_t rtl8180_interrupt(int irq, void *netdev, struct pt_regs *regs)
                 priv->stats.txbkperr++;
                 priv->ieee80211->stats.tx_errors++;
                 rtl8180_tx_isr(dev, BK_PRIORITY, 1);
-                rtl8180_try_wake_queue(dev, BE_PRIORITY);
+                rtl8180_try_wake_queue(dev, BK_PRIORITY);
         }
 
         if (inta & ISR_TBEDER) { /* corresponding to BE_PRIORITY */
@@ -4067,6 +3680,7 @@ irqreturn_t rtl8180_interrupt(int irq, void *netdev, struct pt_regs *regs)
                 priv->link_detect.NumTxOkInPeriod++; /* YJ,add,080828 */
                 priv->stats.txnpokint++;
                 rtl8180_tx_isr(dev, NORM_PRIORITY, 0);
+                rtl8180_try_wake_queue(dev, NORM_PRIORITY);
         }
 
         if (inta & ISR_TLPDOK) { /* Low priority tx ok */
@@ -4113,10 +3727,7 @@ void GPIOChangeRFWorkItemCallBack(struct work_struct *work)
         char *argv[3];
         static char *RadioPowerPath = "/etc/acpi/events/RadioPower.sh";
         static char *envp[] = {"HOME=/", "TERM=linux", "PATH=/usr/bin:/bin", NULL};
-        static int readf_count = 0;
-
-        if (readf_count % 10 == 0)
-                priv->PowerProfile = read_acadapter_file("/proc/acpi/ac_adapter/AC0/state");
+        static int readf_count;
 
         readf_count = (readf_count+1)%0xffff;
         /* We should turn off LED before polling FF51[4]. */
@@ -4162,10 +3773,5 @@ void GPIOChangeRFWorkItemCallBack(struct work_struct *work)
         }
 }
 
-static u8 read_acadapter_file(char *filename)
-{
-        return 0;
-}
-
 module_init(rtl8180_pci_module_init);
 module_exit(rtl8180_pci_module_exit);
diff --git a/drivers/staging/rtl8187se/r8180_dm.h b/drivers/staging/rtl8187se/r8180_dm.h
index b7758254ad76..732c06ac1026 100644
--- a/drivers/staging/rtl8187se/r8180_dm.h
+++ b/drivers/staging/rtl8187se/r8180_dm.h
@@ -13,10 +13,10 @@ bool CheckDig(struct net_device *dev);
 bool CheckHighPower(struct net_device *dev);
 void rtl8180_hw_dig_wq(struct work_struct *work);
 void rtl8180_tx_pw_wq(struct work_struct *work);
-void rtl8180_rate_adapter(struct work_struct * work);
+void rtl8180_rate_adapter(struct work_struct *work);
 void TxPwrTracking87SE(struct net_device *dev);
 bool CheckTxPwrTracking(struct net_device *dev);
-void rtl8180_rate_adapter(struct work_struct * work);
+void rtl8180_rate_adapter(struct work_struct *work);
 void timer_rate_adaptive(unsigned long data);
 
 
diff --git a/drivers/staging/rtl8187se/r8180_rtl8225.h b/drivers/staging/rtl8187se/r8180_rtl8225.h
index 494ea8619e72..c6f2128e755c 100644
--- a/drivers/staging/rtl8187se/r8180_rtl8225.h
+++ b/drivers/staging/rtl8187se/r8180_rtl8225.h
@@ -23,8 +23,8 @@ void rtl8225z2_rf_init(struct net_device *dev);
 void rtl8225z2_rf_set_chan(struct net_device *dev, short ch);
 void rtl8225z2_rf_close(struct net_device *dev);
 
-void RF_WriteReg(struct net_device *dev, u8 offset, u32 data);
-u32 RF_ReadReg(struct net_device *dev, u8 offset);
+void RF_WriteReg(struct net_device *dev, u8 offset, u16 data);
+u16 RF_ReadReg(struct net_device *dev, u8 offset);
 
 void rtl8180_set_mode(struct net_device *dev, int mode);
 void rtl8180_set_mode(struct net_device *dev, int mode);
diff --git a/drivers/staging/rtl8187se/r8180_rtl8225z2.c b/drivers/staging/rtl8187se/r8180_rtl8225z2.c
index d28c1d996084..c592f7936ddb 100644
--- a/drivers/staging/rtl8187se/r8180_rtl8225z2.c
+++ b/drivers/staging/rtl8187se/r8180_rtl8225z2.c
@@ -15,7 +15,6 @@
 
 #include "ieee80211/dot11d.h"
 
-
 static void write_rtl8225(struct net_device *dev, u8 adr, u16 data)
 {
         int i;
@@ -76,22 +75,6 @@ static void write_rtl8225(struct net_device *dev, u8 adr, u16 data)
         rtl8185_rf_pins_enable(dev);
 }
 
-static const u16 rtl8225bcd_rxgain[] = {
-        0x0400, 0x0401, 0x0402, 0x0403, 0x0404, 0x0405, 0x0408, 0x0409,
-        0x040a, 0x040b, 0x0502, 0x0503, 0x0504, 0x0505, 0x0540, 0x0541,
-        0x0542, 0x0543, 0x0544, 0x0545, 0x0580, 0x0581, 0x0582, 0x0583,
-        0x0584, 0x0585, 0x0588, 0x0589, 0x058a, 0x058b, 0x0643, 0x0644,
-        0x0645, 0x0680, 0x0681, 0x0682, 0x0683, 0x0684, 0x0685, 0x0688,
-        0x0689, 0x068a, 0x068b, 0x068c, 0x0742, 0x0743, 0x0744, 0x0745,
-        0x0780, 0x0781, 0x0782, 0x0783, 0x0784, 0x0785, 0x0788, 0x0789,
-        0x078a, 0x078b, 0x078c, 0x078d, 0x0790, 0x0791, 0x0792, 0x0793,
-        0x0794, 0x0795, 0x0798, 0x0799, 0x079a, 0x079b, 0x079c, 0x079d,
-        0x07a0, 0x07a1, 0x07a2, 0x07a3, 0x07a4, 0x07a5, 0x07a8, 0x07a9,
-        0x07aa, 0x07ab, 0x07ac, 0x07ad, 0x07b0, 0x07b1, 0x07b2, 0x07b3,
-        0x07b4, 0x07b5, 0x07b8, 0x07b9, 0x07ba, 0x07bb, 0x07bb
-
-};
-
 static const u8 rtl8225_agc[] = {
         0x9e, 0x9e, 0x9e, 0x9e, 0x9e, 0x9e, 0x9e, 0x9e,
         0x9d, 0x9c, 0x9b, 0x9a, 0x99, 0x98, 0x97, 0x96,
@@ -111,122 +94,12 @@ static const u8 rtl8225_agc[] = {
         0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
 };
 
-static const u8 rtl8225_gain[] = {
-        0x23, 0x88, 0x7c, 0xa5, /* -82dBm */
-        0x23, 0x88, 0x7c, 0xb5, /* -82dBm */
-        0x23, 0x88, 0x7c, 0xc5, /* -82dBm */
-        0x33, 0x80, 0x79, 0xc5, /* -78dBm */
-        0x43, 0x78, 0x76, 0xc5, /* -74dBm */
-        0x53, 0x60, 0x73, 0xc5, /* -70dBm */
-        0x63, 0x58, 0x70, 0xc5, /* -66dBm */
-};
-
-static const u8 rtl8225_tx_gain_cck_ofdm[] = {
-        0x02, 0x06, 0x0e, 0x1e, 0x3e, 0x7e
-};
-
-static const u8 rtl8225_tx_power_cck[] = {
-        0x18, 0x17, 0x15, 0x11, 0x0c, 0x08, 0x04, 0x02,
-        0x1b, 0x1a, 0x17, 0x13, 0x0e, 0x09, 0x04, 0x02,
-        0x1f, 0x1e, 0x1a, 0x15, 0x10, 0x0a, 0x05, 0x02,
-        0x22, 0x21, 0x1d, 0x18, 0x11, 0x0b, 0x06, 0x02,
-        0x26, 0x25, 0x21, 0x1b, 0x14, 0x0d, 0x06, 0x03,
-        0x2b, 0x2a, 0x25, 0x1e, 0x16, 0x0e, 0x07, 0x03
-};
-
-static const u8 rtl8225_tx_power_cck_ch14[] = {
-        0x18, 0x17, 0x15, 0x0c, 0x00, 0x00, 0x00, 0x00,
-        0x1b, 0x1a, 0x17, 0x0e, 0x00, 0x00, 0x00, 0x00,
-        0x1f, 0x1e, 0x1a, 0x0f, 0x00, 0x00, 0x00, 0x00,
-        0x22, 0x21, 0x1d, 0x11, 0x00, 0x00, 0x00, 0x00,
-        0x26, 0x25, 0x21, 0x13, 0x00, 0x00, 0x00, 0x00,
-        0x2b, 0x2a, 0x25, 0x15, 0x00, 0x00, 0x00, 0x00
-};
-
-static const u8 rtl8225_tx_power_ofdm[] = {
-        0x80, 0x90, 0xa2, 0xb5, 0xcb, 0xe4
-};
-
 static const u32 rtl8225_chan[] = {
         0,
         0x0080, 0x0100, 0x0180, 0x0200, 0x0280, 0x0300, 0x0380,
         0x0400, 0x0480, 0x0500, 0x0580, 0x0600, 0x0680, 0x074A,
 };
 
-static void rtl8225_SetTXPowerLevel(struct net_device *dev, short ch)
-{
-        struct r8180_priv *priv = ieee80211_priv(dev);
-        int GainIdx;
-        int GainSetting;
-        int i;
-        u8 power;
-        const u8 *cck_power_table;
-        u8 max_cck_power_level;
-        u8 max_ofdm_power_level;
-        u8 min_ofdm_power_level;
-        u8 cck_power_level = 0xff & priv->chtxpwr[ch];
-        u8 ofdm_power_level = 0xff & priv->chtxpwr_ofdm[ch];
-
-        max_cck_power_level = 35;
-        max_ofdm_power_level = 35;
-        min_ofdm_power_level = 0;
-
-        if (cck_power_level > max_cck_power_level)
-                cck_power_level = max_cck_power_level;
-
-        GainIdx = cck_power_level % 6;
-        GainSetting = cck_power_level / 6;
-
-        if (ch == 14)
-                cck_power_table = rtl8225_tx_power_cck_ch14;
-        else
-                cck_power_table = rtl8225_tx_power_cck;
-
-        write_nic_byte(dev, TX_GAIN_CCK,
-                       rtl8225_tx_gain_cck_ofdm[GainSetting] >> 1);
-
-        for (i = 0; i < 8; i++) {
-                power = cck_power_table[GainIdx * 8 + i];
-                write_phy_cck(dev, 0x44 + i, power);
-        }
-
-        /* FIXME Is this delay really needed ? */
-        force_pci_posting(dev);
-        mdelay(1);
-
-        if (ofdm_power_level > (max_ofdm_power_level - min_ofdm_power_level))
-                ofdm_power_level = max_ofdm_power_level;
-        else
-                ofdm_power_level += min_ofdm_power_level;
-
-        if (ofdm_power_level > 35)
-                ofdm_power_level = 35;
-
-        GainIdx = ofdm_power_level % 6;
-        GainSetting = ofdm_power_level / 6;
-
-        rtl8185_set_anaparam2(dev, RTL8225_ANAPARAM2_ON);
-
-        write_phy_ofdm(dev, 2, 0x42);
-        write_phy_ofdm(dev, 6, 0x00);
-        write_phy_ofdm(dev, 8, 0x00);
-
-        write_nic_byte(dev, TX_GAIN_OFDM,
-                       rtl8225_tx_gain_cck_ofdm[GainSetting] >> 1);
-
-        power = rtl8225_tx_power_ofdm[GainIdx];
-
-        write_phy_ofdm(dev, 5, power);
-        write_phy_ofdm(dev, 7, power);
-
-        force_pci_posting(dev);
-        mdelay(1);
-}
-
-static const u8 rtl8225z2_threshold[] = {
-        0x8d, 0x8d, 0x8d, 0x8d, 0x9d, 0xad, 0xbd,
-};
-
 static const u8 rtl8225z2_gain_bg[] = {
         0x23, 0x15, 0xa5, /* -82-1dBm */
         0x23, 0x15, 0xb5, /* -82-2dBm */
@@ -259,29 +132,8 @@ static const u16 rtl8225z2_rxgain[] = {
         0x0794, 0x0795, 0x0798, 0x0799, 0x079a, 0x079b, 0x079c, 0x079d,
         0x07a0, 0x07a1, 0x07a2, 0x07a3, 0x07a4, 0x07a5, 0x07a8, 0x07a9,
         0x03aa, 0x03ab, 0x03ac, 0x03ad, 0x03b0, 0x03b1, 0x03b2, 0x03b3,
-        0x03b4, 0x03b5, 0x03b8, 0x03b9, 0x03ba, 0x03bb, 0x03bb
-
-};
+        0x03b4, 0x03b5, 0x03b8, 0x03b9, 0x03ba, 0x03bb
 
-static const u8 ZEBRA2_CCK_OFDM_GAIN_SETTING[] = {
-        0x00, 0x01, 0x02, 0x03, 0x04, 0x05,
-        0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b,
-        0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11,
-        0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
-        0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d,
-        0x1e, 0x1f, 0x20, 0x21, 0x22, 0x23,
-};
-
-static const u8 rtl8225z2_tx_power_ofdm[] = {
-        0x42, 0x00, 0x40, 0x00, 0x40
-};
-
-static const u8 rtl8225z2_tx_power_cck_ch14[] = {
-        0x36, 0x35, 0x2e, 0x1b, 0x00, 0x00, 0x00, 0x00
-};
-
-static const u8 rtl8225z2_tx_power_cck[] = {
-        0x36, 0x35, 0x2e, 0x25, 0x1c, 0x12, 0x09, 0x04
 };
 
 void rtl8225z2_set_gain(struct net_device *dev, short gain)
@@ -412,22 +264,6 @@ static u32 read_rtl8225(struct net_device *dev, u8 adr)
         return dataRead;
 }
 
-short rtl8225_is_V_z2(struct net_device *dev)
-{
-        short vz2 = 1;
-
-        if (read_rtl8225(dev, 8) != 0x588)
-                vz2 = 0;
-        else    /* reg 9 pg 1 = 24 */
-                if (read_rtl8225(dev, 9) != 0x700)
-                        vz2 = 0;
-
-        /* sw back to pg 0 */
-        write_rtl8225(dev, 0, 0xb7);
-
-        return vz2;
-}
-
 void rtl8225z2_rf_close(struct net_device *dev)
 {
         RF_WriteReg(dev, 0x4, 0x1f);
@@ -524,8 +360,7 @@ void rtl8225z2_SetTXPowerLevel(struct net_device *dev, short ch)
         if (cck_power_level > 35)
                 cck_power_level = 35;
 
-        write_nic_byte(dev, CCK_TXAGC,
-                       (ZEBRA2_CCK_OFDM_GAIN_SETTING[(u8)cck_power_level]));
+        write_nic_byte(dev, CCK_TXAGC, cck_power_level);
         force_pci_posting(dev);
         mdelay(1);
 
@@ -540,8 +375,7 @@ void rtl8225z2_SetTXPowerLevel(struct net_device *dev, short ch)
                 write_phy_ofdm(dev, 8, 0x40);
         }
 
-        write_nic_byte(dev, OFDM_TXAGC,
-                       ZEBRA2_CCK_OFDM_GAIN_SETTING[(u8)ofdm_power_level]);
+        write_nic_byte(dev, OFDM_TXAGC, ofdm_power_level);
 
         if (ofdm_power_level <= 11) {
                 write_phy_ofdm(dev, 0x07, 0x5c);
@@ -592,50 +426,13 @@ static void rtl8225_host_pci_init(struct net_device *dev)
         write_nic_word(dev, GP_ENABLE, 0xff & (~(1 << 6)));
 }
 
-static void rtl8225_rf_set_chan(struct net_device *dev, short ch)
-{
-        struct r8180_priv *priv = ieee80211_priv(dev);
-        short gset = (priv->ieee80211->state == IEEE80211_LINKED &&
-                ieee80211_is_54g(&priv->ieee80211->current_network)) ||
-                priv->ieee80211->iw_mode == IW_MODE_MONITOR;
-
-        rtl8225_SetTXPowerLevel(dev, ch);
-
-        write_rtl8225(dev, 0x7, rtl8225_chan[ch]);
-
-        force_pci_posting(dev);
-        mdelay(10);
-
-        if (gset) {
-                write_nic_byte(dev, SIFS, 0x22);
-                write_nic_byte(dev, DIFS, 0x14);
-        } else {
-                write_nic_byte(dev, SIFS, 0x44);
-                write_nic_byte(dev, DIFS, 0x24);
-        }
-
-        if (priv->ieee80211->state == IEEE80211_LINKED &&
-            ieee80211_is_shortslot(&priv->ieee80211->current_network))
-                write_nic_byte(dev, SLOT, 0x9);
-        else
-                write_nic_byte(dev, SLOT, 0x14);
-
-        if (gset) {
-                write_nic_byte(dev, EIFS, 81);
-                write_nic_byte(dev, CW_VAL, 0x73);
-        } else {
-                write_nic_byte(dev, EIFS, 81);
-                write_nic_byte(dev, CW_VAL, 0xa5);
-        }
-}
-
 void rtl8225z2_rf_init(struct net_device *dev)
 {
         struct r8180_priv *priv = ieee80211_priv(dev);
         int i;
         short channel = 1;
-        u16     brsr;
-        u32     data, addr;
+        u16 brsr;
+        u32 data;
 
         priv->chan = channel;
 
@@ -676,8 +473,8 @@ void rtl8225z2_rf_init(struct net_device *dev)
 
         write_rtl8225(dev, 0x0, 0x1b7);
 
-        for (i = 0; i < 95; i++) {
-                write_rtl8225(dev, 0x1, (u8)(i + 1));
+        for (i = 0; i < ARRAY_SIZE(rtl8225z2_rxgain); i++) {
+                write_rtl8225(dev, 0x1, i + 1);
                 write_rtl8225(dev, 0x2, rtl8225z2_rxgain[i]);
         }
 
@@ -707,14 +504,12 @@ void rtl8225z2_rf_init(struct net_device *dev)
 
         write_rtl8225(dev, 0x0, 0x2bf);
 
-        for (i = 0; i < 128; i++) {
-                data = rtl8225_agc[i];
-
-                addr = i + 0x80; /* enable writing AGC table */
-                write_phy_ofdm(dev, 0xb, data);
+        for (i = 0; i < ARRAY_SIZE(rtl8225_agc); i++) {
+                write_phy_ofdm(dev, 0xb, rtl8225_agc[i]);
                 mdelay(1);
 
-                write_phy_ofdm(dev, 0xa, addr);
+                /* enable writing AGC table */
+                write_phy_ofdm(dev, 0xa, i + 0x80);
                 mdelay(1);
         }
 
@@ -808,7 +603,7 @@ void rtl8225z2_rf_init(struct net_device *dev)
         write_nic_dword(dev, 0x94, 0x15c00002);
         rtl8185_rf_pins_enable(dev);
 
-        rtl8225_rf_set_chan(dev, priv->chan);
+        rtl8225z2_rf_set_chan(dev, priv->chan);
 }
 
 void rtl8225z2_rf_set_mode(struct net_device *dev)
diff --git a/drivers/staging/rtl8187se/r8180_wx.c b/drivers/staging/rtl8187se/r8180_wx.c
index 52f63d75d248..156b75882290 100644
--- a/drivers/staging/rtl8187se/r8180_wx.c
+++ b/drivers/staging/rtl8187se/r8180_wx.c
@@ -59,8 +59,6 @@ int r8180_wx_set_key(struct net_device *dev, struct iw_request_info *info,
         if (priv->ieee80211->bHwRadioOff)
                 return 0;
 
-        if (erq->flags & IW_ENCODE_DISABLED)
-
         if (erq->length > 0) {
                 u32* tkey = (u32*) key;
                 priv->key0[0] = tkey[0];
diff --git a/drivers/staging/rtl8187se/r8185b_init.c b/drivers/staging/rtl8187se/r8185b_init.c
index bf343199bd21..f1db9e401c87 100644
--- a/drivers/staging/rtl8187se/r8185b_init.c
+++ b/drivers/staging/rtl8187se/r8185b_init.c
@@ -207,156 +207,84 @@ void SetOutputEnableOfRfPins(struct net_device *dev)
         write_nic_word(dev, RFPinsEnable, 0x1bff);
 }
 
-static int HwHSSIThreeWire(struct net_device *dev,
-                           u8 *pDataBuf,
-                           u8 nDataBufBitCnt,
-                           int bSI,
-                           int bWrite)
+static bool HwHSSIThreeWire(struct net_device *dev,
+                            u8 *pDataBuf,
+                            bool write)
 {
-        int     bResult = 1;
         u8      TryCnt;
         u8      u1bTmp;
 
-        do {
-                /* Check if WE and RE are cleared. */
-                for (TryCnt = 0; TryCnt < TC_3W_POLL_MAX_TRY_CNT; TryCnt++) {
-                        u1bTmp = read_nic_byte(dev, SW_3W_CMD1);
-                        if ((u1bTmp & (SW_3W_CMD1_RE|SW_3W_CMD1_WE)) == 0)
-                                break;
-
-                        udelay(10);
-                }
-                if (TryCnt == TC_3W_POLL_MAX_TRY_CNT) {
-                        printk(KERN_ERR "rtl8187se: HwThreeWire(): CmdReg:"
-                               " %#X RE|WE bits are not clear!!\n", u1bTmp);
-                        dump_stack();
-                        return 0;
-                }
-
-                /* RTL8187S HSSI Read/Write Function */
-                u1bTmp = read_nic_byte(dev, RF_SW_CONFIG);
-
-                if (bSI)
-                        u1bTmp |=   RF_SW_CFG_SI; /* reg08[1]=1 Serial Interface(SI) */
-
-                else
-                        u1bTmp &= ~RF_SW_CFG_SI; /* reg08[1]=0 Parallel Interface(PI) */
-
-
-                write_nic_byte(dev, RF_SW_CONFIG, u1bTmp);
-
-                if (bSI) {
-                        /* jong: HW SI read must set reg84[3]=0. */
-                        u1bTmp = read_nic_byte(dev, RFPinsSelect);
-                        u1bTmp &= ~BIT3;
-                        write_nic_byte(dev, RFPinsSelect, u1bTmp);
-                }
-                /*  Fill up data buffer for write operation. */
-
-                if (bWrite) {
-                        if (nDataBufBitCnt == 16) {
-                                write_nic_word(dev, SW_3W_DB0, *((u16 *)pDataBuf));
-                        } else if (nDataBufBitCnt == 64) {
-                        /* RTL8187S shouldn't enter this case */
-                                write_nic_dword(dev, SW_3W_DB0, *((u32 *)pDataBuf));
-                                write_nic_dword(dev, SW_3W_DB1, *((u32 *)(pDataBuf + 4)));
-                        } else {
-                                int idx;
-                                int ByteCnt = nDataBufBitCnt / 8;
-                                                                /* printk("%d\n",nDataBufBitCnt); */
-                                if ((nDataBufBitCnt % 8) != 0) {
-                                        printk(KERN_ERR "rtl8187se: "
-                                               "HwThreeWire(): nDataBufBitCnt(%d)"
-                                               " should be multiple of 8!!!\n",
-                                               nDataBufBitCnt);
-                                        dump_stack();
-                                        nDataBufBitCnt += 8;
-                                        nDataBufBitCnt &= ~7;
-                                }
-
-                               if (nDataBufBitCnt > 64) {
-                                        printk(KERN_ERR "rtl8187se: HwThreeWire():"
-                                               " nDataBufBitCnt(%d) should <= 64!!!\n",
-                                               nDataBufBitCnt);
-                                        dump_stack();
-                                        nDataBufBitCnt = 64;
-                                }
+        /* Check if WE and RE are cleared. */
+        for (TryCnt = 0; TryCnt < TC_3W_POLL_MAX_TRY_CNT; TryCnt++) {
+                u1bTmp = read_nic_byte(dev, SW_3W_CMD1);
+                if ((u1bTmp & (SW_3W_CMD1_RE|SW_3W_CMD1_WE)) == 0)
+                        break;
 
-                                for (idx = 0; idx < ByteCnt; idx++)
-                                        write_nic_byte(dev, (SW_3W_DB0+idx), *(pDataBuf+idx));
+                udelay(10);
+        }
+        if (TryCnt == TC_3W_POLL_MAX_TRY_CNT) {
+                netdev_err(dev,
+                           "HwThreeWire(): CmdReg: %#X RE|WE bits are not clear!!\n",
+                           u1bTmp);
+        return false;
+        }
 
-                        }
-                } else {        /* read */
-                        if (bSI) {
-                                /* SI - reg274[3:0] : RF register's Address */
-                                write_nic_word(dev, SW_3W_DB0, *((u16 *)pDataBuf));
-                        } else {
-                                /*  PI - reg274[15:12] : RF register's Address */
-                                write_nic_word(dev, SW_3W_DB0, (*((u16 *)pDataBuf)) << 12);
-                        }
-                }
+        /* RTL8187S HSSI Read/Write Function */
+        u1bTmp = read_nic_byte(dev, RF_SW_CONFIG);
+        u1bTmp |= RF_SW_CFG_SI; /* reg08[1]=1 Serial Interface(SI) */
+        write_nic_byte(dev, RF_SW_CONFIG, u1bTmp);
 
-                /* Set up command: WE or RE. */
-                if (bWrite)
-                        write_nic_byte(dev, SW_3W_CMD1, SW_3W_CMD1_WE);
+        /* jong: HW SI read must set reg84[3]=0. */
+        u1bTmp = read_nic_byte(dev, RFPinsSelect);
+        u1bTmp &= ~BIT3;
+        write_nic_byte(dev, RFPinsSelect, u1bTmp);
+        /*  Fill up data buffer for write operation. */
 
-                else
-                        write_nic_byte(dev, SW_3W_CMD1, SW_3W_CMD1_RE);
+        /* SI - reg274[3:0] : RF register's Address */
+        if (write)
+                write_nic_word(dev, SW_3W_DB0, *((u16 *)pDataBuf));
+        else
+                write_nic_word(dev, SW_3W_DB0, *((u16 *)pDataBuf));
 
+        /* Set up command: WE or RE. */
+        if (write)
+                write_nic_byte(dev, SW_3W_CMD1, SW_3W_CMD1_WE);
+        else
+                write_nic_byte(dev, SW_3W_CMD1, SW_3W_CMD1_RE);
 
-                /* Check if DONE is set. */
-                for (TryCnt = 0; TryCnt < TC_3W_POLL_MAX_TRY_CNT; TryCnt++) {
-                        u1bTmp = read_nic_byte(dev, SW_3W_CMD1);
-                        if ((u1bTmp & SW_3W_CMD1_DONE) != 0)
-                                break;
 
-                        udelay(10);
-                }
+        /* Check if DONE is set. */
+        for (TryCnt = 0; TryCnt < TC_3W_POLL_MAX_TRY_CNT; TryCnt++) {
+                u1bTmp = read_nic_byte(dev, SW_3W_CMD1);
+                if (u1bTmp & SW_3W_CMD1_DONE)
+                        break;
 
-                write_nic_byte(dev, SW_3W_CMD1, 0);
+                udelay(10);
+        }
 
-                /* Read back data for read operation. */
-                if (bWrite == 0) {
-                        if (bSI) {
-                                /* Serial Interface : reg363_362[11:0] */
-                                *((u16 *)pDataBuf) = read_nic_word(dev, SI_DATA_READ) ;
-                        } else {
-                                /* Parallel Interface : reg361_360[11:0] */
-                                *((u16 *)pDataBuf) = read_nic_word(dev, PI_DATA_READ);
-                        }
+        write_nic_byte(dev, SW_3W_CMD1, 0);
 
-                        *((u16 *)pDataBuf) &= 0x0FFF;
-                }
-
-        } while (0);
+        /* Read back data for read operation. */
+        if (!write) {
+                /* Serial Interface : reg363_362[11:0] */
+                *((u16 *)pDataBuf) = read_nic_word(dev, SI_DATA_READ);
+                *((u16 *)pDataBuf) &= 0x0FFF;
+        }
 
-        return bResult;
+        return true;
 }
 
-void RF_WriteReg(struct net_device *dev, u8 offset, u32 data)
+void RF_WriteReg(struct net_device *dev, u8 offset, u16 data)
 {
-        u32 data2Write;
-        u8 len;
-
-        /* Pure HW 3-wire. */
-        data2Write = (data << 4) | (u32)(offset & 0x0f);
-        len = 16;
-
-        HwHSSIThreeWire(dev, (u8 *)(&data2Write), len, 1, 1);
+        u16 reg = (data << 4) | (offset & 0x0f);
+        HwHSSIThreeWire(dev, (u8 *)&reg, true);
 }
 
-u32 RF_ReadReg(struct net_device *dev, u8 offset)
+u16 RF_ReadReg(struct net_device *dev, u8 offset)
 {
-        u32 data2Write;
-        u8 wlen;
-        u32 dataRead;
-
-        data2Write = ((u32)(offset & 0x0f));
-        wlen = 16;
-        HwHSSIThreeWire(dev, (u8 *)(&data2Write), wlen, 1, 0);
-        dataRead = data2Write;
-
-        return dataRead;
+        u16 reg = offset & 0x0f;
+        HwHSSIThreeWire(dev, (u8 *)&reg, false);
+        return reg;
 }
 
 
@@ -472,7 +400,8 @@ void ZEBRA_Config_85BASIC_HardCode(struct net_device *dev)
         struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev);
         u32                     i;
         u32     addr, data;
-        u32     u4bRegOffset, u4bRegValue, u4bRF23, u4bRF24;
+        u32 u4bRegOffset, u4bRegValue;
+        u16 u4bRF23, u4bRF24;
         u8                      u1b24E;
         int d_cut = 0;
 
@@ -491,7 +420,7 @@ void ZEBRA_Config_85BASIC_HardCode(struct net_device *dev)
 
         if (u4bRF23 == 0x818 && u4bRF24 == 0x70C) {
                 d_cut = 1;
-                printk(KERN_INFO "rtl8187se: card type changed from C- to D-cut\n");
+                netdev_info(dev, "card type changed from C- to D-cut\n");
         }
 
         /* Page0 : reg0-reg15 */
@@ -930,10 +859,7 @@ static void MacConfig_85BASIC(struct net_device *dev)
 
 u8 GetSupportedWirelessMode8185(struct net_device *dev)
 {
-        u8 btSupportedWirelessMode = 0;
-
-        btSupportedWirelessMode = (WIRELESS_MODE_B | WIRELESS_MODE_G);
-        return btSupportedWirelessMode;
+        return WIRELESS_MODE_B | WIRELESS_MODE_G;
 }
 
 void ActUpdateChannelAccessSetting(struct net_device *dev,
@@ -1130,13 +1056,13 @@ void ActSetWirelessMode8185(struct net_device *dev, u8 btWirelessMode)
         ieee->mode = (WIRELESS_MODE)btWirelessMode;
 
         /* 3. Change related setting. */
-        if( ieee->mode == WIRELESS_MODE_A ) {
+        if (ieee->mode == WIRELESS_MODE_A)
                 DMESG("WIRELESS_MODE_A\n");
-        } else if( ieee->mode == WIRELESS_MODE_B ) {
+        else if (ieee->mode == WIRELESS_MODE_B)
                 DMESG("WIRELESS_MODE_B\n");
-        } else if( ieee->mode == WIRELESS_MODE_G ) {
+        else if (ieee->mode == WIRELESS_MODE_G)
                 DMESG("WIRELESS_MODE_G\n");
-        }
+
         ActUpdateChannelAccessSetting( dev, ieee->mode, &priv->ChannelAccessSetting);
 }
 
@@ -1148,18 +1074,11 @@ void rtl8185b_irq_enable(struct net_device *dev)
         write_nic_dword(dev, IMR, priv->IntrMask);
 }
 
-void DrvIFIndicateDisassociation(struct net_device *dev, u16 reason)
-{
-                /* nothing is needed after disassociation request. */
-}
-
 void MgntDisconnectIBSS(struct net_device *dev)
 {
         struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev);
         u8 i;
 
-        DrvIFIndicateDisassociation(dev, unspec_reason);
-
         for (i = 0; i < 6 ; i++)
                 priv->ieee80211->current_network.bssid[i] = 0x55;
 
@@ -1190,8 +1109,6 @@ void MlmeDisassociateRequest(struct net_device *dev, u8 *asSta, u8 asRsn)
 
         if (memcmp(priv->ieee80211->current_network.bssid, asSta, 6) == 0) {
                 /* ShuChen TODO: change media status. */
-                /* ShuChen TODO: What to do when disassociate. */
-                DrvIFIndicateDisassociation(dev, unspec_reason);
 
                 for (i = 0; i < 6; i++)
                         priv->ieee80211->current_network.bssid[i] = 0x22;
@@ -1267,14 +1184,6 @@ bool SetRFPowerState(struct net_device *dev, RT_RF_POWER_STATE eRFPowerState)
         return bResult;
 }
 
-void HalEnableRx8185Dummy(struct net_device *dev)
-{
-}
-
-void HalDisableRx8185Dummy(struct net_device *dev)
-{
-}
-
 bool MgntActSet_RF_State(struct net_device *dev, RT_RF_POWER_STATE StateToSet, u32 ChangeSource)
 {
         struct  r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev);
@@ -1323,11 +1232,9 @@ bool MgntActSet_RF_State(struct net_device *dev, RT_RF_POWER_STATE StateToSet, u
                         priv->RfOffReason = 0;
                         bActionAllowed = true;
 
-                        if (rtState == eRfOff && ChangeSource >= RF_CHANGE_BY_HW && !priv->bInHctTest)
+                        if (rtState == eRfOff && ChangeSource >= RF_CHANGE_BY_HW)
                                 bConnectBySSID = true;
-
-                } else
-                        ;
+                }
                 break;
 
         case eRfOff:
@@ -1359,18 +1266,6 @@ bool MgntActSet_RF_State(struct net_device *dev, RT_RF_POWER_STATE StateToSet, u
         if (bActionAllowed) {
                 /* Config HW to the specified mode. */
                 SetRFPowerState(dev, StateToSet);
-
-                /* Turn on RF.  */
-                if (StateToSet == eRfOn) {
-                        HalEnableRx8185Dummy(dev);
-                        if (bConnectBySSID) {
-                                /* by amy not supported */
-                        }
-                }
-                /* Turn off RF. */
-                else if (StateToSet == eRfOff)
-                        HalDisableRx8185Dummy(dev);
-
         }
 
         /* Release RF spinlock  */
diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
index 81134d312ee3..1a70f324552f 100644
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
@@ -82,7 +82,7 @@ static struct rtl819x_ops rtl819xp_ops = {
         .RxCheckStuckHandler            = rtl8192_HalRxCheckStuck,
 };
 
-static struct pci_device_id rtl8192_pci_id_tbl[] __devinitdata = {
+static struct pci_device_id rtl8192_pci_id_tbl[] = {
         {RTL_PCI_DEVICE(0x10ec, 0x8192, rtl819xp_ops)},
         {RTL_PCI_DEVICE(0x07aa, 0x0044, rtl819xp_ops)},
         {RTL_PCI_DEVICE(0x07aa, 0x0047, rtl819xp_ops)},
@@ -91,15 +91,15 @@ static struct pci_device_id rtl8192_pci_id_tbl[] __devinitdata = {
 
 MODULE_DEVICE_TABLE(pci, rtl8192_pci_id_tbl);
 
-static int __devinit rtl8192_pci_probe(struct pci_dev *pdev,
+static int rtl8192_pci_probe(struct pci_dev *pdev,
                         const struct pci_device_id *id);
-static void __devexit rtl8192_pci_disconnect(struct pci_dev *pdev);
+static void rtl8192_pci_disconnect(struct pci_dev *pdev);
 
 static struct pci_driver rtl8192_pci_driver = {
         .name = DRV_NAME,       /* Driver name   */
         .id_table = rtl8192_pci_id_tbl, /* PCI_ID table  */
         .probe  = rtl8192_pci_probe,    /* probe fn      */
-        .remove  = __devexit_p(rtl8192_pci_disconnect), /* remove fn */
+        .remove  = rtl8192_pci_disconnect,      /* remove fn */
         .suspend = rtl8192E_suspend,    /* PM suspend fn */
         .resume = rtl8192E_resume,                 /* PM resume fn  */
 };
@@ -2846,7 +2846,7 @@ static const struct net_device_ops rtl8192_netdev_ops = {
         .ndo_start_xmit = rtllib_xmit,
 };
 
-static int __devinit rtl8192_pci_probe(struct pci_dev *pdev,
+static int rtl8192_pci_probe(struct pci_dev *pdev,
                         const struct pci_device_id *id)
 {
         unsigned long ioaddr = 0;
@@ -2955,7 +2955,8 @@ static int __devinit rtl8192_pci_probe(struct pci_dev *pdev,
         netif_carrier_off(dev);
         netif_stop_queue(dev);
 
-        register_netdev(dev);
+        if (register_netdev(dev))
+                goto err_free_irq;
         RT_TRACE(COMP_INIT, "dev name: %s\n", dev->name);
 
         rtl8192_proc_init_one(dev);
@@ -2981,7 +2982,7 @@ err_pci_disable:
         return err;
 }
 
-static void __devexit rtl8192_pci_disconnect(struct pci_dev *pdev)
+static void rtl8192_pci_disconnect(struct pci_dev *pdev)
 {
         struct net_device *dev = pci_get_drvdata(pdev);
         struct r8192_priv *priv ;
diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h
index 9ac8d8ea4ae8..3485ef1dfab1 100644
--- a/drivers/staging/rtl8192e/rtllib.h
+++ b/drivers/staging/rtl8192e/rtllib.h
@@ -2567,7 +2567,7 @@ static inline void *rtllib_priv(struct net_device *dev)
         return ((struct rtllib_device *)netdev_priv(dev))->priv;
 }
 
-extern inline int rtllib_is_empty_essid(const char *essid, int essid_len)
+static inline int rtllib_is_empty_essid(const char *essid, int essid_len)
 {
         /* Single white space is for Linksys APs */
         if (essid_len == 1 && essid[0] == ' ')
@@ -2583,7 +2583,7 @@ extern inline int rtllib_is_empty_essid(const char *essid, int essid_len)
         return 1;
 }
 
-extern inline int rtllib_is_valid_mode(struct rtllib_device *ieee, int mode)
+static inline int rtllib_is_valid_mode(struct rtllib_device *ieee, int mode)
 {
         /*
          * It is possible for both access points and our device to support
@@ -2609,7 +2609,7 @@ extern inline int rtllib_is_valid_mode(struct rtllib_device *ieee, int mode)
         return 0;
 }
 
-extern inline int rtllib_get_hdrlen(u16 fc)
+static inline int rtllib_get_hdrlen(u16 fc)
 {
         int hdrlen = RTLLIB_3ADDR_LEN;
 
diff --git a/drivers/staging/rtl8192e/rtllib_tx.c b/drivers/staging/rtl8192e/rtllib_tx.c
index 42900ee4825b..759d7c7d78e5 100644
--- a/drivers/staging/rtl8192e/rtllib_tx.c
+++ b/drivers/staging/rtl8192e/rtllib_tx.c
@@ -287,7 +287,7 @@ static void rtllib_tx_query_agg_cap(struct rtllib_device *ieee,
 {
         struct rt_hi_throughput *pHTInfo = ieee->pHTInfo;
         struct tx_ts_record *pTxTs = NULL;
-        struct rtllib_hdr_1addr* hdr = (struct rtllib_hdr_1addr *)skb->data;
+        struct rtllib_hdr_1addr *hdr = (struct rtllib_hdr_1addr *)skb->data;
 
         if (rtllib_act_scanning(ieee, false))
                 return;
diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211.h b/drivers/staging/rtl8192u/ieee80211/ieee80211.h
index 13f45c3125ce..502bfdbcc84b 100644
--- a/drivers/staging/rtl8192u/ieee80211/ieee80211.h
+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211.h
@@ -235,7 +235,10 @@ enum	_ReasonCode{
 
 
 
-#define aSifsTime        ((priv->ieee80211->current_network.mode == IEEE_A)||(priv->ieee80211->current_network.mode == IEEE_N_24G)||(priv->ieee80211->current_network.mode == IEEE_N_5G))? 16 : 10
+#define aSifsTime ((priv->ieee80211->current_network.mode == IEEE_A || \
+                    priv->ieee80211->current_network.mode == IEEE_N_24G || \
+                    priv->ieee80211->current_network.mode == IEEE_N_5G) ? \
+                   16 : 10)
 
 #define MGMT_QUEUE_NUM 5
 
diff --git a/drivers/staging/rtl8192u/r8192U_core.c b/drivers/staging/rtl8192u/r8192U_core.c
index 5a2fab9fa772..56367f23112f 100644
--- a/drivers/staging/rtl8192u/r8192U_core.c
+++ b/drivers/staging/rtl8192u/r8192U_core.c
@@ -144,9 +144,9 @@ MODULE_PARM_DESC(ifname," Net interface name, wlan%d=default");
 MODULE_PARM_DESC(hwwep," Try to use hardware security support. ");
 MODULE_PARM_DESC(channels," Channel bitmask for specific locales. NYI");
 
-static int __devinit rtl8192_usb_probe(struct usb_interface *intf,
+static int rtl8192_usb_probe(struct usb_interface *intf,
                          const struct usb_device_id *id);
-static void __devexit rtl8192_usb_disconnect(struct usb_interface *intf);
+static void rtl8192_usb_disconnect(struct usb_interface *intf);
 
 
 static struct usb_driver rtl8192_usb_driver = {
@@ -5739,7 +5739,7 @@ static const struct net_device_ops rtl8192_netdev_ops = {
      ---------------------------- USB_STUFF---------------------------
 *****************************************************************************/
 
-static int __devinit rtl8192_usb_probe(struct usb_interface *intf,
+static int rtl8192_usb_probe(struct usb_interface *intf,
                          const struct usb_device_id *id)
 {
 //      unsigned long ioaddr = 0;
@@ -5826,7 +5826,7 @@ void rtl8192_cancel_deferred_work(struct r8192_priv* priv)
 }
 
 
-static void __devexit rtl8192_usb_disconnect(struct usb_interface *intf)
+static void rtl8192_usb_disconnect(struct usb_interface *intf)
 {
         struct net_device *dev = usb_get_intfdata(intf);
 
diff --git a/drivers/staging/rtl8712/mlme_linux.c b/drivers/staging/rtl8712/mlme_linux.c
index abf96c14df93..7279854c86aa 100644
--- a/drivers/staging/rtl8712/mlme_linux.c
+++ b/drivers/staging/rtl8712/mlme_linux.c
@@ -156,7 +156,7 @@ void r8712_report_sec_ie(struct _adapter *adapter, u8 authmode, u8 *sec_ie)
                 p = buff;
                 p += sprintf(p, "ASSOCINFO(ReqIEs=");
                 len = sec_ie[1] + 2;
-                len =  (len < IW_CUSTOM_MAX) ? len : IW_CUSTOM_MAX;
+                len =  (len < IW_CUSTOM_MAX) ? len : IW_CUSTOM_MAX - 1;
                 for (i = 0; i < len; i++)
                         p += sprintf(p, "%02x", sec_ie[i]);
                 p += sprintf(p, ")");
diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c
index 659683e022b9..31f31dbf7f31 100644
--- a/drivers/staging/rtl8712/rtl871x_cmd.c
+++ b/drivers/staging/rtl8712/rtl871x_cmd.c
@@ -814,7 +814,7 @@ u8 r8712_setassocsta_cmd(struct _adapter *padapter, u8 *mac_addr)
         struct cmd_priv                 *pcmdpriv = &padapter->cmdpriv;
         struct cmd_obj                  *ph2c;
         struct set_assocsta_parm        *psetassocsta_para;
-        struct set_stakey_rsp           *psetassocsta_rsp = NULL;
+        struct set_assocsta_rsp         *psetassocsta_rsp = NULL;
 
         ph2c = (struct cmd_obj *)_malloc(sizeof(struct cmd_obj));
         if (ph2c == NULL)
@@ -825,7 +825,7 @@ u8 r8712_setassocsta_cmd(struct _adapter *padapter, u8 *mac_addr)
                 kfree((u8 *) ph2c);
                 return _FAIL;
         }
-        psetassocsta_rsp = (struct set_stakey_rsp *)_malloc(
+        psetassocsta_rsp = (struct set_assocsta_rsp *)_malloc(
                             sizeof(struct set_assocsta_rsp));
         if (psetassocsta_rsp == NULL) {
                 kfree((u8 *)ph2c);
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index c9a6a7fbb89c..3a6479064519 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -2110,10 +2110,10 @@ static int r871x_wps_start(struct net_device *dev,
         struct iw_point *pdata = &wrqu->data;
         u32   u32wps_start = 0;
 
-        if (copy_from_user((void *)&u32wps_start, pdata->pointer, 4))
-                return -EFAULT;
         if ((padapter->bDriverStopped) || (pdata == NULL))
                 return -EINVAL;
+        if (copy_from_user((void *)&u32wps_start, pdata->pointer, 4))
+                return -EFAULT;
         if (u32wps_start == 0)
                 u32wps_start = *extra;
         if (u32wps_start == 1) /* WPS Start */
diff --git a/drivers/staging/rts5139/Makefile b/drivers/staging/rts5139/Makefile
index 82b8958e8d31..75dd31224e62 100644
--- a/drivers/staging/rts5139/Makefile
+++ b/drivers/staging/rts5139/Makefile
@@ -25,13 +25,19 @@
 # Makefile for the RTS51xx USB Card Reader drivers.
 #
 
-TARGET_MODULE := rts5139
+obj-$(CONFIG_RTS5139) := rts5139.o
 
-EXTRA_CFLAGS := -Idrivers/scsi -I$(PWD)
+ccflags-y := -Idrivers/scsi
 
-obj-m += $(TARGET_MODULE).o
-
-common-obj := rts51x_transport.o rts51x_scsi.o rts51x_fop.o
-
-$(TARGET_MODULE)-objs := $(common-obj) rts51x.o rts51x_chip.o rts51x_card.o \
-                xd.o sd.o ms.o sd_cprm.o ms_mg.o
+rts5139-y :=                            \
+                rts51x_transport.o      \
+                rts51x_scsi.o           \
+                rts51x_fop.o            \
+                rts51x.o                \
+                rts51x_chip.o           \
+                rts51x_card.o           \
+                xd.o                    \
+                sd.o                    \
+                ms.o                    \
+                sd_cprm.o               \
+                ms_mg.o
diff --git a/drivers/staging/rts5139/ms.c b/drivers/staging/rts5139/ms.c
index 6eef33b03f55..a27f7e224e03 100644
--- a/drivers/staging/rts5139/ms.c
+++ b/drivers/staging/rts5139/ms.c
@@ -160,7 +160,7 @@ int ms_transfer_data(struct rts51x_chip *chip, u8 trans_mode, u8 tpc,
                 rts51x_add_cmd(chip, WRITE_REG_CMD, MS_CFG, MS_2K_SECTOR_MODE,
                                0);
 
-        trans_dma_enable(dir, chip, sec_cnt * 512, DMA_512);
+        rts51x_trans_dma_enable(dir, chip, sec_cnt * 512, DMA_512);
 
         rts51x_add_cmd(chip, WRITE_REG_CMD, MS_TRANSFER, 0xFF,
                        MS_TRANSFER_START | trans_mode);
@@ -602,7 +602,7 @@ static int ms_prepare_reset(struct rts51x_chip *chip)
         if (!chip->option.FT2_fast_mode) {
                 wait_timeout(250);
 
-                card_power_on(chip, MS_CARD);
+                rts51x_card_power_on(chip, MS_CARD);
                 wait_timeout(150);
 
 #ifdef SUPPORT_OCP
@@ -872,7 +872,7 @@ static int msxc_change_power(struct rts51x_chip *chip, u8 mode)
         int retval;
         u8 buf[6];
 
-        ms_cleanup_work(chip);
+        rts51x_ms_cleanup_work(chip);
 
         /* Set Parameter Register */
         retval = ms_set_rw_reg_addr(chip, 0, 0, Pro_DataCount1, 6);
@@ -2600,14 +2600,14 @@ BUILD_FAIL:
         return STATUS_FAIL;
 }
 
-int reset_ms_card(struct rts51x_chip *chip)
+int rts51x_reset_ms_card(struct rts51x_chip *chip)
 {
         struct ms_info *ms_card = &(chip->ms_card);
         int retval;
 
         memset(ms_card, 0, sizeof(struct ms_info));
 
-        enable_card_clock(chip, MS_CARD);
+        rts51x_enable_card_clock(chip, MS_CARD);
 
         retval = rts51x_select_card(chip, MS_CARD);
         if (retval != STATUS_SUCCESS)
@@ -2936,7 +2936,7 @@ static int mspro_read_format_progress(struct rts51x_chip *chip,
         return STATUS_SUCCESS;
 }
 
-void mspro_polling_format_status(struct rts51x_chip *chip)
+void rts51x_mspro_polling_format_status(struct rts51x_chip *chip)
 {
         struct ms_info *ms_card = &(chip->ms_card);
         int i;
@@ -2952,25 +2952,25 @@ void mspro_polling_format_status(struct rts51x_chip *chip)
         return;
 }
 
-void mspro_format_sense(struct rts51x_chip *chip, unsigned int lun)
+void rts51x_mspro_format_sense(struct rts51x_chip *chip, unsigned int lun)
 {
         struct ms_info *ms_card = &(chip->ms_card);
 
         if (CHK_FORMAT_STATUS(ms_card, FORMAT_SUCCESS)) {
-                set_sense_type(chip, lun, SENSE_TYPE_NO_SENSE);
+                rts51x_set_sense_type(chip, lun, SENSE_TYPE_NO_SENSE);
                 ms_card->pro_under_formatting = 0;
                 ms_card->progress = 0;
         } else if (CHK_FORMAT_STATUS(ms_card, FORMAT_IN_PROGRESS)) {
-                set_sense_data(chip, lun, CUR_ERR, 0x02, 0, 0x04, 0x04,
+                rts51x_set_sense_data(chip, lun, CUR_ERR, 0x02, 0, 0x04, 0x04,
                                0, (u16) (ms_card->progress));
         } else {
-                set_sense_type(chip, lun, SENSE_TYPE_FORMAT_CMD_FAILED);
+                rts51x_set_sense_type(chip, lun, SENSE_TYPE_FORMAT_CMD_FAILED);
                 ms_card->pro_under_formatting = 0;
                 ms_card->progress = 0;
         }
 }
 
-int mspro_format(struct scsi_cmnd *srb, struct rts51x_chip *chip,
+int rts51x_mspro_format(struct scsi_cmnd *srb, struct rts51x_chip *chip,
                  int short_data_len, int quick_format)
 {
         struct ms_info *ms_card = &(chip->ms_card);
@@ -3035,7 +3035,7 @@ int mspro_format(struct scsi_cmnd *srb, struct rts51x_chip *chip,
                 ms_card->pro_under_formatting = 0;
                 ms_card->progress = 0;
                 ms_card->format_status = FORMAT_SUCCESS;
-                set_sense_type(chip, SCSI_LUN(srb), SENSE_TYPE_NO_SENSE);
+                rts51x_set_sense_type(chip, SCSI_LUN(srb), SENSE_TYPE_NO_SENSE);
                 return STATUS_SUCCESS;
         }
 
@@ -3103,7 +3103,7 @@ static int ms_read_multiple_pages(struct rts51x_chip *chip, u16 phy_blk,
         rts51x_add_cmd(chip, WRITE_REG_CMD, MS_SECTOR_CNT_H, 0xFF, 0);
         rts51x_add_cmd(chip, WRITE_REG_CMD, MS_TPC, 0xFF, READ_PAGE_DATA);
 
-        trans_dma_enable(DMA_FROM_DEVICE, chip, 512 * page_cnt, DMA_512);
+        rts51x_trans_dma_enable(DMA_FROM_DEVICE, chip, 512 * page_cnt, DMA_512);
 
         rts51x_add_cmd(chip, WRITE_REG_CMD, MS_TRANSFER, 0xFF,
                        MS_TRANSFER_START | MS_TM_MULTI_READ);
@@ -3307,7 +3307,7 @@ static int ms_write_multiple_pages(struct rts51x_chip *chip, u16 old_blk,
         rts51x_add_cmd(chip, WRITE_REG_CMD, CARD_DATA_SOURCE, 0x01,
                        RING_BUFFER);
 
-        trans_dma_enable(DMA_TO_DEVICE, chip, 512 * page_cnt, DMA_512);
+        rts51x_trans_dma_enable(DMA_TO_DEVICE, chip, 512 * page_cnt, DMA_512);
 
         rts51x_add_cmd(chip, WRITE_REG_CMD, MS_TRANSFER, 0xFF,
                        MS_TRANSFER_START | MS_TM_MULTI_WRITE);
@@ -3467,7 +3467,7 @@ static int ms_read_multiple_pages(struct rts51x_chip *chip, u16 phy_blk,
                 rts51x_add_cmd(chip, WRITE_REG_CMD, MS_TRANS_CFG, 0xFF,
                                trans_cfg);
 
-                trans_dma_enable(DMA_FROM_DEVICE, chip, 512, DMA_512);
+                rts51x_trans_dma_enable(DMA_FROM_DEVICE, chip, 512, DMA_512);
 
                 rts51x_add_cmd(chip, WRITE_REG_CMD, MS_TRANSFER, 0xFF,
                                MS_TRANSFER_START | MS_TM_NORMAL_READ);
@@ -3670,7 +3670,7 @@ static int ms_write_multiple_pages(struct rts51x_chip *chip, u16 old_blk,
                 rts51x_add_cmd(chip, WRITE_REG_CMD, MS_TRANS_CFG, 0xFF,
                                WAIT_INT);
 
-                trans_dma_enable(DMA_TO_DEVICE, chip, 512, DMA_512);
+                rts51x_trans_dma_enable(DMA_TO_DEVICE, chip, 512, DMA_512);
 
                 rts51x_add_cmd(chip, WRITE_REG_CMD, MS_TRANSFER, 0xFF,
                                MS_TRANSFER_START | MS_TM_NORMAL_WRITE);
@@ -3803,10 +3803,10 @@ static int ms_prepare_write(struct rts51x_chip *chip, u16 old_blk, u16 new_blk,
         return STATUS_SUCCESS;
 }
 
-int ms_delay_write(struct rts51x_chip *chip)
+int rts51x_ms_delay_write(struct rts51x_chip *chip)
 {
         struct ms_info *ms_card = &(chip->ms_card);
-        struct ms_delay_write_tag *delay_write = &(ms_card->delay_write);
+        struct rts51x_ms_delay_write_tag *delay_write = &(ms_card->delay_write);
         int retval;
 
         if (delay_write->delay_write_flag) {
@@ -3827,16 +3827,16 @@ int ms_delay_write(struct rts51x_chip *chip)
         return STATUS_SUCCESS;
 }
 
-static inline void ms_rw_fail(struct scsi_cmnd *srb, struct rts51x_chip *chip)
+static inline void rts51x_ms_rw_fail(struct scsi_cmnd *srb, struct rts51x_chip *chip)
 {
         if (srb->sc_data_direction == DMA_FROM_DEVICE)
-                set_sense_type(chip, SCSI_LUN(srb),
+                rts51x_set_sense_type(chip, SCSI_LUN(srb),
                                SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR);
         else
-                set_sense_type(chip, SCSI_LUN(srb), SENSE_TYPE_MEDIA_WRITE_ERR);
+                rts51x_set_sense_type(chip, SCSI_LUN(srb), SENSE_TYPE_MEDIA_WRITE_ERR);
 }
 
-static int ms_rw_multi_sector(struct scsi_cmnd *srb, struct rts51x_chip *chip,
+static int rts51x_ms_rw_multi_sector(struct scsi_cmnd *srb, struct rts51x_chip *chip,
                               u32 start_sector, u16 sector_cnt)
 {
         struct ms_info *ms_card = &(chip->ms_card);
@@ -3847,7 +3847,7 @@ static int ms_rw_multi_sector(struct scsi_cmnd *srb, struct rts51x_chip *chip,
         u8 start_page, end_page = 0, page_cnt;
         u8 *buf;
         void *ptr = NULL;
-        struct ms_delay_write_tag *delay_write = &(ms_card->delay_write);
+        struct rts51x_ms_delay_write_tag *delay_write = &(ms_card->delay_write);
 
         ms_set_err_code(chip, MS_NO_ERROR);
 
@@ -3857,7 +3857,7 @@ static int ms_rw_multi_sector(struct scsi_cmnd *srb, struct rts51x_chip *chip,
 
         retval = ms_switch_clock(chip);
         if (retval != STATUS_SUCCESS) {
-                ms_rw_fail(srb, chip);
+                rts51x_ms_rw_fail(srb, chip);
                 TRACE_RET(chip, retval);
         }
 
@@ -3873,7 +3873,7 @@ static int ms_rw_multi_sector(struct scsi_cmnd *srb, struct rts51x_chip *chip,
                 retval = ms_build_l2p_tbl(chip, seg_no);
                 if (retval != STATUS_SUCCESS) {
                         chip->card_fail |= MS_CARD;
-                        set_sense_type(chip, lun, SENSE_TYPE_MEDIA_NOT_PRESENT);
+                        rts51x_set_sense_type(chip, lun, SENSE_TYPE_MEDIA_NOT_PRESENT);
                         TRACE_RET(chip, retval);
                 }
         }
@@ -3898,7 +3898,7 @@ static int ms_rw_multi_sector(struct scsi_cmnd *srb, struct rts51x_chip *chip,
                                               start_page);
 #endif
                         if (retval != STATUS_SUCCESS) {
-                                set_sense_type(chip, lun,
+                                rts51x_set_sense_type(chip, lun,
                                                SENSE_TYPE_MEDIA_WRITE_ERR);
                                 TRACE_RET(chip, retval);
                         }
@@ -3911,9 +3911,9 @@ static int ms_rw_multi_sector(struct scsi_cmnd *srb, struct rts51x_chip *chip,
                         old_blk = delay_write->old_phyblock;
                         new_blk = delay_write->new_phyblock;
                 } else {
-                        retval = ms_delay_write(chip);
+                        retval = rts51x_ms_delay_write(chip);
                         if (retval != STATUS_SUCCESS) {
-                                set_sense_type(chip, lun,
+                                rts51x_set_sense_type(chip, lun,
                                                SENSE_TYPE_MEDIA_WRITE_ERR);
                                 TRACE_RET(chip, retval);
                         }
@@ -3922,7 +3922,7 @@ static int ms_rw_multi_sector(struct scsi_cmnd *srb, struct rts51x_chip *chip,
                                            log_blk - ms_start_idx[seg_no]);
                         new_blk = ms_get_unused_block(chip, seg_no);
                         if ((old_blk == 0xFFFF) || (new_blk == 0xFFFF)) {
-                                set_sense_type(chip, lun,
+                                rts51x_set_sense_type(chip, lun,
                                                SENSE_TYPE_MEDIA_WRITE_ERR);
                                 TRACE_RET(chip, STATUS_FAIL);
                         }
@@ -3933,26 +3933,26 @@ static int ms_rw_multi_sector(struct scsi_cmnd *srb, struct rts51x_chip *chip,
                         if (retval != STATUS_SUCCESS) {
                                 if (monitor_card_cd(chip, MS_CARD) ==
                                     CD_NOT_EXIST) {
-                                        set_sense_type(chip, lun,
+                                        rts51x_set_sense_type(chip, lun,
                                                 SENSE_TYPE_MEDIA_NOT_PRESENT);
                                         TRACE_RET(chip, STATUS_FAIL);
                                 }
 
-                                set_sense_type(chip, lun,
+                                rts51x_set_sense_type(chip, lun,
                                                SENSE_TYPE_MEDIA_WRITE_ERR);
                                 TRACE_RET(chip, retval);
                         }
                 }
         } else {
-                retval = ms_delay_write(chip);
+                retval = rts51x_ms_delay_write(chip);
                 if (retval != STATUS_SUCCESS) {
                         if (monitor_card_cd(chip, MS_CARD) == CD_NOT_EXIST) {
-                                set_sense_type(chip, lun,
+                                rts51x_set_sense_type(chip, lun,
                                                SENSE_TYPE_MEDIA_NOT_PRESENT);
                                 TRACE_RET(chip, STATUS_FAIL);
                         }
 
-                        set_sense_type(chip, lun,
+                        rts51x_set_sense_type(chip, lun,
                                        SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR);
                         TRACE_RET(chip, retval);
                 }
@@ -3960,7 +3960,7 @@ static int ms_rw_multi_sector(struct scsi_cmnd *srb, struct rts51x_chip *chip,
                     ms_get_l2p_tbl(chip, seg_no,
                                    log_blk - ms_start_idx[seg_no]);
                 if (old_blk == 0xFFFF) {
-                        set_sense_type(chip, lun,
+                        rts51x_set_sense_type(chip, lun,
                                        SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR);
                         TRACE_RET(chip, STATUS_FAIL);
                 }
@@ -3993,12 +3993,12 @@ static int ms_rw_multi_sector(struct scsi_cmnd *srb, struct rts51x_chip *chip,
 
                 if (retval != STATUS_SUCCESS) {
                         if (monitor_card_cd(chip, MS_CARD) == CD_NOT_EXIST) {
-                                set_sense_type(chip, lun,
+                                rts51x_set_sense_type(chip, lun,
                                                SENSE_TYPE_MEDIA_NOT_PRESENT);
                                 TRACE_RET(chip, STATUS_FAIL);
                         }
 
-                        ms_rw_fail(srb, chip);
+                        rts51x_ms_rw_fail(srb, chip);
                         TRACE_RET(chip, retval);
                 }
                 /* Update L2P table if need */
@@ -4030,7 +4030,7 @@ static int ms_rw_multi_sector(struct scsi_cmnd *srb, struct rts51x_chip *chip,
                         retval = ms_build_l2p_tbl(chip, seg_no);
                         if (retval != STATUS_SUCCESS) {
                                 chip->card_fail |= MS_CARD;
-                                set_sense_type(chip, lun,
+                                rts51x_set_sense_type(chip, lun,
                                                SENSE_TYPE_MEDIA_NOT_PRESENT);
                                 TRACE_RET(chip, retval);
                         }
@@ -4040,14 +4040,14 @@ static int ms_rw_multi_sector(struct scsi_cmnd *srb, struct rts51x_chip *chip,
                     ms_get_l2p_tbl(chip, seg_no,
                                    log_blk - ms_start_idx[seg_no]);
                 if (old_blk == 0xFFFF) {
-                        ms_rw_fail(srb, chip);
+                        rts51x_ms_rw_fail(srb, chip);
                         TRACE_RET(chip, STATUS_FAIL);
                 }
 
                 if (srb->sc_data_direction == DMA_TO_DEVICE) {
                         new_blk = ms_get_unused_block(chip, seg_no);
                         if (new_blk == 0xFFFF) {
-                                ms_rw_fail(srb, chip);
+                                rts51x_ms_rw_fail(srb, chip);
                                 TRACE_RET(chip, STATUS_FAIL);
                         }
                 }
@@ -4073,7 +4073,7 @@ static int ms_rw_multi_sector(struct scsi_cmnd *srb, struct rts51x_chip *chip,
         return STATUS_SUCCESS;
 }
 
-int ms_rw(struct scsi_cmnd *srb, struct rts51x_chip *chip, u32 start_sector,
+int rts51x_ms_rw(struct scsi_cmnd *srb, struct rts51x_chip *chip, u32 start_sector,
           u16 sector_cnt)
 {
         struct ms_info *ms_card = &(chip->ms_card);
@@ -4084,12 +4084,12 @@ int ms_rw(struct scsi_cmnd *srb, struct rts51x_chip *chip, u32 start_sector,
                     mspro_rw_multi_sector(srb, chip, start_sector, sector_cnt);
         else
                 retval =
-                    ms_rw_multi_sector(srb, chip, start_sector, sector_cnt);
+                    rts51x_ms_rw_multi_sector(srb, chip, start_sector, sector_cnt);
 
         return retval;
 }
 
-void ms_free_l2p_tbl(struct rts51x_chip *chip)
+void rts51x_ms_free_l2p_tbl(struct rts51x_chip *chip)
 {
         struct ms_info *ms_card = &(chip->ms_card);
         int i = 0;
@@ -4110,7 +4110,7 @@ void ms_free_l2p_tbl(struct rts51x_chip *chip)
         }
 }
 
-void ms_cleanup_work(struct rts51x_chip *chip)
+void rts51x_ms_cleanup_work(struct rts51x_chip *chip)
 {
         struct ms_info *ms_card = &(chip->ms_card);
 
@@ -4130,7 +4130,7 @@ void ms_cleanup_work(struct rts51x_chip *chip)
         } else if ((!CHK_MSPRO(ms_card))
                    && ms_card->delay_write.delay_write_flag) {
                 RTS51X_DEBUGP("MS: delay write\n");
-                ms_delay_write(chip);
+                rts51x_ms_delay_write(chip);
                 ms_card->counter = 0;
         }
 }
@@ -4161,12 +4161,12 @@ static int ms_power_off_card3v3(struct rts51x_chip *chip)
         return STATUS_SUCCESS;
 }
 
-int release_ms_card(struct rts51x_chip *chip)
+int rts51x_release_ms_card(struct rts51x_chip *chip)
 {
         struct ms_info *ms_card = &(chip->ms_card);
         int retval;
 
-        RTS51X_DEBUGP("release_ms_card\n");
+        RTS51X_DEBUGP("rts51x_release_ms_card\n");
 
         ms_card->delay_write.delay_write_flag = 0;
         ms_card->pro_under_formatting = 0;
@@ -4175,7 +4175,7 @@ int release_ms_card(struct rts51x_chip *chip)
         chip->card_fail &= ~MS_CARD;
         chip->card_wp &= ~MS_CARD;
 
-        ms_free_l2p_tbl(chip);
+        rts51x_ms_free_l2p_tbl(chip);
 
         rts51x_write_register(chip, SFSM_ED, HW_CMD_STOP, HW_CMD_STOP);
 
diff --git a/drivers/staging/rts5139/ms.h b/drivers/staging/rts5139/ms.h
index 0321d06e776d..857c1974ef24 100644
--- a/drivers/staging/rts5139/ms.h
+++ b/drivers/staging/rts5139/ms.h
@@ -231,18 +231,18 @@
         (((retval) != STATUS_SUCCESS) || \
         (chip->rsp_buf[0] & MS_TRANSFER_ERR))
 
-void mspro_polling_format_status(struct rts51x_chip *chip);
-void mspro_format_sense(struct rts51x_chip *chip, unsigned int lun);
+void rts51x_mspro_polling_format_status(struct rts51x_chip *chip);
+void rts51x_mspro_format_sense(struct rts51x_chip *chip, unsigned int lun);
 
-int reset_ms_card(struct rts51x_chip *chip);
-int ms_rw(struct scsi_cmnd *srb, struct rts51x_chip *chip, u32 start_sector,
+int rts51x_reset_ms_card(struct rts51x_chip *chip);
+int rts51x_ms_rw(struct scsi_cmnd *srb, struct rts51x_chip *chip, u32 start_sector,
           u16 sector_cnt);
-int mspro_format(struct scsi_cmnd *srb, struct rts51x_chip *chip,
+int rts51x_mspro_format(struct scsi_cmnd *srb, struct rts51x_chip *chip,
                  int short_data_len, int quick_format);
-void ms_free_l2p_tbl(struct rts51x_chip *chip);
-void ms_cleanup_work(struct rts51x_chip *chip);
-int release_ms_card(struct rts51x_chip *chip);
-int ms_delay_write(struct rts51x_chip *chip);
+void rts51x_ms_free_l2p_tbl(struct rts51x_chip *chip);
+void rts51x_ms_cleanup_work(struct rts51x_chip *chip);
+int rts51x_release_ms_card(struct rts51x_chip *chip);
+int rts51x_ms_delay_write(struct rts51x_chip *chip);
 
 #ifdef SUPPORT_MAGIC_GATE
 
diff --git a/drivers/staging/rts5139/ms_mg.c b/drivers/staging/rts5139/ms_mg.c
index 057d96c1a937..54cfd85259a9 100644
--- a/drivers/staging/rts5139/ms_mg.c
+++ b/drivers/staging/rts5139/ms_mg.c
@@ -119,7 +119,7 @@ int mg_set_tpc_para_sub(struct rts51x_chip *chip, int type, u8 mg_entry_num)
   * 2. send SET_ID TPC command to medium with Leaf ID released by host
   * in this SCSI CMD.
   */
-int mg_set_leaf_id(struct scsi_cmnd *srb, struct rts51x_chip *chip)
+int rts51x_mg_set_leaf_id(struct scsi_cmnd *srb, struct rts51x_chip *chip)
 {
         int retval;
         int i;
@@ -129,10 +129,10 @@ int mg_set_leaf_id(struct scsi_cmnd *srb, struct rts51x_chip *chip)
         RTS51X_DEBUGP("--%s--\n", __func__);
 
         if (scsi_bufflen(srb) < 12) {
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
+                rts51x_set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
                 TRACE_RET(chip, STATUS_FAIL);
         }
-        ms_cleanup_work(chip);
+        rts51x_ms_cleanup_work(chip);
 
         retval = ms_switch_clock(chip);
         if (retval != STATUS_SUCCESS)
@@ -140,7 +140,7 @@ int mg_set_leaf_id(struct scsi_cmnd *srb, struct rts51x_chip *chip)
 
         retval = mg_send_ex_cmd(chip, MG_SET_LID, 0);
         if (retval != STATUS_SUCCESS) {
-                set_sense_type(chip, lun, SENSE_TYPE_MG_KEY_FAIL_NOT_ESTAB);
+                rts51x_set_sense_type(chip, lun, SENSE_TYPE_MG_KEY_FAIL_NOT_ESTAB);
                 TRACE_RET(chip, retval);
         }
 
@@ -151,12 +151,12 @@ int mg_set_leaf_id(struct scsi_cmnd *srb, struct rts51x_chip *chip)
         retval =
             ms_write_bytes(chip, PRO_WRITE_SHORT_DATA, 32, WAIT_INT, buf1, 32);
         if (retval != STATUS_SUCCESS) {
-                set_sense_type(chip, lun, SENSE_TYPE_MG_KEY_FAIL_NOT_ESTAB);
+                rts51x_set_sense_type(chip, lun, SENSE_TYPE_MG_KEY_FAIL_NOT_ESTAB);
                 TRACE_RET(chip, retval);
         }
         retval = mg_check_int_error(chip);
         if (retval != STATUS_SUCCESS) {
-                set_sense_type(chip, lun, SENSE_TYPE_MG_KEY_FAIL_NOT_ESTAB);
+                rts51x_set_sense_type(chip, lun, SENSE_TYPE_MG_KEY_FAIL_NOT_ESTAB);
                 TRACE_RET(chip, retval);
         }
 
@@ -170,7 +170,7 @@ int mg_set_leaf_id(struct scsi_cmnd *srb, struct rts51x_chip *chip)
   * data(1536 bytes totally) from medium by using READ_LONG_DATA TPC
   * for 3 times, and report data to host with data-length is 1052 bytes.
   */
-int mg_get_local_EKB(struct scsi_cmnd *srb, struct rts51x_chip *chip)
+int rts51x_mg_get_local_EKB(struct scsi_cmnd *srb, struct rts51x_chip *chip)
 {
         int retval = STATUS_FAIL;
         int bufflen;
@@ -179,7 +179,7 @@ int mg_get_local_EKB(struct scsi_cmnd *srb, struct rts51x_chip *chip)
 
         RTS51X_DEBUGP("--%s--\n", __func__);
 
-        ms_cleanup_work(chip);
+        rts51x_ms_cleanup_work(chip);
 
         retval = ms_switch_clock(chip);
         if (retval != STATUS_SUCCESS)
@@ -196,21 +196,21 @@ int mg_get_local_EKB(struct scsi_cmnd *srb, struct rts51x_chip *chip)
 
         retval = mg_send_ex_cmd(chip, MG_GET_LEKB, 0);
         if (retval != STATUS_SUCCESS) {
-                set_sense_type(chip, lun, SENSE_TYPE_MG_KEY_FAIL_NOT_AUTHEN);
+                rts51x_set_sense_type(chip, lun, SENSE_TYPE_MG_KEY_FAIL_NOT_AUTHEN);
                 TRACE_GOTO(chip, GetEKBFinish);
         }
 
         retval = ms_transfer_data(chip, MS_TM_AUTO_READ, PRO_READ_LONG_DATA,
                                   3, WAIT_INT, 0, 0, buf + 4, 1536);
         if (retval != STATUS_SUCCESS) {
-                set_sense_type(chip, lun, SENSE_TYPE_MG_KEY_FAIL_NOT_AUTHEN);
+                rts51x_set_sense_type(chip, lun, SENSE_TYPE_MG_KEY_FAIL_NOT_AUTHEN);
                 rts51x_write_register(chip, CARD_STOP, MS_STOP | MS_CLR_ERR,
                                       MS_STOP | MS_CLR_ERR);
                 TRACE_GOTO(chip, GetEKBFinish);
         }
         retval = mg_check_int_error(chip);
         if (retval != STATUS_SUCCESS) {
-                set_sense_type(chip, lun, SENSE_TYPE_MG_KEY_FAIL_NOT_AUTHEN);
+                rts51x_set_sense_type(chip, lun, SENSE_TYPE_MG_KEY_FAIL_NOT_AUTHEN);
                 TRACE_GOTO(chip, GetEKBFinish);
         }
 
@@ -229,7 +229,7 @@ GetEKBFinish:
   * TPC commands to the medium for writing 8-bytes data as challenge
   * by host within a short data packet.
   */
-int mg_chg(struct scsi_cmnd *srb, struct rts51x_chip *chip)
+int rts51x_mg_chg(struct scsi_cmnd *srb, struct rts51x_chip *chip)
 {
         struct ms_info *ms_card = &(chip->ms_card);
         int retval;
@@ -240,7 +240,7 @@ int mg_chg(struct scsi_cmnd *srb, struct rts51x_chip *chip)
 
         RTS51X_DEBUGP("--%s--\n", __func__);
 
-        ms_cleanup_work(chip);
+        rts51x_ms_cleanup_work(chip);
 
         retval = ms_switch_clock(chip);
         if (retval != STATUS_SUCCESS)
@@ -248,19 +248,19 @@ int mg_chg(struct scsi_cmnd *srb, struct rts51x_chip *chip)
 
         retval = mg_send_ex_cmd(chip, MG_GET_ID, 0);
         if (retval != STATUS_SUCCESS) {
-                set_sense_type(chip, lun, SENSE_TYPE_MG_INCOMPATIBLE_MEDIUM);
+                rts51x_set_sense_type(chip, lun, SENSE_TYPE_MG_INCOMPATIBLE_MEDIUM);
                 TRACE_RET(chip, retval);
         }
 
         retval =
             ms_read_bytes(chip, PRO_READ_SHORT_DATA, 32, WAIT_INT, buf, 32);
         if (retval != STATUS_SUCCESS) {
-                set_sense_type(chip, lun, SENSE_TYPE_MG_INCOMPATIBLE_MEDIUM);
+                rts51x_set_sense_type(chip, lun, SENSE_TYPE_MG_INCOMPATIBLE_MEDIUM);
                 TRACE_RET(chip, retval);
         }
         retval = mg_check_int_error(chip);
         if (retval != STATUS_SUCCESS) {
-                set_sense_type(chip, lun, SENSE_TYPE_MG_INCOMPATIBLE_MEDIUM);
+                rts51x_set_sense_type(chip, lun, SENSE_TYPE_MG_INCOMPATIBLE_MEDIUM);
                 TRACE_RET(chip, retval);
         }
 
@@ -276,13 +276,13 @@ int mg_chg(struct scsi_cmnd *srb, struct rts51x_chip *chip)
         }
 
         if (i == 2500) {
-                set_sense_type(chip, lun, SENSE_TYPE_MG_INCOMPATIBLE_MEDIUM);
+                rts51x_set_sense_type(chip, lun, SENSE_TYPE_MG_INCOMPATIBLE_MEDIUM);
                 TRACE_RET(chip, STATUS_FAIL);
         }
 
         retval = mg_send_ex_cmd(chip, MG_SET_RD, 0);
         if (retval != STATUS_SUCCESS) {
-                set_sense_type(chip, lun, SENSE_TYPE_MG_INCOMPATIBLE_MEDIUM);
+                rts51x_set_sense_type(chip, lun, SENSE_TYPE_MG_INCOMPATIBLE_MEDIUM);
                 TRACE_RET(chip, retval);
         }
 
@@ -296,12 +296,12 @@ int mg_chg(struct scsi_cmnd *srb, struct rts51x_chip *chip)
         retval =
             ms_write_bytes(chip, PRO_WRITE_SHORT_DATA, 32, WAIT_INT, buf, 32);
         if (retval != STATUS_SUCCESS) {
-                set_sense_type(chip, lun, SENSE_TYPE_MG_INCOMPATIBLE_MEDIUM);
+                rts51x_set_sense_type(chip, lun, SENSE_TYPE_MG_INCOMPATIBLE_MEDIUM);
                 TRACE_RET(chip, retval);
         }
         retval = mg_check_int_error(chip);
         if (retval != STATUS_SUCCESS) {
-                set_sense_type(chip, lun, SENSE_TYPE_MG_INCOMPATIBLE_MEDIUM);
+                rts51x_set_sense_type(chip, lun, SENSE_TYPE_MG_INCOMPATIBLE_MEDIUM);
                 TRACE_RET(chip, retval);
         }
 
@@ -320,7 +320,7 @@ int mg_chg(struct scsi_cmnd *srb, struct rts51x_chip *chip)
   * The paremeter MagicGateID is the one that adapter has obtained from
   * the medium by TPC commands in Set Leaf ID command phase previously.
   */
-int mg_get_rsp_chg(struct scsi_cmnd *srb, struct rts51x_chip *chip)
+int rts51x_mg_get_rsp_chg(struct scsi_cmnd *srb, struct rts51x_chip *chip)
 {
         struct ms_info *ms_card = &(chip->ms_card);
         int retval, i;
@@ -330,7 +330,7 @@ int mg_get_rsp_chg(struct scsi_cmnd *srb, struct rts51x_chip *chip)
 
         RTS51X_DEBUGP("--%s--\n", __func__);
 
-        ms_cleanup_work(chip);
+        rts51x_ms_cleanup_work(chip);
 
         retval = ms_switch_clock(chip);
         if (retval != STATUS_SUCCESS)
@@ -338,19 +338,19 @@ int mg_get_rsp_chg(struct scsi_cmnd *srb, struct rts51x_chip *chip)
 
         retval = mg_send_ex_cmd(chip, MG_MAKE_RMS, 0);
         if (retval != STATUS_SUCCESS) {
-                set_sense_type(chip, lun, SENSE_TYPE_MG_KEY_FAIL_NOT_AUTHEN);
+                rts51x_set_sense_type(chip, lun, SENSE_TYPE_MG_KEY_FAIL_NOT_AUTHEN);
                 TRACE_RET(chip, retval);
         }
 
         retval =
             ms_read_bytes(chip, PRO_READ_SHORT_DATA, 32, WAIT_INT, buf1, 32);
         if (retval != STATUS_SUCCESS) {
-                set_sense_type(chip, lun, SENSE_TYPE_MG_KEY_FAIL_NOT_AUTHEN);
+                rts51x_set_sense_type(chip, lun, SENSE_TYPE_MG_KEY_FAIL_NOT_AUTHEN);
                 TRACE_RET(chip, retval);
         }
         retval = mg_check_int_error(chip);
         if (retval != STATUS_SUCCESS) {
-                set_sense_type(chip, lun, SENSE_TYPE_MG_KEY_FAIL_NOT_AUTHEN);
+                rts51x_set_sense_type(chip, lun, SENSE_TYPE_MG_KEY_FAIL_NOT_AUTHEN);
                 TRACE_RET(chip, retval);
         }
 
@@ -375,7 +375,7 @@ int mg_get_rsp_chg(struct scsi_cmnd *srb, struct rts51x_chip *chip)
         }
 
         if (i == 2500) {
-                set_sense_type(chip, lun, SENSE_TYPE_MG_KEY_FAIL_NOT_AUTHEN);
+                rts51x_set_sense_type(chip, lun, SENSE_TYPE_MG_KEY_FAIL_NOT_AUTHEN);
                 TRACE_RET(chip, STATUS_FAIL);
         }
 
@@ -389,7 +389,7 @@ int mg_get_rsp_chg(struct scsi_cmnd *srb, struct rts51x_chip *chip)
   * issues TPC commands to the medium for writing 8-bytes data as
   * challenge by host within a short data packet.
   */
-int mg_rsp(struct scsi_cmnd *srb, struct rts51x_chip *chip)
+int rts51x_mg_rsp(struct scsi_cmnd *srb, struct rts51x_chip *chip)
 {
         struct ms_info *ms_card = &(chip->ms_card);
         int retval;
@@ -400,7 +400,7 @@ int mg_rsp(struct scsi_cmnd *srb, struct rts51x_chip *chip)
 
         RTS51X_DEBUGP("--%s--\n", __func__);
 
-        ms_cleanup_work(chip);
+        rts51x_ms_cleanup_work(chip);
 
         retval = ms_switch_clock(chip);
         if (retval != STATUS_SUCCESS)
@@ -408,7 +408,7 @@ int mg_rsp(struct scsi_cmnd *srb, struct rts51x_chip *chip)
 
         retval = mg_send_ex_cmd(chip, MG_MAKE_KSE, 0);
         if (retval != STATUS_SUCCESS) {
-                set_sense_type(chip, lun, SENSE_TYPE_MG_KEY_FAIL_NOT_AUTHEN);
+                rts51x_set_sense_type(chip, lun, SENSE_TYPE_MG_KEY_FAIL_NOT_AUTHEN);
                 TRACE_RET(chip, retval);
         }
 
@@ -422,12 +422,12 @@ int mg_rsp(struct scsi_cmnd *srb, struct rts51x_chip *chip)
         retval =
             ms_write_bytes(chip, PRO_WRITE_SHORT_DATA, 32, WAIT_INT, buf, 32);
         if (retval != STATUS_SUCCESS) {
-                set_sense_type(chip, lun, SENSE_TYPE_MG_KEY_FAIL_NOT_AUTHEN);
+                rts51x_set_sense_type(chip, lun, SENSE_TYPE_MG_KEY_FAIL_NOT_AUTHEN);
                 TRACE_RET(chip, retval);
         }
         retval = mg_check_int_error(chip);
         if (retval != STATUS_SUCCESS) {
-                set_sense_type(chip, lun, SENSE_TYPE_MG_KEY_FAIL_NOT_AUTHEN);
+                rts51x_set_sense_type(chip, lun, SENSE_TYPE_MG_KEY_FAIL_NOT_AUTHEN);
                 TRACE_RET(chip, retval);
         }
 
@@ -447,7 +447,7 @@ int mg_rsp(struct scsi_cmnd *srb, struct rts51x_chip *chip)
   * precedes data transmission from medium to Ring buffer by DMA mechanism
   * in order to get maximum performance and minimum code size simultaneously.
   */
-int mg_get_ICV(struct scsi_cmnd *srb, struct rts51x_chip *chip)
+int rts51x_mg_get_ICV(struct scsi_cmnd *srb, struct rts51x_chip *chip)
 {
         struct ms_info *ms_card = &(chip->ms_card);
         int retval;
@@ -457,7 +457,7 @@ int mg_get_ICV(struct scsi_cmnd *srb, struct rts51x_chip *chip)
 
         RTS51X_DEBUGP("--%s--\n", __func__);
 
-        ms_cleanup_work(chip);
+        rts51x_ms_cleanup_work(chip);
 
         retval = ms_switch_clock(chip);
         if (retval != STATUS_SUCCESS)
@@ -474,21 +474,21 @@ int mg_get_ICV(struct scsi_cmnd *srb, struct rts51x_chip *chip)
 
         retval = mg_send_ex_cmd(chip, MG_GET_IBD, ms_card->mg_entry_num);
         if (retval != STATUS_SUCCESS) {
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR);
+                rts51x_set_sense_type(chip, lun, SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR);
                 TRACE_GOTO(chip, GetICVFinish);
         }
 
         retval = ms_transfer_data(chip, MS_TM_AUTO_READ, PRO_READ_LONG_DATA,
                                   2, WAIT_INT, 0, 0, buf + 4, 1024);
         if (retval != STATUS_SUCCESS) {
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR);
+                rts51x_set_sense_type(chip, lun, SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR);
                 rts51x_write_register(chip, CARD_STOP, MS_STOP | MS_CLR_ERR,
                                       MS_STOP | MS_CLR_ERR);
                 TRACE_GOTO(chip, GetICVFinish);
         }
         retval = mg_check_int_error(chip);
         if (retval != STATUS_SUCCESS) {
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR);
+                rts51x_set_sense_type(chip, lun, SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR);
                 TRACE_GOTO(chip, GetICVFinish);
         }
 
@@ -511,7 +511,7 @@ GetICVFinish:
   * that sent by host, and it should be skipped by shifting DMA pointer
   * before writing 1024 bytes to medium.
   */
-int mg_set_ICV(struct scsi_cmnd *srb, struct rts51x_chip *chip)
+int rts51x_mg_set_ICV(struct scsi_cmnd *srb, struct rts51x_chip *chip)
 {
         struct ms_info *ms_card = &(chip->ms_card);
         int retval;
@@ -524,7 +524,7 @@ int mg_set_ICV(struct scsi_cmnd *srb, struct rts51x_chip *chip)
 
         RTS51X_DEBUGP("--%s--\n", __func__);
 
-        ms_cleanup_work(chip);
+        rts51x_ms_cleanup_work(chip);
 
         retval = ms_switch_clock(chip);
         if (retval != STATUS_SUCCESS)
@@ -541,13 +541,13 @@ int mg_set_ICV(struct scsi_cmnd *srb, struct rts51x_chip *chip)
         if (retval != STATUS_SUCCESS) {
                 if (ms_card->mg_auth == 0) {
                         if ((buf[5] & 0xC0) != 0)
-                                set_sense_type(chip, lun,
+                                rts51x_set_sense_type(chip, lun,
                                         SENSE_TYPE_MG_KEY_FAIL_NOT_ESTAB);
                         else
-                                set_sense_type(chip, lun,
+                                rts51x_set_sense_type(chip, lun,
                                         SENSE_TYPE_MG_WRITE_ERR);
                 } else {
-                        set_sense_type(chip, lun, SENSE_TYPE_MG_WRITE_ERR);
+                        rts51x_set_sense_type(chip, lun, SENSE_TYPE_MG_WRITE_ERR);
                 }
                 TRACE_GOTO(chip, SetICVFinish);
         }
@@ -563,7 +563,7 @@ int mg_set_ICV(struct scsi_cmnd *srb, struct rts51x_chip *chip)
                 rts51x_add_cmd(chip, WRITE_REG_CMD, MS_TRANS_CFG, 0xFF,
                                WAIT_INT);
 
-                trans_dma_enable(DMA_TO_DEVICE, chip, 512, DMA_512);
+                rts51x_trans_dma_enable(DMA_TO_DEVICE, chip, 512, DMA_512);
 
                 rts51x_add_cmd(chip, WRITE_REG_CMD, MS_TRANSFER, 0xFF,
                                MS_TRANSFER_START | MS_TM_NORMAL_WRITE);
@@ -572,7 +572,7 @@ int mg_set_ICV(struct scsi_cmnd *srb, struct rts51x_chip *chip)
 
                 retval = rts51x_send_cmd(chip, MODE_CDOR, 100);
                 if (retval != STATUS_SUCCESS) {
-                        set_sense_type(chip, lun, SENSE_TYPE_MG_WRITE_ERR);
+                        rts51x_set_sense_type(chip, lun, SENSE_TYPE_MG_WRITE_ERR);
                         TRACE_GOTO(chip, SetICVFinish);
                 }
 
@@ -583,13 +583,13 @@ int mg_set_ICV(struct scsi_cmnd *srb, struct rts51x_chip *chip)
                         rts51x_clear_ms_error(chip);
                         if (ms_card->mg_auth == 0) {
                                 if ((buf[5] & 0xC0) != 0)
-                                        set_sense_type(chip, lun,
+                                        rts51x_set_sense_type(chip, lun,
                                                 SENSE_TYPE_MG_KEY_FAIL_NOT_ESTAB);
                                 else
-                                        set_sense_type(chip, lun,
+                                        rts51x_set_sense_type(chip, lun,
                                                 SENSE_TYPE_MG_WRITE_ERR);
                         } else {
-                                set_sense_type(chip, lun,
+                                rts51x_set_sense_type(chip, lun,
                                                SENSE_TYPE_MG_WRITE_ERR);
                         }
                         retval = STATUS_FAIL;
@@ -602,13 +602,13 @@ int mg_set_ICV(struct scsi_cmnd *srb, struct rts51x_chip *chip)
                         rts51x_clear_ms_error(chip);
                         if (ms_card->mg_auth == 0) {
                                 if ((buf[5] & 0xC0) != 0)
-                                        set_sense_type(chip, lun,
+                                        rts51x_set_sense_type(chip, lun,
                                                 SENSE_TYPE_MG_KEY_FAIL_NOT_ESTAB);
                                 else
-                                        set_sense_type(chip, lun,
+                                        rts51x_set_sense_type(chip, lun,
                                                 SENSE_TYPE_MG_WRITE_ERR);
                         } else {
-                                set_sense_type(chip, lun,
+                                rts51x_set_sense_type(chip, lun,
                                                SENSE_TYPE_MG_WRITE_ERR);
                         }
                         retval = STATUS_FAIL;
@@ -622,13 +622,13 @@ int mg_set_ICV(struct scsi_cmnd *srb, struct rts51x_chip *chip)
                 rts51x_clear_ms_error(chip);
                 if (ms_card->mg_auth == 0) {
                         if ((buf[5] & 0xC0) != 0)
-                                set_sense_type(chip, lun,
+                                rts51x_set_sense_type(chip, lun,
                                         SENSE_TYPE_MG_KEY_FAIL_NOT_ESTAB);
                         else
-                                set_sense_type(chip, lun,
+                                rts51x_set_sense_type(chip, lun,
                                         SENSE_TYPE_MG_WRITE_ERR);
                 } else {
-                        set_sense_type(chip, lun, SENSE_TYPE_MG_WRITE_ERR);
+                        rts51x_set_sense_type(chip, lun, SENSE_TYPE_MG_WRITE_ERR);
                 }
                 TRACE_GOTO(chip, SetICVFinish);
         }
diff --git a/drivers/staging/rts5139/ms_mg.h b/drivers/staging/rts5139/ms_mg.h
index e2ca55085f97..d15733a992ae 100644
--- a/drivers/staging/rts5139/ms_mg.h
+++ b/drivers/staging/rts5139/ms_mg.h
@@ -30,12 +30,12 @@
 #include "rts51x_chip.h"
 #include "ms.h"
 
-int mg_set_leaf_id(struct scsi_cmnd *srb, struct rts51x_chip *chip);
-int mg_get_local_EKB(struct scsi_cmnd *srb, struct rts51x_chip *chip);
-int mg_chg(struct scsi_cmnd *srb, struct rts51x_chip *chip);
-int mg_get_rsp_chg(struct scsi_cmnd *srb, struct rts51x_chip *chip);
-int mg_rsp(struct scsi_cmnd *srb, struct rts51x_chip *chip);
-int mg_get_ICV(struct scsi_cmnd *srb, struct rts51x_chip *chip);
-int mg_set_ICV(struct scsi_cmnd *srb, struct rts51x_chip *chip);
+int rts51x_mg_set_leaf_id(struct scsi_cmnd *srb, struct rts51x_chip *chip);
+int rts51x_mg_get_local_EKB(struct scsi_cmnd *srb, struct rts51x_chip *chip);
+int rts51x_mg_chg(struct scsi_cmnd *srb, struct rts51x_chip *chip);
+int rts51x_mg_get_rsp_chg(struct scsi_cmnd *srb, struct rts51x_chip *chip);
+int rts51x_mg_rsp(struct scsi_cmnd *srb, struct rts51x_chip *chip);
+int rts51x_mg_get_ICV(struct scsi_cmnd *srb, struct rts51x_chip *chip);
+int rts51x_mg_set_ICV(struct scsi_cmnd *srb, struct rts51x_chip *chip);
 
 #endif /* __RTS51X_MS_MG_H */
diff --git a/drivers/staging/rts5139/rts51x.c b/drivers/staging/rts5139/rts51x.c
index c3fe7dda1f4e..04213463123e 100644
--- a/drivers/staging/rts5139/rts51x.c
+++ b/drivers/staging/rts5139/rts51x.c
@@ -306,7 +306,7 @@ static int rts51x_control_thread(void *__chip)
 
                 /* we've got a command, let's do it! */
                 else {
-                        RTS51X_DEBUG(scsi_show_command(chip->srb));
+                        RTS51X_DEBUG(rts51x_scsi_show_command(chip->srb));
                         rts51x_invoke_transport(chip->srb, chip);
                 }
 
@@ -397,7 +397,7 @@ static int rts51x_polling_thread(void *__chip)
                 }
 #endif
 
-                mspro_polling_format_status(chip);
+                rts51x_mspro_polling_format_status(chip);
 
                 /* lock the device pointers */
                 mutex_lock(&(chip->usb->dev_mutex));
@@ -478,7 +478,7 @@ static void rts51x_init_options(struct rts51x_chip *chip)
 {
         struct rts51x_option *option = &(chip->option);
 
-        option->mspro_formatter_enable = 1;
+        option->rts51x_mspro_formatter_enable = 1;
 
         option->fpga_sd_sdr104_clk = CLK_100;
         option->fpga_sd_sdr50_clk = CLK_100;
@@ -510,7 +510,7 @@ static void rts51x_init_options(struct rts51x_chip *chip)
 
         option->FT2_fast_mode = 0;
         option->pwr_delay = 800;
-        option->xd_rw_step = 0;
+        option->rts51x_xd_rw_step = 0;
         option->D3318_off_delay = 50;
         option->delink_delay = 100;
         option->rts5129_D3318_off_enable = 0;
@@ -518,7 +518,7 @@ static void rts51x_init_options(struct rts51x_chip *chip)
         option->reset_or_rw_fail_set_pad_drive = 1;
         option->debounce_num = 2;
         option->led_toggle_interval = 6;
-        option->xd_rwn_step = 0;
+        option->rts51x_xd_rwn_step = 0;
         option->sd_send_status_en = 0;
         option->sdr50_tx_phase = 0x01;
         option->sdr50_rx_phase = 0x05;
diff --git a/drivers/staging/rts5139/rts51x_card.c b/drivers/staging/rts5139/rts51x_card.c
index 50be42ac592b..509d83e623a5 100644
--- a/drivers/staging/rts5139/rts51x_card.c
+++ b/drivers/staging/rts5139/rts51x_card.c
@@ -41,7 +41,7 @@
 #include "sd.h"
 #include "ms.h"
 
-void do_remaining_work(struct rts51x_chip *chip)
+void rts51x_do_remaining_work(struct rts51x_chip *chip)
 {
         struct sd_info *sd_card = &(chip->sd_card);
         struct xd_info *xd_card = &(chip->xd_card);
@@ -84,27 +84,27 @@ void do_remaining_work(struct rts51x_chip *chip)
         }
 
         if (sd_card->counter > POLLING_WAIT_CNT)
-                sd_cleanup_work(chip);
+                rts51x_sd_cleanup_work(chip);
 
         if (xd_card->counter > POLLING_WAIT_CNT)
-                xd_cleanup_work(chip);
+                rts51x_xd_cleanup_work(chip);
 
         if (ms_card->counter > POLLING_WAIT_CNT)
-                ms_cleanup_work(chip);
+                rts51x_ms_cleanup_work(chip);
 }
 
-static void do_reset_xd_card(struct rts51x_chip *chip)
+static void do_rts51x_reset_xd_card(struct rts51x_chip *chip)
 {
         int retval;
 
         if (chip->card2lun[XD_CARD] >= MAX_ALLOWED_LUN_CNT)
                 return;
 
-        retval = reset_xd_card(chip);
+        retval = rts51x_reset_xd_card(chip);
         if (retval == STATUS_SUCCESS) {
                 chip->card_ready |= XD_CARD;
                 chip->card_fail &= ~XD_CARD;
-                chip->rw_card[chip->card2lun[XD_CARD]] = xd_rw;
+                chip->rw_card[chip->card2lun[XD_CARD]] = rts51x_xd_rw;
         } else {
                 chip->card_ready &= ~XD_CARD;
                 chip->card_fail |= XD_CARD;
@@ -120,18 +120,18 @@ static void do_reset_xd_card(struct rts51x_chip *chip)
         }
 }
 
-void do_reset_sd_card(struct rts51x_chip *chip)
+void rts51x_do_rts51x_reset_sd_card(struct rts51x_chip *chip)
 {
         int retval;
 
         if (chip->card2lun[SD_CARD] >= MAX_ALLOWED_LUN_CNT)
                 return;
 
-        retval = reset_sd_card(chip);
+        retval = rts51x_reset_sd_card(chip);
         if (retval == STATUS_SUCCESS) {
                 chip->card_ready |= SD_CARD;
                 chip->card_fail &= ~SD_CARD;
-                chip->rw_card[chip->card2lun[SD_CARD]] = sd_rw;
+                chip->rw_card[chip->card2lun[SD_CARD]] = rts51x_sd_rw;
         } else {
                 chip->card_ready &= ~SD_CARD;
                 chip->card_fail |= SD_CARD;
@@ -147,18 +147,18 @@ void do_reset_sd_card(struct rts51x_chip *chip)
         }
 }
 
-static void do_reset_ms_card(struct rts51x_chip *chip)
+static void do_rts51x_reset_ms_card(struct rts51x_chip *chip)
 {
         int retval;
 
         if (chip->card2lun[MS_CARD] >= MAX_ALLOWED_LUN_CNT)
                 return;
 
-        retval = reset_ms_card(chip);
+        retval = rts51x_reset_ms_card(chip);
         if (retval == STATUS_SUCCESS) {
                 chip->card_ready |= MS_CARD;
                 chip->card_fail &= ~MS_CARD;
-                chip->rw_card[chip->card2lun[MS_CARD]] = ms_rw;
+                chip->rw_card[chip->card2lun[MS_CARD]] = rts51x_ms_rw;
         } else {
                 chip->card_ready &= ~MS_CARD;
                 chip->card_fail |= MS_CARD;
@@ -301,7 +301,7 @@ void rts51x_init_cards(struct rts51x_chip *chip)
                         chip->card_exist &= ~XD_CARD;
                         chip->card_ejected = 0;
                         if (chip->card_ready & XD_CARD) {
-                                release_xd_card(chip);
+                                rts51x_release_xd_card(chip);
                                 chip->rw_card[chip->card2lun[XD_CARD]] = NULL;
                                 clear_bit(chip->card2lun[XD_CARD],
                                           &(chip->lun_mc));
@@ -312,7 +312,7 @@ void rts51x_init_cards(struct rts51x_chip *chip)
                         chip->card_exist &= ~SD_CARD;
                         chip->card_ejected = 0;
                         if (chip->card_ready & SD_CARD) {
-                                release_sd_card(chip);
+                                rts51x_release_sd_card(chip);
                                 chip->rw_card[chip->card2lun[SD_CARD]] = NULL;
                                 clear_bit(chip->card2lun[SD_CARD],
                                           &(chip->lun_mc));
@@ -323,7 +323,7 @@ void rts51x_init_cards(struct rts51x_chip *chip)
                         chip->card_exist &= ~MS_CARD;
                         chip->card_ejected = 0;
                         if (chip->card_ready & MS_CARD) {
-                                release_ms_card(chip);
+                                rts51x_release_ms_card(chip);
                                 chip->rw_card[chip->card2lun[MS_CARD]] = NULL;
                                 clear_bit(chip->card2lun[MS_CARD],
                                           &(chip->lun_mc));
@@ -339,13 +339,13 @@ void rts51x_init_cards(struct rts51x_chip *chip)
 
                 if (need_reset & XD_CARD) {
                         chip->card_exist |= XD_CARD;
-                        do_reset_xd_card(chip);
+                        do_rts51x_reset_xd_card(chip);
                 } else if (need_reset & SD_CARD) {
                         chip->card_exist |= SD_CARD;
-                        do_reset_sd_card(chip);
+                        rts51x_do_rts51x_reset_sd_card(chip);
                 } else if (need_reset & MS_CARD) {
                         chip->card_exist |= MS_CARD;
-                        do_reset_ms_card(chip);
+                        do_rts51x_reset_ms_card(chip);
                 }
         }
 }
@@ -353,20 +353,20 @@ void rts51x_init_cards(struct rts51x_chip *chip)
 void rts51x_release_cards(struct rts51x_chip *chip)
 {
         if (chip->card_ready & SD_CARD) {
-                sd_cleanup_work(chip);
-                release_sd_card(chip);
+                rts51x_sd_cleanup_work(chip);
+                rts51x_release_sd_card(chip);
                 chip->card_ready &= ~SD_CARD;
         }
 
         if (chip->card_ready & XD_CARD) {
-                xd_cleanup_work(chip);
-                release_xd_card(chip);
+                rts51x_xd_cleanup_work(chip);
+                rts51x_release_xd_card(chip);
                 chip->card_ready &= ~XD_CARD;
         }
 
         if (chip->card_ready & MS_CARD) {
-                ms_cleanup_work(chip);
-                release_ms_card(chip);
+                rts51x_ms_cleanup_work(chip);
+                rts51x_release_ms_card(chip);
                 chip->card_ready &= ~MS_CARD;
         }
 }
@@ -376,7 +376,7 @@ static inline u8 double_depth(u8 depth)
         return ((depth > 1) ? (depth - 1) : depth);
 }
 
-int switch_ssc_clock(struct rts51x_chip *chip, int clk)
+int rts51x_switch_ssc_clock(struct rts51x_chip *chip, int clk)
 {
         struct sd_info *sd_card = &(chip->sd_card);
         struct ms_info *ms_card = &(chip->ms_card);
@@ -513,7 +513,7 @@ int switch_ssc_clock(struct rts51x_chip *chip, int clk)
         return STATUS_SUCCESS;
 }
 
-int switch_normal_clock(struct rts51x_chip *chip, int clk)
+int rts51x_switch_normal_clock(struct rts51x_chip *chip, int clk)
 {
         int retval;
         u8 sel, div, mcu_cnt;
@@ -653,7 +653,7 @@ int switch_normal_clock(struct rts51x_chip *chip, int clk)
         return STATUS_SUCCESS;
 }
 
-int card_rw(struct scsi_cmnd *srb, struct rts51x_chip *chip, u32 sec_addr,
+int rts51x_card_rw(struct scsi_cmnd *srb, struct rts51x_chip *chip, u32 sec_addr,
             u16 sec_cnt)
 {
         int retval;
@@ -688,7 +688,7 @@ int card_rw(struct scsi_cmnd *srb, struct rts51x_chip *chip, u32 sec_addr,
         return retval;
 }
 
-u8 get_lun_card(struct rts51x_chip *chip, unsigned int lun)
+u8 rts51x_get_lun_card(struct rts51x_chip *chip, unsigned int lun)
 {
         if ((chip->card_ready & chip->lun2card[lun]) == XD_CARD)
                 return (u8) XD_CARD;
@@ -744,24 +744,24 @@ int rts51x_select_card(struct rts51x_chip *chip, int card)
         return STATUS_SUCCESS;
 }
 
-void eject_card(struct rts51x_chip *chip, unsigned int lun)
+void rts51x_eject_card(struct rts51x_chip *chip, unsigned int lun)
 {
         RTS51X_DEBUGP("eject card\n");
         RTS51X_SET_STAT(chip, STAT_RUN);
-        do_remaining_work(chip);
+        rts51x_do_remaining_work(chip);
 
         if ((chip->card_ready & chip->lun2card[lun]) == SD_CARD) {
-                release_sd_card(chip);
+                rts51x_release_sd_card(chip);
                 chip->card_ejected |= SD_CARD;
                 chip->card_ready &= ~SD_CARD;
                 chip->capacity[lun] = 0;
         } else if ((chip->card_ready & chip->lun2card[lun]) == XD_CARD) {
-                release_xd_card(chip);
+                rts51x_release_xd_card(chip);
                 chip->card_ejected |= XD_CARD;
                 chip->card_ready &= ~XD_CARD;
                 chip->capacity[lun] = 0;
         } else if ((chip->card_ready & chip->lun2card[lun]) == MS_CARD) {
-                release_ms_card(chip);
+                rts51x_release_ms_card(chip);
                 chip->card_ejected |= MS_CARD;
                 chip->card_ready &= ~MS_CARD;
                 chip->capacity[lun] = 0;
@@ -770,7 +770,7 @@ void eject_card(struct rts51x_chip *chip, unsigned int lun)
                               XD_INT | MS_INT | SD_INT);
 }
 
-void trans_dma_enable(enum dma_data_direction dir, struct rts51x_chip *chip,
+void rts51x_trans_dma_enable(enum dma_data_direction dir, struct rts51x_chip *chip,
                       u32 byte_cnt, u8 pack_size)
 {
         if (pack_size > DMA_1024)
@@ -798,7 +798,7 @@ void trans_dma_enable(enum dma_data_direction dir, struct rts51x_chip *chip,
         }
 }
 
-int enable_card_clock(struct rts51x_chip *chip, u8 card)
+int rts51x_enable_card_clock(struct rts51x_chip *chip, u8 card)
 {
         u8 clk_en = 0;
 
@@ -814,7 +814,7 @@ int enable_card_clock(struct rts51x_chip *chip, u8 card)
         return STATUS_SUCCESS;
 }
 
-int card_power_on(struct rts51x_chip *chip, u8 card)
+int rts51x_card_power_on(struct rts51x_chip *chip, u8 card)
 {
         u8 mask, val1, val2;
 
@@ -863,7 +863,7 @@ int monitor_card_cd(struct rts51x_chip *chip, u8 card)
         return CD_NOT_EXIST;
 }
 
-int toggle_gpio(struct rts51x_chip *chip, u8 gpio)
+int rts51x_toggle_gpio(struct rts51x_chip *chip, u8 gpio)
 {
         int retval;
         u8 temp_reg;
@@ -898,7 +898,7 @@ int toggle_gpio(struct rts51x_chip *chip, u8 gpio)
         return STATUS_SUCCESS;
 }
 
-int turn_on_led(struct rts51x_chip *chip, u8 gpio)
+int rts51x_turn_on_led(struct rts51x_chip *chip, u8 gpio)
 {
         int retval;
         u8 gpio_oe[4] = {
@@ -917,7 +917,7 @@ int turn_on_led(struct rts51x_chip *chip, u8 gpio)
         return STATUS_SUCCESS;
 }
 
-int turn_off_led(struct rts51x_chip *chip, u8 gpio)
+int rts51x_turn_off_led(struct rts51x_chip *chip, u8 gpio)
 {
         int retval;
         u8 gpio_output[4] = {
diff --git a/drivers/staging/rts5139/rts51x_card.h b/drivers/staging/rts5139/rts51x_card.h
index c5c03cce98bd..e62b25c31413 100644
--- a/drivers/staging/rts5139/rts51x_card.h
+++ b/drivers/staging/rts5139/rts51x_card.h
@@ -737,24 +737,24 @@
 
 int monitor_card_cd(struct rts51x_chip *chip, u8 card);
 
-void do_remaining_work(struct rts51x_chip *chip);
-void do_reset_sd_card(struct rts51x_chip *chip);
+void rts51x_do_remaining_work(struct rts51x_chip *chip);
+void rts51x_do_rts51x_reset_sd_card(struct rts51x_chip *chip);
 void rts51x_init_cards(struct rts51x_chip *chip);
 void rts51x_release_cards(struct rts51x_chip *chip);
-int switch_ssc_clock(struct rts51x_chip *chip, int clk);
-int switch_normal_clock(struct rts51x_chip *chip, int clk);
-int card_rw(struct scsi_cmnd *srb, struct rts51x_chip *chip, u32 sec_addr,
+int rts51x_switch_ssc_clock(struct rts51x_chip *chip, int clk);
+int rts51x_switch_normal_clock(struct rts51x_chip *chip, int clk);
+int rts51x_card_rw(struct scsi_cmnd *srb, struct rts51x_chip *chip, u32 sec_addr,
             u16 sec_cnt);
-u8 get_lun_card(struct rts51x_chip *chip, unsigned int lun);
+u8 rts51x_get_lun_card(struct rts51x_chip *chip, unsigned int lun);
 int rts51x_select_card(struct rts51x_chip *chip, int card);
-void eject_card(struct rts51x_chip *chip, unsigned int lun);
-void trans_dma_enable(enum dma_data_direction dir, struct rts51x_chip *chip,
+void rts51x_eject_card(struct rts51x_chip *chip, unsigned int lun);
+void rts51x_trans_dma_enable(enum dma_data_direction dir, struct rts51x_chip *chip,
                       u32 byte_cnt, u8 pack_size);
-int enable_card_clock(struct rts51x_chip *chip, u8 card);
-int card_power_on(struct rts51x_chip *chip, u8 card);
-int toggle_gpio(struct rts51x_chip *chip, u8 gpio);
-int turn_on_led(struct rts51x_chip *chip, u8 gpio);
-int turn_off_led(struct rts51x_chip *chip, u8 gpio);
+int rts51x_enable_card_clock(struct rts51x_chip *chip, u8 card);
+int rts51x_card_power_on(struct rts51x_chip *chip, u8 card);
+int rts51x_toggle_gpio(struct rts51x_chip *chip, u8 gpio);
+int rts51x_turn_on_led(struct rts51x_chip *chip, u8 gpio);
+int rts51x_turn_off_led(struct rts51x_chip *chip, u8 gpio);
 
 static inline int check_card_ready(struct rts51x_chip *chip, unsigned int lun)
 {
@@ -830,9 +830,9 @@ static inline int switch_clock(struct rts51x_chip *chip, int clk)
         int retval = 0;
 
         if (chip->asic_code)
-                retval = switch_ssc_clock(chip, clk);
+                retval = rts51x_switch_ssc_clock(chip, clk);
         else
-                retval = switch_normal_clock(chip, clk);
+                retval = rts51x_switch_normal_clock(chip, clk);
 
         return retval;
 }
diff --git a/drivers/staging/rts5139/rts51x_chip.c b/drivers/staging/rts5139/rts51x_chip.c
index 08dcae8db63e..7d7510de170c 100644
--- a/drivers/staging/rts5139/rts51x_chip.c
+++ b/drivers/staging/rts5139/rts51x_chip.c
@@ -132,7 +132,7 @@ int rts51x_reset_chip(struct rts51x_chip *chip)
         }
 #endif
         if (chip->option.FT2_fast_mode) {
-                card_power_on(chip, SD_CARD | MS_CARD | XD_CARD);
+                rts51x_card_power_on(chip, SD_CARD | MS_CARD | XD_CARD);
                 wait_timeout(10);
         }
 
@@ -212,8 +212,8 @@ int rts51x_init_chip(struct rts51x_chip *chip)
 
 int rts51x_release_chip(struct rts51x_chip *chip)
 {
-        xd_free_l2p_tbl(chip);
-        ms_free_l2p_tbl(chip);
+        rts51x_xd_free_l2p_tbl(chip);
+        rts51x_ms_free_l2p_tbl(chip);
         chip->card_ready = 0;
         return STATUS_SUCCESS;
 }
@@ -227,7 +227,7 @@ static inline void rts51x_blink_led(struct rts51x_chip *chip)
                         chip->led_toggle_counter++;
                 } else {
                         chip->led_toggle_counter = 0;
-                        toggle_gpio(chip, LED_GPIO);
+                        rts51x_toggle_gpio(chip, LED_GPIO);
                 }
         }
 }
@@ -325,14 +325,14 @@ void rts51x_polling_func(struct rts51x_chip *chip)
                             && (chip->card_exist &
                                 (SD_CARD | MS_CARD | XD_CARD))
                             && (!chip->card_ejected)) {
-                                turn_on_led(chip, LED_GPIO);
+                                rts51x_turn_on_led(chip, LED_GPIO);
                         } else {
                                 if (chip->rts5179) {
                                         rts51x_ep0_write_register(chip,
                                                                   CARD_GPIO,
                                                                   0x03, 0x00);
                                 } else {
-                                        turn_off_led(chip, LED_GPIO);
+                                        rts51x_turn_off_led(chip, LED_GPIO);
                                 }
 
                         }
@@ -353,7 +353,7 @@ void rts51x_polling_func(struct rts51x_chip *chip)
         switch (RTS51X_GET_STAT(chip)) {
         case STAT_RUN:
                 rts51x_blink_led(chip);
-                do_remaining_work(chip);
+                rts51x_do_remaining_work(chip);
                 break;
 
         case STAT_IDLE:
@@ -707,7 +707,7 @@ void rts51x_do_before_power_down(struct rts51x_chip *chip)
         if (chip->rts5179)
                 rts51x_ep0_write_register(chip, CARD_GPIO, 0x03, 0x00);
         else
-                turn_off_led(chip, LED_GPIO);
+                rts51x_turn_off_led(chip, LED_GPIO);
 
         chip->cur_clk = 0;
         chip->card_exist = 0;
@@ -797,7 +797,7 @@ void rts51x_pp_status(struct rts51x_chip *chip, unsigned int lun, u8 *status,
 {
         struct sd_info *sd_card = &(chip->sd_card);
         struct ms_info *ms_card = &(chip->ms_card);
-        u8 card = get_lun_card(chip, lun);
+        u8 card = rts51x_get_lun_card(chip, lun);
 #ifdef SUPPORT_OC
         u8 oc_now_mask = 0, oc_ever_mask = 0;
 #endif
@@ -958,9 +958,9 @@ void rts51x_read_status(struct rts51x_chip *chip, unsigned int lun,
                 rts51x_status[12] = 0;
 
         /* Detailed Type */
-        if (get_lun_card(chip, lun) == XD_CARD) {
+        if (rts51x_get_lun_card(chip, lun) == XD_CARD) {
                 rts51x_status[13] = 0x40;
-        } else if (get_lun_card(chip, lun) == SD_CARD) {
+        } else if (rts51x_get_lun_card(chip, lun) == SD_CARD) {
                 struct sd_info *sd_card = &(chip->sd_card);
 
                 rts51x_status[13] = 0x20;
@@ -976,7 +976,7 @@ void rts51x_read_status(struct rts51x_chip *chip, unsigned int lun,
                         if (CHK_MMC_SECTOR_MODE(sd_card))
                                 rts51x_status[13] |= 0x04; /* Hi capacity */
                 }
-        } else if (get_lun_card(chip, lun) == MS_CARD) {
+        } else if (rts51x_get_lun_card(chip, lun) == MS_CARD) {
                 struct ms_info *ms_card = &(chip->ms_card);
 
                 if (CHK_MSPRO(ms_card)) {
diff --git a/drivers/staging/rts5139/rts51x_chip.h b/drivers/staging/rts5139/rts51x_chip.h
index 64257caf2f30..12deb24cfbbe 100644
--- a/drivers/staging/rts5139/rts51x_chip.h
+++ b/drivers/staging/rts5139/rts51x_chip.h
@@ -253,7 +253,7 @@ struct sense_data_t {
 #define SUPPORT_UHS50_MMC44             0x40
 
 struct rts51x_option {
-        int mspro_formatter_enable;
+        int rts51x_mspro_formatter_enable;
 
         /* card clock expected by user for fpga platform */
         int fpga_sd_sdr104_clk;
@@ -308,7 +308,7 @@ struct rts51x_option {
          * add for config delay between 1/4 PMOS and 3/4 PMOS */
         int pwr_delay;
 
-        int xd_rw_step;         /* add to tune xd tRP */
+        int rts51x_xd_rw_step;          /* add to tune xd tRP */
         int D3318_off_delay;    /* add to tune D3318 off delay time */
         int delink_delay;       /* add to tune delink delay time */
         /* add for rts5129 to enable/disable D3318 off */
@@ -320,7 +320,7 @@ struct rts51x_option {
 
         u8 debounce_num;        /* debounce number */
         u8 led_toggle_interval; /* used to control led toggle speed */
-        int xd_rwn_step;
+        int rts51x_xd_rwn_step;
         u8 sd_send_status_en;
         /* used to store default phase which is
          * used when phase tune all pass. */
@@ -337,11 +337,11 @@ struct rts51x_option {
         u8 dv18_voltage;        /* add to tune dv18 voltage */
 };
 
-#define MS_FORMATTER_ENABLED(chip)      ((chip)->option.mspro_formatter_enable)
+#define MS_FORMATTER_ENABLED(chip)      ((chip)->option.rts51x_mspro_formatter_enable)
 
 struct rts51x_chip;
 
-typedef int (*card_rw_func) (struct scsi_cmnd *srb, struct rts51x_chip *chip,
+typedef int (*rts51x_card_rw_func) (struct scsi_cmnd *srb, struct rts51x_chip *chip,
                              u32 sec_addr, u16 sec_cnt);
 
 /* For MS Card */
@@ -564,7 +564,7 @@ struct sd_info {
 #define CHK_MS8BIT(ms_card)     (((ms_card)->ms_type & MS_8BIT))
 #define CHK_MS4BIT(ms_card)     (((ms_card)->ms_type & MS_4BIT))
 
-struct ms_delay_write_tag {
+struct rts51x_ms_delay_write_tag {
         u16 old_phyblock;
         u16 new_phyblock;
         u16 logblock;
@@ -605,7 +605,7 @@ struct ms_info {
         u32 total_sec_cnt;
         u8 last_rw_int;
 
-        struct ms_delay_write_tag delay_write;
+        struct rts51x_ms_delay_write_tag delay_write;
 
         int counter;
 
@@ -671,7 +671,7 @@ struct rts51x_chip {
         u32 capacity[MAX_ALLOWED_LUN_CNT];
 
         /* read/write card function pointer */
-        card_rw_func rw_card[MAX_ALLOWED_LUN_CNT];
+        rts51x_card_rw_func rw_card[MAX_ALLOWED_LUN_CNT];
         /* read/write capacity, used for GPIO Toggle */
         u32 rw_cap[MAX_ALLOWED_LUN_CNT];
         /* card to lun mapping table */
diff --git a/drivers/staging/rts5139/rts51x_fop.c b/drivers/staging/rts5139/rts51x_fop.c
index bf1a9e64e874..dee7d8af564e 100644
--- a/drivers/staging/rts5139/rts51x_fop.c
+++ b/drivers/staging/rts5139/rts51x_fop.c
@@ -70,7 +70,7 @@ static int rts51x_sd_direct_cmnd(struct rts51x_chip *chip,
         switch (dir) {
         case 0:
                 /* No data */
-                retval = ext_sd_execute_no_data(chip, chip->card2lun[SD_CARD],
+                retval = ext_rts51x_sd_execute_no_data(chip, chip->card2lun[SD_CARD],
                                                 cmd_idx, standby, acmd,
                                                 rsp_code, arg);
                 if (retval != TRANSPORT_GOOD)
@@ -83,7 +83,7 @@ static int rts51x_sd_direct_cmnd(struct rts51x_chip *chip,
                 if (!buf)
                         TRACE_RET(chip, STATUS_NOMEM);
 
-                retval = ext_sd_execute_read_data(chip, chip->card2lun[SD_CARD],
+                retval = ext_rts51x_sd_execute_read_data(chip, chip->card2lun[SD_CARD],
                                                   cmd_idx, cmd12, standby, acmd,
                                                   rsp_code, arg, len, buf,
                                                   cmnd->buf_len, 0);
@@ -117,7 +117,7 @@ static int rts51x_sd_direct_cmnd(struct rts51x_chip *chip,
                 }
 
                 retval =
-                    ext_sd_execute_write_data(chip, chip->card2lun[SD_CARD],
+                    ext_rts51x_sd_execute_write_data(chip, chip->card2lun[SD_CARD],
                                               cmd_idx, cmd12, standby, acmd,
                                               rsp_code, arg, len, buf,
                                               cmnd->buf_len, 0);
diff --git a/drivers/staging/rts5139/rts51x_scsi.c b/drivers/staging/rts5139/rts51x_scsi.c
index e07a1f4f58cf..052911c93103 100644
--- a/drivers/staging/rts5139/rts51x_scsi.c
+++ b/drivers/staging/rts5139/rts51x_scsi.c
@@ -44,7 +44,7 @@
 #include "ms_mg.h"
 #include "trace.h"
 
-void scsi_show_command(struct scsi_cmnd *srb)
+void rts51x_scsi_show_command(struct scsi_cmnd *srb)
 {
         char *what = NULL;
         int i, unknown_cmd = 0;
@@ -333,72 +333,72 @@ void scsi_show_command(struct scsi_cmnd *srb)
         }
 }
 
-void set_sense_type(struct rts51x_chip *chip, unsigned int lun, int sense_type)
+void rts51x_set_sense_type(struct rts51x_chip *chip, unsigned int lun, int sense_type)
 {
         switch (sense_type) {
         case SENSE_TYPE_MEDIA_CHANGE:
-                set_sense_data(chip, lun, CUR_ERR, 0x06, 0, 0x28, 0, 0, 0);
+                rts51x_set_sense_data(chip, lun, CUR_ERR, 0x06, 0, 0x28, 0, 0, 0);
                 break;
 
         case SENSE_TYPE_MEDIA_NOT_PRESENT:
-                set_sense_data(chip, lun, CUR_ERR, 0x02, 0, 0x3A, 0, 0, 0);
+                rts51x_set_sense_data(chip, lun, CUR_ERR, 0x02, 0, 0x3A, 0, 0, 0);
                 break;
 
         case SENSE_TYPE_MEDIA_LBA_OVER_RANGE:
-                set_sense_data(chip, lun, CUR_ERR, 0x05, 0, 0x21, 0, 0, 0);
+                rts51x_set_sense_data(chip, lun, CUR_ERR, 0x05, 0, 0x21, 0, 0, 0);
                 break;
 
         case SENSE_TYPE_MEDIA_LUN_NOT_SUPPORT:
-                set_sense_data(chip, lun, CUR_ERR, 0x05, 0, 0x25, 0, 0, 0);
+                rts51x_set_sense_data(chip, lun, CUR_ERR, 0x05, 0, 0x25, 0, 0, 0);
                 break;
 
         case SENSE_TYPE_MEDIA_WRITE_PROTECT:
-                set_sense_data(chip, lun, CUR_ERR, 0x07, 0, 0x27, 0, 0, 0);
+                rts51x_set_sense_data(chip, lun, CUR_ERR, 0x07, 0, 0x27, 0, 0, 0);
                 break;
 
         case SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR:
-                set_sense_data(chip, lun, CUR_ERR, 0x03, 0, 0x11, 0, 0, 0);
+                rts51x_set_sense_data(chip, lun, CUR_ERR, 0x03, 0, 0x11, 0, 0, 0);
                 break;
 
         case SENSE_TYPE_MEDIA_WRITE_ERR:
-                set_sense_data(chip, lun, CUR_ERR, 0x03, 0, 0x0C, 0x02, 0, 0);
+                rts51x_set_sense_data(chip, lun, CUR_ERR, 0x03, 0, 0x0C, 0x02, 0, 0);
                 break;
 
         case SENSE_TYPE_MEDIA_INVALID_CMD_FIELD:
-                set_sense_data(chip, lun, CUR_ERR, ILGAL_REQ, 0,
+                rts51x_set_sense_data(chip, lun, CUR_ERR, ILGAL_REQ, 0,
                                ASC_INVLD_CDB, ASCQ_INVLD_CDB, CDB_ILLEGAL, 1);
                 break;
 
         case SENSE_TYPE_FORMAT_CMD_FAILED:
-                set_sense_data(chip, lun, CUR_ERR, 0x03, 0, 0x31, 0x01, 0, 0);
+                rts51x_set_sense_data(chip, lun, CUR_ERR, 0x03, 0, 0x31, 0x01, 0, 0);
                 break;
 
 #ifdef SUPPORT_MAGIC_GATE
         case SENSE_TYPE_MG_KEY_FAIL_NOT_ESTAB:
-                set_sense_data(chip, lun, CUR_ERR, 0x05, 0, 0x6F, 0x02, 0, 0);
+                rts51x_set_sense_data(chip, lun, CUR_ERR, 0x05, 0, 0x6F, 0x02, 0, 0);
                 break;
 
         case SENSE_TYPE_MG_KEY_FAIL_NOT_AUTHEN:
-                set_sense_data(chip, lun, CUR_ERR, 0x05, 0, 0x6F, 0x00, 0, 0);
+                rts51x_set_sense_data(chip, lun, CUR_ERR, 0x05, 0, 0x6F, 0x00, 0, 0);
                 break;
 
         case SENSE_TYPE_MG_INCOMPATIBLE_MEDIUM:
-                set_sense_data(chip, lun, CUR_ERR, 0x02, 0, 0x30, 0x00, 0, 0);
+                rts51x_set_sense_data(chip, lun, CUR_ERR, 0x02, 0, 0x30, 0x00, 0, 0);
                 break;
 
         case SENSE_TYPE_MG_WRITE_ERR:
-                set_sense_data(chip, lun, CUR_ERR, 0x03, 0, 0x0C, 0x00, 0, 0);
+                rts51x_set_sense_data(chip, lun, CUR_ERR, 0x03, 0, 0x0C, 0x00, 0, 0);
                 break;
 #endif
 
         case SENSE_TYPE_NO_SENSE:
         default:
-                set_sense_data(chip, lun, CUR_ERR, 0, 0, 0, 0, 0, 0);
+                rts51x_set_sense_data(chip, lun, CUR_ERR, 0, 0, 0, 0, 0, 0);
                 break;
         }
 }
 
-void set_sense_data(struct rts51x_chip *chip, unsigned int lun, u8 err_code,
+void rts51x_set_sense_data(struct rts51x_chip *chip, unsigned int lun, u8 err_code,
                     u8 sense_key, u32 info, u8 asc, u8 ascq, u8 sns_key_info0,
                     u16 sns_key_info1)
 {
@@ -428,13 +428,13 @@ static int test_unit_ready(struct scsi_cmnd *srb, struct rts51x_chip *chip)
         rts51x_init_cards(chip);
 
         if (!check_card_ready(chip, lun)) {
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_NOT_PRESENT);
+                rts51x_set_sense_type(chip, lun, SENSE_TYPE_MEDIA_NOT_PRESENT);
                 return TRANSPORT_FAILED;
         }
 
         if (!check_lun_mc(chip, lun)) {
                 set_lun_mc(chip, lun);
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_CHANGE);
+                rts51x_set_sense_type(chip, lun, SENSE_TYPE_MEDIA_CHANGE);
                 return TRANSPORT_FAILED;
         }
 
@@ -457,7 +457,7 @@ static int inquiry(struct scsi_cmnd *srb, struct rts51x_chip *chip)
         char *inquiry_string;
         unsigned char sendbytes;
         unsigned char *buf;
-        u8 card = get_lun_card(chip, lun);
+        u8 card = rts51x_get_lun_card(chip, lun);
         int pro_formatter_flag = 0;
         unsigned char inquiry_buf[] = {
                 QULIFIRE | DRCT_ACCESS_DEV,
@@ -532,7 +532,7 @@ static int start_stop_unit(struct scsi_cmnd *srb, struct rts51x_chip *chip)
         case UNLOAD_MEDIUM:
                 /* Media shall be unload */
                 if (check_card_ready(chip, lun))
-                        eject_card(chip, lun);
+                        rts51x_eject_card(chip, lun);
                 return TRANSPORT_GOOD;
 
         case MAKE_MEDIUM_READY:
@@ -540,7 +540,7 @@ static int start_stop_unit(struct scsi_cmnd *srb, struct rts51x_chip *chip)
                 if (check_card_ready(chip, lun)) {
                         return TRANSPORT_GOOD;
                 } else {
-                        set_sense_type(chip, lun, SENSE_TYPE_MEDIA_NOT_PRESENT);
+                        rts51x_set_sense_type(chip, lun, SENSE_TYPE_MEDIA_NOT_PRESENT);
                         TRACE_RET(chip, TRANSPORT_FAILED);
                 }
 
@@ -559,7 +559,7 @@ static int allow_medium_removal(struct scsi_cmnd *srb, struct rts51x_chip *chip)
         scsi_set_resid(srb, 0);
 
         if (prevent) {
-                set_sense_type(chip, SCSI_LUN(srb),
+                rts51x_set_sense_type(chip, SCSI_LUN(srb),
                                SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
                 TRACE_RET(chip, TRANSPORT_FAILED);
         }
@@ -663,10 +663,10 @@ static int mode_sense(struct scsi_cmnd *srb, struct rts51x_chip *chip)
         int status;
         int pro_formatter_flag;
         unsigned char pageCode, *buf;
-        u8 card = get_lun_card(chip, lun);
+        u8 card = rts51x_get_lun_card(chip, lun);
 
         if (!check_card_ready(chip, lun)) {
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_NOT_PRESENT);
+                rts51x_set_sense_type(chip, lun, SENSE_TYPE_MEDIA_NOT_PRESENT);
                 scsi_set_resid(srb, scsi_bufflen(srb));
                 TRACE_RET(chip, TRANSPORT_FAILED);
         }
@@ -678,7 +678,7 @@ static int mode_sense(struct scsi_cmnd *srb, struct rts51x_chip *chip)
         if ((get_lun2card(chip, lun) & MS_CARD)) {
                 if (!card || (card == MS_CARD)) {
                         dataSize = 108;
-                        if (chip->option.mspro_formatter_enable)
+                        if (chip->option.rts51x_mspro_formatter_enable)
                                 pro_formatter_flag = 1;
                 }
         }
@@ -725,7 +725,7 @@ static int mode_sense(struct scsi_cmnd *srb, struct rts51x_chip *chip)
                 }
                 status = TRANSPORT_GOOD;
         } else {
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
+                rts51x_set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
                 scsi_set_resid(srb, scsi_bufflen(srb));
                 status = TRANSPORT_FAILED;
         }
@@ -749,9 +749,9 @@ static int request_sense(struct scsi_cmnd *srb, struct rts51x_chip *chip)
 
         sense = &(chip->sense_buffer[lun]);
 
-        if ((get_lun_card(chip, lun) == MS_CARD)
+        if ((rts51x_get_lun_card(chip, lun) == MS_CARD)
             && PRO_UNDER_FORMATTING(ms_card)) {
-                mspro_format_sense(chip, lun);
+                rts51x_mspro_format_sense(chip, lun);
         }
 
         buf = vmalloc(scsi_bufflen(srb));
@@ -766,7 +766,7 @@ static int request_sense(struct scsi_cmnd *srb, struct rts51x_chip *chip)
 
         scsi_set_resid(srb, 0);
         /* Reset Sense Data */
-        set_sense_type(chip, lun, SENSE_TYPE_NO_SENSE);
+        rts51x_set_sense_type(chip, lun, SENSE_TYPE_NO_SENSE);
         return TRANSPORT_GOOD;
 }
 
@@ -778,13 +778,13 @@ static int read_write(struct scsi_cmnd *srb, struct rts51x_chip *chip)
         u16 sec_cnt;
 
         if (!check_card_ready(chip, lun) || (chip->capacity[lun] == 0)) {
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_NOT_PRESENT);
+                rts51x_set_sense_type(chip, lun, SENSE_TYPE_MEDIA_NOT_PRESENT);
                 TRACE_RET(chip, TRANSPORT_FAILED);
         }
 
         if (!check_lun_mc(chip, lun)) {
                 set_lun_mc(chip, lun);
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_CHANGE);
+                rts51x_set_sense_type(chip, lun, SENSE_TYPE_MEDIA_CHANGE);
                 return TRANSPORT_FAILED;
         }
 
@@ -812,13 +812,13 @@ static int read_write(struct scsi_cmnd *srb, struct rts51x_chip *chip)
                         ((u32) srb->cmnd[7]);
                 sec_cnt = ((u16) (srb->cmnd[9]) << 8) | srb->cmnd[10];
         } else {
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
+                rts51x_set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
                 TRACE_RET(chip, TRANSPORT_FAILED);
         }
 
         if ((start_sec > chip->capacity[lun]) ||
             ((start_sec + sec_cnt) > chip->capacity[lun])) {
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_LBA_OVER_RANGE);
+                rts51x_set_sense_type(chip, lun, SENSE_TYPE_MEDIA_LBA_OVER_RANGE);
                 TRACE_RET(chip, TRANSPORT_FAILED);
         }
 
@@ -830,17 +830,17 @@ static int read_write(struct scsi_cmnd *srb, struct rts51x_chip *chip)
         if ((srb->sc_data_direction == DMA_TO_DEVICE)
             && check_card_wp(chip, lun)) {
                 RTS51X_DEBUGP("Write protected card!\n");
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_WRITE_PROTECT);
+                rts51x_set_sense_type(chip, lun, SENSE_TYPE_MEDIA_WRITE_PROTECT);
                 TRACE_RET(chip, TRANSPORT_FAILED);
         }
 
-        retval = card_rw(srb, chip, start_sec, sec_cnt);
+        retval = rts51x_card_rw(srb, chip, start_sec, sec_cnt);
         if (retval != STATUS_SUCCESS) {
                 if (srb->sc_data_direction == DMA_FROM_DEVICE) {
-                        set_sense_type(chip, lun,
+                        rts51x_set_sense_type(chip, lun,
                                        SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR);
                 } else {
-                        set_sense_type(chip, lun, SENSE_TYPE_MEDIA_WRITE_ERR);
+                        rts51x_set_sense_type(chip, lun, SENSE_TYPE_MEDIA_WRITE_ERR);
                 }
                 TRACE_RET(chip, TRANSPORT_FAILED);
         }
@@ -855,13 +855,13 @@ static int read_format_capacity(struct scsi_cmnd *srb, struct rts51x_chip *chip)
         unsigned char *buf;
         unsigned int lun = SCSI_LUN(srb);
         unsigned int buf_len;
-        u8 card = get_lun_card(chip, lun);
+        u8 card = rts51x_get_lun_card(chip, lun);
         int desc_cnt;
         int i = 0;
 
         if (!check_card_ready(chip, lun)) {
-                if (!chip->option.mspro_formatter_enable) {
-                        set_sense_type(chip, lun, SENSE_TYPE_MEDIA_NOT_PRESENT);
+                if (!chip->option.rts51x_mspro_formatter_enable) {
+                        rts51x_set_sense_type(chip, lun, SENSE_TYPE_MEDIA_NOT_PRESENT);
                         TRACE_RET(chip, TRANSPORT_FAILED);
                 }
         }
@@ -877,7 +877,7 @@ static int read_format_capacity(struct scsi_cmnd *srb, struct rts51x_chip *chip)
         buf[i++] = 0;
 
         /* Capacity List Length */
-        if ((buf_len > 12) && chip->option.mspro_formatter_enable &&
+        if ((buf_len > 12) && chip->option.rts51x_mspro_formatter_enable &&
             (chip->lun2card[lun] & MS_CARD) && (!card || (card == MS_CARD))) {
                 buf[i++] = 0x10;
                 desc_cnt = 2;
@@ -933,13 +933,13 @@ static int read_capacity(struct scsi_cmnd *srb, struct rts51x_chip *chip)
         unsigned int lun = SCSI_LUN(srb);
 
         if (!check_card_ready(chip, lun)) {
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_NOT_PRESENT);
+                rts51x_set_sense_type(chip, lun, SENSE_TYPE_MEDIA_NOT_PRESENT);
                 TRACE_RET(chip, TRANSPORT_FAILED);
         }
 
         if (!check_lun_mc(chip, lun)) {
                 set_lun_mc(chip, lun);
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_CHANGE);
+                rts51x_set_sense_type(chip, lun, SENSE_TYPE_MEDIA_CHANGE);
                 return TRANSPORT_FAILED;
         }
 
@@ -1021,7 +1021,7 @@ static int read_mem(struct scsi_cmnd *srb, struct rts51x_chip *chip)
                 retval = rts51x_ep0_read_register(chip, addr + i, buf + i);
                 if (retval != STATUS_SUCCESS) {
                         vfree(buf);
-                        set_sense_type(chip, lun,
+                        rts51x_set_sense_type(chip, lun,
                                        SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR);
                         TRACE_RET(chip, TRANSPORT_FAILED);
                 }
@@ -1066,7 +1066,7 @@ static int write_mem(struct scsi_cmnd *srb, struct rts51x_chip *chip)
                     rts51x_ep0_write_register(chip, addr + i, 0xFF, buf[i]);
                 if (retval != STATUS_SUCCESS) {
                         vfree(buf);
-                        set_sense_type(chip, lun, SENSE_TYPE_MEDIA_WRITE_ERR);
+                        rts51x_set_sense_type(chip, lun, SENSE_TYPE_MEDIA_WRITE_ERR);
                         TRACE_RET(chip, TRANSPORT_FAILED);
                 }
         }
@@ -1083,12 +1083,12 @@ static int get_sd_csd(struct scsi_cmnd *srb, struct rts51x_chip *chip)
         unsigned int lun = SCSI_LUN(srb);
 
         if (!check_card_ready(chip, lun)) {
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_NOT_PRESENT);
+                rts51x_set_sense_type(chip, lun, SENSE_TYPE_MEDIA_NOT_PRESENT);
                 TRACE_RET(chip, TRANSPORT_FAILED);
         }
 
-        if (get_lun_card(chip, lun) != SD_CARD) {
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR);
+        if (rts51x_get_lun_card(chip, lun) != SD_CARD) {
+                rts51x_set_sense_type(chip, lun, SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR);
                 TRACE_RET(chip, TRANSPORT_FAILED);
         }
 
@@ -1120,7 +1120,7 @@ static int read_phy_register(struct scsi_cmnd *srb, struct rts51x_chip *chip)
                             rts51x_read_phy_register(chip, addr + i, buf + i);
                         if (retval != STATUS_SUCCESS) {
                                 vfree(buf);
-                                set_sense_type(chip, SCSI_LUN(srb),
+                                rts51x_set_sense_type(chip, SCSI_LUN(srb),
                                         SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR);
                                 TRACE_RET(chip, TRANSPORT_FAILED);
                         }
@@ -1163,7 +1163,7 @@ static int write_phy_register(struct scsi_cmnd *srb, struct rts51x_chip *chip)
                             rts51x_write_phy_register(chip, addr + i, buf[i]);
                         if (retval != STATUS_SUCCESS) {
                                 vfree(buf);
-                                set_sense_type(chip, SCSI_LUN(srb),
+                                rts51x_set_sense_type(chip, SCSI_LUN(srb),
                                                SENSE_TYPE_MEDIA_WRITE_ERR);
                                 TRACE_RET(chip, TRANSPORT_FAILED);
                         }
@@ -1181,15 +1181,15 @@ static int get_card_bus_width(struct scsi_cmnd *srb, struct rts51x_chip *chip)
         u8 card, bus_width;
 
         if (!check_card_ready(chip, lun)) {
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_NOT_PRESENT);
+                rts51x_set_sense_type(chip, lun, SENSE_TYPE_MEDIA_NOT_PRESENT);
                 TRACE_RET(chip, TRANSPORT_FAILED);
         }
 
-        card = get_lun_card(chip, lun);
+        card = rts51x_get_lun_card(chip, lun);
         if ((card == SD_CARD) || (card == MS_CARD)) {
                 bus_width = chip->card_bus_width[lun];
         } else {
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR);
+                rts51x_set_sense_type(chip, lun, SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR);
                 TRACE_RET(chip, TRANSPORT_FAILED);
         }
 
@@ -1211,7 +1211,7 @@ static int trace_msg_cmd(struct scsi_cmnd *srb, struct rts51x_chip *chip)
             ((2 + MSG_FUNC_LEN + MSG_FILE_LEN + TIME_VAL_LEN) * TRACE_ITEM_CNT);
 
         if ((scsi_bufflen(srb) < buf_len) || (scsi_sglist(srb) == NULL)) {
-                set_sense_type(chip, SCSI_LUN(srb),
+                rts51x_set_sense_type(chip, SCSI_LUN(srb),
                                SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR);
                 TRACE_RET(chip, TRANSPORT_FAILED);
         }
@@ -1251,7 +1251,7 @@ static int rw_mem_cmd_buf(struct scsi_cmnd *srb, struct rts51x_chip *chip)
         case ADD_BATCHCMD:
                 cmd_type = srb->cmnd[4];
                 if (cmd_type > 2) {
-                        set_sense_type(chip, lun,
+                        rts51x_set_sense_type(chip, lun,
                                        SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
                         TRACE_RET(chip, TRANSPORT_FAILED);
                 }
@@ -1274,13 +1274,13 @@ static int rw_mem_cmd_buf(struct scsi_cmnd *srb, struct rts51x_chip *chip)
                                                                           [9]);
                 retval = rts51x_send_cmd(chip, mode, 1000);
                 if (retval != STATUS_SUCCESS) {
-                        set_sense_type(chip, lun, SENSE_TYPE_MEDIA_WRITE_ERR);
+                        rts51x_set_sense_type(chip, lun, SENSE_TYPE_MEDIA_WRITE_ERR);
                         TRACE_RET(chip, TRANSPORT_FAILED);
                 }
                 if (mode & STAGE_R) {
                         retval = rts51x_get_rsp(chip, len, timeout);
                         if (retval != STATUS_SUCCESS) {
-                                set_sense_type(chip, lun,
+                                rts51x_set_sense_type(chip, lun,
                                         SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR);
                                 TRACE_RET(chip, TRANSPORT_FAILED);
                         }
@@ -1291,7 +1291,7 @@ static int rw_mem_cmd_buf(struct scsi_cmnd *srb, struct rts51x_chip *chip)
                 idx = srb->cmnd[4];
                 value = chip->rsp_buf[idx];
                 if (scsi_bufflen(srb) < 1) {
-                        set_sense_type(chip, lun,
+                        rts51x_set_sense_type(chip, lun,
                                        SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
                         TRACE_RET(chip, TRANSPORT_FAILED);
                 }
@@ -1300,12 +1300,12 @@ static int rw_mem_cmd_buf(struct scsi_cmnd *srb, struct rts51x_chip *chip)
                 break;
 
         default:
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
+                rts51x_set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
                 TRACE_RET(chip, TRANSPORT_FAILED);
         }
 
         if (retval != STATUS_SUCCESS) {
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_WRITE_ERR);
+                rts51x_set_sense_type(chip, lun, SENSE_TYPE_MEDIA_WRITE_ERR);
                 TRACE_RET(chip, TRANSPORT_FAILED);
         }
 
@@ -1357,7 +1357,7 @@ static int app_cmd(struct scsi_cmnd *srb, struct rts51x_chip *chip)
                 break;
 
         default:
-                set_sense_type(chip, SCSI_LUN(srb),
+                rts51x_set_sense_type(chip, SCSI_LUN(srb),
                                SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
                 TRACE_RET(chip, TRANSPORT_FAILED);
         }
@@ -1401,7 +1401,7 @@ static int vendor_cmnd(struct scsi_cmnd *srb, struct rts51x_chip *chip)
                 break;
 
         default:
-                set_sense_type(chip, SCSI_LUN(srb),
+                rts51x_set_sense_type(chip, SCSI_LUN(srb),
                                SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
                 TRACE_RET(chip, TRANSPORT_FAILED);
         }
@@ -1415,15 +1415,15 @@ static int ms_format_cmnd(struct scsi_cmnd *srb, struct rts51x_chip *chip)
         unsigned int lun = SCSI_LUN(srb);
         int retval, quick_format;
 
-        if (get_lun_card(chip, lun) != MS_CARD) {
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_LUN_NOT_SUPPORT);
+        if (rts51x_get_lun_card(chip, lun) != MS_CARD) {
+                rts51x_set_sense_type(chip, lun, SENSE_TYPE_MEDIA_LUN_NOT_SUPPORT);
                 TRACE_RET(chip, TRANSPORT_FAILED);
         }
 
         if ((srb->cmnd[3] != 0x4D) || (srb->cmnd[4] != 0x47)
             || (srb->cmnd[5] != 0x66) || (srb->cmnd[6] != 0x6D)
             || (srb->cmnd[7] != 0x74)) {
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
+                rts51x_set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
                 TRACE_RET(chip, TRANSPORT_FAILED);
         }
 
@@ -1433,26 +1433,26 @@ static int ms_format_cmnd(struct scsi_cmnd *srb, struct rts51x_chip *chip)
                 quick_format = 1;
 
         if (!(chip->card_ready & MS_CARD)) {
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_NOT_PRESENT);
+                rts51x_set_sense_type(chip, lun, SENSE_TYPE_MEDIA_NOT_PRESENT);
                 TRACE_RET(chip, TRANSPORT_FAILED);
         }
 
         if (chip->card_wp & MS_CARD) {
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_WRITE_PROTECT);
+                rts51x_set_sense_type(chip, lun, SENSE_TYPE_MEDIA_WRITE_PROTECT);
                 TRACE_RET(chip, TRANSPORT_FAILED);
         }
 
         if (!CHK_MSPRO(ms_card)) {
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_LUN_NOT_SUPPORT);
+                rts51x_set_sense_type(chip, lun, SENSE_TYPE_MEDIA_LUN_NOT_SUPPORT);
                 TRACE_RET(chip, TRANSPORT_FAILED);
         }
 
         rts51x_prepare_run(chip);
         RTS51X_SET_STAT(chip, STAT_RUN);
 
-        retval = mspro_format(srb, chip, MS_SHORT_DATA_LEN, quick_format);
+        retval = rts51x_mspro_format(srb, chip, MS_SHORT_DATA_LEN, quick_format);
         if (retval != STATUS_SUCCESS) {
-                set_sense_type(chip, lun, SENSE_TYPE_FORMAT_CMD_FAILED);
+                rts51x_set_sense_type(chip, lun, SENSE_TYPE_FORMAT_CMD_FAILED);
                 TRACE_RET(chip, TRANSPORT_FAILED);
         }
 
@@ -1471,18 +1471,18 @@ static int get_ms_information(struct scsi_cmnd *srb, struct rts51x_chip *chip)
         int i;
 
         if (!check_card_ready(chip, lun)) {
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_NOT_PRESENT);
+                rts51x_set_sense_type(chip, lun, SENSE_TYPE_MEDIA_NOT_PRESENT);
                 TRACE_RET(chip, TRANSPORT_FAILED);
         }
-        if ((get_lun_card(chip, lun) != MS_CARD)) {
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_LUN_NOT_SUPPORT);
+        if ((rts51x_get_lun_card(chip, lun) != MS_CARD)) {
+                rts51x_set_sense_type(chip, lun, SENSE_TYPE_MEDIA_LUN_NOT_SUPPORT);
                 TRACE_RET(chip, TRANSPORT_FAILED);
         }
 
         if ((srb->cmnd[2] != 0xB0) || (srb->cmnd[4] != 0x4D) ||
             (srb->cmnd[5] != 0x53) || (srb->cmnd[6] != 0x49) ||
             (srb->cmnd[7] != 0x44)) {
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
+                rts51x_set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
                 TRACE_RET(chip, TRANSPORT_FAILED);
         }
 
@@ -1490,7 +1490,7 @@ static int get_ms_information(struct scsi_cmnd *srb, struct rts51x_chip *chip)
         if ((CHK_MSXC(ms_card) && (dev_info_id == 0x10)) ||
             (!CHK_MSXC(ms_card) && (dev_info_id == 0x13)) ||
             !CHK_MSPRO(ms_card)) {
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
+                rts51x_set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
                 TRACE_RET(chip, TRANSPORT_FAILED);
         }
 
@@ -1576,44 +1576,44 @@ static int sd_extention_cmnd(struct scsi_cmnd *srb, struct rts51x_chip *chip)
         rts51x_prepare_run(chip);
         RTS51X_SET_STAT(chip, STAT_RUN);
 
-        sd_cleanup_work(chip);
+        rts51x_sd_cleanup_work(chip);
 
         if (!check_card_ready(chip, lun)) {
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_NOT_PRESENT);
+                rts51x_set_sense_type(chip, lun, SENSE_TYPE_MEDIA_NOT_PRESENT);
                 TRACE_RET(chip, TRANSPORT_FAILED);
         }
-        if ((get_lun_card(chip, lun) != SD_CARD)) {
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_LUN_NOT_SUPPORT);
+        if ((rts51x_get_lun_card(chip, lun) != SD_CARD)) {
+                rts51x_set_sense_type(chip, lun, SENSE_TYPE_MEDIA_LUN_NOT_SUPPORT);
                 TRACE_RET(chip, TRANSPORT_FAILED);
         }
 
         switch (srb->cmnd[0]) {
         case SD_PASS_THRU_MODE:
-                result = sd_pass_thru_mode(srb, chip);
+                result = rts51x_sd_pass_thru_mode(srb, chip);
                 break;
 
         case SD_EXECUTE_NO_DATA:
-                result = sd_execute_no_data(srb, chip);
+                result = rts51x_sd_execute_no_data(srb, chip);
                 break;
 
         case SD_EXECUTE_READ:
-                result = sd_execute_read_data(srb, chip);
+                result = rts51x_sd_execute_read_data(srb, chip);
                 break;
 
         case SD_EXECUTE_WRITE:
-                result = sd_execute_write_data(srb, chip);
+                result = rts51x_sd_execute_write_data(srb, chip);
                 break;
 
         case SD_GET_RSP:
-                result = sd_get_cmd_rsp(srb, chip);
+                result = rts51x_sd_get_cmd_rsp(srb, chip);
                 break;
 
         case SD_HW_RST:
-                result = sd_hw_rst(srb, chip);
+                result = rts51x_sd_hw_rst(srb, chip);
                 break;
 
         default:
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
+                rts51x_set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
                 TRACE_RET(chip, TRANSPORT_FAILED);
         }
 
@@ -1632,24 +1632,24 @@ static int mg_report_key(struct scsi_cmnd *srb, struct rts51x_chip *chip)
         rts51x_prepare_run(chip);
         RTS51X_SET_STAT(chip, STAT_RUN);
 
-        ms_cleanup_work(chip);
+        rts51x_ms_cleanup_work(chip);
 
         if (!check_card_ready(chip, lun)) {
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_NOT_PRESENT);
+                rts51x_set_sense_type(chip, lun, SENSE_TYPE_MEDIA_NOT_PRESENT);
                 TRACE_RET(chip, TRANSPORT_FAILED);
         }
-        if ((get_lun_card(chip, lun) != MS_CARD)) {
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_LUN_NOT_SUPPORT);
+        if ((rts51x_get_lun_card(chip, lun) != MS_CARD)) {
+                rts51x_set_sense_type(chip, lun, SENSE_TYPE_MEDIA_LUN_NOT_SUPPORT);
                 TRACE_RET(chip, TRANSPORT_FAILED);
         }
 
         if (srb->cmnd[7] != KC_MG_R_PRO) {
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
+                rts51x_set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
                 TRACE_RET(chip, TRANSPORT_FAILED);
         }
 
         if (!CHK_MSPRO(ms_card)) {
-                set_sense_type(chip, lun, SENSE_TYPE_MG_INCOMPATIBLE_MEDIUM);
+                rts51x_set_sense_type(chip, lun, SENSE_TYPE_MG_INCOMPATIBLE_MEDIUM);
                 TRACE_RET(chip, TRANSPORT_FAILED);
         }
 
@@ -1659,11 +1659,11 @@ static int mg_report_key(struct scsi_cmnd *srb, struct rts51x_chip *chip)
         case KF_GET_LOC_EKB:
                 if ((scsi_bufflen(srb) == 0x41C) &&
                     (srb->cmnd[8] == 0x04) && (srb->cmnd[9] == 0x1C)) {
-                        retval = mg_get_local_EKB(srb, chip);
+                        retval = rts51x_mg_get_local_EKB(srb, chip);
                         if (retval != STATUS_SUCCESS)
                                 TRACE_RET(chip, TRANSPORT_FAILED);
                 } else {
-                        set_sense_type(chip, lun,
+                        rts51x_set_sense_type(chip, lun,
                                        SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
                         TRACE_RET(chip, TRANSPORT_FAILED);
                 }
@@ -1672,11 +1672,11 @@ static int mg_report_key(struct scsi_cmnd *srb, struct rts51x_chip *chip)
         case KF_RSP_CHG:
                 if ((scsi_bufflen(srb) == 0x24) &&
                     (srb->cmnd[8] == 0x00) && (srb->cmnd[9] == 0x24)) {
-                        retval = mg_get_rsp_chg(srb, chip);
+                        retval = rts51x_mg_get_rsp_chg(srb, chip);
                         if (retval != STATUS_SUCCESS)
                                 TRACE_RET(chip, TRANSPORT_FAILED);
                 } else {
-                        set_sense_type(chip, lun,
+                        rts51x_set_sense_type(chip, lun,
                                        SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
                         TRACE_RET(chip, TRANSPORT_FAILED);
                 }
@@ -1690,18 +1690,18 @@ static int mg_report_key(struct scsi_cmnd *srb, struct rts51x_chip *chip)
                     (srb->cmnd[2] == 0x00) &&
                     (srb->cmnd[3] == 0x00) &&
                     (srb->cmnd[4] == 0x00) && (srb->cmnd[5] < 32)) {
-                        retval = mg_get_ICV(srb, chip);
+                        retval = rts51x_mg_get_ICV(srb, chip);
                         if (retval != STATUS_SUCCESS)
                                 TRACE_RET(chip, TRANSPORT_FAILED);
                 } else {
-                        set_sense_type(chip, lun,
+                        rts51x_set_sense_type(chip, lun,
                                        SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
                         TRACE_RET(chip, TRANSPORT_FAILED);
                 }
                 break;
 
         default:
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
+                rts51x_set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
                 TRACE_RET(chip, TRANSPORT_FAILED);
         }
 
@@ -1719,28 +1719,28 @@ static int mg_send_key(struct scsi_cmnd *srb, struct rts51x_chip *chip)
         rts51x_prepare_run(chip);
         RTS51X_SET_STAT(chip, STAT_RUN);
 
-        ms_cleanup_work(chip);
+        rts51x_ms_cleanup_work(chip);
 
         if (!check_card_ready(chip, lun)) {
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_NOT_PRESENT);
+                rts51x_set_sense_type(chip, lun, SENSE_TYPE_MEDIA_NOT_PRESENT);
                 TRACE_RET(chip, TRANSPORT_FAILED);
         }
         if (check_card_wp(chip, lun)) {
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_WRITE_PROTECT);
+                rts51x_set_sense_type(chip, lun, SENSE_TYPE_MEDIA_WRITE_PROTECT);
                 TRACE_RET(chip, TRANSPORT_FAILED);
         }
-        if ((get_lun_card(chip, lun) != MS_CARD)) {
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_LUN_NOT_SUPPORT);
+        if ((rts51x_get_lun_card(chip, lun) != MS_CARD)) {
+                rts51x_set_sense_type(chip, lun, SENSE_TYPE_MEDIA_LUN_NOT_SUPPORT);
                 TRACE_RET(chip, TRANSPORT_FAILED);
         }
 
         if (srb->cmnd[7] != KC_MG_R_PRO) {
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
+                rts51x_set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
                 TRACE_RET(chip, TRANSPORT_FAILED);
         }
 
         if (!CHK_MSPRO(ms_card)) {
-                set_sense_type(chip, lun, SENSE_TYPE_MG_INCOMPATIBLE_MEDIUM);
+                rts51x_set_sense_type(chip, lun, SENSE_TYPE_MG_INCOMPATIBLE_MEDIUM);
                 TRACE_RET(chip, TRANSPORT_FAILED);
         }
 
@@ -1750,11 +1750,11 @@ static int mg_send_key(struct scsi_cmnd *srb, struct rts51x_chip *chip)
         case KF_SET_LEAF_ID:
                 if ((scsi_bufflen(srb) == 0x0C) &&
                     (srb->cmnd[8] == 0x00) && (srb->cmnd[9] == 0x0C)) {
-                        retval = mg_set_leaf_id(srb, chip);
+                        retval = rts51x_mg_set_leaf_id(srb, chip);
                         if (retval != STATUS_SUCCESS)
                                 TRACE_RET(chip, TRANSPORT_FAILED);
                 } else {
-                        set_sense_type(chip, lun,
+                        rts51x_set_sense_type(chip, lun,
                                        SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
                         TRACE_RET(chip, TRANSPORT_FAILED);
                 }
@@ -1763,11 +1763,11 @@ static int mg_send_key(struct scsi_cmnd *srb, struct rts51x_chip *chip)
         case KF_CHG_HOST:
                 if ((scsi_bufflen(srb) == 0x0C) &&
                     (srb->cmnd[8] == 0x00) && (srb->cmnd[9] == 0x0C)) {
-                        retval = mg_chg(srb, chip);
+                        retval = rts51x_mg_chg(srb, chip);
                         if (retval != STATUS_SUCCESS)
                                 TRACE_RET(chip, TRANSPORT_FAILED);
                 } else {
-                        set_sense_type(chip, lun,
+                        rts51x_set_sense_type(chip, lun,
                                        SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
                         TRACE_RET(chip, TRANSPORT_FAILED);
                 }
@@ -1776,11 +1776,11 @@ static int mg_send_key(struct scsi_cmnd *srb, struct rts51x_chip *chip)
         case KF_RSP_HOST:
                 if ((scsi_bufflen(srb) == 0x0C) &&
                     (srb->cmnd[8] == 0x00) && (srb->cmnd[9] == 0x0C)) {
-                        retval = mg_rsp(srb, chip);
+                        retval = rts51x_mg_rsp(srb, chip);
                         if (retval != STATUS_SUCCESS)
                                 TRACE_RET(chip, TRANSPORT_FAILED);
                 } else {
-                        set_sense_type(chip, lun,
+                        rts51x_set_sense_type(chip, lun,
                                        SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
                         TRACE_RET(chip, TRANSPORT_FAILED);
                 }
@@ -1794,18 +1794,18 @@ static int mg_send_key(struct scsi_cmnd *srb, struct rts51x_chip *chip)
                     (srb->cmnd[2] == 0x00) &&
                     (srb->cmnd[3] == 0x00) &&
                     (srb->cmnd[4] == 0x00) && (srb->cmnd[5] < 32)) {
-                        retval = mg_set_ICV(srb, chip);
+                        retval = rts51x_mg_set_ICV(srb, chip);
                         if (retval != STATUS_SUCCESS)
                                 TRACE_RET(chip, TRANSPORT_FAILED);
                 } else {
-                        set_sense_type(chip, lun,
+                        rts51x_set_sense_type(chip, lun,
                                        SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
                         TRACE_RET(chip, TRANSPORT_FAILED);
                 }
                 break;
 
         default:
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
+                rts51x_set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
                 TRACE_RET(chip, TRANSPORT_FAILED);
         }
 
@@ -1820,12 +1820,12 @@ int rts51x_scsi_handler(struct scsi_cmnd *srb, struct rts51x_chip *chip)
         unsigned int lun = SCSI_LUN(srb);
         int result = TRANSPORT_GOOD;
 
-        if ((get_lun_card(chip, lun) == MS_CARD) &&
+        if ((rts51x_get_lun_card(chip, lun) == MS_CARD) &&
             (ms_card->format_status == FORMAT_IN_PROGRESS)) {
                 if ((srb->cmnd[0] != REQUEST_SENSE)
                     && (srb->cmnd[0] != INQUIRY)) {
                         /* Logical Unit Not Ready Format in Progress */
-                        set_sense_data(chip, lun, CUR_ERR, 0x02, 0, 0x04, 0x04,
+                        rts51x_set_sense_data(chip, lun, CUR_ERR, 0x02, 0, 0x04, 0x04,
                                        0, (u16) (ms_card->progress));
                         TRACE_RET(chip, TRANSPORT_FAILED);
                 }
@@ -1908,7 +1908,7 @@ int rts51x_scsi_handler(struct scsi_cmnd *srb, struct rts51x_chip *chip)
                 break;
 
         default:
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
+                rts51x_set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
                 result = TRANSPORT_FAILED;
         }
 
diff --git a/drivers/staging/rts5139/rts51x_scsi.h b/drivers/staging/rts5139/rts51x_scsi.h
index 9042bc98a9a0..cdfe550371ce 100644
--- a/drivers/staging/rts5139/rts51x_scsi.h
+++ b/drivers/staging/rts5139/rts51x_scsi.h
@@ -133,9 +133,9 @@ struct rts51x_chip;
 
 #define SCSI                    0x00    /* Interface ID                     */
 
-void scsi_show_command(struct scsi_cmnd *srb);
-void set_sense_type(struct rts51x_chip *chip, unsigned int lun, int sense_type);
-void set_sense_data(struct rts51x_chip *chip, unsigned int lun, u8 err_code,
+void rts51x_scsi_show_command(struct scsi_cmnd *srb);
+void rts51x_set_sense_type(struct rts51x_chip *chip, unsigned int lun, int sense_type);
+void rts51x_set_sense_data(struct rts51x_chip *chip, unsigned int lun, u8 err_code,
                     u8 sense_key, u32 info, u8 asc, u8 ascq, u8 sns_key_info0,
                     u16 sns_key_info1);
 
diff --git a/drivers/staging/rts5139/sd.c b/drivers/staging/rts5139/sd.c
index b739f26f78cc..4283b0917f24 100644
--- a/drivers/staging/rts5139/sd.c
+++ b/drivers/staging/rts5139/sd.c
@@ -680,7 +680,7 @@ static int sd_set_init_para(struct rts51x_chip *chip)
         return STATUS_SUCCESS;
 }
 
-int sd_select_card(struct rts51x_chip *chip, int select)
+int rts51x_sd_select_card(struct rts51x_chip *chip, int select)
 {
         struct sd_info *sd_card = &(chip->sd_card);
         int retval;
@@ -1747,7 +1747,7 @@ static int mmc_ddr_tuning(struct rts51x_chip *chip)
         return STATUS_SUCCESS;
 }
 
-int sd_switch_clock(struct rts51x_chip *chip)
+int rts51x_sd_switch_clock(struct rts51x_chip *chip)
 {
         struct sd_info *sd_card = &(chip->sd_card);
         int retval;
@@ -1913,7 +1913,7 @@ static int sd_init_power(struct rts51x_chip *chip)
 #endif
 
                 /* Power on card */
-                retval = card_power_on(chip, SD_CARD);
+                retval = rts51x_card_power_on(chip, SD_CARD);
                 if (retval != STATUS_SUCCESS)
                         TRACE_RET(chip, retval);
 
@@ -2139,7 +2139,7 @@ RTY_CMD55:
         if (retval != STATUS_SUCCESS)
                 TRACE_RET(chip, retval);
         /* Select SD card */
-        retval = sd_select_card(chip, 1);
+        retval = rts51x_sd_select_card(chip, 1);
         if (retval != STATUS_SUCCESS)
                 TRACE_RET(chip, retval);
 
@@ -2656,7 +2656,7 @@ RTY_MMC_RST:
         spec_ver = (sd_card->raw_csd[0] & 0x3C) >> 2;
 
         /* Select MMC card */
-        retval = sd_select_card(chip, 1);
+        retval = rts51x_sd_select_card(chip, 1);
         if (retval != STATUS_SUCCESS)
                 TRACE_RET(chip, retval);
 
@@ -2748,7 +2748,7 @@ RTY_MMC_RST:
         return STATUS_SUCCESS;
 }
 
-int reset_sd_card(struct rts51x_chip *chip)
+int rts51x_reset_sd_card(struct rts51x_chip *chip)
 {
         struct sd_info *sd_card = &(chip->sd_card);
         int retval;
@@ -2764,7 +2764,7 @@ int reset_sd_card(struct rts51x_chip *chip)
         sd_card->sd_switch_fail = 0;
 
         sd_clear_reset_fail(chip);
-        enable_card_clock(chip, SD_CARD);
+        rts51x_enable_card_clock(chip, SD_CARD);
 
         sd_init_power(chip);
 
@@ -2891,7 +2891,7 @@ static void sd_stop_seq_mode(struct rts51x_chip *chip)
         int retval;
 
         if (sd_card->seq_mode) {
-                retval = sd_switch_clock(chip);
+                retval = rts51x_sd_switch_clock(chip);
                 if (retval != STATUS_SUCCESS)
                         return;
 
@@ -2923,14 +2923,14 @@ static inline int sd_auto_tune_clock(struct rts51x_chip *chip)
                         sd_card->sd_clock = CLK_50;
         }
 
-        retval = sd_switch_clock(chip);
+        retval = rts51x_sd_switch_clock(chip);
         if (retval != STATUS_SUCCESS)
                 TRACE_RET(chip, retval);
 
         return STATUS_SUCCESS;
 }
 
-int sd_rw(struct scsi_cmnd *srb, struct rts51x_chip *chip, u32 start_sector,
+int rts51x_sd_rw(struct scsi_cmnd *srb, struct rts51x_chip *chip, u32 start_sector,
           u16 sector_cnt)
 {
         struct sd_info *sd_card = &(chip->sd_card);
@@ -2947,11 +2947,11 @@ int sd_rw(struct scsi_cmnd *srb, struct rts51x_chip *chip, u32 start_sector,
         else
                 data_addr = start_sector;
 
-        RTS51X_DEBUGP("sd_rw, data_addr = 0x%x\n", data_addr);
+        RTS51X_DEBUGP("rts51x_sd_rw, data_addr = 0x%x\n", data_addr);
 
         sd_clr_err_code(chip);
 
-        retval = sd_switch_clock(chip);
+        retval = rts51x_sd_switch_clock(chip);
         if (retval != STATUS_SUCCESS)
                 TRACE_RET(chip, retval);
 
@@ -3020,7 +3020,7 @@ int sd_rw(struct scsi_cmnd *srb, struct rts51x_chip *chip, u32 start_sector,
                                SD_NO_WAIT_BUSY_END | SD_NO_CHECK_CRC7 |
                                SD_RSP_LEN_0);
 
-                trans_dma_enable(srb->sc_data_direction, chip, sector_cnt * 512,
+                rts51x_trans_dma_enable(srb->sc_data_direction, chip, sector_cnt * 512,
                                  DMA_512);
 
                 if (srb->sc_data_direction == DMA_FROM_DEVICE) {
@@ -3058,7 +3058,7 @@ int sd_rw(struct scsi_cmnd *srb, struct rts51x_chip *chip, u32 start_sector,
                                        SD_NO_WAIT_BUSY_END | SD_CHECK_CRC7 |
                                        SD_RSP_LEN_6);
 
-                        trans_dma_enable(srb->sc_data_direction, chip,
+                        rts51x_trans_dma_enable(srb->sc_data_direction, chip,
                                          sector_cnt * 512, DMA_512);
 
                         rts51x_add_cmd(chip, WRITE_REG_CMD, SD_TRANSFER, 0xFF,
@@ -3099,7 +3099,7 @@ int sd_rw(struct scsi_cmnd *srb, struct rts51x_chip *chip, u32 start_sector,
                                        SD_NO_WAIT_BUSY_END | SD_NO_CHECK_CRC7 |
                                        SD_RSP_LEN_0);
 
-                        trans_dma_enable(srb->sc_data_direction, chip,
+                        rts51x_trans_dma_enable(srb->sc_data_direction, chip,
                                          sector_cnt * 512, DMA_512);
 
                         rts51x_add_cmd(chip, WRITE_REG_CMD, SD_TRANSFER, 0xFF,
@@ -3168,7 +3168,7 @@ int sd_rw(struct scsi_cmnd *srb, struct rts51x_chip *chip, u32 start_sector,
         return STATUS_SUCCESS;
 }
 
-void sd_cleanup_work(struct rts51x_chip *chip)
+void rts51x_sd_cleanup_work(struct rts51x_chip *chip)
 {
         struct sd_info *sd_card = &(chip->sd_card);
 
@@ -3220,12 +3220,12 @@ static int sd_power_off_card3v3(struct rts51x_chip *chip)
         return STATUS_SUCCESS;
 }
 
-int release_sd_card(struct rts51x_chip *chip)
+int rts51x_release_sd_card(struct rts51x_chip *chip)
 {
         struct sd_info *sd_card = &(chip->sd_card);
         int retval;
 
-        RTS51X_DEBUGP("release_sd_card\n");
+        RTS51X_DEBUGP("rts51x_release_sd_card\n");
 
         chip->card_ready &= ~SD_CARD;
         chip->card_fail &= ~SD_CARD;
diff --git a/drivers/staging/rts5139/sd.h b/drivers/staging/rts5139/sd.h
index de155d8e682d..7dd943f54c74 100644
--- a/drivers/staging/rts5139/sd.h
+++ b/drivers/staging/rts5139/sd.h
@@ -256,13 +256,13 @@ struct timing_phase_path {
         int len;
 };
 
-int sd_select_card(struct rts51x_chip *chip, int select);
-int reset_sd_card(struct rts51x_chip *chip);
-int sd_switch_clock(struct rts51x_chip *chip);
-int sd_rw(struct scsi_cmnd *srb, struct rts51x_chip *chip, u32 start_sector,
+int rts51x_sd_select_card(struct rts51x_chip *chip, int select);
+int rts51x_reset_sd_card(struct rts51x_chip *chip);
+int rts51x_sd_switch_clock(struct rts51x_chip *chip);
+int rts51x_sd_rw(struct scsi_cmnd *srb, struct rts51x_chip *chip, u32 start_sector,
           u16 sector_cnt);
-void sd_cleanup_work(struct rts51x_chip *chip);
-int release_sd_card(struct rts51x_chip *chip);
+void rts51x_sd_cleanup_work(struct rts51x_chip *chip);
+int rts51x_release_sd_card(struct rts51x_chip *chip);
 
 #ifdef SUPPORT_CPRM
 extern int reset_sd(struct rts51x_chip *chip);
diff --git a/drivers/staging/rts5139/sd_cprm.c b/drivers/staging/rts5139/sd_cprm.c
index 0167f7f35c20..d4689839e15a 100644
--- a/drivers/staging/rts5139/sd_cprm.c
+++ b/drivers/staging/rts5139/sd_cprm.c
@@ -269,7 +269,7 @@ static int ext_sd_get_rsp(struct rts51x_chip *chip, int len,
         return STATUS_SUCCESS;
 }
 
-int ext_sd_execute_no_data(struct rts51x_chip *chip, unsigned int lun,
+int ext_rts51x_sd_execute_no_data(struct rts51x_chip *chip, unsigned int lun,
                            u8 cmd_idx, u8 standby, u8 acmd, u8 rsp_code,
                            u32 arg)
 {
@@ -277,30 +277,30 @@ int ext_sd_execute_no_data(struct rts51x_chip *chip, unsigned int lun,
         int retval, rsp_len;
         u8 rsp_type;
 
-        retval = sd_switch_clock(chip);
+        retval = rts51x_sd_switch_clock(chip);
         if (retval != STATUS_SUCCESS)
                 TRACE_RET(chip, TRANSPORT_FAILED);
 
         if (sd_card->pre_cmd_err) {
                 sd_card->pre_cmd_err = 0;
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_CHANGE);
+                rts51x_set_sense_type(chip, lun, SENSE_TYPE_MEDIA_CHANGE);
                 TRACE_RET(chip, TRANSPORT_FAILED);
         }
         retval = get_rsp_type(rsp_code, &rsp_type, &rsp_len);
         if (retval != STATUS_SUCCESS) {
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
+                rts51x_set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
                 TRACE_RET(chip, TRANSPORT_FAILED);
         }
         sd_card->last_rsp_type = rsp_type;
 
-        retval = sd_switch_clock(chip);
+        retval = rts51x_sd_switch_clock(chip);
         if (retval != STATUS_SUCCESS)
                 TRACE_RET(chip, TRANSPORT_FAILED);
         /* Set H/W SD/MMC Bus Width */
         rts51x_write_register(chip, SD_CFG1, 0x03, SD_BUS_WIDTH_4);
 
         if (standby) {
-                retval = sd_select_card(chip, 0);
+                retval = rts51x_sd_select_card(chip, 0);
                 if (retval != STATUS_SUCCESS)
                         TRACE_GOTO(chip, SD_Execute_Cmd_Failed);
         }
@@ -319,7 +319,7 @@ int ext_sd_execute_no_data(struct rts51x_chip *chip, unsigned int lun,
                 TRACE_GOTO(chip, SD_Execute_Cmd_Failed);
 
         if (standby) {
-                retval = sd_select_card(chip, 1);
+                retval = rts51x_sd_select_card(chip, 1);
                 if (retval != STATUS_SUCCESS)
                         TRACE_GOTO(chip, SD_Execute_Cmd_Failed);
         }
@@ -328,16 +328,16 @@ int ext_sd_execute_no_data(struct rts51x_chip *chip, unsigned int lun,
 
 SD_Execute_Cmd_Failed:
         sd_card->pre_cmd_err = 1;
-        set_sense_type(chip, lun, SENSE_TYPE_NO_SENSE);
-        release_sd_card(chip);
-        do_reset_sd_card(chip);
+        rts51x_set_sense_type(chip, lun, SENSE_TYPE_NO_SENSE);
+        rts51x_release_sd_card(chip);
+        rts51x_do_rts51x_reset_sd_card(chip);
         if (!(chip->card_ready & SD_CARD))
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_NOT_PRESENT);
+                rts51x_set_sense_type(chip, lun, SENSE_TYPE_MEDIA_NOT_PRESENT);
 
         TRACE_RET(chip, TRANSPORT_FAILED);
 }
 
-int ext_sd_execute_read_data(struct rts51x_chip *chip, unsigned int lun,
+int ext_rts51x_sd_execute_read_data(struct rts51x_chip *chip, unsigned int lun,
                              u8 cmd_idx, u8 cmd12, u8 standby,
                              u8 acmd, u8 rsp_code, u32 arg, u32 data_len,
                              void *data_buf, unsigned int buf_len, int use_sg)
@@ -349,21 +349,21 @@ int ext_sd_execute_read_data(struct rts51x_chip *chip, unsigned int lun,
 
         if (sd_card->pre_cmd_err) {
                 sd_card->pre_cmd_err = 0;
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_CHANGE);
+                rts51x_set_sense_type(chip, lun, SENSE_TYPE_MEDIA_CHANGE);
                 TRACE_RET(chip, TRANSPORT_FAILED);
         }
 
-        retval = sd_switch_clock(chip);
+        retval = rts51x_sd_switch_clock(chip);
         if (retval != STATUS_SUCCESS)
                 TRACE_RET(chip, STATUS_FAIL);
         retval = get_rsp_type(rsp_code, &rsp_type, &rsp_len);
         if (retval != STATUS_SUCCESS) {
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
+                rts51x_set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
                 TRACE_RET(chip, TRANSPORT_FAILED);
         }
         sd_card->last_rsp_type = rsp_type;
 
-        retval = sd_switch_clock(chip);
+        retval = rts51x_sd_switch_clock(chip);
         if (retval != STATUS_SUCCESS)
                 TRACE_RET(chip, TRANSPORT_FAILED);
         bus_width = SD_BUS_WIDTH_4;
@@ -376,7 +376,7 @@ int ext_sd_execute_read_data(struct rts51x_chip *chip, unsigned int lun,
         }
 
         if (standby) {
-                retval = sd_select_card(chip, 0);
+                retval = rts51x_sd_select_card(chip, 0);
                 if (retval != STATUS_SUCCESS)
                         TRACE_GOTO(chip, SD_Execute_Read_Cmd_Failed);
         }
@@ -448,7 +448,7 @@ int ext_sd_execute_read_data(struct rts51x_chip *chip, unsigned int lun,
                 rts51x_add_cmd(chip, WRITE_REG_CMD, SD_CMD4, 0xFF, (u8) arg);
                 rts51x_add_cmd(chip, WRITE_REG_CMD, SD_CFG1, 0x03, bus_width);
                 rts51x_add_cmd(chip, WRITE_REG_CMD, SD_CFG2, 0xFF, rsp_type);
-                trans_dma_enable(DMA_FROM_DEVICE, chip, data_len, DMA_512);
+                rts51x_trans_dma_enable(DMA_FROM_DEVICE, chip, data_len, DMA_512);
                 rts51x_add_cmd(chip, WRITE_REG_CMD, SD_TRANSFER, 0xFF,
                                SD_TM_AUTO_READ_2 | SD_TRANSFER_START);
                 rts51x_add_cmd(chip, CHECK_REG_CMD, SD_TRANSFER,
@@ -490,7 +490,7 @@ int ext_sd_execute_read_data(struct rts51x_chip *chip, unsigned int lun,
                 TRACE_GOTO(chip, SD_Execute_Read_Cmd_Failed);
 
         if (standby) {
-                retval = sd_select_card(chip, 1);
+                retval = rts51x_sd_select_card(chip, 1);
                 if (retval != STATUS_SUCCESS)
                         TRACE_GOTO(chip, SD_Execute_Read_Cmd_Failed);
         }
@@ -531,18 +531,18 @@ int ext_sd_execute_read_data(struct rts51x_chip *chip, unsigned int lun,
 
 SD_Execute_Read_Cmd_Failed:
         sd_card->pre_cmd_err = 1;
-        set_sense_type(chip, lun, SENSE_TYPE_NO_SENSE);
+        rts51x_set_sense_type(chip, lun, SENSE_TYPE_NO_SENSE);
         if (read_err)
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR);
-        release_sd_card(chip);
-        do_reset_sd_card(chip);
+                rts51x_set_sense_type(chip, lun, SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR);
+        rts51x_release_sd_card(chip);
+        rts51x_do_rts51x_reset_sd_card(chip);
         if (!(chip->card_ready & SD_CARD))
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_NOT_PRESENT);
+                rts51x_set_sense_type(chip, lun, SENSE_TYPE_MEDIA_NOT_PRESENT);
 
         TRACE_RET(chip, TRANSPORT_FAILED);
 }
 
-int ext_sd_execute_write_data(struct rts51x_chip *chip, unsigned int lun,
+int ext_rts51x_sd_execute_write_data(struct rts51x_chip *chip, unsigned int lun,
                               u8 cmd_idx, u8 cmd12, u8 standby, u8 acmd,
                               u8 rsp_code, u32 arg, u32 data_len,
                               void *data_buf, unsigned int buf_len, int use_sg)
@@ -555,22 +555,22 @@ int ext_sd_execute_write_data(struct rts51x_chip *chip, unsigned int lun,
 
         if (sd_card->pre_cmd_err) {
                 sd_card->pre_cmd_err = 0;
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_CHANGE);
+                rts51x_set_sense_type(chip, lun, SENSE_TYPE_MEDIA_CHANGE);
                 TRACE_RET(chip, TRANSPORT_FAILED);
         }
 
-        retval = sd_switch_clock(chip);
+        retval = rts51x_sd_switch_clock(chip);
         if (retval != STATUS_SUCCESS)
                 TRACE_RET(chip, STATUS_FAIL);
 
         retval = get_rsp_type(rsp_code, &rsp_type, &rsp_len);
         if (retval != STATUS_SUCCESS) {
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
+                rts51x_set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
                 TRACE_RET(chip, TRANSPORT_FAILED);
         }
         sd_card->last_rsp_type = rsp_type;
 
-        retval = sd_switch_clock(chip);
+        retval = rts51x_sd_switch_clock(chip);
         if (retval != STATUS_SUCCESS)
                 TRACE_RET(chip, TRANSPORT_FAILED);
         rts51x_write_register(chip, SD_CFG1, 0x03, SD_BUS_WIDTH_4);
@@ -583,7 +583,7 @@ int ext_sd_execute_write_data(struct rts51x_chip *chip, unsigned int lun,
         }
 
         if (standby) {
-                retval = sd_select_card(chip, 0);
+                retval = rts51x_sd_select_card(chip, 0);
                 if (retval != STATUS_SUCCESS)
                         TRACE_GOTO(chip, SD_Execute_Write_Cmd_Failed);
         }
@@ -690,7 +690,7 @@ int ext_sd_execute_write_data(struct rts51x_chip *chip, unsigned int lun,
                 rts51x_add_cmd(chip, WRITE_REG_CMD, SD_BLOCK_CNT_L,
                                0xFF, (u8) ((data_len & 0x0001FE00) >> 9));
 
-                trans_dma_enable(DMA_TO_DEVICE, chip, data_len, DMA_512);
+                rts51x_trans_dma_enable(DMA_TO_DEVICE, chip, data_len, DMA_512);
 
                 rts51x_add_cmd(chip, WRITE_REG_CMD, SD_TRANSFER, 0xFF,
                                SD_TM_AUTO_WRITE_3 | SD_TRANSFER_START);
@@ -724,7 +724,7 @@ int ext_sd_execute_write_data(struct rts51x_chip *chip, unsigned int lun,
         }
 
         if (standby) {
-                retval = sd_select_card(chip, 1);
+                retval = rts51x_sd_select_card(chip, 1);
                 if (retval != STATUS_SUCCESS)
                         TRACE_GOTO(chip, SD_Execute_Write_Cmd_Failed);
         }
@@ -767,18 +767,18 @@ int ext_sd_execute_write_data(struct rts51x_chip *chip, unsigned int lun,
 
 SD_Execute_Write_Cmd_Failed:
         sd_card->pre_cmd_err = 1;
-        set_sense_type(chip, lun, SENSE_TYPE_NO_SENSE);
+        rts51x_set_sense_type(chip, lun, SENSE_TYPE_NO_SENSE);
         if (write_err)
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_WRITE_ERR);
-        release_sd_card(chip);
-        do_reset_sd_card(chip);
+                rts51x_set_sense_type(chip, lun, SENSE_TYPE_MEDIA_WRITE_ERR);
+        rts51x_release_sd_card(chip);
+        rts51x_do_rts51x_reset_sd_card(chip);
         if (!(chip->card_ready & SD_CARD))
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_NOT_PRESENT);
+                rts51x_set_sense_type(chip, lun, SENSE_TYPE_MEDIA_NOT_PRESENT);
 
         TRACE_RET(chip, TRANSPORT_FAILED);
 }
 
-int sd_pass_thru_mode(struct scsi_cmnd *srb, struct rts51x_chip *chip)
+int rts51x_sd_pass_thru_mode(struct scsi_cmnd *srb, struct rts51x_chip *chip)
 {
         struct sd_info *sd_card = &(chip->sd_card);
         unsigned int lun = SCSI_LUN(srb);
@@ -808,7 +808,7 @@ int sd_pass_thru_mode(struct scsi_cmnd *srb, struct rts51x_chip *chip)
 
         if (!(CHK_BIT(chip->lun_mc, lun))) {
                 SET_BIT(chip->lun_mc, lun);
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_CHANGE);
+                rts51x_set_sense_type(chip, lun, SENSE_TYPE_MEDIA_CHANGE);
                 TRACE_RET(chip, TRANSPORT_FAILED);
         }
 
@@ -816,7 +816,7 @@ int sd_pass_thru_mode(struct scsi_cmnd *srb, struct rts51x_chip *chip)
             || (0x20 != srb->cmnd[4]) || (0x43 != srb->cmnd[5])
             || (0x61 != srb->cmnd[6]) || (0x72 != srb->cmnd[7])
             || (0x64 != srb->cmnd[8])) {
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
+                rts51x_set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
                 TRACE_RET(chip, TRANSPORT_FAILED);
         }
 
@@ -830,7 +830,7 @@ int sd_pass_thru_mode(struct scsi_cmnd *srb, struct rts51x_chip *chip)
                 break;
 
         default:
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
+                rts51x_set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
                 TRACE_RET(chip, TRANSPORT_FAILED);
         }
 
@@ -850,7 +850,7 @@ int sd_pass_thru_mode(struct scsi_cmnd *srb, struct rts51x_chip *chip)
         return TRANSPORT_GOOD;
 }
 
-int sd_execute_no_data(struct scsi_cmnd *srb, struct rts51x_chip *chip)
+int rts51x_sd_execute_no_data(struct scsi_cmnd *srb, struct rts51x_chip *chip)
 {
         struct sd_info *sd_card = &(chip->sd_card);
         unsigned int lun = SCSI_LUN(srb);
@@ -860,7 +860,7 @@ int sd_execute_no_data(struct scsi_cmnd *srb, struct rts51x_chip *chip)
         u32 arg;
 
         if (!sd_card->sd_pass_thru_en) {
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
+                rts51x_set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
                 TRACE_RET(chip, TRANSPORT_FAILED);
         }
 
@@ -876,13 +876,13 @@ int sd_execute_no_data(struct scsi_cmnd *srb, struct rts51x_chip *chip)
         rsp_code = srb->cmnd[10];
 
         retval =
-            ext_sd_execute_no_data(chip, lun, cmd_idx, standby, acmd, rsp_code,
+            ext_rts51x_sd_execute_no_data(chip, lun, cmd_idx, standby, acmd, rsp_code,
                                    arg);
         scsi_set_resid(srb, 0);
         return retval;
 }
 
-int sd_execute_read_data(struct scsi_cmnd *srb, struct rts51x_chip *chip)
+int rts51x_sd_execute_read_data(struct scsi_cmnd *srb, struct rts51x_chip *chip)
 {
         struct sd_info *sd_card = &(chip->sd_card);
         int retval;
@@ -891,7 +891,7 @@ int sd_execute_read_data(struct scsi_cmnd *srb, struct rts51x_chip *chip)
         u32 arg, data_len;
 
         if (!sd_card->sd_pass_thru_en) {
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
+                rts51x_set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
                 TRACE_RET(chip, TRANSPORT_FAILED);
         }
 
@@ -912,7 +912,7 @@ int sd_execute_read_data(struct scsi_cmnd *srb, struct rts51x_chip *chip)
         rsp_code = srb->cmnd[10];
 
         retval =
-            ext_sd_execute_read_data(chip, lun, cmd_idx, send_cmd12, standby,
+            ext_rts51x_sd_execute_read_data(chip, lun, cmd_idx, send_cmd12, standby,
                                      acmd, rsp_code, arg, data_len,
                                      scsi_sglist(srb), scsi_bufflen(srb),
                                      scsi_sg_count(srb));
@@ -920,7 +920,7 @@ int sd_execute_read_data(struct scsi_cmnd *srb, struct rts51x_chip *chip)
         return retval;
 }
 
-int sd_execute_write_data(struct scsi_cmnd *srb, struct rts51x_chip *chip)
+int rts51x_sd_execute_write_data(struct scsi_cmnd *srb, struct rts51x_chip *chip)
 {
         struct sd_info *sd_card = &(chip->sd_card);
         int retval;
@@ -929,7 +929,7 @@ int sd_execute_write_data(struct scsi_cmnd *srb, struct rts51x_chip *chip)
         u32 data_len, arg;
 
         if (!sd_card->sd_pass_thru_en) {
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
+                rts51x_set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
                 TRACE_RET(chip, TRANSPORT_FAILED);
         }
 
@@ -950,7 +950,7 @@ int sd_execute_write_data(struct scsi_cmnd *srb, struct rts51x_chip *chip)
         rsp_code = srb->cmnd[10];
 
         retval =
-            ext_sd_execute_write_data(chip, lun, cmd_idx, send_cmd12, standby,
+            ext_rts51x_sd_execute_write_data(chip, lun, cmd_idx, send_cmd12, standby,
                                       acmd, rsp_code, arg, data_len,
                                       scsi_sglist(srb), scsi_bufflen(srb),
                                       scsi_sg_count(srb));
@@ -958,7 +958,7 @@ int sd_execute_write_data(struct scsi_cmnd *srb, struct rts51x_chip *chip)
         return retval;
 }
 
-int sd_get_cmd_rsp(struct scsi_cmnd *srb, struct rts51x_chip *chip)
+int rts51x_sd_get_cmd_rsp(struct scsi_cmnd *srb, struct rts51x_chip *chip)
 {
         struct sd_info *sd_card = &(chip->sd_card);
         unsigned int lun = SCSI_LUN(srb);
@@ -966,20 +966,20 @@ int sd_get_cmd_rsp(struct scsi_cmnd *srb, struct rts51x_chip *chip)
         u16 data_len;
 
         if (!sd_card->sd_pass_thru_en) {
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
+                rts51x_set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
                 TRACE_RET(chip, TRANSPORT_FAILED);
         }
 
         if (sd_card->pre_cmd_err) {
                 sd_card->pre_cmd_err = 0;
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_CHANGE);
+                rts51x_set_sense_type(chip, lun, SENSE_TYPE_MEDIA_CHANGE);
                 TRACE_RET(chip, TRANSPORT_FAILED);
         }
 
         data_len = ((u16) srb->cmnd[7] << 8) | srb->cmnd[8];
 
         if (sd_card->last_rsp_type == SD_RSP_TYPE_R0) {
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
+                rts51x_set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
                 TRACE_RET(chip, TRANSPORT_FAILED);
         } else if (sd_card->last_rsp_type == SD_RSP_TYPE_R2) {
                 count = (data_len < 17) ? data_len : 17;
@@ -997,20 +997,20 @@ int sd_get_cmd_rsp(struct scsi_cmnd *srb, struct rts51x_chip *chip)
         return TRANSPORT_GOOD;
 }
 
-int sd_hw_rst(struct scsi_cmnd *srb, struct rts51x_chip *chip)
+int rts51x_sd_hw_rst(struct scsi_cmnd *srb, struct rts51x_chip *chip)
 {
         struct sd_info *sd_card = &(chip->sd_card);
         unsigned int lun = SCSI_LUN(srb);
         int retval;
 
         if (!sd_card->sd_pass_thru_en) {
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
+                rts51x_set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
                 TRACE_RET(chip, TRANSPORT_FAILED);
         }
 
         if (sd_card->pre_cmd_err) {
                 sd_card->pre_cmd_err = 0;
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_CHANGE);
+                rts51x_set_sense_type(chip, lun, SENSE_TYPE_MEDIA_CHANGE);
                 TRACE_RET(chip, TRANSPORT_FAILED);
         }
 
@@ -1018,16 +1018,16 @@ int sd_hw_rst(struct scsi_cmnd *srb, struct rts51x_chip *chip)
             || (0x20 != srb->cmnd[4]) || (0x43 != srb->cmnd[5])
             || (0x61 != srb->cmnd[6]) || (0x72 != srb->cmnd[7])
             || (0x64 != srb->cmnd[8])) {
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
+                rts51x_set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
                 TRACE_RET(chip, TRANSPORT_FAILED);
         }
 
         switch (srb->cmnd[1] & 0x0F) {
         case 0:
                 /* SD Card Power Off -> ON and Initialization */
-                retval = reset_sd_card(chip);
+                retval = rts51x_reset_sd_card(chip);
                 if (retval != STATUS_SUCCESS) {
-                        set_sense_type(chip, lun, SENSE_TYPE_MEDIA_NOT_PRESENT);
+                        rts51x_set_sense_type(chip, lun, SENSE_TYPE_MEDIA_NOT_PRESENT);
                         sd_card->pre_cmd_err = 1;
                         TRACE_RET(chip, TRANSPORT_FAILED);
                 }
@@ -1038,14 +1038,14 @@ int sd_hw_rst(struct scsi_cmnd *srb, struct rts51x_chip *chip)
                  * (without SD Card Power Off -> ON) */
                 retval = reset_sd(chip);
                 if (retval != STATUS_SUCCESS) {
-                        set_sense_type(chip, lun, SENSE_TYPE_MEDIA_NOT_PRESENT);
+                        rts51x_set_sense_type(chip, lun, SENSE_TYPE_MEDIA_NOT_PRESENT);
                         sd_card->pre_cmd_err = 1;
                         TRACE_RET(chip, TRANSPORT_FAILED);
                 }
                 break;
 
         default:
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
+                rts51x_set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
                 TRACE_RET(chip, TRANSPORT_FAILED);
         }
 
diff --git a/drivers/staging/rts5139/sd_cprm.h b/drivers/staging/rts5139/sd_cprm.h
index 75e263b6594c..79dfd27db41a 100644
--- a/drivers/staging/rts5139/sd_cprm.h
+++ b/drivers/staging/rts5139/sd_cprm.h
@@ -31,24 +31,24 @@
 #include "sd.h"
 
 #ifdef SUPPORT_CPRM
-int ext_sd_execute_no_data(struct rts51x_chip *chip, unsigned int lun,
+int ext_rts51x_sd_execute_no_data(struct rts51x_chip *chip, unsigned int lun,
                            u8 cmd_idx, u8 standby, u8 acmd, u8 rsp_code,
                            u32 arg);
-int ext_sd_execute_read_data(struct rts51x_chip *chip, unsigned int lun,
+int ext_rts51x_sd_execute_read_data(struct rts51x_chip *chip, unsigned int lun,
                              u8 cmd_idx, u8 cmd12, u8 standby, u8 acmd,
                              u8 rsp_code, u32 arg, u32 data_len, void *data_buf,
                              unsigned int buf_len, int use_sg);
-int ext_sd_execute_write_data(struct rts51x_chip *chip, unsigned int lun,
+int ext_rts51x_sd_execute_write_data(struct rts51x_chip *chip, unsigned int lun,
                               u8 cmd_idx, u8 cmd12, u8 standby, u8 acmd,
                               u8 rsp_code, u32 arg, u32 data_len,
                               void *data_buf, unsigned int buf_len, int use_sg);
 
-int sd_pass_thru_mode(struct scsi_cmnd *srb, struct rts51x_chip *chip);
-int sd_execute_no_data(struct scsi_cmnd *srb, struct rts51x_chip *chip);
-int sd_execute_read_data(struct scsi_cmnd *srb, struct rts51x_chip *chip);
-int sd_execute_write_data(struct scsi_cmnd *srb, struct rts51x_chip *chip);
-int sd_get_cmd_rsp(struct scsi_cmnd *srb, struct rts51x_chip *chip);
-int sd_hw_rst(struct scsi_cmnd *srb, struct rts51x_chip *chip);
+int rts51x_sd_pass_thru_mode(struct scsi_cmnd *srb, struct rts51x_chip *chip);
+int rts51x_sd_execute_no_data(struct scsi_cmnd *srb, struct rts51x_chip *chip);
+int rts51x_sd_execute_read_data(struct scsi_cmnd *srb, struct rts51x_chip *chip);
+int rts51x_sd_execute_write_data(struct scsi_cmnd *srb, struct rts51x_chip *chip);
+int rts51x_sd_get_cmd_rsp(struct scsi_cmnd *srb, struct rts51x_chip *chip);
+int rts51x_sd_hw_rst(struct scsi_cmnd *srb, struct rts51x_chip *chip);
 #endif
 
 #endif /* __RTS51X_SD_CPRM_H */
diff --git a/drivers/staging/rts5139/xd.c b/drivers/staging/rts5139/xd.c
index 58f8ba24caed..10fea7e16ace 100644
--- a/drivers/staging/rts5139/xd.c
+++ b/drivers/staging/rts5139/xd.c
@@ -425,7 +425,7 @@ static int reset_xd(struct rts51x_chip *chip)
                 }
 #endif
 
-                retval = card_power_on(chip, XD_CARD);
+                retval = rts51x_card_power_on(chip, XD_CARD);
                 if (retval != STATUS_SUCCESS)
                         TRACE_RET(chip, retval);
 #ifdef SUPPORT_OCP
@@ -472,8 +472,8 @@ static int reset_xd(struct rts51x_chip *chip)
                 rts51x_init_cmd(chip);
                 rts51x_add_cmd(chip, WRITE_REG_CMD, XD_DTCTL, 0xFF,
                         XD_TIME_SETUP_STEP * 3 + XD_TIME_RW_STEP *
-                        (2 + i + chip->option.xd_rw_step)
-                        + XD_TIME_RWN_STEP * (i + chip->option.xd_rwn_step));
+                        (2 + i + chip->option.rts51x_xd_rw_step)
+                        + XD_TIME_RWN_STEP * (i + chip->option.rts51x_xd_rwn_step));
                 rts51x_add_cmd(chip, WRITE_REG_CMD, XD_CATCTL, 0xFF,
                         XD_TIME_SETUP_STEP * 3 + XD_TIME_RW_STEP * (4 +
                         i) + XD_TIME_RWN_STEP * (3 + i));
@@ -905,7 +905,7 @@ static u32 xd_get_l2p_tbl(struct rts51x_chip *chip, int zone_no, u16 log_off)
         return (u32) zone->l2p_table[log_off] + ((u32) (zone_no) << 10);
 }
 
-int reset_xd_card(struct rts51x_chip *chip)
+int rts51x_reset_xd_card(struct rts51x_chip *chip)
 {
         struct xd_info *xd_card = &(chip->xd_card);
         int retval;
@@ -920,7 +920,7 @@ int reset_xd_card(struct rts51x_chip *chip)
         xd_card->cis_block = 0xFFFF;
         xd_card->delay_write.delay_write_flag = 0;
 
-        enable_card_clock(chip, XD_CARD);
+        rts51x_enable_card_clock(chip, XD_CARD);
 
         retval = reset_xd(chip);
         if (retval != STATUS_SUCCESS) {
@@ -1526,7 +1526,7 @@ static int xd_read_multiple_pages(struct rts51x_chip *chip, u32 phy_blk,
         rts51x_add_cmd(chip, WRITE_REG_CMD, XD_CHK_DATA_STATUS,
                        XD_AUTO_CHK_DATA_STATUS, XD_AUTO_CHK_DATA_STATUS);
 
-        trans_dma_enable(chip->srb->sc_data_direction, chip, page_cnt * 512,
+        rts51x_trans_dma_enable(chip->srb->sc_data_direction, chip, page_cnt * 512,
                          DMA_512);
 
         rts51x_add_cmd(chip, WRITE_REG_CMD, XD_TRANSFER, 0xFF,
@@ -1745,7 +1745,7 @@ static int xd_write_multiple_pages(struct rts51x_chip *chip, u32 old_blk,
         rts51x_add_cmd(chip, WRITE_REG_CMD, CARD_DATA_SOURCE, 0x01,
                        RING_BUFFER);
 
-        trans_dma_enable(chip->srb->sc_data_direction, chip, page_cnt * 512,
+        rts51x_trans_dma_enable(chip->srb->sc_data_direction, chip, page_cnt * 512,
                          DMA_512);
 
         rts51x_add_cmd(chip, WRITE_REG_CMD, XD_TRANSFER, 0xFF,
@@ -1842,7 +1842,7 @@ static int xd_delay_write(struct rts51x_chip *chip)
         return STATUS_SUCCESS;
 }
 
-int xd_rw(struct scsi_cmnd *srb, struct rts51x_chip *chip, u32 start_sector,
+int rts51x_xd_rw(struct scsi_cmnd *srb, struct rts51x_chip *chip, u32 start_sector,
           u16 sector_cnt)
 {
         struct xd_info *xd_card = &(chip->xd_card);
@@ -1860,7 +1860,7 @@ int xd_rw(struct scsi_cmnd *srb, struct rts51x_chip *chip, u32 start_sector,
 
         xd_card->counter = 0;
 
-        RTS51X_DEBUGP("xd_rw: scsi_bufflen = %d, scsi_sg_count = %d\n",
+        RTS51X_DEBUGP("rts51x_xd_rw: scsi_bufflen = %d, scsi_sg_count = %d\n",
                        scsi_bufflen(srb), scsi_sg_count(srb));
         RTS51X_DEBUGP("Data direction: %s\n",
                        (srb->sc_data_direction ==
@@ -1883,7 +1883,7 @@ int xd_rw(struct scsi_cmnd *srb, struct rts51x_chip *chip, u32 start_sector,
                 retval = xd_build_l2p_tbl(chip, zone_no);
                 if (retval != STATUS_SUCCESS) {
                         chip->card_fail |= XD_CARD;
-                        set_sense_type(chip, lun, SENSE_TYPE_MEDIA_NOT_PRESENT);
+                        rts51x_set_sense_type(chip, lun, SENSE_TYPE_MEDIA_NOT_PRESENT);
                         TRACE_RET(chip, retval);
                 }
         }
@@ -1900,7 +1900,7 @@ int xd_rw(struct scsi_cmnd *srb, struct rts51x_chip *chip, u32 start_sector,
                                                       delay_write->pageoff,
                                                       start_page);
                                 if (retval != STATUS_SUCCESS) {
-                                        set_sense_type(chip, lun,
+                                        rts51x_set_sense_type(chip, lun,
                                                 SENSE_TYPE_MEDIA_WRITE_ERR);
                                         TRACE_RET(chip, retval);
                                 }
@@ -1916,7 +1916,7 @@ int xd_rw(struct scsi_cmnd *srb, struct rts51x_chip *chip, u32 start_sector,
                 } else {
                         retval = xd_delay_write(chip);
                         if (retval != STATUS_SUCCESS) {
-                                set_sense_type(chip, lun,
+                                rts51x_set_sense_type(chip, lun,
                                                SENSE_TYPE_MEDIA_WRITE_ERR);
                                 TRACE_RET(chip, retval);
                         }
@@ -1924,7 +1924,7 @@ int xd_rw(struct scsi_cmnd *srb, struct rts51x_chip *chip, u32 start_sector,
                         new_blk = xd_get_unused_block(chip, zone_no);
                         if ((old_blk == BLK_NOT_FOUND)
                             || (new_blk == BLK_NOT_FOUND)) {
-                                set_sense_type(chip, lun,
+                                rts51x_set_sense_type(chip, lun,
                                                SENSE_TYPE_MEDIA_WRITE_ERR);
                                 TRACE_RET(chip, retval);
                         }
@@ -1935,11 +1935,11 @@ int xd_rw(struct scsi_cmnd *srb, struct rts51x_chip *chip, u32 start_sector,
                         if (retval != STATUS_SUCCESS) {
                                 if (monitor_card_cd(chip, XD_CARD) ==
                                     CD_NOT_EXIST) {
-                                        set_sense_type(chip, lun,
+                                        rts51x_set_sense_type(chip, lun,
                                                 SENSE_TYPE_MEDIA_NOT_PRESENT);
                                         TRACE_RET(chip, STATUS_FAIL);
                                 }
-                                set_sense_type(chip, lun,
+                                rts51x_set_sense_type(chip, lun,
                                                SENSE_TYPE_MEDIA_WRITE_ERR);
                                 TRACE_RET(chip, retval);
                         }
@@ -1948,18 +1948,18 @@ int xd_rw(struct scsi_cmnd *srb, struct rts51x_chip *chip, u32 start_sector,
                 retval = xd_delay_write(chip);
                 if (retval != STATUS_SUCCESS) {
                         if (monitor_card_cd(chip, XD_CARD) == CD_NOT_EXIST) {
-                                set_sense_type(chip, lun,
+                                rts51x_set_sense_type(chip, lun,
                                                SENSE_TYPE_MEDIA_NOT_PRESENT);
                                 TRACE_RET(chip, STATUS_FAIL);
                         }
-                        set_sense_type(chip, lun,
+                        rts51x_set_sense_type(chip, lun,
                                        SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR);
                         TRACE_RET(chip, retval);
                 }
 
                 old_blk = xd_get_l2p_tbl(chip, zone_no, log_off);
                 if (old_blk == BLK_NOT_FOUND) {
-                        set_sense_type(chip, lun,
+                        rts51x_set_sense_type(chip, lun,
                                        SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR);
                         TRACE_RET(chip, STATUS_FAIL);
                 }
@@ -1980,7 +1980,7 @@ int xd_rw(struct scsi_cmnd *srb, struct rts51x_chip *chip, u32 start_sector,
                                                         start_page, end_page,
                                                         buf, &ptr, &offset);
                         if (retval != STATUS_SUCCESS) {
-                                set_sense_type(chip, lun,
+                                rts51x_set_sense_type(chip, lun,
                                         SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR);
                                 TRACE_RET(chip, STATUS_FAIL);
                         }
@@ -1991,7 +1991,7 @@ int xd_rw(struct scsi_cmnd *srb, struct rts51x_chip *chip, u32 start_sector,
                                                     end_page, buf, &ptr,
                                                     &offset);
                         if (retval != STATUS_SUCCESS) {
-                                set_sense_type(chip, lun,
+                                rts51x_set_sense_type(chip, lun,
                                                SENSE_TYPE_MEDIA_WRITE_ERR);
                                 TRACE_RET(chip, STATUS_FAIL);
                         }
@@ -2010,7 +2010,7 @@ int xd_rw(struct scsi_cmnd *srb, struct rts51x_chip *chip, u32 start_sector,
                         retval = xd_build_l2p_tbl(chip, zone_no);
                         if (retval != STATUS_SUCCESS) {
                                 chip->card_fail |= XD_CARD;
-                                set_sense_type(chip, lun,
+                                rts51x_set_sense_type(chip, lun,
                                                SENSE_TYPE_MEDIA_NOT_PRESENT);
                                 TRACE_RET(chip, retval);
                         }
@@ -2019,10 +2019,10 @@ int xd_rw(struct scsi_cmnd *srb, struct rts51x_chip *chip, u32 start_sector,
                 old_blk = xd_get_l2p_tbl(chip, zone_no, log_off);
                 if (old_blk == BLK_NOT_FOUND) {
                         if (srb->sc_data_direction == DMA_FROM_DEVICE) {
-                                set_sense_type(chip, lun,
+                                rts51x_set_sense_type(chip, lun,
                                         SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR);
                         } else {
-                                set_sense_type(chip, lun,
+                                rts51x_set_sense_type(chip, lun,
                                                SENSE_TYPE_MEDIA_WRITE_ERR);
                         }
                         TRACE_RET(chip, STATUS_FAIL);
@@ -2031,7 +2031,7 @@ int xd_rw(struct scsi_cmnd *srb, struct rts51x_chip *chip, u32 start_sector,
                 if (srb->sc_data_direction == DMA_TO_DEVICE) {
                         new_blk = xd_get_unused_block(chip, zone_no);
                         if (new_blk == BLK_NOT_FOUND) {
-                                set_sense_type(chip, lun,
+                                rts51x_set_sense_type(chip, lun,
                                                SENSE_TYPE_MEDIA_WRITE_ERR);
                                 TRACE_RET(chip, STATUS_FAIL);
                         }
@@ -2054,7 +2054,7 @@ int xd_rw(struct scsi_cmnd *srb, struct rts51x_chip *chip, u32 start_sector,
         return STATUS_SUCCESS;
 }
 
-void xd_free_l2p_tbl(struct rts51x_chip *chip)
+void rts51x_xd_free_l2p_tbl(struct rts51x_chip *chip)
 {
         struct xd_info *xd_card = &(chip->xd_card);
         int i = 0;
@@ -2075,7 +2075,7 @@ void xd_free_l2p_tbl(struct rts51x_chip *chip)
         }
 }
 
-void xd_cleanup_work(struct rts51x_chip *chip)
+void rts51x_xd_cleanup_work(struct rts51x_chip *chip)
 {
         struct xd_info *xd_card = &(chip->xd_card);
 
@@ -2115,12 +2115,12 @@ static int xd_power_off_card3v3(struct rts51x_chip *chip)
         return STATUS_SUCCESS;
 }
 
-int release_xd_card(struct rts51x_chip *chip)
+int rts51x_release_xd_card(struct rts51x_chip *chip)
 {
         struct xd_info *xd_card = &(chip->xd_card);
         int retval;
 
-        RTS51X_DEBUGP("release_xd_card\n");
+        RTS51X_DEBUGP("rts51x_release_xd_card\n");
 
         chip->card_ready &= ~XD_CARD;
         chip->card_fail &= ~XD_CARD;
@@ -2128,7 +2128,7 @@ int release_xd_card(struct rts51x_chip *chip)
 
         xd_card->delay_write.delay_write_flag = 0;
 
-        xd_free_l2p_tbl(chip);
+        rts51x_xd_free_l2p_tbl(chip);
 
         rts51x_write_register(chip, SFSM_ED, HW_CMD_STOP, HW_CMD_STOP);
 
diff --git a/drivers/staging/rts5139/xd.h b/drivers/staging/rts5139/xd.h
index 55e4205e23fa..695a0b4d7e52 100644
--- a/drivers/staging/rts5139/xd.h
+++ b/drivers/staging/rts5139/xd.h
@@ -181,11 +181,11 @@
 #define CIS1_8                  (256 + 8)
 #define CIS1_9                  (256 + 9)
 
-int reset_xd_card(struct rts51x_chip *chip);
-int xd_rw(struct scsi_cmnd *srb, struct rts51x_chip *chip, u32 start_sector,
+int rts51x_reset_xd_card(struct rts51x_chip *chip);
+int rts51x_xd_rw(struct scsi_cmnd *srb, struct rts51x_chip *chip, u32 start_sector,
           u16 sector_cnt);
-void xd_free_l2p_tbl(struct rts51x_chip *chip);
-void xd_cleanup_work(struct rts51x_chip *chip);
-int release_xd_card(struct rts51x_chip *chip);
+void rts51x_xd_free_l2p_tbl(struct rts51x_chip *chip);
+void rts51x_xd_cleanup_work(struct rts51x_chip *chip);
+int rts51x_release_xd_card(struct rts51x_chip *chip);
 
 #endif /* __RTS51X_XD_H */
diff --git a/drivers/staging/rts_pstor/Kconfig b/drivers/staging/rts_pstor/Kconfig
deleted file mode 100644
index 4d66a99fba82..000000000000
--- a/drivers/staging/rts_pstor/Kconfig
+++ /dev/null
@@ -1,16 +0,0 @@
-config RTS_PSTOR
-        tristate "RealTek PCI-E Card Reader support"
-        depends on PCI && SCSI
-        help
-          Say Y here to include driver code to support the Realtek
-          PCI-E card readers.
-
-          If this driver is compiled as a module, it will be named rts_pstor.
-
-config RTS_PSTOR_DEBUG
-        bool "Realtek PCI-E Card Reader verbose debug"
-        depends on RTS_PSTOR
-        help
-          Say Y here in order to have the rts_pstor code generate
-          verbose debugging messages.
-
diff --git a/drivers/staging/rts_pstor/Makefile b/drivers/staging/rts_pstor/Makefile
deleted file mode 100644
index 42533d39c07f..000000000000
--- a/drivers/staging/rts_pstor/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-ccflags := -Idrivers/scsi
-
-obj-$(CONFIG_RTS_PSTOR) := rts_pstor.o
-
-rts_pstor-y :=                          \
-                rtsx.o                  \
-                rtsx_chip.o             \
-                rtsx_transport.o        \
-                rtsx_scsi.o             \
-                rtsx_card.o             \
-                general.o               \
-                sd.o                    \
-                xd.o                    \
-                ms.o                    \
-                spi.o
-
diff --git a/drivers/staging/rts_pstor/TODO b/drivers/staging/rts_pstor/TODO
deleted file mode 100644
index becb95e4f2cd..000000000000
--- a/drivers/staging/rts_pstor/TODO
+++ /dev/null
@@ -1,9 +0,0 @@
-TODO:
-- support more pcie card reader of Realtek family
-- use kernel coding style
-- checkpatch.pl fixes
-- stop having thousands of lines of code duplicated with staging/rts5139
-- This driver contains an entire SD/MMC stack -- it should use the stack in
-  drivers/mmc instead, as a host driver e.g. drivers/mmc/host/realtek-pci.c;
-  see drivers/mmc/host/via-sdmmc.c as an example.
-- This driver presents cards as SCSI devices, but they should be MMC devices.
diff --git a/drivers/staging/rts_pstor/debug.h b/drivers/staging/rts_pstor/debug.h
deleted file mode 100644
index ab305be96fb5..000000000000
--- a/drivers/staging/rts_pstor/debug.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Driver for Realtek PCI-Express card reader
- * Header file
- *
- * Copyright(c) 2009 Realtek Semiconductor Corp. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2, 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, see <http://www.gnu.org/licenses/>.
- *
- * Author:
- *   wwang (wei_wang@realsil.com.cn)
- *   No. 450, Shenhu Road, Suzhou Industry Park, Suzhou, China
- */
-
-#ifndef __REALTEK_RTSX_DEBUG_H
-#define __REALTEK_RTSX_DEBUG_H
-
-#include <linux/kernel.h>
-
-#define RTSX_STOR "rts_pstor: "
-
-#ifdef CONFIG_RTS_PSTOR_DEBUG
-#define RTSX_DEBUGP(x...) printk(KERN_DEBUG RTSX_STOR x)
-#define RTSX_DEBUGPN(x...) printk(KERN_DEBUG x)
-#define RTSX_DEBUGPX(x...) printk(x)
-#define RTSX_DEBUG(x) x
-#else
-#define RTSX_DEBUGP(x...)
-#define RTSX_DEBUGPN(x...)
-#define RTSX_DEBUGPX(x...)
-#define RTSX_DEBUG(x)
-#endif
-
-#endif   /* __REALTEK_RTSX_DEBUG_H */
diff --git a/drivers/staging/rts_pstor/general.c b/drivers/staging/rts_pstor/general.c
deleted file mode 100644
index 056e98d2475c..000000000000
--- a/drivers/staging/rts_pstor/general.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Driver for Realtek PCI-Express card reader
- *
- * Copyright(c) 2009 Realtek Semiconductor Corp. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2, 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, see <http://www.gnu.org/licenses/>.
- *
- * Author:
- *   wwang (wei_wang@realsil.com.cn)
- *   No. 450, Shenhu Road, Suzhou Industry Park, Suzhou, China
- */
-
-#include "general.h"
-
-int bit1cnt_long(u32 data)
-{
-        int i, cnt = 0;
-        for (i = 0; i < 32; i++) {
-                if (data & 0x01)
-                        cnt++;
-                data >>= 1;
-        }
-        return cnt;
-}
-
diff --git a/drivers/staging/rts_pstor/general.h b/drivers/staging/rts_pstor/general.h
deleted file mode 100644
index f17930d2e0c4..000000000000
--- a/drivers/staging/rts_pstor/general.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Driver for Realtek PCI-Express card reader
- * Header file
- *
- * Copyright(c) 2009 Realtek Semiconductor Corp. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2, 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, see <http://www.gnu.org/licenses/>.
- *
- * Author:
- *   wwang (wei_wang@realsil.com.cn)
- *   No. 450, Shenhu Road, Suzhou Industry Park, Suzhou, China
- */
-
-#ifndef __RTSX_GENERAL_H
-#define __RTSX_GENERAL_H
-
-#include "rtsx.h"
-
-int bit1cnt_long(u32 data);
-
-#endif /* __RTSX_GENERAL_H */
diff --git a/drivers/staging/rts_pstor/ms.c b/drivers/staging/rts_pstor/ms.c
deleted file mode 100644
index 16a5c16fb6ab..000000000000
--- a/drivers/staging/rts_pstor/ms.c
+++ /dev/null
@@ -1,4051 +0,0 @@
-/* Driver for Realtek PCI-Express card reader
- *
- * Copyright(c) 2009 Realtek Semiconductor Corp. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2, 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, see <http://www.gnu.org/licenses/>.
- *
- * Author:
- *   wwang (wei_wang@realsil.com.cn)
- *   No. 450, Shenhu Road, Suzhou Industry Park, Suzhou, China
- */
-
-#include <linux/blkdev.h>
-#include <linux/kthread.h>
-#include <linux/sched.h>
-#include <linux/vmalloc.h>
-
-#include "rtsx.h"
-#include "rtsx_transport.h"
-#include "rtsx_scsi.h"
-#include "rtsx_card.h"
-#include "ms.h"
-
-static inline void ms_set_err_code(struct rtsx_chip *chip, u8 err_code)
-{
-        struct ms_info *ms_card = &(chip->ms_card);
-
-        ms_card->err_code = err_code;
-}
-
-static inline int ms_check_err_code(struct rtsx_chip *chip, u8 err_code)
-{
-        struct ms_info *ms_card = &(chip->ms_card);
-
-        return (ms_card->err_code == err_code);
-}
-
-static int ms_parse_err_code(struct rtsx_chip *chip)
-{
-        TRACE_RET(chip, STATUS_FAIL);
-}
-
-static int ms_transfer_tpc(struct rtsx_chip *chip, u8 trans_mode, u8 tpc, u8 cnt, u8 cfg)
-{
-        struct ms_info *ms_card = &(chip->ms_card);
-        int retval;
-        u8 *ptr;
-
-        RTSX_DEBUGP("ms_transfer_tpc: tpc = 0x%x\n", tpc);
-
-        rtsx_init_cmd(chip);
-
-        rtsx_add_cmd(chip, WRITE_REG_CMD, MS_TPC, 0xFF, tpc);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, MS_BYTE_CNT, 0xFF, cnt);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, MS_TRANS_CFG, 0xFF, cfg);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_DATA_SOURCE, 0x01, PINGPONG_BUFFER);
-
-        rtsx_add_cmd(chip, WRITE_REG_CMD, MS_TRANSFER, 0xFF, MS_TRANSFER_START | trans_mode);
-        rtsx_add_cmd(chip, CHECK_REG_CMD, MS_TRANSFER, MS_TRANSFER_END, MS_TRANSFER_END);
-
-        rtsx_add_cmd(chip, READ_REG_CMD, MS_TRANS_CFG, 0, 0);
-
-        retval = rtsx_send_cmd(chip, MS_CARD, 5000);
-        if (retval < 0) {
-                rtsx_clear_ms_error(chip);
-                ms_set_err_code(chip, MS_TO_ERROR);
-                TRACE_RET(chip, ms_parse_err_code(chip));
-        }
-
-        ptr = rtsx_get_cmd_data(chip) + 1;
-
-        if (!(tpc & 0x08)) {            /* Read Packet */
-                if (*ptr & MS_CRC16_ERR) {
-                        ms_set_err_code(chip, MS_CRC16_ERROR);
-                        TRACE_RET(chip, ms_parse_err_code(chip));
-                }
-        } else {                        /* Write Packet */
-                if (CHK_MSPRO(ms_card) && !(*ptr & 0x80)) {
-                        if (*ptr & (MS_INT_ERR | MS_INT_CMDNK)) {
-                                ms_set_err_code(chip, MS_CMD_NK);
-                                TRACE_RET(chip, ms_parse_err_code(chip));
-                        }
-                }
-        }
-
-        if (*ptr & MS_RDY_TIMEOUT) {
-                rtsx_clear_ms_error(chip);
-                ms_set_err_code(chip, MS_TO_ERROR);
-                TRACE_RET(chip, ms_parse_err_code(chip));
-        }
-
-        return STATUS_SUCCESS;
-}
-
-static int ms_transfer_data(struct rtsx_chip *chip, u8 trans_mode, u8 tpc, u16 sec_cnt,
-                u8 cfg, int mode_2k, int use_sg, void *buf, int buf_len)
-{
-        int retval;
-        u8 val, err_code = 0;
-        enum dma_data_direction dir;
-
-        if (!buf || !buf_len)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        if (trans_mode == MS_TM_AUTO_READ) {
-                dir = DMA_FROM_DEVICE;
-                err_code = MS_FLASH_READ_ERROR;
-        } else if (trans_mode == MS_TM_AUTO_WRITE) {
-                dir = DMA_TO_DEVICE;
-                err_code = MS_FLASH_WRITE_ERROR;
-        } else {
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        rtsx_init_cmd(chip);
-
-        rtsx_add_cmd(chip, WRITE_REG_CMD, MS_TPC, 0xFF, tpc);
-        rtsx_add_cmd(chip, WRITE_REG_CMD,
-                     MS_SECTOR_CNT_H, 0xFF, (u8)(sec_cnt >> 8));
-        rtsx_add_cmd(chip, WRITE_REG_CMD, MS_SECTOR_CNT_L, 0xFF, (u8)sec_cnt);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, MS_TRANS_CFG, 0xFF, cfg);
-
-        if (mode_2k) {
-                rtsx_add_cmd(chip, WRITE_REG_CMD,
-                             MS_CFG, MS_2K_SECTOR_MODE, MS_2K_SECTOR_MODE);
-        } else {
-                rtsx_add_cmd(chip, WRITE_REG_CMD, MS_CFG, MS_2K_SECTOR_MODE, 0);
-        }
-
-        trans_dma_enable(dir, chip, sec_cnt * 512, DMA_512);
-
-        rtsx_add_cmd(chip, WRITE_REG_CMD,
-                     MS_TRANSFER, 0xFF, MS_TRANSFER_START | trans_mode);
-        rtsx_add_cmd(chip, CHECK_REG_CMD,
-                     MS_TRANSFER, MS_TRANSFER_END, MS_TRANSFER_END);
-
-        rtsx_send_cmd_no_wait(chip);
-
-        retval = rtsx_transfer_data(chip, MS_CARD, buf, buf_len,
-                                    use_sg, dir, chip->mspro_timeout);
-        if (retval < 0) {
-                ms_set_err_code(chip, err_code);
-                if (retval == -ETIMEDOUT)
-                        retval = STATUS_TIMEDOUT;
-                else
-                        retval = STATUS_FAIL;
-
-                TRACE_RET(chip, retval);
-        }
-
-        RTSX_READ_REG(chip, MS_TRANS_CFG, &val);
-        if (val & (MS_INT_CMDNK | MS_INT_ERR | MS_CRC16_ERR | MS_RDY_TIMEOUT))
-                TRACE_RET(chip, STATUS_FAIL);
-
-        return STATUS_SUCCESS;
-}
-
-static int ms_write_bytes(struct rtsx_chip *chip,
-                          u8 tpc, u8 cnt, u8 cfg, u8 *data, int data_len)
-{
-        struct ms_info *ms_card = &(chip->ms_card);
-        int retval, i;
-
-        if (!data || (data_len < cnt))
-                TRACE_RET(chip, STATUS_ERROR);
-
-        rtsx_init_cmd(chip);
-
-        for (i = 0; i < cnt; i++) {
-                rtsx_add_cmd(chip, WRITE_REG_CMD,
-                             PPBUF_BASE2 + i, 0xFF, data[i]);
-        }
-        if (cnt % 2)
-                rtsx_add_cmd(chip, WRITE_REG_CMD, PPBUF_BASE2 + i, 0xFF, 0xFF);
-
-        rtsx_add_cmd(chip, WRITE_REG_CMD, MS_TPC, 0xFF, tpc);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, MS_BYTE_CNT, 0xFF, cnt);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, MS_TRANS_CFG, 0xFF, cfg);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_DATA_SOURCE, 0x01, PINGPONG_BUFFER);
-
-        rtsx_add_cmd(chip, WRITE_REG_CMD,
-                     MS_TRANSFER, 0xFF, MS_TRANSFER_START | MS_TM_WRITE_BYTES);
-        rtsx_add_cmd(chip, CHECK_REG_CMD,
-                     MS_TRANSFER, MS_TRANSFER_END, MS_TRANSFER_END);
-
-        retval = rtsx_send_cmd(chip, MS_CARD, 5000);
-        if (retval < 0) {
-                u8 val = 0;
-
-                rtsx_read_register(chip, MS_TRANS_CFG, &val);
-                RTSX_DEBUGP("MS_TRANS_CFG: 0x%02x\n", val);
-
-                rtsx_clear_ms_error(chip);
-
-                if (!(tpc & 0x08)) {
-                        if (val & MS_CRC16_ERR) {
-                                ms_set_err_code(chip, MS_CRC16_ERROR);
-                                TRACE_RET(chip, ms_parse_err_code(chip));
-                        }
-                } else {
-                        if (CHK_MSPRO(ms_card) && !(val & 0x80)) {
-                                if (val & (MS_INT_ERR | MS_INT_CMDNK)) {
-                                        ms_set_err_code(chip, MS_CMD_NK);
-                                        TRACE_RET(chip, ms_parse_err_code(chip));
-                                }
-                        }
-                }
-
-                if (val & MS_RDY_TIMEOUT) {
-                        ms_set_err_code(chip, MS_TO_ERROR);
-                        TRACE_RET(chip, ms_parse_err_code(chip));
-                }
-
-                ms_set_err_code(chip, MS_TO_ERROR);
-                TRACE_RET(chip, ms_parse_err_code(chip));
-        }
-
-        return STATUS_SUCCESS;
-}
-
-static int ms_read_bytes(struct rtsx_chip *chip, u8 tpc, u8 cnt, u8 cfg, u8 *data, int data_len)
-{
-        struct ms_info *ms_card = &(chip->ms_card);
-        int retval, i;
-        u8 *ptr;
-
-        if (!data)
-                TRACE_RET(chip, STATUS_ERROR);
-
-        rtsx_init_cmd(chip);
-
-        rtsx_add_cmd(chip, WRITE_REG_CMD, MS_TPC, 0xFF, tpc);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, MS_BYTE_CNT, 0xFF, cnt);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, MS_TRANS_CFG, 0xFF, cfg);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_DATA_SOURCE, 0x01, PINGPONG_BUFFER);
-
-        rtsx_add_cmd(chip, WRITE_REG_CMD, MS_TRANSFER, 0xFF, MS_TRANSFER_START | MS_TM_READ_BYTES);
-        rtsx_add_cmd(chip, CHECK_REG_CMD, MS_TRANSFER, MS_TRANSFER_END, MS_TRANSFER_END);
-
-        for (i = 0; i < data_len - 1; i++)
-               rtsx_add_cmd(chip, READ_REG_CMD, PPBUF_BASE2 + i, 0, 0);
-
-        if (data_len % 2)
-                rtsx_add_cmd(chip, READ_REG_CMD, PPBUF_BASE2 + data_len, 0, 0);
-        else
-                rtsx_add_cmd(chip, READ_REG_CMD, PPBUF_BASE2 + data_len - 1, 0, 0);
-
-        retval = rtsx_send_cmd(chip, MS_CARD, 5000);
-        if (retval < 0) {
-                u8 val = 0;
-
-                rtsx_read_register(chip, MS_TRANS_CFG, &val);
-                rtsx_clear_ms_error(chip);
-
-                if (!(tpc & 0x08)) {
-                        if (val & MS_CRC16_ERR) {
-                                ms_set_err_code(chip, MS_CRC16_ERROR);
-                                TRACE_RET(chip, ms_parse_err_code(chip));
-                        }
-                } else {
-                        if (CHK_MSPRO(ms_card) && !(val & 0x80)) {
-                                if (val & (MS_INT_ERR | MS_INT_CMDNK)) {
-                                        ms_set_err_code(chip, MS_CMD_NK);
-                                        TRACE_RET(chip, ms_parse_err_code(chip));
-                                }
-                        }
-                }
-
-                if (val & MS_RDY_TIMEOUT) {
-                        ms_set_err_code(chip, MS_TO_ERROR);
-                        TRACE_RET(chip, ms_parse_err_code(chip));
-                }
-
-                ms_set_err_code(chip, MS_TO_ERROR);
-                TRACE_RET(chip, ms_parse_err_code(chip));
-        }
-
-        ptr = rtsx_get_cmd_data(chip) + 1;
-
-        for (i = 0; i < data_len; i++)
-                data[i] = ptr[i];
-
-        if ((tpc == PRO_READ_SHORT_DATA) && (data_len == 8)) {
-                RTSX_DEBUGP("Read format progress:\n");
-                RTSX_DUMP(ptr, cnt);
-        }
-
-        return STATUS_SUCCESS;
-}
-
-static int ms_set_rw_reg_addr(struct rtsx_chip *chip,
-                u8 read_start, u8 read_cnt, u8 write_start, u8 write_cnt)
-{
-        int retval, i;
-        u8 data[4];
-
-        data[0] = read_start;
-        data[1] = read_cnt;
-        data[2] = write_start;
-        data[3] = write_cnt;
-
-        for (i = 0; i < MS_MAX_RETRY_COUNT; i++) {
-                retval = ms_write_bytes(chip, SET_RW_REG_ADRS, 4,
-                                        NO_WAIT_INT, data, 4);
-                if (retval == STATUS_SUCCESS)
-                        return STATUS_SUCCESS;
-                rtsx_clear_ms_error(chip);
-        }
-
-        TRACE_RET(chip, STATUS_FAIL);
-}
-
-static int ms_send_cmd(struct rtsx_chip *chip, u8 cmd, u8 cfg)
-{
-        u8 data[2];
-
-        data[0] = cmd;
-        data[1] = 0;
-
-        return ms_write_bytes(chip, PRO_SET_CMD, 1, cfg, data, 1);
-}
-
-static int ms_set_init_para(struct rtsx_chip *chip)
-{
-        struct ms_info *ms_card = &(chip->ms_card);
-        int retval;
-
-        if (CHK_HG8BIT(ms_card)) {
-                if (chip->asic_code)
-                        ms_card->ms_clock = chip->asic_ms_hg_clk;
-                else
-                        ms_card->ms_clock = chip->fpga_ms_hg_clk;
-
-        } else if (CHK_MSPRO(ms_card) || CHK_MS4BIT(ms_card)) {
-                if (chip->asic_code)
-                        ms_card->ms_clock = chip->asic_ms_4bit_clk;
-                else
-                        ms_card->ms_clock = chip->fpga_ms_4bit_clk;
-
-        } else {
-                if (chip->asic_code)
-                        ms_card->ms_clock = chip->asic_ms_1bit_clk;
-                else
-                        ms_card->ms_clock = chip->fpga_ms_1bit_clk;
-        }
-
-        retval = switch_clock(chip, ms_card->ms_clock);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        retval = select_card(chip, MS_CARD);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        return STATUS_SUCCESS;
-}
-
-static int ms_switch_clock(struct rtsx_chip *chip)
-{
-        struct ms_info *ms_card = &(chip->ms_card);
-        int retval;
-
-        retval = select_card(chip, MS_CARD);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        retval = switch_clock(chip, ms_card->ms_clock);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        return STATUS_SUCCESS;
-}
-
-static int ms_pull_ctl_disable(struct rtsx_chip *chip)
-{
-        if (CHECK_PID(chip, 0x5209)) {
-                RTSX_WRITE_REG(chip, CARD_PULL_CTL4, 0xFF, 0x55);
-                RTSX_WRITE_REG(chip, CARD_PULL_CTL5, 0xFF, 0x55);
-                RTSX_WRITE_REG(chip, CARD_PULL_CTL6, 0xFF, 0x15);
-        } else if (CHECK_PID(chip, 0x5208)) {
-                RTSX_WRITE_REG(chip, CARD_PULL_CTL1, 0xFF,
-                        MS_D1_PD | MS_D2_PD | MS_CLK_PD | MS_D6_PD);
-                RTSX_WRITE_REG(chip, CARD_PULL_CTL2, 0xFF,
-                        MS_D3_PD | MS_D0_PD | MS_BS_PD | XD_D4_PD);
-                RTSX_WRITE_REG(chip, CARD_PULL_CTL3, 0xFF,
-                        MS_D7_PD | XD_CE_PD | XD_CLE_PD | XD_CD_PU);
-                RTSX_WRITE_REG(chip, CARD_PULL_CTL4, 0xFF,
-                        XD_RDY_PD | SD_D3_PD | SD_D2_PD | XD_ALE_PD);
-                RTSX_WRITE_REG(chip, CARD_PULL_CTL5, 0xFF,
-                        MS_INS_PU | SD_WP_PD | SD_CD_PU | SD_CMD_PD);
-                RTSX_WRITE_REG(chip, CARD_PULL_CTL6, 0xFF,
-                        MS_D5_PD | MS_D4_PD);
-        } else if (CHECK_PID(chip, 0x5288)) {
-                if (CHECK_BARO_PKG(chip, QFN)) {
-                        RTSX_WRITE_REG(chip, CARD_PULL_CTL1, 0xFF, 0x55);
-                        RTSX_WRITE_REG(chip, CARD_PULL_CTL2, 0xFF, 0x55);
-                        RTSX_WRITE_REG(chip, CARD_PULL_CTL3, 0xFF, 0x4B);
-                        RTSX_WRITE_REG(chip, CARD_PULL_CTL4, 0xFF, 0x69);
-                }
-        }
-
-        return STATUS_SUCCESS;
-}
-
-static int ms_pull_ctl_enable(struct rtsx_chip *chip)
-{
-        int retval;
-
-        rtsx_init_cmd(chip);
-
-        if (CHECK_PID(chip, 0x5209)) {
-                rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL4, 0xFF, 0x55);
-                rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL5, 0xFF, 0x55);
-                rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL6, 0xFF, 0x15);
-        } else if (CHECK_PID(chip, 0x5208)) {
-                rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL1, 0xFF,
-                        MS_D1_PD | MS_D2_PD | MS_CLK_NP | MS_D6_PD);
-                rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL2, 0xFF,
-                        MS_D3_PD | MS_D0_PD | MS_BS_NP | XD_D4_PD);
-                rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL3, 0xFF,
-                        MS_D7_PD | XD_CE_PD | XD_CLE_PD | XD_CD_PU);
-                rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL4, 0xFF,
-                        XD_RDY_PD | SD_D3_PD | SD_D2_PD | XD_ALE_PD);
-                rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL5, 0xFF,
-                        MS_INS_PU | SD_WP_PD | SD_CD_PU | SD_CMD_PD);
-                rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL6, 0xFF,
-                        MS_D5_PD | MS_D4_PD);
-        } else if (CHECK_PID(chip, 0x5288)) {
-                if (CHECK_BARO_PKG(chip, QFN)) {
-                        rtsx_add_cmd(chip, WRITE_REG_CMD,
-                                     CARD_PULL_CTL1, 0xFF, 0x55);
-                        rtsx_add_cmd(chip, WRITE_REG_CMD,
-                                     CARD_PULL_CTL2, 0xFF, 0x45);
-                        rtsx_add_cmd(chip, WRITE_REG_CMD,
-                                     CARD_PULL_CTL3, 0xFF, 0x4B);
-                        rtsx_add_cmd(chip, WRITE_REG_CMD,
-                                     CARD_PULL_CTL4, 0xFF, 0x29);
-                }
-        }
-
-        retval = rtsx_send_cmd(chip, MS_CARD, 100);
-        if (retval < 0)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        return STATUS_SUCCESS;
-}
-
-static int ms_prepare_reset(struct rtsx_chip *chip)
-{
-        struct ms_info *ms_card = &(chip->ms_card);
-        int retval;
-        u8 oc_mask = 0;
-
-        ms_card->ms_type = 0;
-        ms_card->check_ms_flow = 0;
-        ms_card->switch_8bit_fail = 0;
-        ms_card->delay_write.delay_write_flag = 0;
-
-        ms_card->pro_under_formatting = 0;
-
-        retval = ms_power_off_card3v3(chip);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        if (!chip->ft2_fast_mode)
-                wait_timeout(250);
-
-        retval = enable_card_clock(chip, MS_CARD);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        if (chip->asic_code) {
-                retval = ms_pull_ctl_enable(chip);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-        } else {
-                RTSX_WRITE_REG(chip, FPGA_PULL_CTL, FPGA_MS_PULL_CTL_BIT | 0x20, 0);
-        }
-
-        if (!chip->ft2_fast_mode) {
-                retval = card_power_on(chip, MS_CARD);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-
-                wait_timeout(150);
-
-#ifdef SUPPORT_OCP
-                if (CHECK_LUN_MODE(chip, SD_MS_2LUN))
-                        oc_mask = MS_OC_NOW | MS_OC_EVER;
-                else
-                        oc_mask = SD_OC_NOW | SD_OC_EVER;
-
-                if (chip->ocp_stat & oc_mask) {
-                        RTSX_DEBUGP("Over current, OCPSTAT is 0x%x\n",
-                                     chip->ocp_stat);
-                        TRACE_RET(chip, STATUS_FAIL);
-                }
-#endif
-        }
-
-        RTSX_WRITE_REG(chip, CARD_OE, MS_OUTPUT_EN, MS_OUTPUT_EN);
-
-        if (chip->asic_code) {
-                RTSX_WRITE_REG(chip, MS_CFG, 0xFF,
-                        SAMPLE_TIME_RISING | PUSH_TIME_DEFAULT |
-                        NO_EXTEND_TOGGLE | MS_BUS_WIDTH_1);
-        } else {
-                RTSX_WRITE_REG(chip, MS_CFG, 0xFF,
-                        SAMPLE_TIME_FALLING | PUSH_TIME_DEFAULT |
-                        NO_EXTEND_TOGGLE | MS_BUS_WIDTH_1);
-        }
-        RTSX_WRITE_REG(chip, MS_TRANS_CFG, 0xFF, NO_WAIT_INT | NO_AUTO_READ_INT_REG);
-        RTSX_WRITE_REG(chip, CARD_STOP, MS_STOP | MS_CLR_ERR, MS_STOP | MS_CLR_ERR);
-
-        retval = ms_set_init_para(chip);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        return STATUS_SUCCESS;
-}
-
-static int ms_identify_media_type(struct rtsx_chip *chip, int switch_8bit_bus)
-{
-        struct ms_info *ms_card = &(chip->ms_card);
-        int retval, i;
-        u8 val;
-
-        retval = ms_set_rw_reg_addr(chip, Pro_StatusReg, 6, SystemParm, 1);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        for (i = 0; i < MS_MAX_RETRY_COUNT; i++) {
-                retval = ms_transfer_tpc(chip, MS_TM_READ_BYTES, READ_REG, 6, NO_WAIT_INT);
-                if (retval == STATUS_SUCCESS)
-                        break;
-        }
-        if (i == MS_MAX_RETRY_COUNT)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        RTSX_READ_REG(chip, PPBUF_BASE2 + 2, &val);
-        RTSX_DEBUGP("Type register: 0x%x\n", val);
-        if (val != 0x01) {
-                if (val != 0x02)
-                        ms_card->check_ms_flow = 1;
-
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        RTSX_READ_REG(chip, PPBUF_BASE2 + 4, &val);
-        RTSX_DEBUGP("Category register: 0x%x\n", val);
-        if (val != 0) {
-                ms_card->check_ms_flow = 1;
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        RTSX_READ_REG(chip, PPBUF_BASE2 + 5, &val);
-        RTSX_DEBUGP("Class register: 0x%x\n", val);
-        if (val == 0) {
-                RTSX_READ_REG(chip, PPBUF_BASE2, &val);
-                if (val & WRT_PRTCT)
-                        chip->card_wp |= MS_CARD;
-                else
-                        chip->card_wp &= ~MS_CARD;
-
-        } else if ((val == 0x01) || (val == 0x02) || (val == 0x03)) {
-                chip->card_wp |= MS_CARD;
-        } else {
-                ms_card->check_ms_flow = 1;
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        ms_card->ms_type |= TYPE_MSPRO;
-
-        RTSX_READ_REG(chip, PPBUF_BASE2 + 3, &val);
-        RTSX_DEBUGP("IF Mode register: 0x%x\n", val);
-        if (val == 0) {
-                ms_card->ms_type &= 0x0F;
-        } else if (val == 7) {
-                if (switch_8bit_bus)
-                        ms_card->ms_type |= MS_HG;
-                else
-                        ms_card->ms_type &= 0x0F;
-
-        } else {
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        return STATUS_SUCCESS;
-}
-
-static int ms_confirm_cpu_startup(struct rtsx_chip *chip)
-{
-        int retval, i, k;
-        u8 val;
-
-        /* Confirm CPU StartUp */
-        k = 0;
-        do {
-                if (detect_card_cd(chip, MS_CARD) != STATUS_SUCCESS) {
-                        ms_set_err_code(chip, MS_NO_CARD);
-                        TRACE_RET(chip, STATUS_FAIL);
-                }
-
-                for (i = 0; i < MS_MAX_RETRY_COUNT; i++) {
-                        retval = ms_read_bytes(chip, GET_INT, 1, NO_WAIT_INT, &val, 1);
-                        if (retval == STATUS_SUCCESS)
-                                break;
-                }
-                if (i == MS_MAX_RETRY_COUNT)
-                        TRACE_RET(chip, STATUS_FAIL);
-
-                if (k > 100)
-                        TRACE_RET(chip, STATUS_FAIL);
-
-                k++;
-                wait_timeout(100);
-        } while (!(val & INT_REG_CED));
-
-        for (i = 0; i < MS_MAX_RETRY_COUNT; i++) {
-                retval = ms_read_bytes(chip, GET_INT, 1, NO_WAIT_INT, &val, 1);
-                if (retval == STATUS_SUCCESS)
-                        break;
-        }
-        if (i == MS_MAX_RETRY_COUNT)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        if (val & INT_REG_ERR) {
-                if (val & INT_REG_CMDNK)
-                        chip->card_wp |= (MS_CARD);
-                else
-                        TRACE_RET(chip, STATUS_FAIL);
-        }
-        /* --  end confirm CPU startup */
-
-        return STATUS_SUCCESS;
-}
-
-static int ms_switch_parallel_bus(struct rtsx_chip *chip)
-{
-        int retval, i;
-        u8 data[2];
-
-        data[0] = PARALLEL_4BIT_IF;
-        data[1] = 0;
-        for (i = 0; i < MS_MAX_RETRY_COUNT; i++) {
-                retval = ms_write_bytes(chip, WRITE_REG, 1, NO_WAIT_INT, data, 2);
-                if (retval == STATUS_SUCCESS)
-                        break;
-        }
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        return STATUS_SUCCESS;
-}
-
-static int ms_switch_8bit_bus(struct rtsx_chip *chip)
-{
-        struct ms_info *ms_card = &(chip->ms_card);
-        int retval, i;
-        u8 data[2];
-
-        data[0] = PARALLEL_8BIT_IF;
-        data[1] = 0;
-        for (i = 0; i < MS_MAX_RETRY_COUNT; i++) {
-                retval = ms_write_bytes(chip, WRITE_REG, 1, NO_WAIT_INT, data, 2);
-                if (retval == STATUS_SUCCESS)
-                        break;
-        }
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        RTSX_WRITE_REG(chip, MS_CFG, 0x98, MS_BUS_WIDTH_8 | SAMPLE_TIME_FALLING);
-        ms_card->ms_type |= MS_8BIT;
-        retval = ms_set_init_para(chip);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        for (i = 0; i < MS_MAX_RETRY_COUNT; i++) {
-                retval = ms_transfer_tpc(chip, MS_TM_READ_BYTES, GET_INT, 1, NO_WAIT_INT);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        return STATUS_SUCCESS;
-}
-
-static int ms_pro_reset_flow(struct rtsx_chip *chip, int switch_8bit_bus)
-{
-        struct ms_info *ms_card = &(chip->ms_card);
-        int retval, i;
-
-        for (i = 0; i < 3; i++) {
-                retval = ms_prepare_reset(chip);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-
-                retval = ms_identify_media_type(chip, switch_8bit_bus);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-
-                retval = ms_confirm_cpu_startup(chip);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-
-                retval = ms_switch_parallel_bus(chip);
-                if (retval != STATUS_SUCCESS) {
-                        if (detect_card_cd(chip, MS_CARD) != STATUS_SUCCESS) {
-                                ms_set_err_code(chip, MS_NO_CARD);
-                                TRACE_RET(chip, STATUS_FAIL);
-                        }
-                        continue;
-                } else {
-                        break;
-                }
-        }
-
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        /* Switch MS-PRO into Parallel mode */
-        RTSX_WRITE_REG(chip, MS_CFG, 0x18, MS_BUS_WIDTH_4);
-        RTSX_WRITE_REG(chip, MS_CFG, PUSH_TIME_ODD, PUSH_TIME_ODD);
-
-        retval = ms_set_init_para(chip);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        /* If MSPro HG Card, We shall try to switch to 8-bit bus */
-        if (CHK_MSHG(ms_card) && chip->support_ms_8bit && switch_8bit_bus) {
-                retval = ms_switch_8bit_bus(chip);
-                if (retval != STATUS_SUCCESS) {
-                        ms_card->switch_8bit_fail = 1;
-                        TRACE_RET(chip, STATUS_FAIL);
-                }
-        }
-
-        return STATUS_SUCCESS;
-}
-
-#ifdef XC_POWERCLASS
-static int msxc_change_power(struct rtsx_chip *chip, u8 mode)
-{
-        int retval;
-        u8 buf[6];
-
-        ms_cleanup_work(chip);
-
-        retval = ms_set_rw_reg_addr(chip, 0, 0, Pro_DataCount1, 6);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        buf[0] = 0;
-        buf[1] = mode;
-        buf[2] = 0;
-        buf[3] = 0;
-        buf[4] = 0;
-        buf[5] = 0;
-
-        retval = ms_write_bytes(chip, PRO_WRITE_REG , 6, NO_WAIT_INT, buf, 6);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        retval = ms_send_cmd(chip, XC_CHG_POWER, WAIT_INT);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        RTSX_READ_REG(chip, MS_TRANS_CFG, buf);
-        if (buf[0] & (MS_INT_CMDNK | MS_INT_ERR))
-                TRACE_RET(chip, STATUS_FAIL);
-
-        return STATUS_SUCCESS;
-}
-#endif
-
-static int ms_read_attribute_info(struct rtsx_chip *chip)
-{
-        struct ms_info *ms_card = &(chip->ms_card);
-        int retval, i;
-        u8 val, *buf, class_code, device_type, sub_class, data[16];
-        u16 total_blk = 0, blk_size = 0;
-#ifdef SUPPORT_MSXC
-        u32 xc_total_blk = 0, xc_blk_size = 0;
-#endif
-        u32 sys_info_addr = 0, sys_info_size;
-#ifdef SUPPORT_PCGL_1P18
-        u32 model_name_addr = 0, model_name_size;
-        int found_sys_info = 0, found_model_name = 0;
-#endif
-
-        retval = ms_set_rw_reg_addr(chip, Pro_IntReg, 2, Pro_SystemParm, 7);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        if (CHK_MS8BIT(ms_card))
-                data[0] = PARALLEL_8BIT_IF;
-        else
-                data[0] = PARALLEL_4BIT_IF;
-
-        data[1] = 0;
-
-        data[2] = 0x40;
-        data[3] = 0;
-        data[4] = 0;
-        data[5] = 0;
-        data[6] = 0;
-        data[7] = 0;
-
-        for (i = 0; i < MS_MAX_RETRY_COUNT; i++) {
-                retval = ms_write_bytes(chip, PRO_WRITE_REG, 7, NO_WAIT_INT, data, 8);
-                if (retval == STATUS_SUCCESS)
-                        break;
-        }
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        buf = kmalloc(64 * 512, GFP_KERNEL);
-        if (buf == NULL)
-                TRACE_RET(chip, STATUS_ERROR);
-
-        for (i = 0; i < MS_MAX_RETRY_COUNT; i++) {
-                retval = ms_send_cmd(chip, PRO_READ_ATRB, WAIT_INT);
-                if (retval != STATUS_SUCCESS)
-                        continue;
-
-                retval = rtsx_read_register(chip, MS_TRANS_CFG, &val);
-                if (retval != STATUS_SUCCESS) {
-                        kfree(buf);
-                        TRACE_RET(chip, STATUS_FAIL);
-                }
-                if (!(val & MS_INT_BREQ)) {
-                        kfree(buf);
-                        TRACE_RET(chip, STATUS_FAIL);
-                }
-                retval = ms_transfer_data(chip, MS_TM_AUTO_READ, PRO_READ_LONG_DATA,
-                                0x40, WAIT_INT, 0, 0, buf, 64 * 512);
-                if (retval == STATUS_SUCCESS)
-                        break;
-                else
-                        rtsx_clear_ms_error(chip);
-        }
-        if (retval != STATUS_SUCCESS) {
-                kfree(buf);
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        i = 0;
-        do {
-                retval = rtsx_read_register(chip, MS_TRANS_CFG, &val);
-                if (retval != STATUS_SUCCESS) {
-                        kfree(buf);
-                        TRACE_RET(chip, STATUS_FAIL);
-                }
-
-                if ((val & MS_INT_CED) || !(val & MS_INT_BREQ))
-                        break;
-
-                retval = ms_transfer_tpc(chip, MS_TM_NORMAL_READ, PRO_READ_LONG_DATA, 0, WAIT_INT);
-                if (retval != STATUS_SUCCESS) {
-                        kfree(buf);
-                        TRACE_RET(chip, STATUS_FAIL);
-                }
-
-                i++;
-        } while (i < 1024);
-
-        if (retval != STATUS_SUCCESS) {
-                kfree(buf);
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        if ((buf[0] != 0xa5) && (buf[1] != 0xc3)) {
-                /* Signature code is wrong */
-                kfree(buf);
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        if ((buf[4] < 1) || (buf[4] > 12)) {
-                kfree(buf);
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        for (i = 0; i < buf[4]; i++) {
-                int cur_addr_off = 16 + i * 12;
-
-#ifdef SUPPORT_MSXC
-                if ((buf[cur_addr_off + 8] == 0x10) || (buf[cur_addr_off + 8] == 0x13))
-#else
-                if (buf[cur_addr_off + 8] == 0x10)
-#endif
-                {
-                        sys_info_addr = ((u32)buf[cur_addr_off + 0] << 24) |
-                                ((u32)buf[cur_addr_off + 1] << 16) |
-                                ((u32)buf[cur_addr_off + 2] << 8) | buf[cur_addr_off + 3];
-                        sys_info_size = ((u32)buf[cur_addr_off + 4] << 24) |
-                                ((u32)buf[cur_addr_off + 5] << 16) |
-                                ((u32)buf[cur_addr_off + 6] << 8) | buf[cur_addr_off + 7];
-                        RTSX_DEBUGP("sys_info_addr = 0x%x, sys_info_size = 0x%x\n",
-                                        sys_info_addr, sys_info_size);
-                        if (sys_info_size != 96)  {
-                                kfree(buf);
-                                TRACE_RET(chip, STATUS_FAIL);
-                        }
-                        if (sys_info_addr < 0x1A0) {
-                                kfree(buf);
-                                TRACE_RET(chip, STATUS_FAIL);
-                        }
-                        if ((sys_info_size + sys_info_addr) > 0x8000) {
-                                kfree(buf);
-                                TRACE_RET(chip, STATUS_FAIL);
-                        }
-
-#ifdef SUPPORT_MSXC
-                        if (buf[cur_addr_off + 8] == 0x13)
-                                ms_card->ms_type |= MS_XC;
-#endif
-#ifdef SUPPORT_PCGL_1P18
-                        found_sys_info = 1;
-#else
-                        break;
-#endif
-                }
-#ifdef SUPPORT_PCGL_1P18
-                if (buf[cur_addr_off + 8] == 0x15) {
-                        model_name_addr = ((u32)buf[cur_addr_off + 0] << 24) |
-                                ((u32)buf[cur_addr_off + 1] << 16) |
-                                ((u32)buf[cur_addr_off + 2] << 8) | buf[cur_addr_off + 3];
-                        model_name_size = ((u32)buf[cur_addr_off + 4] << 24) |
-                                ((u32)buf[cur_addr_off + 5] << 16) |
-                                ((u32)buf[cur_addr_off + 6] << 8) | buf[cur_addr_off + 7];
-                        RTSX_DEBUGP("model_name_addr = 0x%x, model_name_size = 0x%x\n",
-                                        model_name_addr, model_name_size);
-                        if (model_name_size != 48)  {
-                                kfree(buf);
-                                TRACE_RET(chip, STATUS_FAIL);
-                        }
-                        if (model_name_addr < 0x1A0) {
-                                kfree(buf);
-                                TRACE_RET(chip, STATUS_FAIL);
-                        }
-                        if ((model_name_size + model_name_addr) > 0x8000) {
-                                kfree(buf);
-                                TRACE_RET(chip, STATUS_FAIL);
-                        }
-
-                        found_model_name = 1;
-                }
-
-                if (found_sys_info && found_model_name)
-                        break;
-#endif
-        }
-
-        if (i == buf[4]) {
-                kfree(buf);
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        class_code =  buf[sys_info_addr + 0];
-        device_type = buf[sys_info_addr + 56];
-        sub_class = buf[sys_info_addr + 46];
-#ifdef SUPPORT_MSXC
-        if (CHK_MSXC(ms_card)) {
-                xc_total_blk = ((u32)buf[sys_info_addr + 6] << 24) |
-                                ((u32)buf[sys_info_addr + 7] << 16) |
-                                ((u32)buf[sys_info_addr + 8] << 8) |
-                                buf[sys_info_addr + 9];
-                xc_blk_size = ((u32)buf[sys_info_addr + 32] << 24) |
-                                ((u32)buf[sys_info_addr + 33] << 16) |
-                                ((u32)buf[sys_info_addr + 34] << 8) |
-                                buf[sys_info_addr + 35];
-                RTSX_DEBUGP("xc_total_blk = 0x%x, xc_blk_size = 0x%x\n", xc_total_blk, xc_blk_size);
-        } else {
-                total_blk = ((u16)buf[sys_info_addr + 6] << 8) | buf[sys_info_addr + 7];
-                blk_size = ((u16)buf[sys_info_addr + 2] << 8) | buf[sys_info_addr + 3];
-                RTSX_DEBUGP("total_blk = 0x%x, blk_size = 0x%x\n", total_blk, blk_size);
-        }
-#else
-        total_blk = ((u16)buf[sys_info_addr + 6] << 8) | buf[sys_info_addr + 7];
-        blk_size = ((u16)buf[sys_info_addr + 2] << 8) | buf[sys_info_addr + 3];
-        RTSX_DEBUGP("total_blk = 0x%x, blk_size = 0x%x\n", total_blk, blk_size);
-#endif
-
-        RTSX_DEBUGP("class_code = 0x%x, device_type = 0x%x, sub_class = 0x%x\n",
-                        class_code, device_type, sub_class);
-
-        memcpy(ms_card->raw_sys_info, buf + sys_info_addr, 96);
-#ifdef SUPPORT_PCGL_1P18
-        memcpy(ms_card->raw_model_name, buf + model_name_addr, 48);
-#endif
-
-        kfree(buf);
-
-#ifdef SUPPORT_MSXC
-        if (CHK_MSXC(ms_card)) {
-                if (class_code != 0x03)
-                        TRACE_RET(chip, STATUS_FAIL);
-        } else {
-                if (class_code != 0x02)
-                        TRACE_RET(chip, STATUS_FAIL);
-        }
-#else
-        if (class_code != 0x02)
-                TRACE_RET(chip, STATUS_FAIL);
-#endif
-
-        if (device_type != 0x00) {
-                if ((device_type == 0x01) || (device_type == 0x02) ||
-                                (device_type == 0x03)) {
-                        chip->card_wp |= MS_CARD;
-                } else {
-                        TRACE_RET(chip, STATUS_FAIL);
-                }
-        }
-
-        if (sub_class & 0xC0)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        RTSX_DEBUGP("class_code: 0x%x, device_type: 0x%x, sub_class: 0x%x\n",
-                class_code, device_type, sub_class);
-
-#ifdef SUPPORT_MSXC
-        if (CHK_MSXC(ms_card)) {
-                chip->capacity[chip->card2lun[MS_CARD]] =
-                        ms_card->capacity = xc_total_blk * xc_blk_size;
-        } else {
-                chip->capacity[chip->card2lun[MS_CARD]] =
-                        ms_card->capacity = total_blk * blk_size;
-        }
-#else
-        chip->capacity[chip->card2lun[MS_CARD]] = ms_card->capacity = total_blk * blk_size;
-#endif
-
-        return STATUS_SUCCESS;
-}
-
-#ifdef SUPPORT_MAGIC_GATE
-static int mg_set_tpc_para_sub(struct rtsx_chip *chip, int type, u8 mg_entry_num);
-#endif
-
-static int reset_ms_pro(struct rtsx_chip *chip)
-{
-        struct ms_info *ms_card = &(chip->ms_card);
-        int retval;
-#ifdef XC_POWERCLASS
-        u8 change_power_class;
-
-        if (chip->ms_power_class_en & 0x02)
-                change_power_class = 2;
-        else if (chip->ms_power_class_en & 0x01)
-                change_power_class = 1;
-        else
-                change_power_class = 0;
-#endif
-
-#ifdef XC_POWERCLASS
-Retry:
-#endif
-        retval = ms_pro_reset_flow(chip, 1);
-        if (retval != STATUS_SUCCESS) {
-                if (ms_card->switch_8bit_fail) {
-                        retval = ms_pro_reset_flow(chip, 0);
-                        if (retval != STATUS_SUCCESS)
-                                TRACE_RET(chip, STATUS_FAIL);
-                } else {
-                        TRACE_RET(chip, STATUS_FAIL);
-                }
-        }
-
-        retval = ms_read_attribute_info(chip);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-#ifdef XC_POWERCLASS
-        if (CHK_HG8BIT(ms_card))
-                change_power_class = 0;
-
-        if (change_power_class && CHK_MSXC(ms_card)) {
-                u8 power_class_en = chip->ms_power_class_en;
-
-                RTSX_DEBUGP("power_class_en = 0x%x\n", power_class_en);
-                RTSX_DEBUGP("change_power_class = %d\n", change_power_class);
-
-                if (change_power_class)
-                        power_class_en &= (1 << (change_power_class - 1));
-                else
-                        power_class_en = 0;
-
-                if (power_class_en) {
-                        u8 power_class_mode = (ms_card->raw_sys_info[46] & 0x18) >> 3;
-                        RTSX_DEBUGP("power_class_mode = 0x%x", power_class_mode);
-                        if (change_power_class > power_class_mode)
-                                change_power_class = power_class_mode;
-                        if (change_power_class) {
-                                retval = msxc_change_power(chip, change_power_class);
-                                if (retval != STATUS_SUCCESS) {
-                                        change_power_class--;
-                                        goto Retry;
-                                }
-                        }
-                }
-        }
-#endif
-
-#ifdef SUPPORT_MAGIC_GATE
-        retval = mg_set_tpc_para_sub(chip, 0, 0);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-#endif
-
-        if (CHK_HG8BIT(ms_card))
-                chip->card_bus_width[chip->card2lun[MS_CARD]] = 8;
-        else
-                chip->card_bus_width[chip->card2lun[MS_CARD]] = 4;
-
-        return STATUS_SUCCESS;
-}
-
-static int ms_read_status_reg(struct rtsx_chip *chip)
-{
-        int retval;
-        u8 val[2];
-
-        retval = ms_set_rw_reg_addr(chip, StatusReg0, 2, 0, 0);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        retval = ms_read_bytes(chip, READ_REG, 2, NO_WAIT_INT, val, 2);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        if (val[1] & (STS_UCDT | STS_UCEX | STS_UCFG)) {
-                ms_set_err_code(chip, MS_FLASH_READ_ERROR);
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        return STATUS_SUCCESS;
-}
-
-
-static int ms_read_extra_data(struct rtsx_chip *chip,
-                u16 block_addr, u8 page_num, u8 *buf, int buf_len)
-{
-        struct ms_info *ms_card = &(chip->ms_card);
-        int retval, i;
-        u8 val, data[10];
-
-        retval = ms_set_rw_reg_addr(chip, OverwriteFlag, MS_EXTRA_SIZE, SystemParm, 6);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        if (CHK_MS4BIT(ms_card)) {
-                /* Parallel interface */
-                data[0] = 0x88;
-        } else {
-                /* Serial interface */
-                data[0] = 0x80;
-        }
-        data[1] = 0;
-        data[2] = (u8)(block_addr >> 8);
-        data[3] = (u8)block_addr;
-        data[4] = 0x40;
-        data[5] = page_num;
-
-        for (i = 0; i < MS_MAX_RETRY_COUNT; i++) {
-                retval = ms_write_bytes(chip, WRITE_REG, 6, NO_WAIT_INT, data, 6);
-                if (retval == STATUS_SUCCESS)
-                        break;
-        }
-        if (i == MS_MAX_RETRY_COUNT)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        ms_set_err_code(chip, MS_NO_ERROR);
-
-        for (i = 0; i < MS_MAX_RETRY_COUNT; i++) {
-                retval = ms_send_cmd(chip, BLOCK_READ, WAIT_INT);
-                if (retval == STATUS_SUCCESS)
-                        break;
-        }
-        if (i == MS_MAX_RETRY_COUNT)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        ms_set_err_code(chip, MS_NO_ERROR);
-        retval = ms_read_bytes(chip, GET_INT, 1, NO_WAIT_INT, &val, 1);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        if (val & INT_REG_CMDNK) {
-                ms_set_err_code(chip, MS_CMD_NK);
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-        if (val & INT_REG_CED) {
-                if (val & INT_REG_ERR) {
-                        retval = ms_read_status_reg(chip);
-                        if (retval != STATUS_SUCCESS)
-                                TRACE_RET(chip, STATUS_FAIL);
-
-                        retval = ms_set_rw_reg_addr(chip, OverwriteFlag, MS_EXTRA_SIZE, SystemParm, 6);
-                        if (retval != STATUS_SUCCESS)
-                                TRACE_RET(chip, STATUS_FAIL);
-                }
-        }
-
-        retval = ms_read_bytes(chip, READ_REG, MS_EXTRA_SIZE, NO_WAIT_INT, data, MS_EXTRA_SIZE);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        if (buf && buf_len) {
-                if (buf_len > MS_EXTRA_SIZE)
-                        buf_len = MS_EXTRA_SIZE;
-                memcpy(buf, data, buf_len);
-        }
-
-        return STATUS_SUCCESS;
-}
-
-static int ms_write_extra_data(struct rtsx_chip *chip,
-                u16 block_addr, u8 page_num, u8 *buf, int buf_len)
-{
-        struct ms_info *ms_card = &(chip->ms_card);
-        int retval, i;
-        u8 val, data[16];
-
-        if (!buf || (buf_len < MS_EXTRA_SIZE))
-                TRACE_RET(chip, STATUS_FAIL);
-
-        retval = ms_set_rw_reg_addr(chip, OverwriteFlag, MS_EXTRA_SIZE, SystemParm, 6 + MS_EXTRA_SIZE);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        if (CHK_MS4BIT(ms_card))
-                data[0] = 0x88;
-        else
-                data[0] = 0x80;
-
-        data[1] = 0;
-        data[2] = (u8)(block_addr >> 8);
-        data[3] = (u8)block_addr;
-        data[4] = 0x40;
-        data[5] = page_num;
-
-        for (i = 6; i < MS_EXTRA_SIZE + 6; i++)
-                data[i] = buf[i - 6];
-
-        retval = ms_write_bytes(chip, WRITE_REG , (6+MS_EXTRA_SIZE), NO_WAIT_INT, data, 16);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        retval = ms_send_cmd(chip, BLOCK_WRITE, WAIT_INT);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        ms_set_err_code(chip, MS_NO_ERROR);
-        retval = ms_read_bytes(chip, GET_INT, 1, NO_WAIT_INT, &val, 1);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        if (val & INT_REG_CMDNK) {
-                ms_set_err_code(chip, MS_CMD_NK);
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-        if (val & INT_REG_CED) {
-                if (val & INT_REG_ERR) {
-                        ms_set_err_code(chip, MS_FLASH_WRITE_ERROR);
-                        TRACE_RET(chip, STATUS_FAIL);
-                }
-        }
-
-        return STATUS_SUCCESS;
-}
-
-
-static int ms_read_page(struct rtsx_chip *chip, u16 block_addr, u8 page_num)
-{
-        struct ms_info *ms_card = &(chip->ms_card);
-        int retval;
-        u8 val, data[6];
-
-        retval = ms_set_rw_reg_addr(chip, OverwriteFlag, MS_EXTRA_SIZE, SystemParm, 6);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        if (CHK_MS4BIT(ms_card))
-                data[0] = 0x88;
-        else
-                data[0] = 0x80;
-
-        data[1] = 0;
-        data[2] = (u8)(block_addr >> 8);
-        data[3] = (u8)block_addr;
-        data[4] = 0x20;
-        data[5] = page_num;
-
-        retval = ms_write_bytes(chip, WRITE_REG , 6, NO_WAIT_INT, data, 6);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        retval = ms_send_cmd(chip, BLOCK_READ, WAIT_INT);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        ms_set_err_code(chip, MS_NO_ERROR);
-        retval = ms_read_bytes(chip, GET_INT, 1, NO_WAIT_INT, &val, 1);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        if (val & INT_REG_CMDNK) {
-                ms_set_err_code(chip, MS_CMD_NK);
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        if (val & INT_REG_CED) {
-                if (val & INT_REG_ERR) {
-                        if (!(val & INT_REG_BREQ)) {
-                                ms_set_err_code(chip,  MS_FLASH_READ_ERROR);
-                                TRACE_RET(chip, STATUS_FAIL);
-                        }
-                        retval = ms_read_status_reg(chip);
-                        if (retval != STATUS_SUCCESS)
-                                ms_set_err_code(chip,  MS_FLASH_WRITE_ERROR);
-
-                } else {
-                        if (!(val & INT_REG_BREQ)) {
-                                ms_set_err_code(chip, MS_BREQ_ERROR);
-                                TRACE_RET(chip, STATUS_FAIL);
-                        }
-                }
-        }
-
-        retval = ms_transfer_tpc(chip, MS_TM_NORMAL_READ, READ_PAGE_DATA, 0, NO_WAIT_INT);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        if (ms_check_err_code(chip, MS_FLASH_WRITE_ERROR))
-                TRACE_RET(chip, STATUS_FAIL);
-
-        return STATUS_SUCCESS;
-}
-
-
-static int ms_set_bad_block(struct rtsx_chip *chip, u16 phy_blk)
-{
-        struct ms_info *ms_card = &(chip->ms_card);
-        int retval;
-        u8 val, data[8], extra[MS_EXTRA_SIZE];
-
-        retval = ms_read_extra_data(chip, phy_blk, 0, extra, MS_EXTRA_SIZE);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        retval = ms_set_rw_reg_addr(chip, OverwriteFlag, MS_EXTRA_SIZE, SystemParm, 7);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        ms_set_err_code(chip, MS_NO_ERROR);
-
-        if (CHK_MS4BIT(ms_card))
-                data[0] = 0x88;
-        else
-                data[0] = 0x80;
-
-        data[1] = 0;
-        data[2] = (u8)(phy_blk >> 8);
-        data[3] = (u8)phy_blk;
-        data[4] = 0x80;
-        data[5] = 0;
-        data[6] = extra[0] & 0x7F;
-        data[7] = 0xFF;
-
-        retval = ms_write_bytes(chip, WRITE_REG , 7, NO_WAIT_INT, data, 7);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        retval = ms_send_cmd(chip, BLOCK_WRITE, WAIT_INT);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        ms_set_err_code(chip, MS_NO_ERROR);
-        retval = ms_read_bytes(chip, GET_INT, 1, NO_WAIT_INT, &val, 1);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        if (val & INT_REG_CMDNK) {
-                ms_set_err_code(chip, MS_CMD_NK);
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        if (val & INT_REG_CED) {
-                if (val & INT_REG_ERR) {
-                        ms_set_err_code(chip, MS_FLASH_WRITE_ERROR);
-                        TRACE_RET(chip, STATUS_FAIL);
-                }
-        }
-
-        return STATUS_SUCCESS;
-}
-
-
-static int ms_erase_block(struct rtsx_chip *chip, u16 phy_blk)
-{
-        struct ms_info *ms_card = &(chip->ms_card);
-        int retval, i = 0;
-        u8 val, data[6];
-
-        retval = ms_set_rw_reg_addr(chip, OverwriteFlag, MS_EXTRA_SIZE, SystemParm, 6);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        ms_set_err_code(chip, MS_NO_ERROR);
-
-        if (CHK_MS4BIT(ms_card))
-                data[0] = 0x88;
-        else
-                data[0] = 0x80;
-
-        data[1] = 0;
-        data[2] = (u8)(phy_blk >> 8);
-        data[3] = (u8)phy_blk;
-        data[4] = 0;
-        data[5] = 0;
-
-        retval = ms_write_bytes(chip, WRITE_REG, 6, NO_WAIT_INT, data, 6);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-ERASE_RTY:
-        retval = ms_send_cmd(chip, BLOCK_ERASE, WAIT_INT);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        ms_set_err_code(chip, MS_NO_ERROR);
-        retval = ms_read_bytes(chip, GET_INT, 1, NO_WAIT_INT, &val, 1);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        if (val & INT_REG_CMDNK) {
-                if (i < 3) {
-                        i++;
-                        goto ERASE_RTY;
-                }
-
-                ms_set_err_code(chip, MS_CMD_NK);
-                ms_set_bad_block(chip, phy_blk);
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        if (val & INT_REG_CED) {
-                if (val & INT_REG_ERR) {
-                        ms_set_err_code(chip, MS_FLASH_WRITE_ERROR);
-                        TRACE_RET(chip, STATUS_FAIL);
-                }
-        }
-
-        return STATUS_SUCCESS;
-}
-
-
-static void ms_set_page_status(u16 log_blk, u8 type, u8 *extra, int extra_len)
-{
-        if (!extra || (extra_len < MS_EXTRA_SIZE))
-                return;
-
-        memset(extra, 0xFF, MS_EXTRA_SIZE);
-
-        if (type == setPS_NG) {
-                /* set page status as 1:NG,and block status keep 1:OK */
-                extra[0] = 0xB8;
-        } else {
-                /* set page status as 0:Data Error,and block status keep 1:OK */
-                extra[0] = 0x98;
-        }
-
-        extra[2] = (u8)(log_blk >> 8);
-        extra[3] = (u8)log_blk;
-}
-
-static int ms_init_page(struct rtsx_chip *chip, u16 phy_blk, u16 log_blk, u8 start_page, u8 end_page)
-{
-        int retval;
-        u8 extra[MS_EXTRA_SIZE], i;
-
-        memset(extra, 0xff, MS_EXTRA_SIZE);
-
-        extra[0] = 0xf8;        /* Block, page OK, data erased */
-        extra[1] = 0xff;
-        extra[2] = (u8)(log_blk >> 8);
-        extra[3] = (u8)log_blk;
-
-        for (i = start_page; i < end_page; i++) {
-                if (detect_card_cd(chip, MS_CARD) != STATUS_SUCCESS) {
-                        ms_set_err_code(chip, MS_NO_CARD);
-                        TRACE_RET(chip, STATUS_FAIL);
-                }
-
-                retval = ms_write_extra_data(chip, phy_blk, i, extra, MS_EXTRA_SIZE);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        return STATUS_SUCCESS;
-}
-
-static int ms_copy_page(struct rtsx_chip *chip, u16 old_blk, u16 new_blk,
-                u16 log_blk, u8 start_page, u8 end_page)
-{
-        struct ms_info *ms_card = &(chip->ms_card);
-        int retval, rty_cnt, uncorrect_flag = 0;
-        u8 extra[MS_EXTRA_SIZE], val, i, j, data[16];
-
-        RTSX_DEBUGP("Copy page from 0x%x to 0x%x, logical block is 0x%x\n",
-                old_blk, new_blk, log_blk);
-        RTSX_DEBUGP("start_page = %d, end_page = %d\n", start_page, end_page);
-
-        retval = ms_read_extra_data(chip, new_blk, 0, extra, MS_EXTRA_SIZE);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        retval = ms_read_status_reg(chip);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        RTSX_READ_REG(chip, PPBUF_BASE2, &val);
-
-        if (val & BUF_FULL) {
-                retval = ms_send_cmd(chip, CLEAR_BUF, WAIT_INT);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-
-                retval = ms_read_bytes(chip, GET_INT, 1, NO_WAIT_INT, &val, 1);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-
-                if (!(val & INT_REG_CED)) {
-                        ms_set_err_code(chip, MS_FLASH_WRITE_ERROR);
-                        TRACE_RET(chip, STATUS_FAIL);
-                }
-        }
-
-        for (i = start_page; i < end_page; i++) {
-                if (detect_card_cd(chip, MS_CARD) != STATUS_SUCCESS) {
-                        ms_set_err_code(chip, MS_NO_CARD);
-                        TRACE_RET(chip, STATUS_FAIL);
-                }
-
-                ms_read_extra_data(chip, old_blk, i, extra, MS_EXTRA_SIZE);
-
-                retval = ms_set_rw_reg_addr(chip, OverwriteFlag, MS_EXTRA_SIZE, SystemParm, 6);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-
-                ms_set_err_code(chip, MS_NO_ERROR);
-
-                if (CHK_MS4BIT(ms_card))
-                        data[0] = 0x88;
-                else
-                        data[0] = 0x80;
-
-                data[1] = 0;
-                data[2] = (u8)(old_blk >> 8);
-                data[3] = (u8)old_blk;
-                data[4] = 0x20;
-                data[5] = i;
-
-                retval = ms_write_bytes(chip, WRITE_REG , 6, NO_WAIT_INT, data, 6);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-
-                retval = ms_send_cmd(chip, BLOCK_READ, WAIT_INT);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-
-                ms_set_err_code(chip, MS_NO_ERROR);
-                retval = ms_read_bytes(chip, GET_INT, 1, NO_WAIT_INT, &val, 1);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-
-                if (val & INT_REG_CMDNK) {
-                        ms_set_err_code(chip, MS_CMD_NK);
-                        TRACE_RET(chip, STATUS_FAIL);
-                }
-
-                if (val & INT_REG_CED) {
-                        if (val & INT_REG_ERR) {
-                                retval = ms_read_status_reg(chip);
-                                if (retval != STATUS_SUCCESS) {
-                                        uncorrect_flag = 1;
-                                        RTSX_DEBUGP("Uncorrectable error\n");
-                                } else {
-                                        uncorrect_flag = 0;
-                                }
-
-                                retval = ms_transfer_tpc(chip, MS_TM_NORMAL_READ, READ_PAGE_DATA, 0, NO_WAIT_INT);
-                                if (retval != STATUS_SUCCESS)
-                                        TRACE_RET(chip, STATUS_FAIL);
-
-                                if (uncorrect_flag) {
-                                        ms_set_page_status(log_blk, setPS_NG, extra, MS_EXTRA_SIZE);
-                                        if (i == 0)
-                                                extra[0] &= 0xEF;
-
-                                        ms_write_extra_data(chip, old_blk, i, extra, MS_EXTRA_SIZE);
-                                        RTSX_DEBUGP("page %d : extra[0] = 0x%x\n", i, extra[0]);
-                                        MS_SET_BAD_BLOCK_FLG(ms_card);
-
-                                        ms_set_page_status(log_blk, setPS_Error, extra, MS_EXTRA_SIZE);
-                                        ms_write_extra_data(chip, new_blk, i, extra, MS_EXTRA_SIZE);
-                                        continue;
-                                }
-
-                                for (rty_cnt = 0; rty_cnt < MS_MAX_RETRY_COUNT; rty_cnt++) {
-                                        retval = ms_transfer_tpc(chip, MS_TM_NORMAL_WRITE,
-                                                        WRITE_PAGE_DATA, 0, NO_WAIT_INT);
-                                        if (retval == STATUS_SUCCESS)
-                                                break;
-                                }
-                                if (rty_cnt == MS_MAX_RETRY_COUNT)
-                                        TRACE_RET(chip, STATUS_FAIL);
-                        }
-
-                        if (!(val & INT_REG_BREQ)) {
-                                ms_set_err_code(chip, MS_BREQ_ERROR);
-                                TRACE_RET(chip, STATUS_FAIL);
-                        }
-                }
-
-                retval = ms_set_rw_reg_addr(chip, OverwriteFlag,
-                                MS_EXTRA_SIZE, SystemParm, (6+MS_EXTRA_SIZE));
-
-                ms_set_err_code(chip, MS_NO_ERROR);
-
-                if (CHK_MS4BIT(ms_card))
-                        data[0] = 0x88;
-                else
-                        data[0] = 0x80;
-
-                data[1] = 0;
-                data[2] = (u8)(new_blk >> 8);
-                data[3] = (u8)new_blk;
-                data[4] = 0x20;
-                data[5] = i;
-
-                if ((extra[0] & 0x60) != 0x60)
-                        data[6] = extra[0];
-                else
-                        data[6] = 0xF8;
-
-                data[6 + 1] = 0xFF;
-                data[6 + 2] = (u8)(log_blk >> 8);
-                data[6 + 3] = (u8)log_blk;
-
-                for (j = 4; j <= MS_EXTRA_SIZE; j++)
-                        data[6 + j] = 0xFF;
-
-                retval = ms_write_bytes(chip, WRITE_REG, (6 + MS_EXTRA_SIZE), NO_WAIT_INT, data, 16);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-
-                retval = ms_send_cmd(chip, BLOCK_WRITE, WAIT_INT);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-
-                ms_set_err_code(chip, MS_NO_ERROR);
-                retval = ms_read_bytes(chip, GET_INT, 1, NO_WAIT_INT, &val, 1);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-
-                if (val & INT_REG_CMDNK) {
-                        ms_set_err_code(chip, MS_CMD_NK);
-                        TRACE_RET(chip, STATUS_FAIL);
-                }
-
-                if (val & INT_REG_CED) {
-                        if (val & INT_REG_ERR) {
-                                ms_set_err_code(chip, MS_FLASH_WRITE_ERROR);
-                                TRACE_RET(chip, STATUS_FAIL);
-                        }
-                }
-
-                if (i == 0) {
-                        retval = ms_set_rw_reg_addr(chip, OverwriteFlag, MS_EXTRA_SIZE, SystemParm, 7);
-                        if (retval != STATUS_SUCCESS)
-                                TRACE_RET(chip, STATUS_FAIL);
-
-                        ms_set_err_code(chip, MS_NO_ERROR);
-
-                        if (CHK_MS4BIT(ms_card))
-                                data[0] = 0x88;
-                        else
-                                data[0] = 0x80;
-
-                        data[1] = 0;
-                        data[2] = (u8)(old_blk >> 8);
-                        data[3] = (u8)old_blk;
-                        data[4] = 0x80;
-                        data[5] = 0;
-                        data[6] = 0xEF;
-                        data[7] = 0xFF;
-
-                        retval = ms_write_bytes(chip, WRITE_REG, 7, NO_WAIT_INT, data, 8);
-                        if (retval != STATUS_SUCCESS)
-                                TRACE_RET(chip, STATUS_FAIL);
-
-                        retval = ms_send_cmd(chip, BLOCK_WRITE, WAIT_INT);
-                        if (retval != STATUS_SUCCESS)
-                                TRACE_RET(chip, STATUS_FAIL);
-
-                        ms_set_err_code(chip, MS_NO_ERROR);
-                        retval = ms_read_bytes(chip, GET_INT, 1, NO_WAIT_INT, &val, 1);
-                        if (retval != STATUS_SUCCESS)
-                                TRACE_RET(chip, STATUS_FAIL);
-
-                        if (val & INT_REG_CMDNK) {
-                                ms_set_err_code(chip, MS_CMD_NK);
-                                TRACE_RET(chip, STATUS_FAIL);
-                        }
-
-                        if (val & INT_REG_CED) {
-                                if (val & INT_REG_ERR) {
-                                        ms_set_err_code(chip, MS_FLASH_WRITE_ERROR);
-                                        TRACE_RET(chip, STATUS_FAIL);
-                                }
-                        }
-                }
-        }
-
-        return STATUS_SUCCESS;
-}
-
-
-static int reset_ms(struct rtsx_chip *chip)
-{
-        struct ms_info *ms_card = &(chip->ms_card);
-        int retval;
-        u16 i, reg_addr, block_size;
-        u8 val, extra[MS_EXTRA_SIZE], j, *ptr;
-#ifndef SUPPORT_MAGIC_GATE
-        u16 eblock_cnt;
-#endif
-
-        retval = ms_prepare_reset(chip);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        ms_card->ms_type |= TYPE_MS;
-
-        retval = ms_send_cmd(chip, MS_RESET, NO_WAIT_INT);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        retval = ms_read_status_reg(chip);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        RTSX_READ_REG(chip, PPBUF_BASE2, &val);
-        if (val & WRT_PRTCT)
-                chip->card_wp |= MS_CARD;
-        else
-                chip->card_wp &= ~MS_CARD;
-
-        i = 0;
-
-RE_SEARCH:
-        /* Search Boot Block */
-        while (i < (MAX_DEFECTIVE_BLOCK + 2)) {
-                if (detect_card_cd(chip, MS_CARD) != STATUS_SUCCESS) {
-                        ms_set_err_code(chip, MS_NO_CARD);
-                        TRACE_RET(chip, STATUS_FAIL);
-                }
-
-                retval = ms_read_extra_data(chip, i, 0, extra, MS_EXTRA_SIZE);
-                if (retval != STATUS_SUCCESS) {
-                        i++;
-                        continue;
-                }
-
-                if (extra[0] & BLOCK_OK) {
-                        if (!(extra[1] & NOT_BOOT_BLOCK)) {
-                                ms_card->boot_block = i;
-                                break;
-                        }
-                }
-                i++;
-        }
-
-        if (i == (MAX_DEFECTIVE_BLOCK + 2)) {
-                RTSX_DEBUGP("No boot block found!");
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        for (j = 0; j < 3; j++) {
-                retval = ms_read_page(chip, ms_card->boot_block, j);
-                if (retval != STATUS_SUCCESS) {
-                        if (ms_check_err_code(chip, MS_FLASH_WRITE_ERROR)) {
-                                i = ms_card->boot_block + 1;
-                                ms_set_err_code(chip, MS_NO_ERROR);
-                                goto RE_SEARCH;
-                        }
-                }
-        }
-
-        retval = ms_read_page(chip, ms_card->boot_block, 0);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        /* Read MS system information as sys_info */
-        rtsx_init_cmd(chip);
-
-        for (i = 0; i < 96; i++)
-                rtsx_add_cmd(chip, READ_REG_CMD, PPBUF_BASE2 + 0x1A0 + i, 0, 0);
-
-        retval = rtsx_send_cmd(chip, MS_CARD, 100);
-        if (retval < 0)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        ptr = rtsx_get_cmd_data(chip);
-        memcpy(ms_card->raw_sys_info, ptr, 96);
-
-        /* Read useful block contents */
-        rtsx_init_cmd(chip);
-
-        rtsx_add_cmd(chip, READ_REG_CMD, HEADER_ID0, 0, 0);
-        rtsx_add_cmd(chip, READ_REG_CMD, HEADER_ID1, 0, 0);
-
-        for (reg_addr = DISABLED_BLOCK0; reg_addr <= DISABLED_BLOCK3; reg_addr++)
-                rtsx_add_cmd(chip, READ_REG_CMD, reg_addr, 0, 0);
-
-        for (reg_addr = BLOCK_SIZE_0; reg_addr <= PAGE_SIZE_1; reg_addr++)
-                rtsx_add_cmd(chip, READ_REG_CMD, reg_addr, 0, 0);
-
-        rtsx_add_cmd(chip, READ_REG_CMD, MS_Device_Type, 0, 0);
-        rtsx_add_cmd(chip, READ_REG_CMD, MS_4bit_Support, 0, 0);
-
-        retval = rtsx_send_cmd(chip, MS_CARD, 100);
-        if (retval < 0)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        ptr = rtsx_get_cmd_data(chip);
-
-        RTSX_DEBUGP("Boot block data:\n");
-        RTSX_DUMP(ptr, 16);
-
-        /* Block ID error
-         * HEADER_ID0, HEADER_ID1
-         */
-        if (ptr[0] != 0x00 || ptr[1] != 0x01) {
-                i = ms_card->boot_block + 1;
-                goto RE_SEARCH;
-        }
-
-        /* Page size error
-         * PAGE_SIZE_0, PAGE_SIZE_1
-         */
-        if (ptr[12] != 0x02 || ptr[13] != 0x00) {
-                i = ms_card->boot_block + 1;
-                goto RE_SEARCH;
-        }
-
-        if ((ptr[14] == 1) || (ptr[14] == 3))
-                chip->card_wp |= MS_CARD;
-
-        /* BLOCK_SIZE_0, BLOCK_SIZE_1 */
-        block_size = ((u16)ptr[6] << 8) | ptr[7];
-        if (block_size == 0x0010) {
-                /* Block size 16KB */
-                ms_card->block_shift = 5;
-                ms_card->page_off = 0x1F;
-        } else if (block_size == 0x0008) {
-                /* Block size 8KB */
-                ms_card->block_shift = 4;
-                ms_card->page_off = 0x0F;
-        }
-
-        /* BLOCK_COUNT_0, BLOCK_COUNT_1 */
-        ms_card->total_block = ((u16)ptr[8] << 8) | ptr[9];
-
-#ifdef SUPPORT_MAGIC_GATE
-        j = ptr[10];
-
-        if (ms_card->block_shift == 4)  { /* 4MB or 8MB */
-                if (j < 2)  { /* Effective block for 4MB: 0x1F0 */
-                        ms_card->capacity = 0x1EE0;
-                } else { /* Effective block for 8MB: 0x3E0 */
-                        ms_card->capacity = 0x3DE0;
-                }
-        } else  { /* 16MB, 32MB, 64MB or 128MB */
-                if (j < 5)  { /* Effective block for 16MB: 0x3E0 */
-                        ms_card->capacity = 0x7BC0;
-                } else if (j < 0xA) { /* Effective block for 32MB: 0x7C0 */
-                        ms_card->capacity = 0xF7C0;
-                } else if (j < 0x11) { /* Effective block for 64MB: 0xF80 */
-                        ms_card->capacity = 0x1EF80;
-                } else { /* Effective block for 128MB: 0x1F00 */
-                        ms_card->capacity = 0x3DF00;
-                }
-        }
-#else
-        /* EBLOCK_COUNT_0, EBLOCK_COUNT_1 */
-        eblock_cnt = ((u16)ptr[10] << 8) | ptr[11];
-
-        ms_card->capacity = ((u32)eblock_cnt - 2) << ms_card->block_shift;
-#endif
-
-        chip->capacity[chip->card2lun[MS_CARD]] = ms_card->capacity;
-
-        /* Switch I/F Mode */
-        if (ptr[15]) {
-                retval = ms_set_rw_reg_addr(chip, 0, 0, SystemParm, 1);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-
-                RTSX_WRITE_REG(chip, PPBUF_BASE2, 0xFF, 0x88);
-                RTSX_WRITE_REG(chip, PPBUF_BASE2 + 1, 0xFF, 0);
-
-                retval = ms_transfer_tpc(chip, MS_TM_WRITE_BYTES, WRITE_REG , 1, NO_WAIT_INT);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-
-                RTSX_WRITE_REG(chip, MS_CFG, 0x58 | MS_NO_CHECK_INT,
-                                MS_BUS_WIDTH_4 | PUSH_TIME_ODD | MS_NO_CHECK_INT);
-
-                ms_card->ms_type |= MS_4BIT;
-        }
-
-        if (CHK_MS4BIT(ms_card))
-                chip->card_bus_width[chip->card2lun[MS_CARD]] = 4;
-        else
-                chip->card_bus_width[chip->card2lun[MS_CARD]] = 1;
-
-        return STATUS_SUCCESS;
-}
-
-static int ms_init_l2p_tbl(struct rtsx_chip *chip)
-{
-        struct ms_info *ms_card = &(chip->ms_card);
-        int size, i, seg_no, retval;
-        u16 defect_block, reg_addr;
-        u8 val1, val2;
-
-        ms_card->segment_cnt = ms_card->total_block >> 9;
-        RTSX_DEBUGP("ms_card->segment_cnt = %d\n", ms_card->segment_cnt);
-
-        size = ms_card->segment_cnt * sizeof(struct zone_entry);
-        ms_card->segment = vzalloc(size);
-        if (ms_card->segment == NULL)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        retval = ms_read_page(chip, ms_card->boot_block, 1);
-        if (retval != STATUS_SUCCESS)
-                TRACE_GOTO(chip, INIT_FAIL);
-
-        reg_addr = PPBUF_BASE2;
-        for (i = 0; i < (((ms_card->total_block >> 9) * 10) + 1); i++) {
-                retval = rtsx_read_register(chip, reg_addr++, &val1);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_GOTO(chip, INIT_FAIL);
-
-                retval = rtsx_read_register(chip, reg_addr++, &val2);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_GOTO(chip, INIT_FAIL);
-
-                defect_block = ((u16)val1 << 8) | val2;
-                if (defect_block == 0xFFFF)
-                        break;
-
-                seg_no = defect_block / 512;
-                ms_card->segment[seg_no].defect_list[ms_card->segment[seg_no].disable_count++] = defect_block;
-        }
-
-        for (i = 0; i < ms_card->segment_cnt; i++) {
-                ms_card->segment[i].build_flag = 0;
-                ms_card->segment[i].l2p_table = NULL;
-                ms_card->segment[i].free_table = NULL;
-                ms_card->segment[i].get_index = 0;
-                ms_card->segment[i].set_index = 0;
-                ms_card->segment[i].unused_blk_cnt = 0;
-
-                RTSX_DEBUGP("defective block count of segment %d is %d\n",
-                                        i, ms_card->segment[i].disable_count);
-        }
-
-        return STATUS_SUCCESS;
-
-INIT_FAIL:
-        if (ms_card->segment) {
-                vfree(ms_card->segment);
-                ms_card->segment = NULL;
-        }
-
-        return STATUS_FAIL;
-}
-
-static u16 ms_get_l2p_tbl(struct rtsx_chip *chip, int seg_no, u16 log_off)
-{
-        struct ms_info *ms_card = &(chip->ms_card);
-        struct zone_entry *segment;
-
-        if (ms_card->segment == NULL)
-                return 0xFFFF;
-
-        segment = &(ms_card->segment[seg_no]);
-
-        if (segment->l2p_table)
-                return segment->l2p_table[log_off];
-
-        return 0xFFFF;
-}
-
-static void ms_set_l2p_tbl(struct rtsx_chip *chip, int seg_no, u16 log_off, u16 phy_blk)
-{
-        struct ms_info *ms_card = &(chip->ms_card);
-        struct zone_entry *segment;
-
-        if (ms_card->segment == NULL)
-                return;
-
-        segment = &(ms_card->segment[seg_no]);
-        if (segment->l2p_table)
-                segment->l2p_table[log_off] = phy_blk;
-}
-
-static void ms_set_unused_block(struct rtsx_chip *chip, u16 phy_blk)
-{
-        struct ms_info *ms_card = &(chip->ms_card);
-        struct zone_entry *segment;
-        int seg_no;
-
-        seg_no = (int)phy_blk >> 9;
-        segment = &(ms_card->segment[seg_no]);
-
-        segment->free_table[segment->set_index++] = phy_blk;
-        if (segment->set_index >= MS_FREE_TABLE_CNT)
-                segment->set_index = 0;
-
-        segment->unused_blk_cnt++;
-}
-
-static u16 ms_get_unused_block(struct rtsx_chip *chip, int seg_no)
-{
-        struct ms_info *ms_card = &(chip->ms_card);
-        struct zone_entry *segment;
-        u16 phy_blk;
-
-        segment = &(ms_card->segment[seg_no]);
-
-        if (segment->unused_blk_cnt <= 0)
-                return 0xFFFF;
-
-        phy_blk = segment->free_table[segment->get_index];
-        segment->free_table[segment->get_index++] = 0xFFFF;
-        if (segment->get_index >= MS_FREE_TABLE_CNT)
-                segment->get_index = 0;
-
-        segment->unused_blk_cnt--;
-
-        return phy_blk;
-}
-
-static const unsigned short ms_start_idx[] = {0, 494, 990, 1486, 1982, 2478, 2974, 3470,
-        3966, 4462, 4958, 5454, 5950, 6446, 6942, 7438, 7934};
-
-static int ms_arbitrate_l2p(struct rtsx_chip *chip, u16 phy_blk, u16 log_off, u8 us1, u8 us2)
-{
-        struct ms_info *ms_card = &(chip->ms_card);
-        struct zone_entry *segment;
-        int seg_no;
-        u16 tmp_blk;
-
-        seg_no = (int)phy_blk >> 9;
-        segment = &(ms_card->segment[seg_no]);
-        tmp_blk = segment->l2p_table[log_off];
-
-        if (us1 != us2) {
-                if (us1 == 0) {
-                        if (!(chip->card_wp & MS_CARD))
-                                ms_erase_block(chip, tmp_blk);
-
-                        ms_set_unused_block(chip, tmp_blk);
-                        segment->l2p_table[log_off] = phy_blk;
-                } else {
-                        if (!(chip->card_wp & MS_CARD))
-                                ms_erase_block(chip, phy_blk);
-
-                        ms_set_unused_block(chip, phy_blk);
-                }
-        } else {
-                if (phy_blk < tmp_blk) {
-                        if (!(chip->card_wp & MS_CARD))
-                                ms_erase_block(chip, phy_blk);
-
-                        ms_set_unused_block(chip, phy_blk);
-                } else {
-                        if (!(chip->card_wp & MS_CARD))
-                                ms_erase_block(chip, tmp_blk);
-
-                        ms_set_unused_block(chip, tmp_blk);
-                        segment->l2p_table[log_off] = phy_blk;
-                }
-        }
-
-        return STATUS_SUCCESS;
-}
-
-static int ms_build_l2p_tbl(struct rtsx_chip *chip, int seg_no)
-{
-        struct ms_info *ms_card = &(chip->ms_card);
-        struct zone_entry *segment;
-        int retval, table_size, disable_cnt, defect_flag, i;
-        u16 start, end, phy_blk, log_blk, tmp_blk;
-        u8 extra[MS_EXTRA_SIZE], us1, us2;
-
-        RTSX_DEBUGP("ms_build_l2p_tbl: %d\n", seg_no);
-
-        if (ms_card->segment == NULL) {
-                retval = ms_init_l2p_tbl(chip);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, retval);
-        }
-
-        if (ms_card->segment[seg_no].build_flag) {
-                RTSX_DEBUGP("l2p table of segment %d has been built\n", seg_no);
-                return STATUS_SUCCESS;
-        }
-
-        if (seg_no == 0)
-                table_size = 494;
-        else
-                table_size = 496;
-
-        segment = &(ms_card->segment[seg_no]);
-
-        if (segment->l2p_table == NULL) {
-                segment->l2p_table = (u16 *)vmalloc(table_size * 2);
-                if (segment->l2p_table == NULL)
-                        TRACE_GOTO(chip, BUILD_FAIL);
-        }
-        memset((u8 *)(segment->l2p_table), 0xff, table_size * 2);
-
-        if (segment->free_table == NULL) {
-                segment->free_table = (u16 *)vmalloc(MS_FREE_TABLE_CNT * 2);
-                if (segment->free_table == NULL)
-                        TRACE_GOTO(chip, BUILD_FAIL);
-        }
-        memset((u8 *)(segment->free_table), 0xff, MS_FREE_TABLE_CNT * 2);
-
-        start = (u16)seg_no << 9;
-        end = (u16)(seg_no + 1) << 9;
-
-        disable_cnt = segment->disable_count;
-
-        segment->get_index = segment->set_index = 0;
-        segment->unused_blk_cnt = 0;
-
-        for (phy_blk = start; phy_blk < end; phy_blk++) {
-                if (disable_cnt) {
-                        defect_flag = 0;
-                        for (i = 0; i < segment->disable_count; i++) {
-                                if (phy_blk == segment->defect_list[i]) {
-                                        defect_flag = 1;
-                                        break;
-                                }
-                        }
-                        if (defect_flag) {
-                                disable_cnt--;
-                                continue;
-                        }
-                }
-
-                retval = ms_read_extra_data(chip, phy_blk, 0, extra, MS_EXTRA_SIZE);
-                if (retval != STATUS_SUCCESS) {
-                        RTSX_DEBUGP("read extra data fail\n");
-                        ms_set_bad_block(chip, phy_blk);
-                        continue;
-                }
-
-                if (seg_no == ms_card->segment_cnt - 1) {
-                        if (!(extra[1] & NOT_TRANSLATION_TABLE)) {
-                                if (!(chip->card_wp & MS_CARD)) {
-                                        retval = ms_erase_block(chip, phy_blk);
-                                        if (retval != STATUS_SUCCESS)
-                                                continue;
-                                        extra[2] = 0xff;
-                                        extra[3] = 0xff;
-                                }
-                        }
-                }
-
-                if (!(extra[0] & BLOCK_OK))
-                        continue;
-                if (!(extra[1] & NOT_BOOT_BLOCK))
-                        continue;
-                if ((extra[0] & PAGE_OK) != PAGE_OK)
-                        continue;
-
-                log_blk = ((u16)extra[2] << 8) | extra[3];
-
-                if (log_blk == 0xFFFF) {
-                        if (!(chip->card_wp & MS_CARD)) {
-                                retval = ms_erase_block(chip, phy_blk);
-                                if (retval != STATUS_SUCCESS)
-                                        continue;
-                        }
-                        ms_set_unused_block(chip, phy_blk);
-                        continue;
-                }
-
-                if ((log_blk < ms_start_idx[seg_no]) ||
-                                (log_blk >= ms_start_idx[seg_no+1])) {
-                        if (!(chip->card_wp & MS_CARD)) {
-                                retval = ms_erase_block(chip, phy_blk);
-                                if (retval != STATUS_SUCCESS)
-                                        continue;
-                        }
-                        ms_set_unused_block(chip, phy_blk);
-                        continue;
-                }
-
-                if (segment->l2p_table[log_blk - ms_start_idx[seg_no]] == 0xFFFF) {
-                        segment->l2p_table[log_blk - ms_start_idx[seg_no]] = phy_blk;
-                        continue;
-                }
-
-                us1 = extra[0] & 0x10;
-                tmp_blk = segment->l2p_table[log_blk - ms_start_idx[seg_no]];
-                retval = ms_read_extra_data(chip, tmp_blk, 0, extra, MS_EXTRA_SIZE);
-                if (retval != STATUS_SUCCESS)
-                        continue;
-                us2 = extra[0] & 0x10;
-
-                (void)ms_arbitrate_l2p(chip, phy_blk, log_blk-ms_start_idx[seg_no], us1, us2);
-                continue;
-        }
-
-        segment->build_flag = 1;
-
-        RTSX_DEBUGP("unused block count: %d\n", segment->unused_blk_cnt);
-
-        /* Logical Address Confirmation Process */
-        if (seg_no == ms_card->segment_cnt - 1) {
-                if (segment->unused_blk_cnt < 2)
-                        chip->card_wp |= MS_CARD;
-        } else {
-                if (segment->unused_blk_cnt < 1)
-                        chip->card_wp |= MS_CARD;
-        }
-
-        if (chip->card_wp & MS_CARD)
-                return STATUS_SUCCESS;
-
-        for (log_blk = ms_start_idx[seg_no]; log_blk < ms_start_idx[seg_no + 1]; log_blk++) {
-                if (segment->l2p_table[log_blk-ms_start_idx[seg_no]] == 0xFFFF) {
-                        phy_blk = ms_get_unused_block(chip, seg_no);
-                        if (phy_blk == 0xFFFF) {
-                                chip->card_wp |= MS_CARD;
-                                return STATUS_SUCCESS;
-                        }
-                        retval = ms_init_page(chip, phy_blk, log_blk, 0, 1);
-                        if (retval != STATUS_SUCCESS)
-                                TRACE_GOTO(chip, BUILD_FAIL);
-
-                        segment->l2p_table[log_blk-ms_start_idx[seg_no]] = phy_blk;
-                        if (seg_no == ms_card->segment_cnt - 1) {
-                                if (segment->unused_blk_cnt < 2) {
-                                        chip->card_wp |= MS_CARD;
-                                        return STATUS_SUCCESS;
-                                }
-                        } else {
-                                if (segment->unused_blk_cnt < 1) {
-                                        chip->card_wp |= MS_CARD;
-                                        return STATUS_SUCCESS;
-                                }
-                        }
-                }
-        }
-
-        /* Make boot block be the first normal block */
-        if (seg_no == 0) {
-                for (log_blk = 0; log_blk < 494; log_blk++) {
-                        tmp_blk = segment->l2p_table[log_blk];
-                        if (tmp_blk < ms_card->boot_block) {
-                                RTSX_DEBUGP("Boot block is not the first normal block.\n");
-
-                                if (chip->card_wp & MS_CARD)
-                                        break;
-
-                                phy_blk = ms_get_unused_block(chip, 0);
-                                retval = ms_copy_page(chip, tmp_blk, phy_blk,
-                                                log_blk, 0, ms_card->page_off + 1);
-                                if (retval != STATUS_SUCCESS)
-                                        TRACE_RET(chip, STATUS_FAIL);
-
-                                segment->l2p_table[log_blk] = phy_blk;
-
-                                retval = ms_set_bad_block(chip, tmp_blk);
-                                if (retval != STATUS_SUCCESS)
-                                        TRACE_RET(chip, STATUS_FAIL);
-                        }
-                }
-        }
-
-        return STATUS_SUCCESS;
-
-BUILD_FAIL:
-        segment->build_flag = 0;
-        if (segment->l2p_table) {
-                vfree(segment->l2p_table);
-                segment->l2p_table = NULL;
-        }
-        if (segment->free_table) {
-                vfree(segment->free_table);
-                segment->free_table = NULL;
-        }
-
-        return STATUS_FAIL;
-}
-
-
-int reset_ms_card(struct rtsx_chip *chip)
-{
-        struct ms_info *ms_card = &(chip->ms_card);
-        int retval;
-
-        memset(ms_card, 0, sizeof(struct ms_info));
-
-        retval = enable_card_clock(chip, MS_CARD);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        retval = select_card(chip, MS_CARD);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        ms_card->ms_type = 0;
-
-        retval = reset_ms_pro(chip);
-        if (retval != STATUS_SUCCESS) {
-                if (ms_card->check_ms_flow) {
-                        retval = reset_ms(chip);
-                        if (retval != STATUS_SUCCESS)
-                                TRACE_RET(chip, STATUS_FAIL);
-                } else {
-                        TRACE_RET(chip, STATUS_FAIL);
-                }
-        }
-
-        retval = ms_set_init_para(chip);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        if (!CHK_MSPRO(ms_card)) {
-                /* Build table for the last segment,
-                 * to check if L2P table block exists, erasing it
-                 */
-                retval = ms_build_l2p_tbl(chip, ms_card->total_block / 512 - 1);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        RTSX_DEBUGP("ms_card->ms_type = 0x%x\n", ms_card->ms_type);
-
-        return STATUS_SUCCESS;
-}
-
-static int mspro_set_rw_cmd(struct rtsx_chip *chip, u32 start_sec, u16 sec_cnt, u8 cmd)
-{
-        int retval, i;
-        u8 data[8];
-
-        data[0] = cmd;
-        data[1] = (u8)(sec_cnt >> 8);
-        data[2] = (u8)sec_cnt;
-        data[3] = (u8)(start_sec >> 24);
-        data[4] = (u8)(start_sec >> 16);
-        data[5] = (u8)(start_sec >> 8);
-        data[6] = (u8)start_sec;
-        data[7] = 0;
-
-        for (i = 0; i < MS_MAX_RETRY_COUNT; i++) {
-                retval = ms_write_bytes(chip, PRO_EX_SET_CMD, 7, WAIT_INT, data, 8);
-                if (retval == STATUS_SUCCESS)
-                        break;
-        }
-        if (i == MS_MAX_RETRY_COUNT)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        return STATUS_SUCCESS;
-}
-
-
-void mspro_stop_seq_mode(struct rtsx_chip *chip)
-{
-        struct ms_info *ms_card = &(chip->ms_card);
-        int retval;
-
-        RTSX_DEBUGP("--%s--\n", __func__);
-
-        if (ms_card->seq_mode) {
-                retval = ms_switch_clock(chip);
-                if (retval != STATUS_SUCCESS)
-                        return;
-
-                ms_card->seq_mode = 0;
-                ms_card->total_sec_cnt = 0;
-                ms_send_cmd(chip, PRO_STOP, WAIT_INT);
-
-                rtsx_write_register(chip, RBCTL, RB_FLUSH, RB_FLUSH);
-        }
-}
-
-static inline int ms_auto_tune_clock(struct rtsx_chip *chip)
-{
-        struct ms_info *ms_card = &(chip->ms_card);
-        int retval;
-
-        RTSX_DEBUGP("--%s--\n", __func__);
-
-        if (chip->asic_code) {
-                if (ms_card->ms_clock > 30)
-                        ms_card->ms_clock -= 20;
-        } else {
-                if (ms_card->ms_clock == CLK_80)
-                        ms_card->ms_clock = CLK_60;
-                else if (ms_card->ms_clock == CLK_60)
-                        ms_card->ms_clock = CLK_40;
-        }
-
-        retval = ms_switch_clock(chip);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        return STATUS_SUCCESS;
-}
-
-static int mspro_rw_multi_sector(struct scsi_cmnd *srb, struct rtsx_chip *chip, u32 start_sector, u16 sector_cnt)
-{
-        struct ms_info *ms_card = &(chip->ms_card);
-        int retval, mode_2k = 0;
-        u16 count;
-        u8 val, trans_mode, rw_tpc, rw_cmd;
-
-        ms_set_err_code(chip, MS_NO_ERROR);
-
-        ms_card->cleanup_counter = 0;
-
-        if (CHK_MSHG(ms_card)) {
-                if ((start_sector % 4) || (sector_cnt % 4)) {
-                        if (srb->sc_data_direction == DMA_FROM_DEVICE) {
-                                rw_tpc = PRO_READ_LONG_DATA;
-                                rw_cmd = PRO_READ_DATA;
-                        } else {
-                                rw_tpc = PRO_WRITE_LONG_DATA;
-                                rw_cmd = PRO_WRITE_DATA;
-                        }
-                } else {
-                        if (srb->sc_data_direction == DMA_FROM_DEVICE) {
-                                rw_tpc = PRO_READ_QUAD_DATA;
-                                rw_cmd = PRO_READ_2K_DATA;
-                        } else {
-                                rw_tpc = PRO_WRITE_QUAD_DATA;
-                                rw_cmd = PRO_WRITE_2K_DATA;
-                        }
-                        mode_2k = 1;
-                }
-        } else {
-                if (srb->sc_data_direction == DMA_FROM_DEVICE) {
-                        rw_tpc = PRO_READ_LONG_DATA;
-                        rw_cmd = PRO_READ_DATA;
-                } else {
-                        rw_tpc = PRO_WRITE_LONG_DATA;
-                        rw_cmd = PRO_WRITE_DATA;
-                }
-        }
-
-        retval = ms_switch_clock(chip);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        if (srb->sc_data_direction == DMA_FROM_DEVICE)
-                trans_mode = MS_TM_AUTO_READ;
-        else
-                trans_mode = MS_TM_AUTO_WRITE;
-
-        RTSX_READ_REG(chip, MS_TRANS_CFG, &val);
-
-        if (ms_card->seq_mode) {
-                if ((ms_card->pre_dir != srb->sc_data_direction)
-                                || ((ms_card->pre_sec_addr + ms_card->pre_sec_cnt) != start_sector)
-                                || (mode_2k && (ms_card->seq_mode & MODE_512_SEQ))
-                                || (!mode_2k && (ms_card->seq_mode & MODE_2K_SEQ))
-                                || !(val & MS_INT_BREQ)
-                                || ((ms_card->total_sec_cnt + sector_cnt) > 0xFE00)) {
-                        ms_card->seq_mode = 0;
-                        ms_card->total_sec_cnt = 0;
-                        if (val & MS_INT_BREQ) {
-                                retval = ms_send_cmd(chip, PRO_STOP, WAIT_INT);
-                                if (retval != STATUS_SUCCESS)
-                                        TRACE_RET(chip, STATUS_FAIL);
-
-                                rtsx_write_register(chip, RBCTL, RB_FLUSH, RB_FLUSH);
-                        }
-                }
-        }
-
-        if (!ms_card->seq_mode) {
-                ms_card->total_sec_cnt = 0;
-                if (sector_cnt >= SEQ_START_CRITERIA) {
-                        if ((ms_card->capacity - start_sector) > 0xFE00)
-                                count = 0xFE00;
-                        else
-                                count = (u16)(ms_card->capacity - start_sector);
-
-                        if (count > sector_cnt) {
-                                if (mode_2k)
-                                        ms_card->seq_mode |= MODE_2K_SEQ;
-                                else
-                                        ms_card->seq_mode |= MODE_512_SEQ;
-                        }
-                } else {
-                        count = sector_cnt;
-                }
-                retval = mspro_set_rw_cmd(chip, start_sector, count, rw_cmd);
-                if (retval != STATUS_SUCCESS) {
-                        ms_card->seq_mode = 0;
-                        TRACE_RET(chip, STATUS_FAIL);
-                }
-        }
-
-        retval = ms_transfer_data(chip, trans_mode, rw_tpc, sector_cnt, WAIT_INT, mode_2k,
-                        scsi_sg_count(srb), scsi_sglist(srb), scsi_bufflen(srb));
-        if (retval != STATUS_SUCCESS) {
-                ms_card->seq_mode = 0;
-                rtsx_read_register(chip, MS_TRANS_CFG, &val);
-                rtsx_clear_ms_error(chip);
-
-                if (detect_card_cd(chip, MS_CARD) != STATUS_SUCCESS) {
-                        chip->rw_need_retry = 0;
-                        RTSX_DEBUGP("No card exist, exit mspro_rw_multi_sector\n");
-                        TRACE_RET(chip, STATUS_FAIL);
-                }
-
-                if (val & MS_INT_BREQ)
-                        ms_send_cmd(chip, PRO_STOP, WAIT_INT);
-
-                if (val & (MS_CRC16_ERR | MS_RDY_TIMEOUT)) {
-                        RTSX_DEBUGP("MSPro CRC error, tune clock!\n");
-                        chip->rw_need_retry = 1;
-                        ms_auto_tune_clock(chip);
-                }
-
-                TRACE_RET(chip, retval);
-        }
-
-        if (ms_card->seq_mode) {
-                ms_card->pre_sec_addr = start_sector;
-                ms_card->pre_sec_cnt = sector_cnt;
-                ms_card->pre_dir = srb->sc_data_direction;
-                ms_card->total_sec_cnt += sector_cnt;
-        }
-
-        return STATUS_SUCCESS;
-}
-
-static int mspro_read_format_progress(struct rtsx_chip *chip, const int short_data_len)
-{
-        struct ms_info *ms_card = &(chip->ms_card);
-        int retval, i;
-        u32 total_progress, cur_progress;
-        u8 cnt, tmp;
-        u8 data[8];
-
-        RTSX_DEBUGP("mspro_read_format_progress, short_data_len = %d\n", short_data_len);
-
-        retval = ms_switch_clock(chip);
-        if (retval != STATUS_SUCCESS) {
-                ms_card->format_status = FORMAT_FAIL;
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        retval = rtsx_read_register(chip, MS_TRANS_CFG, &tmp);
-        if (retval != STATUS_SUCCESS) {
-                ms_card->format_status = FORMAT_FAIL;
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        if (!(tmp & MS_INT_BREQ)) {
-                if ((tmp &  (MS_INT_CED | MS_INT_BREQ | MS_INT_CMDNK | MS_INT_ERR)) == MS_INT_CED) {
-                        ms_card->format_status = FORMAT_SUCCESS;
-                        return STATUS_SUCCESS;
-                }
-                ms_card->format_status = FORMAT_FAIL;
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        if (short_data_len >= 256)
-                cnt = 0;
-        else
-                cnt = (u8)short_data_len;
-
-        retval = rtsx_write_register(chip, MS_CFG, MS_NO_CHECK_INT, MS_NO_CHECK_INT);
-        if (retval != STATUS_SUCCESS) {
-                ms_card->format_status = FORMAT_FAIL;
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        retval = ms_read_bytes(chip, PRO_READ_SHORT_DATA, cnt, WAIT_INT, data, 8);
-        if (retval != STATUS_SUCCESS) {
-                ms_card->format_status = FORMAT_FAIL;
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        total_progress = (data[0] << 24) | (data[1] << 16) | (data[2] << 8) | data[3];
-        cur_progress = (data[4] << 24) | (data[5] << 16) | (data[6] << 8) | data[7];
-
-        RTSX_DEBUGP("total_progress = %d, cur_progress = %d\n",
-                                total_progress, cur_progress);
-
-        if (total_progress == 0) {
-                ms_card->progress = 0;
-        } else {
-                u64 ulltmp = (u64)cur_progress * (u64)65535;
-                do_div(ulltmp, total_progress);
-                ms_card->progress = (u16)ulltmp;
-        }
-        RTSX_DEBUGP("progress = %d\n", ms_card->progress);
-
-        for (i = 0; i < 5000; i++) {
-                retval = rtsx_read_register(chip, MS_TRANS_CFG, &tmp);
-                if (retval != STATUS_SUCCESS) {
-                        ms_card->format_status = FORMAT_FAIL;
-                        TRACE_RET(chip, STATUS_FAIL);
-                }
-                if (tmp & (MS_INT_CED | MS_INT_CMDNK | MS_INT_BREQ | MS_INT_ERR))
-                        break;
-
-                wait_timeout(1);
-        }
-
-        retval = rtsx_write_register(chip, MS_CFG, MS_NO_CHECK_INT, 0);
-        if (retval != STATUS_SUCCESS) {
-                ms_card->format_status = FORMAT_FAIL;
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        if (i == 5000) {
-                ms_card->format_status = FORMAT_FAIL;
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        if (tmp & (MS_INT_CMDNK | MS_INT_ERR)) {
-                ms_card->format_status = FORMAT_FAIL;
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        if (tmp & MS_INT_CED) {
-                ms_card->format_status = FORMAT_SUCCESS;
-                ms_card->pro_under_formatting = 0;
-        } else if (tmp & MS_INT_BREQ) {
-                ms_card->format_status = FORMAT_IN_PROGRESS;
-        } else {
-                ms_card->format_status = FORMAT_FAIL;
-                ms_card->pro_under_formatting = 0;
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        return STATUS_SUCCESS;
-}
-
-void mspro_polling_format_status(struct rtsx_chip *chip)
-{
-        struct ms_info *ms_card = &(chip->ms_card);
-        int i;
-
-        if (ms_card->pro_under_formatting && (rtsx_get_stat(chip) != RTSX_STAT_SS)) {
-                rtsx_set_stat(chip, RTSX_STAT_RUN);
-
-                for (i = 0; i < 65535; i++) {
-                        mspro_read_format_progress(chip, MS_SHORT_DATA_LEN);
-                        if (ms_card->format_status != FORMAT_IN_PROGRESS)
-                                break;
-                }
-        }
-
-        return;
-}
-
-int mspro_format(struct scsi_cmnd *srb, struct rtsx_chip *chip, int short_data_len, int quick_format)
-{
-        struct ms_info *ms_card = &(chip->ms_card);
-        int retval, i;
-        u8 buf[8], tmp;
-        u16 para;
-
-        RTSX_DEBUGP("--%s--\n", __func__);
-
-        retval = ms_switch_clock(chip);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        retval = ms_set_rw_reg_addr(chip, 0x00, 0x00, Pro_TPCParm, 0x01);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        memset(buf, 0, 2);
-        switch (short_data_len) {
-        case 32:
-                buf[0] = 0;
-                break;
-        case 64:
-                buf[0] = 1;
-                break;
-        case 128:
-                buf[0] = 2;
-                break;
-        case 256:
-        default:
-                buf[0] = 3;
-                break;
-        }
-
-        for (i = 0; i < MS_MAX_RETRY_COUNT; i++) {
-                retval = ms_write_bytes(chip, PRO_WRITE_REG, 1, NO_WAIT_INT, buf, 2);
-                if (retval == STATUS_SUCCESS)
-                        break;
-        }
-        if (i == MS_MAX_RETRY_COUNT)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        if (quick_format)
-                para = 0x0000;
-        else
-                para = 0x0001;
-
-        retval = mspro_set_rw_cmd(chip, 0, para, PRO_FORMAT);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        RTSX_READ_REG(chip, MS_TRANS_CFG, &tmp);
-
-        if (tmp & (MS_INT_CMDNK | MS_INT_ERR))
-                TRACE_RET(chip, STATUS_FAIL);
-
-        if ((tmp & (MS_INT_BREQ | MS_INT_CED)) == MS_INT_BREQ) {
-                ms_card->pro_under_formatting = 1;
-                ms_card->progress = 0;
-                ms_card->format_status = FORMAT_IN_PROGRESS;
-                return STATUS_SUCCESS;
-        }
-
-        if (tmp & MS_INT_CED) {
-                ms_card->pro_under_formatting = 0;
-                ms_card->progress = 0;
-                ms_card->format_status = FORMAT_SUCCESS;
-                set_sense_type(chip, SCSI_LUN(srb), SENSE_TYPE_NO_SENSE);
-                return STATUS_SUCCESS;
-        }
-
-        TRACE_RET(chip, STATUS_FAIL);
-}
-
-
-static int ms_read_multiple_pages(struct rtsx_chip *chip, u16 phy_blk, u16 log_blk,
-                u8 start_page, u8 end_page, u8 *buf, unsigned int *index, unsigned int *offset)
-{
-        struct ms_info *ms_card = &(chip->ms_card);
-        int retval, i;
-        u8 extra[MS_EXTRA_SIZE], page_addr, val, trans_cfg, data[6];
-        u8 *ptr;
-
-        retval = ms_read_extra_data(chip, phy_blk, start_page, extra, MS_EXTRA_SIZE);
-        if (retval == STATUS_SUCCESS) {
-                if ((extra[1] & 0x30) != 0x30) {
-                        ms_set_err_code(chip, MS_FLASH_READ_ERROR);
-                        TRACE_RET(chip, STATUS_FAIL);
-                }
-        }
-
-        retval = ms_set_rw_reg_addr(chip, OverwriteFlag, MS_EXTRA_SIZE, SystemParm, 6);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        if (CHK_MS4BIT(ms_card))
-                data[0] = 0x88;
-        else
-                data[0] = 0x80;
-
-        data[1] = 0;
-        data[2] = (u8)(phy_blk >> 8);
-        data[3] = (u8)phy_blk;
-        data[4] = 0;
-        data[5] = start_page;
-
-        for (i = 0; i < MS_MAX_RETRY_COUNT; i++) {
-                retval = ms_write_bytes(chip, WRITE_REG, 6, NO_WAIT_INT, data, 6);
-                if (retval == STATUS_SUCCESS)
-                        break;
-        }
-        if (i == MS_MAX_RETRY_COUNT)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        ms_set_err_code(chip, MS_NO_ERROR);
-
-        retval = ms_send_cmd(chip, BLOCK_READ, WAIT_INT);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        ptr = buf;
-
-        for (page_addr = start_page; page_addr < end_page; page_addr++) {
-                ms_set_err_code(chip, MS_NO_ERROR);
-
-                if (detect_card_cd(chip, MS_CARD) != STATUS_SUCCESS) {
-                        ms_set_err_code(chip, MS_NO_CARD);
-                        TRACE_RET(chip, STATUS_FAIL);
-                }
-
-                retval = ms_read_bytes(chip, GET_INT, 1, NO_WAIT_INT, &val, 1);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-
-                if (val & INT_REG_CMDNK) {
-                        ms_set_err_code(chip, MS_CMD_NK);
-                        TRACE_RET(chip, STATUS_FAIL);
-                }
-                if (val & INT_REG_ERR) {
-                        if (val & INT_REG_BREQ) {
-                                retval = ms_read_status_reg(chip);
-                                if (retval != STATUS_SUCCESS) {
-                                        if (!(chip->card_wp & MS_CARD)) {
-                                                reset_ms(chip);
-                                                ms_set_page_status(log_blk, setPS_NG, extra, MS_EXTRA_SIZE);
-                                                ms_write_extra_data(chip, phy_blk,
-                                                                page_addr, extra, MS_EXTRA_SIZE);
-                                        }
-                                        ms_set_err_code(chip, MS_FLASH_READ_ERROR);
-                                        TRACE_RET(chip, STATUS_FAIL);
-                                }
-                        } else {
-                                ms_set_err_code(chip, MS_FLASH_READ_ERROR);
-                                TRACE_RET(chip, STATUS_FAIL);
-                        }
-                } else {
-                        if (!(val & INT_REG_BREQ)) {
-                                ms_set_err_code(chip, MS_BREQ_ERROR);
-                                TRACE_RET(chip, STATUS_FAIL);
-                        }
-                }
-
-                if (page_addr == (end_page - 1)) {
-                        if (!(val & INT_REG_CED)) {
-                                retval = ms_send_cmd(chip, BLOCK_END, WAIT_INT);
-                                if (retval != STATUS_SUCCESS)
-                                        TRACE_RET(chip, STATUS_FAIL);
-                        }
-
-                        retval = ms_read_bytes(chip, GET_INT, 1, NO_WAIT_INT, &val, 1);
-                        if (retval != STATUS_SUCCESS)
-                                TRACE_RET(chip, STATUS_FAIL);
-
-                        if (!(val & INT_REG_CED)) {
-                                ms_set_err_code(chip, MS_FLASH_READ_ERROR);
-                                TRACE_RET(chip, STATUS_FAIL);
-                        }
-
-                        trans_cfg = NO_WAIT_INT;
-                } else {
-                        trans_cfg = WAIT_INT;
-                }
-
-                rtsx_init_cmd(chip);
-
-                rtsx_add_cmd(chip, WRITE_REG_CMD, MS_TPC, 0xFF, READ_PAGE_DATA);
-                rtsx_add_cmd(chip, WRITE_REG_CMD, MS_TRANS_CFG, 0xFF, trans_cfg);
-                rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_DATA_SOURCE, 0x01, RING_BUFFER);
-
-                trans_dma_enable(DMA_FROM_DEVICE, chip, 512, DMA_512);
-
-                rtsx_add_cmd(chip, WRITE_REG_CMD, MS_TRANSFER, 0xFF,
-                                MS_TRANSFER_START |  MS_TM_NORMAL_READ);
-                rtsx_add_cmd(chip, CHECK_REG_CMD, MS_TRANSFER, MS_TRANSFER_END, MS_TRANSFER_END);
-
-                rtsx_send_cmd_no_wait(chip);
-
-                retval = rtsx_transfer_data_partial(chip, MS_CARD, ptr, 512, scsi_sg_count(chip->srb),
-                                index, offset, DMA_FROM_DEVICE, chip->ms_timeout);
-                if (retval < 0) {
-                        if (retval == -ETIMEDOUT) {
-                                ms_set_err_code(chip, MS_TO_ERROR);
-                                rtsx_clear_ms_error(chip);
-                                TRACE_RET(chip, STATUS_TIMEDOUT);
-                        }
-
-                        retval = rtsx_read_register(chip, MS_TRANS_CFG, &val);
-                        if (retval != STATUS_SUCCESS) {
-                                ms_set_err_code(chip, MS_TO_ERROR);
-                                rtsx_clear_ms_error(chip);
-                                TRACE_RET(chip, STATUS_TIMEDOUT);
-                        }
-                        if (val & (MS_CRC16_ERR | MS_RDY_TIMEOUT)) {
-                                ms_set_err_code(chip, MS_CRC16_ERROR);
-                                rtsx_clear_ms_error(chip);
-                                TRACE_RET(chip, STATUS_FAIL);
-                        }
-                }
-
-                if (scsi_sg_count(chip->srb) == 0)
-                        ptr += 512;
-        }
-
-        return STATUS_SUCCESS;
-}
-
-static int ms_write_multiple_pages(struct rtsx_chip *chip, u16 old_blk, u16 new_blk,
-                u16 log_blk, u8 start_page, u8 end_page, u8 *buf,
-                unsigned int *index, unsigned int *offset)
-{
-        struct ms_info *ms_card = &(chip->ms_card);
-        int retval, i;
-        u8 page_addr, val, data[16];
-        u8 *ptr;
-
-        if (!start_page) {
-                retval = ms_set_rw_reg_addr(chip, OverwriteFlag, MS_EXTRA_SIZE, SystemParm, 7);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-
-                if (CHK_MS4BIT(ms_card))
-                        data[0] = 0x88;
-                else
-                        data[0] = 0x80;
-
-                data[1] = 0;
-                data[2] = (u8)(old_blk >> 8);
-                data[3] = (u8)old_blk;
-                data[4] = 0x80;
-                data[5] = 0;
-                data[6] = 0xEF;
-                data[7] = 0xFF;
-
-                retval = ms_write_bytes(chip, WRITE_REG, 7, NO_WAIT_INT, data, 8);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-
-                retval = ms_send_cmd(chip, BLOCK_WRITE, WAIT_INT);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-
-                ms_set_err_code(chip, MS_NO_ERROR);
-                retval = ms_transfer_tpc(chip, MS_TM_READ_BYTES, GET_INT, 1, NO_WAIT_INT);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        retval = ms_set_rw_reg_addr(chip, OverwriteFlag, MS_EXTRA_SIZE, SystemParm, (6 + MS_EXTRA_SIZE));
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        ms_set_err_code(chip, MS_NO_ERROR);
-
-        if (CHK_MS4BIT(ms_card))
-                data[0] = 0x88;
-        else
-                data[0] = 0x80;
-
-        data[1] = 0;
-        data[2] = (u8)(new_blk >> 8);
-        data[3] = (u8)new_blk;
-        if ((end_page - start_page) == 1)
-                data[4] = 0x20;
-        else
-                data[4] = 0;
-
-        data[5] = start_page;
-        data[6] = 0xF8;
-        data[7] = 0xFF;
-        data[8] = (u8)(log_blk >> 8);
-        data[9] = (u8)log_blk;
-
-        for (i = 0x0A; i < 0x10; i++)
-                data[i] = 0xFF;
-
-        for (i = 0; i < MS_MAX_RETRY_COUNT; i++) {
-                retval = ms_write_bytes(chip, WRITE_REG, 6 + MS_EXTRA_SIZE, NO_WAIT_INT, data, 16);
-                if (retval == STATUS_SUCCESS)
-                        break;
-        }
-        if (i == MS_MAX_RETRY_COUNT)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        for (i = 0; i < MS_MAX_RETRY_COUNT; i++) {
-                retval = ms_send_cmd(chip, BLOCK_WRITE, WAIT_INT);
-                if (retval == STATUS_SUCCESS)
-                        break;
-        }
-        if (i == MS_MAX_RETRY_COUNT)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        retval = ms_read_bytes(chip, GET_INT, 1, NO_WAIT_INT, &val, 1);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        ptr = buf;
-        for (page_addr = start_page; page_addr < end_page; page_addr++) {
-                ms_set_err_code(chip, MS_NO_ERROR);
-
-                if (detect_card_cd(chip, MS_CARD) != STATUS_SUCCESS) {
-                        ms_set_err_code(chip, MS_NO_CARD);
-                        TRACE_RET(chip, STATUS_FAIL);
-                }
-
-                if (val & INT_REG_CMDNK) {
-                        ms_set_err_code(chip, MS_CMD_NK);
-                        TRACE_RET(chip, STATUS_FAIL);
-                }
-                if (val & INT_REG_ERR) {
-                        ms_set_err_code(chip, MS_FLASH_WRITE_ERROR);
-                        TRACE_RET(chip, STATUS_FAIL);
-                }
-                if (!(val & INT_REG_BREQ)) {
-                        ms_set_err_code(chip, MS_BREQ_ERROR);
-                        TRACE_RET(chip, STATUS_FAIL);
-                }
-
-                udelay(30);
-
-                rtsx_init_cmd(chip);
-
-                rtsx_add_cmd(chip, WRITE_REG_CMD, MS_TPC, 0xFF, WRITE_PAGE_DATA);
-                rtsx_add_cmd(chip, WRITE_REG_CMD, MS_TRANS_CFG, 0xFF, WAIT_INT);
-                rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_DATA_SOURCE, 0x01, RING_BUFFER);
-
-                trans_dma_enable(DMA_TO_DEVICE, chip, 512, DMA_512);
-
-                rtsx_add_cmd(chip, WRITE_REG_CMD, MS_TRANSFER, 0xFF,
-                                MS_TRANSFER_START |  MS_TM_NORMAL_WRITE);
-                rtsx_add_cmd(chip, CHECK_REG_CMD, MS_TRANSFER, MS_TRANSFER_END, MS_TRANSFER_END);
-
-                rtsx_send_cmd_no_wait(chip);
-
-                retval = rtsx_transfer_data_partial(chip, MS_CARD, ptr, 512, scsi_sg_count(chip->srb),
-                                index, offset, DMA_TO_DEVICE, chip->ms_timeout);
-                if (retval < 0) {
-                        ms_set_err_code(chip, MS_TO_ERROR);
-                        rtsx_clear_ms_error(chip);
-
-                        if (retval == -ETIMEDOUT)
-                                TRACE_RET(chip, STATUS_TIMEDOUT);
-                        else
-                                TRACE_RET(chip, STATUS_FAIL);
-                }
-
-                retval = ms_read_bytes(chip, GET_INT, 1, NO_WAIT_INT, &val, 1);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-
-                if ((end_page - start_page) == 1) {
-                        if (!(val & INT_REG_CED)) {
-                                ms_set_err_code(chip, MS_FLASH_WRITE_ERROR);
-                                TRACE_RET(chip, STATUS_FAIL);
-                        }
-                } else {
-                        if (page_addr == (end_page - 1)) {
-                                if (!(val & INT_REG_CED)) {
-                                        retval = ms_send_cmd(chip, BLOCK_END, WAIT_INT);
-                                        if (retval != STATUS_SUCCESS)
-                                                TRACE_RET(chip, STATUS_FAIL);
-                                }
-
-                                retval = ms_read_bytes(chip, GET_INT, 1, NO_WAIT_INT, &val, 1);
-                                if (retval != STATUS_SUCCESS)
-                                        TRACE_RET(chip, STATUS_FAIL);
-                        }
-
-                        if ((page_addr == (end_page - 1)) || (page_addr == ms_card->page_off)) {
-                                if (!(val & INT_REG_CED)) {
-                                        ms_set_err_code(chip, MS_FLASH_WRITE_ERROR);
-                                        TRACE_RET(chip, STATUS_FAIL);
-                                }
-                        }
-                }
-
-                if (scsi_sg_count(chip->srb) == 0)
-                        ptr += 512;
-        }
-
-        return STATUS_SUCCESS;
-}
-
-
-static int ms_finish_write(struct rtsx_chip *chip, u16 old_blk, u16 new_blk,
-                u16 log_blk, u8 page_off)
-{
-        struct ms_info *ms_card = &(chip->ms_card);
-        int retval, seg_no;
-
-        retval = ms_copy_page(chip, old_blk, new_blk, log_blk,
-                        page_off, ms_card->page_off + 1);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        seg_no = old_blk >> 9;
-
-        if (MS_TST_BAD_BLOCK_FLG(ms_card)) {
-                MS_CLR_BAD_BLOCK_FLG(ms_card);
-                ms_set_bad_block(chip, old_blk);
-        } else {
-                retval = ms_erase_block(chip, old_blk);
-                if (retval == STATUS_SUCCESS)
-                        ms_set_unused_block(chip, old_blk);
-        }
-
-        ms_set_l2p_tbl(chip, seg_no, log_blk - ms_start_idx[seg_no], new_blk);
-
-        return STATUS_SUCCESS;
-}
-
-static int ms_prepare_write(struct rtsx_chip *chip, u16 old_blk, u16 new_blk,
-                u16 log_blk, u8 start_page)
-{
-        int retval;
-
-        if (start_page) {
-                retval = ms_copy_page(chip, old_blk, new_blk, log_blk, 0, start_page);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        return STATUS_SUCCESS;
-}
-
-#ifdef MS_DELAY_WRITE
-int ms_delay_write(struct rtsx_chip *chip)
-{
-        struct ms_info *ms_card = &(chip->ms_card);
-        struct ms_delay_write_tag *delay_write = &(ms_card->delay_write);
-        int retval;
-
-        if (delay_write->delay_write_flag) {
-                retval = ms_set_init_para(chip);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-
-                delay_write->delay_write_flag = 0;
-                retval = ms_finish_write(chip,
-                                delay_write->old_phyblock, delay_write->new_phyblock,
-                                delay_write->logblock, delay_write->pageoff);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        return STATUS_SUCCESS;
-}
-#endif
-
-static inline void ms_rw_fail(struct scsi_cmnd *srb, struct rtsx_chip *chip)
-{
-        if (srb->sc_data_direction == DMA_FROM_DEVICE)
-                set_sense_type(chip, SCSI_LUN(srb), SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR);
-        else
-                set_sense_type(chip, SCSI_LUN(srb), SENSE_TYPE_MEDIA_WRITE_ERR);
-}
-
-static int ms_rw_multi_sector(struct scsi_cmnd *srb, struct rtsx_chip *chip, u32 start_sector, u16 sector_cnt)
-{
-        struct ms_info *ms_card = &(chip->ms_card);
-        unsigned int lun = SCSI_LUN(srb);
-        int retval, seg_no;
-        unsigned int index = 0, offset = 0;
-        u16 old_blk = 0, new_blk = 0, log_blk, total_sec_cnt = sector_cnt;
-        u8 start_page, end_page = 0, page_cnt;
-        u8 *ptr;
-#ifdef MS_DELAY_WRITE
-        struct ms_delay_write_tag *delay_write = &(ms_card->delay_write);
-#endif
-
-        ms_set_err_code(chip, MS_NO_ERROR);
-
-        ms_card->cleanup_counter = 0;
-
-        ptr = (u8 *)scsi_sglist(srb);
-
-        retval = ms_switch_clock(chip);
-        if (retval != STATUS_SUCCESS) {
-                ms_rw_fail(srb, chip);
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        log_blk = (u16)(start_sector >> ms_card->block_shift);
-        start_page = (u8)(start_sector & ms_card->page_off);
-
-        for (seg_no = 0; seg_no < ARRAY_SIZE(ms_start_idx) - 1; seg_no++) {
-                if (log_blk < ms_start_idx[seg_no+1])
-                        break;
-        }
-
-        if (ms_card->segment[seg_no].build_flag == 0) {
-                retval = ms_build_l2p_tbl(chip, seg_no);
-                if (retval != STATUS_SUCCESS) {
-                        chip->card_fail |= MS_CARD;
-                        set_sense_type(chip, lun, SENSE_TYPE_MEDIA_NOT_PRESENT);
-                        TRACE_RET(chip, STATUS_FAIL);
-                }
-        }
-
-        if (srb->sc_data_direction == DMA_TO_DEVICE) {
-#ifdef MS_DELAY_WRITE
-                if (delay_write->delay_write_flag &&
-                                (delay_write->logblock == log_blk) &&
-                                (start_page > delay_write->pageoff)) {
-                        delay_write->delay_write_flag = 0;
-                        retval = ms_copy_page(chip,
-                                delay_write->old_phyblock,
-                                delay_write->new_phyblock, log_blk,
-                                delay_write->pageoff, start_page);
-                        if (retval != STATUS_SUCCESS) {
-                                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_WRITE_ERR);
-                                TRACE_RET(chip, STATUS_FAIL);
-                        }
-                        old_blk = delay_write->old_phyblock;
-                        new_blk = delay_write->new_phyblock;
-                } else if (delay_write->delay_write_flag &&
-                                (delay_write->logblock == log_blk) &&
-                                (start_page == delay_write->pageoff)) {
-                        delay_write->delay_write_flag = 0;
-                        old_blk = delay_write->old_phyblock;
-                        new_blk = delay_write->new_phyblock;
-                } else {
-                        retval = ms_delay_write(chip);
-                        if (retval != STATUS_SUCCESS) {
-                                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_WRITE_ERR);
-                                TRACE_RET(chip, STATUS_FAIL);
-                        }
-#endif
-                        old_blk = ms_get_l2p_tbl(chip, seg_no, log_blk - ms_start_idx[seg_no]);
-                        new_blk  = ms_get_unused_block(chip, seg_no);
-                        if ((old_blk == 0xFFFF) || (new_blk == 0xFFFF)) {
-                                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_WRITE_ERR);
-                                TRACE_RET(chip, STATUS_FAIL);
-                        }
-
-                        retval = ms_prepare_write(chip, old_blk, new_blk, log_blk, start_page);
-                        if (retval != STATUS_SUCCESS) {
-                                if (detect_card_cd(chip, MS_CARD) != STATUS_SUCCESS) {
-                                        set_sense_type(chip, lun, SENSE_TYPE_MEDIA_NOT_PRESENT);
-                                        TRACE_RET(chip, STATUS_FAIL);
-                                }
-                                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_WRITE_ERR);
-                                TRACE_RET(chip, STATUS_FAIL);
-                        }
-#ifdef MS_DELAY_WRITE
-                }
-#endif
-        } else {
-#ifdef MS_DELAY_WRITE
-                retval = ms_delay_write(chip);
-                if (retval != STATUS_SUCCESS) {
-                        if (detect_card_cd(chip, MS_CARD) != STATUS_SUCCESS) {
-                                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_NOT_PRESENT);
-                                TRACE_RET(chip, STATUS_FAIL);
-                        }
-                        set_sense_type(chip, lun, SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR);
-                        TRACE_RET(chip, STATUS_FAIL);
-                }
-#endif
-                old_blk = ms_get_l2p_tbl(chip, seg_no, log_blk - ms_start_idx[seg_no]);
-                if (old_blk == 0xFFFF) {
-                        set_sense_type(chip, lun, SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR);
-                        TRACE_RET(chip, STATUS_FAIL);
-                }
-        }
-
-        RTSX_DEBUGP("seg_no = %d, old_blk = 0x%x, new_blk = 0x%x\n", seg_no, old_blk, new_blk);
-
-        while (total_sec_cnt) {
-                if ((start_page + total_sec_cnt) > (ms_card->page_off + 1))
-                        end_page = ms_card->page_off + 1;
-                else
-                        end_page = start_page + (u8)total_sec_cnt;
-
-                page_cnt = end_page - start_page;
-
-                RTSX_DEBUGP("start_page = %d, end_page = %d, page_cnt = %d\n",
-                                start_page, end_page, page_cnt);
-
-                if (srb->sc_data_direction == DMA_FROM_DEVICE) {
-                        retval = ms_read_multiple_pages(chip,
-                                old_blk, log_blk, start_page, end_page,
-                                ptr, &index, &offset);
-                } else {
-                        retval = ms_write_multiple_pages(chip, old_blk,
-                                new_blk, log_blk, start_page, end_page,
-                                ptr, &index, &offset);
-                }
-
-                if (retval != STATUS_SUCCESS) {
-                        toggle_gpio(chip, 1);
-                        if (detect_card_cd(chip, MS_CARD) != STATUS_SUCCESS) {
-                                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_NOT_PRESENT);
-                                TRACE_RET(chip, STATUS_FAIL);
-                        }
-                        ms_rw_fail(srb, chip);
-                        TRACE_RET(chip, STATUS_FAIL);
-                }
-
-                if (srb->sc_data_direction == DMA_TO_DEVICE) {
-                        if (end_page == (ms_card->page_off + 1)) {
-                                retval = ms_erase_block(chip, old_blk);
-                                if (retval == STATUS_SUCCESS)
-                                        ms_set_unused_block(chip, old_blk);
-
-                                ms_set_l2p_tbl(chip, seg_no, log_blk - ms_start_idx[seg_no], new_blk);
-                        }
-                }
-
-                total_sec_cnt -= page_cnt;
-                if (scsi_sg_count(srb) == 0)
-                        ptr += page_cnt * 512;
-
-                if (total_sec_cnt == 0)
-                        break;
-
-                log_blk++;
-
-                for (seg_no = 0; seg_no < ARRAY_SIZE(ms_start_idx) - 1;
-                                seg_no++) {
-                        if (log_blk < ms_start_idx[seg_no+1])
-                                break;
-                }
-
-                if (ms_card->segment[seg_no].build_flag == 0) {
-                        retval = ms_build_l2p_tbl(chip, seg_no);
-                        if (retval != STATUS_SUCCESS) {
-                                chip->card_fail |= MS_CARD;
-                                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_NOT_PRESENT);
-                                TRACE_RET(chip, STATUS_FAIL);
-                        }
-                }
-
-                old_blk = ms_get_l2p_tbl(chip, seg_no, log_blk - ms_start_idx[seg_no]);
-                if (old_blk == 0xFFFF) {
-                        ms_rw_fail(srb, chip);
-                        TRACE_RET(chip, STATUS_FAIL);
-                }
-
-                if (srb->sc_data_direction == DMA_TO_DEVICE) {
-                        new_blk = ms_get_unused_block(chip, seg_no);
-                        if (new_blk == 0xFFFF) {
-                                ms_rw_fail(srb, chip);
-                                TRACE_RET(chip, STATUS_FAIL);
-                        }
-                }
-
-                RTSX_DEBUGP("seg_no = %d, old_blk = 0x%x, new_blk = 0x%x\n", seg_no, old_blk, new_blk);
-
-                start_page = 0;
-        }
-
-        if (srb->sc_data_direction == DMA_TO_DEVICE) {
-                if (end_page < (ms_card->page_off + 1)) {
-#ifdef MS_DELAY_WRITE
-                        delay_write->delay_write_flag = 1;
-                        delay_write->old_phyblock = old_blk;
-                        delay_write->new_phyblock = new_blk;
-                        delay_write->logblock = log_blk;
-                        delay_write->pageoff = end_page;
-#else
-                        retval = ms_finish_write(chip, old_blk, new_blk, log_blk, end_page);
-                        if (retval != STATUS_SUCCESS) {
-                                if (detect_card_cd(chip, MS_CARD) != STATUS_SUCCESS) {
-                                        set_sense_type(chip, lun, SENSE_TYPE_MEDIA_NOT_PRESENT);
-                                        TRACE_RET(chip, STATUS_FAIL);
-                                }
-
-                                ms_rw_fail(srb, chip);
-                                TRACE_RET(chip, STATUS_FAIL);
-                        }
-#endif
-                }
-        }
-
-        scsi_set_resid(srb, 0);
-
-        return STATUS_SUCCESS;
-}
-
-int ms_rw(struct scsi_cmnd *srb, struct rtsx_chip *chip, u32 start_sector, u16 sector_cnt)
-{
-        struct ms_info *ms_card = &(chip->ms_card);
-        int retval;
-
-        if (CHK_MSPRO(ms_card))
-                retval = mspro_rw_multi_sector(srb, chip, start_sector, sector_cnt);
-        else
-                retval = ms_rw_multi_sector(srb, chip, start_sector, sector_cnt);
-
-        return retval;
-}
-
-
-void ms_free_l2p_tbl(struct rtsx_chip *chip)
-{
-        struct ms_info *ms_card = &(chip->ms_card);
-        int i = 0;
-
-        if (ms_card->segment != NULL) {
-                for (i = 0; i < ms_card->segment_cnt; i++) {
-                        if (ms_card->segment[i].l2p_table != NULL) {
-                                vfree(ms_card->segment[i].l2p_table);
-                                ms_card->segment[i].l2p_table = NULL;
-                        }
-                        if (ms_card->segment[i].free_table != NULL) {
-                                vfree(ms_card->segment[i].free_table);
-                                ms_card->segment[i].free_table = NULL;
-                        }
-                }
-                vfree(ms_card->segment);
-                ms_card->segment = NULL;
-        }
-}
-
-#ifdef SUPPORT_MAGIC_GATE
-
-#ifdef READ_BYTES_WAIT_INT
-static int ms_poll_int(struct rtsx_chip *chip)
-{
-        int retval;
-        u8 val;
-
-        rtsx_init_cmd(chip);
-
-        rtsx_add_cmd(chip, CHECK_REG_CMD, MS_TRANS_CFG, MS_INT_CED, MS_INT_CED);
-
-        retval = rtsx_send_cmd(chip, MS_CARD, 5000);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        val = *rtsx_get_cmd_data(chip);
-        if (val & MS_INT_ERR)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        return STATUS_SUCCESS;
-}
-#endif
-
-#ifdef MS_SAMPLE_INT_ERR
-static int check_ms_err(struct rtsx_chip *chip)
-{
-        int retval;
-        u8 val;
-
-        retval = rtsx_read_register(chip, MS_TRANSFER, &val);
-        if (retval != STATUS_SUCCESS)
-                return 1;
-        if (val & MS_TRANSFER_ERR)
-                return 1;
-
-        retval = rtsx_read_register(chip, MS_TRANS_CFG, &val);
-        if (retval != STATUS_SUCCESS)
-                return 1;
-
-        if (val & (MS_INT_ERR | MS_INT_CMDNK))
-                return 1;
-
-        return 0;
-}
-#else
-static int check_ms_err(struct rtsx_chip *chip)
-{
-        int retval;
-        u8 val;
-
-        retval = rtsx_read_register(chip, MS_TRANSFER, &val);
-        if (retval != STATUS_SUCCESS)
-                return 1;
-        if (val & MS_TRANSFER_ERR)
-                return 1;
-
-        return 0;
-}
-#endif
-
-static int mg_send_ex_cmd(struct rtsx_chip *chip, u8 cmd, u8 entry_num)
-{
-        int retval, i;
-        u8 data[8];
-
-        data[0] = cmd;
-        data[1] = 0;
-        data[2] = 0;
-        data[3] = 0;
-        data[4] = 0;
-        data[5] = 0;
-        data[6] = entry_num;
-        data[7] = 0;
-
-        for (i = 0; i < MS_MAX_RETRY_COUNT; i++) {
-                retval = ms_write_bytes(chip, PRO_EX_SET_CMD, 7, WAIT_INT, data, 8);
-                if (retval == STATUS_SUCCESS)
-                        break;
-        }
-        if (i == MS_MAX_RETRY_COUNT)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        if (check_ms_err(chip)) {
-                rtsx_clear_ms_error(chip);
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        return STATUS_SUCCESS;
-}
-
-static int mg_set_tpc_para_sub(struct rtsx_chip *chip, int type, u8 mg_entry_num)
-{
-        int retval;
-        u8 buf[6];
-
-        RTSX_DEBUGP("--%s--\n", __func__);
-
-        if (type == 0)
-                retval = ms_set_rw_reg_addr(chip, 0, 0, Pro_TPCParm, 1);
-        else
-                retval = ms_set_rw_reg_addr(chip, 0, 0, Pro_DataCount1, 6);
-
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        buf[0] = 0;
-        buf[1] = 0;
-        if (type == 1) {
-                buf[2] = 0;
-                buf[3] = 0;
-                buf[4] = 0;
-                buf[5] = mg_entry_num;
-        }
-        retval = ms_write_bytes(chip, PRO_WRITE_REG, (type == 0) ? 1 : 6, NO_WAIT_INT, buf, 6);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        return STATUS_SUCCESS;
-}
-
-int mg_set_leaf_id(struct scsi_cmnd *srb, struct rtsx_chip *chip)
-{
-        int retval;
-        int i;
-        unsigned int lun = SCSI_LUN(srb);
-        u8 buf1[32], buf2[12];
-
-        RTSX_DEBUGP("--%s--\n", __func__);
-
-        if (scsi_bufflen(srb) < 12) {
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        ms_cleanup_work(chip);
-
-        retval = ms_switch_clock(chip);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        retval = mg_send_ex_cmd(chip, MG_SET_LID, 0);
-        if (retval != STATUS_SUCCESS) {
-                set_sense_type(chip, lun, SENSE_TYPE_MG_KEY_FAIL_NOT_ESTAB);
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        memset(buf1, 0, 32);
-        rtsx_stor_get_xfer_buf(buf2, min(12, (int)scsi_bufflen(srb)), srb);
-        for (i = 0; i < 8; i++)
-                buf1[8+i] = buf2[4+i];
-
-        retval = ms_write_bytes(chip, PRO_WRITE_SHORT_DATA, 32, WAIT_INT, buf1, 32);
-        if (retval != STATUS_SUCCESS) {
-                set_sense_type(chip, lun, SENSE_TYPE_MG_KEY_FAIL_NOT_ESTAB);
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-        if (check_ms_err(chip)) {
-                set_sense_type(chip, lun, SENSE_TYPE_MG_KEY_FAIL_NOT_ESTAB);
-                rtsx_clear_ms_error(chip);
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        return STATUS_SUCCESS;
-}
-
-int mg_get_local_EKB(struct scsi_cmnd *srb, struct rtsx_chip *chip)
-{
-        int retval = STATUS_FAIL;
-        int bufflen;
-        unsigned int lun = SCSI_LUN(srb);
-        u8 *buf = NULL;
-
-        RTSX_DEBUGP("--%s--\n", __func__);
-
-        ms_cleanup_work(chip);
-
-        retval = ms_switch_clock(chip);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        buf = kmalloc(1540, GFP_KERNEL);
-        if (!buf)
-                TRACE_RET(chip, STATUS_ERROR);
-
-        buf[0] = 0x04;
-        buf[1] = 0x1A;
-        buf[2] = 0x00;
-        buf[3] = 0x00;
-
-        retval = mg_send_ex_cmd(chip, MG_GET_LEKB, 0);
-        if (retval != STATUS_SUCCESS) {
-                set_sense_type(chip, lun, SENSE_TYPE_MG_KEY_FAIL_NOT_AUTHEN);
-                TRACE_GOTO(chip, GetEKBFinish);
-        }
-
-        retval = ms_transfer_data(chip, MS_TM_AUTO_READ, PRO_READ_LONG_DATA,
-                                3, WAIT_INT, 0, 0, buf + 4, 1536);
-        if (retval != STATUS_SUCCESS) {
-                set_sense_type(chip, lun, SENSE_TYPE_MG_KEY_FAIL_NOT_AUTHEN);
-                rtsx_clear_ms_error(chip);
-                TRACE_GOTO(chip, GetEKBFinish);
-        }
-        if (check_ms_err(chip)) {
-                set_sense_type(chip, lun, SENSE_TYPE_MG_KEY_FAIL_NOT_AUTHEN);
-                rtsx_clear_ms_error(chip);
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        bufflen = min(1052, (int)scsi_bufflen(srb));
-        rtsx_stor_set_xfer_buf(buf, bufflen, srb);
-
-GetEKBFinish:
-        kfree(buf);
-        return retval;
-}
-
-int mg_chg(struct scsi_cmnd *srb, struct rtsx_chip *chip)
-{
-        struct ms_info *ms_card = &(chip->ms_card);
-        int retval;
-        int bufflen;
-        int i;
-        unsigned int lun = SCSI_LUN(srb);
-        u8 buf[32];
-
-        RTSX_DEBUGP("--%s--\n", __func__);
-
-        ms_cleanup_work(chip);
-
-        retval = ms_switch_clock(chip);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        retval = mg_send_ex_cmd(chip, MG_GET_ID, 0);
-        if (retval != STATUS_SUCCESS) {
-                set_sense_type(chip, lun, SENSE_TYPE_MG_INCOMPATIBLE_MEDIUM);
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        retval = ms_read_bytes(chip, PRO_READ_SHORT_DATA, 32, WAIT_INT, buf, 32);
-        if (retval != STATUS_SUCCESS) {
-                set_sense_type(chip, lun, SENSE_TYPE_MG_INCOMPATIBLE_MEDIUM);
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-        if (check_ms_err(chip)) {
-                set_sense_type(chip, lun, SENSE_TYPE_MG_INCOMPATIBLE_MEDIUM);
-                rtsx_clear_ms_error(chip);
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        memcpy(ms_card->magic_gate_id, buf, 16);
-
-#ifdef READ_BYTES_WAIT_INT
-        retval = ms_poll_int(chip);
-        if (retval != STATUS_SUCCESS) {
-                set_sense_type(chip, lun, SENSE_TYPE_MG_INCOMPATIBLE_MEDIUM);
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-#endif
-
-        retval = mg_send_ex_cmd(chip, MG_SET_RD, 0);
-        if (retval != STATUS_SUCCESS) {
-                set_sense_type(chip, lun, SENSE_TYPE_MG_INCOMPATIBLE_MEDIUM);
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        bufflen = min(12, (int)scsi_bufflen(srb));
-        rtsx_stor_get_xfer_buf(buf, bufflen, srb);
-
-        for (i = 0; i < 8; i++)
-                buf[i] = buf[4+i];
-
-        for (i = 0; i < 24; i++)
-                buf[8+i] = 0;
-
-        retval = ms_write_bytes(chip, PRO_WRITE_SHORT_DATA,
-                                32, WAIT_INT, buf, 32);
-        if (retval != STATUS_SUCCESS) {
-                set_sense_type(chip, lun, SENSE_TYPE_MG_INCOMPATIBLE_MEDIUM);
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-        if (check_ms_err(chip)) {
-                set_sense_type(chip, lun, SENSE_TYPE_MG_INCOMPATIBLE_MEDIUM);
-                rtsx_clear_ms_error(chip);
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        ms_card->mg_auth = 0;
-
-        return STATUS_SUCCESS;
-}
-
-int mg_get_rsp_chg(struct scsi_cmnd *srb, struct rtsx_chip *chip)
-{
-        struct ms_info *ms_card = &(chip->ms_card);
-        int retval;
-        int bufflen;
-        unsigned int lun = SCSI_LUN(srb);
-        u8 buf1[32], buf2[36];
-
-        RTSX_DEBUGP("--%s--\n", __func__);
-
-        ms_cleanup_work(chip);
-
-        retval = ms_switch_clock(chip);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        retval = mg_send_ex_cmd(chip, MG_MAKE_RMS, 0);
-        if (retval != STATUS_SUCCESS) {
-                set_sense_type(chip, lun, SENSE_TYPE_MG_KEY_FAIL_NOT_AUTHEN);
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        retval = ms_read_bytes(chip, PRO_READ_SHORT_DATA, 32, WAIT_INT, buf1, 32);
-        if (retval != STATUS_SUCCESS) {
-                set_sense_type(chip, lun, SENSE_TYPE_MG_KEY_FAIL_NOT_AUTHEN);
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-        if (check_ms_err(chip)) {
-                set_sense_type(chip, lun, SENSE_TYPE_MG_KEY_FAIL_NOT_AUTHEN);
-                rtsx_clear_ms_error(chip);
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        buf2[0] = 0x00;
-        buf2[1] = 0x22;
-        buf2[2] = 0x00;
-        buf2[3] = 0x00;
-
-        memcpy(buf2 + 4, ms_card->magic_gate_id, 16);
-        memcpy(buf2 + 20, buf1, 16);
-
-        bufflen = min(36, (int)scsi_bufflen(srb));
-        rtsx_stor_set_xfer_buf(buf2, bufflen, srb);
-
-#ifdef READ_BYTES_WAIT_INT
-        retval = ms_poll_int(chip);
-        if (retval != STATUS_SUCCESS) {
-                set_sense_type(chip, lun, SENSE_TYPE_MG_KEY_FAIL_NOT_AUTHEN);
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-#endif
-
-        return STATUS_SUCCESS;
-}
-
-int mg_rsp(struct scsi_cmnd *srb, struct rtsx_chip *chip)
-{
-        struct ms_info *ms_card = &(chip->ms_card);
-        int retval;
-        int i;
-        int bufflen;
-        unsigned int lun = SCSI_LUN(srb);
-        u8 buf[32];
-
-        RTSX_DEBUGP("--%s--\n", __func__);
-
-        ms_cleanup_work(chip);
-
-        retval = ms_switch_clock(chip);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        retval = mg_send_ex_cmd(chip, MG_MAKE_KSE, 0);
-        if (retval != STATUS_SUCCESS) {
-                set_sense_type(chip, lun, SENSE_TYPE_MG_KEY_FAIL_NOT_AUTHEN);
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        bufflen = min(12, (int)scsi_bufflen(srb));
-        rtsx_stor_get_xfer_buf(buf, bufflen, srb);
-
-        for (i = 0; i < 8; i++)
-                buf[i] = buf[4+i];
-
-        for (i = 0; i < 24; i++)
-                buf[8+i] = 0;
-
-        retval = ms_write_bytes(chip, PRO_WRITE_SHORT_DATA, 32, WAIT_INT, buf, 32);
-        if (retval != STATUS_SUCCESS) {
-                set_sense_type(chip, lun, SENSE_TYPE_MG_KEY_FAIL_NOT_AUTHEN);
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-        if (check_ms_err(chip)) {
-                set_sense_type(chip, lun, SENSE_TYPE_MG_KEY_FAIL_NOT_AUTHEN);
-                rtsx_clear_ms_error(chip);
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        ms_card->mg_auth = 1;
-
-        return STATUS_SUCCESS;
-}
-
-int mg_get_ICV(struct scsi_cmnd *srb, struct rtsx_chip *chip)
-{
-        struct ms_info *ms_card = &(chip->ms_card);
-        int retval;
-        int bufflen;
-        unsigned int lun = SCSI_LUN(srb);
-        u8 *buf = NULL;
-
-        RTSX_DEBUGP("--%s--\n", __func__);
-
-        ms_cleanup_work(chip);
-
-        retval = ms_switch_clock(chip);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        buf = kmalloc(1028, GFP_KERNEL);
-        if (!buf)
-                TRACE_RET(chip, STATUS_ERROR);
-
-        buf[0] = 0x04;
-        buf[1] = 0x02;
-        buf[2] = 0x00;
-        buf[3] = 0x00;
-
-        retval = mg_send_ex_cmd(chip, MG_GET_IBD, ms_card->mg_entry_num);
-        if (retval != STATUS_SUCCESS) {
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR);
-                TRACE_GOTO(chip, GetICVFinish);
-        }
-
-        retval = ms_transfer_data(chip, MS_TM_AUTO_READ, PRO_READ_LONG_DATA,
-                                2, WAIT_INT, 0, 0, buf + 4, 1024);
-        if (retval != STATUS_SUCCESS) {
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR);
-                rtsx_clear_ms_error(chip);
-                TRACE_GOTO(chip, GetICVFinish);
-        }
-        if (check_ms_err(chip)) {
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR);
-                rtsx_clear_ms_error(chip);
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        bufflen = min(1028, (int)scsi_bufflen(srb));
-        rtsx_stor_set_xfer_buf(buf, bufflen, srb);
-
-GetICVFinish:
-        kfree(buf);
-        return retval;
-}
-
-int mg_set_ICV(struct scsi_cmnd *srb, struct rtsx_chip *chip)
-{
-        struct ms_info *ms_card = &(chip->ms_card);
-        int retval;
-        int bufflen;
-#ifdef MG_SET_ICV_SLOW
-        int i;
-#endif
-        unsigned int lun = SCSI_LUN(srb);
-        u8 *buf = NULL;
-
-        RTSX_DEBUGP("--%s--\n", __func__);
-
-        ms_cleanup_work(chip);
-
-        retval = ms_switch_clock(chip);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        buf = kmalloc(1028, GFP_KERNEL);
-        if (!buf)
-                TRACE_RET(chip, STATUS_ERROR);
-
-        bufflen = min(1028, (int)scsi_bufflen(srb));
-        rtsx_stor_get_xfer_buf(buf, bufflen, srb);
-
-        retval = mg_send_ex_cmd(chip, MG_SET_IBD, ms_card->mg_entry_num);
-        if (retval != STATUS_SUCCESS) {
-                if (ms_card->mg_auth == 0) {
-                        if ((buf[5] & 0xC0) != 0)
-                                set_sense_type(chip, lun, SENSE_TYPE_MG_KEY_FAIL_NOT_ESTAB);
-                        else
-                                set_sense_type(chip, lun, SENSE_TYPE_MG_WRITE_ERR);
-                } else {
-                        set_sense_type(chip, lun, SENSE_TYPE_MG_WRITE_ERR);
-                }
-                TRACE_GOTO(chip, SetICVFinish);
-        }
-
-#ifdef MG_SET_ICV_SLOW
-        for (i = 0; i < 2; i++) {
-                udelay(50);
-
-                rtsx_init_cmd(chip);
-
-                rtsx_add_cmd(chip, WRITE_REG_CMD, MS_TPC, 0xFF, PRO_WRITE_LONG_DATA);
-                rtsx_add_cmd(chip, WRITE_REG_CMD, MS_TRANS_CFG, 0xFF, WAIT_INT);
-                rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_DATA_SOURCE, 0x01, RING_BUFFER);
-
-                trans_dma_enable(DMA_TO_DEVICE, chip, 512, DMA_512);
-
-                rtsx_add_cmd(chip, WRITE_REG_CMD, MS_TRANSFER, 0xFF,
-                                MS_TRANSFER_START |  MS_TM_NORMAL_WRITE);
-                rtsx_add_cmd(chip, CHECK_REG_CMD, MS_TRANSFER, MS_TRANSFER_END, MS_TRANSFER_END);
-
-                rtsx_send_cmd_no_wait(chip);
-
-                retval = rtsx_transfer_data(chip, MS_CARD, buf + 4 + i*512, 512, 0, DMA_TO_DEVICE, 3000);
-                if ((retval < 0) || check_ms_err(chip)) {
-                        rtsx_clear_ms_error(chip);
-                        if (ms_card->mg_auth == 0) {
-                                if ((buf[5] & 0xC0) != 0)
-                                        set_sense_type(chip, lun, SENSE_TYPE_MG_KEY_FAIL_NOT_ESTAB);
-                                else
-                                        set_sense_type(chip, lun, SENSE_TYPE_MG_WRITE_ERR);
-                        } else {
-                                set_sense_type(chip, lun, SENSE_TYPE_MG_WRITE_ERR);
-                        }
-                        retval = STATUS_FAIL;
-                        TRACE_GOTO(chip, SetICVFinish);
-                }
-        }
-#else
-        retval = ms_transfer_data(chip, MS_TM_AUTO_WRITE, PRO_WRITE_LONG_DATA,
-                                2, WAIT_INT, 0, 0, buf + 4, 1024);
-        if ((retval != STATUS_SUCCESS) || check_ms_err(chip)) {
-                rtsx_clear_ms_error(chip);
-                if (ms_card->mg_auth == 0) {
-                        if ((buf[5] & 0xC0) != 0)
-                                set_sense_type(chip, lun, SENSE_TYPE_MG_KEY_FAIL_NOT_ESTAB);
-                        else
-                                set_sense_type(chip, lun, SENSE_TYPE_MG_WRITE_ERR);
-                } else {
-                        set_sense_type(chip, lun, SENSE_TYPE_MG_WRITE_ERR);
-                }
-                TRACE_GOTO(chip, SetICVFinish);
-        }
-#endif
-
-SetICVFinish:
-        kfree(buf);
-        return retval;
-}
-
-#endif /* SUPPORT_MAGIC_GATE */
-
-void ms_cleanup_work(struct rtsx_chip *chip)
-{
-        struct ms_info *ms_card = &(chip->ms_card);
-
-        if (CHK_MSPRO(ms_card)) {
-                if (ms_card->seq_mode) {
-                        RTSX_DEBUGP("MS Pro: stop transmission\n");
-                        mspro_stop_seq_mode(chip);
-                        ms_card->cleanup_counter = 0;
-                }
-                if (CHK_MSHG(ms_card)) {
-                        rtsx_write_register(chip, MS_CFG,
-                                MS_2K_SECTOR_MODE, 0x00);
-                }
-        }
-#ifdef MS_DELAY_WRITE
-        else if ((!CHK_MSPRO(ms_card)) && ms_card->delay_write.delay_write_flag) {
-                RTSX_DEBUGP("MS: delay write\n");
-                ms_delay_write(chip);
-                ms_card->cleanup_counter = 0;
-        }
-#endif
-}
-
-int ms_power_off_card3v3(struct rtsx_chip *chip)
-{
-        int retval;
-
-        retval = disable_card_clock(chip, MS_CARD);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        if (chip->asic_code) {
-                retval = ms_pull_ctl_disable(chip);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-        } else {
-                RTSX_WRITE_REG(chip, FPGA_PULL_CTL,
-                        FPGA_MS_PULL_CTL_BIT | 0x20, FPGA_MS_PULL_CTL_BIT);
-        }
-        RTSX_WRITE_REG(chip, CARD_OE, MS_OUTPUT_EN, 0);
-        if (!chip->ft2_fast_mode) {
-                retval = card_power_off(chip, MS_CARD);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        return STATUS_SUCCESS;
-}
-
-int release_ms_card(struct rtsx_chip *chip)
-{
-        struct ms_info *ms_card = &(chip->ms_card);
-        int retval;
-
-        RTSX_DEBUGP("release_ms_card\n");
-
-#ifdef MS_DELAY_WRITE
-        ms_card->delay_write.delay_write_flag = 0;
-#endif
-        ms_card->pro_under_formatting = 0;
-
-        chip->card_ready &= ~MS_CARD;
-        chip->card_fail &= ~MS_CARD;
-        chip->card_wp &= ~MS_CARD;
-
-        ms_free_l2p_tbl(chip);
-
-        memset(ms_card->raw_sys_info, 0, 96);
-#ifdef SUPPORT_PCGL_1P18
-        memset(ms_card->raw_model_name, 0, 48);
-#endif
-
-        retval = ms_power_off_card3v3(chip);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        return STATUS_SUCCESS;
-}
-
diff --git a/drivers/staging/rts_pstor/ms.h b/drivers/staging/rts_pstor/ms.h
deleted file mode 100644
index 537019876139..000000000000
--- a/drivers/staging/rts_pstor/ms.h
+++ /dev/null
@@ -1,225 +0,0 @@
-/* Driver for Realtek PCI-Express card reader
- * Header file
- *
- * Copyright(c) 2009 Realtek Semiconductor Corp. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2, 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, see <http://www.gnu.org/licenses/>.
- *
- * Author:
- *   wwang (wei_wang@realsil.com.cn)
- *   No. 450, Shenhu Road, Suzhou Industry Park, Suzhou, China
- */
-
-#ifndef __REALTEK_RTSX_MS_H
-#define __REALTEK_RTSX_MS_H
-
-#define MS_DELAY_WRITE
-
-#define MS_MAX_RETRY_COUNT      3
-
-#define MS_EXTRA_SIZE           0x9
-
-#define WRT_PRTCT               0x01
-
-/* Error Code */
-#define MS_NO_ERROR                             0x00
-#define MS_CRC16_ERROR                          0x80
-#define MS_TO_ERROR                             0x40
-#define MS_NO_CARD                              0x20
-#define MS_NO_MEMORY                            0x10
-#define MS_CMD_NK                               0x08
-#define MS_FLASH_READ_ERROR                     0x04
-#define MS_FLASH_WRITE_ERROR                    0x02
-#define MS_BREQ_ERROR                           0x01
-#define MS_NOT_FOUND                            0x03
-
-/* Transfer Protocol Command */
-#define READ_PAGE_DATA                          0x02
-#define READ_REG                                0x04
-#define GET_INT                                 0x07
-#define WRITE_PAGE_DATA                         0x0D
-#define WRITE_REG                               0x0B
-#define SET_RW_REG_ADRS                         0x08
-#define SET_CMD                                 0x0E
-
-#define PRO_READ_LONG_DATA                      0x02
-#define PRO_READ_SHORT_DATA                     0x03
-#define PRO_READ_REG                            0x04
-#define PRO_READ_QUAD_DATA                      0x05
-#define PRO_GET_INT                             0x07
-#define PRO_WRITE_LONG_DATA                     0x0D
-#define PRO_WRITE_SHORT_DATA                    0x0C
-#define PRO_WRITE_QUAD_DATA                     0x0A
-#define PRO_WRITE_REG                           0x0B
-#define PRO_SET_RW_REG_ADRS                     0x08
-#define PRO_SET_CMD                             0x0E
-#define PRO_EX_SET_CMD                          0x09
-
-#ifdef SUPPORT_MAGIC_GATE
-
-#define MG_GET_ID               0x40
-#define MG_SET_LID              0x41
-#define MG_GET_LEKB             0x42
-#define MG_SET_RD               0x43
-#define MG_MAKE_RMS             0x44
-#define MG_MAKE_KSE             0x45
-#define MG_SET_IBD              0x46
-#define MG_GET_IBD              0x47
-
-#endif
-
-#ifdef XC_POWERCLASS
-#define XC_CHG_POWER            0x16
-#endif
-
-#define BLOCK_READ      0xAA
-#define BLOCK_WRITE     0x55
-#define BLOCK_END       0x33
-#define BLOCK_ERASE     0x99
-#define FLASH_STOP      0xCC
-
-#define SLEEP           0x5A
-#define CLEAR_BUF       0xC3
-#define MS_RESET        0x3C
-
-#define PRO_READ_DATA           0x20
-#define PRO_WRITE_DATA          0x21
-#define PRO_READ_ATRB           0x24
-#define PRO_STOP                0x25
-#define PRO_ERASE               0x26
-#define PRO_READ_2K_DATA        0x27
-#define PRO_WRITE_2K_DATA       0x28
-
-#define PRO_FORMAT              0x10
-#define PRO_SLEEP               0x11
-
-#define IntReg                  0x01
-#define StatusReg0              0x02
-#define StatusReg1              0x03
-
-#define SystemParm              0x10
-#define BlockAdrs               0x11
-#define CMDParm                 0x14
-#define PageAdrs                0x15
-
-#define OverwriteFlag           0x16
-#define ManagemenFlag           0x17
-#define LogicalAdrs             0x18
-#define ReserveArea             0x1A
-
-#define Pro_IntReg              0x01
-#define Pro_StatusReg           0x02
-#define Pro_TypeReg             0x04
-#define Pro_IFModeReg           0x05
-#define Pro_CatagoryReg         0x06
-#define Pro_ClassReg            0x07
-
-
-#define Pro_SystemParm          0x10
-#define Pro_DataCount1          0x11
-#define Pro_DataCount0          0x12
-#define Pro_DataAddr3           0x13
-#define Pro_DataAddr2           0x14
-#define Pro_DataAddr1           0x15
-#define Pro_DataAddr0           0x16
-
-#define Pro_TPCParm             0x17
-#define Pro_CMDParm             0x18
-
-#define INT_REG_CED             0x80
-#define INT_REG_ERR             0x40
-#define INT_REG_BREQ            0x20
-#define INT_REG_CMDNK           0x01
-
-#define BLOCK_BOOT              0xC0
-#define BLOCK_OK                0x80
-#define PAGE_OK                 0x60
-#define DATA_COMPL              0x10
-
-#define NOT_BOOT_BLOCK          0x4
-#define NOT_TRANSLATION_TABLE   0x8
-
-#define HEADER_ID0              PPBUF_BASE2
-#define HEADER_ID1              (PPBUF_BASE2 + 1)
-#define DISABLED_BLOCK0         (PPBUF_BASE2 + 0x170 + 4)
-#define DISABLED_BLOCK1         (PPBUF_BASE2 + 0x170 + 5)
-#define DISABLED_BLOCK2         (PPBUF_BASE2 + 0x170 + 6)
-#define DISABLED_BLOCK3         (PPBUF_BASE2 + 0x170 + 7)
-#define BLOCK_SIZE_0            (PPBUF_BASE2 + 0x1a0 + 2)
-#define BLOCK_SIZE_1            (PPBUF_BASE2 + 0x1a0 + 3)
-#define BLOCK_COUNT_0           (PPBUF_BASE2 + 0x1a0 + 4)
-#define BLOCK_COUNT_1           (PPBUF_BASE2 + 0x1a0 + 5)
-#define EBLOCK_COUNT_0          (PPBUF_BASE2 + 0x1a0 + 6)
-#define EBLOCK_COUNT_1          (PPBUF_BASE2 + 0x1a0 + 7)
-#define PAGE_SIZE_0             (PPBUF_BASE2 + 0x1a0 + 8)
-#define PAGE_SIZE_1             (PPBUF_BASE2 + 0x1a0 + 9)
-
-#define MS_Device_Type          (PPBUF_BASE2 + 0x1D8)
-
-#define MS_4bit_Support         (PPBUF_BASE2 + 0x1D3)
-
-#define setPS_NG        1
-#define setPS_Error     0
-
-#define PARALLEL_8BIT_IF        0x40
-#define PARALLEL_4BIT_IF        0x00
-#define SERIAL_IF               0x80
-
-#define BUF_FULL        0x10
-#define BUF_EMPTY       0x20
-
-#define MEDIA_BUSY      0x80
-#define FLASH_BUSY      0x40
-#define DATA_ERROR      0x20
-#define STS_UCDT        0x10
-#define EXTRA_ERROR     0x08
-#define STS_UCEX        0x04
-#define FLAG_ERROR      0x02
-#define STS_UCFG        0x01
-
-#define MS_SHORT_DATA_LEN       32
-
-#define FORMAT_SUCCESS          0
-#define FORMAT_FAIL             1
-#define FORMAT_IN_PROGRESS      2
-
-#define MS_SET_BAD_BLOCK_FLG(ms_card)   ((ms_card)->multi_flag |= 0x80)
-#define MS_CLR_BAD_BLOCK_FLG(ms_card)   ((ms_card)->multi_flag &= 0x7F)
-#define MS_TST_BAD_BLOCK_FLG(ms_card)   ((ms_card)->multi_flag & 0x80)
-
-void mspro_polling_format_status(struct rtsx_chip *chip);
-
-void mspro_stop_seq_mode(struct rtsx_chip *chip);
-int reset_ms_card(struct rtsx_chip *chip);
-int ms_rw(struct scsi_cmnd *srb, struct rtsx_chip *chip, u32 start_sector, u16 sector_cnt);
-int mspro_format(struct scsi_cmnd *srb, struct rtsx_chip *chip, int short_data_len, int quick_format);
-void ms_free_l2p_tbl(struct rtsx_chip *chip);
-void ms_cleanup_work(struct rtsx_chip *chip);
-int ms_power_off_card3v3(struct rtsx_chip *chip);
-int release_ms_card(struct rtsx_chip *chip);
-#ifdef MS_DELAY_WRITE
-int ms_delay_write(struct rtsx_chip *chip);
-#endif
-
-#ifdef SUPPORT_MAGIC_GATE
-int mg_set_leaf_id(struct scsi_cmnd *srb, struct rtsx_chip *chip);
-int mg_get_local_EKB(struct scsi_cmnd *srb, struct rtsx_chip *chip);
-int mg_chg(struct scsi_cmnd *srb, struct rtsx_chip *chip);
-int mg_get_rsp_chg(struct scsi_cmnd *srb, struct rtsx_chip *chip);
-int mg_rsp(struct scsi_cmnd *srb, struct rtsx_chip *chip);
-int mg_get_ICV(struct scsi_cmnd *srb, struct rtsx_chip *chip);
-int mg_set_ICV(struct scsi_cmnd *srb, struct rtsx_chip *chip);
-#endif
-
-#endif  /* __REALTEK_RTSX_MS_H */
diff --git a/drivers/staging/rts_pstor/rtsx.c b/drivers/staging/rts_pstor/rtsx.c
deleted file mode 100644
index afe9c2e763d7..000000000000
--- a/drivers/staging/rts_pstor/rtsx.c
+++ /dev/null
@@ -1,1105 +0,0 @@
-/* Driver for Realtek PCI-Express card reader
- *
- * Copyright(c) 2009 Realtek Semiconductor Corp. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2, 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, see <http://www.gnu.org/licenses/>.
- *
- * Author:
- *   wwang (wei_wang@realsil.com.cn)
- *   No. 450, Shenhu Road, Suzhou Industry Park, Suzhou, China
- */
-
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
-#include <linux/blkdev.h>
-#include <linux/kthread.h>
-#include <linux/sched.h>
-#include <linux/workqueue.h>
-
-#include "rtsx.h"
-#include "rtsx_chip.h"
-#include "rtsx_transport.h"
-#include "rtsx_scsi.h"
-#include "rtsx_card.h"
-#include "general.h"
-
-#include "ms.h"
-#include "sd.h"
-#include "xd.h"
-
-#define DRIVER_VERSION "v1.10"
-
-MODULE_DESCRIPTION("Realtek PCI-Express card reader driver");
-MODULE_LICENSE("GPL");
-MODULE_VERSION(DRIVER_VERSION);
-
-static unsigned int delay_use = 1;
-module_param(delay_use, uint, S_IRUGO | S_IWUSR);
-MODULE_PARM_DESC(delay_use, "seconds to delay before using a new device");
-
-static int ss_en;
-module_param(ss_en, int, S_IRUGO | S_IWUSR);
-MODULE_PARM_DESC(ss_en, "enable selective suspend");
-
-static int ss_interval = 50;
-module_param(ss_interval, int, S_IRUGO | S_IWUSR);
-MODULE_PARM_DESC(ss_interval, "Interval to enter ss state in seconds");
-
-static int auto_delink_en;
-module_param(auto_delink_en, int, S_IRUGO | S_IWUSR);
-MODULE_PARM_DESC(auto_delink_en, "enable auto delink");
-
-static unsigned char aspm_l0s_l1_en;
-module_param(aspm_l0s_l1_en, byte, S_IRUGO | S_IWUSR);
-MODULE_PARM_DESC(aspm_l0s_l1_en, "enable device aspm");
-
-static int msi_en;
-module_param(msi_en, int, S_IRUGO | S_IWUSR);
-MODULE_PARM_DESC(msi_en, "enable msi");
-
-static irqreturn_t rtsx_interrupt(int irq, void *dev_id);
-
-/***********************************************************************
- * Host functions
- ***********************************************************************/
-
-static const char *host_info(struct Scsi_Host *host)
-{
-        return "SCSI emulation for PCI-Express Mass Storage devices";
-}
-
-static int slave_alloc(struct scsi_device *sdev)
-{
-        /*
-         * Set the INQUIRY transfer length to 36.  We don't use any of
-         * the extra data and many devices choke if asked for more or
-         * less than 36 bytes.
-         */
-        sdev->inquiry_len = 36;
-        return 0;
-}
-
-static int slave_configure(struct scsi_device *sdev)
-{
-        /* Scatter-gather buffers (all but the last) must have a length
-         * divisible by the bulk maxpacket size.  Otherwise a data packet
-         * would end up being short, causing a premature end to the data
-         * transfer.  Since high-speed bulk pipes have a maxpacket size
-         * of 512, we'll use that as the scsi device queue's DMA alignment
-         * mask.  Guaranteeing proper alignment of the first buffer will
-         * have the desired effect because, except at the beginning and
-         * the end, scatter-gather buffers follow page boundaries. */
-        blk_queue_dma_alignment(sdev->request_queue, (512 - 1));
-
-        /* Set the SCSI level to at least 2.  We'll leave it at 3 if that's
-         * what is originally reported.  We need this to avoid confusing
-         * the SCSI layer with devices that report 0 or 1, but need 10-byte
-         * commands (ala ATAPI devices behind certain bridges, or devices
-         * which simply have broken INQUIRY data).
-         *
-         * NOTE: This means /dev/sg programs (ala cdrecord) will get the
-         * actual information.  This seems to be the preference for
-         * programs like that.
-         *
-         * NOTE: This also means that /proc/scsi/scsi and sysfs may report
-         * the actual value or the modified one, depending on where the
-         * data comes from.
-         */
-        if (sdev->scsi_level < SCSI_2)
-                sdev->scsi_level = sdev->sdev_target->scsi_level = SCSI_2;
-
-        return 0;
-}
-
-
-/***********************************************************************
- * /proc/scsi/ functions
- ***********************************************************************/
-
-/* we use this macro to help us write into the buffer */
-#undef SPRINTF
-#define SPRINTF(args...) \
-        do { if (pos < buffer+length) pos += sprintf(pos, ## args); } while (0)
-
-static int proc_info(struct Scsi_Host *host, char *buffer,
-                char **start, off_t offset, int length, int inout)
-{
-        char *pos = buffer;
-
-        /* if someone is sending us data, just throw it away */
-        if (inout)
-                return length;
-
-        /* print the controller name */
-        SPRINTF("   Host scsi%d: %s\n", host->host_no, CR_DRIVER_NAME);
-
-        /* print product, vendor, and driver version strings */
-        SPRINTF("       Vendor: Realtek Corp.\n");
-        SPRINTF("      Product: PCIE Card Reader\n");
-        SPRINTF("      Version: %s\n", DRIVER_VERSION);
-
-        /*
-         * Calculate start of next buffer, and return value.
-         */
-        *start = buffer + offset;
-
-        if ((pos - buffer) < offset)
-                return 0;
-        else if ((pos - buffer - offset) < length)
-                return pos - buffer - offset;
-        else
-                return length;
-}
-
-/* queue a command */
-/* This is always called with scsi_lock(host) held */
-static int queuecommand_lck(struct scsi_cmnd *srb,
-                        void (*done)(struct scsi_cmnd *))
-{
-        struct rtsx_dev *dev = host_to_rtsx(srb->device->host);
-        struct rtsx_chip *chip = dev->chip;
-
-        /* check for state-transition errors */
-        if (chip->srb != NULL) {
-                dev_err(&dev->pci->dev, "Error in %s: chip->srb = %p\n",
-                        __func__, chip->srb);
-                return SCSI_MLQUEUE_HOST_BUSY;
-        }
-
-        /* fail the command if we are disconnecting */
-        if (rtsx_chk_stat(chip, RTSX_STAT_DISCONNECT)) {
-                dev_info(&dev->pci->dev, "Fail command during disconnect\n");
-                srb->result = DID_NO_CONNECT << 16;
-                done(srb);
-                return 0;
-        }
-
-        /* enqueue the command and wake up the control thread */
-        srb->scsi_done = done;
-        chip->srb = srb;
-        complete(&dev->cmnd_ready);
-
-        return 0;
-}
-
-static DEF_SCSI_QCMD(queuecommand)
-
-/***********************************************************************
- * Error handling functions
- ***********************************************************************/
-
-/* Command timeout and abort */
-static int command_abort(struct scsi_cmnd *srb)
-{
-        struct Scsi_Host *host = srb->device->host;
-        struct rtsx_dev *dev = host_to_rtsx(host);
-        struct rtsx_chip *chip = dev->chip;
-
-        dev_info(&dev->pci->dev, "%s called\n", __func__);
-
-        scsi_lock(host);
-
-        /* Is this command still active? */
-        if (chip->srb != srb) {
-                scsi_unlock(host);
-                dev_info(&dev->pci->dev, "-- nothing to abort\n");
-                return FAILED;
-        }
-
-        rtsx_set_stat(chip, RTSX_STAT_ABORT);
-
-        scsi_unlock(host);
-
-        /* Wait for the aborted command to finish */
-        wait_for_completion(&dev->notify);
-
-        return SUCCESS;
-}
-
-/* This invokes the transport reset mechanism to reset the state of the
- * device */
-static int device_reset(struct scsi_cmnd *srb)
-{
-        int result = 0;
-        struct rtsx_dev *dev = host_to_rtsx(srb->device->host);
-
-        dev_info(&dev->pci->dev, "%s called\n", __func__);
-
-        return result < 0 ? FAILED : SUCCESS;
-}
-
-/* Simulate a SCSI bus reset by resetting the device's USB port. */
-static int bus_reset(struct scsi_cmnd *srb)
-{
-        int result = 0;
-        struct rtsx_dev *dev = host_to_rtsx(srb->device->host);
-
-        dev_info(&dev->pci->dev, "%s called\n", __func__);
-
-        return result < 0 ? FAILED : SUCCESS;
-}
-
-
-/*
- * this defines our host template, with which we'll allocate hosts
- */
-
-static struct scsi_host_template rtsx_host_template = {
-        /* basic userland interface stuff */
-        .name =                         CR_DRIVER_NAME,
-        .proc_name =                    CR_DRIVER_NAME,
-        .proc_info =                    proc_info,
-        .info =                         host_info,
-
-        /* command interface -- queued only */
-        .queuecommand =                 queuecommand,
-
-        /* error and abort handlers */
-        .eh_abort_handler =             command_abort,
-        .eh_device_reset_handler =      device_reset,
-        .eh_bus_reset_handler =         bus_reset,
-
-        /* queue commands only, only one command per LUN */
-        .can_queue =                    1,
-        .cmd_per_lun =                  1,
-
-        /* unknown initiator id */
-        .this_id =                      -1,
-
-        .slave_alloc =                  slave_alloc,
-        .slave_configure =              slave_configure,
-
-        /* lots of sg segments can be handled */
-        .sg_tablesize =                 SG_ALL,
-
-        /* limit the total size of a transfer to 120 KB */
-        .max_sectors =                  240,
-
-        /* merge commands... this seems to help performance, but
-         * periodically someone should test to see which setting is more
-         * optimal.
-         */
-        .use_clustering =               1,
-
-        /* emulated HBA */
-        .emulated =                     1,
-
-        /* we do our own delay after a device or bus reset */
-        .skip_settle_delay =            1,
-
-        /* module management */
-        .module =                       THIS_MODULE
-};
-
-
-static int rtsx_acquire_irq(struct rtsx_dev *dev)
-{
-        struct rtsx_chip *chip = dev->chip;
-
-        dev_info(&dev->pci->dev, "%s: chip->msi_en = %d, pci->irq = %d\n",
-                 __func__, chip->msi_en, dev->pci->irq);
-
-        if (request_irq(dev->pci->irq, rtsx_interrupt,
-                        chip->msi_en ? 0 : IRQF_SHARED,
-                        CR_DRIVER_NAME, dev)) {
-                dev_err(&dev->pci->dev,
-                        "rtsx: unable to grab IRQ %d, disabling device\n",
-                        dev->pci->irq);
-                return -1;
-        }
-
-        dev->irq = dev->pci->irq;
-        pci_intx(dev->pci, !chip->msi_en);
-
-        return 0;
-}
-
-
-int rtsx_read_pci_cfg_byte(u8 bus, u8 dev, u8 func, u8 offset, u8 *val)
-{
-        struct pci_dev *pdev;
-        u8 data;
-        u8 devfn = (dev << 3) | func;
-
-        pdev = pci_get_bus_and_slot(bus, devfn);
-        if (!pdev)
-                return -1;
-
-        pci_read_config_byte(pdev, offset, &data);
-        if (val)
-                *val = data;
-
-        return 0;
-}
-
-#ifdef CONFIG_PM
-/*
- * power management
- */
-static int rtsx_suspend(struct pci_dev *pci, pm_message_t state)
-{
-        struct rtsx_dev *dev = (struct rtsx_dev *)pci_get_drvdata(pci);
-        struct rtsx_chip *chip;
-
-        if (!dev)
-                return 0;
-
-        /* lock the device pointers */
-        mutex_lock(&(dev->dev_mutex));
-
-        chip = dev->chip;
-
-        rtsx_do_before_power_down(chip, PM_S3);
-
-        if (dev->irq >= 0) {
-                synchronize_irq(dev->irq);
-                free_irq(dev->irq, (void *)dev);
-                dev->irq = -1;
-        }
-
-        if (chip->msi_en)
-                pci_disable_msi(pci);
-
-        pci_save_state(pci);
-        pci_enable_wake(pci, pci_choose_state(pci, state), 1);
-        pci_disable_device(pci);
-        pci_set_power_state(pci, pci_choose_state(pci, state));
-
-        /* unlock the device pointers */
-        mutex_unlock(&dev->dev_mutex);
-
-        return 0;
-}
-
-static int rtsx_resume(struct pci_dev *pci)
-{
-        struct rtsx_dev *dev = (struct rtsx_dev *)pci_get_drvdata(pci);
-        struct rtsx_chip *chip;
-
-        if (!dev)
-                return 0;
-
-        chip = dev->chip;
-
-        /* lock the device pointers */
-        mutex_lock(&(dev->dev_mutex));
-
-        pci_set_power_state(pci, PCI_D0);
-        pci_restore_state(pci);
-        if (pci_enable_device(pci) < 0) {
-                dev_err(&dev->pci->dev,
-                        "%s: pci_enable_device failed, disabling device\n",
-                        CR_DRIVER_NAME);
-                /* unlock the device pointers */
-                mutex_unlock(&dev->dev_mutex);
-                return -EIO;
-        }
-        pci_set_master(pci);
-
-        if (chip->msi_en) {
-                if (pci_enable_msi(pci) < 0)
-                        chip->msi_en = 0;
-        }
-
-        if (rtsx_acquire_irq(dev) < 0) {
-                /* unlock the device pointers */
-                mutex_unlock(&dev->dev_mutex);
-                return -EIO;
-        }
-
-        rtsx_write_register(chip, HOST_SLEEP_STATE, 0x03, 0x00);
-        rtsx_init_chip(chip);
-
-        /* unlock the device pointers */
-        mutex_unlock(&dev->dev_mutex);
-
-        return 0;
-}
-#endif /* CONFIG_PM */
-
-static void rtsx_shutdown(struct pci_dev *pci)
-{
-        struct rtsx_dev *dev = (struct rtsx_dev *)pci_get_drvdata(pci);
-        struct rtsx_chip *chip;
-
-        if (!dev)
-                return;
-
-        chip = dev->chip;
-
-        rtsx_do_before_power_down(chip, PM_S1);
-
-        if (dev->irq >= 0) {
-                synchronize_irq(dev->irq);
-                free_irq(dev->irq, (void *)dev);
-                dev->irq = -1;
-        }
-
-        if (chip->msi_en)
-                pci_disable_msi(pci);
-
-        pci_disable_device(pci);
-
-        return;
-}
-
-static int rtsx_control_thread(void *__dev)
-{
-        struct rtsx_dev *dev = (struct rtsx_dev *)__dev;
-        struct rtsx_chip *chip = dev->chip;
-        struct Scsi_Host *host = rtsx_to_host(dev);
-
-        for (;;) {
-                if (wait_for_completion_interruptible(&dev->cmnd_ready))
-                        break;
-
-                /* lock the device pointers */
-                mutex_lock(&(dev->dev_mutex));
-
-                /* if the device has disconnected, we are free to exit */
-                if (rtsx_chk_stat(chip, RTSX_STAT_DISCONNECT)) {
-                        dev_info(&dev->pci->dev, "-- rtsx-control exiting\n");
-                        mutex_unlock(&dev->dev_mutex);
-                        break;
-                }
-
-                /* lock access to the state */
-                scsi_lock(host);
-
-                /* has the command aborted ? */
-                if (rtsx_chk_stat(chip, RTSX_STAT_ABORT)) {
-                        chip->srb->result = DID_ABORT << 16;
-                        goto SkipForAbort;
-                }
-
-                scsi_unlock(host);
-
-                /* reject the command if the direction indicator
-                 * is UNKNOWN
-                 */
-                if (chip->srb->sc_data_direction == DMA_BIDIRECTIONAL) {
-                        dev_err(&dev->pci->dev, "UNKNOWN data direction\n");
-                        chip->srb->result = DID_ERROR << 16;
-                }
-
-                /* reject if target != 0 or if LUN is higher than
-                 * the maximum known LUN
-                 */
-                else if (chip->srb->device->id) {
-                        dev_err(&dev->pci->dev, "Bad target number (%d:%d)\n",
-                                chip->srb->device->id,
-                                chip->srb->device->lun);
-                        chip->srb->result = DID_BAD_TARGET << 16;
-                }
-
-                else if (chip->srb->device->lun > chip->max_lun) {
-                        dev_err(&dev->pci->dev, "Bad LUN (%d:%d)\n",
-                                chip->srb->device->id,
-                                chip->srb->device->lun);
-                        chip->srb->result = DID_BAD_TARGET << 16;
-                }
-
-                /* we've got a command, let's do it! */
-                else {
-                        RTSX_DEBUG(scsi_show_command(chip->srb));
-                        rtsx_invoke_transport(chip->srb, chip);
-                }
-
-                /* lock access to the state */
-                scsi_lock(host);
-
-                /* did the command already complete because of a disconnect? */
-                if (!chip->srb)
-                        ;               /* nothing to do */
-
-                /* indicate that the command is done */
-                else if (chip->srb->result != DID_ABORT << 16) {
-                        chip->srb->scsi_done(chip->srb);
-                } else {
-SkipForAbort:
-                        dev_err(&dev->pci->dev, "scsi command aborted\n");
-                }
-
-                if (rtsx_chk_stat(chip, RTSX_STAT_ABORT)) {
-                        complete(&(dev->notify));
-
-                        rtsx_set_stat(chip, RTSX_STAT_IDLE);
-                }
-
-                /* finished working on this command */
-                chip->srb = NULL;
-                scsi_unlock(host);
-
-                /* unlock the device pointers */
-                mutex_unlock(&dev->dev_mutex);
-        } /* for (;;) */
-
-        /* notify the exit routine that we're actually exiting now
-         *
-         * complete()/wait_for_completion() is similar to up()/down(),
-         * except that complete() is safe in the case where the structure
-         * is getting deleted in a parallel mode of execution (i.e. just
-         * after the down() -- that's necessary for the thread-shutdown
-         * case.
-         *
-         * complete_and_exit() goes even further than this -- it is safe in
-         * the case that the thread of the caller is going away (not just
-         * the structure) -- this is necessary for the module-remove case.
-         * This is important in preemption kernels, which transfer the flow
-         * of execution immediately upon a complete().
-         */
-        complete_and_exit(&dev->control_exit, 0);
-}
-
-
-static int rtsx_polling_thread(void *__dev)
-{
-        struct rtsx_dev *dev = (struct rtsx_dev *)__dev;
-        struct rtsx_chip *chip = dev->chip;
-        struct sd_info *sd_card = &(chip->sd_card);
-        struct xd_info *xd_card = &(chip->xd_card);
-        struct ms_info *ms_card = &(chip->ms_card);
-
-        sd_card->cleanup_counter = 0;
-        xd_card->cleanup_counter = 0;
-        ms_card->cleanup_counter = 0;
-
-        /* Wait until SCSI scan finished */
-        wait_timeout((delay_use + 5) * 1000);
-
-        for (;;) {
-
-                set_current_state(TASK_INTERRUPTIBLE);
-                schedule_timeout(POLLING_INTERVAL);
-
-                /* lock the device pointers */
-                mutex_lock(&(dev->dev_mutex));
-
-                /* if the device has disconnected, we are free to exit */
-                if (rtsx_chk_stat(chip, RTSX_STAT_DISCONNECT)) {
-                        dev_info(&dev->pci->dev, "-- rtsx-polling exiting\n");
-                        mutex_unlock(&dev->dev_mutex);
-                        break;
-                }
-
-                mutex_unlock(&dev->dev_mutex);
-
-                mspro_polling_format_status(chip);
-
-                /* lock the device pointers */
-                mutex_lock(&(dev->dev_mutex));
-
-                rtsx_polling_func(chip);
-
-                /* unlock the device pointers */
-                mutex_unlock(&dev->dev_mutex);
-        }
-
-        complete_and_exit(&dev->polling_exit, 0);
-}
-
-/*
- * interrupt handler
- */
-static irqreturn_t rtsx_interrupt(int irq, void *dev_id)
-{
-        struct rtsx_dev *dev = dev_id;
-        struct rtsx_chip *chip;
-        int retval;
-        u32 status;
-
-        if (dev)
-                chip = dev->chip;
-        else
-                return IRQ_NONE;
-
-        if (!chip)
-                return IRQ_NONE;
-
-        spin_lock(&dev->reg_lock);
-
-        retval = rtsx_pre_handle_interrupt(chip);
-        if (retval == STATUS_FAIL) {
-                spin_unlock(&dev->reg_lock);
-                if (chip->int_reg == 0xFFFFFFFF)
-                        return IRQ_HANDLED;
-                else
-                        return IRQ_NONE;
-        }
-
-        status = chip->int_reg;
-
-        if (dev->check_card_cd) {
-                if (!(dev->check_card_cd & status)) {
-                        /* card not exist, return TRANS_RESULT_FAIL */
-                        dev->trans_result = TRANS_RESULT_FAIL;
-                        if (dev->done)
-                                complete(dev->done);
-                        goto Exit;
-                }
-        }
-
-        if (status & (NEED_COMPLETE_INT | DELINK_INT)) {
-                if (status & (TRANS_FAIL_INT | DELINK_INT)) {
-                        if (status & DELINK_INT)
-                                RTSX_SET_DELINK(chip);
-                        dev->trans_result = TRANS_RESULT_FAIL;
-                        if (dev->done)
-                                complete(dev->done);
-                } else if (status & TRANS_OK_INT) {
-                        dev->trans_result = TRANS_RESULT_OK;
-                        if (dev->done)
-                                complete(dev->done);
-                } else if (status & DATA_DONE_INT) {
-                        dev->trans_result = TRANS_NOT_READY;
-                        if (dev->done && (dev->trans_state == STATE_TRANS_SG))
-                                complete(dev->done);
-                }
-        }
-
-Exit:
-        spin_unlock(&dev->reg_lock);
-        return IRQ_HANDLED;
-}
-
-
-/* Release all our dynamic resources */
-static void rtsx_release_resources(struct rtsx_dev *dev)
-{
-        dev_info(&dev->pci->dev, "-- %s\n", __func__);
-
-        /* Tell the control thread to exit.  The SCSI host must
-         * already have been removed so it won't try to queue
-         * any more commands.
-         */
-        dev_info(&dev->pci->dev, "-- sending exit command to thread\n");
-        complete(&dev->cmnd_ready);
-        if (dev->ctl_thread)
-                wait_for_completion(&dev->control_exit);
-        if (dev->polling_thread)
-                wait_for_completion(&dev->polling_exit);
-
-        wait_timeout(200);
-
-        if (dev->rtsx_resv_buf) {
-                dma_free_coherent(&(dev->pci->dev), RTSX_RESV_BUF_LEN,
-                                dev->rtsx_resv_buf, dev->rtsx_resv_buf_addr);
-                dev->chip->host_cmds_ptr = NULL;
-                dev->chip->host_sg_tbl_ptr = NULL;
-        }
-
-        if (dev->irq > 0)
-                free_irq(dev->irq, (void *)dev);
-        if (dev->chip->msi_en)
-                pci_disable_msi(dev->pci);
-        if (dev->remap_addr)
-                iounmap(dev->remap_addr);
-
-        pci_disable_device(dev->pci);
-        pci_release_regions(dev->pci);
-
-        rtsx_release_chip(dev->chip);
-        kfree(dev->chip);
-}
-
-/* First stage of disconnect processing: stop all commands and remove
- * the host */
-static void quiesce_and_remove_host(struct rtsx_dev *dev)
-{
-        struct Scsi_Host *host = rtsx_to_host(dev);
-        struct rtsx_chip *chip = dev->chip;
-
-        /* Prevent new transfers, stop the current command, and
-         * interrupt a SCSI-scan or device-reset delay */
-        mutex_lock(&dev->dev_mutex);
-        scsi_lock(host);
-        rtsx_set_stat(chip, RTSX_STAT_DISCONNECT);
-        scsi_unlock(host);
-        mutex_unlock(&dev->dev_mutex);
-        wake_up(&dev->delay_wait);
-        wait_for_completion(&dev->scanning_done);
-
-        /* Wait some time to let other threads exist */
-        wait_timeout(100);
-
-        /* queuecommand won't accept any new commands and the control
-         * thread won't execute a previously-queued command.  If there
-         * is such a command pending, complete it with an error. */
-        mutex_lock(&dev->dev_mutex);
-        if (chip->srb) {
-                chip->srb->result = DID_NO_CONNECT << 16;
-                scsi_lock(host);
-                chip->srb->scsi_done(dev->chip->srb);
-                chip->srb = NULL;
-                scsi_unlock(host);
-        }
-        mutex_unlock(&dev->dev_mutex);
-
-        /* Now we own no commands so it's safe to remove the SCSI host */
-        scsi_remove_host(host);
-}
-
-/* Second stage of disconnect processing: deallocate all resources */
-static void release_everything(struct rtsx_dev *dev)
-{
-        rtsx_release_resources(dev);
-
-        /* Drop our reference to the host; the SCSI core will free it
-         * when the refcount becomes 0. */
-        scsi_host_put(rtsx_to_host(dev));
-}
-
-/* Thread to carry out delayed SCSI-device scanning */
-static int rtsx_scan_thread(void *__dev)
-{
-        struct rtsx_dev *dev = (struct rtsx_dev *)__dev;
-        struct rtsx_chip *chip = dev->chip;
-
-        /* Wait for the timeout to expire or for a disconnect */
-        if (delay_use > 0) {
-                dev_info(&dev->pci->dev,
-                         "%s: waiting for device to settle before scanning\n",
-                         CR_DRIVER_NAME);
-                wait_event_interruptible_timeout(dev->delay_wait,
-                                rtsx_chk_stat(chip, RTSX_STAT_DISCONNECT),
-                                delay_use * HZ);
-        }
-
-        /* If the device is still connected, perform the scanning */
-        if (!rtsx_chk_stat(chip, RTSX_STAT_DISCONNECT)) {
-                scsi_scan_host(rtsx_to_host(dev));
-                dev_info(&dev->pci->dev, "%s: device scan complete\n",
-                         CR_DRIVER_NAME);
-
-                /* Should we unbind if no devices were detected? */
-        }
-
-        complete_and_exit(&dev->scanning_done, 0);
-}
-
-static void rtsx_init_options(struct rtsx_chip *chip)
-{
-        chip->vendor_id = chip->rtsx->pci->vendor;
-        chip->product_id = chip->rtsx->pci->device;
-        chip->adma_mode = 1;
-        chip->lun_mc = 0;
-        chip->driver_first_load = 1;
-#ifdef HW_AUTO_SWITCH_SD_BUS
-        chip->sdio_in_charge = 0;
-#endif
-
-        chip->mspro_formatter_enable = 1;
-        chip->ignore_sd = 0;
-        chip->use_hw_setting = 0;
-        chip->lun_mode = DEFAULT_SINGLE;
-        chip->auto_delink_en = auto_delink_en;
-        chip->ss_en = ss_en;
-        chip->ss_idle_period = ss_interval * 1000;
-        chip->remote_wakeup_en = 0;
-        chip->aspm_l0s_l1_en = aspm_l0s_l1_en;
-        chip->dynamic_aspm = 1;
-        chip->fpga_sd_sdr104_clk = CLK_200;
-        chip->fpga_sd_ddr50_clk = CLK_100;
-        chip->fpga_sd_sdr50_clk = CLK_100;
-        chip->fpga_sd_hs_clk = CLK_100;
-        chip->fpga_mmc_52m_clk = CLK_80;
-        chip->fpga_ms_hg_clk = CLK_80;
-        chip->fpga_ms_4bit_clk = CLK_80;
-        chip->fpga_ms_1bit_clk = CLK_40;
-        chip->asic_sd_sdr104_clk = 203;
-        chip->asic_sd_sdr50_clk = 98;
-        chip->asic_sd_ddr50_clk = 98;
-        chip->asic_sd_hs_clk = 98;
-        chip->asic_mmc_52m_clk = 98;
-        chip->asic_ms_hg_clk = 117;
-        chip->asic_ms_4bit_clk = 78;
-        chip->asic_ms_1bit_clk = 39;
-        chip->ssc_depth_sd_sdr104 = SSC_DEPTH_2M;
-        chip->ssc_depth_sd_sdr50 = SSC_DEPTH_2M;
-        chip->ssc_depth_sd_ddr50 = SSC_DEPTH_1M;
-        chip->ssc_depth_sd_hs = SSC_DEPTH_1M;
-        chip->ssc_depth_mmc_52m = SSC_DEPTH_1M;
-        chip->ssc_depth_ms_hg = SSC_DEPTH_1M;
-        chip->ssc_depth_ms_4bit = SSC_DEPTH_512K;
-        chip->ssc_depth_low_speed = SSC_DEPTH_512K;
-        chip->ssc_en = 1;
-        chip->sd_speed_prior = 0x01040203;
-        chip->sd_current_prior = 0x00010203;
-        chip->sd_ctl = SD_PUSH_POINT_AUTO |
-                       SD_SAMPLE_POINT_AUTO |
-                       SUPPORT_MMC_DDR_MODE;
-        chip->sd_ddr_tx_phase = 0;
-        chip->mmc_ddr_tx_phase = 1;
-        chip->sd_default_tx_phase = 15;
-        chip->sd_default_rx_phase = 15;
-        chip->pmos_pwr_on_interval = 200;
-        chip->sd_voltage_switch_delay = 1000;
-        chip->ms_power_class_en = 3;
-
-        chip->sd_400mA_ocp_thd = 1;
-        chip->sd_800mA_ocp_thd = 5;
-        chip->ms_ocp_thd = 2;
-
-        chip->card_drive_sel = 0x55;
-        chip->sd30_drive_sel_1v8 = 0x03;
-        chip->sd30_drive_sel_3v3 = 0x01;
-
-        chip->do_delink_before_power_down = 1;
-        chip->auto_power_down = 1;
-        chip->polling_config = 0;
-
-        chip->force_clkreq_0 = 1;
-        chip->ft2_fast_mode = 0;
-
-        chip->sdio_retry_cnt = 1;
-
-        chip->xd_timeout = 2000;
-        chip->sd_timeout = 10000;
-        chip->ms_timeout = 2000;
-        chip->mspro_timeout = 15000;
-
-        chip->power_down_in_ss = 1;
-
-        chip->sdr104_en = 1;
-        chip->sdr50_en = 1;
-        chip->ddr50_en = 1;
-
-        chip->delink_stage1_step = 100;
-        chip->delink_stage2_step = 40;
-        chip->delink_stage3_step = 20;
-
-        chip->auto_delink_in_L1 = 1;
-        chip->blink_led = 1;
-        chip->msi_en = msi_en;
-        chip->hp_watch_bios_hotplug = 0;
-        chip->max_payload = 0;
-        chip->phy_voltage = 0;
-
-        chip->support_ms_8bit = 1;
-        chip->s3_pwr_off_delay = 1000;
-}
-
-static int __devinit rtsx_probe(struct pci_dev *pci,
-                                const struct pci_device_id *pci_id)
-{
-        struct Scsi_Host *host;
-        struct rtsx_dev *dev;
-        int err = 0;
-        struct task_struct *th;
-
-        RTSX_DEBUGP("Realtek PCI-E card reader detected\n");
-
-        err = pci_enable_device(pci);
-        if (err < 0) {
-                dev_err(&pci->dev, "PCI enable device failed!\n");
-                return err;
-        }
-
-        err = pci_request_regions(pci, CR_DRIVER_NAME);
-        if (err < 0) {
-                dev_err(&pci->dev, "PCI request regions for %s failed!\n",
-                        CR_DRIVER_NAME);
-                pci_disable_device(pci);
-                return err;
-        }
-
-        /*
-         * Ask the SCSI layer to allocate a host structure, with extra
-         * space at the end for our private rtsx_dev structure.
-         */
-        host = scsi_host_alloc(&rtsx_host_template, sizeof(*dev));
-        if (!host) {
-                dev_err(&pci->dev, "Unable to allocate the scsi host\n");
-                pci_release_regions(pci);
-                pci_disable_device(pci);
-                return -ENOMEM;
-        }
-
-        dev = host_to_rtsx(host);
-        memset(dev, 0, sizeof(struct rtsx_dev));
-
-        dev->chip = kzalloc(sizeof(struct rtsx_chip), GFP_KERNEL);
-        if (dev->chip == NULL)
-                goto errout;
-
-        spin_lock_init(&dev->reg_lock);
-        mutex_init(&(dev->dev_mutex));
-        init_completion(&dev->cmnd_ready);
-        init_completion(&dev->control_exit);
-        init_completion(&dev->polling_exit);
-        init_completion(&(dev->notify));
-        init_completion(&dev->scanning_done);
-        init_waitqueue_head(&dev->delay_wait);
-
-        dev->pci = pci;
-        dev->irq = -1;
-
-        dev_info(&pci->dev, "Resource length: 0x%x\n",
-                 (unsigned int)pci_resource_len(pci, 0));
-        dev->addr = pci_resource_start(pci, 0);
-        dev->remap_addr = ioremap_nocache(dev->addr, pci_resource_len(pci, 0));
-        if (dev->remap_addr == NULL) {
-                dev_err(&pci->dev, "ioremap error\n");
-                err = -ENXIO;
-                goto errout;
-        }
-
-        /*
-         * Using "unsigned long" cast here to eliminate gcc warning in
-         * 64-bit system
-         */
-        dev_info(&pci->dev, "Original address: 0x%lx, remapped address: 0x%lx\n",
-                 (unsigned long)(dev->addr), (unsigned long)(dev->remap_addr));
-
-        dev->rtsx_resv_buf = dma_alloc_coherent(&(pci->dev), RTSX_RESV_BUF_LEN,
-                        &(dev->rtsx_resv_buf_addr), GFP_KERNEL);
-        if (dev->rtsx_resv_buf == NULL) {
-                dev_err(&pci->dev, "alloc dma buffer fail\n");
-                err = -ENXIO;
-                goto errout;
-        }
-        dev->chip->host_cmds_ptr = dev->rtsx_resv_buf;
-        dev->chip->host_cmds_addr = dev->rtsx_resv_buf_addr;
-        dev->chip->host_sg_tbl_ptr = dev->rtsx_resv_buf + HOST_CMDS_BUF_LEN;
-        dev->chip->host_sg_tbl_addr = dev->rtsx_resv_buf_addr +
-                                      HOST_CMDS_BUF_LEN;
-
-        dev->chip->rtsx = dev;
-
-        rtsx_init_options(dev->chip);
-
-        dev_info(&pci->dev, "pci->irq = %d\n", pci->irq);
-
-        if (dev->chip->msi_en) {
-                if (pci_enable_msi(pci) < 0)
-                        dev->chip->msi_en = 0;
-        }
-
-        if (rtsx_acquire_irq(dev) < 0) {
-                err = -EBUSY;
-                goto errout;
-        }
-
-        pci_set_master(pci);
-        synchronize_irq(dev->irq);
-
-        rtsx_init_chip(dev->chip);
-
-        /* set the supported max_lun and max_id for the scsi host
-         * NOTE: the minimal value of max_id is 1 */
-        host->max_id = 1;
-        host->max_lun = dev->chip->max_lun;
-
-        /* Start up our control thread */
-        th = kthread_run(rtsx_control_thread, dev, CR_DRIVER_NAME);
-        if (IS_ERR(th)) {
-                dev_err(&pci->dev, "Unable to start control thread\n");
-                err = PTR_ERR(th);
-                goto errout;
-        }
-        dev->ctl_thread = th;
-
-        err = scsi_add_host(host, &pci->dev);
-        if (err) {
-                dev_err(&pci->dev, "Unable to add the scsi host\n");
-                goto errout;
-        }
-
-        /* Start up the thread for delayed SCSI-device scanning */
-        th = kthread_run(rtsx_scan_thread, dev, "rtsx-scan");
-        if (IS_ERR(th)) {
-                dev_err(&pci->dev, "Unable to start the device-scanning thread\n");
-                complete(&dev->scanning_done);
-                quiesce_and_remove_host(dev);
-                err = PTR_ERR(th);
-                goto errout;
-        }
-
-        /* Start up the thread for polling thread */
-        th = kthread_run(rtsx_polling_thread, dev, "rtsx-polling");
-        if (IS_ERR(th)) {
-                dev_err(&pci->dev, "Unable to start the device-polling thread\n");
-                quiesce_and_remove_host(dev);
-                err = PTR_ERR(th);
-                goto errout;
-        }
-        dev->polling_thread = th;
-
-        pci_set_drvdata(pci, dev);
-
-        return 0;
-
-        /* We come here if there are any problems */
-errout:
-        dev_err(&pci->dev, "rtsx_probe() failed\n");
-        release_everything(dev);
-
-        return err;
-}
-
-
-static void __devexit rtsx_remove(struct pci_dev *pci)
-{
-        struct rtsx_dev *dev = (struct rtsx_dev *)pci_get_drvdata(pci);
-
-        dev_info(&pci->dev, "rtsx_remove() called\n");
-
-        quiesce_and_remove_host(dev);
-        release_everything(dev);
-
-        pci_set_drvdata(pci, NULL);
-}
-
-/* PCI IDs */
-static DEFINE_PCI_DEVICE_TABLE(rtsx_ids) = {
-        { PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x5208), PCI_CLASS_OTHERS << 16, 0xFF0000 },
-        { PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x5209), PCI_CLASS_OTHERS << 16, 0xFF0000 },
-        { PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x5288), PCI_CLASS_OTHERS << 16, 0xFF0000 },
-        { 0, },
-};
-
-MODULE_DEVICE_TABLE(pci, rtsx_ids);
-
-/* pci_driver definition */
-static struct pci_driver driver = {
-        .name = CR_DRIVER_NAME,
-        .id_table = rtsx_ids,
-        .probe = rtsx_probe,
-        .remove = __devexit_p(rtsx_remove),
-#ifdef CONFIG_PM
-        .suspend = rtsx_suspend,
-        .resume = rtsx_resume,
-#endif
-        .shutdown = rtsx_shutdown,
-};
-
-static int __init rtsx_init(void)
-{
-        pr_info("Initializing Realtek PCIE storage driver...\n");
-
-        return pci_register_driver(&driver);
-}
-
-static void __exit rtsx_exit(void)
-{
-        pr_info("rtsx_exit() called\n");
-
-        pci_unregister_driver(&driver);
-
-        pr_info("%s module exit\n", CR_DRIVER_NAME);
-}
-
-module_init(rtsx_init)
-module_exit(rtsx_exit)
-
diff --git a/drivers/staging/rts_pstor/rtsx.h b/drivers/staging/rts_pstor/rtsx.h
deleted file mode 100644
index 1ab42fcc47da..000000000000
--- a/drivers/staging/rts_pstor/rtsx.h
+++ /dev/null
@@ -1,186 +0,0 @@
-/* Driver for Realtek PCI-Express card reader
- * Header file
- *
- * Copyright(c) 2009 Realtek Semiconductor Corp. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2, 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, see <http://www.gnu.org/licenses/>.
- *
- * Author:
- *   wwang (wei_wang@realsil.com.cn)
- *   No. 450, Shenhu Road, Suzhou Industry Park, Suzhou, China
- */
-
-#ifndef __REALTEK_RTSX_H
-#define __REALTEK_RTSX_H
-
-#include <linux/io.h>
-#include <linux/bitops.h>
-#include <linux/delay.h>
-#include <linux/interrupt.h>
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/moduleparam.h>
-#include <linux/init.h>
-#include <linux/slab.h>
-#include <linux/pci.h>
-#include <linux/mutex.h>
-#include <linux/cdrom.h>
-#include <linux/workqueue.h>
-#include <linux/timer.h>
-#include <linux/time.h>
-
-#include <scsi/scsi.h>
-#include <scsi/scsi_cmnd.h>
-#include <scsi/scsi_device.h>
-#include <scsi/scsi_devinfo.h>
-#include <scsi/scsi_eh.h>
-#include <scsi/scsi_host.h>
-
-#include "debug.h"
-#include "trace.h"
-#include "general.h"
-
-#define CR_DRIVER_NAME          "rts_pstor"
-
-#define pci_get_bus_and_slot(bus, devfn)        \
-        pci_get_domain_bus_and_slot(0, (bus), (devfn))
-
-/*
- * macros for easy use
- */
-#define rtsx_writel(chip, reg, value) \
-        iowrite32(value, (chip)->rtsx->remap_addr + reg)
-#define rtsx_readl(chip, reg) \
-        ioread32((chip)->rtsx->remap_addr + reg)
-#define rtsx_writew(chip, reg, value) \
-        iowrite16(value, (chip)->rtsx->remap_addr + reg)
-#define rtsx_readw(chip, reg) \
-        ioread16((chip)->rtsx->remap_addr + reg)
-#define rtsx_writeb(chip, reg, value) \
-        iowrite8(value, (chip)->rtsx->remap_addr + reg)
-#define rtsx_readb(chip, reg) \
-        ioread8((chip)->rtsx->remap_addr + reg)
-
-#define rtsx_read_config_byte(chip, where, val) \
-        pci_read_config_byte((chip)->rtsx->pci, where, val)
-
-#define rtsx_write_config_byte(chip, where, val) \
-        pci_write_config_byte((chip)->rtsx->pci, where, val)
-
-#define wait_timeout_x(task_state, msecs)               \
-do {                                                    \
-                set_current_state((task_state));        \
-                schedule_timeout((msecs) * HZ / 1000);  \
-} while (0)
-#define wait_timeout(msecs)     wait_timeout_x(TASK_INTERRUPTIBLE, (msecs))
-
-
-#define STATE_TRANS_NONE        0
-#define STATE_TRANS_CMD         1
-#define STATE_TRANS_BUF         2
-#define STATE_TRANS_SG          3
-
-#define TRANS_NOT_READY         0
-#define TRANS_RESULT_OK         1
-#define TRANS_RESULT_FAIL       2
-
-#define SCSI_LUN(srb)           ((srb)->device->lun)
-
-typedef unsigned long DELAY_PARA_T;
-
-struct rtsx_chip;
-
-struct rtsx_dev {
-        struct pci_dev *pci;
-
-        /* pci resources */
-        unsigned long           addr;
-        void __iomem            *remap_addr;
-        int irq;
-
-        /* locks */
-        spinlock_t              reg_lock;
-
-        struct task_struct      *ctl_thread;     /* the control thread   */
-        struct task_struct      *polling_thread; /* the polling thread   */
-
-        /* mutual exclusion and synchronization structures */
-        struct completion       cmnd_ready;      /* to sleep thread on      */
-        struct completion       control_exit;    /* control thread exit     */
-        struct completion       polling_exit;    /* polling thread exit     */
-        struct completion       notify;          /* thread begin/end        */
-        struct completion       scanning_done;   /* wait for scan thread    */
-
-        wait_queue_head_t       delay_wait;      /* wait during scan, reset */
-        struct mutex            dev_mutex;
-
-        /* host reserved buffer */
-        void                    *rtsx_resv_buf;
-        dma_addr_t              rtsx_resv_buf_addr;
-
-        char                    trans_result;
-        char                    trans_state;
-
-        struct completion       *done;
-        /* Whether interrupt handler should care card cd info */
-        u32                     check_card_cd;
-
-        struct rtsx_chip        *chip;
-};
-
-typedef struct rtsx_dev rtsx_dev_t;
-
-/* Convert between rtsx_dev and the corresponding Scsi_Host */
-static inline struct Scsi_Host *rtsx_to_host(struct rtsx_dev *dev)
-{
-        return container_of((void *) dev, struct Scsi_Host, hostdata);
-}
-static inline struct rtsx_dev *host_to_rtsx(struct Scsi_Host *host)
-{
-        return (struct rtsx_dev *) host->hostdata;
-}
-
-static inline void get_current_time(u8 *timeval_buf, int buf_len)
-{
-        struct timeval tv;
-
-        if (!timeval_buf || (buf_len < 8))
-                return;
-
-        do_gettimeofday(&tv);
-
-        timeval_buf[0] = (u8)(tv.tv_sec >> 24);
-        timeval_buf[1] = (u8)(tv.tv_sec >> 16);
-        timeval_buf[2] = (u8)(tv.tv_sec >> 8);
-        timeval_buf[3] = (u8)(tv.tv_sec);
-        timeval_buf[4] = (u8)(tv.tv_usec >> 24);
-        timeval_buf[5] = (u8)(tv.tv_usec >> 16);
-        timeval_buf[6] = (u8)(tv.tv_usec >> 8);
-        timeval_buf[7] = (u8)(tv.tv_usec);
-}
-
-/* The scsi_lock() and scsi_unlock() macros protect the sm_state and the
- * single queue element srb for write access */
-#define scsi_unlock(host)       spin_unlock_irq(host->host_lock)
-#define scsi_lock(host)         spin_lock_irq(host->host_lock)
-
-#define lock_state(chip)        spin_lock_irq(&((chip)->rtsx->reg_lock))
-#define unlock_state(chip)      spin_unlock_irq(&((chip)->rtsx->reg_lock))
-
-/* struct scsi_cmnd transfer buffer access utilities */
-enum xfer_buf_dir       {TO_XFER_BUF, FROM_XFER_BUF};
-
-int rtsx_read_pci_cfg_byte(u8 bus, u8 dev, u8 func, u8 offset, u8 *val);
-
-#endif  /* __REALTEK_RTSX_H */
diff --git a/drivers/staging/rts_pstor/rtsx_card.c b/drivers/staging/rts_pstor/rtsx_card.c
deleted file mode 100644
index 539aa6a27788..000000000000
--- a/drivers/staging/rts_pstor/rtsx_card.c
+++ /dev/null
@@ -1,1233 +0,0 @@
-/* Driver for Realtek PCI-Express card reader
- *
- * Copyright(c) 2009 Realtek Semiconductor Corp. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2, 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, see <http://www.gnu.org/licenses/>.
- *
- * Author:
- *   wwang (wei_wang@realsil.com.cn)
- *   No. 450, Shenhu Road, Suzhou Industry Park, Suzhou, China
- */
-
-#include <linux/blkdev.h>
-#include <linux/kthread.h>
-#include <linux/sched.h>
-#include <linux/workqueue.h>
-#include <linux/kernel.h>
-
-#include "rtsx.h"
-#include "rtsx_transport.h"
-#include "rtsx_scsi.h"
-#include "rtsx_card.h"
-
-#include "rtsx_sys.h"
-#include "general.h"
-
-#include "sd.h"
-#include "xd.h"
-#include "ms.h"
-
-void do_remaining_work(struct rtsx_chip *chip)
-{
-        struct sd_info *sd_card = &(chip->sd_card);
-#ifdef XD_DELAY_WRITE
-        struct xd_info *xd_card = &(chip->xd_card);
-#endif
-        struct ms_info *ms_card = &(chip->ms_card);
-
-        if (chip->card_ready & SD_CARD) {
-                if (sd_card->seq_mode) {
-                        rtsx_set_stat(chip, RTSX_STAT_RUN);
-                        sd_card->cleanup_counter++;
-                } else {
-                        sd_card->cleanup_counter = 0;
-                }
-        }
-
-#ifdef XD_DELAY_WRITE
-        if (chip->card_ready & XD_CARD) {
-                if (xd_card->delay_write.delay_write_flag) {
-                        rtsx_set_stat(chip, RTSX_STAT_RUN);
-                        xd_card->cleanup_counter++;
-                } else {
-                        xd_card->cleanup_counter = 0;
-                }
-        }
-#endif
-
-        if (chip->card_ready & MS_CARD) {
-                if (CHK_MSPRO(ms_card)) {
-                        if (ms_card->seq_mode) {
-                                rtsx_set_stat(chip, RTSX_STAT_RUN);
-                                ms_card->cleanup_counter++;
-                        } else {
-                                ms_card->cleanup_counter = 0;
-                        }
-                } else {
-#ifdef MS_DELAY_WRITE
-                        if (ms_card->delay_write.delay_write_flag) {
-                                rtsx_set_stat(chip, RTSX_STAT_RUN);
-                                ms_card->cleanup_counter++;
-                        } else {
-                                ms_card->cleanup_counter = 0;
-                        }
-#endif
-                }
-        }
-
-        if (sd_card->cleanup_counter > POLLING_WAIT_CNT)
-                sd_cleanup_work(chip);
-
-        if (xd_card->cleanup_counter > POLLING_WAIT_CNT)
-                xd_cleanup_work(chip);
-
-        if (ms_card->cleanup_counter > POLLING_WAIT_CNT)
-                ms_cleanup_work(chip);
-}
-
-void try_to_switch_sdio_ctrl(struct rtsx_chip *chip)
-{
-        u8 reg1 = 0, reg2 = 0;
-
-        rtsx_read_register(chip, 0xFF34, &reg1);
-        rtsx_read_register(chip, 0xFF38, &reg2);
-        RTSX_DEBUGP("reg 0xFF34: 0x%x, reg 0xFF38: 0x%x\n", reg1, reg2);
-        if ((reg1 & 0xC0) && (reg2 & 0xC0)) {
-                chip->sd_int = 1;
-                rtsx_write_register(chip, SDIO_CTRL, 0xFF, SDIO_BUS_CTRL | SDIO_CD_CTRL);
-                rtsx_write_register(chip, PWR_GATE_CTRL, LDO3318_PWR_MASK, LDO_ON);
-        }
-}
-
-#ifdef SUPPORT_SDIO_ASPM
-void dynamic_configure_sdio_aspm(struct rtsx_chip *chip)
-{
-        u8 buf[12], reg;
-        int i;
-
-        for (i = 0; i < 12; i++)
-                rtsx_read_register(chip, 0xFF08 + i, &buf[i]);
-        rtsx_read_register(chip, 0xFF25, &reg);
-        if ((memcmp(buf, chip->sdio_raw_data, 12) != 0) || (reg & 0x03)) {
-                chip->sdio_counter = 0;
-                chip->sdio_idle = 0;
-        } else {
-                if (!chip->sdio_idle) {
-                        chip->sdio_counter++;
-                        if (chip->sdio_counter >= SDIO_IDLE_COUNT) {
-                                chip->sdio_counter = 0;
-                                chip->sdio_idle = 1;
-                        }
-                }
-        }
-        memcpy(chip->sdio_raw_data, buf, 12);
-
-        if (chip->sdio_idle) {
-                if (!chip->sdio_aspm) {
-                        RTSX_DEBUGP("SDIO enter ASPM!\n");
-                        rtsx_write_register(chip, ASPM_FORCE_CTL, 0xFC,
-                                        0x30 | (chip->aspm_level[1] << 2));
-                        chip->sdio_aspm = 1;
-                }
-        } else {
-                if (chip->sdio_aspm) {
-                        RTSX_DEBUGP("SDIO exit ASPM!\n");
-                        rtsx_write_register(chip, ASPM_FORCE_CTL, 0xFC, 0x30);
-                        chip->sdio_aspm = 0;
-                }
-        }
-}
-#endif
-
-void do_reset_sd_card(struct rtsx_chip *chip)
-{
-        int retval;
-
-        RTSX_DEBUGP("%s: %d, card2lun = 0x%x\n", __func__,
-                     chip->sd_reset_counter, chip->card2lun[SD_CARD]);
-
-        if (chip->card2lun[SD_CARD] >= MAX_ALLOWED_LUN_CNT) {
-                clear_bit(SD_NR, &(chip->need_reset));
-                chip->sd_reset_counter = 0;
-                chip->sd_show_cnt = 0;
-                return;
-        }
-
-        chip->rw_fail_cnt[chip->card2lun[SD_CARD]] = 0;
-
-        rtsx_set_stat(chip, RTSX_STAT_RUN);
-        rtsx_write_register(chip, SDIO_CTRL, 0xFF, 0);
-
-        retval = reset_sd_card(chip);
-        if (chip->need_release & SD_CARD)
-                return;
-        if (retval == STATUS_SUCCESS) {
-                clear_bit(SD_NR, &(chip->need_reset));
-                chip->sd_reset_counter = 0;
-                chip->sd_show_cnt = 0;
-                chip->card_ready |= SD_CARD;
-                chip->card_fail &= ~SD_CARD;
-                chip->rw_card[chip->card2lun[SD_CARD]] = sd_rw;
-        } else {
-                if (chip->sd_io || (chip->sd_reset_counter >= MAX_RESET_CNT)) {
-                        clear_bit(SD_NR, &(chip->need_reset));
-                        chip->sd_reset_counter = 0;
-                        chip->sd_show_cnt = 0;
-                } else {
-                        chip->sd_reset_counter++;
-                }
-                chip->card_ready &= ~SD_CARD;
-                chip->card_fail |= SD_CARD;
-                chip->capacity[chip->card2lun[SD_CARD]] = 0;
-                chip->rw_card[chip->card2lun[SD_CARD]] = NULL;
-
-                rtsx_write_register(chip, CARD_OE, SD_OUTPUT_EN, 0);
-                if (!chip->ft2_fast_mode)
-                        card_power_off(chip, SD_CARD);
-                if (chip->sd_io) {
-                        chip->sd_int = 0;
-                        try_to_switch_sdio_ctrl(chip);
-                } else {
-                        disable_card_clock(chip, SD_CARD);
-                }
-        }
-}
-
-void do_reset_xd_card(struct rtsx_chip *chip)
-{
-        int retval;
-
-        RTSX_DEBUGP("%s: %d, card2lun = 0x%x\n", __func__,
-                     chip->xd_reset_counter, chip->card2lun[XD_CARD]);
-
-        if (chip->card2lun[XD_CARD] >= MAX_ALLOWED_LUN_CNT) {
-                clear_bit(XD_NR, &(chip->need_reset));
-                chip->xd_reset_counter = 0;
-                chip->xd_show_cnt = 0;
-                return;
-        }
-
-        chip->rw_fail_cnt[chip->card2lun[XD_CARD]] = 0;
-
-        rtsx_set_stat(chip, RTSX_STAT_RUN);
-        rtsx_write_register(chip, SDIO_CTRL, 0xFF, 0);
-
-        retval = reset_xd_card(chip);
-        if (chip->need_release & XD_CARD)
-                return;
-        if (retval == STATUS_SUCCESS) {
-                clear_bit(XD_NR, &(chip->need_reset));
-                chip->xd_reset_counter = 0;
-                chip->card_ready |= XD_CARD;
-                chip->card_fail &= ~XD_CARD;
-                chip->rw_card[chip->card2lun[XD_CARD]] = xd_rw;
-        } else {
-                if (chip->xd_reset_counter >= MAX_RESET_CNT) {
-                        clear_bit(XD_NR, &(chip->need_reset));
-                        chip->xd_reset_counter = 0;
-                        chip->xd_show_cnt = 0;
-                } else {
-                        chip->xd_reset_counter++;
-                }
-                chip->card_ready &= ~XD_CARD;
-                chip->card_fail |= XD_CARD;
-                chip->capacity[chip->card2lun[XD_CARD]] = 0;
-                chip->rw_card[chip->card2lun[XD_CARD]] = NULL;
-
-                rtsx_write_register(chip, CARD_OE, XD_OUTPUT_EN, 0);
-                if (!chip->ft2_fast_mode)
-                        card_power_off(chip, XD_CARD);
-                disable_card_clock(chip, XD_CARD);
-        }
-}
-
-void do_reset_ms_card(struct rtsx_chip *chip)
-{
-        int retval;
-
-        RTSX_DEBUGP("%s: %d, card2lun = 0x%x\n", __func__,
-                     chip->ms_reset_counter, chip->card2lun[MS_CARD]);
-
-        if (chip->card2lun[MS_CARD] >= MAX_ALLOWED_LUN_CNT) {
-                clear_bit(MS_NR, &(chip->need_reset));
-                chip->ms_reset_counter = 0;
-                chip->ms_show_cnt = 0;
-                return;
-        }
-
-        chip->rw_fail_cnt[chip->card2lun[MS_CARD]] = 0;
-
-        rtsx_set_stat(chip, RTSX_STAT_RUN);
-        rtsx_write_register(chip, SDIO_CTRL, 0xFF, 0);
-
-        retval = reset_ms_card(chip);
-        if (chip->need_release & MS_CARD)
-                return;
-        if (retval == STATUS_SUCCESS) {
-                clear_bit(MS_NR, &(chip->need_reset));
-                chip->ms_reset_counter = 0;
-                chip->card_ready |= MS_CARD;
-                chip->card_fail &= ~MS_CARD;
-                chip->rw_card[chip->card2lun[MS_CARD]] = ms_rw;
-        } else {
-                if (chip->ms_reset_counter >= MAX_RESET_CNT) {
-                        clear_bit(MS_NR, &(chip->need_reset));
-                        chip->ms_reset_counter = 0;
-                        chip->ms_show_cnt = 0;
-                } else {
-                        chip->ms_reset_counter++;
-                }
-                chip->card_ready &= ~MS_CARD;
-                chip->card_fail |= MS_CARD;
-                chip->capacity[chip->card2lun[MS_CARD]] = 0;
-                chip->rw_card[chip->card2lun[MS_CARD]] = NULL;
-
-                rtsx_write_register(chip, CARD_OE, MS_OUTPUT_EN, 0);
-                if (!chip->ft2_fast_mode)
-                        card_power_off(chip, MS_CARD);
-                disable_card_clock(chip, MS_CARD);
-        }
-}
-
-static void release_sdio(struct rtsx_chip *chip)
-{
-        if (chip->sd_io) {
-                rtsx_write_register(chip, CARD_STOP, SD_STOP | SD_CLR_ERR,
-                                SD_STOP | SD_CLR_ERR);
-
-                if (chip->chip_insert_with_sdio) {
-                        chip->chip_insert_with_sdio = 0;
-
-                        if (CHECK_PID(chip, 0x5288))
-                                rtsx_write_register(chip, 0xFE5A, 0x08, 0x00);
-                        else
-                                rtsx_write_register(chip, 0xFE70, 0x80, 0x00);
-                }
-
-                rtsx_write_register(chip, SDIO_CTRL, SDIO_CD_CTRL, 0);
-                chip->sd_io = 0;
-        }
-}
-
-void rtsx_power_off_card(struct rtsx_chip *chip)
-{
-        if ((chip->card_ready & SD_CARD) || chip->sd_io) {
-                sd_cleanup_work(chip);
-                sd_power_off_card3v3(chip);
-        }
-
-        if (chip->card_ready & XD_CARD) {
-                xd_cleanup_work(chip);
-                xd_power_off_card3v3(chip);
-        }
-
-        if (chip->card_ready & MS_CARD) {
-                ms_cleanup_work(chip);
-                ms_power_off_card3v3(chip);
-        }
-}
-
-void rtsx_release_cards(struct rtsx_chip *chip)
-{
-        chip->int_reg = rtsx_readl(chip, RTSX_BIPR);
-
-        if ((chip->card_ready & SD_CARD) || chip->sd_io) {
-                if (chip->int_reg & SD_EXIST)
-                        sd_cleanup_work(chip);
-                release_sd_card(chip);
-        }
-
-        if (chip->card_ready & XD_CARD) {
-                if (chip->int_reg & XD_EXIST)
-                        xd_cleanup_work(chip);
-                release_xd_card(chip);
-        }
-
-        if (chip->card_ready & MS_CARD) {
-                if (chip->int_reg & MS_EXIST)
-                        ms_cleanup_work(chip);
-                release_ms_card(chip);
-        }
-}
-
-void rtsx_reset_cards(struct rtsx_chip *chip)
-{
-        if (!chip->need_reset)
-                return;
-
-        rtsx_set_stat(chip, RTSX_STAT_RUN);
-
-        rtsx_force_power_on(chip, SSC_PDCTL | OC_PDCTL);
-
-        rtsx_disable_aspm(chip);
-
-        if ((chip->need_reset & SD_CARD) && chip->chip_insert_with_sdio)
-                clear_bit(SD_NR, &(chip->need_reset));
-
-        if (chip->need_reset & XD_CARD) {
-                chip->card_exist |= XD_CARD;
-
-                if (chip->xd_show_cnt >= MAX_SHOW_CNT)
-                        do_reset_xd_card(chip);
-                else
-                        chip->xd_show_cnt++;
-        }
-        if (CHECK_PID(chip, 0x5288) && CHECK_BARO_PKG(chip, QFN)) {
-                if (chip->card_exist & XD_CARD) {
-                        clear_bit(SD_NR, &(chip->need_reset));
-                        clear_bit(MS_NR, &(chip->need_reset));
-                }
-        }
-        if (chip->need_reset & SD_CARD) {
-                chip->card_exist |= SD_CARD;
-
-                if (chip->sd_show_cnt >= MAX_SHOW_CNT) {
-                        rtsx_write_register(chip, RBCTL, RB_FLUSH, RB_FLUSH);
-                        do_reset_sd_card(chip);
-                } else {
-                        chip->sd_show_cnt++;
-                }
-        }
-        if (chip->need_reset & MS_CARD) {
-                chip->card_exist |= MS_CARD;
-
-                if (chip->ms_show_cnt >= MAX_SHOW_CNT)
-                        do_reset_ms_card(chip);
-                else
-                        chip->ms_show_cnt++;
-        }
-}
-
-void rtsx_reinit_cards(struct rtsx_chip *chip, int reset_chip)
-{
-        rtsx_set_stat(chip, RTSX_STAT_RUN);
-
-        rtsx_force_power_on(chip, SSC_PDCTL | OC_PDCTL);
-
-        if (reset_chip)
-                rtsx_reset_chip(chip);
-
-        chip->int_reg = rtsx_readl(chip, RTSX_BIPR);
-
-        if ((chip->int_reg & SD_EXIST) && (chip->need_reinit & SD_CARD)) {
-                release_sdio(chip);
-                release_sd_card(chip);
-
-                wait_timeout(100);
-
-                chip->card_exist |= SD_CARD;
-                do_reset_sd_card(chip);
-        }
-
-        if ((chip->int_reg & XD_EXIST) && (chip->need_reinit & XD_CARD)) {
-                release_xd_card(chip);
-
-                wait_timeout(100);
-
-                chip->card_exist |= XD_CARD;
-                do_reset_xd_card(chip);
-        }
-
-        if ((chip->int_reg & MS_EXIST) && (chip->need_reinit & MS_CARD)) {
-                release_ms_card(chip);
-
-                wait_timeout(100);
-
-                chip->card_exist |= MS_CARD;
-                do_reset_ms_card(chip);
-        }
-
-        chip->need_reinit = 0;
-}
-
-#ifdef DISABLE_CARD_INT
-void card_cd_debounce(struct rtsx_chip *chip, unsigned long *need_reset, unsigned long *need_release)
-{
-        u8 release_map = 0, reset_map = 0;
-
-        chip->int_reg = rtsx_readl(chip, RTSX_BIPR);
-
-        if (chip->card_exist) {
-                if (chip->card_exist & XD_CARD) {
-                        if (!(chip->int_reg & XD_EXIST))
-                                release_map |= XD_CARD;
-                } else if (chip->card_exist & SD_CARD) {
-                        if (!(chip->int_reg & SD_EXIST))
-                                release_map |= SD_CARD;
-                } else if (chip->card_exist & MS_CARD) {
-                        if (!(chip->int_reg & MS_EXIST))
-                                release_map |= MS_CARD;
-                }
-        } else {
-                if (chip->int_reg & XD_EXIST)
-                        reset_map |= XD_CARD;
-                else if (chip->int_reg & SD_EXIST)
-                        reset_map |= SD_CARD;
-                else if (chip->int_reg & MS_EXIST)
-                        reset_map |= MS_CARD;
-        }
-
-        if (reset_map) {
-                int xd_cnt = 0, sd_cnt = 0, ms_cnt = 0;
-                int i;
-
-                for (i = 0; i < (DEBOUNCE_CNT); i++) {
-                        chip->int_reg = rtsx_readl(chip, RTSX_BIPR);
-
-                        if (chip->int_reg & XD_EXIST)
-                                xd_cnt++;
-                        else
-                                xd_cnt = 0;
-
-                        if (chip->int_reg & SD_EXIST)
-                                sd_cnt++;
-                        else
-                                sd_cnt = 0;
-
-                        if (chip->int_reg & MS_EXIST)
-                                ms_cnt++;
-                        else
-                                ms_cnt = 0;
-
-                        wait_timeout(30);
-                }
-
-                reset_map = 0;
-                if (!(chip->card_exist & XD_CARD) && (xd_cnt > (DEBOUNCE_CNT-1)))
-                        reset_map |= XD_CARD;
-                if (!(chip->card_exist & SD_CARD) && (sd_cnt > (DEBOUNCE_CNT-1)))
-                        reset_map |= SD_CARD;
-                if (!(chip->card_exist & MS_CARD) && (ms_cnt > (DEBOUNCE_CNT-1)))
-                        reset_map |= MS_CARD;
-        }
-
-        if (CHECK_PID(chip, 0x5288) && CHECK_BARO_PKG(chip, QFN))
-                rtsx_write_register(chip, HOST_SLEEP_STATE, 0xC0, 0x00);
-
-        if (need_reset)
-                *need_reset = reset_map;
-        if (need_release)
-                *need_release = release_map;
-}
-#endif
-
-void rtsx_init_cards(struct rtsx_chip *chip)
-{
-        if (RTSX_TST_DELINK(chip) && (rtsx_get_stat(chip) != RTSX_STAT_SS)) {
-                RTSX_DEBUGP("Reset chip in polling thread!\n");
-                rtsx_reset_chip(chip);
-                RTSX_CLR_DELINK(chip);
-        }
-
-#ifdef DISABLE_CARD_INT
-        card_cd_debounce(chip, &(chip->need_reset), &(chip->need_release));
-#endif
-
-        if (chip->need_release) {
-                if (CHECK_PID(chip, 0x5288) && CHECK_BARO_PKG(chip, QFN)) {
-                        if (chip->int_reg & XD_EXIST) {
-                                clear_bit(SD_NR, &(chip->need_release));
-                                clear_bit(MS_NR, &(chip->need_release));
-                        }
-                }
-
-                if (!(chip->card_exist & SD_CARD) && !chip->sd_io)
-                        clear_bit(SD_NR, &(chip->need_release));
-                if (!(chip->card_exist & XD_CARD))
-                        clear_bit(XD_NR, &(chip->need_release));
-                if (!(chip->card_exist & MS_CARD))
-                        clear_bit(MS_NR, &(chip->need_release));
-
-                RTSX_DEBUGP("chip->need_release = 0x%x\n", (unsigned int)(chip->need_release));
-
-#ifdef SUPPORT_OCP
-                if (chip->need_release) {
-                        if (CHECK_PID(chip, 0x5209)) {
-                                u8 mask = 0, val = 0;
-                                if (CHECK_LUN_MODE(chip, SD_MS_2LUN)) {
-                                        if (chip->ocp_stat & (MS_OC_NOW | MS_OC_EVER)) {
-                                                mask |= MS_OCP_INT_CLR | MS_OC_CLR;
-                                                val |= MS_OCP_INT_CLR | MS_OC_CLR;
-                                        }
-                                }
-                                if (chip->ocp_stat & (SD_OC_NOW | SD_OC_EVER)) {
-                                        mask |= SD_OCP_INT_CLR | SD_OC_CLR;
-                                        val |= SD_OCP_INT_CLR | SD_OC_CLR;
-                                }
-                                if (mask)
-                                        rtsx_write_register(chip, OCPCTL, mask, val);
-                        } else {
-                                if (chip->ocp_stat & (CARD_OC_NOW | CARD_OC_EVER))
-                                        rtsx_write_register(chip, OCPCLR,
-                                                            CARD_OC_INT_CLR | CARD_OC_CLR,
-                                                            CARD_OC_INT_CLR | CARD_OC_CLR);
-                        }
-                        chip->ocp_stat = 0;
-                }
-#endif
-                if (chip->need_release) {
-                        rtsx_set_stat(chip, RTSX_STAT_RUN);
-                        rtsx_force_power_on(chip, SSC_PDCTL | OC_PDCTL);
-                }
-
-                if (chip->need_release & SD_CARD) {
-                        clear_bit(SD_NR, &(chip->need_release));
-                        chip->card_exist &= ~SD_CARD;
-                        chip->card_ejected &= ~SD_CARD;
-                        chip->card_fail &= ~SD_CARD;
-                        CLR_BIT(chip->lun_mc, chip->card2lun[SD_CARD]);
-                        chip->rw_fail_cnt[chip->card2lun[SD_CARD]] = 0;
-                        rtsx_write_register(chip, RBCTL, RB_FLUSH, RB_FLUSH);
-
-                        release_sdio(chip);
-                        release_sd_card(chip);
-                }
-
-                if (chip->need_release & XD_CARD) {
-                        clear_bit(XD_NR, &(chip->need_release));
-                        chip->card_exist &= ~XD_CARD;
-                        chip->card_ejected &= ~XD_CARD;
-                        chip->card_fail &= ~XD_CARD;
-                        CLR_BIT(chip->lun_mc, chip->card2lun[XD_CARD]);
-                        chip->rw_fail_cnt[chip->card2lun[XD_CARD]] = 0;
-
-                        release_xd_card(chip);
-
-                        if (CHECK_PID(chip, 0x5288) && CHECK_BARO_PKG(chip, QFN))
-                                rtsx_write_register(chip, HOST_SLEEP_STATE, 0xC0, 0xC0);
-                }
-
-                if (chip->need_release & MS_CARD) {
-                        clear_bit(MS_NR, &(chip->need_release));
-                        chip->card_exist &= ~MS_CARD;
-                        chip->card_ejected &= ~MS_CARD;
-                        chip->card_fail &= ~MS_CARD;
-                        CLR_BIT(chip->lun_mc, chip->card2lun[MS_CARD]);
-                        chip->rw_fail_cnt[chip->card2lun[MS_CARD]] = 0;
-
-                        release_ms_card(chip);
-                }
-
-                RTSX_DEBUGP("chip->card_exist = 0x%x\n", chip->card_exist);
-
-                if (!chip->card_exist)
-                        turn_off_led(chip, LED_GPIO);
-        }
-
-        if (chip->need_reset) {
-                RTSX_DEBUGP("chip->need_reset = 0x%x\n", (unsigned int)(chip->need_reset));
-
-                rtsx_reset_cards(chip);
-        }
-
-        if (chip->need_reinit) {
-                RTSX_DEBUGP("chip->need_reinit = 0x%x\n", (unsigned int)(chip->need_reinit));
-
-                rtsx_reinit_cards(chip, 0);
-        }
-}
-
-static inline u8 double_depth(u8 depth)
-{
-        return ((depth > 1) ? (depth - 1) : depth);
-}
-
-int switch_ssc_clock(struct rtsx_chip *chip, int clk)
-{
-        struct sd_info *sd_card = &(chip->sd_card);
-        struct ms_info *ms_card = &(chip->ms_card);
-        int retval;
-        u8 N = (u8)(clk - 2), min_N, max_N;
-        u8 mcu_cnt, div, max_div, ssc_depth, ssc_depth_mask;
-        int sd_vpclk_phase_reset = 0;
-
-        if (chip->cur_clk == clk)
-                return STATUS_SUCCESS;
-
-        if (CHECK_PID(chip, 0x5209)) {
-                min_N = 80;
-                max_N = 208;
-                max_div = CLK_DIV_8;
-        } else {
-                min_N = 60;
-                max_N = 120;
-                max_div = CLK_DIV_4;
-        }
-
-        if (CHECK_PID(chip, 0x5209) && (chip->cur_card == SD_CARD)) {
-                struct sd_info *sd_card = &(chip->sd_card);
-                if (CHK_SD30_SPEED(sd_card) || CHK_MMC_DDR52(sd_card))
-                        sd_vpclk_phase_reset = 1;
-        }
-
-        RTSX_DEBUGP("Switch SSC clock to %dMHz (cur_clk = %d)\n", clk, chip->cur_clk);
-
-        if ((clk <= 2) || (N > max_N))
-                TRACE_RET(chip, STATUS_FAIL);
-
-        mcu_cnt = (u8)(125/clk + 3);
-        if (CHECK_PID(chip, 0x5209)) {
-                if (mcu_cnt > 15)
-                        mcu_cnt = 15;
-        } else {
-                if (mcu_cnt > 7)
-                        mcu_cnt = 7;
-        }
-
-        div = CLK_DIV_1;
-        while ((N < min_N) && (div < max_div)) {
-                N = (N + 2) * 2 - 2;
-                div++;
-        }
-        RTSX_DEBUGP("N = %d, div = %d\n", N, div);
-
-        if (chip->ssc_en) {
-                if (CHECK_PID(chip, 0x5209)) {
-                        if (chip->cur_card == SD_CARD) {
-                                if (CHK_SD_SDR104(sd_card))
-                                        ssc_depth = chip->ssc_depth_sd_sdr104;
-                                else if (CHK_SD_SDR50(sd_card))
-                                        ssc_depth = chip->ssc_depth_sd_sdr50;
-                                else if (CHK_SD_DDR50(sd_card))
-                                        ssc_depth = double_depth(chip->ssc_depth_sd_ddr50);
-                                else if (CHK_SD_HS(sd_card))
-                                        ssc_depth = double_depth(chip->ssc_depth_sd_hs);
-                                else if (CHK_MMC_52M(sd_card) || CHK_MMC_DDR52(sd_card))
-                                        ssc_depth = double_depth(chip->ssc_depth_mmc_52m);
-                                else
-                                        ssc_depth = double_depth(chip->ssc_depth_low_speed);
-                        } else if (chip->cur_card == MS_CARD) {
-                                if (CHK_MSPRO(ms_card)) {
-                                        if (CHK_HG8BIT(ms_card))
-                                                ssc_depth = double_depth(chip->ssc_depth_ms_hg);
-                                        else
-                                                ssc_depth = double_depth(chip->ssc_depth_ms_4bit);
-                                } else {
-                                        if (CHK_MS4BIT(ms_card))
-                                                ssc_depth = double_depth(chip->ssc_depth_ms_4bit);
-                                        else
-                                                ssc_depth = double_depth(chip->ssc_depth_low_speed);
-                                }
-                        } else {
-                                ssc_depth = double_depth(chip->ssc_depth_low_speed);
-                        }
-
-                        if (ssc_depth) {
-                                if (div == CLK_DIV_2) {
-                                        if (ssc_depth > 1)
-                                                ssc_depth -= 1;
-                                        else
-                                                ssc_depth = SSC_DEPTH_4M;
-
-                                } else if (div == CLK_DIV_4) {
-                                        if (ssc_depth > 2)
-                                                ssc_depth -= 2;
-                                        else
-                                                ssc_depth = SSC_DEPTH_4M;
-
-                                } else if (div == CLK_DIV_8) {
-                                        if (ssc_depth > 3)
-                                                ssc_depth -= 3;
-                                        else
-                                                ssc_depth = SSC_DEPTH_4M;
-
-                                }
-                        }
-                } else {
-                        ssc_depth = 0x01;
-                        N -= 2;
-                }
-        } else {
-                ssc_depth = 0;
-        }
-
-        if (CHECK_PID(chip, 0x5209))
-                ssc_depth_mask = SSC_DEPTH_MASK;
-        else
-                ssc_depth_mask = 0x03;
-
-        RTSX_DEBUGP("ssc_depth = %d\n", ssc_depth);
-
-        rtsx_init_cmd(chip);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, CLK_CTL, CLK_LOW_FREQ, CLK_LOW_FREQ);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, CLK_DIV, 0xFF, (div << 4) | mcu_cnt);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, SSC_CTL1, SSC_RSTB, 0);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, SSC_CTL2, ssc_depth_mask, ssc_depth);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, SSC_DIV_N_0, 0xFF, N);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, SSC_CTL1, SSC_RSTB, SSC_RSTB);
-        if (sd_vpclk_phase_reset) {
-                rtsx_add_cmd(chip, WRITE_REG_CMD, SD_VPCLK0_CTL, PHASE_NOT_RESET, 0);
-                rtsx_add_cmd(chip, WRITE_REG_CMD, SD_VPCLK0_CTL, PHASE_NOT_RESET, PHASE_NOT_RESET);
-        }
-
-        retval = rtsx_send_cmd(chip, 0, WAIT_TIME);
-        if (retval < 0)
-                TRACE_RET(chip, STATUS_ERROR);
-
-        udelay(10);
-        RTSX_WRITE_REG(chip, CLK_CTL, CLK_LOW_FREQ, 0);
-
-        chip->cur_clk = clk;
-
-        return STATUS_SUCCESS;
-}
-
-int switch_normal_clock(struct rtsx_chip *chip, int clk)
-{
-        u8 sel, div, mcu_cnt;
-        int sd_vpclk_phase_reset = 0;
-
-        if (chip->cur_clk == clk)
-                return STATUS_SUCCESS;
-
-        if (CHECK_PID(chip, 0x5209) && (chip->cur_card == SD_CARD)) {
-                struct sd_info *sd_card = &(chip->sd_card);
-                if (CHK_SD30_SPEED(sd_card) || CHK_MMC_DDR52(sd_card))
-                        sd_vpclk_phase_reset = 1;
-        }
-
-        switch (clk) {
-        case CLK_20:
-                RTSX_DEBUGP("Switch clock to 20MHz\n");
-                sel = SSC_80;
-                div = CLK_DIV_4;
-                mcu_cnt = 7;
-                break;
-
-        case CLK_30:
-                RTSX_DEBUGP("Switch clock to 30MHz\n");
-                sel = SSC_120;
-                div = CLK_DIV_4;
-                mcu_cnt = 7;
-                break;
-
-        case CLK_40:
-                RTSX_DEBUGP("Switch clock to 40MHz\n");
-                sel = SSC_80;
-                div = CLK_DIV_2;
-                mcu_cnt = 7;
-                break;
-
-        case CLK_50:
-                RTSX_DEBUGP("Switch clock to 50MHz\n");
-                sel = SSC_100;
-                div = CLK_DIV_2;
-                mcu_cnt = 6;
-                break;
-
-        case CLK_60:
-                RTSX_DEBUGP("Switch clock to 60MHz\n");
-                sel = SSC_120;
-                div = CLK_DIV_2;
-                mcu_cnt = 6;
-                break;
-
-        case CLK_80:
-                RTSX_DEBUGP("Switch clock to 80MHz\n");
-                sel = SSC_80;
-                div = CLK_DIV_1;
-                mcu_cnt = 5;
-                break;
-
-        case CLK_100:
-                RTSX_DEBUGP("Switch clock to 100MHz\n");
-                sel = SSC_100;
-                div = CLK_DIV_1;
-                mcu_cnt = 5;
-                break;
-
-        case CLK_120:
-                RTSX_DEBUGP("Switch clock to 120MHz\n");
-                sel = SSC_120;
-                div = CLK_DIV_1;
-                mcu_cnt = 5;
-                break;
-
-        case CLK_150:
-                RTSX_DEBUGP("Switch clock to 150MHz\n");
-                sel = SSC_150;
-                div = CLK_DIV_1;
-                mcu_cnt = 4;
-                break;
-
-        case CLK_200:
-                RTSX_DEBUGP("Switch clock to 200MHz\n");
-                sel = SSC_200;
-                div = CLK_DIV_1;
-                mcu_cnt = 4;
-                break;
-
-        default:
-                RTSX_DEBUGP("Try to switch to an illegal clock (%d)\n", clk);
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        RTSX_WRITE_REG(chip, CLK_CTL, 0xFF, CLK_LOW_FREQ);
-        if (sd_vpclk_phase_reset) {
-                RTSX_WRITE_REG(chip, SD_VPCLK0_CTL, PHASE_NOT_RESET, 0);
-                RTSX_WRITE_REG(chip, SD_VPCLK1_CTL, PHASE_NOT_RESET, 0);
-        }
-        RTSX_WRITE_REG(chip, CLK_DIV, 0xFF, (div << 4) | mcu_cnt);
-        RTSX_WRITE_REG(chip, CLK_SEL, 0xFF, sel);
-
-        if (sd_vpclk_phase_reset) {
-                udelay(200);
-                RTSX_WRITE_REG(chip, SD_VPCLK0_CTL, PHASE_NOT_RESET, PHASE_NOT_RESET);
-                RTSX_WRITE_REG(chip, SD_VPCLK1_CTL, PHASE_NOT_RESET, PHASE_NOT_RESET);
-                udelay(200);
-        }
-        RTSX_WRITE_REG(chip, CLK_CTL, 0xFF, 0);
-
-        chip->cur_clk = clk;
-
-        return STATUS_SUCCESS;
-}
-
-void trans_dma_enable(enum dma_data_direction dir, struct rtsx_chip *chip, u32 byte_cnt, u8 pack_size)
-{
-        if (pack_size > DMA_1024)
-                pack_size = DMA_512;
-
-        rtsx_add_cmd(chip, WRITE_REG_CMD, IRQSTAT0, DMA_DONE_INT, DMA_DONE_INT);
-
-        rtsx_add_cmd(chip, WRITE_REG_CMD, DMATC3, 0xFF, (u8)(byte_cnt >> 24));
-        rtsx_add_cmd(chip, WRITE_REG_CMD, DMATC2, 0xFF, (u8)(byte_cnt >> 16));
-        rtsx_add_cmd(chip, WRITE_REG_CMD, DMATC1, 0xFF, (u8)(byte_cnt >> 8));
-        rtsx_add_cmd(chip, WRITE_REG_CMD, DMATC0, 0xFF, (u8)byte_cnt);
-
-        if (dir == DMA_FROM_DEVICE) {
-                rtsx_add_cmd(chip, WRITE_REG_CMD, DMACTL, 0x03 | DMA_PACK_SIZE_MASK,
-                             DMA_DIR_FROM_CARD | DMA_EN | pack_size);
-        } else {
-                rtsx_add_cmd(chip, WRITE_REG_CMD, DMACTL, 0x03 | DMA_PACK_SIZE_MASK,
-                             DMA_DIR_TO_CARD | DMA_EN | pack_size);
-        }
-
-        rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_DATA_SOURCE, 0x01, RING_BUFFER);
-}
-
-int enable_card_clock(struct rtsx_chip *chip, u8 card)
-{
-        u8 clk_en = 0;
-
-        if (card & XD_CARD)
-                clk_en |= XD_CLK_EN;
-        if (card & SD_CARD)
-                clk_en |= SD_CLK_EN;
-        if (card & MS_CARD)
-                clk_en |= MS_CLK_EN;
-
-        RTSX_WRITE_REG(chip, CARD_CLK_EN, clk_en, clk_en);
-
-        return STATUS_SUCCESS;
-}
-
-int disable_card_clock(struct rtsx_chip *chip, u8 card)
-{
-        u8 clk_en = 0;
-
-        if (card & XD_CARD)
-                clk_en |= XD_CLK_EN;
-        if (card & SD_CARD)
-                clk_en |= SD_CLK_EN;
-        if (card & MS_CARD)
-                clk_en |= MS_CLK_EN;
-
-        RTSX_WRITE_REG(chip, CARD_CLK_EN, clk_en, 0);
-
-        return STATUS_SUCCESS;
-}
-
-int card_power_on(struct rtsx_chip *chip, u8 card)
-{
-        int retval;
-        u8 mask, val1, val2;
-
-        if (CHECK_LUN_MODE(chip, SD_MS_2LUN) && (card == MS_CARD)) {
-                mask = MS_POWER_MASK;
-                val1 = MS_PARTIAL_POWER_ON;
-                val2 = MS_POWER_ON;
-        } else {
-                mask = SD_POWER_MASK;
-                val1 = SD_PARTIAL_POWER_ON;
-                val2 = SD_POWER_ON;
-        }
-
-        rtsx_init_cmd(chip);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PWR_CTL, mask, val1);
-        if (CHECK_PID(chip, 0x5209) && (card == SD_CARD))
-                rtsx_add_cmd(chip, WRITE_REG_CMD, PWR_GATE_CTRL, LDO3318_PWR_MASK, LDO_SUSPEND);
-
-        retval = rtsx_send_cmd(chip, 0, 100);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        udelay(chip->pmos_pwr_on_interval);
-
-        rtsx_init_cmd(chip);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PWR_CTL, mask, val2);
-        if (CHECK_PID(chip, 0x5209) && (card == SD_CARD))
-                rtsx_add_cmd(chip, WRITE_REG_CMD, PWR_GATE_CTRL, LDO3318_PWR_MASK, LDO_ON);
-
-        retval = rtsx_send_cmd(chip, 0, 100);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        return STATUS_SUCCESS;
-}
-
-int card_power_off(struct rtsx_chip *chip, u8 card)
-{
-        u8 mask, val;
-
-        if (CHECK_LUN_MODE(chip, SD_MS_2LUN) && (card == MS_CARD)) {
-                mask = MS_POWER_MASK;
-                val = MS_POWER_OFF;
-        } else {
-                mask = SD_POWER_MASK;
-                val = SD_POWER_OFF;
-        }
-        if (CHECK_PID(chip, 0x5209)) {
-                mask |= PMOS_STRG_MASK;
-                val |= PMOS_STRG_400mA;
-        }
-
-        RTSX_WRITE_REG(chip, CARD_PWR_CTL, mask, val);
-        if (CHECK_PID(chip, 0x5209) && (card == SD_CARD))
-                RTSX_WRITE_REG(chip, PWR_GATE_CTRL, LDO3318_PWR_MASK, LDO_OFF);
-
-        return STATUS_SUCCESS;
-}
-
-int card_rw(struct scsi_cmnd *srb, struct rtsx_chip *chip, u32 sec_addr, u16 sec_cnt)
-{
-        int retval;
-        unsigned int lun = SCSI_LUN(srb);
-        int i;
-
-        if (chip->rw_card[lun] == NULL)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        for (i = 0; i < 3; i++) {
-                chip->rw_need_retry = 0;
-
-                retval = chip->rw_card[lun](srb, chip, sec_addr, sec_cnt);
-                if (retval != STATUS_SUCCESS) {
-                        if (rtsx_check_chip_exist(chip) != STATUS_SUCCESS) {
-                                rtsx_release_chip(chip);
-                                TRACE_RET(chip, STATUS_FAIL);
-                        }
-                        if (detect_card_cd(chip, chip->cur_card) != STATUS_SUCCESS)
-                                TRACE_RET(chip, STATUS_FAIL);
-
-                        if (!chip->rw_need_retry) {
-                                RTSX_DEBUGP("RW fail, but no need to retry\n");
-                                break;
-                        }
-                } else {
-                        chip->rw_need_retry = 0;
-                        break;
-                }
-
-                RTSX_DEBUGP("Retry RW, (i = %d)\n", i);
-        }
-
-        return retval;
-}
-
-int card_share_mode(struct rtsx_chip *chip, int card)
-{
-        u8 mask, value;
-
-        if (CHECK_PID(chip, 0x5209) || CHECK_PID(chip, 0x5208)) {
-                mask = CARD_SHARE_MASK;
-                if (card == SD_CARD)
-                        value = CARD_SHARE_48_SD;
-                else if (card == MS_CARD)
-                        value = CARD_SHARE_48_MS;
-                else if (card == XD_CARD)
-                        value = CARD_SHARE_48_XD;
-                else
-                        TRACE_RET(chip, STATUS_FAIL);
-
-        } else if (CHECK_PID(chip, 0x5288)) {
-                mask = 0x03;
-                if (card == SD_CARD)
-                        value = CARD_SHARE_BAROSSA_SD;
-                else if (card == MS_CARD)
-                        value = CARD_SHARE_BAROSSA_MS;
-                else if (card == XD_CARD)
-                        value = CARD_SHARE_BAROSSA_XD;
-                else
-                        TRACE_RET(chip, STATUS_FAIL);
-
-        } else {
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        RTSX_WRITE_REG(chip, CARD_SHARE_MODE, mask, value);
-
-        return STATUS_SUCCESS;
-}
-
-
-int select_card(struct rtsx_chip *chip, int card)
-{
-        int retval;
-
-        if (chip->cur_card != card) {
-                u8 mod;
-
-                if (card == SD_CARD)
-                        mod = SD_MOD_SEL;
-                else if (card == MS_CARD)
-                        mod = MS_MOD_SEL;
-                else if (card == XD_CARD)
-                        mod = XD_MOD_SEL;
-                else if (card == SPI_CARD)
-                        mod = SPI_MOD_SEL;
-                else
-                        TRACE_RET(chip, STATUS_FAIL);
-
-                RTSX_WRITE_REG(chip, CARD_SELECT, 0x07, mod);
-                chip->cur_card = card;
-
-                retval =  card_share_mode(chip, card);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        return STATUS_SUCCESS;
-}
-
-void toggle_gpio(struct rtsx_chip *chip, u8 gpio)
-{
-        u8 temp_reg;
-
-        rtsx_read_register(chip, CARD_GPIO, &temp_reg);
-        temp_reg ^= (0x01 << gpio);
-        rtsx_write_register(chip, CARD_GPIO, 0xFF, temp_reg);
-}
-
-void turn_on_led(struct rtsx_chip *chip, u8 gpio)
-{
-        if (CHECK_PID(chip, 0x5288))
-                rtsx_write_register(chip, CARD_GPIO, (u8)(1 << gpio), (u8)(1 << gpio));
-        else
-                rtsx_write_register(chip, CARD_GPIO, (u8)(1 << gpio), 0);
-}
-
-void turn_off_led(struct rtsx_chip *chip, u8 gpio)
-{
-        if (CHECK_PID(chip, 0x5288))
-                rtsx_write_register(chip, CARD_GPIO, (u8)(1 << gpio), 0);
-        else
-                rtsx_write_register(chip, CARD_GPIO, (u8)(1 << gpio), (u8)(1 << gpio));
-}
-
-int detect_card_cd(struct rtsx_chip *chip, int card)
-{
-        u32 card_cd, status;
-
-        if (card == SD_CARD) {
-                card_cd = SD_EXIST;
-        } else if (card == MS_CARD) {
-                card_cd = MS_EXIST;
-        } else if (card == XD_CARD) {
-                card_cd = XD_EXIST;
-        } else {
-                RTSX_DEBUGP("Wrong card type: 0x%x\n", card);
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        status = rtsx_readl(chip, RTSX_BIPR);
-        if (!(status & card_cd))
-                TRACE_RET(chip, STATUS_FAIL);
-
-        return STATUS_SUCCESS;
-}
-
-int check_card_exist(struct rtsx_chip *chip, unsigned int lun)
-{
-        if (chip->card_exist & chip->lun2card[lun])
-                return 1;
-
-        return 0;
-}
-
-int check_card_ready(struct rtsx_chip *chip, unsigned int lun)
-{
-        if (chip->card_ready & chip->lun2card[lun])
-                return 1;
-
-        return 0;
-}
-
-int check_card_wp(struct rtsx_chip *chip, unsigned int lun)
-{
-        if (chip->card_wp & chip->lun2card[lun])
-                return 1;
-
-        return 0;
-}
-
-int check_card_fail(struct rtsx_chip *chip, unsigned int lun)
-{
-        if (chip->card_fail & chip->lun2card[lun])
-                return 1;
-
-        return 0;
-}
-
-int check_card_ejected(struct rtsx_chip *chip, unsigned int lun)
-{
-        if (chip->card_ejected & chip->lun2card[lun])
-                return 1;
-
-        return 0;
-}
-
-u8 get_lun_card(struct rtsx_chip *chip, unsigned int lun)
-{
-        if ((chip->card_ready & chip->lun2card[lun]) == XD_CARD)
-                return (u8)XD_CARD;
-        else if ((chip->card_ready & chip->lun2card[lun]) == SD_CARD)
-                return (u8)SD_CARD;
-        else if ((chip->card_ready & chip->lun2card[lun]) == MS_CARD)
-                return (u8)MS_CARD;
-
-        return 0;
-}
-
-void eject_card(struct rtsx_chip *chip, unsigned int lun)
-{
-        do_remaining_work(chip);
-
-        if ((chip->card_ready & chip->lun2card[lun]) == SD_CARD) {
-                release_sd_card(chip);
-                chip->card_ejected |= SD_CARD;
-                chip->card_ready &= ~SD_CARD;
-                chip->capacity[lun] = 0;
-        } else if ((chip->card_ready & chip->lun2card[lun]) == XD_CARD) {
-                release_xd_card(chip);
-                chip->card_ejected |= XD_CARD;
-                chip->card_ready &= ~XD_CARD;
-                chip->capacity[lun] = 0;
-        } else if ((chip->card_ready & chip->lun2card[lun]) == MS_CARD) {
-                release_ms_card(chip);
-                chip->card_ejected |= MS_CARD;
-                chip->card_ready &= ~MS_CARD;
-                chip->capacity[lun] = 0;
-        }
-}
diff --git a/drivers/staging/rts_pstor/rtsx_card.h b/drivers/staging/rts_pstor/rtsx_card.h
deleted file mode 100644
index 3f7277676208..000000000000
--- a/drivers/staging/rts_pstor/rtsx_card.h
+++ /dev/null
@@ -1,1093 +0,0 @@
-/* Driver for Realtek PCI-Express card reader
- * Header file
- *
- * Copyright(c) 2009 Realtek Semiconductor Corp. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2, 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, see <http://www.gnu.org/licenses/>.
- *
- * Author:
- *   wwang (wei_wang@realsil.com.cn)
- *   No. 450, Shenhu Road, Suzhou Industry Park, Suzhou, China
- */
-
-#ifndef __REALTEK_RTSX_CARD_H
-#define __REALTEK_RTSX_CARD_H
-
-#include "debug.h"
-#include "rtsx.h"
-#include "rtsx_chip.h"
-#include "rtsx_transport.h"
-#include "sd.h"
-
-#define SSC_POWER_DOWN          0x01
-#define SD_OC_POWER_DOWN        0x02
-#define MS_OC_POWER_DOWN        0x04
-#define ALL_POWER_DOWN          0x07
-#define OC_POWER_DOWN           0x06
-
-#define PMOS_STRG_MASK          0x10
-#define PMOS_STRG_800mA         0x10
-#define PMOS_STRG_400mA         0x00
-
-#define POWER_OFF               0x03
-#define PARTIAL_POWER_ON        0x01
-#define POWER_ON                0x00
-
-#define MS_POWER_OFF            0x0C
-#define MS_PARTIAL_POWER_ON     0x04
-#define MS_POWER_ON             0x00
-#define MS_POWER_MASK           0x0C
-
-#define SD_POWER_OFF            0x03
-#define SD_PARTIAL_POWER_ON     0x01
-#define SD_POWER_ON             0x00
-#define SD_POWER_MASK           0x03
-
-#define XD_OUTPUT_EN            0x02
-#define SD_OUTPUT_EN            0x04
-#define MS_OUTPUT_EN            0x08
-#define SPI_OUTPUT_EN           0x10
-
-#define CLK_LOW_FREQ            0x01
-
-#define CLK_DIV_1               0x01
-#define CLK_DIV_2               0x02
-#define CLK_DIV_4               0x03
-#define CLK_DIV_8               0x04
-
-#define SSC_80                  0
-#define SSC_100                 1
-#define SSC_120                 2
-#define SSC_150                 3
-#define SSC_200                 4
-
-#define XD_CLK_EN               0x02
-#define SD_CLK_EN               0x04
-#define MS_CLK_EN               0x08
-#define SPI_CLK_EN              0x10
-
-#define XD_MOD_SEL              1
-#define SD_MOD_SEL              2
-#define MS_MOD_SEL              3
-#define SPI_MOD_SEL             4
-
-#define CHANGE_CLK              0x01
-
-#define SD_CRC7_ERR                     0x80
-#define SD_CRC16_ERR                    0x40
-#define SD_CRC_WRITE_ERR                0x20
-#define SD_CRC_WRITE_ERR_MASK           0x1C
-#define GET_CRC_TIME_OUT                0x02
-#define SD_TUNING_COMPARE_ERR           0x01
-
-#define SD_RSP_80CLK_TIMEOUT            0x01
-
-#define SD_CLK_TOGGLE_EN                0x80
-#define SD_CLK_FORCE_STOP               0x40
-#define SD_DAT3_STATUS                  0x10
-#define SD_DAT2_STATUS                  0x08
-#define SD_DAT1_STATUS                  0x04
-#define SD_DAT0_STATUS                  0x02
-#define SD_CMD_STATUS                   0x01
-
-#define SD_IO_USING_1V8                 0x80
-#define SD_IO_USING_3V3                 0x7F
-#define TYPE_A_DRIVING                  0x00
-#define TYPE_B_DRIVING                  0x01
-#define TYPE_C_DRIVING                  0x02
-#define TYPE_D_DRIVING                  0x03
-
-#define DDR_FIX_RX_DAT                  0x00
-#define DDR_VAR_RX_DAT                  0x80
-#define DDR_FIX_RX_DAT_EDGE             0x00
-#define DDR_FIX_RX_DAT_14_DELAY         0x40
-#define DDR_FIX_RX_CMD                  0x00
-#define DDR_VAR_RX_CMD                  0x20
-#define DDR_FIX_RX_CMD_POS_EDGE         0x00
-#define DDR_FIX_RX_CMD_14_DELAY         0x10
-#define SD20_RX_POS_EDGE                0x00
-#define SD20_RX_14_DELAY                0x08
-#define SD20_RX_SEL_MASK                0x08
-
-#define DDR_FIX_TX_CMD_DAT              0x00
-#define DDR_VAR_TX_CMD_DAT              0x80
-#define DDR_FIX_TX_DAT_14_TSU           0x00
-#define DDR_FIX_TX_DAT_12_TSU           0x40
-#define DDR_FIX_TX_CMD_NEG_EDGE         0x00
-#define DDR_FIX_TX_CMD_14_AHEAD         0x20
-#define SD20_TX_NEG_EDGE                0x00
-#define SD20_TX_14_AHEAD                0x10
-#define SD20_TX_SEL_MASK                0x10
-#define DDR_VAR_SDCLK_POL_SWAP          0x01
-
-#define SD_TRANSFER_START               0x80
-#define SD_TRANSFER_END                 0x40
-#define SD_STAT_IDLE                    0x20
-#define SD_TRANSFER_ERR                 0x10
-#define SD_TM_NORMAL_WRITE              0x00
-#define SD_TM_AUTO_WRITE_3              0x01
-#define SD_TM_AUTO_WRITE_4              0x02
-#define SD_TM_AUTO_READ_3               0x05
-#define SD_TM_AUTO_READ_4               0x06
-#define SD_TM_CMD_RSP                   0x08
-#define SD_TM_AUTO_WRITE_1              0x09
-#define SD_TM_AUTO_WRITE_2              0x0A
-#define SD_TM_NORMAL_READ               0x0C
-#define SD_TM_AUTO_READ_1               0x0D
-#define SD_TM_AUTO_READ_2               0x0E
-#define SD_TM_AUTO_TUNING               0x0F
-
-#define PHASE_CHANGE                    0x80
-#define PHASE_NOT_RESET                 0x40
-
-#define DCMPS_CHANGE                    0x80
-#define DCMPS_CHANGE_DONE               0x40
-#define DCMPS_ERROR                     0x20
-#define DCMPS_CURRENT_PHASE             0x1F
-
-#define SD_CLK_DIVIDE_0                 0x00
-#define SD_CLK_DIVIDE_256               0xC0
-#define SD_CLK_DIVIDE_128               0x80
-#define SD_BUS_WIDTH_1                  0x00
-#define SD_BUS_WIDTH_4                  0x01
-#define SD_BUS_WIDTH_8                  0x02
-#define SD_ASYNC_FIFO_NOT_RST           0x10
-#define SD_20_MODE                      0x00
-#define SD_DDR_MODE                     0x04
-#define SD_30_MODE                      0x08
-
-#define SD_CLK_DIVIDE_MASK              0xC0
-
-#define SD_CMD_IDLE                     0x80
-
-#define SD_DATA_IDLE                    0x80
-
-#define DCM_RESET                       0x08
-#define DCM_LOCKED                      0x04
-#define DCM_208M                        0x00
-#define DCM_TX                          0x01
-#define DCM_RX                          0x02
-
-#define DRP_START                       0x80
-#define DRP_DONE                        0x40
-
-#define DRP_WRITE                       0x80
-#define DRP_READ                        0x00
-#define DCM_WRITE_ADDRESS_50            0x50
-#define DCM_WRITE_ADDRESS_51            0x51
-#define DCM_READ_ADDRESS_00             0x00
-#define DCM_READ_ADDRESS_51             0x51
-
-#define SD_CALCULATE_CRC7               0x00
-#define SD_NO_CALCULATE_CRC7            0x80
-#define SD_CHECK_CRC16                  0x00
-#define SD_NO_CHECK_CRC16               0x40
-#define SD_NO_CHECK_WAIT_CRC_TO         0x20
-#define SD_WAIT_BUSY_END                0x08
-#define SD_NO_WAIT_BUSY_END             0x00
-#define SD_CHECK_CRC7                   0x00
-#define SD_NO_CHECK_CRC7                0x04
-#define SD_RSP_LEN_0                    0x00
-#define SD_RSP_LEN_6                    0x01
-#define SD_RSP_LEN_17                   0x02
-#define SD_RSP_TYPE_R0                  0x04
-#define SD_RSP_TYPE_R1                  0x01
-#define SD_RSP_TYPE_R1b                 0x09
-#define SD_RSP_TYPE_R2                  0x02
-#define SD_RSP_TYPE_R3                  0x05
-#define SD_RSP_TYPE_R4                  0x05
-#define SD_RSP_TYPE_R5                  0x01
-#define SD_RSP_TYPE_R6                  0x01
-#define SD_RSP_TYPE_R7                  0x01
-
-#define SD_RSP_80CLK_TIMEOUT_EN         0x01
-
-#define SAMPLE_TIME_RISING              0x00
-#define SAMPLE_TIME_FALLING             0x80
-#define PUSH_TIME_DEFAULT               0x00
-#define PUSH_TIME_ODD                   0x40
-#define NO_EXTEND_TOGGLE                0x00
-#define EXTEND_TOGGLE_CHK               0x20
-#define MS_BUS_WIDTH_1                  0x00
-#define MS_BUS_WIDTH_4                  0x10
-#define MS_BUS_WIDTH_8                  0x18
-#define MS_2K_SECTOR_MODE               0x04
-#define MS_512_SECTOR_MODE              0x00
-#define MS_TOGGLE_TIMEOUT_EN            0x00
-#define MS_TOGGLE_TIMEOUT_DISEN         0x01
-#define MS_NO_CHECK_INT                 0x02
-
-#define WAIT_INT                        0x80
-#define NO_WAIT_INT                     0x00
-#define NO_AUTO_READ_INT_REG            0x00
-#define AUTO_READ_INT_REG               0x40
-#define MS_CRC16_ERR                    0x20
-#define MS_RDY_TIMEOUT                  0x10
-#define MS_INT_CMDNK                    0x08
-#define MS_INT_BREQ                     0x04
-#define MS_INT_ERR                      0x02
-#define MS_INT_CED                      0x01
-
-#define MS_TRANSFER_START               0x80
-#define MS_TRANSFER_END                 0x40
-#define MS_TRANSFER_ERR                 0x20
-#define MS_BS_STATE                     0x10
-#define MS_TM_READ_BYTES                0x00
-#define MS_TM_NORMAL_READ               0x01
-#define MS_TM_WRITE_BYTES               0x04
-#define MS_TM_NORMAL_WRITE              0x05
-#define MS_TM_AUTO_READ                 0x08
-#define MS_TM_AUTO_WRITE                0x0C
-
-#define CARD_SHARE_MASK                 0x0F
-#define CARD_SHARE_MULTI_LUN            0x00
-#define CARD_SHARE_NORMAL               0x00
-#define CARD_SHARE_48_XD                0x02
-#define CARD_SHARE_48_SD                0x04
-#define CARD_SHARE_48_MS                0x08
-#define CARD_SHARE_BAROSSA_XD           0x00
-#define CARD_SHARE_BAROSSA_SD           0x01
-#define CARD_SHARE_BAROSSA_MS           0x02
-
-#define MS_DRIVE_8                      0x00
-#define MS_DRIVE_4                      0x40
-#define MS_DRIVE_12                     0x80
-#define SD_DRIVE_8                      0x00
-#define SD_DRIVE_4                      0x10
-#define SD_DRIVE_12                     0x20
-#define XD_DRIVE_8                      0x00
-#define XD_DRIVE_4                      0x04
-#define XD_DRIVE_12                     0x08
-
-#define SPI_STOP                0x01
-#define XD_STOP                 0x02
-#define SD_STOP                 0x04
-#define MS_STOP                 0x08
-#define SPI_CLR_ERR             0x10
-#define XD_CLR_ERR              0x20
-#define SD_CLR_ERR              0x40
-#define MS_CLR_ERR              0x80
-
-#define CRC_FIX_CLK             (0x00 << 0)
-#define CRC_VAR_CLK0            (0x01 << 0)
-#define CRC_VAR_CLK1            (0x02 << 0)
-#define SD30_FIX_CLK            (0x00 << 2)
-#define SD30_VAR_CLK0           (0x01 << 2)
-#define SD30_VAR_CLK1           (0x02 << 2)
-#define SAMPLE_FIX_CLK          (0x00 << 4)
-#define SAMPLE_VAR_CLK0         (0x01 << 4)
-#define SAMPLE_VAR_CLK1         (0x02 << 4)
-
-#define SDIO_VER_20             0x80
-#define SDIO_VER_10             0x00
-#define SDIO_VER_CHG            0x40
-#define SDIO_BUS_AUTO_SWITCH    0x10
-
-#define PINGPONG_BUFFER         0x01
-#define RING_BUFFER             0x00
-
-#define RB_FLUSH                0x80
-
-#define DMA_DONE_INT_EN                 0x80
-#define SUSPEND_INT_EN                  0x40
-#define LINK_RDY_INT_EN                 0x20
-#define LINK_DOWN_INT_EN                0x10
-
-#define DMA_DONE_INT                    0x80
-#define SUSPEND_INT                     0x40
-#define LINK_RDY_INT                    0x20
-#define LINK_DOWN_INT                   0x10
-
-#define MRD_ERR_INT_EN                  0x40
-#define MWR_ERR_INT_EN                  0x20
-#define SCSI_CMD_INT_EN                 0x10
-#define TLP_RCV_INT_EN                  0x08
-#define TLP_TRSMT_INT_EN                0x04
-#define MRD_COMPLETE_INT_EN             0x02
-#define MWR_COMPLETE_INT_EN             0x01
-
-#define MRD_ERR_INT                     0x40
-#define MWR_ERR_INT                     0x20
-#define SCSI_CMD_INT                    0x10
-#define TLP_RX_INT                      0x08
-#define TLP_TX_INT                      0x04
-#define MRD_COMPLETE_INT                0x02
-#define MWR_COMPLETE_INT                0x01
-
-#define MSG_RX_INT_EN                   0x08
-#define MRD_RX_INT_EN                   0x04
-#define MWR_RX_INT_EN                   0x02
-#define CPLD_RX_INT_EN                  0x01
-
-#define MSG_RX_INT                      0x08
-#define MRD_RX_INT                      0x04
-#define MWR_RX_INT                      0x02
-#define CPLD_RX_INT                     0x01
-
-#define MSG_TX_INT_EN                   0x08
-#define MRD_TX_INT_EN                   0x04
-#define MWR_TX_INT_EN                   0x02
-#define CPLD_TX_INT_EN                  0x01
-
-#define MSG_TX_INT                      0x08
-#define MRD_TX_INT                      0x04
-#define MWR_TX_INT                      0x02
-#define CPLD_TX_INT                     0x01
-
-#define DMA_RST                         0x80
-#define DMA_BUSY                        0x04
-#define DMA_DIR_TO_CARD                 0x00
-#define DMA_DIR_FROM_CARD               0x02
-#define DMA_EN                          0x01
-#define DMA_128                         (0 << 4)
-#define DMA_256                         (1 << 4)
-#define DMA_512                         (2 << 4)
-#define DMA_1024                        (3 << 4)
-#define DMA_PACK_SIZE_MASK              0x30
-
-#define XD_PWR_OFF_DELAY0               0x00
-#define XD_PWR_OFF_DELAY1               0x02
-#define XD_PWR_OFF_DELAY2               0x04
-#define XD_PWR_OFF_DELAY3               0x06
-#define XD_AUTO_PWR_OFF_EN              0xF7
-#define XD_NO_AUTO_PWR_OFF              0x08
-
-#define XD_TIME_RWN_1                   0x00
-#define XD_TIME_RWN_STEP                0x20
-#define XD_TIME_RW_1                    0x00
-#define XD_TIME_RW_STEP                 0x04
-#define XD_TIME_SETUP_1                 0x00
-#define XD_TIME_SETUP_STEP              0x01
-
-#define XD_ECC2_UNCORRECTABLE           0x80
-#define XD_ECC2_ERROR                   0x40
-#define XD_ECC1_UNCORRECTABLE           0x20
-#define XD_ECC1_ERROR                   0x10
-#define XD_RDY                          0x04
-#define XD_CE_EN                        0xFD
-#define XD_CE_DISEN                     0x02
-#define XD_WP_EN                        0xFE
-#define XD_WP_DISEN                     0x01
-
-#define XD_TRANSFER_START               0x80
-#define XD_TRANSFER_END                 0x40
-#define XD_PPB_EMPTY                    0x20
-#define XD_RESET                        0x00
-#define XD_ERASE                        0x01
-#define XD_READ_STATUS                  0x02
-#define XD_READ_ID                      0x03
-#define XD_READ_REDUNDANT               0x04
-#define XD_READ_PAGES                   0x05
-#define XD_SET_CMD                      0x06
-#define XD_NORMAL_READ                  0x07
-#define XD_WRITE_PAGES                  0x08
-#define XD_NORMAL_WRITE                 0x09
-#define XD_WRITE_REDUNDANT              0x0A
-#define XD_SET_ADDR                     0x0B
-
-#define XD_PPB_TO_SIE                   0x80
-#define XD_TO_PPB_ONLY                  0x00
-#define XD_BA_TRANSFORM                 0x40
-#define XD_BA_NO_TRANSFORM              0x00
-#define XD_NO_CALC_ECC                  0x20
-#define XD_CALC_ECC                     0x00
-#define XD_IGNORE_ECC                   0x10
-#define XD_CHECK_ECC                    0x00
-#define XD_DIRECT_TO_RB                 0x08
-#define XD_ADDR_LENGTH_0                0x00
-#define XD_ADDR_LENGTH_1                0x01
-#define XD_ADDR_LENGTH_2                0x02
-#define XD_ADDR_LENGTH_3                0x03
-#define XD_ADDR_LENGTH_4                0x04
-
-#define XD_GPG                          0xFF
-#define XD_BPG                          0x00
-
-#define XD_GBLK                         0xFF
-#define XD_LATER_BBLK                   0xF0
-
-#define XD_ECC2_ALL1                    0x80
-#define XD_ECC1_ALL1                    0x40
-#define XD_BA2_ALL0                     0x20
-#define XD_BA1_ALL0                     0x10
-#define XD_BA1_BA2_EQL                  0x04
-#define XD_BA2_VALID                    0x02
-#define XD_BA1_VALID                    0x01
-
-#define XD_PGSTS_ZEROBIT_OVER4          0x00
-#define XD_PGSTS_NOT_FF                 0x02
-#define XD_AUTO_CHK_DATA_STATUS         0x01
-
-#define RSTB_MODE_DETECT                0x80
-#define MODE_OUT_VLD                    0x40
-#define MODE_OUT_0_NONE                 0x00
-#define MODE_OUT_10_NONE                0x04
-#define MODE_OUT_10_47                  0x05
-#define MODE_OUT_10_180                 0x06
-#define MODE_OUT_10_680                 0x07
-#define MODE_OUT_16_NONE                0x08
-#define MODE_OUT_16_47                  0x09
-#define MODE_OUT_16_180                 0x0A
-#define MODE_OUT_16_680                 0x0B
-#define MODE_OUT_NONE_NONE              0x0C
-#define MODE_OUT_NONE_47                0x0D
-#define MODE_OUT_NONE_180               0x0E
-#define MODE_OUT_NONE_680               0x0F
-
-#define CARD_OC_INT_EN                  0x20
-#define CARD_DETECT_EN                  0x08
-
-#define MS_DETECT_EN                    0x80
-#define MS_OCP_INT_EN                   0x40
-#define MS_OCP_INT_CLR                  0x20
-#define MS_OC_CLR                       0x10
-#define SD_DETECT_EN                    0x08
-#define SD_OCP_INT_EN                   0x04
-#define SD_OCP_INT_CLR                  0x02
-#define SD_OC_CLR                       0x01
-
-#define CARD_OCP_DETECT                 0x80
-#define CARD_OC_NOW                     0x08
-#define CARD_OC_EVER                    0x04
-
-#define MS_OCP_DETECT                   0x80
-#define MS_OC_NOW                       0x40
-#define MS_OC_EVER                      0x20
-#define SD_OCP_DETECT                   0x08
-#define SD_OC_NOW                       0x04
-#define SD_OC_EVER                      0x02
-
-#define CARD_OC_INT_CLR                 0x08
-#define CARD_OC_CLR                     0x02
-
-#define SD_OCP_GLITCH_MASK              0x07
-#define SD_OCP_GLITCH_6_4               0x00
-#define SD_OCP_GLITCH_64                0x01
-#define SD_OCP_GLITCH_640               0x02
-#define SD_OCP_GLITCH_1000              0x03
-#define SD_OCP_GLITCH_2000              0x04
-#define SD_OCP_GLITCH_4000              0x05
-#define SD_OCP_GLITCH_8000              0x06
-#define SD_OCP_GLITCH_10000             0x07
-
-#define MS_OCP_GLITCH_MASK              0x70
-#define MS_OCP_GLITCH_6_4               (0x00 << 4)
-#define MS_OCP_GLITCH_64                (0x01 << 4)
-#define MS_OCP_GLITCH_640               (0x02 << 4)
-#define MS_OCP_GLITCH_1000              (0x03 << 4)
-#define MS_OCP_GLITCH_2000              (0x04 << 4)
-#define MS_OCP_GLITCH_4000              (0x05 << 4)
-#define MS_OCP_GLITCH_8000              (0x06 << 4)
-#define MS_OCP_GLITCH_10000             (0x07 << 4)
-
-#define OCP_TIME_60                     0x00
-#define OCP_TIME_100                    (0x01 << 3)
-#define OCP_TIME_200                    (0x02 << 3)
-#define OCP_TIME_400                    (0x03 << 3)
-#define OCP_TIME_600                    (0x04 << 3)
-#define OCP_TIME_800                    (0x05 << 3)
-#define OCP_TIME_1100                   (0x06 << 3)
-#define OCP_TIME_MASK                   0x38
-
-#define MS_OCP_TIME_60                  0x00
-#define MS_OCP_TIME_100                 (0x01 << 4)
-#define MS_OCP_TIME_200                 (0x02 << 4)
-#define MS_OCP_TIME_400                 (0x03 << 4)
-#define MS_OCP_TIME_600                 (0x04 << 4)
-#define MS_OCP_TIME_800                 (0x05 << 4)
-#define MS_OCP_TIME_1100                (0x06 << 4)
-#define MS_OCP_TIME_MASK                0x70
-
-#define SD_OCP_TIME_60                  0x00
-#define SD_OCP_TIME_100                 0x01
-#define SD_OCP_TIME_200                 0x02
-#define SD_OCP_TIME_400                 0x03
-#define SD_OCP_TIME_600                 0x04
-#define SD_OCP_TIME_800                 0x05
-#define SD_OCP_TIME_1100                0x06
-#define SD_OCP_TIME_MASK                0x07
-
-#define OCP_THD_315_417                 0x00
-#define OCP_THD_283_783                 (0x01 << 6)
-#define OCP_THD_244_946                 (0x02 << 6)
-#define OCP_THD_191_1080                (0x03 << 6)
-#define OCP_THD_MASK                    0xC0
-
-#define MS_OCP_THD_450                  0x00
-#define MS_OCP_THD_550                  (0x01 << 4)
-#define MS_OCP_THD_650                  (0x02 << 4)
-#define MS_OCP_THD_750                  (0x03 << 4)
-#define MS_OCP_THD_850                  (0x04 << 4)
-#define MS_OCP_THD_950                  (0x05 << 4)
-#define MS_OCP_THD_1050                 (0x06 << 4)
-#define MS_OCP_THD_1150                 (0x07 << 4)
-#define MS_OCP_THD_MASK                 0x70
-
-#define SD_OCP_THD_450                  0x00
-#define SD_OCP_THD_550                  0x01
-#define SD_OCP_THD_650                  0x02
-#define SD_OCP_THD_750                  0x03
-#define SD_OCP_THD_850                  0x04
-#define SD_OCP_THD_950                  0x05
-#define SD_OCP_THD_1050                 0x06
-#define SD_OCP_THD_1150                 0x07
-#define SD_OCP_THD_MASK                 0x07
-
-#define FPGA_MS_PULL_CTL_EN             0xEF
-#define FPGA_SD_PULL_CTL_EN             0xF7
-#define FPGA_XD_PULL_CTL_EN1            0xFE
-#define FPGA_XD_PULL_CTL_EN2            0xFD
-#define FPGA_XD_PULL_CTL_EN3            0xFB
-
-#define FPGA_MS_PULL_CTL_BIT            0x10
-#define FPGA_SD_PULL_CTL_BIT            0x08
-
-#define BLINK_EN                        0x08
-#define LED_GPIO0                       (0 << 4)
-#define LED_GPIO1                       (1 << 4)
-#define LED_GPIO2                       (2 << 4)
-
-#define SDIO_BUS_CTRL           0x01
-#define SDIO_CD_CTRL            0x02
-
-#define SSC_RSTB                0x80
-#define SSC_8X_EN               0x40
-#define SSC_FIX_FRAC            0x20
-#define SSC_SEL_1M              0x00
-#define SSC_SEL_2M              0x08
-#define SSC_SEL_4M              0x10
-#define SSC_SEL_8M              0x18
-
-#define SSC_DEPTH_MASK          0x07
-#define SSC_DEPTH_DISALBE       0x00
-#define SSC_DEPTH_4M            0x01
-#define SSC_DEPTH_2M            0x02
-#define SSC_DEPTH_1M            0x03
-#define SSC_DEPTH_512K          0x04
-#define SSC_DEPTH_256K          0x05
-#define SSC_DEPTH_128K          0x06
-#define SSC_DEPTH_64K           0x07
-
-#define XD_D3_NP                0x00
-#define XD_D3_PD                (0x01 << 6)
-#define XD_D3_PU                (0x02 << 6)
-#define XD_D2_NP                0x00
-#define XD_D2_PD                (0x01 << 4)
-#define XD_D2_PU                (0x02 << 4)
-#define XD_D1_NP                0x00
-#define XD_D1_PD                (0x01 << 2)
-#define XD_D1_PU                (0x02 << 2)
-#define XD_D0_NP                0x00
-#define XD_D0_PD                0x01
-#define XD_D0_PU                0x02
-
-#define SD_D7_NP                0x00
-#define SD_D7_PD                (0x01 << 4)
-#define SD_DAT7_PU              (0x02 << 4)
-#define SD_CLK_NP               0x00
-#define SD_CLK_PD               (0x01 << 2)
-#define SD_CLK_PU               (0x02 << 2)
-#define SD_D5_NP                0x00
-#define SD_D5_PD                0x01
-#define SD_D5_PU                0x02
-
-#define MS_D1_NP                0x00
-#define MS_D1_PD                (0x01 << 6)
-#define MS_D1_PU                (0x02 << 6)
-#define MS_D2_NP                0x00
-#define MS_D2_PD                (0x01 << 4)
-#define MS_D2_PU                (0x02 << 4)
-#define MS_CLK_NP               0x00
-#define MS_CLK_PD               (0x01 << 2)
-#define MS_CLK_PU               (0x02 << 2)
-#define MS_D6_NP                0x00
-#define MS_D6_PD                0x01
-#define MS_D6_PU                0x02
-
-#define XD_D7_NP                0x00
-#define XD_D7_PD                (0x01 << 6)
-#define XD_D7_PU                (0x02 << 6)
-#define XD_D6_NP                0x00
-#define XD_D6_PD                (0x01 << 4)
-#define XD_D6_PU                (0x02 << 4)
-#define XD_D5_NP                0x00
-#define XD_D5_PD                (0x01 << 2)
-#define XD_D5_PU                (0x02 << 2)
-#define XD_D4_NP                0x00
-#define XD_D4_PD                0x01
-#define XD_D4_PU                0x02
-
-#define SD_D6_NP                0x00
-#define SD_D6_PD                (0x01 << 6)
-#define SD_D6_PU                (0x02 << 6)
-#define SD_D0_NP                0x00
-#define SD_D0_PD                (0x01 << 4)
-#define SD_D0_PU                (0x02 << 4)
-#define SD_D1_NP                0x00
-#define SD_D1_PD                0x01
-#define SD_D1_PU                0x02
-
-#define MS_D3_NP                0x00
-#define MS_D3_PD                (0x01 << 6)
-#define MS_D3_PU                (0x02 << 6)
-#define MS_D0_NP                0x00
-#define MS_D0_PD                (0x01 << 4)
-#define MS_D0_PU                (0x02 << 4)
-#define MS_BS_NP                0x00
-#define MS_BS_PD                (0x01 << 2)
-#define MS_BS_PU                (0x02 << 2)
-
-#define XD_WP_NP                0x00
-#define XD_WP_PD                (0x01 << 6)
-#define XD_WP_PU                (0x02 << 6)
-#define XD_CE_NP                0x00
-#define XD_CE_PD                (0x01 << 3)
-#define XD_CE_PU                (0x02 << 3)
-#define XD_CLE_NP               0x00
-#define XD_CLE_PD               (0x01 << 1)
-#define XD_CLE_PU               (0x02 << 1)
-#define XD_CD_PD                0x00
-#define XD_CD_PU                0x01
-
-#define SD_D4_NP                0x00
-#define SD_D4_PD                (0x01 << 6)
-#define SD_D4_PU                (0x02 << 6)
-
-#define MS_D7_NP                0x00
-#define MS_D7_PD                (0x01 << 6)
-#define MS_D7_PU                (0x02 << 6)
-
-#define XD_RDY_NP               0x00
-#define XD_RDY_PD               (0x01 << 6)
-#define XD_RDY_PU               (0x02 << 6)
-#define XD_WE_NP                0x00
-#define XD_WE_PD                (0x01 << 4)
-#define XD_WE_PU                (0x02 << 4)
-#define XD_RE_NP                0x00
-#define XD_RE_PD                (0x01 << 2)
-#define XD_RE_PU                (0x02 << 2)
-#define XD_ALE_NP               0x00
-#define XD_ALE_PD               0x01
-#define XD_ALE_PU               0x02
-
-#define SD_D3_NP                0x00
-#define SD_D3_PD                (0x01 << 4)
-#define SD_D3_PU                (0x02 << 4)
-#define SD_D2_NP                0x00
-#define SD_D2_PD                (0x01 << 2)
-#define SD_D2_PU                (0x02 << 2)
-
-#define MS_INS_PD               0x00
-#define MS_INS_PU               (0x01 << 7)
-#define SD_WP_NP                0x00
-#define SD_WP_PD                (0x01 << 5)
-#define SD_WP_PU                (0x02 << 5)
-#define SD_CD_PD                0x00
-#define SD_CD_PU                (0x01 << 4)
-#define SD_CMD_NP               0x00
-#define SD_CMD_PD               (0x01 << 2)
-#define SD_CMD_PU               (0x02 << 2)
-
-#define MS_D5_NP                0x00
-#define MS_D5_PD                (0x01 << 2)
-#define MS_D5_PU                (0x02 << 2)
-#define MS_D4_NP                0x00
-#define MS_D4_PD                0x01
-#define MS_D4_PU                0x02
-
-#define FORCE_PM_CLOCK          0x10
-#define EN_CLOCK_PM             0x01
-
-#define HOST_ENTER_S3           0x02
-#define HOST_ENTER_S1           0x01
-
-#define AUX_PWR_DETECTED        0x01
-
-#define PHY_DEBUG_MODE          0x01
-
-#define SPI_COMMAND_BIT_8       0xE0
-#define SPI_ADDRESS_BIT_24      0x17
-#define SPI_ADDRESS_BIT_32      0x1F
-
-#define SPI_TRANSFER0_START     0x80
-#define SPI_TRANSFER0_END       0x40
-#define SPI_C_MODE0             0x00
-#define SPI_CA_MODE0            0x01
-#define SPI_CDO_MODE0           0x02
-#define SPI_CDI_MODE0           0x03
-#define SPI_CADO_MODE0          0x04
-#define SPI_CADI_MODE0          0x05
-#define SPI_POLLING_MODE0       0x06
-
-#define SPI_TRANSFER1_START     0x80
-#define SPI_TRANSFER1_END       0x40
-#define SPI_DO_MODE1            0x00
-#define SPI_DI_MODE1            0x01
-
-#define CS_POLARITY_HIGH        0x40
-#define CS_POLARITY_LOW         0x00
-#define DTO_MSB_FIRST           0x00
-#define DTO_LSB_FIRST           0x20
-#define SPI_MASTER              0x00
-#define SPI_SLAVE               0x10
-#define SPI_MODE0               0x00
-#define SPI_MODE1               0x04
-#define SPI_MODE2               0x08
-#define SPI_MODE3               0x0C
-#define SPI_MANUAL              0x00
-#define SPI_HALF_AUTO           0x01
-#define SPI_AUTO                0x02
-#define SPI_EEPROM_AUTO         0x03
-
-#define EDO_TIMING_MASK         0x03
-#define SAMPLE_RISING           0x00
-#define SAMPLE_DELAY_HALF       0x01
-#define SAMPLE_DELAY_ONE        0x02
-#define SAPMLE_DELAY_ONE_HALF   0x03
-#define TCS_MASK                0x0C
-
-#define NOT_BYPASS_SD           0x02
-#define DISABLE_SDIO_FUNC       0x04
-#define SELECT_1LUN             0x08
-
-#define PWR_GATE_EN             0x01
-#define LDO3318_PWR_MASK        0x06
-#define LDO_ON                  0x00
-#define LDO_SUSPEND             0x04
-#define LDO_OFF                 0x06
-
-#define SD_CFG1                 0xFDA0
-#define SD_CFG2                 0xFDA1
-#define SD_CFG3                 0xFDA2
-#define SD_STAT1                0xFDA3
-#define SD_STAT2                0xFDA4
-#define SD_BUS_STAT             0xFDA5
-#define SD_PAD_CTL              0xFDA6
-#define SD_SAMPLE_POINT_CTL     0xFDA7
-#define SD_PUSH_POINT_CTL       0xFDA8
-#define SD_CMD0                 0xFDA9
-#define SD_CMD1                 0xFDAA
-#define SD_CMD2                 0xFDAB
-#define SD_CMD3                 0xFDAC
-#define SD_CMD4                 0xFDAD
-#define SD_CMD5                 0xFDAE
-#define SD_BYTE_CNT_L           0xFDAF
-#define SD_BYTE_CNT_H           0xFDB0
-#define SD_BLOCK_CNT_L          0xFDB1
-#define SD_BLOCK_CNT_H          0xFDB2
-#define SD_TRANSFER             0xFDB3
-#define SD_CMD_STATE            0xFDB5
-#define SD_DATA_STATE           0xFDB6
-
-#define DCM_DRP_CTL             0xFC23
-#define DCM_DRP_TRIG            0xFC24
-#define DCM_DRP_CFG             0xFC25
-#define DCM_DRP_WR_DATA_L       0xFC26
-#define DCM_DRP_WR_DATA_H       0xFC27
-#define DCM_DRP_RD_DATA_L       0xFC28
-#define DCM_DRP_RD_DATA_H       0xFC29
-#define SD_VPCLK0_CTL           0xFC2A
-#define SD_VPCLK1_CTL           0xFC2B
-#define SD_DCMPS0_CTL           0xFC2C
-#define SD_DCMPS1_CTL           0xFC2D
-#define SD_VPTX_CTL             SD_VPCLK0_CTL
-#define SD_VPRX_CTL             SD_VPCLK1_CTL
-#define SD_DCMPS_TX_CTL         SD_DCMPS0_CTL
-#define SD_DCMPS_RX_CTL         SD_DCMPS1_CTL
-
-#define CARD_CLK_SOURCE         0xFC2E
-
-#define CARD_PWR_CTL            0xFD50
-#define CARD_CLK_SWITCH         0xFD51
-#define CARD_SHARE_MODE         0xFD52
-#define CARD_DRIVE_SEL          0xFD53
-#define CARD_STOP               0xFD54
-#define CARD_OE                 0xFD55
-#define CARD_AUTO_BLINK         0xFD56
-#define CARD_GPIO_DIR           0xFD57
-#define CARD_GPIO               0xFD58
-
-#define CARD_DATA_SOURCE        0xFD5B
-#define CARD_SELECT             0xFD5C
-#define SD30_DRIVE_SEL          0xFD5E
-
-#define CARD_CLK_EN             0xFD69
-
-#define SDIO_CTRL               0xFD6B
-
-#define FPDCTL                  0xFC00
-#define PDINFO                  0xFC01
-
-#define CLK_CTL                 0xFC02
-#define CLK_DIV                 0xFC03
-#define CLK_SEL                 0xFC04
-
-#define SSC_DIV_N_0             0xFC0F
-#define SSC_DIV_N_1             0xFC10
-
-#define RCCTL                   0xFC14
-
-#define FPGA_PULL_CTL           0xFC1D
-
-#define CARD_PULL_CTL1          0xFD60
-#define CARD_PULL_CTL2          0xFD61
-#define CARD_PULL_CTL3          0xFD62
-#define CARD_PULL_CTL4          0xFD63
-#define CARD_PULL_CTL5          0xFD64
-#define CARD_PULL_CTL6          0xFD65
-
-#define IRQEN0                          0xFE20
-#define IRQSTAT0                        0xFE21
-#define IRQEN1                          0xFE22
-#define IRQSTAT1                        0xFE23
-#define TLPRIEN                         0xFE24
-#define TLPRISTAT                       0xFE25
-#define TLPTIEN                         0xFE26
-#define TLPTISTAT                       0xFE27
-#define DMATC0                          0xFE28
-#define DMATC1                          0xFE29
-#define DMATC2                          0xFE2A
-#define DMATC3                          0xFE2B
-#define DMACTL                          0xFE2C
-#define BCTL                            0xFE2D
-#define RBBC0                           0xFE2E
-#define RBBC1                           0xFE2F
-#define RBDAT                           0xFE30
-#define RBCTL                           0xFE34
-#define CFGADDR0                        0xFE35
-#define CFGADDR1                        0xFE36
-#define CFGDATA0                        0xFE37
-#define CFGDATA1                        0xFE38
-#define CFGDATA2                        0xFE39
-#define CFGDATA3                        0xFE3A
-#define CFGRWCTL                        0xFE3B
-#define PHYRWCTL                        0xFE3C
-#define PHYDATA0                        0xFE3D
-#define PHYDATA1                        0xFE3E
-#define PHYADDR                         0xFE3F
-#define MSGRXDATA0                      0xFE40
-#define MSGRXDATA1                      0xFE41
-#define MSGRXDATA2                      0xFE42
-#define MSGRXDATA3                      0xFE43
-#define MSGTXDATA0                      0xFE44
-#define MSGTXDATA1                      0xFE45
-#define MSGTXDATA2                      0xFE46
-#define MSGTXDATA3                      0xFE47
-#define MSGTXCTL                        0xFE48
-#define PETXCFG                         0xFE49
-
-#define CDRESUMECTL                     0xFE52
-#define WAKE_SEL_CTL                    0xFE54
-#define PME_FORCE_CTL                   0xFE56
-#define ASPM_FORCE_CTL                  0xFE57
-#define PM_CLK_FORCE_CTL                0xFE58
-#define PERST_GLITCH_WIDTH              0xFE5C
-#define CHANGE_LINK_STATE               0xFE5B
-#define RESET_LOAD_REG                  0xFE5E
-#define HOST_SLEEP_STATE                0xFE60
-#define MAIN_PWR_OFF_CTL                0xFE70  /* RTS5208 */
-#define SDIO_CFG                        0xFE70  /* RTS5209 */
-
-#define NFTS_TX_CTRL                    0xFE72
-
-#define PWR_GATE_CTRL                   0xFE75
-#define PWD_SUSPEND_EN                  0xFE76
-
-#define EFUSE_CONTENT                   0xFE5F
-
-#define XD_INIT                         0xFD10
-#define XD_DTCTL                        0xFD11
-#define XD_CTL                          0xFD12
-#define XD_TRANSFER                     0xFD13
-#define XD_CFG                          0xFD14
-#define XD_ADDRESS0                     0xFD15
-#define XD_ADDRESS1                     0xFD16
-#define XD_ADDRESS2                     0xFD17
-#define XD_ADDRESS3                     0xFD18
-#define XD_ADDRESS4                     0xFD19
-#define XD_DAT                          0xFD1A
-#define XD_PAGE_CNT                     0xFD1B
-#define XD_PAGE_STATUS                  0xFD1C
-#define XD_BLOCK_STATUS                 0xFD1D
-#define XD_BLOCK_ADDR1_L                0xFD1E
-#define XD_BLOCK_ADDR1_H                0xFD1F
-#define XD_BLOCK_ADDR2_L                0xFD20
-#define XD_BLOCK_ADDR2_H                0xFD21
-#define XD_BYTE_CNT_L                   0xFD22
-#define XD_BYTE_CNT_H                   0xFD23
-#define XD_PARITY                       0xFD24
-#define XD_ECC_BIT1                     0xFD25
-#define XD_ECC_BYTE1                    0xFD26
-#define XD_ECC_BIT2                     0xFD27
-#define XD_ECC_BYTE2                    0xFD28
-#define XD_RESERVED0                    0xFD29
-#define XD_RESERVED1                    0xFD2A
-#define XD_RESERVED2                    0xFD2B
-#define XD_RESERVED3                    0xFD2C
-#define XD_CHK_DATA_STATUS              0xFD2D
-#define XD_CATCTL                       0xFD2E
-
-#define MS_CFG                          0xFD40
-#define MS_TPC                          0xFD41
-#define MS_TRANS_CFG                    0xFD42
-#define MS_TRANSFER                     0xFD43
-#define MS_INT_REG                      0xFD44
-#define MS_BYTE_CNT                     0xFD45
-#define MS_SECTOR_CNT_L                 0xFD46
-#define MS_SECTOR_CNT_H                 0xFD47
-#define MS_DBUS_H                       0xFD48
-
-#define SSC_CTL1                        0xFC11
-#define SSC_CTL2                        0xFC12
-
-#define OCPCTL                          0xFC15
-#define OCPSTAT                         0xFC16
-#define OCPCLR                          0xFC17  /* 5208 */
-#define OCPGLITCH                       0xFC17  /* 5209 */
-#define OCPPARA1                        0xFC18
-#define OCPPARA2                        0xFC19
-
-#define EFUSE_OP                        0xFC20
-#define EFUSE_CTRL                      0xFC21
-#define EFUSE_DATA                      0xFC22
-
-#define SPI_COMMAND                     0xFD80
-#define SPI_ADDR0                       0xFD81
-#define SPI_ADDR1                       0xFD82
-#define SPI_ADDR2                       0xFD83
-#define SPI_ADDR3                       0xFD84
-#define SPI_CA_NUMBER                   0xFD85
-#define SPI_LENGTH0                     0xFD86
-#define SPI_LENGTH1                     0xFD87
-#define SPI_DATA                        0xFD88
-#define SPI_DATA_NUMBER                 0xFD89
-#define SPI_TRANSFER0                   0xFD90
-#define SPI_TRANSFER1                   0xFD91
-#define SPI_CONTROL                     0xFD92
-#define SPI_SIG                         0xFD93
-#define SPI_TCTL                        0xFD94
-#define SPI_SLAVE_NUM                   0xFD95
-#define SPI_CLK_DIVIDER0                0xFD96
-#define SPI_CLK_DIVIDER1                0xFD97
-
-#define SRAM_BASE                       0xE600
-#define RBUF_BASE                       0xF400
-#define PPBUF_BASE1                     0xF800
-#define PPBUF_BASE2                     0xFA00
-#define IMAGE_FLAG_ADDR0                0xCE80
-#define IMAGE_FLAG_ADDR1                0xCE81
-
-#define READ_OP                 1
-#define WRITE_OP                2
-
-#define LCTLR           0x80
-
-#define POLLING_WAIT_CNT        1
-#define IDLE_MAX_COUNT          10
-#define SDIO_IDLE_COUNT         10
-
-#define DEBOUNCE_CNT                    5
-
-void do_remaining_work(struct rtsx_chip *chip);
-void try_to_switch_sdio_ctrl(struct rtsx_chip *chip);
-void do_reset_sd_card(struct rtsx_chip *chip);
-void do_reset_xd_card(struct rtsx_chip *chip);
-void do_reset_ms_card(struct rtsx_chip *chip);
-void rtsx_power_off_card(struct rtsx_chip *chip);
-void rtsx_release_cards(struct rtsx_chip *chip);
-void rtsx_reset_cards(struct rtsx_chip *chip);
-void rtsx_reinit_cards(struct rtsx_chip *chip, int reset_chip);
-void rtsx_init_cards(struct rtsx_chip *chip);
-int switch_ssc_clock(struct rtsx_chip *chip, int clk);
-int switch_normal_clock(struct rtsx_chip *chip, int clk);
-int enable_card_clock(struct rtsx_chip *chip, u8 card);
-int disable_card_clock(struct rtsx_chip *chip, u8 card);
-int card_rw(struct scsi_cmnd *srb, struct rtsx_chip *chip, u32 sec_addr, u16 sec_cnt);
-void trans_dma_enable(enum dma_data_direction dir, struct rtsx_chip *chip, u32 byte_cnt, u8 pack_size);
-void toggle_gpio(struct rtsx_chip *chip, u8 gpio);
-void turn_on_led(struct rtsx_chip *chip, u8 gpio);
-void turn_off_led(struct rtsx_chip *chip, u8 gpio);
-
-int card_share_mode(struct rtsx_chip *chip, int card);
-int select_card(struct rtsx_chip *chip, int card);
-int detect_card_cd(struct rtsx_chip *chip, int card);
-int check_card_exist(struct rtsx_chip *chip, unsigned int lun);
-int check_card_ready(struct rtsx_chip *chip, unsigned int lun);
-int check_card_wp(struct rtsx_chip *chip, unsigned int lun);
-int check_card_fail(struct rtsx_chip *chip, unsigned int lun);
-int check_card_ejected(struct rtsx_chip *chip, unsigned int lun);
-void eject_card(struct rtsx_chip *chip, unsigned int lun);
-u8 get_lun_card(struct rtsx_chip *chip, unsigned int lun);
-
-static inline u32 get_card_size(struct rtsx_chip *chip, unsigned int lun)
-{
-#ifdef SUPPORT_SD_LOCK
-        struct sd_info *sd_card = &(chip->sd_card);
-
-        if ((get_lun_card(chip, lun) == SD_CARD) && (sd_card->sd_lock_status & SD_LOCKED))
-                return 0;
-        else
-                return chip->capacity[lun];
-#else
-        return chip->capacity[lun];
-#endif
-}
-
-static inline int switch_clock(struct rtsx_chip *chip, int clk)
-{
-        int retval = 0;
-
-        if (chip->asic_code)
-                retval = switch_ssc_clock(chip, clk);
-        else
-                retval = switch_normal_clock(chip, clk);
-
-        return retval;
-}
-
-int card_power_on(struct rtsx_chip *chip, u8 card);
-int card_power_off(struct rtsx_chip *chip, u8 card);
-
-static inline int card_power_off_all(struct rtsx_chip *chip)
-{
-        RTSX_WRITE_REG(chip, CARD_PWR_CTL, 0x0F, 0x0F);
-
-        return STATUS_SUCCESS;
-}
-
-static inline void rtsx_clear_xd_error(struct rtsx_chip *chip)
-{
-        rtsx_write_register(chip, CARD_STOP, XD_STOP | XD_CLR_ERR, XD_STOP | XD_CLR_ERR);
-}
-
-static inline void rtsx_clear_sd_error(struct rtsx_chip *chip)
-{
-        rtsx_write_register(chip, CARD_STOP, SD_STOP | SD_CLR_ERR, SD_STOP | SD_CLR_ERR);
-}
-
-static inline void rtsx_clear_ms_error(struct rtsx_chip *chip)
-{
-        rtsx_write_register(chip, CARD_STOP, MS_STOP | MS_CLR_ERR, MS_STOP | MS_CLR_ERR);
-}
-
-static inline void rtsx_clear_spi_error(struct rtsx_chip *chip)
-{
-        rtsx_write_register(chip, CARD_STOP, SPI_STOP | SPI_CLR_ERR, SPI_STOP | SPI_CLR_ERR);
-}
-
-#ifdef SUPPORT_SDIO_ASPM
-void dynamic_configure_sdio_aspm(struct rtsx_chip *chip);
-#endif
-
-#endif  /* __REALTEK_RTSX_CARD_H */
diff --git a/drivers/staging/rts_pstor/rtsx_chip.c b/drivers/staging/rts_pstor/rtsx_chip.c
deleted file mode 100644
index d8e691b99028..000000000000
--- a/drivers/staging/rts_pstor/rtsx_chip.c
+++ /dev/null
@@ -1,2264 +0,0 @@
-/* Driver for Realtek PCI-Express card reader
- *
- * Copyright(c) 2009 Realtek Semiconductor Corp. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2, 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, see <http://www.gnu.org/licenses/>.
- *
- * Author:
- *   wwang (wei_wang@realsil.com.cn)
- *   No. 450, Shenhu Road, Suzhou Industry Park, Suzhou, China
- */
-
-#include <linux/blkdev.h>
-#include <linux/kthread.h>
-#include <linux/sched.h>
-#include <linux/workqueue.h>
-#include <linux/vmalloc.h>
-
-#include "rtsx.h"
-#include "rtsx_transport.h"
-#include "rtsx_scsi.h"
-#include "rtsx_card.h"
-#include "rtsx_chip.h"
-#include "rtsx_sys.h"
-#include "general.h"
-
-#include "sd.h"
-#include "xd.h"
-#include "ms.h"
-
-static void rtsx_calibration(struct rtsx_chip *chip)
-{
-        rtsx_write_phy_register(chip, 0x1B, 0x135E);
-        wait_timeout(10);
-        rtsx_write_phy_register(chip, 0x00, 0x0280);
-        rtsx_write_phy_register(chip, 0x01, 0x7112);
-        rtsx_write_phy_register(chip, 0x01, 0x7110);
-        rtsx_write_phy_register(chip, 0x01, 0x7112);
-        rtsx_write_phy_register(chip, 0x01, 0x7113);
-        rtsx_write_phy_register(chip, 0x00, 0x0288);
-}
-
-void rtsx_disable_card_int(struct rtsx_chip *chip)
-{
-        u32 reg = rtsx_readl(chip, RTSX_BIER);
-
-        reg &= ~(XD_INT_EN | SD_INT_EN | MS_INT_EN);
-        rtsx_writel(chip, RTSX_BIER, reg);
-}
-
-void rtsx_enable_card_int(struct rtsx_chip *chip)
-{
-        u32 reg = rtsx_readl(chip, RTSX_BIER);
-        int i;
-
-        for (i = 0; i <= chip->max_lun; i++) {
-                if (chip->lun2card[i] & XD_CARD)
-                        reg |= XD_INT_EN;
-                if (chip->lun2card[i] & SD_CARD)
-                        reg |= SD_INT_EN;
-                if (chip->lun2card[i] & MS_CARD)
-                        reg |= MS_INT_EN;
-        }
-        if (chip->hw_bypass_sd)
-                reg &= ~((u32)SD_INT_EN);
-
-        rtsx_writel(chip, RTSX_BIER, reg);
-}
-
-void rtsx_enable_bus_int(struct rtsx_chip *chip)
-{
-        u32 reg = 0;
-#ifndef DISABLE_CARD_INT
-        int i;
-#endif
-
-        reg = TRANS_OK_INT_EN | TRANS_FAIL_INT_EN;
-
-#ifndef DISABLE_CARD_INT
-        for (i = 0; i <= chip->max_lun; i++) {
-                RTSX_DEBUGP("lun2card[%d] = 0x%02x\n", i, chip->lun2card[i]);
-
-                if (chip->lun2card[i] & XD_CARD)
-                        reg |= XD_INT_EN;
-                if (chip->lun2card[i] & SD_CARD)
-                        reg |= SD_INT_EN;
-                if (chip->lun2card[i] & MS_CARD)
-                        reg |= MS_INT_EN;
-        }
-        if (chip->hw_bypass_sd)
-                reg &= ~((u32)SD_INT_EN);
-#endif
-
-        if (chip->ic_version >= IC_VER_C)
-                reg |= DELINK_INT_EN;
-#ifdef SUPPORT_OCP
-        if (CHECK_PID(chip, 0x5209)) {
-                if (CHECK_LUN_MODE(chip, SD_MS_2LUN))
-                        reg |= MS_OC_INT_EN | SD_OC_INT_EN;
-                else
-                        reg |= SD_OC_INT_EN;
-        } else {
-                reg |= OC_INT_EN;
-        }
-#endif
-        if (!chip->adma_mode)
-                reg |= DATA_DONE_INT_EN;
-
-        /* Enable Bus Interrupt */
-        rtsx_writel(chip, RTSX_BIER, reg);
-
-        RTSX_DEBUGP("RTSX_BIER: 0x%08x\n", reg);
-}
-
-void rtsx_disable_bus_int(struct rtsx_chip *chip)
-{
-        rtsx_writel(chip, RTSX_BIER, 0);
-}
-
-static int rtsx_pre_handle_sdio_old(struct rtsx_chip *chip)
-{
-        if (chip->ignore_sd && CHK_SDIO_EXIST(chip)) {
-                if (chip->asic_code) {
-                        RTSX_WRITE_REG(chip, CARD_PULL_CTL5, 0xFF,
-                                MS_INS_PU | SD_WP_PU | SD_CD_PU | SD_CMD_PU);
-                } else {
-                        RTSX_WRITE_REG(chip, FPGA_PULL_CTL, 0xFF, FPGA_SD_PULL_CTL_EN);
-                }
-                RTSX_WRITE_REG(chip, CARD_SHARE_MODE, 0xFF, CARD_SHARE_48_SD);
-
-                /* Enable SDIO internal clock */
-                RTSX_WRITE_REG(chip, 0xFF2C, 0x01, 0x01);
-
-                RTSX_WRITE_REG(chip, SDIO_CTRL, 0xFF, SDIO_BUS_CTRL | SDIO_CD_CTRL);
-
-                chip->sd_int = 1;
-                chip->sd_io = 1;
-        } else {
-                chip->need_reset |= SD_CARD;
-        }
-
-        return STATUS_SUCCESS;
-}
-
-#ifdef HW_AUTO_SWITCH_SD_BUS
-static int rtsx_pre_handle_sdio_new(struct rtsx_chip *chip)
-{
-        u8 tmp;
-        int sw_bypass_sd = 0;
-        int retval;
-
-        if (chip->driver_first_load) {
-                if (CHECK_PID(chip, 0x5288)) {
-                        RTSX_READ_REG(chip, 0xFE5A, &tmp);
-                        if (tmp & 0x08)
-                                sw_bypass_sd = 1;
-                } else if (CHECK_PID(chip, 0x5208)) {
-                        RTSX_READ_REG(chip, 0xFE70, &tmp);
-                        if (tmp & 0x80)
-                                sw_bypass_sd = 1;
-                } else if (CHECK_PID(chip, 0x5209)) {
-                        RTSX_READ_REG(chip, SDIO_CFG, &tmp);
-                        if (tmp & SDIO_BUS_AUTO_SWITCH)
-                                sw_bypass_sd = 1;
-                }
-        } else {
-                if (chip->sdio_in_charge)
-                        sw_bypass_sd = 1;
-        }
-        RTSX_DEBUGP("chip->sdio_in_charge = %d\n", chip->sdio_in_charge);
-        RTSX_DEBUGP("chip->driver_first_load = %d\n", chip->driver_first_load);
-        RTSX_DEBUGP("sw_bypass_sd = %d\n", sw_bypass_sd);
-
-        if (sw_bypass_sd) {
-                u8 cd_toggle_mask = 0;
-
-                RTSX_READ_REG(chip, TLPTISTAT, &tmp);
-                if (CHECK_PID(chip, 0x5209))
-                        cd_toggle_mask = 0x10;
-                else
-                        cd_toggle_mask = 0x08;
-
-                if (tmp & cd_toggle_mask) {
-                        /* Disable sdio_bus_auto_switch */
-                        if (CHECK_PID(chip, 0x5288))
-                                RTSX_WRITE_REG(chip, 0xFE5A, 0x08, 0x00);
-                        else if (CHECK_PID(chip, 0x5208))
-                                RTSX_WRITE_REG(chip, 0xFE70, 0x80, 0x00);
-                        else
-                                RTSX_WRITE_REG(chip, SDIO_CFG, SDIO_BUS_AUTO_SWITCH, 0);
-
-                        RTSX_WRITE_REG(chip, TLPTISTAT, 0xFF, tmp);
-
-                        chip->need_reset |= SD_CARD;
-                } else {
-                        RTSX_DEBUGP("Chip inserted with SDIO!\n");
-
-                        if (chip->asic_code) {
-                                retval = sd_pull_ctl_enable(chip);
-                                if (retval != STATUS_SUCCESS)
-                                        TRACE_RET(chip, STATUS_FAIL);
-                        } else {
-                                RTSX_WRITE_REG(chip, FPGA_PULL_CTL, FPGA_SD_PULL_CTL_BIT | 0x20, 0);
-                        }
-                        retval = card_share_mode(chip, SD_CARD);
-                        if (retval != STATUS_SUCCESS)
-                                TRACE_RET(chip, STATUS_FAIL);
-
-                        /* Enable sdio_bus_auto_switch */
-                        if (CHECK_PID(chip, 0x5288)) {
-                                RTSX_WRITE_REG(chip, 0xFE5A, 0x08, 0x08);
-                        } else if (CHECK_PID(chip, 0x5208)) {
-                                RTSX_WRITE_REG(chip, 0xFE70, 0x80, 0x80);
-                        } else {
-                                RTSX_WRITE_REG(chip, SDIO_CFG,
-                                        SDIO_BUS_AUTO_SWITCH, SDIO_BUS_AUTO_SWITCH);
-                        }
-                        chip->chip_insert_with_sdio = 1;
-                        chip->sd_io = 1;
-                }
-        } else {
-                if (CHECK_PID(chip, 0x5209))
-                        RTSX_WRITE_REG(chip, TLPTISTAT, 0x10, 0x10);
-                else
-                        RTSX_WRITE_REG(chip, TLPTISTAT, 0x08, 0x08);
-
-                chip->need_reset |= SD_CARD;
-        }
-
-        return STATUS_SUCCESS;
-}
-#endif
-
-int rtsx_reset_chip(struct rtsx_chip *chip)
-{
-        int retval;
-
-        rtsx_writel(chip, RTSX_HCBAR, chip->host_cmds_addr);
-
-        rtsx_disable_aspm(chip);
-
-        if (CHECK_PID(chip, 0x5209) && chip->asic_code) {
-                u16 val;
-
-                /* optimize PHY */
-                retval = rtsx_write_phy_register(chip, 0x00, 0xB966);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-
-                retval = rtsx_write_phy_register(chip, 0x01, 0x713F);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-
-                retval = rtsx_write_phy_register(chip, 0x03, 0xA549);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-
-                retval = rtsx_write_phy_register(chip, 0x06, 0xB235);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-
-                retval = rtsx_write_phy_register(chip, 0x07, 0xEF40);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-
-                retval = rtsx_write_phy_register(chip, 0x1E, 0xF8EB);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-
-                retval = rtsx_write_phy_register(chip, 0x19, 0xFE6C);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-
-                wait_timeout(1);
-                retval = rtsx_write_phy_register(chip, 0x0A, 0x05C0);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-
-
-                retval = rtsx_write_cfg_dw(chip, 1, 0x110, 0xFFFF, 0xFFFF);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-
-                retval = rtsx_read_phy_register(chip, 0x08, &val);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-
-                RTSX_DEBUGP("Read from phy 0x08: 0x%04x\n", val);
-
-                if (chip->phy_voltage) {
-                        chip->phy_voltage &= 0x3F;
-                        RTSX_DEBUGP("chip->phy_voltage = 0x%x\n", chip->phy_voltage);
-                        val &= ~0x3F;
-                        val |= chip->phy_voltage;
-                        RTSX_DEBUGP("Write to phy 0x08: 0x%04x\n", val);
-                        retval = rtsx_write_phy_register(chip, 0x08, val);
-                        if (retval != STATUS_SUCCESS)
-                                TRACE_RET(chip, STATUS_FAIL);
-
-                } else {
-                        chip->phy_voltage = (u8)(val & 0x3F);
-                        RTSX_DEBUGP("Default, chip->phy_voltage = 0x%x\n", chip->phy_voltage);
-                }
-        }
-
-        RTSX_WRITE_REG(chip, HOST_SLEEP_STATE, 0x03, 0x00);
-
-        /* Disable card clock */
-        RTSX_WRITE_REG(chip, CARD_CLK_EN, 0x1E, 0);
-
-#ifdef SUPPORT_OCP
-        /* SSC power on, OCD power on */
-        if (CHECK_LUN_MODE(chip, SD_MS_2LUN))
-                RTSX_WRITE_REG(chip, FPDCTL, OC_POWER_DOWN, 0);
-        else
-                RTSX_WRITE_REG(chip, FPDCTL, OC_POWER_DOWN, MS_OC_POWER_DOWN);
-
-        if (CHECK_PID(chip, 0x5209)) {
-                RTSX_WRITE_REG(chip, OCPPARA1, SD_OCP_TIME_MASK | MS_OCP_TIME_MASK,
-                                    SD_OCP_TIME_800 | MS_OCP_TIME_800);
-                RTSX_WRITE_REG(chip, OCPPARA2, SD_OCP_THD_MASK | MS_OCP_THD_MASK,
-                                    chip->sd_400mA_ocp_thd | (chip->ms_ocp_thd << 4));
-                if (CHECK_LUN_MODE(chip, SD_MS_2LUN)) {
-                        RTSX_WRITE_REG(chip, OCPGLITCH, SD_OCP_GLITCH_MASK | MS_OCP_GLITCH_MASK,
-                                       SD_OCP_GLITCH_10000 | MS_OCP_GLITCH_10000);
-                } else {
-                        RTSX_WRITE_REG(chip, OCPGLITCH, SD_OCP_GLITCH_MASK, SD_OCP_GLITCH_10000);
-                }
-                RTSX_WRITE_REG(chip, OCPCTL, 0xFF,
-                                    SD_OCP_INT_EN | SD_DETECT_EN | MS_OCP_INT_EN | MS_DETECT_EN);
-        } else {
-                RTSX_WRITE_REG(chip, OCPPARA1, OCP_TIME_MASK, OCP_TIME_800);
-                RTSX_WRITE_REG(chip, OCPPARA2, OCP_THD_MASK, OCP_THD_244_946);
-                RTSX_WRITE_REG(chip, OCPCTL, 0xFF, CARD_OC_INT_EN | CARD_DETECT_EN);
-        }
-#else
-        /* OC power down */
-        RTSX_WRITE_REG(chip, FPDCTL, OC_POWER_DOWN, OC_POWER_DOWN);
-#endif
-
-        if (!CHECK_PID(chip, 0x5288))
-                RTSX_WRITE_REG(chip, CARD_GPIO_DIR, 0xFF, 0x03);
-
-        /* Turn off LED */
-        RTSX_WRITE_REG(chip, CARD_GPIO, 0xFF, 0x03);
-
-        /* Reset delink mode */
-        RTSX_WRITE_REG(chip, CHANGE_LINK_STATE, 0x0A, 0);
-
-        /* Card driving select */
-        RTSX_WRITE_REG(chip, CARD_DRIVE_SEL, 0xFF, chip->card_drive_sel);
-        if (CHECK_PID(chip, 0x5209))
-                RTSX_WRITE_REG(chip, SD30_DRIVE_SEL, 0x07, chip->sd30_drive_sel_3v3);
-
-#ifdef LED_AUTO_BLINK
-        RTSX_WRITE_REG(chip, CARD_AUTO_BLINK, 0xFF,
-                        LED_BLINK_SPEED | BLINK_EN | LED_GPIO0);
-#endif
-
-        if (chip->asic_code) {
-                /* Enable SSC Clock */
-                RTSX_WRITE_REG(chip, SSC_CTL1, 0xFF, SSC_8X_EN | SSC_SEL_4M);
-                RTSX_WRITE_REG(chip, SSC_CTL2, 0xFF, 0x12);
-        }
-
-        /* Disable cd_pwr_save (u_force_rst_core_en=0, u_cd_rst_core_en=0)
-              0xFE5B
-              bit[1]    u_cd_rst_core_en        rst_value = 0
-              bit[2]    u_force_rst_core_en     rst_value = 0
-              bit[5]    u_mac_phy_rst_n_dbg     rst_value = 1
-              bit[4]    u_non_sticky_rst_n_dbg  rst_value = 0
-        */
-        RTSX_WRITE_REG(chip, CHANGE_LINK_STATE, 0x16, 0x10);
-
-        /* Enable ASPM */
-        if (chip->aspm_l0s_l1_en) {
-                if (chip->dynamic_aspm) {
-                        if (CHK_SDIO_EXIST(chip)) {
-                                if (CHECK_PID(chip, 0x5209)) {
-                                        retval = rtsx_write_cfg_dw(chip, 1, 0xC0, 0xFF, chip->aspm_l0s_l1_en);
-                                        if (retval != STATUS_SUCCESS)
-                                                TRACE_RET(chip, STATUS_FAIL);
-
-                                } else if (CHECK_PID(chip, 0x5288)) {
-                                        retval = rtsx_write_cfg_dw(chip, 2, 0xC0, 0xFF, chip->aspm_l0s_l1_en);
-                                        if (retval != STATUS_SUCCESS)
-                                                TRACE_RET(chip, STATUS_FAIL);
-                                }
-                        }
-                } else {
-                        if (CHECK_PID(chip, 0x5208))
-                                RTSX_WRITE_REG(chip, ASPM_FORCE_CTL, 0xFF, 0x3F);
-
-                        retval = rtsx_write_config_byte(chip, LCTLR, chip->aspm_l0s_l1_en);
-                        if (retval != STATUS_SUCCESS)
-                                TRACE_RET(chip, STATUS_FAIL);
-
-                        chip->aspm_level[0] = chip->aspm_l0s_l1_en;
-                        if (CHK_SDIO_EXIST(chip)) {
-                                chip->aspm_level[1] = chip->aspm_l0s_l1_en;
-                                if (CHECK_PID(chip, 0x5288))
-                                        retval = rtsx_write_cfg_dw(chip, 2, 0xC0, 0xFF, chip->aspm_l0s_l1_en);
-                                else
-                                        retval = rtsx_write_cfg_dw(chip, 1, 0xC0, 0xFF, chip->aspm_l0s_l1_en);
-
-                                if (retval != STATUS_SUCCESS)
-                                        TRACE_RET(chip, STATUS_FAIL);
-
-                        }
-
-                        chip->aspm_enabled = 1;
-                }
-        } else {
-                if (chip->asic_code && CHECK_PID(chip, 0x5208)) {
-                        retval = rtsx_write_phy_register(chip, 0x07, 0x0129);
-                        if (retval != STATUS_SUCCESS)
-                                TRACE_RET(chip, STATUS_FAIL);
-                }
-                retval = rtsx_write_config_byte(chip, LCTLR, chip->aspm_l0s_l1_en);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        retval = rtsx_write_config_byte(chip, 0x81, 1);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        if (CHK_SDIO_EXIST(chip)) {
-                if (CHECK_PID(chip, 0x5288))
-                        retval = rtsx_write_cfg_dw(chip, 2, 0xC0, 0xFF00, 0x0100);
-                else
-                        retval = rtsx_write_cfg_dw(chip, 1, 0xC0, 0xFF00, 0x0100);
-
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-
-        }
-
-        if (CHECK_PID(chip, 0x5209)) {
-                retval = rtsx_write_cfg_dw(chip, 0, 0x70C, 0xFF000000, 0x5B);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        if (CHECK_PID(chip, 0x5288)) {
-                if (!CHK_SDIO_EXIST(chip)) {
-                        retval = rtsx_write_cfg_dw(chip, 2, 0xC0, 0xFFFF, 0x0103);
-                        if (retval != STATUS_SUCCESS)
-                                TRACE_RET(chip, STATUS_FAIL);
-
-                        retval = rtsx_write_cfg_dw(chip, 2, 0x84, 0xFF, 0x03);
-                        if (retval != STATUS_SUCCESS)
-                                TRACE_RET(chip, STATUS_FAIL);
-
-                }
-        }
-
-        RTSX_WRITE_REG(chip, IRQSTAT0, LINK_RDY_INT, LINK_RDY_INT);
-
-        RTSX_WRITE_REG(chip, PERST_GLITCH_WIDTH, 0xFF, 0x80);
-
-        if (CHECK_PID(chip, 0x5209)) {
-                RTSX_WRITE_REG(chip, PWD_SUSPEND_EN, 0xFF, 0xFF);
-                RTSX_WRITE_REG(chip, PWR_GATE_CTRL, PWR_GATE_EN, PWR_GATE_EN);
-        }
-
-        /* Enable PCIE interrupt */
-        if (chip->asic_code) {
-                if (CHECK_PID(chip, 0x5208)) {
-                        if (chip->phy_debug_mode) {
-                                RTSX_WRITE_REG(chip, CDRESUMECTL, 0x77, 0);
-                                rtsx_disable_bus_int(chip);
-                        } else {
-                                rtsx_enable_bus_int(chip);
-                        }
-
-                        if (chip->ic_version >= IC_VER_D) {
-                                u16 reg;
-                                retval = rtsx_read_phy_register(chip, 0x00, &reg);
-                                if (retval != STATUS_SUCCESS)
-                                        TRACE_RET(chip, STATUS_FAIL);
-
-                                reg &= 0xFE7F;
-                                reg |= 0x80;
-                                retval = rtsx_write_phy_register(chip, 0x00, reg);
-                                if (retval != STATUS_SUCCESS)
-                                        TRACE_RET(chip, STATUS_FAIL);
-
-                                retval = rtsx_read_phy_register(chip, 0x1C, &reg);
-                                if (retval != STATUS_SUCCESS)
-                                        TRACE_RET(chip, STATUS_FAIL);
-
-                                reg &= 0xFFF7;
-                                retval = rtsx_write_phy_register(chip, 0x1C, reg);
-                                if (retval != STATUS_SUCCESS)
-                                        TRACE_RET(chip, STATUS_FAIL);
-
-                        }
-
-                        if (chip->driver_first_load && (chip->ic_version < IC_VER_C))
-                                rtsx_calibration(chip);
-
-                } else {
-                        rtsx_enable_bus_int(chip);
-                }
-        } else {
-                rtsx_enable_bus_int(chip);
-        }
-
-#ifdef HW_INT_WRITE_CLR
-        if (CHECK_PID(chip, 0x5209)) {
-                /* Set interrupt write clear */
-                RTSX_WRITE_REG(chip, NFTS_TX_CTRL, 0x02, 0);
-        }
-#endif
-
-        chip->need_reset = 0;
-
-        chip->int_reg = rtsx_readl(chip, RTSX_BIPR);
-#ifdef HW_INT_WRITE_CLR
-        if (CHECK_PID(chip, 0x5209)) {
-                /* Clear interrupt flag */
-                rtsx_writel(chip, RTSX_BIPR, chip->int_reg);
-        }
-#endif
-        if (chip->hw_bypass_sd)
-                goto NextCard;
-        RTSX_DEBUGP("In rtsx_reset_chip, chip->int_reg = 0x%x\n", chip->int_reg);
-        if (chip->int_reg & SD_EXIST) {
-#ifdef HW_AUTO_SWITCH_SD_BUS
-                if (CHECK_PID(chip, 0x5208) && (chip->ic_version < IC_VER_C))
-                        retval = rtsx_pre_handle_sdio_old(chip);
-                else
-                        retval = rtsx_pre_handle_sdio_new(chip);
-
-                RTSX_DEBUGP("chip->need_reset = 0x%x (rtsx_reset_chip)\n", (unsigned int)(chip->need_reset));
-#else  /* HW_AUTO_SWITCH_SD_BUS */
-                retval = rtsx_pre_handle_sdio_old(chip);
-#endif  /* HW_AUTO_SWITCH_SD_BUS */
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-
-        } else {
-                chip->sd_io = 0;
-                RTSX_WRITE_REG(chip, SDIO_CTRL, SDIO_BUS_CTRL | SDIO_CD_CTRL, 0);
-        }
-
-NextCard:
-        if (chip->int_reg & XD_EXIST)
-                chip->need_reset |= XD_CARD;
-        if (chip->int_reg & MS_EXIST)
-                chip->need_reset |= MS_CARD;
-        if (chip->int_reg & CARD_EXIST)
-                RTSX_WRITE_REG(chip, SSC_CTL1, SSC_RSTB, SSC_RSTB);
-
-        RTSX_DEBUGP("In rtsx_init_chip, chip->need_reset = 0x%x\n", (unsigned int)(chip->need_reset));
-
-        RTSX_WRITE_REG(chip, RCCTL, 0x01, 0x00);
-
-        if (CHECK_PID(chip, 0x5208) || CHECK_PID(chip, 0x5288)) {
-                /* Turn off main power when entering S3/S4 state */
-                RTSX_WRITE_REG(chip, MAIN_PWR_OFF_CTL, 0x03, 0x03);
-        }
-
-        if (chip->remote_wakeup_en && !chip->auto_delink_en) {
-                RTSX_WRITE_REG(chip, WAKE_SEL_CTL, 0x07, 0x07);
-                if (chip->aux_pwr_exist)
-                        RTSX_WRITE_REG(chip, PME_FORCE_CTL, 0xFF, 0x33);
-        } else {
-                RTSX_WRITE_REG(chip, WAKE_SEL_CTL, 0x07, 0x04);
-                RTSX_WRITE_REG(chip, PME_FORCE_CTL, 0xFF, 0x30);
-        }
-
-        if (CHECK_PID(chip, 0x5208) && (chip->ic_version >= IC_VER_D)) {
-                RTSX_WRITE_REG(chip, PETXCFG, 0x1C, 0x14);
-        } else if (CHECK_PID(chip, 0x5209)) {
-                if (chip->force_clkreq_0)
-                        RTSX_WRITE_REG(chip, PETXCFG, 0x08, 0x08);
-                else
-                        RTSX_WRITE_REG(chip, PETXCFG, 0x08, 0x00);
-        }
-
-        if (chip->asic_code && CHECK_PID(chip, 0x5208)) {
-                retval = rtsx_clr_phy_reg_bit(chip, 0x1C, 2);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        if (chip->ft2_fast_mode) {
-                RTSX_WRITE_REG(chip, CARD_PWR_CTL, 0xFF, MS_PARTIAL_POWER_ON | SD_PARTIAL_POWER_ON);
-                udelay(chip->pmos_pwr_on_interval);
-                RTSX_WRITE_REG(chip, CARD_PWR_CTL, 0xFF, MS_POWER_ON | SD_POWER_ON);
-
-                wait_timeout(200);
-        }
-
-        /* Reset card */
-        rtsx_reset_detected_cards(chip, 0);
-
-        chip->driver_first_load = 0;
-
-        return STATUS_SUCCESS;
-}
-
-static inline int check_sd_speed_prior(u32 sd_speed_prior)
-{
-        int i, fake_para = 0;
-
-        for (i = 0; i < 4; i++) {
-                u8 tmp = (u8)(sd_speed_prior >> (i*8));
-                if ((tmp < 0x01) || (tmp > 0x04)) {
-                        fake_para = 1;
-                        break;
-                }
-        }
-
-        return !fake_para;
-}
-
-static inline int check_sd_current_prior(u32 sd_current_prior)
-{
-        int i, fake_para = 0;
-
-        for (i = 0; i < 4; i++) {
-                u8 tmp = (u8)(sd_current_prior >> (i*8));
-                if (tmp > 0x03) {
-                        fake_para = 1;
-                        break;
-                }
-        }
-
-        return !fake_para;
-}
-
-static int rts5209_init(struct rtsx_chip *chip)
-{
-        int retval;
-        u32 lval = 0;
-        u8 val = 0;
-
-        val = rtsx_readb(chip, 0x1C);
-        if ((val & 0x10) == 0)
-                chip->asic_code = 1;
-        else
-                chip->asic_code = 0;
-
-        chip->ic_version = val & 0x0F;
-        chip->phy_debug_mode = 0;
-
-        chip->aux_pwr_exist = 0;
-
-        chip->ms_power_class_en = 0x03;
-
-        retval = rtsx_read_cfg_dw(chip, 0, 0x724, &lval);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        RTSX_DEBUGP("dw in 0x724: 0x%x\n", lval);
-        val = (u8)lval;
-        if (!(val & 0x80)) {
-                if (val & 0x08)
-                        chip->lun_mode = DEFAULT_SINGLE;
-                else
-                        chip->lun_mode = SD_MS_2LUN;
-
-                if (val & 0x04)
-                        SET_SDIO_EXIST(chip);
-                else
-                        CLR_SDIO_EXIST(chip);
-
-                if (val & 0x02)
-                        chip->hw_bypass_sd = 0;
-                else
-                        chip->hw_bypass_sd = 1;
-
-        } else {
-                SET_SDIO_EXIST(chip);
-                chip->hw_bypass_sd = 0;
-        }
-
-        if (chip->use_hw_setting) {
-                u8 clk;
-
-                chip->aspm_l0s_l1_en = (val >> 5) & 0x03;
-
-                val = (u8)(lval >> 8);
-
-                clk = (val >> 5) & 0x07;
-                if (clk != 0x07)
-                        chip->asic_sd_sdr50_clk = 98 - clk * 2;
-
-                if (val & 0x10)
-                        chip->auto_delink_en = 1;
-                else
-                        chip->auto_delink_en = 0;
-
-                if (chip->ss_en == 2) {
-                        chip->ss_en = 0;
-                } else {
-                        if (val & 0x08)
-                                chip->ss_en = 1;
-                        else
-                                chip->ss_en = 0;
-                }
-
-                clk = val & 0x07;
-                if (clk != 0x07)
-                        chip->asic_ms_hg_clk = (59 - clk) * 2;
-
-                val = (u8)(lval >> 16);
-
-                clk = (val >> 6) & 0x03;
-                if (clk != 0x03) {
-                        chip->asic_sd_hs_clk = (49 - clk * 2) * 2;
-                        chip->asic_mmc_52m_clk = (49 - clk * 2) * 2;
-                }
-
-                clk = (val >> 4) & 0x03;
-                if (clk != 0x03)
-                        chip->asic_sd_ddr50_clk = (48 - clk * 2) * 2;
-
-                if (val & 0x01)
-                        chip->sdr104_en = 1;
-                else
-                        chip->sdr104_en = 0;
-
-                if (val & 0x02)
-                        chip->ddr50_en = 1;
-                else
-                        chip->ddr50_en = 0;
-
-                if (val & 0x04)
-                        chip->sdr50_en = 1;
-                else
-                        chip->sdr50_en = 0;
-
-
-                val = (u8)(lval >> 24);
-
-                clk = (val >> 5) & 0x07;
-                if (clk != 0x07)
-                        chip->asic_sd_sdr104_clk = 206 - clk * 3;
-
-                if (val & 0x10)
-                        chip->power_down_in_ss = 1;
-                else
-                        chip->power_down_in_ss = 0;
-
-                chip->ms_power_class_en = val & 0x03;
-        }
-
-        if (chip->hp_watch_bios_hotplug && chip->auto_delink_en) {
-                u8 reg58, reg5b;
-
-                retval = rtsx_read_pci_cfg_byte(0x00,
-                                                0x1C, 0x02, 0x58, &reg58);
-                if (retval < 0)
-                        return STATUS_SUCCESS;
-
-                retval = rtsx_read_pci_cfg_byte(0x00,
-                                                0x1C, 0x02, 0x5B, &reg5b);
-                if (retval < 0)
-                        return STATUS_SUCCESS;
-
-                RTSX_DEBUGP("reg58 = 0x%x, reg5b = 0x%x\n", reg58, reg5b);
-
-                if ((reg58 == 0x00) && (reg5b == 0x01))
-                        chip->auto_delink_en = 0;
-
-        }
-
-        return STATUS_SUCCESS;
-}
-
-static int rts5208_init(struct rtsx_chip *chip)
-{
-        int retval;
-        u16 reg = 0;
-        u8 val = 0;
-
-        RTSX_WRITE_REG(chip, CLK_SEL, 0x03, 0x03);
-        RTSX_READ_REG(chip, CLK_SEL, &val);
-        if (val == 0)
-                chip->asic_code = 1;
-        else
-                chip->asic_code = 0;
-
-        if (chip->asic_code) {
-                retval = rtsx_read_phy_register(chip, 0x1C, &reg);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-
-                RTSX_DEBUGP("Value of phy register 0x1C is 0x%x\n", reg);
-                chip->ic_version = (reg >> 4) & 0x07;
-                if (reg & PHY_DEBUG_MODE)
-                        chip->phy_debug_mode = 1;
-                else
-                        chip->phy_debug_mode = 0;
-
-        } else {
-                RTSX_READ_REG(chip, 0xFE80, &val);
-                chip->ic_version = val;
-                chip->phy_debug_mode = 0;
-        }
-
-        RTSX_READ_REG(chip, PDINFO, &val);
-        RTSX_DEBUGP("PDINFO: 0x%x\n", val);
-        if (val & AUX_PWR_DETECTED)
-                chip->aux_pwr_exist = 1;
-        else
-                chip->aux_pwr_exist = 0;
-
-        RTSX_READ_REG(chip, 0xFE50, &val);
-        if (val & 0x01)
-                chip->hw_bypass_sd = 1;
-        else
-                chip->hw_bypass_sd = 0;
-
-        rtsx_read_config_byte(chip, 0x0E, &val);
-        if (val & 0x80)
-                SET_SDIO_EXIST(chip);
-        else
-                CLR_SDIO_EXIST(chip);
-
-        if (chip->use_hw_setting) {
-                RTSX_READ_REG(chip, CHANGE_LINK_STATE, &val);
-                if (val & 0x80)
-                        chip->auto_delink_en = 1;
-                else
-                        chip->auto_delink_en = 0;
-        }
-
-        return STATUS_SUCCESS;
-}
-
-static int rts5288_init(struct rtsx_chip *chip)
-{
-        int retval;
-        u8 val = 0, max_func;
-        u32 lval = 0;
-
-        RTSX_WRITE_REG(chip, CLK_SEL, 0x03, 0x03);
-        RTSX_READ_REG(chip, CLK_SEL, &val);
-        if (val == 0)
-                chip->asic_code = 1;
-        else
-                chip->asic_code = 0;
-
-        chip->ic_version = 0;
-        chip->phy_debug_mode = 0;
-
-        RTSX_READ_REG(chip, PDINFO, &val);
-        RTSX_DEBUGP("PDINFO: 0x%x\n", val);
-        if (val & AUX_PWR_DETECTED)
-                chip->aux_pwr_exist = 1;
-        else
-                chip->aux_pwr_exist = 0;
-
-        RTSX_READ_REG(chip, CARD_SHARE_MODE, &val);
-        RTSX_DEBUGP("CARD_SHARE_MODE: 0x%x\n", val);
-        if (val & 0x04)
-                chip->baro_pkg = QFN;
-        else
-                chip->baro_pkg = LQFP;
-
-        RTSX_READ_REG(chip, 0xFE5A, &val);
-        if (val & 0x10)
-                chip->hw_bypass_sd = 1;
-        else
-                chip->hw_bypass_sd = 0;
-
-        retval = rtsx_read_cfg_dw(chip, 0, 0x718, &lval);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        max_func = (u8)((lval >> 29) & 0x07);
-        RTSX_DEBUGP("Max function number: %d\n", max_func);
-        if (max_func == 0x02)
-                SET_SDIO_EXIST(chip);
-        else
-                CLR_SDIO_EXIST(chip);
-
-        if (chip->use_hw_setting) {
-                RTSX_READ_REG(chip, CHANGE_LINK_STATE, &val);
-                if (val & 0x80)
-                        chip->auto_delink_en = 1;
-                else
-                        chip->auto_delink_en = 0;
-
-                if (CHECK_BARO_PKG(chip, LQFP))
-                        chip->lun_mode = SD_MS_1LUN;
-                else
-                        chip->lun_mode = DEFAULT_SINGLE;
-
-        }
-
-        return STATUS_SUCCESS;
-}
-
-int rtsx_init_chip(struct rtsx_chip *chip)
-{
-        struct sd_info *sd_card = &(chip->sd_card);
-        struct xd_info *xd_card = &(chip->xd_card);
-        struct ms_info *ms_card = &(chip->ms_card);
-        int retval;
-        unsigned int i;
-
-        RTSX_DEBUGP("Vendor ID: 0x%04x, Product ID: 0x%04x\n",
-                     chip->vendor_id, chip->product_id);
-
-        chip->ic_version = 0;
-
-#ifdef _MSG_TRACE
-        chip->msg_idx = 0;
-#endif
-
-        memset(xd_card, 0, sizeof(struct xd_info));
-        memset(sd_card, 0, sizeof(struct sd_info));
-        memset(ms_card, 0, sizeof(struct ms_info));
-
-        chip->xd_reset_counter = 0;
-        chip->sd_reset_counter = 0;
-        chip->ms_reset_counter = 0;
-
-        chip->xd_show_cnt = MAX_SHOW_CNT;
-        chip->sd_show_cnt = MAX_SHOW_CNT;
-        chip->ms_show_cnt = MAX_SHOW_CNT;
-
-        chip->sd_io = 0;
-        chip->auto_delink_cnt = 0;
-        chip->auto_delink_allowed = 1;
-        rtsx_set_stat(chip, RTSX_STAT_INIT);
-
-        chip->aspm_enabled = 0;
-        chip->chip_insert_with_sdio = 0;
-        chip->sdio_aspm = 0;
-        chip->sdio_idle = 0;
-        chip->sdio_counter = 0;
-        chip->cur_card = 0;
-        chip->phy_debug_mode = 0;
-        chip->sdio_func_exist = 0;
-        memset(chip->sdio_raw_data, 0, 12);
-
-        for (i = 0; i < MAX_ALLOWED_LUN_CNT; i++) {
-                set_sense_type(chip, i, SENSE_TYPE_NO_SENSE);
-                chip->rw_fail_cnt[i] = 0;
-        }
-
-        if (!check_sd_speed_prior(chip->sd_speed_prior))
-                chip->sd_speed_prior = 0x01040203;
-
-        RTSX_DEBUGP("sd_speed_prior = 0x%08x\n", chip->sd_speed_prior);
-
-        if (!check_sd_current_prior(chip->sd_current_prior))
-                chip->sd_current_prior = 0x00010203;
-
-        RTSX_DEBUGP("sd_current_prior = 0x%08x\n", chip->sd_current_prior);
-
-        if ((chip->sd_ddr_tx_phase > 31) || (chip->sd_ddr_tx_phase < 0))
-                chip->sd_ddr_tx_phase = 0;
-
-        if ((chip->mmc_ddr_tx_phase > 31) || (chip->mmc_ddr_tx_phase < 0))
-                chip->mmc_ddr_tx_phase = 0;
-
-        RTSX_WRITE_REG(chip, FPDCTL, SSC_POWER_DOWN, 0);
-        wait_timeout(200);
-        RTSX_WRITE_REG(chip, CLK_DIV, 0x07, 0x07);
-        RTSX_DEBUGP("chip->use_hw_setting = %d\n", chip->use_hw_setting);
-
-        if (CHECK_PID(chip, 0x5209)) {
-                retval = rts5209_init(chip);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-
-        } else if (CHECK_PID(chip, 0x5208)) {
-                retval = rts5208_init(chip);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-
-        } else if (CHECK_PID(chip, 0x5288)) {
-                retval = rts5288_init(chip);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-
-        }
-
-        if (chip->ss_en == 2)
-                chip->ss_en = 0;
-
-        RTSX_DEBUGP("chip->asic_code = %d\n", chip->asic_code);
-        RTSX_DEBUGP("chip->ic_version = 0x%x\n", chip->ic_version);
-        RTSX_DEBUGP("chip->phy_debug_mode = %d\n", chip->phy_debug_mode);
-        RTSX_DEBUGP("chip->aux_pwr_exist = %d\n", chip->aux_pwr_exist);
-        RTSX_DEBUGP("chip->sdio_func_exist = %d\n", chip->sdio_func_exist);
-        RTSX_DEBUGP("chip->hw_bypass_sd = %d\n", chip->hw_bypass_sd);
-        RTSX_DEBUGP("chip->aspm_l0s_l1_en = %d\n", chip->aspm_l0s_l1_en);
-        RTSX_DEBUGP("chip->lun_mode = %d\n", chip->lun_mode);
-        RTSX_DEBUGP("chip->auto_delink_en = %d\n", chip->auto_delink_en);
-        RTSX_DEBUGP("chip->ss_en = %d\n", chip->ss_en);
-        RTSX_DEBUGP("chip->baro_pkg = %d\n", chip->baro_pkg);
-
-        if (CHECK_LUN_MODE(chip, SD_MS_2LUN)) {
-                chip->card2lun[SD_CARD] = 0;
-                chip->card2lun[MS_CARD] = 1;
-                chip->card2lun[XD_CARD] = 0xFF;
-                chip->lun2card[0] = SD_CARD;
-                chip->lun2card[1] = MS_CARD;
-                chip->max_lun = 1;
-                SET_SDIO_IGNORED(chip);
-        } else if (CHECK_LUN_MODE(chip, SD_MS_1LUN)) {
-                chip->card2lun[SD_CARD] = 0;
-                chip->card2lun[MS_CARD] = 0;
-                chip->card2lun[XD_CARD] = 0xFF;
-                chip->lun2card[0] = SD_CARD | MS_CARD;
-                chip->max_lun = 0;
-        } else {
-                chip->card2lun[XD_CARD] = 0;
-                chip->card2lun[SD_CARD] = 0;
-                chip->card2lun[MS_CARD] = 0;
-                chip->lun2card[0] = XD_CARD | SD_CARD | MS_CARD;
-                chip->max_lun = 0;
-        }
-
-        retval = rtsx_reset_chip(chip);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        return STATUS_SUCCESS;
-}
-
-void rtsx_release_chip(struct rtsx_chip *chip)
-{
-        xd_free_l2p_tbl(chip);
-        ms_free_l2p_tbl(chip);
-        chip->card_exist = 0;
-        chip->card_ready = 0;
-}
-
-#if !defined(LED_AUTO_BLINK) && defined(REGULAR_BLINK)
-static inline void rtsx_blink_led(struct rtsx_chip *chip)
-{
-        if (chip->card_exist && chip->blink_led) {
-                if (chip->led_toggle_counter < LED_TOGGLE_INTERVAL) {
-                        chip->led_toggle_counter++;
-                } else {
-                        chip->led_toggle_counter = 0;
-                        toggle_gpio(chip, LED_GPIO);
-                }
-        }
-}
-#endif
-
-static void rtsx_monitor_aspm_config(struct rtsx_chip *chip)
-{
-        int maybe_support_aspm, reg_changed;
-        u32 tmp = 0;
-        u8 reg0 = 0, reg1 = 0;
-
-        maybe_support_aspm = 0;
-        reg_changed = 0;
-        rtsx_read_config_byte(chip, LCTLR, &reg0);
-        if (chip->aspm_level[0] != reg0) {
-                reg_changed = 1;
-                chip->aspm_level[0] = reg0;
-        }
-        if (CHK_SDIO_EXIST(chip) && !CHK_SDIO_IGNORED(chip)) {
-                rtsx_read_cfg_dw(chip, 1, 0xC0, &tmp);
-                reg1 = (u8)tmp;
-                if (chip->aspm_level[1] != reg1) {
-                        reg_changed = 1;
-                        chip->aspm_level[1] = reg1;
-                }
-
-                if ((reg0 & 0x03) && (reg1 & 0x03))
-                        maybe_support_aspm = 1;
-
-        } else {
-                if (reg0 & 0x03)
-                        maybe_support_aspm = 1;
-
-        }
-
-        if (reg_changed) {
-                if (maybe_support_aspm)
-                        chip->aspm_l0s_l1_en = 0x03;
-
-                RTSX_DEBUGP("aspm_level[0] = 0x%02x, aspm_level[1] = 0x%02x\n",
-                              chip->aspm_level[0], chip->aspm_level[1]);
-
-                if (chip->aspm_l0s_l1_en) {
-                        chip->aspm_enabled = 1;
-                } else {
-                        chip->aspm_enabled = 0;
-                        chip->sdio_aspm = 0;
-                }
-                rtsx_write_register(chip, ASPM_FORCE_CTL, 0xFF,
-                        0x30 | chip->aspm_level[0] | (chip->aspm_level[1] << 2));
-        }
-}
-
-void rtsx_polling_func(struct rtsx_chip *chip)
-{
-#ifdef SUPPORT_SD_LOCK
-        struct sd_info *sd_card = &(chip->sd_card);
-#endif
-        int ss_allowed;
-
-        if (rtsx_chk_stat(chip, RTSX_STAT_SUSPEND))
-                return;
-
-        if (rtsx_chk_stat(chip, RTSX_STAT_DELINK))
-                goto Delink_Stage;
-
-        if (chip->polling_config) {
-                u8 val;
-                rtsx_read_config_byte(chip, 0, &val);
-        }
-
-        if (rtsx_chk_stat(chip, RTSX_STAT_SS))
-                return;
-
-#ifdef SUPPORT_OCP
-        if (chip->ocp_int) {
-                rtsx_read_register(chip, OCPSTAT, &(chip->ocp_stat));
-
-                if (CHECK_PID(chip, 0x5209) &&
-                                CHECK_LUN_MODE(chip, SD_MS_2LUN)) {
-                        if (chip->ocp_int & SD_OC_INT)
-                                sd_power_off_card3v3(chip);
-                        if (chip->ocp_int & MS_OC_INT)
-                                ms_power_off_card3v3(chip);
-                } else {
-                        if (chip->card_exist & SD_CARD)
-                                sd_power_off_card3v3(chip);
-                        else if (chip->card_exist & MS_CARD)
-                                ms_power_off_card3v3(chip);
-                        else if (chip->card_exist & XD_CARD)
-                                xd_power_off_card3v3(chip);
-
-                }
-
-                chip->ocp_int = 0;
-        }
-#endif
-
-#ifdef SUPPORT_SD_LOCK
-        if (sd_card->sd_erase_status) {
-                if (chip->card_exist & SD_CARD) {
-                        u8 val;
-                        if (CHECK_PID(chip, 0x5209)) {
-                                rtsx_read_register(chip, SD_BUS_STAT, &val);
-                                if (val & SD_DAT0_STATUS) {
-                                        sd_card->sd_erase_status = SD_NOT_ERASE;
-                                        sd_card->sd_lock_notify = 1;
-                                        chip->need_reinit |= SD_CARD;
-                                }
-                        } else {
-                                rtsx_read_register(chip, 0xFD30, &val);
-                                if (val & 0x02) {
-                                        sd_card->sd_erase_status = SD_NOT_ERASE;
-                                        sd_card->sd_lock_notify = 1;
-                                        chip->need_reinit |= SD_CARD;
-                                }
-                        }
-                } else {
-                        sd_card->sd_erase_status = SD_NOT_ERASE;
-                }
-        }
-#endif
-
-        rtsx_init_cards(chip);
-
-        if (chip->ss_en) {
-                ss_allowed = 1;
-
-                if (CHECK_PID(chip, 0x5288)) {
-                        ss_allowed = 0;
-                } else {
-                        if (CHK_SDIO_EXIST(chip) && !CHK_SDIO_IGNORED(chip)) {
-                                u32 val;
-                                rtsx_read_cfg_dw(chip, 1, 0x04, &val);
-                                if (val & 0x07)
-                                        ss_allowed = 0;
-
-                        }
-                }
-        } else {
-                ss_allowed = 0;
-        }
-
-        if (ss_allowed && !chip->sd_io) {
-                if (rtsx_get_stat(chip) != RTSX_STAT_IDLE) {
-                        chip->ss_counter = 0;
-                } else {
-                        if (chip->ss_counter <
-                                (chip->ss_idle_period / POLLING_INTERVAL)) {
-                                chip->ss_counter++;
-                        } else {
-                                rtsx_exclusive_enter_ss(chip);
-                                return;
-                        }
-                }
-        }
-
-        if (CHECK_PID(chip, 0x5208)) {
-                rtsx_monitor_aspm_config(chip);
-
-#ifdef SUPPORT_SDIO_ASPM
-                if (CHK_SDIO_EXIST(chip) && !CHK_SDIO_IGNORED(chip) &&
-                                chip->aspm_l0s_l1_en && chip->dynamic_aspm) {
-                        if (chip->sd_io) {
-                                dynamic_configure_sdio_aspm(chip);
-                        } else {
-                                if (!chip->sdio_aspm) {
-                                        RTSX_DEBUGP("SDIO enter ASPM!\n");
-                                        rtsx_write_register(chip,
-                                                ASPM_FORCE_CTL, 0xFC,
-                                                0x30 | (chip->aspm_level[1] << 2));
-                                        chip->sdio_aspm = 1;
-                                }
-                        }
-                }
-#endif
-        }
-
-        if (chip->idle_counter < IDLE_MAX_COUNT) {
-                chip->idle_counter++;
-        } else {
-                if (rtsx_get_stat(chip) != RTSX_STAT_IDLE) {
-                        RTSX_DEBUGP("Idle state!\n");
-                        rtsx_set_stat(chip, RTSX_STAT_IDLE);
-
-#if !defined(LED_AUTO_BLINK) && defined(REGULAR_BLINK)
-                        chip->led_toggle_counter = 0;
-#endif
-                        rtsx_force_power_on(chip, SSC_PDCTL);
-
-                        turn_off_led(chip, LED_GPIO);
-
-                        if (chip->auto_power_down && !chip->card_ready && !chip->sd_io)
-                                rtsx_force_power_down(chip, SSC_PDCTL | OC_PDCTL);
-
-                }
-        }
-
-        switch (rtsx_get_stat(chip)) {
-        case RTSX_STAT_RUN:
-#if !defined(LED_AUTO_BLINK) && defined(REGULAR_BLINK)
-                rtsx_blink_led(chip);
-#endif
-                do_remaining_work(chip);
-                break;
-
-        case RTSX_STAT_IDLE:
-                if (chip->sd_io && !chip->sd_int)
-                        try_to_switch_sdio_ctrl(chip);
-
-                rtsx_enable_aspm(chip);
-                break;
-
-        default:
-                break;
-        }
-
-
-#ifdef SUPPORT_OCP
-        if (CHECK_LUN_MODE(chip, SD_MS_2LUN)) {
-#ifdef CONFIG_RTS_PSTOR_DEBUG
-                if (chip->ocp_stat & (SD_OC_NOW | SD_OC_EVER | MS_OC_NOW | MS_OC_EVER))
-                        RTSX_DEBUGP("Over current, OCPSTAT is 0x%x\n", chip->ocp_stat);
-#endif
-
-                if (chip->ocp_stat & (SD_OC_NOW | SD_OC_EVER)) {
-                        if (chip->card_exist & SD_CARD) {
-                                rtsx_write_register(chip, CARD_OE, SD_OUTPUT_EN, 0);
-                                card_power_off(chip, SD_CARD);
-                                chip->card_fail |= SD_CARD;
-                        }
-                }
-                if (chip->ocp_stat & (MS_OC_NOW | MS_OC_EVER)) {
-                        if (chip->card_exist & MS_CARD) {
-                                rtsx_write_register(chip, CARD_OE, MS_OUTPUT_EN, 0);
-                                card_power_off(chip, MS_CARD);
-                                chip->card_fail |= MS_CARD;
-                        }
-                }
-        } else {
-                if (chip->ocp_stat & (SD_OC_NOW | SD_OC_EVER)) {
-                        RTSX_DEBUGP("Over current, OCPSTAT is 0x%x\n", chip->ocp_stat);
-                        if (chip->card_exist & SD_CARD) {
-                                rtsx_write_register(chip, CARD_OE, SD_OUTPUT_EN, 0);
-                                chip->card_fail |= SD_CARD;
-                        } else if (chip->card_exist & MS_CARD) {
-                                rtsx_write_register(chip, CARD_OE, MS_OUTPUT_EN, 0);
-                                chip->card_fail |= MS_CARD;
-                        } else if (chip->card_exist & XD_CARD) {
-                                rtsx_write_register(chip, CARD_OE, XD_OUTPUT_EN, 0);
-                                chip->card_fail |= XD_CARD;
-                        }
-                        card_power_off(chip, SD_CARD);
-                }
-        }
-#endif
-
-Delink_Stage:
-        if (chip->auto_delink_en && chip->auto_delink_allowed &&
-                        !chip->card_ready && !chip->card_ejected && !chip->sd_io) {
-                int enter_L1 = chip->auto_delink_in_L1 && (chip->aspm_l0s_l1_en || chip->ss_en);
-                int delink_stage1_cnt = chip->delink_stage1_step;
-                int delink_stage2_cnt = delink_stage1_cnt + chip->delink_stage2_step;
-                int delink_stage3_cnt = delink_stage2_cnt + chip->delink_stage3_step;
-
-                if (chip->auto_delink_cnt <= delink_stage3_cnt) {
-                        if (chip->auto_delink_cnt == delink_stage1_cnt) {
-                                rtsx_set_stat(chip, RTSX_STAT_DELINK);
-
-                                if (chip->asic_code && CHECK_PID(chip, 0x5208))
-                                        rtsx_set_phy_reg_bit(chip, 0x1C, 2);
-
-                                if (chip->card_exist) {
-                                        RTSX_DEBUGP("False card inserted, do force delink\n");
-
-                                        if (enter_L1)
-                                                rtsx_write_register(chip, HOST_SLEEP_STATE, 0x03, 1);
-
-                                        rtsx_write_register(chip, CHANGE_LINK_STATE, 0x0A, 0x0A);
-
-                                        if (enter_L1)
-                                                rtsx_enter_L1(chip);
-
-                                        chip->auto_delink_cnt = delink_stage3_cnt + 1;
-                                } else {
-                                        RTSX_DEBUGP("No card inserted, do delink\n");
-
-                                        if (enter_L1)
-                                                rtsx_write_register(chip, HOST_SLEEP_STATE, 0x03, 1);
-
-#ifdef HW_INT_WRITE_CLR
-                                        if (CHECK_PID(chip, 0x5209)) {
-                                                rtsx_writel(chip, RTSX_BIPR, 0xFFFFFFFF);
-                                                RTSX_DEBUGP("RTSX_BIPR: 0x%x\n", rtsx_readl(chip, RTSX_BIPR));
-                                        }
-#endif
-                                        rtsx_write_register(chip, CHANGE_LINK_STATE, 0x02, 0x02);
-
-                                        if (enter_L1)
-                                                rtsx_enter_L1(chip);
-
-                                }
-                        }
-
-                        if (chip->auto_delink_cnt == delink_stage2_cnt) {
-                                RTSX_DEBUGP("Try to do force delink\n");
-
-                                if (enter_L1)
-                                        rtsx_exit_L1(chip);
-
-                                if (chip->asic_code && CHECK_PID(chip, 0x5208))
-                                        rtsx_set_phy_reg_bit(chip, 0x1C, 2);
-
-                                rtsx_write_register(chip, CHANGE_LINK_STATE, 0x0A, 0x0A);
-                        }
-
-                        chip->auto_delink_cnt++;
-                }
-        } else {
-                chip->auto_delink_cnt = 0;
-        }
-}
-
-void rtsx_undo_delink(struct rtsx_chip *chip)
-{
-        chip->auto_delink_allowed = 0;
-        rtsx_write_register(chip, CHANGE_LINK_STATE, 0x0A, 0x00);
-}
-
-/**
- * rtsx_stop_cmd - stop command transfer and DMA transfer
- * @chip: Realtek's card reader chip
- * @card: flash card type
- *
- * Stop command transfer and DMA transfer.
- * This function is called in error handler.
- */
-void rtsx_stop_cmd(struct rtsx_chip *chip, int card)
-{
-        int i;
-
-        for (i = 0; i <= 8; i++) {
-                int addr = RTSX_HCBAR + i * 4;
-                u32 reg;
-                reg = rtsx_readl(chip, addr);
-                RTSX_DEBUGP("BAR (0x%02x): 0x%08x\n", addr, reg);
-        }
-        rtsx_writel(chip, RTSX_HCBCTLR, STOP_CMD);
-        rtsx_writel(chip, RTSX_HDBCTLR, STOP_DMA);
-
-        for (i = 0; i < 16; i++) {
-                u16 addr = 0xFE20 + (u16)i;
-                u8 val;
-                rtsx_read_register(chip, addr, &val);
-                RTSX_DEBUGP("0x%04X: 0x%02x\n", addr, val);
-        }
-
-        rtsx_write_register(chip, DMACTL, 0x80, 0x80);
-        rtsx_write_register(chip, RBCTL, 0x80, 0x80);
-}
-
-#define MAX_RW_REG_CNT          1024
-
-int rtsx_write_register(struct rtsx_chip *chip, u16 addr, u8 mask, u8 data)
-{
-        int i;
-        u32 val = 3 << 30;
-
-        val |= (u32)(addr & 0x3FFF) << 16;
-        val |= (u32)mask << 8;
-        val |= (u32)data;
-
-        rtsx_writel(chip, RTSX_HAIMR, val);
-
-        for (i = 0; i < MAX_RW_REG_CNT; i++) {
-                val = rtsx_readl(chip, RTSX_HAIMR);
-                if ((val & (1 << 31)) == 0) {
-                        if (data != (u8)val)
-                                TRACE_RET(chip, STATUS_FAIL);
-
-                        return STATUS_SUCCESS;
-                }
-        }
-
-        TRACE_RET(chip, STATUS_TIMEDOUT);
-}
-
-int rtsx_read_register(struct rtsx_chip *chip, u16 addr, u8 *data)
-{
-        u32 val = 2 << 30;
-        int i;
-
-        if (data)
-                *data = 0;
-
-        val |= (u32)(addr & 0x3FFF) << 16;
-
-        rtsx_writel(chip, RTSX_HAIMR, val);
-
-        for (i = 0; i < MAX_RW_REG_CNT; i++) {
-                val = rtsx_readl(chip, RTSX_HAIMR);
-                if ((val & (1 << 31)) == 0)
-                        break;
-        }
-
-        if (i >= MAX_RW_REG_CNT)
-                TRACE_RET(chip, STATUS_TIMEDOUT);
-
-        if (data)
-                *data = (u8)(val & 0xFF);
-
-        return STATUS_SUCCESS;
-}
-
-int rtsx_write_cfg_dw(struct rtsx_chip *chip, u8 func_no, u16 addr, u32 mask, u32 val)
-{
-        u8 mode = 0, tmp;
-        int i;
-
-        for (i = 0; i < 4; i++) {
-                if (mask & 0xFF) {
-                        RTSX_WRITE_REG(chip, CFGDATA0 + i,
-                                       0xFF, (u8)(val & mask & 0xFF));
-                        mode |= (1 << i);
-                }
-                mask >>= 8;
-                val >>= 8;
-        }
-
-        if (mode) {
-                RTSX_WRITE_REG(chip, CFGADDR0, 0xFF, (u8)addr);
-                RTSX_WRITE_REG(chip, CFGADDR1, 0xFF, (u8)(addr >> 8));
-
-                RTSX_WRITE_REG(chip, CFGRWCTL, 0xFF,
-                               0x80 | mode | ((func_no & 0x03) << 4));
-
-                for (i = 0; i < MAX_RW_REG_CNT; i++) {
-                        RTSX_READ_REG(chip, CFGRWCTL, &tmp);
-                        if ((tmp & 0x80) == 0)
-                                break;
-                }
-        }
-
-        return STATUS_SUCCESS;
-}
-
-int rtsx_read_cfg_dw(struct rtsx_chip *chip, u8 func_no, u16 addr, u32 *val)
-{
-        int i;
-        u8 tmp;
-        u32 data = 0;
-
-        RTSX_WRITE_REG(chip, CFGADDR0, 0xFF, (u8)addr);
-        RTSX_WRITE_REG(chip, CFGADDR1, 0xFF, (u8)(addr >> 8));
-        RTSX_WRITE_REG(chip, CFGRWCTL, 0xFF, 0x80 | ((func_no & 0x03) << 4));
-
-        for (i = 0; i < MAX_RW_REG_CNT; i++) {
-                RTSX_READ_REG(chip, CFGRWCTL, &tmp);
-                if ((tmp & 0x80) == 0)
-                        break;
-        }
-
-        for (i = 0; i < 4; i++) {
-                RTSX_READ_REG(chip, CFGDATA0 + i, &tmp);
-                data |= (u32)tmp << (i * 8);
-        }
-
-        if (val)
-                *val = data;
-
-        return STATUS_SUCCESS;
-}
-
-int rtsx_write_cfg_seq(struct rtsx_chip *chip, u8 func, u16 addr, u8 *buf, int len)
-{
-        u32 *data, *mask;
-        u16 offset = addr % 4;
-        u16 aligned_addr = addr - offset;
-        int dw_len, i, j;
-        int retval;
-
-        RTSX_DEBUGP("%s\n", __func__);
-
-        if (!buf)
-                TRACE_RET(chip, STATUS_NOMEM);
-
-        if ((len + offset) % 4)
-                dw_len = (len + offset) / 4 + 1;
-        else
-                dw_len = (len + offset) / 4;
-
-        RTSX_DEBUGP("dw_len = %d\n", dw_len);
-
-        data = vzalloc(dw_len * 4);
-        if (!data)
-                TRACE_RET(chip, STATUS_NOMEM);
-
-        mask = vzalloc(dw_len * 4);
-        if (!mask) {
-                vfree(data);
-                TRACE_RET(chip, STATUS_NOMEM);
-        }
-
-        j = 0;
-        for (i = 0; i < len; i++) {
-                mask[j] |= 0xFF << (offset * 8);
-                data[j] |= buf[i] << (offset * 8);
-                if (++offset == 4) {
-                        j++;
-                        offset = 0;
-                }
-        }
-
-        RTSX_DUMP(mask, dw_len * 4);
-        RTSX_DUMP(data, dw_len * 4);
-
-        for (i = 0; i < dw_len; i++) {
-                retval = rtsx_write_cfg_dw(chip, func, aligned_addr + i * 4, mask[i], data[i]);
-                if (retval != STATUS_SUCCESS) {
-                        vfree(data);
-                        vfree(mask);
-                        TRACE_RET(chip, STATUS_FAIL);
-                }
-        }
-
-        vfree(data);
-        vfree(mask);
-
-        return STATUS_SUCCESS;
-}
-
-int rtsx_read_cfg_seq(struct rtsx_chip *chip, u8 func, u16 addr, u8 *buf, int len)
-{
-        u32 *data;
-        u16 offset = addr % 4;
-        u16 aligned_addr = addr - offset;
-        int dw_len, i, j;
-        int retval;
-
-        RTSX_DEBUGP("%s\n", __func__);
-
-        if ((len + offset) % 4)
-                dw_len = (len + offset) / 4 + 1;
-        else
-                dw_len = (len + offset) / 4;
-
-        RTSX_DEBUGP("dw_len = %d\n", dw_len);
-
-        data = (u32 *)vmalloc(dw_len * 4);
-        if (!data)
-                TRACE_RET(chip, STATUS_NOMEM);
-
-        for (i = 0; i < dw_len; i++) {
-                retval = rtsx_read_cfg_dw(chip, func, aligned_addr + i * 4, data + i);
-                if (retval != STATUS_SUCCESS) {
-                        vfree(data);
-                        TRACE_RET(chip, STATUS_FAIL);
-                }
-        }
-
-        if (buf) {
-                j = 0;
-
-                for (i = 0; i < len; i++) {
-                        buf[i] = (u8)(data[j] >> (offset * 8));
-                        if (++offset == 4) {
-                                j++;
-                                offset = 0;
-                        }
-                }
-        }
-
-        vfree(data);
-
-        return STATUS_SUCCESS;
-}
-
-int rtsx_write_phy_register(struct rtsx_chip *chip, u8 addr, u16 val)
-{
-        int i, finished = 0;
-        u8 tmp;
-
-        RTSX_WRITE_REG(chip, PHYDATA0, 0xFF, (u8)val);
-        RTSX_WRITE_REG(chip, PHYDATA1, 0xFF, (u8)(val >> 8));
-        RTSX_WRITE_REG(chip, PHYADDR, 0xFF, addr);
-        RTSX_WRITE_REG(chip, PHYRWCTL, 0xFF, 0x81);
-
-        for (i = 0; i < 100000; i++) {
-                RTSX_READ_REG(chip, PHYRWCTL, &tmp);
-                if (!(tmp & 0x80)) {
-                        finished = 1;
-                        break;
-                }
-        }
-
-        if (!finished)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        return STATUS_SUCCESS;
-}
-
-int rtsx_read_phy_register(struct rtsx_chip *chip, u8 addr, u16 *val)
-{
-        int i, finished = 0;
-        u16 data = 0;
-        u8 tmp;
-
-        RTSX_WRITE_REG(chip, PHYADDR, 0xFF, addr);
-        RTSX_WRITE_REG(chip, PHYRWCTL, 0xFF, 0x80);
-
-        for (i = 0; i < 100000; i++) {
-                RTSX_READ_REG(chip, PHYRWCTL, &tmp);
-                if (!(tmp & 0x80)) {
-                        finished = 1;
-                        break;
-                }
-        }
-
-        if (!finished)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        RTSX_READ_REG(chip, PHYDATA0, &tmp);
-        data = tmp;
-        RTSX_READ_REG(chip, PHYDATA1, &tmp);
-        data |= (u16)tmp << 8;
-
-        if (val)
-                *val = data;
-
-        return STATUS_SUCCESS;
-}
-
-int rtsx_read_efuse(struct rtsx_chip *chip, u8 addr, u8 *val)
-{
-        int i;
-        u8 data = 0;
-
-        RTSX_WRITE_REG(chip, EFUSE_CTRL, 0xFF, 0x80|addr);
-
-        for (i = 0; i < 100; i++) {
-                RTSX_READ_REG(chip, EFUSE_CTRL, &data);
-                if (!(data & 0x80))
-                        break;
-                udelay(1);
-        }
-
-        if (data & 0x80)
-                TRACE_RET(chip, STATUS_TIMEDOUT);
-
-        RTSX_READ_REG(chip, EFUSE_DATA, &data);
-        if (val)
-                *val = data;
-
-        return STATUS_SUCCESS;
-}
-
-int rtsx_write_efuse(struct rtsx_chip *chip, u8 addr, u8 val)
-{
-        int i, j;
-        u8 data = 0, tmp = 0xFF;
-
-        for (i = 0; i < 8; i++) {
-                if (val & (u8)(1 << i))
-                        continue;
-
-                tmp &= (~(u8)(1 << i));
-                RTSX_DEBUGP("Write 0x%x to 0x%x\n", tmp, addr);
-
-                RTSX_WRITE_REG(chip, EFUSE_DATA, 0xFF, tmp);
-                RTSX_WRITE_REG(chip, EFUSE_CTRL, 0xFF, 0xA0|addr);
-
-                for (j = 0; j < 100; j++) {
-                        RTSX_READ_REG(chip, EFUSE_CTRL, &data);
-                        if (!(data & 0x80))
-                                break;
-                        wait_timeout(3);
-                }
-
-                if (data & 0x80)
-                        TRACE_RET(chip, STATUS_TIMEDOUT);
-
-                wait_timeout(5);
-        }
-
-        return STATUS_SUCCESS;
-}
-
-int rtsx_clr_phy_reg_bit(struct rtsx_chip *chip, u8 reg, u8 bit)
-{
-        int retval;
-        u16 value;
-
-        retval = rtsx_read_phy_register(chip, reg, &value);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        if (value & (1 << bit)) {
-                value &= ~(1 << bit);
-                retval = rtsx_write_phy_register(chip, reg, value);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        return STATUS_SUCCESS;
-}
-
-int rtsx_set_phy_reg_bit(struct rtsx_chip *chip, u8 reg, u8 bit)
-{
-        int retval;
-        u16 value;
-
-        retval = rtsx_read_phy_register(chip, reg, &value);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        if (0 == (value & (1 << bit))) {
-                value |= (1 << bit);
-                retval = rtsx_write_phy_register(chip, reg, value);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        return STATUS_SUCCESS;
-}
-
-int rtsx_check_link_ready(struct rtsx_chip *chip)
-{
-        u8 val;
-
-        RTSX_READ_REG(chip, IRQSTAT0, &val);
-
-        RTSX_DEBUGP("IRQSTAT0: 0x%x\n", val);
-        if (val & LINK_RDY_INT) {
-                RTSX_DEBUGP("Delinked!\n");
-                rtsx_write_register(chip, IRQSTAT0, LINK_RDY_INT, LINK_RDY_INT);
-                return STATUS_FAIL;
-        }
-
-        return STATUS_SUCCESS;
-}
-
-static void rtsx_handle_pm_dstate(struct rtsx_chip *chip, u8 dstate)
-{
-        u32 ultmp;
-
-        RTSX_DEBUGP("%04x set pm_dstate to %d\n", chip->product_id, dstate);
-
-        if (CHK_SDIO_EXIST(chip)) {
-                u8 func_no;
-
-                if (CHECK_PID(chip, 0x5288))
-                        func_no = 2;
-                else
-                        func_no = 1;
-
-                rtsx_read_cfg_dw(chip, func_no, 0x84, &ultmp);
-                RTSX_DEBUGP("pm_dstate of function %d: 0x%x\n", (int)func_no, ultmp);
-                rtsx_write_cfg_dw(chip, func_no, 0x84, 0xFF, dstate);
-        }
-
-        rtsx_write_config_byte(chip, 0x44, dstate);
-        rtsx_write_config_byte(chip, 0x45, 0);
-}
-
-void rtsx_enter_L1(struct rtsx_chip *chip)
-{
-        rtsx_handle_pm_dstate(chip, 2);
-}
-
-void rtsx_exit_L1(struct rtsx_chip *chip)
-{
-        rtsx_write_config_byte(chip, 0x44, 0);
-        rtsx_write_config_byte(chip, 0x45, 0);
-}
-
-void rtsx_enter_ss(struct rtsx_chip *chip)
-{
-        RTSX_DEBUGP("Enter Selective Suspend State!\n");
-
-        rtsx_write_register(chip, IRQSTAT0, LINK_RDY_INT, LINK_RDY_INT);
-
-        if (chip->power_down_in_ss) {
-                rtsx_power_off_card(chip);
-                rtsx_force_power_down(chip, SSC_PDCTL | OC_PDCTL);
-        }
-
-        if (CHK_SDIO_EXIST(chip)) {
-                if (CHECK_PID(chip, 0x5288))
-                        rtsx_write_cfg_dw(chip, 2, 0xC0, 0xFF00, 0x0100);
-                else
-                        rtsx_write_cfg_dw(chip, 1, 0xC0, 0xFF00, 0x0100);
-        }
-
-        if (chip->auto_delink_en) {
-                rtsx_write_register(chip, HOST_SLEEP_STATE, 0x01, 0x01);
-        } else {
-                if (!chip->phy_debug_mode) {
-                        u32 tmp;
-                        tmp = rtsx_readl(chip, RTSX_BIER);
-                        tmp |= CARD_INT;
-                        rtsx_writel(chip, RTSX_BIER, tmp);
-                }
-
-                rtsx_write_register(chip, CHANGE_LINK_STATE, 0x02, 0);
-        }
-
-        rtsx_enter_L1(chip);
-
-        RTSX_CLR_DELINK(chip);
-        rtsx_set_stat(chip, RTSX_STAT_SS);
-}
-
-void rtsx_exit_ss(struct rtsx_chip *chip)
-{
-        RTSX_DEBUGP("Exit Selective Suspend State!\n");
-
-        rtsx_exit_L1(chip);
-
-        if (chip->power_down_in_ss) {
-                rtsx_force_power_on(chip, SSC_PDCTL | OC_PDCTL);
-                udelay(1000);
-        }
-
-        if (RTSX_TST_DELINK(chip)) {
-                chip->need_reinit = SD_CARD | MS_CARD | XD_CARD;
-                rtsx_reinit_cards(chip, 1);
-                RTSX_CLR_DELINK(chip);
-        } else if (chip->power_down_in_ss) {
-                chip->need_reinit = SD_CARD | MS_CARD | XD_CARD;
-                rtsx_reinit_cards(chip, 0);
-        }
-}
-
-int rtsx_pre_handle_interrupt(struct rtsx_chip *chip)
-{
-        u32 status, int_enable;
-        int exit_ss = 0;
-#ifdef SUPPORT_OCP
-        u32 ocp_int = 0;
-
-        if (CHECK_PID(chip, 0x5209)) {
-                if (CHECK_LUN_MODE(chip, SD_MS_2LUN))
-                        ocp_int = MS_OC_INT | SD_OC_INT;
-                else
-                        ocp_int = SD_OC_INT;
-
-        } else {
-                ocp_int = OC_INT;
-        }
-#endif
-
-        if (chip->ss_en) {
-                chip->ss_counter = 0;
-                if (rtsx_get_stat(chip) == RTSX_STAT_SS) {
-                        exit_ss = 1;
-                        rtsx_exit_L1(chip);
-                        rtsx_set_stat(chip, RTSX_STAT_RUN);
-                }
-        }
-
-        int_enable = rtsx_readl(chip, RTSX_BIER);
-        chip->int_reg = rtsx_readl(chip, RTSX_BIPR);
-
-#ifdef HW_INT_WRITE_CLR
-        if (CHECK_PID(chip, 0x5209))
-                rtsx_writel(chip, RTSX_BIPR, chip->int_reg);
-#endif
-
-        if (((chip->int_reg & int_enable) == 0) || (chip->int_reg == 0xFFFFFFFF))
-                return STATUS_FAIL;
-
-        if (!chip->msi_en) {
-                if (CHECK_PID(chip, 0x5209)) {
-                        u8 val;
-                        rtsx_read_config_byte(chip, 0x05, &val);
-                        if (val & 0x04)
-                                return STATUS_FAIL;
-                }
-        }
-
-        status = chip->int_reg &= (int_enable | 0x7FFFFF);
-
-        if (status & CARD_INT) {
-                chip->auto_delink_cnt = 0;
-
-                if (status & SD_INT) {
-                        if (status & SD_EXIST) {
-                                set_bit(SD_NR, &(chip->need_reset));
-                        } else {
-                                set_bit(SD_NR, &(chip->need_release));
-                                chip->sd_reset_counter = 0;
-                                chip->sd_show_cnt = 0;
-                                clear_bit(SD_NR, &(chip->need_reset));
-                        }
-                } else {
-                        /* If multi-luns, it's possible that
-                           when plugging/unplugging one card
-                           there is another card which still
-                           exists in the slot. In this case,
-                           all existed cards should be reset.
-                        */
-                        if (exit_ss && (status & SD_EXIST))
-                                set_bit(SD_NR, &(chip->need_reinit));
-                }
-                if (!CHECK_PID(chip, 0x5288) || CHECK_BARO_PKG(chip, QFN)) {
-                        if (status & XD_INT) {
-                                if (status & XD_EXIST) {
-                                        set_bit(XD_NR, &(chip->need_reset));
-                                } else {
-                                        set_bit(XD_NR, &(chip->need_release));
-                                        chip->xd_reset_counter = 0;
-                                        chip->xd_show_cnt = 0;
-                                        clear_bit(XD_NR, &(chip->need_reset));
-                                }
-                        } else {
-                                if (exit_ss && (status & XD_EXIST))
-                                        set_bit(XD_NR, &(chip->need_reinit));
-                        }
-                }
-                if (status & MS_INT) {
-                        if (status & MS_EXIST) {
-                                set_bit(MS_NR, &(chip->need_reset));
-                        } else {
-                                set_bit(MS_NR, &(chip->need_release));
-                                chip->ms_reset_counter = 0;
-                                chip->ms_show_cnt = 0;
-                                clear_bit(MS_NR, &(chip->need_reset));
-                        }
-                } else {
-                        if (exit_ss && (status & MS_EXIST))
-                                set_bit(MS_NR, &(chip->need_reinit));
-                }
-        }
-
-#ifdef SUPPORT_OCP
-        chip->ocp_int = ocp_int & status;
-#endif
-
-        if (chip->sd_io) {
-                if (chip->int_reg & DATA_DONE_INT)
-                        chip->int_reg &= ~(u32)DATA_DONE_INT;
-        }
-
-        return STATUS_SUCCESS;
-}
-
-void rtsx_do_before_power_down(struct rtsx_chip *chip, int pm_stat)
-{
-        int retval;
-
-        RTSX_DEBUGP("rtsx_do_before_power_down, pm_stat = %d\n", pm_stat);
-
-        rtsx_set_stat(chip, RTSX_STAT_SUSPEND);
-
-        retval = rtsx_force_power_on(chip, SSC_PDCTL);
-        if (retval != STATUS_SUCCESS)
-                return;
-
-        rtsx_release_cards(chip);
-        rtsx_disable_bus_int(chip);
-        turn_off_led(chip, LED_GPIO);
-
-#ifdef HW_AUTO_SWITCH_SD_BUS
-        if (chip->sd_io) {
-                chip->sdio_in_charge = 1;
-                if (CHECK_PID(chip, 0x5208)) {
-                        rtsx_write_register(chip, TLPTISTAT, 0x08, 0x08);
-                        /* Enable sdio_bus_auto_switch */
-                        rtsx_write_register(chip, 0xFE70, 0x80, 0x80);
-                } else if (CHECK_PID(chip, 0x5288)) {
-                        rtsx_write_register(chip, TLPTISTAT, 0x08, 0x08);
-                        /* Enable sdio_bus_auto_switch */
-                        rtsx_write_register(chip, 0xFE5A, 0x08, 0x08);
-                } else if (CHECK_PID(chip, 0x5209)) {
-                        rtsx_write_register(chip, TLPTISTAT, 0x10, 0x10);
-                        /* Enable sdio_bus_auto_switch */
-                        rtsx_write_register(chip, SDIO_CFG, SDIO_BUS_AUTO_SWITCH, SDIO_BUS_AUTO_SWITCH);
-                }
-        }
-#endif
-
-        if (CHECK_PID(chip, 0x5208) && (chip->ic_version >= IC_VER_D)) {
-                /* u_force_clkreq_0 */
-                rtsx_write_register(chip, PETXCFG, 0x08, 0x08);
-        } else if (CHECK_PID(chip, 0x5209)) {
-                /* u_force_clkreq_0 */
-                rtsx_write_register(chip, PETXCFG, 0x08, 0x08);
-        }
-
-        if (pm_stat == PM_S1) {
-                RTSX_DEBUGP("Host enter S1\n");
-                rtsx_write_register(chip, HOST_SLEEP_STATE, 0x03, HOST_ENTER_S1);
-        } else if (pm_stat == PM_S3) {
-                if (chip->s3_pwr_off_delay > 0)
-                        wait_timeout(chip->s3_pwr_off_delay);
-
-                RTSX_DEBUGP("Host enter S3\n");
-                rtsx_write_register(chip, HOST_SLEEP_STATE, 0x03, HOST_ENTER_S3);
-        }
-
-        if (chip->do_delink_before_power_down && chip->auto_delink_en)
-                rtsx_write_register(chip, CHANGE_LINK_STATE, 0x02, 2);
-
-        rtsx_force_power_down(chip, SSC_PDCTL | OC_PDCTL);
-
-        chip->cur_clk = 0;
-        chip->cur_card = 0;
-        chip->card_exist = 0;
-}
-
-void rtsx_enable_aspm(struct rtsx_chip *chip)
-{
-        if (chip->aspm_l0s_l1_en && chip->dynamic_aspm) {
-                if (!chip->aspm_enabled) {
-                        RTSX_DEBUGP("Try to enable ASPM\n");
-                        chip->aspm_enabled = 1;
-
-                        if (chip->asic_code && CHECK_PID(chip, 0x5208))
-                                rtsx_write_phy_register(chip, 0x07, 0);
-                        if (CHECK_PID(chip, 0x5208)) {
-                                rtsx_write_register(chip, ASPM_FORCE_CTL, 0xF3,
-                                        0x30 | chip->aspm_level[0]);
-                        } else {
-                                rtsx_write_config_byte(chip, LCTLR, chip->aspm_l0s_l1_en);
-                        }
-
-                        if (CHK_SDIO_EXIST(chip)) {
-                                u16 val = chip->aspm_l0s_l1_en | 0x0100;
-                                if (CHECK_PID(chip, 0x5288))
-                                        rtsx_write_cfg_dw(chip, 2, 0xC0, 0xFFFF, val);
-                                else
-                                        rtsx_write_cfg_dw(chip, 1, 0xC0, 0xFFFF, val);
-                        }
-                }
-        }
-
-        return;
-}
-
-void rtsx_disable_aspm(struct rtsx_chip *chip)
-{
-        if (CHECK_PID(chip, 0x5208))
-                rtsx_monitor_aspm_config(chip);
-
-        if (chip->aspm_l0s_l1_en && chip->dynamic_aspm) {
-                if (chip->aspm_enabled) {
-                        RTSX_DEBUGP("Try to disable ASPM\n");
-                        chip->aspm_enabled = 0;
-
-                        if (chip->asic_code && CHECK_PID(chip, 0x5208))
-                                rtsx_write_phy_register(chip, 0x07, 0x0129);
-                        if (CHECK_PID(chip, 0x5208))
-                                rtsx_write_register(chip, ASPM_FORCE_CTL, 0xF3, 0x30);
-                        else
-                                rtsx_write_config_byte(chip, LCTLR, 0x00);
-
-                        wait_timeout(1);
-                }
-        }
-
-        return;
-}
-
-int rtsx_read_ppbuf(struct rtsx_chip *chip, u8 *buf, int buf_len)
-{
-        int retval;
-        int i, j;
-        u16 reg_addr;
-        u8 *ptr;
-
-        if (!buf)
-                TRACE_RET(chip, STATUS_ERROR);
-
-        ptr = buf;
-        reg_addr = PPBUF_BASE2;
-        for (i = 0; i < buf_len/256; i++) {
-                rtsx_init_cmd(chip);
-
-                for (j = 0; j < 256; j++)
-                        rtsx_add_cmd(chip, READ_REG_CMD, reg_addr++, 0, 0);
-
-                retval = rtsx_send_cmd(chip, 0, 250);
-                if (retval < 0)
-                        TRACE_RET(chip, STATUS_FAIL);
-
-                memcpy(ptr, rtsx_get_cmd_data(chip), 256);
-                ptr += 256;
-        }
-
-        if (buf_len%256) {
-                rtsx_init_cmd(chip);
-
-                for (j = 0; j < buf_len%256; j++)
-                        rtsx_add_cmd(chip, READ_REG_CMD, reg_addr++, 0, 0);
-
-                retval = rtsx_send_cmd(chip, 0, 250);
-                if (retval < 0)
-                        TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        memcpy(ptr, rtsx_get_cmd_data(chip), buf_len%256);
-
-        return STATUS_SUCCESS;
-}
-
-int rtsx_write_ppbuf(struct rtsx_chip *chip, u8 *buf, int buf_len)
-{
-        int retval;
-        int i, j;
-        u16 reg_addr;
-        u8 *ptr;
-
-        if (!buf)
-                TRACE_RET(chip, STATUS_ERROR);
-
-        ptr = buf;
-        reg_addr = PPBUF_BASE2;
-        for (i = 0; i < buf_len/256; i++) {
-                rtsx_init_cmd(chip);
-
-                for (j = 0; j < 256; j++) {
-                        rtsx_add_cmd(chip, WRITE_REG_CMD, reg_addr++, 0xFF, *ptr);
-                        ptr++;
-                }
-
-                retval = rtsx_send_cmd(chip, 0, 250);
-                if (retval < 0)
-                        TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        if (buf_len%256) {
-                rtsx_init_cmd(chip);
-
-                for (j = 0; j < buf_len%256; j++) {
-                        rtsx_add_cmd(chip, WRITE_REG_CMD, reg_addr++, 0xFF, *ptr);
-                        ptr++;
-                }
-
-                retval = rtsx_send_cmd(chip, 0, 250);
-                if (retval < 0)
-                        TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        return STATUS_SUCCESS;
-}
-
-int rtsx_check_chip_exist(struct rtsx_chip *chip)
-{
-        if (rtsx_readl(chip, 0) == 0xFFFFFFFF)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        return STATUS_SUCCESS;
-}
-
-int rtsx_force_power_on(struct rtsx_chip *chip, u8 ctl)
-{
-        int retval;
-        u8 mask = 0;
-
-        if (ctl & SSC_PDCTL)
-                mask |= SSC_POWER_DOWN;
-
-#ifdef SUPPORT_OCP
-        if (ctl & OC_PDCTL) {
-                mask |= SD_OC_POWER_DOWN;
-                if (CHECK_LUN_MODE(chip, SD_MS_2LUN))
-                        mask |= MS_OC_POWER_DOWN;
-        }
-#endif
-
-        if (mask) {
-                retval = rtsx_write_register(chip, FPDCTL, mask, 0);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-
-                if (CHECK_PID(chip, 0x5288))
-                        wait_timeout(200);
-        }
-
-        return STATUS_SUCCESS;
-}
-
-int rtsx_force_power_down(struct rtsx_chip *chip, u8 ctl)
-{
-        int retval;
-        u8 mask = 0, val = 0;
-
-        if (ctl & SSC_PDCTL)
-                mask |= SSC_POWER_DOWN;
-
-#ifdef SUPPORT_OCP
-        if (ctl & OC_PDCTL) {
-                mask |= SD_OC_POWER_DOWN;
-                if (CHECK_LUN_MODE(chip, SD_MS_2LUN))
-                        mask |= MS_OC_POWER_DOWN;
-        }
-#endif
-
-        if (mask) {
-                val = mask;
-                retval = rtsx_write_register(chip, FPDCTL, mask, val);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        return STATUS_SUCCESS;
-}
diff --git a/drivers/staging/rts_pstor/rtsx_chip.h b/drivers/staging/rts_pstor/rtsx_chip.h
deleted file mode 100644
index 9f7cd82a1541..000000000000
--- a/drivers/staging/rts_pstor/rtsx_chip.h
+++ /dev/null
@@ -1,989 +0,0 @@
-/* Driver for Realtek PCI-Express card reader
- * Header file
- *
- * Copyright(c) 2009 Realtek Semiconductor Corp. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2, 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, see <http://www.gnu.org/licenses/>.
- *
- * Author:
- *   wwang (wei_wang@realsil.com.cn)
- *   No. 450, Shenhu Road, Suzhou Industry Park, Suzhou, China
- */
-
-#ifndef __REALTEK_RTSX_CHIP_H
-#define __REALTEK_RTSX_CHIP_H
-
-#include "rtsx.h"
-
-#define SUPPORT_CPRM
-#define SUPPORT_OCP
-#define SUPPORT_SDIO_ASPM
-#define SUPPORT_MAGIC_GATE
-#define SUPPORT_MSXC
-#define SUPPORT_SD_LOCK
-/* Hardware switch bus_ctl and cd_ctl automatically */
-#define HW_AUTO_SWITCH_SD_BUS
-/* Enable hardware interrupt write clear */
-#define HW_INT_WRITE_CLR
-/* #define LED_AUTO_BLINK */
-/* #define DISABLE_CARD_INT */
-
-#ifdef SUPPORT_MAGIC_GATE
-        /* Using NORMAL_WRITE instead of AUTO_WRITE to set ICV */
-        #define MG_SET_ICV_SLOW
-        /* HW may miss ERR/CMDNK signal when sampling INT status. */
-        #define MS_SAMPLE_INT_ERR
-        /* HW DO NOT support Wait_INT function during READ_BYTES transfer mode */
-        #define READ_BYTES_WAIT_INT
-#endif
-
-#ifdef SUPPORT_MSXC
-#define XC_POWERCLASS
-#define SUPPORT_PCGL_1P18
-#endif
-
-#ifndef LED_AUTO_BLINK
-#define REGULAR_BLINK
-#endif
-
-#define LED_BLINK_SPEED         5
-#define LED_TOGGLE_INTERVAL     6
-#define GPIO_TOGGLE_THRESHOLD   1024
-#define LED_GPIO                0
-
-#define POLLING_INTERVAL        30
-
-#define TRACE_ITEM_CNT          64
-
-#ifndef STATUS_SUCCESS
-#define STATUS_SUCCESS          0
-#endif
-#ifndef STATUS_FAIL
-#define STATUS_FAIL             1
-#endif
-#ifndef STATUS_TIMEDOUT
-#define STATUS_TIMEDOUT         2
-#endif
-#ifndef STATUS_NOMEM
-#define STATUS_NOMEM            3
-#endif
-#ifndef STATUS_READ_FAIL
-#define STATUS_READ_FAIL        4
-#endif
-#ifndef STATUS_WRITE_FAIL
-#define STATUS_WRITE_FAIL       5
-#endif
-#ifndef STATUS_ERROR
-#define STATUS_ERROR            10
-#endif
-
-#define PM_S1                   1
-#define PM_S3                   3
-
-/*
- * Transport return codes
- */
-
-#define TRANSPORT_GOOD          0   /* Transport good, command good        */
-#define TRANSPORT_FAILED        1   /* Transport good, command failed   */
-#define TRANSPORT_NO_SENSE      2  /* Command failed, no auto-sense    */
-#define TRANSPORT_ERROR         3   /* Transport bad (i.e. device dead) */
-
-
-/*-----------------------------------
-    Start-Stop-Unit
------------------------------------*/
-#define STOP_MEDIUM                     0x00    /* access disable         */
-#define MAKE_MEDIUM_READY               0x01    /* access enable          */
-#define UNLOAD_MEDIUM                   0x02    /* unload                 */
-#define LOAD_MEDIUM                     0x03    /* load                   */
-
-/*-----------------------------------
-    STANDARD_INQUIRY
------------------------------------*/
-#define QULIFIRE                0x00
-#define AENC_FNC                0x00
-#define TRML_IOP                0x00
-#define REL_ADR                 0x00
-#define WBUS_32                 0x00
-#define WBUS_16                 0x00
-#define SYNC                    0x00
-#define LINKED                  0x00
-#define CMD_QUE                 0x00
-#define SFT_RE                  0x00
-
-#define VEN_ID_LEN              8               /* Vendor ID Length         */
-#define PRDCT_ID_LEN            16              /* Product ID Length        */
-#define PRDCT_REV_LEN           4               /* Product LOT Length       */
-
-/* Dynamic flag definitions: used in set_bit() etc. */
-#define RTSX_FLIDX_TRANS_ACTIVE         18  /* 0x00040000  transfer is active */
-#define RTSX_FLIDX_ABORTING             20  /* 0x00100000  abort is in progress */
-#define RTSX_FLIDX_DISCONNECTING        21  /* 0x00200000  disconnect in progress */
-#define ABORTING_OR_DISCONNECTING       ((1UL << US_FLIDX_ABORTING) | \
-                                         (1UL << US_FLIDX_DISCONNECTING))
-#define RTSX_FLIDX_RESETTING            22  /* 0x00400000  device reset in progress */
-#define RTSX_FLIDX_TIMED_OUT            23  /* 0x00800000  SCSI midlayer timed out  */
-
-#define DRCT_ACCESS_DEV         0x00    /* Direct Access Device      */
-#define RMB_DISC                0x80    /* The Device is Removable   */
-#define ANSI_SCSI2              0x02    /* Based on ANSI-SCSI2       */
-
-#define SCSI                    0x00    /* Interface ID              */
-
-#define WRITE_PROTECTED_MEDIA 0x07
-
-/*---- sense key ----*/
-#define ILI                     0x20    /* ILI bit is on                    */
-
-#define NO_SENSE                0x00    /* not exist sense key              */
-#define RECOVER_ERR             0x01    /* Target/Logical unit is recoverd  */
-#define NOT_READY               0x02    /* Logical unit is not ready        */
-#define MEDIA_ERR               0x03    /* medium/data error                */
-#define HARDWARE_ERR            0x04    /* hardware error                   */
-#define ILGAL_REQ               0x05    /* CDB/parameter/identify msg error */
-#define UNIT_ATTENTION          0x06    /* unit attention condition occur   */
-#define DAT_PRTCT               0x07    /* read/write is desable            */
-#define BLNC_CHK                0x08    /* find blank/DOF in read           */
-                                        /* write to unblank area            */
-#define CPY_ABRT                0x0a    /* Copy/Compare/Copy&Verify illgal  */
-#define ABRT_CMD                0x0b    /* Target make the command in error */
-#define EQUAL                   0x0c    /* Search Data end with Equal       */
-#define VLM_OVRFLW              0x0d    /* Some data are left in buffer     */
-#define MISCMP                  0x0e    /* find inequality                  */
-
-#define READ_ERR                -1
-#define WRITE_ERR               -2
-
-#define FIRST_RESET             0x01
-#define USED_EXIST              0x02
-
-/*-----------------------------------
-    SENSE_DATA
------------------------------------*/
-/*---- valid ----*/
-#define SENSE_VALID             0x80    /* Sense data is valid as SCSI2     */
-#define SENSE_INVALID           0x00    /* Sense data is invalid as SCSI2   */
-
-/*---- error code ----*/
-#define CUR_ERR                 0x70    /* current error                    */
-#define DEF_ERR                 0x71    /* specific command error           */
-
-/*---- sense key Information ----*/
-#define SNSKEYINFO_LEN          3       /* length of sense key information   */
-
-#define SKSV                    0x80
-#define CDB_ILLEGAL             0x40
-#define DAT_ILLEGAL             0x00
-#define BPV                     0x08
-#define BIT_ILLEGAL0            0       /* bit0 is illegal                  */
-#define BIT_ILLEGAL1            1       /* bit1 is illegal                  */
-#define BIT_ILLEGAL2            2       /* bit2 is illegal                  */
-#define BIT_ILLEGAL3            3       /* bit3 is illegal                  */
-#define BIT_ILLEGAL4            4       /* bit4 is illegal                  */
-#define BIT_ILLEGAL5            5       /* bit5 is illegal                  */
-#define BIT_ILLEGAL6            6       /* bit6 is illegal                  */
-#define BIT_ILLEGAL7            7       /* bit7 is illegal                  */
-
-/*---- ASC ----*/
-#define ASC_NO_INFO             0x00
-#define ASC_MISCMP              0x1d
-#define ASC_INVLD_CDB           0x24
-#define ASC_INVLD_PARA          0x26
-#define ASC_LU_NOT_READY        0x04
-#define ASC_WRITE_ERR           0x0c
-#define ASC_READ_ERR            0x11
-#define ASC_LOAD_EJCT_ERR       0x53
-#define ASC_MEDIA_NOT_PRESENT   0x3A
-#define ASC_MEDIA_CHANGED       0x28
-#define ASC_MEDIA_IN_PROCESS    0x04
-#define ASC_WRITE_PROTECT       0x27
-#define ASC_LUN_NOT_SUPPORTED   0x25
-
-/*---- ASQC ----*/
-#define ASCQ_NO_INFO            0x00
-#define ASCQ_MEDIA_IN_PROCESS   0x01
-#define ASCQ_MISCMP             0x00
-#define ASCQ_INVLD_CDB          0x00
-#define ASCQ_INVLD_PARA         0x02
-#define ASCQ_LU_NOT_READY       0x02
-#define ASCQ_WRITE_ERR          0x02
-#define ASCQ_READ_ERR           0x00
-#define ASCQ_LOAD_EJCT_ERR      0x00
-#define ASCQ_WRITE_PROTECT      0x00
-
-
-struct sense_data_t {
-    unsigned char   err_code;           /* error code */
-                                                /* bit7 : valid                    */
-                                                /*   (1 : SCSI2)                    */
-                                                /*   (0 : Vendor specific)          */
-                                                /* bit6-0 : error code             */
-                                                /*  (0x70 : current error)          */
-                                                /*  (0x71 : specific command error) */
-    unsigned char   seg_no;             /* segment No.                      */
-    unsigned char   sense_key;          /* byte5 : ILI                      */
-                                                /* bit3-0 : sense key              */
-    unsigned char   info[4];            /* information                       */
-    unsigned char   ad_sense_len;       /* additional sense data length     */
-    unsigned char   cmd_info[4];        /* command specific information      */
-    unsigned char   asc;                /* ASC                              */
-    unsigned char   ascq;               /* ASCQ                             */
-    unsigned char   rfu;                /* FRU                              */
-    unsigned char   sns_key_info[3];    /* sense key specific information    */
-};
-
-/* PCI Operation Register Address */
-#define RTSX_HCBAR              0x00
-#define RTSX_HCBCTLR            0x04
-#define RTSX_HDBAR              0x08
-#define RTSX_HDBCTLR            0x0C
-#define RTSX_HAIMR              0x10
-#define RTSX_BIPR               0x14
-#define RTSX_BIER               0x18
-
-/* Host command buffer control register */
-#define STOP_CMD                (0x01 << 28)
-
-/* Host data buffer control register */
-#define SDMA_MODE               0x00
-#define ADMA_MODE               (0x02 << 26)
-#define STOP_DMA                (0x01 << 28)
-#define TRIG_DMA                (0x01 << 31)
-
-/* Bus interrupt pending register */
-#define CMD_DONE_INT            (1 << 31)
-#define DATA_DONE_INT           (1 << 30)
-#define TRANS_OK_INT            (1 << 29)
-#define TRANS_FAIL_INT          (1 << 28)
-#define XD_INT                  (1 << 27)
-#define MS_INT                  (1 << 26)
-#define SD_INT                  (1 << 25)
-#define GPIO0_INT               (1 << 24)
-#define OC_INT                  (1 << 23)
-#define SD_WRITE_PROTECT        (1 << 19)
-#define XD_EXIST                (1 << 18)
-#define MS_EXIST                (1 << 17)
-#define SD_EXIST                (1 << 16)
-#define DELINK_INT              GPIO0_INT
-#define MS_OC_INT               (1 << 23)
-#define SD_OC_INT               (1 << 22)
-
-#define CARD_INT                (XD_INT | MS_INT | SD_INT)
-#define NEED_COMPLETE_INT       (DATA_DONE_INT | TRANS_OK_INT | TRANS_FAIL_INT)
-#define RTSX_INT                (CMD_DONE_INT | NEED_COMPLETE_INT | CARD_INT | GPIO0_INT | OC_INT)
-
-#define CARD_EXIST              (XD_EXIST | MS_EXIST | SD_EXIST)
-
-/* Bus interrupt enable register */
-#define CMD_DONE_INT_EN         (1 << 31)
-#define DATA_DONE_INT_EN        (1 << 30)
-#define TRANS_OK_INT_EN         (1 << 29)
-#define TRANS_FAIL_INT_EN       (1 << 28)
-#define XD_INT_EN               (1 << 27)
-#define MS_INT_EN               (1 << 26)
-#define SD_INT_EN               (1 << 25)
-#define GPIO0_INT_EN            (1 << 24)
-#define OC_INT_EN               (1 << 23)
-#define DELINK_INT_EN           GPIO0_INT_EN
-#define MS_OC_INT_EN            (1 << 23)
-#define SD_OC_INT_EN            (1 << 22)
-
-
-#define READ_REG_CMD            0
-#define WRITE_REG_CMD           1
-#define CHECK_REG_CMD           2
-
-#define HOST_TO_DEVICE          0
-#define DEVICE_TO_HOST          1
-
-
-#define RTSX_RESV_BUF_LEN       4096
-#define HOST_CMDS_BUF_LEN       1024
-#define HOST_SG_TBL_BUF_LEN     (RTSX_RESV_BUF_LEN - HOST_CMDS_BUF_LEN)
-
-#define SD_NR           2
-#define MS_NR           3
-#define XD_NR           4
-#define SPI_NR          7
-#define SD_CARD         (1 << SD_NR)
-#define MS_CARD         (1 << MS_NR)
-#define XD_CARD         (1 << XD_NR)
-#define SPI_CARD        (1 << SPI_NR)
-
-#define MAX_ALLOWED_LUN_CNT     8
-
-#define XD_FREE_TABLE_CNT       1200
-#define MS_FREE_TABLE_CNT       512
-
-
-/* Bit Operation */
-#define SET_BIT(data, idx)      ((data) |= 1 << (idx))
-#define CLR_BIT(data, idx)      ((data) &= ~(1 << (idx)))
-#define CHK_BIT(data, idx)      ((data) & (1 << (idx)))
-
-/* SG descriptor */
-#define SG_INT                  0x04
-#define SG_END                  0x02
-#define SG_VALID                0x01
-
-#define SG_NO_OP                0x00
-#define SG_TRANS_DATA           (0x02 << 4)
-#define SG_LINK_DESC            (0x03 << 4)
-
-struct rtsx_chip;
-
-typedef int (*card_rw_func)(struct scsi_cmnd *srb, struct rtsx_chip *chip, u32 sec_addr, u16 sec_cnt);
-
-/* Supported Clock */
-enum card_clock {CLK_20 = 1, CLK_30, CLK_40, CLK_50, CLK_60, CLK_80, CLK_100, CLK_120, CLK_150, CLK_200};
-
-enum RTSX_STAT  {RTSX_STAT_INIT, RTSX_STAT_IDLE, RTSX_STAT_RUN, RTSX_STAT_SS,
-                RTSX_STAT_DELINK, RTSX_STAT_SUSPEND, RTSX_STAT_ABORT, RTSX_STAT_DISCONNECT};
-enum IC_VER     {IC_VER_AB, IC_VER_C = 2, IC_VER_D = 3};
-
-#define MAX_RESET_CNT           3
-
-/* For MS Card */
-#define MAX_DEFECTIVE_BLOCK     10
-
-struct zone_entry {
-        u16 *l2p_table;
-        u16 *free_table;
-        u16 defect_list[MAX_DEFECTIVE_BLOCK];  /* For MS card only */
-        int set_index;
-        int get_index;
-        int unused_blk_cnt;
-        int disable_count;
-        /* To indicate whether the L2P table of this zone has been built. */
-        int build_flag;
-};
-
-#define TYPE_SD                 0x0000
-#define TYPE_MMC                0x0001
-
-/* TYPE_SD */
-#define SD_HS                   0x0100
-#define SD_SDR50                0x0200
-#define SD_DDR50                0x0400
-#define SD_SDR104               0x0800
-#define SD_HCXC                 0x1000
-
-/* TYPE_MMC */
-#define MMC_26M                 0x0100
-#define MMC_52M                 0x0200
-#define MMC_4BIT                0x0400
-#define MMC_8BIT                0x0800
-#define MMC_SECTOR_MODE         0x1000
-#define MMC_DDR52               0x2000
-
-/* SD card */
-#define CHK_SD(sd_card)                 (((sd_card)->sd_type & 0xFF) == TYPE_SD)
-#define CHK_SD_HS(sd_card)              (CHK_SD(sd_card) && ((sd_card)->sd_type & SD_HS))
-#define CHK_SD_SDR50(sd_card)           (CHK_SD(sd_card) && ((sd_card)->sd_type & SD_SDR50))
-#define CHK_SD_DDR50(sd_card)           (CHK_SD(sd_card) && ((sd_card)->sd_type & SD_DDR50))
-#define CHK_SD_SDR104(sd_card)          (CHK_SD(sd_card) && ((sd_card)->sd_type & SD_SDR104))
-#define CHK_SD_HCXC(sd_card)            (CHK_SD(sd_card) && ((sd_card)->sd_type & SD_HCXC))
-#define CHK_SD_HC(sd_card)              (CHK_SD_HCXC(sd_card) && ((sd_card)->capacity <= 0x4000000))
-#define CHK_SD_XC(sd_card)              (CHK_SD_HCXC(sd_card) && ((sd_card)->capacity > 0x4000000))
-#define CHK_SD30_SPEED(sd_card)         (CHK_SD_SDR50(sd_card) || CHK_SD_DDR50(sd_card) || CHK_SD_SDR104(sd_card))
-
-#define SET_SD(sd_card)                 ((sd_card)->sd_type = TYPE_SD)
-#define SET_SD_HS(sd_card)              ((sd_card)->sd_type |= SD_HS)
-#define SET_SD_SDR50(sd_card)           ((sd_card)->sd_type |= SD_SDR50)
-#define SET_SD_DDR50(sd_card)           ((sd_card)->sd_type |= SD_DDR50)
-#define SET_SD_SDR104(sd_card)          ((sd_card)->sd_type |= SD_SDR104)
-#define SET_SD_HCXC(sd_card)            ((sd_card)->sd_type |= SD_HCXC)
-
-#define CLR_SD_HS(sd_card)              ((sd_card)->sd_type &= ~SD_HS)
-#define CLR_SD_SDR50(sd_card)           ((sd_card)->sd_type &= ~SD_SDR50)
-#define CLR_SD_DDR50(sd_card)           ((sd_card)->sd_type &= ~SD_DDR50)
-#define CLR_SD_SDR104(sd_card)          ((sd_card)->sd_type &= ~SD_SDR104)
-#define CLR_SD_HCXC(sd_card)            ((sd_card)->sd_type &= ~SD_HCXC)
-
-/* MMC card */
-#define CHK_MMC(sd_card)                (((sd_card)->sd_type & 0xFF) == TYPE_MMC)
-#define CHK_MMC_26M(sd_card)            (CHK_MMC(sd_card) && ((sd_card)->sd_type & MMC_26M))
-#define CHK_MMC_52M(sd_card)            (CHK_MMC(sd_card) && ((sd_card)->sd_type & MMC_52M))
-#define CHK_MMC_4BIT(sd_card)           (CHK_MMC(sd_card) && ((sd_card)->sd_type & MMC_4BIT))
-#define CHK_MMC_8BIT(sd_card)           (CHK_MMC(sd_card) && ((sd_card)->sd_type & MMC_8BIT))
-#define CHK_MMC_SECTOR_MODE(sd_card)    (CHK_MMC(sd_card) && ((sd_card)->sd_type & MMC_SECTOR_MODE))
-#define CHK_MMC_DDR52(sd_card)          (CHK_MMC(sd_card) && ((sd_card)->sd_type & MMC_DDR52))
-
-#define SET_MMC(sd_card)                ((sd_card)->sd_type = TYPE_MMC)
-#define SET_MMC_26M(sd_card)            ((sd_card)->sd_type |= MMC_26M)
-#define SET_MMC_52M(sd_card)            ((sd_card)->sd_type |= MMC_52M)
-#define SET_MMC_4BIT(sd_card)           ((sd_card)->sd_type |= MMC_4BIT)
-#define SET_MMC_8BIT(sd_card)           ((sd_card)->sd_type |= MMC_8BIT)
-#define SET_MMC_SECTOR_MODE(sd_card)    ((sd_card)->sd_type |= MMC_SECTOR_MODE)
-#define SET_MMC_DDR52(sd_card)          ((sd_card)->sd_type |= MMC_DDR52)
-
-#define CLR_MMC_26M(sd_card)            ((sd_card)->sd_type &= ~MMC_26M)
-#define CLR_MMC_52M(sd_card)            ((sd_card)->sd_type &= ~MMC_52M)
-#define CLR_MMC_4BIT(sd_card)           ((sd_card)->sd_type &= ~MMC_4BIT)
-#define CLR_MMC_8BIT(sd_card)           ((sd_card)->sd_type &= ~MMC_8BIT)
-#define CLR_MMC_SECTOR_MODE(sd_card)    ((sd_card)->sd_type &= ~MMC_SECTOR_MODE)
-#define CLR_MMC_DDR52(sd_card)          ((sd_card)->sd_type &= ~MMC_DDR52)
-
-#define CHK_MMC_HS(sd_card)             (CHK_MMC_52M(sd_card) && CHK_MMC_26M(sd_card))
-#define CLR_MMC_HS(sd_card)                     \
-do {                                            \
-        CLR_MMC_DDR52(sd_card);                 \
-        CLR_MMC_52M(sd_card);                   \
-        CLR_MMC_26M(sd_card);                   \
-} while (0)
-
-#define SD_SUPPORT_CLASS_TEN            0x01
-#define SD_SUPPORT_1V8                  0x02
-
-#define SD_SET_CLASS_TEN(sd_card)       ((sd_card)->sd_setting |= SD_SUPPORT_CLASS_TEN)
-#define SD_CHK_CLASS_TEN(sd_card)       ((sd_card)->sd_setting & SD_SUPPORT_CLASS_TEN)
-#define SD_CLR_CLASS_TEN(sd_card)       ((sd_card)->sd_setting &= ~SD_SUPPORT_CLASS_TEN)
-#define SD_SET_1V8(sd_card)             ((sd_card)->sd_setting |= SD_SUPPORT_1V8)
-#define SD_CHK_1V8(sd_card)             ((sd_card)->sd_setting & SD_SUPPORT_1V8)
-#define SD_CLR_1V8(sd_card)             ((sd_card)->sd_setting &= ~SD_SUPPORT_1V8)
-
-struct sd_info {
-        u16 sd_type;
-        u8 err_code;
-        u8 sd_data_buf_ready;
-        u32 sd_addr;
-        u32 capacity;
-
-        u8 raw_csd[16];
-        u8 raw_scr[8];
-
-        /* Sequential RW */
-        int seq_mode;
-        enum dma_data_direction pre_dir;
-        u32 pre_sec_addr;
-        u16 pre_sec_cnt;
-
-        int cleanup_counter;
-
-        int sd_clock;
-
-        int mmc_dont_switch_bus;
-
-#ifdef SUPPORT_CPRM
-        int sd_pass_thru_en;
-        int pre_cmd_err;
-        u8 last_rsp_type;
-        u8 rsp[17];
-#endif
-
-        u8 func_group1_mask;
-        u8 func_group2_mask;
-        u8 func_group3_mask;
-        u8 func_group4_mask;
-
-        u8 sd_switch_fail;
-        u8 sd_read_phase;
-
-#ifdef SUPPORT_SD_LOCK
-        u8 sd_lock_status;
-        u8 sd_erase_status;
-        u8 sd_lock_notify;
-#endif
-        int need_retune;
-};
-
-struct xd_delay_write_tag {
-        u32 old_phyblock;
-        u32 new_phyblock;
-        u32 logblock;
-        u8 pageoff;
-        u8 delay_write_flag;
-};
-
-struct xd_info {
-        u8 maker_code;
-        u8 device_code;
-        u8 block_shift;
-        u8 page_off;
-        u8 addr_cycle;
-        u16 cis_block;
-        u8 multi_flag;
-        u8 err_code;
-        u32 capacity;
-
-        struct zone_entry *zone;
-        int zone_cnt;
-
-        struct xd_delay_write_tag delay_write;
-        int cleanup_counter;
-
-        int xd_clock;
-};
-
-#define MODE_512_SEQ            0x01
-#define MODE_2K_SEQ             0x02
-
-#define TYPE_MS                 0x0000
-#define TYPE_MSPRO              0x0001
-
-#define MS_4BIT                 0x0100
-#define MS_8BIT                 0x0200
-#define MS_HG                   0x0400
-#define MS_XC                   0x0800
-
-#define HG8BIT                  (MS_HG | MS_8BIT)
-
-#define CHK_MSPRO(ms_card)      (((ms_card)->ms_type & 0xFF) == TYPE_MSPRO)
-#define CHK_HG8BIT(ms_card)     (CHK_MSPRO(ms_card) && (((ms_card)->ms_type & HG8BIT) == HG8BIT))
-#define CHK_MSXC(ms_card)       (CHK_MSPRO(ms_card) && ((ms_card)->ms_type & MS_XC))
-#define CHK_MSHG(ms_card)       (CHK_MSPRO(ms_card) && ((ms_card)->ms_type & MS_HG))
-
-#define CHK_MS8BIT(ms_card)     (((ms_card)->ms_type & MS_8BIT))
-#define CHK_MS4BIT(ms_card)     (((ms_card)->ms_type & MS_4BIT))
-
-struct ms_delay_write_tag {
-        u16 old_phyblock;
-        u16 new_phyblock;
-        u16 logblock;
-        u8 pageoff;
-        u8 delay_write_flag;
-};
-
-struct ms_info {
-        u16 ms_type;
-        u8 block_shift;
-        u8 page_off;
-        u16 total_block;
-        u16 boot_block;
-        u32 capacity;
-
-        u8 check_ms_flow;
-        u8 switch_8bit_fail;
-        u8 err_code;
-
-        struct zone_entry *segment;
-        int segment_cnt;
-
-        int pro_under_formatting;
-        int format_status;
-        u16 progress;
-        u8 raw_sys_info[96];
-#ifdef SUPPORT_PCGL_1P18
-        u8 raw_model_name[48];
-#endif
-
-        u8 multi_flag;
-
-        /* Sequential RW */
-        u8 seq_mode;
-        enum dma_data_direction pre_dir;
-        u32 pre_sec_addr;
-        u16 pre_sec_cnt;
-        u32 total_sec_cnt;
-
-        struct ms_delay_write_tag delay_write;
-
-        int cleanup_counter;
-
-        int ms_clock;
-
-#ifdef SUPPORT_MAGIC_GATE
-        u8 magic_gate_id[16];
-        u8 mg_entry_num;
-        int mg_auth;    /* flag to indicate authentication process */
-#endif
-};
-
-struct spi_info {
-        u8 use_clk;
-        u8 write_en;
-        u16 clk_div;
-        u8 err_code;
-
-        int spi_clock;
-};
-
-
-#ifdef _MSG_TRACE
-struct trace_msg_t {
-        u16 line;
-#define MSG_FUNC_LEN 64
-        char func[MSG_FUNC_LEN];
-#define MSG_FILE_LEN 32
-        char file[MSG_FILE_LEN];
-#define TIME_VAL_LEN 16
-        u8 timeval_buf[TIME_VAL_LEN];
-        u8 valid;
-};
-#endif
-
-/************/
-/* LUN mode */
-/************/
-/* Single LUN, support xD/SD/MS */
-#define DEFAULT_SINGLE          0
-/* 2 LUN mode, support SD/MS */
-#define SD_MS_2LUN              1
-/* Single LUN, but only support SD/MS, for Barossa LQFP */
-#define SD_MS_1LUN              2
-
-#define LAST_LUN_MODE           2
-
-/* Barossa package */
-#define QFN             0
-#define LQFP            1
-
-/******************/
-/* sd_ctl bit map */
-/******************/
-/* SD push point control, bit 0, 1 */
-#define SD_PUSH_POINT_CTL_MASK          0x03
-#define SD_PUSH_POINT_DELAY             0x01
-#define SD_PUSH_POINT_AUTO              0x02
-/* SD sample point control, bit 2, 3 */
-#define SD_SAMPLE_POINT_CTL_MASK        0x0C
-#define SD_SAMPLE_POINT_DELAY           0x04
-#define SD_SAMPLE_POINT_AUTO            0x08
-/* SD DDR Tx phase set by user, bit 4 */
-#define SD_DDR_TX_PHASE_SET_BY_USER     0x10
-/* MMC DDR Tx phase set by user, bit 5 */
-#define MMC_DDR_TX_PHASE_SET_BY_USER    0x20
-/* Support MMC DDR mode, bit 6 */
-#define SUPPORT_MMC_DDR_MODE            0x40
-/* Reset MMC at first */
-#define RESET_MMC_FIRST                 0x80
-
-#define SEQ_START_CRITERIA              0x20
-
-/* MS Power Class En */
-#define POWER_CLASS_2_EN                0x02
-#define POWER_CLASS_1_EN                0x01
-
-#define MAX_SHOW_CNT                    10
-#define MAX_RESET_CNT                   3
-
-#define SDIO_EXIST                      0x01
-#define SDIO_IGNORED                    0x02
-
-#define CHK_SDIO_EXIST(chip)            ((chip)->sdio_func_exist & SDIO_EXIST)
-#define SET_SDIO_EXIST(chip)            ((chip)->sdio_func_exist |= SDIO_EXIST)
-#define CLR_SDIO_EXIST(chip)            ((chip)->sdio_func_exist &= ~SDIO_EXIST)
-
-#define CHK_SDIO_IGNORED(chip)          ((chip)->sdio_func_exist & SDIO_IGNORED)
-#define SET_SDIO_IGNORED(chip)          ((chip)->sdio_func_exist |= SDIO_IGNORED)
-#define CLR_SDIO_IGNORED(chip)          ((chip)->sdio_func_exist &= ~SDIO_IGNORED)
-
-struct rtsx_chip {
-        rtsx_dev_t              *rtsx;
-
-        u32                     int_reg;                /* Bus interrupt pending register */
-        char                    max_lun;
-        void                    *context;
-
-        void                    *host_cmds_ptr;         /* host commands buffer pointer */
-        dma_addr_t              host_cmds_addr;
-        int                     ci;                     /* Command Index */
-
-        void                    *host_sg_tbl_ptr;       /* SG descriptor table */
-        dma_addr_t              host_sg_tbl_addr;
-        int                     sgi;                    /* SG entry index */
-
-        struct scsi_cmnd        *srb;                   /* current srb */
-        struct sense_data_t     sense_buffer[MAX_ALLOWED_LUN_CNT];
-
-        int                     cur_clk;                /* current card clock */
-
-        /* Current accessed card */
-        int                     cur_card;
-
-        unsigned long           need_release;           /* need release bit map */
-        unsigned long           need_reset;             /* need reset bit map */
-        /* Flag to indicate that this card is just resumed from SS state,
-         * and need released before being resetted
-         */
-        unsigned long           need_reinit;
-
-        int                     rw_need_retry;
-
-#ifdef SUPPORT_OCP
-        u32                     ocp_int;
-        u8                      ocp_stat;
-#endif
-
-        u8                      card_exist;             /* card exist bit map (physical exist) */
-        u8                      card_ready;             /* card ready bit map (reset successfully) */
-        u8                      card_fail;              /* card reset fail bit map */
-        u8                      card_ejected;           /* card ejected bit map */
-        u8                      card_wp;                /* card write protected bit map */
-
-        u8                      lun_mc;                 /* flag to indicate whether to answer MediaChange */
-
-#ifndef LED_AUTO_BLINK
-        int                     led_toggle_counter;
-#endif
-
-        int                     sd_reset_counter;
-        int                     xd_reset_counter;
-        int                     ms_reset_counter;
-
-        /* card bus width */
-        u8                      card_bus_width[MAX_ALLOWED_LUN_CNT];
-        /* card capacity */
-        u32                     capacity[MAX_ALLOWED_LUN_CNT];
-        /* read/write card function pointer */
-        card_rw_func            rw_card[MAX_ALLOWED_LUN_CNT];
-        /* read/write capacity, used for GPIO Toggle */
-        u32                     rw_cap[MAX_ALLOWED_LUN_CNT];
-        /* card to lun mapping table */
-        u8                      card2lun[32];
-        /* lun to card mapping table */
-        u8                      lun2card[MAX_ALLOWED_LUN_CNT];
-
-        int                     rw_fail_cnt[MAX_ALLOWED_LUN_CNT];
-
-        int                     sd_show_cnt;
-        int                     xd_show_cnt;
-        int                     ms_show_cnt;
-
-        /* card information */
-        struct sd_info          sd_card;
-        struct xd_info          xd_card;
-        struct ms_info          ms_card;
-
-        struct spi_info         spi;
-
-#ifdef _MSG_TRACE
-        struct trace_msg_t      trace_msg[TRACE_ITEM_CNT];
-        int                     msg_idx;
-#endif
-
-        int                     auto_delink_cnt;
-        int                     auto_delink_allowed;
-
-        int                     aspm_enabled;
-
-        int                     sdio_aspm;
-        int                     sdio_idle;
-        int                     sdio_counter;
-        u8                      sdio_raw_data[12];
-
-        u8                      sd_io;
-        u8                      sd_int;
-
-        u8                      rtsx_flag;
-
-        int                     ss_counter;
-        int                     idle_counter;
-        enum RTSX_STAT          rtsx_stat;
-
-        u16                     vendor_id;
-        u16                     product_id;
-        u8                      ic_version;
-
-        int                     driver_first_load;
-
-#ifdef HW_AUTO_SWITCH_SD_BUS
-        int                     sdio_in_charge;
-#endif
-
-        u8                      aspm_level[2];
-
-        int                     chip_insert_with_sdio;
-
-        /* Options */
-
-        int adma_mode;
-
-        int auto_delink_en;
-        int ss_en;
-        u8 lun_mode;
-        u8 aspm_l0s_l1_en;
-
-        int power_down_in_ss;
-
-        int sdr104_en;
-        int ddr50_en;
-        int sdr50_en;
-
-        int baro_pkg;
-
-        int asic_code;
-        int phy_debug_mode;
-        int hw_bypass_sd;
-        int sdio_func_exist;
-        int aux_pwr_exist;
-        u8 ms_power_class_en;
-
-        int mspro_formatter_enable;
-
-        int remote_wakeup_en;
-
-        int ignore_sd;
-        int use_hw_setting;
-
-        int ss_idle_period;
-
-        int dynamic_aspm;
-
-        int fpga_sd_sdr104_clk;
-        int fpga_sd_ddr50_clk;
-        int fpga_sd_sdr50_clk;
-        int fpga_sd_hs_clk;
-        int fpga_mmc_52m_clk;
-        int fpga_ms_hg_clk;
-        int fpga_ms_4bit_clk;
-        int fpga_ms_1bit_clk;
-
-        int asic_sd_sdr104_clk;
-        int asic_sd_ddr50_clk;
-        int asic_sd_sdr50_clk;
-        int asic_sd_hs_clk;
-        int asic_mmc_52m_clk;
-        int asic_ms_hg_clk;
-        int asic_ms_4bit_clk;
-        int asic_ms_1bit_clk;
-
-        u8 ssc_depth_sd_sdr104;
-        u8 ssc_depth_sd_ddr50;
-        u8 ssc_depth_sd_sdr50;
-        u8 ssc_depth_sd_hs;
-        u8 ssc_depth_mmc_52m;
-        u8 ssc_depth_ms_hg;
-        u8 ssc_depth_ms_4bit;
-        u8 ssc_depth_low_speed;
-
-        u8 card_drive_sel;
-        u8 sd30_drive_sel_1v8;
-        u8 sd30_drive_sel_3v3;
-
-        u8 sd_400mA_ocp_thd;
-        u8 sd_800mA_ocp_thd;
-        u8 ms_ocp_thd;
-
-        int ssc_en;
-        int msi_en;
-
-        int xd_timeout;
-        int sd_timeout;
-        int ms_timeout;
-        int mspro_timeout;
-
-        int auto_power_down;
-
-        int sd_ddr_tx_phase;
-        int mmc_ddr_tx_phase;
-        int sd_default_tx_phase;
-        int sd_default_rx_phase;
-
-        int pmos_pwr_on_interval;
-        int sd_voltage_switch_delay;
-        int s3_pwr_off_delay;
-
-        int force_clkreq_0;
-        int ft2_fast_mode;
-
-        int do_delink_before_power_down;
-        int polling_config;
-        int sdio_retry_cnt;
-
-        int delink_stage1_step;
-        int delink_stage2_step;
-        int delink_stage3_step;
-
-        int auto_delink_in_L1;
-        int hp_watch_bios_hotplug;
-        int support_ms_8bit;
-
-        u8 blink_led;
-        u8 phy_voltage;
-        u8 max_payload;
-
-        u32 sd_speed_prior;
-        u32 sd_current_prior;
-        u32 sd_ctl;
-};
-
-#define rtsx_set_stat(chip, stat)                               \
-do {                                                            \
-        if ((stat) != RTSX_STAT_IDLE) {                         \
-                (chip)->idle_counter = 0;                       \
-        }                                                       \
-        (chip)->rtsx_stat = (enum RTSX_STAT)(stat);             \
-} while (0)
-#define rtsx_get_stat(chip)             ((chip)->rtsx_stat)
-#define rtsx_chk_stat(chip, stat)       ((chip)->rtsx_stat == (stat))
-
-#define RTSX_SET_DELINK(chip)   ((chip)->rtsx_flag |= 0x01)
-#define RTSX_CLR_DELINK(chip)   ((chip)->rtsx_flag &= 0xFE)
-#define RTSX_TST_DELINK(chip)   ((chip)->rtsx_flag & 0x01)
-
-#define CHECK_PID(chip, pid)            ((chip)->product_id == (pid))
-#define CHECK_BARO_PKG(chip, pkg)       ((chip)->baro_pkg == (pkg))
-#define CHECK_LUN_MODE(chip, mode)      ((chip)->lun_mode == (mode))
-
-/* Power down control */
-#define SSC_PDCTL               0x01
-#define OC_PDCTL                0x02
-
-int rtsx_force_power_on(struct rtsx_chip *chip, u8 ctl);
-int rtsx_force_power_down(struct rtsx_chip *chip, u8 ctl);
-
-void rtsx_disable_card_int(struct rtsx_chip *chip);
-void rtsx_enable_card_int(struct rtsx_chip *chip);
-void rtsx_enable_bus_int(struct rtsx_chip *chip);
-void rtsx_disable_bus_int(struct rtsx_chip *chip);
-int rtsx_reset_chip(struct rtsx_chip *chip);
-int rtsx_init_chip(struct rtsx_chip *chip);
-void rtsx_release_chip(struct rtsx_chip *chip);
-void rtsx_polling_func(struct rtsx_chip *chip);
-void rtsx_undo_delink(struct rtsx_chip *chip);
-void rtsx_stop_cmd(struct rtsx_chip *chip, int card);
-int rtsx_write_register(struct rtsx_chip *chip, u16 addr, u8 mask, u8 data);
-int rtsx_read_register(struct rtsx_chip *chip, u16 addr, u8 *data);
-int rtsx_write_cfg_dw(struct rtsx_chip *chip, u8 func_no, u16 addr, u32 mask, u32 val);
-int rtsx_read_cfg_dw(struct rtsx_chip *chip, u8 func_no, u16 addr, u32 *val);
-int rtsx_write_cfg_seq(struct rtsx_chip *chip, u8 func, u16 addr, u8 *buf, int len);
-int rtsx_read_cfg_seq(struct rtsx_chip *chip, u8 func, u16 addr, u8 *buf, int len);
-int rtsx_write_phy_register(struct rtsx_chip *chip, u8 addr, u16 val);
-int rtsx_read_phy_register(struct rtsx_chip *chip, u8 addr, u16 *val);
-int rtsx_read_efuse(struct rtsx_chip *chip, u8 addr, u8 *val);
-int rtsx_write_efuse(struct rtsx_chip *chip, u8 addr, u8 val);
-int rtsx_clr_phy_reg_bit(struct rtsx_chip *chip, u8 reg, u8 bit);
-int rtsx_set_phy_reg_bit(struct rtsx_chip *chip, u8 reg, u8 bit);
-int rtsx_check_link_ready(struct rtsx_chip *chip);
-void rtsx_enter_ss(struct rtsx_chip *chip);
-void rtsx_exit_ss(struct rtsx_chip *chip);
-int rtsx_pre_handle_interrupt(struct rtsx_chip *chip);
-void rtsx_enter_L1(struct rtsx_chip *chip);
-void rtsx_exit_L1(struct rtsx_chip *chip);
-void rtsx_do_before_power_down(struct rtsx_chip *chip, int pm_stat);
-void rtsx_enable_aspm(struct rtsx_chip *chip);
-void rtsx_disable_aspm(struct rtsx_chip *chip);
-int rtsx_read_ppbuf(struct rtsx_chip *chip, u8 *buf, int buf_len);
-int rtsx_write_ppbuf(struct rtsx_chip *chip, u8 *buf, int buf_len);
-int rtsx_check_chip_exist(struct rtsx_chip *chip);
-
-#define RTSX_WRITE_REG(chip, addr, mask, data)                                  \
-do {                                                                            \
-        int retval = rtsx_write_register((chip), (addr), (mask), (data));       \
-        if (retval != STATUS_SUCCESS) {                                         \
-                TRACE_RET((chip), retval);                                      \
-        }                                                                       \
-} while (0)
-
-#define RTSX_READ_REG(chip, addr, data)                                         \
-do {                                                                            \
-        int retval = rtsx_read_register((chip), (addr), (data));                \
-        if (retval != STATUS_SUCCESS) {                                         \
-                TRACE_RET((chip), retval);                                      \
-        }                                                                       \
-} while (0)
-
-#endif  /* __REALTEK_RTSX_CHIP_H */
diff --git a/drivers/staging/rts_pstor/rtsx_scsi.c b/drivers/staging/rts_pstor/rtsx_scsi.c
deleted file mode 100644
index 86c41b3a42a3..000000000000
--- a/drivers/staging/rts_pstor/rtsx_scsi.c
+++ /dev/null
@@ -1,3137 +0,0 @@
-/* Driver for Realtek PCI-Express card reader
- *
- * Copyright(c) 2009 Realtek Semiconductor Corp. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2, 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, see <http://www.gnu.org/licenses/>.
- *
- * Author:
- *   wwang (wei_wang@realsil.com.cn)
- *   No. 450, Shenhu Road, Suzhou Industry Park, Suzhou, China
- */
-
-#include <linux/blkdev.h>
-#include <linux/kthread.h>
-#include <linux/sched.h>
-#include <linux/vmalloc.h>
-
-#include "rtsx.h"
-#include "rtsx_transport.h"
-#include "rtsx_sys.h"
-#include "rtsx_card.h"
-#include "rtsx_chip.h"
-#include "rtsx_scsi.h"
-#include "sd.h"
-#include "ms.h"
-#include "spi.h"
-
-void scsi_show_command(struct scsi_cmnd *srb)
-{
-        char *what = NULL;
-        int i, unknown_cmd = 0;
-
-        switch (srb->cmnd[0]) {
-        case TEST_UNIT_READY: what = "TEST_UNIT_READY"; break;
-        case REZERO_UNIT: what = "REZERO_UNIT"; break;
-        case REQUEST_SENSE: what = "REQUEST_SENSE"; break;
-        case FORMAT_UNIT: what = "FORMAT_UNIT"; break;
-        case READ_BLOCK_LIMITS: what = "READ_BLOCK_LIMITS"; break;
-        case REASSIGN_BLOCKS: what = "REASSIGN_BLOCKS"; break;
-        case READ_6: what = "READ_6"; break;
-        case WRITE_6: what = "WRITE_6"; break;
-        case SEEK_6: what = "SEEK_6"; break;
-        case READ_REVERSE: what = "READ_REVERSE"; break;
-        case WRITE_FILEMARKS: what = "WRITE_FILEMARKS"; break;
-        case SPACE: what = "SPACE"; break;
-        case INQUIRY: what = "INQUIRY"; break;
-        case RECOVER_BUFFERED_DATA: what = "RECOVER_BUFFERED_DATA"; break;
-        case MODE_SELECT: what = "MODE_SELECT"; break;
-        case RESERVE: what = "RESERVE"; break;
-        case RELEASE: what = "RELEASE"; break;
-        case COPY: what = "COPY"; break;
-        case ERASE: what = "ERASE"; break;
-        case MODE_SENSE: what = "MODE_SENSE"; break;
-        case START_STOP: what = "START_STOP"; break;
-        case RECEIVE_DIAGNOSTIC: what = "RECEIVE_DIAGNOSTIC"; break;
-        case SEND_DIAGNOSTIC: what = "SEND_DIAGNOSTIC"; break;
-        case ALLOW_MEDIUM_REMOVAL: what = "ALLOW_MEDIUM_REMOVAL"; break;
-        case SET_WINDOW: what = "SET_WINDOW"; break;
-        case READ_CAPACITY: what = "READ_CAPACITY"; break;
-        case READ_10: what = "READ_10"; break;
-        case WRITE_10: what = "WRITE_10"; break;
-        case SEEK_10: what = "SEEK_10"; break;
-        case WRITE_VERIFY: what = "WRITE_VERIFY"; break;
-        case VERIFY: what = "VERIFY"; break;
-        case SEARCH_HIGH: what = "SEARCH_HIGH"; break;
-        case SEARCH_EQUAL: what = "SEARCH_EQUAL"; break;
-        case SEARCH_LOW: what = "SEARCH_LOW"; break;
-        case SET_LIMITS: what = "SET_LIMITS"; break;
-        case READ_POSITION: what = "READ_POSITION"; break;
-        case SYNCHRONIZE_CACHE: what = "SYNCHRONIZE_CACHE"; break;
-        case LOCK_UNLOCK_CACHE: what = "LOCK_UNLOCK_CACHE"; break;
-        case READ_DEFECT_DATA: what = "READ_DEFECT_DATA"; break;
-        case MEDIUM_SCAN: what = "MEDIUM_SCAN"; break;
-        case COMPARE: what = "COMPARE"; break;
-        case COPY_VERIFY: what = "COPY_VERIFY"; break;
-        case WRITE_BUFFER: what = "WRITE_BUFFER"; break;
-        case READ_BUFFER: what = "READ_BUFFER"; break;
-        case UPDATE_BLOCK: what = "UPDATE_BLOCK"; break;
-        case READ_LONG: what = "READ_LONG"; break;
-        case WRITE_LONG: what = "WRITE_LONG"; break;
-        case CHANGE_DEFINITION: what = "CHANGE_DEFINITION"; break;
-        case WRITE_SAME: what = "WRITE_SAME"; break;
-        case GPCMD_READ_SUBCHANNEL: what = "READ SUBCHANNEL"; break;
-        case READ_TOC: what = "READ_TOC"; break;
-        case GPCMD_READ_HEADER: what = "READ HEADER"; break;
-        case GPCMD_PLAY_AUDIO_10: what = "PLAY AUDIO (10)"; break;
-        case GPCMD_PLAY_AUDIO_MSF: what = "PLAY AUDIO MSF"; break;
-        case GPCMD_GET_EVENT_STATUS_NOTIFICATION:
-                what = "GET EVENT/STATUS NOTIFICATION"; break;
-        case GPCMD_PAUSE_RESUME: what = "PAUSE/RESUME"; break;
-        case LOG_SELECT: what = "LOG_SELECT"; break;
-        case LOG_SENSE: what = "LOG_SENSE"; break;
-        case GPCMD_STOP_PLAY_SCAN: what = "STOP PLAY/SCAN"; break;
-        case GPCMD_READ_DISC_INFO: what = "READ DISC INFORMATION"; break;
-        case GPCMD_READ_TRACK_RZONE_INFO:
-                what = "READ TRACK INFORMATION"; break;
-        case GPCMD_RESERVE_RZONE_TRACK: what = "RESERVE TRACK"; break;
-        case GPCMD_SEND_OPC: what = "SEND OPC"; break;
-        case MODE_SELECT_10: what = "MODE_SELECT_10"; break;
-        case GPCMD_REPAIR_RZONE_TRACK: what = "REPAIR TRACK"; break;
-        case 0x59: what = "READ MASTER CUE"; break;
-        case MODE_SENSE_10: what = "MODE_SENSE_10"; break;
-        case GPCMD_CLOSE_TRACK: what = "CLOSE TRACK/SESSION"; break;
-        case 0x5C: what = "READ BUFFER CAPACITY"; break;
-        case 0x5D: what = "SEND CUE SHEET"; break;
-        case GPCMD_BLANK: what = "BLANK"; break;
-        case REPORT_LUNS: what = "REPORT LUNS"; break;
-        case MOVE_MEDIUM: what = "MOVE_MEDIUM or PLAY AUDIO (12)"; break;
-        case READ_12: what = "READ_12"; break;
-        case WRITE_12: what = "WRITE_12"; break;
-        case WRITE_VERIFY_12: what = "WRITE_VERIFY_12"; break;
-        case SEARCH_HIGH_12: what = "SEARCH_HIGH_12"; break;
-        case SEARCH_EQUAL_12: what = "SEARCH_EQUAL_12"; break;
-        case SEARCH_LOW_12: what = "SEARCH_LOW_12"; break;
-        case SEND_VOLUME_TAG: what = "SEND_VOLUME_TAG"; break;
-        case READ_ELEMENT_STATUS: what = "READ_ELEMENT_STATUS"; break;
-        case GPCMD_READ_CD_MSF: what = "READ CD MSF"; break;
-        case GPCMD_SCAN: what = "SCAN"; break;
-        case GPCMD_SET_SPEED: what = "SET CD SPEED"; break;
-        case GPCMD_MECHANISM_STATUS: what = "MECHANISM STATUS"; break;
-        case GPCMD_READ_CD: what = "READ CD"; break;
-        case 0xE1: what = "WRITE CONTINUE"; break;
-        case WRITE_LONG_2: what = "WRITE_LONG_2"; break;
-        case VENDOR_CMND: what = "Realtek's vendor command"; break;
-        default: what = "(unknown command)"; unknown_cmd = 1; break;
-        }
-
-        if (srb->cmnd[0] != TEST_UNIT_READY)
-                RTSX_DEBUGP("Command %s (%d bytes)\n", what, srb->cmd_len);
-
-        if (unknown_cmd) {
-                RTSX_DEBUGP("");
-                for (i = 0; i < srb->cmd_len && i < 16; i++)
-                        RTSX_DEBUGPN(" %02x", srb->cmnd[i]);
-                RTSX_DEBUGPN("\n");
-        }
-}
-
-void set_sense_type(struct rtsx_chip *chip, unsigned int lun, int sense_type)
-{
-        switch (sense_type) {
-        case SENSE_TYPE_MEDIA_CHANGE:
-                set_sense_data(chip, lun, CUR_ERR, 0x06, 0, 0x28, 0, 0, 0);
-                break;
-
-        case SENSE_TYPE_MEDIA_NOT_PRESENT:
-                set_sense_data(chip, lun, CUR_ERR, 0x02, 0, 0x3A, 0, 0, 0);
-                break;
-
-        case SENSE_TYPE_MEDIA_LBA_OVER_RANGE:
-                set_sense_data(chip, lun, CUR_ERR, 0x05, 0, 0x21, 0, 0, 0);
-                break;
-
-        case SENSE_TYPE_MEDIA_LUN_NOT_SUPPORT:
-                set_sense_data(chip, lun, CUR_ERR, 0x05, 0, 0x25, 0, 0, 0);
-                break;
-
-        case SENSE_TYPE_MEDIA_WRITE_PROTECT:
-                set_sense_data(chip, lun, CUR_ERR, 0x07, 0, 0x27, 0, 0, 0);
-                break;
-
-        case SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR:
-                set_sense_data(chip, lun, CUR_ERR, 0x03, 0, 0x11, 0, 0, 0);
-                break;
-
-        case SENSE_TYPE_MEDIA_WRITE_ERR:
-                set_sense_data(chip, lun, CUR_ERR, 0x03, 0, 0x0C, 0x02, 0, 0);
-                break;
-
-        case SENSE_TYPE_MEDIA_INVALID_CMD_FIELD:
-                set_sense_data(chip, lun, CUR_ERR, ILGAL_REQ, 0,
-                                ASC_INVLD_CDB, ASCQ_INVLD_CDB, CDB_ILLEGAL, 1);
-                break;
-
-        case SENSE_TYPE_FORMAT_IN_PROGRESS:
-                set_sense_data(chip, lun, CUR_ERR, 0x02, 0, 0x04, 0x04, 0, 0);
-                break;
-
-        case SENSE_TYPE_FORMAT_CMD_FAILED:
-                set_sense_data(chip, lun, CUR_ERR, 0x03, 0, 0x31, 0x01, 0, 0);
-                break;
-
-#ifdef SUPPORT_MAGIC_GATE
-        case SENSE_TYPE_MG_KEY_FAIL_NOT_ESTAB:
-                set_sense_data(chip, lun, CUR_ERR, 0x05, 0, 0x6F, 0x02, 0, 0);
-                break;
-
-        case SENSE_TYPE_MG_KEY_FAIL_NOT_AUTHEN:
-                set_sense_data(chip, lun, CUR_ERR, 0x05, 0, 0x6F, 0x00, 0, 0);
-                break;
-
-        case SENSE_TYPE_MG_INCOMPATIBLE_MEDIUM:
-                set_sense_data(chip, lun, CUR_ERR, 0x02, 0, 0x30, 0x00, 0, 0);
-                break;
-
-        case SENSE_TYPE_MG_WRITE_ERR:
-                set_sense_data(chip, lun, CUR_ERR, 0x03, 0, 0x0C, 0x00, 0, 0);
-                break;
-#endif
-
-#ifdef SUPPORT_SD_LOCK
-        case SENSE_TYPE_MEDIA_READ_FORBIDDEN:
-                set_sense_data(chip, lun, CUR_ERR, 0x07, 0, 0x11, 0x13, 0, 0);
-                break;
-#endif
-
-        case SENSE_TYPE_NO_SENSE:
-        default:
-                set_sense_data(chip, lun, CUR_ERR, 0, 0, 0, 0, 0, 0);
-                break;
-        }
-}
-
-void set_sense_data(struct rtsx_chip *chip, unsigned int lun, u8 err_code, u8 sense_key,
-                u32 info, u8 asc, u8 ascq, u8 sns_key_info0, u16 sns_key_info1)
-{
-        struct sense_data_t *sense = &(chip->sense_buffer[lun]);
-
-        sense->err_code = err_code;
-        sense->sense_key = sense_key;
-        sense->info[0] = (u8)(info >> 24);
-        sense->info[1] = (u8)(info >> 16);
-        sense->info[2] = (u8)(info >> 8);
-        sense->info[3] = (u8)info;
-
-        sense->ad_sense_len = sizeof(struct sense_data_t) - 8;
-        sense->asc = asc;
-        sense->ascq = ascq;
-        if (sns_key_info0 != 0) {
-                sense->sns_key_info[0] = SKSV | sns_key_info0;
-                sense->sns_key_info[1] = (sns_key_info1 & 0xf0) >> 8;
-                sense->sns_key_info[2] = sns_key_info1 & 0x0f;
-        }
-}
-
-static int test_unit_ready(struct scsi_cmnd *srb, struct rtsx_chip *chip)
-{
-        unsigned int lun = SCSI_LUN(srb);
-
-        if (!check_card_ready(chip, lun)) {
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_NOT_PRESENT);
-                return TRANSPORT_FAILED;
-        }
-
-        if (!(CHK_BIT(chip->lun_mc, lun))) {
-                SET_BIT(chip->lun_mc, lun);
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_CHANGE);
-                return TRANSPORT_FAILED;
-        }
-
-#ifdef SUPPORT_SD_LOCK
-        if (get_lun_card(chip, SCSI_LUN(srb)) == SD_CARD) {
-                struct sd_info *sd_card = &(chip->sd_card);
-                if (sd_card->sd_lock_notify) {
-                        sd_card->sd_lock_notify = 0;
-                        set_sense_type(chip, lun, SENSE_TYPE_MEDIA_CHANGE);
-                        return TRANSPORT_FAILED;
-                } else if (sd_card->sd_lock_status & SD_LOCKED) {
-                        set_sense_type(chip, lun, SENSE_TYPE_MEDIA_READ_FORBIDDEN);
-                        return TRANSPORT_FAILED;
-                }
-        }
-#endif
-
-        return TRANSPORT_GOOD;
-}
-
-static unsigned char formatter_inquiry_str[20] = {
-        'M', 'E', 'M', 'O', 'R', 'Y', 'S', 'T', 'I', 'C', 'K',
-#ifdef SUPPORT_MAGIC_GATE
-        '-', 'M', 'G', /* Byte[47:49] */
-#else
-        0x20, 0x20, 0x20,  /* Byte[47:49] */
-#endif
-
-#ifdef SUPPORT_MAGIC_GATE
-        0x0B,  /* Byte[50]: MG, MS, MSPro, MSXC */
-#else
-        0x09,  /* Byte[50]: MS, MSPro, MSXC */
-#endif
-        0x00,  /* Byte[51]: Category Specific Commands */
-        0x00,  /* Byte[52]: Access Control and feature */
-        0x20, 0x20, 0x20, /* Byte[53:55] */
-};
-
-static int inquiry(struct scsi_cmnd *srb, struct rtsx_chip *chip)
-{
-        unsigned int lun = SCSI_LUN(srb);
-        char *inquiry_default = (char *)"Generic-xD/SD/M.S.      1.00 ";
-        char *inquiry_sdms =    (char *)"Generic-SD/MemoryStick  1.00 ";
-        char *inquiry_sd =      (char *)"Generic-SD/MMC          1.00 ";
-        char *inquiry_ms =      (char *)"Generic-MemoryStick     1.00 ";
-        char *inquiry_string;
-        unsigned char sendbytes;
-        unsigned char *buf;
-        u8 card = get_lun_card(chip, lun);
-        int pro_formatter_flag = 0;
-        unsigned char inquiry_buf[] = {
-                QULIFIRE|DRCT_ACCESS_DEV,
-                RMB_DISC|0x0D,
-                0x00,
-                0x01,
-                0x1f,
-                0x02,
-                0,
-                REL_ADR|WBUS_32|WBUS_16|SYNC|LINKED|CMD_QUE|SFT_RE,
-        };
-
-        if (CHECK_LUN_MODE(chip, SD_MS_2LUN)) {
-                if (chip->lun2card[lun] == SD_CARD)
-                        inquiry_string = inquiry_sd;
-                else
-                        inquiry_string = inquiry_ms;
-
-        } else if (CHECK_LUN_MODE(chip, SD_MS_1LUN)) {
-                inquiry_string = inquiry_sdms;
-        } else {
-                inquiry_string = inquiry_default;
-        }
-
-        buf = vmalloc(scsi_bufflen(srb));
-        if (buf == NULL)
-                TRACE_RET(chip, TRANSPORT_ERROR);
-
-#ifdef SUPPORT_MAGIC_GATE
-        if ((chip->mspro_formatter_enable) &&
-                        (chip->lun2card[lun] & MS_CARD))
-#else
-        if (chip->mspro_formatter_enable)
-#endif
-        {
-                if (!card || (card == MS_CARD))
-                        pro_formatter_flag = 1;
-        }
-
-        if (pro_formatter_flag) {
-                if (scsi_bufflen(srb) < 56)
-                        sendbytes = (unsigned char)(scsi_bufflen(srb));
-                else
-                        sendbytes = 56;
-
-        } else {
-                if (scsi_bufflen(srb) < 36)
-                        sendbytes = (unsigned char)(scsi_bufflen(srb));
-                else
-                        sendbytes = 36;
-        }
-
-        if (sendbytes > 8) {
-                memcpy(buf, inquiry_buf, 8);
-                memcpy(buf + 8, inquiry_string, sendbytes - 8);
-                if (pro_formatter_flag) {
-                        /* Additional Length */
-                        buf[4] = 0x33;
-                }
-        } else {
-                memcpy(buf, inquiry_buf, sendbytes);
-        }
-
-        if (pro_formatter_flag) {
-                if (sendbytes > 36)
-                        memcpy(buf + 36, formatter_inquiry_str, sendbytes - 36);
-        }
-
-        scsi_set_resid(srb, 0);
-
-        rtsx_stor_set_xfer_buf(buf, scsi_bufflen(srb), srb);
-        vfree(buf);
-
-        return TRANSPORT_GOOD;
-}
-
-
-static int start_stop_unit(struct scsi_cmnd *srb, struct rtsx_chip *chip)
-{
-        unsigned int lun = SCSI_LUN(srb);
-
-        scsi_set_resid(srb, scsi_bufflen(srb));
-
-        if (srb->cmnd[1] == 1)
-                return TRANSPORT_GOOD;
-
-        switch (srb->cmnd[0x4]) {
-        case STOP_MEDIUM:
-                /* Media disabled */
-                return TRANSPORT_GOOD;
-
-        case UNLOAD_MEDIUM:
-                /* Media shall be unload */
-                if (check_card_ready(chip, lun))
-                        eject_card(chip, lun);
-                return TRANSPORT_GOOD;
-
-        case MAKE_MEDIUM_READY:
-        case LOAD_MEDIUM:
-                if (check_card_ready(chip, lun)) {
-                        return TRANSPORT_GOOD;
-                } else {
-                        set_sense_type(chip, lun, SENSE_TYPE_MEDIA_NOT_PRESENT);
-                        TRACE_RET(chip, TRANSPORT_FAILED);
-                }
-
-                break;
-        }
-
-        TRACE_RET(chip, TRANSPORT_ERROR);
-}
-
-
-static int allow_medium_removal(struct scsi_cmnd *srb, struct rtsx_chip *chip)
-{
-        int prevent;
-
-        prevent = srb->cmnd[4] & 0x1;
-
-        scsi_set_resid(srb, 0);
-
-        if (prevent) {
-                set_sense_type(chip, SCSI_LUN(srb), SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
-                TRACE_RET(chip, TRANSPORT_FAILED);
-        }
-
-        return TRANSPORT_GOOD;
-}
-
-
-static int request_sense(struct scsi_cmnd *srb, struct rtsx_chip *chip)
-{
-        struct sense_data_t *sense;
-        unsigned int lun = SCSI_LUN(srb);
-        struct ms_info *ms_card = &(chip->ms_card);
-        unsigned char *tmp, *buf;
-
-        sense = &(chip->sense_buffer[lun]);
-
-        if ((get_lun_card(chip, lun) == MS_CARD) && ms_card->pro_under_formatting) {
-                if (ms_card->format_status == FORMAT_SUCCESS) {
-                        set_sense_type(chip, lun, SENSE_TYPE_NO_SENSE);
-                        ms_card->pro_under_formatting = 0;
-                        ms_card->progress = 0;
-                } else if (ms_card->format_status == FORMAT_IN_PROGRESS) {
-                        /* Logical Unit Not Ready Format in Progress */
-                        set_sense_data(chip, lun, CUR_ERR, 0x02, 0, 0x04, 0x04,
-                                        0, (u16)(ms_card->progress));
-                } else {
-                        /* Format Command Failed */
-                        set_sense_type(chip, lun, SENSE_TYPE_FORMAT_CMD_FAILED);
-                        ms_card->pro_under_formatting = 0;
-                        ms_card->progress = 0;
-                }
-
-                rtsx_set_stat(chip, RTSX_STAT_RUN);
-        }
-
-        buf = vmalloc(scsi_bufflen(srb));
-        if (buf == NULL)
-                TRACE_RET(chip, TRANSPORT_ERROR);
-
-        tmp = (unsigned char *)sense;
-        memcpy(buf, tmp, scsi_bufflen(srb));
-
-        rtsx_stor_set_xfer_buf(buf, scsi_bufflen(srb), srb);
-        vfree(buf);
-
-        scsi_set_resid(srb, 0);
-        /* Reset Sense Data */
-        set_sense_type(chip, lun, SENSE_TYPE_NO_SENSE);
-        return TRANSPORT_GOOD;
-}
-
-static void ms_mode_sense(struct rtsx_chip *chip, u8 cmd,
-                int lun, u8 *buf, int buf_len)
-{
-        struct ms_info *ms_card = &(chip->ms_card);
-        int sys_info_offset;
-        int data_size = buf_len;
-        int support_format = 0;
-        int i = 0;
-
-        if (cmd == MODE_SENSE) {
-                sys_info_offset = 8;
-                if (data_size > 0x68)
-                        data_size = 0x68;
-
-                buf[i++] = 0x67;  /* Mode Data Length */
-        } else {
-                sys_info_offset = 12;
-                if (data_size > 0x6C)
-                        data_size = 0x6C;
-
-                buf[i++] = 0x00;  /* Mode Data Length (MSB) */
-                buf[i++] = 0x6A;  /* Mode Data Length (LSB) */
-        }
-
-        /* Medium Type Code */
-        if (check_card_ready(chip, lun)) {
-                if (CHK_MSXC(ms_card)) {
-                        support_format = 1;
-                        buf[i++] = 0x40;
-                } else if (CHK_MSPRO(ms_card)) {
-                        support_format = 1;
-                        buf[i++] = 0x20;
-                } else {
-                        buf[i++] = 0x10;
-                }
-
-                /* WP */
-                if (check_card_wp(chip, lun))
-                        buf[i++] = 0x80;
-                else
-                        buf[i++] = 0x00;
-
-        } else {
-                buf[i++] = 0x00;        /* MediaType */
-                buf[i++] = 0x00;        /* WP */
-        }
-
-        buf[i++] = 0x00;                /* Reserved */
-
-        if (cmd == MODE_SENSE_10) {
-                buf[i++] = 0x00;  /* Reserved */
-                buf[i++] = 0x00;  /* Block descriptor length(MSB) */
-                buf[i++] = 0x00;  /* Block descriptor length(LSB) */
-
-                /* The Following Data is the content of "Page 0x20" */
-                if (data_size >= 9)
-                        buf[i++] = 0x20;                /* Page Code */
-                if (data_size >= 10)
-                        buf[i++] = 0x62;                /* Page Length */
-                if (data_size >= 11)
-                        buf[i++] = 0x00;                /* No Access Control */
-                if (data_size >= 12) {
-                        if (support_format)
-                                buf[i++] = 0xC0;        /* SF, SGM */
-                        else
-                                buf[i++] = 0x00;
-                }
-        } else {
-                /* The Following Data is the content of "Page 0x20" */
-                if (data_size >= 5)
-                        buf[i++] = 0x20;                /* Page Code */
-                if (data_size >= 6)
-                        buf[i++] = 0x62;                /* Page Length */
-                if (data_size >= 7)
-                        buf[i++] = 0x00;                /* No Access Control */
-                if (data_size >= 8) {
-                        if (support_format)
-                                buf[i++] = 0xC0;        /* SF, SGM */
-                        else
-                                buf[i++] = 0x00;
-                }
-        }
-
-        if (data_size > sys_info_offset) {
-                /* 96 Bytes Attribute Data */
-                int len = data_size - sys_info_offset;
-                len = (len < 96) ? len : 96;
-
-                memcpy(buf + sys_info_offset, ms_card->raw_sys_info, len);
-        }
-}
-
-static int mode_sense(struct scsi_cmnd *srb, struct rtsx_chip *chip)
-{
-        unsigned int lun = SCSI_LUN(srb);
-        unsigned int dataSize;
-        int status;
-        int pro_formatter_flag;
-        unsigned char pageCode, *buf;
-        u8 card = get_lun_card(chip, lun);
-
-#ifndef SUPPORT_MAGIC_GATE
-        if (!check_card_ready(chip, lun)) {
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_NOT_PRESENT);
-                scsi_set_resid(srb, scsi_bufflen(srb));
-                TRACE_RET(chip, TRANSPORT_FAILED);
-        }
-#endif
-
-        pro_formatter_flag = 0;
-        dataSize = 8;
-#ifdef SUPPORT_MAGIC_GATE
-        if ((chip->lun2card[lun] & MS_CARD)) {
-                if (!card || (card == MS_CARD)) {
-                        dataSize = 108;
-                        if (chip->mspro_formatter_enable)
-                                pro_formatter_flag = 1;
-                }
-        }
-#else
-        if (card == MS_CARD) {
-                if (chip->mspro_formatter_enable) {
-                        pro_formatter_flag = 1;
-                        dataSize = 108;
-                }
-        }
-#endif
-
-        buf = kmalloc(dataSize, GFP_KERNEL);
-        if (buf == NULL)
-                TRACE_RET(chip, TRANSPORT_ERROR);
-
-        pageCode = srb->cmnd[2] & 0x3f;
-
-        if ((pageCode == 0x3F) || (pageCode == 0x1C) ||
-                (pageCode == 0x00) ||
-                (pro_formatter_flag && (pageCode == 0x20))) {
-                if (srb->cmnd[0] == MODE_SENSE) {
-                        if ((pageCode == 0x3F) || (pageCode == 0x20)) {
-                                ms_mode_sense(chip, srb->cmnd[0],
-                                              lun, buf, dataSize);
-                        } else {
-                                dataSize = 4;
-                                buf[0] = 0x03;
-                                buf[1] = 0x00;
-                                if (check_card_wp(chip, lun))
-                                        buf[2] = 0x80;
-                                else
-                                        buf[2] = 0x00;
-
-                                buf[3] = 0x00;
-                        }
-                } else {
-                        if ((pageCode == 0x3F) || (pageCode == 0x20)) {
-                                ms_mode_sense(chip, srb->cmnd[0],
-                                              lun, buf, dataSize);
-                        } else {
-                                dataSize = 8;
-                                buf[0] = 0x00;
-                                buf[1] = 0x06;
-                                buf[2] = 0x00;
-                                if (check_card_wp(chip, lun))
-                                        buf[3] = 0x80;
-                                else
-                                        buf[3] = 0x00;
-                                buf[4] = 0x00;
-                                buf[5] = 0x00;
-                                buf[6] = 0x00;
-                                buf[7] = 0x00;
-                        }
-                }
-                status = TRANSPORT_GOOD;
-        } else {
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
-                scsi_set_resid(srb, scsi_bufflen(srb));
-                status = TRANSPORT_FAILED;
-        }
-
-        if (status == TRANSPORT_GOOD) {
-                unsigned int len = min(scsi_bufflen(srb), dataSize);
-                rtsx_stor_set_xfer_buf(buf, len, srb);
-                scsi_set_resid(srb, scsi_bufflen(srb) - len);
-        }
-        kfree(buf);
-
-        return status;
-}
-
-static int read_write(struct scsi_cmnd *srb, struct rtsx_chip *chip)
-{
-#ifdef SUPPORT_SD_LOCK
-        struct sd_info *sd_card = &(chip->sd_card);
-#endif
-        unsigned int lun = SCSI_LUN(srb);
-        int retval;
-        u32 start_sec;
-        u16 sec_cnt;
-
-        rtsx_disable_aspm(chip);
-
-        if (chip->ss_en && (rtsx_get_stat(chip) == RTSX_STAT_SS)) {
-                rtsx_exit_ss(chip);
-                wait_timeout(100);
-        }
-        rtsx_set_stat(chip, RTSX_STAT_RUN);
-
-        if (!check_card_ready(chip, lun) || (get_card_size(chip, lun) == 0)) {
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_NOT_PRESENT);
-                TRACE_RET(chip, TRANSPORT_FAILED);
-        }
-
-        if (!(CHK_BIT(chip->lun_mc, lun))) {
-                SET_BIT(chip->lun_mc, lun);
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_CHANGE);
-                return TRANSPORT_FAILED;
-        }
-
-#ifdef SUPPORT_SD_LOCK
-        if (sd_card->sd_erase_status) {
-                /* Accessing to any card is forbidden
-                 * until the erase procedure of SD is completed
-                 */
-                RTSX_DEBUGP("SD card being erased!\n");
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_READ_FORBIDDEN);
-                TRACE_RET(chip, TRANSPORT_FAILED);
-        }
-
-        if (get_lun_card(chip, lun) == SD_CARD) {
-                if (sd_card->sd_lock_status & SD_LOCKED) {
-                        RTSX_DEBUGP("SD card locked!\n");
-                        set_sense_type(chip, lun, SENSE_TYPE_MEDIA_READ_FORBIDDEN);
-                        TRACE_RET(chip, TRANSPORT_FAILED);
-                }
-        }
-#endif
-
-        if ((srb->cmnd[0] == READ_10) || (srb->cmnd[0] == WRITE_10)) {
-                start_sec = ((u32)srb->cmnd[2] << 24) | ((u32)srb->cmnd[3] << 16) |
-                        ((u32)srb->cmnd[4] << 8) | ((u32)srb->cmnd[5]);
-                sec_cnt = ((u16)(srb->cmnd[7]) << 8) | srb->cmnd[8];
-        } else if ((srb->cmnd[0] == READ_6) || (srb->cmnd[0] == WRITE_6)) {
-                start_sec = ((u32)(srb->cmnd[1] & 0x1F) << 16) |
-                        ((u32)srb->cmnd[2] << 8) | ((u32)srb->cmnd[3]);
-                sec_cnt = srb->cmnd[4];
-        } else if ((srb->cmnd[0] == VENDOR_CMND) && (srb->cmnd[1] == SCSI_APP_CMD) &&
-                        ((srb->cmnd[2] == PP_READ10) || (srb->cmnd[2] == PP_WRITE10))) {
-                start_sec = ((u32)srb->cmnd[4] << 24) | ((u32)srb->cmnd[5] << 16) |
-                        ((u32)srb->cmnd[6] << 8) | ((u32)srb->cmnd[7]);
-                sec_cnt = ((u16)(srb->cmnd[9]) << 8) | srb->cmnd[10];
-        } else {
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
-                TRACE_RET(chip, TRANSPORT_FAILED);
-        }
-
-        /* In some test, we will receive a start_sec like 0xFFFFFFFF.
-         * In this situation, start_sec + sec_cnt will overflow, so we
-         * need to judge start_sec at first
-         */
-        if ((start_sec > get_card_size(chip, lun)) ||
-                        ((start_sec + sec_cnt) > get_card_size(chip, lun))) {
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_LBA_OVER_RANGE);
-                TRACE_RET(chip, TRANSPORT_FAILED);
-        }
-
-        if (sec_cnt == 0) {
-                scsi_set_resid(srb, 0);
-                return TRANSPORT_GOOD;
-        }
-
-        if (chip->rw_fail_cnt[lun] == 3) {
-                RTSX_DEBUGP("read/write fail three times in succession\n");
-                if (srb->sc_data_direction == DMA_FROM_DEVICE)
-                        set_sense_type(chip, lun, SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR);
-                else
-                        set_sense_type(chip, lun, SENSE_TYPE_MEDIA_WRITE_ERR);
-
-                TRACE_RET(chip, TRANSPORT_FAILED);
-        }
-
-        if (srb->sc_data_direction == DMA_TO_DEVICE) {
-                if (check_card_wp(chip, lun)) {
-                        RTSX_DEBUGP("Write protected card!\n");
-                        set_sense_type(chip, lun, SENSE_TYPE_MEDIA_WRITE_PROTECT);
-                        TRACE_RET(chip, TRANSPORT_FAILED);
-                }
-                if (CHECK_PID(chip, 0x5209) && chip->max_payload) {
-                        u8 val = 0x10 | (chip->max_payload << 5);
-                        retval = rtsx_write_cfg_dw(chip, 0, 0x78, 0xFF, val);
-                        if (retval != STATUS_SUCCESS)
-                                TRACE_RET(chip, TRANSPORT_ERROR);
-                }
-        }
-
-        retval = card_rw(srb, chip, start_sec, sec_cnt);
-        if (retval != STATUS_SUCCESS) {
-                if (chip->need_release & chip->lun2card[lun]) {
-                        chip->rw_fail_cnt[lun] = 0;
-                        set_sense_type(chip, lun, SENSE_TYPE_MEDIA_NOT_PRESENT);
-                } else {
-                        chip->rw_fail_cnt[lun]++;
-                        if (srb->sc_data_direction == DMA_FROM_DEVICE)
-                                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR);
-                        else
-                                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_WRITE_ERR);
-                }
-                retval = TRANSPORT_FAILED;
-                TRACE_GOTO(chip, Exit);
-        } else {
-                chip->rw_fail_cnt[lun] = 0;
-                retval = TRANSPORT_GOOD;
-        }
-
-        scsi_set_resid(srb, 0);
-
-Exit:
-        if (srb->sc_data_direction == DMA_TO_DEVICE) {
-                if (CHECK_PID(chip, 0x5209) && chip->max_payload) {
-                        retval = rtsx_write_cfg_dw(chip, 0, 0x78, 0xFF, 0x10);
-                        if (retval != STATUS_SUCCESS)
-                                TRACE_RET(chip, TRANSPORT_ERROR);
-                }
-        }
-
-        return retval;
-}
-
-static int read_format_capacity(struct scsi_cmnd *srb, struct rtsx_chip *chip)
-{
-        unsigned char *buf;
-        unsigned int lun = SCSI_LUN(srb);
-        unsigned int buf_len;
-        u8 card = get_lun_card(chip, lun);
-        u32 card_size;
-        int desc_cnt;
-        int i = 0;
-
-        if (!check_card_ready(chip, lun)) {
-                if (!chip->mspro_formatter_enable) {
-                        set_sense_type(chip, lun, SENSE_TYPE_MEDIA_NOT_PRESENT);
-                        TRACE_RET(chip, TRANSPORT_FAILED);
-                }
-        }
-
-        buf_len = (scsi_bufflen(srb) > 12) ? 0x14 : 12;
-
-        buf = kmalloc(buf_len, GFP_KERNEL);
-        if (buf == NULL)
-                TRACE_RET(chip, TRANSPORT_ERROR);
-
-        buf[i++] = 0;
-        buf[i++] = 0;
-        buf[i++] = 0;
-
-        /* Capacity List Length */
-        if ((buf_len > 12) && chip->mspro_formatter_enable &&
-                        (chip->lun2card[lun] & MS_CARD) &&
-                        (!card || (card == MS_CARD))) {
-                buf[i++] = 0x10;
-                desc_cnt = 2;
-        } else {
-                buf[i++] = 0x08;
-                desc_cnt = 1;
-        }
-
-        while (desc_cnt) {
-                if (check_card_ready(chip, lun)) {
-                        card_size = get_card_size(chip, lun);
-                        buf[i++] = (unsigned char)(card_size >> 24);
-                        buf[i++] = (unsigned char)(card_size >> 16);
-                        buf[i++] = (unsigned char)(card_size >> 8);
-                        buf[i++] = (unsigned char)card_size;
-
-                        if (desc_cnt == 2)
-                                buf[i++] = 2;
-                        else
-                                buf[i++] = 0;
-                } else {
-                        buf[i++] = 0xFF;
-                        buf[i++] = 0xFF;
-                        buf[i++] = 0xFF;
-                        buf[i++] = 0xFF;
-
-                        if (desc_cnt == 2)
-                                buf[i++] = 3;
-                        else
-                                buf[i++] = 0;
-                }
-
-                buf[i++] = 0x00;
-                buf[i++] = 0x02;
-                buf[i++] = 0x00;
-
-                desc_cnt--;
-        }
-
-        buf_len = min(scsi_bufflen(srb), buf_len);
-        rtsx_stor_set_xfer_buf(buf, buf_len, srb);
-        kfree(buf);
-
-        scsi_set_resid(srb, scsi_bufflen(srb) - buf_len);
-
-        return TRANSPORT_GOOD;
-}
-
-static int read_capacity(struct scsi_cmnd *srb, struct rtsx_chip *chip)
-{
-        unsigned char *buf;
-        unsigned int lun = SCSI_LUN(srb);
-        u32 card_size;
-
-        if (!check_card_ready(chip, lun)) {
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_NOT_PRESENT);
-                TRACE_RET(chip, TRANSPORT_FAILED);
-        }
-
-        if (!(CHK_BIT(chip->lun_mc, lun))) {
-                SET_BIT(chip->lun_mc, lun);
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_CHANGE);
-                return TRANSPORT_FAILED;
-        }
-
-        buf = kmalloc(8, GFP_KERNEL);
-        if (buf == NULL)
-                TRACE_RET(chip, TRANSPORT_ERROR);
-
-        card_size = get_card_size(chip, lun);
-        buf[0] = (unsigned char)((card_size - 1) >> 24);
-        buf[1] = (unsigned char)((card_size - 1) >> 16);
-        buf[2] = (unsigned char)((card_size - 1) >> 8);
-        buf[3] = (unsigned char)(card_size - 1);
-
-        buf[4] = 0x00;
-        buf[5] = 0x00;
-        buf[6] = 0x02;
-        buf[7] = 0x00;
-
-        rtsx_stor_set_xfer_buf(buf, scsi_bufflen(srb), srb);
-        kfree(buf);
-
-        scsi_set_resid(srb, 0);
-
-        return TRANSPORT_GOOD;
-}
-
-static int read_eeprom(struct scsi_cmnd *srb, struct rtsx_chip *chip)
-{
-        unsigned short len, i;
-        int retval;
-        u8 *buf;
-
-        rtsx_disable_aspm(chip);
-
-        if (chip->ss_en && (rtsx_get_stat(chip) == RTSX_STAT_SS)) {
-                rtsx_exit_ss(chip);
-                wait_timeout(100);
-        }
-        rtsx_set_stat(chip, RTSX_STAT_RUN);
-
-        len = ((u16)srb->cmnd[4] << 8) | srb->cmnd[5];
-
-        buf = (u8 *)vmalloc(len);
-        if (!buf)
-                TRACE_RET(chip, TRANSPORT_ERROR);
-
-        retval = rtsx_force_power_on(chip, SSC_PDCTL);
-        if (retval != STATUS_SUCCESS) {
-                vfree(buf);
-                set_sense_type(chip, SCSI_LUN(srb), SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR);
-                TRACE_RET(chip, TRANSPORT_FAILED);
-        }
-
-        for (i = 0; i < len; i++) {
-                retval = spi_read_eeprom(chip, i, buf + i);
-                if (retval != STATUS_SUCCESS) {
-                        vfree(buf);
-                        set_sense_type(chip, SCSI_LUN(srb), SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR);
-                        TRACE_RET(chip, TRANSPORT_FAILED);
-                }
-        }
-
-        len = (unsigned short)min(scsi_bufflen(srb), (unsigned int)len);
-        rtsx_stor_set_xfer_buf(buf, len, srb);
-        scsi_set_resid(srb, scsi_bufflen(srb) - len);
-
-        vfree(buf);
-
-        return TRANSPORT_GOOD;
-}
-
-static int write_eeprom(struct scsi_cmnd *srb, struct rtsx_chip *chip)
-{
-        unsigned short len, i;
-        int retval;
-        u8 *buf;
-
-        rtsx_disable_aspm(chip);
-
-        if (chip->ss_en && (rtsx_get_stat(chip) == RTSX_STAT_SS)) {
-                rtsx_exit_ss(chip);
-                wait_timeout(100);
-        }
-        rtsx_set_stat(chip, RTSX_STAT_RUN);
-
-        len = ((u16)srb->cmnd[4] << 8) | srb->cmnd[5];
-
-        retval = rtsx_force_power_on(chip, SSC_PDCTL);
-        if (retval != STATUS_SUCCESS) {
-                set_sense_type(chip, SCSI_LUN(srb), SENSE_TYPE_MEDIA_WRITE_ERR);
-                TRACE_RET(chip, TRANSPORT_FAILED);
-        }
-
-        if (len == 511) {
-                retval = spi_erase_eeprom_chip(chip);
-                if (retval != STATUS_SUCCESS) {
-                        set_sense_type(chip, SCSI_LUN(srb), SENSE_TYPE_MEDIA_WRITE_ERR);
-                        TRACE_RET(chip, TRANSPORT_FAILED);
-                }
-        } else {
-                len = (unsigned short)min(scsi_bufflen(srb), (unsigned int)len);
-                buf = (u8 *)vmalloc(len);
-                if (buf == NULL)
-                        TRACE_RET(chip, TRANSPORT_ERROR);
-
-                rtsx_stor_get_xfer_buf(buf, len, srb);
-                scsi_set_resid(srb, scsi_bufflen(srb) - len);
-
-                for (i = 0; i < len; i++) {
-                        retval = spi_write_eeprom(chip, i, buf[i]);
-                        if (retval != STATUS_SUCCESS) {
-                                vfree(buf);
-                                set_sense_type(chip, SCSI_LUN(srb), SENSE_TYPE_MEDIA_WRITE_ERR);
-                                TRACE_RET(chip, TRANSPORT_FAILED);
-                        }
-                }
-
-                vfree(buf);
-        }
-
-        return TRANSPORT_GOOD;
-}
-
-static int read_mem(struct scsi_cmnd *srb, struct rtsx_chip *chip)
-{
-        unsigned short addr, len, i;
-        int retval;
-        u8 *buf;
-
-        rtsx_disable_aspm(chip);
-
-        if (chip->ss_en && (rtsx_get_stat(chip) == RTSX_STAT_SS)) {
-                rtsx_exit_ss(chip);
-                wait_timeout(100);
-        }
-        rtsx_set_stat(chip, RTSX_STAT_RUN);
-
-        addr = ((u16)srb->cmnd[2] << 8) | srb->cmnd[3];
-        len = ((u16)srb->cmnd[4] << 8) | srb->cmnd[5];
-
-        if (addr < 0xFC00) {
-                set_sense_type(chip, SCSI_LUN(srb), SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
-                TRACE_RET(chip, TRANSPORT_FAILED);
-        }
-
-        buf = (u8 *)vmalloc(len);
-        if (!buf)
-                TRACE_RET(chip, TRANSPORT_ERROR);
-
-        retval = rtsx_force_power_on(chip, SSC_PDCTL);
-        if (retval != STATUS_SUCCESS) {
-                vfree(buf);
-                set_sense_type(chip, SCSI_LUN(srb), SENSE_TYPE_MEDIA_WRITE_ERR);
-                TRACE_RET(chip, TRANSPORT_FAILED);
-        }
-
-        for (i = 0; i < len; i++) {
-                retval = rtsx_read_register(chip, addr + i, buf + i);
-                if (retval != STATUS_SUCCESS) {
-                        vfree(buf);
-                        set_sense_type(chip, SCSI_LUN(srb), SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR);
-                        TRACE_RET(chip, TRANSPORT_FAILED);
-                }
-        }
-
-        len = (unsigned short)min(scsi_bufflen(srb), (unsigned int)len);
-        rtsx_stor_set_xfer_buf(buf, len, srb);
-        scsi_set_resid(srb, scsi_bufflen(srb) - len);
-
-        vfree(buf);
-
-        return TRANSPORT_GOOD;
-}
-
-static int write_mem(struct scsi_cmnd *srb, struct rtsx_chip *chip)
-{
-        unsigned short addr, len, i;
-        int retval;
-        u8 *buf;
-
-        rtsx_disable_aspm(chip);
-
-        if (chip->ss_en && (rtsx_get_stat(chip) == RTSX_STAT_SS)) {
-                rtsx_exit_ss(chip);
-                wait_timeout(100);
-        }
-        rtsx_set_stat(chip, RTSX_STAT_RUN);
-
-        addr = ((u16)srb->cmnd[2] << 8) | srb->cmnd[3];
-        len = ((u16)srb->cmnd[4] << 8) | srb->cmnd[5];
-
-        if (addr < 0xFC00) {
-                set_sense_type(chip, SCSI_LUN(srb), SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
-                TRACE_RET(chip, TRANSPORT_FAILED);
-        }
-
-        len = (unsigned short)min(scsi_bufflen(srb), (unsigned int)len);
-        buf = (u8 *)vmalloc(len);
-        if (buf == NULL)
-                TRACE_RET(chip, TRANSPORT_ERROR);
-
-        rtsx_stor_get_xfer_buf(buf, len, srb);
-        scsi_set_resid(srb, scsi_bufflen(srb) - len);
-
-        retval = rtsx_force_power_on(chip, SSC_PDCTL);
-        if (retval != STATUS_SUCCESS) {
-                vfree(buf);
-                set_sense_type(chip, SCSI_LUN(srb), SENSE_TYPE_MEDIA_WRITE_ERR);
-                TRACE_RET(chip, TRANSPORT_FAILED);
-        }
-
-        for (i = 0; i < len; i++) {
-                retval = rtsx_write_register(chip, addr + i, 0xFF, buf[i]);
-                if (retval != STATUS_SUCCESS) {
-                        vfree(buf);
-                        set_sense_type(chip, SCSI_LUN(srb), SENSE_TYPE_MEDIA_WRITE_ERR);
-                        TRACE_RET(chip, TRANSPORT_FAILED);
-                }
-        }
-
-        vfree(buf);
-
-        return TRANSPORT_GOOD;
-}
-
-static int get_sd_csd(struct scsi_cmnd *srb, struct rtsx_chip *chip)
-{
-        struct sd_info *sd_card = &(chip->sd_card);
-        unsigned int lun = SCSI_LUN(srb);
-
-        if (!check_card_ready(chip, lun)) {
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_NOT_PRESENT);
-                TRACE_RET(chip, TRANSPORT_FAILED);
-        }
-
-        if (get_lun_card(chip, lun) != SD_CARD) {
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR);
-                TRACE_RET(chip, TRANSPORT_FAILED);
-        }
-
-        scsi_set_resid(srb, 0);
-        rtsx_stor_set_xfer_buf(sd_card->raw_csd, scsi_bufflen(srb), srb);
-
-        return TRANSPORT_GOOD;
-}
-
-static int toggle_gpio_cmd(struct scsi_cmnd *srb, struct rtsx_chip *chip)
-{
-        u8 gpio = srb->cmnd[2];
-
-        rtsx_disable_aspm(chip);
-
-        if (chip->ss_en && (rtsx_get_stat(chip) == RTSX_STAT_SS)) {
-                rtsx_exit_ss(chip);
-                wait_timeout(100);
-        }
-        rtsx_set_stat(chip, RTSX_STAT_RUN);
-
-        if (gpio > 3)
-                gpio = 1;
-        toggle_gpio(chip, gpio);
-
-        return TRANSPORT_GOOD;
-}
-
-#ifdef _MSG_TRACE
-static int trace_msg_cmd(struct scsi_cmnd *srb, struct rtsx_chip *chip)
-{
-        unsigned char *ptr, *buf = NULL;
-        int i, msg_cnt;
-        u8 clear;
-        unsigned int buf_len;
-
-        buf_len = 4 + ((2 + MSG_FUNC_LEN + MSG_FILE_LEN + TIME_VAL_LEN) * TRACE_ITEM_CNT);
-
-        if ((scsi_bufflen(srb) < buf_len) || (scsi_sglist(srb) == NULL)) {
-                set_sense_type(chip, SCSI_LUN(srb), SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR);
-                TRACE_RET(chip, TRANSPORT_FAILED);
-        }
-
-        clear = srb->cmnd[2];
-
-        buf = (unsigned char *)vmalloc(scsi_bufflen(srb));
-        if (buf == NULL)
-                TRACE_RET(chip, TRANSPORT_ERROR);
-        ptr = buf;
-
-        if (chip->trace_msg[chip->msg_idx].valid)
-                msg_cnt = TRACE_ITEM_CNT;
-        else
-                msg_cnt = chip->msg_idx;
-
-        *(ptr++) = (u8)(msg_cnt >> 24);
-        *(ptr++) = (u8)(msg_cnt >> 16);
-        *(ptr++) = (u8)(msg_cnt >> 8);
-        *(ptr++) = (u8)msg_cnt;
-        RTSX_DEBUGP("Trace message count is %d\n", msg_cnt);
-
-        for (i = 1; i <= msg_cnt; i++) {
-                int j, idx;
-
-                idx = chip->msg_idx - i;
-                if (idx < 0)
-                        idx += TRACE_ITEM_CNT;
-
-                *(ptr++) = (u8)(chip->trace_msg[idx].line >> 8);
-                *(ptr++) = (u8)(chip->trace_msg[idx].line);
-                for (j = 0; j < MSG_FUNC_LEN; j++)
-                        *(ptr++) = chip->trace_msg[idx].func[j];
-
-                for (j = 0; j < MSG_FILE_LEN; j++)
-                        *(ptr++) = chip->trace_msg[idx].file[j];
-
-                for (j = 0; j < TIME_VAL_LEN; j++)
-                        *(ptr++) = chip->trace_msg[idx].timeval_buf[j];
-        }
-
-        rtsx_stor_set_xfer_buf(buf, scsi_bufflen(srb), srb);
-        vfree(buf);
-
-        if (clear) {
-                chip->msg_idx = 0;
-                for (i = 0; i < TRACE_ITEM_CNT; i++)
-                        chip->trace_msg[i].valid = 0;
-        }
-
-        scsi_set_resid(srb, 0);
-        return TRANSPORT_GOOD;
-}
-#endif
-
-static int read_host_reg(struct scsi_cmnd *srb, struct rtsx_chip *chip)
-{
-        u8 addr, buf[4];
-        u32 val;
-        unsigned int len;
-
-        rtsx_disable_aspm(chip);
-
-        if (chip->ss_en && (rtsx_get_stat(chip) == RTSX_STAT_SS)) {
-                rtsx_exit_ss(chip);
-                wait_timeout(100);
-        }
-        rtsx_set_stat(chip, RTSX_STAT_RUN);
-
-        addr = srb->cmnd[4];
-
-        val = rtsx_readl(chip, addr);
-        RTSX_DEBUGP("Host register (0x%x): 0x%x\n", addr, val);
-
-        buf[0] = (u8)(val >> 24);
-        buf[1] = (u8)(val >> 16);
-        buf[2] = (u8)(val >> 8);
-        buf[3] = (u8)val;
-
-        len = min(scsi_bufflen(srb), (unsigned int)4);
-        rtsx_stor_set_xfer_buf(buf, len, srb);
-        scsi_set_resid(srb, scsi_bufflen(srb) - len);
-
-        return TRANSPORT_GOOD;
-}
-
-static int write_host_reg(struct scsi_cmnd *srb, struct rtsx_chip *chip)
-{
-        u8 addr, buf[4];
-        u32 val;
-        unsigned int len;
-
-        rtsx_disable_aspm(chip);
-
-        if (chip->ss_en && (rtsx_get_stat(chip) == RTSX_STAT_SS)) {
-                rtsx_exit_ss(chip);
-                wait_timeout(100);
-        }
-        rtsx_set_stat(chip, RTSX_STAT_RUN);
-
-        addr = srb->cmnd[4];
-
-        len = min(scsi_bufflen(srb), (unsigned int)4);
-        rtsx_stor_get_xfer_buf(buf, len, srb);
-        scsi_set_resid(srb, scsi_bufflen(srb) - len);
-
-        val = ((u32)buf[0] << 24) | ((u32)buf[1] << 16) | ((u32)buf[2] << 8) | buf[3];
-
-        rtsx_writel(chip, addr, val);
-
-        return TRANSPORT_GOOD;
-}
-
-static int set_variable(struct scsi_cmnd *srb, struct rtsx_chip *chip)
-{
-        unsigned lun = SCSI_LUN(srb);
-
-        if (srb->cmnd[3] == 1) {
-                /* Variable Clock */
-                struct xd_info *xd_card = &(chip->xd_card);
-                struct sd_info *sd_card = &(chip->sd_card);
-                struct ms_info *ms_card = &(chip->ms_card);
-
-                switch (srb->cmnd[4]) {
-                case XD_CARD:
-                        xd_card->xd_clock = srb->cmnd[5];
-                        break;
-
-                case SD_CARD:
-                        sd_card->sd_clock = srb->cmnd[5];
-                        break;
-
-                case MS_CARD:
-                        ms_card->ms_clock = srb->cmnd[5];
-                        break;
-
-                default:
-                        set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
-                        TRACE_RET(chip, TRANSPORT_FAILED);
-                }
-        } else if (srb->cmnd[3] == 2) {
-                if (srb->cmnd[4]) {
-                        chip->blink_led = 1;
-                } else {
-                        int retval;
-
-                        chip->blink_led = 0;
-
-                        rtsx_disable_aspm(chip);
-
-                        if (chip->ss_en && (rtsx_get_stat(chip) == RTSX_STAT_SS)) {
-                                rtsx_exit_ss(chip);
-                                wait_timeout(100);
-                        }
-                        rtsx_set_stat(chip, RTSX_STAT_RUN);
-
-                        retval = rtsx_force_power_on(chip, SSC_PDCTL);
-                        if (retval != STATUS_SUCCESS) {
-                                set_sense_type(chip, SCSI_LUN(srb), SENSE_TYPE_MEDIA_WRITE_ERR);
-                                TRACE_RET(chip, TRANSPORT_FAILED);
-                        }
-
-                        turn_off_led(chip, LED_GPIO);
-                }
-        } else {
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
-                TRACE_RET(chip, TRANSPORT_FAILED);
-        }
-
-        return TRANSPORT_GOOD;
-}
-
-static int get_variable(struct scsi_cmnd *srb, struct rtsx_chip *chip)
-{
-        unsigned int lun = SCSI_LUN(srb);
-
-        if (srb->cmnd[3] == 1) {
-                struct xd_info *xd_card = &(chip->xd_card);
-                struct sd_info *sd_card = &(chip->sd_card);
-                struct ms_info *ms_card = &(chip->ms_card);
-                u8 tmp;
-
-                switch (srb->cmnd[4]) {
-                case XD_CARD:
-                        tmp = (u8)(xd_card->xd_clock);
-                        break;
-
-                case SD_CARD:
-                        tmp = (u8)(sd_card->sd_clock);
-                        break;
-
-                case MS_CARD:
-                        tmp = (u8)(ms_card->ms_clock);
-                        break;
-
-                default:
-                        set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
-                        TRACE_RET(chip, TRANSPORT_FAILED);
-                }
-
-                rtsx_stor_set_xfer_buf(&tmp, 1, srb);
-        } else if (srb->cmnd[3] == 2) {
-                u8 tmp = chip->blink_led;
-                rtsx_stor_set_xfer_buf(&tmp, 1, srb);
-        } else {
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
-                TRACE_RET(chip, TRANSPORT_FAILED);
-        }
-
-        return TRANSPORT_GOOD;
-}
-
-static int dma_access_ring_buffer(struct scsi_cmnd *srb, struct rtsx_chip *chip)
-{
-        int retval;
-        unsigned int lun = SCSI_LUN(srb);
-        u16 len;
-
-        rtsx_disable_aspm(chip);
-
-        if (chip->ss_en && (rtsx_get_stat(chip) == RTSX_STAT_SS)) {
-                rtsx_exit_ss(chip);
-                wait_timeout(100);
-        }
-        rtsx_set_stat(chip, RTSX_STAT_RUN);
-
-        len = ((u16)(srb->cmnd[4]) << 8) | srb->cmnd[5];
-        len = min(len, (u16)scsi_bufflen(srb));
-
-        if (srb->sc_data_direction == DMA_FROM_DEVICE)
-                RTSX_DEBUGP("Read from device\n");
-        else
-                RTSX_DEBUGP("Write to device\n");
-
-        retval = rtsx_transfer_data(chip, 0, scsi_sglist(srb), len,
-                        scsi_sg_count(srb), srb->sc_data_direction, 1000);
-        if (retval < 0) {
-                if (srb->sc_data_direction == DMA_FROM_DEVICE)
-                        set_sense_type(chip, lun, SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR);
-                else
-                        set_sense_type(chip, lun, SENSE_TYPE_MEDIA_WRITE_ERR);
-
-                TRACE_RET(chip, TRANSPORT_FAILED);
-        }
-        scsi_set_resid(srb, 0);
-
-        return TRANSPORT_GOOD;
-}
-
-static int get_dev_status(struct scsi_cmnd *srb, struct rtsx_chip *chip)
-{
-        struct sd_info *sd_card = &(chip->sd_card);
-        struct ms_info *ms_card = &(chip->ms_card);
-        int buf_len;
-        unsigned int lun = SCSI_LUN(srb);
-        u8 card = get_lun_card(chip, lun);
-        u8 status[32];
-#ifdef SUPPORT_OCP
-        u8 oc_now_mask = 0, oc_ever_mask = 0;
-#endif
-
-        memset(status, 0, 32);
-
-        status[0] = (u8)(chip->product_id);
-        status[1] = chip->ic_version;
-
-        if (chip->auto_delink_en)
-                status[2] = 0x10;
-        else
-                status[2] = 0x00;
-
-        status[3] = 20;
-        status[4] = 10;
-        status[5] = 05;
-        status[6] = 21;
-
-        if (chip->card_wp)
-                status[7] = 0x20;
-        else
-                status[7] = 0x00;
-
-#ifdef SUPPORT_OCP
-        status[8] = 0;
-        if (CHECK_LUN_MODE(chip, SD_MS_2LUN) && (chip->lun2card[lun] == MS_CARD)) {
-                oc_now_mask = MS_OC_NOW;
-                oc_ever_mask = MS_OC_EVER;
-        } else {
-                oc_now_mask = SD_OC_NOW;
-                oc_ever_mask = SD_OC_EVER;
-        }
-
-        if (chip->ocp_stat & oc_now_mask)
-                status[8] |= 0x02;
-
-        if (chip->ocp_stat & oc_ever_mask)
-                status[8] |= 0x01;
-#endif
-
-        if (card == SD_CARD) {
-                if (CHK_SD(sd_card)) {
-                        if (CHK_SD_HCXC(sd_card)) {
-                                if (sd_card->capacity > 0x4000000)
-                                        status[0x0E] = 0x02;
-                                else
-                                        status[0x0E] = 0x01;
-                        } else {
-                                status[0x0E] = 0x00;
-                        }
-
-                        if (CHK_SD_SDR104(sd_card))
-                                status[0x0F] = 0x03;
-                        else if (CHK_SD_DDR50(sd_card))
-                                status[0x0F] = 0x04;
-                        else if (CHK_SD_SDR50(sd_card))
-                                status[0x0F] = 0x02;
-                        else if (CHK_SD_HS(sd_card))
-                                status[0x0F] = 0x01;
-                        else
-                                status[0x0F] = 0x00;
-                } else {
-                        if (CHK_MMC_SECTOR_MODE(sd_card))
-                                status[0x0E] = 0x01;
-                        else
-                                status[0x0E] = 0x00;
-
-                        if (CHK_MMC_DDR52(sd_card))
-                                status[0x0F] = 0x03;
-                        else if (CHK_MMC_52M(sd_card))
-                                status[0x0F] = 0x02;
-                        else if (CHK_MMC_26M(sd_card))
-                                status[0x0F] = 0x01;
-                        else
-                                status[0x0F] = 0x00;
-                }
-        } else if (card == MS_CARD) {
-                if (CHK_MSPRO(ms_card)) {
-                        if (CHK_MSXC(ms_card))
-                                status[0x0E] = 0x01;
-                        else
-                                status[0x0E] = 0x00;
-
-                        if (CHK_HG8BIT(ms_card))
-                                status[0x0F] = 0x01;
-                        else
-                                status[0x0F] = 0x00;
-                }
-        }
-
-#ifdef SUPPORT_SD_LOCK
-        if (card == SD_CARD) {
-                status[0x17] = 0x80;
-                if (sd_card->sd_erase_status)
-                        status[0x17] |= 0x01;
-                if (sd_card->sd_lock_status & SD_LOCKED) {
-                        status[0x17] |= 0x02;
-                        status[0x07] |= 0x40;
-                }
-                if (sd_card->sd_lock_status & SD_PWD_EXIST)
-                        status[0x17] |= 0x04;
-        } else {
-                status[0x17] = 0x00;
-        }
-
-        RTSX_DEBUGP("status[0x17] = 0x%x\n", status[0x17]);
-#endif
-
-        status[0x18] = 0x8A;
-        status[0x1A] = 0x28;
-#ifdef SUPPORT_SD_LOCK
-        status[0x1F] = 0x01;
-#endif
-
-        buf_len = min(scsi_bufflen(srb), (unsigned int)sizeof(status));
-        rtsx_stor_set_xfer_buf(status, buf_len, srb);
-        scsi_set_resid(srb, scsi_bufflen(srb) - buf_len);
-
-        return TRANSPORT_GOOD;
-}
-
-static int set_chip_mode(struct scsi_cmnd *srb, struct rtsx_chip *chip)
-{
-        int phy_debug_mode;
-        int retval;
-        u16 reg;
-
-        if (!CHECK_PID(chip, 0x5208)) {
-                set_sense_type(chip, SCSI_LUN(srb), SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
-                TRACE_RET(chip, TRANSPORT_FAILED);
-        }
-
-        phy_debug_mode = (int)(srb->cmnd[3]);
-
-        if (phy_debug_mode) {
-                chip->phy_debug_mode = 1;
-                retval = rtsx_write_register(chip, CDRESUMECTL, 0x77, 0);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, TRANSPORT_FAILED);
-
-                rtsx_disable_bus_int(chip);
-
-                retval = rtsx_read_phy_register(chip, 0x1C, &reg);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, TRANSPORT_FAILED);
-
-                reg |= 0x0001;
-                retval = rtsx_write_phy_register(chip, 0x1C, reg);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, TRANSPORT_FAILED);
-        } else {
-                chip->phy_debug_mode = 0;
-                retval = rtsx_write_register(chip, CDRESUMECTL, 0x77, 0x77);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, TRANSPORT_FAILED);
-
-                rtsx_enable_bus_int(chip);
-
-                retval = rtsx_read_phy_register(chip, 0x1C, &reg);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, TRANSPORT_FAILED);
-
-                reg &= 0xFFFE;
-                retval = rtsx_write_phy_register(chip, 0x1C, reg);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, TRANSPORT_FAILED);
-        }
-
-        return TRANSPORT_GOOD;
-}
-
-static int rw_mem_cmd_buf(struct scsi_cmnd *srb, struct rtsx_chip *chip)
-{
-        int retval =  STATUS_SUCCESS;
-        unsigned int lun = SCSI_LUN(srb);
-        u8 cmd_type, mask, value, idx;
-        u16 addr;
-
-        rtsx_disable_aspm(chip);
-
-        if (chip->ss_en && (rtsx_get_stat(chip) == RTSX_STAT_SS)) {
-                rtsx_exit_ss(chip);
-                wait_timeout(100);
-        }
-        rtsx_set_stat(chip, RTSX_STAT_RUN);
-
-        switch (srb->cmnd[3]) {
-        case INIT_BATCHCMD:
-                rtsx_init_cmd(chip);
-                break;
-
-        case ADD_BATCHCMD:
-                cmd_type = srb->cmnd[4];
-                if (cmd_type > 2) {
-                        set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
-                        TRACE_RET(chip, TRANSPORT_FAILED);
-                }
-                addr = (srb->cmnd[5] << 8) | srb->cmnd[6];
-                mask = srb->cmnd[7];
-                value = srb->cmnd[8];
-                rtsx_add_cmd(chip, cmd_type, addr, mask, value);
-                break;
-
-        case SEND_BATCHCMD:
-                retval = rtsx_send_cmd(chip, 0, 1000);
-                break;
-
-        case GET_BATCHRSP:
-                idx = srb->cmnd[4];
-                value = *(rtsx_get_cmd_data(chip) + idx);
-                if (scsi_bufflen(srb) < 1) {
-                        set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
-                        TRACE_RET(chip, TRANSPORT_FAILED);
-                }
-                rtsx_stor_set_xfer_buf(&value, 1, srb);
-                scsi_set_resid(srb, 0);
-                break;
-
-        default:
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
-                TRACE_RET(chip, TRANSPORT_FAILED);
-        }
-
-        if (retval != STATUS_SUCCESS) {
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_WRITE_ERR);
-                TRACE_RET(chip, TRANSPORT_FAILED);
-        }
-
-        return TRANSPORT_GOOD;
-}
-
-static int suit_cmd(struct scsi_cmnd *srb, struct rtsx_chip *chip)
-{
-        int result;
-
-        switch (srb->cmnd[3]) {
-        case INIT_BATCHCMD:
-        case ADD_BATCHCMD:
-        case SEND_BATCHCMD:
-        case GET_BATCHRSP:
-                result = rw_mem_cmd_buf(srb, chip);
-                break;
-        default:
-                result = TRANSPORT_ERROR;
-        }
-
-        return result;
-}
-
-static int read_phy_register(struct scsi_cmnd *srb, struct rtsx_chip *chip)
-{
-        unsigned short addr, len, i;
-        int retval;
-        u8 *buf;
-        u16 val;
-
-        rtsx_disable_aspm(chip);
-
-        if (chip->ss_en && (rtsx_get_stat(chip) == RTSX_STAT_SS)) {
-                rtsx_exit_ss(chip);
-                wait_timeout(100);
-        }
-        rtsx_set_stat(chip, RTSX_STAT_RUN);
-
-        addr = ((u16)srb->cmnd[4] << 8) | srb->cmnd[5];
-        len = ((u16)srb->cmnd[6] << 8) | srb->cmnd[7];
-
-        if (len % 2)
-                len -= len % 2;
-
-        if (len) {
-                buf = (u8 *)vmalloc(len);
-                if (!buf)
-                        TRACE_RET(chip, TRANSPORT_ERROR);
-
-                retval = rtsx_force_power_on(chip, SSC_PDCTL);
-                if (retval != STATUS_SUCCESS) {
-                        vfree(buf);
-                        set_sense_type(chip, SCSI_LUN(srb), SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR);
-                        TRACE_RET(chip, TRANSPORT_FAILED);
-                }
-
-                for (i = 0; i < len / 2; i++) {
-                        retval = rtsx_read_phy_register(chip, addr + i, &val);
-                        if (retval != STATUS_SUCCESS) {
-                                vfree(buf);
-                                set_sense_type(chip, SCSI_LUN(srb), SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR);
-                                TRACE_RET(chip, TRANSPORT_FAILED);
-                        }
-
-                        buf[2*i] = (u8)(val >> 8);
-                        buf[2*i+1] = (u8)val;
-                }
-
-                len = (unsigned short)min(scsi_bufflen(srb), (unsigned int)len);
-                rtsx_stor_set_xfer_buf(buf, len, srb);
-                scsi_set_resid(srb, scsi_bufflen(srb) - len);
-
-                vfree(buf);
-        }
-
-        return TRANSPORT_GOOD;
-}
-
-static int write_phy_register(struct scsi_cmnd *srb, struct rtsx_chip *chip)
-{
-        unsigned short addr, len, i;
-        int retval;
-        u8 *buf;
-        u16 val;
-
-        rtsx_disable_aspm(chip);
-
-        if (chip->ss_en && (rtsx_get_stat(chip) == RTSX_STAT_SS)) {
-                rtsx_exit_ss(chip);
-                wait_timeout(100);
-        }
-        rtsx_set_stat(chip, RTSX_STAT_RUN);
-
-        addr = ((u16)srb->cmnd[4] << 8) | srb->cmnd[5];
-        len = ((u16)srb->cmnd[6] << 8) | srb->cmnd[7];
-
-        if (len % 2)
-                len -= len % 2;
-
-        if (len) {
-                len = (unsigned short)min(scsi_bufflen(srb), (unsigned int)len);
-
-                buf = (u8 *)vmalloc(len);
-                if (buf == NULL)
-                        TRACE_RET(chip, TRANSPORT_ERROR);
-
-                rtsx_stor_get_xfer_buf(buf, len, srb);
-                scsi_set_resid(srb, scsi_bufflen(srb) - len);
-
-                retval = rtsx_force_power_on(chip, SSC_PDCTL);
-                if (retval != STATUS_SUCCESS) {
-                        vfree(buf);
-                        set_sense_type(chip, SCSI_LUN(srb), SENSE_TYPE_MEDIA_WRITE_ERR);
-                        TRACE_RET(chip, TRANSPORT_FAILED);
-                }
-
-                for (i = 0; i < len / 2; i++) {
-                        val = ((u16)buf[2*i] << 8) | buf[2*i+1];
-                        retval = rtsx_write_phy_register(chip, addr + i, val);
-                        if (retval != STATUS_SUCCESS) {
-                                vfree(buf);
-                                set_sense_type(chip, SCSI_LUN(srb), SENSE_TYPE_MEDIA_WRITE_ERR);
-                                TRACE_RET(chip, TRANSPORT_FAILED);
-                        }
-                }
-
-                vfree(buf);
-        }
-
-        return TRANSPORT_GOOD;
-}
-
-static int erase_eeprom2(struct scsi_cmnd *srb, struct rtsx_chip *chip)
-{
-        unsigned short addr;
-        int retval;
-        u8 mode;
-
-        rtsx_disable_aspm(chip);
-
-        if (chip->ss_en && (rtsx_get_stat(chip) == RTSX_STAT_SS)) {
-                rtsx_exit_ss(chip);
-                wait_timeout(100);
-        }
-        rtsx_set_stat(chip, RTSX_STAT_RUN);
-
-        retval = rtsx_force_power_on(chip, SSC_PDCTL);
-        if (retval != STATUS_SUCCESS) {
-                set_sense_type(chip, SCSI_LUN(srb), SENSE_TYPE_MEDIA_WRITE_ERR);
-                TRACE_RET(chip, TRANSPORT_FAILED);
-        }
-
-        mode = srb->cmnd[3];
-        addr = ((u16)srb->cmnd[4] << 8) | srb->cmnd[5];
-
-        if (mode == 0) {
-                retval = spi_erase_eeprom_chip(chip);
-                if (retval != STATUS_SUCCESS) {
-                        set_sense_type(chip, SCSI_LUN(srb), SENSE_TYPE_MEDIA_WRITE_ERR);
-                        TRACE_RET(chip, TRANSPORT_FAILED);
-                }
-        } else if (mode == 1) {
-                retval = spi_erase_eeprom_byte(chip, addr);
-                if (retval != STATUS_SUCCESS) {
-                        set_sense_type(chip, SCSI_LUN(srb), SENSE_TYPE_MEDIA_WRITE_ERR);
-                        TRACE_RET(chip, TRANSPORT_FAILED);
-                }
-        } else {
-                set_sense_type(chip, SCSI_LUN(srb), SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
-                TRACE_RET(chip, TRANSPORT_FAILED);
-        }
-
-        return TRANSPORT_GOOD;
-}
-
-static int read_eeprom2(struct scsi_cmnd *srb, struct rtsx_chip *chip)
-{
-        unsigned short addr, len, i;
-        int retval;
-        u8 *buf;
-
-        rtsx_disable_aspm(chip);
-
-        if (chip->ss_en && (rtsx_get_stat(chip) == RTSX_STAT_SS)) {
-                rtsx_exit_ss(chip);
-                wait_timeout(100);
-        }
-        rtsx_set_stat(chip, RTSX_STAT_RUN);
-
-        addr = ((u16)srb->cmnd[4] << 8) | srb->cmnd[5];
-        len = ((u16)srb->cmnd[6] << 8) | srb->cmnd[7];
-
-        buf = (u8 *)vmalloc(len);
-        if (!buf)
-                TRACE_RET(chip, TRANSPORT_ERROR);
-
-        retval = rtsx_force_power_on(chip, SSC_PDCTL);
-        if (retval != STATUS_SUCCESS) {
-                vfree(buf);
-                set_sense_type(chip, SCSI_LUN(srb), SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR);
-                TRACE_RET(chip, TRANSPORT_FAILED);
-        }
-
-        for (i = 0; i < len; i++) {
-                retval = spi_read_eeprom(chip, addr + i, buf + i);
-                if (retval != STATUS_SUCCESS) {
-                        vfree(buf);
-                        set_sense_type(chip, SCSI_LUN(srb), SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR);
-                        TRACE_RET(chip, TRANSPORT_FAILED);
-                }
-        }
-
-        len = (unsigned short)min(scsi_bufflen(srb), (unsigned int)len);
-        rtsx_stor_set_xfer_buf(buf, len, srb);
-        scsi_set_resid(srb, scsi_bufflen(srb) - len);
-
-        vfree(buf);
-
-        return TRANSPORT_GOOD;
-}
-
-static int write_eeprom2(struct scsi_cmnd *srb, struct rtsx_chip *chip)
-{
-        unsigned short addr, len, i;
-        int retval;
-        u8 *buf;
-
-        rtsx_disable_aspm(chip);
-
-        if (chip->ss_en && (rtsx_get_stat(chip) == RTSX_STAT_SS)) {
-                rtsx_exit_ss(chip);
-                wait_timeout(100);
-        }
-        rtsx_set_stat(chip, RTSX_STAT_RUN);
-
-        addr = ((u16)srb->cmnd[4] << 8) | srb->cmnd[5];
-        len = ((u16)srb->cmnd[6] << 8) | srb->cmnd[7];
-
-        len = (unsigned short)min(scsi_bufflen(srb), (unsigned int)len);
-        buf = (u8 *)vmalloc(len);
-        if (buf == NULL)
-                TRACE_RET(chip, TRANSPORT_ERROR);
-
-        rtsx_stor_get_xfer_buf(buf, len, srb);
-        scsi_set_resid(srb, scsi_bufflen(srb) - len);
-
-        retval = rtsx_force_power_on(chip, SSC_PDCTL);
-        if (retval != STATUS_SUCCESS) {
-                vfree(buf);
-                set_sense_type(chip, SCSI_LUN(srb), SENSE_TYPE_MEDIA_WRITE_ERR);
-                TRACE_RET(chip, TRANSPORT_FAILED);
-        }
-
-        for (i = 0; i < len; i++) {
-                retval = spi_write_eeprom(chip, addr + i, buf[i]);
-                if (retval != STATUS_SUCCESS) {
-                        vfree(buf);
-                        set_sense_type(chip, SCSI_LUN(srb), SENSE_TYPE_MEDIA_WRITE_ERR);
-                        TRACE_RET(chip, TRANSPORT_FAILED);
-                }
-        }
-
-        vfree(buf);
-
-        return TRANSPORT_GOOD;
-}
-
-static int read_efuse(struct scsi_cmnd *srb, struct rtsx_chip *chip)
-{
-        int retval;
-        u8 addr, len, i;
-        u8 *buf;
-
-        rtsx_disable_aspm(chip);
-
-        if (chip->ss_en && (rtsx_get_stat(chip) == RTSX_STAT_SS)) {
-                rtsx_exit_ss(chip);
-                wait_timeout(100);
-        }
-        rtsx_set_stat(chip, RTSX_STAT_RUN);
-
-        addr = srb->cmnd[4];
-        len = srb->cmnd[5];
-
-        buf = (u8 *)vmalloc(len);
-        if (!buf)
-                TRACE_RET(chip, TRANSPORT_ERROR);
-
-        retval = rtsx_force_power_on(chip, SSC_PDCTL);
-        if (retval != STATUS_SUCCESS) {
-                vfree(buf);
-                set_sense_type(chip, SCSI_LUN(srb), SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR);
-                TRACE_RET(chip, TRANSPORT_FAILED);
-        }
-
-        for (i = 0; i < len; i++) {
-                retval = rtsx_read_efuse(chip, addr + i, buf + i);
-                if (retval != STATUS_SUCCESS) {
-                        vfree(buf);
-                        set_sense_type(chip, SCSI_LUN(srb), SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR);
-                        TRACE_RET(chip, TRANSPORT_FAILED);
-                }
-        }
-
-        len = (u8)min(scsi_bufflen(srb), (unsigned int)len);
-        rtsx_stor_set_xfer_buf(buf, len, srb);
-        scsi_set_resid(srb, scsi_bufflen(srb) - len);
-
-        vfree(buf);
-
-        return TRANSPORT_GOOD;
-}
-
-static int write_efuse(struct scsi_cmnd *srb, struct rtsx_chip *chip)
-{
-        int retval, result = TRANSPORT_GOOD;
-        u16 val;
-        u8 addr, len, i;
-        u8 *buf;
-
-        rtsx_disable_aspm(chip);
-
-        if (chip->ss_en && (rtsx_get_stat(chip) == RTSX_STAT_SS)) {
-                rtsx_exit_ss(chip);
-                wait_timeout(100);
-        }
-        rtsx_set_stat(chip, RTSX_STAT_RUN);
-
-        addr = srb->cmnd[4];
-        len = srb->cmnd[5];
-
-        len = (u8)min(scsi_bufflen(srb), (unsigned int)len);
-        buf = (u8 *)vmalloc(len);
-        if (buf == NULL)
-                TRACE_RET(chip, TRANSPORT_ERROR);
-
-        rtsx_stor_get_xfer_buf(buf, len, srb);
-        scsi_set_resid(srb, scsi_bufflen(srb) - len);
-
-        retval = rtsx_force_power_on(chip, SSC_PDCTL);
-        if (retval != STATUS_SUCCESS) {
-                vfree(buf);
-                TRACE_RET(chip, TRANSPORT_ERROR);
-        }
-
-        if (chip->asic_code) {
-                retval = rtsx_read_phy_register(chip, 0x08, &val);
-                if (retval != STATUS_SUCCESS) {
-                        vfree(buf);
-                        TRACE_RET(chip, TRANSPORT_ERROR);
-                }
-
-                retval = rtsx_write_register(chip, PWR_GATE_CTRL, LDO3318_PWR_MASK, LDO_OFF);
-                if (retval != STATUS_SUCCESS) {
-                        vfree(buf);
-                        TRACE_RET(chip, TRANSPORT_ERROR);
-                }
-
-                wait_timeout(600);
-
-                retval = rtsx_write_phy_register(chip, 0x08, 0x4C00 | chip->phy_voltage);
-                if (retval != STATUS_SUCCESS) {
-                        vfree(buf);
-                        TRACE_RET(chip, TRANSPORT_ERROR);
-                }
-
-                retval = rtsx_write_register(chip, PWR_GATE_CTRL, LDO3318_PWR_MASK, LDO_ON);
-                if (retval != STATUS_SUCCESS) {
-                        vfree(buf);
-                        TRACE_RET(chip, TRANSPORT_ERROR);
-                }
-
-                wait_timeout(600);
-        }
-
-        retval = card_power_on(chip, SPI_CARD);
-        if (retval != STATUS_SUCCESS) {
-                vfree(buf);
-                TRACE_RET(chip, TRANSPORT_ERROR);
-        }
-
-        wait_timeout(50);
-
-        for (i = 0; i < len; i++) {
-                retval = rtsx_write_efuse(chip, addr + i, buf[i]);
-                if (retval != STATUS_SUCCESS) {
-                        set_sense_type(chip, SCSI_LUN(srb), SENSE_TYPE_MEDIA_WRITE_ERR);
-                        result = TRANSPORT_FAILED;
-                        TRACE_GOTO(chip, Exit);
-                }
-        }
-
-Exit:
-        vfree(buf);
-
-        retval = card_power_off(chip, SPI_CARD);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, TRANSPORT_ERROR);
-
-        if (chip->asic_code) {
-                retval = rtsx_write_register(chip, PWR_GATE_CTRL, LDO3318_PWR_MASK, LDO_OFF);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, TRANSPORT_ERROR);
-
-                wait_timeout(600);
-
-                retval = rtsx_write_phy_register(chip, 0x08, val);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, TRANSPORT_ERROR);
-
-                retval = rtsx_write_register(chip, PWR_GATE_CTRL, LDO3318_PWR_MASK, LDO_ON);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, TRANSPORT_ERROR);
-        }
-
-        return result;
-}
-
-static int read_cfg_byte(struct scsi_cmnd *srb, struct rtsx_chip *chip)
-{
-        int retval;
-        u8 func, func_max;
-        u16 addr, len;
-        u8 *buf;
-
-        rtsx_disable_aspm(chip);
-
-        if (chip->ss_en && (rtsx_get_stat(chip) == RTSX_STAT_SS)) {
-                rtsx_exit_ss(chip);
-                wait_timeout(100);
-        }
-        rtsx_set_stat(chip, RTSX_STAT_RUN);
-
-        func = srb->cmnd[3];
-        addr = ((u16)(srb->cmnd[4]) << 8) | srb->cmnd[5];
-        len = ((u16)(srb->cmnd[6]) << 8) | srb->cmnd[7];
-
-        RTSX_DEBUGP("%s: func = %d, addr = 0x%x, len = %d\n", __func__, func, addr, len);
-
-        if (CHK_SDIO_EXIST(chip) && !CHK_SDIO_IGNORED(chip))
-                func_max = 1;
-        else
-                func_max = 0;
-
-        if (func > func_max) {
-                set_sense_type(chip, SCSI_LUN(srb), SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
-                TRACE_RET(chip, TRANSPORT_FAILED);
-        }
-
-        buf = (u8 *)vmalloc(len);
-        if (!buf)
-                TRACE_RET(chip, TRANSPORT_ERROR);
-
-        retval = rtsx_read_cfg_seq(chip, func, addr, buf, len);
-        if (retval != STATUS_SUCCESS) {
-                set_sense_type(chip, SCSI_LUN(srb), SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR);
-                vfree(buf);
-                TRACE_RET(chip, TRANSPORT_FAILED);
-        }
-
-        len = (u16)min(scsi_bufflen(srb), (unsigned int)len);
-        rtsx_stor_set_xfer_buf(buf, len, srb);
-        scsi_set_resid(srb, scsi_bufflen(srb) - len);
-
-        vfree(buf);
-
-        return TRANSPORT_GOOD;
-}
-
-static int write_cfg_byte(struct scsi_cmnd *srb, struct rtsx_chip *chip)
-{
-        int retval;
-        u8 func, func_max;
-        u16 addr, len;
-        u8 *buf;
-
-        rtsx_disable_aspm(chip);
-
-        if (chip->ss_en && (rtsx_get_stat(chip) == RTSX_STAT_SS)) {
-                rtsx_exit_ss(chip);
-                wait_timeout(100);
-        }
-        rtsx_set_stat(chip, RTSX_STAT_RUN);
-
-        func = srb->cmnd[3];
-        addr = ((u16)(srb->cmnd[4]) << 8) | srb->cmnd[5];
-        len = ((u16)(srb->cmnd[6]) << 8) | srb->cmnd[7];
-
-        RTSX_DEBUGP("%s: func = %d, addr = 0x%x\n", __func__, func, addr);
-
-        if (CHK_SDIO_EXIST(chip) && !CHK_SDIO_IGNORED(chip))
-                func_max = 1;
-        else
-                func_max = 0;
-
-        if (func > func_max) {
-                set_sense_type(chip, SCSI_LUN(srb), SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
-                TRACE_RET(chip, TRANSPORT_FAILED);
-        }
-
-        len = (unsigned short)min(scsi_bufflen(srb), (unsigned int)len);
-        buf = (u8 *)vmalloc(len);
-        if (!buf)
-                TRACE_RET(chip, TRANSPORT_ERROR);
-
-        rtsx_stor_get_xfer_buf(buf, len, srb);
-        scsi_set_resid(srb, scsi_bufflen(srb) - len);
-
-        retval = rtsx_write_cfg_seq(chip, func, addr, buf, len);
-        if (retval != STATUS_SUCCESS) {
-                set_sense_type(chip, SCSI_LUN(srb), SENSE_TYPE_MEDIA_WRITE_ERR);
-                vfree(buf);
-                TRACE_RET(chip, TRANSPORT_FAILED);
-        }
-
-        vfree(buf);
-
-        return TRANSPORT_GOOD;
-}
-
-static int app_cmd(struct scsi_cmnd *srb, struct rtsx_chip *chip)
-{
-        int result;
-
-        switch (srb->cmnd[2]) {
-        case PP_READ10:
-        case PP_WRITE10:
-                result = read_write(srb, chip);
-                break;
-
-        case READ_HOST_REG:
-                result = read_host_reg(srb, chip);
-                break;
-
-        case WRITE_HOST_REG:
-                result = write_host_reg(srb, chip);
-                break;
-
-        case GET_VAR:
-                result = get_variable(srb, chip);
-                break;
-
-        case SET_VAR:
-                result = set_variable(srb, chip);
-                break;
-
-        case DMA_READ:
-        case DMA_WRITE:
-                result = dma_access_ring_buffer(srb, chip);
-                break;
-
-        case READ_PHY:
-                result = read_phy_register(srb, chip);
-                break;
-
-        case WRITE_PHY:
-                result = write_phy_register(srb, chip);
-                break;
-
-        case ERASE_EEPROM2:
-                result = erase_eeprom2(srb, chip);
-                break;
-
-        case READ_EEPROM2:
-                result = read_eeprom2(srb, chip);
-                break;
-
-        case WRITE_EEPROM2:
-                result = write_eeprom2(srb, chip);
-                break;
-
-        case READ_EFUSE:
-                result = read_efuse(srb, chip);
-                break;
-
-        case WRITE_EFUSE:
-                result = write_efuse(srb, chip);
-                break;
-
-        case READ_CFG:
-                result = read_cfg_byte(srb, chip);
-                break;
-
-        case WRITE_CFG:
-                result = write_cfg_byte(srb, chip);
-                break;
-
-        case SET_CHIP_MODE:
-                result = set_chip_mode(srb, chip);
-                break;
-
-        case SUIT_CMD:
-                result = suit_cmd(srb, chip);
-                break;
-
-        case GET_DEV_STATUS:
-                result = get_dev_status(srb, chip);
-                break;
-
-        default:
-                set_sense_type(chip, SCSI_LUN(srb), SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
-                TRACE_RET(chip, TRANSPORT_FAILED);
-        }
-
-        return result;
-}
-
-
-static int read_status(struct scsi_cmnd *srb, struct rtsx_chip *chip)
-{
-        u8 rtsx_status[16];
-        int buf_len;
-        unsigned int lun = SCSI_LUN(srb);
-
-        rtsx_status[0] = (u8)(chip->vendor_id >> 8);
-        rtsx_status[1] = (u8)(chip->vendor_id);
-
-        rtsx_status[2] = (u8)(chip->product_id >> 8);
-        rtsx_status[3] = (u8)(chip->product_id);
-
-        rtsx_status[4] = (u8)lun;
-
-        if (CHECK_LUN_MODE(chip, SD_MS_2LUN)) {
-                if (chip->lun2card[lun] == SD_CARD)
-                        rtsx_status[5] = 2;
-                else
-                        rtsx_status[5] = 3;
-        } else {
-                if (chip->card_exist) {
-                        if (chip->card_exist & XD_CARD)
-                                rtsx_status[5] = 4;
-                        else if (chip->card_exist & SD_CARD)
-                                rtsx_status[5] = 2;
-                        else if (chip->card_exist & MS_CARD)
-                                rtsx_status[5] = 3;
-                        else
-                                rtsx_status[5] = 7;
-                } else {
-                        rtsx_status[5] = 7;
-                }
-        }
-
-        if (CHECK_LUN_MODE(chip, SD_MS_2LUN))
-                rtsx_status[6] = 2;
-        else
-                rtsx_status[6] = 1;
-
-        rtsx_status[7] = (u8)(chip->product_id);
-        rtsx_status[8] = chip->ic_version;
-
-        if (check_card_exist(chip, lun))
-                rtsx_status[9] = 1;
-        else
-                rtsx_status[9] = 0;
-
-        if (CHECK_LUN_MODE(chip, SD_MS_2LUN))
-                rtsx_status[10] = 0;
-        else
-                rtsx_status[10] = 1;
-
-        if (CHECK_LUN_MODE(chip, SD_MS_2LUN)) {
-                if (chip->lun2card[lun] == SD_CARD)
-                        rtsx_status[11] = SD_CARD;
-                else
-                        rtsx_status[11] = MS_CARD;
-        } else {
-                rtsx_status[11] = XD_CARD | SD_CARD | MS_CARD;
-        }
-
-        if (check_card_ready(chip, lun))
-                rtsx_status[12] = 1;
-        else
-                rtsx_status[12] = 0;
-
-        if (get_lun_card(chip, lun) == XD_CARD) {
-                rtsx_status[13] = 0x40;
-        } else if (get_lun_card(chip, lun) == SD_CARD) {
-                struct sd_info *sd_card = &(chip->sd_card);
-
-                rtsx_status[13] = 0x20;
-                if (CHK_SD(sd_card)) {
-                        if (CHK_SD_HCXC(sd_card))
-                                rtsx_status[13] |= 0x04;
-                        if (CHK_SD_HS(sd_card))
-                                rtsx_status[13] |= 0x02;
-                } else {
-                        rtsx_status[13] |= 0x08;
-                        if (CHK_MMC_52M(sd_card))
-                                rtsx_status[13] |= 0x02;
-                        if (CHK_MMC_SECTOR_MODE(sd_card))
-                                rtsx_status[13] |= 0x04;
-                }
-        } else if (get_lun_card(chip, lun) == MS_CARD) {
-                struct ms_info *ms_card = &(chip->ms_card);
-
-                if (CHK_MSPRO(ms_card)) {
-                        rtsx_status[13] = 0x38;
-                        if (CHK_HG8BIT(ms_card))
-                                rtsx_status[13] |= 0x04;
-#ifdef SUPPORT_MSXC
-                        if (CHK_MSXC(ms_card))
-                                rtsx_status[13] |= 0x01;
-#endif
-                } else {
-                        rtsx_status[13] = 0x30;
-                }
-        } else {
-                if (CHECK_LUN_MODE(chip, DEFAULT_SINGLE)) {
-#ifdef SUPPORT_SDIO
-                        if (chip->sd_io && chip->sd_int)
-                                rtsx_status[13] = 0x60;
-                        else
-                                rtsx_status[13] = 0x70;
-#else
-                        rtsx_status[13] = 0x70;
-#endif
-                } else {
-                        if (chip->lun2card[lun] == SD_CARD)
-                                rtsx_status[13] = 0x20;
-                        else
-                                rtsx_status[13] = 0x30;
-                }
-        }
-
-        rtsx_status[14] = 0x78;
-        if (CHK_SDIO_EXIST(chip) && !CHK_SDIO_IGNORED(chip))
-                rtsx_status[15] = 0x83;
-        else
-                rtsx_status[15] = 0x82;
-
-        buf_len = min(scsi_bufflen(srb), (unsigned int)sizeof(rtsx_status));
-        rtsx_stor_set_xfer_buf(rtsx_status, buf_len, srb);
-        scsi_set_resid(srb, scsi_bufflen(srb) - buf_len);
-
-        return TRANSPORT_GOOD;
-}
-
-static int get_card_bus_width(struct scsi_cmnd *srb, struct rtsx_chip *chip)
-{
-        unsigned int lun = SCSI_LUN(srb);
-        u8 card, bus_width;
-
-        if (!check_card_ready(chip, lun)) {
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_NOT_PRESENT);
-                TRACE_RET(chip, TRANSPORT_FAILED);
-        }
-
-        card = get_lun_card(chip, lun);
-        if ((card == SD_CARD) || (card == MS_CARD)) {
-                bus_width = chip->card_bus_width[lun];
-        } else {
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR);
-                TRACE_RET(chip, TRANSPORT_FAILED);
-        }
-
-        scsi_set_resid(srb, 0);
-        rtsx_stor_set_xfer_buf(&bus_width, scsi_bufflen(srb), srb);
-
-        return TRANSPORT_GOOD;
-}
-
-static int spi_vendor_cmd(struct scsi_cmnd *srb, struct rtsx_chip *chip)
-{
-        int result;
-        unsigned int lun = SCSI_LUN(srb);
-        u8 gpio_dir;
-
-        if (CHECK_PID(chip, 0x5208) || CHECK_PID(chip, 0x5288)) {
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
-                TRACE_RET(chip, TRANSPORT_FAILED);
-        }
-
-        rtsx_disable_aspm(chip);
-
-        if (chip->ss_en && (rtsx_get_stat(chip) == RTSX_STAT_SS)) {
-                rtsx_exit_ss(chip);
-                wait_timeout(100);
-        }
-        rtsx_set_stat(chip, RTSX_STAT_RUN);
-
-        rtsx_force_power_on(chip, SSC_PDCTL);
-
-        rtsx_read_register(chip, CARD_GPIO_DIR, &gpio_dir);
-        rtsx_write_register(chip, CARD_GPIO_DIR, 0x07, gpio_dir & 0x06);
-
-        switch (srb->cmnd[2]) {
-        case SCSI_SPI_GETSTATUS:
-                result = spi_get_status(srb, chip);
-                break;
-
-        case SCSI_SPI_SETPARAMETER:
-                result = spi_set_parameter(srb, chip);
-                break;
-
-        case SCSI_SPI_READFALSHID:
-                result = spi_read_flash_id(srb, chip);
-                break;
-
-        case SCSI_SPI_READFLASH:
-                result = spi_read_flash(srb, chip);
-                break;
-
-        case SCSI_SPI_WRITEFLASH:
-                result = spi_write_flash(srb, chip);
-                break;
-
-        case SCSI_SPI_WRITEFLASHSTATUS:
-                result = spi_write_flash_status(srb, chip);
-                break;
-
-        case SCSI_SPI_ERASEFLASH:
-                result = spi_erase_flash(srb, chip);
-                break;
-
-        default:
-                rtsx_write_register(chip, CARD_GPIO_DIR, 0x07, gpio_dir);
-
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
-                TRACE_RET(chip, TRANSPORT_FAILED);
-        }
-
-        rtsx_write_register(chip, CARD_GPIO_DIR, 0x07, gpio_dir);
-
-        if (result != STATUS_SUCCESS)
-                TRACE_RET(chip, TRANSPORT_FAILED);
-
-        return TRANSPORT_GOOD;
-}
-
-static int vendor_cmnd(struct scsi_cmnd *srb, struct rtsx_chip *chip)
-{
-        int result;
-
-        switch (srb->cmnd[1]) {
-        case READ_STATUS:
-                result = read_status(srb, chip);
-                break;
-
-        case READ_MEM:
-                result = read_mem(srb, chip);
-                break;
-
-        case WRITE_MEM:
-                result = write_mem(srb, chip);
-                break;
-
-        case READ_EEPROM:
-                result = read_eeprom(srb, chip);
-                break;
-
-        case WRITE_EEPROM:
-                result = write_eeprom(srb, chip);
-                break;
-
-        case TOGGLE_GPIO:
-                result = toggle_gpio_cmd(srb, chip);
-                break;
-
-        case GET_SD_CSD:
-                result = get_sd_csd(srb, chip);
-                break;
-
-        case GET_BUS_WIDTH:
-                result = get_card_bus_width(srb, chip);
-                break;
-
-#ifdef _MSG_TRACE
-        case TRACE_MSG:
-                result = trace_msg_cmd(srb, chip);
-                break;
-#endif
-
-        case SCSI_APP_CMD:
-                result = app_cmd(srb, chip);
-                break;
-
-        case SPI_VENDOR_COMMAND:
-                result = spi_vendor_cmd(srb, chip);
-                break;
-
-        default:
-                set_sense_type(chip, SCSI_LUN(srb), SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
-                TRACE_RET(chip, TRANSPORT_FAILED);
-        }
-
-        return result;
-}
-
-#if !defined(LED_AUTO_BLINK) && !defined(REGULAR_BLINK)
-void led_shine(struct scsi_cmnd *srb, struct rtsx_chip *chip)
-{
-        unsigned int lun = SCSI_LUN(srb);
-        u16 sec_cnt;
-
-        if ((srb->cmnd[0] == READ_10) || (srb->cmnd[0] == WRITE_10))
-                sec_cnt = ((u16)(srb->cmnd[7]) << 8) | srb->cmnd[8];
-        else if ((srb->cmnd[0] == READ_6) || (srb->cmnd[0] == WRITE_6))
-                sec_cnt = srb->cmnd[4];
-        else
-                return;
-
-        if (chip->rw_cap[lun] >= GPIO_TOGGLE_THRESHOLD) {
-                toggle_gpio(chip, LED_GPIO);
-                chip->rw_cap[lun] = 0;
-        } else {
-                chip->rw_cap[lun] += sec_cnt;
-        }
-}
-#endif
-
-static int ms_format_cmnd(struct scsi_cmnd *srb, struct rtsx_chip *chip)
-{
-        struct ms_info *ms_card = &(chip->ms_card);
-        unsigned int lun = SCSI_LUN(srb);
-        int retval, quick_format;
-
-        if (get_lun_card(chip, lun) != MS_CARD) {
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_LUN_NOT_SUPPORT);
-                TRACE_RET(chip, TRANSPORT_FAILED);
-        }
-
-        if ((srb->cmnd[3] != 0x4D) || (srb->cmnd[4] != 0x47) ||
-                (srb->cmnd[5] != 0x66) || (srb->cmnd[6] != 0x6D) ||
-                (srb->cmnd[7] != 0x74)) {
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
-                TRACE_RET(chip, TRANSPORT_FAILED);
-        }
-
-        rtsx_disable_aspm(chip);
-
-        if (chip->ss_en && (rtsx_get_stat(chip) == RTSX_STAT_SS)) {
-                rtsx_exit_ss(chip);
-                wait_timeout(100);
-
-                if (!check_card_ready(chip, lun) ||
-                                (get_card_size(chip, lun) == 0)) {
-                        set_sense_type(chip, lun, SENSE_TYPE_MEDIA_NOT_PRESENT);
-                        TRACE_RET(chip, TRANSPORT_FAILED);
-                }
-        }
-        rtsx_set_stat(chip, RTSX_STAT_RUN);
-
-        if (srb->cmnd[8] & 0x01)
-                quick_format = 0;
-        else
-                quick_format = 1;
-
-        if (!(chip->card_ready & MS_CARD)) {
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_NOT_PRESENT);
-                TRACE_RET(chip, TRANSPORT_FAILED);
-        }
-
-        if (chip->card_wp & MS_CARD) {
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_WRITE_PROTECT);
-                TRACE_RET(chip, TRANSPORT_FAILED);
-        }
-
-        if (!CHK_MSPRO(ms_card)) {
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_LUN_NOT_SUPPORT);
-                TRACE_RET(chip, TRANSPORT_FAILED);
-        }
-
-        retval = mspro_format(srb, chip, MS_SHORT_DATA_LEN, quick_format);
-        if (retval != STATUS_SUCCESS) {
-                set_sense_type(chip, lun, SENSE_TYPE_FORMAT_CMD_FAILED);
-                TRACE_RET(chip, TRANSPORT_FAILED);
-        }
-
-        scsi_set_resid(srb, 0);
-        return TRANSPORT_GOOD;
-}
-
-#ifdef SUPPORT_PCGL_1P18
-static int get_ms_information(struct scsi_cmnd *srb, struct rtsx_chip *chip)
-{
-        struct ms_info *ms_card = &(chip->ms_card);
-        unsigned int lun = SCSI_LUN(srb);
-        u8 dev_info_id, data_len;
-        u8 *buf;
-        unsigned int buf_len;
-        int i;
-
-        if (!check_card_ready(chip, lun)) {
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_NOT_PRESENT);
-                TRACE_RET(chip, TRANSPORT_FAILED);
-        }
-        if ((get_lun_card(chip, lun) != MS_CARD)) {
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_LUN_NOT_SUPPORT);
-                TRACE_RET(chip, TRANSPORT_FAILED);
-        }
-
-        if ((srb->cmnd[2] != 0xB0) || (srb->cmnd[4] != 0x4D) ||
-                (srb->cmnd[5] != 0x53) || (srb->cmnd[6] != 0x49) ||
-                (srb->cmnd[7] != 0x44)) {
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
-                TRACE_RET(chip, TRANSPORT_FAILED);
-        }
-
-        dev_info_id = srb->cmnd[3];
-        if ((CHK_MSXC(ms_card) && (dev_info_id == 0x10)) ||
-                        (!CHK_MSXC(ms_card) && (dev_info_id == 0x13)) ||
-                        !CHK_MSPRO(ms_card)) {
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
-                TRACE_RET(chip, TRANSPORT_FAILED);
-        }
-
-        if (dev_info_id == 0x15)
-                buf_len = data_len = 0x3A;
-        else
-                buf_len = data_len = 0x6A;
-
-        buf = kmalloc(buf_len, GFP_KERNEL);
-        if (!buf)
-                TRACE_RET(chip, TRANSPORT_ERROR);
-
-        i = 0;
-        /*  GET Memory Stick Media Information Response Header */
-        buf[i++] = 0x00;                /* Data length MSB */
-        buf[i++] = data_len;            /* Data length LSB */
-        /* Device Information Type Code */
-        if (CHK_MSXC(ms_card))
-                buf[i++] = 0x03;
-        else
-                buf[i++] = 0x02;
-
-        /* SGM bit */
-        buf[i++] = 0x01;
-        /* Reserved */
-        buf[i++] = 0x00;
-        buf[i++] = 0x00;
-        buf[i++] = 0x00;
-        /* Number of Device Information */
-        buf[i++] = 0x01;
-
-        /*  Device Information Body */
-
-        /* Device Information ID Number */
-        buf[i++] = dev_info_id;
-        /* Device Information Length */
-        if (dev_info_id == 0x15)
-                data_len = 0x31;
-        else
-                data_len = 0x61;
-
-        buf[i++] = 0x00;                /* Data length MSB */
-        buf[i++] = data_len;            /* Data length LSB */
-        /* Valid Bit */
-        buf[i++] = 0x80;
-        if ((dev_info_id == 0x10) || (dev_info_id == 0x13)) {
-                /* System Information */
-                memcpy(buf+i, ms_card->raw_sys_info, 96);
-        } else {
-                /* Model Name */
-                memcpy(buf+i, ms_card->raw_model_name, 48);
-        }
-
-        rtsx_stor_set_xfer_buf(buf, buf_len, srb);
-
-        if (dev_info_id == 0x15)
-                scsi_set_resid(srb, scsi_bufflen(srb)-0x3C);
-        else
-                scsi_set_resid(srb, scsi_bufflen(srb)-0x6C);
-
-        kfree(buf);
-        return STATUS_SUCCESS;
-}
-#endif
-
-static int ms_sp_cmnd(struct scsi_cmnd *srb, struct rtsx_chip *chip)
-{
-        int retval = TRANSPORT_ERROR;
-
-        if (srb->cmnd[2] == MS_FORMAT)
-                retval = ms_format_cmnd(srb, chip);
-#ifdef SUPPORT_PCGL_1P18
-        else if (srb->cmnd[2] == GET_MS_INFORMATION)
-                retval = get_ms_information(srb, chip);
-#endif
-
-        return retval;
-}
-
-#ifdef SUPPORT_CPRM
-static int sd_extention_cmnd(struct scsi_cmnd *srb, struct rtsx_chip *chip)
-{
-        unsigned int lun = SCSI_LUN(srb);
-        int result;
-
-        rtsx_disable_aspm(chip);
-
-        if (chip->ss_en && (rtsx_get_stat(chip) == RTSX_STAT_SS)) {
-                rtsx_exit_ss(chip);
-                wait_timeout(100);
-        }
-        rtsx_set_stat(chip, RTSX_STAT_RUN);
-
-        sd_cleanup_work(chip);
-
-        if (!check_card_ready(chip, lun)) {
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_NOT_PRESENT);
-                TRACE_RET(chip, TRANSPORT_FAILED);
-        }
-        if ((get_lun_card(chip, lun) != SD_CARD)) {
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_LUN_NOT_SUPPORT);
-                TRACE_RET(chip, TRANSPORT_FAILED);
-        }
-
-        switch (srb->cmnd[0]) {
-        case SD_PASS_THRU_MODE:
-                result = sd_pass_thru_mode(srb, chip);
-                break;
-
-        case SD_EXECUTE_NO_DATA:
-                result = sd_execute_no_data(srb, chip);
-                break;
-
-        case SD_EXECUTE_READ:
-                result = sd_execute_read_data(srb, chip);
-                break;
-
-        case SD_EXECUTE_WRITE:
-                result = sd_execute_write_data(srb, chip);
-                break;
-
-        case SD_GET_RSP:
-                result = sd_get_cmd_rsp(srb, chip);
-                break;
-
-        case SD_HW_RST:
-                result = sd_hw_rst(srb, chip);
-                break;
-
-        default:
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
-                TRACE_RET(chip, TRANSPORT_FAILED);
-        }
-
-        return result;
-}
-#endif
-
-#ifdef SUPPORT_MAGIC_GATE
-static int mg_report_key(struct scsi_cmnd *srb, struct rtsx_chip *chip)
-{
-        struct ms_info *ms_card = &(chip->ms_card);
-        unsigned int lun = SCSI_LUN(srb);
-        int retval;
-        u8 key_format;
-
-        RTSX_DEBUGP("--%s--\n", __func__);
-
-        rtsx_disable_aspm(chip);
-
-        if (chip->ss_en && (rtsx_get_stat(chip) == RTSX_STAT_SS)) {
-                rtsx_exit_ss(chip);
-                wait_timeout(100);
-        }
-        rtsx_set_stat(chip, RTSX_STAT_RUN);
-
-        ms_cleanup_work(chip);
-
-        if (!check_card_ready(chip, lun)) {
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_NOT_PRESENT);
-                TRACE_RET(chip, TRANSPORT_FAILED);
-        }
-        if ((get_lun_card(chip, lun) != MS_CARD)) {
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_LUN_NOT_SUPPORT);
-                TRACE_RET(chip, TRANSPORT_FAILED);
-        }
-
-        if (srb->cmnd[7] != KC_MG_R_PRO) {
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
-                TRACE_RET(chip, TRANSPORT_FAILED);
-        }
-
-        if (!CHK_MSPRO(ms_card)) {
-                set_sense_type(chip, lun, SENSE_TYPE_MG_INCOMPATIBLE_MEDIUM);
-                TRACE_RET(chip, TRANSPORT_FAILED);
-        }
-
-        key_format = srb->cmnd[10] & 0x3F;
-        RTSX_DEBUGP("key_format = 0x%x\n", key_format);
-
-        switch (key_format) {
-        case KF_GET_LOC_EKB:
-                if ((scsi_bufflen(srb) == 0x41C) &&
-                        (srb->cmnd[8] == 0x04) &&
-                        (srb->cmnd[9] == 0x1C)) {
-                        retval = mg_get_local_EKB(srb, chip);
-                        if (retval != STATUS_SUCCESS)
-                                TRACE_RET(chip, TRANSPORT_FAILED);
-
-                } else {
-                        set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
-                        TRACE_RET(chip, TRANSPORT_FAILED);
-                }
-                break;
-
-        case KF_RSP_CHG:
-                if ((scsi_bufflen(srb) == 0x24) &&
-                        (srb->cmnd[8] == 0x00) &&
-                        (srb->cmnd[9] == 0x24)) {
-                        retval = mg_get_rsp_chg(srb, chip);
-                        if (retval != STATUS_SUCCESS)
-                                TRACE_RET(chip, TRANSPORT_FAILED);
-
-                } else {
-                        set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
-                        TRACE_RET(chip, TRANSPORT_FAILED);
-                }
-                break;
-
-        case KF_GET_ICV:
-                ms_card->mg_entry_num = srb->cmnd[5];
-                if ((scsi_bufflen(srb) == 0x404) &&
-                        (srb->cmnd[8] == 0x04) &&
-                        (srb->cmnd[9] == 0x04) &&
-                        (srb->cmnd[2] == 0x00) &&
-                        (srb->cmnd[3] == 0x00) &&
-                        (srb->cmnd[4] == 0x00) &&
-                        (srb->cmnd[5] < 32)) {
-                        retval = mg_get_ICV(srb, chip);
-                        if (retval != STATUS_SUCCESS)
-                                TRACE_RET(chip, TRANSPORT_FAILED);
-
-                } else {
-                        set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
-                        TRACE_RET(chip, TRANSPORT_FAILED);
-                }
-                break;
-
-        default:
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
-                TRACE_RET(chip, TRANSPORT_FAILED);
-        }
-
-        scsi_set_resid(srb, 0);
-        return TRANSPORT_GOOD;
-}
-
-static int mg_send_key(struct scsi_cmnd *srb, struct rtsx_chip *chip)
-{
-        struct ms_info *ms_card = &(chip->ms_card);
-        unsigned int lun = SCSI_LUN(srb);
-        int retval;
-        u8 key_format;
-
-        RTSX_DEBUGP("--%s--\n", __func__);
-
-        rtsx_disable_aspm(chip);
-
-        if (chip->ss_en && (rtsx_get_stat(chip) == RTSX_STAT_SS)) {
-                rtsx_exit_ss(chip);
-                wait_timeout(100);
-        }
-        rtsx_set_stat(chip, RTSX_STAT_RUN);
-
-        ms_cleanup_work(chip);
-
-        if (!check_card_ready(chip, lun)) {
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_NOT_PRESENT);
-                TRACE_RET(chip, TRANSPORT_FAILED);
-        }
-        if (check_card_wp(chip, lun)) {
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_WRITE_PROTECT);
-                TRACE_RET(chip, TRANSPORT_FAILED);
-        }
-        if ((get_lun_card(chip, lun) != MS_CARD)) {
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_LUN_NOT_SUPPORT);
-                TRACE_RET(chip, TRANSPORT_FAILED);
-        }
-
-        if (srb->cmnd[7] != KC_MG_R_PRO) {
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
-                TRACE_RET(chip, TRANSPORT_FAILED);
-        }
-
-        if (!CHK_MSPRO(ms_card)) {
-                set_sense_type(chip, lun, SENSE_TYPE_MG_INCOMPATIBLE_MEDIUM);
-                TRACE_RET(chip, TRANSPORT_FAILED);
-        }
-
-        key_format = srb->cmnd[10] & 0x3F;
-        RTSX_DEBUGP("key_format = 0x%x\n", key_format);
-
-        switch (key_format) {
-        case KF_SET_LEAF_ID:
-                if ((scsi_bufflen(srb) == 0x0C) &&
-                        (srb->cmnd[8] == 0x00) &&
-                        (srb->cmnd[9] == 0x0C)) {
-                        retval = mg_set_leaf_id(srb, chip);
-                        if (retval != STATUS_SUCCESS)
-                                TRACE_RET(chip, TRANSPORT_FAILED);
-
-                } else {
-                        set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
-                        TRACE_RET(chip, TRANSPORT_FAILED);
-                }
-                break;
-
-        case KF_CHG_HOST:
-                if ((scsi_bufflen(srb) == 0x0C) &&
-                        (srb->cmnd[8] == 0x00) &&
-                        (srb->cmnd[9] == 0x0C)) {
-                        retval = mg_chg(srb, chip);
-                        if (retval != STATUS_SUCCESS)
-                                TRACE_RET(chip, TRANSPORT_FAILED);
-
-                } else {
-                        set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
-                        TRACE_RET(chip, TRANSPORT_FAILED);
-                }
-                break;
-
-        case KF_RSP_HOST:
-                if ((scsi_bufflen(srb) == 0x0C) &&
-                        (srb->cmnd[8] == 0x00) &&
-                        (srb->cmnd[9] == 0x0C)) {
-                        retval = mg_rsp(srb, chip);
-                        if (retval != STATUS_SUCCESS)
-                                TRACE_RET(chip, TRANSPORT_FAILED);
-
-                } else {
-                        set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
-                        TRACE_RET(chip, TRANSPORT_FAILED);
-                }
-                break;
-
-        case KF_SET_ICV:
-                ms_card->mg_entry_num = srb->cmnd[5];
-                if ((scsi_bufflen(srb) == 0x404) &&
-                        (srb->cmnd[8] == 0x04) &&
-                        (srb->cmnd[9] == 0x04) &&
-                        (srb->cmnd[2] == 0x00) &&
-                        (srb->cmnd[3] == 0x00) &&
-                        (srb->cmnd[4] == 0x00) &&
-                        (srb->cmnd[5] < 32)) {
-                        retval = mg_set_ICV(srb, chip);
-                        if (retval != STATUS_SUCCESS)
-                                TRACE_RET(chip, TRANSPORT_FAILED);
-
-                } else {
-                        set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
-                        TRACE_RET(chip, TRANSPORT_FAILED);
-                }
-                break;
-
-        default:
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
-                TRACE_RET(chip, TRANSPORT_FAILED);
-        }
-
-        scsi_set_resid(srb, 0);
-        return TRANSPORT_GOOD;
-}
-#endif
-
-int rtsx_scsi_handler(struct scsi_cmnd *srb, struct rtsx_chip *chip)
-{
-#ifdef SUPPORT_SD_LOCK
-        struct sd_info *sd_card = &(chip->sd_card);
-#endif
-        struct ms_info *ms_card = &(chip->ms_card);
-        unsigned int lun = SCSI_LUN(srb);
-        int result;
-
-#ifdef SUPPORT_SD_LOCK
-        if (sd_card->sd_erase_status) {
-                /* Block all SCSI command except for
-                 * REQUEST_SENSE and rs_ppstatus
-                 */
-                if (!((srb->cmnd[0] == VENDOR_CMND) &&
-                                (srb->cmnd[1] == SCSI_APP_CMD) &&
-                                (srb->cmnd[2] == GET_DEV_STATUS)) &&
-                                (srb->cmnd[0] != REQUEST_SENSE)) {
-                        /* Logical Unit Not Ready Format in Progress */
-                        set_sense_data(chip, lun, CUR_ERR,
-                                       0x02, 0, 0x04, 0x04, 0, 0);
-                        TRACE_RET(chip, TRANSPORT_FAILED);
-                }
-        }
-#endif
-
-        if ((get_lun_card(chip, lun) == MS_CARD) &&
-                        (ms_card->format_status == FORMAT_IN_PROGRESS)) {
-                if ((srb->cmnd[0] != REQUEST_SENSE) && (srb->cmnd[0] != INQUIRY)) {
-                        /* Logical Unit Not Ready Format in Progress */
-                        set_sense_data(chip, lun, CUR_ERR, 0x02, 0, 0x04, 0x04,
-                                        0, (u16)(ms_card->progress));
-                        TRACE_RET(chip, TRANSPORT_FAILED);
-                }
-        }
-
-        switch (srb->cmnd[0]) {
-        case READ_10:
-        case WRITE_10:
-        case READ_6:
-        case WRITE_6:
-                result = read_write(srb, chip);
-#if !defined(LED_AUTO_BLINK) && !defined(REGULAR_BLINK)
-                led_shine(srb, chip);
-#endif
-                break;
-
-        case TEST_UNIT_READY:
-                result = test_unit_ready(srb, chip);
-                break;
-
-        case INQUIRY:
-                result = inquiry(srb, chip);
-                break;
-
-        case READ_CAPACITY:
-                result = read_capacity(srb, chip);
-                break;
-
-        case START_STOP:
-                result = start_stop_unit(srb, chip);
-                break;
-
-        case ALLOW_MEDIUM_REMOVAL:
-                result = allow_medium_removal(srb, chip);
-                break;
-
-        case REQUEST_SENSE:
-                result = request_sense(srb, chip);
-                break;
-
-        case MODE_SENSE:
-        case MODE_SENSE_10:
-                result = mode_sense(srb, chip);
-                break;
-
-        case 0x23:
-                result = read_format_capacity(srb, chip);
-                break;
-
-        case VENDOR_CMND:
-                result = vendor_cmnd(srb, chip);
-                break;
-
-        case MS_SP_CMND:
-                result = ms_sp_cmnd(srb, chip);
-                break;
-
-#ifdef SUPPORT_CPRM
-        case SD_PASS_THRU_MODE:
-        case SD_EXECUTE_NO_DATA:
-        case SD_EXECUTE_READ:
-        case SD_EXECUTE_WRITE:
-        case SD_GET_RSP:
-        case SD_HW_RST:
-                result = sd_extention_cmnd(srb, chip);
-                break;
-#endif
-
-#ifdef SUPPORT_MAGIC_GATE
-        case CMD_MSPRO_MG_RKEY:
-                result = mg_report_key(srb, chip);
-                break;
-
-        case CMD_MSPRO_MG_SKEY:
-                result = mg_send_key(srb, chip);
-                break;
-#endif
-
-        case FORMAT_UNIT:
-        case MODE_SELECT:
-        case VERIFY:
-                result = TRANSPORT_GOOD;
-                break;
-
-        default:
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
-                result = TRANSPORT_FAILED;
-        }
-
-        return result;
-}
diff --git a/drivers/staging/rts_pstor/rtsx_scsi.h b/drivers/staging/rts_pstor/rtsx_scsi.h
deleted file mode 100644
index 64b84992fdb3..000000000000
--- a/drivers/staging/rts_pstor/rtsx_scsi.h
+++ /dev/null
@@ -1,142 +0,0 @@
-/* Driver for Realtek PCI-Express card reader
- * Header file
- *
- * Copyright(c) 2009 Realtek Semiconductor Corp. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2, 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, see <http://www.gnu.org/licenses/>.
- *
- * Author:
- *   wwang (wei_wang@realsil.com.cn)
- *   No. 450, Shenhu Road, Suzhou Industry Park, Suzhou, China
- */
-
-#ifndef __REALTEK_RTSX_SCSI_H
-#define __REALTEK_RTSX_SCSI_H
-
-#include "rtsx.h"
-#include "rtsx_chip.h"
-
-#define MS_SP_CMND              0xFA
-#define MS_FORMAT               0xA0
-#define GET_MS_INFORMATION      0xB0
-
-#define VENDOR_CMND             0xF0
-
-#define READ_STATUS             0x09
-
-#define READ_EEPROM             0x04
-#define WRITE_EEPROM            0x05
-#define READ_MEM                0x0D
-#define WRITE_MEM               0x0E
-#define GET_BUS_WIDTH           0x13
-#define GET_SD_CSD              0x14
-#define TOGGLE_GPIO             0x15
-#define TRACE_MSG               0x18
-
-#define SCSI_APP_CMD            0x10
-
-#define PP_READ10               0x1A
-#define PP_WRITE10              0x0A
-#define READ_HOST_REG           0x1D
-#define WRITE_HOST_REG          0x0D
-#define SET_VAR                 0x05
-#define GET_VAR                 0x15
-#define DMA_READ                0x16
-#define DMA_WRITE               0x06
-#define GET_DEV_STATUS          0x10
-#define SET_CHIP_MODE           0x27
-#define SUIT_CMD                0xE0
-#define WRITE_PHY               0x07
-#define READ_PHY                0x17
-#define WRITE_EEPROM2           0x03
-#define READ_EEPROM2            0x13
-#define ERASE_EEPROM2           0x23
-#define WRITE_EFUSE             0x04
-#define READ_EFUSE              0x14
-#define WRITE_CFG               0x0E
-#define READ_CFG                0x1E
-
-#define SPI_VENDOR_COMMAND              0x1C
-
-#define SCSI_SPI_GETSTATUS              0x00
-#define SCSI_SPI_SETPARAMETER           0x01
-#define SCSI_SPI_READFALSHID            0x02
-#define SCSI_SPI_READFLASH              0x03
-#define SCSI_SPI_WRITEFLASH             0x04
-#define SCSI_SPI_WRITEFLASHSTATUS       0x05
-#define SCSI_SPI_ERASEFLASH             0x06
-
-#define INIT_BATCHCMD           0x41
-#define ADD_BATCHCMD            0x42
-#define SEND_BATCHCMD           0x43
-#define GET_BATCHRSP            0x44
-
-#define CHIP_NORMALMODE         0x00
-#define CHIP_DEBUGMODE          0x01
-
-/* SD Pass Through Command Extension */
-#define SD_PASS_THRU_MODE       0xD0
-#define SD_EXECUTE_NO_DATA      0xD1
-#define SD_EXECUTE_READ         0xD2
-#define SD_EXECUTE_WRITE        0xD3
-#define SD_GET_RSP              0xD4
-#define SD_HW_RST               0xD6
-
-#ifdef SUPPORT_MAGIC_GATE
-#define CMD_MSPRO_MG_RKEY       0xA4   /* Report Key Command */
-#define CMD_MSPRO_MG_SKEY       0xA3   /* Send Key Command */
-
-/* CBWCB field: key class */
-#define KC_MG_R_PRO             0xBE   /* MG-R PRO*/
-
-/* CBWCB field: key format */
-#define KF_SET_LEAF_ID          0x31   /* Set Leaf ID */
-#define KF_GET_LOC_EKB          0x32   /* Get Local EKB */
-#define KF_CHG_HOST             0x33   /* Challenge (host) */
-#define KF_RSP_CHG              0x34   /* Response and Challenge (device)  */
-#define KF_RSP_HOST             0x35   /* Response (host) */
-#define KF_GET_ICV              0x36   /* Get ICV */
-#define KF_SET_ICV              0x37   /* SSet ICV */
-#endif
-
-/* Sense type */
-#define SENSE_TYPE_NO_SENSE                             0
-#define SENSE_TYPE_MEDIA_CHANGE                         1
-#define SENSE_TYPE_MEDIA_NOT_PRESENT                    2
-#define SENSE_TYPE_MEDIA_LBA_OVER_RANGE                 3
-#define SENSE_TYPE_MEDIA_LUN_NOT_SUPPORT                4
-#define SENSE_TYPE_MEDIA_WRITE_PROTECT                  5
-#define SENSE_TYPE_MEDIA_INVALID_CMD_FIELD              6
-#define SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR             7
-#define SENSE_TYPE_MEDIA_WRITE_ERR                      8
-#define SENSE_TYPE_FORMAT_IN_PROGRESS                   9
-#define SENSE_TYPE_FORMAT_CMD_FAILED                    10
-#ifdef SUPPORT_MAGIC_GATE
-#define SENSE_TYPE_MG_KEY_FAIL_NOT_ESTAB                0x0b
-#define SENSE_TYPE_MG_KEY_FAIL_NOT_AUTHEN               0x0c
-#define SENSE_TYPE_MG_INCOMPATIBLE_MEDIUM               0x0d
-#define SENSE_TYPE_MG_WRITE_ERR                         0x0e
-#endif
-#ifdef SUPPORT_SD_LOCK
-#define SENSE_TYPE_MEDIA_READ_FORBIDDEN                 0x10  /* FOR Locked SD card*/
-#endif
-
-void scsi_show_command(struct scsi_cmnd *srb);
-void set_sense_type(struct rtsx_chip *chip, unsigned int lun, int sense_type);
-void set_sense_data(struct rtsx_chip *chip, unsigned int lun, u8 err_code, u8 sense_key,
-                u32 info, u8 asc, u8 ascq, u8 sns_key_info0, u16 sns_key_info1);
-int rtsx_scsi_handler(struct scsi_cmnd *srb, struct rtsx_chip *chip);
-
-#endif   /* __REALTEK_RTSX_SCSI_H */
-
diff --git a/drivers/staging/rts_pstor/rtsx_sys.h b/drivers/staging/rts_pstor/rtsx_sys.h
deleted file mode 100644
index 8e55a3a8b00a..000000000000
--- a/drivers/staging/rts_pstor/rtsx_sys.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/* Driver for Realtek PCI-Express card reader
- * Header file
- *
- * Copyright(c) 2009 Realtek Semiconductor Corp. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2, 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, see <http://www.gnu.org/licenses/>.
- *
- * Author:
- *   wwang (wei_wang@realsil.com.cn)
- *   No. 450, Shenhu Road, Suzhou Industry Park, Suzhou, China
- */
-
-#ifndef __RTSX_SYS_H
-#define __RTSX_SYS_H
-
-#include "rtsx.h"
-#include "rtsx_chip.h"
-#include "rtsx_card.h"
-
-typedef dma_addr_t ULONG_PTR;
-
-static inline void rtsx_exclusive_enter_ss(struct rtsx_chip *chip)
-{
-        struct rtsx_dev *dev = chip->rtsx;
-
-        spin_lock(&(dev->reg_lock));
-        rtsx_enter_ss(chip);
-        spin_unlock(&(dev->reg_lock));
-}
-
-static inline void rtsx_reset_detected_cards(struct rtsx_chip *chip, int flag)
-{
-        rtsx_reset_cards(chip);
-}
-
-#define RTSX_MSG_IN_INT(x)
-
-#endif  /* __RTSX_SYS_H */
-
diff --git a/drivers/staging/rts_pstor/rtsx_transport.c b/drivers/staging/rts_pstor/rtsx_transport.c
deleted file mode 100644
index 1f9a42480443..000000000000
--- a/drivers/staging/rts_pstor/rtsx_transport.c
+++ /dev/null
@@ -1,769 +0,0 @@
-/* Driver for Realtek PCI-Express card reader
- *
- * Copyright(c) 2009 Realtek Semiconductor Corp. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2, 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, see <http://www.gnu.org/licenses/>.
- *
- * Author:
- *   wwang (wei_wang@realsil.com.cn)
- *   No. 450, Shenhu Road, Suzhou Industry Park, Suzhou, China
- */
-
-#include <linux/blkdev.h>
-#include <linux/kthread.h>
-#include <linux/sched.h>
-
-#include "rtsx.h"
-#include "rtsx_scsi.h"
-#include "rtsx_transport.h"
-#include "rtsx_chip.h"
-#include "rtsx_card.h"
-#include "debug.h"
-
-/***********************************************************************
- * Scatter-gather transfer buffer access routines
- ***********************************************************************/
-
-/* Copy a buffer of length buflen to/from the srb's transfer buffer.
- * (Note: for scatter-gather transfers (srb->use_sg > 0), srb->request_buffer
- * points to a list of s-g entries and we ignore srb->request_bufflen.
- * For non-scatter-gather transfers, srb->request_buffer points to the
- * transfer buffer itself and srb->request_bufflen is the buffer's length.)
- * Update the *index and *offset variables so that the next copy will
- * pick up from where this one left off. */
-
-unsigned int rtsx_stor_access_xfer_buf(unsigned char *buffer,
-        unsigned int buflen, struct scsi_cmnd *srb, unsigned int *index,
-        unsigned int *offset, enum xfer_buf_dir dir)
-{
-        unsigned int cnt;
-
-        /* If not using scatter-gather, just transfer the data directly.
-         * Make certain it will fit in the available buffer space. */
-        if (scsi_sg_count(srb) == 0) {
-                if (*offset >= scsi_bufflen(srb))
-                        return 0;
-                cnt = min(buflen, scsi_bufflen(srb) - *offset);
-                if (dir == TO_XFER_BUF)
-                        memcpy((unsigned char *) scsi_sglist(srb) + *offset,
-                                        buffer, cnt);
-                else
-                        memcpy(buffer, (unsigned char *) scsi_sglist(srb) +
-                                        *offset, cnt);
-                *offset += cnt;
-
-        /* Using scatter-gather.  We have to go through the list one entry
-         * at a time.  Each s-g entry contains some number of pages, and
-         * each page has to be kmap()'ed separately.  If the page is already
-         * in kernel-addressable memory then kmap() will return its address.
-         * If the page is not directly accessible -- such as a user buffer
-         * located in high memory -- then kmap() will map it to a temporary
-         * position in the kernel's virtual address space. */
-        } else {
-                struct scatterlist *sg =
-                                (struct scatterlist *) scsi_sglist(srb)
-                                + *index;
-
-                /* This loop handles a single s-g list entry, which may
-                 * include multiple pages.  Find the initial page structure
-                 * and the starting offset within the page, and update
-                 * the *offset and *index values for the next loop. */
-                cnt = 0;
-                while (cnt < buflen && *index < scsi_sg_count(srb)) {
-                        struct page *page = sg_page(sg) +
-                                        ((sg->offset + *offset) >> PAGE_SHIFT);
-                        unsigned int poff =
-                                        (sg->offset + *offset) & (PAGE_SIZE-1);
-                        unsigned int sglen = sg->length - *offset;
-
-                        if (sglen > buflen - cnt) {
-
-                                /* Transfer ends within this s-g entry */
-                                sglen = buflen - cnt;
-                                *offset += sglen;
-                        } else {
-
-                                /* Transfer continues to next s-g entry */
-                                *offset = 0;
-                                ++*index;
-                                ++sg;
-                        }
-
-                        /* Transfer the data for all the pages in this
-                         * s-g entry.  For each page: call kmap(), do the
-                         * transfer, and call kunmap() immediately after. */
-                        while (sglen > 0) {
-                                unsigned int plen = min(sglen, (unsigned int)
-                                                PAGE_SIZE - poff);
-                                unsigned char *ptr = kmap(page);
-
-                                if (dir == TO_XFER_BUF)
-                                        memcpy(ptr + poff, buffer + cnt, plen);
-                                else
-                                        memcpy(buffer + cnt, ptr + poff, plen);
-                                kunmap(page);
-
-                                /* Start at the beginning of the next page */
-                                poff = 0;
-                                ++page;
-                                cnt += plen;
-                                sglen -= plen;
-                        }
-                }
-        }
-
-        /* Return the amount actually transferred */
-        return cnt;
-}
-
-/* Store the contents of buffer into srb's transfer buffer and set the
-* SCSI residue. */
-void rtsx_stor_set_xfer_buf(unsigned char *buffer,
-        unsigned int buflen, struct scsi_cmnd *srb)
-{
-        unsigned int index = 0, offset = 0;
-
-        rtsx_stor_access_xfer_buf(buffer, buflen, srb, &index, &offset,
-                                  TO_XFER_BUF);
-        if (buflen < scsi_bufflen(srb))
-                scsi_set_resid(srb, scsi_bufflen(srb) - buflen);
-}
-
-void rtsx_stor_get_xfer_buf(unsigned char *buffer,
-        unsigned int buflen, struct scsi_cmnd *srb)
-{
-        unsigned int index = 0, offset = 0;
-
-        rtsx_stor_access_xfer_buf(buffer, buflen, srb, &index, &offset,
-                                  FROM_XFER_BUF);
-        if (buflen < scsi_bufflen(srb))
-                scsi_set_resid(srb, scsi_bufflen(srb) - buflen);
-}
-
-
-/***********************************************************************
- * Transport routines
- ***********************************************************************/
-
-/* Invoke the transport and basic error-handling/recovery methods
- *
- * This is used to send the message to the device and receive the response.
- */
-void rtsx_invoke_transport(struct scsi_cmnd *srb, struct rtsx_chip *chip)
-{
-        int result;
-
-        result = rtsx_scsi_handler(srb, chip);
-
-        /* if the command gets aborted by the higher layers, we need to
-         * short-circuit all other processing
-         */
-        if (rtsx_chk_stat(chip, RTSX_STAT_ABORT)) {
-                RTSX_DEBUGP("-- command was aborted\n");
-                srb->result = DID_ABORT << 16;
-                goto Handle_Errors;
-        }
-
-        /* if there is a transport error, reset and don't auto-sense */
-        if (result == TRANSPORT_ERROR) {
-                RTSX_DEBUGP("-- transport indicates error, resetting\n");
-                srb->result = DID_ERROR << 16;
-                goto Handle_Errors;
-        }
-
-        srb->result = SAM_STAT_GOOD;
-
-        /*
-         * If we have a failure, we're going to do a REQUEST_SENSE
-         * automatically.  Note that we differentiate between a command
-         * "failure" and an "error" in the transport mechanism.
-         */
-        if (result == TRANSPORT_FAILED) {
-                /* set the result so the higher layers expect this data */
-                srb->result = SAM_STAT_CHECK_CONDITION;
-                memcpy(srb->sense_buffer,
-                        (unsigned char *)&(chip->sense_buffer[SCSI_LUN(srb)]),
-                        sizeof(struct sense_data_t));
-        }
-
-        return;
-
-        /* Error and abort processing: try to resynchronize with the device
-         * by issuing a port reset.  If that fails, try a class-specific
-         * device reset. */
-Handle_Errors:
-        return;
-}
-
-void rtsx_add_cmd(struct rtsx_chip *chip,
-                u8 cmd_type, u16 reg_addr, u8 mask, u8 data)
-{
-        u32 *cb = (u32 *)(chip->host_cmds_ptr);
-        u32 val = 0;
-
-        val |= (u32)(cmd_type & 0x03) << 30;
-        val |= (u32)(reg_addr & 0x3FFF) << 16;
-        val |= (u32)mask << 8;
-        val |= (u32)data;
-
-        spin_lock_irq(&chip->rtsx->reg_lock);
-        if (chip->ci < (HOST_CMDS_BUF_LEN / 4))
-                cb[(chip->ci)++] = cpu_to_le32(val);
-
-        spin_unlock_irq(&chip->rtsx->reg_lock);
-}
-
-void rtsx_send_cmd_no_wait(struct rtsx_chip *chip)
-{
-        u32 val = 1 << 31;
-
-        rtsx_writel(chip, RTSX_HCBAR, chip->host_cmds_addr);
-
-        val |= (u32)(chip->ci * 4) & 0x00FFFFFF;
-        /* Hardware Auto Response */
-        val |= 0x40000000;
-        rtsx_writel(chip, RTSX_HCBCTLR, val);
-}
-
-int rtsx_send_cmd(struct rtsx_chip *chip, u8 card, int timeout)
-{
-        struct rtsx_dev *rtsx = chip->rtsx;
-        struct completion trans_done;
-        u32 val = 1 << 31;
-        long timeleft;
-        int err = 0;
-
-        if (card == SD_CARD)
-                rtsx->check_card_cd = SD_EXIST;
-        else if (card == MS_CARD)
-                rtsx->check_card_cd = MS_EXIST;
-        else if (card == XD_CARD)
-                rtsx->check_card_cd = XD_EXIST;
-        else
-                rtsx->check_card_cd = 0;
-
-        spin_lock_irq(&rtsx->reg_lock);
-
-        /* set up data structures for the wakeup system */
-        rtsx->done = &trans_done;
-        rtsx->trans_result = TRANS_NOT_READY;
-        init_completion(&trans_done);
-        rtsx->trans_state = STATE_TRANS_CMD;
-
-        rtsx_writel(chip, RTSX_HCBAR, chip->host_cmds_addr);
-
-        val |= (u32)(chip->ci * 4) & 0x00FFFFFF;
-        /* Hardware Auto Response */
-        val |= 0x40000000;
-        rtsx_writel(chip, RTSX_HCBCTLR, val);
-
-        spin_unlock_irq(&rtsx->reg_lock);
-
-        /* Wait for TRANS_OK_INT */
-        timeleft = wait_for_completion_interruptible_timeout(
-                &trans_done, timeout * HZ / 1000);
-        if (timeleft <= 0) {
-                RTSX_DEBUGP("chip->int_reg = 0x%x\n", chip->int_reg);
-                err = -ETIMEDOUT;
-                TRACE_GOTO(chip, finish_send_cmd);
-        }
-
-        spin_lock_irq(&rtsx->reg_lock);
-        if (rtsx->trans_result == TRANS_RESULT_FAIL)
-                err = -EIO;
-        else if (rtsx->trans_result == TRANS_RESULT_OK)
-                err = 0;
-
-        spin_unlock_irq(&rtsx->reg_lock);
-
-finish_send_cmd:
-        rtsx->done = NULL;
-        rtsx->trans_state = STATE_TRANS_NONE;
-
-        if (err < 0)
-                rtsx_stop_cmd(chip, card);
-
-        return err;
-}
-
-static inline void rtsx_add_sg_tbl(
-        struct rtsx_chip *chip, u32 addr, u32 len, u8 option)
-{
-        u64 *sgb = (u64 *)(chip->host_sg_tbl_ptr);
-        u64 val = 0;
-        u32 temp_len = 0;
-        u8  temp_opt = 0;
-
-        do {
-                if (len > 0x80000) {
-                        temp_len = 0x80000;
-                        temp_opt = option & (~SG_END);
-                } else {
-                        temp_len = len;
-                        temp_opt = option;
-                }
-                val = ((u64)addr << 32) | ((u64)temp_len << 12) | temp_opt;
-
-                if (chip->sgi < (HOST_SG_TBL_BUF_LEN / 8))
-                        sgb[(chip->sgi)++] = cpu_to_le64(val);
-
-                len -= temp_len;
-                addr += temp_len;
-        } while (len);
-}
-
-static int rtsx_transfer_sglist_adma_partial(struct rtsx_chip *chip, u8 card,
-                struct scatterlist *sg, int num_sg, unsigned int *index,
-                unsigned int *offset, int size,
-                enum dma_data_direction dma_dir, int timeout)
-{
-        struct rtsx_dev *rtsx = chip->rtsx;
-        struct completion trans_done;
-        u8 dir;
-        int sg_cnt, i, resid;
-        int err = 0;
-        long timeleft;
-        struct scatterlist *sg_ptr;
-        u32 val = TRIG_DMA;
-
-        if ((sg == NULL) || (num_sg <= 0) || !offset || !index)
-                return -EIO;
-
-        if (dma_dir == DMA_TO_DEVICE)
-                dir = HOST_TO_DEVICE;
-        else if (dma_dir == DMA_FROM_DEVICE)
-                dir = DEVICE_TO_HOST;
-        else
-                return -ENXIO;
-
-        if (card == SD_CARD)
-                rtsx->check_card_cd = SD_EXIST;
-        else if (card == MS_CARD)
-                rtsx->check_card_cd = MS_EXIST;
-        else if (card == XD_CARD)
-                rtsx->check_card_cd = XD_EXIST;
-        else
-                rtsx->check_card_cd = 0;
-
-        spin_lock_irq(&rtsx->reg_lock);
-
-        /* set up data structures for the wakeup system */
-        rtsx->done = &trans_done;
-
-        rtsx->trans_state = STATE_TRANS_SG;
-        rtsx->trans_result = TRANS_NOT_READY;
-
-        spin_unlock_irq(&rtsx->reg_lock);
-
-        sg_cnt = dma_map_sg(&(rtsx->pci->dev), sg, num_sg, dma_dir);
-
-        resid = size;
-        sg_ptr = sg;
-        chip->sgi = 0;
-        /* Usually the next entry will be @sg@ + 1, but if this sg element
-         * is part of a chained scatterlist, it could jump to the start of
-         * a new scatterlist array. So here we use sg_next to move to
-         * the proper sg
-         */
-        for (i = 0; i < *index; i++)
-                sg_ptr = sg_next(sg_ptr);
-        for (i = *index; i < sg_cnt; i++) {
-                dma_addr_t addr;
-                unsigned int len;
-                u8 option;
-
-                addr = sg_dma_address(sg_ptr);
-                len = sg_dma_len(sg_ptr);
-
-                RTSX_DEBUGP("DMA addr: 0x%x, Len: 0x%x\n",
-                             (unsigned int)addr, len);
-                RTSX_DEBUGP("*index = %d, *offset = %d\n", *index, *offset);
-
-                addr += *offset;
-
-                if ((len - *offset) > resid) {
-                        *offset += resid;
-                        len = resid;
-                        resid = 0;
-                } else {
-                        resid -= (len - *offset);
-                        len -= *offset;
-                        *offset = 0;
-                        *index = *index + 1;
-                }
-                if ((i == (sg_cnt - 1)) || !resid)
-                        option = SG_VALID | SG_END | SG_TRANS_DATA;
-                else
-                        option = SG_VALID | SG_TRANS_DATA;
-
-                rtsx_add_sg_tbl(chip, (u32)addr, (u32)len, option);
-
-                if (!resid)
-                        break;
-
-                sg_ptr = sg_next(sg_ptr);
-        }
-
-        RTSX_DEBUGP("SG table count = %d\n", chip->sgi);
-
-        val |= (u32)(dir & 0x01) << 29;
-        val |= ADMA_MODE;
-
-        spin_lock_irq(&rtsx->reg_lock);
-
-        init_completion(&trans_done);
-
-        rtsx_writel(chip, RTSX_HDBAR, chip->host_sg_tbl_addr);
-        rtsx_writel(chip, RTSX_HDBCTLR, val);
-
-        spin_unlock_irq(&rtsx->reg_lock);
-
-        timeleft = wait_for_completion_interruptible_timeout(
-                &trans_done, timeout * HZ / 1000);
-        if (timeleft <= 0) {
-                RTSX_DEBUGP("Timeout (%s %d)\n", __func__, __LINE__);
-                RTSX_DEBUGP("chip->int_reg = 0x%x\n", chip->int_reg);
-                err = -ETIMEDOUT;
-                goto out;
-        }
-
-        spin_lock_irq(&rtsx->reg_lock);
-        if (rtsx->trans_result == TRANS_RESULT_FAIL) {
-                err = -EIO;
-                spin_unlock_irq(&rtsx->reg_lock);
-                goto out;
-        }
-        spin_unlock_irq(&rtsx->reg_lock);
-
-        /* Wait for TRANS_OK_INT */
-        spin_lock_irq(&rtsx->reg_lock);
-        if (rtsx->trans_result == TRANS_NOT_READY) {
-                init_completion(&trans_done);
-                spin_unlock_irq(&rtsx->reg_lock);
-                timeleft = wait_for_completion_interruptible_timeout(
-                        &trans_done, timeout * HZ / 1000);
-                if (timeleft <= 0) {
-                        RTSX_DEBUGP("Timeout (%s %d)\n", __func__, __LINE__);
-                        RTSX_DEBUGP("chip->int_reg = 0x%x\n", chip->int_reg);
-                        err = -ETIMEDOUT;
-                        goto out;
-                }
-        } else {
-                spin_unlock_irq(&rtsx->reg_lock);
-        }
-
-        spin_lock_irq(&rtsx->reg_lock);
-        if (rtsx->trans_result == TRANS_RESULT_FAIL)
-                err = -EIO;
-        else if (rtsx->trans_result == TRANS_RESULT_OK)
-                err = 0;
-
-        spin_unlock_irq(&rtsx->reg_lock);
-
-out:
-        rtsx->done = NULL;
-        rtsx->trans_state = STATE_TRANS_NONE;
-        dma_unmap_sg(&(rtsx->pci->dev), sg, num_sg, dma_dir);
-
-        if (err < 0)
-                rtsx_stop_cmd(chip, card);
-
-        return err;
-}
-
-static int rtsx_transfer_sglist_adma(struct rtsx_chip *chip, u8 card,
-                struct scatterlist *sg, int num_sg,
-                enum dma_data_direction dma_dir, int timeout)
-{
-        struct rtsx_dev *rtsx = chip->rtsx;
-        struct completion trans_done;
-        u8 dir;
-        int buf_cnt, i;
-        int err = 0;
-        long timeleft;
-        struct scatterlist *sg_ptr;
-
-        if ((sg == NULL) || (num_sg <= 0))
-                return -EIO;
-
-        if (dma_dir == DMA_TO_DEVICE)
-                dir = HOST_TO_DEVICE;
-        else if (dma_dir == DMA_FROM_DEVICE)
-                dir = DEVICE_TO_HOST;
-        else
-                return -ENXIO;
-
-        if (card == SD_CARD)
-                rtsx->check_card_cd = SD_EXIST;
-        else if (card == MS_CARD)
-                rtsx->check_card_cd = MS_EXIST;
-        else if (card == XD_CARD)
-                rtsx->check_card_cd = XD_EXIST;
-        else
-                rtsx->check_card_cd = 0;
-
-        spin_lock_irq(&rtsx->reg_lock);
-
-        /* set up data structures for the wakeup system */
-        rtsx->done = &trans_done;
-
-        rtsx->trans_state = STATE_TRANS_SG;
-        rtsx->trans_result = TRANS_NOT_READY;
-
-        spin_unlock_irq(&rtsx->reg_lock);
-
-        buf_cnt = dma_map_sg(&(rtsx->pci->dev), sg, num_sg, dma_dir);
-
-        sg_ptr = sg;
-
-        for (i = 0; i <= buf_cnt / (HOST_SG_TBL_BUF_LEN / 8); i++) {
-                u32 val = TRIG_DMA;
-                int sg_cnt, j;
-
-                if (i == buf_cnt / (HOST_SG_TBL_BUF_LEN / 8))
-                        sg_cnt = buf_cnt % (HOST_SG_TBL_BUF_LEN / 8);
-                else
-                        sg_cnt = (HOST_SG_TBL_BUF_LEN / 8);
-
-                chip->sgi = 0;
-                for (j = 0; j < sg_cnt; j++) {
-                        dma_addr_t addr = sg_dma_address(sg_ptr);
-                        unsigned int len = sg_dma_len(sg_ptr);
-                        u8 option;
-
-                        RTSX_DEBUGP("DMA addr: 0x%x, Len: 0x%x\n",
-                                     (unsigned int)addr, len);
-
-                        if (j == (sg_cnt - 1))
-                                option = SG_VALID | SG_END | SG_TRANS_DATA;
-                        else
-                                option = SG_VALID | SG_TRANS_DATA;
-
-                        rtsx_add_sg_tbl(chip, (u32)addr, (u32)len, option);
-
-                        sg_ptr = sg_next(sg_ptr);
-                }
-
-                RTSX_DEBUGP("SG table count = %d\n", chip->sgi);
-
-                val |= (u32)(dir & 0x01) << 29;
-                val |= ADMA_MODE;
-
-                spin_lock_irq(&rtsx->reg_lock);
-
-                init_completion(&trans_done);
-
-                rtsx_writel(chip, RTSX_HDBAR, chip->host_sg_tbl_addr);
-                rtsx_writel(chip, RTSX_HDBCTLR, val);
-
-                spin_unlock_irq(&rtsx->reg_lock);
-
-                timeleft = wait_for_completion_interruptible_timeout(
-                        &trans_done, timeout * HZ / 1000);
-                if (timeleft <= 0) {
-                        RTSX_DEBUGP("Timeout (%s %d)\n", __func__, __LINE__);
-                        RTSX_DEBUGP("chip->int_reg = 0x%x\n", chip->int_reg);
-                        err = -ETIMEDOUT;
-                        goto out;
-                }
-
-                spin_lock_irq(&rtsx->reg_lock);
-                if (rtsx->trans_result == TRANS_RESULT_FAIL) {
-                        err = -EIO;
-                        spin_unlock_irq(&rtsx->reg_lock);
-                        goto out;
-                }
-                spin_unlock_irq(&rtsx->reg_lock);
-
-                sg_ptr += sg_cnt;
-        }
-
-        /* Wait for TRANS_OK_INT */
-        spin_lock_irq(&rtsx->reg_lock);
-        if (rtsx->trans_result == TRANS_NOT_READY) {
-                init_completion(&trans_done);
-                spin_unlock_irq(&rtsx->reg_lock);
-                timeleft = wait_for_completion_interruptible_timeout(
-                        &trans_done, timeout * HZ / 1000);
-                if (timeleft <= 0) {
-                        RTSX_DEBUGP("Timeout (%s %d)\n", __func__, __LINE__);
-                        RTSX_DEBUGP("chip->int_reg = 0x%x\n", chip->int_reg);
-                        err = -ETIMEDOUT;
-                        goto out;
-                }
-        } else {
-                spin_unlock_irq(&rtsx->reg_lock);
-        }
-
-        spin_lock_irq(&rtsx->reg_lock);
-        if (rtsx->trans_result == TRANS_RESULT_FAIL)
-                err = -EIO;
-        else if (rtsx->trans_result == TRANS_RESULT_OK)
-                err = 0;
-
-        spin_unlock_irq(&rtsx->reg_lock);
-
-out:
-        rtsx->done = NULL;
-        rtsx->trans_state = STATE_TRANS_NONE;
-        dma_unmap_sg(&(rtsx->pci->dev), sg, num_sg, dma_dir);
-
-        if (err < 0)
-                rtsx_stop_cmd(chip, card);
-
-        return err;
-}
-
-static int rtsx_transfer_buf(struct rtsx_chip *chip, u8 card, void *buf, size_t len,
-                enum dma_data_direction dma_dir, int timeout)
-{
-        struct rtsx_dev *rtsx = chip->rtsx;
-        struct completion trans_done;
-        dma_addr_t addr;
-        u8 dir;
-        int err = 0;
-        u32 val = (1 << 31);
-        long timeleft;
-
-        if ((buf == NULL) || (len <= 0))
-                return -EIO;
-
-        if (dma_dir == DMA_TO_DEVICE)
-                dir = HOST_TO_DEVICE;
-        else if (dma_dir == DMA_FROM_DEVICE)
-                dir = DEVICE_TO_HOST;
-        else
-                return -ENXIO;
-
-        addr = dma_map_single(&(rtsx->pci->dev), buf, len, dma_dir);
-        if (!addr)
-                return -ENOMEM;
-
-        if (card == SD_CARD)
-                rtsx->check_card_cd = SD_EXIST;
-        else if (card == MS_CARD)
-                rtsx->check_card_cd = MS_EXIST;
-        else if (card == XD_CARD)
-                rtsx->check_card_cd = XD_EXIST;
-        else
-                rtsx->check_card_cd = 0;
-
-        val |= (u32)(dir & 0x01) << 29;
-        val |= (u32)(len & 0x00FFFFFF);
-
-        spin_lock_irq(&rtsx->reg_lock);
-
-        /* set up data structures for the wakeup system */
-        rtsx->done = &trans_done;
-
-        init_completion(&trans_done);
-
-        rtsx->trans_state = STATE_TRANS_BUF;
-        rtsx->trans_result = TRANS_NOT_READY;
-
-        rtsx_writel(chip, RTSX_HDBAR, addr);
-        rtsx_writel(chip, RTSX_HDBCTLR, val);
-
-        spin_unlock_irq(&rtsx->reg_lock);
-
-        /* Wait for TRANS_OK_INT */
-        timeleft = wait_for_completion_interruptible_timeout(
-                &trans_done, timeout * HZ / 1000);
-        if (timeleft <= 0) {
-                RTSX_DEBUGP("Timeout (%s %d)\n", __func__, __LINE__);
-                RTSX_DEBUGP("chip->int_reg = 0x%x\n", chip->int_reg);
-                err = -ETIMEDOUT;
-                goto out;
-        }
-
-        spin_lock_irq(&rtsx->reg_lock);
-        if (rtsx->trans_result == TRANS_RESULT_FAIL)
-                err = -EIO;
-        else if (rtsx->trans_result == TRANS_RESULT_OK)
-                err = 0;
-
-        spin_unlock_irq(&rtsx->reg_lock);
-
-out:
-        rtsx->done = NULL;
-        rtsx->trans_state = STATE_TRANS_NONE;
-        dma_unmap_single(&(rtsx->pci->dev), addr, len, dma_dir);
-
-        if (err < 0)
-                rtsx_stop_cmd(chip, card);
-
-        return err;
-}
-
-int rtsx_transfer_data_partial(struct rtsx_chip *chip, u8 card,
-                void *buf, size_t len, int use_sg, unsigned int *index,
-                unsigned int *offset, enum dma_data_direction dma_dir,
-                int timeout)
-{
-        int err = 0;
-
-        /* don't transfer data during abort processing */
-        if (rtsx_chk_stat(chip, RTSX_STAT_ABORT))
-                return -EIO;
-
-        if (use_sg) {
-                err = rtsx_transfer_sglist_adma_partial(chip, card,
-                                (struct scatterlist *)buf, use_sg,
-                                index, offset, (int)len, dma_dir, timeout);
-        } else {
-                err = rtsx_transfer_buf(chip, card,
-                                        buf, len, dma_dir, timeout);
-        }
-
-        if (err < 0) {
-                if (RTSX_TST_DELINK(chip)) {
-                        RTSX_CLR_DELINK(chip);
-                        chip->need_reinit = SD_CARD | MS_CARD | XD_CARD;
-                        rtsx_reinit_cards(chip, 1);
-                }
-        }
-
-        return err;
-}
-
-int rtsx_transfer_data(struct rtsx_chip *chip, u8 card, void *buf, size_t len,
-                int use_sg, enum dma_data_direction dma_dir, int timeout)
-{
-        int err = 0;
-
-        RTSX_DEBUGP("use_sg = %d\n", use_sg);
-
-        /* don't transfer data during abort processing */
-        if (rtsx_chk_stat(chip, RTSX_STAT_ABORT))
-                return -EIO;
-
-        if (use_sg) {
-                err = rtsx_transfer_sglist_adma(chip, card,
-                                (struct scatterlist *)buf,
-                                use_sg, dma_dir, timeout);
-        } else {
-                err = rtsx_transfer_buf(chip, card, buf, len, dma_dir, timeout);
-        }
-
-        if (err < 0) {
-                if (RTSX_TST_DELINK(chip)) {
-                        RTSX_CLR_DELINK(chip);
-                        chip->need_reinit = SD_CARD | MS_CARD | XD_CARD;
-                        rtsx_reinit_cards(chip, 1);
-                }
-        }
-
-        return err;
-}
-
diff --git a/drivers/staging/rts_pstor/rtsx_transport.h b/drivers/staging/rts_pstor/rtsx_transport.h
deleted file mode 100644
index 41f1ea05a8d3..000000000000
--- a/drivers/staging/rts_pstor/rtsx_transport.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* Driver for Realtek PCI-Express card reader
- * Header file
- *
- * Copyright(c) 2009 Realtek Semiconductor Corp. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2, 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, see <http://www.gnu.org/licenses/>.
- *
- * Author:
- *   wwang (wei_wang@realsil.com.cn)
- *   No. 450, Shenhu Road, Suzhou Industry Park, Suzhou, China
- */
-
-#ifndef __REALTEK_RTSX_TRANSPORT_H
-#define __REALTEK_RTSX_TRANSPORT_H
-
-#include "rtsx.h"
-#include "rtsx_chip.h"
-
-#define WAIT_TIME       2000
-
-unsigned int rtsx_stor_access_xfer_buf(unsigned char *buffer,
-        unsigned int buflen, struct scsi_cmnd *srb, unsigned int *index,
-        unsigned int *offset, enum xfer_buf_dir dir);
-void rtsx_stor_set_xfer_buf(unsigned char *buffer,
-        unsigned int buflen, struct scsi_cmnd *srb);
-void rtsx_stor_get_xfer_buf(unsigned char *buffer,
-        unsigned int buflen, struct scsi_cmnd *srb);
-void rtsx_invoke_transport(struct scsi_cmnd *srb, struct rtsx_chip *chip);
-
-
-#define rtsx_init_cmd(chip)                     ((chip)->ci = 0)
-
-void rtsx_add_cmd(struct rtsx_chip *chip,
-                u8 cmd_type, u16 reg_addr, u8 mask, u8 data);
-void rtsx_send_cmd_no_wait(struct rtsx_chip *chip);
-int rtsx_send_cmd(struct rtsx_chip *chip, u8 card, int timeout);
-
-extern inline u8 *rtsx_get_cmd_data(struct rtsx_chip *chip)
-{
-#ifdef CMD_USING_SG
-        return (u8 *)(chip->host_sg_tbl_ptr);
-#else
-        return (u8 *)(chip->host_cmds_ptr);
-#endif
-}
-
-int rtsx_transfer_data(struct rtsx_chip *chip, u8 card, void *buf, size_t len,
-                int use_sg, enum dma_data_direction dma_dir, int timeout);
-
-int rtsx_transfer_data_partial(struct rtsx_chip *chip, u8 card, void *buf, size_t len,
-                int use_sg, unsigned int *index, unsigned int *offset,
-                enum dma_data_direction dma_dir, int timeout);
-
-#endif   /* __REALTEK_RTSX_TRANSPORT_H */
-
diff --git a/drivers/staging/rts_pstor/sd.c b/drivers/staging/rts_pstor/sd.c
deleted file mode 100644
index c6a581c47cbc..000000000000
--- a/drivers/staging/rts_pstor/sd.c
+++ /dev/null
@@ -1,4570 +0,0 @@
-/* Driver for Realtek PCI-Express card reader
- *
- * Copyright(c) 2009 Realtek Semiconductor Corp. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2, 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, see <http://www.gnu.org/licenses/>.
- *
- * Author:
- *   wwang (wei_wang@realsil.com.cn)
- *   No. 450, Shenhu Road, Suzhou Industry Park, Suzhou, China
- */
-
-#include <linux/blkdev.h>
-#include <linux/kthread.h>
-#include <linux/sched.h>
-
-#include "rtsx.h"
-#include "rtsx_transport.h"
-#include "rtsx_scsi.h"
-#include "rtsx_card.h"
-#include "sd.h"
-
-#define SD_MAX_RETRY_COUNT      3
-
-static u16 REG_SD_CFG1;
-static u16 REG_SD_CFG2;
-static u16 REG_SD_CFG3;
-static u16 REG_SD_STAT1;
-static u16 REG_SD_STAT2;
-static u16 REG_SD_BUS_STAT;
-static u16 REG_SD_PAD_CTL;
-static u16 REG_SD_SAMPLE_POINT_CTL;
-static u16 REG_SD_PUSH_POINT_CTL;
-static u16 REG_SD_CMD0;
-static u16 REG_SD_CMD1;
-static u16 REG_SD_CMD2;
-static u16 REG_SD_CMD3;
-static u16 REG_SD_CMD4;
-static u16 REG_SD_CMD5;
-static u16 REG_SD_BYTE_CNT_L;
-static u16 REG_SD_BYTE_CNT_H;
-static u16 REG_SD_BLOCK_CNT_L;
-static u16 REG_SD_BLOCK_CNT_H;
-static u16 REG_SD_TRANSFER;
-static u16 REG_SD_VPCLK0_CTL;
-static u16 REG_SD_VPCLK1_CTL;
-static u16 REG_SD_DCMPS0_CTL;
-static u16 REG_SD_DCMPS1_CTL;
-
-static inline void sd_set_err_code(struct rtsx_chip *chip, u8 err_code)
-{
-        struct sd_info *sd_card = &(chip->sd_card);
-
-        sd_card->err_code |= err_code;
-}
-
-static inline void sd_clr_err_code(struct rtsx_chip *chip)
-{
-        struct sd_info *sd_card = &(chip->sd_card);
-
-        sd_card->err_code = 0;
-}
-
-static inline int sd_check_err_code(struct rtsx_chip *chip, u8 err_code)
-{
-        struct sd_info *sd_card = &(chip->sd_card);
-
-        return sd_card->err_code & err_code;
-}
-
-static void sd_init_reg_addr(struct rtsx_chip *chip)
-{
-        if (CHECK_PID(chip, 0x5209)) {
-                REG_SD_CFG1 = SD_CFG1;
-                REG_SD_CFG2 = SD_CFG2;
-                REG_SD_CFG3 = SD_CFG3;
-                REG_SD_STAT1 = SD_STAT1;
-                REG_SD_STAT2 = SD_STAT2;
-                REG_SD_BUS_STAT = SD_BUS_STAT;
-                REG_SD_PAD_CTL = SD_PAD_CTL;
-                REG_SD_SAMPLE_POINT_CTL = SD_SAMPLE_POINT_CTL;
-                REG_SD_PUSH_POINT_CTL = SD_PUSH_POINT_CTL;
-                REG_SD_CMD0 = SD_CMD0;
-                REG_SD_CMD1 = SD_CMD1;
-                REG_SD_CMD2 = SD_CMD2;
-                REG_SD_CMD3 = SD_CMD3;
-                REG_SD_CMD4 = SD_CMD4;
-                REG_SD_CMD5 = SD_CMD5;
-                REG_SD_BYTE_CNT_L = SD_BYTE_CNT_L;
-                REG_SD_BYTE_CNT_H = SD_BYTE_CNT_H;
-                REG_SD_BLOCK_CNT_L = SD_BLOCK_CNT_L;
-                REG_SD_BLOCK_CNT_H = SD_BLOCK_CNT_H;
-                REG_SD_TRANSFER = SD_TRANSFER;
-                REG_SD_VPCLK0_CTL = SD_VPCLK0_CTL;
-                REG_SD_VPCLK1_CTL = SD_VPCLK1_CTL;
-                REG_SD_DCMPS0_CTL = SD_DCMPS0_CTL;
-                REG_SD_DCMPS1_CTL = SD_DCMPS1_CTL;
-        } else {
-                REG_SD_CFG1 = 0xFD31;
-                REG_SD_CFG2 = 0xFD33;
-                REG_SD_CFG3 = 0xFD3E;
-                REG_SD_STAT1 = 0xFD30;
-                REG_SD_STAT2 = 0;
-                REG_SD_BUS_STAT = 0;
-                REG_SD_PAD_CTL = 0;
-                REG_SD_SAMPLE_POINT_CTL = 0;
-                REG_SD_PUSH_POINT_CTL = 0;
-                REG_SD_CMD0 = 0xFD34;
-                REG_SD_CMD1 = 0xFD35;
-                REG_SD_CMD2 = 0xFD36;
-                REG_SD_CMD3 = 0xFD37;
-                REG_SD_CMD4 = 0xFD38;
-                REG_SD_CMD5 = 0xFD5A;
-                REG_SD_BYTE_CNT_L = 0xFD39;
-                REG_SD_BYTE_CNT_H = 0xFD3A;
-                REG_SD_BLOCK_CNT_L = 0xFD3B;
-                REG_SD_BLOCK_CNT_H = 0xFD3C;
-                REG_SD_TRANSFER = 0xFD32;
-                REG_SD_VPCLK0_CTL = 0;
-                REG_SD_VPCLK1_CTL = 0;
-                REG_SD_DCMPS0_CTL = 0;
-                REG_SD_DCMPS1_CTL = 0;
-        }
-}
-
-static int sd_check_data0_status(struct rtsx_chip *chip)
-{
-        u8 stat;
-
-        if (CHECK_PID(chip, 0x5209))
-                RTSX_READ_REG(chip, REG_SD_BUS_STAT, &stat);
-        else
-                RTSX_READ_REG(chip, REG_SD_STAT1, &stat);
-
-        if (!(stat & SD_DAT0_STATUS)) {
-                sd_set_err_code(chip, SD_BUSY);
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        return STATUS_SUCCESS;
-}
-
-static int sd_send_cmd_get_rsp(struct rtsx_chip *chip, u8 cmd_idx,
-                u32 arg, u8 rsp_type, u8 *rsp, int rsp_len)
-{
-        struct sd_info *sd_card = &(chip->sd_card);
-        int retval;
-        int timeout = 100;
-        u16 reg_addr;
-        u8 *ptr;
-        int stat_idx = 0;
-        int rty_cnt = 0;
-
-        sd_clr_err_code(chip);
-
-        RTSX_DEBUGP("SD/MMC CMD %d, arg = 0x%08x\n", cmd_idx, arg);
-
-        if (rsp_type == SD_RSP_TYPE_R1b)
-                timeout = 3000;
-
-RTY_SEND_CMD:
-
-        rtsx_init_cmd(chip);
-
-        rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_CMD0, 0xFF, 0x40 | cmd_idx);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_CMD1, 0xFF, (u8)(arg >> 24));
-        rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_CMD2, 0xFF, (u8)(arg >> 16));
-        rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_CMD3, 0xFF, (u8)(arg >> 8));
-        rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_CMD4, 0xFF, (u8)arg);
-
-        rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_CFG2, 0xFF, rsp_type);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_DATA_SOURCE,
-                        0x01, PINGPONG_BUFFER);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_TRANSFER,
-                        0xFF, SD_TM_CMD_RSP | SD_TRANSFER_START);
-        rtsx_add_cmd(chip, CHECK_REG_CMD, REG_SD_TRANSFER,
-                     SD_TRANSFER_END | SD_STAT_IDLE, SD_TRANSFER_END | SD_STAT_IDLE);
-
-        if (rsp_type == SD_RSP_TYPE_R2) {
-                for (reg_addr = PPBUF_BASE2; reg_addr < PPBUF_BASE2 + 16; reg_addr++)
-                        rtsx_add_cmd(chip, READ_REG_CMD, reg_addr, 0, 0);
-
-                stat_idx = 16;
-        } else if (rsp_type != SD_RSP_TYPE_R0) {
-                for (reg_addr = REG_SD_CMD0; reg_addr <= REG_SD_CMD4; reg_addr++)
-                        rtsx_add_cmd(chip, READ_REG_CMD, reg_addr, 0, 0);
-
-                stat_idx = 5;
-        }
-
-        rtsx_add_cmd(chip, READ_REG_CMD, REG_SD_STAT1, 0, 0);
-
-        retval = rtsx_send_cmd(chip, SD_CARD, timeout);
-        if (retval < 0) {
-                u8 val;
-
-                rtsx_read_register(chip, REG_SD_STAT1, &val);
-                RTSX_DEBUGP("SD_STAT1: 0x%x\n", val);
-
-                if (CHECK_PID(chip, 0x5209)) {
-                        rtsx_read_register(chip, REG_SD_STAT2, &val);
-                        RTSX_DEBUGP("SD_STAT2: 0x%x\n", val);
-
-                        if (val & SD_RSP_80CLK_TIMEOUT) {
-                                rtsx_clear_sd_error(chip);
-                                sd_set_err_code(chip, SD_RSP_TIMEOUT);
-                                TRACE_RET(chip, STATUS_FAIL);
-                        }
-
-                        rtsx_read_register(chip, REG_SD_BUS_STAT, &val);
-                        RTSX_DEBUGP("SD_BUS_STAT: 0x%x\n", val);
-                } else {
-                        rtsx_read_register(chip, REG_SD_CFG3, &val);
-                        RTSX_DEBUGP("SD_CFG3: 0x%x\n", val);
-                }
-
-                if (retval == -ETIMEDOUT) {
-                        if (rsp_type & SD_WAIT_BUSY_END) {
-                                retval = sd_check_data0_status(chip);
-                                if (retval != STATUS_SUCCESS) {
-                                        rtsx_clear_sd_error(chip);
-                                        TRACE_RET(chip, retval);
-                                }
-                        } else {
-                                sd_set_err_code(chip, SD_TO_ERR);
-                        }
-                        retval = STATUS_TIMEDOUT;
-                } else {
-                        retval = STATUS_FAIL;
-                }
-                rtsx_clear_sd_error(chip);
-
-                TRACE_RET(chip, retval);
-        }
-
-        if (rsp_type == SD_RSP_TYPE_R0)
-                return STATUS_SUCCESS;
-
-        ptr = rtsx_get_cmd_data(chip) + 1;
-
-        if ((ptr[0] & 0xC0) != 0) {
-                sd_set_err_code(chip, SD_STS_ERR);
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        if (!(rsp_type & SD_NO_CHECK_CRC7)) {
-                if (ptr[stat_idx] & SD_CRC7_ERR) {
-                        if (cmd_idx == WRITE_MULTIPLE_BLOCK) {
-                                sd_set_err_code(chip, SD_CRC_ERR);
-                                TRACE_RET(chip, STATUS_FAIL);
-                        }
-                        if (rty_cnt < SD_MAX_RETRY_COUNT) {
-                                wait_timeout(20);
-                                rty_cnt++;
-                                goto RTY_SEND_CMD;
-                        } else {
-                                sd_set_err_code(chip, SD_CRC_ERR);
-                                TRACE_RET(chip, STATUS_FAIL);
-                        }
-                }
-        }
-
-        if ((rsp_type == SD_RSP_TYPE_R1) || (rsp_type == SD_RSP_TYPE_R1b)) {
-                if ((cmd_idx != SEND_RELATIVE_ADDR) && (cmd_idx != SEND_IF_COND)) {
-                        if (cmd_idx != STOP_TRANSMISSION) {
-                                if (ptr[1] & 0x80)
-                                        TRACE_RET(chip, STATUS_FAIL);
-                        }
-#ifdef SUPPORT_SD_LOCK
-                        if (ptr[1] & 0x7D)
-#else
-                        if (ptr[1] & 0x7F)
-#endif
-                        {
-                                RTSX_DEBUGP("ptr[1]: 0x%02x\n", ptr[1]);
-                                TRACE_RET(chip, STATUS_FAIL);
-                        }
-                        if (ptr[2] & 0xFF) {
-                                RTSX_DEBUGP("ptr[2]: 0x%02x\n", ptr[2]);
-                                TRACE_RET(chip, STATUS_FAIL);
-                        }
-                        if (ptr[3] & 0x80) {
-                                RTSX_DEBUGP("ptr[3]: 0x%02x\n", ptr[3]);
-                                TRACE_RET(chip, STATUS_FAIL);
-                        }
-                        if (ptr[3] & 0x01)
-                                sd_card->sd_data_buf_ready = 1;
-                        else
-                                sd_card->sd_data_buf_ready = 0;
-                }
-        }
-
-        if (rsp && rsp_len)
-                memcpy(rsp, ptr, rsp_len);
-
-        return STATUS_SUCCESS;
-}
-
-static int sd_read_data(struct rtsx_chip *chip,
-                        u8 trans_mode, u8 *cmd, int cmd_len, u16 byte_cnt,
-                        u16 blk_cnt, u8 bus_width, u8 *buf, int buf_len,
-                        int timeout)
-{
-        struct sd_info *sd_card = &(chip->sd_card);
-        int retval;
-        int i;
-
-        sd_clr_err_code(chip);
-
-        if (!buf)
-                buf_len = 0;
-
-        if (buf_len > 512)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        rtsx_init_cmd(chip);
-
-        if (cmd_len) {
-                RTSX_DEBUGP("SD/MMC CMD %d\n", cmd[0] - 0x40);
-                for (i = 0; i < (cmd_len < 6 ? cmd_len : 6); i++)
-                        rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_CMD0 + i, 0xFF, cmd[i]);
-        }
-        rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_BYTE_CNT_L, 0xFF, (u8)byte_cnt);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_BYTE_CNT_H, 0xFF, (u8)(byte_cnt >> 8));
-        rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_BLOCK_CNT_L, 0xFF, (u8)blk_cnt);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_BLOCK_CNT_H, 0xFF, (u8)(blk_cnt >> 8));
-
-        rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_CFG1, 0x03, bus_width);
-
-        rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_CFG2, 0xFF,
-                        SD_CALCULATE_CRC7 | SD_CHECK_CRC16 | SD_NO_WAIT_BUSY_END |
-                        SD_CHECK_CRC7 | SD_RSP_LEN_6);
-        if (trans_mode != SD_TM_AUTO_TUNING)
-                rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_DATA_SOURCE, 0x01, PINGPONG_BUFFER);
-
-        rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_TRANSFER, 0xFF, trans_mode | SD_TRANSFER_START);
-        rtsx_add_cmd(chip, CHECK_REG_CMD, REG_SD_TRANSFER, SD_TRANSFER_END, SD_TRANSFER_END);
-
-        retval = rtsx_send_cmd(chip, SD_CARD, timeout);
-        if (retval < 0) {
-                if (retval == -ETIMEDOUT) {
-                        sd_send_cmd_get_rsp(chip, SEND_STATUS, sd_card->sd_addr,
-                                            SD_RSP_TYPE_R1, NULL, 0);
-                }
-
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        if (buf && buf_len) {
-                retval = rtsx_read_ppbuf(chip, buf, buf_len);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        return STATUS_SUCCESS;
-}
-
-static int sd_write_data(struct rtsx_chip *chip, u8 trans_mode,
-                u8 *cmd, int cmd_len, u16 byte_cnt, u16 blk_cnt, u8 bus_width,
-                u8 *buf, int buf_len, int timeout)
-{
-        struct sd_info *sd_card = &(chip->sd_card);
-        int retval;
-        int i;
-
-        sd_clr_err_code(chip);
-
-        if (!buf)
-                buf_len = 0;
-
-        if (buf_len > 512) {
-                /* This function can't write data more than one page */
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        if (buf && buf_len) {
-                retval = rtsx_write_ppbuf(chip, buf, buf_len);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        rtsx_init_cmd(chip);
-
-        if (cmd_len) {
-                RTSX_DEBUGP("SD/MMC CMD %d\n", cmd[0] - 0x40);
-                for (i = 0; i < (cmd_len < 6 ? cmd_len : 6); i++) {
-                        rtsx_add_cmd(chip, WRITE_REG_CMD,
-                                     REG_SD_CMD0 + i, 0xFF, cmd[i]);
-                }
-        }
-        rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_BYTE_CNT_L, 0xFF, (u8)byte_cnt);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_BYTE_CNT_H, 0xFF, (u8)(byte_cnt >> 8));
-        rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_BLOCK_CNT_L, 0xFF, (u8)blk_cnt);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_BLOCK_CNT_H, 0xFF, (u8)(blk_cnt >> 8));
-
-        rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_CFG1, 0x03, bus_width);
-
-        rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_CFG2, 0xFF,
-                SD_CALCULATE_CRC7 | SD_CHECK_CRC16 | SD_NO_WAIT_BUSY_END |
-                SD_CHECK_CRC7 | SD_RSP_LEN_6);
-
-        rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_TRANSFER, 0xFF, trans_mode | SD_TRANSFER_START);
-        rtsx_add_cmd(chip, CHECK_REG_CMD, REG_SD_TRANSFER, SD_TRANSFER_END, SD_TRANSFER_END);
-
-        retval = rtsx_send_cmd(chip, SD_CARD, timeout);
-        if (retval < 0) {
-                if (retval == -ETIMEDOUT) {
-                        sd_send_cmd_get_rsp(chip, SEND_STATUS,
-                                sd_card->sd_addr, SD_RSP_TYPE_R1, NULL, 0);
-                }
-
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        return STATUS_SUCCESS;
-}
-
-static int sd_check_csd(struct rtsx_chip *chip, char check_wp)
-{
-        struct sd_info *sd_card = &(chip->sd_card);
-        int retval;
-        int i;
-        u8 csd_ver, trans_speed;
-        u8 rsp[16];
-
-        for (i = 0; i < 6; i++) {
-                if (detect_card_cd(chip, SD_CARD) != STATUS_SUCCESS) {
-                        sd_set_err_code(chip, SD_NO_CARD);
-                        TRACE_RET(chip, STATUS_FAIL);
-                }
-
-                retval = sd_send_cmd_get_rsp(chip, SEND_CSD, sd_card->sd_addr, SD_RSP_TYPE_R2, rsp, 16);
-                if (retval == STATUS_SUCCESS)
-                        break;
-        }
-
-        if (i == 6)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        memcpy(sd_card->raw_csd, rsp + 1, 15);
-
-        if (CHECK_PID(chip, 0x5209))
-                RTSX_READ_REG(chip, REG_SD_CMD5, sd_card->raw_csd + 15);
-
-        RTSX_DEBUGP("CSD Response:\n");
-        RTSX_DUMP(sd_card->raw_csd, 16);
-
-        csd_ver = (rsp[1] & 0xc0) >> 6;
-        RTSX_DEBUGP("csd_ver = %d\n", csd_ver);
-
-        trans_speed = rsp[4];
-        if ((trans_speed & 0x07) == 0x02) {
-                if ((trans_speed & 0xf8) >= 0x30) {
-                        if (chip->asic_code)
-                                sd_card->sd_clock = 47;
-                        else
-                                sd_card->sd_clock = CLK_50;
-
-                } else if ((trans_speed & 0xf8) == 0x28) {
-                        if (chip->asic_code)
-                                sd_card->sd_clock = 39;
-                        else
-                                sd_card->sd_clock = CLK_40;
-
-                } else if ((trans_speed & 0xf8) == 0x20) {
-                        if (chip->asic_code)
-                                sd_card->sd_clock = 29;
-                        else
-                                sd_card->sd_clock = CLK_30;
-
-                } else if ((trans_speed & 0xf8) >= 0x10) {
-                        if (chip->asic_code)
-                                sd_card->sd_clock = 23;
-                        else
-                                sd_card->sd_clock = CLK_20;
-
-                } else if ((trans_speed & 0x08) >= 0x08) {
-                        if (chip->asic_code)
-                                sd_card->sd_clock = 19;
-                        else
-                                sd_card->sd_clock = CLK_20;
-                } else {
-                        TRACE_RET(chip, STATUS_FAIL);
-                }
-        } else {
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        if (CHK_MMC_SECTOR_MODE(sd_card)) {
-                sd_card->capacity = 0;
-        } else {
-                if ((!CHK_SD_HCXC(sd_card)) || (csd_ver == 0)) {
-                        u8 blk_size, c_size_mult;
-                        u16 c_size;
-                        blk_size = rsp[6] & 0x0F;
-                        c_size =  ((u16)(rsp[7] & 0x03) << 10)
-                                        + ((u16)rsp[8] << 2)
-                                        + ((u16)(rsp[9] & 0xC0) >> 6);
-                        c_size_mult = (u8)((rsp[10] & 0x03) << 1);
-                        c_size_mult += (rsp[11] & 0x80) >> 7;
-                        sd_card->capacity = (((u32)(c_size + 1)) * (1 << (c_size_mult + 2))) << (blk_size - 9);
-                } else {
-                        u32 total_sector = 0;
-                        total_sector = (((u32)rsp[8] & 0x3f) << 16) |
-                                ((u32)rsp[9] << 8) | (u32)rsp[10];
-                        sd_card->capacity = (total_sector + 1) << 10;
-                }
-        }
-
-        if (check_wp) {
-                if (rsp[15] & 0x30)
-                        chip->card_wp |= SD_CARD;
-
-                RTSX_DEBUGP("CSD WP Status: 0x%x\n", rsp[15]);
-        }
-
-        return STATUS_SUCCESS;
-}
-
-static int sd_set_sample_push_timing(struct rtsx_chip *chip)
-{
-        struct sd_info *sd_card = &(chip->sd_card);
-
-        if (CHECK_PID(chip, 0x5209)) {
-                if (CHK_SD_SDR104(sd_card) || CHK_SD_SDR50(sd_card)) {
-                        RTSX_WRITE_REG(chip, SD_CFG1, 0x0C | SD_ASYNC_FIFO_NOT_RST,
-                                        SD_30_MODE | SD_ASYNC_FIFO_NOT_RST);
-                        RTSX_WRITE_REG(chip, CLK_CTL, CLK_LOW_FREQ, CLK_LOW_FREQ);
-                        RTSX_WRITE_REG(chip, CARD_CLK_SOURCE, 0xFF,
-                                        CRC_VAR_CLK0 | SD30_FIX_CLK | SAMPLE_VAR_CLK1);
-                        RTSX_WRITE_REG(chip, CLK_CTL, CLK_LOW_FREQ, 0);
-                } else if (CHK_SD_DDR50(sd_card) || CHK_MMC_DDR52(sd_card)) {
-                        RTSX_WRITE_REG(chip, SD_CFG1, 0x0C | SD_ASYNC_FIFO_NOT_RST,
-                                        SD_DDR_MODE | SD_ASYNC_FIFO_NOT_RST);
-                        RTSX_WRITE_REG(chip, CLK_CTL, CLK_LOW_FREQ, CLK_LOW_FREQ);
-                        RTSX_WRITE_REG(chip, CARD_CLK_SOURCE, 0xFF,
-                                        CRC_VAR_CLK0 | SD30_FIX_CLK | SAMPLE_VAR_CLK1);
-                        RTSX_WRITE_REG(chip, CLK_CTL, CLK_LOW_FREQ, 0);
-                        RTSX_WRITE_REG(chip, SD_PUSH_POINT_CTL, DDR_VAR_TX_CMD_DAT,
-                                        DDR_VAR_TX_CMD_DAT);
-                        RTSX_WRITE_REG(chip, SD_SAMPLE_POINT_CTL, DDR_VAR_RX_DAT | DDR_VAR_RX_CMD,
-                                        DDR_VAR_RX_DAT | DDR_VAR_RX_CMD);
-                } else {
-                        u8 val = 0;
-
-                        RTSX_WRITE_REG(chip, SD_CFG1, 0x0C, SD_20_MODE);
-                        RTSX_WRITE_REG(chip, CLK_CTL, CLK_LOW_FREQ, CLK_LOW_FREQ);
-                        RTSX_WRITE_REG(chip, CARD_CLK_SOURCE, 0xFF,
-                                        CRC_FIX_CLK | SD30_VAR_CLK0 | SAMPLE_VAR_CLK1);
-                        RTSX_WRITE_REG(chip, CLK_CTL, CLK_LOW_FREQ, 0);
-
-                        if ((chip->sd_ctl & SD_PUSH_POINT_CTL_MASK) == SD_PUSH_POINT_AUTO)
-                                val = SD20_TX_NEG_EDGE;
-                        else if ((chip->sd_ctl & SD_PUSH_POINT_CTL_MASK) == SD_PUSH_POINT_DELAY)
-                                val = SD20_TX_14_AHEAD;
-                        else
-                                val = SD20_TX_NEG_EDGE;
-
-                        RTSX_WRITE_REG(chip, SD_PUSH_POINT_CTL, SD20_TX_SEL_MASK, val);
-
-                        if ((chip->sd_ctl & SD_SAMPLE_POINT_CTL_MASK) == SD_SAMPLE_POINT_AUTO) {
-                                if (chip->asic_code) {
-                                        if (CHK_SD_HS(sd_card) || CHK_MMC_52M(sd_card))
-                                                val = SD20_RX_14_DELAY;
-                                        else
-                                                val = SD20_RX_POS_EDGE;
-                                } else {
-                                        val = SD20_RX_14_DELAY;
-                                }
-                        } else if ((chip->sd_ctl & SD_SAMPLE_POINT_CTL_MASK) == SD_SAMPLE_POINT_DELAY) {
-                                val = SD20_RX_14_DELAY;
-                        } else {
-                                val = SD20_RX_POS_EDGE;
-                        }
-                        RTSX_WRITE_REG(chip, SD_SAMPLE_POINT_CTL, SD20_RX_SEL_MASK, val);
-                }
-        } else {
-                u8 val = 0;
-
-                if ((chip->sd_ctl & SD_PUSH_POINT_CTL_MASK) == SD_PUSH_POINT_DELAY)
-                        val |= 0x10;
-
-                if ((chip->sd_ctl & SD_SAMPLE_POINT_CTL_MASK) == SD_SAMPLE_POINT_AUTO) {
-                        if (chip->asic_code) {
-                                if (CHK_SD_HS(sd_card) || CHK_MMC_52M(sd_card)) {
-                                        if (val & 0x10)
-                                                val |= 0x04;
-                                        else
-                                                val |= 0x08;
-                                }
-                        } else {
-                                if (val & 0x10)
-                                        val |= 0x04;
-                                else
-                                        val |= 0x08;
-                        }
-                } else if ((chip->sd_ctl & SD_SAMPLE_POINT_CTL_MASK) == SD_SAMPLE_POINT_DELAY) {
-                        if (val & 0x10)
-                                val |= 0x04;
-                        else
-                                val |= 0x08;
-                }
-
-                RTSX_WRITE_REG(chip, REG_SD_CFG1, 0x1C, val);
-        }
-
-        return STATUS_SUCCESS;
-}
-
-static void sd_choose_proper_clock(struct rtsx_chip *chip)
-{
-        struct sd_info *sd_card = &(chip->sd_card);
-
-        if (CHK_SD_SDR104(sd_card)) {
-                if (chip->asic_code)
-                        sd_card->sd_clock = chip->asic_sd_sdr104_clk;
-                else
-                        sd_card->sd_clock = chip->fpga_sd_sdr104_clk;
-
-        } else if (CHK_SD_DDR50(sd_card)) {
-                if (chip->asic_code)
-                        sd_card->sd_clock = chip->asic_sd_ddr50_clk;
-                else
-                        sd_card->sd_clock = chip->fpga_sd_ddr50_clk;
-
-        } else if (CHK_SD_SDR50(sd_card)) {
-                if (chip->asic_code)
-                        sd_card->sd_clock = chip->asic_sd_sdr50_clk;
-                else
-                        sd_card->sd_clock = chip->fpga_sd_sdr50_clk;
-
-        } else if (CHK_SD_HS(sd_card)) {
-                if (chip->asic_code)
-                        sd_card->sd_clock = chip->asic_sd_hs_clk;
-                else
-                        sd_card->sd_clock = chip->fpga_sd_hs_clk;
-
-        } else if (CHK_MMC_52M(sd_card) || CHK_MMC_DDR52(sd_card)) {
-                if (chip->asic_code)
-                        sd_card->sd_clock = chip->asic_mmc_52m_clk;
-                else
-                        sd_card->sd_clock = chip->fpga_mmc_52m_clk;
-
-        } else if (CHK_MMC_26M(sd_card)) {
-                if (chip->asic_code)
-                        sd_card->sd_clock = 48;
-                else
-                        sd_card->sd_clock = CLK_50;
-        }
-}
-
-static int sd_set_clock_divider(struct rtsx_chip *chip, u8 clk_div)
-{
-        u8 mask = 0, val = 0;
-
-        if (CHECK_PID(chip, 0x5209)) {
-                mask = SD_CLK_DIVIDE_MASK;
-                val = clk_div;
-        } else {
-                mask = 0x60;
-                if (clk_div == SD_CLK_DIVIDE_0)
-                        val = 0x00;
-                else if (clk_div == SD_CLK_DIVIDE_128)
-                        val = 0x40;
-                else if (clk_div == SD_CLK_DIVIDE_256)
-                        val = 0x20;
-        }
-
-        RTSX_WRITE_REG(chip, REG_SD_CFG1, mask, val);
-
-        return STATUS_SUCCESS;
-}
-
-static int sd_set_init_para(struct rtsx_chip *chip)
-{
-        struct sd_info *sd_card = &(chip->sd_card);
-        int retval;
-
-        retval = sd_set_sample_push_timing(chip);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        sd_choose_proper_clock(chip);
-
-        retval = switch_clock(chip, sd_card->sd_clock);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        return STATUS_SUCCESS;
-}
-
-int sd_select_card(struct rtsx_chip *chip, int select)
-{
-        struct sd_info *sd_card = &(chip->sd_card);
-        int retval;
-        u8 cmd_idx, cmd_type;
-        u32 addr;
-
-        if (select) {
-                cmd_idx = SELECT_CARD;
-                cmd_type = SD_RSP_TYPE_R1;
-                addr = sd_card->sd_addr;
-        } else {
-                cmd_idx = DESELECT_CARD;
-                cmd_type = SD_RSP_TYPE_R0;
-                addr = 0;
-        }
-
-        retval = sd_send_cmd_get_rsp(chip, cmd_idx, addr, cmd_type, NULL, 0);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        return STATUS_SUCCESS;
-}
-
-#ifdef SUPPORT_SD_LOCK
-static int sd_update_lock_status(struct rtsx_chip *chip)
-{
-        struct sd_info *sd_card = &(chip->sd_card);
-        int retval;
-        u8 rsp[5];
-
-        retval = sd_send_cmd_get_rsp(chip, SEND_STATUS, sd_card->sd_addr, SD_RSP_TYPE_R1, rsp, 5);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        if (rsp[1] & 0x02)
-                sd_card->sd_lock_status |= SD_LOCKED;
-        else
-                sd_card->sd_lock_status &= ~SD_LOCKED;
-
-        RTSX_DEBUGP("sd_card->sd_lock_status = 0x%x\n", sd_card->sd_lock_status);
-
-        if (rsp[1] & 0x01)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        return STATUS_SUCCESS;
-}
-#endif
-
-static int sd_wait_state_data_ready(struct rtsx_chip *chip, u8 state, u8 data_ready, int polling_cnt)
-{
-        struct sd_info *sd_card = &(chip->sd_card);
-        int retval, i;
-        u8 rsp[5];
-
-        for (i = 0; i < polling_cnt; i++) {
-                retval = sd_send_cmd_get_rsp(chip, SEND_STATUS,
-                                             sd_card->sd_addr, SD_RSP_TYPE_R1, rsp, 5);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-
-                if (((rsp[3] & 0x1E) == state) && ((rsp[3] & 0x01) == data_ready))
-                        return STATUS_SUCCESS;
-        }
-
-        TRACE_RET(chip, STATUS_FAIL);
-}
-
-static int sd_change_bank_voltage(struct rtsx_chip *chip, u8 voltage)
-{
-        int retval;
-
-        if (voltage == SD_IO_3V3) {
-                if (chip->asic_code) {
-                        retval = rtsx_write_phy_register(chip, 0x08, 0x4FC0 | chip->phy_voltage);
-                        if (retval != STATUS_SUCCESS)
-                                TRACE_RET(chip, STATUS_FAIL);
-                } else {
-                        RTSX_WRITE_REG(chip, SD_PAD_CTL, SD_IO_USING_1V8, 0);
-                }
-        } else if (voltage == SD_IO_1V8) {
-                if (chip->asic_code) {
-                        retval = rtsx_write_phy_register(chip, 0x08, 0x4C40 | chip->phy_voltage);
-                        if (retval != STATUS_SUCCESS)
-                                TRACE_RET(chip, STATUS_FAIL);
-                } else {
-                        RTSX_WRITE_REG(chip, SD_PAD_CTL, SD_IO_USING_1V8, SD_IO_USING_1V8);
-                }
-        } else {
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        return STATUS_SUCCESS;
-}
-
-static int sd_voltage_switch(struct rtsx_chip *chip)
-{
-        int retval;
-        u8 stat;
-
-        RTSX_WRITE_REG(chip, SD_BUS_STAT, SD_CLK_TOGGLE_EN | SD_CLK_FORCE_STOP, SD_CLK_TOGGLE_EN);
-
-        retval = sd_send_cmd_get_rsp(chip, VOLTAGE_SWITCH, 0, SD_RSP_TYPE_R1, NULL, 0);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        udelay(chip->sd_voltage_switch_delay);
-
-        RTSX_READ_REG(chip, SD_BUS_STAT, &stat);
-        if (stat & (SD_CMD_STATUS | SD_DAT3_STATUS | SD_DAT2_STATUS |
-                                SD_DAT1_STATUS | SD_DAT0_STATUS)) {
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        RTSX_WRITE_REG(chip, SD_BUS_STAT, 0xFF, SD_CLK_FORCE_STOP);
-        retval = sd_change_bank_voltage(chip, SD_IO_1V8);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        wait_timeout(50);
-
-        RTSX_WRITE_REG(chip, SD_BUS_STAT, 0xFF, SD_CLK_TOGGLE_EN);
-        wait_timeout(10);
-
-        RTSX_READ_REG(chip, SD_BUS_STAT, &stat);
-        if ((stat & (SD_CMD_STATUS | SD_DAT3_STATUS | SD_DAT2_STATUS |
-                                SD_DAT1_STATUS | SD_DAT0_STATUS)) !=
-                        (SD_CMD_STATUS | SD_DAT3_STATUS | SD_DAT2_STATUS |
-                                SD_DAT1_STATUS | SD_DAT0_STATUS)) {
-                RTSX_DEBUGP("SD_BUS_STAT: 0x%x\n", stat);
-                rtsx_write_register(chip, SD_BUS_STAT, SD_CLK_TOGGLE_EN | SD_CLK_FORCE_STOP, 0);
-                rtsx_write_register(chip, CARD_CLK_EN, 0xFF, 0);
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        RTSX_WRITE_REG(chip, SD_BUS_STAT, SD_CLK_TOGGLE_EN | SD_CLK_FORCE_STOP, 0);
-
-        return STATUS_SUCCESS;
-}
-
-static int sd_reset_dcm(struct rtsx_chip *chip, u8 tune_dir)
-{
-        if (tune_dir == TUNE_RX) {
-                RTSX_WRITE_REG(chip, DCM_DRP_CTL, 0xFF, DCM_RESET | DCM_RX);
-                RTSX_WRITE_REG(chip, DCM_DRP_CTL, 0xFF, DCM_RX);
-        } else {
-                RTSX_WRITE_REG(chip, DCM_DRP_CTL, 0xFF, DCM_RESET | DCM_TX);
-                RTSX_WRITE_REG(chip, DCM_DRP_CTL, 0xFF, DCM_TX);
-        }
-
-        return STATUS_SUCCESS;
-}
-
-static int sd_change_phase(struct rtsx_chip *chip, u8 sample_point, u8 tune_dir)
-{
-        struct sd_info *sd_card = &(chip->sd_card);
-        u16 SD_VP_CTL, SD_DCMPS_CTL;
-        u8 val;
-        int retval;
-        int ddr_rx = 0;
-
-        RTSX_DEBUGP("sd_change_phase (sample_point = %d, tune_dir = %d)\n",
-                                sample_point, tune_dir);
-
-        if (tune_dir == TUNE_RX) {
-                SD_VP_CTL = SD_VPRX_CTL;
-                SD_DCMPS_CTL = SD_DCMPS_RX_CTL;
-                if (CHK_SD_DDR50(sd_card))
-                        ddr_rx = 1;
-        } else {
-                SD_VP_CTL = SD_VPTX_CTL;
-                SD_DCMPS_CTL = SD_DCMPS_TX_CTL;
-        }
-
-        if (chip->asic_code) {
-                RTSX_WRITE_REG(chip, CLK_CTL, CHANGE_CLK, CHANGE_CLK);
-                RTSX_WRITE_REG(chip, SD_VP_CTL, 0x1F, sample_point);
-                RTSX_WRITE_REG(chip, SD_VPCLK0_CTL, PHASE_NOT_RESET, 0);
-                RTSX_WRITE_REG(chip, SD_VPCLK0_CTL, PHASE_NOT_RESET, PHASE_NOT_RESET);
-                RTSX_WRITE_REG(chip, CLK_CTL, CHANGE_CLK, 0);
-        } else {
-#ifdef CONFIG_RTS_PSTOR_DEBUG
-                rtsx_read_register(chip, SD_VP_CTL, &val);
-                RTSX_DEBUGP("SD_VP_CTL: 0x%x\n", val);
-                rtsx_read_register(chip, SD_DCMPS_CTL, &val);
-                RTSX_DEBUGP("SD_DCMPS_CTL: 0x%x\n", val);
-#endif
-
-                if (ddr_rx) {
-                        RTSX_WRITE_REG(chip, SD_VP_CTL, PHASE_CHANGE, PHASE_CHANGE);
-                        udelay(50);
-                        RTSX_WRITE_REG(chip, SD_VP_CTL, 0xFF,
-                                        PHASE_CHANGE | PHASE_NOT_RESET | sample_point);
-                } else {
-                        RTSX_WRITE_REG(chip, CLK_CTL, CHANGE_CLK, CHANGE_CLK);
-                        udelay(50);
-                        RTSX_WRITE_REG(chip, SD_VP_CTL, 0xFF,
-                                        PHASE_NOT_RESET | sample_point);
-                }
-                udelay(100);
-
-                rtsx_init_cmd(chip);
-                rtsx_add_cmd(chip, WRITE_REG_CMD, SD_DCMPS_CTL, DCMPS_CHANGE, DCMPS_CHANGE);
-                rtsx_add_cmd(chip, CHECK_REG_CMD, SD_DCMPS_CTL, DCMPS_CHANGE_DONE, DCMPS_CHANGE_DONE);
-                retval = rtsx_send_cmd(chip, SD_CARD, 100);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_GOTO(chip, Fail);
-
-                val = *rtsx_get_cmd_data(chip);
-                if (val & DCMPS_ERROR)
-                        TRACE_GOTO(chip, Fail);
-
-                if ((val & DCMPS_CURRENT_PHASE) != sample_point)
-                        TRACE_GOTO(chip, Fail);
-
-                RTSX_WRITE_REG(chip, SD_DCMPS_CTL, DCMPS_CHANGE, 0);
-                if (ddr_rx)
-                        RTSX_WRITE_REG(chip, SD_VP_CTL, PHASE_CHANGE, 0);
-                else
-                        RTSX_WRITE_REG(chip, CLK_CTL, CHANGE_CLK, 0);
-
-                udelay(50);
-        }
-
-        RTSX_WRITE_REG(chip, SD_CFG1, SD_ASYNC_FIFO_NOT_RST, 0);
-
-        return STATUS_SUCCESS;
-
-Fail:
-#ifdef CONFIG_RTS_PSTOR_DEBUG
-        rtsx_read_register(chip, SD_VP_CTL, &val);
-        RTSX_DEBUGP("SD_VP_CTL: 0x%x\n", val);
-        rtsx_read_register(chip, SD_DCMPS_CTL, &val);
-        RTSX_DEBUGP("SD_DCMPS_CTL: 0x%x\n", val);
-#endif
-
-        rtsx_write_register(chip, SD_DCMPS_CTL, DCMPS_CHANGE, 0);
-        rtsx_write_register(chip, SD_VP_CTL, PHASE_CHANGE, 0);
-        wait_timeout(10);
-        sd_reset_dcm(chip, tune_dir);
-        return STATUS_FAIL;
-}
-
-static int sd_check_spec(struct rtsx_chip *chip, u8 bus_width)
-{
-        struct sd_info *sd_card = &(chip->sd_card);
-        int retval;
-        u8 cmd[5], buf[8];
-
-        retval = sd_send_cmd_get_rsp(chip, APP_CMD, sd_card->sd_addr, SD_RSP_TYPE_R1, NULL, 0);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        cmd[0] = 0x40 | SEND_SCR;
-        cmd[1] = 0;
-        cmd[2] = 0;
-        cmd[3] = 0;
-        cmd[4] = 0;
-
-        retval = sd_read_data(chip, SD_TM_NORMAL_READ, cmd, 5, 8, 1, bus_width, buf, 8, 250);
-        if (retval != STATUS_SUCCESS) {
-                rtsx_clear_sd_error(chip);
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        memcpy(sd_card->raw_scr, buf, 8);
-
-        if ((buf[0] & 0x0F) == 0)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        return STATUS_SUCCESS;
-}
-
-static int sd_query_switch_result(struct rtsx_chip *chip, u8 func_group, u8 func_to_switch,
-                u8 *buf, int buf_len)
-{
-        u8 support_mask = 0, query_switch = 0, switch_busy = 0;
-        int support_offset = 0, query_switch_offset = 0, check_busy_offset = 0;
-
-        if (func_group == SD_FUNC_GROUP_1) {
-                support_offset = FUNCTION_GROUP1_SUPPORT_OFFSET;
-                query_switch_offset = FUNCTION_GROUP1_QUERY_SWITCH_OFFSET;
-                check_busy_offset = FUNCTION_GROUP1_CHECK_BUSY_OFFSET;
-
-                switch (func_to_switch) {
-                case HS_SUPPORT:
-                        support_mask = HS_SUPPORT_MASK;
-                        query_switch = HS_QUERY_SWITCH_OK;
-                        switch_busy = HS_SWITCH_BUSY;
-                        break;
-
-                case SDR50_SUPPORT:
-                        support_mask = SDR50_SUPPORT_MASK;
-                        query_switch = SDR50_QUERY_SWITCH_OK;
-                        switch_busy = SDR50_SWITCH_BUSY;
-                        break;
-
-                case SDR104_SUPPORT:
-                        support_mask = SDR104_SUPPORT_MASK;
-                        query_switch = SDR104_QUERY_SWITCH_OK;
-                        switch_busy = SDR104_SWITCH_BUSY;
-                        break;
-
-                case DDR50_SUPPORT:
-                        support_mask = DDR50_SUPPORT_MASK;
-                        query_switch = DDR50_QUERY_SWITCH_OK;
-                        switch_busy = DDR50_SWITCH_BUSY;
-                        break;
-
-                default:
-                        TRACE_RET(chip, STATUS_FAIL);
-                }
-        } else if (func_group == SD_FUNC_GROUP_3) {
-                support_offset = FUNCTION_GROUP3_SUPPORT_OFFSET;
-                query_switch_offset = FUNCTION_GROUP3_QUERY_SWITCH_OFFSET;
-                check_busy_offset = FUNCTION_GROUP3_CHECK_BUSY_OFFSET;
-
-                switch (func_to_switch) {
-                case DRIVING_TYPE_A:
-                        support_mask = DRIVING_TYPE_A_MASK;
-                        query_switch = TYPE_A_QUERY_SWITCH_OK;
-                        switch_busy = TYPE_A_SWITCH_BUSY;
-                        break;
-
-                case DRIVING_TYPE_C:
-                        support_mask = DRIVING_TYPE_C_MASK;
-                        query_switch = TYPE_C_QUERY_SWITCH_OK;
-                        switch_busy = TYPE_C_SWITCH_BUSY;
-                        break;
-
-                case DRIVING_TYPE_D:
-                        support_mask = DRIVING_TYPE_D_MASK;
-                        query_switch = TYPE_D_QUERY_SWITCH_OK;
-                        switch_busy = TYPE_D_SWITCH_BUSY;
-                        break;
-
-                default:
-                        TRACE_RET(chip, STATUS_FAIL);
-                }
-        } else if (func_group == SD_FUNC_GROUP_4) {
-                support_offset = FUNCTION_GROUP4_SUPPORT_OFFSET;
-                query_switch_offset = FUNCTION_GROUP4_QUERY_SWITCH_OFFSET;
-                check_busy_offset = FUNCTION_GROUP4_CHECK_BUSY_OFFSET;
-
-                switch (func_to_switch) {
-                case CURRENT_LIMIT_400:
-                        support_mask = CURRENT_LIMIT_400_MASK;
-                        query_switch = CURRENT_LIMIT_400_QUERY_SWITCH_OK;
-                        switch_busy = CURRENT_LIMIT_400_SWITCH_BUSY;
-                        break;
-
-                case CURRENT_LIMIT_600:
-                        support_mask = CURRENT_LIMIT_600_MASK;
-                        query_switch = CURRENT_LIMIT_600_QUERY_SWITCH_OK;
-                        switch_busy = CURRENT_LIMIT_600_SWITCH_BUSY;
-                        break;
-
-                case CURRENT_LIMIT_800:
-                        support_mask = CURRENT_LIMIT_800_MASK;
-                        query_switch = CURRENT_LIMIT_800_QUERY_SWITCH_OK;
-                        switch_busy = CURRENT_LIMIT_800_SWITCH_BUSY;
-                        break;
-
-                default:
-                        TRACE_RET(chip, STATUS_FAIL);
-                }
-        } else {
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        if (func_group == SD_FUNC_GROUP_1) {
-                if (!(buf[support_offset] & support_mask) ||
-                                ((buf[query_switch_offset] & 0x0F) != query_switch)) {
-                        TRACE_RET(chip, STATUS_FAIL);
-                }
-        }
-
-        /* Check 'Busy Status' */
-        if ((buf[DATA_STRUCTURE_VER_OFFSET] == 0x01) &&
-                    ((buf[check_busy_offset] & switch_busy) == switch_busy)) {
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        return STATUS_SUCCESS;
-}
-
-static int sd_check_switch_mode(struct rtsx_chip *chip, u8 mode,
-                u8 func_group, u8 func_to_switch, u8 bus_width)
-{
-        struct sd_info *sd_card = &(chip->sd_card);
-        int retval;
-        u8 cmd[5], buf[64];
-
-        RTSX_DEBUGP("sd_check_switch_mode (mode = %d, func_group = %d, func_to_switch = %d)\n",
-                        mode, func_group, func_to_switch);
-
-        cmd[0] = 0x40 | SWITCH;
-        cmd[1] = mode;
-
-        if (func_group == SD_FUNC_GROUP_1) {
-                cmd[2] = 0xFF;
-                cmd[3] = 0xFF;
-                cmd[4] = 0xF0 + func_to_switch;
-        } else if (func_group == SD_FUNC_GROUP_3) {
-                cmd[2] = 0xFF;
-                cmd[3] = 0xF0 + func_to_switch;
-                cmd[4] = 0xFF;
-        } else if (func_group == SD_FUNC_GROUP_4) {
-                cmd[2] = 0xFF;
-                cmd[3] = 0x0F + (func_to_switch << 4);
-                cmd[4] = 0xFF;
-        } else {
-                cmd[1] = SD_CHECK_MODE;
-                cmd[2] = 0xFF;
-                cmd[3] = 0xFF;
-                cmd[4] = 0xFF;
-        }
-
-        retval = sd_read_data(chip, SD_TM_NORMAL_READ, cmd, 5, 64, 1, bus_width, buf, 64, 250);
-        if (retval != STATUS_SUCCESS) {
-                rtsx_clear_sd_error(chip);
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        RTSX_DUMP(buf, 64);
-
-        if (func_group == NO_ARGUMENT) {
-                sd_card->func_group1_mask = buf[0x0D];
-                sd_card->func_group2_mask = buf[0x0B];
-                sd_card->func_group3_mask = buf[0x09];
-                sd_card->func_group4_mask = buf[0x07];
-
-                RTSX_DEBUGP("func_group1_mask = 0x%02x\n", buf[0x0D]);
-                RTSX_DEBUGP("func_group2_mask = 0x%02x\n", buf[0x0B]);
-                RTSX_DEBUGP("func_group3_mask = 0x%02x\n", buf[0x09]);
-                RTSX_DEBUGP("func_group4_mask = 0x%02x\n", buf[0x07]);
-        } else {
-                /* Maximum current consumption, check whether current is acceptable;
-                 * bit[511:496] = 0x0000 means some error happened.
-                 */
-                u16 cc = ((u16)buf[0] << 8) | buf[1];
-                RTSX_DEBUGP("Maximum current consumption: %dmA\n", cc);
-                if ((cc == 0) || (cc > 800))
-                        TRACE_RET(chip, STATUS_FAIL);
-
-                retval = sd_query_switch_result(chip, func_group, func_to_switch, buf, 64);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-
-                if ((cc > 400) || (func_to_switch > CURRENT_LIMIT_400)) {
-                        RTSX_WRITE_REG(chip, OCPPARA2, SD_OCP_THD_MASK, chip->sd_800mA_ocp_thd);
-                        RTSX_WRITE_REG(chip, CARD_PWR_CTL, PMOS_STRG_MASK, PMOS_STRG_800mA);
-                }
-        }
-
-        return STATUS_SUCCESS;
-}
-
-static u8 downgrade_switch_mode(u8 func_group, u8 func_to_switch)
-{
-        if (func_group == SD_FUNC_GROUP_1) {
-                if (func_to_switch > HS_SUPPORT)
-                        func_to_switch--;
-
-        } else if (func_group == SD_FUNC_GROUP_4) {
-                if (func_to_switch > CURRENT_LIMIT_200)
-                        func_to_switch--;
-        }
-
-        return func_to_switch;
-}
-
-static int sd_check_switch(struct rtsx_chip *chip,
-                u8 func_group, u8 func_to_switch, u8 bus_width)
-{
-        int retval;
-        int i;
-        int switch_good = 0;
-
-        for (i = 0; i < 3; i++) {
-                if (detect_card_cd(chip, SD_CARD) != STATUS_SUCCESS) {
-                        sd_set_err_code(chip, SD_NO_CARD);
-                        TRACE_RET(chip, STATUS_FAIL);
-                }
-
-                retval = sd_check_switch_mode(chip, SD_CHECK_MODE, func_group,
-                                func_to_switch, bus_width);
-                if (retval == STATUS_SUCCESS) {
-                        u8 stat;
-
-                        retval = sd_check_switch_mode(chip, SD_SWITCH_MODE,
-                                        func_group, func_to_switch, bus_width);
-                        if (retval == STATUS_SUCCESS) {
-                                switch_good = 1;
-                                break;
-                        }
-
-                        RTSX_READ_REG(chip, SD_STAT1, &stat);
-                        if (stat & SD_CRC16_ERR) {
-                                RTSX_DEBUGP("SD CRC16 error when switching mode\n");
-                                TRACE_RET(chip, STATUS_FAIL);
-                        }
-                }
-
-                func_to_switch = downgrade_switch_mode(func_group, func_to_switch);
-
-                wait_timeout(20);
-        }
-
-        if (!switch_good)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        return STATUS_SUCCESS;
-}
-
-static int sd_switch_function(struct rtsx_chip *chip, u8 bus_width)
-{
-        struct sd_info *sd_card = &(chip->sd_card);
-        int retval;
-        int i;
-        u8 func_to_switch = 0;
-
-        /* Get supported functions */
-        retval = sd_check_switch_mode(chip, SD_CHECK_MODE,
-                        NO_ARGUMENT, NO_ARGUMENT, bus_width);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        sd_card->func_group1_mask &= ~(sd_card->sd_switch_fail);
-
-        /* Function Group 1: Access Mode */
-        for (i = 0; i < 4; i++) {
-                switch ((u8)(chip->sd_speed_prior >> (i*8))) {
-                case SDR104_SUPPORT:
-                        if ((sd_card->func_group1_mask & SDR104_SUPPORT_MASK)
-                                        && chip->sdr104_en) {
-                                func_to_switch = SDR104_SUPPORT;
-                        }
-                        break;
-
-                case DDR50_SUPPORT:
-                        if ((sd_card->func_group1_mask & DDR50_SUPPORT_MASK)
-                                        && chip->ddr50_en) {
-                                func_to_switch = DDR50_SUPPORT;
-                        }
-                        break;
-
-                case SDR50_SUPPORT:
-                        if ((sd_card->func_group1_mask & SDR50_SUPPORT_MASK)
-                                        && chip->sdr50_en) {
-                                func_to_switch = SDR50_SUPPORT;
-                        }
-                        break;
-
-                case HS_SUPPORT:
-                        if (sd_card->func_group1_mask & HS_SUPPORT_MASK)
-                                func_to_switch = HS_SUPPORT;
-
-                        break;
-
-                default:
-                        continue;
-                }
-
-
-                if (func_to_switch)
-                        break;
-
-        }
-        RTSX_DEBUGP("SD_FUNC_GROUP_1: func_to_switch = 0x%02x", func_to_switch);
-
-#ifdef SUPPORT_SD_LOCK
-        if ((sd_card->sd_lock_status & SD_SDR_RST)
-                        && (DDR50_SUPPORT == func_to_switch)
-                        && (sd_card->func_group1_mask & SDR50_SUPPORT_MASK)) {
-                func_to_switch = SDR50_SUPPORT;
-                RTSX_DEBUGP("Using SDR50 instead of DDR50 for SD Lock\n");
-        }
-#endif
-
-        if (func_to_switch) {
-                retval = sd_check_switch(chip, SD_FUNC_GROUP_1, func_to_switch, bus_width);
-                if (retval != STATUS_SUCCESS) {
-                        if (func_to_switch == SDR104_SUPPORT) {
-                                sd_card->sd_switch_fail = SDR104_SUPPORT_MASK;
-                        } else if (func_to_switch == DDR50_SUPPORT) {
-                                sd_card->sd_switch_fail =
-                                        SDR104_SUPPORT_MASK | DDR50_SUPPORT_MASK;
-                        } else if (func_to_switch == SDR50_SUPPORT) {
-                                sd_card->sd_switch_fail =
-                                        SDR104_SUPPORT_MASK | DDR50_SUPPORT_MASK |
-                                        SDR50_SUPPORT_MASK;
-                        }
-                        TRACE_RET(chip, STATUS_FAIL);
-                }
-
-                if (func_to_switch == SDR104_SUPPORT)
-                        SET_SD_SDR104(sd_card);
-                else if (func_to_switch == DDR50_SUPPORT)
-                        SET_SD_DDR50(sd_card);
-                else if (func_to_switch == SDR50_SUPPORT)
-                        SET_SD_SDR50(sd_card);
-                else
-                        SET_SD_HS(sd_card);
-        }
-
-        if (CHK_SD_DDR50(sd_card)) {
-                RTSX_WRITE_REG(chip, SD_PUSH_POINT_CTL, 0x06, 0x04);
-                retval = sd_set_sample_push_timing(chip);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        if (!func_to_switch || (func_to_switch == HS_SUPPORT)) {
-                /* Do not try to switch current limit if the card doesn't
-                 * support UHS mode or we don't want it to support UHS mode
-                 */
-                return STATUS_SUCCESS;
-        }
-
-        /* Function Group 4: Current Limit */
-        func_to_switch = 0xFF;
-
-        for (i = 0; i < 4; i++) {
-                switch ((u8)(chip->sd_current_prior >> (i*8))) {
-                case CURRENT_LIMIT_800:
-                        if (sd_card->func_group4_mask & CURRENT_LIMIT_800_MASK)
-                                func_to_switch = CURRENT_LIMIT_800;
-
-                        break;
-
-                case CURRENT_LIMIT_600:
-                        if (sd_card->func_group4_mask & CURRENT_LIMIT_600_MASK)
-                                func_to_switch = CURRENT_LIMIT_600;
-
-                        break;
-
-                case CURRENT_LIMIT_400:
-                        if (sd_card->func_group4_mask & CURRENT_LIMIT_400_MASK)
-                                func_to_switch = CURRENT_LIMIT_400;
-
-                        break;
-
-                case CURRENT_LIMIT_200:
-                        if (sd_card->func_group4_mask & CURRENT_LIMIT_200_MASK)
-                                func_to_switch = CURRENT_LIMIT_200;
-
-                        break;
-
-                default:
-                        continue;
-                }
-
-                if (func_to_switch != 0xFF)
-                        break;
-        }
-
-        RTSX_DEBUGP("SD_FUNC_GROUP_4: func_to_switch = 0x%02x", func_to_switch);
-
-        if (func_to_switch <= CURRENT_LIMIT_800) {
-                retval = sd_check_switch(chip, SD_FUNC_GROUP_4, func_to_switch, bus_width);
-                if (retval != STATUS_SUCCESS) {
-                        if (sd_check_err_code(chip, SD_NO_CARD))
-                                TRACE_RET(chip, STATUS_FAIL);
-                }
-                RTSX_DEBUGP("Switch current limit finished! (%d)\n", retval);
-        }
-
-        if (CHK_SD_DDR50(sd_card))
-                RTSX_WRITE_REG(chip, SD_PUSH_POINT_CTL, 0x06, 0);
-
-        return STATUS_SUCCESS;
-}
-
-static int sd_wait_data_idle(struct rtsx_chip *chip)
-{
-        int retval = STATUS_TIMEDOUT;
-        int i;
-        u8 val = 0;
-
-        for (i = 0; i < 100; i++) {
-                RTSX_READ_REG(chip, SD_DATA_STATE, &val);
-                if (val & SD_DATA_IDLE) {
-                        retval = STATUS_SUCCESS;
-                        break;
-                }
-                udelay(100);
-        }
-        RTSX_DEBUGP("SD_DATA_STATE: 0x%02x\n", val);
-
-        return retval;
-}
-
-static int sd_sdr_tuning_rx_cmd(struct rtsx_chip *chip, u8 sample_point)
-{
-        int retval;
-        u8 cmd[5];
-
-        retval = sd_change_phase(chip, sample_point, TUNE_RX);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        cmd[0] = 0x40 | SEND_TUNING_PATTERN;
-        cmd[1] = 0;
-        cmd[2] = 0;
-        cmd[3] = 0;
-        cmd[4] = 0;
-
-        retval = sd_read_data(chip, SD_TM_AUTO_TUNING,
-                        cmd, 5, 0x40, 1, SD_BUS_WIDTH_4, NULL, 0, 100);
-        if (retval != STATUS_SUCCESS) {
-                (void)sd_wait_data_idle(chip);
-
-                rtsx_clear_sd_error(chip);
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        return STATUS_SUCCESS;
-}
-
-static int sd_ddr_tuning_rx_cmd(struct rtsx_chip *chip, u8 sample_point)
-{
-        struct sd_info *sd_card = &(chip->sd_card);
-        int retval;
-        u8 cmd[5];
-
-        retval = sd_change_phase(chip, sample_point, TUNE_RX);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        RTSX_DEBUGP("sd ddr tuning rx\n");
-
-        retval = sd_send_cmd_get_rsp(chip, APP_CMD, sd_card->sd_addr, SD_RSP_TYPE_R1, NULL, 0);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        cmd[0] = 0x40 | SD_STATUS;
-        cmd[1] = 0;
-        cmd[2] = 0;
-        cmd[3] = 0;
-        cmd[4] = 0;
-
-        retval = sd_read_data(chip, SD_TM_NORMAL_READ,
-                        cmd, 5, 64, 1, SD_BUS_WIDTH_4, NULL, 0, 100);
-        if (retval != STATUS_SUCCESS) {
-                (void)sd_wait_data_idle(chip);
-
-                rtsx_clear_sd_error(chip);
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        return STATUS_SUCCESS;
-}
-
-static int mmc_ddr_tunning_rx_cmd(struct rtsx_chip *chip, u8 sample_point)
-{
-        struct sd_info *sd_card = &(chip->sd_card);
-        int retval;
-        u8 cmd[5], bus_width;
-
-        if (CHK_MMC_8BIT(sd_card))
-                bus_width = SD_BUS_WIDTH_8;
-        else if (CHK_MMC_4BIT(sd_card))
-                bus_width = SD_BUS_WIDTH_4;
-        else
-                bus_width = SD_BUS_WIDTH_1;
-
-        retval = sd_change_phase(chip, sample_point, TUNE_RX);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        RTSX_DEBUGP("mmc ddr tuning rx\n");
-
-        cmd[0] = 0x40 | SEND_EXT_CSD;
-        cmd[1] = 0;
-        cmd[2] = 0;
-        cmd[3] = 0;
-        cmd[4] = 0;
-
-        retval = sd_read_data(chip, SD_TM_NORMAL_READ,
-                        cmd, 5, 0x200, 1, bus_width, NULL, 0, 100);
-        if (retval != STATUS_SUCCESS) {
-                (void)sd_wait_data_idle(chip);
-
-                rtsx_clear_sd_error(chip);
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        return STATUS_SUCCESS;
-}
-
-static int sd_sdr_tuning_tx_cmd(struct rtsx_chip *chip, u8 sample_point)
-{
-        struct sd_info *sd_card = &(chip->sd_card);
-        int retval;
-
-        retval = sd_change_phase(chip, sample_point, TUNE_TX);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        RTSX_WRITE_REG(chip, SD_CFG3, SD_RSP_80CLK_TIMEOUT_EN, SD_RSP_80CLK_TIMEOUT_EN);
-
-        retval = sd_send_cmd_get_rsp(chip, SEND_STATUS, sd_card->sd_addr,
-                SD_RSP_TYPE_R1, NULL, 0);
-        if (retval != STATUS_SUCCESS) {
-                if (sd_check_err_code(chip, SD_RSP_TIMEOUT)) {
-                        rtsx_write_register(chip, SD_CFG3, SD_RSP_80CLK_TIMEOUT_EN, 0);
-                        TRACE_RET(chip, STATUS_FAIL);
-                }
-        }
-
-        RTSX_WRITE_REG(chip, SD_CFG3, SD_RSP_80CLK_TIMEOUT_EN, 0);
-
-        return STATUS_SUCCESS;
-}
-
-static int sd_ddr_tuning_tx_cmd(struct rtsx_chip *chip, u8 sample_point)
-{
-        struct sd_info *sd_card = &(chip->sd_card);
-        int retval;
-        u8 cmd[5], bus_width;
-
-        retval = sd_change_phase(chip, sample_point, TUNE_TX);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        if (CHK_SD(sd_card)) {
-                bus_width = SD_BUS_WIDTH_4;
-        } else {
-                if (CHK_MMC_8BIT(sd_card))
-                        bus_width = SD_BUS_WIDTH_8;
-                else if (CHK_MMC_4BIT(sd_card))
-                        bus_width = SD_BUS_WIDTH_4;
-                else
-                        bus_width = SD_BUS_WIDTH_1;
-        }
-
-        retval = sd_wait_state_data_ready(chip, 0x08, 1, 1000);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        RTSX_WRITE_REG(chip, SD_CFG3, SD_RSP_80CLK_TIMEOUT_EN, SD_RSP_80CLK_TIMEOUT_EN);
-
-        cmd[0] = 0x40 | PROGRAM_CSD;
-        cmd[1] = 0;
-        cmd[2] = 0;
-        cmd[3] = 0;
-        cmd[4] = 0;
-
-        retval = sd_write_data(chip, SD_TM_AUTO_WRITE_2,
-                        cmd, 5, 16, 1, bus_width, sd_card->raw_csd, 16, 100);
-        if (retval != STATUS_SUCCESS) {
-                rtsx_clear_sd_error(chip);
-                rtsx_write_register(chip, SD_CFG3, SD_RSP_80CLK_TIMEOUT_EN, 0);
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        RTSX_WRITE_REG(chip, SD_CFG3, SD_RSP_80CLK_TIMEOUT_EN, 0);
-
-        sd_send_cmd_get_rsp(chip, SEND_STATUS, sd_card->sd_addr, SD_RSP_TYPE_R1, NULL, 0);
-
-        return STATUS_SUCCESS;
-}
-
-static u8 sd_search_final_phase(struct rtsx_chip *chip, u32 phase_map, u8 tune_dir)
-{
-        struct sd_info *sd_card = &(chip->sd_card);
-        struct timing_phase_path path[MAX_PHASE + 1];
-        int i, j, cont_path_cnt;
-        int new_block, max_len, final_path_idx;
-        u8 final_phase = 0xFF;
-
-        if (phase_map == 0xFFFFFFFF) {
-                if (tune_dir == TUNE_RX)
-                        final_phase = (u8)chip->sd_default_rx_phase;
-                else
-                        final_phase = (u8)chip->sd_default_tx_phase;
-
-                goto Search_Finish;
-        }
-
-        cont_path_cnt = 0;
-        new_block = 1;
-        j = 0;
-        for (i = 0; i < MAX_PHASE + 1; i++) {
-                if (phase_map & (1 << i)) {
-                        if (new_block) {
-                                new_block = 0;
-                                j = cont_path_cnt++;
-                                path[j].start = i;
-                                path[j].end = i;
-                        } else {
-                                path[j].end = i;
-                        }
-                } else {
-                        new_block = 1;
-                        if (cont_path_cnt) {
-                                int idx = cont_path_cnt - 1;
-                                path[idx].len = path[idx].end - path[idx].start + 1;
-                                path[idx].mid = path[idx].start + path[idx].len / 2;
-                        }
-                }
-        }
-
-        if (cont_path_cnt == 0) {
-                RTSX_DEBUGP("No continuous phase path\n");
-                goto Search_Finish;
-        } else {
-                int idx = cont_path_cnt - 1;
-                path[idx].len = path[idx].end - path[idx].start + 1;
-                path[idx].mid = path[idx].start + path[idx].len / 2;
-        }
-
-        if ((path[0].start == 0) && (path[cont_path_cnt - 1].end == MAX_PHASE)) {
-                path[0].start = path[cont_path_cnt - 1].start - MAX_PHASE - 1;
-                path[0].len += path[cont_path_cnt - 1].len;
-                path[0].mid = path[0].start + path[0].len / 2;
-                if (path[0].mid < 0)
-                        path[0].mid += MAX_PHASE + 1;
-
-                cont_path_cnt--;
-        }
-
-        max_len = 0;
-        final_phase = 0;
-        final_path_idx = 0;
-        for (i = 0; i < cont_path_cnt; i++) {
-                if (path[i].len > max_len) {
-                        max_len = path[i].len;
-                        final_phase = (u8)path[i].mid;
-                        final_path_idx = i;
-                }
-
-                RTSX_DEBUGP("path[%d].start = %d\n", i, path[i].start);
-                RTSX_DEBUGP("path[%d].end = %d\n", i, path[i].end);
-                RTSX_DEBUGP("path[%d].len = %d\n", i, path[i].len);
-                RTSX_DEBUGP("path[%d].mid = %d\n", i, path[i].mid);
-                RTSX_DEBUGP("\n");
-        }
-
-        if (tune_dir == TUNE_TX) {
-                if (CHK_SD_SDR104(sd_card)) {
-                        if (max_len > 15) {
-                                int temp_mid = (max_len - 16) / 2;
-                                int temp_final_phase =
-                                        path[final_path_idx].end - (max_len - (6 + temp_mid));
-
-                                if (temp_final_phase < 0)
-                                        final_phase = (u8)(temp_final_phase + MAX_PHASE + 1);
-                                else
-                                        final_phase = (u8)temp_final_phase;
-                        }
-                } else if (CHK_SD_SDR50(sd_card)) {
-                        if (max_len > 12) {
-                                int temp_mid = (max_len - 13) / 2;
-                                int temp_final_phase =
-                                        path[final_path_idx].end - (max_len - (3 + temp_mid));
-
-                                if (temp_final_phase < 0)
-                                        final_phase = (u8)(temp_final_phase + MAX_PHASE + 1);
-                                else
-                                        final_phase = (u8)temp_final_phase;
-                        }
-                }
-        }
-
-Search_Finish:
-        RTSX_DEBUGP("Final chosen phase: %d\n", final_phase);
-        return final_phase;
-}
-
-static int sd_tuning_rx(struct rtsx_chip *chip)
-{
-        struct sd_info *sd_card = &(chip->sd_card);
-        int retval;
-        int i, j;
-        u32 raw_phase_map[3], phase_map;
-        u8 final_phase;
-        int (*tuning_cmd)(struct rtsx_chip *chip, u8 sample_point);
-
-        if (CHK_SD(sd_card)) {
-                if (CHK_SD_DDR50(sd_card))
-                        tuning_cmd = sd_ddr_tuning_rx_cmd;
-                else
-                        tuning_cmd = sd_sdr_tuning_rx_cmd;
-
-        } else {
-                if (CHK_MMC_DDR52(sd_card))
-                        tuning_cmd = mmc_ddr_tunning_rx_cmd;
-                else
-                        TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        for (i = 0; i < 3; i++) {
-                raw_phase_map[i] = 0;
-                for (j = MAX_PHASE; j >= 0; j--) {
-                        if (detect_card_cd(chip, SD_CARD) != STATUS_SUCCESS) {
-                                sd_set_err_code(chip, SD_NO_CARD);
-                                TRACE_RET(chip, STATUS_FAIL);
-                        }
-
-                        retval = tuning_cmd(chip, (u8)j);
-                        if (retval == STATUS_SUCCESS)
-                                raw_phase_map[i] |= 1 << j;
-                }
-        }
-
-        phase_map = raw_phase_map[0] & raw_phase_map[1] & raw_phase_map[2];
-        for (i = 0; i < 3; i++)
-                RTSX_DEBUGP("RX raw_phase_map[%d] = 0x%08x\n", i, raw_phase_map[i]);
-
-        RTSX_DEBUGP("RX phase_map = 0x%08x\n", phase_map);
-
-        final_phase = sd_search_final_phase(chip, phase_map, TUNE_RX);
-        if (final_phase == 0xFF)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        retval = sd_change_phase(chip, final_phase, TUNE_RX);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        return STATUS_SUCCESS;
-}
-
-static int sd_ddr_pre_tuning_tx(struct rtsx_chip *chip)
-{
-        struct sd_info *sd_card = &(chip->sd_card);
-        int retval;
-        int i;
-        u32 phase_map;
-        u8 final_phase;
-
-        RTSX_WRITE_REG(chip, SD_CFG3, SD_RSP_80CLK_TIMEOUT_EN, SD_RSP_80CLK_TIMEOUT_EN);
-
-        phase_map = 0;
-        for (i = MAX_PHASE; i >= 0; i--) {
-                if (detect_card_cd(chip, SD_CARD) != STATUS_SUCCESS) {
-                        sd_set_err_code(chip, SD_NO_CARD);
-                        rtsx_write_register(chip, SD_CFG3,
-                                                SD_RSP_80CLK_TIMEOUT_EN, 0);
-                        TRACE_RET(chip, STATUS_FAIL);
-                }
-
-                retval = sd_change_phase(chip, (u8)i, TUNE_TX);
-                if (retval != STATUS_SUCCESS)
-                        continue;
-
-                retval = sd_send_cmd_get_rsp(chip, SEND_STATUS, sd_card->sd_addr,
-                                SD_RSP_TYPE_R1, NULL, 0);
-                if ((retval == STATUS_SUCCESS) || !sd_check_err_code(chip, SD_RSP_TIMEOUT))
-                        phase_map |= 1 << i;
-        }
-
-        RTSX_WRITE_REG(chip, SD_CFG3, SD_RSP_80CLK_TIMEOUT_EN, 0);
-
-        RTSX_DEBUGP("DDR TX pre tune phase_map = 0x%08x\n", phase_map);
-
-        final_phase = sd_search_final_phase(chip, phase_map, TUNE_TX);
-        if (final_phase == 0xFF)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        retval = sd_change_phase(chip, final_phase, TUNE_TX);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        RTSX_DEBUGP("DDR TX pre tune phase: %d\n", (int)final_phase);
-
-        return STATUS_SUCCESS;
-}
-
-static int sd_tuning_tx(struct rtsx_chip *chip)
-{
-        struct sd_info *sd_card = &(chip->sd_card);
-        int retval;
-        int i, j;
-        u32 raw_phase_map[3], phase_map;
-        u8 final_phase;
-        int (*tuning_cmd)(struct rtsx_chip *chip, u8 sample_point);
-
-        if (CHK_SD(sd_card)) {
-                if (CHK_SD_DDR50(sd_card))
-                        tuning_cmd = sd_ddr_tuning_tx_cmd;
-                else
-                        tuning_cmd = sd_sdr_tuning_tx_cmd;
-
-        } else {
-                if (CHK_MMC_DDR52(sd_card))
-                        tuning_cmd = sd_ddr_tuning_tx_cmd;
-                else
-                        TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        for (i = 0; i < 3; i++) {
-                raw_phase_map[i] = 0;
-                for (j = MAX_PHASE; j >= 0; j--) {
-                        if (detect_card_cd(chip, SD_CARD) != STATUS_SUCCESS) {
-                                sd_set_err_code(chip, SD_NO_CARD);
-                                rtsx_write_register(chip, SD_CFG3,
-                                                    SD_RSP_80CLK_TIMEOUT_EN, 0);
-                                TRACE_RET(chip, STATUS_FAIL);
-                        }
-
-                        retval = tuning_cmd(chip, (u8)j);
-                        if (retval == STATUS_SUCCESS)
-                                raw_phase_map[i] |= 1 << j;
-                }
-        }
-
-        phase_map = raw_phase_map[0] & raw_phase_map[1] & raw_phase_map[2];
-        for (i = 0; i < 3; i++)
-                RTSX_DEBUGP("TX raw_phase_map[%d] = 0x%08x\n", i, raw_phase_map[i]);
-
-        RTSX_DEBUGP("TX phase_map = 0x%08x\n", phase_map);
-
-        final_phase = sd_search_final_phase(chip, phase_map, TUNE_TX);
-        if (final_phase == 0xFF)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        retval = sd_change_phase(chip, final_phase, TUNE_TX);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        return STATUS_SUCCESS;
-}
-
-static int sd_sdr_tuning(struct rtsx_chip *chip)
-{
-        int retval;
-
-        retval = sd_tuning_tx(chip);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        retval = sd_tuning_rx(chip);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        return STATUS_SUCCESS;
-}
-
-static int sd_ddr_tuning(struct rtsx_chip *chip)
-{
-        int retval;
-
-        if (!(chip->sd_ctl & SD_DDR_TX_PHASE_SET_BY_USER)) {
-                retval = sd_ddr_pre_tuning_tx(chip);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-        } else {
-                retval = sd_change_phase(chip, (u8)chip->sd_ddr_tx_phase, TUNE_TX);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        retval = sd_tuning_rx(chip);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        if (!(chip->sd_ctl & SD_DDR_TX_PHASE_SET_BY_USER)) {
-                retval = sd_tuning_tx(chip);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        return STATUS_SUCCESS;
-}
-
-static int mmc_ddr_tuning(struct rtsx_chip *chip)
-{
-        int retval;
-
-        if (!(chip->sd_ctl & MMC_DDR_TX_PHASE_SET_BY_USER)) {
-                retval = sd_ddr_pre_tuning_tx(chip);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-        } else {
-                retval = sd_change_phase(chip, (u8)chip->mmc_ddr_tx_phase, TUNE_TX);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        retval = sd_tuning_rx(chip);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        if (!(chip->sd_ctl & MMC_DDR_TX_PHASE_SET_BY_USER)) {
-                retval = sd_tuning_tx(chip);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        return STATUS_SUCCESS;
-}
-
-int sd_switch_clock(struct rtsx_chip *chip)
-{
-        struct sd_info *sd_card = &(chip->sd_card);
-        int retval;
-        int re_tuning = 0;
-
-        retval = select_card(chip, SD_CARD);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        if (CHECK_PID(chip, 0x5209) &&
-                        (CHK_SD30_SPEED(sd_card) || CHK_MMC_DDR52(sd_card))) {
-                if (sd_card->need_retune && (sd_card->sd_clock != chip->cur_clk)) {
-                        re_tuning = 1;
-                        sd_card->need_retune = 0;
-                }
-        }
-
-        retval = switch_clock(chip, sd_card->sd_clock);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        if (re_tuning) {
-                if (CHK_SD(sd_card)) {
-                        if (CHK_SD_DDR50(sd_card))
-                                retval = sd_ddr_tuning(chip);
-                        else
-                                retval = sd_sdr_tuning(chip);
-                } else {
-                        if (CHK_MMC_DDR52(sd_card))
-                                retval = mmc_ddr_tuning(chip);
-                }
-
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        return STATUS_SUCCESS;
-}
-
-static int sd_prepare_reset(struct rtsx_chip *chip)
-{
-        struct sd_info *sd_card = &(chip->sd_card);
-        int retval;
-
-        if (chip->asic_code)
-                sd_card->sd_clock = 29;
-        else
-                sd_card->sd_clock = CLK_30;
-
-        sd_card->sd_type = 0;
-        sd_card->seq_mode = 0;
-        sd_card->sd_data_buf_ready = 0;
-        sd_card->capacity = 0;
-
-#ifdef SUPPORT_SD_LOCK
-        sd_card->sd_lock_status = 0;
-        sd_card->sd_erase_status = 0;
-#endif
-
-        chip->capacity[chip->card2lun[SD_CARD]] = 0;
-        chip->sd_io = 0;
-
-        retval = sd_set_init_para(chip);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, retval);
-
-        if (CHECK_PID(chip, 0x5209)) {
-                RTSX_WRITE_REG(chip, REG_SD_CFG1, 0xFF,
-                        SD_CLK_DIVIDE_128 | SD_20_MODE | SD_BUS_WIDTH_1);
-                RTSX_WRITE_REG(chip, SD_SAMPLE_POINT_CTL, 0xFF, SD20_RX_POS_EDGE);
-                RTSX_WRITE_REG(chip, SD_PUSH_POINT_CTL, 0xFF, 0);
-        } else {
-                RTSX_WRITE_REG(chip, REG_SD_CFG1, 0xFF, 0x40);
-        }
-
-        RTSX_WRITE_REG(chip, CARD_STOP, SD_STOP | SD_CLR_ERR, SD_STOP | SD_CLR_ERR);
-
-        retval = select_card(chip, SD_CARD);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        return STATUS_SUCCESS;
-}
-
-static int sd_pull_ctl_disable(struct rtsx_chip *chip)
-{
-        if (CHECK_PID(chip, 0x5209)) {
-                RTSX_WRITE_REG(chip, CARD_PULL_CTL1, 0xFF, 0x55);
-                RTSX_WRITE_REG(chip, CARD_PULL_CTL2, 0xFF, 0x55);
-                RTSX_WRITE_REG(chip, CARD_PULL_CTL3, 0xFF, 0xD5);
-        } else if (CHECK_PID(chip, 0x5208)) {
-                RTSX_WRITE_REG(chip, CARD_PULL_CTL1, 0xFF,
-                        XD_D3_PD | SD_D7_PD | SD_CLK_PD | SD_D5_PD);
-                RTSX_WRITE_REG(chip, CARD_PULL_CTL2, 0xFF,
-                        SD_D6_PD | SD_D0_PD | SD_D1_PD | XD_D5_PD);
-                RTSX_WRITE_REG(chip, CARD_PULL_CTL3, 0xFF,
-                        SD_D4_PD | XD_CE_PD | XD_CLE_PD | XD_CD_PU);
-                RTSX_WRITE_REG(chip, CARD_PULL_CTL4, 0xFF,
-                        XD_RDY_PD | SD_D3_PD | SD_D2_PD | XD_ALE_PD);
-                RTSX_WRITE_REG(chip, CARD_PULL_CTL5, 0xFF,
-                        MS_INS_PU | SD_WP_PD | SD_CD_PU | SD_CMD_PD);
-                RTSX_WRITE_REG(chip, CARD_PULL_CTL6, 0xFF, MS_D5_PD | MS_D4_PD);
-        } else if (CHECK_PID(chip, 0x5288)) {
-                if (CHECK_BARO_PKG(chip, QFN)) {
-                        RTSX_WRITE_REG(chip, CARD_PULL_CTL1, 0xFF, 0x55);
-                        RTSX_WRITE_REG(chip, CARD_PULL_CTL2, 0xFF, 0x55);
-                        RTSX_WRITE_REG(chip, CARD_PULL_CTL3, 0xFF, 0x4B);
-                        RTSX_WRITE_REG(chip, CARD_PULL_CTL4, 0xFF, 0x69);
-                }
-        }
-
-        return STATUS_SUCCESS;
-}
-
-int sd_pull_ctl_enable(struct rtsx_chip *chip)
-{
-        int retval;
-
-        rtsx_init_cmd(chip);
-
-        if (CHECK_PID(chip, 0x5209)) {
-                rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL1, 0xFF, 0xAA);
-                rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL2, 0xFF, 0xAA);
-                rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL3, 0xFF, 0xE9);
-        } else if (CHECK_PID(chip, 0x5208)) {
-                rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL1, 0xFF,
-                        XD_D3_PD | SD_DAT7_PU | SD_CLK_NP | SD_D5_PU);
-                rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL2, 0xFF,
-                        SD_D6_PU | SD_D0_PU | SD_D1_PU | XD_D5_PD);
-                rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL3, 0xFF,
-                        SD_D4_PU | XD_CE_PD | XD_CLE_PD | XD_CD_PU);
-                rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL4, 0xFF,
-                        XD_RDY_PD | SD_D3_PU | SD_D2_PU | XD_ALE_PD);
-                rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL5, 0xFF,
-                        MS_INS_PU | SD_WP_PU | SD_CD_PU | SD_CMD_PU);
-                rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL6, 0xFF, MS_D5_PD | MS_D4_PD);
-        } else if (CHECK_PID(chip, 0x5288)) {
-                if (CHECK_BARO_PKG(chip, QFN)) {
-                        rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL1, 0xFF, 0xA8);
-                        rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL2, 0xFF, 0x5A);
-                        rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL3, 0xFF, 0x95);
-                        rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL4, 0xFF, 0xAA);
-                }
-        }
-
-        retval = rtsx_send_cmd(chip, SD_CARD, 100);
-        if (retval < 0)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        return STATUS_SUCCESS;
-}
-
-static int sd_init_power(struct rtsx_chip *chip)
-{
-        int retval;
-
-        if (CHECK_PID(chip, 0x5209))
-                RTSX_WRITE_REG(chip, PWR_GATE_CTRL, LDO3318_PWR_MASK, LDO_OFF);
-
-        retval = sd_power_off_card3v3(chip);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        if (!chip->ft2_fast_mode)
-                wait_timeout(250);
-
-        retval = enable_card_clock(chip, SD_CARD);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        if (chip->asic_code) {
-                retval = sd_pull_ctl_enable(chip);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-        } else {
-                RTSX_WRITE_REG(chip, FPGA_PULL_CTL, FPGA_SD_PULL_CTL_BIT | 0x20, 0);
-        }
-
-        if (chip->ft2_fast_mode) {
-                if (CHECK_PID(chip, 0x5209))
-                        RTSX_WRITE_REG(chip, PWR_GATE_CTRL, LDO3318_PWR_MASK, LDO_ON);
-
-        } else {
-                retval = card_power_on(chip, SD_CARD);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-
-                wait_timeout(260);
-
-#ifdef SUPPORT_OCP
-                if (chip->ocp_stat & (SD_OC_NOW | SD_OC_EVER)) {
-                        RTSX_DEBUGP("Over current, OCPSTAT is 0x%x\n", chip->ocp_stat);
-                        TRACE_RET(chip, STATUS_FAIL);
-                }
-#endif
-        }
-
-        RTSX_WRITE_REG(chip, CARD_OE, SD_OUTPUT_EN, SD_OUTPUT_EN);
-
-        return STATUS_SUCCESS;
-}
-
-static int sd_dummy_clock(struct rtsx_chip *chip)
-{
-        if (CHECK_PID(chip, 0x5209)) {
-                RTSX_WRITE_REG(chip, SD_BUS_STAT, SD_CLK_TOGGLE_EN, SD_CLK_TOGGLE_EN);
-                wait_timeout(5);
-                RTSX_WRITE_REG(chip, SD_BUS_STAT, SD_CLK_TOGGLE_EN, 0x00);
-        } else {
-                RTSX_WRITE_REG(chip, REG_SD_CFG3, 0x01, 0x01);
-                wait_timeout(5);
-                RTSX_WRITE_REG(chip, REG_SD_CFG3, 0x01, 0);
-        }
-
-        return STATUS_SUCCESS;
-}
-
-static int sd_read_lba0(struct rtsx_chip *chip)
-{
-        struct sd_info *sd_card = &(chip->sd_card);
-        int retval;
-        u8 cmd[5], bus_width;
-
-        cmd[0] = 0x40 | READ_SINGLE_BLOCK;
-        cmd[1] = 0;
-        cmd[2] = 0;
-        cmd[3] = 0;
-        cmd[4] = 0;
-
-        if (CHK_SD(sd_card)) {
-                bus_width = SD_BUS_WIDTH_4;
-        } else {
-                if (CHK_MMC_8BIT(sd_card))
-                        bus_width = SD_BUS_WIDTH_8;
-                else if (CHK_MMC_4BIT(sd_card))
-                        bus_width = SD_BUS_WIDTH_4;
-                else
-                        bus_width = SD_BUS_WIDTH_1;
-        }
-
-        retval = sd_read_data(chip, SD_TM_NORMAL_READ, cmd,
-                5, 512, 1, bus_width, NULL, 0, 100);
-        if (retval != STATUS_SUCCESS) {
-                rtsx_clear_sd_error(chip);
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        return STATUS_SUCCESS;
-}
-
-static int sd_check_wp_state(struct rtsx_chip *chip)
-{
-        struct sd_info *sd_card = &(chip->sd_card);
-        int retval;
-        u32 val;
-        u16 sd_card_type;
-        u8 cmd[5], buf[64];
-
-        retval = sd_send_cmd_get_rsp(chip, APP_CMD,
-                        sd_card->sd_addr, SD_RSP_TYPE_R1, NULL, 0);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        cmd[0] = 0x40 | SD_STATUS;
-        cmd[1] = 0;
-        cmd[2] = 0;
-        cmd[3] = 0;
-        cmd[4] = 0;
-
-        retval = sd_read_data(chip, SD_TM_NORMAL_READ, cmd, 5, 64, 1, SD_BUS_WIDTH_4, buf, 64, 250);
-        if (retval != STATUS_SUCCESS) {
-                rtsx_clear_sd_error(chip);
-
-                sd_send_cmd_get_rsp(chip, SEND_STATUS, sd_card->sd_addr, SD_RSP_TYPE_R1, NULL, 0);
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        RTSX_DEBUGP("ACMD13:\n");
-        RTSX_DUMP(buf, 64);
-
-        sd_card_type = ((u16)buf[2] << 8) | buf[3];
-        RTSX_DEBUGP("sd_card_type = 0x%04x\n", sd_card_type);
-        if ((sd_card_type == 0x0001) || (sd_card_type == 0x0002)) {
-                /* ROM card or OTP */
-                chip->card_wp |= SD_CARD;
-        }
-
-        /* Check SD Machanical Write-Protect Switch */
-        val = rtsx_readl(chip, RTSX_BIPR);
-        if (val & SD_WRITE_PROTECT)
-                chip->card_wp |= SD_CARD;
-
-        return STATUS_SUCCESS;
-}
-
-static int reset_sd(struct rtsx_chip *chip)
-{
-        struct sd_info *sd_card = &(chip->sd_card);
-        int retval, i = 0, j = 0, k = 0, hi_cap_flow = 0;
-        int sd_dont_switch = 0;
-        int support_1v8 = 0;
-        int try_sdio = 1;
-        u8 rsp[16];
-        u8 switch_bus_width;
-        u32 voltage = 0;
-        int sd20_mode = 0;
-
-        SET_SD(sd_card);
-
-Switch_Fail:
-
-        i = 0;
-        j = 0;
-        k = 0;
-        hi_cap_flow = 0;
-
-#ifdef SUPPORT_SD_LOCK
-        if (sd_card->sd_lock_status & SD_UNLOCK_POW_ON)
-                goto SD_UNLOCK_ENTRY;
-#endif
-
-        retval = sd_prepare_reset(chip);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        retval = sd_dummy_clock(chip);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        if (CHK_SDIO_EXIST(chip) && !CHK_SDIO_IGNORED(chip) && try_sdio) {
-                int rty_cnt = 0;
-
-                for (; rty_cnt < chip->sdio_retry_cnt; rty_cnt++) {
-                        if (detect_card_cd(chip, SD_CARD) != STATUS_SUCCESS) {
-                                sd_set_err_code(chip, SD_NO_CARD);
-                                TRACE_RET(chip, STATUS_FAIL);
-                        }
-
-                        retval = sd_send_cmd_get_rsp(chip, IO_SEND_OP_COND, 0, SD_RSP_TYPE_R4, rsp, 5);
-                        if (retval == STATUS_SUCCESS) {
-                                int func_num = (rsp[1] >> 4) & 0x07;
-                                if (func_num) {
-                                        RTSX_DEBUGP("SD_IO card (Function number: %d)!\n", func_num);
-                                        chip->sd_io = 1;
-                                        TRACE_RET(chip, STATUS_FAIL);
-                                }
-
-                                break;
-                        }
-
-                        sd_init_power(chip);
-
-                        sd_dummy_clock(chip);
-                }
-
-                RTSX_DEBUGP("Normal card!\n");
-        }
-
-        /* Start Initialization Process of SD Card */
-RTY_SD_RST:
-        retval = sd_send_cmd_get_rsp(chip, GO_IDLE_STATE, 0, SD_RSP_TYPE_R0, NULL, 0);
-        if (retval != STATUS_SUCCESS)
-               TRACE_RET(chip, STATUS_FAIL);
-
-        wait_timeout(20);
-
-        retval = sd_send_cmd_get_rsp(chip, SEND_IF_COND, 0x000001AA, SD_RSP_TYPE_R7, rsp, 5);
-        if (retval == STATUS_SUCCESS) {
-                if ((rsp[4] == 0xAA) && ((rsp[3] & 0x0f) == 0x01)) {
-                        hi_cap_flow = 1;
-                        if (CHECK_PID(chip, 0x5209)) {
-                                if (sd20_mode) {
-                                        voltage = SUPPORT_VOLTAGE |
-                                                SUPPORT_HIGH_AND_EXTENDED_CAPACITY;
-                                } else {
-                                        voltage = SUPPORT_VOLTAGE |
-                                                SUPPORT_HIGH_AND_EXTENDED_CAPACITY |
-                                                SUPPORT_MAX_POWER_PERMANCE | SUPPORT_1V8;
-                                }
-                        } else {
-                                voltage = SUPPORT_VOLTAGE | 0x40000000;
-                        }
-                }
-        }
-
-        if (!hi_cap_flow) {
-                voltage = SUPPORT_VOLTAGE;
-
-                retval = sd_send_cmd_get_rsp(chip, GO_IDLE_STATE, 0, SD_RSP_TYPE_R0, NULL, 0);
-                if (retval != STATUS_SUCCESS)
-                       TRACE_RET(chip, STATUS_FAIL);
-
-                wait_timeout(20);
-        }
-
-        do {
-                retval = sd_send_cmd_get_rsp(chip, APP_CMD, 0, SD_RSP_TYPE_R1, NULL, 0);
-                if (retval != STATUS_SUCCESS) {
-                        if (detect_card_cd(chip, SD_CARD) != STATUS_SUCCESS) {
-                                sd_set_err_code(chip, SD_NO_CARD);
-                                TRACE_RET(chip, STATUS_FAIL);
-                        }
-
-                        j++;
-                        if (j < 3)
-                                goto RTY_SD_RST;
-                        else
-                                TRACE_RET(chip, STATUS_FAIL);
-                }
-
-                retval = sd_send_cmd_get_rsp(chip, SD_APP_OP_COND, voltage, SD_RSP_TYPE_R3, rsp, 5);
-                if (retval != STATUS_SUCCESS) {
-                        k++;
-                        if (k < 3)
-                                goto RTY_SD_RST;
-                        else
-                                TRACE_RET(chip, STATUS_FAIL);
-                }
-
-                i++;
-                wait_timeout(20);
-        } while (!(rsp[1] & 0x80) && (i < 255));
-
-        if (i == 255)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        if (hi_cap_flow) {
-                if (rsp[1] & 0x40)
-                        SET_SD_HCXC(sd_card);
-                else
-                        CLR_SD_HCXC(sd_card);
-
-                if (CHECK_PID(chip, 0x5209) && CHK_SD_HCXC(sd_card) && !sd20_mode)
-                        support_1v8 = (rsp[1] & 0x01) ? 1 : 0;
-                else
-                        support_1v8 = 0;
-        } else {
-                CLR_SD_HCXC(sd_card);
-                support_1v8 = 0;
-        }
-        RTSX_DEBUGP("support_1v8 = %d\n", support_1v8);
-
-        if (support_1v8) {
-                retval = sd_voltage_switch(chip);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        retval = sd_send_cmd_get_rsp(chip, ALL_SEND_CID, 0, SD_RSP_TYPE_R2, NULL, 0);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        for (i = 0; i < 3; i++) {
-                retval = sd_send_cmd_get_rsp(chip, SEND_RELATIVE_ADDR, 0, SD_RSP_TYPE_R6, rsp, 5);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-
-                sd_card->sd_addr = (u32)rsp[1] << 24;
-                sd_card->sd_addr += (u32)rsp[2] << 16;
-
-                if (sd_card->sd_addr)
-                        break;
-        }
-
-        retval = sd_check_csd(chip, 1);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        retval = sd_select_card(chip, 1);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-#ifdef SUPPORT_SD_LOCK
-SD_UNLOCK_ENTRY:
-        retval = sd_update_lock_status(chip);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        if (sd_card->sd_lock_status & SD_LOCKED) {
-                sd_card->sd_lock_status |= (SD_LOCK_1BIT_MODE | SD_PWD_EXIST);
-                return STATUS_SUCCESS;
-        } else if (!(sd_card->sd_lock_status & SD_UNLOCK_POW_ON)) {
-                sd_card->sd_lock_status &= ~SD_PWD_EXIST;
-        }
-#endif
-
-        retval = sd_send_cmd_get_rsp(chip, APP_CMD, sd_card->sd_addr, SD_RSP_TYPE_R1, NULL, 0);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        retval = sd_send_cmd_get_rsp(chip, SET_CLR_CARD_DETECT, 0, SD_RSP_TYPE_R1, NULL, 0);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        if (support_1v8) {
-                retval = sd_send_cmd_get_rsp(chip, APP_CMD, sd_card->sd_addr, SD_RSP_TYPE_R1, NULL, 0);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-
-                retval = sd_send_cmd_get_rsp(chip, SET_BUS_WIDTH, 2, SD_RSP_TYPE_R1, NULL, 0);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-
-                switch_bus_width = SD_BUS_WIDTH_4;
-        } else {
-                switch_bus_width = SD_BUS_WIDTH_1;
-        }
-
-        retval = sd_send_cmd_get_rsp(chip, SET_BLOCKLEN, 0x200, SD_RSP_TYPE_R1, NULL, 0);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        retval = sd_set_clock_divider(chip, SD_CLK_DIVIDE_0);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        if (!(sd_card->raw_csd[4] & 0x40))
-                sd_dont_switch = 1;
-
-        if (!sd_dont_switch) {
-                if (sd20_mode) {
-                        /* Set sd_switch_fail here, because we needn't
-                         * switch to UHS mode
-                         */
-                        sd_card->sd_switch_fail = SDR104_SUPPORT_MASK |
-                                DDR50_SUPPORT_MASK | SDR50_SUPPORT_MASK;
-                }
-
-                /* Check the card whether follow SD1.1 spec or higher */
-                retval = sd_check_spec(chip, switch_bus_width);
-                if (retval == STATUS_SUCCESS) {
-                        retval = sd_switch_function(chip, switch_bus_width);
-                        if (retval != STATUS_SUCCESS) {
-                                if (CHECK_PID(chip, 0x5209))
-                                        sd_change_bank_voltage(chip, SD_IO_3V3);
-
-                                sd_init_power(chip);
-                                sd_dont_switch = 1;
-                                try_sdio = 0;
-
-                                goto Switch_Fail;
-                        }
-                } else {
-                        if (support_1v8) {
-                                if (CHECK_PID(chip, 0x5209))
-                                        sd_change_bank_voltage(chip, SD_IO_3V3);
-
-                                sd_init_power(chip);
-                                sd_dont_switch = 1;
-                                try_sdio = 0;
-
-                                goto Switch_Fail;
-                        }
-                }
-        }
-
-        if (!support_1v8) {
-                retval = sd_send_cmd_get_rsp(chip, APP_CMD, sd_card->sd_addr, SD_RSP_TYPE_R1, NULL, 0);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-
-                retval = sd_send_cmd_get_rsp(chip, SET_BUS_WIDTH, 2, SD_RSP_TYPE_R1, NULL, 0);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-        }
-
-#ifdef SUPPORT_SD_LOCK
-        sd_card->sd_lock_status &= ~SD_LOCK_1BIT_MODE;
-#endif
-
-        if (!sd20_mode && CHK_SD30_SPEED(sd_card)) {
-                int read_lba0 = 1;
-
-                RTSX_WRITE_REG(chip, SD30_DRIVE_SEL, 0x07, chip->sd30_drive_sel_1v8);
-
-                retval = sd_set_init_para(chip);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-
-                if (CHK_SD_DDR50(sd_card))
-                        retval = sd_ddr_tuning(chip);
-                else
-                        retval = sd_sdr_tuning(chip);
-
-                if (retval != STATUS_SUCCESS) {
-                        if (sd20_mode) {
-                                TRACE_RET(chip, STATUS_FAIL);
-                        } else {
-                                retval = sd_init_power(chip);
-                                if (retval != STATUS_SUCCESS)
-                                        TRACE_RET(chip, STATUS_FAIL);
-
-                                try_sdio = 0;
-                                sd20_mode = 1;
-                                goto Switch_Fail;
-                        }
-                }
-
-                sd_send_cmd_get_rsp(chip, SEND_STATUS, sd_card->sd_addr, SD_RSP_TYPE_R1, NULL, 0);
-
-                if (CHK_SD_DDR50(sd_card)) {
-                        retval = sd_wait_state_data_ready(chip, 0x08, 1, 1000);
-                        if (retval != STATUS_SUCCESS)
-                                read_lba0 = 0;
-                }
-
-                if (read_lba0) {
-                        retval = sd_read_lba0(chip);
-                        if (retval != STATUS_SUCCESS) {
-                                if (sd20_mode) {
-                                        TRACE_RET(chip, STATUS_FAIL);
-                                } else {
-                                        retval = sd_init_power(chip);
-                                        if (retval != STATUS_SUCCESS)
-                                                TRACE_RET(chip, STATUS_FAIL);
-
-                                        try_sdio = 0;
-                                        sd20_mode = 1;
-                                        goto Switch_Fail;
-                                }
-                        }
-                }
-        }
-
-        retval = sd_check_wp_state(chip);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        chip->card_bus_width[chip->card2lun[SD_CARD]] = 4;
-
-#ifdef SUPPORT_SD_LOCK
-        if (sd_card->sd_lock_status & SD_UNLOCK_POW_ON) {
-                RTSX_WRITE_REG(chip, REG_SD_BLOCK_CNT_H, 0xFF, 0x02);
-                RTSX_WRITE_REG(chip, REG_SD_BLOCK_CNT_L, 0xFF, 0x00);
-        }
-#endif
-
-        return STATUS_SUCCESS;
-}
-
-
-static int mmc_test_switch_bus(struct rtsx_chip *chip, u8 width)
-{
-        struct sd_info *sd_card = &(chip->sd_card);
-        int retval;
-        u8 buf[8] = {0}, bus_width, *ptr;
-        u16 byte_cnt;
-        int len;
-
-        retval = sd_send_cmd_get_rsp(chip, BUSTEST_W, 0, SD_RSP_TYPE_R1, NULL, 0);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, SWITCH_FAIL);
-
-        if (width == MMC_8BIT_BUS) {
-                buf[0] = 0x55;
-                buf[1] = 0xAA;
-                len = 8;
-                byte_cnt = 8;
-                bus_width = SD_BUS_WIDTH_8;
-        } else {
-                buf[0] = 0x5A;
-                len = 4;
-                byte_cnt = 4;
-                bus_width = SD_BUS_WIDTH_4;
-        }
-
-        if (!CHECK_PID(chip, 0x5209)) {
-                retval = rtsx_write_register(chip, REG_SD_CFG3, 0x02, 0x02);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, SWITCH_ERR);
-        }
-
-        retval = sd_write_data(chip, SD_TM_AUTO_WRITE_3,
-                        NULL, 0, byte_cnt, 1, bus_width, buf, len, 100);
-        if (retval != STATUS_SUCCESS) {
-                if (CHECK_PID(chip, 0x5209)) {
-                        u8 val1 = 0, val2 = 0;
-                        rtsx_read_register(chip, REG_SD_STAT1, &val1);
-                        rtsx_read_register(chip, REG_SD_STAT2, &val2);
-                        rtsx_clear_sd_error(chip);
-                        if ((val1 & 0xE0) || val2)
-                                TRACE_RET(chip, SWITCH_ERR);
-                } else {
-                        rtsx_clear_sd_error(chip);
-                        rtsx_write_register(chip, REG_SD_CFG3, 0x02, 0);
-                        TRACE_RET(chip, SWITCH_ERR);
-                }
-        }
-
-        if (!CHECK_PID(chip, 0x5209)) {
-                retval = rtsx_write_register(chip, REG_SD_CFG3, 0x02, 0);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, SWITCH_ERR);
-        }
-
-        RTSX_DEBUGP("SD/MMC CMD %d\n", BUSTEST_R);
-
-        rtsx_init_cmd(chip);
-
-        rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_CMD0, 0xFF, 0x40 | BUSTEST_R);
-
-        if (width == MMC_8BIT_BUS)
-                rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_BYTE_CNT_L, 0xFF, 0x08);
-        else
-                rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_BYTE_CNT_L, 0xFF, 0x04);
-
-        rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_BLOCK_CNT_L, 0xFF, 1);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_BLOCK_CNT_H, 0xFF, 0);
-
-        rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_CFG2, 0xFF,
-                        SD_CALCULATE_CRC7 | SD_NO_CHECK_CRC16 | SD_NO_WAIT_BUSY_END |
-                        SD_CHECK_CRC7 | SD_RSP_LEN_6);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_DATA_SOURCE, 0x01, PINGPONG_BUFFER);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_TRANSFER, 0xFF, SD_TM_NORMAL_READ | SD_TRANSFER_START);
-        rtsx_add_cmd(chip, CHECK_REG_CMD, REG_SD_TRANSFER, SD_TRANSFER_END, SD_TRANSFER_END);
-
-        rtsx_add_cmd(chip, READ_REG_CMD, PPBUF_BASE2, 0, 0);
-        if (width == MMC_8BIT_BUS)
-                rtsx_add_cmd(chip, READ_REG_CMD, PPBUF_BASE2 + 1, 0, 0);
-
-        retval = rtsx_send_cmd(chip, SD_CARD, 100);
-        if (retval < 0) {
-                rtsx_clear_sd_error(chip);
-                TRACE_RET(chip, SWITCH_ERR);
-        }
-
-        ptr = rtsx_get_cmd_data(chip) + 1;
-
-        if (width == MMC_8BIT_BUS) {
-                RTSX_DEBUGP("BUSTEST_R [8bits]: 0x%02x 0x%02x\n", ptr[0], ptr[1]);
-                if ((ptr[0] == 0xAA) && (ptr[1] == 0x55)) {
-                        u8 rsp[5];
-                        u32 arg;
-
-                        if (CHK_MMC_DDR52(sd_card))
-                                arg = 0x03B70600;
-                        else
-                                arg = 0x03B70200;
-
-                        retval = sd_send_cmd_get_rsp(chip, SWITCH, arg, SD_RSP_TYPE_R1b, rsp, 5);
-                        if ((retval == STATUS_SUCCESS) && !(rsp[4] & MMC_SWITCH_ERR))
-                                return SWITCH_SUCCESS;
-                }
-        } else {
-                RTSX_DEBUGP("BUSTEST_R [4bits]: 0x%02x\n", ptr[0]);
-                if (ptr[0] == 0xA5) {
-                        u8 rsp[5];
-                        u32 arg;
-
-                        if (CHK_MMC_DDR52(sd_card))
-                                arg = 0x03B70500;
-                        else
-                                arg = 0x03B70100;
-
-                        retval = sd_send_cmd_get_rsp(chip, SWITCH, arg, SD_RSP_TYPE_R1b, rsp, 5);
-                        if ((retval == STATUS_SUCCESS) && !(rsp[4] & MMC_SWITCH_ERR))
-                                return SWITCH_SUCCESS;
-                }
-        }
-
-        TRACE_RET(chip, SWITCH_FAIL);
-}
-
-
-static int mmc_switch_timing_bus(struct rtsx_chip *chip, int switch_ddr)
-{
-        struct sd_info *sd_card = &(chip->sd_card);
-        int retval;
-        u8 *ptr, card_type, card_type_mask = 0;
-
-        CLR_MMC_HS(sd_card);
-
-        RTSX_DEBUGP("SD/MMC CMD %d\n", SEND_EXT_CSD);
-
-        rtsx_init_cmd(chip);
-
-        rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_CMD0, 0xFF, 0x40 | SEND_EXT_CSD);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_CMD1, 0xFF, 0);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_CMD2, 0xFF, 0);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_CMD3, 0xFF, 0);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_CMD4, 0xFF, 0);
-
-        rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_BYTE_CNT_L, 0xFF, 0);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_BYTE_CNT_H, 0xFF, 2);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_BLOCK_CNT_L, 0xFF, 1);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_BLOCK_CNT_H, 0xFF, 0);
-
-        rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_CFG2, 0xFF,
-                        SD_CALCULATE_CRC7 | SD_CHECK_CRC16 | SD_NO_WAIT_BUSY_END |
-                        SD_CHECK_CRC7 | SD_RSP_LEN_6);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_DATA_SOURCE, 0x01, PINGPONG_BUFFER);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_TRANSFER, 0xFF, SD_TM_NORMAL_READ | SD_TRANSFER_START);
-        rtsx_add_cmd(chip, CHECK_REG_CMD, REG_SD_TRANSFER, SD_TRANSFER_END, SD_TRANSFER_END);
-
-        rtsx_add_cmd(chip, READ_REG_CMD, PPBUF_BASE2 + 196, 0xFF, 0);
-        rtsx_add_cmd(chip, READ_REG_CMD, PPBUF_BASE2 + 212, 0xFF, 0);
-        rtsx_add_cmd(chip, READ_REG_CMD, PPBUF_BASE2 + 213, 0xFF, 0);
-        rtsx_add_cmd(chip, READ_REG_CMD, PPBUF_BASE2 + 214, 0xFF, 0);
-        rtsx_add_cmd(chip, READ_REG_CMD, PPBUF_BASE2 + 215, 0xFF, 0);
-
-        retval = rtsx_send_cmd(chip, SD_CARD, 1000);
-        if (retval < 0) {
-                if (retval == -ETIMEDOUT) {
-                        rtsx_clear_sd_error(chip);
-                        sd_send_cmd_get_rsp(chip, SEND_STATUS, sd_card->sd_addr,
-                                        SD_RSP_TYPE_R1, NULL, 0);
-                }
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        ptr = rtsx_get_cmd_data(chip);
-        if (ptr[0] & SD_TRANSFER_ERR) {
-                sd_send_cmd_get_rsp(chip, SEND_STATUS, sd_card->sd_addr, SD_RSP_TYPE_R1, NULL, 0);
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        if (CHK_MMC_SECTOR_MODE(sd_card)) {
-                sd_card->capacity = ((u32)ptr[5] << 24) | ((u32)ptr[4] << 16) |
-                        ((u32)ptr[3] << 8) | ((u32)ptr[2]);
-        }
-
-        if (CHECK_PID(chip, 0x5209)) {
-#ifdef SUPPORT_SD_LOCK
-                if (!(sd_card->sd_lock_status & SD_SDR_RST) &&
-                                (chip->sd_ctl & SUPPORT_MMC_DDR_MODE)) {
-                        card_type_mask = 0x07;
-                } else {
-                        card_type_mask = 0x03;
-                }
-#else
-                if (chip->sd_ctl & SUPPORT_MMC_DDR_MODE)
-                        card_type_mask = 0x07;
-                else
-                        card_type_mask = 0x03;
-#endif
-        } else {
-                card_type_mask = 0x03;
-        }
-        card_type = ptr[1] & card_type_mask;
-        if (card_type) {
-                u8 rsp[5];
-
-                if (card_type & 0x04) {
-                        if (switch_ddr)
-                                SET_MMC_DDR52(sd_card);
-                        else
-                                SET_MMC_52M(sd_card);
-                } else if (card_type & 0x02) {
-                        SET_MMC_52M(sd_card);
-                } else {
-                        SET_MMC_26M(sd_card);
-                }
-
-                retval = sd_send_cmd_get_rsp(chip, SWITCH,
-                                0x03B90100, SD_RSP_TYPE_R1b, rsp, 5);
-                if ((retval != STATUS_SUCCESS) || (rsp[4] & MMC_SWITCH_ERR))
-                        CLR_MMC_HS(sd_card);
-        }
-
-        sd_choose_proper_clock(chip);
-        retval = switch_clock(chip, sd_card->sd_clock);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        /* Test Bus Procedure */
-        retval = mmc_test_switch_bus(chip, MMC_8BIT_BUS);
-        if (retval == SWITCH_SUCCESS) {
-                SET_MMC_8BIT(sd_card);
-                chip->card_bus_width[chip->card2lun[SD_CARD]] = 8;
-#ifdef SUPPORT_SD_LOCK
-                sd_card->sd_lock_status &= ~SD_LOCK_1BIT_MODE;
-#endif
-        } else if (retval == SWITCH_FAIL) {
-                retval = mmc_test_switch_bus(chip, MMC_4BIT_BUS);
-                if (retval == SWITCH_SUCCESS) {
-                        SET_MMC_4BIT(sd_card);
-                        chip->card_bus_width[chip->card2lun[SD_CARD]] = 4;
-#ifdef SUPPORT_SD_LOCK
-                        sd_card->sd_lock_status &= ~SD_LOCK_1BIT_MODE;
-#endif
-                } else if (retval == SWITCH_FAIL) {
-                        CLR_MMC_8BIT(sd_card);
-                        CLR_MMC_4BIT(sd_card);
-                } else {
-                        TRACE_RET(chip, STATUS_FAIL);
-                }
-        } else {
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        return STATUS_SUCCESS;
-}
-
-
-static int reset_mmc(struct rtsx_chip *chip)
-{
-        struct sd_info *sd_card = &(chip->sd_card);
-        int retval, i = 0, j = 0, k = 0;
-        int switch_ddr = 1;
-        u8 rsp[16];
-        u8 spec_ver = 0;
-        u32 temp;
-
-#ifdef SUPPORT_SD_LOCK
-        if (sd_card->sd_lock_status & SD_UNLOCK_POW_ON)
-                goto MMC_UNLOCK_ENTRY;
-#endif
-
-Switch_Fail:
-        retval = sd_prepare_reset(chip);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, retval);
-
-        SET_MMC(sd_card);
-
-RTY_MMC_RST:
-        retval = sd_send_cmd_get_rsp(chip, GO_IDLE_STATE, 0, SD_RSP_TYPE_R0, NULL, 0);
-        if (retval != STATUS_SUCCESS)
-               TRACE_RET(chip, STATUS_FAIL);
-
-        do {
-                if (detect_card_cd(chip, SD_CARD) != STATUS_SUCCESS) {
-                        sd_set_err_code(chip, SD_NO_CARD);
-                        TRACE_RET(chip, STATUS_FAIL);
-                }
-
-                retval = sd_send_cmd_get_rsp(chip, SEND_OP_COND,
-                                (SUPPORT_VOLTAGE|0x40000000), SD_RSP_TYPE_R3, rsp, 5);
-                if (retval != STATUS_SUCCESS) {
-                        if (sd_check_err_code(chip, SD_BUSY) || sd_check_err_code(chip, SD_TO_ERR)) {
-                                k++;
-                                if (k < 20) {
-                                        sd_clr_err_code(chip);
-                                        goto RTY_MMC_RST;
-                                } else {
-                                        TRACE_RET(chip, STATUS_FAIL);
-                                }
-                        } else {
-                                j++;
-                                if (j < 100) {
-                                        sd_clr_err_code(chip);
-                                        goto RTY_MMC_RST;
-                                } else {
-                                        TRACE_RET(chip, STATUS_FAIL);
-                                }
-                        }
-                }
-
-                wait_timeout(20);
-                i++;
-        } while (!(rsp[1] & 0x80) && (i < 255));
-
-        if (i == 255)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        if ((rsp[1] & 0x60) == 0x40)
-                SET_MMC_SECTOR_MODE(sd_card);
-        else
-                CLR_MMC_SECTOR_MODE(sd_card);
-
-        retval = sd_send_cmd_get_rsp(chip, ALL_SEND_CID, 0, SD_RSP_TYPE_R2, NULL, 0);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        sd_card->sd_addr = 0x00100000;
-        retval = sd_send_cmd_get_rsp(chip, SET_RELATIVE_ADDR, sd_card->sd_addr, SD_RSP_TYPE_R6, rsp, 5);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        retval = sd_check_csd(chip, 1);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        spec_ver = (sd_card->raw_csd[0] & 0x3C) >> 2;
-
-        retval = sd_select_card(chip, 1);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        retval = sd_send_cmd_get_rsp(chip, SET_BLOCKLEN, 0x200, SD_RSP_TYPE_R1, NULL, 0);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-#ifdef SUPPORT_SD_LOCK
-MMC_UNLOCK_ENTRY:
-        retval = sd_update_lock_status(chip);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-#endif
-
-        retval = sd_set_clock_divider(chip, SD_CLK_DIVIDE_0);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        chip->card_bus_width[chip->card2lun[SD_CARD]] = 1;
-
-        if (!sd_card->mmc_dont_switch_bus) {
-                if (spec_ver == 4) {
-                        /* MMC 4.x Cards */
-                        retval = mmc_switch_timing_bus(chip, switch_ddr);
-                        if (retval != STATUS_SUCCESS) {
-                                retval = sd_init_power(chip);
-                                if (retval != STATUS_SUCCESS)
-                                        TRACE_RET(chip, STATUS_FAIL);
-                                sd_card->mmc_dont_switch_bus = 1;
-                                TRACE_GOTO(chip, Switch_Fail);
-                        }
-                }
-
-                if (CHK_MMC_SECTOR_MODE(sd_card) && (sd_card->capacity == 0))
-                        TRACE_RET(chip, STATUS_FAIL);
-
-                if (switch_ddr && CHK_MMC_DDR52(sd_card)) {
-                        retval = sd_set_init_para(chip);
-                        if (retval != STATUS_SUCCESS)
-                                TRACE_RET(chip, STATUS_FAIL);
-
-                        retval = mmc_ddr_tuning(chip);
-                        if (retval != STATUS_SUCCESS) {
-                                retval = sd_init_power(chip);
-                                if (retval != STATUS_SUCCESS)
-                                        TRACE_RET(chip, STATUS_FAIL);
-
-                                switch_ddr = 0;
-                                TRACE_GOTO(chip, Switch_Fail);
-                        }
-
-                        retval = sd_wait_state_data_ready(chip, 0x08, 1, 1000);
-                        if (retval == STATUS_SUCCESS) {
-                                retval = sd_read_lba0(chip);
-                                if (retval != STATUS_SUCCESS) {
-                                        retval = sd_init_power(chip);
-                                        if (retval != STATUS_SUCCESS)
-                                                TRACE_RET(chip, STATUS_FAIL);
-
-                                        switch_ddr = 0;
-                                        TRACE_GOTO(chip, Switch_Fail);
-                                }
-                        }
-                }
-        }
-
-#ifdef SUPPORT_SD_LOCK
-        if (sd_card->sd_lock_status & SD_UNLOCK_POW_ON) {
-                RTSX_WRITE_REG(chip, REG_SD_BLOCK_CNT_H, 0xFF, 0x02);
-                RTSX_WRITE_REG(chip, REG_SD_BLOCK_CNT_L, 0xFF, 0x00);
-        }
-#endif
-
-        temp = rtsx_readl(chip, RTSX_BIPR);
-        if (temp & SD_WRITE_PROTECT)
-                chip->card_wp |= SD_CARD;
-
-        return STATUS_SUCCESS;
-}
-
-int reset_sd_card(struct rtsx_chip *chip)
-{
-        struct sd_info *sd_card = &(chip->sd_card);
-        int retval;
-
-        sd_init_reg_addr(chip);
-
-        memset(sd_card, 0, sizeof(struct sd_info));
-        chip->capacity[chip->card2lun[SD_CARD]] = 0;
-
-        retval = enable_card_clock(chip, SD_CARD);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        if (chip->ignore_sd && CHK_SDIO_EXIST(chip) && !CHK_SDIO_IGNORED(chip)) {
-                if (chip->asic_code) {
-                        retval = sd_pull_ctl_enable(chip);
-                        if (retval != STATUS_SUCCESS)
-                                TRACE_RET(chip, STATUS_FAIL);
-                } else {
-                        retval = rtsx_write_register(chip, FPGA_PULL_CTL,
-                                                     FPGA_SD_PULL_CTL_BIT | 0x20, 0);
-                        if (retval != STATUS_SUCCESS)
-                                TRACE_RET(chip, STATUS_FAIL);
-                }
-                retval = card_share_mode(chip, SD_CARD);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-
-                chip->sd_io = 1;
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        retval = sd_init_power(chip);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        if (chip->sd_ctl & RESET_MMC_FIRST) {
-                retval = reset_mmc(chip);
-                if (retval != STATUS_SUCCESS) {
-                        if (sd_check_err_code(chip, SD_NO_CARD))
-                                TRACE_RET(chip, STATUS_FAIL);
-
-                        retval = reset_sd(chip);
-                        if (retval != STATUS_SUCCESS) {
-                                if (CHECK_PID(chip, 0x5209))
-                                        sd_change_bank_voltage(chip, SD_IO_3V3);
-
-                                TRACE_RET(chip, STATUS_FAIL);
-                        }
-                }
-        } else {
-                retval = reset_sd(chip);
-                if (retval != STATUS_SUCCESS) {
-                        if (sd_check_err_code(chip, SD_NO_CARD))
-                                TRACE_RET(chip, STATUS_FAIL);
-
-                        if (CHECK_PID(chip, 0x5209)) {
-                                retval = sd_change_bank_voltage(chip, SD_IO_3V3);
-                                if (retval != STATUS_SUCCESS)
-                                        TRACE_RET(chip, STATUS_FAIL);
-                        }
-
-                        if (chip->sd_io) {
-                                TRACE_RET(chip, STATUS_FAIL);
-                        } else {
-                                retval = reset_mmc(chip);
-                                if (retval != STATUS_SUCCESS)
-                                        TRACE_RET(chip, STATUS_FAIL);
-                        }
-                }
-        }
-
-        retval = sd_set_clock_divider(chip, SD_CLK_DIVIDE_0);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        RTSX_WRITE_REG(chip, REG_SD_BYTE_CNT_L, 0xFF, 0);
-        RTSX_WRITE_REG(chip, REG_SD_BYTE_CNT_H, 0xFF, 2);
-
-        chip->capacity[chip->card2lun[SD_CARD]] = sd_card->capacity;
-
-        retval = sd_set_init_para(chip);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        RTSX_DEBUGP("sd_card->sd_type = 0x%x\n", sd_card->sd_type);
-
-        return STATUS_SUCCESS;
-}
-
-static int reset_mmc_only(struct rtsx_chip *chip)
-{
-        struct sd_info *sd_card = &(chip->sd_card);
-        int retval;
-
-        sd_card->sd_type = 0;
-        sd_card->seq_mode = 0;
-        sd_card->sd_data_buf_ready = 0;
-        sd_card->capacity = 0;
-        sd_card->sd_switch_fail = 0;
-
-#ifdef SUPPORT_SD_LOCK
-        sd_card->sd_lock_status = 0;
-        sd_card->sd_erase_status = 0;
-#endif
-
-        chip->capacity[chip->card2lun[SD_CARD]] = sd_card->capacity = 0;
-
-        retval = enable_card_clock(chip, SD_CARD);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        retval = sd_init_power(chip);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        retval = reset_mmc(chip);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        retval = sd_set_clock_divider(chip, SD_CLK_DIVIDE_0);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        RTSX_WRITE_REG(chip, REG_SD_BYTE_CNT_L, 0xFF, 0);
-        RTSX_WRITE_REG(chip, REG_SD_BYTE_CNT_H, 0xFF, 2);
-
-        chip->capacity[chip->card2lun[SD_CARD]] = sd_card->capacity;
-
-        retval = sd_set_init_para(chip);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        RTSX_DEBUGP("In reset_mmc_only, sd_card->sd_type = 0x%x\n", sd_card->sd_type);
-
-        return STATUS_SUCCESS;
-}
-
-#define WAIT_DATA_READY_RTY_CNT         255
-
-static int wait_data_buf_ready(struct rtsx_chip *chip)
-{
-        struct sd_info *sd_card = &(chip->sd_card);
-        int i, retval;
-
-        for (i = 0; i < WAIT_DATA_READY_RTY_CNT; i++) {
-                if (detect_card_cd(chip, SD_CARD) != STATUS_SUCCESS) {
-                        sd_set_err_code(chip, SD_NO_CARD);
-                        TRACE_RET(chip, STATUS_FAIL);
-                }
-
-                sd_card->sd_data_buf_ready = 0;
-
-                retval = sd_send_cmd_get_rsp(chip, SEND_STATUS,
-                                sd_card->sd_addr, SD_RSP_TYPE_R1, NULL, 0);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-
-                if (sd_card->sd_data_buf_ready) {
-                        return sd_send_cmd_get_rsp(chip, SEND_STATUS,
-                                sd_card->sd_addr, SD_RSP_TYPE_R1, NULL, 0);
-                }
-        }
-
-        sd_set_err_code(chip, SD_TO_ERR);
-
-        TRACE_RET(chip, STATUS_FAIL);
-}
-
-void sd_stop_seq_mode(struct rtsx_chip *chip)
-{
-        struct sd_info *sd_card = &(chip->sd_card);
-        int retval;
-
-        if (sd_card->seq_mode) {
-                retval = sd_switch_clock(chip);
-                if (retval != STATUS_SUCCESS)
-                        return;
-
-                retval = sd_send_cmd_get_rsp(chip, STOP_TRANSMISSION, 0,
-                                SD_RSP_TYPE_R1b, NULL, 0);
-                if (retval != STATUS_SUCCESS)
-                        sd_set_err_code(chip, SD_STS_ERR);
-
-                retval = sd_wait_state_data_ready(chip, 0x08, 1, 1000);
-                if (retval != STATUS_SUCCESS)
-                        sd_set_err_code(chip, SD_STS_ERR);
-
-                sd_card->seq_mode = 0;
-
-                rtsx_write_register(chip, RBCTL, RB_FLUSH, RB_FLUSH);
-        }
-}
-
-static inline int sd_auto_tune_clock(struct rtsx_chip *chip)
-{
-        struct sd_info *sd_card = &(chip->sd_card);
-        int retval;
-
-        if (chip->asic_code) {
-                if (sd_card->sd_clock > 30)
-                        sd_card->sd_clock -= 20;
-        } else {
-                switch (sd_card->sd_clock) {
-                case CLK_200:
-                        sd_card->sd_clock = CLK_150;
-                        break;
-
-                case CLK_150:
-                        sd_card->sd_clock = CLK_120;
-                        break;
-
-                case CLK_120:
-                        sd_card->sd_clock = CLK_100;
-                        break;
-
-                case CLK_100:
-                        sd_card->sd_clock = CLK_80;
-                        break;
-
-                case CLK_80:
-                        sd_card->sd_clock = CLK_60;
-                        break;
-
-                case CLK_60:
-                        sd_card->sd_clock = CLK_50;
-                        break;
-
-                default:
-                        break;
-                }
-        }
-
-        retval = sd_switch_clock(chip);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        return STATUS_SUCCESS;
-}
-
-int sd_rw(struct scsi_cmnd *srb, struct rtsx_chip *chip, u32 start_sector, u16 sector_cnt)
-{
-        struct sd_info *sd_card = &(chip->sd_card);
-        u32 data_addr;
-        u8 cfg2;
-        int retval;
-
-        if (srb->sc_data_direction == DMA_FROM_DEVICE) {
-                RTSX_DEBUGP("sd_rw: Read %d %s from 0x%x\n", sector_cnt,
-                             (sector_cnt > 1) ? "sectors" : "sector", start_sector);
-        } else {
-                RTSX_DEBUGP("sd_rw: Write %d %s to 0x%x\n", sector_cnt,
-                             (sector_cnt > 1) ? "sectors" : "sector", start_sector);
-        }
-
-        sd_card->cleanup_counter = 0;
-
-        if (!(chip->card_ready & SD_CARD)) {
-                sd_card->seq_mode = 0;
-
-                retval = reset_sd_card(chip);
-                if (retval == STATUS_SUCCESS) {
-                        chip->card_ready |= SD_CARD;
-                        chip->card_fail &= ~SD_CARD;
-                } else {
-                        chip->card_ready &= ~SD_CARD;
-                        chip->card_fail |= SD_CARD;
-                        chip->capacity[chip->card2lun[SD_CARD]] = 0;
-                        chip->rw_need_retry = 1;
-                        TRACE_RET(chip, STATUS_FAIL);
-                }
-        }
-
-        if (!CHK_SD_HCXC(sd_card) && !CHK_MMC_SECTOR_MODE(sd_card))
-                data_addr = start_sector << 9;
-        else
-                data_addr = start_sector;
-
-        sd_clr_err_code(chip);
-
-        retval = sd_switch_clock(chip);
-        if (retval != STATUS_SUCCESS) {
-                sd_set_err_code(chip, SD_IO_ERR);
-                TRACE_GOTO(chip, RW_FAIL);
-        }
-
-        if (sd_card->seq_mode && ((sd_card->pre_dir != srb->sc_data_direction)
-                        || ((sd_card->pre_sec_addr + sd_card->pre_sec_cnt) != start_sector))) {
-                if ((sd_card->pre_sec_cnt < 0x80)
-                                && (sd_card->pre_dir == DMA_FROM_DEVICE)
-                                && !CHK_SD30_SPEED(sd_card)
-                                && !CHK_SD_HS(sd_card)
-                                && !CHK_MMC_HS(sd_card)) {
-                        sd_send_cmd_get_rsp(chip, SEND_STATUS,
-                                        sd_card->sd_addr, SD_RSP_TYPE_R1, NULL, 0);
-                }
-
-                retval = sd_send_cmd_get_rsp(chip, STOP_TRANSMISSION,
-                                0, SD_RSP_TYPE_R1b, NULL, 0);
-                if (retval != STATUS_SUCCESS) {
-                        chip->rw_need_retry = 1;
-                        sd_set_err_code(chip, SD_STS_ERR);
-                        TRACE_GOTO(chip, RW_FAIL);
-                }
-
-                sd_card->seq_mode = 0;
-
-                retval = rtsx_write_register(chip, RBCTL, RB_FLUSH, RB_FLUSH);
-                if (retval != STATUS_SUCCESS) {
-                        sd_set_err_code(chip, SD_IO_ERR);
-                        TRACE_GOTO(chip, RW_FAIL);
-                }
-
-                if ((sd_card->pre_sec_cnt < 0x80)
-                                && !CHK_SD30_SPEED(sd_card)
-                                && !CHK_SD_HS(sd_card)
-                                && !CHK_MMC_HS(sd_card)) {
-                        sd_send_cmd_get_rsp(chip, SEND_STATUS,
-                                        sd_card->sd_addr, SD_RSP_TYPE_R1, NULL, 0);
-                }
-        }
-
-        rtsx_init_cmd(chip);
-
-        rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_BYTE_CNT_L, 0xFF, 0x00);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_BYTE_CNT_H, 0xFF, 0x02);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_BLOCK_CNT_L, 0xFF, (u8)sector_cnt);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_BLOCK_CNT_H, 0xFF, (u8)(sector_cnt >> 8));
-
-        rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_DATA_SOURCE, 0x01, RING_BUFFER);
-
-        if (CHK_MMC_8BIT(sd_card))
-                rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_CFG1, 0x03, SD_BUS_WIDTH_8);
-        else if (CHK_MMC_4BIT(sd_card) || CHK_SD(sd_card))
-                rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_CFG1, 0x03, SD_BUS_WIDTH_4);
-        else
-                rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_CFG1, 0x03, SD_BUS_WIDTH_1);
-
-        if (sd_card->seq_mode) {
-                cfg2 = SD_NO_CALCULATE_CRC7 | SD_CHECK_CRC16 | SD_NO_WAIT_BUSY_END |
-                                SD_NO_CHECK_CRC7 | SD_RSP_LEN_0;
-                if (CHECK_PID(chip, 0x5209)) {
-                        if (!CHK_SD30_SPEED(sd_card))
-                                cfg2 |= SD_NO_CHECK_WAIT_CRC_TO;
-                }
-                rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_CFG2, 0xFF, cfg2);
-
-                trans_dma_enable(srb->sc_data_direction, chip, sector_cnt * 512, DMA_512);
-
-                if (srb->sc_data_direction == DMA_FROM_DEVICE) {
-                        rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_TRANSFER, 0xFF,
-                                     SD_TM_AUTO_READ_3 | SD_TRANSFER_START);
-                } else {
-                        rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_TRANSFER, 0xFF,
-                                     SD_TM_AUTO_WRITE_3 | SD_TRANSFER_START);
-                }
-
-                rtsx_add_cmd(chip, CHECK_REG_CMD, REG_SD_TRANSFER, SD_TRANSFER_END, SD_TRANSFER_END);
-
-                rtsx_send_cmd_no_wait(chip);
-        } else {
-                if (srb->sc_data_direction == DMA_FROM_DEVICE) {
-                        RTSX_DEBUGP("SD/MMC CMD %d\n", READ_MULTIPLE_BLOCK);
-                        rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_CMD0, 0xFF,
-                                     0x40 | READ_MULTIPLE_BLOCK);
-                        rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_CMD1, 0xFF, (u8)(data_addr >> 24));
-                        rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_CMD2, 0xFF, (u8)(data_addr >> 16));
-                        rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_CMD3, 0xFF, (u8)(data_addr >> 8));
-                        rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_CMD4, 0xFF, (u8)data_addr);
-
-                        cfg2 = SD_CALCULATE_CRC7 | SD_CHECK_CRC16 | SD_NO_WAIT_BUSY_END |
-                                        SD_CHECK_CRC7 | SD_RSP_LEN_6;
-                        if (CHECK_PID(chip, 0x5209)) {
-                                if (!CHK_SD30_SPEED(sd_card))
-                                        cfg2 |= SD_NO_CHECK_WAIT_CRC_TO;
-                        }
-                        rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_CFG2, 0xFF, cfg2);
-
-                        trans_dma_enable(srb->sc_data_direction, chip, sector_cnt * 512, DMA_512);
-
-                        rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_TRANSFER, 0xFF,
-                                     SD_TM_AUTO_READ_2 | SD_TRANSFER_START);
-                        rtsx_add_cmd(chip, CHECK_REG_CMD, REG_SD_TRANSFER,
-                                     SD_TRANSFER_END, SD_TRANSFER_END);
-
-                        rtsx_send_cmd_no_wait(chip);
-                } else {
-                        retval = rtsx_send_cmd(chip, SD_CARD, 50);
-                        if (retval < 0) {
-                                rtsx_clear_sd_error(chip);
-
-                                chip->rw_need_retry = 1;
-                                sd_set_err_code(chip, SD_TO_ERR);
-                                TRACE_GOTO(chip, RW_FAIL);
-                        }
-
-                        retval = wait_data_buf_ready(chip);
-                        if (retval != STATUS_SUCCESS) {
-                                chip->rw_need_retry = 1;
-                                sd_set_err_code(chip, SD_TO_ERR);
-                                TRACE_GOTO(chip, RW_FAIL);
-                        }
-
-                        retval = sd_send_cmd_get_rsp(chip, WRITE_MULTIPLE_BLOCK,
-                                        data_addr, SD_RSP_TYPE_R1, NULL, 0);
-                        if (retval != STATUS_SUCCESS) {
-                                chip->rw_need_retry = 1;
-                                TRACE_GOTO(chip, RW_FAIL);
-                        }
-
-                        rtsx_init_cmd(chip);
-
-                        cfg2 = SD_NO_CALCULATE_CRC7 | SD_CHECK_CRC16 | SD_NO_WAIT_BUSY_END |
-                                        SD_NO_CHECK_CRC7 | SD_RSP_LEN_0;
-                        if (CHECK_PID(chip, 0x5209)) {
-                                if (!CHK_SD30_SPEED(sd_card))
-                                        cfg2 |= SD_NO_CHECK_WAIT_CRC_TO;
-                        }
-                        rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_CFG2, 0xFF, cfg2);
-
-                        trans_dma_enable(srb->sc_data_direction, chip, sector_cnt * 512, DMA_512);
-
-                        rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_TRANSFER, 0xFF,
-                                     SD_TM_AUTO_WRITE_3 | SD_TRANSFER_START);
-                        rtsx_add_cmd(chip, CHECK_REG_CMD, REG_SD_TRANSFER,
-                                     SD_TRANSFER_END, SD_TRANSFER_END);
-
-                        rtsx_send_cmd_no_wait(chip);
-                }
-
-                sd_card->seq_mode = 1;
-        }
-
-        retval = rtsx_transfer_data(chip, SD_CARD, scsi_sglist(srb), scsi_bufflen(srb),
-                        scsi_sg_count(srb), srb->sc_data_direction, chip->sd_timeout);
-        if (retval < 0) {
-                u8 stat = 0;
-                int err;
-
-                sd_card->seq_mode = 0;
-
-                if (retval == -ETIMEDOUT)
-                        err = STATUS_TIMEDOUT;
-                else
-                        err = STATUS_FAIL;
-
-                rtsx_read_register(chip, REG_SD_STAT1, &stat);
-                rtsx_clear_sd_error(chip);
-                if (detect_card_cd(chip, SD_CARD) != STATUS_SUCCESS) {
-                        chip->rw_need_retry = 0;
-                        RTSX_DEBUGP("No card exist, exit sd_rw\n");
-                        TRACE_RET(chip, STATUS_FAIL);
-                }
-
-                chip->rw_need_retry = 1;
-
-                retval = sd_send_cmd_get_rsp(chip, STOP_TRANSMISSION, 0, SD_RSP_TYPE_R1b, NULL, 0);
-                if (retval != STATUS_SUCCESS) {
-                        sd_set_err_code(chip, SD_STS_ERR);
-                        TRACE_GOTO(chip, RW_FAIL);
-                }
-
-                if (stat & (SD_CRC7_ERR | SD_CRC16_ERR | SD_CRC_WRITE_ERR)) {
-                        RTSX_DEBUGP("SD CRC error, tune clock!\n");
-                        sd_set_err_code(chip, SD_CRC_ERR);
-                        TRACE_GOTO(chip, RW_FAIL);
-                }
-
-                if (err == STATUS_TIMEDOUT) {
-                        sd_set_err_code(chip, SD_TO_ERR);
-                        TRACE_GOTO(chip, RW_FAIL);
-                }
-
-                TRACE_RET(chip, err);
-        }
-
-        sd_card->pre_sec_addr = start_sector;
-        sd_card->pre_sec_cnt = sector_cnt;
-        sd_card->pre_dir = srb->sc_data_direction;
-
-        return STATUS_SUCCESS;
-
-RW_FAIL:
-        sd_card->seq_mode = 0;
-
-        if (detect_card_cd(chip, SD_CARD) != STATUS_SUCCESS) {
-                chip->rw_need_retry = 0;
-                RTSX_DEBUGP("No card exist, exit sd_rw\n");
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        if (sd_check_err_code(chip, SD_CRC_ERR)) {
-                if (CHK_MMC_4BIT(sd_card) || CHK_MMC_8BIT(sd_card)) {
-                        sd_card->mmc_dont_switch_bus = 1;
-                        reset_mmc_only(chip);
-                        sd_card->mmc_dont_switch_bus = 0;
-                } else {
-                        sd_card->need_retune = 1;
-                        sd_auto_tune_clock(chip);
-                }
-        } else if (sd_check_err_code(chip, SD_TO_ERR | SD_STS_ERR)) {
-                retval = reset_sd_card(chip);
-                if (retval != STATUS_SUCCESS) {
-                        chip->card_ready &= ~SD_CARD;
-                        chip->card_fail |= SD_CARD;
-                        chip->capacity[chip->card2lun[SD_CARD]] = 0;
-                }
-        }
-
-        TRACE_RET(chip, STATUS_FAIL);
-}
-
-#ifdef SUPPORT_CPRM
-int soft_reset_sd_card(struct rtsx_chip *chip)
-{
-        return reset_sd(chip);
-}
-
-int ext_sd_send_cmd_get_rsp(struct rtsx_chip *chip, u8 cmd_idx,
-                u32 arg, u8 rsp_type, u8 *rsp, int rsp_len, int special_check)
-{
-        int retval;
-        int timeout = 100;
-        u16 reg_addr;
-        u8 *ptr;
-        int stat_idx = 0;
-        int rty_cnt = 0;
-
-        RTSX_DEBUGP("EXT SD/MMC CMD %d\n", cmd_idx);
-
-        if (rsp_type == SD_RSP_TYPE_R1b)
-                timeout = 3000;
-
-RTY_SEND_CMD:
-
-        rtsx_init_cmd(chip);
-
-        rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_CMD0, 0xFF, 0x40 | cmd_idx);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_CMD1, 0xFF, (u8)(arg >> 24));
-        rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_CMD2, 0xFF, (u8)(arg >> 16));
-        rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_CMD3, 0xFF, (u8)(arg >> 8));
-        rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_CMD4, 0xFF, (u8)arg);
-
-        rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_CFG2, 0xFF, rsp_type);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_DATA_SOURCE,
-                        0x01, PINGPONG_BUFFER);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_TRANSFER,
-                        0xFF, SD_TM_CMD_RSP | SD_TRANSFER_START);
-        rtsx_add_cmd(chip, CHECK_REG_CMD, REG_SD_TRANSFER, SD_TRANSFER_END, SD_TRANSFER_END);
-
-        if (rsp_type == SD_RSP_TYPE_R2) {
-                for (reg_addr = PPBUF_BASE2; reg_addr < PPBUF_BASE2 + 16; reg_addr++)
-                        rtsx_add_cmd(chip, READ_REG_CMD, reg_addr, 0, 0);
-
-                stat_idx = 17;
-        } else if (rsp_type != SD_RSP_TYPE_R0) {
-                for (reg_addr = REG_SD_CMD0; reg_addr <= REG_SD_CMD4; reg_addr++)
-                        rtsx_add_cmd(chip, READ_REG_CMD, reg_addr, 0, 0);
-
-                stat_idx = 6;
-        }
-        rtsx_add_cmd(chip, READ_REG_CMD, REG_SD_CMD5, 0, 0);
-
-        rtsx_add_cmd(chip, READ_REG_CMD, REG_SD_STAT1, 0, 0);
-
-        retval = rtsx_send_cmd(chip, SD_CARD, timeout);
-        if (retval < 0) {
-                if (retval == -ETIMEDOUT) {
-                        rtsx_clear_sd_error(chip);
-
-                        if (rsp_type & SD_WAIT_BUSY_END) {
-                                retval = sd_check_data0_status(chip);
-                                if (retval != STATUS_SUCCESS)
-                                        TRACE_RET(chip, retval);
-                        } else {
-                                sd_set_err_code(chip, SD_TO_ERR);
-                        }
-                }
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        if (rsp_type == SD_RSP_TYPE_R0)
-                return STATUS_SUCCESS;
-
-        ptr = rtsx_get_cmd_data(chip) + 1;
-
-        if ((ptr[0] & 0xC0) != 0) {
-                sd_set_err_code(chip, SD_STS_ERR);
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        if (!(rsp_type & SD_NO_CHECK_CRC7)) {
-                if (ptr[stat_idx] & SD_CRC7_ERR) {
-                        if (cmd_idx == WRITE_MULTIPLE_BLOCK) {
-                                sd_set_err_code(chip, SD_CRC_ERR);
-                                TRACE_RET(chip, STATUS_FAIL);
-                        }
-                        if (rty_cnt < SD_MAX_RETRY_COUNT) {
-                                wait_timeout(20);
-                                rty_cnt++;
-                                goto RTY_SEND_CMD;
-                        } else {
-                                sd_set_err_code(chip, SD_CRC_ERR);
-                                TRACE_RET(chip, STATUS_FAIL);
-                        }
-                }
-        }
-
-        if ((cmd_idx == SELECT_CARD) || (cmd_idx == APP_CMD) ||
-                        (cmd_idx == SEND_STATUS) || (cmd_idx == STOP_TRANSMISSION)) {
-                if ((cmd_idx != STOP_TRANSMISSION) && (special_check == 0)) {
-                        if (ptr[1] & 0x80)
-                                TRACE_RET(chip, STATUS_FAIL);
-                }
-#ifdef SUPPORT_SD_LOCK
-                if (ptr[1] & 0x7D)
-#else
-                if (ptr[1] & 0x7F)
-#endif
-                {
-                        TRACE_RET(chip, STATUS_FAIL);
-                }
-                if (ptr[2] & 0xF8)
-                        TRACE_RET(chip, STATUS_FAIL);
-
-                if (cmd_idx == SELECT_CARD) {
-                        if (rsp_type == SD_RSP_TYPE_R2) {
-                                if ((ptr[3] & 0x1E) != 0x04)
-                                        TRACE_RET(chip, STATUS_FAIL);
-
-                        } else if (rsp_type == SD_RSP_TYPE_R0) {
-                                if ((ptr[3] & 0x1E) != 0x03)
-                                        TRACE_RET(chip, STATUS_FAIL);
-                        }
-                }
-        }
-
-        if (rsp && rsp_len)
-                memcpy(rsp, ptr, rsp_len);
-
-        return STATUS_SUCCESS;
-}
-
-int ext_sd_get_rsp(struct rtsx_chip *chip, int len, u8 *rsp, u8 rsp_type)
-{
-        int retval, rsp_len;
-        u16 reg_addr;
-
-        if (rsp_type == SD_RSP_TYPE_R0)
-                return STATUS_SUCCESS;
-
-        rtsx_init_cmd(chip);
-
-        if (rsp_type == SD_RSP_TYPE_R2) {
-                for (reg_addr = PPBUF_BASE2; reg_addr < PPBUF_BASE2 + 16; reg_addr++)
-                        rtsx_add_cmd(chip, READ_REG_CMD, reg_addr, 0xFF, 0);
-
-                rsp_len = 17;
-        } else if (rsp_type != SD_RSP_TYPE_R0) {
-                for (reg_addr = REG_SD_CMD0; reg_addr <= REG_SD_CMD4; reg_addr++)
-                        rtsx_add_cmd(chip, READ_REG_CMD, reg_addr, 0xFF, 0);
-
-                rsp_len = 6;
-        }
-        rtsx_add_cmd(chip, READ_REG_CMD, REG_SD_CMD5, 0xFF, 0);
-
-        retval = rtsx_send_cmd(chip, SD_CARD, 100);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        if (rsp) {
-                int min_len = (rsp_len < len) ? rsp_len : len;
-
-                memcpy(rsp, rtsx_get_cmd_data(chip), min_len);
-
-                RTSX_DEBUGP("min_len = %d\n", min_len);
-                RTSX_DEBUGP("Response in cmd buf: 0x%x 0x%x 0x%x 0x%x\n",
-                        rsp[0], rsp[1], rsp[2], rsp[3]);
-        }
-
-        return STATUS_SUCCESS;
-}
-
-int sd_pass_thru_mode(struct scsi_cmnd *srb, struct rtsx_chip *chip)
-{
-        struct sd_info *sd_card = &(chip->sd_card);
-        unsigned int lun = SCSI_LUN(srb);
-        int len;
-        u8 buf[18] = {
-                0x00,
-                0x00,
-                0x00,
-                0x0E,
-                0x00,
-                0x00,
-                0x00,
-                0x00,
-                0x53,
-                0x44,
-                0x20,
-                0x43,
-                0x61,
-                0x72,
-                0x64,
-                0x00,
-                0x00,
-                0x00,
-        };
-
-        sd_card->pre_cmd_err = 0;
-
-        if (!(CHK_BIT(chip->lun_mc, lun))) {
-                SET_BIT(chip->lun_mc, lun);
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_CHANGE);
-                TRACE_RET(chip, TRANSPORT_FAILED);
-        }
-
-        if ((0x53 != srb->cmnd[2]) || (0x44 != srb->cmnd[3]) || (0x20 != srb->cmnd[4]) ||
-                        (0x43 != srb->cmnd[5]) || (0x61 != srb->cmnd[6]) ||
-                        (0x72 != srb->cmnd[7]) || (0x64 != srb->cmnd[8])) {
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
-                TRACE_RET(chip, TRANSPORT_FAILED);
-        }
-
-        switch (srb->cmnd[1] & 0x0F) {
-        case 0:
-                sd_card->sd_pass_thru_en = 0;
-                break;
-
-        case 1:
-                sd_card->sd_pass_thru_en = 1;
-                break;
-
-        default:
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
-                TRACE_RET(chip, TRANSPORT_FAILED);
-        }
-
-        buf[5] = (1 == CHK_SD(sd_card)) ?  0x01 : 0x02;
-        if (chip->card_wp & SD_CARD)
-                buf[5] |= 0x80;
-
-        buf[6] = (u8)(sd_card->sd_addr >> 16);
-        buf[7] = (u8)(sd_card->sd_addr >> 24);
-
-        buf[15] = chip->max_lun;
-
-        len = min(18, (int)scsi_bufflen(srb));
-        rtsx_stor_set_xfer_buf(buf, len, srb);
-
-        return TRANSPORT_GOOD;
-}
-
-static inline int get_rsp_type(struct scsi_cmnd *srb, u8 *rsp_type, int *rsp_len)
-{
-        if (!rsp_type || !rsp_len)
-                return STATUS_FAIL;
-
-        switch (srb->cmnd[10]) {
-        case 0x03:
-                *rsp_type = SD_RSP_TYPE_R0;
-                *rsp_len = 0;
-                break;
-
-        case 0x04:
-                *rsp_type = SD_RSP_TYPE_R1;
-                *rsp_len = 6;
-                break;
-
-        case 0x05:
-                *rsp_type = SD_RSP_TYPE_R1b;
-                *rsp_len = 6;
-                break;
-
-        case 0x06:
-                *rsp_type = SD_RSP_TYPE_R2;
-                *rsp_len = 17;
-                break;
-
-        case 0x07:
-                *rsp_type = SD_RSP_TYPE_R3;
-                *rsp_len = 6;
-                break;
-
-        default:
-                return STATUS_FAIL;
-        }
-
-        return STATUS_SUCCESS;
-}
-
-int sd_execute_no_data(struct scsi_cmnd *srb, struct rtsx_chip *chip)
-{
-        struct sd_info *sd_card = &(chip->sd_card);
-        unsigned int lun = SCSI_LUN(srb);
-        int retval, rsp_len;
-        u8 cmd_idx, rsp_type;
-        u8 standby = 0, acmd = 0;
-        u32 arg;
-
-        if (!sd_card->sd_pass_thru_en) {
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
-                TRACE_RET(chip, TRANSPORT_FAILED);
-        }
-
-        retval = sd_switch_clock(chip);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, TRANSPORT_FAILED);
-
-        if (sd_card->pre_cmd_err) {
-                sd_card->pre_cmd_err = 0;
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_CHANGE);
-                TRACE_RET(chip, TRANSPORT_FAILED);
-        }
-
-        cmd_idx = srb->cmnd[2] & 0x3F;
-        if (srb->cmnd[1] & 0x02)
-                standby = 1;
-
-        if (srb->cmnd[1] & 0x01)
-                acmd = 1;
-
-        arg = ((u32)srb->cmnd[3] << 24) | ((u32)srb->cmnd[4] << 16) |
-                ((u32)srb->cmnd[5] << 8) | srb->cmnd[6];
-
-        retval = get_rsp_type(srb, &rsp_type, &rsp_len);
-        if (retval != STATUS_SUCCESS) {
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
-                TRACE_RET(chip, TRANSPORT_FAILED);
-        }
-        sd_card->last_rsp_type = rsp_type;
-
-        retval = sd_switch_clock(chip);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, TRANSPORT_FAILED);
-
-#ifdef SUPPORT_SD_LOCK
-        if ((sd_card->sd_lock_status & SD_LOCK_1BIT_MODE) == 0) {
-                if (CHK_MMC_8BIT(sd_card)) {
-                        retval = rtsx_write_register(chip, REG_SD_CFG1, 0x03, SD_BUS_WIDTH_8);
-                        if (retval != STATUS_SUCCESS)
-                                TRACE_RET(chip, TRANSPORT_FAILED);
-
-                } else if (CHK_SD(sd_card) || CHK_MMC_4BIT(sd_card)) {
-                        retval = rtsx_write_register(chip, REG_SD_CFG1, 0x03, SD_BUS_WIDTH_4);
-                        if (retval != STATUS_SUCCESS)
-                                TRACE_RET(chip, TRANSPORT_FAILED);
-                }
-        }
-#else
-        retval = rtsx_write_register(chip, REG_SD_CFG1, 0x03, SD_BUS_WIDTH_4);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, TRANSPORT_FAILED);
-#endif
-
-        if (standby) {
-                retval = sd_select_card(chip, 0);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_GOTO(chip, SD_Execute_Cmd_Failed);
-        }
-
-        if (acmd) {
-                retval = ext_sd_send_cmd_get_rsp(chip, APP_CMD, sd_card->sd_addr,
-                                SD_RSP_TYPE_R1, NULL, 0, 0);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_GOTO(chip, SD_Execute_Cmd_Failed);
-        }
-
-        retval = ext_sd_send_cmd_get_rsp(chip, cmd_idx, arg, rsp_type,
-                        sd_card->rsp, rsp_len, 0);
-        if (retval != STATUS_SUCCESS)
-                TRACE_GOTO(chip, SD_Execute_Cmd_Failed);
-
-        if (standby) {
-                retval = sd_select_card(chip, 1);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_GOTO(chip, SD_Execute_Cmd_Failed);
-        }
-
-#ifdef SUPPORT_SD_LOCK
-        retval = sd_update_lock_status(chip);
-        if (retval != STATUS_SUCCESS)
-                TRACE_GOTO(chip, SD_Execute_Cmd_Failed);
-#endif
-
-        scsi_set_resid(srb, 0);
-        return TRANSPORT_GOOD;
-
-SD_Execute_Cmd_Failed:
-        sd_card->pre_cmd_err = 1;
-        set_sense_type(chip, lun, SENSE_TYPE_NO_SENSE);
-        release_sd_card(chip);
-        do_reset_sd_card(chip);
-        if (!(chip->card_ready & SD_CARD))
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_NOT_PRESENT);
-
-        TRACE_RET(chip, TRANSPORT_FAILED);
-}
-
-int sd_execute_read_data(struct scsi_cmnd *srb, struct rtsx_chip *chip)
-{
-        struct sd_info *sd_card = &(chip->sd_card);
-        unsigned int lun = SCSI_LUN(srb);
-        int retval, rsp_len, i;
-        int cmd13_checkbit = 0, read_err = 0;
-        u8 cmd_idx, rsp_type, bus_width;
-        u8 send_cmd12 = 0, standby = 0, acmd = 0;
-        u32 data_len;
-
-        if (!sd_card->sd_pass_thru_en) {
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
-                TRACE_RET(chip, TRANSPORT_FAILED);
-        }
-
-        if (sd_card->pre_cmd_err) {
-                sd_card->pre_cmd_err = 0;
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_CHANGE);
-                TRACE_RET(chip, TRANSPORT_FAILED);
-        }
-
-        retval = sd_switch_clock(chip);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, TRANSPORT_FAILED);
-
-        cmd_idx = srb->cmnd[2] & 0x3F;
-        if (srb->cmnd[1] & 0x04)
-                send_cmd12 = 1;
-
-        if (srb->cmnd[1] & 0x02)
-                standby = 1;
-
-        if (srb->cmnd[1] & 0x01)
-                acmd = 1;
-
-        data_len = ((u32)srb->cmnd[7] << 16) | ((u32)srb->cmnd[8] << 8) | srb->cmnd[9];
-
-        retval = get_rsp_type(srb, &rsp_type, &rsp_len);
-        if (retval != STATUS_SUCCESS) {
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
-                TRACE_RET(chip, TRANSPORT_FAILED);
-        }
-        sd_card->last_rsp_type = rsp_type;
-
-        retval = sd_switch_clock(chip);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, TRANSPORT_FAILED);
-
-#ifdef SUPPORT_SD_LOCK
-        if ((sd_card->sd_lock_status & SD_LOCK_1BIT_MODE) == 0) {
-                if (CHK_MMC_8BIT(sd_card))
-                        bus_width = SD_BUS_WIDTH_8;
-                else if (CHK_SD(sd_card) || CHK_MMC_4BIT(sd_card))
-                        bus_width = SD_BUS_WIDTH_4;
-                else
-                        bus_width = SD_BUS_WIDTH_1;
-        } else {
-                bus_width = SD_BUS_WIDTH_4;
-        }
-        RTSX_DEBUGP("bus_width = %d\n", bus_width);
-#else
-        bus_width = SD_BUS_WIDTH_4;
-#endif
-
-        if (data_len < 512) {
-                retval = ext_sd_send_cmd_get_rsp(chip, SET_BLOCKLEN, data_len,
-                                SD_RSP_TYPE_R1, NULL, 0, 0);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_GOTO(chip, SD_Execute_Read_Cmd_Failed);
-        }
-
-        if (standby) {
-                retval = sd_select_card(chip, 0);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_GOTO(chip, SD_Execute_Read_Cmd_Failed);
-        }
-
-        if (acmd) {
-                retval = ext_sd_send_cmd_get_rsp(chip, APP_CMD, sd_card->sd_addr,
-                                SD_RSP_TYPE_R1, NULL, 0, 0);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_GOTO(chip, SD_Execute_Read_Cmd_Failed);
-        }
-
-        if (data_len <= 512) {
-                int min_len;
-                u8 *buf;
-                u16 byte_cnt, blk_cnt;
-                u8 cmd[5];
-
-                byte_cnt = ((u16)(srb->cmnd[8] & 0x03) << 8) | srb->cmnd[9];
-                blk_cnt = 1;
-
-                cmd[0] = 0x40 | cmd_idx;
-                cmd[1] = srb->cmnd[3];
-                cmd[2] = srb->cmnd[4];
-                cmd[3] = srb->cmnd[5];
-                cmd[4] = srb->cmnd[6];
-
-                buf = kmalloc(data_len, GFP_KERNEL);
-                if (buf == NULL)
-                        TRACE_RET(chip, TRANSPORT_ERROR);
-
-                retval = sd_read_data(chip, SD_TM_NORMAL_READ, cmd, 5, byte_cnt,
-                                       blk_cnt, bus_width, buf, data_len, 2000);
-                if (retval != STATUS_SUCCESS) {
-                        read_err = 1;
-                        kfree(buf);
-                        rtsx_clear_sd_error(chip);
-                        TRACE_GOTO(chip, SD_Execute_Read_Cmd_Failed);
-                }
-
-                min_len = min(data_len, scsi_bufflen(srb));
-                rtsx_stor_set_xfer_buf(buf, min_len, srb);
-
-                kfree(buf);
-        } else if (!(data_len & 0x1FF)) {
-                rtsx_init_cmd(chip);
-
-                trans_dma_enable(DMA_FROM_DEVICE, chip, data_len, DMA_512);
-
-                rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_BYTE_CNT_H, 0xFF, 0x02);
-                rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_BYTE_CNT_L, 0xFF, 0x00);
-                rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_BLOCK_CNT_H,
-                                0xFF, (srb->cmnd[7] & 0xFE) >> 1);
-                rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_BLOCK_CNT_L,
-                                0xFF, (u8)((data_len & 0x0001FE00) >> 9));
-
-                rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_CMD0, 0xFF, 0x40 | cmd_idx);
-                rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_CMD1, 0xFF, srb->cmnd[3]);
-                rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_CMD2, 0xFF, srb->cmnd[4]);
-                rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_CMD3, 0xFF, srb->cmnd[5]);
-                rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_CMD4, 0xFF, srb->cmnd[6]);
-
-                rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_CFG1, 0x03, bus_width);
-                rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_CFG2, 0xFF, rsp_type);
-
-                rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_TRANSFER,
-                             0xFF, SD_TM_AUTO_READ_2 | SD_TRANSFER_START);
-                rtsx_add_cmd(chip, CHECK_REG_CMD, REG_SD_TRANSFER, SD_TRANSFER_END, SD_TRANSFER_END);
-
-                rtsx_send_cmd_no_wait(chip);
-
-                retval = rtsx_transfer_data(chip, SD_CARD, scsi_sglist(srb), scsi_bufflen(srb),
-                        scsi_sg_count(srb), DMA_FROM_DEVICE, 10000);
-                if (retval < 0) {
-                        read_err = 1;
-                        rtsx_clear_sd_error(chip);
-                        TRACE_GOTO(chip, SD_Execute_Read_Cmd_Failed);
-                }
-
-        } else {
-                TRACE_GOTO(chip, SD_Execute_Read_Cmd_Failed);
-        }
-
-        retval = ext_sd_get_rsp(chip, rsp_len, sd_card->rsp, rsp_type);
-        if (retval != STATUS_SUCCESS)
-                TRACE_GOTO(chip, SD_Execute_Read_Cmd_Failed);
-
-        if (standby) {
-                retval = sd_select_card(chip, 1);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_GOTO(chip, SD_Execute_Read_Cmd_Failed);
-        }
-
-        if (send_cmd12) {
-                retval = ext_sd_send_cmd_get_rsp(chip, STOP_TRANSMISSION,
-                                0, SD_RSP_TYPE_R1b, NULL, 0, 0);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_GOTO(chip, SD_Execute_Read_Cmd_Failed);
-        }
-
-        if (data_len < 512) {
-                retval = ext_sd_send_cmd_get_rsp(chip, SET_BLOCKLEN, 0x200,
-                                SD_RSP_TYPE_R1, NULL, 0, 0);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_GOTO(chip, SD_Execute_Read_Cmd_Failed);
-
-                retval = rtsx_write_register(chip, SD_BYTE_CNT_H, 0xFF, 0x02);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_GOTO(chip, SD_Execute_Read_Cmd_Failed);
-
-                retval = rtsx_write_register(chip, SD_BYTE_CNT_L, 0xFF, 0x00);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_GOTO(chip, SD_Execute_Read_Cmd_Failed);
-        }
-
-        if ((srb->cmnd[1] & 0x02) || (srb->cmnd[1] & 0x04))
-                cmd13_checkbit = 1;
-
-        for (i = 0; i < 3; i++) {
-                retval = ext_sd_send_cmd_get_rsp(chip, SEND_STATUS, sd_card->sd_addr,
-                        SD_RSP_TYPE_R1, NULL, 0, cmd13_checkbit);
-                if (retval == STATUS_SUCCESS)
-                        break;
-        }
-        if (retval != STATUS_SUCCESS)
-                TRACE_GOTO(chip, SD_Execute_Read_Cmd_Failed);
-
-        scsi_set_resid(srb, 0);
-        return TRANSPORT_GOOD;
-
-SD_Execute_Read_Cmd_Failed:
-        sd_card->pre_cmd_err = 1;
-        set_sense_type(chip, lun, SENSE_TYPE_NO_SENSE);
-        if (read_err)
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR);
-
-        release_sd_card(chip);
-        do_reset_sd_card(chip);
-        if (!(chip->card_ready & SD_CARD))
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_NOT_PRESENT);
-
-        TRACE_RET(chip, TRANSPORT_FAILED);
-}
-
-int sd_execute_write_data(struct scsi_cmnd *srb, struct rtsx_chip *chip)
-{
-        struct sd_info *sd_card = &(chip->sd_card);
-        unsigned int lun = SCSI_LUN(srb);
-        int retval, rsp_len, i;
-        int cmd13_checkbit = 0, write_err = 0;
-        u8 cmd_idx, rsp_type;
-        u8 send_cmd12 = 0, standby = 0, acmd = 0;
-        u32 data_len, arg;
-#ifdef SUPPORT_SD_LOCK
-        int lock_cmd_fail = 0;
-        u8 sd_lock_state = 0;
-        u8 lock_cmd_type = 0;
-#endif
-
-        if (!sd_card->sd_pass_thru_en) {
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
-                TRACE_RET(chip, TRANSPORT_FAILED);
-        }
-
-        if (sd_card->pre_cmd_err) {
-                sd_card->pre_cmd_err = 0;
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_CHANGE);
-                TRACE_RET(chip, TRANSPORT_FAILED);
-        }
-
-        retval = sd_switch_clock(chip);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, TRANSPORT_FAILED);
-
-        cmd_idx = srb->cmnd[2] & 0x3F;
-        if (srb->cmnd[1] & 0x04)
-                send_cmd12 = 1;
-
-        if (srb->cmnd[1] & 0x02)
-                standby = 1;
-
-        if (srb->cmnd[1] & 0x01)
-                acmd = 1;
-
-        data_len = ((u32)srb->cmnd[7] << 16) | ((u32)srb->cmnd[8] << 8) | srb->cmnd[9];
-        arg = ((u32)srb->cmnd[3] << 24) | ((u32)srb->cmnd[4] << 16) |
-                ((u32)srb->cmnd[5] << 8) | srb->cmnd[6];
-
-#ifdef SUPPORT_SD_LOCK
-        if (cmd_idx == LOCK_UNLOCK) {
-                sd_lock_state = sd_card->sd_lock_status;
-                sd_lock_state &= SD_LOCKED;
-        }
-#endif
-
-        retval = get_rsp_type(srb, &rsp_type, &rsp_len);
-        if (retval != STATUS_SUCCESS) {
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
-                TRACE_RET(chip, TRANSPORT_FAILED);
-        }
-        sd_card->last_rsp_type = rsp_type;
-
-        retval = sd_switch_clock(chip);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, TRANSPORT_FAILED);
-
-#ifdef SUPPORT_SD_LOCK
-        if ((sd_card->sd_lock_status & SD_LOCK_1BIT_MODE) == 0) {
-                if (CHK_MMC_8BIT(sd_card)) {
-                        retval = rtsx_write_register(chip, REG_SD_CFG1, 0x03, SD_BUS_WIDTH_8);
-                        if (retval != STATUS_SUCCESS)
-                                TRACE_RET(chip, TRANSPORT_FAILED);
-
-                } else if (CHK_SD(sd_card) || CHK_MMC_4BIT(sd_card)) {
-                        retval = rtsx_write_register(chip, REG_SD_CFG1, 0x03, SD_BUS_WIDTH_4);
-                        if (retval != STATUS_SUCCESS)
-                                TRACE_RET(chip, TRANSPORT_FAILED);
-                }
-        }
-#else
-        retval = rtsx_write_register(chip, REG_SD_CFG1, 0x03, SD_BUS_WIDTH_4);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, TRANSPORT_FAILED);
-#endif
-
-        if (data_len < 512) {
-                retval = ext_sd_send_cmd_get_rsp(chip, SET_BLOCKLEN, data_len,
-                                SD_RSP_TYPE_R1, NULL, 0, 0);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_GOTO(chip, SD_Execute_Write_Cmd_Failed);
-        }
-
-        if (standby) {
-                retval = sd_select_card(chip, 0);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_GOTO(chip, SD_Execute_Write_Cmd_Failed);
-        }
-
-        if (acmd) {
-                retval = ext_sd_send_cmd_get_rsp(chip, APP_CMD, sd_card->sd_addr,
-                                SD_RSP_TYPE_R1, NULL, 0, 0);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_GOTO(chip, SD_Execute_Write_Cmd_Failed);
-        }
-
-        retval = ext_sd_send_cmd_get_rsp(chip, cmd_idx, arg, rsp_type,
-                        sd_card->rsp, rsp_len, 0);
-        if (retval != STATUS_SUCCESS)
-                TRACE_GOTO(chip, SD_Execute_Write_Cmd_Failed);
-
-        if (data_len <= 512) {
-                u16 i;
-                u8 *buf;
-
-                buf = kmalloc(data_len, GFP_KERNEL);
-                if (buf == NULL)
-                        TRACE_RET(chip, TRANSPORT_ERROR);
-
-                rtsx_stor_get_xfer_buf(buf, data_len, srb);
-
-#ifdef SUPPORT_SD_LOCK
-                if (cmd_idx == LOCK_UNLOCK)
-                        lock_cmd_type = buf[0] & 0x0F;
-#endif
-
-                if (data_len > 256) {
-                        rtsx_init_cmd(chip);
-                        for (i = 0; i < 256; i++) {
-                                rtsx_add_cmd(chip, WRITE_REG_CMD,
-                                                PPBUF_BASE2 + i, 0xFF, buf[i]);
-                        }
-                        retval = rtsx_send_cmd(chip, 0, 250);
-                        if (retval != STATUS_SUCCESS) {
-                                kfree(buf);
-                                TRACE_GOTO(chip, SD_Execute_Write_Cmd_Failed);
-                        }
-
-                        rtsx_init_cmd(chip);
-                        for (i = 256; i < data_len; i++) {
-                                rtsx_add_cmd(chip, WRITE_REG_CMD,
-                                                PPBUF_BASE2 + i, 0xFF, buf[i]);
-                        }
-                        retval = rtsx_send_cmd(chip, 0, 250);
-                        if (retval != STATUS_SUCCESS) {
-                                kfree(buf);
-                                TRACE_GOTO(chip, SD_Execute_Write_Cmd_Failed);
-                        }
-                } else {
-                        rtsx_init_cmd(chip);
-                        for (i = 0; i < data_len; i++) {
-                                rtsx_add_cmd(chip, WRITE_REG_CMD,
-                                                PPBUF_BASE2 + i, 0xFF, buf[i]);
-                        }
-                        retval = rtsx_send_cmd(chip, 0, 250);
-                        if (retval != STATUS_SUCCESS) {
-                                kfree(buf);
-                                TRACE_GOTO(chip, SD_Execute_Write_Cmd_Failed);
-                        }
-                }
-
-                kfree(buf);
-
-                rtsx_init_cmd(chip);
-
-                rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_BYTE_CNT_H, 0xFF, srb->cmnd[8] & 0x03);
-                rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_BYTE_CNT_L, 0xFF, srb->cmnd[9]);
-                rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_BLOCK_CNT_H, 0xFF, 0x00);
-                rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_BLOCK_CNT_L, 0xFF, 0x01);
-                rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_DATA_SOURCE, 0x01, PINGPONG_BUFFER);
-
-                rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_TRANSFER, 0xFF,
-                             SD_TM_AUTO_WRITE_3 | SD_TRANSFER_START);
-                rtsx_add_cmd(chip, CHECK_REG_CMD, REG_SD_TRANSFER, SD_TRANSFER_END, SD_TRANSFER_END);
-
-                retval = rtsx_send_cmd(chip, SD_CARD, 250);
-        } else if (!(data_len & 0x1FF)) {
-                rtsx_init_cmd(chip);
-
-                trans_dma_enable(DMA_TO_DEVICE, chip, data_len, DMA_512);
-
-                rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_BYTE_CNT_H, 0xFF, 0x02);
-                rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_BYTE_CNT_L, 0xFF, 0x00);
-                rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_BLOCK_CNT_H,
-                                0xFF, (srb->cmnd[7] & 0xFE) >> 1);
-                rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_BLOCK_CNT_L,
-                                0xFF, (u8)((data_len & 0x0001FE00) >> 9));
-
-                rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_TRANSFER, 0xFF, SD_TM_AUTO_WRITE_3 | SD_TRANSFER_START);
-                rtsx_add_cmd(chip, CHECK_REG_CMD, REG_SD_TRANSFER, SD_TRANSFER_END, SD_TRANSFER_END);
-
-                rtsx_send_cmd_no_wait(chip);
-
-                retval = rtsx_transfer_data(chip, SD_CARD, scsi_sglist(srb), scsi_bufflen(srb),
-                        scsi_sg_count(srb), DMA_TO_DEVICE, 10000);
-
-        } else {
-                TRACE_GOTO(chip, SD_Execute_Write_Cmd_Failed);
-        }
-
-        if (retval < 0) {
-                write_err = 1;
-                rtsx_clear_sd_error(chip);
-                TRACE_GOTO(chip, SD_Execute_Write_Cmd_Failed);
-        }
-
-#ifdef SUPPORT_SD_LOCK
-        if (cmd_idx == LOCK_UNLOCK) {
-                if (lock_cmd_type == SD_ERASE) {
-                        sd_card->sd_erase_status = SD_UNDER_ERASING;
-                        scsi_set_resid(srb, 0);
-                        return TRANSPORT_GOOD;
-                }
-
-                rtsx_init_cmd(chip);
-                if (CHECK_PID(chip, 0x5209))
-                        rtsx_add_cmd(chip, CHECK_REG_CMD, SD_BUS_STAT, SD_DAT0_STATUS, SD_DAT0_STATUS);
-                else
-                        rtsx_add_cmd(chip, CHECK_REG_CMD, 0xFD30, 0x02, 0x02);
-
-                rtsx_send_cmd(chip, SD_CARD, 250);
-
-                retval = sd_update_lock_status(chip);
-                if (retval != STATUS_SUCCESS) {
-                        RTSX_DEBUGP("Lock command fail!\n");
-                        lock_cmd_fail = 1;
-                }
-        }
-#endif /* SUPPORT_SD_LOCK */
-
-        if (standby) {
-                retval = sd_select_card(chip, 1);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_GOTO(chip, SD_Execute_Write_Cmd_Failed);
-        }
-
-        if (send_cmd12) {
-                retval = ext_sd_send_cmd_get_rsp(chip, STOP_TRANSMISSION,
-                                0, SD_RSP_TYPE_R1b, NULL, 0, 0);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_GOTO(chip, SD_Execute_Write_Cmd_Failed);
-        }
-
-        if (data_len < 512) {
-                retval = ext_sd_send_cmd_get_rsp(chip, SET_BLOCKLEN, 0x200,
-                                SD_RSP_TYPE_R1, NULL, 0, 0);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_GOTO(chip, SD_Execute_Write_Cmd_Failed);
-
-                retval = rtsx_write_register(chip, SD_BYTE_CNT_H, 0xFF, 0x02);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_GOTO(chip, SD_Execute_Write_Cmd_Failed);
-
-                rtsx_write_register(chip, SD_BYTE_CNT_L, 0xFF, 0x00);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_GOTO(chip, SD_Execute_Write_Cmd_Failed);
-        }
-
-        if ((srb->cmnd[1] & 0x02) || (srb->cmnd[1] & 0x04))
-                cmd13_checkbit = 1;
-
-        for (i = 0; i < 3; i++) {
-                retval = ext_sd_send_cmd_get_rsp(chip, SEND_STATUS, sd_card->sd_addr,
-                        SD_RSP_TYPE_R1, NULL, 0, cmd13_checkbit);
-                if (retval == STATUS_SUCCESS)
-                        break;
-        }
-        if (retval != STATUS_SUCCESS)
-                TRACE_GOTO(chip, SD_Execute_Write_Cmd_Failed);
-
-#ifdef SUPPORT_SD_LOCK
-        if (cmd_idx == LOCK_UNLOCK) {
-                if (!lock_cmd_fail) {
-                        RTSX_DEBUGP("lock_cmd_type = 0x%x\n", lock_cmd_type);
-                        if (lock_cmd_type & SD_CLR_PWD)
-                                sd_card->sd_lock_status &= ~SD_PWD_EXIST;
-
-                        if (lock_cmd_type & SD_SET_PWD)
-                                sd_card->sd_lock_status |= SD_PWD_EXIST;
-                }
-
-                RTSX_DEBUGP("sd_lock_state = 0x%x, sd_card->sd_lock_status = 0x%x\n",
-                             sd_lock_state, sd_card->sd_lock_status);
-                if (sd_lock_state ^ (sd_card->sd_lock_status & SD_LOCKED)) {
-                        sd_card->sd_lock_notify = 1;
-                        if (sd_lock_state) {
-                                if (sd_card->sd_lock_status & SD_LOCK_1BIT_MODE) {
-                                        sd_card->sd_lock_status |= (SD_UNLOCK_POW_ON | SD_SDR_RST);
-                                        if (CHK_SD(sd_card)) {
-                                                retval = reset_sd(chip);
-                                                if (retval != STATUS_SUCCESS) {
-                                                        sd_card->sd_lock_status &= ~(SD_UNLOCK_POW_ON | SD_SDR_RST);
-                                                        TRACE_GOTO(chip, SD_Execute_Write_Cmd_Failed);
-                                                }
-                                        }
-
-                                        sd_card->sd_lock_status &= ~(SD_UNLOCK_POW_ON | SD_SDR_RST);
-                                }
-                        }
-                }
-        }
-
-        if (lock_cmd_fail) {
-                scsi_set_resid(srb, 0);
-                set_sense_type(chip, lun, SENSE_TYPE_NO_SENSE);
-                TRACE_RET(chip, TRANSPORT_FAILED);
-        }
-#endif  /* SUPPORT_SD_LOCK */
-
-        scsi_set_resid(srb, 0);
-        return TRANSPORT_GOOD;
-
-SD_Execute_Write_Cmd_Failed:
-        sd_card->pre_cmd_err = 1;
-        set_sense_type(chip, lun, SENSE_TYPE_NO_SENSE);
-        if (write_err)
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_WRITE_ERR);
-
-        release_sd_card(chip);
-        do_reset_sd_card(chip);
-        if (!(chip->card_ready & SD_CARD))
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_NOT_PRESENT);
-
-        TRACE_RET(chip, TRANSPORT_FAILED);
-}
-
-int sd_get_cmd_rsp(struct scsi_cmnd *srb, struct rtsx_chip *chip)
-{
-        struct sd_info *sd_card = &(chip->sd_card);
-        unsigned int lun = SCSI_LUN(srb);
-        int count;
-        u16 data_len;
-
-        if (!sd_card->sd_pass_thru_en) {
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
-                TRACE_RET(chip, TRANSPORT_FAILED);
-        }
-
-        if (sd_card->pre_cmd_err) {
-                sd_card->pre_cmd_err = 0;
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_CHANGE);
-                TRACE_RET(chip, TRANSPORT_FAILED);
-        }
-
-        data_len = ((u16)srb->cmnd[7] << 8) | srb->cmnd[8];
-
-        if (sd_card->last_rsp_type == SD_RSP_TYPE_R0) {
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
-                TRACE_RET(chip, TRANSPORT_FAILED);
-        } else if (sd_card->last_rsp_type == SD_RSP_TYPE_R2) {
-                count = (data_len < 17) ? data_len : 17;
-        } else {
-                count = (data_len < 6) ? data_len : 6;
-        }
-        rtsx_stor_set_xfer_buf(sd_card->rsp, count, srb);
-
-        RTSX_DEBUGP("Response length: %d\n", data_len);
-        RTSX_DEBUGP("Response: 0x%x 0x%x 0x%x 0x%x\n",
-                sd_card->rsp[0], sd_card->rsp[1], sd_card->rsp[2], sd_card->rsp[3]);
-
-        scsi_set_resid(srb, 0);
-        return TRANSPORT_GOOD;
-}
-
-int sd_hw_rst(struct scsi_cmnd *srb, struct rtsx_chip *chip)
-{
-        struct sd_info *sd_card = &(chip->sd_card);
-        unsigned int lun = SCSI_LUN(srb);
-        int retval;
-
-        if (!sd_card->sd_pass_thru_en) {
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
-                TRACE_RET(chip, TRANSPORT_FAILED);
-        }
-
-        if (sd_card->pre_cmd_err) {
-                sd_card->pre_cmd_err = 0;
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_CHANGE);
-                TRACE_RET(chip, TRANSPORT_FAILED);
-        }
-
-        if ((0x53 != srb->cmnd[2]) || (0x44 != srb->cmnd[3]) || (0x20 != srb->cmnd[4]) ||
-                        (0x43 != srb->cmnd[5]) || (0x61 != srb->cmnd[6]) ||
-                        (0x72 != srb->cmnd[7]) || (0x64 != srb->cmnd[8])) {
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
-                TRACE_RET(chip, TRANSPORT_FAILED);
-        }
-
-        switch (srb->cmnd[1] & 0x0F) {
-        case 0:
-#ifdef SUPPORT_SD_LOCK
-                if (0x64 == srb->cmnd[9])
-                        sd_card->sd_lock_status |= SD_SDR_RST;
-#endif
-                retval = reset_sd_card(chip);
-                if (retval != STATUS_SUCCESS) {
-#ifdef SUPPORT_SD_LOCK
-                        sd_card->sd_lock_status &= ~SD_SDR_RST;
-#endif
-                        set_sense_type(chip, lun, SENSE_TYPE_MEDIA_NOT_PRESENT);
-                        sd_card->pre_cmd_err = 1;
-                        TRACE_RET(chip, TRANSPORT_FAILED);
-                }
-#ifdef SUPPORT_SD_LOCK
-                sd_card->sd_lock_status &= ~SD_SDR_RST;
-#endif
-                break;
-
-        case 1:
-                retval = soft_reset_sd_card(chip);
-                if (retval != STATUS_SUCCESS) {
-                        set_sense_type(chip, lun, SENSE_TYPE_MEDIA_NOT_PRESENT);
-                        sd_card->pre_cmd_err = 1;
-                        TRACE_RET(chip, TRANSPORT_FAILED);
-                }
-                break;
-
-        default:
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
-                TRACE_RET(chip, TRANSPORT_FAILED);
-        }
-
-        scsi_set_resid(srb, 0);
-        return TRANSPORT_GOOD;
-}
-#endif
-
-void sd_cleanup_work(struct rtsx_chip *chip)
-{
-        struct sd_info *sd_card = &(chip->sd_card);
-
-        if (sd_card->seq_mode) {
-                RTSX_DEBUGP("SD: stop transmission\n");
-                sd_stop_seq_mode(chip);
-                sd_card->cleanup_counter = 0;
-        }
-}
-
-int sd_power_off_card3v3(struct rtsx_chip *chip)
-{
-        int retval;
-
-        retval = disable_card_clock(chip, SD_CARD);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        RTSX_WRITE_REG(chip, CARD_OE, SD_OUTPUT_EN, 0);
-
-        if (!chip->ft2_fast_mode) {
-                retval = card_power_off(chip, SD_CARD);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-
-                wait_timeout(50);
-        }
-
-        if (chip->asic_code) {
-                retval = sd_pull_ctl_disable(chip);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-        } else {
-                RTSX_WRITE_REG(chip, FPGA_PULL_CTL,
-                        FPGA_SD_PULL_CTL_BIT | 0x20, FPGA_SD_PULL_CTL_BIT);
-        }
-
-        return STATUS_SUCCESS;
-}
-
-int release_sd_card(struct rtsx_chip *chip)
-{
-        struct sd_info *sd_card = &(chip->sd_card);
-        int retval;
-
-        RTSX_DEBUGP("release_sd_card\n");
-
-        chip->card_ready &= ~SD_CARD;
-        chip->card_fail &= ~SD_CARD;
-        chip->card_wp &= ~SD_CARD;
-
-        chip->sd_io = 0;
-        chip->sd_int = 0;
-
-#ifdef SUPPORT_SD_LOCK
-        sd_card->sd_lock_status = 0;
-        sd_card->sd_erase_status = 0;
-#endif
-
-        memset(sd_card->raw_csd, 0, 16);
-        memset(sd_card->raw_scr, 0, 8);
-
-        retval = sd_power_off_card3v3(chip);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        if (CHECK_PID(chip, 0x5209)) {
-                retval = sd_change_bank_voltage(chip, SD_IO_3V3);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-
-                if (CHK_SD30_SPEED(sd_card))
-                        RTSX_WRITE_REG(chip, SD30_DRIVE_SEL, 0x07, chip->sd30_drive_sel_3v3);
-
-                RTSX_WRITE_REG(chip, OCPPARA2, SD_OCP_THD_MASK, chip->sd_400mA_ocp_thd);
-        }
-
-        return STATUS_SUCCESS;
-}
diff --git a/drivers/staging/rts_pstor/sd.h b/drivers/staging/rts_pstor/sd.h
deleted file mode 100644
index 1df1aa75e93a..000000000000
--- a/drivers/staging/rts_pstor/sd.h
+++ /dev/null
@@ -1,300 +0,0 @@
-/* Driver for Realtek PCI-Express card reader
- * Header file
- *
- * Copyright(c) 2009 Realtek Semiconductor Corp. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2, 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, see <http://www.gnu.org/licenses/>.
- *
- * Author:
- *   wwang (wei_wang@realsil.com.cn)
- *   No. 450, Shenhu Road, Suzhou Industry Park, Suzhou, China
- */
-
-#ifndef __REALTEK_RTSX_SD_H
-#define __REALTEK_RTSX_SD_H
-
-#include "rtsx_chip.h"
-
-#define SUPPORT_VOLTAGE 0x003C0000
-
-/* Error Code */
-#define SD_NO_ERROR             0x0
-#define SD_CRC_ERR              0x80
-#define SD_TO_ERR               0x40
-#define SD_NO_CARD              0x20
-#define SD_BUSY                 0x10
-#define SD_STS_ERR              0x08
-#define SD_RSP_TIMEOUT          0x04
-#define SD_IO_ERR               0x02
-
-/* Return code for MMC switch bus */
-#define SWITCH_SUCCESS          0
-#define SWITCH_ERR              1
-#define SWITCH_FAIL             2
-
-/* MMC/SD Command Index */
-/* Basic command (class 0) */
-#define GO_IDLE_STATE           0
-#define SEND_OP_COND            1
-#define ALL_SEND_CID            2
-#define SET_RELATIVE_ADDR       3
-#define SEND_RELATIVE_ADDR      3
-#define SET_DSR                 4
-#define IO_SEND_OP_COND         5
-#define SWITCH                  6
-#define SELECT_CARD             7
-#define DESELECT_CARD           7
-/* CMD8 is "SEND_EXT_CSD" for MMC4.x Spec
- * while is "SEND_IF_COND" for SD 2.0
- */
-#define SEND_EXT_CSD            8
-#define SEND_IF_COND            8
-
-#define SEND_CSD                9
-#define SEND_CID                10
-#define VOLTAGE_SWITCH          11
-#define READ_DAT_UTIL_STOP      11
-#define STOP_TRANSMISSION       12
-#define SEND_STATUS             13
-#define GO_INACTIVE_STATE       15
-
-#define SET_BLOCKLEN            16
-#define READ_SINGLE_BLOCK       17
-#define READ_MULTIPLE_BLOCK     18
-#define SEND_TUNING_PATTERN     19
-
-#define BUSTEST_R               14
-#define BUSTEST_W               19
-
-#define WRITE_BLOCK             24
-#define WRITE_MULTIPLE_BLOCK    25
-#define PROGRAM_CSD             27
-
-#define ERASE_WR_BLK_START      32
-#define ERASE_WR_BLK_END        33
-#define ERASE_CMD               38
-
-#define LOCK_UNLOCK             42
-#define IO_RW_DIRECT            52
-
-#define APP_CMD                 55
-#define GEN_CMD                 56
-
-#define SET_BUS_WIDTH           6
-#define SD_STATUS               13
-#define SEND_NUM_WR_BLOCKS      22
-#define SET_WR_BLK_ERASE_COUNT  23
-#define SD_APP_OP_COND          41
-#define SET_CLR_CARD_DETECT     42
-#define SEND_SCR                51
-
-#define SD_READ_COMPLETE        0x00
-#define SD_READ_TO              0x01
-#define SD_READ_ADVENCE         0x02
-
-#define SD_CHECK_MODE           0x00
-#define SD_SWITCH_MODE          0x80
-#define SD_FUNC_GROUP_1         0x01
-#define SD_FUNC_GROUP_2         0x02
-#define SD_FUNC_GROUP_3         0x03
-#define SD_FUNC_GROUP_4         0x04
-#define SD_CHECK_SPEC_V1_1      0xFF
-
-#define NO_ARGUMENT                             0x00
-#define CHECK_PATTERN                           0x000000AA
-#define VOLTAGE_SUPPLY_RANGE                    0x00000100
-#define SUPPORT_HIGH_AND_EXTENDED_CAPACITY      0x40000000
-#define SUPPORT_MAX_POWER_PERMANCE              0x10000000
-#define SUPPORT_1V8                             0x01000000
-
-#define SWTICH_NO_ERR           0x00
-#define CARD_NOT_EXIST          0x01
-#define SPEC_NOT_SUPPORT        0x02
-#define CHECK_MODE_ERR          0x03
-#define CHECK_NOT_READY         0x04
-#define SWITCH_CRC_ERR          0x05
-#define SWITCH_MODE_ERR         0x06
-#define SWITCH_PASS             0x07
-
-#ifdef SUPPORT_SD_LOCK
-#define SD_ERASE                0x08
-#define SD_LOCK                 0x04
-#define SD_UNLOCK               0x00
-#define SD_CLR_PWD              0x02
-#define SD_SET_PWD              0x01
-
-#define SD_PWD_LEN              0x10
-
-#define SD_LOCKED               0x80
-#define SD_LOCK_1BIT_MODE       0x40
-#define SD_PWD_EXIST            0x20
-#define SD_UNLOCK_POW_ON        0x01
-#define SD_SDR_RST              0x02
-
-#define SD_NOT_ERASE            0x00
-#define SD_UNDER_ERASING        0x01
-#define SD_COMPLETE_ERASE       0x02
-
-#define SD_RW_FORBIDDEN         0x0F
-
-#endif
-
-#define HS_SUPPORT                      0x01
-#define SDR50_SUPPORT                   0x02
-#define SDR104_SUPPORT                  0x03
-#define DDR50_SUPPORT                   0x04
-
-#define HS_SUPPORT_MASK                 0x02
-#define SDR50_SUPPORT_MASK              0x04
-#define SDR104_SUPPORT_MASK             0x08
-#define DDR50_SUPPORT_MASK              0x10
-
-#define HS_QUERY_SWITCH_OK              0x01
-#define SDR50_QUERY_SWITCH_OK           0x02
-#define SDR104_QUERY_SWITCH_OK          0x03
-#define DDR50_QUERY_SWITCH_OK           0x04
-
-#define HS_SWITCH_BUSY                  0x02
-#define SDR50_SWITCH_BUSY               0x04
-#define SDR104_SWITCH_BUSY              0x08
-#define DDR50_SWITCH_BUSY               0x10
-
-#define FUNCTION_GROUP1_SUPPORT_OFFSET       0x0D
-#define FUNCTION_GROUP1_QUERY_SWITCH_OFFSET  0x10
-#define FUNCTION_GROUP1_CHECK_BUSY_OFFSET    0x1D
-
-#define DRIVING_TYPE_A          0x01
-#define DRIVING_TYPE_B              0x00
-#define DRIVING_TYPE_C              0x02
-#define DRIVING_TYPE_D          0x03
-
-#define DRIVING_TYPE_A_MASK         0x02
-#define DRIVING_TYPE_B_MASK         0x01
-#define DRIVING_TYPE_C_MASK         0x04
-#define DRIVING_TYPE_D_MASK         0x08
-
-#define TYPE_A_QUERY_SWITCH_OK  0x01
-#define TYPE_B_QUERY_SWITCH_OK  0x00
-#define TYPE_C_QUERY_SWITCH_OK  0x02
-#define TYPE_D_QUERY_SWITCH_OK  0x03
-
-#define TYPE_A_SWITCH_BUSY          0x02
-#define TYPE_B_SWITCH_BUSY          0x01
-#define TYPE_C_SWITCH_BUSY      0x04
-#define TYPE_D_SWITCH_BUSY      0x08
-
-#define FUNCTION_GROUP3_SUPPORT_OFFSET       0x09
-#define FUNCTION_GROUP3_QUERY_SWITCH_OFFSET  0x0F
-#define FUNCTION_GROUP3_CHECK_BUSY_OFFSET    0x19
-
-#define CURRENT_LIMIT_200           0x00
-#define CURRENT_LIMIT_400           0x01
-#define CURRENT_LIMIT_600           0x02
-#define CURRENT_LIMIT_800           0x03
-
-#define CURRENT_LIMIT_200_MASK  0x01
-#define CURRENT_LIMIT_400_MASK  0x02
-#define CURRENT_LIMIT_600_MASK  0x04
-#define CURRENT_LIMIT_800_MASK  0x08
-
-#define CURRENT_LIMIT_200_QUERY_SWITCH_OK    0x00
-#define CURRENT_LIMIT_400_QUERY_SWITCH_OK    0x01
-#define CURRENT_LIMIT_600_QUERY_SWITCH_OK    0x02
-#define CURRENT_LIMIT_800_QUERY_SWITCH_OK    0x03
-
-#define CURRENT_LIMIT_200_SWITCH_BUSY        0x01
-#define CURRENT_LIMIT_400_SWITCH_BUSY        0x02
-#define CURRENT_LIMIT_600_SWITCH_BUSY        0x04
-#define CURRENT_LIMIT_800_SWITCH_BUSY        0x08
-
-#define FUNCTION_GROUP4_SUPPORT_OFFSET       0x07
-#define FUNCTION_GROUP4_QUERY_SWITCH_OFFSET  0x0F
-#define FUNCTION_GROUP4_CHECK_BUSY_OFFSET    0x17
-
-#define DATA_STRUCTURE_VER_OFFSET       0x11
-
-#define MAX_PHASE                       31
-
-#define MMC_8BIT_BUS                    0x0010
-#define MMC_4BIT_BUS                    0x0020
-
-#define MMC_SWITCH_ERR                  0x80
-
-#define SD_IO_3V3               0
-#define SD_IO_1V8               1
-
-#define TUNE_TX    0x00
-#define TUNE_RX    0x01
-
-#define CHANGE_TX  0x00
-#define CHANGE_RX  0x01
-
-#define DCM_HIGH_FREQUENCY_MODE  0x00
-#define DCM_LOW_FREQUENCY_MODE   0x01
-
-#define DCM_HIGH_FREQUENCY_MODE_SET  0x0C
-#define DCM_Low_FREQUENCY_MODE_SET   0x00
-
-#define MULTIPLY_BY_1    0x00
-#define MULTIPLY_BY_2    0x01
-#define MULTIPLY_BY_3    0x02
-#define MULTIPLY_BY_4    0x03
-#define MULTIPLY_BY_5    0x04
-#define MULTIPLY_BY_6    0x05
-#define MULTIPLY_BY_7    0x06
-#define MULTIPLY_BY_8    0x07
-#define MULTIPLY_BY_9    0x08
-#define MULTIPLY_BY_10   0x09
-
-#define DIVIDE_BY_2      0x01
-#define DIVIDE_BY_3      0x02
-#define DIVIDE_BY_4      0x03
-#define DIVIDE_BY_5      0x04
-#define DIVIDE_BY_6      0x05
-#define DIVIDE_BY_7      0x06
-#define DIVIDE_BY_8      0x07
-#define DIVIDE_BY_9      0x08
-#define DIVIDE_BY_10     0x09
-
-struct timing_phase_path {
-        int start;
-        int end;
-        int mid;
-        int len;
-};
-
-int sd_select_card(struct rtsx_chip *chip, int select);
-int sd_pull_ctl_enable(struct rtsx_chip *chip);
-int reset_sd_card(struct rtsx_chip *chip);
-int sd_switch_clock(struct rtsx_chip *chip);
-void sd_stop_seq_mode(struct rtsx_chip *chip);
-int sd_rw(struct scsi_cmnd *srb, struct rtsx_chip *chip, u32 start_sector, u16 sector_cnt);
-void sd_cleanup_work(struct rtsx_chip *chip);
-int sd_power_off_card3v3(struct rtsx_chip *chip);
-int release_sd_card(struct rtsx_chip *chip);
-#ifdef SUPPORT_CPRM
-int soft_reset_sd_card(struct rtsx_chip *chip);
-int ext_sd_send_cmd_get_rsp(struct rtsx_chip *chip, u8 cmd_idx,
-                u32 arg, u8 rsp_type, u8 *rsp, int rsp_len, int special_check);
-int ext_sd_get_rsp(struct rtsx_chip *chip, int len, u8 *rsp, u8 rsp_type);
-
-int sd_pass_thru_mode(struct scsi_cmnd *srb, struct rtsx_chip *chip);
-int sd_execute_no_data(struct scsi_cmnd *srb, struct rtsx_chip *chip);
-int sd_execute_read_data(struct scsi_cmnd *srb, struct rtsx_chip *chip);
-int sd_execute_write_data(struct scsi_cmnd *srb, struct rtsx_chip *chip);
-int sd_get_cmd_rsp(struct scsi_cmnd *srb, struct rtsx_chip *chip);
-int sd_hw_rst(struct scsi_cmnd *srb, struct rtsx_chip *chip);
-#endif
-
-#endif  /* __REALTEK_RTSX_SD_H */
diff --git a/drivers/staging/rts_pstor/spi.c b/drivers/staging/rts_pstor/spi.c
deleted file mode 100644
index 6b36cc532a8c..000000000000
--- a/drivers/staging/rts_pstor/spi.c
+++ /dev/null
@@ -1,812 +0,0 @@
-/* Driver for Realtek PCI-Express card reader
- *
- * Copyright(c) 2009 Realtek Semiconductor Corp. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2, 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, see <http://www.gnu.org/licenses/>.
- *
- * Author:
- *   wwang (wei_wang@realsil.com.cn)
- *   No. 450, Shenhu Road, Suzhou Industry Park, Suzhou, China
- */
-
-#include <linux/blkdev.h>
-#include <linux/kthread.h>
-#include <linux/sched.h>
-
-#include "rtsx.h"
-#include "rtsx_transport.h"
-#include "rtsx_scsi.h"
-#include "rtsx_card.h"
-#include "spi.h"
-
-static inline void spi_set_err_code(struct rtsx_chip *chip, u8 err_code)
-{
-        struct spi_info *spi = &(chip->spi);
-
-        spi->err_code = err_code;
-}
-
-static int spi_init(struct rtsx_chip *chip)
-{
-        RTSX_WRITE_REG(chip, SPI_CONTROL, 0xFF,
-                CS_POLARITY_LOW | DTO_MSB_FIRST | SPI_MASTER | SPI_MODE0 | SPI_AUTO);
-        RTSX_WRITE_REG(chip, SPI_TCTL, EDO_TIMING_MASK, SAMPLE_DELAY_HALF);
-
-        return STATUS_SUCCESS;
-}
-
-static int spi_set_init_para(struct rtsx_chip *chip)
-{
-        struct spi_info *spi = &(chip->spi);
-        int retval;
-
-        RTSX_WRITE_REG(chip, SPI_CLK_DIVIDER1, 0xFF, (u8)(spi->clk_div >> 8));
-        RTSX_WRITE_REG(chip, SPI_CLK_DIVIDER0, 0xFF, (u8)(spi->clk_div));
-
-        retval = switch_clock(chip, spi->spi_clock);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        retval = select_card(chip, SPI_CARD);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        RTSX_WRITE_REG(chip, CARD_CLK_EN, SPI_CLK_EN, SPI_CLK_EN);
-        RTSX_WRITE_REG(chip, CARD_OE, SPI_OUTPUT_EN, SPI_OUTPUT_EN);
-
-        wait_timeout(10);
-
-        retval = spi_init(chip);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        return STATUS_SUCCESS;
-}
-
-static int sf_polling_status(struct rtsx_chip *chip, int msec)
-{
-        int retval;
-
-        rtsx_init_cmd(chip);
-
-        rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_COMMAND, 0xFF, SPI_RDSR);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_TRANSFER0, 0xFF, SPI_TRANSFER0_START | SPI_POLLING_MODE0);
-        rtsx_add_cmd(chip, CHECK_REG_CMD, SPI_TRANSFER0, SPI_TRANSFER0_END, SPI_TRANSFER0_END);
-
-        retval = rtsx_send_cmd(chip, 0, msec);
-        if (retval < 0) {
-                rtsx_clear_spi_error(chip);
-                spi_set_err_code(chip, SPI_BUSY_ERR);
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        return STATUS_SUCCESS;
-}
-
-static int sf_enable_write(struct rtsx_chip *chip, u8 ins)
-{
-        struct spi_info *spi = &(chip->spi);
-        int retval;
-
-        if (!spi->write_en)
-                return STATUS_SUCCESS;
-
-        rtsx_init_cmd(chip);
-
-        rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_COMMAND, 0xFF, ins);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_CA_NUMBER, 0xFF, SPI_COMMAND_BIT_8 | SPI_ADDRESS_BIT_24);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_TRANSFER0, 0xFF, SPI_TRANSFER0_START | SPI_C_MODE0);
-        rtsx_add_cmd(chip, CHECK_REG_CMD, SPI_TRANSFER0, SPI_TRANSFER0_END, SPI_TRANSFER0_END);
-
-        retval = rtsx_send_cmd(chip, 0, 100);
-        if (retval < 0) {
-                rtsx_clear_spi_error(chip);
-                spi_set_err_code(chip, SPI_HW_ERR);
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        return STATUS_SUCCESS;
-}
-
-static int sf_disable_write(struct rtsx_chip *chip, u8 ins)
-{
-        struct spi_info *spi = &(chip->spi);
-        int retval;
-
-        if (!spi->write_en)
-                return STATUS_SUCCESS;
-
-        rtsx_init_cmd(chip);
-
-        rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_COMMAND, 0xFF, ins);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_CA_NUMBER, 0xFF, SPI_COMMAND_BIT_8 | SPI_ADDRESS_BIT_24);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_TRANSFER0, 0xFF, SPI_TRANSFER0_START | SPI_C_MODE0);
-        rtsx_add_cmd(chip, CHECK_REG_CMD, SPI_TRANSFER0, SPI_TRANSFER0_END, SPI_TRANSFER0_END);
-
-        retval = rtsx_send_cmd(chip, 0, 100);
-        if (retval < 0) {
-                rtsx_clear_spi_error(chip);
-                spi_set_err_code(chip, SPI_HW_ERR);
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        return STATUS_SUCCESS;
-}
-
-static void sf_program(struct rtsx_chip *chip, u8 ins, u8 addr_mode, u32 addr, u16 len)
-{
-        rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_COMMAND, 0xFF, ins);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_CA_NUMBER, 0xFF, SPI_COMMAND_BIT_8 | SPI_ADDRESS_BIT_24);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_LENGTH0, 0xFF, (u8)len);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_LENGTH1, 0xFF, (u8)(len >> 8));
-        if (addr_mode) {
-                rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_ADDR0, 0xFF, (u8)addr);
-                rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_ADDR1, 0xFF, (u8)(addr >> 8));
-                rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_ADDR2, 0xFF, (u8)(addr >> 16));
-                rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_TRANSFER0, 0xFF, SPI_TRANSFER0_START | SPI_CADO_MODE0);
-        } else {
-                rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_TRANSFER0, 0xFF, SPI_TRANSFER0_START | SPI_CDO_MODE0);
-        }
-        rtsx_add_cmd(chip, CHECK_REG_CMD, SPI_TRANSFER0, SPI_TRANSFER0_END, SPI_TRANSFER0_END);
-}
-
-static int sf_erase(struct rtsx_chip *chip, u8 ins, u8 addr_mode, u32 addr)
-{
-        int retval;
-
-        rtsx_init_cmd(chip);
-
-        rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_COMMAND, 0xFF, ins);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_CA_NUMBER, 0xFF, SPI_COMMAND_BIT_8 | SPI_ADDRESS_BIT_24);
-        if (addr_mode) {
-                rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_ADDR0, 0xFF, (u8)addr);
-                rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_ADDR1, 0xFF, (u8)(addr >> 8));
-                rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_ADDR2, 0xFF, (u8)(addr >> 16));
-                rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_TRANSFER0, 0xFF, SPI_TRANSFER0_START | SPI_CA_MODE0);
-        } else {
-                rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_TRANSFER0, 0xFF, SPI_TRANSFER0_START | SPI_C_MODE0);
-        }
-        rtsx_add_cmd(chip, CHECK_REG_CMD, SPI_TRANSFER0, SPI_TRANSFER0_END, SPI_TRANSFER0_END);
-
-        retval = rtsx_send_cmd(chip, 0, 100);
-        if (retval < 0) {
-                rtsx_clear_spi_error(chip);
-                spi_set_err_code(chip, SPI_HW_ERR);
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        return STATUS_SUCCESS;
-}
-
-static int spi_init_eeprom(struct rtsx_chip *chip)
-{
-        int retval;
-        int clk;
-
-        if (chip->asic_code)
-                clk = 30;
-        else
-                clk = CLK_30;
-
-        RTSX_WRITE_REG(chip, SPI_CLK_DIVIDER1, 0xFF, 0x00);
-        RTSX_WRITE_REG(chip, SPI_CLK_DIVIDER0, 0xFF, 0x27);
-
-        retval = switch_clock(chip, clk);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        retval = select_card(chip, SPI_CARD);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        RTSX_WRITE_REG(chip, CARD_CLK_EN, SPI_CLK_EN, SPI_CLK_EN);
-        RTSX_WRITE_REG(chip, CARD_OE, SPI_OUTPUT_EN, SPI_OUTPUT_EN);
-
-        wait_timeout(10);
-
-        RTSX_WRITE_REG(chip, SPI_CONTROL, 0xFF, CS_POLARITY_HIGH | SPI_EEPROM_AUTO);
-        RTSX_WRITE_REG(chip, SPI_TCTL, EDO_TIMING_MASK, SAMPLE_DELAY_HALF);
-
-        return STATUS_SUCCESS;
-}
-
-static int spi_eeprom_program_enable(struct rtsx_chip *chip)
-{
-        int retval;
-
-        rtsx_init_cmd(chip);
-
-        rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_CA_NUMBER, 0xFF, 0x86);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_COMMAND, 0xFF, 0x13);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_TRANSFER0, 0xFF, SPI_TRANSFER0_START | SPI_CA_MODE0);
-        rtsx_add_cmd(chip, CHECK_REG_CMD, SPI_TRANSFER0, SPI_TRANSFER0_END, SPI_TRANSFER0_END);
-
-        retval = rtsx_send_cmd(chip, 0, 100);
-        if (retval < 0)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        return STATUS_SUCCESS;
-}
-
-int spi_erase_eeprom_chip(struct rtsx_chip *chip)
-{
-        int retval;
-
-        retval = spi_init_eeprom(chip);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        retval = spi_eeprom_program_enable(chip);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        rtsx_init_cmd(chip);
-
-        rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_GPIO_DIR, 0x01, 0);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_DATA_SOURCE, 0x01, RING_BUFFER);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_COMMAND, 0xFF, 0x12);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_CA_NUMBER, 0xFF, 0x84);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_TRANSFER0, 0xFF, SPI_TRANSFER0_START | SPI_CA_MODE0);
-        rtsx_add_cmd(chip, CHECK_REG_CMD, SPI_TRANSFER0, SPI_TRANSFER0_END, SPI_TRANSFER0_END);
-
-        retval = rtsx_send_cmd(chip, 0, 100);
-        if (retval < 0)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        RTSX_WRITE_REG(chip, CARD_GPIO_DIR, 0x01, 0x01);
-
-        return STATUS_SUCCESS;
-}
-
-int spi_erase_eeprom_byte(struct rtsx_chip *chip, u16 addr)
-{
-        int retval;
-
-        retval = spi_init_eeprom(chip);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        retval = spi_eeprom_program_enable(chip);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        rtsx_init_cmd(chip);
-
-        rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_GPIO_DIR, 0x01, 0);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_DATA_SOURCE, 0x01, RING_BUFFER);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_COMMAND, 0xFF, 0x07);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_ADDR0, 0xFF, (u8)addr);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_ADDR1, 0xFF, (u8)(addr >> 8));
-        rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_CA_NUMBER, 0xFF, 0x46);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_TRANSFER0, 0xFF, SPI_TRANSFER0_START | SPI_CA_MODE0);
-        rtsx_add_cmd(chip, CHECK_REG_CMD, SPI_TRANSFER0, SPI_TRANSFER0_END, SPI_TRANSFER0_END);
-
-        retval = rtsx_send_cmd(chip, 0, 100);
-        if (retval < 0)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        RTSX_WRITE_REG(chip, CARD_GPIO_DIR, 0x01, 0x01);
-
-        return STATUS_SUCCESS;
-}
-
-
-int spi_read_eeprom(struct rtsx_chip *chip, u16 addr, u8 *val)
-{
-        int retval;
-        u8 data;
-
-        retval = spi_init_eeprom(chip);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        rtsx_init_cmd(chip);
-
-        rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_GPIO_DIR, 0x01, 0);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_DATA_SOURCE, 0x01, RING_BUFFER);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_COMMAND, 0xFF, 0x06);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_ADDR0, 0xFF, (u8)addr);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_ADDR1, 0xFF, (u8)(addr >> 8));
-        rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_CA_NUMBER, 0xFF, 0x46);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_LENGTH0, 0xFF, 1);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_TRANSFER0, 0xFF, SPI_TRANSFER0_START | SPI_CADI_MODE0);
-        rtsx_add_cmd(chip, CHECK_REG_CMD, SPI_TRANSFER0, SPI_TRANSFER0_END, SPI_TRANSFER0_END);
-
-        retval = rtsx_send_cmd(chip, 0, 100);
-        if (retval < 0)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        wait_timeout(5);
-        RTSX_READ_REG(chip, SPI_DATA, &data);
-
-        if (val)
-                *val = data;
-
-        RTSX_WRITE_REG(chip, CARD_GPIO_DIR, 0x01, 0x01);
-
-        return STATUS_SUCCESS;
-}
-
-int spi_write_eeprom(struct rtsx_chip *chip, u16 addr, u8 val)
-{
-        int retval;
-
-        retval = spi_init_eeprom(chip);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        retval = spi_eeprom_program_enable(chip);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        rtsx_init_cmd(chip);
-
-        rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_GPIO_DIR, 0x01, 0);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_DATA_SOURCE, 0x01, RING_BUFFER);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_COMMAND, 0xFF, 0x05);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_ADDR0, 0xFF, val);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_ADDR1, 0xFF, (u8)addr);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_ADDR2, 0xFF, (u8)(addr >> 8));
-        rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_CA_NUMBER, 0xFF, 0x4E);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_TRANSFER0, 0xFF, SPI_TRANSFER0_START | SPI_CA_MODE0);
-        rtsx_add_cmd(chip, CHECK_REG_CMD, SPI_TRANSFER0, SPI_TRANSFER0_END, SPI_TRANSFER0_END);
-
-        retval = rtsx_send_cmd(chip, 0, 100);
-        if (retval < 0)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        RTSX_WRITE_REG(chip, CARD_GPIO_DIR, 0x01, 0x01);
-
-        return STATUS_SUCCESS;
-}
-
-
-int spi_get_status(struct scsi_cmnd *srb, struct rtsx_chip *chip)
-{
-        struct spi_info *spi = &(chip->spi);
-
-        RTSX_DEBUGP("spi_get_status: err_code = 0x%x\n", spi->err_code);
-        rtsx_stor_set_xfer_buf(&(spi->err_code), min((int)scsi_bufflen(srb), 1), srb);
-        scsi_set_resid(srb, scsi_bufflen(srb) - 1);
-
-        return STATUS_SUCCESS;
-}
-
-int spi_set_parameter(struct scsi_cmnd *srb, struct rtsx_chip *chip)
-{
-        struct spi_info *spi = &(chip->spi);
-
-        spi_set_err_code(chip, SPI_NO_ERR);
-
-        if (chip->asic_code)
-                spi->spi_clock = ((u16)(srb->cmnd[8]) << 8) | srb->cmnd[9];
-        else
-                spi->spi_clock = srb->cmnd[3];
-
-        spi->clk_div = ((u16)(srb->cmnd[4]) << 8) | srb->cmnd[5];
-        spi->write_en = srb->cmnd[6];
-
-        RTSX_DEBUGP("spi_set_parameter: spi_clock = %d, clk_div = %d, write_en = %d\n",
-                     spi->spi_clock, spi->clk_div, spi->write_en);
-
-        return STATUS_SUCCESS;
-}
-
-int spi_read_flash_id(struct scsi_cmnd *srb, struct rtsx_chip *chip)
-{
-        int retval;
-        u16 len;
-        u8 *buf;
-
-        spi_set_err_code(chip, SPI_NO_ERR);
-
-        len = ((u16)(srb->cmnd[7]) << 8) | srb->cmnd[8];
-        if (len > 512) {
-                spi_set_err_code(chip, SPI_INVALID_COMMAND);
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        retval = spi_set_init_para(chip);
-        if (retval != STATUS_SUCCESS) {
-                spi_set_err_code(chip, SPI_HW_ERR);
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        rtsx_init_cmd(chip);
-
-        rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_DATA_SOURCE, 0x01, PINGPONG_BUFFER);
-
-        rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_COMMAND, 0xFF, srb->cmnd[3]);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_ADDR2, 0xFF, srb->cmnd[4]);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_ADDR1, 0xFF, srb->cmnd[5]);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_ADDR0, 0xFF, srb->cmnd[6]);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_CA_NUMBER, 0xFF, SPI_COMMAND_BIT_8 | SPI_ADDRESS_BIT_24);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_LENGTH1, 0xFF, srb->cmnd[7]);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_LENGTH0, 0xFF, srb->cmnd[8]);
-
-        if (len == 0) {
-                if (srb->cmnd[9]) {
-                        rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_TRANSFER0,
-                                      0xFF, SPI_TRANSFER0_START | SPI_CA_MODE0);
-                } else {
-                        rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_TRANSFER0,
-                                      0xFF, SPI_TRANSFER0_START | SPI_C_MODE0);
-                }
-        } else {
-                if (srb->cmnd[9]) {
-                        rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_TRANSFER0,
-                                      0xFF, SPI_TRANSFER0_START | SPI_CADI_MODE0);
-                } else {
-                        rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_TRANSFER0,
-                                      0xFF, SPI_TRANSFER0_START | SPI_CDI_MODE0);
-                }
-        }
-
-        rtsx_add_cmd(chip, CHECK_REG_CMD, SPI_TRANSFER0, SPI_TRANSFER0_END, SPI_TRANSFER0_END);
-
-        retval = rtsx_send_cmd(chip, 0, 100);
-        if (retval < 0) {
-                rtsx_clear_spi_error(chip);
-                spi_set_err_code(chip, SPI_HW_ERR);
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        if (len) {
-                buf = kmalloc(len, GFP_KERNEL);
-                if (!buf)
-                        TRACE_RET(chip, STATUS_ERROR);
-
-                retval = rtsx_read_ppbuf(chip, buf, len);
-                if (retval != STATUS_SUCCESS) {
-                        spi_set_err_code(chip, SPI_READ_ERR);
-                        kfree(buf);
-                        TRACE_RET(chip, STATUS_FAIL);
-                }
-
-                rtsx_stor_set_xfer_buf(buf, scsi_bufflen(srb), srb);
-                scsi_set_resid(srb, 0);
-
-                kfree(buf);
-        }
-
-        return STATUS_SUCCESS;
-}
-
-int spi_read_flash(struct scsi_cmnd *srb, struct rtsx_chip *chip)
-{
-        int retval;
-        unsigned int index = 0, offset = 0;
-        u8 ins, slow_read;
-        u32 addr;
-        u16 len;
-        u8 *buf;
-
-        spi_set_err_code(chip, SPI_NO_ERR);
-
-        ins = srb->cmnd[3];
-        addr = ((u32)(srb->cmnd[4]) << 16) | ((u32)(srb->cmnd[5]) << 8) | srb->cmnd[6];
-        len = ((u16)(srb->cmnd[7]) << 8) | srb->cmnd[8];
-        slow_read = srb->cmnd[9];
-
-        retval = spi_set_init_para(chip);
-        if (retval != STATUS_SUCCESS) {
-                spi_set_err_code(chip, SPI_HW_ERR);
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        buf = kmalloc(SF_PAGE_LEN, GFP_KERNEL);
-        if (buf == NULL)
-                TRACE_RET(chip, STATUS_ERROR);
-
-        while (len) {
-                u16 pagelen = SF_PAGE_LEN - (u8)addr;
-
-                if (pagelen > len)
-                        pagelen = len;
-
-                rtsx_init_cmd(chip);
-
-                trans_dma_enable(DMA_FROM_DEVICE, chip, 256, DMA_256);
-
-                rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_COMMAND, 0xFF, ins);
-
-                if (slow_read) {
-                        rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_ADDR0, 0xFF, (u8)addr);
-                        rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_ADDR1, 0xFF, (u8)(addr >> 8));
-                        rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_ADDR2, 0xFF, (u8)(addr >> 16));
-                        rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_CA_NUMBER, 0xFF, SPI_COMMAND_BIT_8 | SPI_ADDRESS_BIT_24);
-                } else {
-                        rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_ADDR1, 0xFF, (u8)addr);
-                        rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_ADDR2, 0xFF, (u8)(addr >> 8));
-                        rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_ADDR3, 0xFF, (u8)(addr >> 16));
-                        rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_CA_NUMBER, 0xFF, SPI_COMMAND_BIT_8 | SPI_ADDRESS_BIT_32);
-                }
-
-                rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_LENGTH1, 0xFF, (u8)(pagelen >> 8));
-                rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_LENGTH0, 0xFF, (u8)pagelen);
-
-                rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_TRANSFER0, 0xFF, SPI_TRANSFER0_START | SPI_CADI_MODE0);
-                rtsx_add_cmd(chip, CHECK_REG_CMD, SPI_TRANSFER0, SPI_TRANSFER0_END, SPI_TRANSFER0_END);
-
-                rtsx_send_cmd_no_wait(chip);
-
-                retval = rtsx_transfer_data(chip, 0, buf, pagelen, 0, DMA_FROM_DEVICE, 10000);
-                if (retval < 0) {
-                        kfree(buf);
-                        rtsx_clear_spi_error(chip);
-                        spi_set_err_code(chip, SPI_HW_ERR);
-                        TRACE_RET(chip, STATUS_FAIL);
-                }
-
-                rtsx_stor_access_xfer_buf(buf, pagelen, srb, &index, &offset, TO_XFER_BUF);
-
-                addr += pagelen;
-                len -= pagelen;
-        }
-
-        scsi_set_resid(srb, 0);
-        kfree(buf);
-
-        return STATUS_SUCCESS;
-}
-
-int spi_write_flash(struct scsi_cmnd *srb, struct rtsx_chip *chip)
-{
-        int retval;
-        u8 ins, program_mode;
-        u32 addr;
-        u16 len;
-        u8 *buf;
-        unsigned int index = 0, offset = 0;
-
-        spi_set_err_code(chip, SPI_NO_ERR);
-
-        ins = srb->cmnd[3];
-        addr = ((u32)(srb->cmnd[4]) << 16) | ((u32)(srb->cmnd[5]) << 8) | srb->cmnd[6];
-        len = ((u16)(srb->cmnd[7]) << 8) | srb->cmnd[8];
-        program_mode = srb->cmnd[9];
-
-        retval = spi_set_init_para(chip);
-        if (retval != STATUS_SUCCESS) {
-                spi_set_err_code(chip, SPI_HW_ERR);
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        if (program_mode == BYTE_PROGRAM) {
-                buf = kmalloc(4, GFP_KERNEL);
-                if (!buf)
-                        TRACE_RET(chip, STATUS_ERROR);
-
-                while (len) {
-                        retval = sf_enable_write(chip, SPI_WREN);
-                        if (retval != STATUS_SUCCESS) {
-                                kfree(buf);
-                                TRACE_RET(chip, STATUS_FAIL);
-                        }
-
-                        rtsx_stor_access_xfer_buf(buf, 1, srb, &index, &offset, FROM_XFER_BUF);
-
-                        rtsx_init_cmd(chip);
-
-                        rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_DATA_SOURCE, 0x01, PINGPONG_BUFFER);
-                        rtsx_add_cmd(chip, WRITE_REG_CMD, PPBUF_BASE2, 0xFF, buf[0]);
-                        sf_program(chip, ins, 1, addr, 1);
-
-                        retval = rtsx_send_cmd(chip, 0, 100);
-                        if (retval < 0) {
-                                kfree(buf);
-                                rtsx_clear_spi_error(chip);
-                                spi_set_err_code(chip, SPI_HW_ERR);
-                                TRACE_RET(chip, STATUS_FAIL);
-                        }
-
-                        retval = sf_polling_status(chip, 100);
-                        if (retval != STATUS_SUCCESS) {
-                                kfree(buf);
-                                TRACE_RET(chip, STATUS_FAIL);
-                        }
-
-                        addr++;
-                        len--;
-                }
-
-                kfree(buf);
-
-        } else if (program_mode == AAI_PROGRAM) {
-                int first_byte = 1;
-
-                retval = sf_enable_write(chip, SPI_WREN);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-
-                buf = kmalloc(4, GFP_KERNEL);
-                if (!buf)
-                        TRACE_RET(chip, STATUS_ERROR);
-
-                while (len) {
-                        rtsx_stor_access_xfer_buf(buf, 1, srb, &index, &offset, FROM_XFER_BUF);
-
-                        rtsx_init_cmd(chip);
-
-                        rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_DATA_SOURCE, 0x01, PINGPONG_BUFFER);
-                        rtsx_add_cmd(chip, WRITE_REG_CMD, PPBUF_BASE2, 0xFF, buf[0]);
-                        if (first_byte) {
-                                sf_program(chip, ins, 1, addr, 1);
-                                first_byte = 0;
-                        } else {
-                                sf_program(chip, ins, 0, 0, 1);
-                        }
-
-                        retval = rtsx_send_cmd(chip, 0, 100);
-                        if (retval < 0) {
-                                kfree(buf);
-                                rtsx_clear_spi_error(chip);
-                                spi_set_err_code(chip, SPI_HW_ERR);
-                                TRACE_RET(chip, STATUS_FAIL);
-                        }
-
-                        retval = sf_polling_status(chip, 100);
-                        if (retval != STATUS_SUCCESS) {
-                                kfree(buf);
-                                TRACE_RET(chip, STATUS_FAIL);
-                        }
-
-                        len--;
-                }
-
-                kfree(buf);
-
-                retval = sf_disable_write(chip, SPI_WRDI);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-
-                retval = sf_polling_status(chip, 100);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-        } else if (program_mode == PAGE_PROGRAM) {
-                buf = kmalloc(SF_PAGE_LEN, GFP_KERNEL);
-                if (!buf)
-                        TRACE_RET(chip, STATUS_NOMEM);
-
-                while (len) {
-                        u16 pagelen = SF_PAGE_LEN - (u8)addr;
-
-                        if (pagelen > len)
-                                pagelen = len;
-
-                        retval = sf_enable_write(chip, SPI_WREN);
-                        if (retval != STATUS_SUCCESS) {
-                                kfree(buf);
-                                TRACE_RET(chip, STATUS_FAIL);
-                        }
-
-                        rtsx_init_cmd(chip);
-
-                        trans_dma_enable(DMA_TO_DEVICE, chip, 256, DMA_256);
-                        sf_program(chip, ins, 1, addr, pagelen);
-
-                        rtsx_send_cmd_no_wait(chip);
-
-                        rtsx_stor_access_xfer_buf(buf, pagelen, srb, &index, &offset, FROM_XFER_BUF);
-
-                        retval = rtsx_transfer_data(chip, 0, buf, pagelen, 0, DMA_TO_DEVICE, 100);
-                        if (retval < 0) {
-                                kfree(buf);
-                                rtsx_clear_spi_error(chip);
-                                spi_set_err_code(chip, SPI_HW_ERR);
-                                TRACE_RET(chip, STATUS_FAIL);
-                        }
-
-                        retval = sf_polling_status(chip, 100);
-                        if (retval != STATUS_SUCCESS) {
-                                kfree(buf);
-                                TRACE_RET(chip, STATUS_FAIL);
-                        }
-
-                        addr += pagelen;
-                        len -= pagelen;
-                }
-
-                kfree(buf);
-        } else {
-                spi_set_err_code(chip, SPI_INVALID_COMMAND);
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        return STATUS_SUCCESS;
-}
-
-int spi_erase_flash(struct scsi_cmnd *srb, struct rtsx_chip *chip)
-{
-        int retval;
-        u8 ins, erase_mode;
-        u32 addr;
-
-        spi_set_err_code(chip, SPI_NO_ERR);
-
-        ins = srb->cmnd[3];
-        addr = ((u32)(srb->cmnd[4]) << 16) | ((u32)(srb->cmnd[5]) << 8) | srb->cmnd[6];
-        erase_mode = srb->cmnd[9];
-
-        retval = spi_set_init_para(chip);
-        if (retval != STATUS_SUCCESS) {
-                spi_set_err_code(chip, SPI_HW_ERR);
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        if (erase_mode == PAGE_ERASE) {
-                retval = sf_enable_write(chip, SPI_WREN);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-
-                retval = sf_erase(chip, ins, 1, addr);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-        } else if (erase_mode == CHIP_ERASE) {
-                retval = sf_enable_write(chip, SPI_WREN);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-
-                retval = sf_erase(chip, ins, 0, 0);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-        } else {
-                spi_set_err_code(chip, SPI_INVALID_COMMAND);
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        return STATUS_SUCCESS;
-}
-
-int spi_write_flash_status(struct scsi_cmnd *srb, struct rtsx_chip *chip)
-{
-        int retval;
-        u8 ins, status, ewsr;
-
-        ins = srb->cmnd[3];
-        status = srb->cmnd[4];
-        ewsr = srb->cmnd[5];
-
-        retval = spi_set_init_para(chip);
-        if (retval != STATUS_SUCCESS) {
-                spi_set_err_code(chip, SPI_HW_ERR);
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        retval = sf_enable_write(chip, ewsr);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        rtsx_init_cmd(chip);
-
-        rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_DATA_SOURCE, 0x01, PINGPONG_BUFFER);
-
-        rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_COMMAND, 0xFF, ins);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_CA_NUMBER, 0xFF, SPI_COMMAND_BIT_8 | SPI_ADDRESS_BIT_24);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_LENGTH1, 0xFF, 0);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_LENGTH0, 0xFF, 1);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, PPBUF_BASE2, 0xFF, status);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_TRANSFER0, 0xFF, SPI_TRANSFER0_START | SPI_CDO_MODE0);
-        rtsx_add_cmd(chip, CHECK_REG_CMD, SPI_TRANSFER0, SPI_TRANSFER0_END, SPI_TRANSFER0_END);
-
-        retval = rtsx_send_cmd(chip, 0, 100);
-        if (retval != STATUS_SUCCESS) {
-                rtsx_clear_spi_error(chip);
-                spi_set_err_code(chip, SPI_HW_ERR);
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        return STATUS_SUCCESS;
-}
-
diff --git a/drivers/staging/rts_pstor/spi.h b/drivers/staging/rts_pstor/spi.h
deleted file mode 100644
index b59291f8b201..000000000000
--- a/drivers/staging/rts_pstor/spi.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* Driver for Realtek PCI-Express card reader
- * Header file
- *
- * Copyright(c) 2009 Realtek Semiconductor Corp. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2, 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, see <http://www.gnu.org/licenses/>.
- *
- * Author:
- *   wwang (wei_wang@realsil.com.cn)
- *   No. 450, Shenhu Road, Suzhou Industry Park, Suzhou, China
- */
-
-#ifndef __REALTEK_RTSX_SPI_H
-#define __REALTEK_RTSX_SPI_H
-
-/* SPI operation error */
-#define SPI_NO_ERR              0x00
-#define SPI_HW_ERR              0x01
-#define SPI_INVALID_COMMAND     0x02
-#define SPI_READ_ERR            0x03
-#define SPI_WRITE_ERR           0x04
-#define SPI_ERASE_ERR           0x05
-#define SPI_BUSY_ERR            0x06
-
-/* Serial flash instruction */
-#define SPI_READ                0x03
-#define SPI_FAST_READ           0x0B
-#define SPI_WREN                0x06
-#define SPI_WRDI                0x04
-#define SPI_RDSR                0x05
-
-#define SF_PAGE_LEN             256
-
-#define BYTE_PROGRAM            0
-#define AAI_PROGRAM             1
-#define PAGE_PROGRAM            2
-
-#define PAGE_ERASE              0
-#define CHIP_ERASE              1
-
-int spi_erase_eeprom_chip(struct rtsx_chip *chip);
-int spi_erase_eeprom_byte(struct rtsx_chip *chip, u16 addr);
-int spi_read_eeprom(struct rtsx_chip *chip, u16 addr, u8 *val);
-int spi_write_eeprom(struct rtsx_chip *chip, u16 addr, u8 val);
-int spi_get_status(struct scsi_cmnd *srb, struct rtsx_chip *chip);
-int spi_set_parameter(struct scsi_cmnd *srb, struct rtsx_chip *chip);
-int spi_read_flash_id(struct scsi_cmnd *srb, struct rtsx_chip *chip);
-int spi_read_flash(struct scsi_cmnd *srb, struct rtsx_chip *chip);
-int spi_write_flash(struct scsi_cmnd *srb, struct rtsx_chip *chip);
-int spi_erase_flash(struct scsi_cmnd *srb, struct rtsx_chip *chip);
-int spi_write_flash_status(struct scsi_cmnd *srb, struct rtsx_chip *chip);
-
-
-#endif  /* __REALTEK_RTSX_SPI_H */
diff --git a/drivers/staging/rts_pstor/trace.h b/drivers/staging/rts_pstor/trace.h
deleted file mode 100644
index cf60a1b872b3..000000000000
--- a/drivers/staging/rts_pstor/trace.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/* Driver for Realtek PCI-Express card reader
- * Header file
- *
- * Copyright(c) 2009 Realtek Semiconductor Corp. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2, 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, see <http://www.gnu.org/licenses/>.
- *
- * Author:
- *   wwang (wei_wang@realsil.com.cn)
- *   No. 450, Shenhu Road, Suzhou Industry Park, Suzhou, China
- */
-
-#ifndef __REALTEK_RTSX_TRACE_H
-#define __REALTEK_RTSX_TRACE_H
-
-#define _MSG_TRACE
-
-#ifdef _MSG_TRACE
-static inline char *filename(char *path)
-{
-        char *ptr;
-
-        if (path == NULL)
-                return NULL;
-
-        ptr = path;
-
-        while (*ptr != '\0') {
-                if ((*ptr == '\\') || (*ptr == '/'))
-                        path = ptr + 1;
-                
-                ptr++;
-        }
-
-        return path;
-}
-
-#define TRACE_RET(chip, ret)                                                                            \
-do {                                                                                                    \
-        char *_file = filename(__FILE__);                                                               \
-        RTSX_DEBUGP("[%s][%s]:[%d]\n", _file, __func__, __LINE__);                                      \
-        (chip)->trace_msg[(chip)->msg_idx].line = (u16)(__LINE__);                                      \
-        strncpy((chip)->trace_msg[(chip)->msg_idx].func, __func__, MSG_FUNC_LEN-1);                     \
-        strncpy((chip)->trace_msg[(chip)->msg_idx].file, _file, MSG_FILE_LEN-1);                        \
-        get_current_time((chip)->trace_msg[(chip)->msg_idx].timeval_buf, TIME_VAL_LEN);                 \
-        (chip)->trace_msg[(chip)->msg_idx].valid = 1;                                                   \
-        (chip)->msg_idx++;                                                                              \
-        if ((chip)->msg_idx >= TRACE_ITEM_CNT) {                                                        \
-                (chip)->msg_idx = 0;                                                                    \
-        }                                                                                               \
-        return ret;                                                                                     \
-} while (0)
-
-#define TRACE_GOTO(chip, label)                                                                         \
-do {                                                                                                    \
-        char *_file = filename(__FILE__);                                                               \
-        RTSX_DEBUGP("[%s][%s]:[%d]\n", _file, __func__, __LINE__);                                      \
-        (chip)->trace_msg[(chip)->msg_idx].line = (u16)(__LINE__);                                      \
-        strncpy((chip)->trace_msg[(chip)->msg_idx].func, __func__, MSG_FUNC_LEN-1);                     \
-        strncpy((chip)->trace_msg[(chip)->msg_idx].file, _file, MSG_FILE_LEN-1);                        \
-        get_current_time((chip)->trace_msg[(chip)->msg_idx].timeval_buf, TIME_VAL_LEN);                 \
-        (chip)->trace_msg[(chip)->msg_idx].valid = 1;                                                   \
-        (chip)->msg_idx++;                                                                              \
-        if ((chip)->msg_idx >= TRACE_ITEM_CNT) {                                                        \
-                (chip)->msg_idx = 0;                                                                    \
-        }                                                                                               \
-        goto label;                                                                                     \
-} while (0)
-#else
-#define TRACE_RET(chip, ret)    return ret
-#define TRACE_GOTO(chip, label) goto label
-#endif
-
-#ifdef CONFIG_RTS_PSTOR_DEBUG
-#define RTSX_DUMP(buf, buf_len)                                 \
-        print_hex_dump(KERN_DEBUG, RTSX_STOR, DUMP_PREFIX_NONE, \
-                                16, 1, (buf), (buf_len), false)
-#else
-#define RTSX_DUMP(buf, buf_len)
-#endif
-
-#endif  /* __REALTEK_RTSX_TRACE_H */
diff --git a/drivers/staging/rts_pstor/xd.c b/drivers/staging/rts_pstor/xd.c
deleted file mode 100644
index 9bba5b11a824..000000000000
--- a/drivers/staging/rts_pstor/xd.c
+++ /dev/null
@@ -1,2052 +0,0 @@
-/* Driver for Realtek PCI-Express card reader
- *
- * Copyright(c) 2009 Realtek Semiconductor Corp. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2, 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, see <http://www.gnu.org/licenses/>.
- *
- * Author:
- *   wwang (wei_wang@realsil.com.cn)
- *   No. 450, Shenhu Road, Suzhou Industry Park, Suzhou, China
- */
-
-#include <linux/blkdev.h>
-#include <linux/kthread.h>
-#include <linux/sched.h>
-#include <linux/vmalloc.h>
-
-#include "rtsx.h"
-#include "rtsx_transport.h"
-#include "rtsx_scsi.h"
-#include "rtsx_card.h"
-#include "xd.h"
-
-static int xd_build_l2p_tbl(struct rtsx_chip *chip, int zone_no);
-static int xd_init_page(struct rtsx_chip *chip, u32 phy_blk, u16 logoff, u8 start_page, u8 end_page);
-
-static inline void xd_set_err_code(struct rtsx_chip *chip, u8 err_code)
-{
-        struct xd_info *xd_card = &(chip->xd_card);
-
-        xd_card->err_code = err_code;
-}
-
-static inline int xd_check_err_code(struct rtsx_chip *chip, u8 err_code)
-{
-        struct xd_info *xd_card = &(chip->xd_card);
-
-        return (xd_card->err_code == err_code);
-}
-
-static int xd_set_init_para(struct rtsx_chip *chip)
-{
-        struct xd_info *xd_card = &(chip->xd_card);
-        int retval;
-
-        if (chip->asic_code)
-                xd_card->xd_clock = 47;
-        else
-                xd_card->xd_clock = CLK_50;
-
-        retval = switch_clock(chip, xd_card->xd_clock);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        return STATUS_SUCCESS;
-}
-
-static int xd_switch_clock(struct rtsx_chip *chip)
-{
-        struct xd_info *xd_card = &(chip->xd_card);
-        int retval;
-
-        retval = select_card(chip, XD_CARD);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        retval = switch_clock(chip, xd_card->xd_clock);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        return STATUS_SUCCESS;
-}
-
-static int xd_read_id(struct rtsx_chip *chip, u8 id_cmd, u8 *id_buf, u8 buf_len)
-{
-        int retval, i;
-        u8 *ptr;
-
-        rtsx_init_cmd(chip);
-
-        rtsx_add_cmd(chip, WRITE_REG_CMD, XD_DAT, 0xFF, id_cmd);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, XD_TRANSFER, 0xFF, XD_TRANSFER_START | XD_READ_ID);
-        rtsx_add_cmd(chip, CHECK_REG_CMD, XD_TRANSFER, XD_TRANSFER_END, XD_TRANSFER_END);
-
-        for (i = 0; i < 4; i++)
-                rtsx_add_cmd(chip, READ_REG_CMD, (u16)(XD_ADDRESS1 + i), 0, 0);
-
-        retval = rtsx_send_cmd(chip, XD_CARD, 20);
-        if (retval < 0)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        ptr = rtsx_get_cmd_data(chip) + 1;
-        if (id_buf && buf_len) {
-                if (buf_len > 4)
-                        buf_len = 4;
-                memcpy(id_buf, ptr, buf_len);
-        }
-
-        return STATUS_SUCCESS;
-}
-
-static void xd_assign_phy_addr(struct rtsx_chip *chip, u32 addr, u8 mode)
-{
-        struct xd_info *xd_card = &(chip->xd_card);
-
-        switch (mode) {
-        case XD_RW_ADDR:
-                rtsx_add_cmd(chip, WRITE_REG_CMD, XD_ADDRESS0, 0xFF, 0);
-                rtsx_add_cmd(chip, WRITE_REG_CMD, XD_ADDRESS1, 0xFF, (u8)addr);
-                rtsx_add_cmd(chip, WRITE_REG_CMD, XD_ADDRESS2, 0xFF, (u8)(addr >> 8));
-                rtsx_add_cmd(chip, WRITE_REG_CMD, XD_ADDRESS3, 0xFF, (u8)(addr >> 16));
-                rtsx_add_cmd(chip, WRITE_REG_CMD, XD_CFG, 0xFF,
-                                xd_card->addr_cycle | XD_CALC_ECC | XD_BA_NO_TRANSFORM);
-                break;
-
-        case XD_ERASE_ADDR:
-                rtsx_add_cmd(chip, WRITE_REG_CMD, XD_ADDRESS0, 0xFF, (u8)addr);
-                rtsx_add_cmd(chip, WRITE_REG_CMD, XD_ADDRESS1, 0xFF, (u8)(addr >> 8));
-                rtsx_add_cmd(chip, WRITE_REG_CMD, XD_ADDRESS2, 0xFF, (u8)(addr >> 16));
-                rtsx_add_cmd(chip, WRITE_REG_CMD, XD_CFG, 0xFF,
-                                (xd_card->addr_cycle - 1) | XD_CALC_ECC | XD_BA_NO_TRANSFORM);
-                break;
-
-        default:
-                break;
-        }
-}
-
-static int xd_read_redundant(struct rtsx_chip *chip, u32 page_addr, u8 *buf, int buf_len)
-{
-        int retval, i;
-
-        rtsx_init_cmd(chip);
-
-        xd_assign_phy_addr(chip, page_addr, XD_RW_ADDR);
-
-        rtsx_add_cmd(chip, WRITE_REG_CMD, XD_TRANSFER, 0xFF, XD_TRANSFER_START | XD_READ_REDUNDANT);
-        rtsx_add_cmd(chip, CHECK_REG_CMD, XD_TRANSFER, XD_TRANSFER_END, XD_TRANSFER_END);
-
-        for (i = 0; i < 6; i++)
-                rtsx_add_cmd(chip, READ_REG_CMD, (u16)(XD_PAGE_STATUS + i), 0, 0);
-        for (i = 0; i < 4; i++)
-                rtsx_add_cmd(chip, READ_REG_CMD, (u16)(XD_RESERVED0 + i), 0, 0);
-        rtsx_add_cmd(chip, READ_REG_CMD, XD_PARITY, 0, 0);
-
-        retval = rtsx_send_cmd(chip, XD_CARD, 500);
-        if (retval < 0)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        if (buf && buf_len) {
-                u8 *ptr = rtsx_get_cmd_data(chip) + 1;
-
-                if (buf_len > 11)
-                        buf_len = 11;
-                memcpy(buf, ptr, buf_len);
-        }
-
-        return STATUS_SUCCESS;
-}
-
-static int xd_read_data_from_ppb(struct rtsx_chip *chip, int offset, u8 *buf, int buf_len)
-{
-        int retval, i;
-
-        if (!buf || (buf_len < 0))
-                TRACE_RET(chip, STATUS_FAIL);
-
-        rtsx_init_cmd(chip);
-
-        for (i = 0; i < buf_len; i++)
-                rtsx_add_cmd(chip, READ_REG_CMD, PPBUF_BASE2 + offset + i, 0, 0);
-
-        retval = rtsx_send_cmd(chip, 0, 250);
-        if (retval < 0) {
-                rtsx_clear_xd_error(chip);
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        memcpy(buf, rtsx_get_cmd_data(chip), buf_len);
-
-        return STATUS_SUCCESS;
-}
-
-static int xd_read_cis(struct rtsx_chip *chip, u32 page_addr, u8 *buf, int buf_len)
-{
-        int retval;
-        u8 reg;
-
-        if (!buf || (buf_len < 10))
-                TRACE_RET(chip, STATUS_FAIL);
-
-        rtsx_init_cmd(chip);
-
-        xd_assign_phy_addr(chip, page_addr, XD_RW_ADDR);
-
-        rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_DATA_SOURCE, 0x01, PINGPONG_BUFFER);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, XD_PAGE_CNT, 0xFF, 1);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, XD_CHK_DATA_STATUS, XD_AUTO_CHK_DATA_STATUS, XD_AUTO_CHK_DATA_STATUS);
-
-        rtsx_add_cmd(chip, WRITE_REG_CMD, XD_TRANSFER, 0xFF, XD_TRANSFER_START | XD_READ_PAGES);
-        rtsx_add_cmd(chip, CHECK_REG_CMD, XD_TRANSFER, XD_TRANSFER_END, XD_TRANSFER_END);
-
-        retval = rtsx_send_cmd(chip, XD_CARD, 250);
-        if (retval == -ETIMEDOUT) {
-                rtsx_clear_xd_error(chip);
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        RTSX_READ_REG(chip, XD_PAGE_STATUS, &reg);
-        if (reg != XD_GPG) {
-                rtsx_clear_xd_error(chip);
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        RTSX_READ_REG(chip, XD_CTL, &reg);
-        if (!(reg & XD_ECC1_ERROR) || !(reg & XD_ECC1_UNCORRECTABLE)) {
-                retval = xd_read_data_from_ppb(chip, 0, buf, buf_len);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-                if (reg & XD_ECC1_ERROR) {
-                        u8 ecc_bit, ecc_byte;
-
-                        RTSX_READ_REG(chip, XD_ECC_BIT1, &ecc_bit);
-                        RTSX_READ_REG(chip, XD_ECC_BYTE1, &ecc_byte);
-
-                        RTSX_DEBUGP("ECC_BIT1 = 0x%x, ECC_BYTE1 = 0x%x\n", ecc_bit, ecc_byte);
-                        if (ecc_byte < buf_len) {
-                                RTSX_DEBUGP("Before correct: 0x%x\n", buf[ecc_byte]);
-                                buf[ecc_byte] ^= (1 << ecc_bit);
-                                RTSX_DEBUGP("After correct: 0x%x\n", buf[ecc_byte]);
-                        }
-                }
-        } else if (!(reg & XD_ECC2_ERROR) || !(reg & XD_ECC2_UNCORRECTABLE)) {
-                rtsx_clear_xd_error(chip);
-
-                retval = xd_read_data_from_ppb(chip, 256, buf, buf_len);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-                if (reg & XD_ECC2_ERROR) {
-                        u8 ecc_bit, ecc_byte;
-
-                        RTSX_READ_REG(chip, XD_ECC_BIT2, &ecc_bit);
-                        RTSX_READ_REG(chip, XD_ECC_BYTE2, &ecc_byte);
-
-                        RTSX_DEBUGP("ECC_BIT2 = 0x%x, ECC_BYTE2 = 0x%x\n", ecc_bit, ecc_byte);
-                        if (ecc_byte < buf_len) {
-                                RTSX_DEBUGP("Before correct: 0x%x\n", buf[ecc_byte]);
-                                buf[ecc_byte] ^= (1 << ecc_bit);
-                                RTSX_DEBUGP("After correct: 0x%x\n", buf[ecc_byte]);
-                        }
-                }
-        } else {
-                rtsx_clear_xd_error(chip);
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        return STATUS_SUCCESS;
-}
-
-static void xd_fill_pull_ctl_disable(struct rtsx_chip *chip)
-{
-        if (CHECK_PID(chip, 0x5209)) {
-                rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL1, 0xFF, 0x55);
-                rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL2, 0xFF, 0x55);
-                rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL3, 0xFF, 0xD5);
-                rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL4, 0xFF, 0x55);
-                rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL5, 0xFF, 0x55);
-                rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL6, 0xFF, 0x15);
-        } else if (CHECK_PID(chip, 0x5208)) {
-                rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL1, 0xFF,
-                        XD_D3_PD | XD_D2_PD | XD_D1_PD | XD_D0_PD);
-                rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL2, 0xFF,
-                        XD_D7_PD | XD_D6_PD | XD_D5_PD | XD_D4_PD);
-                rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL3, 0xFF,
-                        XD_WP_PD | XD_CE_PD | XD_CLE_PD | XD_CD_PU);
-                rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL4, 0xFF,
-                        XD_RDY_PD | XD_WE_PD | XD_RE_PD | XD_ALE_PD);
-                rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL5, 0xFF,
-                        MS_INS_PU | SD_WP_PD | SD_CD_PU | SD_CMD_PD);
-                rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL6, 0xFF, MS_D5_PD | MS_D4_PD);
-        } else if (CHECK_PID(chip, 0x5288)) {
-                if (CHECK_BARO_PKG(chip, QFN)) {
-                        rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL1, 0xFF, 0x55);
-                        rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL2, 0xFF, 0x55);
-                        rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL3, 0xFF, 0x4B);
-                        rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL4, 0xFF, 0x69);
-                }
-        }
-}
-
-static void xd_fill_pull_ctl_stage1_barossa(struct rtsx_chip *chip)
-{
-        if (CHECK_BARO_PKG(chip, QFN)) {
-                rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL1, 0xFF, 0x55);
-                rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL2, 0xFF, 0x55);
-                rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL3, 0xFF, 0x4B);
-                rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL4, 0xFF, 0x55);
-        }
-}
-
-static void xd_fill_pull_ctl_enable(struct rtsx_chip *chip)
-{
-        if (CHECK_PID(chip, 0x5209)) {
-                rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL1, 0xFF, 0xAA);
-                rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL2, 0xFF, 0x55);
-                rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL3, 0xFF, 0xD5);
-                rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL4, 0xFF, 0x55);
-                rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL5, 0xFF, 0x55);
-                rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL6, 0xFF, 0x15);
-        } else if (CHECK_PID(chip, 0x5208)) {
-                rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL1, 0xFF,
-                        XD_D3_PD | XD_D2_PD | XD_D1_PD | XD_D0_PD);
-                rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL2, 0xFF,
-                        XD_D7_PD | XD_D6_PD | XD_D5_PD | XD_D4_PD);
-                rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL3, 0xFF,
-                        XD_WP_PD | XD_CE_PU | XD_CLE_PD | XD_CD_PU);
-                rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL4, 0xFF,
-                        XD_RDY_PU | XD_WE_PU | XD_RE_PU | XD_ALE_PD);
-                rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL5, 0xFF,
-                        MS_INS_PU | SD_WP_PD | SD_CD_PU | SD_CMD_PD);
-                rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL6, 0xFF, MS_D5_PD | MS_D4_PD);
-        } else if (CHECK_PID(chip, 0x5288)) {
-                if (CHECK_BARO_PKG(chip, QFN)) {
-                        rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL1, 0xFF, 0x55);
-                        rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL2, 0xFF, 0x55);
-                        rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL3, 0xFF, 0x53);
-                        rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL4, 0xFF, 0xA9);
-                }
-        }
-}
-
-static int xd_pull_ctl_disable(struct rtsx_chip *chip)
-{
-        if (CHECK_PID(chip, 0x5209)) {
-                RTSX_WRITE_REG(chip, CARD_PULL_CTL1, 0xFF, 0x55);
-                RTSX_WRITE_REG(chip, CARD_PULL_CTL2, 0xFF, 0x55);
-                RTSX_WRITE_REG(chip, CARD_PULL_CTL3, 0xFF, 0xD5);
-                RTSX_WRITE_REG(chip, CARD_PULL_CTL4, 0xFF, 0x55);
-                RTSX_WRITE_REG(chip, CARD_PULL_CTL5, 0xFF, 0x55);
-                RTSX_WRITE_REG(chip, CARD_PULL_CTL6, 0xFF, 0x15);
-        } else if (CHECK_PID(chip, 0x5208)) {
-                RTSX_WRITE_REG(chip, CARD_PULL_CTL1, 0xFF,
-                        XD_D3_PD | XD_D2_PD | XD_D1_PD | XD_D0_PD);
-                RTSX_WRITE_REG(chip, CARD_PULL_CTL2, 0xFF,
-                        XD_D7_PD | XD_D6_PD | XD_D5_PD | XD_D4_PD);
-                RTSX_WRITE_REG(chip, CARD_PULL_CTL3, 0xFF,
-                        XD_WP_PD | XD_CE_PD | XD_CLE_PD | XD_CD_PU);
-                RTSX_WRITE_REG(chip, CARD_PULL_CTL4, 0xFF,
-                        XD_RDY_PD | XD_WE_PD | XD_RE_PD | XD_ALE_PD);
-                RTSX_WRITE_REG(chip, CARD_PULL_CTL5, 0xFF,
-                        MS_INS_PU | SD_WP_PD | SD_CD_PU | SD_CMD_PD);
-                RTSX_WRITE_REG(chip, CARD_PULL_CTL6, 0xFF, MS_D5_PD | MS_D4_PD);
-        } else if (CHECK_PID(chip, 0x5288)) {
-                if (CHECK_BARO_PKG(chip, QFN)) {
-                        RTSX_WRITE_REG(chip, CARD_PULL_CTL1, 0xFF, 0x55);
-                        RTSX_WRITE_REG(chip, CARD_PULL_CTL2, 0xFF, 0x55);
-                        RTSX_WRITE_REG(chip, CARD_PULL_CTL3, 0xFF, 0x4B);
-                        RTSX_WRITE_REG(chip, CARD_PULL_CTL4, 0xFF, 0x69);
-                }
-        }
-
-        return STATUS_SUCCESS;
-}
-
-static void xd_clear_dma_buffer(struct rtsx_chip *chip)
-{
-        if (CHECK_PID(chip, 0x5209)) {
-                int retval;
-                u8 *buf;
-
-                RTSX_DEBUGP("xD ECC error, dummy write!\n");
-
-                buf = kmalloc(512, GFP_KERNEL);
-                if (!buf)
-                        return;
-
-                rtsx_init_cmd(chip);
-
-                trans_dma_enable(DMA_TO_DEVICE, chip, 512, DMA_512);
-
-                rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_SELECT, 0x07, SD_MOD_SEL);
-                rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_CLK_EN, SD_CLK_EN, SD_CLK_EN);
-                if (chip->asic_code) {
-                        rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL2, 0xFF, 0xAA);
-                } else {
-                        rtsx_add_cmd(chip, WRITE_REG_CMD, FPGA_PULL_CTL,
-                                        FPGA_SD_PULL_CTL_BIT, 0);
-                }
-
-                rtsx_add_cmd(chip, WRITE_REG_CMD, SD_BYTE_CNT_L, 0xFF, 0x00);
-                rtsx_add_cmd(chip, WRITE_REG_CMD, SD_BYTE_CNT_H, 0xFF, 0x02);
-                rtsx_add_cmd(chip, WRITE_REG_CMD, SD_BLOCK_CNT_L, 0xFF, 1);
-                rtsx_add_cmd(chip, WRITE_REG_CMD, SD_BLOCK_CNT_H, 0xFF, 0);
-                rtsx_add_cmd(chip, WRITE_REG_CMD, SD_CFG1, 0x03, SD_BUS_WIDTH_4);
-
-                rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_DATA_SOURCE, 0x01, RING_BUFFER);
-
-                rtsx_add_cmd(chip, WRITE_REG_CMD, SD_TRANSFER, 0xFF,
-                        SD_TM_AUTO_WRITE_3 | SD_TRANSFER_START);
-                rtsx_add_cmd(chip, CHECK_REG_CMD, SD_TRANSFER, SD_TRANSFER_END, SD_TRANSFER_END);
-
-                rtsx_send_cmd_no_wait(chip);
-
-                retval = rtsx_transfer_data(chip, SD_CARD, buf, 512, 0, DMA_TO_DEVICE, 100);
-                if (retval < 0) {
-                        u8 val;
-
-                        rtsx_read_register(chip, SD_STAT1, &val);
-                        RTSX_DEBUGP("SD_STAT1: 0x%x\n", val);
-
-                        rtsx_read_register(chip, SD_STAT2, &val);
-                        RTSX_DEBUGP("SD_STAT2: 0x%x\n", val);
-
-                        rtsx_read_register(chip, SD_BUS_STAT, &val);
-                        RTSX_DEBUGP("SD_BUS_STAT: 0x%x\n", val);
-
-                        rtsx_write_register(chip, CARD_STOP, SD_STOP | SD_CLR_ERR, SD_STOP | SD_CLR_ERR);
-                }
-
-                kfree(buf);
-
-                if (chip->asic_code) {
-                        rtsx_write_register(chip, CARD_PULL_CTL2, 0xFF, 0x55);
-                } else {
-                        rtsx_write_register(chip, FPGA_PULL_CTL,
-                                                FPGA_SD_PULL_CTL_BIT, FPGA_SD_PULL_CTL_BIT);
-                }
-                rtsx_write_register(chip, CARD_SELECT, 0x07, XD_MOD_SEL);
-                rtsx_write_register(chip, CARD_CLK_EN, SD_CLK_EN, 0);
-        }
-}
-
-static int reset_xd(struct rtsx_chip *chip)
-{
-        struct xd_info *xd_card = &(chip->xd_card);
-        int retval, i, j;
-        u8 *ptr, id_buf[4], redunt[11];
-
-        retval = select_card(chip, XD_CARD);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        rtsx_init_cmd(chip);
-
-        rtsx_add_cmd(chip, WRITE_REG_CMD, XD_CHK_DATA_STATUS, 0xFF, XD_PGSTS_NOT_FF);
-        if (chip->asic_code) {
-                if (!CHECK_PID(chip, 0x5288))
-                        xd_fill_pull_ctl_disable(chip);
-                else
-                        xd_fill_pull_ctl_stage1_barossa(chip);
-        } else {
-                rtsx_add_cmd(chip, WRITE_REG_CMD, FPGA_PULL_CTL, 0xFF,
-                        (FPGA_XD_PULL_CTL_EN1 & FPGA_XD_PULL_CTL_EN3) | 0x20);
-        }
-
-        if (!chip->ft2_fast_mode)
-                rtsx_add_cmd(chip, WRITE_REG_CMD, XD_INIT, XD_NO_AUTO_PWR_OFF, 0);
-
-        rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_OE, XD_OUTPUT_EN, 0);
-
-        retval = rtsx_send_cmd(chip, XD_CARD, 100);
-        if (retval < 0)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        if (!chip->ft2_fast_mode) {
-                retval = card_power_off(chip, XD_CARD);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-
-                wait_timeout(250);
-
-                if (CHECK_PID(chip, 0x5209))
-                        RTSX_WRITE_REG(chip, CARD_PULL_CTL1, 0xFF, 0xAA);
-
-                rtsx_init_cmd(chip);
-
-                if (chip->asic_code) {
-                        xd_fill_pull_ctl_enable(chip);
-                } else {
-                        rtsx_add_cmd(chip, WRITE_REG_CMD, FPGA_PULL_CTL, 0xFF,
-                                (FPGA_XD_PULL_CTL_EN1 & FPGA_XD_PULL_CTL_EN2) | 0x20);
-                }
-
-                retval = rtsx_send_cmd(chip, XD_CARD, 100);
-                if (retval < 0)
-                        TRACE_RET(chip, STATUS_FAIL);
-
-                retval = card_power_on(chip, XD_CARD);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-
-#ifdef SUPPORT_OCP
-                wait_timeout(50);
-                if (chip->ocp_stat & (SD_OC_NOW | SD_OC_EVER)) {
-                        RTSX_DEBUGP("Over current, OCPSTAT is 0x%x\n", chip->ocp_stat);
-                        TRACE_RET(chip, STATUS_FAIL);
-                }
-#endif
-        }
-
-        rtsx_init_cmd(chip);
-
-        if (chip->ft2_fast_mode) {
-                if (chip->asic_code) {
-                        xd_fill_pull_ctl_enable(chip);
-                } else {
-                        rtsx_add_cmd(chip, WRITE_REG_CMD, FPGA_PULL_CTL, 0xFF,
-                                (FPGA_XD_PULL_CTL_EN1 & FPGA_XD_PULL_CTL_EN2) | 0x20);
-                }
-        }
-
-        rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_OE, XD_OUTPUT_EN, XD_OUTPUT_EN);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, XD_CTL, XD_CE_DISEN, XD_CE_DISEN);
-
-        retval = rtsx_send_cmd(chip, XD_CARD, 100);
-        if (retval < 0)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        if (!chip->ft2_fast_mode)
-                wait_timeout(200);
-
-        retval = xd_set_init_para(chip);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        /* Read ID to check if the timing setting is right */
-        for (i = 0; i < 4; i++) {
-                rtsx_init_cmd(chip);
-
-                rtsx_add_cmd(chip, WRITE_REG_CMD, XD_DTCTL, 0xFF,
-                                XD_TIME_SETUP_STEP * 3 + XD_TIME_RW_STEP * (2 + i) + XD_TIME_RWN_STEP * i);
-                rtsx_add_cmd(chip, WRITE_REG_CMD, XD_CATCTL, 0xFF,
-                                XD_TIME_SETUP_STEP * 3 + XD_TIME_RW_STEP * (4 + i) + XD_TIME_RWN_STEP * (3 + i));
-
-                rtsx_add_cmd(chip, WRITE_REG_CMD, XD_TRANSFER, 0xFF, XD_TRANSFER_START | XD_RESET);
-                rtsx_add_cmd(chip, CHECK_REG_CMD, XD_TRANSFER, XD_TRANSFER_END, XD_TRANSFER_END);
-
-                rtsx_add_cmd(chip, READ_REG_CMD, XD_DAT, 0, 0);
-                rtsx_add_cmd(chip, READ_REG_CMD, XD_CTL, 0, 0);
-
-                retval = rtsx_send_cmd(chip, XD_CARD, 100);
-                if (retval < 0)
-                        TRACE_RET(chip, STATUS_FAIL);
-
-                ptr = rtsx_get_cmd_data(chip) + 1;
-
-                RTSX_DEBUGP("XD_DAT: 0x%x, XD_CTL: 0x%x\n", ptr[0], ptr[1]);
-
-                if (((ptr[0] & READY_FLAG) != READY_STATE) || !(ptr[1] & XD_RDY))
-                        continue;
-
-                retval = xd_read_id(chip, READ_ID, id_buf, 4);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-
-                RTSX_DEBUGP("READ_ID: 0x%x 0x%x 0x%x 0x%x\n",
-                                        id_buf[0], id_buf[1], id_buf[2], id_buf[3]);
-
-                xd_card->device_code = id_buf[1];
-
-                /* Check if the xD card is supported */
-                switch (xd_card->device_code) {
-                case XD_4M_X8_512_1:
-                case XD_4M_X8_512_2:
-                        xd_card->block_shift = 4;
-                        xd_card->page_off = 0x0F;
-                        xd_card->addr_cycle = 3;
-                        xd_card->zone_cnt = 1;
-                        xd_card->capacity = 8000;
-                        XD_SET_4MB(xd_card);
-                        break;
-                case XD_8M_X8_512:
-                        xd_card->block_shift = 4;
-                        xd_card->page_off = 0x0F;
-                        xd_card->addr_cycle = 3;
-                        xd_card->zone_cnt = 1;
-                        xd_card->capacity = 16000;
-                        break;
-                case XD_16M_X8_512:
-                        XD_PAGE_512(xd_card);
-                        xd_card->addr_cycle = 3;
-                        xd_card->zone_cnt = 1;
-                        xd_card->capacity = 32000;
-                        break;
-                case XD_32M_X8_512:
-                        XD_PAGE_512(xd_card);
-                        xd_card->addr_cycle = 3;
-                        xd_card->zone_cnt = 2;
-                        xd_card->capacity = 64000;
-                        break;
-                case XD_64M_X8_512:
-                        XD_PAGE_512(xd_card);
-                        xd_card->addr_cycle = 4;
-                        xd_card->zone_cnt = 4;
-                        xd_card->capacity = 128000;
-                        break;
-                case XD_128M_X8_512:
-                        XD_PAGE_512(xd_card);
-                        xd_card->addr_cycle = 4;
-                        xd_card->zone_cnt = 8;
-                        xd_card->capacity = 256000;
-                        break;
-                case XD_256M_X8_512:
-                        XD_PAGE_512(xd_card);
-                        xd_card->addr_cycle = 4;
-                        xd_card->zone_cnt = 16;
-                        xd_card->capacity = 512000;
-                        break;
-                case XD_512M_X8:
-                        XD_PAGE_512(xd_card);
-                        xd_card->addr_cycle = 4;
-                        xd_card->zone_cnt = 32;
-                        xd_card->capacity = 1024000;
-                        break;
-                case xD_1G_X8_512:
-                        XD_PAGE_512(xd_card);
-                        xd_card->addr_cycle = 4;
-                        xd_card->zone_cnt = 64;
-                        xd_card->capacity = 2048000;
-                        break;
-                case xD_2G_X8_512:
-                        XD_PAGE_512(xd_card);
-                        xd_card->addr_cycle = 4;
-                        xd_card->zone_cnt = 128;
-                        xd_card->capacity = 4096000;
-                        break;
-                default:
-                        continue;
-                }
-
-                /* Confirm timing setting */
-                for (j = 0; j < 10; j++) {
-                        retval = xd_read_id(chip, READ_ID, id_buf, 4);
-                        if (retval != STATUS_SUCCESS)
-                                TRACE_RET(chip, STATUS_FAIL);
-
-                        if (id_buf[1] != xd_card->device_code)
-                                break;
-                }
-
-                if (j == 10)
-                        break;
-        }
-
-        if (i == 4) {
-                xd_card->block_shift = 0;
-                xd_card->page_off = 0;
-                xd_card->addr_cycle = 0;
-                xd_card->capacity = 0;
-
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        retval = xd_read_id(chip, READ_xD_ID, id_buf, 4);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-        RTSX_DEBUGP("READ_xD_ID: 0x%x 0x%x 0x%x 0x%x\n",
-                        id_buf[0], id_buf[1], id_buf[2], id_buf[3]);
-        if (id_buf[2] != XD_ID_CODE)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        /* Search CIS block */
-        for (i = 0; i < 24; i++) {
-                u32 page_addr;
-
-                if (detect_card_cd(chip, XD_CARD) != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-
-                page_addr = (u32)i << xd_card->block_shift;
-
-                for (j = 0; j < 3; j++) {
-                        retval = xd_read_redundant(chip, page_addr, redunt, 11);
-                        if (retval == STATUS_SUCCESS)
-                                break;
-                }
-                if (j == 3)
-                        continue;
-
-                if (redunt[BLOCK_STATUS] != XD_GBLK)
-                        continue;
-
-                j = 0;
-                if (redunt[PAGE_STATUS] != XD_GPG) {
-                        for (j = 1; j <= 8; j++) {
-                                retval = xd_read_redundant(chip, page_addr + j, redunt, 11);
-                                if (retval == STATUS_SUCCESS) {
-                                        if (redunt[PAGE_STATUS] == XD_GPG)
-                                                break;
-                                }
-                        }
-
-                        if (j == 9)
-                                break;
-                }
-
-                /* Check CIS data */
-                if ((redunt[BLOCK_STATUS] == XD_GBLK) && (redunt[PARITY] & XD_BA1_ALL0)) {
-                        u8 buf[10];
-
-                        page_addr += j;
-
-                        retval = xd_read_cis(chip, page_addr, buf, 10);
-                        if (retval != STATUS_SUCCESS)
-                                TRACE_RET(chip, STATUS_FAIL);
-
-                        if ((buf[0] == 0x01) && (buf[1] == 0x03) && (buf[2] == 0xD9)
-                                        && (buf[3] == 0x01) && (buf[4] == 0xFF)
-                                        && (buf[5] == 0x18) && (buf[6] == 0x02)
-                                        && (buf[7] == 0xDF) && (buf[8] == 0x01)
-                                        && (buf[9] == 0x20)) {
-                                xd_card->cis_block = (u16)i;
-                        }
-                }
-
-                break;
-        }
-
-        RTSX_DEBUGP("CIS block: 0x%x\n", xd_card->cis_block);
-        if (xd_card->cis_block == 0xFFFF)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        chip->capacity[chip->card2lun[XD_CARD]] = xd_card->capacity;
-
-        return STATUS_SUCCESS;
-}
-
-static int xd_check_data_blank(u8 *redunt)
-{
-        int i;
-
-        for (i = 0; i < 6; i++) {
-                if (redunt[PAGE_STATUS + i] != 0xFF)
-                        return 0;
-        }
-
-        if ((redunt[PARITY] & (XD_ECC1_ALL1 | XD_ECC2_ALL1)) != (XD_ECC1_ALL1 | XD_ECC2_ALL1))
-                return 0;
-
-
-        for (i = 0; i < 4; i++) {
-                if (redunt[RESERVED0 + i] != 0xFF)
-                        return 0;
-        }
-
-        return 1;
-}
-
-static u16 xd_load_log_block_addr(u8 *redunt)
-{
-        u16 addr = 0xFFFF;
-
-        if (redunt[PARITY] & XD_BA1_BA2_EQL)
-                addr = ((u16)redunt[BLOCK_ADDR1_H] << 8) | redunt[BLOCK_ADDR1_L];
-        else if (redunt[PARITY] & XD_BA1_VALID)
-                addr = ((u16)redunt[BLOCK_ADDR1_H] << 8) | redunt[BLOCK_ADDR1_L];
-        else if (redunt[PARITY] & XD_BA2_VALID)
-                addr = ((u16)redunt[BLOCK_ADDR2_H] << 8) | redunt[BLOCK_ADDR2_L];
-
-        return addr;
-}
-
-static int xd_init_l2p_tbl(struct rtsx_chip *chip)
-{
-        struct xd_info *xd_card = &(chip->xd_card);
-        int size, i;
-
-        RTSX_DEBUGP("xd_init_l2p_tbl: zone_cnt = %d\n", xd_card->zone_cnt);
-
-        if (xd_card->zone_cnt < 1)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        size = xd_card->zone_cnt * sizeof(struct zone_entry);
-        RTSX_DEBUGP("Buffer size for l2p table is %d\n", size);
-
-        xd_card->zone = (struct zone_entry *)vmalloc(size);
-        if (!xd_card->zone)
-                TRACE_RET(chip, STATUS_ERROR);
-
-        for (i = 0; i < xd_card->zone_cnt; i++) {
-                xd_card->zone[i].build_flag = 0;
-                xd_card->zone[i].l2p_table = NULL;
-                xd_card->zone[i].free_table = NULL;
-                xd_card->zone[i].get_index = 0;
-                xd_card->zone[i].set_index = 0;
-                xd_card->zone[i].unused_blk_cnt = 0;
-        }
-
-        return STATUS_SUCCESS;
-}
-
-static inline void free_zone(struct zone_entry *zone)
-{
-        RTSX_DEBUGP("free_zone\n");
-
-        if (!zone)
-                return;
-
-        zone->build_flag = 0;
-        zone->set_index = 0;
-        zone->get_index = 0;
-        zone->unused_blk_cnt = 0;
-        if (zone->l2p_table) {
-                vfree(zone->l2p_table);
-                zone->l2p_table = NULL;
-        }
-        if (zone->free_table) {
-                vfree(zone->free_table);
-                zone->free_table = NULL;
-        }
-}
-
-static void xd_set_unused_block(struct rtsx_chip *chip, u32 phy_blk)
-{
-        struct xd_info *xd_card = &(chip->xd_card);
-        struct zone_entry *zone;
-        int zone_no;
-
-        zone_no = (int)phy_blk >> 10;
-        if (zone_no >= xd_card->zone_cnt) {
-                RTSX_DEBUGP("Set unused block to invalid zone (zone_no = %d, zone_cnt = %d)\n",
-                        zone_no, xd_card->zone_cnt);
-                return;
-        }
-        zone = &(xd_card->zone[zone_no]);
-
-        if (zone->free_table == NULL) {
-                if (xd_build_l2p_tbl(chip, zone_no) != STATUS_SUCCESS)
-                        return;
-        }
-
-        if ((zone->set_index >= XD_FREE_TABLE_CNT)
-                        || (zone->set_index < 0)) {
-                free_zone(zone);
-                RTSX_DEBUGP("Set unused block fail, invalid set_index\n");
-                return;
-        }
-
-        RTSX_DEBUGP("Set unused block to index %d\n", zone->set_index);
-
-        zone->free_table[zone->set_index++] = (u16) (phy_blk & 0x3ff);
-        if (zone->set_index >= XD_FREE_TABLE_CNT)
-                zone->set_index = 0;
-        zone->unused_blk_cnt++;
-}
-
-static u32 xd_get_unused_block(struct rtsx_chip *chip, int zone_no)
-{
-        struct xd_info *xd_card = &(chip->xd_card);
-        struct zone_entry *zone;
-        u32 phy_blk;
-
-        if (zone_no >= xd_card->zone_cnt) {
-                RTSX_DEBUGP("Get unused block from invalid zone (zone_no = %d, zone_cnt = %d)\n",
-                        zone_no, xd_card->zone_cnt);
-                return BLK_NOT_FOUND;
-        }
-        zone = &(xd_card->zone[zone_no]);
-
-        if ((zone->unused_blk_cnt == 0) || (zone->set_index == zone->get_index)) {
-                free_zone(zone);
-                RTSX_DEBUGP("Get unused block fail, no unused block available\n");
-                return BLK_NOT_FOUND;
-        }
-        if ((zone->get_index >= XD_FREE_TABLE_CNT) || (zone->get_index < 0)) {
-                free_zone(zone);
-                RTSX_DEBUGP("Get unused block fail, invalid get_index\n");
-                return BLK_NOT_FOUND;
-        }
-
-        RTSX_DEBUGP("Get unused block from index %d\n", zone->get_index);
-
-        phy_blk = zone->free_table[zone->get_index];
-        zone->free_table[zone->get_index++] = 0xFFFF;
-        if (zone->get_index >= XD_FREE_TABLE_CNT)
-                zone->get_index = 0;
-        zone->unused_blk_cnt--;
-
-        phy_blk += ((u32)(zone_no) << 10);
-        return phy_blk;
-}
-
-static void xd_set_l2p_tbl(struct rtsx_chip *chip, int zone_no, u16 log_off, u16 phy_off)
-{
-        struct xd_info *xd_card = &(chip->xd_card);
-        struct zone_entry *zone;
-
-        zone = &(xd_card->zone[zone_no]);
-        zone->l2p_table[log_off] = phy_off;
-}
-
-static u32 xd_get_l2p_tbl(struct rtsx_chip *chip, int zone_no, u16 log_off)
-{
-        struct xd_info *xd_card = &(chip->xd_card);
-        struct zone_entry *zone;
-        int retval;
-
-        zone = &(xd_card->zone[zone_no]);
-        if (zone->l2p_table[log_off] == 0xFFFF) {
-                u32 phy_blk = 0;
-                int i;
-
-#ifdef XD_DELAY_WRITE
-                retval = xd_delay_write(chip);
-                if (retval != STATUS_SUCCESS) {
-                        RTSX_DEBUGP("In xd_get_l2p_tbl, delay write fail!\n");
-                        return BLK_NOT_FOUND;
-                }
-#endif
-
-                if (zone->unused_blk_cnt <= 0) {
-                        RTSX_DEBUGP("No unused block!\n");
-                        return BLK_NOT_FOUND;
-                }
-
-                for (i = 0; i < zone->unused_blk_cnt; i++) {
-                        phy_blk = xd_get_unused_block(chip, zone_no);
-                        if (phy_blk == BLK_NOT_FOUND) {
-                                RTSX_DEBUGP("No unused block available!\n");
-                                return BLK_NOT_FOUND;
-                        }
-
-                        retval = xd_init_page(chip, phy_blk, log_off, 0, xd_card->page_off + 1);
-                        if (retval == STATUS_SUCCESS)
-                                break;
-                }
-                if (i >= zone->unused_blk_cnt) {
-                        RTSX_DEBUGP("No good unused block available!\n");
-                        return BLK_NOT_FOUND;
-                }
-
-                xd_set_l2p_tbl(chip, zone_no, log_off, (u16)(phy_blk & 0x3FF));
-                return phy_blk;
-        }
-
-        return (u32)zone->l2p_table[log_off] + ((u32)(zone_no) << 10);
-}
-
-int reset_xd_card(struct rtsx_chip *chip)
-{
-        struct xd_info *xd_card = &(chip->xd_card);
-        int retval;
-
-        memset(xd_card, 0, sizeof(struct xd_info));
-
-        xd_card->block_shift = 0;
-        xd_card->page_off = 0;
-        xd_card->addr_cycle = 0;
-        xd_card->capacity = 0;
-        xd_card->zone_cnt = 0;
-        xd_card->cis_block = 0xFFFF;
-        xd_card->delay_write.delay_write_flag = 0;
-
-        retval = enable_card_clock(chip, XD_CARD);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        retval = reset_xd(chip);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        retval = xd_init_l2p_tbl(chip);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        return STATUS_SUCCESS;
-}
-
-static int xd_mark_bad_block(struct rtsx_chip *chip, u32 phy_blk)
-{
-        struct xd_info *xd_card = &(chip->xd_card);
-        int retval;
-        u32 page_addr;
-        u8 reg = 0;
-
-        RTSX_DEBUGP("mark block 0x%x as bad block\n", phy_blk);
-
-        if (phy_blk == BLK_NOT_FOUND)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        rtsx_init_cmd(chip);
-
-        rtsx_add_cmd(chip, WRITE_REG_CMD, XD_PAGE_STATUS, 0xFF, XD_GPG);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, XD_BLOCK_STATUS, 0xFF, XD_LATER_BBLK);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, XD_BLOCK_ADDR1_H, 0xFF, 0xFF);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, XD_BLOCK_ADDR1_L, 0xFF, 0xFF);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, XD_BLOCK_ADDR2_H, 0xFF, 0xFF);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, XD_BLOCK_ADDR2_L, 0xFF, 0xFF);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, XD_RESERVED0, 0xFF, 0xFF);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, XD_RESERVED1, 0xFF, 0xFF);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, XD_RESERVED2, 0xFF, 0xFF);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, XD_RESERVED3, 0xFF, 0xFF);
-
-        page_addr = phy_blk << xd_card->block_shift;
-
-        xd_assign_phy_addr(chip, page_addr, XD_RW_ADDR);
-
-        rtsx_add_cmd(chip, WRITE_REG_CMD, XD_PAGE_CNT, 0xFF, xd_card->page_off + 1);
-
-        rtsx_add_cmd(chip, WRITE_REG_CMD, XD_TRANSFER, 0xFF, XD_TRANSFER_START | XD_WRITE_REDUNDANT);
-        rtsx_add_cmd(chip, CHECK_REG_CMD, XD_TRANSFER, XD_TRANSFER_END, XD_TRANSFER_END);
-
-        retval = rtsx_send_cmd(chip, XD_CARD, 500);
-        if (retval < 0) {
-                rtsx_clear_xd_error(chip);
-                rtsx_read_register(chip, XD_DAT, &reg);
-                if (reg & PROGRAM_ERROR)
-                        xd_set_err_code(chip, XD_PRG_ERROR);
-                else
-                        xd_set_err_code(chip, XD_TO_ERROR);
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        return STATUS_SUCCESS;
-}
-
-static int xd_init_page(struct rtsx_chip *chip, u32 phy_blk, u16 logoff, u8 start_page, u8 end_page)
-{
-        struct xd_info *xd_card = &(chip->xd_card);
-        int retval;
-        u32 page_addr;
-        u8 reg = 0;
-
-        RTSX_DEBUGP("Init block 0x%x\n", phy_blk);
-
-        if (start_page > end_page)
-                TRACE_RET(chip, STATUS_FAIL);
-        if (phy_blk == BLK_NOT_FOUND)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        rtsx_init_cmd(chip);
-
-        rtsx_add_cmd(chip, WRITE_REG_CMD, XD_PAGE_STATUS, 0xFF, 0xFF);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, XD_BLOCK_STATUS, 0xFF, 0xFF);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, XD_BLOCK_ADDR1_H, 0xFF, (u8)(logoff >> 8));
-        rtsx_add_cmd(chip, WRITE_REG_CMD, XD_BLOCK_ADDR1_L, 0xFF, (u8)logoff);
-
-        page_addr = (phy_blk << xd_card->block_shift) + start_page;
-
-        xd_assign_phy_addr(chip, page_addr, XD_RW_ADDR);
-
-        rtsx_add_cmd(chip, WRITE_REG_CMD, XD_CFG, XD_BA_TRANSFORM, XD_BA_TRANSFORM);
-
-        rtsx_add_cmd(chip, WRITE_REG_CMD, XD_PAGE_CNT, 0xFF, (end_page - start_page));
-
-        rtsx_add_cmd(chip, WRITE_REG_CMD, XD_TRANSFER, 0xFF, XD_TRANSFER_START | XD_WRITE_REDUNDANT);
-        rtsx_add_cmd(chip, CHECK_REG_CMD, XD_TRANSFER, XD_TRANSFER_END, XD_TRANSFER_END);
-
-        retval = rtsx_send_cmd(chip, XD_CARD, 500);
-        if (retval < 0) {
-                rtsx_clear_xd_error(chip);
-                rtsx_read_register(chip, XD_DAT, &reg);
-                if (reg & PROGRAM_ERROR) {
-                        xd_mark_bad_block(chip, phy_blk);
-                        xd_set_err_code(chip, XD_PRG_ERROR);
-                } else {
-                        xd_set_err_code(chip, XD_TO_ERROR);
-                }
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        return STATUS_SUCCESS;
-}
-
-static int xd_copy_page(struct rtsx_chip *chip, u32 old_blk, u32 new_blk, u8 start_page, u8 end_page)
-{
-        struct xd_info *xd_card = &(chip->xd_card);
-        u32 old_page, new_page;
-        u8 i, reg = 0;
-        int retval;
-
-        RTSX_DEBUGP("Copy page from block 0x%x to block 0x%x\n", old_blk, new_blk);
-
-        if (start_page > end_page)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        if ((old_blk == BLK_NOT_FOUND) || (new_blk == BLK_NOT_FOUND))
-                TRACE_RET(chip, STATUS_FAIL);
-
-        old_page = (old_blk << xd_card->block_shift) + start_page;
-        new_page = (new_blk << xd_card->block_shift) + start_page;
-
-        XD_CLR_BAD_NEWBLK(xd_card);
-
-        RTSX_WRITE_REG(chip, CARD_DATA_SOURCE, 0x01, PINGPONG_BUFFER);
-
-        for (i = start_page; i < end_page; i++) {
-                if (detect_card_cd(chip, XD_CARD) != STATUS_SUCCESS) {
-                        rtsx_clear_xd_error(chip);
-                        xd_set_err_code(chip, XD_NO_CARD);
-                        TRACE_RET(chip, STATUS_FAIL);
-                }
-
-                rtsx_init_cmd(chip);
-
-                xd_assign_phy_addr(chip, old_page, XD_RW_ADDR);
-
-                rtsx_add_cmd(chip, WRITE_REG_CMD, XD_PAGE_CNT, 0xFF, 1);
-                rtsx_add_cmd(chip, WRITE_REG_CMD, XD_CHK_DATA_STATUS, XD_AUTO_CHK_DATA_STATUS, 0);
-                rtsx_add_cmd(chip, WRITE_REG_CMD, XD_TRANSFER, 0xFF, XD_TRANSFER_START | XD_READ_PAGES);
-                rtsx_add_cmd(chip, CHECK_REG_CMD, XD_TRANSFER, XD_TRANSFER_END, XD_TRANSFER_END);
-
-                retval = rtsx_send_cmd(chip, XD_CARD, 500);
-                if (retval < 0) {
-                        rtsx_clear_xd_error(chip);
-                        reg = 0;
-                        rtsx_read_register(chip, XD_CTL, &reg);
-                        if (reg & (XD_ECC1_ERROR | XD_ECC2_ERROR)) {
-                                wait_timeout(100);
-
-                                if (detect_card_cd(chip, XD_CARD) != STATUS_SUCCESS) {
-                                        xd_set_err_code(chip, XD_NO_CARD);
-                                        TRACE_RET(chip, STATUS_FAIL);
-                                }
-
-                                if (((reg & (XD_ECC1_ERROR | XD_ECC1_UNCORRECTABLE)) ==
-                                                (XD_ECC1_ERROR | XD_ECC1_UNCORRECTABLE))
-                                        || ((reg & (XD_ECC2_ERROR | XD_ECC2_UNCORRECTABLE)) ==
-                                                (XD_ECC2_ERROR | XD_ECC2_UNCORRECTABLE))) {
-                                        rtsx_write_register(chip, XD_PAGE_STATUS, 0xFF, XD_BPG);
-                                        rtsx_write_register(chip, XD_BLOCK_STATUS, 0xFF, XD_GBLK);
-                                        XD_SET_BAD_OLDBLK(xd_card);
-                                        RTSX_DEBUGP("old block 0x%x ecc error\n", old_blk);
-                                }
-                        } else {
-                                xd_set_err_code(chip, XD_TO_ERROR);
-                                TRACE_RET(chip, STATUS_FAIL);
-                        }
-                }
-
-                if (XD_CHK_BAD_OLDBLK(xd_card))
-                        rtsx_clear_xd_error(chip);
-
-                rtsx_init_cmd(chip);
-
-                xd_assign_phy_addr(chip, new_page, XD_RW_ADDR);
-                rtsx_add_cmd(chip, WRITE_REG_CMD, XD_PAGE_CNT, 0xFF, 1);
-                rtsx_add_cmd(chip, WRITE_REG_CMD, XD_TRANSFER, 0xFF,
-                             XD_TRANSFER_START | XD_WRITE_PAGES);
-                rtsx_add_cmd(chip, CHECK_REG_CMD, XD_TRANSFER, XD_TRANSFER_END, XD_TRANSFER_END);
-
-                retval = rtsx_send_cmd(chip, XD_CARD, 300);
-                if (retval < 0) {
-                        rtsx_clear_xd_error(chip);
-                        reg = 0;
-                        rtsx_read_register(chip, XD_DAT, &reg);
-                        if (reg & PROGRAM_ERROR) {
-                                xd_mark_bad_block(chip, new_blk);
-                                xd_set_err_code(chip, XD_PRG_ERROR);
-                                XD_SET_BAD_NEWBLK(xd_card);
-                        } else {
-                                xd_set_err_code(chip, XD_TO_ERROR);
-                        }
-                        TRACE_RET(chip, STATUS_FAIL);
-                }
-
-                old_page++;
-                new_page++;
-        }
-
-        return STATUS_SUCCESS;
-}
-
-static int xd_reset_cmd(struct rtsx_chip *chip)
-{
-        int retval;
-        u8 *ptr;
-
-        rtsx_init_cmd(chip);
-
-        rtsx_add_cmd(chip, WRITE_REG_CMD, XD_TRANSFER, 0xFF, XD_TRANSFER_START | XD_RESET);
-        rtsx_add_cmd(chip, CHECK_REG_CMD, XD_TRANSFER, XD_TRANSFER_END, XD_TRANSFER_END);
-        rtsx_add_cmd(chip, READ_REG_CMD, XD_DAT, 0, 0);
-        rtsx_add_cmd(chip, READ_REG_CMD, XD_CTL, 0, 0);
-
-        retval = rtsx_send_cmd(chip, XD_CARD, 100);
-        if (retval < 0)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        ptr = rtsx_get_cmd_data(chip) + 1;
-        if (((ptr[0] & READY_FLAG) == READY_STATE) && (ptr[1] & XD_RDY))
-                return STATUS_SUCCESS;
-
-        TRACE_RET(chip, STATUS_FAIL);
-}
-
-static int xd_erase_block(struct rtsx_chip *chip, u32 phy_blk)
-{
-        struct xd_info *xd_card = &(chip->xd_card);
-        u32 page_addr;
-        u8 reg = 0, *ptr;
-        int i, retval;
-
-        if (phy_blk == BLK_NOT_FOUND)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        page_addr = phy_blk << xd_card->block_shift;
-
-        for (i = 0; i < 3; i++) {
-                rtsx_init_cmd(chip);
-
-                xd_assign_phy_addr(chip, page_addr, XD_ERASE_ADDR);
-
-                rtsx_add_cmd(chip, WRITE_REG_CMD, XD_TRANSFER, 0xFF, XD_TRANSFER_START | XD_ERASE);
-                rtsx_add_cmd(chip, CHECK_REG_CMD, XD_TRANSFER, XD_TRANSFER_END, XD_TRANSFER_END);
-                rtsx_add_cmd(chip, READ_REG_CMD, XD_DAT, 0, 0);
-
-                retval = rtsx_send_cmd(chip, XD_CARD, 250);
-                if (retval < 0) {
-                        rtsx_clear_xd_error(chip);
-                        rtsx_read_register(chip, XD_DAT, &reg);
-                        if (reg & PROGRAM_ERROR) {
-                                xd_mark_bad_block(chip, phy_blk);
-                                xd_set_err_code(chip, XD_PRG_ERROR);
-                                TRACE_RET(chip, STATUS_FAIL);
-                        } else {
-                                xd_set_err_code(chip, XD_ERASE_FAIL);
-                        }
-                        retval = xd_reset_cmd(chip);
-                        if (retval != STATUS_SUCCESS)
-                                TRACE_RET(chip, STATUS_FAIL);
-                        continue;
-                }
-
-                ptr = rtsx_get_cmd_data(chip) + 1;
-                if (*ptr & PROGRAM_ERROR) {
-                        xd_mark_bad_block(chip, phy_blk);
-                        xd_set_err_code(chip, XD_PRG_ERROR);
-                        TRACE_RET(chip, STATUS_FAIL);
-                }
-
-                return STATUS_SUCCESS;
-        }
-
-        xd_mark_bad_block(chip, phy_blk);
-        xd_set_err_code(chip, XD_ERASE_FAIL);
-        TRACE_RET(chip, STATUS_FAIL);
-}
-
-
-static int xd_build_l2p_tbl(struct rtsx_chip *chip, int zone_no)
-{
-        struct xd_info *xd_card = &(chip->xd_card);
-        struct zone_entry *zone;
-        int retval;
-        u32 start, end, i;
-        u16 max_logoff, cur_fst_page_logoff, cur_lst_page_logoff, ent_lst_page_logoff;
-        u8 redunt[11];
-
-        RTSX_DEBUGP("xd_build_l2p_tbl: %d\n", zone_no);
-
-        if (xd_card->zone == NULL) {
-                retval = xd_init_l2p_tbl(chip);
-                if (retval != STATUS_SUCCESS)
-                        return retval;
-        }
-
-        if (xd_card->zone[zone_no].build_flag) {
-                RTSX_DEBUGP("l2p table of zone %d has been built\n", zone_no);
-                return STATUS_SUCCESS;
-        }
-
-        zone = &(xd_card->zone[zone_no]);
-
-        if (zone->l2p_table == NULL) {
-                zone->l2p_table = (u16 *)vmalloc(2000);
-                if (zone->l2p_table == NULL)
-                        TRACE_GOTO(chip, Build_Fail);
-        }
-        memset((u8 *)(zone->l2p_table), 0xff, 2000);
-
-        if (zone->free_table == NULL) {
-                zone->free_table = (u16 *)vmalloc(XD_FREE_TABLE_CNT * 2);
-                if (zone->free_table == NULL)
-                        TRACE_GOTO(chip, Build_Fail);
-        }
-        memset((u8 *)(zone->free_table), 0xff, XD_FREE_TABLE_CNT * 2);
-
-        if (zone_no == 0) {
-                if (xd_card->cis_block == 0xFFFF)
-                        start = 0;
-                else
-                        start = xd_card->cis_block + 1;
-                if (XD_CHK_4MB(xd_card)) {
-                        end = 0x200;
-                        max_logoff = 499;
-                } else {
-                        end = 0x400;
-                        max_logoff = 999;
-                }
-        } else {
-                start = (u32)(zone_no) << 10;
-                end = (u32)(zone_no + 1) << 10;
-                max_logoff = 999;
-        }
-
-        RTSX_DEBUGP("start block 0x%x, end block 0x%x\n", start, end);
-
-        zone->set_index = zone->get_index = 0;
-        zone->unused_blk_cnt = 0;
-
-        for (i = start; i < end; i++) {
-                u32 page_addr = i << xd_card->block_shift;
-                u32 phy_block;
-
-                retval = xd_read_redundant(chip, page_addr, redunt, 11);
-                if (retval != STATUS_SUCCESS)
-                        continue;
-
-                if (redunt[BLOCK_STATUS] != 0xFF) {
-                        RTSX_DEBUGP("bad block\n");
-                        continue;
-                }
-
-                if (xd_check_data_blank(redunt)) {
-                        RTSX_DEBUGP("blank block\n");
-                        xd_set_unused_block(chip, i);
-                        continue;
-                }
-
-                cur_fst_page_logoff = xd_load_log_block_addr(redunt);
-                if ((cur_fst_page_logoff == 0xFFFF) || (cur_fst_page_logoff > max_logoff)) {
-                        retval = xd_erase_block(chip, i);
-                        if (retval == STATUS_SUCCESS)
-                                xd_set_unused_block(chip, i);
-                        continue;
-                }
-
-                if ((zone_no == 0) && (cur_fst_page_logoff == 0) && (redunt[PAGE_STATUS] != XD_GPG))
-                        XD_SET_MBR_FAIL(xd_card);
-
-                if (zone->l2p_table[cur_fst_page_logoff] == 0xFFFF) {
-                        zone->l2p_table[cur_fst_page_logoff] = (u16)(i & 0x3FF);
-                        continue;
-                }
-
-                phy_block = zone->l2p_table[cur_fst_page_logoff] + ((u32)((zone_no) << 10));
-
-                page_addr = ((i + 1) << xd_card->block_shift) - 1;
-
-                retval = xd_read_redundant(chip, page_addr, redunt, 11);
-                if (retval != STATUS_SUCCESS)
-                        continue;
-
-                cur_lst_page_logoff = xd_load_log_block_addr(redunt);
-                if (cur_lst_page_logoff == cur_fst_page_logoff) {
-                        int m;
-
-                        page_addr = ((phy_block + 1) << xd_card->block_shift) - 1;
-
-                        for (m = 0; m < 3; m++) {
-                                retval = xd_read_redundant(chip, page_addr, redunt, 11);
-                                if (retval == STATUS_SUCCESS)
-                                        break;
-                        }
-
-                        if (m == 3) {
-                                zone->l2p_table[cur_fst_page_logoff] = (u16)(i & 0x3FF);
-                                retval = xd_erase_block(chip, phy_block);
-                                if (retval == STATUS_SUCCESS)
-                                        xd_set_unused_block(chip, phy_block);
-                                continue;
-                        }
-
-                        ent_lst_page_logoff = xd_load_log_block_addr(redunt);
-                        if (ent_lst_page_logoff != cur_fst_page_logoff) {
-                                zone->l2p_table[cur_fst_page_logoff] = (u16)(i & 0x3FF);
-                                retval = xd_erase_block(chip, phy_block);
-                                if (retval == STATUS_SUCCESS)
-                                        xd_set_unused_block(chip, phy_block);
-                                continue;
-                        } else {
-                                retval = xd_erase_block(chip, i);
-                                if (retval == STATUS_SUCCESS)
-                                        xd_set_unused_block(chip, i);
-                        }
-                } else {
-                        retval = xd_erase_block(chip, i);
-                        if (retval == STATUS_SUCCESS)
-                                xd_set_unused_block(chip, i);
-                }
-        }
-
-        if (XD_CHK_4MB(xd_card))
-                end = 500;
-        else
-                end = 1000;
-
-        i = 0;
-        for (start = 0; start < end; start++) {
-                if (zone->l2p_table[start] == 0xFFFF)
-                        i++;
-        }
-
-        RTSX_DEBUGP("Block count %d, invalid L2P entry %d\n", end, i);
-        RTSX_DEBUGP("Total unused block: %d\n", zone->unused_blk_cnt);
-
-        if ((zone->unused_blk_cnt - i) < 1)
-                chip->card_wp |= XD_CARD;
-
-        zone->build_flag = 1;
-
-        return STATUS_SUCCESS;
-
-Build_Fail:
-        if (zone->l2p_table) {
-                vfree(zone->l2p_table);
-                zone->l2p_table = NULL;
-        }
-        if (zone->free_table) {
-                vfree(zone->free_table);
-                zone->free_table = NULL;
-        }
-
-        return STATUS_FAIL;
-}
-
-static int xd_send_cmd(struct rtsx_chip *chip, u8 cmd)
-{
-        int retval;
-
-        rtsx_init_cmd(chip);
-
-        rtsx_add_cmd(chip, WRITE_REG_CMD, XD_DAT, 0xFF, cmd);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, XD_TRANSFER, 0xFF, XD_TRANSFER_START | XD_SET_CMD);
-        rtsx_add_cmd(chip, CHECK_REG_CMD, XD_TRANSFER, XD_TRANSFER_END, XD_TRANSFER_END);
-
-        retval = rtsx_send_cmd(chip, XD_CARD, 200);
-        if (retval < 0)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        return STATUS_SUCCESS;
-}
-
-static int xd_read_multiple_pages(struct rtsx_chip *chip, u32 phy_blk, u32 log_blk,
-                u8 start_page, u8 end_page, u8 *buf, unsigned int *index, unsigned int *offset)
-{
-        struct xd_info *xd_card = &(chip->xd_card);
-        u32 page_addr, new_blk;
-        u16 log_off;
-        u8 reg_val, page_cnt;
-        int zone_no, retval, i;
-
-        if (start_page > end_page)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        page_cnt = end_page - start_page;
-        zone_no = (int)(log_blk / 1000);
-        log_off = (u16)(log_blk % 1000);
-
-        if ((phy_blk & 0x3FF) == 0x3FF) {
-                for (i = 0; i < 256; i++) {
-                        page_addr = ((u32)i) << xd_card->block_shift;
-
-                        retval = xd_read_redundant(chip, page_addr, NULL, 0);
-                        if (retval == STATUS_SUCCESS)
-                                break;
-
-                        if (detect_card_cd(chip, XD_CARD) != STATUS_SUCCESS) {
-                                xd_set_err_code(chip, XD_NO_CARD);
-                                TRACE_RET(chip, STATUS_FAIL);
-                        }
-                }
-        }
-
-        page_addr = (phy_blk << xd_card->block_shift) + start_page;
-
-        rtsx_init_cmd(chip);
-
-        xd_assign_phy_addr(chip, page_addr, XD_RW_ADDR);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, XD_CFG, XD_PPB_TO_SIE, XD_PPB_TO_SIE);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_DATA_SOURCE, 0x01, RING_BUFFER);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, XD_PAGE_CNT, 0xFF, page_cnt);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, XD_CHK_DATA_STATUS,
-                        XD_AUTO_CHK_DATA_STATUS, XD_AUTO_CHK_DATA_STATUS);
-
-        trans_dma_enable(chip->srb->sc_data_direction, chip, page_cnt * 512, DMA_512);
-
-        rtsx_add_cmd(chip, WRITE_REG_CMD, XD_TRANSFER, 0xFF, XD_TRANSFER_START | XD_READ_PAGES);
-        rtsx_add_cmd(chip, CHECK_REG_CMD, XD_TRANSFER,
-                     XD_TRANSFER_END | XD_PPB_EMPTY, XD_TRANSFER_END | XD_PPB_EMPTY);
-
-        rtsx_send_cmd_no_wait(chip);
-
-        retval = rtsx_transfer_data_partial(chip, XD_CARD, buf, page_cnt * 512, scsi_sg_count(chip->srb),
-                        index, offset, DMA_FROM_DEVICE, chip->xd_timeout);
-        if (retval < 0) {
-                rtsx_clear_xd_error(chip);
-                xd_clear_dma_buffer(chip);
-
-                if (retval == -ETIMEDOUT) {
-                        xd_set_err_code(chip, XD_TO_ERROR);
-                        TRACE_RET(chip, STATUS_FAIL);
-                } else {
-                        TRACE_GOTO(chip, Fail);
-                }
-        }
-
-        return STATUS_SUCCESS;
-
-Fail:
-        RTSX_READ_REG(chip, XD_PAGE_STATUS, &reg_val);
-
-        if (reg_val !=  XD_GPG)
-                xd_set_err_code(chip, XD_PRG_ERROR);
-
-        RTSX_READ_REG(chip, XD_CTL, &reg_val);
-
-        if (((reg_val & (XD_ECC1_ERROR | XD_ECC1_UNCORRECTABLE))
-                                == (XD_ECC1_ERROR | XD_ECC1_UNCORRECTABLE))
-                || ((reg_val & (XD_ECC2_ERROR | XD_ECC2_UNCORRECTABLE))
-                        == (XD_ECC2_ERROR | XD_ECC2_UNCORRECTABLE))) {
-                wait_timeout(100);
-
-                if (detect_card_cd(chip, XD_CARD) != STATUS_SUCCESS) {
-                        xd_set_err_code(chip, XD_NO_CARD);
-                        TRACE_RET(chip, STATUS_FAIL);
-                }
-
-                xd_set_err_code(chip, XD_ECC_ERROR);
-
-                new_blk = xd_get_unused_block(chip, zone_no);
-                if (new_blk == NO_NEW_BLK) {
-                        XD_CLR_BAD_OLDBLK(xd_card);
-                        TRACE_RET(chip, STATUS_FAIL);
-                }
-
-                retval = xd_copy_page(chip, phy_blk, new_blk, 0, xd_card->page_off + 1);
-                if (retval != STATUS_SUCCESS) {
-                        if (!XD_CHK_BAD_NEWBLK(xd_card)) {
-                                retval = xd_erase_block(chip, new_blk);
-                                if (retval == STATUS_SUCCESS)
-                                        xd_set_unused_block(chip, new_blk);
-                        } else {
-                                XD_CLR_BAD_NEWBLK(xd_card);
-                        }
-                        XD_CLR_BAD_OLDBLK(xd_card);
-                        TRACE_RET(chip, STATUS_FAIL);
-                }
-                xd_set_l2p_tbl(chip, zone_no, log_off, (u16)(new_blk & 0x3FF));
-                xd_erase_block(chip, phy_blk);
-                xd_mark_bad_block(chip, phy_blk);
-                XD_CLR_BAD_OLDBLK(xd_card);
-        }
-
-        TRACE_RET(chip, STATUS_FAIL);
-}
-
-static int xd_finish_write(struct rtsx_chip *chip,
-                u32 old_blk, u32 new_blk, u32 log_blk, u8 page_off)
-{
-        struct xd_info *xd_card = &(chip->xd_card);
-        int retval, zone_no;
-        u16 log_off;
-
-        RTSX_DEBUGP("xd_finish_write, old_blk = 0x%x, new_blk = 0x%x, log_blk = 0x%x\n",
-                                old_blk, new_blk, log_blk);
-
-        if (page_off > xd_card->page_off)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        zone_no = (int)(log_blk / 1000);
-        log_off = (u16)(log_blk % 1000);
-
-        if (old_blk == BLK_NOT_FOUND) {
-                retval = xd_init_page(chip, new_blk, log_off,
-                                page_off, xd_card->page_off + 1);
-                if (retval != STATUS_SUCCESS) {
-                        retval = xd_erase_block(chip, new_blk);
-                        if (retval == STATUS_SUCCESS)
-                                xd_set_unused_block(chip, new_blk);
-                        TRACE_RET(chip, STATUS_FAIL);
-                }
-        } else {
-                retval = xd_copy_page(chip, old_blk, new_blk,
-                                page_off, xd_card->page_off + 1);
-                if (retval != STATUS_SUCCESS) {
-                        if (!XD_CHK_BAD_NEWBLK(xd_card)) {
-                                retval = xd_erase_block(chip, new_blk);
-                                if (retval == STATUS_SUCCESS)
-                                        xd_set_unused_block(chip, new_blk);
-                        }
-                        XD_CLR_BAD_NEWBLK(xd_card);
-                        TRACE_RET(chip, STATUS_FAIL);
-                }
-
-                retval = xd_erase_block(chip, old_blk);
-                if (retval == STATUS_SUCCESS) {
-                        if (XD_CHK_BAD_OLDBLK(xd_card)) {
-                                xd_mark_bad_block(chip, old_blk);
-                                XD_CLR_BAD_OLDBLK(xd_card);
-                        } else {
-                                xd_set_unused_block(chip, old_blk);
-                        }
-                } else {
-                        xd_set_err_code(chip, XD_NO_ERROR);
-                        XD_CLR_BAD_OLDBLK(xd_card);
-                }
-        }
-
-        xd_set_l2p_tbl(chip, zone_no, log_off, (u16)(new_blk & 0x3FF));
-
-        return STATUS_SUCCESS;
-}
-
-static int xd_prepare_write(struct rtsx_chip *chip,
-                u32 old_blk, u32 new_blk, u32 log_blk, u8 page_off)
-{
-        int retval;
-
-        RTSX_DEBUGP("%s, old_blk = 0x%x, new_blk = 0x%x, log_blk = 0x%x, page_off = %d\n",
-                                __func__, old_blk, new_blk, log_blk, (int)page_off);
-
-        if (page_off) {
-                retval = xd_copy_page(chip, old_blk, new_blk, 0, page_off);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        return STATUS_SUCCESS;
-}
-
-
-static int xd_write_multiple_pages(struct rtsx_chip *chip, u32 old_blk, u32 new_blk, u32 log_blk,
-                u8 start_page, u8 end_page, u8 *buf, unsigned int *index, unsigned int *offset)
-{
-        struct xd_info *xd_card = &(chip->xd_card);
-        u32 page_addr;
-        int zone_no, retval;
-        u16 log_off;
-        u8 page_cnt, reg_val;
-
-        RTSX_DEBUGP("%s, old_blk = 0x%x, new_blk = 0x%x, log_blk = 0x%x\n",
-                                __func__, old_blk, new_blk, log_blk);
-
-        if (start_page > end_page)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        page_cnt = end_page - start_page;
-        zone_no = (int)(log_blk / 1000);
-        log_off = (u16)(log_blk % 1000);
-
-        page_addr = (new_blk << xd_card->block_shift) + start_page;
-
-        retval = xd_send_cmd(chip, READ1_1);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        rtsx_init_cmd(chip);
-
-        rtsx_add_cmd(chip, WRITE_REG_CMD, XD_BLOCK_ADDR1_H, 0xFF, (u8)(log_off >> 8));
-        rtsx_add_cmd(chip, WRITE_REG_CMD, XD_BLOCK_ADDR1_L, 0xFF, (u8)log_off);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, XD_BLOCK_STATUS, 0xFF, XD_GBLK);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, XD_PAGE_STATUS, 0xFF, XD_GPG);
-
-        xd_assign_phy_addr(chip, page_addr, XD_RW_ADDR);
-
-        rtsx_add_cmd(chip, WRITE_REG_CMD, XD_CFG, XD_BA_TRANSFORM, XD_BA_TRANSFORM);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, XD_PAGE_CNT, 0xFF, page_cnt);
-        rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_DATA_SOURCE, 0x01, RING_BUFFER);
-
-        trans_dma_enable(chip->srb->sc_data_direction, chip, page_cnt * 512, DMA_512);
-
-        rtsx_add_cmd(chip, WRITE_REG_CMD, XD_TRANSFER, 0xFF, XD_TRANSFER_START | XD_WRITE_PAGES);
-        rtsx_add_cmd(chip, CHECK_REG_CMD, XD_TRANSFER, XD_TRANSFER_END, XD_TRANSFER_END);
-
-        rtsx_send_cmd_no_wait(chip);
-
-        retval = rtsx_transfer_data_partial(chip, XD_CARD, buf, page_cnt * 512, scsi_sg_count(chip->srb),
-                        index, offset, DMA_TO_DEVICE, chip->xd_timeout);
-        if (retval < 0) {
-                rtsx_clear_xd_error(chip);
-
-                if (retval == -ETIMEDOUT) {
-                        xd_set_err_code(chip, XD_TO_ERROR);
-                        TRACE_RET(chip, STATUS_FAIL);
-                } else {
-                        TRACE_GOTO(chip, Fail);
-                }
-        }
-
-        if (end_page == (xd_card->page_off + 1)) {
-                xd_card->delay_write.delay_write_flag = 0;
-
-                if (old_blk != BLK_NOT_FOUND) {
-                        retval = xd_erase_block(chip, old_blk);
-                        if (retval == STATUS_SUCCESS) {
-                                if (XD_CHK_BAD_OLDBLK(xd_card)) {
-                                        xd_mark_bad_block(chip, old_blk);
-                                        XD_CLR_BAD_OLDBLK(xd_card);
-                                } else {
-                                        xd_set_unused_block(chip, old_blk);
-                                }
-                        } else {
-                                xd_set_err_code(chip, XD_NO_ERROR);
-                                XD_CLR_BAD_OLDBLK(xd_card);
-                        }
-                }
-                xd_set_l2p_tbl(chip, zone_no, log_off, (u16)(new_blk & 0x3FF));
-        }
-
-        return STATUS_SUCCESS;
-
-Fail:
-        RTSX_READ_REG(chip, XD_DAT, &reg_val);
-        if (reg_val & PROGRAM_ERROR) {
-                xd_set_err_code(chip, XD_PRG_ERROR);
-                xd_mark_bad_block(chip, new_blk);
-        }
-
-        TRACE_RET(chip, STATUS_FAIL);
-}
-
-#ifdef XD_DELAY_WRITE
-int xd_delay_write(struct rtsx_chip *chip)
-{
-        struct xd_info *xd_card = &(chip->xd_card);
-        struct xd_delay_write_tag *delay_write = &(xd_card->delay_write);
-        int retval;
-
-        if (delay_write->delay_write_flag) {
-                RTSX_DEBUGP("xd_delay_write\n");
-                retval = xd_switch_clock(chip);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-
-                delay_write->delay_write_flag = 0;
-                retval = xd_finish_write(chip,
-                                delay_write->old_phyblock, delay_write->new_phyblock,
-                                delay_write->logblock, delay_write->pageoff);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        return STATUS_SUCCESS;
-}
-#endif
-
-int xd_rw(struct scsi_cmnd *srb, struct rtsx_chip *chip, u32 start_sector, u16 sector_cnt)
-{
-        struct xd_info *xd_card = &(chip->xd_card);
-        unsigned int lun = SCSI_LUN(srb);
-#ifdef XD_DELAY_WRITE
-        struct xd_delay_write_tag *delay_write = &(xd_card->delay_write);
-#endif
-        int retval, zone_no;
-        unsigned int index = 0, offset = 0;
-        u32 log_blk, old_blk = 0, new_blk = 0;
-        u16 log_off, total_sec_cnt = sector_cnt;
-        u8 start_page, end_page = 0, page_cnt;
-        u8 *ptr;
-
-        xd_set_err_code(chip, XD_NO_ERROR);
-
-        xd_card->cleanup_counter = 0;
-
-        RTSX_DEBUGP("xd_rw: scsi_sg_count = %d\n", scsi_sg_count(srb));
-
-        ptr = (u8 *)scsi_sglist(srb);
-
-        retval = xd_switch_clock(chip);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-
-        if (detect_card_cd(chip, XD_CARD) != STATUS_SUCCESS) {
-                chip->card_fail |= XD_CARD;
-                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_NOT_PRESENT);
-                TRACE_RET(chip, STATUS_FAIL);
-        }
-
-        log_blk = start_sector >> xd_card->block_shift;
-        start_page = (u8)start_sector & xd_card->page_off;
-        zone_no = (int)(log_blk / 1000);
-        log_off = (u16)(log_blk % 1000);
-
-        if (xd_card->zone[zone_no].build_flag == 0) {
-                retval = xd_build_l2p_tbl(chip, zone_no);
-                if (retval != STATUS_SUCCESS) {
-                        chip->card_fail |= XD_CARD;
-                        set_sense_type(chip, lun, SENSE_TYPE_MEDIA_NOT_PRESENT);
-                        TRACE_RET(chip, STATUS_FAIL);
-                }
-        }
-
-        if (srb->sc_data_direction == DMA_TO_DEVICE) {
-#ifdef XD_DELAY_WRITE
-                if (delay_write->delay_write_flag &&
-                                (delay_write->logblock == log_blk) &&
-                                (start_page > delay_write->pageoff)) {
-                        delay_write->delay_write_flag = 0;
-                        if (delay_write->old_phyblock != BLK_NOT_FOUND) {
-                                retval = xd_copy_page(chip,
-                                        delay_write->old_phyblock,
-                                        delay_write->new_phyblock,
-                                        delay_write->pageoff, start_page);
-                                if (retval != STATUS_SUCCESS) {
-                                        set_sense_type(chip, lun, SENSE_TYPE_MEDIA_WRITE_ERR);
-                                        TRACE_RET(chip, STATUS_FAIL);
-                                }
-                        }
-                        old_blk = delay_write->old_phyblock;
-                        new_blk = delay_write->new_phyblock;
-                } else if (delay_write->delay_write_flag &&
-                                (delay_write->logblock == log_blk) &&
-                                (start_page == delay_write->pageoff)) {
-                        delay_write->delay_write_flag = 0;
-                        old_blk = delay_write->old_phyblock;
-                        new_blk = delay_write->new_phyblock;
-                } else {
-                        retval = xd_delay_write(chip);
-                        if (retval != STATUS_SUCCESS) {
-                                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_WRITE_ERR);
-                                TRACE_RET(chip, STATUS_FAIL);
-                        }
-#endif
-                        old_blk = xd_get_l2p_tbl(chip, zone_no, log_off);
-                        new_blk  = xd_get_unused_block(chip, zone_no);
-                        if ((old_blk == BLK_NOT_FOUND) || (new_blk == BLK_NOT_FOUND)) {
-                                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_WRITE_ERR);
-                                TRACE_RET(chip, STATUS_FAIL);
-                        }
-
-                        retval = xd_prepare_write(chip, old_blk, new_blk, log_blk, start_page);
-                        if (retval != STATUS_SUCCESS) {
-                                if (detect_card_cd(chip, XD_CARD) != STATUS_SUCCESS) {
-                                        set_sense_type(chip, lun, SENSE_TYPE_MEDIA_NOT_PRESENT);
-                                        TRACE_RET(chip, STATUS_FAIL);
-                                }
-                                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_WRITE_ERR);
-                                TRACE_RET(chip, STATUS_FAIL);
-                        }
-#ifdef XD_DELAY_WRITE
-                }
-#endif
-        } else {
-#ifdef XD_DELAY_WRITE
-                retval = xd_delay_write(chip);
-                if (retval != STATUS_SUCCESS) {
-                        if (detect_card_cd(chip, XD_CARD) != STATUS_SUCCESS) {
-                                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_NOT_PRESENT);
-                                TRACE_RET(chip, STATUS_FAIL);
-                        }
-                        set_sense_type(chip, lun, SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR);
-                        TRACE_RET(chip, STATUS_FAIL);
-                }
-#endif
-
-                old_blk = xd_get_l2p_tbl(chip, zone_no, log_off);
-                if (old_blk == BLK_NOT_FOUND) {
-                        set_sense_type(chip, lun, SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR);
-                        TRACE_RET(chip, STATUS_FAIL);
-                }
-        }
-
-        RTSX_DEBUGP("old_blk = 0x%x\n", old_blk);
-
-        while (total_sec_cnt) {
-                if (detect_card_cd(chip, XD_CARD) != STATUS_SUCCESS) {
-                        chip->card_fail |= XD_CARD;
-                        set_sense_type(chip, lun, SENSE_TYPE_MEDIA_NOT_PRESENT);
-                        TRACE_RET(chip, STATUS_FAIL);
-                }
-
-                if ((start_page + total_sec_cnt) > (xd_card->page_off + 1))
-                        end_page = xd_card->page_off + 1;
-                else
-                        end_page = start_page + (u8)total_sec_cnt;
-
-                page_cnt = end_page - start_page;
-                if (srb->sc_data_direction == DMA_FROM_DEVICE) {
-                        retval = xd_read_multiple_pages(chip, old_blk, log_blk,
-                                        start_page, end_page, ptr, &index, &offset);
-                        if (retval != STATUS_SUCCESS) {
-                                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR);
-                                TRACE_RET(chip, STATUS_FAIL);
-                        }
-                } else {
-                        retval = xd_write_multiple_pages(chip, old_blk, new_blk, log_blk,
-                                        start_page, end_page, ptr, &index, &offset);
-                        if (retval != STATUS_SUCCESS) {
-                                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_WRITE_ERR);
-                                TRACE_RET(chip, STATUS_FAIL);
-                        }
-                }
-
-                total_sec_cnt -= page_cnt;
-                if (scsi_sg_count(srb) == 0)
-                        ptr += page_cnt * 512;
-
-                if (total_sec_cnt == 0)
-                        break;
-
-                log_blk++;
-                zone_no = (int)(log_blk / 1000);
-                log_off = (u16)(log_blk % 1000);
-
-                if (xd_card->zone[zone_no].build_flag == 0) {
-                        retval = xd_build_l2p_tbl(chip, zone_no);
-                        if (retval != STATUS_SUCCESS) {
-                                chip->card_fail |= XD_CARD;
-                                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_NOT_PRESENT);
-                                TRACE_RET(chip, STATUS_FAIL);
-                        }
-                }
-
-                old_blk = xd_get_l2p_tbl(chip, zone_no, log_off);
-                if (old_blk == BLK_NOT_FOUND) {
-                        if (srb->sc_data_direction == DMA_FROM_DEVICE)
-                                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR);
-                        else
-                                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_WRITE_ERR);
-                        
-                        TRACE_RET(chip, STATUS_FAIL);
-                }
-
-                if (srb->sc_data_direction == DMA_TO_DEVICE) {
-                        new_blk = xd_get_unused_block(chip, zone_no);
-                        if (new_blk == BLK_NOT_FOUND) {
-                                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_WRITE_ERR);
-                                TRACE_RET(chip, STATUS_FAIL);
-                        }
-                }
-
-                start_page = 0;
-        }
-
-        if ((srb->sc_data_direction == DMA_TO_DEVICE) &&
-                        (end_page != (xd_card->page_off + 1))) {
-#ifdef XD_DELAY_WRITE
-                delay_write->delay_write_flag = 1;
-                delay_write->old_phyblock = old_blk;
-                delay_write->new_phyblock = new_blk;
-                delay_write->logblock = log_blk;
-                delay_write->pageoff = end_page;
-#else
-                if (detect_card_cd(chip, XD_CARD) != STATUS_SUCCESS) {
-                        chip->card_fail |= XD_CARD;
-                        set_sense_type(chip, lun, SENSE_TYPE_MEDIA_NOT_PRESENT);
-                        TRACE_RET(chip, STATUS_FAIL);
-                }
-
-                retval = xd_finish_write(chip, old_blk, new_blk, log_blk, end_page);
-                if (retval != STATUS_SUCCESS) {
-                        if (detect_card_cd(chip, XD_CARD) != STATUS_SUCCESS) {
-                                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_NOT_PRESENT);
-                                TRACE_RET(chip, STATUS_FAIL);
-                        }
-                        set_sense_type(chip, lun, SENSE_TYPE_MEDIA_WRITE_ERR);
-                        TRACE_RET(chip, STATUS_FAIL);
-                }
-#endif
-        }
-
-        scsi_set_resid(srb, 0);
-
-        return STATUS_SUCCESS;
-}
-
-void xd_free_l2p_tbl(struct rtsx_chip *chip)
-{
-        struct xd_info *xd_card = &(chip->xd_card);
-        int i = 0;
-
-        if (xd_card->zone != NULL) {
-                for (i = 0; i < xd_card->zone_cnt; i++) {
-                        if (xd_card->zone[i].l2p_table != NULL) {
-                                vfree(xd_card->zone[i].l2p_table);
-                                xd_card->zone[i].l2p_table = NULL;
-                        }
-                        if (xd_card->zone[i].free_table != NULL) {
-                                vfree(xd_card->zone[i].free_table);
-                                xd_card->zone[i].free_table = NULL;
-                        }
-                }
-                vfree(xd_card->zone);
-                xd_card->zone = NULL;
-        }
-}
-
-void xd_cleanup_work(struct rtsx_chip *chip)
-{
-#ifdef XD_DELAY_WRITE
-        struct xd_info *xd_card = &(chip->xd_card);
-
-        if (xd_card->delay_write.delay_write_flag) {
-                RTSX_DEBUGP("xD: delay write\n");
-                xd_delay_write(chip);
-                xd_card->cleanup_counter = 0;
-        }
-#endif
-}
-
-int xd_power_off_card3v3(struct rtsx_chip *chip)
-{
-        int retval;
-
-        retval = disable_card_clock(chip, XD_CARD);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        RTSX_WRITE_REG(chip, CARD_OE, XD_OUTPUT_EN, 0);
-
-        if (!chip->ft2_fast_mode) {
-                retval = card_power_off(chip, XD_CARD);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-
-                wait_timeout(50);
-        }
-
-        if (chip->asic_code) {
-                retval = xd_pull_ctl_disable(chip);
-                if (retval != STATUS_SUCCESS)
-                        TRACE_RET(chip, STATUS_FAIL);
-        } else {
-                RTSX_WRITE_REG(chip, FPGA_PULL_CTL, 0xFF, 0xDF);
-        }
-
-        return STATUS_SUCCESS;
-}
-
-int release_xd_card(struct rtsx_chip *chip)
-{
-        struct xd_info *xd_card = &(chip->xd_card);
-        int retval;
-
-        RTSX_DEBUGP("release_xd_card\n");
-
-        chip->card_ready &= ~XD_CARD;
-        chip->card_fail &= ~XD_CARD;
-        chip->card_wp &= ~XD_CARD;
-
-        xd_card->delay_write.delay_write_flag = 0;
-
-        xd_free_l2p_tbl(chip);
-
-        retval = xd_power_off_card3v3(chip);
-        if (retval != STATUS_SUCCESS)
-                TRACE_RET(chip, STATUS_FAIL);
-
-        return STATUS_SUCCESS;
-}
diff --git a/drivers/staging/rts_pstor/xd.h b/drivers/staging/rts_pstor/xd.h
deleted file mode 100644
index cd9fbc1f96de..000000000000
--- a/drivers/staging/rts_pstor/xd.h
+++ /dev/null
@@ -1,188 +0,0 @@
-/* Driver for Realtek PCI-Express card reader
- * Header file
- *
- * Copyright(c) 2009 Realtek Semiconductor Corp. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2, 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, see <http://www.gnu.org/licenses/>.
- *
- * Author:
- *   wwang (wei_wang@realsil.com.cn)
- *   No. 450, Shenhu Road, Suzhou Industry Park, Suzhou, China
- */
-
-#ifndef __REALTEK_RTSX_XD_H
-#define __REALTEK_RTSX_XD_H
-
-#define XD_DELAY_WRITE
-
-/* Error Codes */
-#define XD_NO_ERROR                     0x00
-#define XD_NO_MEMORY                    0x80
-#define XD_PRG_ERROR                    0x40
-#define XD_NO_CARD                      0x20
-#define XD_READ_FAIL                    0x10
-#define XD_ERASE_FAIL                   0x08
-#define XD_WRITE_FAIL                   0x04
-#define XD_ECC_ERROR                    0x02
-#define XD_TO_ERROR                     0x01
-
-/* XD Commands */
-#define READ1_1                         0x00
-#define READ1_2                         0x01
-#define READ2                           0x50
-#define READ_ID                         0x90
-#define RESET                           0xff
-#define PAGE_PRG_1                      0x80
-#define PAGE_PRG_2                      0x10
-#define BLK_ERASE_1                     0x60
-#define BLK_ERASE_2                     0xD0
-#define READ_STS                        0x70
-#define READ_xD_ID                      0x9A
-#define COPY_BACK_512                   0x8A
-#define COPY_BACK_2K                    0x85
-#define READ1_1_2                       0x30
-#define READ1_1_3                       0x35
-#define CHG_DAT_OUT_1                   0x05
-#define RDM_DAT_OUT_1                   0x05
-#define CHG_DAT_OUT_2                   0xE0
-#define RDM_DAT_OUT_2                   0xE0
-#define CHG_DAT_OUT_2                   0xE0
-#define CHG_DAT_IN_1                    0x85
-#define CACHE_PRG                       0x15
-
-/* Redundant Area Related */
-#define XD_EXTRA_SIZE                   0x10
-#define XD_2K_EXTRA_SIZE                0x40
-
-#define NOT_WRITE_PROTECTED             0x80
-#define READY_STATE                     0x40
-#define PROGRAM_ERROR                   0x01
-#define PROGRAM_ERROR_N_1               0x02
-#define INTERNAL_READY                  0x20
-#define READY_FLAG                      0x5F
-
-#define XD_8M_X8_512                    0xE6
-#define XD_16M_X8_512                   0x73
-#define XD_32M_X8_512                   0x75
-#define XD_64M_X8_512                   0x76
-#define XD_128M_X8_512                  0x79
-#define XD_256M_X8_512                  0x71
-#define XD_128M_X8_2048                 0xF1
-#define XD_256M_X8_2048                 0xDA
-#define XD_512M_X8                      0xDC
-#define XD_128M_X16_2048                0xC1
-#define XD_4M_X8_512_1                  0xE3
-#define XD_4M_X8_512_2                  0xE5
-#define xD_1G_X8_512                    0xD3
-#define xD_2G_X8_512                    0xD5
-
-#define XD_ID_CODE                      0xB5
-
-#define VENDOR_BLOCK                    0xEFFF
-#define CIS_BLOCK                       0xDFFF
-
-#define BLK_NOT_FOUND                   0xFFFFFFFF
-
-#define NO_NEW_BLK                      0xFFFFFFFF
-
-#define PAGE_CORRECTABLE                0x0
-#define PAGE_NOTCORRECTABLE             0x1
-
-#define NO_OFFSET                       0x0
-#define WITH_OFFSET                     0x1
-
-#define Sect_Per_Page                   4
-#define XD_ADDR_MODE_2C                 XD_ADDR_MODE_2A
-
-#define ZONE0_BAD_BLOCK                 23
-#define NOT_ZONE0_BAD_BLOCK             24
-
-#define XD_RW_ADDR                      0x01
-#define XD_ERASE_ADDR                   0x02
-
-#define XD_PAGE_512(xd_card)            \
-do {                                    \
-        (xd_card)->block_shift = 5;     \
-        (xd_card)->page_off = 0x1F;     \
-} while (0)
-
-#define XD_SET_BAD_NEWBLK(xd_card)      ((xd_card)->multi_flag |= 0x01)
-#define XD_CLR_BAD_NEWBLK(xd_card)      ((xd_card)->multi_flag &= ~0x01)
-#define XD_CHK_BAD_NEWBLK(xd_card)      ((xd_card)->multi_flag & 0x01)
-
-#define XD_SET_BAD_OLDBLK(xd_card)      ((xd_card)->multi_flag |= 0x02)
-#define XD_CLR_BAD_OLDBLK(xd_card)      ((xd_card)->multi_flag &= ~0x02)
-#define XD_CHK_BAD_OLDBLK(xd_card)      ((xd_card)->multi_flag & 0x02)
-
-#define XD_SET_MBR_FAIL(xd_card)        ((xd_card)->multi_flag |= 0x04)
-#define XD_CLR_MBR_FAIL(xd_card)        ((xd_card)->multi_flag &= ~0x04)
-#define XD_CHK_MBR_FAIL(xd_card)        ((xd_card)->multi_flag & 0x04)
-
-#define XD_SET_ECC_FLD_ERR(xd_card)     ((xd_card)->multi_flag |= 0x08)
-#define XD_CLR_ECC_FLD_ERR(xd_card)     ((xd_card)->multi_flag &= ~0x08)
-#define XD_CHK_ECC_FLD_ERR(xd_card)     ((xd_card)->multi_flag & 0x08)
-
-#define XD_SET_4MB(xd_card)             ((xd_card)->multi_flag |= 0x10)
-#define XD_CLR_4MB(xd_card)             ((xd_card)->multi_flag &= ~0x10)
-#define XD_CHK_4MB(xd_card)             ((xd_card)->multi_flag & 0x10)
-
-#define XD_SET_ECC_ERR(xd_card)         ((xd_card)->multi_flag |= 0x40)
-#define XD_CLR_ECC_ERR(xd_card)         ((xd_card)->multi_flag &= ~0x40)
-#define XD_CHK_ECC_ERR(xd_card)         ((xd_card)->multi_flag & 0x40)
-
-#define PAGE_STATUS             0
-#define BLOCK_STATUS            1
-#define BLOCK_ADDR1_L           2
-#define BLOCK_ADDR1_H           3
-#define BLOCK_ADDR2_L           4
-#define BLOCK_ADDR2_H           5
-#define RESERVED0               6
-#define RESERVED1               7
-#define RESERVED2               8
-#define RESERVED3               9
-#define PARITY                  10
-
-#define CIS0_0                  0
-#define CIS0_1                  1
-#define CIS0_2                  2
-#define CIS0_3                  3
-#define CIS0_4                  4
-#define CIS0_5                  5
-#define CIS0_6                  6
-#define CIS0_7                  7
-#define CIS0_8                  8
-#define CIS0_9                  9
-#define CIS1_0                  256
-#define CIS1_1                  (256 + 1)
-#define CIS1_2                  (256 + 2)
-#define CIS1_3                  (256 + 3)
-#define CIS1_4                  (256 + 4)
-#define CIS1_5                  (256 + 5)
-#define CIS1_6                  (256 + 6)
-#define CIS1_7                  (256 + 7)
-#define CIS1_8                  (256 + 8)
-#define CIS1_9                  (256 + 9)
-
-int reset_xd_card(struct rtsx_chip *chip);
-#ifdef XD_DELAY_WRITE
-int xd_delay_write(struct rtsx_chip *chip);
-#endif
-int xd_rw(struct scsi_cmnd *srb, struct rtsx_chip *chip, u32 start_sector, u16 sector_cnt);
-void xd_free_l2p_tbl(struct rtsx_chip *chip);
-void xd_cleanup_work(struct rtsx_chip *chip);
-int xd_power_off_card3v3(struct rtsx_chip *chip);
-int release_xd_card(struct rtsx_chip *chip);
-
-#endif  /* __REALTEK_RTSX_XD_H */
-
diff --git a/drivers/staging/sbe-2t3e3/cpld.c b/drivers/staging/sbe-2t3e3/cpld.c
index cc2b54d52b1b..27365f9bc0b0 100644
--- a/drivers/staging/sbe-2t3e3/cpld.c
+++ b/drivers/staging/sbe-2t3e3/cpld.c
@@ -338,7 +338,7 @@ void cpld_set_fractional_mode(struct channel *sc, u32 mode,
                            SBE_2T3E3_CPLD_VAL_FRACTIONAL_MODE_2);
                 break;
         default:
-                printk(KERN_ERR "wrong mode in set_fractional_mode\n");
+                netdev_err(sc->dev, "wrong mode in set_fractional_mode\n");
                 return;
         }
 
diff --git a/drivers/staging/sbe-2t3e3/main.c b/drivers/staging/sbe-2t3e3/main.c
index f3dbef6b0eef..c8e039860dc4 100644
--- a/drivers/staging/sbe-2t3e3/main.c
+++ b/drivers/staging/sbe-2t3e3/main.c
@@ -135,9 +135,10 @@ void t3e3_read_card_serial_number(struct channel *sc)
         for (i = 0; i < 3; i++)
                 sc->ether.card_serial_number[i] = t3e3_eeprom_read_word(sc, 10 + i);
 
-        printk(KERN_INFO "SBE wanPMC-2T3E3 serial number: %04X%04X%04X\n",
-               sc->ether.card_serial_number[0], sc->ether.card_serial_number[1],
-               sc->ether.card_serial_number[2]);
+        netdev_info(sc->dev, "SBE wanPMC-2T3E3 serial number: %04X%04X%04X\n",
+                    sc->ether.card_serial_number[0],
+                    sc->ether.card_serial_number[1],
+                    sc->ether.card_serial_number[2]);
 }
 
 /*
diff --git a/drivers/staging/sbe-2t3e3/module.c b/drivers/staging/sbe-2t3e3/module.c
index 8adb17816ad9..ae7af397a992 100644
--- a/drivers/staging/sbe-2t3e3/module.c
+++ b/drivers/staging/sbe-2t3e3/module.c
@@ -10,6 +10,8 @@
  * This code is based on a driver written by SBE Inc.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
@@ -50,7 +52,7 @@ static void t3e3_remove_channel(struct channel *channel)
         pci_set_drvdata(pdev, NULL);
 }
 
-static int __devinit t3e3_init_channel(struct channel *channel, struct pci_dev *pdev, struct card *card)
+static int t3e3_init_channel(struct channel *channel, struct pci_dev *pdev, struct card *card)
 {
         struct net_device *dev;
         unsigned int val;
@@ -66,7 +68,7 @@ static int __devinit t3e3_init_channel(struct channel *channel, struct pci_dev *
 
         dev = alloc_hdlcdev(channel);
         if (!dev) {
-                printk(KERN_ERR "SBE 2T3E3" ": Out of memory\n");
+                pr_err("Out of memory\n");
                 err = -ENOMEM;
                 goto free_regions;
         }
@@ -96,7 +98,8 @@ static int __devinit t3e3_init_channel(struct channel *channel, struct pci_dev *
 
         err = request_irq(dev->irq, &t3e3_intr, IRQF_SHARED, dev->name, dev);
         if (err) {
-                printk(KERN_WARNING "%s: could not get irq: %d\n", dev->name, dev->irq);
+                netdev_warn(channel->dev, "%s: could not get irq: %d\n",
+                            dev->name, dev->irq);
                 goto unregister_dev;
         }
 
@@ -114,7 +117,7 @@ disable:
         return err;
 }
 
-static void __devexit t3e3_remove_card(struct pci_dev *pdev)
+static void t3e3_remove_card(struct pci_dev *pdev)
 {
         struct channel *channel0 = pci_get_drvdata(pdev);
         struct card *card = channel0->card;
@@ -128,7 +131,7 @@ static void __devexit t3e3_remove_card(struct pci_dev *pdev)
         kfree(card);
 }
 
-static int __devinit t3e3_init_card(struct pci_dev *pdev, const struct pci_device_id *ent)
+static int t3e3_init_card(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
         /* pdev points to channel #0 */
         struct pci_dev *pdev1 = NULL;
@@ -144,7 +147,7 @@ static int __devinit t3e3_init_card(struct pci_dev *pdev, const struct pci_devic
                                 break; /* found the second channel */
 
                 if (!pdev1) {
-                        printk(KERN_ERR "SBE 2T3E3" ": Can't find the second channel\n");
+                        dev_err(&pdev->dev, "Can't find the second channel\n");
                         return -EFAULT;
                 }
                 channels = 2;
@@ -153,7 +156,7 @@ static int __devinit t3e3_init_card(struct pci_dev *pdev, const struct pci_devic
 
         card = kzalloc(sizeof(struct card) + channels * sizeof(struct channel), GFP_KERNEL);
         if (!card) {
-                printk(KERN_ERR "SBE 2T3E3" ": Out of memory\n");
+                dev_err(&pdev->dev, "Out of memory\n");
                 return -ENOBUFS;
         }
 
@@ -185,7 +188,7 @@ free_card:
         return err;
 }
 
-static struct pci_device_id t3e3_pci_tbl[] __devinitdata = {
+static struct pci_device_id t3e3_pci_tbl[] = {
         { PCI_VENDOR_ID_DEC, PCI_DEVICE_ID_DEC_21142,
           PCI_VENDOR_ID_SBE, PCI_SUBDEVICE_ID_SBE_T3E3, 0, 0, 0 },
         { PCI_VENDOR_ID_DEC, PCI_DEVICE_ID_DEC_21142,
diff --git a/drivers/staging/sbe-2t3e3/netdev.c b/drivers/staging/sbe-2t3e3/netdev.c
index 180c96327b9a..1f5088b3c10b 100644
--- a/drivers/staging/sbe-2t3e3/netdev.c
+++ b/drivers/staging/sbe-2t3e3/netdev.c
@@ -57,7 +57,7 @@ static int t3e3_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
         return 0;
 }
 
-static struct net_device_stats* t3e3_get_stats(struct net_device *dev)
+static struct net_device_stats *t3e3_get_stats(struct net_device *dev)
 {
         struct net_device_stats *nstats = &dev->stats;
         struct channel *sc = dev_to_priv(dev);
@@ -134,7 +134,8 @@ int setup_device(struct net_device *dev, struct channel *sc)
         dev->tx_queue_len = 100;
         hdlc->xmit = t3e3_if_start_xmit;
         hdlc->attach = t3e3_attach;
-        if ((retval = register_hdlc_device(dev))) {
+        retval = register_hdlc_device(dev);
+        if (retval) {
                 dev_err(&sc->pdev->dev, "error registering HDLC device\n");
                 return retval;
         }
diff --git a/drivers/staging/sep/sep_main.c b/drivers/staging/sep/sep_main.c
index a414e52dd082..15c6e3d9437c 100644
--- a/drivers/staging/sep/sep_main.c
+++ b/drivers/staging/sep/sep_main.c
@@ -3431,7 +3431,7 @@ static ssize_t sep_create_dcb_dmatables_context(struct sep_device *sep,
         if (copy_from_user(dcb_args,
                         user_dcb_args,
                         num_dcbs * sizeof(struct build_dcb_struct))) {
-                error = -EINVAL;
+                error = -EFAULT;
                 goto end_function;
         }
 
@@ -3619,7 +3619,7 @@ static ssize_t sep_create_msgarea_context(struct sep_device *sep,
 
         /* Copy input data to write() to allocated message buffer */
         if (copy_from_user(*msg_region, msg_user, msg_len)) {
-                error = -EINVAL;
+                error = -EFAULT;
                 goto end_function;
         }
 
@@ -4112,7 +4112,7 @@ static int sep_register_driver_with_fs(struct sep_device *sep)
  *Attempt to set up and configure a SEP device that has been
  *discovered by the PCI layer. Allocates all required resources.
  */
-static int __devinit sep_probe(struct pci_dev *pdev,
+static int sep_probe(struct pci_dev *pdev,
         const struct pci_device_id *ent)
 {
         int error = 0;
diff --git a/drivers/staging/serqt_usb2/serqt_usb2.c b/drivers/staging/serqt_usb2/serqt_usb2.c
index 099bc69ca00c..1b3e995d3a27 100644
--- a/drivers/staging/serqt_usb2/serqt_usb2.c
+++ b/drivers/staging/serqt_usb2/serqt_usb2.c
@@ -272,7 +272,8 @@ static void qt_write_bulk_callback(struct urb *urb)
         status = urb->status;
 
         if (status) {
-                dev_dbg(&urb->dev->dev, "nonzero write bulk status received:%d\n", status);
+                dev_dbg(&urb->dev->dev,
+                        "nonzero write bulk status received:%d\n", status);
                 return;
         }
 
@@ -290,22 +291,80 @@ static void qt_interrupt_callback(struct urb *urb)
         /* FIXME */
 }
 
+static void qt_status_change_check(struct tty_struct *tty,
+                                   struct urb *urb,
+                                   struct quatech_port *qt_port,
+                                   struct usb_serial_port *port)
+{
+        int flag, i;
+        unsigned char *data = urb->transfer_buffer;
+        unsigned int RxCount = urb->actual_length;
+
+        for (i = 0; i < RxCount; ++i) {
+                /* Look ahead code here */
+                if ((i <= (RxCount - 3)) && (data[i] == 0x1b)
+                    && (data[i + 1] == 0x1b)) {
+                        flag = 0;
+                        switch (data[i + 2]) {
+                        case 0x00:
+                                if (i > (RxCount - 4)) {
+                                        dev_dbg(&port->dev,
+                                                "Illegal escape seuences in received data\n");
+                                        break;
+                                }
+
+                                ProcessLineStatus(qt_port, data[i + 3]);
+
+                                i += 3;
+                                flag = 1;
+                                break;
+
+                        case 0x01:
+                                if (i > (RxCount - 4)) {
+                                        dev_dbg(&port->dev,
+                                                "Illegal escape seuences in received data\n");
+                                        break;
+                                }
+
+                                ProcessModemStatus(qt_port, data[i + 3]);
+
+                                i += 3;
+                                flag = 1;
+                                break;
+
+                        case 0xff:
+                                dev_dbg(&port->dev, "No status sequence.\n");
+
+                                ProcessRxChar(tty, port, data[i]);
+                                ProcessRxChar(tty, port, data[i + 1]);
+
+                                i += 2;
+                                break;
+                        }
+                        if (flag == 1)
+                                continue;
+                }
+
+                if (tty && urb->actual_length)
+                        tty_insert_flip_char(tty, data[i], TTY_NORMAL);
+
+        }
+        tty_flip_buffer_push(tty);
+}
+
 static void qt_read_bulk_callback(struct urb *urb)
 {
 
         struct usb_serial_port *port = urb->context;
         struct usb_serial *serial = get_usb_serial(port, __func__);
         struct quatech_port *qt_port = qt_get_port_private(port);
-        unsigned char *data;
         struct tty_struct *tty;
-        unsigned int index;
-        unsigned int RxCount;
-        int i, result;
-        int flag, flag_data;
+        int result;
 
         if (urb->status) {
                 qt_port->ReadBulkStopped = 1;
-                dev_dbg(&urb->dev->dev, "%s - nonzero write bulk status received: %d\n",
+                dev_dbg(&urb->dev->dev,
+                        "%s - nonzero write bulk status received: %d\n",
                         __func__, urb->status);
                 return;
         }
@@ -314,14 +373,8 @@ static void qt_read_bulk_callback(struct urb *urb)
         if (!tty)
                 return;
 
-        data = urb->transfer_buffer;
-
-        RxCount = urb->actual_length;
-
-        /* index = MINOR(port->tty->device) - serial->minor; */
-        index = tty->index - serial->minor;
-
-        dev_dbg(&port->dev, "%s - port->RxHolding = %d\n", __func__, qt_port->RxHolding);
+        dev_dbg(&port->dev,
+                "%s - port->RxHolding = %d\n", __func__, qt_port->RxHolding);
 
         if (port_paranoia_check(port, __func__) != 0) {
                 qt_port->ReadBulkStopped = 1;
@@ -333,7 +386,8 @@ static void qt_read_bulk_callback(struct urb *urb)
 
         if (qt_port->closePending == 1) {
                 /* Were closing , stop reading */
-                dev_dbg(&port->dev, "%s - (qt_port->closepending == 1\n", __func__);
+                dev_dbg(&port->dev,
+                        "%s - (qt_port->closepending == 1\n", __func__);
                 qt_port->ReadBulkStopped = 1;
                 goto exit;
         }
@@ -351,62 +405,14 @@ static void qt_read_bulk_callback(struct urb *urb)
         if (urb->status) {
                 qt_port->ReadBulkStopped = 1;
 
-                dev_dbg(&port->dev, "%s - nonzero read bulk status received: %d\n",
+                dev_dbg(&port->dev,
+                        "%s - nonzero read bulk status received: %d\n",
                         __func__, urb->status);
                 goto exit;
         }
 
-        if (RxCount) {
-                flag_data = 0;
-                for (i = 0; i < RxCount; ++i) {
-                        /* Look ahead code here */
-                        if ((i <= (RxCount - 3)) && (data[i] == 0x1b)
-                            && (data[i + 1] == 0x1b)) {
-                                flag = 0;
-                                switch (data[i + 2]) {
-                                case 0x00:
-                                        /* line status change 4th byte must follow */
-                                        if (i > (RxCount - 4)) {
-                                                dev_dbg(&port->dev, "Illegal escape seuences in received data\n");
-                                                break;
-                                        }
-                                        ProcessLineStatus(qt_port, data[i + 3]);
-                                        i += 3;
-                                        flag = 1;
-                                        break;
-
-                                case 0x01:
-                                        /* Modem status status change 4th byte must follow */
-                                        dev_dbg(&port->dev, "Modem status status.\n");
-                                        if (i > (RxCount - 4)) {
-                                                dev_dbg(&port->dev, "Illegal escape sequences in received data\n");
-                                                break;
-                                        }
-                                        ProcessModemStatus(qt_port,
-                                                           data[i + 3]);
-                                        i += 3;
-                                        flag = 1;
-                                        break;
-                                case 0xff:
-                                        dev_dbg(&port->dev, "No status sequence.\n");
-
-                                        if (tty) {
-                                                ProcessRxChar(tty, port, data[i]);
-                                                ProcessRxChar(tty, port, data[i + 1]);
-                                        }
-                                        i += 2;
-                                        break;
-                                }
-                                if (flag == 1)
-                                        continue;
-                        }
-
-                        if (tty && urb->actual_length)
-                                tty_insert_flip_char(tty, data[i], TTY_NORMAL);
-
-                }
-                tty_flip_buffer_push(tty);
-        }
+        if (urb->actual_length)
+                qt_status_change_check(tty, urb, qt_port, port);
 
         /* Continue trying to always read  */
         usb_fill_bulk_urb(port->read_urb, serial->dev,
@@ -417,10 +423,11 @@ static void qt_read_bulk_callback(struct urb *urb)
                           qt_read_bulk_callback, port);
         result = usb_submit_urb(port->read_urb, GFP_ATOMIC);
         if (result)
-                dev_dbg(&port->dev, "%s - failed resubmitting read urb, error %d",
+                dev_dbg(&port->dev,
+                        "%s - failed resubmitting read urb, error %d",
                         __func__, result);
         else {
-                if (RxCount) {
+                if (urb->actual_length) {
                         tty_flip_buffer_push(tty);
                         tty_schedule_flip(tty);
                 }
@@ -824,6 +831,31 @@ static void qt_release(struct usb_serial *serial)
 
 }
 
+static void qt_submit_urb_from_open(struct usb_serial *serial,
+                                    struct usb_serial_port *port)
+{
+        int result;
+        struct usb_serial_port *port0 = serial->port[0];
+
+        /* set up interrupt urb */
+        usb_fill_int_urb(port0->interrupt_in_urb,
+                         serial->dev,
+                         usb_rcvintpipe(serial->dev,
+                                        port0->interrupt_in_endpointAddress),
+                         port0->interrupt_in_buffer,
+                         port0->interrupt_in_urb->transfer_buffer_length,
+                         qt_interrupt_callback, serial,
+                         port0->interrupt_in_urb->interval);
+
+        result = usb_submit_urb(port0->interrupt_in_urb,
+                                GFP_KERNEL);
+        if (result) {
+                dev_err(&port->dev,
+                        "%s - Error %d submitting interrupt urb\n",
+                        __func__, result);
+        }
+}
+
 static int qt_open(struct tty_struct *tty,
                    struct usb_serial_port *port)
 {
@@ -884,38 +916,20 @@ static int qt_open(struct tty_struct *tty,
 
         /*  Check to see if we've set up our endpoint info yet */
         if (port0->open_ports == 1) {
-                if (serial->port[0]->interrupt_in_buffer == NULL) {
-                        /* set up interrupt urb */
-                        usb_fill_int_urb(serial->port[0]->interrupt_in_urb,
-                                         serial->dev,
-                                         usb_rcvintpipe(serial->dev,
-                                                        serial->port[0]->interrupt_in_endpointAddress),
-                                         serial->port[0]->interrupt_in_buffer,
-                                         serial->port[0]->
-                                         interrupt_in_urb->transfer_buffer_length,
-                                         qt_interrupt_callback, serial,
-                                         serial->port[0]->
-                                         interrupt_in_urb->interval);
-
-                        result =
-                            usb_submit_urb(serial->port[0]->interrupt_in_urb,
-                                           GFP_KERNEL);
-                        if (result) {
-                                dev_err(&port->dev,
-                                        "%s - Error %d submitting "
-                                        "interrupt urb\n", __func__, result);
-                        }
-
-                }
-
+                if (serial->port[0]->interrupt_in_buffer == NULL)
+                        qt_submit_urb_from_open(serial, port);
         }
 
         dev_dbg(&port->dev, "port number is %d\n", port->number);
         dev_dbg(&port->dev, "serial number is %d\n", port->serial->minor);
-        dev_dbg(&port->dev, "Bulkin endpoint is %d\n", port->bulk_in_endpointAddress);
-        dev_dbg(&port->dev, "BulkOut endpoint is %d\n", port->bulk_out_endpointAddress);
-        dev_dbg(&port->dev, "Interrupt endpoint is %d\n", port->interrupt_in_endpointAddress);
-        dev_dbg(&port->dev, "port's number in the device is %d\n", quatech_port->port_num);
+        dev_dbg(&port->dev,
+                "Bulkin endpoint is %d\n", port->bulk_in_endpointAddress);
+        dev_dbg(&port->dev,
+                "BulkOut endpoint is %d\n", port->bulk_out_endpointAddress);
+        dev_dbg(&port->dev, "Interrupt endpoint is %d\n",
+                port->interrupt_in_endpointAddress);
+        dev_dbg(&port->dev, "port's number in the device is %d\n",
+                quatech_port->port_num);
         quatech_port->read_urb = port->read_urb;
 
         /* set up our bulk in urb */
@@ -928,7 +942,8 @@ static int qt_open(struct tty_struct *tty,
                           quatech_port->read_urb->transfer_buffer_length,
                           qt_read_bulk_callback, quatech_port);
 
-        dev_dbg(&port->dev, "qt_open: bulkin endpoint is %d\n", port->bulk_in_endpointAddress);
+        dev_dbg(&port->dev, "qt_open: bulkin endpoint is %d\n",
+                port->bulk_in_endpointAddress);
         quatech_port->read_urb_busy = true;
         result = usb_submit_urb(quatech_port->read_urb, GFP_KERNEL);
         if (result) {
@@ -1021,15 +1036,18 @@ static void qt_close(struct usb_serial_port *port)
         /* Close uart channel */
         status = qt_close_channel(serial, index);
         if (status < 0)
-                dev_dbg(&port->dev, "%s - port %d qt_close_channel failed.\n", __func__, port->number);
+                dev_dbg(&port->dev,
+                        "%s - port %d qt_close_channel failed.\n",
+                        __func__, port->number);
 
         port0->open_ports--;
 
-        dev_dbg(&port->dev, "qt_num_open_ports in close%d:in port%d\n", port0->open_ports, port->number);
+        dev_dbg(&port->dev, "qt_num_open_ports in close%d:in port%d\n",
+                port0->open_ports, port->number);
 
         if (port0->open_ports == 0) {
                 if (serial->port[0]->interrupt_in_urb) {
-                        dev_dbg(&port->dev, "%s", "Shutdown interrupt_in_urb\n");
+                        dev_dbg(&port->dev, "Shutdown interrupt_in_urb\n");
                         usb_kill_urb(serial->port[0]->interrupt_in_urb);
                 }
 
@@ -1053,7 +1071,8 @@ static int qt_write(struct tty_struct *tty, struct usb_serial_port *port,
                 return -ENODEV;
 
         if (count == 0) {
-                dev_dbg(&port->dev, "%s - write request of 0 bytes\n", __func__);
+                dev_dbg(&port->dev,
+                        "%s - write request of 0 bytes\n", __func__);
                 return 0;
         }
 
@@ -1080,7 +1099,8 @@ static int qt_write(struct tty_struct *tty, struct usb_serial_port *port,
                 /* send the data out the bulk port */
                 result = usb_submit_urb(port->write_urb, GFP_ATOMIC);
                 if (result)
-                        dev_dbg(&port->dev, "%s - failed submitting write urb, error %d\n",
+                        dev_dbg(&port->dev,
+                                "%s - failed submitting write urb, error %d\n",
                                 __func__, result);
                 else
                         result = count;
@@ -1163,7 +1183,8 @@ static int qt_ioctl(struct tty_struct *tty,
                 return 0;
         }
 
-        dev_dbg(&port->dev, "%s -No ioctl for that one.  port = %d\n", __func__, port->number);
+        dev_dbg(&port->dev, "%s -No ioctl for that one.  port = %d\n",
+                __func__, port->number);
         return -ENOIOCTLCMD;
 }
 
@@ -1238,7 +1259,8 @@ static void qt_set_termios(struct tty_struct *tty,
 
         /* Now determine flow control */
         if (cflag & CRTSCTS) {
-                dev_dbg(&port->dev, "%s - Enabling HW flow control port %d\n", __func__, port->number);
+                dev_dbg(&port->dev, "%s - Enabling HW flow control port %d\n",
+                        __func__, port->number);
 
                 /* Enable RTS/CTS flow control */
                 status = BoxSetHW_FlowCtrl(port->serial, index, 1);
@@ -1249,7 +1271,9 @@ static void qt_set_termios(struct tty_struct *tty,
                 }
         } else {
                 /* Disable RTS/CTS flow control */
-                dev_dbg(&port->dev, "%s - disabling HW flow control port %d\n", __func__, port->number);
+                dev_dbg(&port->dev,
+                        "%s - disabling HW flow control port %d\n",
+                        __func__, port->number);
 
                 status = BoxSetHW_FlowCtrl(port->serial, index, 0);
                 if (status < 0) {
@@ -1268,17 +1292,21 @@ static void qt_set_termios(struct tty_struct *tty,
                     BoxSetSW_FlowCtrl(port->serial, index, stop_char,
                                       start_char);
                 if (status < 0)
-                        dev_dbg(&port->dev, "BoxSetSW_FlowCtrl (enabled) failed\n");
+                        dev_dbg(&port->dev,
+                                "BoxSetSW_FlowCtrl (enabled) failed\n");
 
         } else {
                 /* disable SW flow control */
                 status = BoxDisable_SW_FlowCtrl(port->serial, index);
                 if (status < 0)
-                        dev_dbg(&port->dev, "BoxSetSW_FlowCtrl (diabling) failed\n");
+                        dev_dbg(&port->dev,
+                                "BoxSetSW_FlowCtrl (diabling) failed\n");
 
         }
         termios->c_cflag &= ~CMSPAR;
-        /* FIXME: Error cases should be returning the actual bits changed only */
+        /* FIXME:
+           Error cases should be returning the actual bits changed only
+        */
 }
 
 static void qt_break(struct tty_struct *tty, int break_state)
@@ -1436,12 +1464,32 @@ static void qt_throttle(struct tty_struct *tty)
         mutex_unlock(&qt_port->lock);
 }
 
+static void qt_submit_urb_from_unthrottle(struct usb_serial_port *port,
+                                          struct usb_serial *serial)
+{
+        int result;
+
+        /* Start reading from the device */
+        usb_fill_bulk_urb(port->read_urb, serial->dev,
+                          usb_rcvbulkpipe(serial->dev,
+                                          port->bulk_in_endpointAddress),
+                          port->read_urb->transfer_buffer,
+                          port->read_urb->transfer_buffer_length,
+                          qt_read_bulk_callback, port);
+
+        result = usb_submit_urb(port->read_urb, GFP_ATOMIC);
+
+        if (result)
+                dev_err(&port->dev,
+                        "%s - failed restarting read urb, error %d\n",
+                        __func__, result);
+}
+
 static void qt_unthrottle(struct tty_struct *tty)
 {
         struct usb_serial_port *port = tty->driver_data;
         struct usb_serial *serial = get_usb_serial(port, __func__);
         struct quatech_port *qt_port;
-        unsigned int result;
 
         if (!serial)
                 return;
@@ -1457,21 +1505,8 @@ static void qt_unthrottle(struct tty_struct *tty)
                 dev_dbg(&port->dev, "%s - qt_port->RxHolding = 0\n", __func__);
 
                 /* if we have a bulk endpoint, start it up */
-                if ((serial->num_bulk_in) && (qt_port->ReadBulkStopped == 1)) {
-                        /* Start reading from the device */
-                        usb_fill_bulk_urb(port->read_urb, serial->dev,
-                                          usb_rcvbulkpipe(serial->dev,
-                                                          port->bulk_in_endpointAddress),
-                                          port->read_urb->transfer_buffer,
-                                          port->read_urb->
-                                          transfer_buffer_length,
-                                          qt_read_bulk_callback, port);
-                        result = usb_submit_urb(port->read_urb, GFP_ATOMIC);
-                        if (result)
-                                dev_err(&port->dev,
-                                        "%s - failed restarting read urb, error %d\n",
-                                        __func__, result);
-                }
+                if ((serial->num_bulk_in) && (qt_port->ReadBulkStopped == 1))
+                        qt_submit_urb_from_unthrottle(port, serial);
         }
         mutex_unlock(&qt_port->lock);
 }
diff --git a/drivers/staging/silicom/bp_mod.c b/drivers/staging/silicom/bp_mod.c
index 3cfd0516adfa..58c5f5cf4cec 100644
--- a/drivers/staging/silicom/bp_mod.c
+++ b/drivers/staging/silicom/bp_mod.c
@@ -9,7 +9,6 @@
 /*                                                                            */
 /*                                                                            */
 /******************************************************************************/
-#include <linux/version.h>
 
 #include <linux/kernel.h>       /* We're doing kernel work */
 #include <linux/module.h>       /* Specifically, a module */
@@ -4319,16 +4318,6 @@ void remove_bypass_wd_auto(bpctl_dev_t *pbpctl_dev)
                 del_timer_sync(&pbpctl_dev->bp_timer);
 #ifdef BP_SELF_TEST
                 pbpctl_dev_sl = get_status_port_fn(pbpctl_dev);
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31))
-                if (pbpctl_dev_sl && (pbpctl_dev_sl->ndev)
-                    && (pbpctl_dev_sl->ndev->hard_start_xmit)
-                    && (pbpctl_dev_sl->hard_start_xmit_save)) {
-                        rtnl_lock();
-                        pbpctl_dev_sl->ndev->hard_start_xmit =
-                            pbpctl_dev_sl->hard_start_xmit_save;
-                        rtnl_unlock();
-                }
-#else
                 if (pbpctl_dev_sl && (pbpctl_dev_sl->ndev)) {
                         if ((pbpctl_dev_sl->ndev->netdev_ops)
                             && (pbpctl_dev_sl->old_ops)) {
@@ -4342,8 +4331,6 @@ void remove_bypass_wd_auto(bpctl_dev_t *pbpctl_dev)
                         }
 
                 }
-
-#endif
 #endif
         }
 
@@ -4433,23 +4420,7 @@ int set_bp_self_test(bpctl_dev_t *pbpctl_dev, unsigned int param)
         if (pbpctl_dev->bp_caps & WD_CTL_CAP) {
                 pbpctl_dev->bp_self_test_flag = param == 0 ? 0 : 1;
                 pbpctl_dev_sl = get_status_port_fn(pbpctl_dev);
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31))
-                if ((pbpctl_dev_sl->ndev) &&
-                    (pbpctl_dev_sl->ndev->hard_start_xmit)) {
-                        rtnl_lock();
-                        if (pbpctl_dev->bp_self_test_flag == 1) {
 
-                                pbpctl_dev_sl->hard_start_xmit_save =
-                                    pbpctl_dev_sl->ndev->hard_start_xmit;
-                                pbpctl_dev_sl->ndev->hard_start_xmit =
-                                    bp_hard_start_xmit;
-                        } else if (pbpctl_dev_sl->hard_start_xmit_save) {
-                                pbpctl_dev_sl->ndev->hard_start_xmit =
-                                    pbpctl_dev_sl->hard_start_xmit_save;
-                        }
-                        rtnl_unlock();
-                }
-#else
                 if ((pbpctl_dev_sl->ndev) && (pbpctl_dev_sl->ndev->netdev_ops)) {
                         rtnl_lock();
                         if (pbpctl_dev->bp_self_test_flag == 1) {
@@ -4470,7 +4441,6 @@ int set_bp_self_test(bpctl_dev_t *pbpctl_dev, unsigned int param)
                         }
                         rtnl_unlock();
                 }
-#endif
 
                 set_bypass_wd_auto(pbpctl_dev, param);
                 return 0;
@@ -5428,15 +5398,8 @@ static void if_scan_init(void)
         /* rcu_read_lock(); */
         /* rtnl_lock();     */
         /* rcu_read_lock(); */
-#if 1
-#if (LINUX_VERSION_CODE >= 0x020618)
-        for_each_netdev(&init_net, dev)
-#elif (LINUX_VERSION_CODE >= 0x20616)
-        for_each_netdev(dev)
-#else
-        for (dev = dev_base; dev; dev = dev->next)
-#endif
-        {
+
+        for_each_netdev(&init_net, dev) {
 
                 struct ethtool_drvinfo drvinfo;
                 char cbuf[32];
@@ -5454,8 +5417,6 @@ static void if_scan_init(void)
                         dev->ethtool_ops->get_drvinfo(dev, &drvinfo);
                 } else
                         continue;
-                if (!drvinfo.bus_info)
-                        continue;
                 if (!strcmp(drvinfo.bus_info, "N/A"))
                         continue;
                 memcpy(&cbuf, drvinfo.bus_info, 32);
@@ -5491,22 +5452,14 @@ static void if_scan_init(void)
                 }
 
         }
-#endif
         /* rtnl_unlock();     */
         /* rcu_read_unlock(); */
 
 }
 
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30))
-static int device_ioctl(struct inode *inode,    /* see include/linux/fs.h */
-                        struct file *file,      /* ditto */
-                        unsigned int ioctl_num, /* number and param for ioctl */
-                        unsigned long ioctl_param)
-#else
-static long device_ioctl(struct file *file,     /* ditto */
+static long device_ioctl(struct file *file,     /* see include/linux/fs.h */
                          unsigned int ioctl_num,        /* number and param for ioctl */
                          unsigned long ioctl_param)
-#endif
 {
         struct bpctl_cmd bpctl_cmd;
         int dev_idx = 0;
@@ -5517,9 +5470,7 @@ static long device_ioctl(struct file *file,	/* ditto */
 
         static bpctl_dev_t *pbpctl_dev;
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,30))
         /* lock_kernel(); */
-#endif
         lock_bpctl();
         /* local_irq_save(flags); */
         /* if(!spin_trylock_irqsave(&bpvm_lock)){
@@ -5900,9 +5851,7 @@ static long device_ioctl(struct file *file,	/* ditto */
                 ret = -EFAULT;
         ret = SUCCESS;
  bp_exit:
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,30))
         /* unlock_kernel(); */
-#endif
         /* spin_unlock_irqrestore(&bpvm_lock, flags); */
         unlock_bpctl();
         /* unlock_kernel(); */
@@ -5911,12 +5860,7 @@ static long device_ioctl(struct file *file,	/* ditto */
 
 struct file_operations Fops = {
         .owner = THIS_MODULE,
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30))
-        .ioctl = device_ioctl,
-#else
         .unlocked_ioctl = device_ioctl,
-#endif
-
         .open = device_open,
         .release = device_release,      /* a.k.a. close */
 };
@@ -6952,15 +6896,8 @@ static int __init bypass_init_module(void)
                                 memset(bpctl_dev_arr[idx_dev].bp_tx_data + 7,
                                        0xaa, 5);
 
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,9))
-                                bpctl_dev_arr[idx_dev].bp_tx_data[12] =
-                                    (ETH_P_BPTEST >> 8) & 0xff;
-                                bpctl_dev_arr[idx_dev].bp_tx_data[13] =
-                                    ETH_P_BPTEST & 0xff;
-#else
                                 *(__be16 *) (bpctl_dev_arr[idx_dev].bp_tx_data +
                                              12) = htons(ETH_P_BPTEST);
-#endif
 
                         } else
                                 printk("bp_ctl: Memory allocation error!\n");
@@ -7009,83 +6946,6 @@ static int __init bypass_init_module(void)
                 }
         }
 
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0))
-        inter_module_register("is_bypass_sd", THIS_MODULE, &is_bypass_sd);
-        inter_module_register("get_bypass_slave_sd", THIS_MODULE,
-                              &get_bypass_slave_sd);
-        inter_module_register("get_bypass_caps_sd", THIS_MODULE,
-                              &get_bypass_caps_sd);
-        inter_module_register("get_wd_set_caps_sd", THIS_MODULE,
-                              &get_wd_set_caps_sd);
-        inter_module_register("set_bypass_sd", THIS_MODULE, &set_bypass_sd);
-        inter_module_register("get_bypass_sd", THIS_MODULE, &get_bypass_sd);
-        inter_module_register("get_bypass_change_sd", THIS_MODULE,
-                              &get_bypass_change_sd);
-        inter_module_register("set_dis_bypass_sd", THIS_MODULE,
-                              &set_dis_bypass_sd);
-        inter_module_register("get_dis_bypass_sd", THIS_MODULE,
-                              &get_dis_bypass_sd);
-        inter_module_register("set_bypass_pwoff_sd", THIS_MODULE,
-                              &set_bypass_pwoff_sd);
-        inter_module_register("get_bypass_pwoff_sd", THIS_MODULE,
-                              &get_bypass_pwoff_sd);
-        inter_module_register("set_bypass_pwup_sd", THIS_MODULE,
-                              &set_bypass_pwup_sd);
-        inter_module_register("get_bypass_pwup_sd", THIS_MODULE,
-                              &get_bypass_pwup_sd);
-        inter_module_register("get_bypass_wd_sd", THIS_MODULE,
-                              &get_bypass_wd_sd);
-        inter_module_register("set_bypass_wd_sd", THIS_MODULE,
-                              &set_bypass_wd_sd);
-        inter_module_register("get_wd_expire_time_sd", THIS_MODULE,
-                              &get_wd_expire_time_sd);
-        inter_module_register("reset_bypass_wd_timer_sd", THIS_MODULE,
-                              &reset_bypass_wd_timer_sd);
-        inter_module_register("set_std_nic_sd", THIS_MODULE, &set_std_nic_sd);
-        inter_module_register("get_std_nic_sd", THIS_MODULE, &get_std_nic_sd);
-        inter_module_register("set_tx_sd", THIS_MODULE, &set_tx_sd);
-        inter_module_register("get_tx_sd", THIS_MODULE, &get_tx_sd);
-        inter_module_register("set_tpl_sd", THIS_MODULE, &set_tpl_sd);
-        inter_module_register("get_tpl_sd", THIS_MODULE, &get_tpl_sd);
-
-        inter_module_register("set_bp_hw_reset_sd", THIS_MODULE,
-                              &set_bp_hw_reset_sd);
-        inter_module_register("get_bp_hw_reset_sd", THIS_MODULE,
-                              &get_bp_hw_reset_sd);
-
-        inter_module_register("set_tap_sd", THIS_MODULE, &set_tap_sd);
-        inter_module_register("get_tap_sd", THIS_MODULE, &get_tap_sd);
-        inter_module_register("get_tap_change_sd", THIS_MODULE,
-                              &get_tap_change_sd);
-        inter_module_register("set_dis_tap_sd", THIS_MODULE, &set_dis_tap_sd);
-        inter_module_register("get_dis_tap_sd", THIS_MODULE, &get_dis_tap_sd);
-        inter_module_register("set_tap_pwup_sd", THIS_MODULE, &set_tap_pwup_sd);
-        inter_module_register("get_tap_pwup_sd", THIS_MODULE, &get_tap_pwup_sd);
-        inter_module_register("set_bp_disc_sd", THIS_MODULE, &set_bp_disc_sd);
-        inter_module_register("get_bp_disc_sd", THIS_MODULE, &get_bp_disc_sd);
-        inter_module_register("get_bp_disc_change_sd", THIS_MODULE,
-                              &get_bp_disc_change_sd);
-        inter_module_register("set_bp_dis_disc_sd", THIS_MODULE,
-                              &set_bp_dis_disc_sd);
-        inter_module_register("get_bp_dis_disc_sd", THIS_MODULE,
-                              &get_bp_dis_disc_sd);
-        inter_module_register("set_bp_disc_pwup_sd", THIS_MODULE,
-                              &set_bp_disc_pwup_sd);
-        inter_module_register("get_bp_disc_pwup_sd", THIS_MODULE,
-                              &get_bp_disc_pwup_sd);
-        inter_module_register("set_wd_exp_mode_sd", THIS_MODULE,
-                              &set_wd_exp_mode_sd);
-        inter_module_register("get_wd_exp_mode_sd", THIS_MODULE,
-                              &get_wd_exp_mode_sd);
-        inter_module_register("set_wd_autoreset_sd", THIS_MODULE,
-                              &set_wd_autoreset_sd);
-        inter_module_register("get_wd_autoreset_sd", THIS_MODULE,
-                              &get_wd_autoreset_sd);
-        inter_module_register("get_bypass_info_sd", THIS_MODULE,
-                              &get_bypass_info_sd);
-        inter_module_register("bp_if_scan_sd", THIS_MODULE, &bp_if_scan_sd);
-
-#endif
         register_netdevice_notifier(&bp_notifier_block);
 #ifdef BP_PROC_SUPPORT
         {
@@ -7115,58 +6975,8 @@ static int __init bypass_init_module(void)
 static void __exit bypass_cleanup_module(void)
 {
         int i;
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23))
-        int ret;
-#endif
         unregister_netdevice_notifier(&bp_notifier_block);
 
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0))
-        inter_module_unregister("is_bypass_sd");
-        inter_module_unregister("get_bypass_slave_sd");
-        inter_module_unregister("get_bypass_caps_sd");
-        inter_module_unregister("get_wd_set_caps_sd");
-        inter_module_unregister("set_bypass_sd");
-        inter_module_unregister("get_bypass_sd");
-        inter_module_unregister("get_bypass_change_sd");
-        inter_module_unregister("set_dis_bypass_sd");
-        inter_module_unregister("get_dis_bypass_sd");
-        inter_module_unregister("set_bypass_pwoff_sd");
-        inter_module_unregister("get_bypass_pwoff_sd");
-        inter_module_unregister("set_bypass_pwup_sd");
-        inter_module_unregister("get_bypass_pwup_sd");
-        inter_module_unregister("set_bypass_wd_sd");
-        inter_module_unregister("get_bypass_wd_sd");
-        inter_module_unregister("get_wd_expire_time_sd");
-        inter_module_unregister("reset_bypass_wd_timer_sd");
-        inter_module_unregister("set_std_nic_sd");
-        inter_module_unregister("get_std_nic_sd");
-        inter_module_unregister("set_tx_sd");
-        inter_module_unregister("get_tx_sd");
-        inter_module_unregister("set_tpl_sd");
-        inter_module_unregister("get_tpl_sd");
-        inter_module_unregister("set_tap_sd");
-        inter_module_unregister("get_tap_sd");
-        inter_module_unregister("get_tap_change_sd");
-        inter_module_unregister("set_dis_tap_sd");
-        inter_module_unregister("get_dis_tap_sd");
-        inter_module_unregister("set_tap_pwup_sd");
-        inter_module_unregister("get_tap_pwup_sd");
-        inter_module_unregister("set_bp_disc_sd");
-        inter_module_unregister("get_bp_disc_sd");
-        inter_module_unregister("get_bp_disc_change_sd");
-        inter_module_unregister("set_bp_dis_disc_sd");
-        inter_module_unregister("get_bp_dis_disc_sd");
-        inter_module_unregister("set_bp_disc_pwup_sd");
-        inter_module_unregister("get_bp_disc_pwup_sd");
-        inter_module_unregister("set_wd_exp_mode_sd");
-        inter_module_unregister("get_wd_exp_mode_sd");
-        inter_module_unregister("set_wd_autoreset_sd");
-        inter_module_unregister("get_wd_autoreset_sd");
-        inter_module_unregister("get_bypass_info_sd");
-        inter_module_unregister("bp_if_scan_sd");
-
-#endif
-
         for (i = 0; i < device_num; i++) {
                 /* unsigned long flags; */
 #ifdef BP_PROC_SUPPORT
@@ -7198,17 +7008,7 @@ static void __exit bypass_cleanup_module(void)
 /*
 * Unregister the device                             
 */
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23))
-        ret = unregister_chrdev(major_num, DEVICE_NAME);
-/*
-* If there's an error, report it
-*/
-        if (ret < 0)
-                printk("Error in module_unregister_chrdev: %d\n", ret);
-#else
         unregister_chrdev(major_num, DEVICE_NAME);
-
-#endif
 }
 
 module_init(bypass_init_module);
@@ -7597,11 +7397,7 @@ static struct proc_dir_entry *proc_getdir(char *name,
         }
         if (pde == (struct proc_dir_entry *)0) {
                 /* create the directory */
-#if (LINUX_VERSION_CODE > 0x20300)
                 pde = proc_mkdir(name, proc_dir);
-#else
-                pde = create_proc_entry(name, S_IFDIR, proc_dir);
-#endif
                 if (pde == (struct proc_dir_entry *)0) {
 
                         return pde;
@@ -7703,13 +7499,8 @@ get_bypass_slave_pfs(char *page, char **start, off_t off, int count,
                 return len;
         }
         net_slave_dev = pbp_device_block_slave->ndev;
-        if (net_slave_dev) {
-                if (net_slave_dev)
-                        len = sprintf(page, "%s\n", net_slave_dev->name);
-                else
-                        len = sprintf(page, "fail\n");
-
-        }
+        if (net_slave_dev)
+                len = sprintf(page, "%s\n", net_slave_dev->name);
 
         *eof = 1;
         return len;
diff --git a/drivers/staging/silicom/bp_proc.c b/drivers/staging/silicom/bp_proc.c
index 6ad4b27472e4..a01ca97b7665 100644
--- a/drivers/staging/silicom/bp_proc.c
+++ b/drivers/staging/silicom/bp_proc.c
@@ -10,21 +10,20 @@
 /*                                                                            */
 /******************************************************************************/
 
-#include <linux/version.h>
-#if defined(CONFIG_SMP) && ! defined(__SMP__)
+#if defined(CONFIG_SMP) && !defined(__SMP__)
 #define __SMP__
 #endif
 
 #include <linux/proc_fs.h>
 #include <linux/netdevice.h>
 #include <asm/uaccess.h>
-//#include <linux/smp_lock.h>
+/* #include <linux/smp_lock.h> */
 #include "bp_mod.h"
 
 #define BP_PROC_DIR "bypass"
-//#define BYPASS_SUPPORT "bypass"
+/* #define BYPASS_SUPPORT "bypass" */
 
-#ifdef  BYPASS_SUPPORT
+#ifdef BYPASS_SUPPORT
 
 #define GPIO6_SET_ENTRY_SD           "gpio6_set"
 #define GPIO6_CLEAR_ENTRY_SD         "gpio6_clear"
@@ -70,7 +69,7 @@
 #define DISC_CHANGE_ENTRY_SD      "disc_change"
 #define DIS_DISC_ENTRY_SD         "dis_disc"
 #define DISC_PWUP_ENTRY_SD        "disc_pwup"
-#endif                          //bypass_support
+
 static struct proc_dir_entry *bp_procfs_dir;
 
 static struct proc_dir_entry *proc_getdir(char *name,
@@ -86,20 +85,17 @@ static struct proc_dir_entry *proc_getdir(char *name,
         if (pde == (struct proc_dir_entry *)0) {
                 /* create the directory */
                 pde = create_proc_entry(name, S_IFDIR, proc_dir);
-                if (pde == (struct proc_dir_entry *)0) {
-                        return (pde);
-                }
+                if (pde == (struct proc_dir_entry *)0)
+                        return pde;
         }
-        return (pde);
+        return pde;
 }
 
-#ifdef BYPASS_SUPPORT
-
 int
 bypass_proc_create_entry_sd(struct pfs_unit *pfs_unit_curr,
                             char *proc_name,
-                            write_proc_t * write_proc,
-                            read_proc_t * read_proc,
+                            write_proc_t *write_proc,
+                            read_proc_t *read_proc,
                             struct proc_dir_entry *parent_pfs, void *data)
 {
         strcpy(pfs_unit_curr->proc_name, proc_name);
@@ -107,10 +103,8 @@ bypass_proc_create_entry_sd(struct pfs_unit *pfs_unit_curr,
                                                       S_IFREG | S_IRUSR |
                                                       S_IWUSR | S_IRGRP |
                                                       S_IROTH, parent_pfs);
-        if (pfs_unit_curr->proc_entry == 0) {
-
+        if (pfs_unit_curr->proc_entry == 0)
                 return -1;
-        }
 
         pfs_unit_curr->proc_entry->read_proc = read_proc;
         pfs_unit_curr->proc_entry->write_proc = write_proc;
@@ -207,9 +201,8 @@ set_bypass_pfs(struct file *file, const char *buffer,
         if (count > (sizeof(kbuf) - 1))
                 return -1;
 
-        if (copy_from_user(&kbuf, buffer, count)) {
+        if (copy_from_user(&kbuf, buffer, count))
                 return -1;
-        }
 
         kbuf[count] = '\0';
         length = strlen(kbuf);
@@ -239,9 +232,8 @@ set_tap_pfs(struct file *file, const char *buffer,
         if (count > (sizeof(kbuf) - 1))
                 return -1;
 
-        if (copy_from_user(&kbuf, buffer, count)) {
+        if (copy_from_user(&kbuf, buffer, count))
                 return -1;
-        }
 
         kbuf[count] = '\0';
         length = strlen(kbuf);
@@ -271,9 +263,8 @@ set_disc_pfs(struct file *file, const char *buffer,
         if (count > (sizeof(kbuf) - 1))
                 return -1;
 
-        if (copy_from_user(&kbuf, buffer, count)) {
+        if (copy_from_user(&kbuf, buffer, count))
                 return -1;
-        }
 
         kbuf[count] = '\0';
         length = strlen(kbuf);
@@ -421,9 +412,8 @@ set_bypass_wd_pfs(struct file *file, const char *buffer,
         unsigned int timeout = 0;
         char *timeout_ptr = kbuf;
 
-        if (copy_from_user(&kbuf, buffer, count)) {
+        if (copy_from_user(&kbuf, buffer, count))
                 return -1;
-        }
 
         timeout_ptr = kbuf;
         timeout = atoi(&timeout_ptr);
@@ -570,9 +560,8 @@ set_dis_bypass_pfs(struct file *file, const char *buffer,
 
         int bypass_param = 0, length = 0;
 
-        if (copy_from_user(&kbuf, buffer, count)) {
+        if (copy_from_user(&kbuf, buffer, count))
                 return -1;
-        }
 
         kbuf[count] = '\0';
         length = strlen(kbuf);
@@ -599,9 +588,8 @@ set_dis_tap_pfs(struct file *file, const char *buffer,
 
         int tap_param = 0, length = 0;
 
-        if (copy_from_user(&kbuf, buffer, count)) {
+        if (copy_from_user(&kbuf, buffer, count))
                 return -1;
-        }
 
         kbuf[count] = '\0';
         length = strlen(kbuf);
@@ -628,9 +616,8 @@ set_dis_disc_pfs(struct file *file, const char *buffer,
 
         int tap_param = 0, length = 0;
 
-        if (copy_from_user(&kbuf, buffer, count)) {
+        if (copy_from_user(&kbuf, buffer, count))
                 return -1;
-        }
 
         kbuf[count] = '\0';
         length = strlen(kbuf);
@@ -717,9 +704,8 @@ set_bypass_pwup_pfs(struct file *file, const char *buffer,
 
         int bypass_param = 0, length = 0;
 
-        if (copy_from_user(&kbuf, buffer, count)) {
+        if (copy_from_user(&kbuf, buffer, count))
                 return -1;
-        }
 
         kbuf[count] = '\0';
         length = strlen(kbuf);
@@ -746,9 +732,8 @@ set_bypass_pwoff_pfs(struct file *file, const char *buffer,
 
         int bypass_param = 0, length = 0;
 
-        if (copy_from_user(&kbuf, buffer, count)) {
+        if (copy_from_user(&kbuf, buffer, count))
                 return -1;
-        }
 
         kbuf[count] = '\0';
         length = strlen(kbuf);
@@ -775,9 +760,8 @@ set_tap_pwup_pfs(struct file *file, const char *buffer,
 
         int tap_param = 0, length = 0;
 
-        if (copy_from_user(&kbuf, buffer, count)) {
+        if (copy_from_user(&kbuf, buffer, count))
                 return -1;
-        }
 
         kbuf[count] = '\0';
         length = strlen(kbuf);
@@ -804,9 +788,8 @@ set_disc_pwup_pfs(struct file *file, const char *buffer,
 
         int tap_param = 0, length = 0;
 
-        if (copy_from_user(&kbuf, buffer, count)) {
+        if (copy_from_user(&kbuf, buffer, count))
                 return -1;
-        }
 
         kbuf[count] = '\0';
         length = strlen(kbuf);
@@ -913,9 +896,8 @@ set_std_nic_pfs(struct file *file, const char *buffer,
 
         int bypass_param = 0, length = 0;
 
-        if (copy_from_user(&kbuf, buffer, count)) {
+        if (copy_from_user(&kbuf, buffer, count))
                 return -1;
-        }
 
         kbuf[count] = '\0';
         length = strlen(kbuf);
@@ -988,9 +970,8 @@ set_wd_exp_mode_pfs(struct file *file, const char *buffer,
         if (count > (sizeof(kbuf) - 1))
                 return -1;
 
-        if (copy_from_user(&kbuf, buffer, count)) {
+        if (copy_from_user(&kbuf, buffer, count))
                 return -1;
-        }
 
         kbuf[count] = '\0';
         length = strlen(kbuf);
@@ -1036,9 +1017,8 @@ set_wd_autoreset_pfs(struct file *file, const char *buffer,
         u32 timeout = 0;
         char *timeout_ptr = kbuf;
 
-        if (copy_from_user(&kbuf, buffer, count)) {
+        if (copy_from_user(&kbuf, buffer, count))
                 return -1;
-        }
 
         timeout_ptr = kbuf;
         timeout = atoi(&timeout_ptr);
@@ -1061,9 +1041,8 @@ set_tpl_pfs(struct file *file, const char *buffer,
         if (count > (sizeof(kbuf) - 1))
                 return -1;
 
-        if (copy_from_user(&kbuf, buffer, count)) {
+        if (copy_from_user(&kbuf, buffer, count))
                 return -1;
-        }
 
         kbuf[count] = '\0';
         length = strlen(kbuf);
@@ -1094,9 +1073,8 @@ set_wait_at_pwup_pfs(struct file *file, const char *buffer,
         if (count > (sizeof(kbuf) - 1))
                 return -1;
 
-        if (copy_from_user(&kbuf, buffer, count)) {
+        if (copy_from_user(&kbuf, buffer, count))
                 return -1;
-        }
 
         kbuf[count] = '\0';
         length = strlen(kbuf);
@@ -1126,9 +1104,8 @@ set_hw_reset_pfs(struct file *file, const char *buffer,
         if (count > (sizeof(kbuf) - 1))
                 return -1;
 
-        if (copy_from_user(&kbuf, buffer, count)) {
+        if (copy_from_user(&kbuf, buffer, count))
                 return -1;
-        }
 
         kbuf[count] = '\0';
         length = strlen(kbuf);
@@ -1147,10 +1124,10 @@ set_hw_reset_pfs(struct file *file, const char *buffer,
 
 #endif                          /*PMC_FIX_FLAG */
 
-int bypass_proc_create_dev_sd(bpctl_dev_t * pbp_device_block)
+int bypass_proc_create_dev_sd(bpctl_dev_t *pbp_device_block)
 {
         struct bypass_pfs_sd *current_pfs = &(pbp_device_block->bypass_pfs_set);
-        static struct proc_dir_entry *procfs_dir = NULL;
+        static struct proc_dir_entry *procfs_dir;
         int ret = 0;
 
         sprintf(current_pfs->dir_name, "bypass_%s", dev->name);
@@ -1327,7 +1304,7 @@ int bypass_proc_create_dev_sd(bpctl_dev_t * pbp_device_block)
         return ret;
 }
 
-int bypass_proc_remove_dev_sd(bpctl_dev_t * pbp_device_block)
+int bypass_proc_remove_dev_sd(bpctl_dev_t *pbp_device_block)
 {
 
         struct bypass_pfs_sd *current_pfs = &pbp_device_block->bypass_pfs_set;
diff --git a/drivers/staging/silicom/bypasslib/bplibk.h b/drivers/staging/silicom/bypasslib/bplibk.h
index a1c85eec02f0..d8c1d27650b4 100644
--- a/drivers/staging/silicom/bypasslib/bplibk.h
+++ b/drivers/staging/silicom/bypasslib/bplibk.h
@@ -28,16 +28,7 @@
         ((pid==INTEL_PEG4BPII_PID)||   \
           (pid==INTEL_PEG4BPFII_PID)))
 
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10))
-#define pci_get_class pci_find_class
-
-#define pci_get_device pci_find_device
-
-#endif
-
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,10))
 #define EXPORT_SYMBOL_NOVERS EXPORT_SYMBOL
-#endif
 
 #ifdef BP_VENDOR_SUPPORT
 char *bp_desc_array[] =
diff --git a/drivers/staging/silicom/bypasslib/bypass.c b/drivers/staging/silicom/bypasslib/bypass.c
index 527829d58133..95a1f1815d90 100644
--- a/drivers/staging/silicom/bypasslib/bypass.c
+++ b/drivers/staging/silicom/bypasslib/bypass.c
@@ -11,7 +11,6 @@
 /*                                                                            */
 /******************************************************************************/
 
-#include <linux/version.h>
 #if defined(CONFIG_SMP) && ! defined(__SMP__)
 #define __SMP__
 #endif
diff --git a/drivers/staging/slicoss/slicoss.c b/drivers/staging/slicoss/slicoss.c
index cd920dad85cd..78578ee59557 100644
--- a/drivers/staging/slicoss/slicoss.c
+++ b/drivers/staging/slicoss/slicoss.c
@@ -142,39 +142,12 @@ static DEFINE_PCI_DEVICE_TABLE(slic_pci_tbl) = {
 
 MODULE_DEVICE_TABLE(pci, slic_pci_tbl);
 
-#ifdef ASSERT
-#undef ASSERT
-#endif
-
-static void slic_assert_fail(void)
-{
-        u32 cpuid;
-        u32 curr_pid;
-        cpuid = smp_processor_id();
-        curr_pid = current->pid;
-
-        printk(KERN_ERR "%s CPU # %d ---- PID # %d\n",
-               __func__, cpuid, curr_pid);
-}
-
-#ifndef ASSERT
-#define ASSERT(a) do {                                                  \
-        if (!(a)) {                                                     \
-                printk(KERN_ERR "slicoss ASSERT() Failure: function %s" \
-                        "line %d\n", __func__, __LINE__);               \
-                slic_assert_fail();                                     \
-        }                                                               \
-} while (0)
-#endif
-
-
 #define SLIC_GET_SLIC_HANDLE(_adapter, _pslic_handle)                   \
 {                                                                       \
     spin_lock_irqsave(&_adapter->handle_lock.lock,                      \
                         _adapter->handle_lock.flags);                   \
     _pslic_handle  =  _adapter->pfree_slic_handles;                     \
     if (_pslic_handle) {                                                \
-        ASSERT(_pslic_handle->type == SLIC_HANDLE_FREE);                \
         _adapter->pfree_slic_handles = _pslic_handle->next;             \
     }                                                                   \
     spin_unlock_irqrestore(&_adapter->handle_lock.lock,                 \
@@ -325,11 +298,8 @@ static void slic_timer_ping(ulong dev)
         struct adapter *adapter;
         struct sliccard *card;
 
-        ASSERT(dev);
         adapter = netdev_priv((struct net_device *)dev);
-        ASSERT(adapter);
         card = adapter->card;
-        ASSERT(card);
 
         adapter->pingtimer.expires = jiffies + (PING_TIMER_INTERVAL * HZ);
         add_timer(&adapter->pingtimer);
@@ -361,9 +331,6 @@ static void slic_link_config(struct adapter *adapter,
         if (adapter->state != ADAPT_UP)
                 return;
 
-        ASSERT((adapter->devid == SLIC_1GB_DEVICE_ID)
-               || (adapter->devid == SLIC_2GB_DEVICE_ID));
-
         if (linkspeed > LINK_1000MB)
                 linkspeed = LINK_AUTOSPEED;
         if (linkduplex > LINK_AUTOD)
@@ -593,8 +560,7 @@ static int slic_card_download(struct adapter *adapter)
                 file = "slicoss/gbdownload.sys";
                 break;
         default:
-                ASSERT(0);
-                break;
+                return -ENOENT;
         }
         ret = request_firmware(&fw, file, &adapter->pcidev->dev);
         if (ret) {
@@ -604,7 +570,6 @@ static int slic_card_download(struct adapter *adapter)
         }
         numsects = *(u32 *)(fw->data + index);
         index += 4;
-        ASSERT(numsects <= 3);
         for (i = 0; i < numsects; i++) {
                 sectsize[i] = *(u32 *)(fw->data + index);
                 index += 4;
@@ -1060,8 +1025,6 @@ static void slic_upr_start(struct adapter *adapter)
         case SLIC_UPR_PING:
                 slic_reg32_write(&slic_regs->slic_ping, 1, FLUSH);
                 break;
-        default:
-                ASSERT(0);
         }
 }
 
@@ -1116,9 +1079,6 @@ static void slic_link_upr_complete(struct adapter *adapter, u32 isr)
         if (adapter->state != ADAPT_UP)
                 return;
 
-        ASSERT((adapter->devid == SLIC_1GB_DEVICE_ID)
-               || (adapter->devid == SLIC_2GB_DEVICE_ID));
-
         linkup = linkstatus & GIG_LINKUP ? LINK_UP : LINK_DOWN;
         if (linkstatus & GIG_SPEED_1000)
                 linkspeed = LINK_1000MB;
@@ -1170,7 +1130,6 @@ static void slic_upr_request_complete(struct adapter *adapter, u32 isr)
         spin_lock_irqsave(&adapter->upr_lock.lock, adapter->upr_lock.flags);
         upr = adapter->upr_list;
         if (!upr) {
-                ASSERT(0);
                 spin_unlock_irqrestore(&adapter->upr_lock.lock,
                                         adapter->upr_lock.flags);
                 return;
@@ -1178,7 +1137,6 @@ static void slic_upr_request_complete(struct adapter *adapter, u32 isr)
         adapter->upr_list = upr->next;
         upr->next = NULL;
         adapter->upr_busy = 0;
-        ASSERT(adapter->port == upr->adapter);
         switch (upr->upr_request) {
         case SLIC_UPR_STATS:
                 {
@@ -1260,23 +1218,9 @@ static void slic_upr_request_complete(struct adapter *adapter, u32 isr)
                 break;
         case SLIC_UPR_RCONFIG:
                 break;
-        case SLIC_UPR_RPHY:
-                ASSERT(0);
-                break;
-        case SLIC_UPR_ENLB:
-                ASSERT(0);
-                break;
-        case SLIC_UPR_ENCT:
-                ASSERT(0);
-                break;
-        case SLIC_UPR_PDWN:
-                ASSERT(0);
-                break;
         case SLIC_UPR_PING:
                 card->pingstatus |= (isr & ISR_PINGDSMASK);
                 break;
-        default:
-                ASSERT(0);
         }
         kfree(upr);
         slic_upr_start(adapter);
@@ -1292,7 +1236,6 @@ static void slic_config_get(struct adapter *adapter, u32 config,
         status = slic_upr_request(adapter,
                                   SLIC_UPR_RCONFIG,
                                   (u32) config, (u32) config_h, 0, 0);
-        ASSERT(status == 0);
 }
 
 /*
@@ -1422,7 +1365,6 @@ static int slic_rspqueue_init(struct adapter *adapter)
         __iomem struct slic_regs *slic_regs = adapter->slic_regs;
         u32 paddrh = 0;
 
-        ASSERT(adapter->state == ADAPT_DOWN);
         memset(rspq, 0, sizeof(struct slic_rspqueue));
 
         rspq->num_pages = SLIC_RSPQ_PAGES_GB;
@@ -1439,14 +1381,6 @@ static int slic_rspqueue_init(struct adapter *adapter)
                 }
                 /* FIXME:
                  * do we really need this assertions (4K PAGE_SIZE aligned addr)? */
-#if 0
-#ifndef CONFIG_X86_64
-                ASSERT(((u32) rspq->vaddr[i] & 0xFFFFF000) ==
-                       (u32) rspq->vaddr[i]);
-                ASSERT(((u32) rspq->paddr[i] & 0xFFFFF000) ==
-                       (u32) rspq->paddr[i]);
-#endif
-#endif
                 memset(rspq->vaddr[i], 0, PAGE_SIZE);
 
                 if (paddrh == 0) {
@@ -1475,18 +1409,9 @@ static struct slic_rspbuf *slic_rspqueue_getnext(struct adapter *adapter)
                 return NULL;
 
         buf = rspq->rspbuf;
-#if BITS_PER_LONG == 32
-        ASSERT((buf->status & 0xFFFFFFE0) == 0);
-#endif
-        ASSERT(buf->hosthandle);
         if (++rspq->offset < SLIC_RSPQ_BUFSINPAGE) {
                 rspq->rspbuf++;
-#if BITS_PER_LONG == 32
-                ASSERT(((u32) rspq->rspbuf & 0xFFFFFFE0) ==
-                       (u32) rspq->rspbuf);
-#endif
         } else {
-                ASSERT(rspq->offset == SLIC_RSPQ_BUFSINPAGE);
                 slic_reg64_write(adapter, &adapter->slic_regs->slic_rbar64,
                         (rspq->paddr[rspq->pageindex] | SLIC_RSPQ_BUFSINPAGE),
                         &adapter->slic_regs->slic_addr_upper, 0, DONT_FLUSH);
@@ -1494,22 +1419,9 @@ static struct slic_rspbuf *slic_rspqueue_getnext(struct adapter *adapter)
                 rspq->offset = 0;
                 rspq->rspbuf = (struct slic_rspbuf *)
                                                 rspq->vaddr[rspq->pageindex];
-#if BITS_PER_LONG == 32
-                ASSERT(((u32) rspq->rspbuf & 0xFFFFF000) ==
-                       (u32) rspq->rspbuf);
-#endif
         }
-#if BITS_PER_LONG == 32
-        ASSERT(((u32) buf & 0xFFFFFFE0) == (u32) buf);
-#endif
-        return buf;
-}
-
-static void slic_cmdqmem_init(struct adapter *adapter)
-{
-        struct slic_cmdqmem *cmdqmem = &adapter->cmdqmem;
 
-        memset(cmdqmem, 0, sizeof(struct slic_cmdqmem));
+        return buf;
 }
 
 static void slic_cmdqmem_free(struct adapter *adapter)
@@ -1540,9 +1452,7 @@ static u32 *slic_cmdqmem_addpage(struct adapter *adapter)
                                         &cmdqmem->dma_pages[cmdqmem->pagecnt]);
         if (!pageaddr)
                 return NULL;
-#if BITS_PER_LONG == 32
-        ASSERT(((u32) pageaddr & 0xFFFFF000) == (u32) pageaddr);
-#endif
+
         cmdqmem->pages[cmdqmem->pagecnt] = pageaddr;
         cmdqmem->pagecnt++;
         return pageaddr;
@@ -1598,11 +1508,6 @@ static void slic_cmdq_addcmdpage(struct adapter *adapter, u32 *page)
                (adapter->slic_handle_ix < 256)) {
                 /* Allocate and initialize a SLIC_HANDLE for this command */
                 SLIC_GET_SLIC_HANDLE(adapter, pslic_handle);
-                if (pslic_handle == NULL)
-                        ASSERT(0);
-                ASSERT(pslic_handle ==
-                       &adapter->slic_handles[pslic_handle->token.
-                                              handle_index]);
                 pslic_handle->type = SLIC_HANDLE_CMD;
                 pslic_handle->address = (void *) cmd;
                 pslic_handle->offset = (ushort) adapter->slic_handle_ix++;
@@ -1641,20 +1546,16 @@ static int slic_cmdq_init(struct adapter *adapter)
         int i;
         u32 *pageaddr;
 
-        ASSERT(adapter->state == ADAPT_DOWN);
         memset(&adapter->cmdq_all, 0, sizeof(struct slic_cmdqueue));
         memset(&adapter->cmdq_free, 0, sizeof(struct slic_cmdqueue));
         memset(&adapter->cmdq_done, 0, sizeof(struct slic_cmdqueue));
         spin_lock_init(&adapter->cmdq_all.lock.lock);
         spin_lock_init(&adapter->cmdq_free.lock.lock);
         spin_lock_init(&adapter->cmdq_done.lock.lock);
-        slic_cmdqmem_init(adapter);
+        memset(&adapter->cmdqmem, 0, sizeof(struct slic_cmdqmem));
         adapter->slic_handle_ix = 1;
         for (i = 0; i < SLIC_CMDQ_INITPAGES; i++) {
                 pageaddr = slic_cmdqmem_addpage(adapter);
-#if BITS_PER_LONG == 32
-                ASSERT(((u32) pageaddr & 0xFFFFF000) == (u32) pageaddr);
-#endif
                 if (!pageaddr) {
                         slic_cmdq_free(adapter);
                         return -ENOMEM;
@@ -1682,7 +1583,6 @@ static void slic_cmdq_reset(struct adapter *adapter)
         while (hcmd) {
                 if (hcmd->busy) {
                         skb = hcmd->skb;
-                        ASSERT(skb);
                         hcmd->busy = 0;
                         hcmd->skb = NULL;
                         dev_kfree_skb_irq(skb);
@@ -1718,7 +1618,6 @@ static void slic_cmdq_getdone(struct adapter *adapter)
         struct slic_cmdqueue *done_cmdq = &adapter->cmdq_done;
         struct slic_cmdqueue *free_cmdq = &adapter->cmdq_free;
 
-        ASSERT(free_cmdq->head == NULL);
         spin_lock_irqsave(&done_cmdq->lock.lock, done_cmdq->lock.flags);
 
         free_cmdq->head = done_cmdq->head;
@@ -1884,7 +1783,6 @@ static int slic_rcvqueue_init(struct adapter *adapter)
         int i, count;
         struct slic_rcvqueue *rcvq = &adapter->rcvqueue;
 
-        ASSERT(adapter->state == ADAPT_DOWN);
         rcvq->tail = NULL;
         rcvq->head = NULL;
         rcvq->size = SLIC_RCVQ_ENTRIES;
@@ -1913,7 +1811,6 @@ static struct sk_buff *slic_rcvqueue_getnext(struct adapter *adapter)
         if (rcvq->count) {
                 skb = rcvq->head;
                 rcvbuf = (struct slic_rcvbuf *)skb->head;
-                ASSERT(rcvbuf);
 
                 if (rcvbuf->status & IRHDDR_SVALID) {
                         rcvq->head = rcvq->head->next;
@@ -1946,8 +1843,6 @@ static u32 slic_rcvqueue_reinsert(struct adapter *adapter, struct sk_buff *skb)
         struct slic_rcvbuf *rcvbuf = (struct slic_rcvbuf *)skb->head;
         struct device *dev;
 
-        ASSERT(skb->len == SLIC_RCVBUF_HEADSIZE);
-
         paddr = (void *)pci_map_single(adapter->pcidev, skb->head,
                                   SLIC_RCVQ_RCVBUFSIZE, PCI_DMA_FROMDEVICE);
         rcvbuf->status = 0;
@@ -2019,7 +1914,6 @@ static int slic_debug_card_show(struct seq_file *seq, void *v)
                     card->adapters_activated);
         seq_printf(seq, "     Allocated           : %d\n",
                     card->adapters_allocated);
-        ASSERT(card->card_size <= SLIC_NBR_MACS);
         for (i = 0; i < card->card_size; i++) {
                 seq_printf(seq,
                            "     MAC%d : %2.2X %2.2X %2.2X %2.2X %2.2X %2.2X\n",
@@ -2460,7 +2354,6 @@ static void slic_link_event_handler(struct adapter *adapter)
                 (u32) &pshmem->linkstatus,      /* no 4GB wrap guaranteed */
                                   0, 0, 0);
 #endif
-        ASSERT(status == 0);
 }
 
 static void slic_init_cleanup(struct adapter *adapter)
@@ -2524,8 +2417,6 @@ static void slic_mcast_set_list(struct net_device *dev)
         char *addresses;
         struct netdev_hw_addr *ha;
 
-        ASSERT(adapter);
-
         netdev_for_each_mc_addr(ha, dev) {
                 addresses = (char *) &ha->addr;
                 status = slic_mcast_add_list(adapter, addresses);
@@ -2612,8 +2503,6 @@ static void slic_xmit_fail(struct adapter *adapter,
                                 "xmit_start skb[%p] type[%x] No host commands "
                                 "available\n", skb, skb->pkt_type);
                         break;
-                default:
-                        ASSERT(0);
                 }
         }
         dev_kfree_skb(skb);
@@ -2725,7 +2614,6 @@ static void slic_rcv_handler(struct adapter *adapter)
         while ((skb = slic_rcvqueue_getnext(adapter))) {
                 u32 rx_bytes;
 
-                ASSERT(skb->head);
                 rcvbuf = (struct slic_rcvbuf *)skb->head;
                 adapter->card->events++;
                 if (rcvbuf->status & IRHDDR_ERR) {
@@ -2781,16 +2669,11 @@ static void slic_xmit_complete(struct adapter *adapter)
                  Get the complete host command buffer
                 */
                 slic_handle_word.handle_token = rspbuf->hosthandle;
-                ASSERT(slic_handle_word.handle_index);
-                ASSERT(slic_handle_word.handle_index <= SLIC_CMDQ_MAXCMDS);
                 hcmd =
                     (struct slic_hostcmd *)
                         adapter->slic_handles[slic_handle_word.handle_index].
                                                                         address;
 /*      hcmd = (struct slic_hostcmd *) rspbuf->hosthandle; */
-                ASSERT(hcmd);
-                ASSERT(hcmd->pslic_handle ==
-                       &adapter->slic_handles[slic_handle_word.handle_index]);
                 if (hcmd->type == SLIC_CMD_DUMB) {
                         if (hcmd->skb)
                                 dev_kfree_skb_irq(hcmd->skb);
@@ -2884,9 +2767,6 @@ static irqreturn_t slic_interrupt(int irq, void *dev_id)
                                 slic_upr_request_complete(adapter, isr);
                         }
                         break;
-
-                default:
-                        break;
                 }
 
                 adapter->isrcopy = 0;
@@ -2911,7 +2791,6 @@ static netdev_tx_t slic_xmit_start(struct sk_buff *skb, struct net_device *dev)
         void *offloadcmd = NULL;
 
         card = adapter->card;
-        ASSERT(card);
         if ((adapter->linkstate != LINK_UP) ||
             (adapter->state != ADAPT_UP) || (card->state != CARD_UP)) {
                 status = XMIT_FAIL_LINK_STATE;
@@ -2929,9 +2808,6 @@ static netdev_tx_t slic_xmit_start(struct sk_buff *skb, struct net_device *dev)
                         status = XMIT_FAIL_HOSTCMD_FAIL;
                         goto xmit_fail;
                 }
-                ASSERT(hcmd->pslic_handle);
-                ASSERT(hcmd->cmd64.hosthandle ==
-                       hcmd->pslic_handle->token.handle_token);
                 hcmd->skb = skb;
                 hcmd->busy = 1;
                 hcmd->type = SLIC_CMD_DUMB;
@@ -3024,8 +2900,6 @@ static int slic_if_init(struct adapter *adapter)
         struct slic_shmem *pshmem;
         int rc;
 
-        ASSERT(card);
-
         /* adapter should be down at this point */
         if (adapter->state != ADAPT_DOWN) {
                 dev_err(&dev->dev, "%s: adapter->state != ADAPT_DOWN\n",
@@ -3033,7 +2907,6 @@ static int slic_if_init(struct adapter *adapter)
                 rc = -EIO;
                 goto err;
         }
-        ASSERT(adapter->linkstate == LINK_DOWN);
 
         adapter->devflags_prev = dev->flags;
         adapter->macopts = MAC_DIRECTED;
@@ -3133,9 +3006,6 @@ static int slic_entry_open(struct net_device *dev)
         struct sliccard *card = adapter->card;
         int status;
 
-        ASSERT(adapter);
-        ASSERT(card);
-
         netif_stop_queue(adapter->netdev);
 
         spin_lock_irqsave(&slic_global.driver_lock.lock,
@@ -3176,7 +3046,7 @@ static void slic_card_cleanup(struct sliccard *card)
         kfree(card);
 }
 
-static void __devexit slic_entry_remove(struct pci_dev *pcidev)
+static void slic_entry_remove(struct pci_dev *pcidev)
 {
         struct net_device *dev = pci_get_drvdata(pcidev);
         u32 mmio_start = 0;
@@ -3202,9 +3072,7 @@ static void __devexit slic_entry_remove(struct pci_dev *pcidev)
                 mlist = mlist->next;
                 kfree(mcaddr);
         }
-        ASSERT(adapter->card);
         card = adapter->card;
-        ASSERT(card->adapters_allocated);
         card->adapters_allocated--;
         adapter->allocated = 0;
         if (!card->adapters_allocated) {
@@ -3214,10 +3082,8 @@ static void __devexit slic_entry_remove(struct pci_dev *pcidev)
                 } else {
                         while (curr_card->next != card)
                                 curr_card = curr_card->next;
-                        ASSERT(curr_card);
                         curr_card->next = card->next;
                 }
-                ASSERT(slic_global.num_slic_cards);
                 slic_global.num_slic_cards--;
                 slic_card_cleanup(card);
         }
@@ -3234,14 +3100,12 @@ static int slic_entry_halt(struct net_device *dev)
 
         spin_lock_irqsave(&slic_global.driver_lock.lock,
                                 slic_global.driver_lock.flags);
-        ASSERT(card);
         netif_stop_queue(adapter->netdev);
         adapter->state = ADAPT_DOWN;
         adapter->linkstate = LINK_DOWN;
         adapter->upr_list = NULL;
         adapter->upr_busy = 0;
         adapter->devflags_prev = 0;
-        ASSERT(card->adapter[adapter->cardindex] == adapter);
         slic_reg32_write(&slic_regs->slic_icr, ICR_INT_OFF, FLUSH);
         adapter->all_reg_writes++;
         adapter->icr_reg_writes++;
@@ -3273,7 +3137,6 @@ static struct net_device_stats *slic_get_stats(struct net_device *dev)
 {
         struct adapter *adapter = netdev_priv(dev);
 
-        ASSERT(adapter);
         dev->stats.collisions = adapter->slic_stats.iface.xmit_collisions;
         dev->stats.rx_errors = adapter->slic_stats.iface.rcv_errors;
         dev->stats.tx_errors = adapter->slic_stats.iface.xmt_errors;
@@ -3296,7 +3159,6 @@ static int slic_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
         u32 data[7];
         u32 intagg;
 
-        ASSERT(rq);
         switch (cmd) {
         case SIOCSLICSETINTAGG:
                 if (copy_from_user(data, rq->ifr_data, 28))
@@ -3342,7 +3204,6 @@ static int slic_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
                 }
 #endif
         case SIOCETHTOOL:
-                ASSERT(adapter);
                 if (copy_from_user(&ecmd, rq->ifr_data, sizeof(ecmd)))
                         return -EFAULT;
 
@@ -3682,7 +3543,6 @@ static void slic_init_adapter(struct net_device *netdev,
         /*
           Initialize slic_handle array
         */
-        ASSERT(SLIC_CMDQ_MAXCMDS <= 0xFFFF);
         /*
          Start with 1.  0 is an invalid host handle.
         */
@@ -3699,8 +3559,6 @@ static void slic_init_adapter(struct net_device *netdev,
                                         sizeof(struct slic_shmem),
                                         &adapter->
                                         phys_shmem);
-        ASSERT(adapter->pshmem);
-
         if (adapter->pshmem)
                 memset(adapter->pshmem, 0, sizeof(struct slic_shmem));
 }
@@ -3775,11 +3633,9 @@ static u32 slic_card_locate(struct adapter *adapter)
                 }
         }
 
-        ASSERT(card);
         if (!card)
                 return -ENXIO;
         /* Put the adapter in the card's adapter list */
-        ASSERT(card->adapter[adapter->port] == NULL);
         if (!card->adapter[adapter->port]) {
                 card->adapter[adapter->port] = adapter;
                 adapter->card = card;
@@ -3794,7 +3650,6 @@ static u32 slic_card_locate(struct adapter *adapter)
                         else
                                 break;
                 }
-                ASSERT(i != SLIC_MAX_PORTS);
                 if (physcard->adapter[i]->slotnumber == adapter->slotnumber)
                         break;
                 physcard = physcard->next;
@@ -3802,7 +3657,11 @@ static u32 slic_card_locate(struct adapter *adapter)
         if (!physcard) {
                 /* no structure allocated for this physical card yet */
                 physcard = kzalloc(sizeof(struct physcard), GFP_ATOMIC);
-                ASSERT(physcard);
+                if (!physcard) {
+                        if (card_hostid == SLIC_HOSTID_DEFAULT)
+                                kfree(card);
+                        return -ENOMEM;
+                }
 
                 physcard->next = slic_global.phys_card;
                 slic_global.phys_card = physcard;
@@ -3813,14 +3672,13 @@ static u32 slic_card_locate(struct adapter *adapter)
         /* Note - this is ZERO relative */
         adapter->physport = physcard->adapters_allocd - 1;
 
-        ASSERT(physcard->adapter[adapter->physport] == NULL);
         physcard->adapter[adapter->physport] = adapter;
         adapter->physcard = physcard;
 
         return 0;
 }
 
-static int __devinit slic_entry_probe(struct pci_dev *pcidev,
+static int slic_entry_probe(struct pci_dev *pcidev,
                                const struct pci_device_id *pci_tbl_entry)
 {
         static int cards_found;
@@ -3962,7 +3820,7 @@ static struct pci_driver slic_driver = {
         .name = DRV_NAME,
         .id_table = slic_pci_tbl,
         .probe = slic_entry_probe,
-        .remove = __devexit_p(slic_entry_remove),
+        .remove = slic_entry_remove,
 };
 
 static int __init slic_module_init(void)
diff --git a/drivers/staging/sm7xxfb/sm7xxfb.c b/drivers/staging/sm7xxfb/sm7xxfb.c
index f27182d4dea6..0764bbbfd497 100644
--- a/drivers/staging/sm7xxfb/sm7xxfb.c
+++ b/drivers/staging/sm7xxfb/sm7xxfb.c
@@ -768,7 +768,7 @@ static inline void sm7xx_init_hw(void)
         outb_p(0x11, 0x3c5);
 }
 
-static int __devinit smtcfb_pci_probe(struct pci_dev *pdev,
+static int smtcfb_pci_probe(struct pci_dev *pdev,
                                    const struct pci_device_id *ent)
 {
         struct smtcfb_info *sfb;
@@ -928,7 +928,7 @@ static DEFINE_PCI_DEVICE_TABLE(smtcfb_pci_table) = {
         {0,}
 };
 
-static void __devexit smtcfb_pci_remove(struct pci_dev *pdev)
+static void smtcfb_pci_remove(struct pci_dev *pdev)
 {
         struct smtcfb_info *sfb;
 
@@ -1027,7 +1027,7 @@ static struct pci_driver smtcfb_driver = {
         .name = "smtcfb",
         .id_table = smtcfb_pci_table,
         .probe = smtcfb_pci_probe,
-        .remove = __devexit_p(smtcfb_pci_remove),
+        .remove = smtcfb_pci_remove,
         .driver.pm  = SM7XX_PM_OPS,
 };
 
diff --git a/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c b/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c
index 277491a877ea..299f51810199 100644
--- a/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c
+++ b/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c
@@ -31,6 +31,7 @@
 #include <linux/interrupt.h>
 #include <linux/regulator/consumer.h>
 #include <linux/module.h>
+#include <linux/input/mt.h>
 #include "synaptics_i2c_rmi4.h"
 
 /* TODO: for multiple device support will need a per-device mutex */
@@ -67,7 +68,6 @@
 #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)
 
@@ -164,6 +164,7 @@ struct synaptics_rmi4_device_info {
  * @regulator: pointer to the regulator structure
  * @wait: wait queue structure variable
  * @touch_stopped: flag to stop the thread function
+ * @fingers_supported: maximum supported fingers
  *
  * This structure gives the device data information.
  */
@@ -184,6 +185,7 @@ struct synaptics_rmi4_data {
         struct regulator        *regulator;
         wait_queue_head_t       wait;
         bool                    touch_stopped;
+        unsigned char           fingers_supported;
 };
 
 /**
@@ -303,22 +305,21 @@ static int synpatics_rmi4_touchpad_report(struct synaptics_rmi4_data *pdata,
         /* 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;
+        int     x, y;
+        int     wx, wy;
         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];
+        unsigned char   fingers_supported = pdata->fingers_supported;
         struct  i2c_client *client = pdata->i2c_client;
+        struct  input_dev *input_dev = pdata->input_dev;
 
         /* get 2D sensor finger data */
         /*
@@ -333,7 +334,6 @@ static int synpatics_rmi4_touchpad_report(struct synaptics_rmi4_data *pdata,
          *      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,
@@ -358,7 +358,11 @@ static int synpatics_rmi4_touchpad_report(struct synaptics_rmi4_data *pdata,
                  * if finger status indicates a finger is present then
                  * read the finger data and report it
                  */
-                if (finger_status == 1 || finger_status == 2) {
+                input_mt_slot(input_dev, finger);
+                input_mt_report_slot_state(input_dev, MT_TOOL_FINGER,
+                                                        finger_status != 0);
+
+                if (finger_status) {
                         /* Read the finger data */
                         data_offset = data_base_addr +
                                         ((finger * data_reg_blk_size) +
@@ -367,50 +371,33 @@ static int synpatics_rmi4_touchpad_report(struct synaptics_rmi4_data *pdata,
                                                 data_offset, data,
                                                 data_reg_blk_size);
                         if (retval != data_reg_blk_size) {
-                                printk(KERN_ERR "%s:read data failed\n",
+                                dev_err(&client->dev, "%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];
                         }
+                        x = (data[0] << 4) | (data[2] & MASK_4BIT);
+                        y = (data[1] << 4) | ((data[2] >> 4) & MASK_4BIT);
+                        wy = (data[3] >> 4) & MASK_4BIT;
+                        wx = (data[3] & MASK_4BIT);
+
+                        if (pdata->board->x_flip)
+                                x = pdata->sensor_max_x - x;
+                        if (pdata->board->y_flip)
+                                y = pdata->sensor_max_y - y;
+
+                        input_report_abs(input_dev, ABS_MT_TOUCH_MAJOR,
+                                                                max(wx, wy));
+                        input_report_abs(input_dev, ABS_MT_POSITION_X, x);
+                        input_report_abs(input_dev, ABS_MT_POSITION_Y, y);
+
                         /* 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);
+        input_mt_sync_frame(input_dev);
+        input_sync(input_dev);
         /* return the number of touch points */
         return touch_count;
 }
@@ -575,6 +562,7 @@ static int synpatics_rmi4_touchpad_detect(struct synaptics_rmi4_data *pdata,
                 if ((queries[1] & MASK_3BIT) == 5)
                         rfi->num_of_data_points = 10;
         }
+        pdata->fingers_supported = rfi->num_of_data_points;
         /* Need to get interrupt info for handling interrupts */
         rfi->index_to_intr_reg = (interruptcount + 7)/8;
         if (rfi->index_to_intr_reg != 0)
@@ -891,7 +879,7 @@ static int synaptics_rmi4_i2c_query_device(struct synaptics_rmi4_data *pdata)
  * the rmi4 Physical Device Table and enumerate any rmi4 functions that
  * have data sources associated with them.
  */
-static int __devinit synaptics_rmi4_probe
+static int synaptics_rmi4_probe
         (struct i2c_client *client, const struct i2c_device_id *dev_id)
 {
         int retval;
@@ -988,6 +976,8 @@ static int __devinit synaptics_rmi4_probe
                                         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);
+        input_mt_init_slots(rmi4_data->input_dev,
+                                rmi4_data->fingers_supported, 0);
 
         /* Clear interrupts */
         synaptics_rmi4_i2c_block_read(rmi4_data,
@@ -1032,7 +1022,7 @@ err_input:
  * This function uses to remove the i2c-client
  * touchscreen driver and returns integer.
  */
-static int __devexit synaptics_rmi4_remove(struct i2c_client *client)
+static int 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;
@@ -1140,33 +1130,11 @@ static struct i2c_driver synaptics_rmi4_driver = {
 #endif
         },
         .probe          =       synaptics_rmi4_probe,
-        .remove         =       __devexit_p(synaptics_rmi4_remove),
+        .remove         =       synaptics_rmi4_remove,
         .id_table       =       synaptics_rmi4_id_table,
 };
-/**
- * synaptics_rmi4_init() - Initialize the touchscreen driver
- *
- * This function 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 function 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_i2c_driver(synaptics_rmi4_driver);
 
 MODULE_LICENSE("GPL v2");
 MODULE_AUTHOR("naveen.gaddipati@stericsson.com, js.ha@stericsson.com");
diff --git a/drivers/staging/telephony/Kconfig b/drivers/staging/telephony/Kconfig
deleted file mode 100644
index b5f78b6ed2bd..000000000000
--- a/drivers/staging/telephony/Kconfig
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# Telephony device configuration
-#
-
-menuconfig PHONE
-        tristate "Telephony support"
-        depends on HAS_IOMEM
-        ---help---
-          Say Y here if you have a telephony card, which for example allows
-          you to use a regular phone for voice-over-IP applications.
-
-          Note: this has nothing to do with modems.  You do not need to say Y
-          here in order to be able to use a modem under Linux.
-
-          To compile this driver as a module, choose M here: the
-          module will be called phonedev.
-
-if PHONE
-
-config PHONE_IXJ
-        tristate "QuickNet Internet LineJack/PhoneJack support"
-        depends on ISA || PCI
-        ---help---
-          Say M if you have a telephony card manufactured by Quicknet
-          Technologies, Inc.  These include the Internet PhoneJACK and
-          Internet LineJACK Telephony Cards. You will get a module called
-          ixj.
-
-          For the ISA versions of these products, you can configure the
-          cards using the isapnp tools (pnpdump/isapnp) or you can use the
-          isapnp support.  Please read <file:Documentation/telephony/ixj.txt>.
-
-          For more information on these cards, see Quicknet's web site at:
-          <http://www.quicknet.net/>.
-
-          If you do not have any Quicknet telephony cards, you can safely
-          say N here.
-
-config PHONE_IXJ_PCMCIA
-        tristate "QuickNet Internet LineJack/PhoneJack PCMCIA support"
-        depends on PHONE_IXJ && PCMCIA
-        help
-          Say Y here to configure in PCMCIA service support for the Quicknet
-          cards manufactured by Quicknet Technologies, Inc.  This changes the
-          card initialization code to work with the card manager daemon.
-
-endif # PHONE
diff --git a/drivers/staging/telephony/Makefile b/drivers/staging/telephony/Makefile
deleted file mode 100644
index 1206615d69e4..000000000000
--- a/drivers/staging/telephony/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Makefile for drivers/telephony
-#
-
-obj-$(CONFIG_PHONE) += phonedev.o
-obj-$(CONFIG_PHONE_IXJ) += ixj.o
-obj-$(CONFIG_PHONE_IXJ_PCMCIA) += ixj_pcmcia.o
diff --git a/drivers/staging/telephony/TODO b/drivers/staging/telephony/TODO
deleted file mode 100644
index d47dec3508d7..000000000000
--- a/drivers/staging/telephony/TODO
+++ /dev/null
@@ -1,10 +0,0 @@
-TODO
-. Determine if the boards are still in use
-  and move this module back to drivers/telephony if necessary
-. Coding style cleanups
-
-Please send patches to Greg Kroah-Hartman <greg@kroah.com> and
-cc Joe Perches <joe@perches.com> if the module should be reactivated.
-
-If no module activity occurs before version 3.6 is released, this
-module should be removed.
diff --git a/drivers/staging/telephony/ixj-ver.h b/drivers/staging/telephony/ixj-ver.h
deleted file mode 100644
index 2031ac6c888c..000000000000
--- a/drivers/staging/telephony/ixj-ver.h
+++ /dev/null
@@ -1,4 +0,0 @@
-/* configuration management identifiers */
-#define IXJ_VER_MAJOR 1
-#define IXJ_VER_MINOR 0
-#define IXJ_BLD_VER   1
diff --git a/drivers/staging/telephony/ixj.c b/drivers/staging/telephony/ixj.c
deleted file mode 100644
index 1cfa0b07d725..000000000000
--- a/drivers/staging/telephony/ixj.c
+++ /dev/null
@@ -1,10571 +0,0 @@
-/****************************************************************************
- *    ixj.c
- *
- * Device Driver for Quicknet Technologies, Inc.'s Telephony cards
- * including the Internet PhoneJACK, Internet PhoneJACK Lite,
- * Internet PhoneJACK PCI, Internet LineJACK, Internet PhoneCARD and
- * SmartCABLE
- *
- *    (c) Copyright 1999-2001  Quicknet Technologies, Inc.
- *
- *    This program is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU General Public License
- *    as published by the Free Software Foundation; either version
- *    2 of the License, or (at your option) any later version.
- *
- * Author:          Ed Okerson, <eokerson@quicknet.net>
- *
- * Contributors:    Greg Herlein, <gherlein@quicknet.net>
- *                  David W. Erhart, <derhart@quicknet.net>
- *                  John Sellers, <jsellers@quicknet.net>
- *                  Mike Preston, <mpreston@quicknet.net>
- *
- * Fixes:           David Huggins-Daines, <dhd@cepstral.com>
- *                  Fabio Ferrari, <fabio.ferrari@digitro.com.br>
- *                  Artis Kugevics, <artis@mt.lv>
- *                  Daniele Bellucci, <bellucda@tiscali.it>
- *
- * More information about the hardware related to this driver can be found
- * at our website:    http://www.quicknet.net
- *
- * IN NO EVENT SHALL QUICKNET TECHNOLOGIES, INC. BE LIABLE TO ANY PARTY FOR
- * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
- * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF QUICKNET
- * TECHNOLOGIES, INC. HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * QUICKNET TECHNOLOGIES, INC. SPECIFICALLY DISCLAIMS ANY WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND QUICKNET TECHNOLOGIES, INC. HAS NO OBLIGATION
- * TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- *
- ***************************************************************************/
-
-/*
- * Revision 4.8  2003/07/09 19:39:00  Daniele Bellucci
- * Audit some copy_*_user and minor cleanup.
- *
- * Revision 4.7  2001/08/13 06:19:33  craigs
- * Added additional changes from Alan Cox and John Anderson for
- * 2.2 to 2.4 cleanup and bounds checking
- *
- * Revision 4.6  2001/08/13 01:05:05  craigs
- * Really fixed PHONE_QUERY_CODEC problem this time
- *
- * Revision 4.5  2001/08/13 00:11:03  craigs
- * Fixed problem in handling of PHONE_QUERY_CODEC, thanks to Shane Anderson
- *
- * Revision 4.4  2001/08/07 07:58:12  craigs
- * Changed back to three digit version numbers
- * Added tagbuild target to allow automatic and easy tagging of versions
- *
- * Revision 4.3  2001/08/07 07:24:47  craigs
- * Added ixj-ver.h to allow easy configuration management of driver
- * Added display of version number in /prox/ixj
- *
- * Revision 4.2  2001/08/06 07:07:19  craigs
- * Reverted IXJCTL_DSP_TYPE and IXJCTL_DSP_VERSION files to original
- * behaviour of returning int rather than short *
- *
- * Revision 4.1  2001/08/05 00:17:37  craigs
- * More changes for correct PCMCIA installation
- * Start of changes for backward Linux compatibility
- *
- * Revision 4.0  2001/08/04 12:33:12  craigs
- * New version using GNU autoconf
- *
- * Revision 3.105  2001/07/20 23:14:32  eokerson
- * More work on CallerID generation when using ring cadences.
- *
- * Revision 3.104  2001/07/06 01:33:55  eokerson
- * Some bugfixes from Robert Vojta <vojta@ipex.cz> and a few mods to the Makefile.
- *
- * Revision 3.103  2001/07/05 19:20:16  eokerson
- * Updated HOWTO
- * Changed mic gain to 30dB on Internet LineJACK mic/speaker port.
- *
- * Revision 3.102  2001/07/03 23:51:21  eokerson
- * Un-mute mic on Internet LineJACK when in speakerphone mode.
- *
- * Revision 3.101  2001/07/02 19:26:56  eokerson
- * Removed initialiazation of ixjdebug and ixj_convert_loaded so they will go in the .bss instead of the .data
- *
- * Revision 3.100  2001/07/02 19:18:27  eokerson
- * Changed driver to make dynamic allocation possible.  We now pass IXJ * between functions instead of array indexes.
- * Fixed the way the POTS and PSTN ports interact during a PSTN call to allow local answering.
- * Fixed speaker mode on Internet LineJACK.
- *
- * Revision 3.99  2001/05/09 14:11:16  eokerson
- * Fixed kmalloc error in ixj_build_filter_cadence.  Thanks David Chan <cat@waulogy.stanford.edu>.
- *
- * Revision 3.98  2001/05/08 19:55:33  eokerson
- * Fixed POTS hookstate detection while it is connected to PSTN port.
- *
- * Revision 3.97  2001/05/08 00:01:04  eokerson
- * Fixed kernel oops when sending caller ID data.
- *
- * Revision 3.96  2001/05/04 23:09:30  eokerson
- * Now uses one kernel timer for each card, instead of one for the entire driver.
- *
- * Revision 3.95  2001/04/25 22:06:47  eokerson
- * Fixed squawking at beginning of some G.723.1 calls.
- *
- * Revision 3.94  2001/04/03 23:42:00  eokerson
- * Added linear volume ioctls
- * Added raw filter load ioctl
- *
- * Revision 3.93  2001/02/27 01:00:06  eokerson
- * Fixed blocking in CallerID.
- * Reduced size of ixj structure for smaller driver footprint.
- *
- * Revision 3.92  2001/02/20 22:02:59  eokerson
- * Fixed isapnp and pcmcia module compatibility for 2.4.x kernels.
- * Improved PSTN ring detection.
- * Fixed wink generation on POTS ports.
- *
- * Revision 3.91  2001/02/13 00:55:44  eokerson
- * Turn AEC back on after changing frame sizes.
- *
- * Revision 3.90  2001/02/12 16:42:00  eokerson
- * Added ALAW codec, thanks to Fabio Ferrari for the table based converters to make ALAW from ULAW.
- *
- * Revision 3.89  2001/02/12 15:41:16  eokerson
- * Fix from Artis Kugevics - Tone gains were not being set correctly.
- *
- * Revision 3.88  2001/02/05 23:25:42  eokerson
- * Fixed lockup bugs with deregister.
- *
- * Revision 3.87  2001/01/29 21:00:39  eokerson
- * Fix from Fabio Ferrari <fabio.ferrari@digitro.com.br> to properly handle EAGAIN and EINTR during non-blocking write.
- * Updated copyright date.
- *
- * Revision 3.86  2001/01/23 23:53:46  eokerson
- * Fixes to G.729 compatibility.
- *
- * Revision 3.85  2001/01/23 21:30:36  eokerson
- * Added verbage about cards supported.
- * Removed commands that put the card in low power mode at some times that it should not be in low power mode.
- *
- * Revision 3.84  2001/01/22 23:32:10  eokerson
- * Some bugfixes from David Huggins-Daines, <dhd@cepstral.com> and other cleanups.
- *
- * Revision 3.83  2001/01/19 14:51:41  eokerson
- * Fixed ixj_WriteDSPCommand to decrement usage counter when command fails.
- *
- * Revision 3.82  2001/01/19 00:34:49  eokerson
- * Added verbosity to write overlap errors.
- *
- * Revision 3.81  2001/01/18 23:56:54  eokerson
- * Fixed PSTN line test functions.
- *
- * Revision 3.80  2001/01/18 22:29:27  eokerson
- * Updated AEC/AGC values for different cards.
- *
- * Revision 3.79  2001/01/17 02:58:54  eokerson
- * Fixed AEC reset after Caller ID.
- * Fixed Codec lockup after Caller ID on Call Waiting when not using 30ms frames.
- *
- * Revision 3.78  2001/01/16 19:43:09  eokerson
- * Added support for Linux 2.4.x kernels.
- *
- * Revision 3.77  2001/01/09 04:00:52  eokerson
- * Linetest will now test the line, even if it has previously succeeded.
- *
- * Revision 3.76  2001/01/08 19:27:00  eokerson
- * Fixed problem with standard cable on Internet PhoneCARD.
- *
- * Revision 3.75  2000/12/22 16:52:14  eokerson
- * Modified to allow hookstate detection on the POTS port when the PSTN port is selected.
- *
- * Revision 3.74  2000/12/08 22:41:50  eokerson
- * Added capability for G729B.
- *
- * Revision 3.73  2000/12/07 23:35:16  eokerson
- * Added capability to have different ring pattern before CallerID data.
- * Added hookstate checks in CallerID routines to stop FSK.
- *
- * Revision 3.72  2000/12/06 19:31:31  eokerson
- * Modified signal behavior to only send one signal per event.
- *
- * Revision 3.71  2000/12/06 03:23:08  eokerson
- * Fixed CallerID on Call Waiting.
- *
- * Revision 3.70  2000/12/04 21:29:37  eokerson
- * Added checking to Smart Cable gain functions.
- *
- * Revision 3.69  2000/12/04 21:05:20  eokerson
- * Changed ixjdebug levels.
- * Added ioctls to change gains in Internet Phone CARD Smart Cable.
- *
- * Revision 3.68  2000/12/04 00:17:21  craigs
- * Changed mixer voice gain to +6dB rather than 0dB
- *
- * Revision 3.67  2000/11/30 21:25:51  eokerson
- * Fixed write signal errors.
- *
- * Revision 3.66  2000/11/29 22:42:44  eokerson
- * Fixed PSTN ring detect problems.
- *
- * Revision 3.65  2000/11/29 07:31:55  craigs
- * Added new 425Hz filter co-efficients
- * Added card-specific DTMF prescaler initialisation
- *
- * Revision 3.64  2000/11/28 14:03:32  craigs
- * Changed certain mixer initialisations to be 0dB rather than 12dB
- * Added additional information to /proc/ixj
- *
- * Revision 3.63  2000/11/28 11:38:41  craigs
- * Added display of AEC modes in AUTO and AGC mode
- *
- * Revision 3.62  2000/11/28 04:05:44  eokerson
- * Improved PSTN ring detection routine.
- *
- * Revision 3.61  2000/11/27 21:53:12  eokerson
- * Fixed flash detection.
- *
- * Revision 3.60  2000/11/27 15:57:29  eokerson
- * More work on G.729 load routines.
- *
- * Revision 3.59  2000/11/25 21:55:12  eokerson
- * Fixed errors in G.729 load routine.
- *
- * Revision 3.58  2000/11/25 04:08:29  eokerson
- * Added board locks around G.729 and TS85 load routines.
- *
- * Revision 3.57  2000/11/24 05:35:17  craigs
- * Added ability to retrieve mixer values on LineJACK
- * Added complete initialisation of all mixer values at startup
- * Fixed spelling mistake
- *
- * Revision 3.56  2000/11/23 02:52:11  robertj
- * Added cvs change log keyword.
- * Fixed bug in capabilities list when using G.729 module.
- *
- */
-
-#include "ixj-ver.h"
-
-#define PERFMON_STATS
-#define IXJDEBUG 0
-#define MAXRINGS 5
-
-#include <linux/module.h>
-
-#include <linux/init.h>
-#include <linux/sched.h>
-#include <linux/kernel.h>       /* printk() */
-#include <linux/fs.h>           /* everything... */
-#include <linux/errno.h>        /* error codes */
-#include <linux/slab.h>
-#include <linux/mutex.h>
-#include <linux/mm.h>
-#include <linux/ioport.h>
-#include <linux/interrupt.h>
-#include <linux/proc_fs.h>
-#include <linux/poll.h>
-#include <linux/timer.h>
-#include <linux/delay.h>
-#include <linux/pci.h>
-
-#include <asm/io.h>
-#include <asm/uaccess.h>
-
-#include <linux/isapnp.h>
-
-#include "ixj.h"
-
-#define TYPE(inode) (iminor(inode) >> 4)
-#define NUM(inode) (iminor(inode) & 0xf)
-
-static DEFINE_MUTEX(ixj_mutex);
-static int ixjdebug;
-static int hertz = HZ;
-static int samplerate = 100;
-
-module_param(ixjdebug, int, 0);
-
-static DEFINE_PCI_DEVICE_TABLE(ixj_pci_tbl) = {
-        { PCI_VENDOR_ID_QUICKNET, PCI_DEVICE_ID_QUICKNET_XJ,
-          PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        { }
-};
-MODULE_DEVICE_TABLE(pci, ixj_pci_tbl);
-
-/************************************************************************
-*
-* ixjdebug meanings are now bit mapped instead of level based
-* Values can be or'ed together to turn on multiple messages
-*
-* bit  0 (0x0001) = any failure
-* bit  1 (0x0002) = general messages
-* bit  2 (0x0004) = POTS ringing related
-* bit  3 (0x0008) = PSTN events
-* bit  4 (0x0010) = PSTN Cadence state details
-* bit  5 (0x0020) = Tone detection triggers
-* bit  6 (0x0040) = Tone detection cadence details
-* bit  7 (0x0080) = ioctl tracking
-* bit  8 (0x0100) = signal tracking
-* bit  9 (0x0200) = CallerID generation details
-*
-************************************************************************/
-
-#ifdef IXJ_DYN_ALLOC
-
-static IXJ *ixj[IXJMAX];
-#define get_ixj(b)      ixj[(b)]
-
-/*
- *      Allocate a free IXJ device
- */
-
-static IXJ *ixj_alloc()
-{
-        for(cnt=0; cnt<IXJMAX; cnt++)
-        {
-                if(ixj[cnt] == NULL || !ixj[cnt]->DSPbase)
-                {
-                        j = kmalloc(sizeof(IXJ), GFP_KERNEL);
-                        if (j == NULL)
-                                return NULL;
-                        ixj[cnt] = j;
-                        return j;
-                }
-        }
-        return NULL;
-}
-
-static void ixj_fsk_free(IXJ *j)
-{
-        kfree(j->fskdata);
-        j->fskdata = NULL;
-}
-
-static void ixj_fsk_alloc(IXJ *j)
-{
-        if(!j->fskdata) {
-                j->fskdata = kmalloc(8000, GFP_KERNEL);
-                if (!j->fskdata) {
-                        if(ixjdebug & 0x0200) {
-                                printk("IXJ phone%d - allocate failed\n", j->board);
-                        }
-                        return;
-                } else {
-                        j->fsksize = 8000;
-                        if(ixjdebug & 0x0200) {
-                                printk("IXJ phone%d - allocate succeeded\n", j->board);
-                        }
-                }
-        }
-}
-
-#else
-
-static IXJ ixj[IXJMAX];
-#define get_ixj(b)      (&ixj[(b)])
-
-/*
- *      Allocate a free IXJ device
- */
-
-static IXJ *ixj_alloc(void)
-{
-        int cnt;
-        for(cnt=0; cnt<IXJMAX; cnt++) {
-                if(!ixj[cnt].DSPbase)
-                        return &ixj[cnt];
-        }
-        return NULL;
-}
-
-static inline void ixj_fsk_free(IXJ *j) {;}
-
-static inline void ixj_fsk_alloc(IXJ *j)
-{
-        j->fsksize = 8000;
-}
-
-#endif
-
-#ifdef PERFMON_STATS
-#define ixj_perfmon(x)  ((x)++)
-#else
-#define ixj_perfmon(x)  do { } while(0)
-#endif
-
-static int ixj_convert_loaded;
-
-static int ixj_WriteDSPCommand(unsigned short, IXJ *j);
-
-/************************************************************************
-*
-* These are function definitions to allow external modules to register
-* enhanced functionality call backs.
-*
-************************************************************************/
-
-static int Stub(IXJ * J, unsigned long arg)
-{
-        return 0;
-}
-
-static IXJ_REGFUNC ixj_PreRead = &Stub;
-static IXJ_REGFUNC ixj_PostRead = &Stub;
-static IXJ_REGFUNC ixj_PreWrite = &Stub;
-static IXJ_REGFUNC ixj_PostWrite = &Stub;
-
-static void ixj_read_frame(IXJ *j);
-static void ixj_write_frame(IXJ *j);
-static void ixj_init_timer(IXJ *j);
-static void ixj_add_timer(IXJ * j);
-static void ixj_timeout(unsigned long ptr);
-static int read_filters(IXJ *j);
-static int LineMonitor(IXJ *j);
-static int ixj_fasync(int fd, struct file *, int mode);
-static int ixj_set_port(IXJ *j, int arg);
-static int ixj_set_pots(IXJ *j, int arg);
-static int ixj_hookstate(IXJ *j);
-static int ixj_record_start(IXJ *j);
-static void ixj_record_stop(IXJ *j);
-static void set_rec_volume(IXJ *j, int volume);
-static int get_rec_volume(IXJ *j);
-static int set_rec_codec(IXJ *j, int rate);
-static void ixj_vad(IXJ *j, int arg);
-static int ixj_play_start(IXJ *j);
-static void ixj_play_stop(IXJ *j);
-static int ixj_set_tone_on(unsigned short arg, IXJ *j);
-static int ixj_set_tone_off(unsigned short, IXJ *j);
-static int ixj_play_tone(IXJ *j, char tone);
-static void ixj_aec_start(IXJ *j, int level);
-static int idle(IXJ *j);
-static void ixj_ring_on(IXJ *j);
-static void ixj_ring_off(IXJ *j);
-static void aec_stop(IXJ *j);
-static void ixj_ringback(IXJ *j);
-static void ixj_busytone(IXJ *j);
-static void ixj_dialtone(IXJ *j);
-static void ixj_cpt_stop(IXJ *j);
-static char daa_int_read(IXJ *j);
-static char daa_CR_read(IXJ *j, int cr);
-static int daa_set_mode(IXJ *j, int mode);
-static int ixj_linetest(IXJ *j);
-static int ixj_daa_write(IXJ *j);
-static int ixj_daa_cid_read(IXJ *j);
-static void DAA_Coeff_US(IXJ *j);
-static void DAA_Coeff_UK(IXJ *j);
-static void DAA_Coeff_France(IXJ *j);
-static void DAA_Coeff_Germany(IXJ *j);
-static void DAA_Coeff_Australia(IXJ *j);
-static void DAA_Coeff_Japan(IXJ *j);
-static int ixj_init_filter(IXJ *j, IXJ_FILTER * jf);
-static int ixj_init_filter_raw(IXJ *j, IXJ_FILTER_RAW * jfr);
-static int ixj_init_tone(IXJ *j, IXJ_TONE * ti);
-static int ixj_build_cadence(IXJ *j, IXJ_CADENCE __user * cp);
-static int ixj_build_filter_cadence(IXJ *j, IXJ_FILTER_CADENCE __user * cp);
-/* Serial Control Interface funtions */
-static int SCI_Control(IXJ *j, int control);
-static int SCI_Prepare(IXJ *j);
-static int SCI_WaitHighSCI(IXJ *j);
-static int SCI_WaitLowSCI(IXJ *j);
-static DWORD PCIEE_GetSerialNumber(WORD wAddress);
-static int ixj_PCcontrol_wait(IXJ *j);
-static void ixj_pre_cid(IXJ *j);
-static void ixj_write_cid(IXJ *j);
-static void ixj_write_cid_bit(IXJ *j, int bit);
-static int set_base_frame(IXJ *j, int size);
-static int set_play_codec(IXJ *j, int rate);
-static void set_rec_depth(IXJ *j, int depth);
-static int ixj_mixer(long val, IXJ *j);
-
-/************************************************************************
-CT8020/CT8021 Host Programmers Model
-Host address    Function                                        Access
-DSPbase +
-0-1             Aux Software Status Register (reserved)         Read Only
-2-3             Software Status Register                        Read Only
-4-5             Aux Software Control Register (reserved)        Read Write
-6-7             Software Control Register                       Read Write
-8-9             Hardware Status Register                        Read Only
-A-B             Hardware Control Register                       Read Write
-C-D Host Transmit (Write) Data Buffer Access Port (buffer input)Write Only
-E-F Host Receive (Read) Data Buffer Access Port (buffer input)  Read Only
-************************************************************************/
-
-static inline void ixj_read_HSR(IXJ *j)
-{
-        j->hsr.bytes.low = inb_p(j->DSPbase + 8);
-        j->hsr.bytes.high = inb_p(j->DSPbase + 9);
-}
-
-static inline int IsControlReady(IXJ *j)
-{
-        ixj_read_HSR(j);
-        return j->hsr.bits.controlrdy ? 1 : 0;
-}
-
-static inline int IsPCControlReady(IXJ *j)
-{
-        j->pccr1.byte = inb_p(j->XILINXbase + 3);
-        return j->pccr1.bits.crr ? 1 : 0;
-}
-
-static inline int IsStatusReady(IXJ *j)
-{
-        ixj_read_HSR(j);
-        return j->hsr.bits.statusrdy ? 1 : 0;
-}
-
-static inline int IsRxReady(IXJ *j)
-{
-        ixj_read_HSR(j);
-        ixj_perfmon(j->rxreadycheck);
-        return j->hsr.bits.rxrdy ? 1 : 0;
-}
-
-static inline int IsTxReady(IXJ *j)
-{
-        ixj_read_HSR(j);
-        ixj_perfmon(j->txreadycheck);
-        return j->hsr.bits.txrdy ? 1 : 0;
-}
-
-static inline void set_play_volume(IXJ *j, int volume)
-{
-        if (ixjdebug & 0x0002)
-                printk(KERN_INFO "IXJ: /dev/phone%d Setting Play Volume to 0x%4.4x\n", j->board, volume);
-        ixj_WriteDSPCommand(0xCF02, j);
-        ixj_WriteDSPCommand(volume, j);
-}
-
-static int set_play_volume_linear(IXJ *j, int volume)
-{
-        int newvolume, dspplaymax;
-
-        if (ixjdebug & 0x0002)
-                printk(KERN_INFO "IXJ: /dev/phone %d Setting Linear Play Volume to 0x%4.4x\n", j->board, volume);
-        if(volume > 100 || volume < 0) {
-                return -1;
-        }
-
-        /* This should normalize the perceived volumes between the different cards caused by differences in the hardware */
-        switch (j->cardtype) {
-        case QTI_PHONEJACK:
-                dspplaymax = 0x380;
-                break;
-        case QTI_LINEJACK:
-                if(j->port == PORT_PSTN) {
-                        dspplaymax = 0x48;
-                } else {
-                        dspplaymax = 0x100;
-                }
-                break;
-        case QTI_PHONEJACK_LITE:
-                dspplaymax = 0x380;
-                break;
-        case QTI_PHONEJACK_PCI:
-                dspplaymax = 0x6C;
-                break;
-        case QTI_PHONECARD:
-                dspplaymax = 0x50;
-                break;
-        default:
-                return -1;
-        }
-        newvolume = (dspplaymax * volume) / 100;
-        set_play_volume(j, newvolume);
-        return 0;
-}
-
-static inline void set_play_depth(IXJ *j, int depth)
-{
-        if (depth > 60)
-                depth = 60;
-        if (depth < 0)
-                depth = 0;
-        ixj_WriteDSPCommand(0x5280 + depth, j);
-}
-
-static inline int get_play_volume(IXJ *j)
-{
-        ixj_WriteDSPCommand(0xCF00, j);
-        return j->ssr.high << 8 | j->ssr.low;
-}
-
-static int get_play_volume_linear(IXJ *j)
-{
-        int volume, newvolume, dspplaymax;
-
-        /* This should normalize the perceived volumes between the different cards caused by differences in the hardware */
-        switch (j->cardtype) {
-        case QTI_PHONEJACK:
-                dspplaymax = 0x380;
-                break;
-        case QTI_LINEJACK:
-                if(j->port == PORT_PSTN) {
-                        dspplaymax = 0x48;
-                } else {
-                        dspplaymax = 0x100;
-                }
-                break;
-        case QTI_PHONEJACK_LITE:
-                dspplaymax = 0x380;
-                break;
-        case QTI_PHONEJACK_PCI:
-                dspplaymax = 0x6C;
-                break;
-        case QTI_PHONECARD:
-                dspplaymax = 100;
-                break;
-        default:
-                return -1;
-        }
-        volume = get_play_volume(j);
-        newvolume = (volume * 100) / dspplaymax;
-        if(newvolume > 100)
-                newvolume = 100;
-        return newvolume;
-}
-
-static inline BYTE SLIC_GetState(IXJ *j)
-{
-        if (j->cardtype == QTI_PHONECARD) {
-                j->pccr1.byte = 0;
-                j->psccr.bits.dev = 3;
-                j->psccr.bits.rw = 1;
-                outw_p(j->psccr.byte << 8, j->XILINXbase + 0x00);
-                ixj_PCcontrol_wait(j);
-                j->pslic.byte = inw_p(j->XILINXbase + 0x00) & 0xFF;
-                ixj_PCcontrol_wait(j);
-                if (j->pslic.bits.powerdown)
-                        return PLD_SLIC_STATE_OC;
-                else if (!j->pslic.bits.ring0 && !j->pslic.bits.ring1)
-                        return PLD_SLIC_STATE_ACTIVE;
-                else
-                        return PLD_SLIC_STATE_RINGING;
-        } else {
-                j->pld_slicr.byte = inb_p(j->XILINXbase + 0x01);
-        }
-        return j->pld_slicr.bits.state;
-}
-
-static bool SLIC_SetState(BYTE byState, IXJ *j)
-{
-        bool fRetVal = false;
-
-        if (j->cardtype == QTI_PHONECARD) {
-                if (j->flags.pcmciasct) {
-                        switch (byState) {
-                        case PLD_SLIC_STATE_TIPOPEN:
-                        case PLD_SLIC_STATE_OC:
-                                j->pslic.bits.powerdown = 1;
-                                j->pslic.bits.ring0 = j->pslic.bits.ring1 = 0;
-                                fRetVal = true;
-                                break;
-                        case PLD_SLIC_STATE_RINGING:
-                                if (j->readers || j->writers) {
-                                        j->pslic.bits.powerdown = 0;
-                                        j->pslic.bits.ring0 = 1;
-                                        j->pslic.bits.ring1 = 0;
-                                        fRetVal = true;
-                                }
-                                break;
-                        case PLD_SLIC_STATE_OHT:        /* On-hook transmit */
-
-                        case PLD_SLIC_STATE_STANDBY:
-                        case PLD_SLIC_STATE_ACTIVE:
-                                if (j->readers || j->writers) {
-                                        j->pslic.bits.powerdown = 0;
-                                } else {
-                                        j->pslic.bits.powerdown = 1;
-                                }
-                                j->pslic.bits.ring0 = j->pslic.bits.ring1 = 0;
-                                fRetVal = true;
-                                break;
-                        case PLD_SLIC_STATE_APR:        /* Active polarity reversal */
-
-                        case PLD_SLIC_STATE_OHTPR:      /* OHT polarity reversal */
-
-                        default:
-                                fRetVal = false;
-                                break;
-                        }
-                        j->psccr.bits.dev = 3;
-                        j->psccr.bits.rw = 0;
-                        outw_p(j->psccr.byte << 8 | j->pslic.byte, j->XILINXbase + 0x00);
-                        ixj_PCcontrol_wait(j);
-                }
-        } else {
-                /* Set the C1, C2, C3 & B2EN signals. */
-                switch (byState) {
-                case PLD_SLIC_STATE_OC:
-                        j->pld_slicw.bits.c1 = 0;
-                        j->pld_slicw.bits.c2 = 0;
-                        j->pld_slicw.bits.c3 = 0;
-                        j->pld_slicw.bits.b2en = 0;
-                        outb_p(j->pld_slicw.byte, j->XILINXbase + 0x01);
-                        fRetVal = true;
-                        break;
-                case PLD_SLIC_STATE_RINGING:
-                        j->pld_slicw.bits.c1 = 1;
-                        j->pld_slicw.bits.c2 = 0;
-                        j->pld_slicw.bits.c3 = 0;
-                        j->pld_slicw.bits.b2en = 1;
-                        outb_p(j->pld_slicw.byte, j->XILINXbase + 0x01);
-                        fRetVal = true;
-                        break;
-                case PLD_SLIC_STATE_ACTIVE:
-                        j->pld_slicw.bits.c1 = 0;
-                        j->pld_slicw.bits.c2 = 1;
-                        j->pld_slicw.bits.c3 = 0;
-                        j->pld_slicw.bits.b2en = 0;
-                        outb_p(j->pld_slicw.byte, j->XILINXbase + 0x01);
-                        fRetVal = true;
-                        break;
-                case PLD_SLIC_STATE_OHT:        /* On-hook transmit */
-
-                        j->pld_slicw.bits.c1 = 1;
-                        j->pld_slicw.bits.c2 = 1;
-                        j->pld_slicw.bits.c3 = 0;
-                        j->pld_slicw.bits.b2en = 0;
-                        outb_p(j->pld_slicw.byte, j->XILINXbase + 0x01);
-                        fRetVal = true;
-                        break;
-                case PLD_SLIC_STATE_TIPOPEN:
-                        j->pld_slicw.bits.c1 = 0;
-                        j->pld_slicw.bits.c2 = 0;
-                        j->pld_slicw.bits.c3 = 1;
-                        j->pld_slicw.bits.b2en = 0;
-                        outb_p(j->pld_slicw.byte, j->XILINXbase + 0x01);
-                        fRetVal = true;
-                        break;
-                case PLD_SLIC_STATE_STANDBY:
-                        j->pld_slicw.bits.c1 = 1;
-                        j->pld_slicw.bits.c2 = 0;
-                        j->pld_slicw.bits.c3 = 1;
-                        j->pld_slicw.bits.b2en = 1;
-                        outb_p(j->pld_slicw.byte, j->XILINXbase + 0x01);
-                        fRetVal = true;
-                        break;
-                case PLD_SLIC_STATE_APR:        /* Active polarity reversal */
-
-                        j->pld_slicw.bits.c1 = 0;
-                        j->pld_slicw.bits.c2 = 1;
-                        j->pld_slicw.bits.c3 = 1;
-                        j->pld_slicw.bits.b2en = 0;
-                        outb_p(j->pld_slicw.byte, j->XILINXbase + 0x01);
-                        fRetVal = true;
-                        break;
-                case PLD_SLIC_STATE_OHTPR:      /* OHT polarity reversal */
-
-                        j->pld_slicw.bits.c1 = 1;
-                        j->pld_slicw.bits.c2 = 1;
-                        j->pld_slicw.bits.c3 = 1;
-                        j->pld_slicw.bits.b2en = 0;
-                        outb_p(j->pld_slicw.byte, j->XILINXbase + 0x01);
-                        fRetVal = true;
-                        break;
-                default:
-                        fRetVal = false;
-                        break;
-                }
-        }
-
-        return fRetVal;
-}
-
-static int ixj_wink(IXJ *j)
-{
-        BYTE slicnow;
-
-        slicnow = SLIC_GetState(j);
-
-        j->pots_winkstart = jiffies;
-        SLIC_SetState(PLD_SLIC_STATE_OC, j);
-
-        msleep(jiffies_to_msecs(j->winktime));
-
-        SLIC_SetState(slicnow, j);
-        return 0;
-}
-
-static void ixj_init_timer(IXJ *j)
-{
-        init_timer(&j->timer);
-        j->timer.function = ixj_timeout;
-        j->timer.data = (unsigned long)j;
-}
-
-static void ixj_add_timer(IXJ *j)
-{
-        j->timer.expires = jiffies + (hertz / samplerate);
-        add_timer(&j->timer);
-}
-
-static void ixj_tone_timeout(IXJ *j)
-{
-        IXJ_TONE ti;
-
-        j->tone_state++;
-        if (j->tone_state == 3) {
-                j->tone_state = 0;
-                if (j->cadence_t) {
-                        j->tone_cadence_state++;
-                        if (j->tone_cadence_state >= j->cadence_t->elements_used) {
-                                switch (j->cadence_t->termination) {
-                                case PLAY_ONCE:
-                                        ixj_cpt_stop(j);
-                                        break;
-                                case REPEAT_LAST_ELEMENT:
-                                        j->tone_cadence_state--;
-                                        ixj_play_tone(j, j->cadence_t->ce[j->tone_cadence_state].index);
-                                        break;
-                                case REPEAT_ALL:
-                                        j->tone_cadence_state = 0;
-                                        if (j->cadence_t->ce[j->tone_cadence_state].freq0) {
-                                                ti.tone_index = j->cadence_t->ce[j->tone_cadence_state].index;
-                                                ti.freq0 = j->cadence_t->ce[j->tone_cadence_state].freq0;
-                                                ti.gain0 = j->cadence_t->ce[j->tone_cadence_state].gain0;
-                                                ti.freq1 = j->cadence_t->ce[j->tone_cadence_state].freq1;
-                                                ti.gain1 = j->cadence_t->ce[j->tone_cadence_state].gain1;
-                                                ixj_init_tone(j, &ti);
-                                        }
-                                        ixj_set_tone_on(j->cadence_t->ce[0].tone_on_time, j);
-                                        ixj_set_tone_off(j->cadence_t->ce[0].tone_off_time, j);
-                                        ixj_play_tone(j, j->cadence_t->ce[0].index);
-                                        break;
-                                }
-                        } else {
-                                if (j->cadence_t->ce[j->tone_cadence_state].gain0) {
-                                        ti.tone_index = j->cadence_t->ce[j->tone_cadence_state].index;
-                                        ti.freq0 = j->cadence_t->ce[j->tone_cadence_state].freq0;
-                                        ti.gain0 = j->cadence_t->ce[j->tone_cadence_state].gain0;
-                                        ti.freq1 = j->cadence_t->ce[j->tone_cadence_state].freq1;
-                                        ti.gain1 = j->cadence_t->ce[j->tone_cadence_state].gain1;
-                                        ixj_init_tone(j, &ti);
-                                }
-                                ixj_set_tone_on(j->cadence_t->ce[j->tone_cadence_state].tone_on_time, j);
-                                ixj_set_tone_off(j->cadence_t->ce[j->tone_cadence_state].tone_off_time, j);
-                                ixj_play_tone(j, j->cadence_t->ce[j->tone_cadence_state].index);
-                        }
-                }
-        }
-}
-
-static inline void ixj_kill_fasync(IXJ *j, IXJ_SIGEVENT event, int dir)
-{
-        if(j->ixj_signals[event]) {
-                if(ixjdebug & 0x0100)
-                        printk("Sending signal for event %d\n", event);
-                        /* Send apps notice of change */
-                /* see config.h for macro definition */
-                kill_fasync(&(j->async_queue), j->ixj_signals[event], dir);
-        }
-}
-
-static void ixj_pstn_state(IXJ *j)
-{
-        int var;
-        union XOPXR0 XR0, daaint;
-
-        var = 10;
-
-        XR0.reg = j->m_DAAShadowRegs.XOP_REGS.XOP.xr0.reg;
-        daaint.reg = 0;
-        XR0.bitreg.RMR = j->m_DAAShadowRegs.SOP_REGS.SOP.cr1.bitreg.RMR;
-
-        j->pld_scrr.byte = inb_p(j->XILINXbase);
-        if (j->pld_scrr.bits.daaflag) {
-                daa_int_read(j);
-                if(j->m_DAAShadowRegs.XOP_REGS.XOP.xr0.bitreg.RING) {
-                        if(time_after(jiffies, j->pstn_sleeptil) && !(j->flags.pots_pstn && j->hookstate)) {
-                                daaint.bitreg.RING = 1;
-                                if(ixjdebug & 0x0008) {
-                                        printk(KERN_INFO "IXJ DAA Ring Interrupt /dev/phone%d at %ld\n", j->board, jiffies);
-                                }
-                        } else {
-                                daa_set_mode(j, SOP_PU_RESET);
-                        }
-                }
-                if(j->m_DAAShadowRegs.XOP_REGS.XOP.xr0.bitreg.Caller_ID) {
-                        daaint.bitreg.Caller_ID = 1;
-                        j->pstn_cid_intr = 1;
-                        j->pstn_cid_received = jiffies;
-                        if(ixjdebug & 0x0008) {
-                                printk(KERN_INFO "IXJ DAA Caller_ID Interrupt /dev/phone%d at %ld\n", j->board, jiffies);
-                        }
-                }
-                if(j->m_DAAShadowRegs.XOP_REGS.XOP.xr0.bitreg.Cadence) {
-                        daaint.bitreg.Cadence = 1;
-                        if(ixjdebug & 0x0008) {
-                                printk(KERN_INFO "IXJ DAA Cadence Interrupt /dev/phone%d at %ld\n", j->board, jiffies);
-                        }
-                }
-                if(j->m_DAAShadowRegs.XOP_REGS.XOP.xr0.bitreg.VDD_OK != XR0.bitreg.VDD_OK) {
-                        daaint.bitreg.VDD_OK = 1;
-                        daaint.bitreg.SI_0 = j->m_DAAShadowRegs.XOP_REGS.XOP.xr0.bitreg.VDD_OK;
-                }
-        }
-        daa_CR_read(j, 1);
-        if(j->m_DAAShadowRegs.SOP_REGS.SOP.cr1.bitreg.RMR != XR0.bitreg.RMR && time_after(jiffies, j->pstn_sleeptil) && !(j->flags.pots_pstn && j->hookstate)) {
-                daaint.bitreg.RMR = 1;
-                daaint.bitreg.SI_1 = j->m_DAAShadowRegs.SOP_REGS.SOP.cr1.bitreg.RMR;
-                if(ixjdebug & 0x0008) {
-                        printk(KERN_INFO "IXJ DAA RMR /dev/phone%d was %s for %ld\n", j->board, XR0.bitreg.RMR?"on":"off", jiffies - j->pstn_last_rmr);
-                }
-                j->pstn_prev_rmr = j->pstn_last_rmr;
-                j->pstn_last_rmr = jiffies;
-        }
-        switch(j->daa_mode) {
-                case SOP_PU_SLEEP:
-                        if (daaint.bitreg.RING) {
-                                if (!j->flags.pstn_ringing) {
-                                        if (j->daa_mode != SOP_PU_RINGING) {
-                                                j->pstn_ring_int = jiffies;
-                                                daa_set_mode(j, SOP_PU_RINGING);
-                                        }
-                                }
-                        }
-                        break;
-                case SOP_PU_RINGING:
-                        if (daaint.bitreg.RMR) {
-                                if (ixjdebug & 0x0008) {
-                                        printk(KERN_INFO "IXJ Ring Cadence a state = %d /dev/phone%d at %ld\n", j->cadence_f[4].state, j->board, jiffies);
-                                }
-                                if (daaint.bitreg.SI_1) {                /* Rising edge of RMR */
-                                        j->flags.pstn_rmr = 1;
-                                        j->pstn_ring_start = jiffies;
-                                        j->pstn_ring_stop = 0;
-                                        j->ex.bits.pstn_ring = 0;
-                                        if (j->cadence_f[4].state == 0) {
-                                                j->cadence_f[4].state = 1;
-                                                j->cadence_f[4].on1min = jiffies + (long)((j->cadence_f[4].on1 * hertz * (100 - var)) / 10000);
-                                                j->cadence_f[4].on1dot = jiffies + (long)((j->cadence_f[4].on1 * hertz * (100)) / 10000);
-                                                j->cadence_f[4].on1max = jiffies + (long)((j->cadence_f[4].on1 * hertz * (100 + var)) / 10000);
-                                        } else if (j->cadence_f[4].state == 2) {
-                                                if((time_after(jiffies, j->cadence_f[4].off1min) &&
-                                                    time_before(jiffies, j->cadence_f[4].off1max))) {
-                                                        if (j->cadence_f[4].on2) {
-                                                                j->cadence_f[4].state = 3;
-                                                                j->cadence_f[4].on2min = jiffies + (long)((j->cadence_f[4].on2 * (hertz * (100 - var)) / 10000));
-                                                                j->cadence_f[4].on2dot = jiffies + (long)((j->cadence_f[4].on2 * (hertz * (100)) / 10000));
-                                                                j->cadence_f[4].on2max = jiffies + (long)((j->cadence_f[4].on2 * (hertz * (100 + var)) / 10000));
-                                                        } else {
-                                                                j->cadence_f[4].state = 7;
-                                                        }
-                                                } else {
-                                                        if (ixjdebug & 0x0008) {
-                                                                printk(KERN_INFO "IXJ Ring Cadence fail state = %d /dev/phone%d at %ld should be %d\n",
-                                                                                j->cadence_f[4].state, j->board, jiffies - j->pstn_prev_rmr,
-                                                                                j->cadence_f[4].off1);
-                                                        }
-                                                        j->cadence_f[4].state = 0;
-                                                }
-                                        } else if (j->cadence_f[4].state == 4) {
-                                                if((time_after(jiffies, j->cadence_f[4].off2min) &&
-                                                    time_before(jiffies, j->cadence_f[4].off2max))) {
-                                                        if (j->cadence_f[4].on3) {
-                                                                j->cadence_f[4].state = 5;
-                                                                j->cadence_f[4].on3min = jiffies + (long)((j->cadence_f[4].on3 * (hertz * (100 - var)) / 10000));
-                                                                j->cadence_f[4].on3dot = jiffies + (long)((j->cadence_f[4].on3 * (hertz * (100)) / 10000));
-                                                                j->cadence_f[4].on3max = jiffies + (long)((j->cadence_f[4].on3 * (hertz * (100 + var)) / 10000));
-                                                        } else {
-                                                                j->cadence_f[4].state = 7;
-                                                        }
-                                                } else {
-                                                        if (ixjdebug & 0x0008) {
-                                                                printk(KERN_INFO "IXJ Ring Cadence fail state = %d /dev/phone%d at %ld should be %d\n",
-                                                                                j->cadence_f[4].state, j->board, jiffies - j->pstn_prev_rmr,
-                                                                                j->cadence_f[4].off2);
-                                                        }
-                                                        j->cadence_f[4].state = 0;
-                                                }
-                                        } else if (j->cadence_f[4].state == 6) {
-                                                if((time_after(jiffies, j->cadence_f[4].off3min) &&
-                                                    time_before(jiffies, j->cadence_f[4].off3max))) {
-                                                        j->cadence_f[4].state = 7;
-                                                } else {
-                                                        if (ixjdebug & 0x0008) {
-                                                                printk(KERN_INFO "IXJ Ring Cadence fail state = %d /dev/phone%d at %ld should be %d\n",
-                                                                                j->cadence_f[4].state, j->board, jiffies - j->pstn_prev_rmr,
-                                                                                j->cadence_f[4].off3);
-                                                        }
-                                                        j->cadence_f[4].state = 0;
-                                                }
-                                        } else {
-                                                j->cadence_f[4].state = 0;
-                                        }
-                                } else {                                /* Falling edge of RMR */
-                                        j->pstn_ring_start = 0;
-                                        j->pstn_ring_stop = jiffies;
-                                        if (j->cadence_f[4].state == 1) {
-                                                if(!j->cadence_f[4].on1) {
-                                                        j->cadence_f[4].state = 7;
-                                                } else if((time_after(jiffies, j->cadence_f[4].on1min) &&
-                                                  time_before(jiffies, j->cadence_f[4].on1max))) {
-                                                        if (j->cadence_f[4].off1) {
-                                                                j->cadence_f[4].state = 2;
-                                                                j->cadence_f[4].off1min = jiffies + (long)((j->cadence_f[4].off1 * (hertz * (100 - var)) / 10000));
-                                                                j->cadence_f[4].off1dot = jiffies + (long)((j->cadence_f[4].off1 * (hertz * (100)) / 10000));
-                                                                j->cadence_f[4].off1max = jiffies + (long)((j->cadence_f[4].off1 * (hertz * (100 + var)) / 10000));
-                                                        } else {
-                                                                j->cadence_f[4].state = 7;
-                                                        }
-                                                } else {
-                                                        if (ixjdebug & 0x0008) {
-                                                                printk(KERN_INFO "IXJ Ring Cadence fail state = %d /dev/phone%d at %ld should be %d\n",
-                                                                                j->cadence_f[4].state, j->board, jiffies - j->pstn_prev_rmr,
-                                                                                j->cadence_f[4].on1);
-                                                        }
-                                                        j->cadence_f[4].state = 0;
-                                                }
-                                        } else if (j->cadence_f[4].state == 3) {
-                                                if((time_after(jiffies, j->cadence_f[4].on2min) &&
-                                                    time_before(jiffies, j->cadence_f[4].on2max))) {
-                                                        if (j->cadence_f[4].off2) {
-                                                                j->cadence_f[4].state = 4;
-                                                                j->cadence_f[4].off2min = jiffies + (long)((j->cadence_f[4].off2 * (hertz * (100 - var)) / 10000));
-                                                                j->cadence_f[4].off2dot = jiffies + (long)((j->cadence_f[4].off2 * (hertz * (100)) / 10000));
-                                                                j->cadence_f[4].off2max = jiffies + (long)((j->cadence_f[4].off2 * (hertz * (100 + var)) / 10000));
-                                                        } else {
-                                                                j->cadence_f[4].state = 7;
-                                                        }
-                                                } else {
-                                                        if (ixjdebug & 0x0008) {
-                                                                printk(KERN_INFO "IXJ Ring Cadence fail state = %d /dev/phone%d at %ld should be %d\n",
-                                                                                j->cadence_f[4].state, j->board, jiffies - j->pstn_prev_rmr,
-                                                                                j->cadence_f[4].on2);
-                                                        }
-                                                        j->cadence_f[4].state = 0;
-                                                }
-                                        } else if (j->cadence_f[4].state == 5) {
-                                                if((time_after(jiffies, j->cadence_f[4].on3min) &&
-                                                    time_before(jiffies, j->cadence_f[4].on3max))) {
-                                                        if (j->cadence_f[4].off3) {
-                                                                j->cadence_f[4].state = 6;
-                                                                j->cadence_f[4].off3min = jiffies + (long)((j->cadence_f[4].off3 * (hertz * (100 - var)) / 10000));
-                                                                j->cadence_f[4].off3dot = jiffies + (long)((j->cadence_f[4].off3 * (hertz * (100)) / 10000));
-                                                                j->cadence_f[4].off3max = jiffies + (long)((j->cadence_f[4].off3 * (hertz * (100 + var)) / 10000));
-                                                        } else {
-                                                                j->cadence_f[4].state = 7;
-                                                        }
-                                                } else {
-                                                        j->cadence_f[4].state = 0;
-                                                }
-                                        } else {
-                                                if (ixjdebug & 0x0008) {
-                                                        printk(KERN_INFO "IXJ Ring Cadence fail state = %d /dev/phone%d at %ld should be %d\n",
-                                                                        j->cadence_f[4].state, j->board, jiffies - j->pstn_prev_rmr,
-                                                                        j->cadence_f[4].on3);
-                                                }
-                                                j->cadence_f[4].state = 0;
-                                        }
-                                }
-                                if (ixjdebug & 0x0010) {
-                                        printk(KERN_INFO "IXJ Ring Cadence b state = %d /dev/phone%d at %ld\n", j->cadence_f[4].state, j->board, jiffies);
-                                }
-                                if (ixjdebug & 0x0010) {
-                                        switch(j->cadence_f[4].state) {
-                                                case 1:
-                                                        printk(KERN_INFO "IXJ /dev/phone%d Next Ring Cadence state at %u min %ld - %ld - max %ld\n", j->board,
-                                                j->cadence_f[4].on1, j->cadence_f[4].on1min, j->cadence_f[4].on1dot, j->cadence_f[4].on1max);
-                                                        break;
-                                                case 2:
-                                                        printk(KERN_INFO "IXJ /dev/phone%d Next Ring Cadence state at %u min %ld - %ld - max %ld\n", j->board,
-                                                j->cadence_f[4].off1, j->cadence_f[4].off1min, j->cadence_f[4].off1dot, j->cadence_f[4].off1max);
-                                                        break;
-                                                case 3:
-                                                        printk(KERN_INFO "IXJ /dev/phone%d Next Ring Cadence state at %u min %ld - %ld - max %ld\n", j->board,
-                                                j->cadence_f[4].on2, j->cadence_f[4].on2min, j->cadence_f[4].on2dot, j->cadence_f[4].on2max);
-                                                        break;
-                                                case 4:
-                                                        printk(KERN_INFO "IXJ /dev/phone%d Next Ring Cadence state at %u min %ld - %ld - max %ld\n", j->board,
-                                                j->cadence_f[4].off2, j->cadence_f[4].off2min, j->cadence_f[4].off2dot, j->cadence_f[4].off2max);
-                                                        break;
-                                                case 5:
-                                                        printk(KERN_INFO "IXJ /dev/phone%d Next Ring Cadence state at %u min %ld - %ld - max %ld\n", j->board,
-                                                j->cadence_f[4].on3, j->cadence_f[4].on3min, j->cadence_f[4].on3dot, j->cadence_f[4].on3max);
-                                                        break;
-                                                case 6:
-                                                        printk(KERN_INFO "IXJ /dev/phone%d Next Ring Cadence state at %u min %ld - %ld - max %ld\n", j->board,
-                                                j->cadence_f[4].off3, j->cadence_f[4].off3min, j->cadence_f[4].off3dot, j->cadence_f[4].off3max);
-                                                        break;
-                                        }
-                                }
-                        }
-                        if (j->cadence_f[4].state == 7) {
-                                j->cadence_f[4].state = 0;
-                                j->pstn_ring_stop = jiffies;
-                                j->ex.bits.pstn_ring = 1;
-                                ixj_kill_fasync(j, SIG_PSTN_RING, POLL_IN);
-                                if(ixjdebug & 0x0008) {
-                                        printk(KERN_INFO "IXJ Ring int set /dev/phone%d at %ld\n", j->board, jiffies);
-                                }
-                        }
-                        if((j->pstn_ring_int != 0 && time_after(jiffies, j->pstn_ring_int + (hertz * 5)) && !j->flags.pstn_rmr) ||
-                           (j->pstn_ring_stop != 0 && time_after(jiffies, j->pstn_ring_stop + (hertz * 5)))) {
-                                if(ixjdebug & 0x0008) {
-                                        printk("IXJ DAA no ring in 5 seconds /dev/phone%d at %ld\n", j->board, jiffies);
-                                        printk("IXJ DAA pstn ring int /dev/phone%d at %ld\n", j->board, j->pstn_ring_int);
-                                        printk("IXJ DAA pstn ring stop /dev/phone%d at %ld\n", j->board, j->pstn_ring_stop);
-                                }
-                                j->pstn_ring_stop = j->pstn_ring_int = 0;
-                                daa_set_mode(j, SOP_PU_SLEEP);
-                        }
-                        outb_p(j->pld_scrw.byte, j->XILINXbase);
-                        if (j->pstn_cid_intr && time_after(jiffies, j->pstn_cid_received + hertz)) {
-                                ixj_daa_cid_read(j);
-                                j->ex.bits.caller_id = 1;
-                                ixj_kill_fasync(j, SIG_CALLER_ID, POLL_IN);
-                                j->pstn_cid_intr = 0;
-                        }
-                        if (daaint.bitreg.Cadence) {
-                                if(ixjdebug & 0x0008) {
-                                        printk("IXJ DAA Cadence interrupt going to sleep /dev/phone%d\n", j->board);
-                                }
-                                daa_set_mode(j, SOP_PU_SLEEP);
-                                j->ex.bits.pstn_ring = 0;
-                        }
-                        break;
-                case SOP_PU_CONVERSATION:
-                        if (daaint.bitreg.VDD_OK) {
-                                if(!daaint.bitreg.SI_0) {
-                                        if (!j->pstn_winkstart) {
-                                                if(ixjdebug & 0x0008) {
-                                                        printk("IXJ DAA possible wink /dev/phone%d %ld\n", j->board, jiffies);
-                                                }
-                                                j->pstn_winkstart = jiffies;
-                                        }
-                                } else {
-                                        if (j->pstn_winkstart) {
-                                                if(ixjdebug & 0x0008) {
-                                                        printk("IXJ DAA possible wink end /dev/phone%d %ld\n", j->board, jiffies);
-                                                }
-                                                j->pstn_winkstart = 0;
-                                        }
-                                }
-                        }
-                        if (j->pstn_winkstart && time_after(jiffies, j->pstn_winkstart + ((hertz * j->winktime) / 1000))) {
-                                if(ixjdebug & 0x0008) {
-                                        printk("IXJ DAA wink detected going to sleep /dev/phone%d %ld\n", j->board, jiffies);
-                                }
-                                daa_set_mode(j, SOP_PU_SLEEP);
-                                j->pstn_winkstart = 0;
-                                j->ex.bits.pstn_wink = 1;
-                                ixj_kill_fasync(j, SIG_PSTN_WINK, POLL_IN);
-                        }
-                        break;
-        }
-}
-
-static void ixj_timeout(unsigned long ptr)
-{
-        int board;
-        unsigned long jifon;
-        IXJ *j = (IXJ *)ptr;
-        board = j->board;
-
-        if (j->DSPbase && atomic_read(&j->DSPWrite) == 0 && test_and_set_bit(board, (void *)&j->busyflags) == 0) {
-                ixj_perfmon(j->timerchecks);
-                j->hookstate = ixj_hookstate(j);
-                if (j->tone_state) {
-                        if (!(j->hookstate)) {
-                                ixj_cpt_stop(j);
-                                if (j->m_hook) {
-                                        j->m_hook = 0;
-                                        j->ex.bits.hookstate = 1;
-                                        ixj_kill_fasync(j, SIG_HOOKSTATE, POLL_IN);
-                                }
-                                clear_bit(board, &j->busyflags);
-                                ixj_add_timer(j);
-                                return;
-                        }
-                        if (j->tone_state == 1)
-                                jifon = ((hertz * j->tone_on_time) * 25 / 100000);
-                        else
-                                jifon = ((hertz * j->tone_on_time) * 25 / 100000) + ((hertz * j->tone_off_time) * 25 / 100000);
-                        if (time_before(jiffies, j->tone_start_jif + jifon)) {
-                                if (j->tone_state == 1) {
-                                        ixj_play_tone(j, j->tone_index);
-                                        if (j->dsp.low == 0x20) {
-                                                clear_bit(board, &j->busyflags);
-                                                ixj_add_timer(j);
-                                                return;
-                                        }
-                                } else {
-                                        ixj_play_tone(j, 0);
-                                        if (j->dsp.low == 0x20) {
-                                                clear_bit(board, &j->busyflags);
-                                                ixj_add_timer(j);
-                                                return;
-                                        }
-                                }
-                        } else {
-                                ixj_tone_timeout(j);
-                                if (j->flags.dialtone) {
-                                        ixj_dialtone(j);
-                                }
-                                if (j->flags.busytone) {
-                                        ixj_busytone(j);
-                                        if (j->dsp.low == 0x20) {
-                                                clear_bit(board, &j->busyflags);
-                                                ixj_add_timer(j);
-                                                return;
-                                        }
-                                }
-                                if (j->flags.ringback) {
-                                        ixj_ringback(j);
-                                        if (j->dsp.low == 0x20) {
-                                                clear_bit(board, &j->busyflags);
-                                                ixj_add_timer(j);
-                                                return;
-                                        }
-                                }
-                                if (!j->tone_state) {
-                                        ixj_cpt_stop(j);
-                                }
-                        }
-                }
-                if (!(j->tone_state && j->dsp.low == 0x20)) {
-                        if (IsRxReady(j)) {
-                                ixj_read_frame(j);
-                        }
-                        if (IsTxReady(j)) {
-                                ixj_write_frame(j);
-                        }
-                }
-                if (j->flags.cringing) {
-                        if (j->hookstate & 1) {
-                                j->flags.cringing = 0;
-                                ixj_ring_off(j);
-                        } else if(j->cadence_f[5].enable && ((!j->cadence_f[5].en_filter) || (j->cadence_f[5].en_filter && j->flags.firstring))) {
-                                switch(j->cadence_f[5].state) {
-                                        case 0:
-                                                j->cadence_f[5].on1dot = jiffies + (long)((j->cadence_f[5].on1 * (hertz * 100) / 10000));
-                                                if (time_before(jiffies, j->cadence_f[5].on1dot)) {
-                                                        if(ixjdebug & 0x0004) {
-                                                                printk("Ringing cadence state = %d - %ld\n", j->cadence_f[5].state, jiffies);
-                                                        }
-                                                        ixj_ring_on(j);
-                                                }
-                                                j->cadence_f[5].state = 1;
-                                                break;
-                                        case 1:
-                                                if (time_after(jiffies, j->cadence_f[5].on1dot)) {
-                                                        j->cadence_f[5].off1dot = jiffies + (long)((j->cadence_f[5].off1 * (hertz * 100) / 10000));
-                                                        if(ixjdebug & 0x0004) {
-                                                                printk("Ringing cadence state = %d - %ld\n", j->cadence_f[5].state, jiffies);
-                                                        }
-                                                        ixj_ring_off(j);
-                                                        j->cadence_f[5].state = 2;
-                                                }
-                                                break;
-                                        case 2:
-                                                if (time_after(jiffies, j->cadence_f[5].off1dot)) {
-                                                        if(ixjdebug & 0x0004) {
-                                                                printk("Ringing cadence state = %d - %ld\n", j->cadence_f[5].state, jiffies);
-                                                        }
-                                                        ixj_ring_on(j);
-                                                        if (j->cadence_f[5].on2) {
-                                                                j->cadence_f[5].on2dot = jiffies + (long)((j->cadence_f[5].on2 * (hertz * 100) / 10000));
-                                                                j->cadence_f[5].state = 3;
-                                                        } else {
-                                                                j->cadence_f[5].state = 7;
-                                                        }
-                                                }
-                                                break;
-                                        case 3:
-                                                if (time_after(jiffies, j->cadence_f[5].on2dot)) {
-                                                        if(ixjdebug & 0x0004) {
-                                                                printk("Ringing cadence state = %d - %ld\n", j->cadence_f[5].state, jiffies);
-                                                        }
-                                                        ixj_ring_off(j);
-                                                        if (j->cadence_f[5].off2) {
-                                                                j->cadence_f[5].off2dot = jiffies + (long)((j->cadence_f[5].off2 * (hertz * 100) / 10000));
-                                                                j->cadence_f[5].state = 4;
-                                                        } else {
-                                                                j->cadence_f[5].state = 7;
-                                                        }
-                                                }
-                                                break;
-                                        case 4:
-                                                if (time_after(jiffies, j->cadence_f[5].off2dot)) {
-                                                        if(ixjdebug & 0x0004) {
-                                                                printk("Ringing cadence state = %d - %ld\n", j->cadence_f[5].state, jiffies);
-                                                        }
-                                                        ixj_ring_on(j);
-                                                        if (j->cadence_f[5].on3) {
-                                                                j->cadence_f[5].on3dot = jiffies + (long)((j->cadence_f[5].on3 * (hertz * 100) / 10000));
-                                                                j->cadence_f[5].state = 5;
-                                                        } else {
-                                                                j->cadence_f[5].state = 7;
-                                                        }
-                                                }
-                                                break;
-                                        case 5:
-                                                if (time_after(jiffies, j->cadence_f[5].on3dot)) {
-                                                        if(ixjdebug & 0x0004) {
-                                                                printk("Ringing cadence state = %d - %ld\n", j->cadence_f[5].state, jiffies);
-                                                        }
-                                                        ixj_ring_off(j);
-                                                        if (j->cadence_f[5].off3) {
-                                                                j->cadence_f[5].off3dot = jiffies + (long)((j->cadence_f[5].off3 * (hertz * 100) / 10000));
-                                                                j->cadence_f[5].state = 6;
-                                                        } else {
-                                                                j->cadence_f[5].state = 7;
-                                                        }
-                                                }
-                                                break;
-                                        case 6:
-                                                if (time_after(jiffies, j->cadence_f[5].off3dot)) {
-                                                        if(ixjdebug & 0x0004) {
-                                                                printk("Ringing cadence state = %d - %ld\n", j->cadence_f[5].state, jiffies);
-                                                        }
-                                                        j->cadence_f[5].state = 7;
-                                                }
-                                                break;
-                                        case 7:
-                                                if(ixjdebug & 0x0004) {
-                                                        printk("Ringing cadence state = %d - %ld\n", j->cadence_f[5].state, jiffies);
-                                                }
-                                                j->flags.cidring = 1;
-                                                j->cadence_f[5].state = 0;
-                                                break;
-                                }
-                                if (j->flags.cidring && !j->flags.cidsent) {
-                                        j->flags.cidsent = 1;
-                                        if(j->fskdcnt) {
-                                                SLIC_SetState(PLD_SLIC_STATE_OHT, j);
-                                                ixj_pre_cid(j);
-                                        }
-                                        j->flags.cidring = 0;
-                                }
-                                clear_bit(board, &j->busyflags);
-                                ixj_add_timer(j);
-                                return;
-                        } else {
-                                if (time_after(jiffies, j->ring_cadence_jif + (hertz / 2))) {
-                                        if (j->flags.cidring && !j->flags.cidsent) {
-                                                j->flags.cidsent = 1;
-                                                if(j->fskdcnt) {
-                                                        SLIC_SetState(PLD_SLIC_STATE_OHT, j);
-                                                        ixj_pre_cid(j);
-                                                }
-                                                j->flags.cidring = 0;
-                                        }
-                                        j->ring_cadence_t--;
-                                        if (j->ring_cadence_t == -1)
-                                                j->ring_cadence_t = 15;
-                                        j->ring_cadence_jif = jiffies;
-
-                                        if (j->ring_cadence & 1 << j->ring_cadence_t) {
-                                                if(j->flags.cidsent && j->cadence_f[5].en_filter)
-                                                        j->flags.firstring = 1;
-                                                else
-                                                        ixj_ring_on(j);
-                                        } else {
-                                                ixj_ring_off(j);
-                                                if(!j->flags.cidsent)
-                                                        j->flags.cidring = 1;
-                                        }
-                                }
-                                clear_bit(board, &j->busyflags);
-                                ixj_add_timer(j);
-                                return;
-                        }
-                }
-                if (!j->flags.ringing) {
-                        if (j->hookstate) { /* & 1) { */
-                                if (j->dsp.low != 0x20 &&
-                                    SLIC_GetState(j) != PLD_SLIC_STATE_ACTIVE) {
-                                        SLIC_SetState(PLD_SLIC_STATE_ACTIVE, j);
-                                }
-                                LineMonitor(j);
-                                read_filters(j);
-                                ixj_WriteDSPCommand(0x511B, j);
-                                j->proc_load = j->ssr.high << 8 | j->ssr.low;
-                                if (!j->m_hook && (j->hookstate & 1)) {
-                                        j->m_hook = j->ex.bits.hookstate = 1;
-                                        ixj_kill_fasync(j, SIG_HOOKSTATE, POLL_IN);
-                                }
-                        } else {
-                                if (j->ex.bits.dtmf_ready) {
-                                        j->dtmf_wp = j->dtmf_rp = j->ex.bits.dtmf_ready = 0;
-                                }
-                                if (j->m_hook) {
-                                        j->m_hook = 0;
-                                        j->ex.bits.hookstate = 1;
-                                        ixj_kill_fasync(j, SIG_HOOKSTATE, POLL_IN);
-                                }
-                        }
-                }
-                if (j->cardtype == QTI_LINEJACK && !j->flags.pstncheck && j->flags.pstn_present) {
-                        ixj_pstn_state(j);
-                }
-                if (j->ex.bytes) {
-                        wake_up_interruptible(&j->poll_q);      /* Wake any blocked selects */
-                }
-                clear_bit(board, &j->busyflags);
-        }
-        ixj_add_timer(j);
-}
-
-static int ixj_status_wait(IXJ *j)
-{
-        unsigned long jif;
-
-        jif = jiffies + ((60 * hertz) / 100);
-        while (!IsStatusReady(j)) {
-                ixj_perfmon(j->statuswait);
-                if (time_after(jiffies, jif)) {
-                        ixj_perfmon(j->statuswaitfail);
-                        return -1;
-                }
-        }
-        return 0;
-}
-
-static int ixj_PCcontrol_wait(IXJ *j)
-{
-        unsigned long jif;
-
-        jif = jiffies + ((60 * hertz) / 100);
-        while (!IsPCControlReady(j)) {
-                ixj_perfmon(j->pcontrolwait);
-                if (time_after(jiffies, jif)) {
-                        ixj_perfmon(j->pcontrolwaitfail);
-                        return -1;
-                }
-        }
-        return 0;
-}
-
-static int ixj_WriteDSPCommand(unsigned short cmd, IXJ *j)
-{
-        BYTES bytes;
-        unsigned long jif;
-
-        atomic_inc(&j->DSPWrite);
-        if(atomic_read(&j->DSPWrite) > 1) {
-                printk("IXJ %d DSP write overlap attempting command 0x%4.4x\n", j->board, cmd);
-                return -1;
-        }
-        bytes.high = (cmd & 0xFF00) >> 8;
-        bytes.low = cmd & 0x00FF;
-        jif = jiffies + ((60 * hertz) / 100);
-        while (!IsControlReady(j)) {
-                ixj_perfmon(j->iscontrolready);
-                if (time_after(jiffies, jif)) {
-                        ixj_perfmon(j->iscontrolreadyfail);
-                        atomic_dec(&j->DSPWrite);
-                        if(atomic_read(&j->DSPWrite) > 0) {
-                                printk("IXJ %d DSP overlaped command 0x%4.4x during control ready failure.\n", j->board, cmd);
-                                while(atomic_read(&j->DSPWrite) > 0) {
-                                        atomic_dec(&j->DSPWrite);
-                                }
-                        }
-                        return -1;
-                }
-        }
-        outb(bytes.low, j->DSPbase + 6);
-        outb(bytes.high, j->DSPbase + 7);
-
-        if (ixj_status_wait(j)) {
-                j->ssr.low = 0xFF;
-                j->ssr.high = 0xFF;
-                atomic_dec(&j->DSPWrite);
-                if(atomic_read(&j->DSPWrite) > 0) {
-                        printk("IXJ %d DSP overlaped command 0x%4.4x during status wait failure.\n", j->board, cmd);
-                        while(atomic_read(&j->DSPWrite) > 0) {
-                                atomic_dec(&j->DSPWrite);
-                        }
-                }
-                return -1;
-        }
-/* Read Software Status Register */
-        j->ssr.low = inb_p(j->DSPbase + 2);
-        j->ssr.high = inb_p(j->DSPbase + 3);
-        atomic_dec(&j->DSPWrite);
-        if(atomic_read(&j->DSPWrite) > 0) {
-                printk("IXJ %d DSP overlaped command 0x%4.4x\n", j->board, cmd);
-                while(atomic_read(&j->DSPWrite) > 0) {
-                        atomic_dec(&j->DSPWrite);
-                }
-        }
-        return 0;
-}
-
-/***************************************************************************
-*
-*  General Purpose IO Register read routine
-*
-***************************************************************************/
-static inline int ixj_gpio_read(IXJ *j)
-{
-        if (ixj_WriteDSPCommand(0x5143, j))
-                return -1;
-
-        j->gpio.bytes.low = j->ssr.low;
-        j->gpio.bytes.high = j->ssr.high;
-
-        return 0;
-}
-
-static inline void LED_SetState(int state, IXJ *j)
-{
-        if (j->cardtype == QTI_LINEJACK) {
-                j->pld_scrw.bits.led1 = state & 0x1 ? 1 : 0;
-                j->pld_scrw.bits.led2 = state & 0x2 ? 1 : 0;
-                j->pld_scrw.bits.led3 = state & 0x4 ? 1 : 0;
-                j->pld_scrw.bits.led4 = state & 0x8 ? 1 : 0;
-
-                outb(j->pld_scrw.byte, j->XILINXbase);
-        }
-}
-
-/*********************************************************************
-*  GPIO Pins are configured as follows on the Quicknet Internet
-*  PhoneJACK Telephony Cards
-*
-* POTS Select        GPIO_6=0 GPIO_7=0
-* Mic/Speaker Select GPIO_6=0 GPIO_7=1
-* Handset Select     GPIO_6=1 GPIO_7=0
-*
-* SLIC Active        GPIO_1=0 GPIO_2=1 GPIO_5=0
-* SLIC Ringing       GPIO_1=1 GPIO_2=1 GPIO_5=0
-* SLIC Open Circuit  GPIO_1=0 GPIO_2=0 GPIO_5=0
-*
-* Hook Switch changes reported on GPIO_3
-*********************************************************************/
-static int ixj_set_port(IXJ *j, int arg)
-{
-        if (j->cardtype == QTI_PHONEJACK_LITE) {
-                if (arg != PORT_POTS)
-                        return 10;
-                else
-                        return 0;
-        }
-        switch (arg) {
-        case PORT_POTS:
-                j->port = PORT_POTS;
-                switch (j->cardtype) {
-                case QTI_PHONECARD:
-                        if (j->flags.pcmciasct == 1)
-                                SLIC_SetState(PLD_SLIC_STATE_ACTIVE, j);
-                        else
-                                return 11;
-                        break;
-                case QTI_PHONEJACK_PCI:
-                        j->pld_slicw.pcib.mic = 0;
-                        j->pld_slicw.pcib.spk = 0;
-                        outb(j->pld_slicw.byte, j->XILINXbase + 0x01);
-                        break;
-                case QTI_LINEJACK:
-                        ixj_set_pots(j, 0);                     /* Disconnect POTS/PSTN relay */
-                        if (ixj_WriteDSPCommand(0xC528, j))             /* Write CODEC config to
-                                                                           Software Control Register */
-                                return 2;
-                        j->pld_scrw.bits.daafsyncen = 0;        /* Turn off DAA Frame Sync */
-
-                        outb(j->pld_scrw.byte, j->XILINXbase);
-                        j->pld_clock.byte = 0;
-                        outb(j->pld_clock.byte, j->XILINXbase + 0x04);
-                        j->pld_slicw.bits.rly1 = 1;
-                        j->pld_slicw.bits.spken = 0;
-                        outb(j->pld_slicw.byte, j->XILINXbase + 0x01);
-                        ixj_mixer(0x1200, j);   /* Turn Off MIC switch on mixer left */
-                        ixj_mixer(0x1401, j);   /* Turn On Mono1 switch on mixer left */
-                        ixj_mixer(0x1300, j);       /* Turn Off MIC switch on mixer right */
-                        ixj_mixer(0x1501, j);       /* Turn On Mono1 switch on mixer right */
-                        ixj_mixer(0x0E80, j);   /*Mic mute */
-                        ixj_mixer(0x0F00, j);   /* Set mono out (SLIC) to 0dB */
-                        ixj_mixer(0x0080, j);   /* Mute Master Left volume */
-                        ixj_mixer(0x0180, j);   /* Mute Master Right volume */
-                        SLIC_SetState(PLD_SLIC_STATE_STANDBY, j);
-/*                      SLIC_SetState(PLD_SLIC_STATE_ACTIVE, j); */
-                        break;
-                case QTI_PHONEJACK:
-                        j->gpio.bytes.high = 0x0B;
-                        j->gpio.bits.gpio6 = 0;
-                        j->gpio.bits.gpio7 = 0;
-                        ixj_WriteDSPCommand(j->gpio.word, j);
-                        break;
-                }
-                break;
-        case PORT_PSTN:
-                if (j->cardtype == QTI_LINEJACK) {
-                        ixj_WriteDSPCommand(0xC534, j); /* Write CODEC config to Software Control Register */
-
-                        j->pld_slicw.bits.rly3 = 0;
-                        j->pld_slicw.bits.rly1 = 1;
-                        j->pld_slicw.bits.spken = 0;
-                        outb(j->pld_slicw.byte, j->XILINXbase + 0x01);
-                        j->port = PORT_PSTN;
-                } else {
-                        return 4;
-                }
-                break;
-        case PORT_SPEAKER:
-                j->port = PORT_SPEAKER;
-                switch (j->cardtype) {
-                case QTI_PHONECARD:
-                        if (j->flags.pcmciasct) {
-                                SLIC_SetState(PLD_SLIC_STATE_OC, j);
-                        }
-                        break;
-                case QTI_PHONEJACK_PCI:
-                        j->pld_slicw.pcib.mic = 1;
-                        j->pld_slicw.pcib.spk = 1;
-                        outb(j->pld_slicw.byte, j->XILINXbase + 0x01);
-                        break;
-                case QTI_LINEJACK:
-                        ixj_set_pots(j, 0);                     /* Disconnect POTS/PSTN relay */
-                        if (ixj_WriteDSPCommand(0xC528, j))             /* Write CODEC config to
-                                                                           Software Control Register */
-                                return 2;
-                        j->pld_scrw.bits.daafsyncen = 0;        /* Turn off DAA Frame Sync */
-
-                        outb(j->pld_scrw.byte, j->XILINXbase);
-                        j->pld_clock.byte = 0;
-                        outb(j->pld_clock.byte, j->XILINXbase + 0x04);
-                        j->pld_slicw.bits.rly1 = 1;
-                        j->pld_slicw.bits.spken = 1;
-                        outb(j->pld_slicw.byte, j->XILINXbase + 0x01);
-                        ixj_mixer(0x1201, j);   /* Turn On MIC switch on mixer left */
-                        ixj_mixer(0x1400, j);   /* Turn Off Mono1 switch on mixer left */
-                        ixj_mixer(0x1301, j);       /* Turn On MIC switch on mixer right */
-                        ixj_mixer(0x1500, j);       /* Turn Off Mono1 switch on mixer right */
-                        ixj_mixer(0x0E06, j);   /*Mic un-mute 0dB */
-                        ixj_mixer(0x0F80, j);   /* Mute mono out (SLIC) */
-                        ixj_mixer(0x0000, j);   /* Set Master Left volume to 0dB */
-                        ixj_mixer(0x0100, j);   /* Set Master Right volume to 0dB */
-                        break;
-                case QTI_PHONEJACK:
-                        j->gpio.bytes.high = 0x0B;
-                        j->gpio.bits.gpio6 = 0;
-                        j->gpio.bits.gpio7 = 1;
-                        ixj_WriteDSPCommand(j->gpio.word, j);
-                        break;
-                }
-                break;
-        case PORT_HANDSET:
-                if (j->cardtype != QTI_PHONEJACK) {
-                        return 5;
-                } else {
-                        j->gpio.bytes.high = 0x0B;
-                        j->gpio.bits.gpio6 = 1;
-                        j->gpio.bits.gpio7 = 0;
-                        ixj_WriteDSPCommand(j->gpio.word, j);
-                        j->port = PORT_HANDSET;
-                }
-                break;
-        default:
-                return 6;
-                break;
-        }
-        return 0;
-}
-
-static int ixj_set_pots(IXJ *j, int arg)
-{
-        if (j->cardtype == QTI_LINEJACK) {
-                if (arg) {
-                        if (j->port == PORT_PSTN) {
-                                j->pld_slicw.bits.rly1 = 0;
-                                outb(j->pld_slicw.byte, j->XILINXbase + 0x01);
-                                j->flags.pots_pstn = 1;
-                                return 1;
-                        } else {
-                                j->flags.pots_pstn = 0;
-                                return 0;
-                        }
-                } else {
-                        j->pld_slicw.bits.rly1 = 1;
-                        outb(j->pld_slicw.byte, j->XILINXbase + 0x01);
-                        j->flags.pots_pstn = 0;
-                        return 1;
-                }
-        } else {
-                return 0;
-        }
-}
-
-static void ixj_ring_on(IXJ *j)
-{
-        if (j->dsp.low == 0x20) /* Internet PhoneJACK */
-         {
-                if (ixjdebug & 0x0004)
-                        printk(KERN_INFO "IXJ Ring On /dev/phone%d\n",  j->board);
-
-                j->gpio.bytes.high = 0x0B;
-                j->gpio.bytes.low = 0x00;
-                j->gpio.bits.gpio1 = 1;
-                j->gpio.bits.gpio2 = 1;
-                j->gpio.bits.gpio5 = 0;
-                ixj_WriteDSPCommand(j->gpio.word, j);   /* send the ring signal */
-        } else                  /* Internet LineJACK, Internet PhoneJACK Lite or Internet PhoneJACK PCI */
-        {
-                if (ixjdebug & 0x0004)
-                        printk(KERN_INFO "IXJ Ring On /dev/phone%d\n", j->board);
-
-                SLIC_SetState(PLD_SLIC_STATE_RINGING, j);
-        }
-}
-
-static int ixj_siadc(IXJ *j, int val)
-{
-        if(j->cardtype == QTI_PHONECARD){
-                if(j->flags.pcmciascp){
-                        if(val == -1)
-                                return j->siadc.bits.rxg;
-
-                        if(val < 0 || val > 0x1F)
-                                return -1;
-
-                        j->siadc.bits.hom = 0;                          /* Handset Out Mute */
-                        j->siadc.bits.lom = 0;                          /* Line Out Mute */
-                        j->siadc.bits.rxg = val;                        /*(0xC000 - 0x41C8) / 0x4EF;    RX PGA Gain */
-                        j->psccr.bits.addr = 6;                         /* R/W Smart Cable Register Address */
-                        j->psccr.bits.rw = 0;                           /* Read / Write flag */
-                        j->psccr.bits.dev = 0;
-                        outb(j->siadc.byte, j->XILINXbase + 0x00);
-                        outb(j->psccr.byte, j->XILINXbase + 0x01);
-                        ixj_PCcontrol_wait(j);
-                        return j->siadc.bits.rxg;
-                }
-        }
-        return -1;
-}
-
-static int ixj_sidac(IXJ *j, int val)
-{
-        if(j->cardtype == QTI_PHONECARD){
-                if(j->flags.pcmciascp){
-                        if(val == -1)
-                                return j->sidac.bits.txg;
-
-                        if(val < 0 || val > 0x1F)
-                                return -1;
-
-                        j->sidac.bits.srm = 1;                          /* Speaker Right Mute */
-                        j->sidac.bits.slm = 1;                          /* Speaker Left Mute */
-                        j->sidac.bits.txg = val;                        /* (0xC000 - 0x45E4) / 0x5D3;    TX PGA Gain */
-                        j->psccr.bits.addr = 7;                         /* R/W Smart Cable Register Address */
-                        j->psccr.bits.rw = 0;                           /* Read / Write flag */
-                        j->psccr.bits.dev = 0;
-                        outb(j->sidac.byte, j->XILINXbase + 0x00);
-                        outb(j->psccr.byte, j->XILINXbase + 0x01);
-                        ixj_PCcontrol_wait(j);
-                        return j->sidac.bits.txg;
-                }
-        }
-        return -1;
-}
-
-static int ixj_pcmcia_cable_check(IXJ *j)
-{
-        j->pccr1.byte = inb_p(j->XILINXbase + 0x03);
-        if (!j->flags.pcmciastate) {
-                j->pccr2.byte = inb_p(j->XILINXbase + 0x02);
-                if (j->pccr1.bits.drf || j->pccr2.bits.rstc) {
-                        j->flags.pcmciastate = 4;
-                        return 0;
-                }
-                if (j->pccr1.bits.ed) {
-                        j->pccr1.bits.ed = 0;
-                        j->psccr.bits.dev = 3;
-                        j->psccr.bits.rw = 1;
-                        outw_p(j->psccr.byte << 8, j->XILINXbase + 0x00);
-                        ixj_PCcontrol_wait(j);
-                        j->pslic.byte = inw_p(j->XILINXbase + 0x00) & 0xFF;
-                        j->pslic.bits.led2 = j->pslic.bits.det ? 1 : 0;
-                        j->psccr.bits.dev = 3;
-                        j->psccr.bits.rw = 0;
-                        outw_p(j->psccr.byte << 8 | j->pslic.byte, j->XILINXbase + 0x00);
-                        ixj_PCcontrol_wait(j);
-                        return j->pslic.bits.led2 ? 1 : 0;
-                } else if (j->flags.pcmciasct) {
-                        return j->r_hook;
-                } else {
-                        return 1;
-                }
-        } else if (j->flags.pcmciastate == 4) {
-                if (!j->pccr1.bits.drf) {
-                        j->flags.pcmciastate = 3;
-                }
-                return 0;
-        } else if (j->flags.pcmciastate == 3) {
-                j->pccr2.bits.pwr = 0;
-                j->pccr2.bits.rstc = 1;
-                outb(j->pccr2.byte, j->XILINXbase + 0x02);
-                j->checkwait = jiffies + (hertz * 2);
-                j->flags.incheck = 1;
-                j->flags.pcmciastate = 2;
-                return 0;
-        } else if (j->flags.pcmciastate == 2) {
-                if (j->flags.incheck) {
-                        if (time_before(jiffies, j->checkwait)) {
-                                return 0;
-                        } else {
-                                j->flags.incheck = 0;
-                        }
-                }
-                j->pccr2.bits.pwr = 0;
-                j->pccr2.bits.rstc = 0;
-                outb_p(j->pccr2.byte, j->XILINXbase + 0x02);
-                j->flags.pcmciastate = 1;
-                return 0;
-        } else if (j->flags.pcmciastate == 1) {
-                j->flags.pcmciastate = 0;
-                if (!j->pccr1.bits.drf) {
-                        j->psccr.bits.dev = 3;
-                        j->psccr.bits.rw = 1;
-                        outb_p(j->psccr.byte, j->XILINXbase + 0x01);
-                        ixj_PCcontrol_wait(j);
-                        j->flags.pcmciascp = 1;         /* Set Cable Present Flag */
-
-                        j->flags.pcmciasct = (inw_p(j->XILINXbase + 0x00) >> 8) & 0x03;         /* Get Cable Type */
-
-                        if (j->flags.pcmciasct == 3) {
-                                j->flags.pcmciastate = 4;
-                                return 0;
-                        } else if (j->flags.pcmciasct == 0) {
-                                j->pccr2.bits.pwr = 1;
-                                j->pccr2.bits.rstc = 0;
-                                outb_p(j->pccr2.byte, j->XILINXbase + 0x02);
-                                j->port = PORT_SPEAKER;
-                        } else {
-                                j->port = PORT_POTS;
-                        }
-                        j->sic1.bits.cpd = 0;                           /* Chip Power Down */
-                        j->sic1.bits.mpd = 0;                           /* MIC Bias Power Down */
-                        j->sic1.bits.hpd = 0;                           /* Handset Bias Power Down */
-                        j->sic1.bits.lpd = 0;                           /* Line Bias Power Down */
-                        j->sic1.bits.spd = 1;                           /* Speaker Drive Power Down */
-                        j->psccr.bits.addr = 1;                         /* R/W Smart Cable Register Address */
-                        j->psccr.bits.rw = 0;                           /* Read / Write flag */
-                        j->psccr.bits.dev = 0;
-                        outb(j->sic1.byte, j->XILINXbase + 0x00);
-                        outb(j->psccr.byte, j->XILINXbase + 0x01);
-                        ixj_PCcontrol_wait(j);
-
-                        j->sic2.bits.al = 0;                            /* Analog Loopback DAC analog -> ADC analog */
-                        j->sic2.bits.dl2 = 0;                           /* Digital Loopback DAC -> ADC one bit */
-                        j->sic2.bits.dl1 = 0;                           /* Digital Loopback ADC -> DAC one bit */
-                        j->sic2.bits.pll = 0;                           /* 1 = div 10, 0 = div 5 */
-                        j->sic2.bits.hpd = 0;                           /* HPF disable */
-                        j->psccr.bits.addr = 2;                         /* R/W Smart Cable Register Address */
-                        j->psccr.bits.rw = 0;                           /* Read / Write flag */
-                        j->psccr.bits.dev = 0;
-                        outb(j->sic2.byte, j->XILINXbase + 0x00);
-                        outb(j->psccr.byte, j->XILINXbase + 0x01);
-                        ixj_PCcontrol_wait(j);
-
-                        j->psccr.bits.addr = 3;                         /* R/W Smart Cable Register Address */
-                        j->psccr.bits.rw = 0;                           /* Read / Write flag */
-                        j->psccr.bits.dev = 0;
-                        outb(0x00, j->XILINXbase + 0x00);               /* PLL Divide N1 */
-                        outb(j->psccr.byte, j->XILINXbase + 0x01);
-                        ixj_PCcontrol_wait(j);
-
-                        j->psccr.bits.addr = 4;                         /* R/W Smart Cable Register Address */
-                        j->psccr.bits.rw = 0;                           /* Read / Write flag */
-                        j->psccr.bits.dev = 0;
-                        outb(0x09, j->XILINXbase + 0x00);               /* PLL Multiply M1 */
-                        outb(j->psccr.byte, j->XILINXbase + 0x01);
-                        ixj_PCcontrol_wait(j);
-
-                        j->sirxg.bits.lig = 1;                          /* Line In Gain */
-                        j->sirxg.bits.lim = 1;                          /* Line In Mute */
-                        j->sirxg.bits.mcg = 0;                          /* MIC In Gain was 3 */
-                        j->sirxg.bits.mcm = 0;                          /* MIC In Mute */
-                        j->sirxg.bits.him = 0;                          /* Handset In Mute */
-                        j->sirxg.bits.iir = 1;                          /* IIR */
-                        j->psccr.bits.addr = 5;                         /* R/W Smart Cable Register Address */
-                        j->psccr.bits.rw = 0;                           /* Read / Write flag */
-                        j->psccr.bits.dev = 0;
-                        outb(j->sirxg.byte, j->XILINXbase + 0x00);
-                        outb(j->psccr.byte, j->XILINXbase + 0x01);
-                        ixj_PCcontrol_wait(j);
-
-                        ixj_siadc(j, 0x17);
-                        ixj_sidac(j, 0x1D);
-
-                        j->siaatt.bits.sot = 0;
-                        j->psccr.bits.addr = 9;                         /* R/W Smart Cable Register Address */
-                        j->psccr.bits.rw = 0;                           /* Read / Write flag */
-                        j->psccr.bits.dev = 0;
-                        outb(j->siaatt.byte, j->XILINXbase + 0x00);
-                        outb(j->psccr.byte, j->XILINXbase + 0x01);
-                        ixj_PCcontrol_wait(j);
-
-                        if (j->flags.pcmciasct == 1 && !j->readers && !j->writers) {
-                                j->psccr.byte = j->pslic.byte = 0;
-                                j->pslic.bits.powerdown = 1;
-                                j->psccr.bits.dev = 3;
-                                j->psccr.bits.rw = 0;
-                                outw_p(j->psccr.byte << 8 | j->pslic.byte, j->XILINXbase + 0x00);
-                                ixj_PCcontrol_wait(j);
-                        }
-                }
-                return 0;
-        } else {
-                j->flags.pcmciascp = 0;
-                return 0;
-        }
-        return 0;
-}
-
-static int ixj_hookstate(IXJ *j)
-{
-        int fOffHook = 0;
-
-        switch (j->cardtype) {
-        case QTI_PHONEJACK:
-                ixj_gpio_read(j);
-                fOffHook = j->gpio.bits.gpio3read ? 1 : 0;
-                break;
-        case QTI_LINEJACK:
-        case QTI_PHONEJACK_LITE:
-        case QTI_PHONEJACK_PCI:
-                SLIC_GetState(j);
-                if(j->cardtype == QTI_LINEJACK && j->flags.pots_pstn == 1 && (j->readers || j->writers)) {
-                        fOffHook = j->pld_slicr.bits.potspstn ? 1 : 0;
-                        if(fOffHook != j->p_hook) {
-                                if(!j->checkwait) {
-                                        j->checkwait = jiffies;
-                                }
-                                if(time_before(jiffies, j->checkwait + 2)) {
-                                        fOffHook ^= 1;
-                                } else {
-                                        j->checkwait = 0;
-                                }
-                                j->p_hook = fOffHook;
-                                printk("IXJ : /dev/phone%d pots-pstn hookstate check %d at %ld\n", j->board, fOffHook, jiffies);
-                        }
-                } else {
-                        if (j->pld_slicr.bits.state == PLD_SLIC_STATE_ACTIVE ||
-                            j->pld_slicr.bits.state == PLD_SLIC_STATE_STANDBY) {
-                                if (j->flags.ringing || j->flags.cringing) {
-                                        if (!in_interrupt()) {
-                                                msleep(20);
-                                        }
-                                        SLIC_GetState(j);
-                                        if (j->pld_slicr.bits.state == PLD_SLIC_STATE_RINGING) {
-                                                ixj_ring_on(j);
-                                        }
-                                }
-                                if (j->cardtype == QTI_PHONEJACK_PCI) {
-                                        j->pld_scrr.byte = inb_p(j->XILINXbase);
-                                        fOffHook = j->pld_scrr.pcib.det ? 1 : 0;
-                                } else
-                                        fOffHook = j->pld_slicr.bits.det ? 1 : 0;
-                        }
-                }
-                break;
-        case QTI_PHONECARD:
-                fOffHook = ixj_pcmcia_cable_check(j);
-                break;
-        }
-        if (j->r_hook != fOffHook) {
-                j->r_hook = fOffHook;
-                if (j->port == PORT_SPEAKER || j->port == PORT_HANDSET) { // || (j->port == PORT_PSTN && j->flags.pots_pstn == 0)) {
-                        j->ex.bits.hookstate = 1;
-                        ixj_kill_fasync(j, SIG_HOOKSTATE, POLL_IN);
-                } else if (!fOffHook) {
-                        j->flash_end = jiffies + ((60 * hertz) / 100);
-                }
-        }
-        if (fOffHook) {
-                if(time_before(jiffies, j->flash_end)) {
-                        j->ex.bits.flash = 1;
-                        j->flash_end = 0;
-                        ixj_kill_fasync(j, SIG_FLASH, POLL_IN);
-                }
-        } else {
-                if(time_before(jiffies, j->flash_end)) {
-                        fOffHook = 1;
-                }
-        }
-
-        if (j->port == PORT_PSTN && j->daa_mode == SOP_PU_CONVERSATION)
-                fOffHook |= 2;
-
-        if (j->port == PORT_SPEAKER) {
-                if(j->cardtype == QTI_PHONECARD) {
-                        if(j->flags.pcmciascp && j->flags.pcmciasct) {
-                                fOffHook |= 2;
-                        }
-                } else {
-                        fOffHook |= 2;
-                }
-        }
-
-        if (j->port == PORT_HANDSET)
-                fOffHook |= 2;
-
-        return fOffHook;
-}
-
-static void ixj_ring_off(IXJ *j)
-{
-        if (j->dsp.low == 0x20) /* Internet PhoneJACK */
-         {
-                if (ixjdebug & 0x0004)
-                        printk(KERN_INFO "IXJ Ring Off\n");
-                j->gpio.bytes.high = 0x0B;
-                j->gpio.bytes.low = 0x00;
-                j->gpio.bits.gpio1 = 0;
-                j->gpio.bits.gpio2 = 1;
-                j->gpio.bits.gpio5 = 0;
-                ixj_WriteDSPCommand(j->gpio.word, j);
-        } else                  /* Internet LineJACK */
-        {
-                if (ixjdebug & 0x0004)
-                        printk(KERN_INFO "IXJ Ring Off\n");
-
-                if(!j->flags.cidplay)
-                        SLIC_SetState(PLD_SLIC_STATE_STANDBY, j);
-
-                SLIC_GetState(j);
-        }
-}
-
-static void ixj_ring_start(IXJ *j)
-{
-        j->flags.cringing = 1;
-        if (ixjdebug & 0x0004)
-                printk(KERN_INFO "IXJ Cadence Ringing Start /dev/phone%d\n", j->board);
-        if (ixj_hookstate(j) & 1) {
-                if (j->port == PORT_POTS)
-                        ixj_ring_off(j);
-                j->flags.cringing = 0;
-                if (ixjdebug & 0x0004)
-                        printk(KERN_INFO "IXJ Cadence Ringing Stopped /dev/phone%d off hook\n", j->board);
-        } else if(j->cadence_f[5].enable && (!j->cadence_f[5].en_filter)) {
-                j->ring_cadence_jif = jiffies;
-                j->flags.cidsent = j->flags.cidring = 0;
-                j->cadence_f[5].state = 0;
-                if(j->cadence_f[5].on1)
-                        ixj_ring_on(j);
-        } else {
-                j->ring_cadence_jif = jiffies;
-                j->ring_cadence_t = 15;
-                if (j->ring_cadence & 1 << j->ring_cadence_t) {
-                        ixj_ring_on(j);
-                } else {
-                        ixj_ring_off(j);
-                }
-                j->flags.cidsent = j->flags.cidring = j->flags.firstring = 0;
-        }
-}
-
-static int ixj_ring(IXJ *j)
-{
-        char cntr;
-        unsigned long jif;
-
-        j->flags.ringing = 1;
-        if (ixj_hookstate(j) & 1) {
-                ixj_ring_off(j);
-                j->flags.ringing = 0;
-                return 1;
-        }
-        for (cntr = 0; cntr < j->maxrings; cntr++) {
-                jif = jiffies + (1 * hertz);
-                ixj_ring_on(j);
-                while (time_before(jiffies, jif)) {
-                        if (ixj_hookstate(j) & 1) {
-                                ixj_ring_off(j);
-                                j->flags.ringing = 0;
-                                return 1;
-                        }
-                        schedule_timeout_interruptible(1);
-                        if (signal_pending(current))
-                                break;
-                }
-                jif = jiffies + (3 * hertz);
-                ixj_ring_off(j);
-                while (time_before(jiffies, jif)) {
-                        if (ixj_hookstate(j) & 1) {
-                                msleep(10);
-                                if (ixj_hookstate(j) & 1) {
-                                        j->flags.ringing = 0;
-                                        return 1;
-                                }
-                        }
-                        schedule_timeout_interruptible(1);
-                        if (signal_pending(current))
-                                break;
-                }
-        }
-        ixj_ring_off(j);
-        j->flags.ringing = 0;
-        return 0;
-}
-
-static int ixj_open(struct phone_device *p, struct file *file_p)
-{
-        IXJ *j = get_ixj(p->board);
-        file_p->private_data = j;
-
-        if (!j->DSPbase)
-                return -ENODEV;
-
-        if (file_p->f_mode & FMODE_READ) {
-                if(!j->readers) {
-                        j->readers++;
-                } else {
-                        return -EBUSY;
-                }
-        }
-
-        if (file_p->f_mode & FMODE_WRITE) {
-                if(!j->writers) {
-                        j->writers++;
-                } else {
-                        if (file_p->f_mode & FMODE_READ){
-                                j->readers--;
-                        }
-                        return -EBUSY;
-                }
-        }
-
-        if (j->cardtype == QTI_PHONECARD) {
-                j->pslic.bits.powerdown = 0;
-                j->psccr.bits.dev = 3;
-                j->psccr.bits.rw = 0;
-                outw_p(j->psccr.byte << 8 | j->pslic.byte, j->XILINXbase + 0x00);
-                ixj_PCcontrol_wait(j);
-        }
-
-        j->flags.cidplay = 0;
-        j->flags.cidcw_ack = 0;
-
-        if (ixjdebug & 0x0002)
-                printk(KERN_INFO "Opening board %d\n", p->board);
-
-        j->framesread = j->frameswritten = 0;
-        return 0;
-}
-
-static int ixj_release(struct inode *inode, struct file *file_p)
-{
-        IXJ_TONE ti;
-        int cnt;
-        IXJ *j = file_p->private_data;
-        int board = j->p.board;
-
-        /*
-         *    Set up locks to ensure that only one process is talking to the DSP at a time.
-         *    This is necessary to keep the DSP from locking up.
-         */
-        while(test_and_set_bit(board, (void *)&j->busyflags) != 0)
-                schedule_timeout_interruptible(1);
-        if (ixjdebug & 0x0002)
-                printk(KERN_INFO "Closing board %d\n", NUM(inode));
-
-        if (j->cardtype == QTI_PHONECARD)
-                ixj_set_port(j, PORT_SPEAKER);
-        else
-                ixj_set_port(j, PORT_POTS);
-
-        aec_stop(j);
-        ixj_play_stop(j);
-        ixj_record_stop(j);
-        set_play_volume(j, 0x100);
-        set_rec_volume(j, 0x100);
-        ixj_ring_off(j);
-
-        /* Restore the tone table to default settings. */
-        ti.tone_index = 10;
-        ti.gain0 = 1;
-        ti.freq0 = hz941;
-        ti.gain1 = 0;
-        ti.freq1 = hz1209;
-        ixj_init_tone(j, &ti);
-        ti.tone_index = 11;
-        ti.gain0 = 1;
-        ti.freq0 = hz941;
-        ti.gain1 = 0;
-        ti.freq1 = hz1336;
-        ixj_init_tone(j, &ti);
-        ti.tone_index = 12;
-        ti.gain0 = 1;
-        ti.freq0 = hz941;
-        ti.gain1 = 0;
-        ti.freq1 = hz1477;
-        ixj_init_tone(j, &ti);
-        ti.tone_index = 13;
-        ti.gain0 = 1;
-        ti.freq0 = hz800;
-        ti.gain1 = 0;
-        ti.freq1 = 0;
-        ixj_init_tone(j, &ti);
-        ti.tone_index = 14;
-        ti.gain0 = 1;
-        ti.freq0 = hz1000;
-        ti.gain1 = 0;
-        ti.freq1 = 0;
-        ixj_init_tone(j, &ti);
-        ti.tone_index = 15;
-        ti.gain0 = 1;
-        ti.freq0 = hz1250;
-        ti.gain1 = 0;
-        ti.freq1 = 0;
-        ixj_init_tone(j, &ti);
-        ti.tone_index = 16;
-        ti.gain0 = 1;
-        ti.freq0 = hz950;
-        ti.gain1 = 0;
-        ti.freq1 = 0;
-        ixj_init_tone(j, &ti);
-        ti.tone_index = 17;
-        ti.gain0 = 1;
-        ti.freq0 = hz1100;
-        ti.gain1 = 0;
-        ti.freq1 = 0;
-        ixj_init_tone(j, &ti);
-        ti.tone_index = 18;
-        ti.gain0 = 1;
-        ti.freq0 = hz1400;
-        ti.gain1 = 0;
-        ti.freq1 = 0;
-        ixj_init_tone(j, &ti);
-        ti.tone_index = 19;
-        ti.gain0 = 1;
-        ti.freq0 = hz1500;
-        ti.gain1 = 0;
-        ti.freq1 = 0;
-        ixj_init_tone(j, &ti);
-        ti.tone_index = 20;
-        ti.gain0 = 1;
-        ti.freq0 = hz1600;
-        ti.gain1 = 0;
-        ti.freq1 = 0;
-        ixj_init_tone(j, &ti);
-        ti.tone_index = 21;
-        ti.gain0 = 1;
-        ti.freq0 = hz1800;
-        ti.gain1 = 0;
-        ti.freq1 = 0;
-        ixj_init_tone(j, &ti);
-        ti.tone_index = 22;
-        ti.gain0 = 1;
-        ti.freq0 = hz2100;
-        ti.gain1 = 0;
-        ti.freq1 = 0;
-        ixj_init_tone(j, &ti);
-        ti.tone_index = 23;
-        ti.gain0 = 1;
-        ti.freq0 = hz1300;
-        ti.gain1 = 0;
-        ti.freq1 = 0;
-        ixj_init_tone(j, &ti);
-        ti.tone_index = 24;
-        ti.gain0 = 1;
-        ti.freq0 = hz2450;
-        ti.gain1 = 0;
-        ti.freq1 = 0;
-        ixj_init_tone(j, &ti);
-        ti.tone_index = 25;
-        ti.gain0 = 1;
-        ti.freq0 = hz350;
-        ti.gain1 = 0;
-        ti.freq1 = hz440;
-        ixj_init_tone(j, &ti);
-        ti.tone_index = 26;
-        ti.gain0 = 1;
-        ti.freq0 = hz440;
-        ti.gain1 = 0;
-        ti.freq1 = hz480;
-        ixj_init_tone(j, &ti);
-        ti.tone_index = 27;
-        ti.gain0 = 1;
-        ti.freq0 = hz480;
-        ti.gain1 = 0;
-        ti.freq1 = hz620;
-        ixj_init_tone(j, &ti);
-
-        set_rec_depth(j, 2);    /* Set Record Channel Limit to 2 frames */
-
-        set_play_depth(j, 2);   /* Set Playback Channel Limit to 2 frames */
-
-        j->ex.bits.dtmf_ready = 0;
-        j->dtmf_state = 0;
-        j->dtmf_wp = j->dtmf_rp = 0;
-        j->rec_mode = j->play_mode = -1;
-        j->flags.ringing = 0;
-        j->maxrings = MAXRINGS;
-        j->ring_cadence = USA_RING_CADENCE;
-        if(j->cadence_f[5].enable) {
-                j->cadence_f[5].enable = j->cadence_f[5].en_filter = j->cadence_f[5].state = 0;
-        }
-        j->drybuffer = 0;
-        j->winktime = 320;
-        j->flags.dtmf_oob = 0;
-        for (cnt = 0; cnt < 4; cnt++)
-                j->cadence_f[cnt].enable = 0;
-
-        idle(j);
-
-        if(j->cardtype == QTI_PHONECARD) {
-                SLIC_SetState(PLD_SLIC_STATE_OC, j);
-        }
-
-        if (file_p->f_mode & FMODE_READ)
-                j->readers--;
-        if (file_p->f_mode & FMODE_WRITE)
-                j->writers--;
-
-        if (j->read_buffer && !j->readers) {
-                kfree(j->read_buffer);
-                j->read_buffer = NULL;
-                j->read_buffer_size = 0;
-        }
-        if (j->write_buffer && !j->writers) {
-                kfree(j->write_buffer);
-                j->write_buffer = NULL;
-                j->write_buffer_size = 0;
-        }
-        j->rec_codec = j->play_codec = 0;
-        j->rec_frame_size = j->play_frame_size = 0;
-        j->flags.cidsent = j->flags.cidring = 0;
-
-        if(j->cardtype == QTI_LINEJACK && !j->readers && !j->writers) {
-                ixj_set_port(j, PORT_PSTN);
-                daa_set_mode(j, SOP_PU_SLEEP);
-                ixj_set_pots(j, 1);
-        }
-        ixj_WriteDSPCommand(0x0FE3, j); /* Put the DSP in 1/5 power mode. */
-
-        /* Set up the default signals for events */
-        for (cnt = 0; cnt < 35; cnt++)
-                j->ixj_signals[cnt] = SIGIO;
-
-        /* Set the excetion signal enable flags */
-        j->ex_sig.bits.dtmf_ready = j->ex_sig.bits.hookstate = j->ex_sig.bits.flash = j->ex_sig.bits.pstn_ring =
-        j->ex_sig.bits.caller_id = j->ex_sig.bits.pstn_wink = j->ex_sig.bits.f0 = j->ex_sig.bits.f1 = j->ex_sig.bits.f2 =
-        j->ex_sig.bits.f3 = j->ex_sig.bits.fc0 = j->ex_sig.bits.fc1 = j->ex_sig.bits.fc2 = j->ex_sig.bits.fc3 = 1;
-
-        file_p->private_data = NULL;
-        clear_bit(board, &j->busyflags);
-        return 0;
-}
-
-static int read_filters(IXJ *j)
-{
-        unsigned short fc, cnt, trg;
-        int var;
-
-        trg = 0;
-        if (ixj_WriteDSPCommand(0x5144, j)) {
-                if(ixjdebug & 0x0001) {
-                        printk(KERN_INFO "Read Frame Counter failed!\n");
-                }
-                return -1;
-        }
-        fc = j->ssr.high << 8 | j->ssr.low;
-        if (fc == j->frame_count)
-                return 1;
-
-        j->frame_count = fc;
-
-        if (j->dtmf_proc)
-                return 1;
-
-        var = 10;
-
-        for (cnt = 0; cnt < 4; cnt++) {
-                if (ixj_WriteDSPCommand(0x5154 + cnt, j)) {
-                        if(ixjdebug & 0x0001) {
-                                printk(KERN_INFO "Select Filter %d failed!\n", cnt);
-                        }
-                        return -1;
-                }
-                if (ixj_WriteDSPCommand(0x515C, j)) {
-                        if(ixjdebug & 0x0001) {
-                                printk(KERN_INFO "Read Filter History %d failed!\n", cnt);
-                        }
-                        return -1;
-                }
-                j->filter_hist[cnt] = j->ssr.high << 8 | j->ssr.low;
-
-                if (j->cadence_f[cnt].enable) {
-                        if (j->filter_hist[cnt] & 3 && !(j->filter_hist[cnt] & 12)) {
-                                if (j->cadence_f[cnt].state == 0) {
-                                        j->cadence_f[cnt].state = 1;
-                                        j->cadence_f[cnt].on1min = jiffies + (long)((j->cadence_f[cnt].on1 * (hertz * (100 - var)) / 10000));
-                                        j->cadence_f[cnt].on1dot = jiffies + (long)((j->cadence_f[cnt].on1 * (hertz * (100)) / 10000));
-                                        j->cadence_f[cnt].on1max = jiffies + (long)((j->cadence_f[cnt].on1 * (hertz * (100 + var)) / 10000));
-                                } else if (j->cadence_f[cnt].state == 2 &&
-                                           (time_after(jiffies, j->cadence_f[cnt].off1min) &&
-                                            time_before(jiffies, j->cadence_f[cnt].off1max))) {
-                                        if (j->cadence_f[cnt].on2) {
-                                                j->cadence_f[cnt].state = 3;
-                                                j->cadence_f[cnt].on2min = jiffies + (long)((j->cadence_f[cnt].on2 * (hertz * (100 - var)) / 10000));
-                                                j->cadence_f[cnt].on2dot = jiffies + (long)((j->cadence_f[cnt].on2 * (hertz * (100)) / 10000));
-                                                j->cadence_f[cnt].on2max = jiffies + (long)((j->cadence_f[cnt].on2 * (hertz * (100 + var)) / 10000));
-                                        } else {
-                                                j->cadence_f[cnt].state = 7;
-                                        }
-                                } else if (j->cadence_f[cnt].state == 4 &&
-                                           (time_after(jiffies, j->cadence_f[cnt].off2min) &&
-                                            time_before(jiffies, j->cadence_f[cnt].off2max))) {
-                                        if (j->cadence_f[cnt].on3) {
-                                                j->cadence_f[cnt].state = 5;
-                                                j->cadence_f[cnt].on3min = jiffies + (long)((j->cadence_f[cnt].on3 * (hertz * (100 - var)) / 10000));
-                                                j->cadence_f[cnt].on3dot = jiffies + (long)((j->cadence_f[cnt].on3 * (hertz * (100)) / 10000));
-                                                j->cadence_f[cnt].on3max = jiffies + (long)((j->cadence_f[cnt].on3 * (hertz * (100 + var)) / 10000));
-                                        } else {
-                                                j->cadence_f[cnt].state = 7;
-                                        }
-                                } else {
-                                        j->cadence_f[cnt].state = 0;
-                                }
-                        } else if (j->filter_hist[cnt] & 12 && !(j->filter_hist[cnt] & 3)) {
-                                if (j->cadence_f[cnt].state == 1) {
-                                        if(!j->cadence_f[cnt].on1) {
-                                                j->cadence_f[cnt].state = 7;
-                                        } else if((time_after(jiffies, j->cadence_f[cnt].on1min) &&
-                                          time_before(jiffies, j->cadence_f[cnt].on1max))) {
-                                                if(j->cadence_f[cnt].off1) {
-                                                        j->cadence_f[cnt].state = 2;
-                                                        j->cadence_f[cnt].off1min = jiffies + (long)((j->cadence_f[cnt].off1 * (hertz * (100 - var)) / 10000));
-                                                        j->cadence_f[cnt].off1dot = jiffies + (long)((j->cadence_f[cnt].off1 * (hertz * (100)) / 10000));
-                                                        j->cadence_f[cnt].off1max = jiffies + (long)((j->cadence_f[cnt].off1 * (hertz * (100 + var)) / 10000));
-                                                } else {
-                                                        j->cadence_f[cnt].state = 7;
-                                                }
-                                        } else {
-                                                j->cadence_f[cnt].state = 0;
-                                        }
-                                } else if (j->cadence_f[cnt].state == 3) {
-                                        if((time_after(jiffies, j->cadence_f[cnt].on2min) &&
-                                            time_before(jiffies, j->cadence_f[cnt].on2max))) {
-                                                if(j->cadence_f[cnt].off2) {
-                                                        j->cadence_f[cnt].state = 4;
-                                                        j->cadence_f[cnt].off2min = jiffies + (long)((j->cadence_f[cnt].off2 * (hertz * (100 - var)) / 10000));
-                                                        j->cadence_f[cnt].off2dot = jiffies + (long)((j->cadence_f[cnt].off2 * (hertz * (100)) / 10000));
-                                                        j->cadence_f[cnt].off2max = jiffies + (long)((j->cadence_f[cnt].off2 * (hertz * (100 + var)) / 10000));
-                                                } else {
-                                                        j->cadence_f[cnt].state = 7;
-                                                }
-                                        } else {
-                                                j->cadence_f[cnt].state = 0;
-                                        }
-                                } else if (j->cadence_f[cnt].state == 5) {
-                                        if ((time_after(jiffies, j->cadence_f[cnt].on3min) &&
-                                            time_before(jiffies, j->cadence_f[cnt].on3max))) {
-                                                if(j->cadence_f[cnt].off3) {
-                                                        j->cadence_f[cnt].state = 6;
-                                                        j->cadence_f[cnt].off3min = jiffies + (long)((j->cadence_f[cnt].off3 * (hertz * (100 - var)) / 10000));
-                                                        j->cadence_f[cnt].off3dot = jiffies + (long)((j->cadence_f[cnt].off3 * (hertz * (100)) / 10000));
-                                                        j->cadence_f[cnt].off3max = jiffies + (long)((j->cadence_f[cnt].off3 * (hertz * (100 + var)) / 10000));
-                                                } else {
-                                                        j->cadence_f[cnt].state = 7;
-                                                }
-                                        } else {
-                                                j->cadence_f[cnt].state = 0;
-                                        }
-                                } else {
-                                        j->cadence_f[cnt].state = 0;
-                                }
-                        } else {
-                                switch(j->cadence_f[cnt].state) {
-                                        case 1:
-                                                if(time_after(jiffies, j->cadence_f[cnt].on1dot) &&
-                                                   !j->cadence_f[cnt].off1 &&
-                                                   !j->cadence_f[cnt].on2 && !j->cadence_f[cnt].off2 &&
-                                                   !j->cadence_f[cnt].on3 && !j->cadence_f[cnt].off3) {
-                                                        j->cadence_f[cnt].state = 7;
-                                                }
-                                                break;
-                                        case 3:
-                                                if(time_after(jiffies, j->cadence_f[cnt].on2dot) &&
-                                                   !j->cadence_f[cnt].off2 &&
-                                                   !j->cadence_f[cnt].on3 && !j->cadence_f[cnt].off3) {
-                                                        j->cadence_f[cnt].state = 7;
-                                                }
-                                                break;
-                                        case 5:
-                                                if(time_after(jiffies, j->cadence_f[cnt].on3dot) &&
-                                                   !j->cadence_f[cnt].off3) {
-                                                        j->cadence_f[cnt].state = 7;
-                                                }
-                                                break;
-                                }
-                        }
-
-                        if (ixjdebug & 0x0040) {
-                                printk(KERN_INFO "IXJ Tone Cadence state = %d /dev/phone%d at %ld\n", j->cadence_f[cnt].state, j->board, jiffies);
-                                switch(j->cadence_f[cnt].state) {
-                                        case 0:
-                                                printk(KERN_INFO "IXJ /dev/phone%d No Tone detected\n", j->board);
-                                                break;
-                                        case 1:
-                                                printk(KERN_INFO "IXJ /dev/phone%d Next Tone Cadence state at %u %ld - %ld - %ld\n", j->board,
-                                        j->cadence_f[cnt].on1, j->cadence_f[cnt].on1min, j->cadence_f[cnt].on1dot, j->cadence_f[cnt].on1max);
-                                                break;
-                                        case 2:
-                                                printk(KERN_INFO "IXJ /dev/phone%d Next Tone Cadence state at %ld - %ld\n", j->board, j->cadence_f[cnt].off1min,
-                                                                                                                        j->cadence_f[cnt].off1max);
-                                                break;
-                                        case 3:
-                                                printk(KERN_INFO "IXJ /dev/phone%d Next Tone Cadence state at %ld - %ld\n", j->board, j->cadence_f[cnt].on2min,
-                                                                                                                        j->cadence_f[cnt].on2max);
-                                                break;
-                                        case 4:
-                                                printk(KERN_INFO "IXJ /dev/phone%d Next Tone Cadence state at %ld - %ld\n", j->board, j->cadence_f[cnt].off2min,
-                                                                                                                        j->cadence_f[cnt].off2max);
-                                                break;
-                                        case 5:
-                                                printk(KERN_INFO "IXJ /dev/phone%d Next Tone Cadence state at %ld - %ld\n", j->board, j->cadence_f[cnt].on3min,
-                                                                                                                        j->cadence_f[cnt].on3max);
-                                                break;
-                                        case 6:
-                                                printk(KERN_INFO "IXJ /dev/phone%d Next Tone Cadence state at %ld - %ld\n", j->board, j->cadence_f[cnt].off3min,
-                                                                                                                        j->cadence_f[cnt].off3max);
-                                                break;
-                                }
-                        }
-                }
-                if (j->cadence_f[cnt].state == 7) {
-                        j->cadence_f[cnt].state = 0;
-                        if (j->cadence_f[cnt].enable == 1)
-                                j->cadence_f[cnt].enable = 0;
-                        switch (cnt) {
-                        case 0:
-                                if(ixjdebug & 0x0020) {
-                                        printk(KERN_INFO "Filter Cadence 0 triggered %ld\n", jiffies);
-                                }
-                                j->ex.bits.fc0 = 1;
-                                ixj_kill_fasync(j, SIG_FC0, POLL_IN);
-                                break;
-                        case 1:
-                                if(ixjdebug & 0x0020) {
-                                        printk(KERN_INFO "Filter Cadence 1 triggered %ld\n", jiffies);
-                                }
-                                j->ex.bits.fc1 = 1;
-                                ixj_kill_fasync(j, SIG_FC1, POLL_IN);
-                                break;
-                        case 2:
-                                if(ixjdebug & 0x0020) {
-                                        printk(KERN_INFO "Filter Cadence 2 triggered %ld\n", jiffies);
-                                }
-                                j->ex.bits.fc2 = 1;
-                                ixj_kill_fasync(j, SIG_FC2, POLL_IN);
-                                break;
-                        case 3:
-                                if(ixjdebug & 0x0020) {
-                                        printk(KERN_INFO "Filter Cadence 3 triggered %ld\n", jiffies);
-                                }
-                                j->ex.bits.fc3 = 1;
-                                ixj_kill_fasync(j, SIG_FC3, POLL_IN);
-                                break;
-                        }
-                }
-                if (j->filter_en[cnt] && ((j->filter_hist[cnt] & 3 && !(j->filter_hist[cnt] & 12)) ||
-                                          (j->filter_hist[cnt] & 12 && !(j->filter_hist[cnt] & 3)))) {
-                        if((j->filter_hist[cnt] & 3 && !(j->filter_hist[cnt] & 12))) {
-                                trg = 1;
-                        } else if((j->filter_hist[cnt] & 12 && !(j->filter_hist[cnt] & 3))) {
-                                trg = 0;
-                        }
-                        switch (cnt) {
-                        case 0:
-                                if(ixjdebug & 0x0020) {
-                                        printk(KERN_INFO "Filter 0 triggered %d at %ld\n", trg, jiffies);
-                                }
-                                j->ex.bits.f0 = 1;
-                                ixj_kill_fasync(j, SIG_F0, POLL_IN);
-                                break;
-                        case 1:
-                                if(ixjdebug & 0x0020) {
-                                        printk(KERN_INFO "Filter 1 triggered %d at %ld\n", trg, jiffies);
-                                }
-                                j->ex.bits.f1 = 1;
-                                ixj_kill_fasync(j, SIG_F1, POLL_IN);
-                                break;
-                        case 2:
-                                if(ixjdebug & 0x0020) {
-                                        printk(KERN_INFO "Filter 2 triggered %d at %ld\n", trg, jiffies);
-                                }
-                                j->ex.bits.f2 = 1;
-                                ixj_kill_fasync(j, SIG_F2, POLL_IN);
-                                break;
-                        case 3:
-                                if(ixjdebug & 0x0020) {
-                                        printk(KERN_INFO "Filter 3 triggered %d at %ld\n", trg, jiffies);
-                                }
-                                j->ex.bits.f3 = 1;
-                                ixj_kill_fasync(j, SIG_F3, POLL_IN);
-                                break;
-                        }
-                }
-        }
-        return 0;
-}
-
-static int LineMonitor(IXJ *j)
-{
-        if (j->dtmf_proc) {
-                return -1;
-        }
-        j->dtmf_proc = 1;
-
-        if (ixj_WriteDSPCommand(0x7000, j))             /* Line Monitor */
-                return -1;
-
-        j->dtmf.bytes.high = j->ssr.high;
-        j->dtmf.bytes.low = j->ssr.low;
-        if (!j->dtmf_state && j->dtmf.bits.dtmf_valid) {
-                j->dtmf_state = 1;
-                j->dtmf_current = j->dtmf.bits.digit;
-        }
-        if (j->dtmf_state && !j->dtmf.bits.dtmf_valid)  /* && j->dtmf_wp != j->dtmf_rp) */
-         {
-                if(!j->cidcw_wait) {
-                        j->dtmfbuffer[j->dtmf_wp] = j->dtmf_current;
-                        j->dtmf_wp++;
-                        if (j->dtmf_wp == 79)
-                                j->dtmf_wp = 0;
-                        j->ex.bits.dtmf_ready = 1;
-                        if(j->ex_sig.bits.dtmf_ready) {
-                                ixj_kill_fasync(j, SIG_DTMF_READY, POLL_IN);
-                        }
-                }
-                else if(j->dtmf_current == 0x00 || j->dtmf_current == 0x0D) {
-                        if(ixjdebug & 0x0020) {
-                                printk("IXJ phone%d saw CIDCW Ack DTMF %d from display at %ld\n", j->board, j->dtmf_current, jiffies);
-                        }
-                        j->flags.cidcw_ack = 1;
-                }
-                j->dtmf_state = 0;
-        }
-        j->dtmf_proc = 0;
-
-        return 0;
-}
-
-/************************************************************************
-*
-* Functions to allow alaw <-> ulaw conversions.
-*
-************************************************************************/
-
-static void ulaw2alaw(unsigned char *buff, unsigned long len)
-{
-        static unsigned char table_ulaw2alaw[] =
-        {
-                0x2A, 0x2B, 0x28, 0x29, 0x2E, 0x2F, 0x2C, 0x2D,
-                0x22, 0x23, 0x20, 0x21, 0x26, 0x27, 0x24, 0x25,
-                0x3A, 0x3B, 0x38, 0x39, 0x3E, 0x3F, 0x3C, 0x3D,
-                0x32, 0x33, 0x30, 0x31, 0x36, 0x37, 0x34, 0x35,
-                0x0B, 0x08, 0x09, 0x0E, 0x0F, 0x0C, 0x0D, 0x02,
-                0x03, 0x00, 0x01, 0x06, 0x07, 0x04, 0x05, 0x1A,
-                0x1B, 0x18, 0x19, 0x1E, 0x1F, 0x1C, 0x1D, 0x12,
-                0x13, 0x10, 0x11, 0x16, 0x17, 0x14, 0x15, 0x6B,
-                0x68, 0x69, 0x6E, 0x6F, 0x6C, 0x6D, 0x62, 0x63,
-                0x60, 0x61, 0x66, 0x67, 0x64, 0x65, 0x7B, 0x79,
-                0x7E, 0x7F, 0x7C, 0x7D, 0x72, 0x73, 0x70, 0x71,
-                0x76, 0x77, 0x74, 0x75, 0x4B, 0x49, 0x4F, 0x4D,
-                0x42, 0x43, 0x40, 0x41, 0x46, 0x47, 0x44, 0x45,
-                0x5A, 0x5B, 0x58, 0x59, 0x5E, 0x5F, 0x5C, 0x5D,
-                0x52, 0x52, 0x53, 0x53, 0x50, 0x50, 0x51, 0x51,
-                0x56, 0x56, 0x57, 0x57, 0x54, 0x54, 0x55, 0xD5,
-                0xAA, 0xAB, 0xA8, 0xA9, 0xAE, 0xAF, 0xAC, 0xAD,
-                0xA2, 0xA3, 0xA0, 0xA1, 0xA6, 0xA7, 0xA4, 0xA5,
-                0xBA, 0xBB, 0xB8, 0xB9, 0xBE, 0xBF, 0xBC, 0xBD,
-                0xB2, 0xB3, 0xB0, 0xB1, 0xB6, 0xB7, 0xB4, 0xB5,
-                0x8B, 0x88, 0x89, 0x8E, 0x8F, 0x8C, 0x8D, 0x82,
-                0x83, 0x80, 0x81, 0x86, 0x87, 0x84, 0x85, 0x9A,
-                0x9B, 0x98, 0x99, 0x9E, 0x9F, 0x9C, 0x9D, 0x92,
-                0x93, 0x90, 0x91, 0x96, 0x97, 0x94, 0x95, 0xEB,
-                0xE8, 0xE9, 0xEE, 0xEF, 0xEC, 0xED, 0xE2, 0xE3,
-                0xE0, 0xE1, 0xE6, 0xE7, 0xE4, 0xE5, 0xFB, 0xF9,
-                0xFE, 0xFF, 0xFC, 0xFD, 0xF2, 0xF3, 0xF0, 0xF1,
-                0xF6, 0xF7, 0xF4, 0xF5, 0xCB, 0xC9, 0xCF, 0xCD,
-                0xC2, 0xC3, 0xC0, 0xC1, 0xC6, 0xC7, 0xC4, 0xC5,
-                0xDA, 0xDB, 0xD8, 0xD9, 0xDE, 0xDF, 0xDC, 0xDD,
-                0xD2, 0xD2, 0xD3, 0xD3, 0xD0, 0xD0, 0xD1, 0xD1,
-                0xD6, 0xD6, 0xD7, 0xD7, 0xD4, 0xD4, 0xD5, 0xD5
-        };
-
-        while (len--)
-        {
-                *buff = table_ulaw2alaw[*(unsigned char *)buff];
-                buff++;
-        }
-}
-
-static void alaw2ulaw(unsigned char *buff, unsigned long len)
-{
-        static unsigned char table_alaw2ulaw[] =
-        {
-                0x29, 0x2A, 0x27, 0x28, 0x2D, 0x2E, 0x2B, 0x2C,
-                0x21, 0x22, 0x1F, 0x20, 0x25, 0x26, 0x23, 0x24,
-                0x39, 0x3A, 0x37, 0x38, 0x3D, 0x3E, 0x3B, 0x3C,
-                0x31, 0x32, 0x2F, 0x30, 0x35, 0x36, 0x33, 0x34,
-                0x0A, 0x0B, 0x08, 0x09, 0x0E, 0x0F, 0x0C, 0x0D,
-                0x02, 0x03, 0x00, 0x01, 0x06, 0x07, 0x04, 0x05,
-                0x1A, 0x1B, 0x18, 0x19, 0x1E, 0x1F, 0x1C, 0x1D,
-                0x12, 0x13, 0x10, 0x11, 0x16, 0x17, 0x14, 0x15,
-                0x62, 0x63, 0x60, 0x61, 0x66, 0x67, 0x64, 0x65,
-                0x5D, 0x5D, 0x5C, 0x5C, 0x5F, 0x5F, 0x5E, 0x5E,
-                0x74, 0x76, 0x70, 0x72, 0x7C, 0x7E, 0x78, 0x7A,
-                0x6A, 0x6B, 0x68, 0x69, 0x6E, 0x6F, 0x6C, 0x6D,
-                0x48, 0x49, 0x46, 0x47, 0x4C, 0x4D, 0x4A, 0x4B,
-                0x40, 0x41, 0x3F, 0x3F, 0x44, 0x45, 0x42, 0x43,
-                0x56, 0x57, 0x54, 0x55, 0x5A, 0x5B, 0x58, 0x59,
-                0x4F, 0x4F, 0x4E, 0x4E, 0x52, 0x53, 0x50, 0x51,
-                0xA9, 0xAA, 0xA7, 0xA8, 0xAD, 0xAE, 0xAB, 0xAC,
-                0xA1, 0xA2, 0x9F, 0xA0, 0xA5, 0xA6, 0xA3, 0xA4,
-                0xB9, 0xBA, 0xB7, 0xB8, 0xBD, 0xBE, 0xBB, 0xBC,
-                0xB1, 0xB2, 0xAF, 0xB0, 0xB5, 0xB6, 0xB3, 0xB4,
-                0x8A, 0x8B, 0x88, 0x89, 0x8E, 0x8F, 0x8C, 0x8D,
-                0x82, 0x83, 0x80, 0x81, 0x86, 0x87, 0x84, 0x85,
-                0x9A, 0x9B, 0x98, 0x99, 0x9E, 0x9F, 0x9C, 0x9D,
-                0x92, 0x93, 0x90, 0x91, 0x96, 0x97, 0x94, 0x95,
-                0xE2, 0xE3, 0xE0, 0xE1, 0xE6, 0xE7, 0xE4, 0xE5,
-                0xDD, 0xDD, 0xDC, 0xDC, 0xDF, 0xDF, 0xDE, 0xDE,
-                0xF4, 0xF6, 0xF0, 0xF2, 0xFC, 0xFE, 0xF8, 0xFA,
-                0xEA, 0xEB, 0xE8, 0xE9, 0xEE, 0xEF, 0xEC, 0xED,
-                0xC8, 0xC9, 0xC6, 0xC7, 0xCC, 0xCD, 0xCA, 0xCB,
-                0xC0, 0xC1, 0xBF, 0xBF, 0xC4, 0xC5, 0xC2, 0xC3,
-                0xD6, 0xD7, 0xD4, 0xD5, 0xDA, 0xDB, 0xD8, 0xD9,
-                0xCF, 0xCF, 0xCE, 0xCE, 0xD2, 0xD3, 0xD0, 0xD1
-        };
-
-        while (len--)
-        {
-                *buff = table_alaw2ulaw[*(unsigned char *)buff];
-                buff++;
-        }
-}
-
-static ssize_t ixj_read(struct file * file_p, char __user *buf, size_t length, loff_t * ppos)
-{
-        unsigned long i = *ppos;
-        IXJ * j = get_ixj(NUM(file_p->f_path.dentry->d_inode));
-
-        DECLARE_WAITQUEUE(wait, current);
-
-        if (j->flags.inread)
-                return -EALREADY;
-
-        j->flags.inread = 1;
-
-        add_wait_queue(&j->read_q, &wait);
-        set_current_state(TASK_INTERRUPTIBLE);
-        mb();
-
-        while (!j->read_buffer_ready || (j->dtmf_state && j->flags.dtmf_oob)) {
-                ++j->read_wait;
-                if (file_p->f_flags & O_NONBLOCK) {
-                        set_current_state(TASK_RUNNING);
-                        remove_wait_queue(&j->read_q, &wait);
-                        j->flags.inread = 0;
-                        return -EAGAIN;
-                }
-                if (!ixj_hookstate(j)) {
-                        set_current_state(TASK_RUNNING);
-                        remove_wait_queue(&j->read_q, &wait);
-                        j->flags.inread = 0;
-                        return 0;
-                }
-                interruptible_sleep_on(&j->read_q);
-                if (signal_pending(current)) {
-                        set_current_state(TASK_RUNNING);
-                        remove_wait_queue(&j->read_q, &wait);
-                        j->flags.inread = 0;
-                        return -EINTR;
-                }
-        }
-
-        remove_wait_queue(&j->read_q, &wait);
-        set_current_state(TASK_RUNNING);
-        /* Don't ever copy more than the user asks */
-        if(j->rec_codec == ALAW)
-                ulaw2alaw(j->read_buffer, min(length, j->read_buffer_size));
-        i = copy_to_user(buf, j->read_buffer, min(length, j->read_buffer_size));
-        j->read_buffer_ready = 0;
-        if (i) {
-                j->flags.inread = 0;
-                return -EFAULT;
-        } else {
-                j->flags.inread = 0;
-                return min(length, j->read_buffer_size);
-        }
-}
-
-static ssize_t ixj_enhanced_read(struct file * file_p, char __user *buf, size_t length,
-                          loff_t * ppos)
-{
-        int pre_retval;
-        ssize_t read_retval = 0;
-        IXJ *j = get_ixj(NUM(file_p->f_path.dentry->d_inode));
-
-        pre_retval = ixj_PreRead(j, 0L);
-        switch (pre_retval) {
-        case NORMAL:
-                read_retval = ixj_read(file_p, buf, length, ppos);
-                ixj_PostRead(j, 0L);
-                break;
-        case NOPOST:
-                read_retval = ixj_read(file_p, buf, length, ppos);
-                break;
-        case POSTONLY:
-                ixj_PostRead(j, 0L);
-                break;
-        default:
-                read_retval = pre_retval;
-        }
-        return read_retval;
-}
-
-static ssize_t ixj_write(struct file *file_p, const char __user *buf, size_t count, loff_t * ppos)
-{
-        unsigned long i = *ppos;
-        IXJ *j = file_p->private_data;
-
-        DECLARE_WAITQUEUE(wait, current);
-
-        if (j->flags.inwrite)
-                return -EALREADY;
-
-        j->flags.inwrite = 1;
-
-        add_wait_queue(&j->write_q, &wait);
-        set_current_state(TASK_INTERRUPTIBLE);
-        mb();
-
-
-        while (!j->write_buffers_empty) {
-                ++j->write_wait;
-                if (file_p->f_flags & O_NONBLOCK) {
-                        set_current_state(TASK_RUNNING);
-                        remove_wait_queue(&j->write_q, &wait);
-                        j->flags.inwrite = 0;
-                        return -EAGAIN;
-                }
-                if (!ixj_hookstate(j)) {
-                        set_current_state(TASK_RUNNING);
-                        remove_wait_queue(&j->write_q, &wait);
-                        j->flags.inwrite = 0;
-                        return 0;
-                }
-                interruptible_sleep_on(&j->write_q);
-                if (signal_pending(current)) {
-                        set_current_state(TASK_RUNNING);
-                        remove_wait_queue(&j->write_q, &wait);
-                        j->flags.inwrite = 0;
-                        return -EINTR;
-                }
-        }
-        set_current_state(TASK_RUNNING);
-        remove_wait_queue(&j->write_q, &wait);
-        if (j->write_buffer_wp + count >= j->write_buffer_end)
-                j->write_buffer_wp = j->write_buffer;
-        i = copy_from_user(j->write_buffer_wp, buf, min(count, j->write_buffer_size));
-        if (i) {
-                j->flags.inwrite = 0;
-                return -EFAULT;
-        }
-       if(j->play_codec == ALAW)
-               alaw2ulaw(j->write_buffer_wp, min(count, j->write_buffer_size));
-        j->flags.inwrite = 0;
-        return min(count, j->write_buffer_size);
-}
-
-static ssize_t ixj_enhanced_write(struct file * file_p, const char __user *buf, size_t count, loff_t * ppos)
-{
-        int pre_retval;
-        ssize_t write_retval = 0;
-
-        IXJ *j = get_ixj(NUM(file_p->f_path.dentry->d_inode));
-
-        pre_retval = ixj_PreWrite(j, 0L);
-        switch (pre_retval) {
-        case NORMAL:
-                write_retval = ixj_write(file_p, buf, count, ppos);
-                if (write_retval > 0) {
-                        ixj_PostWrite(j, 0L);
-                        j->write_buffer_wp += write_retval;
-                        j->write_buffers_empty--;
-                }
-                break;
-        case NOPOST:
-                write_retval = ixj_write(file_p, buf, count, ppos);
-                if (write_retval > 0) {
-                        j->write_buffer_wp += write_retval;
-                        j->write_buffers_empty--;
-                }
-                break;
-        case POSTONLY:
-                ixj_PostWrite(j, 0L);
-                break;
-        default:
-                write_retval = pre_retval;
-        }
-        return write_retval;
-}
-
-static void ixj_read_frame(IXJ *j)
-{
-        int cnt, dly;
-
-        if (j->read_buffer) {
-                for (cnt = 0; cnt < j->rec_frame_size * 2; cnt += 2) {
-                        if (!(cnt % 16) && !IsRxReady(j)) {
-                                dly = 0;
-                                while (!IsRxReady(j)) {
-                                        if (dly++ > 5) {
-                                                dly = 0;
-                                                break;
-                                        }
-                                        udelay(10);
-                                }
-                        }
-                        /* Throw away word 0 of the 8021 compressed format to get standard G.729. */
-                        if (j->rec_codec == G729 && (cnt == 0 || cnt == 10 || cnt == 20)) {
-                                inb_p(j->DSPbase + 0x0E);
-                                inb_p(j->DSPbase + 0x0F);
-                        }
-                        *(j->read_buffer + cnt) = inb_p(j->DSPbase + 0x0E);
-                        *(j->read_buffer + cnt + 1) = inb_p(j->DSPbase + 0x0F);
-                }
-                ++j->framesread;
-                if (j->intercom != -1) {
-                        if (IsTxReady(get_ixj(j->intercom))) {
-                                for (cnt = 0; cnt < j->rec_frame_size * 2; cnt += 2) {
-                                        if (!(cnt % 16) && !IsTxReady(j)) {
-                                                dly = 0;
-                                                while (!IsTxReady(j)) {
-                                                        if (dly++ > 5) {
-                                                                dly = 0;
-                                                                break;
-                                                        }
-                                                        udelay(10);
-                                                }
-                                        }
-                                        outb_p(*(j->read_buffer + cnt), get_ixj(j->intercom)->DSPbase + 0x0C);
-                                        outb_p(*(j->read_buffer + cnt + 1), get_ixj(j->intercom)->DSPbase + 0x0D);
-                                }
-                                get_ixj(j->intercom)->frameswritten++;
-                        }
-                } else {
-                        j->read_buffer_ready = 1;
-                        wake_up_interruptible(&j->read_q);      /* Wake any blocked readers */
-
-                        wake_up_interruptible(&j->poll_q);      /* Wake any blocked selects */
-
-                        if(j->ixj_signals[SIG_READ_READY])
-                                ixj_kill_fasync(j, SIG_READ_READY, POLL_OUT);
-                }
-        }
-}
-
-static short fsk[][6][20] =
-{
-        {
-                {
-                        0, 17846, 29934, 32364, 24351, 8481, -10126, -25465, -32587, -29196,
-                        -16384, 1715, 19260, 30591, 32051, 23170, 6813, -11743, -26509, -32722
-                },
-                {
-                        -28377, -14876, 3425, 20621, 31163, 31650, 21925, 5126, -13328, -27481,
-                        -32767, -27481, -13328, 5126, 21925, 31650, 31163, 20621, 3425, -14876
-                },
-                {
-                        -28377, -32722, -26509, -11743, 6813, 23170, 32051, 30591, 19260, 1715,
-                        -16384, -29196, -32587, -25465, -10126, 8481, 24351, 32364, 29934, 17846
-                },
-                {
-                        0, -17846, -29934, -32364, -24351, -8481, 10126, 25465, 32587, 29196,
-                        16384, -1715, -19260, -30591, -32051, -23170, -6813, 11743, 26509, 32722
-                },
-                {
-                        28377, 14876, -3425, -20621, -31163, -31650, -21925, -5126, 13328, 27481,
-                        32767, 27481, 13328, -5126, -21925, -31650, -31163, -20621, -3425, 14876
-                },
-                {
-                        28377, 32722, 26509, 11743, -6813, -23170, -32051, -30591, -19260, -1715,
-                        16384, 29196, 32587, 25465, 10126, -8481, -24351, -32364, -29934, -17846
-                }
-        },
-        {
-                {
-                        0, 10126, 19260, 26509, 31163, 32767, 31163, 26509, 19260, 10126,
-                        0, -10126, -19260, -26509, -31163, -32767, -31163, -26509, -19260, -10126
-                },
-                {
-                        -28377, -21925, -13328, -3425, 6813, 16384, 24351, 29934, 32587, 32051,
-                        28377, 21925, 13328, 3425, -6813, -16384, -24351, -29934, -32587, -32051
-                },
-                {
-                        -28377, -32051, -32587, -29934, -24351, -16384, -6813, 3425, 13328, 21925,
-                        28377, 32051, 32587, 29934, 24351, 16384, 6813, -3425, -13328, -21925
-                },
-                {
-                        0, -10126, -19260, -26509, -31163, -32767, -31163, -26509, -19260, -10126,
-                        0, 10126, 19260, 26509, 31163, 32767, 31163, 26509, 19260, 10126
-                },
-                {
-                        28377, 21925, 13328, 3425, -6813, -16383, -24351, -29934, -32587, -32051,
-                        -28377, -21925, -13328, -3425, 6813, 16383, 24351, 29934, 32587, 32051
-                },
-                {
-                        28377, 32051, 32587, 29934, 24351, 16384, 6813, -3425, -13328, -21925,
-                        -28377, -32051, -32587, -29934, -24351, -16384, -6813, 3425, 13328, 21925
-                }
-        }
-};
-
-
-static void ixj_write_cid_bit(IXJ *j, int bit)
-{
-        while (j->fskcnt < 20) {
-                if(j->fskdcnt < (j->fsksize - 1))
-                        j->fskdata[j->fskdcnt++] = fsk[bit][j->fskz][j->fskcnt];
-
-                j->fskcnt += 3;
-        }
-        j->fskcnt %= 20;
-
-        if (!bit)
-                j->fskz++;
-        if (j->fskz >= 6)
-                j->fskz = 0;
-
-}
-
-static void ixj_write_cid_byte(IXJ *j, char byte)
-{
-        IXJ_CBYTE cb;
-
-                cb.cbyte = byte;
-                ixj_write_cid_bit(j, 0);
-                ixj_write_cid_bit(j, cb.cbits.b0 ? 1 : 0);
-                ixj_write_cid_bit(j, cb.cbits.b1 ? 1 : 0);
-                ixj_write_cid_bit(j, cb.cbits.b2 ? 1 : 0);
-                ixj_write_cid_bit(j, cb.cbits.b3 ? 1 : 0);
-                ixj_write_cid_bit(j, cb.cbits.b4 ? 1 : 0);
-                ixj_write_cid_bit(j, cb.cbits.b5 ? 1 : 0);
-                ixj_write_cid_bit(j, cb.cbits.b6 ? 1 : 0);
-                ixj_write_cid_bit(j, cb.cbits.b7 ? 1 : 0);
-                ixj_write_cid_bit(j, 1);
-}
-
-static void ixj_write_cid_seize(IXJ *j)
-{
-        int cnt;
-
-        for (cnt = 0; cnt < 150; cnt++) {
-                ixj_write_cid_bit(j, 0);
-                ixj_write_cid_bit(j, 1);
-        }
-        for (cnt = 0; cnt < 180; cnt++) {
-                ixj_write_cid_bit(j, 1);
-        }
-}
-
-static void ixj_write_cidcw_seize(IXJ *j)
-{
-        int cnt;
-
-        for (cnt = 0; cnt < 80; cnt++) {
-                ixj_write_cid_bit(j, 1);
-        }
-}
-
-static int ixj_write_cid_string(IXJ *j, char *s, int checksum)
-{
-        int cnt;
-
-        for (cnt = 0; cnt < strlen(s); cnt++) {
-                ixj_write_cid_byte(j, s[cnt]);
-                checksum = (checksum + s[cnt]);
-        }
-        return checksum;
-}
-
-static void ixj_pad_fsk(IXJ *j, int pad)
-{
-        int cnt;
-
-        for (cnt = 0; cnt < pad; cnt++) {
-                if(j->fskdcnt < (j->fsksize - 1))
-                        j->fskdata[j->fskdcnt++] = 0x0000;
-        }
-        for (cnt = 0; cnt < 720; cnt++) {
-                if(j->fskdcnt < (j->fsksize - 1))
-                        j->fskdata[j->fskdcnt++] = 0x0000;
-        }
-}
-
-static void ixj_pre_cid(IXJ *j)
-{
-        j->cid_play_codec = j->play_codec;
-        j->cid_play_frame_size = j->play_frame_size;
-        j->cid_play_volume = get_play_volume(j);
-        j->cid_play_flag = j->flags.playing;
-
-        j->cid_rec_codec = j->rec_codec;
-        j->cid_rec_volume = get_rec_volume(j);
-        j->cid_rec_flag = j->flags.recording;
-
-        j->cid_play_aec_level = j->aec_level;
-
-        switch(j->baseframe.low) {
-                case 0xA0:
-                        j->cid_base_frame_size = 20;
-                        break;
-                case 0x50:
-                        j->cid_base_frame_size = 10;
-                        break;
-                case 0xF0:
-                        j->cid_base_frame_size = 30;
-                        break;
-        }
-
-        ixj_play_stop(j);
-        ixj_cpt_stop(j);
-
-        j->flags.cidplay = 1;
-
-        set_base_frame(j, 30);
-        set_play_codec(j, LINEAR16);
-        set_play_volume(j, 0x1B);
-        ixj_play_start(j);
-}
-
-static void ixj_post_cid(IXJ *j)
-{
-        ixj_play_stop(j);
-
-        if(j->cidsize > 5000) {
-                SLIC_SetState(PLD_SLIC_STATE_STANDBY, j);
-        }
-        j->flags.cidplay = 0;
-        if(ixjdebug & 0x0200) {
-                printk("IXJ phone%d Finished Playing CallerID data %ld\n", j->board, jiffies);
-        }
-
-        ixj_fsk_free(j);
-
-        j->fskdcnt = 0;
-        set_base_frame(j, j->cid_base_frame_size);
-        set_play_codec(j, j->cid_play_codec);
-        ixj_aec_start(j, j->cid_play_aec_level);
-        set_play_volume(j, j->cid_play_volume);
-
-        set_rec_codec(j, j->cid_rec_codec);
-        set_rec_volume(j, j->cid_rec_volume);
-
-        if(j->cid_rec_flag)
-                ixj_record_start(j);
-
-        if(j->cid_play_flag)
-                ixj_play_start(j);
-
-        if(j->cid_play_flag) {
-                wake_up_interruptible(&j->write_q);     /* Wake any blocked writers */
-        }
-}
-
-static void ixj_write_cid(IXJ *j)
-{
-        char sdmf1[50];
-        char sdmf2[50];
-        char sdmf3[80];
-        char mdmflen, len1, len2, len3;
-        int pad;
-
-        int checksum = 0;
-
-        if (j->dsp.low == 0x20 || j->flags.cidplay)
-                return;
-
-        j->fskz = j->fskphase = j->fskcnt = j->fskdcnt = 0;
-        j->cidsize = j->cidcnt = 0;
-
-        ixj_fsk_alloc(j);
-
-        strcpy(sdmf1, j->cid_send.month);
-        strcat(sdmf1, j->cid_send.day);
-        strcat(sdmf1, j->cid_send.hour);
-        strcat(sdmf1, j->cid_send.min);
-        strcpy(sdmf2, j->cid_send.number);
-        strcpy(sdmf3, j->cid_send.name);
-
-        len1 = strlen(sdmf1);
-        len2 = strlen(sdmf2);
-        len3 = strlen(sdmf3);
-        mdmflen = len1 + len2 + len3 + 6;
-
-        while(1){
-                ixj_write_cid_seize(j);
-
-                ixj_write_cid_byte(j, 0x80);
-                checksum = 0x80;
-                ixj_write_cid_byte(j, mdmflen);
-                checksum = checksum + mdmflen;
-
-                ixj_write_cid_byte(j, 0x01);
-                checksum = checksum + 0x01;
-                ixj_write_cid_byte(j, len1);
-                checksum = checksum + len1;
-                checksum = ixj_write_cid_string(j, sdmf1, checksum);
-                if(ixj_hookstate(j) & 1)
-                        break;
-
-                ixj_write_cid_byte(j, 0x02);
-                checksum = checksum + 0x02;
-                ixj_write_cid_byte(j, len2);
-                checksum = checksum + len2;
-                checksum = ixj_write_cid_string(j, sdmf2, checksum);
-                if(ixj_hookstate(j) & 1)
-                        break;
-
-                ixj_write_cid_byte(j, 0x07);
-                checksum = checksum + 0x07;
-                ixj_write_cid_byte(j, len3);
-                checksum = checksum + len3;
-                checksum = ixj_write_cid_string(j, sdmf3, checksum);
-                if(ixj_hookstate(j) & 1)
-                        break;
-
-                checksum %= 256;
-                checksum ^= 0xFF;
-                checksum += 1;
-
-                ixj_write_cid_byte(j, (char) checksum);
-
-                pad = j->fskdcnt % 240;
-                if (pad) {
-                        pad = 240 - pad;
-                }
-                ixj_pad_fsk(j, pad);
-                break;
-        }
-
-        ixj_write_frame(j);
-}
-
-static void ixj_write_cidcw(IXJ *j)
-{
-        IXJ_TONE ti;
-
-        char sdmf1[50];
-        char sdmf2[50];
-        char sdmf3[80];
-        char mdmflen, len1, len2, len3;
-        int pad;
-
-        int checksum = 0;
-
-        if (j->dsp.low == 0x20 || j->flags.cidplay)
-                return;
-
-        j->fskz = j->fskphase = j->fskcnt = j->fskdcnt = 0;
-        j->cidsize = j->cidcnt = 0;
-
-        ixj_fsk_alloc(j);
-
-        j->flags.cidcw_ack = 0;
-
-        ti.tone_index = 23;
-        ti.gain0 = 1;
-        ti.freq0 = hz440;
-        ti.gain1 = 0;
-        ti.freq1 = 0;
-        ixj_init_tone(j, &ti);
-
-        ixj_set_tone_on(1500, j);
-        ixj_set_tone_off(32, j);
-        if(ixjdebug & 0x0200) {
-                printk("IXJ cidcw phone%d first tone start at %ld\n", j->board, jiffies);
-        }
-        ixj_play_tone(j, 23);
-
-        clear_bit(j->board, &j->busyflags);
-        while(j->tone_state)
-                schedule_timeout_interruptible(1);
-        while(test_and_set_bit(j->board, (void *)&j->busyflags) != 0)
-                schedule_timeout_interruptible(1);
-        if(ixjdebug & 0x0200) {
-                printk("IXJ cidcw phone%d first tone end at %ld\n", j->board, jiffies);
-        }
-
-        ti.tone_index = 24;
-        ti.gain0 = 1;
-        ti.freq0 = hz2130;
-        ti.gain1 = 0;
-        ti.freq1 = hz2750;
-        ixj_init_tone(j, &ti);
-
-        ixj_set_tone_off(10, j);
-        ixj_set_tone_on(600, j);
-        if(ixjdebug & 0x0200) {
-                printk("IXJ cidcw phone%d second tone start at %ld\n", j->board, jiffies);
-        }
-        ixj_play_tone(j, 24);
-
-        clear_bit(j->board, &j->busyflags);
-        while(j->tone_state)
-                schedule_timeout_interruptible(1);
-        while(test_and_set_bit(j->board, (void *)&j->busyflags) != 0)
-                schedule_timeout_interruptible(1);
-        if(ixjdebug & 0x0200) {
-                printk("IXJ cidcw phone%d sent second tone at %ld\n", j->board, jiffies);
-        }
-
-        j->cidcw_wait = jiffies + ((50 * hertz) / 100);
-
-        clear_bit(j->board, &j->busyflags);
-        while(!j->flags.cidcw_ack && time_before(jiffies, j->cidcw_wait))
-                schedule_timeout_interruptible(1);
-        while(test_and_set_bit(j->board, (void *)&j->busyflags) != 0)
-                schedule_timeout_interruptible(1);
-        j->cidcw_wait = 0;
-        if(!j->flags.cidcw_ack) {
-                if(ixjdebug & 0x0200) {
-                        printk("IXJ cidcw phone%d did not receive ACK from display %ld\n", j->board, jiffies);
-                }
-                ixj_post_cid(j);
-                if(j->cid_play_flag) {
-                        wake_up_interruptible(&j->write_q);     /* Wake any blocked readers */
-                }
-                return;
-        } else {
-                ixj_pre_cid(j);
-        }
-        j->flags.cidcw_ack = 0;
-        strcpy(sdmf1, j->cid_send.month);
-        strcat(sdmf1, j->cid_send.day);
-        strcat(sdmf1, j->cid_send.hour);
-        strcat(sdmf1, j->cid_send.min);
-        strcpy(sdmf2, j->cid_send.number);
-        strcpy(sdmf3, j->cid_send.name);
-
-        len1 = strlen(sdmf1);
-        len2 = strlen(sdmf2);
-        len3 = strlen(sdmf3);
-        mdmflen = len1 + len2 + len3 + 6;
-
-        ixj_write_cidcw_seize(j);
-
-        ixj_write_cid_byte(j, 0x80);
-        checksum = 0x80;
-        ixj_write_cid_byte(j, mdmflen);
-        checksum = checksum + mdmflen;
-
-        ixj_write_cid_byte(j, 0x01);
-        checksum = checksum + 0x01;
-        ixj_write_cid_byte(j, len1);
-        checksum = checksum + len1;
-        checksum = ixj_write_cid_string(j, sdmf1, checksum);
-
-        ixj_write_cid_byte(j, 0x02);
-        checksum = checksum + 0x02;
-        ixj_write_cid_byte(j, len2);
-        checksum = checksum + len2;
-        checksum = ixj_write_cid_string(j, sdmf2, checksum);
-
-        ixj_write_cid_byte(j, 0x07);
-        checksum = checksum + 0x07;
-        ixj_write_cid_byte(j, len3);
-        checksum = checksum + len3;
-        checksum = ixj_write_cid_string(j, sdmf3, checksum);
-
-        checksum %= 256;
-        checksum ^= 0xFF;
-        checksum += 1;
-
-        ixj_write_cid_byte(j, (char) checksum);
-
-        pad = j->fskdcnt % 240;
-        if (pad) {
-                pad = 240 - pad;
-        }
-        ixj_pad_fsk(j, pad);
-        if(ixjdebug & 0x0200) {
-                printk("IXJ cidcw phone%d sent FSK data at %ld\n", j->board, jiffies);
-        }
-}
-
-static void ixj_write_vmwi(IXJ *j, int msg)
-{
-        char mdmflen;
-        int pad;
-
-        int checksum = 0;
-
-        if (j->dsp.low == 0x20 || j->flags.cidplay)
-                return;
-
-        j->fskz = j->fskphase = j->fskcnt = j->fskdcnt = 0;
-        j->cidsize = j->cidcnt = 0;
-
-        ixj_fsk_alloc(j);
-
-        mdmflen = 3;
-
-        if (j->port == PORT_POTS)
-                SLIC_SetState(PLD_SLIC_STATE_OHT, j);
-
-        ixj_write_cid_seize(j);
-
-        ixj_write_cid_byte(j, 0x82);
-        checksum = 0x82;
-        ixj_write_cid_byte(j, mdmflen);
-        checksum = checksum + mdmflen;
-
-        ixj_write_cid_byte(j, 0x0B);
-        checksum = checksum + 0x0B;
-        ixj_write_cid_byte(j, 1);
-        checksum = checksum + 1;
-
-        if(msg) {
-                ixj_write_cid_byte(j, 0xFF);
-                checksum = checksum + 0xFF;
-        }
-        else {
-                ixj_write_cid_byte(j, 0x00);
-                checksum = checksum + 0x00;
-        }
-
-        checksum %= 256;
-        checksum ^= 0xFF;
-        checksum += 1;
-
-        ixj_write_cid_byte(j, (char) checksum);
-
-        pad = j->fskdcnt % 240;
-        if (pad) {
-                pad = 240 - pad;
-        }
-        ixj_pad_fsk(j, pad);
-}
-
-static void ixj_write_frame(IXJ *j)
-{
-        int cnt, frame_count, dly;
-        IXJ_WORD dat;
-
-        frame_count = 0;
-        if(j->flags.cidplay) {
-                for(cnt = 0; cnt < 480; cnt++) {
-                        if (!(cnt % 16) && !IsTxReady(j)) {
-                                dly = 0;
-                                while (!IsTxReady(j)) {
-                                        if (dly++ > 5) {
-                                                dly = 0;
-                                                break;
-                                        }
-                                        udelay(10);
-                                }
-                        }
-                        dat.word = j->fskdata[j->cidcnt++];
-                        outb_p(dat.bytes.low, j->DSPbase + 0x0C);
-                        outb_p(dat.bytes.high, j->DSPbase + 0x0D);
-                        cnt++;
-                }
-                if(j->cidcnt >= j->fskdcnt) {
-                        ixj_post_cid(j);
-                }
-                /* This may seem rude, but if we just played one frame of FSK data for CallerID
-                   and there is real audio data in the buffer, we need to throw it away because
-                   we just used it's time slot */
-                if (j->write_buffer_rp > j->write_buffer_wp) {
-                        j->write_buffer_rp += j->cid_play_frame_size * 2;
-                        if (j->write_buffer_rp >= j->write_buffer_end) {
-                                j->write_buffer_rp = j->write_buffer;
-                        }
-                        j->write_buffers_empty++;
-                        wake_up_interruptible(&j->write_q);     /* Wake any blocked writers */
-
-                        wake_up_interruptible(&j->poll_q);      /* Wake any blocked selects */
-                }
-        } else if (j->write_buffer && j->write_buffers_empty < 1) {
-                if (j->write_buffer_wp > j->write_buffer_rp) {
-                        frame_count =
-                            (j->write_buffer_wp - j->write_buffer_rp) / (j->play_frame_size * 2);
-                }
-                if (j->write_buffer_rp > j->write_buffer_wp) {
-                        frame_count =
-                            (j->write_buffer_wp - j->write_buffer) / (j->play_frame_size * 2) +
-                            (j->write_buffer_end - j->write_buffer_rp) / (j->play_frame_size * 2);
-                }
-                if (frame_count >= 1) {
-                        if (j->ver.low == 0x12 && j->play_mode && j->flags.play_first_frame) {
-                                BYTES blankword;
-
-                                switch (j->play_mode) {
-                                case PLAYBACK_MODE_ULAW:
-                                case PLAYBACK_MODE_ALAW:
-                                        blankword.low = blankword.high = 0xFF;
-                                        break;
-                                case PLAYBACK_MODE_8LINEAR:
-                                case PLAYBACK_MODE_16LINEAR:
-                                default:
-                                        blankword.low = blankword.high = 0x00;
-                                        break;
-                                case PLAYBACK_MODE_8LINEAR_WSS:
-                                        blankword.low = blankword.high = 0x80;
-                                        break;
-                                }
-                                for (cnt = 0; cnt < 16; cnt++) {
-                                        if (!(cnt % 16) && !IsTxReady(j)) {
-                                                dly = 0;
-                                                while (!IsTxReady(j)) {
-                                                        if (dly++ > 5) {
-                                                                dly = 0;
-                                                                break;
-                                                        }
-                                                        udelay(10);
-                                                }
-                                        }
-                                        outb_p((blankword.low), j->DSPbase + 0x0C);
-                                        outb_p((blankword.high), j->DSPbase + 0x0D);
-                                }
-                                j->flags.play_first_frame = 0;
-                        } else  if (j->play_codec == G723_63 && j->flags.play_first_frame) {
-                                for (cnt = 0; cnt < 24; cnt++) {
-                                        BYTES blankword;
-
-                                        if(cnt == 12) {
-                                                blankword.low = 0x02;
-                                                blankword.high = 0x00;
-                                        }
-                                        else {
-                                                blankword.low = blankword.high = 0x00;
-                                        }
-                                        if (!(cnt % 16) && !IsTxReady(j)) {
-                                                dly = 0;
-                                                while (!IsTxReady(j)) {
-                                                        if (dly++ > 5) {
-                                                                dly = 0;
-                                                                break;
-                                                        }
-                                                        udelay(10);
-                                                }
-                                        }
-                                        outb_p((blankword.low), j->DSPbase + 0x0C);
-                                        outb_p((blankword.high), j->DSPbase + 0x0D);
-                                }
-                                j->flags.play_first_frame = 0;
-                        }
-                        for (cnt = 0; cnt < j->play_frame_size * 2; cnt += 2) {
-                                if (!(cnt % 16) && !IsTxReady(j)) {
-                                        dly = 0;
-                                        while (!IsTxReady(j)) {
-                                                if (dly++ > 5) {
-                                                        dly = 0;
-                                                        break;
-                                                }
-                                                udelay(10);
-                                        }
-                                }
-                        /* Add word 0 to G.729 frames for the 8021.  Right now we don't do VAD/CNG  */
-                                if (j->play_codec == G729 && (cnt == 0 || cnt == 10 || cnt == 20)) {
-                                        if (j->write_buffer_rp[cnt] == 0 &&
-                                            j->write_buffer_rp[cnt + 1] == 0 &&
-                                            j->write_buffer_rp[cnt + 2] == 0 &&
-                                            j->write_buffer_rp[cnt + 3] == 0 &&
-                                            j->write_buffer_rp[cnt + 4] == 0 &&
-                                            j->write_buffer_rp[cnt + 5] == 0 &&
-                                            j->write_buffer_rp[cnt + 6] == 0 &&
-                                            j->write_buffer_rp[cnt + 7] == 0 &&
-                                            j->write_buffer_rp[cnt + 8] == 0 &&
-                                            j->write_buffer_rp[cnt + 9] == 0) {
-                                        /* someone is trying to write silence lets make this a type 0 frame. */
-                                                outb_p(0x00, j->DSPbase + 0x0C);
-                                                outb_p(0x00, j->DSPbase + 0x0D);
-                                        } else {
-                                        /* so all other frames are type 1. */
-                                                outb_p(0x01, j->DSPbase + 0x0C);
-                                                outb_p(0x00, j->DSPbase + 0x0D);
-                                        }
-                                }
-                                outb_p(*(j->write_buffer_rp + cnt), j->DSPbase + 0x0C);
-                                outb_p(*(j->write_buffer_rp + cnt + 1), j->DSPbase + 0x0D);
-                                *(j->write_buffer_rp + cnt) = 0;
-                                *(j->write_buffer_rp + cnt + 1) = 0;
-                        }
-                        j->write_buffer_rp += j->play_frame_size * 2;
-                        if (j->write_buffer_rp >= j->write_buffer_end) {
-                                j->write_buffer_rp = j->write_buffer;
-                        }
-                        j->write_buffers_empty++;
-                        wake_up_interruptible(&j->write_q);     /* Wake any blocked writers */
-
-                        wake_up_interruptible(&j->poll_q);      /* Wake any blocked selects */
-
-                        ++j->frameswritten;
-                }
-        } else {
-                j->drybuffer++;
-        }
-        if(j->ixj_signals[SIG_WRITE_READY]) {
-                ixj_kill_fasync(j, SIG_WRITE_READY, POLL_OUT);
-        }
-}
-
-static int idle(IXJ *j)
-{
-        if (ixj_WriteDSPCommand(0x0000, j))             /* DSP Idle */
-
-                return 0;
-
-        if (j->ssr.high || j->ssr.low) {
-                return 0;
-        } else {
-                j->play_mode = -1;
-                j->flags.playing = 0;
-                j->rec_mode = -1;
-                j->flags.recording = 0;
-                return 1;
-        }
-}
-
-static int set_base_frame(IXJ *j, int size)
-{
-        unsigned short cmd;
-        int cnt;
-
-        idle(j);
-        j->cid_play_aec_level = j->aec_level;
-        aec_stop(j);
-        for (cnt = 0; cnt < 10; cnt++) {
-                if (idle(j))
-                        break;
-        }
-        if (j->ssr.high || j->ssr.low)
-                return -1;
-        if (j->dsp.low != 0x20) {
-                switch (size) {
-                case 30:
-                        cmd = 0x07F0;
-                        /* Set Base Frame Size to 240 pg9-10 8021 */
-                        break;
-                case 20:
-                        cmd = 0x07A0;
-                        /* Set Base Frame Size to 160 pg9-10 8021 */
-                        break;
-                case 10:
-                        cmd = 0x0750;
-                        /* Set Base Frame Size to 80 pg9-10 8021 */
-                        break;
-                default:
-                        return -1;
-                }
-        } else {
-                if (size == 30)
-                        return size;
-                else
-                        return -1;
-        }
-        if (ixj_WriteDSPCommand(cmd, j)) {
-                j->baseframe.high = j->baseframe.low = 0xFF;
-                return -1;
-        } else {
-                j->baseframe.high = j->ssr.high;
-                j->baseframe.low = j->ssr.low;
-                /* If the status returned is 0x0000 (pg9-9 8021) the call failed */
-                if(j->baseframe.high == 0x00 && j->baseframe.low == 0x00) {
-                        return -1;
-                }
-        }
-        ixj_aec_start(j, j->cid_play_aec_level);
-        return size;
-}
-
-static int set_rec_codec(IXJ *j, int rate)
-{
-        int retval = 0;
-
-        j->rec_codec = rate;
-
-        switch (rate) {
-        case G723_63:
-                if (j->ver.low != 0x12 || ixj_convert_loaded) {
-                        j->rec_frame_size = 12;
-                        j->rec_mode = 0;
-                } else {
-                        retval = 1;
-                }
-                break;
-        case G723_53:
-                if (j->ver.low != 0x12 || ixj_convert_loaded) {
-                        j->rec_frame_size = 10;
-                        j->rec_mode = 0;
-                } else {
-                        retval = 1;
-                }
-                break;
-        case TS85:
-                if (j->dsp.low == 0x20 || j->flags.ts85_loaded) {
-                        j->rec_frame_size = 16;
-                        j->rec_mode = 0;
-                } else {
-                        retval = 1;
-                }
-                break;
-        case TS48:
-                if (j->ver.low != 0x12 || ixj_convert_loaded) {
-                        j->rec_frame_size = 9;
-                        j->rec_mode = 0;
-                } else {
-                        retval = 1;
-                }
-                break;
-        case TS41:
-                if (j->ver.low != 0x12 || ixj_convert_loaded) {
-                        j->rec_frame_size = 8;
-                        j->rec_mode = 0;
-                } else {
-                        retval = 1;
-                }
-                break;
-        case G728:
-                if (j->dsp.low != 0x20) {
-                        j->rec_frame_size = 48;
-                        j->rec_mode = 0;
-                } else {
-                        retval = 1;
-                }
-                break;
-        case G729:
-                if (j->dsp.low != 0x20) {
-                        if (!j->flags.g729_loaded) {
-                                retval = 1;
-                                break;
-                        }
-                        switch (j->baseframe.low) {
-                        case 0xA0:
-                                j->rec_frame_size = 10;
-                                break;
-                        case 0x50:
-                                j->rec_frame_size = 5;
-                                break;
-                        default:
-                                j->rec_frame_size = 15;
-                                break;
-                        }
-                        j->rec_mode = 0;
-                } else {
-                        retval = 1;
-                }
-                break;
-        case G729B:
-                if (j->dsp.low != 0x20) {
-                        if (!j->flags.g729_loaded) {
-                                retval = 1;
-                                break;
-                        }
-                        switch (j->baseframe.low) {
-                        case 0xA0:
-                                j->rec_frame_size = 12;
-                                break;
-                        case 0x50:
-                                j->rec_frame_size = 6;
-                                break;
-                        default:
-                                j->rec_frame_size = 18;
-                                break;
-                        }
-                        j->rec_mode = 0;
-                } else {
-                        retval = 1;
-                }
-                break;
-        case ULAW:
-                switch (j->baseframe.low) {
-                case 0xA0:
-                        j->rec_frame_size = 80;
-                        break;
-                case 0x50:
-                        j->rec_frame_size = 40;
-                        break;
-                default:
-                        j->rec_frame_size = 120;
-                        break;
-                }
-                j->rec_mode = 4;
-                break;
-        case ALAW:
-                switch (j->baseframe.low) {
-                case 0xA0:
-                        j->rec_frame_size = 80;
-                        break;
-                case 0x50:
-                        j->rec_frame_size = 40;
-                        break;
-                default:
-                        j->rec_frame_size = 120;
-                        break;
-                }
-                j->rec_mode = 4;
-                break;
-        case LINEAR16:
-                switch (j->baseframe.low) {
-                case 0xA0:
-                        j->rec_frame_size = 160;
-                        break;
-                case 0x50:
-                        j->rec_frame_size = 80;
-                        break;
-                default:
-                        j->rec_frame_size = 240;
-                        break;
-                }
-                j->rec_mode = 5;
-                break;
-        case LINEAR8:
-                switch (j->baseframe.low) {
-                case 0xA0:
-                        j->rec_frame_size = 80;
-                        break;
-                case 0x50:
-                        j->rec_frame_size = 40;
-                        break;
-                default:
-                        j->rec_frame_size = 120;
-                        break;
-                }
-                j->rec_mode = 6;
-                break;
-        case WSS:
-                switch (j->baseframe.low) {
-                case 0xA0:
-                        j->rec_frame_size = 80;
-                        break;
-                case 0x50:
-                        j->rec_frame_size = 40;
-                        break;
-                default:
-                        j->rec_frame_size = 120;
-                        break;
-                }
-                j->rec_mode = 7;
-                break;
-        default:
-                kfree(j->read_buffer);
-                j->rec_frame_size = 0;
-                j->rec_mode = -1;
-                j->read_buffer = NULL;
-                j->read_buffer_size = 0;
-                retval = 1;
-                break;
-        }
-        return retval;
-}
-
-static int ixj_record_start(IXJ *j)
-{
-        unsigned short cmd = 0x0000;
-
-        if (j->read_buffer) {
-                ixj_record_stop(j);
-        }
-        j->flags.recording = 1;
-        ixj_WriteDSPCommand(0x0FE0, j); /* Put the DSP in full power mode. */
-
-        if(ixjdebug & 0x0002)
-                printk("IXJ %d Starting Record Codec %d at %ld\n", j->board, j->rec_codec, jiffies);
-
-        if (!j->rec_mode) {
-                switch (j->rec_codec) {
-                case G723_63:
-                        cmd = 0x5131;
-                        break;
-                case G723_53:
-                        cmd = 0x5132;
-                        break;
-                case TS85:
-                        cmd = 0x5130;   /* TrueSpeech 8.5 */
-
-                        break;
-                case TS48:
-                        cmd = 0x5133;   /* TrueSpeech 4.8 */
-
-                        break;
-                case TS41:
-                        cmd = 0x5134;   /* TrueSpeech 4.1 */
-
-                        break;
-                case G728:
-                        cmd = 0x5135;
-                        break;
-                case G729:
-                case G729B:
-                        cmd = 0x5136;
-                        break;
-                default:
-                        return 1;
-                }
-                if (ixj_WriteDSPCommand(cmd, j))
-                        return -1;
-        }
-        if (!j->read_buffer) {
-                if (!j->read_buffer)
-                        j->read_buffer = kmalloc(j->rec_frame_size * 2, GFP_ATOMIC);
-                if (!j->read_buffer) {
-                        printk("Read buffer allocation for ixj board %d failed!\n", j->board);
-                        return -ENOMEM;
-                }
-        }
-        j->read_buffer_size = j->rec_frame_size * 2;
-
-        if (ixj_WriteDSPCommand(0x5102, j))             /* Set Poll sync mode */
-
-                return -1;
-
-        switch (j->rec_mode) {
-        case 0:
-                cmd = 0x1C03;   /* Record C1 */
-
-                break;
-        case 4:
-                if (j->ver.low == 0x12) {
-                        cmd = 0x1E03;   /* Record C1 */
-
-                } else {
-                        cmd = 0x1E01;   /* Record C1 */
-
-                }
-                break;
-        case 5:
-                if (j->ver.low == 0x12) {
-                        cmd = 0x1E83;   /* Record C1 */
-
-                } else {
-                        cmd = 0x1E81;   /* Record C1 */
-
-                }
-                break;
-        case 6:
-                if (j->ver.low == 0x12) {
-                        cmd = 0x1F03;   /* Record C1 */
-
-                } else {
-                        cmd = 0x1F01;   /* Record C1 */
-
-                }
-                break;
-        case 7:
-                if (j->ver.low == 0x12) {
-                        cmd = 0x1F83;   /* Record C1 */
-                } else {
-                        cmd = 0x1F81;   /* Record C1 */
-                }
-                break;
-        }
-        if (ixj_WriteDSPCommand(cmd, j))
-                return -1;
-
-        if (j->flags.playing) {
-                ixj_aec_start(j, j->aec_level);
-        }
-        return 0;
-}
-
-static void ixj_record_stop(IXJ *j)
-{
-        if (ixjdebug & 0x0002)
-                printk("IXJ %d Stopping Record Codec %d at %ld\n", j->board, j->rec_codec, jiffies);
-
-        kfree(j->read_buffer);
-        j->read_buffer = NULL;
-        j->read_buffer_size = 0;
-        if (j->rec_mode > -1) {
-                ixj_WriteDSPCommand(0x5120, j);
-                j->rec_mode = -1;
-        }
-        j->flags.recording = 0;
-}
-static void ixj_vad(IXJ *j, int arg)
-{
-        if (arg)
-                ixj_WriteDSPCommand(0x513F, j);
-        else
-                ixj_WriteDSPCommand(0x513E, j);
-}
-
-static void set_rec_depth(IXJ *j, int depth)
-{
-        if (depth > 60)
-                depth = 60;
-        if (depth < 0)
-                depth = 0;
-        ixj_WriteDSPCommand(0x5180 + depth, j);
-}
-
-static void set_dtmf_prescale(IXJ *j, int volume)
-{
-        ixj_WriteDSPCommand(0xCF07, j);
-        ixj_WriteDSPCommand(volume, j);
-}
-
-static int get_dtmf_prescale(IXJ *j)
-{
-        ixj_WriteDSPCommand(0xCF05, j);
-        return j->ssr.high << 8 | j->ssr.low;
-}
-
-static void set_rec_volume(IXJ *j, int volume)
-{
-        if(j->aec_level == AEC_AGC) {
-                if (ixjdebug & 0x0002)
-                        printk(KERN_INFO "IXJ: /dev/phone%d Setting AGC Threshold to 0x%4.4x\n", j->board, volume);
-                ixj_WriteDSPCommand(0xCF96, j);
-                ixj_WriteDSPCommand(volume, j);
-        } else {
-                if (ixjdebug & 0x0002)
-                        printk(KERN_INFO "IXJ: /dev/phone %d Setting Record Volume to 0x%4.4x\n", j->board, volume);
-                ixj_WriteDSPCommand(0xCF03, j);
-                ixj_WriteDSPCommand(volume, j);
-        }
-}
-
-static int set_rec_volume_linear(IXJ *j, int volume)
-{
-        int newvolume, dsprecmax;
-
-        if (ixjdebug & 0x0002)
-                printk(KERN_INFO "IXJ: /dev/phone %d Setting Linear Record Volume to 0x%4.4x\n", j->board, volume);
-        if(volume > 100 || volume < 0) {
-          return -1;
-        }
-
-        /* This should normalize the perceived volumes between the different cards caused by differences in the hardware */
-        switch (j->cardtype) {
-        case QTI_PHONEJACK:
-                dsprecmax = 0x440;
-                break;
-        case QTI_LINEJACK:
-                dsprecmax = 0x180;
-                ixj_mixer(0x0203, j);   /*Voice Left Volume unmute 6db */
-                ixj_mixer(0x0303, j);   /*Voice Right Volume unmute 6db */
-                ixj_mixer(0x0C00, j);   /*Mono1 unmute 12db */
-                break;
-        case QTI_PHONEJACK_LITE:
-                dsprecmax = 0x4C0;
-                break;
-        case QTI_PHONEJACK_PCI:
-                dsprecmax = 0x100;
-                break;
-        case QTI_PHONECARD:
-                dsprecmax = 0x400;
-                break;
-        default:
-                return -1;
-        }
-        newvolume = (dsprecmax * volume) / 100;
-        set_rec_volume(j, newvolume);
-        return 0;
-}
-
-static int get_rec_volume(IXJ *j)
-{
-        if(j->aec_level == AEC_AGC) {
-                if (ixjdebug & 0x0002)
-                        printk(KERN_INFO "Getting AGC Threshold\n");
-                ixj_WriteDSPCommand(0xCF86, j);
-                if (ixjdebug & 0x0002)
-                        printk(KERN_INFO "AGC Threshold is 0x%2.2x%2.2x\n", j->ssr.high, j->ssr.low);
-                return j->ssr.high << 8 | j->ssr.low;
-        } else {
-                if (ixjdebug & 0x0002)
-                        printk(KERN_INFO "Getting Record Volume\n");
-                ixj_WriteDSPCommand(0xCF01, j);
-                return j->ssr.high << 8 | j->ssr.low;
-        }
-}
-
-static int get_rec_volume_linear(IXJ *j)
-{
-        int volume, newvolume, dsprecmax;
-
-        switch (j->cardtype) {
-        case QTI_PHONEJACK:
-                dsprecmax = 0x440;
-                break;
-        case QTI_LINEJACK:
-                dsprecmax = 0x180;
-                break;
-        case QTI_PHONEJACK_LITE:
-                dsprecmax = 0x4C0;
-                break;
-        case QTI_PHONEJACK_PCI:
-                dsprecmax = 0x100;
-                break;
-        case QTI_PHONECARD:
-                dsprecmax = 0x400;
-                break;
-        default:
-                return -1;
-        }
-        volume = get_rec_volume(j);
-        newvolume = (volume * 100) / dsprecmax;
-        if(newvolume > 100)
-                newvolume = 100;
-        return newvolume;
-}
-
-static int get_rec_level(IXJ *j)
-{
-        int retval;
-
-        ixj_WriteDSPCommand(0xCF88, j);
-
-        retval = j->ssr.high << 8 | j->ssr.low;
-        retval = (retval * 256) / 240;
-        return retval;
-}
-
-static void ixj_aec_start(IXJ *j, int level)
-{
-        j->aec_level = level;
-        if (ixjdebug & 0x0002)
-                printk(KERN_INFO "AGC set = 0x%2.2x\n", j->aec_level);
-        if (!level) {
-                aec_stop(j);
-        } else {
-                if (j->rec_codec == G729 || j->play_codec == G729 || j->rec_codec == G729B || j->play_codec == G729B) {
-                        ixj_WriteDSPCommand(0xE022, j); /* Move AEC filter buffer */
-
-                        ixj_WriteDSPCommand(0x0300, j);
-                }
-                ixj_WriteDSPCommand(0xB001, j); /* AEC On */
-
-                ixj_WriteDSPCommand(0xE013, j); /* Advanced AEC C1 */
-
-                switch (level) {
-                case AEC_LOW:
-                        ixj_WriteDSPCommand(0x0000, j); /* Advanced AEC C2 = off */
-
-                        ixj_WriteDSPCommand(0xE011, j);
-                        ixj_WriteDSPCommand(0xFFFF, j);
-
-                        ixj_WriteDSPCommand(0xCF97, j); /* Set AGC Enable */
-                        ixj_WriteDSPCommand(0x0000, j); /* to off */
-
-                        break;
-
-                case AEC_MED:
-                        ixj_WriteDSPCommand(0x0600, j); /* Advanced AEC C2 = on medium */
-
-                        ixj_WriteDSPCommand(0xE011, j);
-                        ixj_WriteDSPCommand(0x0080, j);
-
-                        ixj_WriteDSPCommand(0xCF97, j); /* Set AGC Enable */
-                        ixj_WriteDSPCommand(0x0000, j); /* to off */
-
-                        break;
-
-                case AEC_HIGH:
-                        ixj_WriteDSPCommand(0x0C00, j); /* Advanced AEC C2 = on high */
-
-                        ixj_WriteDSPCommand(0xE011, j);
-                        ixj_WriteDSPCommand(0x0080, j);
-
-                        ixj_WriteDSPCommand(0xCF97, j); /* Set AGC Enable */
-                        ixj_WriteDSPCommand(0x0000, j); /* to off */
-
-                        break;
-
-                case AEC_AGC:
-                        /* First we have to put the AEC into advance auto mode so that AGC will not conflict with it */
-                        ixj_WriteDSPCommand(0x0002, j); /* Attenuation scaling factor of 2 */
-
-                        ixj_WriteDSPCommand(0xE011, j);
-                        ixj_WriteDSPCommand(0x0100, j); /* Higher Threshold Floor */
-
-                        ixj_WriteDSPCommand(0xE012, j); /* Set Train and Lock */
-
-                        if(j->cardtype == QTI_LINEJACK || j->cardtype == QTI_PHONECARD)
-                                ixj_WriteDSPCommand(0x0224, j);
-                        else
-                                ixj_WriteDSPCommand(0x1224, j);
-
-                        ixj_WriteDSPCommand(0xE014, j);
-                        ixj_WriteDSPCommand(0x0003, j); /* Lock threshold at 3dB */
-
-                        ixj_WriteDSPCommand(0xE338, j); /* Set Echo Suppresser Attenuation to 0dB */
-
-                        /* Now we can set the AGC initial parameters and turn it on */
-                        ixj_WriteDSPCommand(0xCF90, j); /* Set AGC Minimum gain */
-                        ixj_WriteDSPCommand(0x0020, j); /* to 0.125 (-18dB) */
-
-                        ixj_WriteDSPCommand(0xCF91, j); /* Set AGC Maximum gain */
-                        ixj_WriteDSPCommand(0x1000, j); /* to 16 (24dB) */
-
-                        ixj_WriteDSPCommand(0xCF92, j); /* Set AGC start gain */
-                        ixj_WriteDSPCommand(0x0800, j); /* to 8 (+18dB) */
-
-                        ixj_WriteDSPCommand(0xCF93, j); /* Set AGC hold time */
-                        ixj_WriteDSPCommand(0x1F40, j); /* to 2 seconds (units are 250us) */
-
-                        ixj_WriteDSPCommand(0xCF94, j); /* Set AGC Attack Time Constant */
-                        ixj_WriteDSPCommand(0x0005, j); /* to 8ms */
-
-                        ixj_WriteDSPCommand(0xCF95, j); /* Set AGC Decay Time Constant */
-                        ixj_WriteDSPCommand(0x000D, j); /* to 4096ms */
-
-                        ixj_WriteDSPCommand(0xCF96, j); /* Set AGC Attack Threshold */
-                        ixj_WriteDSPCommand(0x1200, j); /* to 25% */
-
-                        ixj_WriteDSPCommand(0xCF97, j); /* Set AGC Enable */
-                        ixj_WriteDSPCommand(0x0001, j); /* to on */
-
-                        break;
-
-                case AEC_AUTO:
-                        ixj_WriteDSPCommand(0x0002, j); /* Attenuation scaling factor of 2 */
-
-                        ixj_WriteDSPCommand(0xE011, j);
-                        ixj_WriteDSPCommand(0x0100, j); /* Higher Threshold Floor */
-
-                        ixj_WriteDSPCommand(0xE012, j); /* Set Train and Lock */
-
-                        if(j->cardtype == QTI_LINEJACK || j->cardtype == QTI_PHONECARD)
-                                ixj_WriteDSPCommand(0x0224, j);
-                        else
-                                ixj_WriteDSPCommand(0x1224, j);
-
-                        ixj_WriteDSPCommand(0xE014, j);
-                        ixj_WriteDSPCommand(0x0003, j); /* Lock threshold at 3dB */
-
-                        ixj_WriteDSPCommand(0xE338, j); /* Set Echo Suppresser Attenuation to 0dB */
-
-                        break;
-                }
-        }
-}
-
-static void aec_stop(IXJ *j)
-{
-        j->aec_level = AEC_OFF;
-        if (j->rec_codec == G729 || j->play_codec == G729 || j->rec_codec == G729B || j->play_codec == G729B) {
-                ixj_WriteDSPCommand(0xE022, j); /* Move AEC filter buffer back */
-
-                ixj_WriteDSPCommand(0x0700, j);
-        }
-        if (j->play_mode != -1 && j->rec_mode != -1)
-        {
-                ixj_WriteDSPCommand(0xB002, j); /* AEC Stop */
-        }
-}
-
-static int set_play_codec(IXJ *j, int rate)
-{
-        int retval = 0;
-
-        j->play_codec = rate;
-
-        switch (rate) {
-        case G723_63:
-                if (j->ver.low != 0x12 || ixj_convert_loaded) {
-                        j->play_frame_size = 12;
-                        j->play_mode = 0;
-                } else {
-                        retval = 1;
-                }
-                break;
-        case G723_53:
-                if (j->ver.low != 0x12 || ixj_convert_loaded) {
-                        j->play_frame_size = 10;
-                        j->play_mode = 0;
-                } else {
-                        retval = 1;
-                }
-                break;
-        case TS85:
-                if (j->dsp.low == 0x20 || j->flags.ts85_loaded) {
-                        j->play_frame_size = 16;
-                        j->play_mode = 0;
-                } else {
-                        retval = 1;
-                }
-                break;
-        case TS48:
-                if (j->ver.low != 0x12 || ixj_convert_loaded) {
-                        j->play_frame_size = 9;
-                        j->play_mode = 0;
-                } else {
-                        retval = 1;
-                }
-                break;
-        case TS41:
-                if (j->ver.low != 0x12 || ixj_convert_loaded) {
-                        j->play_frame_size = 8;
-                        j->play_mode = 0;
-                } else {
-                        retval = 1;
-                }
-                break;
-        case G728:
-                if (j->dsp.low != 0x20) {
-                        j->play_frame_size = 48;
-                        j->play_mode = 0;
-                } else {
-                        retval = 1;
-                }
-                break;
-        case G729:
-                if (j->dsp.low != 0x20) {
-                        if (!j->flags.g729_loaded) {
-                                retval = 1;
-                                break;
-                        }
-                        switch (j->baseframe.low) {
-                        case 0xA0:
-                                j->play_frame_size = 10;
-                                break;
-                        case 0x50:
-                                j->play_frame_size = 5;
-                                break;
-                        default:
-                                j->play_frame_size = 15;
-                                break;
-                        }
-                        j->play_mode = 0;
-                } else {
-                        retval = 1;
-                }
-                break;
-        case G729B:
-                if (j->dsp.low != 0x20) {
-                        if (!j->flags.g729_loaded) {
-                                retval = 1;
-                                break;
-                        }
-                        switch (j->baseframe.low) {
-                        case 0xA0:
-                                j->play_frame_size = 12;
-                                break;
-                        case 0x50:
-                                j->play_frame_size = 6;
-                                break;
-                        default:
-                                j->play_frame_size = 18;
-                                break;
-                        }
-                        j->play_mode = 0;
-                } else {
-                        retval = 1;
-                }
-                break;
-        case ULAW:
-                switch (j->baseframe.low) {
-                case 0xA0:
-                        j->play_frame_size = 80;
-                        break;
-                case 0x50:
-                        j->play_frame_size = 40;
-                        break;
-                default:
-                        j->play_frame_size = 120;
-                        break;
-                }
-                j->play_mode = 2;
-                break;
-        case ALAW:
-                switch (j->baseframe.low) {
-                case 0xA0:
-                        j->play_frame_size = 80;
-                        break;
-                case 0x50:
-                        j->play_frame_size = 40;
-                        break;
-                default:
-                        j->play_frame_size = 120;
-                        break;
-                }
-                j->play_mode = 2;
-                break;
-        case LINEAR16:
-                switch (j->baseframe.low) {
-                case 0xA0:
-                        j->play_frame_size = 160;
-                        break;
-                case 0x50:
-                        j->play_frame_size = 80;
-                        break;
-                default:
-                        j->play_frame_size = 240;
-                        break;
-                }
-                j->play_mode = 6;
-                break;
-        case LINEAR8:
-                switch (j->baseframe.low) {
-                case 0xA0:
-                        j->play_frame_size = 80;
-                        break;
-                case 0x50:
-                        j->play_frame_size = 40;
-                        break;
-                default:
-                        j->play_frame_size = 120;
-                        break;
-                }
-                j->play_mode = 4;
-                break;
-        case WSS:
-                switch (j->baseframe.low) {
-                case 0xA0:
-                        j->play_frame_size = 80;
-                        break;
-                case 0x50:
-                        j->play_frame_size = 40;
-                        break;
-                default:
-                        j->play_frame_size = 120;
-                        break;
-                }
-                j->play_mode = 5;
-                break;
-        default:
-                kfree(j->write_buffer);
-                j->play_frame_size = 0;
-                j->play_mode = -1;
-                j->write_buffer = NULL;
-                j->write_buffer_size = 0;
-                retval = 1;
-                break;
-        }
-        return retval;
-}
-
-static int ixj_play_start(IXJ *j)
-{
-        unsigned short cmd = 0x0000;
-
-        if (j->write_buffer) {
-                ixj_play_stop(j);
-        }
-
-        if(ixjdebug & 0x0002)
-                printk("IXJ %d Starting Play Codec %d at %ld\n", j->board, j->play_codec, jiffies);
-
-        j->flags.playing = 1;
-        ixj_WriteDSPCommand(0x0FE0, j); /* Put the DSP in full power mode. */
-
-        j->flags.play_first_frame = 1;
-        j->drybuffer = 0;
-
-        if (!j->play_mode) {
-                switch (j->play_codec) {
-                case G723_63:
-                        cmd = 0x5231;
-                        break;
-                case G723_53:
-                        cmd = 0x5232;
-                        break;
-                case TS85:
-                        cmd = 0x5230;   /* TrueSpeech 8.5 */
-
-                        break;
-                case TS48:
-                        cmd = 0x5233;   /* TrueSpeech 4.8 */
-
-                        break;
-                case TS41:
-                        cmd = 0x5234;   /* TrueSpeech 4.1 */
-
-                        break;
-                case G728:
-                        cmd = 0x5235;
-                        break;
-                case G729:
-                case G729B:
-                        cmd = 0x5236;
-                        break;
-                default:
-                        return 1;
-                }
-                if (ixj_WriteDSPCommand(cmd, j))
-                        return -1;
-        }
-        j->write_buffer = kmalloc(j->play_frame_size * 2, GFP_ATOMIC);
-        if (!j->write_buffer) {
-                printk("Write buffer allocation for ixj board %d failed!\n", j->board);
-                return -ENOMEM;
-        }
-/*      j->write_buffers_empty = 2; */
-        j->write_buffers_empty = 1;
-        j->write_buffer_size = j->play_frame_size * 2;
-        j->write_buffer_end = j->write_buffer + j->play_frame_size * 2;
-        j->write_buffer_rp = j->write_buffer_wp = j->write_buffer;
-
-        if (ixj_WriteDSPCommand(0x5202, j))             /* Set Poll sync mode */
-
-                return -1;
-
-        switch (j->play_mode) {
-        case 0:
-                cmd = 0x2C03;
-                break;
-        case 2:
-                if (j->ver.low == 0x12) {
-                        cmd = 0x2C23;
-                } else {
-                        cmd = 0x2C21;
-                }
-                break;
-        case 4:
-                if (j->ver.low == 0x12) {
-                        cmd = 0x2C43;
-                } else {
-                        cmd = 0x2C41;
-                }
-                break;
-        case 5:
-                if (j->ver.low == 0x12) {
-                        cmd = 0x2C53;
-                } else {
-                        cmd = 0x2C51;
-                }
-                break;
-        case 6:
-                if (j->ver.low == 0x12) {
-                        cmd = 0x2C63;
-                } else {
-                        cmd = 0x2C61;
-                }
-                break;
-        }
-        if (ixj_WriteDSPCommand(cmd, j))
-                return -1;
-
-        if (ixj_WriteDSPCommand(0x2000, j))             /* Playback C2 */
-                return -1;
-
-        if (ixj_WriteDSPCommand(0x2000 + j->play_frame_size, j))        /* Playback C3 */
-                return -1;
-
-        if (j->flags.recording) {
-                ixj_aec_start(j, j->aec_level);
-        }
-
-        return 0;
-}
-
-static void ixj_play_stop(IXJ *j)
-{
-        if (ixjdebug & 0x0002)
-                printk("IXJ %d Stopping Play Codec %d at %ld\n", j->board, j->play_codec, jiffies);
-
-        kfree(j->write_buffer);
-        j->write_buffer = NULL;
-        j->write_buffer_size = 0;
-        if (j->play_mode > -1) {
-                ixj_WriteDSPCommand(0x5221, j); /* Stop playback and flush buffers.  8022 reference page 9-40 */
-
-                j->play_mode = -1;
-        }
-        j->flags.playing = 0;
-}
-
-static inline int get_play_level(IXJ *j)
-{
-        int retval;
-
-        ixj_WriteDSPCommand(0xCF8F, j); /* 8022 Reference page 9-38 */
-        return j->ssr.high << 8 | j->ssr.low;
-        retval = j->ssr.high << 8 | j->ssr.low;
-        retval = (retval * 256) / 240;
-        return retval;
-}
-
-static unsigned int ixj_poll(struct file *file_p, poll_table * wait)
-{
-        unsigned int mask = 0;
-
-        IXJ *j = get_ixj(NUM(file_p->f_path.dentry->d_inode));
-
-        poll_wait(file_p, &(j->poll_q), wait);
-        if (j->read_buffer_ready > 0)
-                mask |= POLLIN | POLLRDNORM;    /* readable */
-        if (j->write_buffers_empty > 0)
-                mask |= POLLOUT | POLLWRNORM;   /* writable */
-        if (j->ex.bytes)
-                mask |= POLLPRI;
-        return mask;
-}
-
-static int ixj_play_tone(IXJ *j, char tone)
-{
-        if (!j->tone_state) {
-                if(ixjdebug & 0x0002) {
-                        printk("IXJ %d starting tone %d at %ld\n", j->board, tone, jiffies);
-                }
-                if (j->dsp.low == 0x20) {
-                        idle(j);
-                }
-                j->tone_start_jif = jiffies;
-
-                j->tone_state = 1;
-        }
-
-        j->tone_index = tone;
-        if (ixj_WriteDSPCommand(0x6000 + j->tone_index, j))
-                return -1;
-
-        return 0;
-}
-
-static int ixj_set_tone_on(unsigned short arg, IXJ *j)
-{
-        j->tone_on_time = arg;
-
-        if (ixj_WriteDSPCommand(0x6E04, j))             /* Set Tone On Period */
-
-                return -1;
-
-        if (ixj_WriteDSPCommand(arg, j))
-                return -1;
-
-        return 0;
-}
-
-static int SCI_WaitHighSCI(IXJ *j)
-{
-        int cnt;
-
-        j->pld_scrr.byte = inb_p(j->XILINXbase);
-        if (!j->pld_scrr.bits.sci) {
-                for (cnt = 0; cnt < 10; cnt++) {
-                        udelay(32);
-                        j->pld_scrr.byte = inb_p(j->XILINXbase);
-
-                        if ((j->pld_scrr.bits.sci))
-                                return 1;
-                }
-                if (ixjdebug & 0x0001)
-                        printk(KERN_INFO "SCI Wait High failed %x\n", j->pld_scrr.byte);
-                return 0;
-        } else
-                return 1;
-}
-
-static int SCI_WaitLowSCI(IXJ *j)
-{
-        int cnt;
-
-        j->pld_scrr.byte = inb_p(j->XILINXbase);
-        if (j->pld_scrr.bits.sci) {
-                for (cnt = 0; cnt < 10; cnt++) {
-                        udelay(32);
-                        j->pld_scrr.byte = inb_p(j->XILINXbase);
-
-                        if (!(j->pld_scrr.bits.sci))
-                                return 1;
-                }
-                if (ixjdebug & 0x0001)
-                        printk(KERN_INFO "SCI Wait Low failed %x\n", j->pld_scrr.byte);
-                return 0;
-        } else
-                return 1;
-}
-
-static int SCI_Control(IXJ *j, int control)
-{
-        switch (control) {
-        case SCI_End:
-                j->pld_scrw.bits.c0 = 0;        /* Set PLD Serial control interface */
-
-                j->pld_scrw.bits.c1 = 0;        /* to no selection */
-
-                break;
-        case SCI_Enable_DAA:
-                j->pld_scrw.bits.c0 = 1;        /* Set PLD Serial control interface */
-
-                j->pld_scrw.bits.c1 = 0;        /* to write to DAA */
-
-                break;
-        case SCI_Enable_Mixer:
-                j->pld_scrw.bits.c0 = 0;        /* Set PLD Serial control interface */
-
-                j->pld_scrw.bits.c1 = 1;        /* to write to mixer */
-
-                break;
-        case SCI_Enable_EEPROM:
-                j->pld_scrw.bits.c0 = 1;        /* Set PLD Serial control interface */
-
-                j->pld_scrw.bits.c1 = 1;        /* to write to EEPROM */
-
-                break;
-        default:
-                return 0;
-                break;
-        }
-        outb_p(j->pld_scrw.byte, j->XILINXbase);
-
-        switch (control) {
-        case SCI_End:
-                return 1;
-                break;
-        case SCI_Enable_DAA:
-        case SCI_Enable_Mixer:
-        case SCI_Enable_EEPROM:
-                if (!SCI_WaitHighSCI(j))
-                        return 0;
-                break;
-        default:
-                return 0;
-                break;
-        }
-        return 1;
-}
-
-static int SCI_Prepare(IXJ *j)
-{
-        if (!SCI_Control(j, SCI_End))
-                return 0;
-
-        if (!SCI_WaitLowSCI(j))
-                return 0;
-
-        return 1;
-}
-
-static int ixj_get_mixer(long val, IXJ *j)
-{
-        int reg = (val & 0x1F00) >> 8;
-        return j->mix.vol[reg];
-}
-
-static int ixj_mixer(long val, IXJ *j)
-{
-        BYTES bytes;
-
-        bytes.high = (val & 0x1F00) >> 8;
-        bytes.low = val & 0x00FF;
-
-        /* save mixer value so we can get back later on */
-        j->mix.vol[bytes.high] = bytes.low;
-
-        outb_p(bytes.high & 0x1F, j->XILINXbase + 0x03);        /* Load Mixer Address */
-
-        outb_p(bytes.low, j->XILINXbase + 0x02);        /* Load Mixer Data */
-
-        SCI_Control(j, SCI_Enable_Mixer);
-
-        SCI_Control(j, SCI_End);
-
-        return 0;
-}
-
-static int daa_load(BYTES * p_bytes, IXJ *j)
-{
-        outb_p(p_bytes->high, j->XILINXbase + 0x03);
-        outb_p(p_bytes->low, j->XILINXbase + 0x02);
-        if (!SCI_Control(j, SCI_Enable_DAA))
-                return 0;
-        else
-                return 1;
-}
-
-static int ixj_daa_cr4(IXJ *j, char reg)
-{
-        BYTES bytes;
-
-        switch (j->daa_mode) {
-        case SOP_PU_SLEEP:
-                bytes.high = 0x14;
-                break;
-        case SOP_PU_RINGING:
-                bytes.high = 0x54;
-                break;
-        case SOP_PU_CONVERSATION:
-                bytes.high = 0x94;
-                break;
-        case SOP_PU_PULSEDIALING:
-                bytes.high = 0xD4;
-                break;
-        }
-
-        j->m_DAAShadowRegs.SOP_REGS.SOP.cr4.reg = reg;
-
-        switch (j->m_DAAShadowRegs.SOP_REGS.SOP.cr4.bitreg.AGX) {
-        case 0:
-                j->m_DAAShadowRegs.SOP_REGS.SOP.cr4.bitreg.AGR_Z = 0;
-                break;
-        case 1:
-                j->m_DAAShadowRegs.SOP_REGS.SOP.cr4.bitreg.AGR_Z = 2;
-                break;
-        case 2:
-                j->m_DAAShadowRegs.SOP_REGS.SOP.cr4.bitreg.AGR_Z = 1;
-                break;
-        case 3:
-                j->m_DAAShadowRegs.SOP_REGS.SOP.cr4.bitreg.AGR_Z = 3;
-                break;
-        }
-
-        bytes.low = j->m_DAAShadowRegs.SOP_REGS.SOP.cr4.reg;
-
-        if (!daa_load(&bytes, j))
-                return 0;
-
-        if (!SCI_Prepare(j))
-                return 0;
-
-        return 1;
-}
-
-static char daa_int_read(IXJ *j)
-{
-        BYTES bytes;
-
-        if (!SCI_Prepare(j))
-                return 0;
-
-        bytes.high = 0x38;
-        bytes.low = 0x00;
-        outb_p(bytes.high, j->XILINXbase + 0x03);
-        outb_p(bytes.low, j->XILINXbase + 0x02);
-
-        if (!SCI_Control(j, SCI_Enable_DAA))
-                return 0;
-
-        bytes.high = inb_p(j->XILINXbase + 0x03);
-        bytes.low = inb_p(j->XILINXbase + 0x02);
-        if (bytes.low != ALISDAA_ID_BYTE) {
-                if (ixjdebug & 0x0001)
-                        printk("Cannot read DAA ID Byte high = %d low = %d\n", bytes.high, bytes.low);
-                return 0;
-        }
-        if (!SCI_Control(j, SCI_Enable_DAA))
-                return 0;
-        if (!SCI_Control(j, SCI_End))
-                return 0;
-
-        bytes.high = inb_p(j->XILINXbase + 0x03);
-        bytes.low = inb_p(j->XILINXbase + 0x02);
-
-        j->m_DAAShadowRegs.XOP_REGS.XOP.xr0.reg = bytes.high;
-
-        return 1;
-}
-
-static char daa_CR_read(IXJ *j, int cr)
-{
-        IXJ_WORD wdata;
-        BYTES bytes;
-
-        if (!SCI_Prepare(j))
-                return 0;
-
-        switch (j->daa_mode) {
-        case SOP_PU_SLEEP:
-                bytes.high = 0x30 + cr;
-                break;
-        case SOP_PU_RINGING:
-                bytes.high = 0x70 + cr;
-                break;
-        case SOP_PU_CONVERSATION:
-                bytes.high = 0xB0 + cr;
-                break;
-        case SOP_PU_PULSEDIALING:
-        default:
-                bytes.high = 0xF0 + cr;
-                break;
-        }
-
-        bytes.low = 0x00;
-
-        outb_p(bytes.high, j->XILINXbase + 0x03);
-        outb_p(bytes.low, j->XILINXbase + 0x02);
-
-        if (!SCI_Control(j, SCI_Enable_DAA))
-                return 0;
-
-        bytes.high = inb_p(j->XILINXbase + 0x03);
-        bytes.low = inb_p(j->XILINXbase + 0x02);
-        if (bytes.low != ALISDAA_ID_BYTE) {
-                if (ixjdebug & 0x0001)
-                        printk("Cannot read DAA ID Byte high = %d low = %d\n", bytes.high, bytes.low);
-                return 0;
-        }
-        if (!SCI_Control(j, SCI_Enable_DAA))
-                return 0;
-        if (!SCI_Control(j, SCI_End))
-                return 0;
-
-        wdata.word = inw_p(j->XILINXbase + 0x02);
-
-        switch(cr){
-                case 5:
-                        j->m_DAAShadowRegs.SOP_REGS.SOP.cr5.reg = wdata.bytes.high;
-                        break;
-                case 4:
-                        j->m_DAAShadowRegs.SOP_REGS.SOP.cr4.reg = wdata.bytes.high;
-                        break;
-                case 3:
-                        j->m_DAAShadowRegs.SOP_REGS.SOP.cr3.reg = wdata.bytes.high;
-                        break;
-                case 2:
-                        j->m_DAAShadowRegs.SOP_REGS.SOP.cr2.reg = wdata.bytes.high;
-                        break;
-                case 1:
-                        j->m_DAAShadowRegs.SOP_REGS.SOP.cr1.reg = wdata.bytes.high;
-                        break;
-                case 0:
-                        j->m_DAAShadowRegs.SOP_REGS.SOP.cr0.reg = wdata.bytes.high;
-                        break;
-                default:
-                        return 0;
-        }
-        return 1;
-}
-
-static int ixj_daa_cid_reset(IXJ *j)
-{
-        int i;
-        BYTES bytes;
-
-        if (ixjdebug & 0x0002)
-                printk("DAA Clearing CID ram\n");
-
-        if (!SCI_Prepare(j))
-                return 0;
-
-        bytes.high = 0x58;
-        bytes.low = 0x00;
-        outb_p(bytes.high, j->XILINXbase + 0x03);
-        outb_p(bytes.low, j->XILINXbase + 0x02);
-
-        if (!SCI_Control(j, SCI_Enable_DAA))
-                return 0;
-
-        if (!SCI_WaitHighSCI(j))
-                return 0;
-
-        for (i = 0; i < ALISDAA_CALLERID_SIZE - 1; i += 2) {
-                bytes.high = bytes.low = 0x00;
-                outb_p(bytes.high, j->XILINXbase + 0x03);
-
-                if (i < ALISDAA_CALLERID_SIZE - 1)
-                        outb_p(bytes.low, j->XILINXbase + 0x02);
-
-                if (!SCI_Control(j, SCI_Enable_DAA))
-                        return 0;
-
-                if (!SCI_WaitHighSCI(j))
-                        return 0;
-
-        }
-
-        if (!SCI_Control(j, SCI_End))
-                return 0;
-
-        if (ixjdebug & 0x0002)
-                printk("DAA CID ram cleared\n");
-
-        return 1;
-}
-
-static int ixj_daa_cid_read(IXJ *j)
-{
-        int i;
-        BYTES bytes;
-        char CID[ALISDAA_CALLERID_SIZE];
-        bool mContinue;
-        char *pIn, *pOut;
-
-        if (!SCI_Prepare(j))
-                return 0;
-
-        bytes.high = 0x78;
-        bytes.low = 0x00;
-        outb_p(bytes.high, j->XILINXbase + 0x03);
-        outb_p(bytes.low, j->XILINXbase + 0x02);
-
-        if (!SCI_Control(j, SCI_Enable_DAA))
-                return 0;
-
-        if (!SCI_WaitHighSCI(j))
-                return 0;
-
-        bytes.high = inb_p(j->XILINXbase + 0x03);
-        bytes.low = inb_p(j->XILINXbase + 0x02);
-        if (bytes.low != ALISDAA_ID_BYTE) {
-                if (ixjdebug & 0x0001)
-                        printk("DAA Get Version Cannot read DAA ID Byte high = %d low = %d\n", bytes.high, bytes.low);
-                return 0;
-        }
-        for (i = 0; i < ALISDAA_CALLERID_SIZE; i += 2) {
-                bytes.high = bytes.low = 0x00;
-                outb_p(bytes.high, j->XILINXbase + 0x03);
-                outb_p(bytes.low, j->XILINXbase + 0x02);
-
-                if (!SCI_Control(j, SCI_Enable_DAA))
-                        return 0;
-
-                if (!SCI_WaitHighSCI(j))
-                        return 0;
-
-                CID[i + 0] = inb_p(j->XILINXbase + 0x03);
-                CID[i + 1] = inb_p(j->XILINXbase + 0x02);
-        }
-
-        if (!SCI_Control(j, SCI_End))
-                return 0;
-
-        pIn = CID;
-        pOut = j->m_DAAShadowRegs.CAO_REGS.CAO.CallerID;
-        mContinue = true;
-        while (mContinue) {
-                if ((pIn[1] & 0x03) == 0x01) {
-                        pOut[0] = pIn[0];
-                }
-                if ((pIn[2] & 0x0c) == 0x04) {
-                        pOut[1] = ((pIn[2] & 0x03) << 6) | ((pIn[1] & 0xfc) >> 2);
-                }
-                if ((pIn[3] & 0x30) == 0x10) {
-                        pOut[2] = ((pIn[3] & 0x0f) << 4) | ((pIn[2] & 0xf0) >> 4);
-                }
-                if ((pIn[4] & 0xc0) == 0x40) {
-                        pOut[3] = ((pIn[4] & 0x3f) << 2) | ((pIn[3] & 0xc0) >> 6);
-                } else {
-                        mContinue = false;
-                }
-                pIn += 5, pOut += 4;
-        }
-        memset(&j->cid, 0, sizeof(PHONE_CID));
-        pOut = j->m_DAAShadowRegs.CAO_REGS.CAO.CallerID;
-        pOut += 4;
-        strncpy(j->cid.month, pOut, 2);
-        pOut += 2;
-        strncpy(j->cid.day, pOut, 2);
-        pOut += 2;
-        strncpy(j->cid.hour, pOut, 2);
-        pOut += 2;
-        strncpy(j->cid.min, pOut, 2);
-        pOut += 3;
-        j->cid.numlen = *pOut;
-        pOut += 1;
-        strncpy(j->cid.number, pOut, j->cid.numlen);
-        pOut += j->cid.numlen + 1;
-        j->cid.namelen = *pOut;
-        pOut += 1;
-        strncpy(j->cid.name, pOut, j->cid.namelen);
-
-        ixj_daa_cid_reset(j);
-        return 1;
-}
-
-static char daa_get_version(IXJ *j)
-{
-        BYTES bytes;
-
-        if (!SCI_Prepare(j))
-                return 0;
-
-        bytes.high = 0x35;
-        bytes.low = 0x00;
-        outb_p(bytes.high, j->XILINXbase + 0x03);
-        outb_p(bytes.low, j->XILINXbase + 0x02);
-
-        if (!SCI_Control(j, SCI_Enable_DAA))
-                return 0;
-
-        bytes.high = inb_p(j->XILINXbase + 0x03);
-        bytes.low = inb_p(j->XILINXbase + 0x02);
-        if (bytes.low != ALISDAA_ID_BYTE) {
-                if (ixjdebug & 0x0001)
-                        printk("DAA Get Version Cannot read DAA ID Byte high = %d low = %d\n", bytes.high, bytes.low);
-                return 0;
-        }
-        if (!SCI_Control(j, SCI_Enable_DAA))
-                return 0;
-
-        if (!SCI_Control(j, SCI_End))
-                return 0;
-
-        bytes.high = inb_p(j->XILINXbase + 0x03);
-        bytes.low = inb_p(j->XILINXbase + 0x02);
-        if (ixjdebug & 0x0002)
-                printk("DAA CR5 Byte high = 0x%x low = 0x%x\n", bytes.high, bytes.low);
-        j->m_DAAShadowRegs.SOP_REGS.SOP.cr5.reg = bytes.high;
-        return bytes.high;
-}
-
-static int daa_set_mode(IXJ *j, int mode)
-{
-        /* NOTE:
-              The DAA *MUST* be in the conversation mode if the
-              PSTN line is to be seized (PSTN line off-hook).
-              Taking the PSTN line off-hook while the DAA is in
-              a mode other than conversation mode will cause a
-              hardware failure of the ALIS-A part.
-
-           NOTE:
-              The DAA can only go to SLEEP, RINGING or PULSEDIALING modes
-              if the PSTN line is on-hook.  Failure to have the PSTN line
-              in the on-hook state WILL CAUSE A HARDWARE FAILURE OF THE
-              ALIS-A part.
-        */
-
-        BYTES bytes;
-
-        j->flags.pstn_rmr = 0;
-
-        if (!SCI_Prepare(j))
-                return 0;
-
-        switch (mode) {
-        case SOP_PU_RESET:
-                j->pld_scrw.bits.daafsyncen = 0;        /* Turn off DAA Frame Sync */
-
-                outb_p(j->pld_scrw.byte, j->XILINXbase);
-                j->pld_slicw.bits.rly2 = 0;
-                outb_p(j->pld_slicw.byte, j->XILINXbase + 0x01);
-                bytes.high = 0x10;
-                bytes.low = j->m_DAAShadowRegs.SOP_REGS.SOP.cr0.reg;
-                daa_load(&bytes, j);
-                if (!SCI_Prepare(j))
-                        return 0;
-
-                j->daa_mode = SOP_PU_SLEEP;
-                break;
-        case SOP_PU_SLEEP:
-                if(j->daa_mode == SOP_PU_SLEEP)
-                {
-                        break;
-                }
-                if (ixjdebug & 0x0008)
-                        printk(KERN_INFO "phone DAA: SOP_PU_SLEEP at %ld\n", jiffies);
-/*              if(j->daa_mode == SOP_PU_CONVERSATION) */
-                {
-                        j->pld_scrw.bits.daafsyncen = 0;        /* Turn off DAA Frame Sync */
-
-                        outb_p(j->pld_scrw.byte, j->XILINXbase);
-                        j->pld_slicw.bits.rly2 = 0;
-                        outb_p(j->pld_slicw.byte, j->XILINXbase + 0x01);
-                        bytes.high = 0x10;
-                        bytes.low = j->m_DAAShadowRegs.SOP_REGS.SOP.cr0.reg;
-                        daa_load(&bytes, j);
-                        if (!SCI_Prepare(j))
-                                return 0;
-                }
-                j->pld_scrw.bits.daafsyncen = 0;        /* Turn off DAA Frame Sync */
-
-                outb_p(j->pld_scrw.byte, j->XILINXbase);
-                j->pld_slicw.bits.rly2 = 0;
-                outb_p(j->pld_slicw.byte, j->XILINXbase + 0x01);
-                bytes.high = 0x10;
-                bytes.low = j->m_DAAShadowRegs.SOP_REGS.SOP.cr0.reg;
-                daa_load(&bytes, j);
-                if (!SCI_Prepare(j))
-                        return 0;
-
-                j->daa_mode = SOP_PU_SLEEP;
-                j->flags.pstn_ringing = 0;
-                j->ex.bits.pstn_ring = 0;
-                j->pstn_sleeptil = jiffies + (hertz / 4);
-                wake_up_interruptible(&j->read_q);      /* Wake any blocked readers */
-                wake_up_interruptible(&j->write_q);     /* Wake any blocked writers */
-                wake_up_interruptible(&j->poll_q);      /* Wake any blocked selects */
-                break;
-        case SOP_PU_RINGING:
-                if (ixjdebug & 0x0008)
-                        printk(KERN_INFO "phone DAA: SOP_PU_RINGING at %ld\n", jiffies);
-                j->pld_scrw.bits.daafsyncen = 0;        /* Turn off DAA Frame Sync */
-
-                outb_p(j->pld_scrw.byte, j->XILINXbase);
-                j->pld_slicw.bits.rly2 = 0;
-                outb_p(j->pld_slicw.byte, j->XILINXbase + 0x01);
-                bytes.high = 0x50;
-                bytes.low = j->m_DAAShadowRegs.SOP_REGS.SOP.cr0.reg;
-                daa_load(&bytes, j);
-                if (!SCI_Prepare(j))
-                        return 0;
-                j->daa_mode = SOP_PU_RINGING;
-                break;
-        case SOP_PU_CONVERSATION:
-                if (ixjdebug & 0x0008)
-                        printk(KERN_INFO "phone DAA: SOP_PU_CONVERSATION at %ld\n", jiffies);
-                bytes.high = 0x90;
-                bytes.low = j->m_DAAShadowRegs.SOP_REGS.SOP.cr0.reg;
-                daa_load(&bytes, j);
-                if (!SCI_Prepare(j))
-                        return 0;
-                j->pld_slicw.bits.rly2 = 1;
-                outb_p(j->pld_slicw.byte, j->XILINXbase + 0x01);
-                j->pld_scrw.bits.daafsyncen = 1;        /* Turn on DAA Frame Sync */
-
-                outb_p(j->pld_scrw.byte, j->XILINXbase);
-                j->daa_mode = SOP_PU_CONVERSATION;
-                j->flags.pstn_ringing = 0;
-                j->ex.bits.pstn_ring = 0;
-                j->pstn_sleeptil = jiffies;
-                j->pstn_ring_start = j->pstn_ring_stop = j->pstn_ring_int = 0;
-                break;
-        case SOP_PU_PULSEDIALING:
-                if (ixjdebug & 0x0008)
-                        printk(KERN_INFO "phone DAA: SOP_PU_PULSEDIALING at %ld\n", jiffies);
-                j->pld_scrw.bits.daafsyncen = 0;        /* Turn off DAA Frame Sync */
-
-                outb_p(j->pld_scrw.byte, j->XILINXbase);
-                j->pld_slicw.bits.rly2 = 0;
-                outb_p(j->pld_slicw.byte, j->XILINXbase + 0x01);
-                bytes.high = 0xD0;
-                bytes.low = j->m_DAAShadowRegs.SOP_REGS.SOP.cr0.reg;
-                daa_load(&bytes, j);
-                if (!SCI_Prepare(j))
-                        return 0;
-                j->daa_mode = SOP_PU_PULSEDIALING;
-                break;
-        default:
-                break;
-        }
-        return 1;
-}
-
-static int ixj_daa_write(IXJ *j)
-{
-        BYTES bytes;
-
-        j->flags.pstncheck = 1;
-
-        daa_set_mode(j, SOP_PU_SLEEP);
-
-        if (!SCI_Prepare(j))
-                return 0;
-
-        outb_p(j->pld_scrw.byte, j->XILINXbase);
-
-        bytes.high = 0x14;
-        bytes.low = j->m_DAAShadowRegs.SOP_REGS.SOP.cr4.reg;
-        if (!daa_load(&bytes, j))
-                return 0;
-
-        bytes.high = j->m_DAAShadowRegs.SOP_REGS.SOP.cr3.reg;
-        bytes.low = j->m_DAAShadowRegs.SOP_REGS.SOP.cr2.reg;
-        if (!daa_load(&bytes, j))
-                return 0;
-
-        bytes.high = j->m_DAAShadowRegs.SOP_REGS.SOP.cr1.reg;
-        bytes.low = j->m_DAAShadowRegs.SOP_REGS.SOP.cr0.reg;
-        if (!daa_load(&bytes, j))
-                return 0;
-
-        if (!SCI_Prepare(j))
-                return 0;
-
-        bytes.high = 0x1F;
-        bytes.low = j->m_DAAShadowRegs.XOP_REGS.XOP.xr7.reg;
-        if (!daa_load(&bytes, j))
-                return 0;
-
-        bytes.high = j->m_DAAShadowRegs.XOP_xr6_W.reg;
-        bytes.low = j->m_DAAShadowRegs.XOP_REGS.XOP.xr5.reg;
-        if (!daa_load(&bytes, j))
-                return 0;
-
-        bytes.high = j->m_DAAShadowRegs.XOP_REGS.XOP.xr4.reg;
-        bytes.low = j->m_DAAShadowRegs.XOP_REGS.XOP.xr3.reg;
-        if (!daa_load(&bytes, j))
-                return 0;
-
-        bytes.high = j->m_DAAShadowRegs.XOP_REGS.XOP.xr2.reg;
-        bytes.low = j->m_DAAShadowRegs.XOP_REGS.XOP.xr1.reg;
-        if (!daa_load(&bytes, j))
-                return 0;
-
-        bytes.high = j->m_DAAShadowRegs.XOP_xr0_W.reg;
-        bytes.low = 0x00;
-        if (!daa_load(&bytes, j))
-                return 0;
-
-        if (!SCI_Prepare(j))
-                return 0;
-
-        bytes.high = 0x00;
-        bytes.low = j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_1[7];
-        if (!daa_load(&bytes, j))
-                return 0;
-
-        bytes.high = j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_1[6];
-        bytes.low = j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_1[5];
-        if (!daa_load(&bytes, j))
-                return 0;
-
-        bytes.high = j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_1[4];
-        bytes.low = j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_1[3];
-        if (!daa_load(&bytes, j))
-                return 0;
-
-        bytes.high = j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_1[2];
-        bytes.low = j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_1[1];
-        if (!daa_load(&bytes, j))
-                return 0;
-
-        bytes.high = j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_1[0];
-        bytes.low = 0x00;
-        if (!daa_load(&bytes, j))
-                return 0;
-
-        if (!SCI_Control(j, SCI_End))
-                return 0;
-        if (!SCI_WaitLowSCI(j))
-                return 0;
-
-        bytes.high = 0x01;
-        bytes.low = j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_2[7];
-        if (!daa_load(&bytes, j))
-                return 0;
-
-        bytes.high = j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_2[6];
-        bytes.low = j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_2[5];
-        if (!daa_load(&bytes, j))
-                return 0;
-
-        bytes.high = j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_2[4];
-        bytes.low = j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_2[3];
-        if (!daa_load(&bytes, j))
-                return 0;
-
-        bytes.high = j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_2[2];
-        bytes.low = j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_2[1];
-        if (!daa_load(&bytes, j))
-                return 0;
-
-        bytes.high = j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_2[0];
-        bytes.low = 0x00;
-        if (!daa_load(&bytes, j))
-                return 0;
-
-        if (!SCI_Control(j, SCI_End))
-                return 0;
-        if (!SCI_WaitLowSCI(j))
-                return 0;
-
-        bytes.high = 0x02;
-        bytes.low = j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_3[7];
-        if (!daa_load(&bytes, j))
-                return 0;
-
-        bytes.high = j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_3[6];
-        bytes.low = j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_3[5];
-        if (!daa_load(&bytes, j))
-                return 0;
-
-        bytes.high = j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_3[4];
-        bytes.low = j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_3[3];
-        if (!daa_load(&bytes, j))
-                return 0;
-
-        bytes.high = j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_3[2];
-        bytes.low = j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_3[1];
-        if (!daa_load(&bytes, j))
-                return 0;
-
-        bytes.high = j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_3[0];
-        bytes.low = 0x00;
-        if (!daa_load(&bytes, j))
-                return 0;
-
-        if (!SCI_Control(j, SCI_End))
-                return 0;
-        if (!SCI_WaitLowSCI(j))
-                return 0;
-
-        bytes.high = 0x03;
-        bytes.low = j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_1[7];
-        if (!daa_load(&bytes, j))
-                return 0;
-
-        bytes.high = j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_1[6];
-        bytes.low = j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_1[5];
-        if (!daa_load(&bytes, j))
-                return 0;
-
-        bytes.high = j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_1[4];
-        bytes.low = j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_1[3];
-        if (!daa_load(&bytes, j))
-                return 0;
-
-        bytes.high = j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_1[2];
-        bytes.low = j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_1[1];
-        if (!daa_load(&bytes, j))
-                return 0;
-
-        bytes.high = j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_1[0];
-        bytes.low = 0x00;
-        if (!daa_load(&bytes, j))
-                return 0;
-
-        if (!SCI_Control(j, SCI_End))
-                return 0;
-        if (!SCI_WaitLowSCI(j))
-                return 0;
-
-        bytes.high = 0x04;
-        bytes.low = j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_1[7];
-        if (!daa_load(&bytes, j))
-                return 0;
-
-        bytes.high = j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_1[6];
-        bytes.low = j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_1[5];
-        if (!daa_load(&bytes, j))
-                return 0;
-
-        bytes.high = j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_1[4];
-        bytes.low = j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_1[3];
-        if (!daa_load(&bytes, j))
-                return 0;
-
-        bytes.high = j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_1[2];
-        bytes.low = j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_1[1];
-        if (!daa_load(&bytes, j))
-                return 0;
-
-        bytes.high = j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_1[0];
-        bytes.low = 0x00;
-        if (!daa_load(&bytes, j))
-                return 0;
-
-        if (!SCI_Control(j, SCI_End))
-                return 0;
-        if (!SCI_WaitLowSCI(j))
-                return 0;
-
-        bytes.high = 0x05;
-        bytes.low = j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_2[7];
-        if (!daa_load(&bytes, j))
-                return 0;
-
-        bytes.high = j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_2[6];
-        bytes.low = j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_2[5];
-        if (!daa_load(&bytes, j))
-                return 0;
-
-        bytes.high = j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_2[4];
-        bytes.low = j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_2[3];
-        if (!daa_load(&bytes, j))
-                return 0;
-
-        bytes.high = j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_2[2];
-        bytes.low = j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_2[1];
-        if (!daa_load(&bytes, j))
-                return 0;
-
-        bytes.high = j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_2[0];
-        bytes.low = 0x00;
-        if (!daa_load(&bytes, j))
-                return 0;
-
-        if (!SCI_Control(j, SCI_End))
-                return 0;
-        if (!SCI_WaitLowSCI(j))
-                return 0;
-
-        bytes.high = 0x06;
-        bytes.low = j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_2[7];
-        if (!daa_load(&bytes, j))
-                return 0;
-
-        bytes.high = j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_2[6];
-        bytes.low = j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_2[5];
-        if (!daa_load(&bytes, j))
-                return 0;
-
-        bytes.high = j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_2[4];
-        bytes.low = j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_2[3];
-        if (!daa_load(&bytes, j))
-                return 0;
-
-        bytes.high = j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_2[2];
-        bytes.low = j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_2[1];
-        if (!daa_load(&bytes, j))
-                return 0;
-
-        bytes.high = j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_2[0];
-        bytes.low = 0x00;
-        if (!daa_load(&bytes, j))
-                return 0;
-
-        if (!SCI_Control(j, SCI_End))
-                return 0;
-        if (!SCI_WaitLowSCI(j))
-                return 0;
-
-        bytes.high = 0x07;
-        bytes.low = j->m_DAAShadowRegs.COP_REGS.COP.FRRFilterCoeff[7];
-        if (!daa_load(&bytes, j))
-                return 0;
-
-        bytes.high = j->m_DAAShadowRegs.COP_REGS.COP.FRRFilterCoeff[6];
-        bytes.low = j->m_DAAShadowRegs.COP_REGS.COP.FRRFilterCoeff[5];
-        if (!daa_load(&bytes, j))
-                return 0;
-
-        bytes.high = j->m_DAAShadowRegs.COP_REGS.COP.FRRFilterCoeff[4];
-        bytes.low = j->m_DAAShadowRegs.COP_REGS.COP.FRRFilterCoeff[3];
-        if (!daa_load(&bytes, j))
-                return 0;
-
-        bytes.high = j->m_DAAShadowRegs.COP_REGS.COP.FRRFilterCoeff[2];
-        bytes.low = j->m_DAAShadowRegs.COP_REGS.COP.FRRFilterCoeff[1];
-        if (!daa_load(&bytes, j))
-                return 0;
-
-        bytes.high = j->m_DAAShadowRegs.COP_REGS.COP.FRRFilterCoeff[0];
-        bytes.low = 0x00;
-        if (!daa_load(&bytes, j))
-                return 0;
-
-        if (!SCI_Control(j, SCI_End))
-                return 0;
-        if (!SCI_WaitLowSCI(j))
-                return 0;
-
-        bytes.high = 0x08;
-        bytes.low = j->m_DAAShadowRegs.COP_REGS.COP.FRXFilterCoeff[7];
-        if (!daa_load(&bytes, j))
-                return 0;
-
-        bytes.high = j->m_DAAShadowRegs.COP_REGS.COP.FRXFilterCoeff[6];
-        bytes.low = j->m_DAAShadowRegs.COP_REGS.COP.FRXFilterCoeff[5];
-        if (!daa_load(&bytes, j))
-                return 0;
-
-        bytes.high = j->m_DAAShadowRegs.COP_REGS.COP.FRXFilterCoeff[4];
-        bytes.low = j->m_DAAShadowRegs.COP_REGS.COP.FRXFilterCoeff[3];
-        if (!daa_load(&bytes, j))
-                return 0;
-
-        bytes.high = j->m_DAAShadowRegs.COP_REGS.COP.FRXFilterCoeff[2];
-        bytes.low = j->m_DAAShadowRegs.COP_REGS.COP.FRXFilterCoeff[1];
-        if (!daa_load(&bytes, j))
-                return 0;
-
-        bytes.high = j->m_DAAShadowRegs.COP_REGS.COP.FRXFilterCoeff[0];
-        bytes.low = 0x00;
-        if (!daa_load(&bytes, j))
-                return 0;
-
-        if (!SCI_Control(j, SCI_End))
-                return 0;
-        if (!SCI_WaitLowSCI(j))
-                return 0;
-
-        bytes.high = 0x09;
-        bytes.low = j->m_DAAShadowRegs.COP_REGS.COP.ARFilterCoeff[3];
-        if (!daa_load(&bytes, j))
-                return 0;
-
-        bytes.high = j->m_DAAShadowRegs.COP_REGS.COP.ARFilterCoeff[2];
-        bytes.low = j->m_DAAShadowRegs.COP_REGS.COP.ARFilterCoeff[1];
-        if (!daa_load(&bytes, j))
-                return 0;
-
-        bytes.high = j->m_DAAShadowRegs.COP_REGS.COP.ARFilterCoeff[0];
-        bytes.low = 0x00;
-        if (!daa_load(&bytes, j))
-                return 0;
-
-        if (!SCI_Control(j, SCI_End))
-                return 0;
-        if (!SCI_WaitLowSCI(j))
-                return 0;
-
-        bytes.high = 0x0A;
-        bytes.low = j->m_DAAShadowRegs.COP_REGS.COP.AXFilterCoeff[3];
-        if (!daa_load(&bytes, j))
-                return 0;
-
-        bytes.high = j->m_DAAShadowRegs.COP_REGS.COP.AXFilterCoeff[2];
-        bytes.low = j->m_DAAShadowRegs.COP_REGS.COP.AXFilterCoeff[1];
-        if (!daa_load(&bytes, j))
-                return 0;
-
-        bytes.high = j->m_DAAShadowRegs.COP_REGS.COP.AXFilterCoeff[0];
-        bytes.low = 0x00;
-        if (!daa_load(&bytes, j))
-                return 0;
-
-        if (!SCI_Control(j, SCI_End))
-                return 0;
-        if (!SCI_WaitLowSCI(j))
-                return 0;
-
-        bytes.high = 0x0B;
-        bytes.low = j->m_DAAShadowRegs.COP_REGS.COP.Tone1Coeff[3];
-        if (!daa_load(&bytes, j))
-                return 0;
-
-        bytes.high = j->m_DAAShadowRegs.COP_REGS.COP.Tone1Coeff[2];
-        bytes.low = j->m_DAAShadowRegs.COP_REGS.COP.Tone1Coeff[1];
-        if (!daa_load(&bytes, j))
-                return 0;
-
-        bytes.high = j->m_DAAShadowRegs.COP_REGS.COP.Tone1Coeff[0];
-        bytes.low = 0x00;
-        if (!daa_load(&bytes, j))
-                return 0;
-
-        if (!SCI_Control(j, SCI_End))
-                return 0;
-        if (!SCI_WaitLowSCI(j))
-                return 0;
-
-        bytes.high = 0x0C;
-        bytes.low = j->m_DAAShadowRegs.COP_REGS.COP.Tone2Coeff[3];
-        if (!daa_load(&bytes, j))
-                return 0;
-
-        bytes.high = j->m_DAAShadowRegs.COP_REGS.COP.Tone2Coeff[2];
-        bytes.low = j->m_DAAShadowRegs.COP_REGS.COP.Tone2Coeff[1];
-        if (!daa_load(&bytes, j))
-                return 0;
-
-        bytes.high = j->m_DAAShadowRegs.COP_REGS.COP.Tone2Coeff[0];
-        bytes.low = 0x00;
-        if (!daa_load(&bytes, j))
-                return 0;
-
-        if (!SCI_Control(j, SCI_End))
-                return 0;
-        if (!SCI_WaitLowSCI(j))
-                return 0;
-
-        bytes.high = 0x0D;
-        bytes.low = j->m_DAAShadowRegs.COP_REGS.COP.LevelmeteringRinging[3];
-        if (!daa_load(&bytes, j))
-                return 0;
-
-        bytes.high = j->m_DAAShadowRegs.COP_REGS.COP.LevelmeteringRinging[2];
-        bytes.low = j->m_DAAShadowRegs.COP_REGS.COP.LevelmeteringRinging[1];
-        if (!daa_load(&bytes, j))
-                return 0;
-
-        bytes.high = j->m_DAAShadowRegs.COP_REGS.COP.LevelmeteringRinging[0];
-        bytes.low = 0x00;
-        if (!daa_load(&bytes, j))
-                return 0;
-
-        if (!SCI_Control(j, SCI_End))
-                return 0;
-        if (!SCI_WaitLowSCI(j))
-                return 0;
-
-        bytes.high = 0x0E;
-        bytes.low = j->m_DAAShadowRegs.COP_REGS.COP.CallerID1stTone[7];
-        if (!daa_load(&bytes, j))
-                return 0;
-
-        bytes.high = j->m_DAAShadowRegs.COP_REGS.COP.CallerID1stTone[6];
-        bytes.low = j->m_DAAShadowRegs.COP_REGS.COP.CallerID1stTone[5];
-        if (!daa_load(&bytes, j))
-                return 0;
-
-        bytes.high = j->m_DAAShadowRegs.COP_REGS.COP.CallerID1stTone[4];
-        bytes.low = j->m_DAAShadowRegs.COP_REGS.COP.CallerID1stTone[3];
-        if (!daa_load(&bytes, j))
-                return 0;
-
-        bytes.high = j->m_DAAShadowRegs.COP_REGS.COP.CallerID1stTone[2];
-        bytes.low = j->m_DAAShadowRegs.COP_REGS.COP.CallerID1stTone[1];
-        if (!daa_load(&bytes, j))
-                return 0;
-
-        bytes.high = j->m_DAAShadowRegs.COP_REGS.COP.CallerID1stTone[0];
-        bytes.low = 0x00;
-        if (!daa_load(&bytes, j))
-                return 0;
-
-        if (!SCI_Control(j, SCI_End))
-                return 0;
-        if (!SCI_WaitLowSCI(j))
-                return 0;
-
-        bytes.high = 0x0F;
-        bytes.low = j->m_DAAShadowRegs.COP_REGS.COP.CallerID2ndTone[7];
-        if (!daa_load(&bytes, j))
-                return 0;
-
-        bytes.high = j->m_DAAShadowRegs.COP_REGS.COP.CallerID2ndTone[6];
-        bytes.low = j->m_DAAShadowRegs.COP_REGS.COP.CallerID2ndTone[5];
-        if (!daa_load(&bytes, j))
-                return 0;
-
-        bytes.high = j->m_DAAShadowRegs.COP_REGS.COP.CallerID2ndTone[4];
-        bytes.low = j->m_DAAShadowRegs.COP_REGS.COP.CallerID2ndTone[3];
-        if (!daa_load(&bytes, j))
-                return 0;
-
-        bytes.high = j->m_DAAShadowRegs.COP_REGS.COP.CallerID2ndTone[2];
-        bytes.low = j->m_DAAShadowRegs.COP_REGS.COP.CallerID2ndTone[1];
-        if (!daa_load(&bytes, j))
-                return 0;
-
-        bytes.high = j->m_DAAShadowRegs.COP_REGS.COP.CallerID2ndTone[0];
-        bytes.low = 0x00;
-        if (!daa_load(&bytes, j))
-                return 0;
-
-        udelay(32);
-        j->pld_scrr.byte = inb_p(j->XILINXbase);
-        if (!SCI_Control(j, SCI_End))
-                return 0;
-
-        outb_p(j->pld_scrw.byte, j->XILINXbase);
-
-        if (ixjdebug & 0x0002)
-                printk("DAA Coefficients Loaded\n");
-
-        j->flags.pstncheck = 0;
-        return 1;
-}
-
-static int ixj_set_tone_off(unsigned short arg, IXJ *j)
-{
-        j->tone_off_time = arg;
-        if (ixj_WriteDSPCommand(0x6E05, j))             /* Set Tone Off Period */
-
-                return -1;
-        if (ixj_WriteDSPCommand(arg, j))
-                return -1;
-        return 0;
-}
-
-static int ixj_get_tone_on(IXJ *j)
-{
-        if (ixj_WriteDSPCommand(0x6E06, j))             /* Get Tone On Period */
-
-                return -1;
-        return 0;
-}
-
-static int ixj_get_tone_off(IXJ *j)
-{
-        if (ixj_WriteDSPCommand(0x6E07, j))             /* Get Tone Off Period */
-
-                return -1;
-        return 0;
-}
-
-static void ixj_busytone(IXJ *j)
-{
-        j->flags.ringback = 0;
-        j->flags.dialtone = 0;
-        j->flags.busytone = 1;
-        ixj_set_tone_on(0x07D0, j);
-        ixj_set_tone_off(0x07D0, j);
-        ixj_play_tone(j, 27);
-}
-
-static void ixj_dialtone(IXJ *j)
-{
-        j->flags.ringback = 0;
-        j->flags.dialtone = 1;
-        j->flags.busytone = 0;
-        if (j->dsp.low == 0x20) {
-                return;
-        } else {
-                ixj_set_tone_on(0xFFFF, j);
-                ixj_set_tone_off(0x0000, j);
-                ixj_play_tone(j, 25);
-        }
-}
-
-static void ixj_cpt_stop(IXJ *j)
-{
-        if(j->tone_state || j->tone_cadence_state)
-        {
-                j->flags.dialtone = 0;
-                j->flags.busytone = 0;
-                j->flags.ringback = 0;
-                ixj_set_tone_on(0x0001, j);
-                ixj_set_tone_off(0x0000, j);
-                ixj_play_tone(j, 0);
-                j->tone_state = j->tone_cadence_state = 0;
-                if (j->cadence_t) {
-                        kfree(j->cadence_t->ce);
-                        kfree(j->cadence_t);
-                        j->cadence_t = NULL;
-                }
-        }
-        if (j->play_mode == -1 && j->rec_mode == -1)
-                idle(j);
-        if (j->play_mode != -1 && j->dsp.low == 0x20)
-                ixj_play_start(j);
-        if (j->rec_mode != -1 && j->dsp.low == 0x20)
-                ixj_record_start(j);
-}
-
-static void ixj_ringback(IXJ *j)
-{
-        j->flags.busytone = 0;
-        j->flags.dialtone = 0;
-        j->flags.ringback = 1;
-        ixj_set_tone_on(0x0FA0, j);
-        ixj_set_tone_off(0x2EE0, j);
-        ixj_play_tone(j, 26);
-}
-
-static void ixj_testram(IXJ *j)
-{
-        ixj_WriteDSPCommand(0x3001, j); /* Test External SRAM */
-}
-
-static int ixj_build_cadence(IXJ *j, IXJ_CADENCE __user * cp)
-{
-        ixj_cadence *lcp;
-        IXJ_CADENCE_ELEMENT __user *cep;
-        IXJ_CADENCE_ELEMENT *lcep;
-        IXJ_TONE ti;
-        int err;
-
-        lcp = kmalloc(sizeof(ixj_cadence), GFP_KERNEL);
-        if (lcp == NULL)
-                return -ENOMEM;
-
-        err = -EFAULT;
-        if (copy_from_user(&lcp->elements_used,
-                           &cp->elements_used, sizeof(int)))
-                goto out;
-        if (copy_from_user(&lcp->termination,
-                           &cp->termination, sizeof(IXJ_CADENCE_TERM)))
-                goto out;
-        if (get_user(cep, &cp->ce))
-                goto out;
-
-        err = -EINVAL;
-        if ((unsigned)lcp->elements_used >= ~0U/sizeof(IXJ_CADENCE_ELEMENT))
-                goto out;
-
-        err = -ENOMEM;
-        lcep = kmalloc(sizeof(IXJ_CADENCE_ELEMENT) * lcp->elements_used, GFP_KERNEL);
-        if (!lcep)
-                goto out;
-
-        err = -EFAULT;
-        if (copy_from_user(lcep, cep, sizeof(IXJ_CADENCE_ELEMENT) * lcp->elements_used))
-                goto out1;
-
-        if (j->cadence_t) {
-                kfree(j->cadence_t->ce);
-                kfree(j->cadence_t);
-        }
-        lcp->ce = (void *) lcep;
-        j->cadence_t = lcp;
-        j->tone_cadence_state = 0;
-        ixj_set_tone_on(lcp->ce[0].tone_on_time, j);
-        ixj_set_tone_off(lcp->ce[0].tone_off_time, j);
-        if (j->cadence_t->ce[j->tone_cadence_state].freq0) {
-                ti.tone_index = j->cadence_t->ce[j->tone_cadence_state].index;
-                ti.freq0 = j->cadence_t->ce[j->tone_cadence_state].freq0;
-                ti.gain0 = j->cadence_t->ce[j->tone_cadence_state].gain0;
-                ti.freq1 = j->cadence_t->ce[j->tone_cadence_state].freq1;
-                ti.gain1 = j->cadence_t->ce[j->tone_cadence_state].gain1;
-                ixj_init_tone(j, &ti);
-        }
-        ixj_play_tone(j, lcp->ce[0].index);
-        return 1;
-out1:
-        kfree(lcep);
-out:
-        kfree(lcp);
-        return err;
-}
-
-static int ixj_build_filter_cadence(IXJ *j, IXJ_FILTER_CADENCE __user * cp)
-{
-        IXJ_FILTER_CADENCE *lcp;
-        lcp = memdup_user(cp, sizeof(IXJ_FILTER_CADENCE));
-        if (IS_ERR(lcp)) {
-                if(ixjdebug & 0x0001) {
-                        printk(KERN_INFO "Could not allocate memory for cadence or could not copy cadence to kernel\n");
-                }
-                return PTR_ERR(lcp);
-        }
-        if (lcp->filter > 5) {
-                if(ixjdebug & 0x0001) {
-                        printk(KERN_INFO "Cadence out of range\n");
-                }
-                kfree(lcp);
-                return -1;
-        }
-        j->cadence_f[lcp->filter].state = 0;
-        j->cadence_f[lcp->filter].enable = lcp->enable;
-        j->filter_en[lcp->filter] = j->cadence_f[lcp->filter].en_filter = lcp->en_filter;
-        j->cadence_f[lcp->filter].on1 = lcp->on1;
-        j->cadence_f[lcp->filter].on1min = 0;
-        j->cadence_f[lcp->filter].on1max = 0;
-        j->cadence_f[lcp->filter].off1 = lcp->off1;
-        j->cadence_f[lcp->filter].off1min = 0;
-        j->cadence_f[lcp->filter].off1max = 0;
-        j->cadence_f[lcp->filter].on2 = lcp->on2;
-        j->cadence_f[lcp->filter].on2min = 0;
-        j->cadence_f[lcp->filter].on2max = 0;
-        j->cadence_f[lcp->filter].off2 = lcp->off2;
-        j->cadence_f[lcp->filter].off2min = 0;
-        j->cadence_f[lcp->filter].off2max = 0;
-        j->cadence_f[lcp->filter].on3 = lcp->on3;
-        j->cadence_f[lcp->filter].on3min = 0;
-        j->cadence_f[lcp->filter].on3max = 0;
-        j->cadence_f[lcp->filter].off3 = lcp->off3;
-        j->cadence_f[lcp->filter].off3min = 0;
-        j->cadence_f[lcp->filter].off3max = 0;
-        if(ixjdebug & 0x0002) {
-                printk(KERN_INFO "Cadence %d loaded\n", lcp->filter);
-        }
-        kfree(lcp);
-        return 0;
-}
-
-static void add_caps(IXJ *j)
-{
-        j->caps = 0;
-        j->caplist[j->caps].cap = PHONE_VENDOR_QUICKNET;
-        strcpy(j->caplist[j->caps].desc, "Quicknet Technologies, Inc. (www.quicknet.net)");
-        j->caplist[j->caps].captype = vendor;
-        j->caplist[j->caps].handle = j->caps;
-        j->caps++;
-        j->caplist[j->caps].captype = device;
-        switch (j->cardtype) {
-        case QTI_PHONEJACK:
-                strcpy(j->caplist[j->caps].desc, "Quicknet Internet PhoneJACK");
-                break;
-        case QTI_LINEJACK:
-                strcpy(j->caplist[j->caps].desc, "Quicknet Internet LineJACK");
-                break;
-        case QTI_PHONEJACK_LITE:
-                strcpy(j->caplist[j->caps].desc, "Quicknet Internet PhoneJACK Lite");
-                break;
-        case QTI_PHONEJACK_PCI:
-                strcpy(j->caplist[j->caps].desc, "Quicknet Internet PhoneJACK PCI");
-                break;
-        case QTI_PHONECARD:
-                strcpy(j->caplist[j->caps].desc, "Quicknet Internet PhoneCARD");
-                break;
-        }
-        j->caplist[j->caps].cap = j->cardtype;
-        j->caplist[j->caps].handle = j->caps;
-        j->caps++;
-        strcpy(j->caplist[j->caps].desc, "POTS");
-        j->caplist[j->caps].captype = port;
-        j->caplist[j->caps].cap = pots;
-        j->caplist[j->caps].handle = j->caps;
-        j->caps++;
-
-        /* add devices that can do speaker/mic */
-        switch (j->cardtype) {
-        case QTI_PHONEJACK:
-        case QTI_LINEJACK:
-        case QTI_PHONEJACK_PCI:
-        case QTI_PHONECARD:
-                strcpy(j->caplist[j->caps].desc, "SPEAKER");
-                j->caplist[j->caps].captype = port;
-                j->caplist[j->caps].cap = speaker;
-                j->caplist[j->caps].handle = j->caps;
-                j->caps++;
-        default:
-                break;
-        }
-
-        /* add devices that can do handset */
-        switch (j->cardtype) {
-        case QTI_PHONEJACK:
-                strcpy(j->caplist[j->caps].desc, "HANDSET");
-                j->caplist[j->caps].captype = port;
-                j->caplist[j->caps].cap = handset;
-                j->caplist[j->caps].handle = j->caps;
-                j->caps++;
-                break;
-        default:
-                break;
-        }
-
-        /* add devices that can do PSTN */
-        switch (j->cardtype) {
-        case QTI_LINEJACK:
-                strcpy(j->caplist[j->caps].desc, "PSTN");
-                j->caplist[j->caps].captype = port;
-                j->caplist[j->caps].cap = pstn;
-                j->caplist[j->caps].handle = j->caps;
-                j->caps++;
-                break;
-        default:
-                break;
-        }
-
-        /* add codecs - all cards can do uLaw, linear 8/16, and Windows sound system */
-        strcpy(j->caplist[j->caps].desc, "ULAW");
-        j->caplist[j->caps].captype = codec;
-        j->caplist[j->caps].cap = ULAW;
-        j->caplist[j->caps].handle = j->caps;
-        j->caps++;
-
-        strcpy(j->caplist[j->caps].desc, "LINEAR 16 bit");
-        j->caplist[j->caps].captype = codec;
-        j->caplist[j->caps].cap = LINEAR16;
-        j->caplist[j->caps].handle = j->caps;
-        j->caps++;
-
-        strcpy(j->caplist[j->caps].desc, "LINEAR 8 bit");
-        j->caplist[j->caps].captype = codec;
-        j->caplist[j->caps].cap = LINEAR8;
-        j->caplist[j->caps].handle = j->caps;
-        j->caps++;
-
-        strcpy(j->caplist[j->caps].desc, "Windows Sound System");
-        j->caplist[j->caps].captype = codec;
-        j->caplist[j->caps].cap = WSS;
-        j->caplist[j->caps].handle = j->caps;
-        j->caps++;
-
-        /* software ALAW codec, made from ULAW */
-        strcpy(j->caplist[j->caps].desc, "ALAW");
-        j->caplist[j->caps].captype = codec;
-        j->caplist[j->caps].cap = ALAW;
-        j->caplist[j->caps].handle = j->caps;
-        j->caps++;
-
-        /* version 12 of the 8020 does the following codecs in a broken way */
-        if (j->dsp.low != 0x20 || j->ver.low != 0x12) {
-                strcpy(j->caplist[j->caps].desc, "G.723.1 6.3kbps");
-                j->caplist[j->caps].captype = codec;
-                j->caplist[j->caps].cap = G723_63;
-                j->caplist[j->caps].handle = j->caps;
-                j->caps++;
-
-                strcpy(j->caplist[j->caps].desc, "G.723.1 5.3kbps");
-                j->caplist[j->caps].captype = codec;
-                j->caplist[j->caps].cap = G723_53;
-                j->caplist[j->caps].handle = j->caps;
-                j->caps++;
-
-                strcpy(j->caplist[j->caps].desc, "TrueSpeech 4.8kbps");
-                j->caplist[j->caps].captype = codec;
-                j->caplist[j->caps].cap = TS48;
-                j->caplist[j->caps].handle = j->caps;
-                j->caps++;
-
-                strcpy(j->caplist[j->caps].desc, "TrueSpeech 4.1kbps");
-                j->caplist[j->caps].captype = codec;
-                j->caplist[j->caps].cap = TS41;
-                j->caplist[j->caps].handle = j->caps;
-                j->caps++;
-        }
-
-        /* 8020 chips can do TS8.5 native, and 8021/8022 can load it */
-        if (j->dsp.low == 0x20 || j->flags.ts85_loaded) {
-                strcpy(j->caplist[j->caps].desc, "TrueSpeech 8.5kbps");
-                j->caplist[j->caps].captype = codec;
-                j->caplist[j->caps].cap = TS85;
-                j->caplist[j->caps].handle = j->caps;
-                j->caps++;
-        }
-
-        /* 8021 chips can do G728 */
-        if (j->dsp.low == 0x21) {
-                strcpy(j->caplist[j->caps].desc, "G.728 16kbps");
-                j->caplist[j->caps].captype = codec;
-                j->caplist[j->caps].cap = G728;
-                j->caplist[j->caps].handle = j->caps;
-                j->caps++;
-        }
-
-        /* 8021/8022 chips can do G729 if loaded */
-        if (j->dsp.low != 0x20 && j->flags.g729_loaded) {
-                strcpy(j->caplist[j->caps].desc, "G.729A 8kbps");
-                j->caplist[j->caps].captype = codec;
-                j->caplist[j->caps].cap = G729;
-                j->caplist[j->caps].handle = j->caps;
-                j->caps++;
-        }
-        if (j->dsp.low != 0x20 && j->flags.g729_loaded) {
-                strcpy(j->caplist[j->caps].desc, "G.729B 8kbps");
-                j->caplist[j->caps].captype = codec;
-                j->caplist[j->caps].cap = G729B;
-                j->caplist[j->caps].handle = j->caps;
-                j->caps++;
-        }
-}
-
-static int capabilities_check(IXJ *j, struct phone_capability *pcreq)
-{
-        int cnt;
-        int retval = 0;
-        for (cnt = 0; cnt < j->caps; cnt++) {
-                if (pcreq->captype == j->caplist[cnt].captype
-                    && pcreq->cap == j->caplist[cnt].cap) {
-                        retval = 1;
-                        break;
-                }
-        }
-        return retval;
-}
-
-static long do_ixj_ioctl(struct file *file_p, unsigned int cmd, unsigned long arg)
-{
-        IXJ_TONE ti;
-        IXJ_FILTER jf;
-        IXJ_FILTER_RAW jfr;
-        void __user *argp = (void __user *)arg;
-        struct inode *inode = file_p->f_path.dentry->d_inode;
-        unsigned int minor = iminor(inode);
-        unsigned int raise, mant;
-        int board = NUM(inode);
-
-        IXJ *j = get_ixj(NUM(inode));
-
-        int retval = 0;
-
-        /*
-         *    Set up locks to ensure that only one process is talking to the DSP at a time.
-         *    This is necessary to keep the DSP from locking up.
-         */
-        while(test_and_set_bit(board, (void *)&j->busyflags) != 0)
-                schedule_timeout_interruptible(1);
-        if (ixjdebug & 0x0040)
-                printk("phone%d ioctl, cmd: 0x%x, arg: 0x%lx\n", minor, cmd, arg);
-        if (minor >= IXJMAX) {
-                clear_bit(board, &j->busyflags);
-                return -ENODEV;
-        }
-        /*
-         *    Check ioctls only root can use.
-         */
-        if (!capable(CAP_SYS_ADMIN)) {
-                switch (cmd) {
-                case IXJCTL_TESTRAM:
-                case IXJCTL_HZ:
-                        retval = -EPERM;
-                }
-        }
-        switch (cmd) {
-        case IXJCTL_TESTRAM:
-                ixj_testram(j);
-                retval = (j->ssr.high << 8) + j->ssr.low;
-                break;
-        case IXJCTL_CARDTYPE:
-                retval = j->cardtype;
-                break;
-        case IXJCTL_SERIAL:
-                retval = j->serial;
-                break;
-        case IXJCTL_VERSION:
-                {
-                        char arg_str[100];
-                        snprintf(arg_str, sizeof(arg_str),
-                                "\nDriver version %i.%i.%i", IXJ_VER_MAJOR,
-                                IXJ_VER_MINOR, IXJ_BLD_VER);
-                        if (copy_to_user(argp, arg_str, strlen(arg_str)))
-                                retval = -EFAULT;
-                }
-                break;
-        case PHONE_RING_CADENCE:
-                j->ring_cadence = arg;
-                break;
-        case IXJCTL_CIDCW:
-                if(arg) {
-                        if (copy_from_user(&j->cid_send, argp, sizeof(PHONE_CID))) {
-                                retval = -EFAULT;
-                                break;
-                        }
-                } else {
-                        memset(&j->cid_send, 0, sizeof(PHONE_CID));
-                }
-                ixj_write_cidcw(j);
-                break;
-        /* Binary compatbility */
-        case OLD_PHONE_RING_START:
-                arg = 0;
-                /* Fall through */
-        case PHONE_RING_START:
-                if(arg) {
-                        if (copy_from_user(&j->cid_send, argp, sizeof(PHONE_CID))) {
-                                retval = -EFAULT;
-                                break;
-                        }
-                        ixj_write_cid(j);
-                } else {
-                        memset(&j->cid_send, 0, sizeof(PHONE_CID));
-                }
-                ixj_ring_start(j);
-                break;
-        case PHONE_RING_STOP:
-                j->flags.cringing = 0;
-                if(j->cadence_f[5].enable) {
-                        j->cadence_f[5].state = 0;
-                }
-                ixj_ring_off(j);
-                break;
-        case PHONE_RING:
-                retval = ixj_ring(j);
-                break;
-        case PHONE_EXCEPTION:
-                retval = j->ex.bytes;
-                if(j->ex.bits.flash) {
-                        j->flash_end = 0;
-                        j->ex.bits.flash = 0;
-                }
-                j->ex.bits.pstn_ring = 0;
-                j->ex.bits.caller_id = 0;
-                j->ex.bits.pstn_wink = 0;
-                j->ex.bits.f0 = 0;
-                j->ex.bits.f1 = 0;
-                j->ex.bits.f2 = 0;
-                j->ex.bits.f3 = 0;
-                j->ex.bits.fc0 = 0;
-                j->ex.bits.fc1 = 0;
-                j->ex.bits.fc2 = 0;
-                j->ex.bits.fc3 = 0;
-                j->ex.bits.reserved = 0;
-                break;
-        case PHONE_HOOKSTATE:
-                j->ex.bits.hookstate = 0;
-                retval = j->hookstate;  //j->r_hook;
-                break;
-        case IXJCTL_SET_LED:
-                LED_SetState(arg, j);
-                break;
-        case PHONE_FRAME:
-                retval = set_base_frame(j, arg);
-                break;
-        case PHONE_REC_CODEC:
-                retval = set_rec_codec(j, arg);
-                break;
-        case PHONE_VAD:
-                ixj_vad(j, arg);
-                break;
-        case PHONE_REC_START:
-                ixj_record_start(j);
-                break;
-        case PHONE_REC_STOP:
-                ixj_record_stop(j);
-                break;
-        case PHONE_REC_DEPTH:
-                set_rec_depth(j, arg);
-                break;
-        case PHONE_REC_VOLUME:
-                if(arg == -1) {
-                        retval = get_rec_volume(j);
-                }
-                else {
-                        set_rec_volume(j, arg);
-                        retval = arg;
-                }
-                break;
-        case PHONE_REC_VOLUME_LINEAR:
-                if(arg == -1) {
-                        retval = get_rec_volume_linear(j);
-                }
-                else {
-                        set_rec_volume_linear(j, arg);
-                        retval = arg;
-                }
-                break;
-        case IXJCTL_DTMF_PRESCALE:
-                if(arg == -1) {
-                        retval = get_dtmf_prescale(j);
-                }
-                else {
-                        set_dtmf_prescale(j, arg);
-                        retval = arg;
-                }
-                break;
-        case PHONE_REC_LEVEL:
-                retval = get_rec_level(j);
-                break;
-        case IXJCTL_SC_RXG:
-                retval = ixj_siadc(j, arg);
-                break;
-        case IXJCTL_SC_TXG:
-                retval = ixj_sidac(j, arg);
-                break;
-        case IXJCTL_AEC_START:
-                ixj_aec_start(j, arg);
-                break;
-        case IXJCTL_AEC_STOP:
-                aec_stop(j);
-                break;
-        case IXJCTL_AEC_GET_LEVEL:
-                retval = j->aec_level;
-                break;
-        case PHONE_PLAY_CODEC:
-                retval = set_play_codec(j, arg);
-                break;
-        case PHONE_PLAY_START:
-                retval = ixj_play_start(j);
-                break;
-        case PHONE_PLAY_STOP:
-                ixj_play_stop(j);
-                break;
-        case PHONE_PLAY_DEPTH:
-                set_play_depth(j, arg);
-                break;
-        case PHONE_PLAY_VOLUME:
-                if(arg == -1) {
-                        retval = get_play_volume(j);
-                }
-                else {
-                        set_play_volume(j, arg);
-                        retval = arg;
-                }
-                break;
-        case PHONE_PLAY_VOLUME_LINEAR:
-                if(arg == -1) {
-                        retval = get_play_volume_linear(j);
-                }
-                else {
-                        set_play_volume_linear(j, arg);
-                        retval = arg;
-                }
-                break;
-        case PHONE_PLAY_LEVEL:
-                retval = get_play_level(j);
-                break;
-        case IXJCTL_DSP_TYPE:
-                retval = (j->dsp.high << 8) + j->dsp.low;
-                break;
-        case IXJCTL_DSP_VERSION:
-                retval = (j->ver.high << 8) + j->ver.low;
-                break;
-        case IXJCTL_HZ:
-                hertz = arg;
-                break;
-        case IXJCTL_RATE:
-                if (arg > hertz)
-                        retval = -1;
-                else
-                        samplerate = arg;
-                break;
-        case IXJCTL_DRYBUFFER_READ:
-                put_user(j->drybuffer, (unsigned long __user *) argp);
-                break;
-        case IXJCTL_DRYBUFFER_CLEAR:
-                j->drybuffer = 0;
-                break;
-        case IXJCTL_FRAMES_READ:
-                put_user(j->framesread, (unsigned long __user *) argp);
-                break;
-        case IXJCTL_FRAMES_WRITTEN:
-                put_user(j->frameswritten, (unsigned long __user *) argp);
-                break;
-        case IXJCTL_READ_WAIT:
-                put_user(j->read_wait, (unsigned long __user *) argp);
-                break;
-        case IXJCTL_WRITE_WAIT:
-                put_user(j->write_wait, (unsigned long __user *) argp);
-                break;
-        case PHONE_MAXRINGS:
-                j->maxrings = arg;
-                break;
-        case PHONE_SET_TONE_ON_TIME:
-                ixj_set_tone_on(arg, j);
-                break;
-        case PHONE_SET_TONE_OFF_TIME:
-                ixj_set_tone_off(arg, j);
-                break;
-        case PHONE_GET_TONE_ON_TIME:
-                if (ixj_get_tone_on(j)) {
-                        retval = -1;
-                } else {
-                        retval = (j->ssr.high << 8) + j->ssr.low;
-                }
-                break;
-        case PHONE_GET_TONE_OFF_TIME:
-                if (ixj_get_tone_off(j)) {
-                        retval = -1;
-                } else {
-                        retval = (j->ssr.high << 8) + j->ssr.low;
-                }
-                break;
-        case PHONE_PLAY_TONE:
-                if (!j->tone_state)
-                        retval = ixj_play_tone(j, arg);
-                else
-                        retval = -1;
-                break;
-        case PHONE_GET_TONE_STATE:
-                retval = j->tone_state;
-                break;
-        case PHONE_DTMF_READY:
-                retval = j->ex.bits.dtmf_ready;
-                break;
-        case PHONE_GET_DTMF:
-                if (ixj_hookstate(j)) {
-                        if (j->dtmf_rp != j->dtmf_wp) {
-                                retval = j->dtmfbuffer[j->dtmf_rp];
-                                j->dtmf_rp++;
-                                if (j->dtmf_rp == 79)
-                                        j->dtmf_rp = 0;
-                                if (j->dtmf_rp == j->dtmf_wp) {
-                                        j->ex.bits.dtmf_ready = j->dtmf_rp = j->dtmf_wp = 0;
-                                }
-                        }
-                }
-                break;
-        case PHONE_GET_DTMF_ASCII:
-                if (ixj_hookstate(j)) {
-                        if (j->dtmf_rp != j->dtmf_wp) {
-                                switch (j->dtmfbuffer[j->dtmf_rp]) {
-                                case 10:
-                                        retval = 42;    /* '*'; */
-
-                                        break;
-                                case 11:
-                                        retval = 48;    /*'0'; */
-
-                                        break;
-                                case 12:
-                                        retval = 35;    /*'#'; */
-
-                                        break;
-                                case 28:
-                                        retval = 65;    /*'A'; */
-
-                                        break;
-                                case 29:
-                                        retval = 66;    /*'B'; */
-
-                                        break;
-                                case 30:
-                                        retval = 67;    /*'C'; */
-
-                                        break;
-                                case 31:
-                                        retval = 68;    /*'D'; */
-
-                                        break;
-                                default:
-                                        retval = 48 + j->dtmfbuffer[j->dtmf_rp];
-                                        break;
-                                }
-                                j->dtmf_rp++;
-                                if (j->dtmf_rp == 79)
-                                        j->dtmf_rp = 0;
-                                if(j->dtmf_rp == j->dtmf_wp)
-                                {
-                                        j->ex.bits.dtmf_ready = j->dtmf_rp = j->dtmf_wp = 0;
-                                }
-                        }
-                }
-                break;
-        case PHONE_DTMF_OOB:
-                j->flags.dtmf_oob = arg;
-                break;
-        case PHONE_DIALTONE:
-                ixj_dialtone(j);
-                break;
-        case PHONE_BUSY:
-                ixj_busytone(j);
-                break;
-        case PHONE_RINGBACK:
-                ixj_ringback(j);
-                break;
-        case PHONE_WINK:
-                if(j->cardtype == QTI_PHONEJACK)
-                        retval = -1;
-                else
-                        retval = ixj_wink(j);
-                break;
-        case PHONE_CPT_STOP:
-                ixj_cpt_stop(j);
-                break;
-        case PHONE_QUERY_CODEC:
-        {
-                struct phone_codec_data pd;
-                int val;
-                int proto_size[] = {
-                        -1,
-                        12, 10, 16, 9, 8, 48, 5,
-                        40, 40, 80, 40, 40, 6
-                };
-                if(copy_from_user(&pd, argp, sizeof(pd))) {
-                        retval = -EFAULT;
-                        break;
-                }
-                if(pd.type<1 || pd.type>13) {
-                        retval = -EPROTONOSUPPORT;
-                        break;
-                }
-                if(pd.type<G729)
-                        val=proto_size[pd.type];
-                else switch(j->baseframe.low)
-                {
-                        case 0xA0:val=2*proto_size[pd.type];break;
-                        case 0x50:val=proto_size[pd.type];break;
-                        default:val=proto_size[pd.type]*3;break;
-                }
-                pd.buf_min=pd.buf_max=pd.buf_opt=val;
-                if(copy_to_user(argp, &pd, sizeof(pd)))
-                        retval = -EFAULT;
-                break;
-        }
-        case IXJCTL_DSP_IDLE:
-                idle(j);
-                break;
-        case IXJCTL_MIXER:
-                if ((arg & 0xff) == 0xff)
-                        retval = ixj_get_mixer(arg, j);
-                else
-                        ixj_mixer(arg, j);
-                break;
-        case IXJCTL_DAA_COEFF_SET:
-                switch (arg) {
-                case DAA_US:
-                        DAA_Coeff_US(j);
-                        retval = ixj_daa_write(j);
-                        break;
-                case DAA_UK:
-                        DAA_Coeff_UK(j);
-                        retval = ixj_daa_write(j);
-                        break;
-                case DAA_FRANCE:
-                        DAA_Coeff_France(j);
-                        retval = ixj_daa_write(j);
-                        break;
-                case DAA_GERMANY:
-                        DAA_Coeff_Germany(j);
-                        retval = ixj_daa_write(j);
-                        break;
-                case DAA_AUSTRALIA:
-                        DAA_Coeff_Australia(j);
-                        retval = ixj_daa_write(j);
-                        break;
-                case DAA_JAPAN:
-                        DAA_Coeff_Japan(j);
-                        retval = ixj_daa_write(j);
-                        break;
-                default:
-                        retval = 1;
-                        break;
-                }
-                break;
-        case IXJCTL_DAA_AGAIN:
-                ixj_daa_cr4(j, arg | 0x02);
-                break;
-        case IXJCTL_PSTN_LINETEST:
-                retval = ixj_linetest(j);
-                break;
-        case IXJCTL_VMWI:
-                ixj_write_vmwi(j, arg);
-                break;
-        case IXJCTL_CID:
-                if (copy_to_user(argp, &j->cid, sizeof(PHONE_CID)))
-                        retval = -EFAULT;
-                j->ex.bits.caller_id = 0;
-                break;
-        case IXJCTL_WINK_DURATION:
-                j->winktime = arg;
-                break;
-        case IXJCTL_PORT:
-                if (arg)
-                        retval = ixj_set_port(j, arg);
-                else
-                        retval = j->port;
-                break;
-        case IXJCTL_POTS_PSTN:
-                retval = ixj_set_pots(j, arg);
-                break;
-        case PHONE_CAPABILITIES:
-                add_caps(j);
-                retval = j->caps;
-                break;
-        case PHONE_CAPABILITIES_LIST:
-                add_caps(j);
-                if (copy_to_user(argp, j->caplist, sizeof(struct phone_capability) * j->caps))
-                        retval = -EFAULT;
-                break;
-        case PHONE_CAPABILITIES_CHECK:
-                {
-                        struct phone_capability cap;
-                        if (copy_from_user(&cap, argp, sizeof(cap)))
-                                retval = -EFAULT;
-                        else {
-                                add_caps(j);
-                                retval = capabilities_check(j, &cap);
-                        }
-                }
-                break;
-        case PHONE_PSTN_SET_STATE:
-                daa_set_mode(j, arg);
-                break;
-        case PHONE_PSTN_GET_STATE:
-                retval = j->daa_mode;
-                j->ex.bits.pstn_ring = 0;
-                break;
-        case IXJCTL_SET_FILTER:
-                if (copy_from_user(&jf, argp, sizeof(jf)))
-                        retval = -EFAULT;
-                else
-                        retval = ixj_init_filter(j, &jf);
-                break;
-        case IXJCTL_SET_FILTER_RAW:
-                if (copy_from_user(&jfr, argp, sizeof(jfr)))
-                        retval = -EFAULT;
-                else
-                        retval = ixj_init_filter_raw(j, &jfr);
-                break;
-        case IXJCTL_GET_FILTER_HIST:
-                if(arg<0||arg>3)
-                        retval = -EINVAL;
-                else
-                        retval = j->filter_hist[arg];
-                break;
-        case IXJCTL_INIT_TONE:
-                if (copy_from_user(&ti, argp, sizeof(ti)))
-                        retval = -EFAULT;
-                else
-                        retval = ixj_init_tone(j, &ti);
-                break;
-        case IXJCTL_TONE_CADENCE:
-                retval = ixj_build_cadence(j, argp);
-                break;
-        case IXJCTL_FILTER_CADENCE:
-                retval = ixj_build_filter_cadence(j, argp);
-                break;
-        case IXJCTL_SIGCTL:
-                if (copy_from_user(&j->sigdef, argp, sizeof(IXJ_SIGDEF))) {
-                        retval = -EFAULT;
-                        break;
-                }
-                j->ixj_signals[j->sigdef.event] = j->sigdef.signal;
-                if(j->sigdef.event < 33) {
-                        raise = 1;
-                        for(mant = 0; mant < j->sigdef.event; mant++){
-                                raise *= 2;
-                        }
-                        if(j->sigdef.signal)
-                                j->ex_sig.bytes |= raise;
-                        else
-                                j->ex_sig.bytes &= (raise^0xffff);
-                }
-                break;
-        case IXJCTL_INTERCOM_STOP:
-                if(arg < 0 || arg >= IXJMAX)
-                        return -EINVAL;
-                j->intercom = -1;
-                ixj_record_stop(j);
-                ixj_play_stop(j);
-                idle(j);
-                get_ixj(arg)->intercom = -1;
-                ixj_record_stop(get_ixj(arg));
-                ixj_play_stop(get_ixj(arg));
-                idle(get_ixj(arg));
-                break;
-        case IXJCTL_INTERCOM_START:
-                if(arg < 0 || arg >= IXJMAX)
-                        return -EINVAL;
-                j->intercom = arg;
-                ixj_record_start(j);
-                ixj_play_start(j);
-                get_ixj(arg)->intercom = board;
-                ixj_play_start(get_ixj(arg));
-                ixj_record_start(get_ixj(arg));
-                break;
-        }
-        if (ixjdebug & 0x0040)
-                printk("phone%d ioctl end, cmd: 0x%x, arg: 0x%lx\n", minor, cmd, arg);
-        clear_bit(board, &j->busyflags);
-        return retval;
-}
-
-static long ixj_ioctl(struct file *file_p, unsigned int cmd, unsigned long arg)
-{
-        long ret;
-        mutex_lock(&ixj_mutex);
-        ret = do_ixj_ioctl(file_p, cmd, arg);
-        mutex_unlock(&ixj_mutex);
-        return ret;
-}
-
-static int ixj_fasync(int fd, struct file *file_p, int mode)
-{
-        IXJ *j = get_ixj(NUM(file_p->f_path.dentry->d_inode));
-
-        return fasync_helper(fd, file_p, mode, &j->async_queue);
-}
-
-static const struct file_operations ixj_fops =
-{
-        .owner          = THIS_MODULE,
-        .read           = ixj_enhanced_read,
-        .write          = ixj_enhanced_write,
-        .poll           = ixj_poll,
-        .unlocked_ioctl = ixj_ioctl,
-        .release        = ixj_release,
-        .fasync         = ixj_fasync,
-        .llseek  = default_llseek,
-};
-
-static int ixj_linetest(IXJ *j)
-{
-        j->flags.pstncheck = 1; /* Testing */
-        j->flags.pstn_present = 0; /* Assume the line is not there */
-
-        daa_int_read(j);        /*Clear DAA Interrupt flags */
-        /* */
-        /* Hold all relays in the normally de-energized position. */
-        /* */
-
-        j->pld_slicw.bits.rly1 = 0;
-        j->pld_slicw.bits.rly2 = 0;
-        j->pld_slicw.bits.rly3 = 0;
-        outb_p(j->pld_slicw.byte, j->XILINXbase + 0x01);
-        j->pld_scrw.bits.daafsyncen = 0;        /* Turn off DAA Frame Sync */
-
-        outb_p(j->pld_scrw.byte, j->XILINXbase);
-        j->pld_slicr.byte = inb_p(j->XILINXbase + 0x01);
-        if (j->pld_slicr.bits.potspstn) {
-                j->flags.pots_pstn = 1;
-                j->flags.pots_correct = 0;
-                LED_SetState(0x4, j);
-        } else {
-                j->flags.pots_pstn = 0;
-                j->pld_slicw.bits.rly1 = 0;
-                j->pld_slicw.bits.rly2 = 0;
-                j->pld_slicw.bits.rly3 = 1;
-                outb_p(j->pld_slicw.byte, j->XILINXbase + 0x01);
-                j->pld_scrw.bits.daafsyncen = 0;        /* Turn off DAA Frame Sync */
-
-                outb_p(j->pld_scrw.byte, j->XILINXbase);
-                daa_set_mode(j, SOP_PU_CONVERSATION);
-                msleep(1000);
-                daa_int_read(j);
-                daa_set_mode(j, SOP_PU_RESET);
-                if (j->m_DAAShadowRegs.XOP_REGS.XOP.xr0.bitreg.VDD_OK) {
-                        j->flags.pots_correct = 0;      /* Should not be line voltage on POTS port. */
-                        LED_SetState(0x4, j);
-                        j->pld_slicw.bits.rly3 = 0;
-                        outb_p(j->pld_slicw.byte, j->XILINXbase + 0x01);
-                } else {
-                        j->flags.pots_correct = 1;
-                        LED_SetState(0x8, j);
-                        j->pld_slicw.bits.rly1 = 1;
-                        j->pld_slicw.bits.rly2 = 0;
-                        j->pld_slicw.bits.rly3 = 0;
-                        outb_p(j->pld_slicw.byte, j->XILINXbase + 0x01);
-                }
-        }
-        j->pld_slicw.bits.rly3 = 0;
-        outb_p(j->pld_slicw.byte, j->XILINXbase + 0x01);
-        daa_set_mode(j, SOP_PU_CONVERSATION);
-        msleep(1000);
-        daa_int_read(j);
-        daa_set_mode(j, SOP_PU_RESET);
-        if (j->m_DAAShadowRegs.XOP_REGS.XOP.xr0.bitreg.VDD_OK) {
-                j->pstn_sleeptil = jiffies + (hertz / 4);
-                j->flags.pstn_present = 1;
-        } else {
-                j->flags.pstn_present = 0;
-        }
-        if (j->flags.pstn_present) {
-                if (j->flags.pots_correct) {
-                        LED_SetState(0xA, j);
-                } else {
-                        LED_SetState(0x6, j);
-                }
-        } else {
-                if (j->flags.pots_correct) {
-                        LED_SetState(0x9, j);
-                } else {
-                        LED_SetState(0x5, j);
-                }
-        }
-        j->flags.pstncheck = 0; /* Testing */
-        return j->flags.pstn_present;
-}
-
-static int ixj_selfprobe(IXJ *j)
-{
-        unsigned short cmd;
-        int cnt;
-        BYTES bytes;
-
-        init_waitqueue_head(&j->poll_q);
-        init_waitqueue_head(&j->read_q);
-        init_waitqueue_head(&j->write_q);
-
-        while(atomic_read(&j->DSPWrite) > 0)
-                atomic_dec(&j->DSPWrite);
-        if (ixjdebug & 0x0002)
-                printk(KERN_INFO "Write IDLE to Software Control Register\n");
-        ixj_WriteDSPCommand(0x0FE0, j); /* Put the DSP in full power mode. */
-
-        if (ixj_WriteDSPCommand(0x0000, j))             /* Write IDLE to Software Control Register */
-                return -1;
-/* The read values of the SSR should be 0x00 for the IDLE command */
-        if (j->ssr.low || j->ssr.high)
-                return -1;
-        if (ixjdebug & 0x0002)
-                printk(KERN_INFO "Get Device ID Code\n");
-        if (ixj_WriteDSPCommand(0x3400, j))             /* Get Device ID Code */
-                return -1;
-        j->dsp.low = j->ssr.low;
-        j->dsp.high = j->ssr.high;
-        if (ixjdebug & 0x0002)
-                printk(KERN_INFO "Get Device Version Code\n");
-        if (ixj_WriteDSPCommand(0x3800, j))             /* Get Device Version Code */
-                return -1;
-        j->ver.low = j->ssr.low;
-        j->ver.high = j->ssr.high;
-        if (!j->cardtype) {
-                if (j->dsp.low == 0x21) {
-                        bytes.high = bytes.low = inb_p(j->XILINXbase + 0x02);
-                        outb_p(bytes.low ^ 0xFF, j->XILINXbase + 0x02);
-/* Test for Internet LineJACK or Internet PhoneJACK Lite */
-                        bytes.low = inb_p(j->XILINXbase + 0x02);
-                        if (bytes.low == bytes.high)    /*  Register is read only on */
-                                /*  Internet PhoneJack Lite */
-                         {
-                                j->cardtype = QTI_PHONEJACK_LITE;
-                                if (!request_region(j->XILINXbase, 4, "ixj control")) {
-                                        printk(KERN_INFO "ixj: can't get I/O address 0x%x\n", j->XILINXbase);
-                                        return -1;
-                                }
-                                j->pld_slicw.pcib.e1 = 1;
-                                outb_p(j->pld_slicw.byte, j->XILINXbase);
-                        } else {
-                                j->cardtype = QTI_LINEJACK;
-
-                                if (!request_region(j->XILINXbase, 8, "ixj control")) {
-                                        printk(KERN_INFO "ixj: can't get I/O address 0x%x\n", j->XILINXbase);
-                                        return -1;
-                                }
-                        }
-                } else if (j->dsp.low == 0x22) {
-                        j->cardtype = QTI_PHONEJACK_PCI;
-                        request_region(j->XILINXbase, 4, "ixj control");
-                        j->pld_slicw.pcib.e1 = 1;
-                        outb_p(j->pld_slicw.byte, j->XILINXbase);
-                } else
-                        j->cardtype = QTI_PHONEJACK;
-        } else {
-                switch (j->cardtype) {
-                case QTI_PHONEJACK:
-                        if (!j->dsp.low != 0x20) {
-                                j->dsp.high = 0x80;
-                                j->dsp.low = 0x20;
-                                ixj_WriteDSPCommand(0x3800, j);
-                                j->ver.low = j->ssr.low;
-                                j->ver.high = j->ssr.high;
-                        }
-                        break;
-                case QTI_LINEJACK:
-                        if (!request_region(j->XILINXbase, 8, "ixj control")) {
-                                printk(KERN_INFO "ixj: can't get I/O address 0x%x\n", j->XILINXbase);
-                                return -1;
-                        }
-                        break;
-                case QTI_PHONEJACK_LITE:
-                case QTI_PHONEJACK_PCI:
-                        if (!request_region(j->XILINXbase, 4, "ixj control")) {
-                                printk(KERN_INFO "ixj: can't get I/O address 0x%x\n", j->XILINXbase);
-                                return -1;
-                        }
-                        j->pld_slicw.pcib.e1 = 1;
-                        outb_p(j->pld_slicw.byte, j->XILINXbase);
-                        break;
-                case QTI_PHONECARD:
-                        break;
-                }
-        }
-        if (j->dsp.low == 0x20 || j->cardtype == QTI_PHONEJACK_LITE || j->cardtype == QTI_PHONEJACK_PCI) {
-                if (ixjdebug & 0x0002)
-                        printk(KERN_INFO "Write CODEC config to Software Control Register\n");
-                if (ixj_WriteDSPCommand(0xC462, j))             /* Write CODEC config to Software Control Register */
-                        return -1;
-                if (ixjdebug & 0x0002)
-                        printk(KERN_INFO "Write CODEC timing to Software Control Register\n");
-                if (j->cardtype == QTI_PHONEJACK) {
-                        cmd = 0x9FF2;
-                } else {
-                        cmd = 0x9FF5;
-                }
-                if (ixj_WriteDSPCommand(cmd, j))        /* Write CODEC timing to Software Control Register */
-                        return -1;
-        } else {
-                if (set_base_frame(j, 30) != 30)
-                        return -1;
-                if (ixjdebug & 0x0002)
-                        printk(KERN_INFO "Write CODEC config to Software Control Register\n");
-                if (j->cardtype == QTI_PHONECARD) {
-                        if (ixj_WriteDSPCommand(0xC528, j))             /* Write CODEC config to Software Control Register */
-                                return -1;
-                }
-                if (j->cardtype == QTI_LINEJACK) {
-                        if (ixj_WriteDSPCommand(0xC528, j))             /* Write CODEC config to Software Control Register */
-                                return -1;
-                        if (ixjdebug & 0x0002)
-                                printk(KERN_INFO "Turn on the PLD Clock at 8Khz\n");
-                        j->pld_clock.byte = 0;
-                        outb_p(j->pld_clock.byte, j->XILINXbase + 0x04);
-                }
-        }
-
-        if (j->dsp.low == 0x20) {
-                if (ixjdebug & 0x0002)
-                        printk(KERN_INFO "Configure GPIO pins\n");
-                j->gpio.bytes.high = 0x09;
-/*  bytes.low = 0xEF;  0xF7 */
-                j->gpio.bits.gpio1 = 1;
-                j->gpio.bits.gpio2 = 1;
-                j->gpio.bits.gpio3 = 0;
-                j->gpio.bits.gpio4 = 1;
-                j->gpio.bits.gpio5 = 1;
-                j->gpio.bits.gpio6 = 1;
-                j->gpio.bits.gpio7 = 1;
-                ixj_WriteDSPCommand(j->gpio.word, j);   /* Set GPIO pin directions */
-                if (ixjdebug & 0x0002)
-                        printk(KERN_INFO "Enable SLIC\n");
-                j->gpio.bytes.high = 0x0B;
-                j->gpio.bytes.low = 0x00;
-                j->gpio.bits.gpio1 = 0;
-                j->gpio.bits.gpio2 = 1;
-                j->gpio.bits.gpio5 = 0;
-                ixj_WriteDSPCommand(j->gpio.word, j);   /* send the ring stop signal */
-                j->port = PORT_POTS;
-        } else {
-                if (j->cardtype == QTI_LINEJACK) {
-                        LED_SetState(0x1, j);
-                        msleep(100);
-                        LED_SetState(0x2, j);
-                        msleep(100);
-                        LED_SetState(0x4, j);
-                        msleep(100);
-                        LED_SetState(0x8, j);
-                        msleep(100);
-                        LED_SetState(0x0, j);
-                        daa_get_version(j);
-                        if (ixjdebug & 0x0002)
-                                printk("Loading DAA Coefficients\n");
-                        DAA_Coeff_US(j);
-                        if (!ixj_daa_write(j)) {
-                                printk("DAA write failed on board %d\n", j->board);
-                                return -1;
-                        }
-                        if(!ixj_daa_cid_reset(j)) {
-                                printk("DAA CID reset failed on board %d\n", j->board);
-                                return -1;
-                        }
-                        j->flags.pots_correct = 0;
-                        j->flags.pstn_present = 0;
-                        ixj_linetest(j);
-                        if (j->flags.pots_correct) {
-                                j->pld_scrw.bits.daafsyncen = 0;        /* Turn off DAA Frame Sync */
-
-                                outb_p(j->pld_scrw.byte, j->XILINXbase);
-                                j->pld_slicw.bits.rly1 = 1;
-                                j->pld_slicw.bits.spken = 1;
-                                outb_p(j->pld_slicw.byte, j->XILINXbase + 0x01);
-                                SLIC_SetState(PLD_SLIC_STATE_STANDBY, j);
-/*                              SLIC_SetState(PLD_SLIC_STATE_ACTIVE, j); */
-                                j->port = PORT_POTS;
-                        }
-                        ixj_set_port(j, PORT_PSTN);
-                        ixj_set_pots(j, 1);
-                        if (ixjdebug & 0x0002)
-                                printk(KERN_INFO "Enable Mixer\n");
-                        ixj_mixer(0x0000, j);   /*Master Volume Left unmute 0db */
-                        ixj_mixer(0x0100, j);   /*Master Volume Right unmute 0db */
-
-                        ixj_mixer(0x0203, j);   /*Voice Left Volume unmute 6db */
-                        ixj_mixer(0x0303, j);   /*Voice Right Volume unmute 6db */
-
-                        ixj_mixer(0x0480, j);   /*FM Left mute */
-                        ixj_mixer(0x0580, j);   /*FM Right mute */
-
-                        ixj_mixer(0x0680, j);   /*CD Left mute */
-                        ixj_mixer(0x0780, j);   /*CD Right mute */
-
-                        ixj_mixer(0x0880, j);   /*Line Left mute */
-                        ixj_mixer(0x0980, j);   /*Line Right mute */
-
-                        ixj_mixer(0x0A80, j);   /*Aux left mute  */
-                        ixj_mixer(0x0B80, j);   /*Aux right mute */
-
-                        ixj_mixer(0x0C00, j);   /*Mono1 unmute 12db */
-                        ixj_mixer(0x0D80, j);   /*Mono2 mute */
-
-                        ixj_mixer(0x0E80, j);   /*Mic mute */
-
-                        ixj_mixer(0x0F00, j);   /*Mono Out Volume unmute 0db */
-
-                        ixj_mixer(0x1000, j);   /*Voice Left and Right out only */
-                        ixj_mixer(0x110C, j);
-
-
-                        ixj_mixer(0x1200, j);   /*Mono1 switch on mixer left */
-                        ixj_mixer(0x1401, j);
-
-                        ixj_mixer(0x1300, j);       /*Mono1 switch on mixer right */
-                        ixj_mixer(0x1501, j);
-
-                        ixj_mixer(0x1700, j);   /*Clock select */
-
-                        ixj_mixer(0x1800, j);   /*ADC input from mixer */
-
-                        ixj_mixer(0x1901, j);   /*Mic gain 30db */
-
-                        if (ixjdebug & 0x0002)
-                                printk(KERN_INFO "Setting Default US Ring Cadence Detection\n");
-                        j->cadence_f[4].state = 0;
-                        j->cadence_f[4].on1 = 0;        /*Cadence Filter 4 is used for PSTN ring cadence */
-                        j->cadence_f[4].off1 = 0;
-                        j->cadence_f[4].on2 = 0;
-                        j->cadence_f[4].off2 = 0;
-                        j->cadence_f[4].on3 = 0;
-                        j->cadence_f[4].off3 = 0;       /* These should represent standard US ring pulse. */
-                        j->pstn_last_rmr = jiffies;
-
-                } else {
-                        if (j->cardtype == QTI_PHONECARD) {
-                                ixj_WriteDSPCommand(0xCF07, j);
-                                ixj_WriteDSPCommand(0x00B0, j);
-                                ixj_set_port(j, PORT_SPEAKER);
-                        } else {
-                                ixj_set_port(j, PORT_POTS);
-                                SLIC_SetState(PLD_SLIC_STATE_STANDBY, j);
-/*                              SLIC_SetState(PLD_SLIC_STATE_ACTIVE, j); */
-                        }
-                }
-        }
-
-        j->intercom = -1;
-        j->framesread = j->frameswritten = 0;
-        j->read_wait = j->write_wait = 0;
-        j->rxreadycheck = j->txreadycheck = 0;
-
-        /* initialise the DTMF prescale to a sensible value */
-        if (j->cardtype == QTI_LINEJACK) {
-                set_dtmf_prescale(j, 0x10);
-        } else {
-                set_dtmf_prescale(j, 0x40);
-        }
-        set_play_volume(j, 0x100);
-        set_rec_volume(j, 0x100);
-
-        if (ixj_WriteDSPCommand(0x0000, j))             /* Write IDLE to Software Control Register */
-                return -1;
-/* The read values of the SSR should be 0x00 for the IDLE command */
-        if (j->ssr.low || j->ssr.high)
-                return -1;
-
-        if (ixjdebug & 0x0002)
-                printk(KERN_INFO "Enable Line Monitor\n");
-
-        if (ixjdebug & 0x0002)
-                printk(KERN_INFO "Set Line Monitor to Asynchronous Mode\n");
-
-        if (ixj_WriteDSPCommand(0x7E01, j))             /* Asynchronous Line Monitor */
-                return -1;
-
-        if (ixjdebug & 0x002)
-                printk(KERN_INFO "Enable DTMF Detectors\n");
-
-        if (ixj_WriteDSPCommand(0x5151, j))             /* Enable DTMF detection */
-                return -1;
-
-        if (ixj_WriteDSPCommand(0x6E01, j))             /* Set Asynchronous Tone Generation */
-                return -1;
-
-        set_rec_depth(j, 2);    /* Set Record Channel Limit to 2 frames */
-
-        set_play_depth(j, 2);   /* Set Playback Channel Limit to 2 frames */
-
-        j->ex.bits.dtmf_ready = 0;
-        j->dtmf_state = 0;
-        j->dtmf_wp = j->dtmf_rp = 0;
-        j->rec_mode = j->play_mode = -1;
-        j->flags.ringing = 0;
-        j->maxrings = MAXRINGS;
-        j->ring_cadence = USA_RING_CADENCE;
-        j->drybuffer = 0;
-        j->winktime = 320;
-        j->flags.dtmf_oob = 0;
-        for (cnt = 0; cnt < 4; cnt++)
-                j->cadence_f[cnt].enable = 0;
-        /* must be a device on the specified address */
-        ixj_WriteDSPCommand(0x0FE3, j); /* Put the DSP in 1/5 power mode. */
-
-        /* Set up the default signals for events */
-        for (cnt = 0; cnt < 35; cnt++)
-                j->ixj_signals[cnt] = SIGIO;
-
-        /* Set the exception signal enable flags */
-        j->ex_sig.bits.dtmf_ready = j->ex_sig.bits.hookstate = j->ex_sig.bits.flash = j->ex_sig.bits.pstn_ring =
-        j->ex_sig.bits.caller_id = j->ex_sig.bits.pstn_wink = j->ex_sig.bits.f0 = j->ex_sig.bits.f1 = j->ex_sig.bits.f2 =
-        j->ex_sig.bits.f3 = j->ex_sig.bits.fc0 = j->ex_sig.bits.fc1 = j->ex_sig.bits.fc2 = j->ex_sig.bits.fc3 = 1;
-#ifdef IXJ_DYN_ALLOC
-        j->fskdata = NULL;
-#endif
-        j->fskdcnt = 0;
-        j->cidcw_wait = 0;
-
-        /* Register with the Telephony for Linux subsystem */
-        j->p.f_op = &ixj_fops;
-        j->p.open = ixj_open;
-        j->p.board = j->board;
-        phone_register_device(&j->p, PHONE_UNIT_ANY);
-
-        ixj_init_timer(j);
-        ixj_add_timer(j);
-        return 0;
-}
-
-/*
- *      Exported service for pcmcia card handling
- */
-
-IXJ *ixj_pcmcia_probe(unsigned long dsp, unsigned long xilinx)
-{
-        IXJ *j = ixj_alloc();
-
-        j->board = 0;
-
-        j->DSPbase = dsp;
-        j->XILINXbase = xilinx;
-        j->cardtype = QTI_PHONECARD;
-        ixj_selfprobe(j);
-        return j;
-}
-
-EXPORT_SYMBOL(ixj_pcmcia_probe);                /* For PCMCIA */
-
-static int ixj_get_status_proc(char *buf)
-{
-        int len;
-        int cnt;
-        IXJ *j;
-        len = 0;
-        len += sprintf(buf + len, "\nDriver version %i.%i.%i", IXJ_VER_MAJOR, IXJ_VER_MINOR, IXJ_BLD_VER);
-        len += sprintf(buf + len, "\nsizeof IXJ struct %Zd bytes", sizeof(IXJ));
-        len += sprintf(buf + len, "\nsizeof DAA struct %Zd bytes", sizeof(DAA_REGS));
-        len += sprintf(buf + len, "\nUsing old telephony API");
-        len += sprintf(buf + len, "\nDebug Level %d\n", ixjdebug);
-
-        for (cnt = 0; cnt < IXJMAX; cnt++) {
-                j = get_ixj(cnt);
-                if(j==NULL)
-                        continue;
-                if (j->DSPbase) {
-                        len += sprintf(buf + len, "\nCard Num %d", cnt);
-                        len += sprintf(buf + len, "\nDSP Base Address 0x%4.4x", j->DSPbase);
-                        if (j->cardtype != QTI_PHONEJACK)
-                                len += sprintf(buf + len, "\nXILINX Base Address 0x%4.4x", j->XILINXbase);
-                        len += sprintf(buf + len, "\nDSP Type %2.2x%2.2x", j->dsp.high, j->dsp.low);
-                        len += sprintf(buf + len, "\nDSP Version %2.2x.%2.2x", j->ver.high, j->ver.low);
-                        len += sprintf(buf + len, "\nSerial Number %8.8x", j->serial);
-                        switch (j->cardtype) {
-                        case (QTI_PHONEJACK):
-                                len += sprintf(buf + len, "\nCard Type = Internet PhoneJACK");
-                                break;
-                        case (QTI_LINEJACK):
-                                len += sprintf(buf + len, "\nCard Type = Internet LineJACK");
-                                if (j->flags.g729_loaded)
-                                        len += sprintf(buf + len, " w/G.729 A/B");
-                                len += sprintf(buf + len, " Country = %d", j->daa_country);
-                                break;
-                        case (QTI_PHONEJACK_LITE):
-                                len += sprintf(buf + len, "\nCard Type = Internet PhoneJACK Lite");
-                                if (j->flags.g729_loaded)
-                                        len += sprintf(buf + len, " w/G.729 A/B");
-                                break;
-                        case (QTI_PHONEJACK_PCI):
-                                len += sprintf(buf + len, "\nCard Type = Internet PhoneJACK PCI");
-                                if (j->flags.g729_loaded)
-                                        len += sprintf(buf + len, " w/G.729 A/B");
-                                break;
-                        case (QTI_PHONECARD):
-                                len += sprintf(buf + len, "\nCard Type = Internet PhoneCARD");
-                                if (j->flags.g729_loaded)
-                                        len += sprintf(buf + len, " w/G.729 A/B");
-                                len += sprintf(buf + len, "\nSmart Cable %spresent", j->pccr1.bits.drf ? "not " : "");
-                                if (!j->pccr1.bits.drf)
-                                        len += sprintf(buf + len, "\nSmart Cable type %d", j->flags.pcmciasct);
-                                len += sprintf(buf + len, "\nSmart Cable state %d", j->flags.pcmciastate);
-                                break;
-                        default:
-                                len += sprintf(buf + len, "\nCard Type = %d", j->cardtype);
-                                break;
-                        }
-                        len += sprintf(buf + len, "\nReaders %d", j->readers);
-                        len += sprintf(buf + len, "\nWriters %d", j->writers);
-                        add_caps(j);
-                        len += sprintf(buf + len, "\nCapabilities %d", j->caps);
-                        if (j->dsp.low != 0x20)
-                                len += sprintf(buf + len, "\nDSP Processor load %d", j->proc_load);
-                        if (j->flags.cidsent)
-                                len += sprintf(buf + len, "\nCaller ID data sent");
-                        else
-                                len += sprintf(buf + len, "\nCaller ID data not sent");
-
-                        len += sprintf(buf + len, "\nPlay CODEC ");
-                        switch (j->play_codec) {
-                        case G723_63:
-                                len += sprintf(buf + len, "G.723.1 6.3");
-                                break;
-                        case G723_53:
-                                len += sprintf(buf + len, "G.723.1 5.3");
-                                break;
-                        case TS85:
-                                len += sprintf(buf + len, "TrueSpeech 8.5");
-                                break;
-                        case TS48:
-                                len += sprintf(buf + len, "TrueSpeech 4.8");
-                                break;
-                        case TS41:
-                                len += sprintf(buf + len, "TrueSpeech 4.1");
-                                break;
-                        case G728:
-                                len += sprintf(buf + len, "G.728");
-                                break;
-                        case G729:
-                                len += sprintf(buf + len, "G.729");
-                                break;
-                        case G729B:
-                                len += sprintf(buf + len, "G.729B");
-                                break;
-                        case ULAW:
-                                len += sprintf(buf + len, "uLaw");
-                                break;
-                        case ALAW:
-                                len += sprintf(buf + len, "aLaw");
-                                break;
-                        case LINEAR16:
-                                len += sprintf(buf + len, "16 bit Linear");
-                                break;
-                        case LINEAR8:
-                                len += sprintf(buf + len, "8 bit Linear");
-                                break;
-                        case WSS:
-                                len += sprintf(buf + len, "Windows Sound System");
-                                break;
-                        default:
-                                len += sprintf(buf + len, "NO CODEC CHOSEN");
-                                break;
-                        }
-                        len += sprintf(buf + len, "\nRecord CODEC ");
-                        switch (j->rec_codec) {
-                        case G723_63:
-                                len += sprintf(buf + len, "G.723.1 6.3");
-                                break;
-                        case G723_53:
-                                len += sprintf(buf + len, "G.723.1 5.3");
-                                break;
-                        case TS85:
-                                len += sprintf(buf + len, "TrueSpeech 8.5");
-                                break;
-                        case TS48:
-                                len += sprintf(buf + len, "TrueSpeech 4.8");
-                                break;
-                        case TS41:
-                                len += sprintf(buf + len, "TrueSpeech 4.1");
-                                break;
-                        case G728:
-                                len += sprintf(buf + len, "G.728");
-                                break;
-                        case G729:
-                                len += sprintf(buf + len, "G.729");
-                                break;
-                        case G729B:
-                                len += sprintf(buf + len, "G.729B");
-                                break;
-                        case ULAW:
-                                len += sprintf(buf + len, "uLaw");
-                                break;
-                        case ALAW:
-                                len += sprintf(buf + len, "aLaw");
-                                break;
-                        case LINEAR16:
-                                len += sprintf(buf + len, "16 bit Linear");
-                                break;
-                        case LINEAR8:
-                                len += sprintf(buf + len, "8 bit Linear");
-                                break;
-                        case WSS:
-                                len += sprintf(buf + len, "Windows Sound System");
-                                break;
-                        default:
-                                len += sprintf(buf + len, "NO CODEC CHOSEN");
-                                break;
-                        }
-                        len += sprintf(buf + len, "\nAEC ");
-                        switch (j->aec_level) {
-                        case AEC_OFF:
-                                len += sprintf(buf + len, "Off");
-                                break;
-                        case AEC_LOW:
-                                len += sprintf(buf + len, "Low");
-                                break;
-                        case AEC_MED:
-                                len += sprintf(buf + len, "Med");
-                                break;
-                        case AEC_HIGH:
-                                len += sprintf(buf + len, "High");
-                                break;
-                        case AEC_AUTO:
-                                len += sprintf(buf + len, "Auto");
-                                break;
-                        case AEC_AGC:
-                                len += sprintf(buf + len, "AEC/AGC");
-                                break;
-                        default:
-                                len += sprintf(buf + len, "unknown(%i)", j->aec_level);
-                                break;
-                        }
-
-                        len += sprintf(buf + len, "\nRec volume 0x%x", get_rec_volume(j));
-                        len += sprintf(buf + len, "\nPlay volume 0x%x", get_play_volume(j));
-                        len += sprintf(buf + len, "\nDTMF prescale 0x%x", get_dtmf_prescale(j));
-
-                        len += sprintf(buf + len, "\nHook state %d", j->hookstate); /* j->r_hook);      */
-
-                        if (j->cardtype == QTI_LINEJACK) {
-                                len += sprintf(buf + len, "\nPOTS Correct %d", j->flags.pots_correct);
-                                len += sprintf(buf + len, "\nPSTN Present %d", j->flags.pstn_present);
-                                len += sprintf(buf + len, "\nPSTN Check %d", j->flags.pstncheck);
-                                len += sprintf(buf + len, "\nPOTS to PSTN %d", j->flags.pots_pstn);
-                                switch (j->daa_mode) {
-                                case SOP_PU_SLEEP:
-                                        len += sprintf(buf + len, "\nDAA PSTN On Hook");
-                                        break;
-                                case SOP_PU_RINGING:
-                                        len += sprintf(buf + len, "\nDAA PSTN Ringing");
-                                        len += sprintf(buf + len, "\nRinging state = %d", j->cadence_f[4].state);
-                                        break;
-                                case SOP_PU_CONVERSATION:
-                                        len += sprintf(buf + len, "\nDAA PSTN Off Hook");
-                                        break;
-                                case SOP_PU_PULSEDIALING:
-                                        len += sprintf(buf + len, "\nDAA PSTN Pulse Dialing");
-                                        break;
-                                }
-                                len += sprintf(buf + len, "\nDAA RMR = %d", j->m_DAAShadowRegs.SOP_REGS.SOP.cr1.bitreg.RMR);
-                                len += sprintf(buf + len, "\nDAA VDD OK = %d", j->m_DAAShadowRegs.XOP_REGS.XOP.xr0.bitreg.VDD_OK);
-                                len += sprintf(buf + len, "\nDAA CR0 = 0x%02x", j->m_DAAShadowRegs.SOP_REGS.SOP.cr0.reg);
-                                len += sprintf(buf + len, "\nDAA CR1 = 0x%02x", j->m_DAAShadowRegs.SOP_REGS.SOP.cr1.reg);
-                                len += sprintf(buf + len, "\nDAA CR2 = 0x%02x", j->m_DAAShadowRegs.SOP_REGS.SOP.cr2.reg);
-                                len += sprintf(buf + len, "\nDAA CR3 = 0x%02x", j->m_DAAShadowRegs.SOP_REGS.SOP.cr3.reg);
-                                len += sprintf(buf + len, "\nDAA CR4 = 0x%02x", j->m_DAAShadowRegs.SOP_REGS.SOP.cr4.reg);
-                                len += sprintf(buf + len, "\nDAA CR5 = 0x%02x", j->m_DAAShadowRegs.SOP_REGS.SOP.cr5.reg);
-                                len += sprintf(buf + len, "\nDAA XR0 = 0x%02x", j->m_DAAShadowRegs.XOP_REGS.XOP.xr0.reg);
-                                len += sprintf(buf + len, "\nDAA ringstop %ld - jiffies %ld", j->pstn_ring_stop, jiffies);
-                        }
-                        switch (j->port) {
-                        case PORT_POTS:
-                                len += sprintf(buf + len, "\nPort POTS");
-                                break;
-                        case PORT_PSTN:
-                                len += sprintf(buf + len, "\nPort PSTN");
-                                break;
-                        case PORT_SPEAKER:
-                                len += sprintf(buf + len, "\nPort SPEAKER/MIC");
-                                break;
-                        case PORT_HANDSET:
-                                len += sprintf(buf + len, "\nPort HANDSET");
-                                break;
-                        }
-                        if (j->dsp.low == 0x21 || j->dsp.low == 0x22) {
-                                len += sprintf(buf + len, "\nSLIC state ");
-                                switch (SLIC_GetState(j)) {
-                                case PLD_SLIC_STATE_OC:
-                                        len += sprintf(buf + len, "OC");
-                                        break;
-                                case PLD_SLIC_STATE_RINGING:
-                                        len += sprintf(buf + len, "RINGING");
-                                        break;
-                                case PLD_SLIC_STATE_ACTIVE:
-                                        len += sprintf(buf + len, "ACTIVE");
-                                        break;
-                                case PLD_SLIC_STATE_OHT:        /* On-hook transmit */
-                                        len += sprintf(buf + len, "OHT");
-                                        break;
-                                case PLD_SLIC_STATE_TIPOPEN:
-                                        len += sprintf(buf + len, "TIPOPEN");
-                                        break;
-                                case PLD_SLIC_STATE_STANDBY:
-                                        len += sprintf(buf + len, "STANDBY");
-                                        break;
-                                case PLD_SLIC_STATE_APR:        /* Active polarity reversal */
-                                        len += sprintf(buf + len, "APR");
-                                        break;
-                                case PLD_SLIC_STATE_OHTPR:      /* OHT polarity reversal */
-                                        len += sprintf(buf + len, "OHTPR");
-                                        break;
-                                default:
-                                        len += sprintf(buf + len, "%d", SLIC_GetState(j));
-                                        break;
-                                }
-                        }
-                        len += sprintf(buf + len, "\nBase Frame %2.2x.%2.2x", j->baseframe.high, j->baseframe.low);
-                        len += sprintf(buf + len, "\nCID Base Frame %2d", j->cid_base_frame_size);
-#ifdef PERFMON_STATS
-                        len += sprintf(buf + len, "\nTimer Checks %ld", j->timerchecks);
-                        len += sprintf(buf + len, "\nRX Ready Checks %ld", j->rxreadycheck);
-                        len += sprintf(buf + len, "\nTX Ready Checks %ld", j->txreadycheck);
-                        len += sprintf(buf + len, "\nFrames Read %ld", j->framesread);
-                        len += sprintf(buf + len, "\nFrames Written %ld", j->frameswritten);
-                        len += sprintf(buf + len, "\nDry Buffer %ld", j->drybuffer);
-                        len += sprintf(buf + len, "\nRead Waits %ld", j->read_wait);
-                        len += sprintf(buf + len, "\nWrite Waits %ld", j->write_wait);
-                        len += sprintf(buf + len, "\nStatus Waits %ld", j->statuswait);
-                        len += sprintf(buf + len, "\nStatus Wait Fails %ld", j->statuswaitfail);
-                        len += sprintf(buf + len, "\nPControl Waits %ld", j->pcontrolwait);
-                        len += sprintf(buf + len, "\nPControl Wait Fails %ld", j->pcontrolwaitfail);
-                        len += sprintf(buf + len, "\nIs Control Ready Checks %ld", j->iscontrolready);
-                        len += sprintf(buf + len, "\nIs Control Ready Check failures %ld", j->iscontrolreadyfail);
-
-#endif
-                        len += sprintf(buf + len, "\n");
-                }
-        }
-        return len;
-}
-
-static int ixj_read_proc(char *page, char **start, off_t off,
-                              int count, int *eof, void *data)
-{
-        int len = ixj_get_status_proc(page);
-        if (len <= off+count) *eof = 1;
-        *start = page + off;
-        len -= off;
-        if (len>count) len = count;
-        if (len<0) len = 0;
-        return len;
-}
-
-
-static void cleanup(void)
-{
-        int cnt;
-        IXJ *j;
-
-        for (cnt = 0; cnt < IXJMAX; cnt++) {
-                j = get_ixj(cnt);
-                if(j != NULL && j->DSPbase) {
-                        if (ixjdebug & 0x0002)
-                                printk(KERN_INFO "IXJ: Deleting timer for /dev/phone%d\n", cnt);
-                        del_timer(&j->timer);
-                        if (j->cardtype == QTI_LINEJACK) {
-                                j->pld_scrw.bits.daafsyncen = 0;        /* Turn off DAA Frame Sync */
-
-                                outb_p(j->pld_scrw.byte, j->XILINXbase);
-                                j->pld_slicw.bits.rly1 = 0;
-                                j->pld_slicw.bits.rly2 = 0;
-                                j->pld_slicw.bits.rly3 = 0;
-                                outb_p(j->pld_slicw.byte, j->XILINXbase + 0x01);
-                                LED_SetState(0x0, j);
-                                if (ixjdebug & 0x0002)
-                                        printk(KERN_INFO "IXJ: Releasing XILINX address for /dev/phone%d\n", cnt);
-                                release_region(j->XILINXbase, 8);
-                        } else if (j->cardtype == QTI_PHONEJACK_LITE || j->cardtype == QTI_PHONEJACK_PCI) {
-                                if (ixjdebug & 0x0002)
-                                        printk(KERN_INFO "IXJ: Releasing XILINX address for /dev/phone%d\n", cnt);
-                                release_region(j->XILINXbase, 4);
-                        }
-                        kfree(j->read_buffer);
-                        kfree(j->write_buffer);
-                        if (j->dev)
-                                pnp_device_detach(j->dev);
-                        if (ixjdebug & 0x0002)
-                                printk(KERN_INFO "IXJ: Unregistering /dev/phone%d from LTAPI\n", cnt);
-                        phone_unregister_device(&j->p);
-                        if (ixjdebug & 0x0002)
-                                printk(KERN_INFO "IXJ: Releasing DSP address for /dev/phone%d\n", cnt);
-                        release_region(j->DSPbase, 16);
-#ifdef IXJ_DYN_ALLOC
-                        if (ixjdebug & 0x0002)
-                                printk(KERN_INFO "IXJ: Freeing memory for /dev/phone%d\n", cnt);
-                        kfree(j);
-                        ixj[cnt] = NULL;
-#endif
-                }
-        }
-        if (ixjdebug & 0x0002)
-                printk(KERN_INFO "IXJ: Removing /proc/ixj\n");
-        remove_proc_entry ("ixj", NULL);
-}
-
-/* Typedefs */
-typedef struct {
-        BYTE length;
-        DWORD bits;
-} DATABLOCK;
-
-static void PCIEE_WriteBit(WORD wEEPROMAddress, BYTE lastLCC, BYTE byData)
-{
-        lastLCC = lastLCC & 0xfb;
-        lastLCC = lastLCC | (byData ? 4 : 0);
-        outb(lastLCC, wEEPROMAddress);  /*set data out bit as appropriate */
-
-        mdelay(1);
-        lastLCC = lastLCC | 0x01;
-        outb(lastLCC, wEEPROMAddress);  /*SK rising edge */
-
-        byData = byData << 1;
-        lastLCC = lastLCC & 0xfe;
-        mdelay(1);
-        outb(lastLCC, wEEPROMAddress);  /*after delay, SK falling edge */
-
-}
-
-static BYTE PCIEE_ReadBit(WORD wEEPROMAddress, BYTE lastLCC)
-{
-        mdelay(1);
-        lastLCC = lastLCC | 0x01;
-        outb(lastLCC, wEEPROMAddress);  /*SK rising edge */
-
-        lastLCC = lastLCC & 0xfe;
-        mdelay(1);
-        outb(lastLCC, wEEPROMAddress);  /*after delay, SK falling edge */
-
-        return ((inb(wEEPROMAddress) >> 3) & 1);
-}
-
-static bool PCIEE_ReadWord(WORD wAddress, WORD wLoc, WORD * pwResult)
-{
-        BYTE lastLCC;
-        WORD wEEPROMAddress = wAddress + 3;
-        DWORD i;
-        BYTE byResult;
-        *pwResult = 0;
-        lastLCC = inb(wEEPROMAddress);
-        lastLCC = lastLCC | 0x02;
-        lastLCC = lastLCC & 0xfe;
-        outb(lastLCC, wEEPROMAddress);  /* CS hi, SK lo */
-
-        mdelay(1);              /* delay */
-
-        PCIEE_WriteBit(wEEPROMAddress, lastLCC, 1);
-        PCIEE_WriteBit(wEEPROMAddress, lastLCC, 1);
-        PCIEE_WriteBit(wEEPROMAddress, lastLCC, 0);
-        for (i = 0; i < 8; i++) {
-                PCIEE_WriteBit(wEEPROMAddress, lastLCC, wLoc & 0x80 ? 1 : 0);
-                wLoc <<= 1;
-        }
-
-        for (i = 0; i < 16; i++) {
-                byResult = PCIEE_ReadBit(wEEPROMAddress, lastLCC);
-                *pwResult = (*pwResult << 1) | byResult;
-        }
-
-        mdelay(1);              /* another delay */
-
-        lastLCC = lastLCC & 0xfd;
-        outb(lastLCC, wEEPROMAddress);  /* negate CS */
-
-        return 0;
-}
-
-static DWORD PCIEE_GetSerialNumber(WORD wAddress)
-{
-        WORD wLo, wHi;
-        if (PCIEE_ReadWord(wAddress, 62, &wLo))
-                return 0;
-        if (PCIEE_ReadWord(wAddress, 63, &wHi))
-                return 0;
-        return (((DWORD) wHi << 16) | wLo);
-}
-
-static int dspio[IXJMAX + 1] =
-{
-        0,
-};
-static int xio[IXJMAX + 1] =
-{
-        0,
-};
-
-module_param_array(dspio, int, NULL, 0);
-module_param_array(xio, int, NULL, 0);
-MODULE_DESCRIPTION("Quicknet VoIP Telephony card module - www.quicknet.net");
-MODULE_AUTHOR("Ed Okerson <eokerson@quicknet.net>");
-MODULE_LICENSE("GPL");
-
-static void __exit ixj_exit(void)
-{
-        cleanup();
-}
-
-static IXJ *new_ixj(unsigned long port)
-{
-        IXJ *res;
-        if (!request_region(port, 16, "ixj DSP")) {
-                printk(KERN_INFO "ixj: can't get I/O address 0x%lx\n", port);
-                return NULL;
-        }
-        res = ixj_alloc();
-        if (!res) {
-                release_region(port, 16);
-                printk(KERN_INFO "ixj: out of memory\n");
-                return NULL;
-        }
-        res->DSPbase = port;
-        return res;
-}
-
-static int __init ixj_probe_isapnp(int *cnt)
-{
-        int probe = 0;
-        int func = 0x110;
-        struct pnp_dev *dev = NULL, *old_dev = NULL;
-
-        while (1) {
-                do {
-                        IXJ *j;
-                        int result;
-
-                        old_dev = dev;
-                        dev = pnp_find_dev(NULL, ISAPNP_VENDOR('Q', 'T', 'I'),
-                                         ISAPNP_FUNCTION(func), old_dev);
-                        if (!dev || !dev->card)
-                                break;
-                        result = pnp_device_attach(dev);
-                        if (result < 0) {
-                                printk("pnp attach failed %d \n", result);
-                                break;
-                        }
-                        if (pnp_activate_dev(dev) < 0) {
-                                printk("pnp activate failed (out of resources?)\n");
-                                pnp_device_detach(dev);
-                                return -ENOMEM;
-                        }
-
-                        if (!pnp_port_valid(dev, 0)) {
-                                pnp_device_detach(dev);
-                                return -ENODEV;
-                        }
-
-                        j = new_ixj(pnp_port_start(dev, 0));
-                        if (!j)
-                                break;
-
-                        if (func != 0x110)
-                                j->XILINXbase = pnp_port_start(dev, 1); /* get real port */
-
-                        switch (func) {
-                        case (0x110):
-                                j->cardtype = QTI_PHONEJACK;
-                                break;
-                        case (0x310):
-                                j->cardtype = QTI_LINEJACK;
-                                break;
-                        case (0x410):
-                                j->cardtype = QTI_PHONEJACK_LITE;
-                                break;
-                        }
-                        j->board = *cnt;
-                        probe = ixj_selfprobe(j);
-                        if(!probe) {
-                                j->serial = dev->card->serial;
-                                j->dev = dev;
-                                switch (func) {
-                                case 0x110:
-                                        printk(KERN_INFO "ixj: found Internet PhoneJACK at 0x%x\n", j->DSPbase);
-                                        break;
-                                case 0x310:
-                                        printk(KERN_INFO "ixj: found Internet LineJACK at 0x%x\n", j->DSPbase);
-                                        break;
-                                case 0x410:
-                                        printk(KERN_INFO "ixj: found Internet PhoneJACK Lite at 0x%x\n", j->DSPbase);
-                                        break;
-                                }
-                        }
-                        ++*cnt;
-                } while (dev);
-                if (func == 0x410)
-                        break;
-                if (func == 0x310)
-                        func = 0x410;
-                if (func == 0x110)
-                        func = 0x310;
-                dev = NULL;
-        }
-        return probe;
-}
-
-static int __init ixj_probe_isa(int *cnt)
-{
-        int i, probe;
-
-        /* Use passed parameters for older kernels without PnP */
-        for (i = 0; i < IXJMAX; i++) {
-                if (dspio[i]) {
-                        IXJ *j = new_ixj(dspio[i]);
-
-                        if (!j)
-                                break;
-
-                        j->XILINXbase = xio[i];
-                        j->cardtype = 0;
-
-                        j->board = *cnt;
-                        probe = ixj_selfprobe(j);
-                        j->dev = NULL;
-                        ++*cnt;
-                }
-        }
-        return 0;
-}
-
-static int __init ixj_probe_pci(int *cnt)
-{
-        struct pci_dev *pci = NULL;
-        int i, probe = 0;
-        IXJ *j = NULL;
-
-        for (i = 0; i < IXJMAX - *cnt; i++) {
-                pci = pci_get_device(PCI_VENDOR_ID_QUICKNET,
-                                      PCI_DEVICE_ID_QUICKNET_XJ, pci);
-                if (!pci)
-                        break;
-
-                if (pci_enable_device(pci))
-                        break;
-                j = new_ixj(pci_resource_start(pci, 0));
-                if (!j)
-                        break;
-
-                j->serial = (PCIEE_GetSerialNumber)pci_resource_start(pci, 2);
-                j->XILINXbase = j->DSPbase + 0x10;
-                j->cardtype = QTI_PHONEJACK_PCI;
-                j->board = *cnt;
-                probe = ixj_selfprobe(j);
-                if (!probe)
-                        printk(KERN_INFO "ixj: found Internet PhoneJACK PCI at 0x%x\n", j->DSPbase);
-                ++*cnt;
-        }
-        pci_dev_put(pci);
-        return probe;
-}
-
-static int __init ixj_init(void)
-{
-        int cnt = 0;
-        int probe = 0;
-
-        cnt = 0;
-
-        /* These might be no-ops, see above. */
-        if ((probe = ixj_probe_isapnp(&cnt)) < 0) {
-                return probe;
-        }
-        if ((probe = ixj_probe_isa(&cnt)) < 0) {
-                return probe;
-        }
-        if ((probe = ixj_probe_pci(&cnt)) < 0) {
-                return probe;
-        }
-        printk(KERN_INFO "ixj driver initialized.\n");
-        create_proc_read_entry ("ixj", 0, NULL, ixj_read_proc, NULL);
-        return probe;
-}
-
-module_init(ixj_init);
-module_exit(ixj_exit);
-
-static void DAA_Coeff_US(IXJ *j)
-{
-        int i;
-
-        j->daa_country = DAA_US;
-        /*----------------------------------------------- */
-        /* CAO */
-        for (i = 0; i < ALISDAA_CALLERID_SIZE; i++) {
-                j->m_DAAShadowRegs.CAO_REGS.CAO.CallerID[i] = 0;
-        }
-
-/* Bytes for IM-filter part 1 (04): 0E,32,E2,2F,C2,5A,C0,00 */
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_1[7] = 0x03;
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_1[6] = 0x4B;
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_1[5] = 0x5D;
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_1[4] = 0xCD;
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_1[3] = 0x24;
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_1[2] = 0xC5;
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_1[1] = 0xA0;
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_1[0] = 0x00;
-/* Bytes for IM-filter part 2 (05): 72,85,00,0E,2B,3A,D0,08 */
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_2[7] = 0x71;
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_2[6] = 0x1A;
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_2[5] = 0x00;
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_2[4] = 0x0A;
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_2[3] = 0xB5;
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_2[2] = 0x33;
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_2[1] = 0xE0;
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_2[0] = 0x08;
-/* Bytes for FRX-filter       (08): 03,8F,48,F2,8F,48,70,08 */
-        j->m_DAAShadowRegs.COP_REGS.COP.FRXFilterCoeff[7] = 0x05;
-        j->m_DAAShadowRegs.COP_REGS.COP.FRXFilterCoeff[6] = 0xA3;
-        j->m_DAAShadowRegs.COP_REGS.COP.FRXFilterCoeff[5] = 0x72;
-        j->m_DAAShadowRegs.COP_REGS.COP.FRXFilterCoeff[4] = 0x34;
-        j->m_DAAShadowRegs.COP_REGS.COP.FRXFilterCoeff[3] = 0x3F;
-        j->m_DAAShadowRegs.COP_REGS.COP.FRXFilterCoeff[2] = 0x3B;
-        j->m_DAAShadowRegs.COP_REGS.COP.FRXFilterCoeff[1] = 0x30;
-        j->m_DAAShadowRegs.COP_REGS.COP.FRXFilterCoeff[0] = 0x08;
-/* Bytes for FRR-filter       (07): 04,8F,38,7F,9B,EA,B0,08 */
-        j->m_DAAShadowRegs.COP_REGS.COP.FRRFilterCoeff[7] = 0x05;
-        j->m_DAAShadowRegs.COP_REGS.COP.FRRFilterCoeff[6] = 0x87;
-        j->m_DAAShadowRegs.COP_REGS.COP.FRRFilterCoeff[5] = 0xF9;
-        j->m_DAAShadowRegs.COP_REGS.COP.FRRFilterCoeff[4] = 0x3E;
-        j->m_DAAShadowRegs.COP_REGS.COP.FRRFilterCoeff[3] = 0x32;
-        j->m_DAAShadowRegs.COP_REGS.COP.FRRFilterCoeff[2] = 0xDA;
-        j->m_DAAShadowRegs.COP_REGS.COP.FRRFilterCoeff[1] = 0xB0;
-        j->m_DAAShadowRegs.COP_REGS.COP.FRRFilterCoeff[0] = 0x08;
-/* Bytes for AX-filter        (0A): 16,55,DD,CA */
-        j->m_DAAShadowRegs.COP_REGS.COP.AXFilterCoeff[3] = 0x41;
-        j->m_DAAShadowRegs.COP_REGS.COP.AXFilterCoeff[2] = 0xB5;
-        j->m_DAAShadowRegs.COP_REGS.COP.AXFilterCoeff[1] = 0xDD;
-        j->m_DAAShadowRegs.COP_REGS.COP.AXFilterCoeff[0] = 0xCA;
-/* Bytes for AR-filter        (09): 52,D3,11,42 */
-        j->m_DAAShadowRegs.COP_REGS.COP.ARFilterCoeff[3] = 0x25;
-        j->m_DAAShadowRegs.COP_REGS.COP.ARFilterCoeff[2] = 0xC7;
-        j->m_DAAShadowRegs.COP_REGS.COP.ARFilterCoeff[1] = 0x10;
-        j->m_DAAShadowRegs.COP_REGS.COP.ARFilterCoeff[0] = 0xD6;
-/* Bytes for TH-filter part 1 (00): 00,42,48,81,B3,80,00,98 */
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_1[7] = 0x00;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_1[6] = 0x42;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_1[5] = 0x48;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_1[4] = 0x81;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_1[3] = 0xA5;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_1[2] = 0x80;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_1[1] = 0x00;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_1[0] = 0x98;
-/* Bytes for TH-filter part 2 (01): 02,F2,33,A0,68,AB,8A,AD */
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_2[7] = 0x02;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_2[6] = 0xA2;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_2[5] = 0x2B;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_2[4] = 0xB0;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_2[3] = 0xE8;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_2[2] = 0xAB;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_2[1] = 0x81;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_2[0] = 0xCC;
-/* Bytes for TH-filter part 3 (02): 00,88,DA,54,A4,BA,2D,BB */
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_3[7] = 0x00;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_3[6] = 0x88;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_3[5] = 0xD2;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_3[4] = 0x24;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_3[3] = 0xBA;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_3[2] = 0xA9;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_3[1] = 0x3B;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_3[0] = 0xA6;
-/* ;  (10K, 0.68uF) */
-        /*  */
-        /* Bytes for Ringing part 1 (03):1B,3B,9B,BA,D4,1C,B3,23 */
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_1[7] = 0x1B;
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_1[6] = 0x3C;
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_1[5] = 0x93;
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_1[4] = 0x3A;
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_1[3] = 0x22;
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_1[2] = 0x12;
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_1[1] = 0xA3;
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_1[0] = 0x23;
-        /* Bytes for Ringing part 2 (06):13,42,A6,BA,D4,73,CA,D5 */
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_2[7] = 0x12;
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_2[6] = 0xA2;
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_2[5] = 0xA6;
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_2[4] = 0xBA;
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_2[3] = 0x22;
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_2[2] = 0x7A;
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_2[1] = 0x0A;
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_2[0] = 0xD5;
-
-        /* Levelmetering Ringing        (0D):B2,45,0F,8E       */
-        j->m_DAAShadowRegs.COP_REGS.COP.LevelmeteringRinging[3] = 0xAA;
-        j->m_DAAShadowRegs.COP_REGS.COP.LevelmeteringRinging[2] = 0x35;
-        j->m_DAAShadowRegs.COP_REGS.COP.LevelmeteringRinging[1] = 0x0F;
-        j->m_DAAShadowRegs.COP_REGS.COP.LevelmeteringRinging[0] = 0x8E;
-
-        /* Bytes for Ringing part 1 (03):1B,3B,9B,BA,D4,1C,B3,23 */
-/*      j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_1[7] = 0x1C; */
-/*      j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_1[6] = 0xB3; */
-/*      j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_1[5] = 0xAB; */
-/*      j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_1[4] = 0xAB; */
-/*      j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_1[3] = 0x54; */
-/*      j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_1[2] = 0x2D; */
-/*      j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_1[1] = 0x62; */
-/*      j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_1[0] = 0x2D; */
-        /* Bytes for Ringing part 2 (06):13,42,A6,BA,D4,73,CA,D5 */
-/*      j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_2[7] = 0x2D; */
-/*      j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_2[6] = 0x62; */
-/*      j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_2[5] = 0xA6; */
-/*      j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_2[4] = 0xBB; */
-/*      j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_2[3] = 0x2A; */
-/*      j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_2[2] = 0x7D; */
-/*      j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_2[1] = 0x0A; */
-/*      j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_2[0] = 0xD4; */
-/* */
-        /* Levelmetering Ringing        (0D):B2,45,0F,8E       */
-/*      j->m_DAAShadowRegs.COP_REGS.COP.LevelmeteringRinging[3] = 0xAA; */
-/*      j->m_DAAShadowRegs.COP_REGS.COP.LevelmeteringRinging[2] = 0x05; */
-/*      j->m_DAAShadowRegs.COP_REGS.COP.LevelmeteringRinging[1] = 0x0F; */
-/*      j->m_DAAShadowRegs.COP_REGS.COP.LevelmeteringRinging[0] = 0x8E; */
-
-        /* Caller ID 1st Tone           (0E):CA,0E,CA,09,99,99,99,99 */
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID1stTone[7] = 0xCA;
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID1stTone[6] = 0x0E;
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID1stTone[5] = 0xCA;
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID1stTone[4] = 0x09;
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID1stTone[3] = 0x99;
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID1stTone[2] = 0x99;
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID1stTone[1] = 0x99;
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID1stTone[0] = 0x99;
-/* Caller ID 2nd Tone           (0F):FD,B5,BA,07,DA,00,00,00 */
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID2ndTone[7] = 0xFD;
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID2ndTone[6] = 0xB5;
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID2ndTone[5] = 0xBA;
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID2ndTone[4] = 0x07;
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID2ndTone[3] = 0xDA;
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID2ndTone[2] = 0x00;
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID2ndTone[1] = 0x00;
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID2ndTone[0] = 0x00;
-/*  */
-        /* ;CR Registers */
-        /* Config. Reg. 0 (filters)       (cr0):FE ; CLK gen. by crystal */
-        j->m_DAAShadowRegs.SOP_REGS.SOP.cr0.reg = 0xFF;
-/* Config. Reg. 1 (dialing)       (cr1):05 */
-        j->m_DAAShadowRegs.SOP_REGS.SOP.cr1.reg = 0x05;
-/* Config. Reg. 2 (caller ID)     (cr2):04 */
-        j->m_DAAShadowRegs.SOP_REGS.SOP.cr2.reg = 0x04;
-/* Config. Reg. 3 (testloops)     (cr3):03 ; SEL Bit==0, HP-disabled */
-        j->m_DAAShadowRegs.SOP_REGS.SOP.cr3.reg = 0x00;
-/* Config. Reg. 4 (analog gain)   (cr4):02 */
-        j->m_DAAShadowRegs.SOP_REGS.SOP.cr4.reg = 0x02;
-        /* Config. Reg. 5 (Version)       (cr5):02 */
-        /* Config. Reg. 6 (Reserved)      (cr6):00 */
-        /* Config. Reg. 7 (Reserved)      (cr7):00 */
-        /*  */
-        /* ;xr Registers */
-        /* Ext. Reg. 0 (Interrupt Reg.)   (xr0):02 */
-
-        j->m_DAAShadowRegs.XOP_xr0_W.reg = 0x02;        /* SO_1 set to '1' because it is inverted. */
-        /* Ext. Reg. 1 (Interrupt enable) (xr1):3C Cadence, RING, Caller ID, VDD_OK */
-
-        j->m_DAAShadowRegs.XOP_REGS.XOP.xr1.reg = 0x3C;
-/* Ext. Reg. 2 (Cadence Time Out) (xr2):7D */
-        j->m_DAAShadowRegs.XOP_REGS.XOP.xr2.reg = 0x7D;
-/* Ext. Reg. 3 (DC Char)          (xr3):32 ; B-Filter Off == 1 */
-        j->m_DAAShadowRegs.XOP_REGS.XOP.xr3.reg = 0x3B;         /*0x32; */
-        /* Ext. Reg. 4 (Cadence)          (xr4):00 */
-
-        j->m_DAAShadowRegs.XOP_REGS.XOP.xr4.reg = 0x00;
-/* Ext. Reg. 5 (Ring timer)       (xr5):22 */
-        j->m_DAAShadowRegs.XOP_REGS.XOP.xr5.reg = 0x22;
-/* Ext. Reg. 6 (Power State)      (xr6):00 */
-        j->m_DAAShadowRegs.XOP_xr6_W.reg = 0x00;
-/* Ext. Reg. 7 (Vdd)              (xr7):40 */
-        j->m_DAAShadowRegs.XOP_REGS.XOP.xr7.reg = 0x40;         /* 0x40 ??? Should it be 0x00? */
-        /*  */
-        /* DTMF Tone 1                     (0B): 11,B3,5A,2C ;   697 Hz   */
-        /*                                       12,33,5A,C3 ;  770 Hz   */
-        /*                                       13,3C,5B,32 ;  852 Hz   */
-        /*                                       1D,1B,5C,CC ;  941 Hz   */
-
-        j->m_DAAShadowRegs.COP_REGS.COP.Tone1Coeff[3] = 0x11;
-        j->m_DAAShadowRegs.COP_REGS.COP.Tone1Coeff[2] = 0xB3;
-        j->m_DAAShadowRegs.COP_REGS.COP.Tone1Coeff[1] = 0x5A;
-        j->m_DAAShadowRegs.COP_REGS.COP.Tone1Coeff[0] = 0x2C;
-/* DTMF Tone 2                     (0C): 32,32,52,B3 ;  1209 Hz   */
-        /*                                       EC,1D,52,22 ;  1336 Hz   */
-        /*                                       AA,AC,51,D2 ;  1477 Hz   */
-        /*                                       9B,3B,51,25 ;  1633 Hz   */
-        j->m_DAAShadowRegs.COP_REGS.COP.Tone2Coeff[3] = 0x32;
-        j->m_DAAShadowRegs.COP_REGS.COP.Tone2Coeff[2] = 0x32;
-        j->m_DAAShadowRegs.COP_REGS.COP.Tone2Coeff[1] = 0x52;
-        j->m_DAAShadowRegs.COP_REGS.COP.Tone2Coeff[0] = 0xB3;
-}
-
-static void DAA_Coeff_UK(IXJ *j)
-{
-        int i;
-
-        j->daa_country = DAA_UK;
-        /*----------------------------------------------- */
-        /* CAO */
-        for (i = 0; i < ALISDAA_CALLERID_SIZE; i++) {
-                j->m_DAAShadowRegs.CAO_REGS.CAO.CallerID[i] = 0;
-        }
-
-/*  Bytes for IM-filter part 1 (04): 00,C2,BB,A8,CB,81,A0,00 */
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_1[7] = 0x00;
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_1[6] = 0xC2;
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_1[5] = 0xBB;
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_1[4] = 0xA8;
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_1[3] = 0xCB;
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_1[2] = 0x81;
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_1[1] = 0xA0;
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_1[0] = 0x00;
-/* Bytes for IM-filter part 2 (05): 40,00,00,0A,A4,33,E0,08 */
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_2[7] = 0x40;
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_2[6] = 0x00;
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_2[5] = 0x00;
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_2[4] = 0x0A;
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_2[3] = 0xA4;
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_2[2] = 0x33;
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_2[1] = 0xE0;
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_2[0] = 0x08;
-/* Bytes for FRX-filter       (08): 07,9B,ED,24,B2,A2,A0,08 */
-        j->m_DAAShadowRegs.COP_REGS.COP.FRXFilterCoeff[7] = 0x07;
-        j->m_DAAShadowRegs.COP_REGS.COP.FRXFilterCoeff[6] = 0x9B;
-        j->m_DAAShadowRegs.COP_REGS.COP.FRXFilterCoeff[5] = 0xED;
-        j->m_DAAShadowRegs.COP_REGS.COP.FRXFilterCoeff[4] = 0x24;
-        j->m_DAAShadowRegs.COP_REGS.COP.FRXFilterCoeff[3] = 0xB2;
-        j->m_DAAShadowRegs.COP_REGS.COP.FRXFilterCoeff[2] = 0xA2;
-        j->m_DAAShadowRegs.COP_REGS.COP.FRXFilterCoeff[1] = 0xA0;
-        j->m_DAAShadowRegs.COP_REGS.COP.FRXFilterCoeff[0] = 0x08;
-/* Bytes for FRR-filter       (07): 0F,92,F2,B2,87,D2,30,08 */
-        j->m_DAAShadowRegs.COP_REGS.COP.FRRFilterCoeff[7] = 0x0F;
-        j->m_DAAShadowRegs.COP_REGS.COP.FRRFilterCoeff[6] = 0x92;
-        j->m_DAAShadowRegs.COP_REGS.COP.FRRFilterCoeff[5] = 0xF2;
-        j->m_DAAShadowRegs.COP_REGS.COP.FRRFilterCoeff[4] = 0xB2;
-        j->m_DAAShadowRegs.COP_REGS.COP.FRRFilterCoeff[3] = 0x87;
-        j->m_DAAShadowRegs.COP_REGS.COP.FRRFilterCoeff[2] = 0xD2;
-        j->m_DAAShadowRegs.COP_REGS.COP.FRRFilterCoeff[1] = 0x30;
-        j->m_DAAShadowRegs.COP_REGS.COP.FRRFilterCoeff[0] = 0x08;
-/* Bytes for AX-filter        (0A): 1B,A5,DD,CA */
-        j->m_DAAShadowRegs.COP_REGS.COP.AXFilterCoeff[3] = 0x1B;
-        j->m_DAAShadowRegs.COP_REGS.COP.AXFilterCoeff[2] = 0xA5;
-        j->m_DAAShadowRegs.COP_REGS.COP.AXFilterCoeff[1] = 0xDD;
-        j->m_DAAShadowRegs.COP_REGS.COP.AXFilterCoeff[0] = 0xCA;
-/* Bytes for AR-filter        (09): E2,27,10,D6 */
-        j->m_DAAShadowRegs.COP_REGS.COP.ARFilterCoeff[3] = 0xE2;
-        j->m_DAAShadowRegs.COP_REGS.COP.ARFilterCoeff[2] = 0x27;
-        j->m_DAAShadowRegs.COP_REGS.COP.ARFilterCoeff[1] = 0x10;
-        j->m_DAAShadowRegs.COP_REGS.COP.ARFilterCoeff[0] = 0xD6;
-/* Bytes for TH-filter part 1 (00): 80,2D,38,8B,D0,00,00,98 */
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_1[7] = 0x80;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_1[6] = 0x2D;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_1[5] = 0x38;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_1[4] = 0x8B;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_1[3] = 0xD0;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_1[2] = 0x00;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_1[1] = 0x00;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_1[0] = 0x98;
-/* Bytes for TH-filter part 2 (01): 02,5A,53,F0,0B,5F,84,D4 */
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_2[7] = 0x02;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_2[6] = 0x5A;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_2[5] = 0x53;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_2[4] = 0xF0;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_2[3] = 0x0B;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_2[2] = 0x5F;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_2[1] = 0x84;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_2[0] = 0xD4;
-/* Bytes for TH-filter part 3 (02): 00,88,6A,A4,8F,52,F5,32 */
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_3[7] = 0x00;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_3[6] = 0x88;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_3[5] = 0x6A;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_3[4] = 0xA4;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_3[3] = 0x8F;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_3[2] = 0x52;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_3[1] = 0xF5;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_3[0] = 0x32;
-/* ; idle */
-        /* Bytes for Ringing part 1 (03):1B,3C,93,3A,22,12,A3,23 */
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_1[7] = 0x1B;
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_1[6] = 0x3C;
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_1[5] = 0x93;
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_1[4] = 0x3A;
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_1[3] = 0x22;
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_1[2] = 0x12;
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_1[1] = 0xA3;
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_1[0] = 0x23;
-/* Bytes for Ringing part 2 (06):12,A2,A6,BA,22,7A,0A,D5 */
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_2[7] = 0x12;
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_2[6] = 0xA2;
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_2[5] = 0xA6;
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_2[4] = 0xBA;
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_2[3] = 0x22;
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_2[2] = 0x7A;
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_2[1] = 0x0A;
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_2[0] = 0xD5;
-/* Levelmetering Ringing           (0D):AA,35,0F,8E     ; 25Hz 30V less possible? */
-        j->m_DAAShadowRegs.COP_REGS.COP.LevelmeteringRinging[3] = 0xAA;
-        j->m_DAAShadowRegs.COP_REGS.COP.LevelmeteringRinging[2] = 0x35;
-        j->m_DAAShadowRegs.COP_REGS.COP.LevelmeteringRinging[1] = 0x0F;
-        j->m_DAAShadowRegs.COP_REGS.COP.LevelmeteringRinging[0] = 0x8E;
-/* Caller ID 1st Tone              (0E):CA,0E,CA,09,99,99,99,99 */
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID1stTone[7] = 0xCA;
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID1stTone[6] = 0x0E;
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID1stTone[5] = 0xCA;
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID1stTone[4] = 0x09;
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID1stTone[3] = 0x99;
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID1stTone[2] = 0x99;
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID1stTone[1] = 0x99;
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID1stTone[0] = 0x99;
-/* Caller ID 2nd Tone              (0F):FD,B5,BA,07,DA,00,00,00 */
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID2ndTone[7] = 0xFD;
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID2ndTone[6] = 0xB5;
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID2ndTone[5] = 0xBA;
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID2ndTone[4] = 0x07;
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID2ndTone[3] = 0xDA;
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID2ndTone[2] = 0x00;
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID2ndTone[1] = 0x00;
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID2ndTone[0] = 0x00;
-/* ;CR Registers */
-        /* Config. Reg. 0 (filters)        (cr0):FF */
-        j->m_DAAShadowRegs.SOP_REGS.SOP.cr0.reg = 0xFF;
-/* Config. Reg. 1 (dialing)        (cr1):05 */
-        j->m_DAAShadowRegs.SOP_REGS.SOP.cr1.reg = 0x05;
-/* Config. Reg. 2 (caller ID)      (cr2):04 */
-        j->m_DAAShadowRegs.SOP_REGS.SOP.cr2.reg = 0x04;
-/* Config. Reg. 3 (testloops)      (cr3):00        ;  */
-        j->m_DAAShadowRegs.SOP_REGS.SOP.cr3.reg = 0x00;
-/* Config. Reg. 4 (analog gain)    (cr4):02 */
-        j->m_DAAShadowRegs.SOP_REGS.SOP.cr4.reg = 0x02;
-        /* Config. Reg. 5 (Version)        (cr5):02 */
-        /* Config. Reg. 6 (Reserved)       (cr6):00 */
-        /* Config. Reg. 7 (Reserved)       (cr7):00 */
-        /* ;xr Registers */
-        /* Ext. Reg. 0 (Interrupt Reg.)    (xr0):02 */
-
-        j->m_DAAShadowRegs.XOP_xr0_W.reg = 0x02;        /* SO_1 set to '1' because it is inverted. */
-        /* Ext. Reg. 1 (Interrupt enable)  (xr1):1C */
-
-        j->m_DAAShadowRegs.XOP_REGS.XOP.xr1.reg = 0x1C;         /* RING, Caller ID, VDD_OK */
-        /* Ext. Reg. 2 (Cadence Time Out)  (xr2):7D */
-
-        j->m_DAAShadowRegs.XOP_REGS.XOP.xr2.reg = 0x7D;
-/* Ext. Reg. 3 (DC Char)           (xr3):36        ;  */
-        j->m_DAAShadowRegs.XOP_REGS.XOP.xr3.reg = 0x36;
-/* Ext. Reg. 4 (Cadence)           (xr4):00 */
-        j->m_DAAShadowRegs.XOP_REGS.XOP.xr4.reg = 0x00;
-/* Ext. Reg. 5 (Ring timer)        (xr5):22 */
-        j->m_DAAShadowRegs.XOP_REGS.XOP.xr5.reg = 0x22;
-/* Ext. Reg. 6 (Power State)       (xr6):00 */
-        j->m_DAAShadowRegs.XOP_xr6_W.reg = 0x00;
-/* Ext. Reg. 7 (Vdd)               (xr7):46 */
-        j->m_DAAShadowRegs.XOP_REGS.XOP.xr7.reg = 0x46;         /* 0x46 ??? Should it be 0x00? */
-        /* DTMF Tone 1                     (0B): 11,B3,5A,2C    ;   697 Hz   */
-        /*                                       12,33,5A,C3    ;  770 Hz   */
-        /*                                       13,3C,5B,32    ;  852 Hz   */
-        /*                                       1D,1B,5C,CC    ;  941 Hz   */
-
-        j->m_DAAShadowRegs.COP_REGS.COP.Tone1Coeff[3] = 0x11;
-        j->m_DAAShadowRegs.COP_REGS.COP.Tone1Coeff[2] = 0xB3;
-        j->m_DAAShadowRegs.COP_REGS.COP.Tone1Coeff[1] = 0x5A;
-        j->m_DAAShadowRegs.COP_REGS.COP.Tone1Coeff[0] = 0x2C;
-/* DTMF Tone 2                     (0C): 32,32,52,B3    ;  1209 Hz   */
-        /*                                       EC,1D,52,22    ;  1336 Hz   */
-        /*                                       AA,AC,51,D2    ;  1477 Hz   */
-        /*                                       9B,3B,51,25    ;  1633 Hz   */
-        j->m_DAAShadowRegs.COP_REGS.COP.Tone2Coeff[3] = 0x32;
-        j->m_DAAShadowRegs.COP_REGS.COP.Tone2Coeff[2] = 0x32;
-        j->m_DAAShadowRegs.COP_REGS.COP.Tone2Coeff[1] = 0x52;
-        j->m_DAAShadowRegs.COP_REGS.COP.Tone2Coeff[0] = 0xB3;
-}
-
-
-static void DAA_Coeff_France(IXJ *j)
-{
-        int i;
-
-        j->daa_country = DAA_FRANCE;
-        /*----------------------------------------------- */
-        /* CAO */
-        for (i = 0; i < ALISDAA_CALLERID_SIZE; i++) {
-                j->m_DAAShadowRegs.CAO_REGS.CAO.CallerID[i] = 0;
-        }
-
-/* Bytes for IM-filter part 1 (04): 02,A2,43,2C,22,AF,A0,00 */
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_1[7] = 0x02;
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_1[6] = 0xA2;
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_1[5] = 0x43;
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_1[4] = 0x2C;
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_1[3] = 0x22;
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_1[2] = 0xAF;
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_1[1] = 0xA0;
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_1[0] = 0x00;
-/* Bytes for IM-filter part 2 (05): 67,CE,00,0C,22,33,E0,08 */
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_2[7] = 0x67;
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_2[6] = 0xCE;
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_2[5] = 0x00;
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_2[4] = 0x2C;
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_2[3] = 0x22;
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_2[2] = 0x33;
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_2[1] = 0xE0;
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_2[0] = 0x08;
-/* Bytes for FRX-filter       (08): 07,9A,28,F6,23,4A,B0,08 */
-        j->m_DAAShadowRegs.COP_REGS.COP.FRXFilterCoeff[7] = 0x07;
-        j->m_DAAShadowRegs.COP_REGS.COP.FRXFilterCoeff[6] = 0x9A;
-        j->m_DAAShadowRegs.COP_REGS.COP.FRXFilterCoeff[5] = 0x28;
-        j->m_DAAShadowRegs.COP_REGS.COP.FRXFilterCoeff[4] = 0xF6;
-        j->m_DAAShadowRegs.COP_REGS.COP.FRXFilterCoeff[3] = 0x23;
-        j->m_DAAShadowRegs.COP_REGS.COP.FRXFilterCoeff[2] = 0x4A;
-        j->m_DAAShadowRegs.COP_REGS.COP.FRXFilterCoeff[1] = 0xB0;
-        j->m_DAAShadowRegs.COP_REGS.COP.FRXFilterCoeff[0] = 0x08;
-/* Bytes for FRR-filter       (07): 03,8F,F9,2F,9E,FA,20,08 */
-        j->m_DAAShadowRegs.COP_REGS.COP.FRRFilterCoeff[7] = 0x03;
-        j->m_DAAShadowRegs.COP_REGS.COP.FRRFilterCoeff[6] = 0x8F;
-        j->m_DAAShadowRegs.COP_REGS.COP.FRRFilterCoeff[5] = 0xF9;
-        j->m_DAAShadowRegs.COP_REGS.COP.FRRFilterCoeff[4] = 0x2F;
-        j->m_DAAShadowRegs.COP_REGS.COP.FRRFilterCoeff[3] = 0x9E;
-        j->m_DAAShadowRegs.COP_REGS.COP.FRRFilterCoeff[2] = 0xFA;
-        j->m_DAAShadowRegs.COP_REGS.COP.FRRFilterCoeff[1] = 0x20;
-        j->m_DAAShadowRegs.COP_REGS.COP.FRRFilterCoeff[0] = 0x08;
-/* Bytes for AX-filter        (0A): 16,B5,DD,CA */
-        j->m_DAAShadowRegs.COP_REGS.COP.AXFilterCoeff[3] = 0x16;
-        j->m_DAAShadowRegs.COP_REGS.COP.AXFilterCoeff[2] = 0xB5;
-        j->m_DAAShadowRegs.COP_REGS.COP.AXFilterCoeff[1] = 0xDD;
-        j->m_DAAShadowRegs.COP_REGS.COP.AXFilterCoeff[0] = 0xCA;
-/* Bytes for AR-filter        (09): 52,C7,10,D6 */
-        j->m_DAAShadowRegs.COP_REGS.COP.ARFilterCoeff[3] = 0xE2;
-        j->m_DAAShadowRegs.COP_REGS.COP.ARFilterCoeff[2] = 0xC7;
-        j->m_DAAShadowRegs.COP_REGS.COP.ARFilterCoeff[1] = 0x10;
-        j->m_DAAShadowRegs.COP_REGS.COP.ARFilterCoeff[0] = 0xD6;
-/* Bytes for TH-filter part 1 (00): 00,42,48,81,A6,80,00,98 */
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_1[7] = 0x00;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_1[6] = 0x42;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_1[5] = 0x48;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_1[4] = 0x81;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_1[3] = 0xA6;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_1[2] = 0x80;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_1[1] = 0x00;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_1[0] = 0x98;
-/* Bytes for TH-filter part 2 (01): 02,AC,2A,30,78,AC,8A,2C */
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_2[7] = 0x02;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_2[6] = 0xAC;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_2[5] = 0x2A;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_2[4] = 0x30;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_2[3] = 0x78;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_2[2] = 0xAC;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_2[1] = 0x8A;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_2[0] = 0x2C;
-/* Bytes for TH-filter part 3 (02): 00,88,DA,A5,22,BA,2C,45 */
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_3[7] = 0x00;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_3[6] = 0x88;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_3[5] = 0xDA;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_3[4] = 0xA5;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_3[3] = 0x22;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_3[2] = 0xBA;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_3[1] = 0x2C;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_3[0] = 0x45;
-/* ; idle */
-        /* Bytes for Ringing part 1 (03):1B,3C,93,3A,22,12,A3,23 */
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_1[7] = 0x1B;
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_1[6] = 0x3C;
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_1[5] = 0x93;
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_1[4] = 0x3A;
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_1[3] = 0x22;
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_1[2] = 0x12;
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_1[1] = 0xA3;
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_1[0] = 0x23;
-/* Bytes for Ringing part 2 (06):12,A2,A6,BA,22,7A,0A,D5 */
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_2[7] = 0x12;
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_2[6] = 0xA2;
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_2[5] = 0xA6;
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_2[4] = 0xBA;
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_2[3] = 0x22;
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_2[2] = 0x7A;
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_2[1] = 0x0A;
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_2[0] = 0xD5;
-/* Levelmetering Ringing           (0D):32,45,B5,84     ; 50Hz 20V */
-        j->m_DAAShadowRegs.COP_REGS.COP.LevelmeteringRinging[3] = 0x32;
-        j->m_DAAShadowRegs.COP_REGS.COP.LevelmeteringRinging[2] = 0x45;
-        j->m_DAAShadowRegs.COP_REGS.COP.LevelmeteringRinging[1] = 0xB5;
-        j->m_DAAShadowRegs.COP_REGS.COP.LevelmeteringRinging[0] = 0x84;
-/* Caller ID 1st Tone              (0E):CA,0E,CA,09,99,99,99,99 */
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID1stTone[7] = 0xCA;
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID1stTone[6] = 0x0E;
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID1stTone[5] = 0xCA;
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID1stTone[4] = 0x09;
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID1stTone[3] = 0x99;
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID1stTone[2] = 0x99;
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID1stTone[1] = 0x99;
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID1stTone[0] = 0x99;
-/* Caller ID 2nd Tone              (0F):FD,B5,BA,07,DA,00,00,00 */
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID2ndTone[7] = 0xFD;
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID2ndTone[6] = 0xB5;
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID2ndTone[5] = 0xBA;
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID2ndTone[4] = 0x07;
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID2ndTone[3] = 0xDA;
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID2ndTone[2] = 0x00;
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID2ndTone[1] = 0x00;
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID2ndTone[0] = 0x00;
-/* ;CR Registers */
-        /* Config. Reg. 0 (filters)        (cr0):FF */
-        j->m_DAAShadowRegs.SOP_REGS.SOP.cr0.reg = 0xFF;
-/* Config. Reg. 1 (dialing)        (cr1):05 */
-        j->m_DAAShadowRegs.SOP_REGS.SOP.cr1.reg = 0x05;
-/* Config. Reg. 2 (caller ID)      (cr2):04 */
-        j->m_DAAShadowRegs.SOP_REGS.SOP.cr2.reg = 0x04;
-/* Config. Reg. 3 (testloops)      (cr3):00        ;  */
-        j->m_DAAShadowRegs.SOP_REGS.SOP.cr3.reg = 0x00;
-/* Config. Reg. 4 (analog gain)    (cr4):02 */
-        j->m_DAAShadowRegs.SOP_REGS.SOP.cr4.reg = 0x02;
-        /* Config. Reg. 5 (Version)        (cr5):02 */
-        /* Config. Reg. 6 (Reserved)       (cr6):00 */
-        /* Config. Reg. 7 (Reserved)       (cr7):00 */
-        /* ;xr Registers */
-        /* Ext. Reg. 0 (Interrupt Reg.)    (xr0):02 */
-
-        j->m_DAAShadowRegs.XOP_xr0_W.reg = 0x02;        /* SO_1 set to '1' because it is inverted. */
-        /* Ext. Reg. 1 (Interrupt enable)  (xr1):1C */
-
-        j->m_DAAShadowRegs.XOP_REGS.XOP.xr1.reg = 0x1C;         /* RING, Caller ID, VDD_OK */
-        /* Ext. Reg. 2 (Cadence Time Out)  (xr2):7D */
-
-        j->m_DAAShadowRegs.XOP_REGS.XOP.xr2.reg = 0x7D;
-/* Ext. Reg. 3 (DC Char)           (xr3):36        ;  */
-        j->m_DAAShadowRegs.XOP_REGS.XOP.xr3.reg = 0x36;
-/* Ext. Reg. 4 (Cadence)           (xr4):00 */
-        j->m_DAAShadowRegs.XOP_REGS.XOP.xr4.reg = 0x00;
-/* Ext. Reg. 5 (Ring timer)        (xr5):22 */
-        j->m_DAAShadowRegs.XOP_REGS.XOP.xr5.reg = 0x22;
-/* Ext. Reg. 6 (Power State)       (xr6):00 */
-        j->m_DAAShadowRegs.XOP_xr6_W.reg = 0x00;
-/* Ext. Reg. 7 (Vdd)               (xr7):46 */
-        j->m_DAAShadowRegs.XOP_REGS.XOP.xr7.reg = 0x46;         /* 0x46 ??? Should it be 0x00? */
-        /* DTMF Tone 1                     (0B): 11,B3,5A,2C    ;   697 Hz   */
-        /*                                       12,33,5A,C3    ;  770 Hz   */
-        /*                                       13,3C,5B,32    ;  852 Hz   */
-        /*                                       1D,1B,5C,CC    ;  941 Hz   */
-
-        j->m_DAAShadowRegs.COP_REGS.COP.Tone1Coeff[3] = 0x11;
-        j->m_DAAShadowRegs.COP_REGS.COP.Tone1Coeff[2] = 0xB3;
-        j->m_DAAShadowRegs.COP_REGS.COP.Tone1Coeff[1] = 0x5A;
-        j->m_DAAShadowRegs.COP_REGS.COP.Tone1Coeff[0] = 0x2C;
-/* DTMF Tone 2                     (0C): 32,32,52,B3    ;  1209 Hz   */
-        /*                                       EC,1D,52,22    ;  1336 Hz   */
-        /*                                       AA,AC,51,D2    ;  1477 Hz   */
-        /*                                       9B,3B,51,25    ;  1633 Hz   */
-        j->m_DAAShadowRegs.COP_REGS.COP.Tone2Coeff[3] = 0x32;
-        j->m_DAAShadowRegs.COP_REGS.COP.Tone2Coeff[2] = 0x32;
-        j->m_DAAShadowRegs.COP_REGS.COP.Tone2Coeff[1] = 0x52;
-        j->m_DAAShadowRegs.COP_REGS.COP.Tone2Coeff[0] = 0xB3;
-}
-
-
-static void DAA_Coeff_Germany(IXJ *j)
-{
-        int i;
-
-        j->daa_country = DAA_GERMANY;
-        /*----------------------------------------------- */
-        /* CAO */
-        for (i = 0; i < ALISDAA_CALLERID_SIZE; i++) {
-                j->m_DAAShadowRegs.CAO_REGS.CAO.CallerID[i] = 0;
-        }
-
-/* Bytes for IM-filter part 1 (04): 00,CE,BB,B8,D2,81,B0,00 */
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_1[7] = 0x00;
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_1[6] = 0xCE;
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_1[5] = 0xBB;
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_1[4] = 0xB8;
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_1[3] = 0xD2;
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_1[2] = 0x81;
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_1[1] = 0xB0;
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_1[0] = 0x00;
-/* Bytes for IM-filter part 2 (05): 45,8F,00,0C,D2,3A,D0,08 */
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_2[7] = 0x45;
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_2[6] = 0x8F;
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_2[5] = 0x00;
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_2[4] = 0x0C;
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_2[3] = 0xD2;
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_2[2] = 0x3A;
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_2[1] = 0xD0;
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_2[0] = 0x08;
-/* Bytes for FRX-filter       (08): 07,AA,E2,34,24,89,20,08 */
-        j->m_DAAShadowRegs.COP_REGS.COP.FRXFilterCoeff[7] = 0x07;
-        j->m_DAAShadowRegs.COP_REGS.COP.FRXFilterCoeff[6] = 0xAA;
-        j->m_DAAShadowRegs.COP_REGS.COP.FRXFilterCoeff[5] = 0xE2;
-        j->m_DAAShadowRegs.COP_REGS.COP.FRXFilterCoeff[4] = 0x34;
-        j->m_DAAShadowRegs.COP_REGS.COP.FRXFilterCoeff[3] = 0x24;
-        j->m_DAAShadowRegs.COP_REGS.COP.FRXFilterCoeff[2] = 0x89;
-        j->m_DAAShadowRegs.COP_REGS.COP.FRXFilterCoeff[1] = 0x20;
-        j->m_DAAShadowRegs.COP_REGS.COP.FRXFilterCoeff[0] = 0x08;
-/* Bytes for FRR-filter       (07): 02,87,FA,37,9A,CA,B0,08 */
-        j->m_DAAShadowRegs.COP_REGS.COP.FRRFilterCoeff[7] = 0x02;
-        j->m_DAAShadowRegs.COP_REGS.COP.FRRFilterCoeff[6] = 0x87;
-        j->m_DAAShadowRegs.COP_REGS.COP.FRRFilterCoeff[5] = 0xFA;
-        j->m_DAAShadowRegs.COP_REGS.COP.FRRFilterCoeff[4] = 0x37;
-        j->m_DAAShadowRegs.COP_REGS.COP.FRRFilterCoeff[3] = 0x9A;
-        j->m_DAAShadowRegs.COP_REGS.COP.FRRFilterCoeff[2] = 0xCA;
-        j->m_DAAShadowRegs.COP_REGS.COP.FRRFilterCoeff[1] = 0xB0;
-        j->m_DAAShadowRegs.COP_REGS.COP.FRRFilterCoeff[0] = 0x08;
-/* Bytes for AX-filter        (0A): 72,D5,DD,CA */
-        j->m_DAAShadowRegs.COP_REGS.COP.AXFilterCoeff[3] = 0x72;
-        j->m_DAAShadowRegs.COP_REGS.COP.AXFilterCoeff[2] = 0xD5;
-        j->m_DAAShadowRegs.COP_REGS.COP.AXFilterCoeff[1] = 0xDD;
-        j->m_DAAShadowRegs.COP_REGS.COP.AXFilterCoeff[0] = 0xCA;
-/* Bytes for AR-filter        (09): 72,42,13,4B */
-        j->m_DAAShadowRegs.COP_REGS.COP.ARFilterCoeff[3] = 0x72;
-        j->m_DAAShadowRegs.COP_REGS.COP.ARFilterCoeff[2] = 0x42;
-        j->m_DAAShadowRegs.COP_REGS.COP.ARFilterCoeff[1] = 0x13;
-        j->m_DAAShadowRegs.COP_REGS.COP.ARFilterCoeff[0] = 0x4B;
-/* Bytes for TH-filter part 1 (00): 80,52,48,81,AD,80,00,98 */
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_1[7] = 0x80;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_1[6] = 0x52;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_1[5] = 0x48;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_1[4] = 0x81;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_1[3] = 0xAD;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_1[2] = 0x80;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_1[1] = 0x00;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_1[0] = 0x98;
-/* Bytes for TH-filter part 2 (01): 02,42,5A,20,E8,1A,81,27 */
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_2[7] = 0x02;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_2[6] = 0x42;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_2[5] = 0x5A;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_2[4] = 0x20;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_2[3] = 0xE8;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_2[2] = 0x1A;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_2[1] = 0x81;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_2[0] = 0x27;
-/* Bytes for TH-filter part 3 (02): 00,88,63,26,BD,4B,A3,C2 */
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_3[7] = 0x00;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_3[6] = 0x88;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_3[5] = 0x63;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_3[4] = 0x26;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_3[3] = 0xBD;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_3[2] = 0x4B;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_3[1] = 0xA3;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_3[0] = 0xC2;
-/* ;  (10K, 0.68uF) */
-        /* Bytes for Ringing part 1 (03):1B,3B,9B,BA,D4,1C,B3,23 */
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_1[7] = 0x1B;
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_1[6] = 0x3B;
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_1[5] = 0x9B;
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_1[4] = 0xBA;
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_1[3] = 0xD4;
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_1[2] = 0x1C;
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_1[1] = 0xB3;
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_1[0] = 0x23;
-/* Bytes for Ringing part 2 (06):13,42,A6,BA,D4,73,CA,D5 */
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_2[7] = 0x13;
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_2[6] = 0x42;
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_2[5] = 0xA6;
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_2[4] = 0xBA;
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_2[3] = 0xD4;
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_2[2] = 0x73;
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_2[1] = 0xCA;
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_2[0] = 0xD5;
-/* Levelmetering Ringing        (0D):B2,45,0F,8E       */
-        j->m_DAAShadowRegs.COP_REGS.COP.LevelmeteringRinging[3] = 0xB2;
-        j->m_DAAShadowRegs.COP_REGS.COP.LevelmeteringRinging[2] = 0x45;
-        j->m_DAAShadowRegs.COP_REGS.COP.LevelmeteringRinging[1] = 0x0F;
-        j->m_DAAShadowRegs.COP_REGS.COP.LevelmeteringRinging[0] = 0x8E;
-/* Caller ID 1st Tone           (0E):CA,0E,CA,09,99,99,99,99 */
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID1stTone[7] = 0xCA;
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID1stTone[6] = 0x0E;
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID1stTone[5] = 0xCA;
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID1stTone[4] = 0x09;
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID1stTone[3] = 0x99;
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID1stTone[2] = 0x99;
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID1stTone[1] = 0x99;
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID1stTone[0] = 0x99;
-/* Caller ID 2nd Tone           (0F):FD,B5,BA,07,DA,00,00,00 */
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID2ndTone[7] = 0xFD;
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID2ndTone[6] = 0xB5;
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID2ndTone[5] = 0xBA;
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID2ndTone[4] = 0x07;
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID2ndTone[3] = 0xDA;
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID2ndTone[2] = 0x00;
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID2ndTone[1] = 0x00;
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID2ndTone[0] = 0x00;
-/* ;CR Registers */
-        /* Config. Reg. 0 (filters)        (cr0):FF ; all Filters enabled, CLK from ext. source */
-        j->m_DAAShadowRegs.SOP_REGS.SOP.cr0.reg = 0xFF;
-/* Config. Reg. 1 (dialing)        (cr1):05 ; Manual Ring, Ring metering enabled */
-        j->m_DAAShadowRegs.SOP_REGS.SOP.cr1.reg = 0x05;
-/* Config. Reg. 2 (caller ID)      (cr2):04 ; Analog Gain 0dB, FSC internal */
-        j->m_DAAShadowRegs.SOP_REGS.SOP.cr2.reg = 0x04;
-/* Config. Reg. 3 (testloops)      (cr3):00 ; SEL Bit==0, HP-enabled */
-        j->m_DAAShadowRegs.SOP_REGS.SOP.cr3.reg = 0x00;
-/* Config. Reg. 4 (analog gain)    (cr4):02 */
-        j->m_DAAShadowRegs.SOP_REGS.SOP.cr4.reg = 0x02;
-        /* Config. Reg. 5 (Version)        (cr5):02 */
-        /* Config. Reg. 6 (Reserved)       (cr6):00 */
-        /* Config. Reg. 7 (Reserved)       (cr7):00 */
-        /* ;xr Registers */
-        /* Ext. Reg. 0 (Interrupt Reg.)    (xr0):02 */
-
-        j->m_DAAShadowRegs.XOP_xr0_W.reg = 0x02;        /* SO_1 set to '1' because it is inverted. */
-        /* Ext. Reg. 1 (Interrupt enable)  (xr1):1C ; Ring, CID, VDDOK Interrupts enabled */
-
-        j->m_DAAShadowRegs.XOP_REGS.XOP.xr1.reg = 0x1C;         /* RING, Caller ID, VDD_OK */
-        /* Ext. Reg. 2 (Cadence Time Out)  (xr2):7D */
-
-        j->m_DAAShadowRegs.XOP_REGS.XOP.xr2.reg = 0x7D;
-/* Ext. Reg. 3 (DC Char)           (xr3):32 ; B-Filter Off==1, U0=3.5V, R=200Ohm */
-        j->m_DAAShadowRegs.XOP_REGS.XOP.xr3.reg = 0x32;
-/* Ext. Reg. 4 (Cadence)           (xr4):00 */
-        j->m_DAAShadowRegs.XOP_REGS.XOP.xr4.reg = 0x00;
-/* Ext. Reg. 5 (Ring timer)        (xr5):22 */
-        j->m_DAAShadowRegs.XOP_REGS.XOP.xr5.reg = 0x22;
-/* Ext. Reg. 6 (Power State)       (xr6):00 */
-        j->m_DAAShadowRegs.XOP_xr6_W.reg = 0x00;
-/* Ext. Reg. 7 (Vdd)               (xr7):40 ; VDD=4.25 V */
-        j->m_DAAShadowRegs.XOP_REGS.XOP.xr7.reg = 0x40;         /* 0x40 ??? Should it be 0x00? */
-        /* DTMF Tone 1                     (0B): 11,B3,5A,2C    ;   697 Hz   */
-        /*                                       12,33,5A,C3    ;  770 Hz   */
-        /*                                       13,3C,5B,32    ;  852 Hz   */
-        /*                                       1D,1B,5C,CC    ;  941 Hz   */
-
-        j->m_DAAShadowRegs.COP_REGS.COP.Tone1Coeff[3] = 0x11;
-        j->m_DAAShadowRegs.COP_REGS.COP.Tone1Coeff[2] = 0xB3;
-        j->m_DAAShadowRegs.COP_REGS.COP.Tone1Coeff[1] = 0x5A;
-        j->m_DAAShadowRegs.COP_REGS.COP.Tone1Coeff[0] = 0x2C;
-/* DTMF Tone 2                     (0C): 32,32,52,B3    ;  1209 Hz   */
-        /*                                       EC,1D,52,22    ;  1336 Hz   */
-        /*                                       AA,AC,51,D2    ;  1477 Hz   */
-        /*                                       9B,3B,51,25    ;  1633 Hz   */
-        j->m_DAAShadowRegs.COP_REGS.COP.Tone2Coeff[3] = 0x32;
-        j->m_DAAShadowRegs.COP_REGS.COP.Tone2Coeff[2] = 0x32;
-        j->m_DAAShadowRegs.COP_REGS.COP.Tone2Coeff[1] = 0x52;
-        j->m_DAAShadowRegs.COP_REGS.COP.Tone2Coeff[0] = 0xB3;
-}
-
-
-static void DAA_Coeff_Australia(IXJ *j)
-{
-        int i;
-
-        j->daa_country = DAA_AUSTRALIA;
-        /*----------------------------------------------- */
-        /* CAO */
-        for (i = 0; i < ALISDAA_CALLERID_SIZE; i++) {
-                j->m_DAAShadowRegs.CAO_REGS.CAO.CallerID[i] = 0;
-        }
-
-/* Bytes for IM-filter part 1 (04): 00,A3,AA,28,B3,82,D0,00 */
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_1[7] = 0x00;
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_1[6] = 0xA3;
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_1[5] = 0xAA;
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_1[4] = 0x28;
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_1[3] = 0xB3;
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_1[2] = 0x82;
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_1[1] = 0xD0;
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_1[0] = 0x00;
-/* Bytes for IM-filter part 2 (05): 70,96,00,09,32,6B,C0,08 */
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_2[7] = 0x70;
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_2[6] = 0x96;
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_2[5] = 0x00;
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_2[4] = 0x09;
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_2[3] = 0x32;
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_2[2] = 0x6B;
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_2[1] = 0xC0;
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_2[0] = 0x08;
-/* Bytes for FRX-filter       (08): 07,96,E2,34,32,9B,30,08 */
-        j->m_DAAShadowRegs.COP_REGS.COP.FRXFilterCoeff[7] = 0x07;
-        j->m_DAAShadowRegs.COP_REGS.COP.FRXFilterCoeff[6] = 0x96;
-        j->m_DAAShadowRegs.COP_REGS.COP.FRXFilterCoeff[5] = 0xE2;
-        j->m_DAAShadowRegs.COP_REGS.COP.FRXFilterCoeff[4] = 0x34;
-        j->m_DAAShadowRegs.COP_REGS.COP.FRXFilterCoeff[3] = 0x32;
-        j->m_DAAShadowRegs.COP_REGS.COP.FRXFilterCoeff[2] = 0x9B;
-        j->m_DAAShadowRegs.COP_REGS.COP.FRXFilterCoeff[1] = 0x30;
-        j->m_DAAShadowRegs.COP_REGS.COP.FRXFilterCoeff[0] = 0x08;
-/* Bytes for FRR-filter       (07): 0F,9A,E9,2F,22,CC,A0,08 */
-        j->m_DAAShadowRegs.COP_REGS.COP.FRRFilterCoeff[7] = 0x0F;
-        j->m_DAAShadowRegs.COP_REGS.COP.FRRFilterCoeff[6] = 0x9A;
-        j->m_DAAShadowRegs.COP_REGS.COP.FRRFilterCoeff[5] = 0xE9;
-        j->m_DAAShadowRegs.COP_REGS.COP.FRRFilterCoeff[4] = 0x2F;
-        j->m_DAAShadowRegs.COP_REGS.COP.FRRFilterCoeff[3] = 0x22;
-        j->m_DAAShadowRegs.COP_REGS.COP.FRRFilterCoeff[2] = 0xCC;
-        j->m_DAAShadowRegs.COP_REGS.COP.FRRFilterCoeff[1] = 0xA0;
-        j->m_DAAShadowRegs.COP_REGS.COP.FRRFilterCoeff[0] = 0x08;
-/* Bytes for AX-filter        (0A): CB,45,DD,CA */
-        j->m_DAAShadowRegs.COP_REGS.COP.AXFilterCoeff[3] = 0xCB;
-        j->m_DAAShadowRegs.COP_REGS.COP.AXFilterCoeff[2] = 0x45;
-        j->m_DAAShadowRegs.COP_REGS.COP.AXFilterCoeff[1] = 0xDD;
-        j->m_DAAShadowRegs.COP_REGS.COP.AXFilterCoeff[0] = 0xCA;
-/* Bytes for AR-filter        (09): 1B,67,10,D6 */
-        j->m_DAAShadowRegs.COP_REGS.COP.ARFilterCoeff[3] = 0x1B;
-        j->m_DAAShadowRegs.COP_REGS.COP.ARFilterCoeff[2] = 0x67;
-        j->m_DAAShadowRegs.COP_REGS.COP.ARFilterCoeff[1] = 0x10;
-        j->m_DAAShadowRegs.COP_REGS.COP.ARFilterCoeff[0] = 0xD6;
-/* Bytes for TH-filter part 1 (00): 80,52,48,81,AF,80,00,98 */
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_1[7] = 0x80;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_1[6] = 0x52;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_1[5] = 0x48;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_1[4] = 0x81;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_1[3] = 0xAF;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_1[2] = 0x80;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_1[1] = 0x00;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_1[0] = 0x98;
-/* Bytes for TH-filter part 2 (01): 02,DB,52,B0,38,01,82,AC */
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_2[7] = 0x02;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_2[6] = 0xDB;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_2[5] = 0x52;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_2[4] = 0xB0;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_2[3] = 0x38;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_2[2] = 0x01;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_2[1] = 0x82;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_2[0] = 0xAC;
-/* Bytes for TH-filter part 3 (02): 00,88,4A,3E,2C,3B,24,46 */
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_3[7] = 0x00;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_3[6] = 0x88;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_3[5] = 0x4A;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_3[4] = 0x3E;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_3[3] = 0x2C;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_3[2] = 0x3B;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_3[1] = 0x24;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_3[0] = 0x46;
-/* ;  idle */
-        /* Bytes for Ringing part 1 (03):1B,3C,93,3A,22,12,A3,23 */
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_1[7] = 0x1B;
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_1[6] = 0x3C;
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_1[5] = 0x93;
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_1[4] = 0x3A;
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_1[3] = 0x22;
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_1[2] = 0x12;
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_1[1] = 0xA3;
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_1[0] = 0x23;
-/* Bytes for Ringing part 2 (06):12,A2,A6,BA,22,7A,0A,D5 */
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_2[7] = 0x12;
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_2[6] = 0xA2;
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_2[5] = 0xA6;
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_2[4] = 0xBA;
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_2[3] = 0x22;
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_2[2] = 0x7A;
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_2[1] = 0x0A;
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_2[0] = 0xD5;
-/* Levelmetering Ringing           (0D):32,45,B5,84   ; 50Hz 20V */
-        j->m_DAAShadowRegs.COP_REGS.COP.LevelmeteringRinging[3] = 0x32;
-        j->m_DAAShadowRegs.COP_REGS.COP.LevelmeteringRinging[2] = 0x45;
-        j->m_DAAShadowRegs.COP_REGS.COP.LevelmeteringRinging[1] = 0xB5;
-        j->m_DAAShadowRegs.COP_REGS.COP.LevelmeteringRinging[0] = 0x84;
-/* Caller ID 1st Tone              (0E):CA,0E,CA,09,99,99,99,99 */
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID1stTone[7] = 0xCA;
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID1stTone[6] = 0x0E;
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID1stTone[5] = 0xCA;
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID1stTone[4] = 0x09;
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID1stTone[3] = 0x99;
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID1stTone[2] = 0x99;
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID1stTone[1] = 0x99;
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID1stTone[0] = 0x99;
-/* Caller ID 2nd Tone              (0F):FD,B5,BA,07,DA,00,00,00 */
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID2ndTone[7] = 0xFD;
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID2ndTone[6] = 0xB5;
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID2ndTone[5] = 0xBA;
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID2ndTone[4] = 0x07;
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID2ndTone[3] = 0xDA;
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID2ndTone[2] = 0x00;
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID2ndTone[1] = 0x00;
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID2ndTone[0] = 0x00;
-/* ;CR Registers */
-        /* Config. Reg. 0 (filters)        (cr0):FF */
-        j->m_DAAShadowRegs.SOP_REGS.SOP.cr0.reg = 0xFF;
-/* Config. Reg. 1 (dialing)        (cr1):05 */
-        j->m_DAAShadowRegs.SOP_REGS.SOP.cr1.reg = 0x05;
-/* Config. Reg. 2 (caller ID)      (cr2):04 */
-        j->m_DAAShadowRegs.SOP_REGS.SOP.cr2.reg = 0x04;
-/* Config. Reg. 3 (testloops)      (cr3):00        ;  */
-        j->m_DAAShadowRegs.SOP_REGS.SOP.cr3.reg = 0x00;
-/* Config. Reg. 4 (analog gain)    (cr4):02 */
-        j->m_DAAShadowRegs.SOP_REGS.SOP.cr4.reg = 0x02;
-        /* Config. Reg. 5 (Version)        (cr5):02 */
-        /* Config. Reg. 6 (Reserved)       (cr6):00 */
-        /* Config. Reg. 7 (Reserved)       (cr7):00 */
-        /* ;xr Registers */
-        /* Ext. Reg. 0 (Interrupt Reg.)    (xr0):02 */
-
-        j->m_DAAShadowRegs.XOP_xr0_W.reg = 0x02;        /* SO_1 set to '1' because it is inverted. */
-        /* Ext. Reg. 1 (Interrupt enable)  (xr1):1C */
-
-        j->m_DAAShadowRegs.XOP_REGS.XOP.xr1.reg = 0x1C;         /* RING, Caller ID, VDD_OK */
-        /* Ext. Reg. 2 (Cadence Time Out)  (xr2):7D */
-
-        j->m_DAAShadowRegs.XOP_REGS.XOP.xr2.reg = 0x7D;
-/* Ext. Reg. 3 (DC Char)           (xr3):2B      ;  */
-        j->m_DAAShadowRegs.XOP_REGS.XOP.xr3.reg = 0x2B;
-/* Ext. Reg. 4 (Cadence)           (xr4):00 */
-        j->m_DAAShadowRegs.XOP_REGS.XOP.xr4.reg = 0x00;
-/* Ext. Reg. 5 (Ring timer)        (xr5):22 */
-        j->m_DAAShadowRegs.XOP_REGS.XOP.xr5.reg = 0x22;
-/* Ext. Reg. 6 (Power State)       (xr6):00 */
-        j->m_DAAShadowRegs.XOP_xr6_W.reg = 0x00;
-/* Ext. Reg. 7 (Vdd)               (xr7):40 */
-        j->m_DAAShadowRegs.XOP_REGS.XOP.xr7.reg = 0x40;         /* 0x40 ??? Should it be 0x00? */
-
-        /* DTMF Tone 1                     (0B): 11,B3,5A,2C    ;  697 Hz   */
-        /*                                       12,33,5A,C3    ;  770 Hz   */
-        /*                                       13,3C,5B,32    ;  852 Hz   */
-        /*                                       1D,1B,5C,CC    ;  941 Hz   */
-        j->m_DAAShadowRegs.COP_REGS.COP.Tone1Coeff[3] = 0x11;
-        j->m_DAAShadowRegs.COP_REGS.COP.Tone1Coeff[2] = 0xB3;
-        j->m_DAAShadowRegs.COP_REGS.COP.Tone1Coeff[1] = 0x5A;
-        j->m_DAAShadowRegs.COP_REGS.COP.Tone1Coeff[0] = 0x2C;
-
-        /* DTMF Tone 2                     (0C): 32,32,52,B3    ;  1209 Hz   */
-        /*                                       EC,1D,52,22    ;  1336 Hz   */
-        /*                                       AA,AC,51,D2    ;  1477 Hz   */
-        /*                                       9B,3B,51,25    ;  1633 Hz   */
-        j->m_DAAShadowRegs.COP_REGS.COP.Tone2Coeff[3] = 0x32;
-        j->m_DAAShadowRegs.COP_REGS.COP.Tone2Coeff[2] = 0x32;
-        j->m_DAAShadowRegs.COP_REGS.COP.Tone2Coeff[1] = 0x52;
-        j->m_DAAShadowRegs.COP_REGS.COP.Tone2Coeff[0] = 0xB3;
-}
-
-static void DAA_Coeff_Japan(IXJ *j)
-{
-        int i;
-
-        j->daa_country = DAA_JAPAN;
-        /*----------------------------------------------- */
-        /* CAO */
-        for (i = 0; i < ALISDAA_CALLERID_SIZE; i++) {
-                j->m_DAAShadowRegs.CAO_REGS.CAO.CallerID[i] = 0;
-        }
-
-/* Bytes for IM-filter part 1 (04): 06,BD,E2,2D,BA,F9,A0,00 */
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_1[7] = 0x06;
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_1[6] = 0xBD;
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_1[5] = 0xE2;
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_1[4] = 0x2D;
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_1[3] = 0xBA;
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_1[2] = 0xF9;
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_1[1] = 0xA0;
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_1[0] = 0x00;
-/* Bytes for IM-filter part 2 (05): 6F,F7,00,0E,34,33,E0,08 */
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_2[7] = 0x6F;
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_2[6] = 0xF7;
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_2[5] = 0x00;
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_2[4] = 0x0E;
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_2[3] = 0x34;
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_2[2] = 0x33;
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_2[1] = 0xE0;
-        j->m_DAAShadowRegs.COP_REGS.COP.IMFilterCoeff_2[0] = 0x08;
-/* Bytes for FRX-filter       (08): 02,8F,68,77,9C,58,F0,08 */
-        j->m_DAAShadowRegs.COP_REGS.COP.FRXFilterCoeff[7] = 0x02;
-        j->m_DAAShadowRegs.COP_REGS.COP.FRXFilterCoeff[6] = 0x8F;
-        j->m_DAAShadowRegs.COP_REGS.COP.FRXFilterCoeff[5] = 0x68;
-        j->m_DAAShadowRegs.COP_REGS.COP.FRXFilterCoeff[4] = 0x77;
-        j->m_DAAShadowRegs.COP_REGS.COP.FRXFilterCoeff[3] = 0x9C;
-        j->m_DAAShadowRegs.COP_REGS.COP.FRXFilterCoeff[2] = 0x58;
-        j->m_DAAShadowRegs.COP_REGS.COP.FRXFilterCoeff[1] = 0xF0;
-        j->m_DAAShadowRegs.COP_REGS.COP.FRXFilterCoeff[0] = 0x08;
-/* Bytes for FRR-filter       (07): 03,8F,38,73,87,EA,20,08 */
-        j->m_DAAShadowRegs.COP_REGS.COP.FRRFilterCoeff[7] = 0x03;
-        j->m_DAAShadowRegs.COP_REGS.COP.FRRFilterCoeff[6] = 0x8F;
-        j->m_DAAShadowRegs.COP_REGS.COP.FRRFilterCoeff[5] = 0x38;
-        j->m_DAAShadowRegs.COP_REGS.COP.FRRFilterCoeff[4] = 0x73;
-        j->m_DAAShadowRegs.COP_REGS.COP.FRRFilterCoeff[3] = 0x87;
-        j->m_DAAShadowRegs.COP_REGS.COP.FRRFilterCoeff[2] = 0xEA;
-        j->m_DAAShadowRegs.COP_REGS.COP.FRRFilterCoeff[1] = 0x20;
-        j->m_DAAShadowRegs.COP_REGS.COP.FRRFilterCoeff[0] = 0x08;
-/* Bytes for AX-filter        (0A): 51,C5,DD,CA */
-        j->m_DAAShadowRegs.COP_REGS.COP.AXFilterCoeff[3] = 0x51;
-        j->m_DAAShadowRegs.COP_REGS.COP.AXFilterCoeff[2] = 0xC5;
-        j->m_DAAShadowRegs.COP_REGS.COP.AXFilterCoeff[1] = 0xDD;
-        j->m_DAAShadowRegs.COP_REGS.COP.AXFilterCoeff[0] = 0xCA;
-/* Bytes for AR-filter        (09): 25,A7,10,D6 */
-        j->m_DAAShadowRegs.COP_REGS.COP.ARFilterCoeff[3] = 0x25;
-        j->m_DAAShadowRegs.COP_REGS.COP.ARFilterCoeff[2] = 0xA7;
-        j->m_DAAShadowRegs.COP_REGS.COP.ARFilterCoeff[1] = 0x10;
-        j->m_DAAShadowRegs.COP_REGS.COP.ARFilterCoeff[0] = 0xD6;
-/* Bytes for TH-filter part 1 (00): 00,42,48,81,AE,80,00,98 */
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_1[7] = 0x00;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_1[6] = 0x42;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_1[5] = 0x48;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_1[4] = 0x81;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_1[3] = 0xAE;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_1[2] = 0x80;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_1[1] = 0x00;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_1[0] = 0x98;
-/* Bytes for TH-filter part 2 (01): 02,AB,2A,20,99,5B,89,28 */
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_2[7] = 0x02;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_2[6] = 0xAB;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_2[5] = 0x2A;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_2[4] = 0x20;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_2[3] = 0x99;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_2[2] = 0x5B;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_2[1] = 0x89;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_2[0] = 0x28;
-/* Bytes for TH-filter part 3 (02): 00,88,DA,25,34,C5,4C,BA */
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_3[7] = 0x00;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_3[6] = 0x88;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_3[5] = 0xDA;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_3[4] = 0x25;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_3[3] = 0x34;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_3[2] = 0xC5;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_3[1] = 0x4C;
-        j->m_DAAShadowRegs.COP_REGS.COP.THFilterCoeff_3[0] = 0xBA;
-/* ;  idle */
-        /* Bytes for Ringing part 1 (03):1B,3C,93,3A,22,12,A3,23 */
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_1[7] = 0x1B;
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_1[6] = 0x3C;
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_1[5] = 0x93;
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_1[4] = 0x3A;
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_1[3] = 0x22;
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_1[2] = 0x12;
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_1[1] = 0xA3;
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_1[0] = 0x23;
-/* Bytes for Ringing part 2 (06):12,A2,A6,BA,22,7A,0A,D5 */
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_2[7] = 0x12;
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_2[6] = 0xA2;
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_2[5] = 0xA6;
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_2[4] = 0xBA;
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_2[3] = 0x22;
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_2[2] = 0x7A;
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_2[1] = 0x0A;
-        j->m_DAAShadowRegs.COP_REGS.COP.RingerImpendance_2[0] = 0xD5;
-/* Levelmetering Ringing           (0D):AA,35,0F,8E    ; 25Hz 30V ????????? */
-        j->m_DAAShadowRegs.COP_REGS.COP.LevelmeteringRinging[3] = 0xAA;
-        j->m_DAAShadowRegs.COP_REGS.COP.LevelmeteringRinging[2] = 0x35;
-        j->m_DAAShadowRegs.COP_REGS.COP.LevelmeteringRinging[1] = 0x0F;
-        j->m_DAAShadowRegs.COP_REGS.COP.LevelmeteringRinging[0] = 0x8E;
-/* Caller ID 1st Tone              (0E):CA,0E,CA,09,99,99,99,99 */
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID1stTone[7] = 0xCA;
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID1stTone[6] = 0x0E;
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID1stTone[5] = 0xCA;
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID1stTone[4] = 0x09;
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID1stTone[3] = 0x99;
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID1stTone[2] = 0x99;
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID1stTone[1] = 0x99;
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID1stTone[0] = 0x99;
-/* Caller ID 2nd Tone              (0F):FD,B5,BA,07,DA,00,00,00 */
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID2ndTone[7] = 0xFD;
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID2ndTone[6] = 0xB5;
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID2ndTone[5] = 0xBA;
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID2ndTone[4] = 0x07;
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID2ndTone[3] = 0xDA;
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID2ndTone[2] = 0x00;
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID2ndTone[1] = 0x00;
-        j->m_DAAShadowRegs.COP_REGS.COP.CallerID2ndTone[0] = 0x00;
-/* ;CR Registers */
-        /* Config. Reg. 0 (filters)        (cr0):FF */
-        j->m_DAAShadowRegs.SOP_REGS.SOP.cr0.reg = 0xFF;
-/* Config. Reg. 1 (dialing)        (cr1):05 */
-        j->m_DAAShadowRegs.SOP_REGS.SOP.cr1.reg = 0x05;
-/* Config. Reg. 2 (caller ID)      (cr2):04 */
-        j->m_DAAShadowRegs.SOP_REGS.SOP.cr2.reg = 0x04;
-/* Config. Reg. 3 (testloops)      (cr3):00        ;  */
-        j->m_DAAShadowRegs.SOP_REGS.SOP.cr3.reg = 0x00;
-/* Config. Reg. 4 (analog gain)    (cr4):02 */
-        j->m_DAAShadowRegs.SOP_REGS.SOP.cr4.reg = 0x02;
-        /* Config. Reg. 5 (Version)        (cr5):02 */
-        /* Config. Reg. 6 (Reserved)       (cr6):00 */
-        /* Config. Reg. 7 (Reserved)       (cr7):00 */
-        /* ;xr Registers */
-        /* Ext. Reg. 0 (Interrupt Reg.)    (xr0):02 */
-
-        j->m_DAAShadowRegs.XOP_xr0_W.reg = 0x02;        /* SO_1 set to '1' because it is inverted. */
-        /* Ext. Reg. 1 (Interrupt enable)  (xr1):1C */
-
-        j->m_DAAShadowRegs.XOP_REGS.XOP.xr1.reg = 0x1C;         /* RING, Caller ID, VDD_OK */
-        /* Ext. Reg. 2 (Cadence Time Out)  (xr2):7D */
-
-        j->m_DAAShadowRegs.XOP_REGS.XOP.xr2.reg = 0x7D;
-/* Ext. Reg. 3 (DC Char)           (xr3):22        ;  */
-        j->m_DAAShadowRegs.XOP_REGS.XOP.xr3.reg = 0x22;
-/* Ext. Reg. 4 (Cadence)           (xr4):00 */
-        j->m_DAAShadowRegs.XOP_REGS.XOP.xr4.reg = 0x00;
-/* Ext. Reg. 5 (Ring timer)        (xr5):22 */
-        j->m_DAAShadowRegs.XOP_REGS.XOP.xr5.reg = 0x22;
-/* Ext. Reg. 6 (Power State)       (xr6):00 */
-        j->m_DAAShadowRegs.XOP_xr6_W.reg = 0x00;
-/* Ext. Reg. 7 (Vdd)               (xr7):40 */
-        j->m_DAAShadowRegs.XOP_REGS.XOP.xr7.reg = 0x40;         /* 0x40 ??? Should it be 0x00? */
-        /* DTMF Tone 1                     (0B): 11,B3,5A,2C    ;   697 Hz   */
-        /*                                       12,33,5A,C3    ;  770 Hz   */
-        /*                                       13,3C,5B,32    ;  852 Hz   */
-        /*                                       1D,1B,5C,CC    ;  941 Hz   */
-
-        j->m_DAAShadowRegs.COP_REGS.COP.Tone1Coeff[3] = 0x11;
-        j->m_DAAShadowRegs.COP_REGS.COP.Tone1Coeff[2] = 0xB3;
-        j->m_DAAShadowRegs.COP_REGS.COP.Tone1Coeff[1] = 0x5A;
-        j->m_DAAShadowRegs.COP_REGS.COP.Tone1Coeff[0] = 0x2C;
-/* DTMF Tone 2                     (0C): 32,32,52,B3    ;  1209 Hz   */
-        /*                                       EC,1D,52,22    ;  1336 Hz   */
-        /*                                       AA,AC,51,D2    ;  1477 Hz   */
-        /*                                       9B,3B,51,25    ;  1633 Hz   */
-        j->m_DAAShadowRegs.COP_REGS.COP.Tone2Coeff[3] = 0x32;
-        j->m_DAAShadowRegs.COP_REGS.COP.Tone2Coeff[2] = 0x32;
-        j->m_DAAShadowRegs.COP_REGS.COP.Tone2Coeff[1] = 0x52;
-        j->m_DAAShadowRegs.COP_REGS.COP.Tone2Coeff[0] = 0xB3;
-}
-
-static s16 tone_table[][19] =
-{
-        {                       /* f20_50[] 11 */
-                32538,          /* A1 = 1.985962 */
-                 -32325,        /* A2 = -0.986511 */
-                 -343,          /* B2 = -0.010493 */
-                 0,             /* B1 = 0 */
-                 343,           /* B0 = 0.010493 */
-                 32619,         /* A1 = 1.990906 */
-                 -32520,        /* A2 = -0.992462 */
-                 19179,         /* B2 = 0.585327 */
-                 -19178,        /* B1 = -1.170593 */
-                 19179,         /* B0 = 0.585327 */
-                 32723,         /* A1 = 1.997314 */
-                 -32686,        /* A2 = -0.997528 */
-                 9973,          /* B2 = 0.304352 */
-                 -9955,         /* B1 = -0.607605 */
-                 9973,          /* B0 = 0.304352 */
-                 7,             /* Internal filter scaling */
-                 159,           /* Minimum in-band energy threshold */
-                 21,            /* 21/32 in-band to broad-band ratio */
-                 0x0FF5         /* shift-mask 0x0FF (look at 16 half-frames) bit count = 5 */
-        },
-        {                       /* f133_200[] 12 */
-                32072,          /* A1 = 1.95752 */
-                 -31896,        /* A2 = -0.973419 */
-                 -435,          /* B2 = -0.013294 */
-                 0,             /* B1 = 0 */
-                 435,           /* B0 = 0.013294 */
-                 32188,         /* A1 = 1.9646 */
-                 -32400,        /* A2 = -0.98877 */
-                 15139,         /* B2 = 0.462036 */
-                 -14882,        /* B1 = -0.908356 */
-                 15139,         /* B0 = 0.462036 */
-                 32473,         /* A1 = 1.981995 */
-                 -32524,        /* A2 = -0.992584 */
-                 23200,         /* B2 = 0.708008 */
-                 -23113,        /* B1 = -1.410706 */
-                 23200,         /* B0 = 0.708008 */
-                 7,             /* Internal filter scaling */
-                 159,           /* Minimum in-band energy threshold */
-                 21,            /* 21/32 in-band to broad-band ratio */
-                 0x0FF5         /* shift-mask 0x0FF (look at 16 half-frames) bit count = 5 */
-        },
-        {                       /* f300 13 */
-                31769,          /* A1 = -1.939026 */
-                 -32584,        /* A2 = 0.994385 */
-                 -475,          /* B2 = -0.014522 */
-                 0,             /* B1 = 0.000000 */
-                 475,           /* B0 = 0.014522 */
-                 31789,         /* A1 = -1.940247 */
-                 -32679,        /* A2 = 0.997284 */
-                 17280,         /* B2 = 0.527344 */
-                 -16865,        /* B1 = -1.029358 */
-                 17280,         /* B0 = 0.527344 */
-                 31841,         /* A1 = -1.943481 */
-                 -32681,        /* A2 = 0.997345 */
-                 543,           /* B2 = 0.016579 */
-                 -525,          /* B1 = -0.032097 */
-                 543,           /* B0 = 0.016579 */
-                 5,             /* Internal filter scaling */
-                 159,           /* Minimum in-band energy threshold */
-                 21,            /* 21/32 in-band to broad-band ratio */
-                 0x0FF5         /* shift-mask 0x0FF (look at 16 half-frames) bit count = 5 */
-        },
-        {                       /* f300_420[] 14 */
-                30750,          /* A1 = 1.876892 */
-                 -31212,        /* A2 = -0.952515 */
-                 -804,          /* B2 = -0.024541 */
-                 0,             /* B1 = 0 */
-                 804,           /* B0 = 0.024541 */
-                 30686,         /* A1 = 1.872925 */
-                 -32145,        /* A2 = -0.980988 */
-                 14747,         /* B2 = 0.450043 */
-                 -13703,        /* B1 = -0.836395 */
-                 14747,         /* B0 = 0.450043 */
-                 31651,         /* A1 = 1.931824 */
-                 -32321,        /* A2 = -0.986389 */
-                 24425,         /* B2 = 0.745422 */
-                 -23914,        /* B1 = -1.459595 */
-                 24427,         /* B0 = 0.745483 */
-                 7,             /* Internal filter scaling */
-                 159,           /* Minimum in-band energy threshold */
-                 21,            /* 21/32 in-band to broad-band ratio */
-                 0x0FF5         /* shift-mask 0x0FF (look at 16 half-frames) bit count = 5 */
-        },
-        {                       /* f330 15 */
-                31613,          /* A1 = -1.929565 */
-                 -32646,        /* A2 = 0.996277 */
-                 -185,          /* B2 = -0.005657 */
-                 0,             /* B1 = 0.000000 */
-                 185,           /* B0 = 0.005657 */
-                 31620,         /* A1 = -1.929932 */
-                 -32713,        /* A2 = 0.998352 */
-                 19253,         /* B2 = 0.587585 */
-                 -18566,        /* B1 = -1.133179 */
-                 19253,         /* B0 = 0.587585 */
-                 31674,         /* A1 = -1.933228 */
-                 -32715,        /* A2 = 0.998413 */
-                 2575,          /* B2 = 0.078590 */
-                 -2495,         /* B1 = -0.152283 */
-                 2575,          /* B0 = 0.078590 */
-                 5,             /* Internal filter scaling */
-                 159,           /* Minimum in-band energy threshold */
-                 21,            /* 21/32 in-band to broad-band ratio */
-                 0x0FF5         /* shift-mask 0x0FF (look at 16 half-frames) bit count = 5 */
-        },
-        {                       /* f300_425[] 16 */
-                30741,          /* A1 = 1.876282 */
-                 -31475,        /* A2 = -0.960541 */
-                 -703,          /* B2 = -0.021484 */
-                 0,             /* B1 = 0 */
-                 703,           /* B0 = 0.021484 */
-                 30688,         /* A1 = 1.873047 */
-                 -32248,        /* A2 = -0.984161 */
-                 14542,         /* B2 = 0.443787 */
-                 -13523,        /* B1 = -0.825439 */
-                 14542,         /* B0 = 0.443817 */
-                 31494,         /* A1 = 1.922302 */
-                 -32366,        /* A2 = -0.987762 */
-                 21577,         /* B2 = 0.658508 */
-                 -21013,        /* B1 = -1.282532 */
-                 21577,         /* B0 = 0.658508 */
-                 7,             /* Internal filter scaling */
-                 159,           /* Minimum in-band energy threshold */
-                 21,            /* 21/32 in-band to broad-band ratio */
-                 0x0FF5         /* shift-mask 0x0FF (look at 16 half-frames) bit count = 5 */
-        },
-        {                       /* f330_440[] 17 */
-                30627,          /* A1 = 1.869324 */
-                 -31338,        /* A2 = -0.95636 */
-                 -843,          /* B2 = -0.025749 */
-                 0,             /* B1 = 0 */
-                 843,           /* B0 = 0.025749 */
-                 30550,         /* A1 = 1.864685 */
-                 -32221,        /* A2 = -0.983337 */
-                 13594,         /* B2 = 0.414886 */
-                 -12589,        /* B1 = -0.768402 */
-                 13594,         /* B0 = 0.414886 */
-                 31488,         /* A1 = 1.921936 */
-                 -32358,        /* A2 = -0.987518 */
-                 24684,         /* B2 = 0.753296 */
-                 -24029,        /* B1 = -1.466614 */
-                 24684,         /* B0 = 0.753296 */
-                 7,             /* Internal filter scaling */
-                 159,           /* Minimum in-band energy threshold */
-                 21,            /* 21/32 in-band to broad-band ratio */
-                 0x0FF5         /* shift-mask 0x0FF (look at 16 half-frames) bit count = 5 */
-        },
-        {                       /* f340 18 */
-                31546,          /* A1 = -1.925476 */
-                 -32646,        /* A2 = 0.996277 */
-                 -445,          /* B2 = -0.013588 */
-                 0,             /* B1 = 0.000000 */
-                 445,           /* B0 = 0.013588 */
-                 31551,         /* A1 = -1.925781 */
-                 -32713,        /* A2 = 0.998352 */
-                 23884,         /* B2 = 0.728882 */
-                 -22979,        /* B1 = -1.402527 */
-                 23884,         /* B0 = 0.728882 */
-                 31606,         /* A1 = -1.929138 */
-                 -32715,        /* A2 = 0.998413 */
-                 863,           /* B2 = 0.026367 */
-                 -835,          /* B1 = -0.050985 */
-                 863,           /* B0 = 0.026367 */
-                 5,             /* Internal filter scaling */
-                 159,           /* Minimum in-band energy threshold */
-                 21,            /* 21/32 in-band to broad-band ratio */
-                 0x0FF5         /* shift-mask 0x0FF (look at 16 half-frames) bit count = 5 */
-        },
-        {                       /* f350_400[] 19 */
-                31006,          /* A1 = 1.892517 */
-                 -32029,        /* A2 = -0.977448 */
-                 -461,          /* B2 = -0.014096 */
-                 0,             /* B1 = 0 */
-                 461,           /* B0 = 0.014096 */
-                 30999,         /* A1 = 1.892029 */
-                 -32487,        /* A2 = -0.991455 */
-                 11325,         /* B2 = 0.345612 */
-                 -10682,        /* B1 = -0.651978 */
-                 11325,         /* B0 = 0.345612 */
-                 31441,         /* A1 = 1.919067 */
-                 -32526,        /* A2 = -0.992615 */
-                 24324,         /* B2 = 0.74231 */
-                 -23535,        /* B1 = -1.436523 */
-                 24324,         /* B0 = 0.74231 */
-                 7,             /* Internal filter scaling */
-                 159,           /* Minimum in-band energy threshold */
-                 21,            /* 21/32 in-band to broad-band ratio */
-                 0x0FF5         /* shift-mask 0x0FF (look at 16 half-frames) bit count = 5 */
-        },
-        {                       /* f350_440[] */
-                30634,          /* A1 = 1.869751 */
-                 -31533,        /* A2 = -0.962341 */
-                 -680,          /* B2 = -0.020782 */
-                 0,             /* B1 = 0 */
-                 680,           /* B0 = 0.020782 */
-                 30571,         /* A1 = 1.865906 */
-                 -32277,        /* A2 = -0.985016 */
-                 12894,         /* B2 = 0.393524 */
-                 -11945,        /* B1 = -0.729065 */
-                 12894,         /* B0 = 0.393524 */
-                 31367,         /* A1 = 1.91449 */
-                 -32379,        /* A2 = -0.988129 */
-                 23820,         /* B2 = 0.726929 */
-                 -23104,        /* B1 = -1.410217 */
-                 23820,         /* B0 = 0.726929 */
-                 7,             /* Internal filter scaling */
-                 159,           /* Minimum in-band energy threshold */
-                 21,            /* 21/32 in-band to broad-band ratio */
-                 0x0FF5         /* shift-mask 0x0FF (look at 16 half-frames) bit count = 5 */
-        },
-        {                       /* f350_450[] */
-                30552,          /* A1 = 1.864807 */
-                 -31434,        /* A2 = -0.95929 */
-                 -690,          /* B2 = -0.021066 */
-                 0,             /* B1 = 0 */
-                 690,           /* B0 = 0.021066 */
-                 30472,         /* A1 = 1.859924 */
-                 -32248,        /* A2 = -0.984161 */
-                 13385,         /* B2 = 0.408478 */
-                 -12357,        /* B1 = -0.754242 */
-                 13385,         /* B0 = 0.408478 */
-                 31358,         /* A1 = 1.914001 */
-                 -32366,        /* A2 = -0.987732 */
-                 26488,         /* B2 = 0.80835 */
-                 -25692,        /* B1 = -1.568176 */
-                 26490,         /* B0 = 0.808411 */
-                 7,             /* Internal filter scaling */
-                 159,           /* Minimum in-band energy threshold */
-                 21,            /* 21/32 in-band to broad-band ratio */
-                 0x0FF5         /* shift-mask 0x0FF (look at 16 half-frames) bit count = 5 */
-        },
-        {                       /* f360 */
-                31397,          /* A1 = -1.916321 */
-                 -32623,        /* A2 = 0.995605 */
-                 -117,          /* B2 = -0.003598 */
-                 0,             /* B1 = 0.000000 */
-                 117,           /* B0 = 0.003598 */
-                 31403,         /* A1 = -1.916687 */
-                 -32700,        /* A2 = 0.997925 */
-                 3388,          /* B2 = 0.103401 */
-                 -3240,         /* B1 = -0.197784 */
-                 3388,          /* B0 = 0.103401 */
-                 31463,         /* A1 = -1.920410 */
-                 -32702,        /* A2 = 0.997986 */
-                 13346,         /* B2 = 0.407288 */
-                 -12863,        /* B1 = -0.785126 */
-                 13346,         /* B0 = 0.407288 */
-                 5,             /* Internal filter scaling */
-                 159,           /* Minimum in-band energy threshold */
-                 21,            /* 21/32 in-band to broad-band ratio */
-                 0x0FF5         /* shift-mask 0x0FF (look at 16 half-frames) bit count = 5 */
-        },
-        {                       /* f380_420[] */
-                30831,          /* A1 = 1.881775 */
-                 -32064,        /* A2 = -0.978546 */
-                 -367,          /* B2 = -0.01122 */
-                 0,             /* B1 = 0 */
-                 367,           /* B0 = 0.01122 */
-                 30813,         /* A1 = 1.880737 */
-                 -32456,        /* A2 = -0.990509 */
-                 11068,         /* B2 = 0.337769 */
-                 -10338,        /* B1 = -0.631042 */
-                 11068,         /* B0 = 0.337769 */
-                 31214,         /* A1 = 1.905212 */
-                 -32491,        /* A2 = -0.991577 */
-                 16374,         /* B2 = 0.499695 */
-                 -15781,        /* B1 = -0.963196 */
-                 16374,         /* B0 = 0.499695 */
-                 7,             /* Internal filter scaling */
-                 159,           /* Minimum in-band energy threshold */
-                 21,            /* 21/32 in-band to broad-band ratio */
-                 0x0FF5         /* shift-mask 0x0FF (look at 16 half-frames) bit count = 5 */
-        },
-        {                       /* f392 */
-                31152,          /* A1 = -1.901428 */
-                 -32613,        /* A2 = 0.995300 */
-                 -314,          /* B2 = -0.009605 */
-                 0,             /* B1 = 0.000000 */
-                 314,           /* B0 = 0.009605 */
-                 31156,         /* A1 = -1.901672 */
-                 -32694,        /* A2 = 0.997742 */
-                 28847,         /* B2 = 0.880371 */
-                 -2734,         /* B1 = -0.166901 */
-                 28847,         /* B0 = 0.880371 */
-                 31225,         /* A1 = -1.905823 */
-                 -32696,        /* A2 = 0.997803 */
-                 462,           /* B2 = 0.014108 */
-                 -442,          /* B1 = -0.027019 */
-                 462,           /* B0 = 0.014108 */
-                 5,             /* Internal filter scaling */
-                 159,           /* Minimum in-band energy threshold */
-                 21,            /* 21/32 in-band to broad-band ratio */
-                 0x0FF5         /* shift-mask 0x0FF (look at 16 half-frames) bit count = 5 */
-        },
-        {                       /* f400_425[] */
-                30836,          /* A1 = 1.882141 */
-                 -32296,        /* A2 = -0.985596 */
-                 -324,          /* B2 = -0.009903 */
-                 0,             /* B1 = 0 */
-                 324,           /* B0 = 0.009903 */
-                 30825,         /* A1 = 1.881409 */
-                 -32570,        /* A2 = -0.993958 */
-                 16847,         /* B2 = 0.51416 */
-                 -15792,        /* B1 = -0.963898 */
-                 16847,         /* B0 = 0.51416 */
-                 31106,         /* A1 = 1.89856 */
-                 -32584,        /* A2 = -0.994415 */
-                 9579,          /* B2 = 0.292328 */
-                 -9164,         /* B1 = -0.559357 */
-                 9579,          /* B0 = 0.292328 */
-                 7,             /* Internal filter scaling */
-                 159,           /* Minimum in-band energy threshold */
-                 21,            /* 21/32 in-band to broad-band ratio */
-                 0x0FF5         /* shift-mask 0x0FF (look at 16 half-frames) bit count = 5 */
-        },
-        {                       /* f400_440[] */
-                30702,          /* A1 = 1.873962 */
-                 -32134,        /* A2 = -0.980682 */
-                 -517,          /* B2 = -0.015793 */
-                 0,             /* B1 = 0 */
-                 517,           /* B0 = 0.015793 */
-                 30676,         /* A1 = 1.872375 */
-                 -32520,        /* A2 = -0.992462 */
-                 8144,          /* B2 = 0.24855 */
-                 -7596,         /* B1 = -0.463684 */
-                 8144,          /* B0 = 0.24855 */
-                 31084,         /* A1 = 1.897217 */
-                 -32547,        /* A2 = -0.993256 */
-                 22713,         /* B2 = 0.693176 */
-                 -21734,        /* B1 = -1.326599 */
-                 22713,         /* B0 = 0.693176 */
-                 7,             /* Internal filter scaling */
-                 159,           /* Minimum in-band energy threshold */
-                 21,            /* 21/32 in-band to broad-band ratio */
-                 0x0FF5         /* shift-mask 0x0FF (look at 16 half-frames) bit count = 5 */
-        },
-        {                       /* f400_450[] */
-                30613,          /* A1 = 1.86853 */
-                 -32031,        /* A2 = -0.977509 */
-                 -618,          /* B2 = -0.018866 */
-                 0,             /* B1 = 0 */
-                 618,           /* B0 = 0.018866 */
-                 30577,         /* A1 = 1.866272 */
-                 -32491,        /* A2 = -0.991577 */
-                 9612,          /* B2 = 0.293335 */
-                 -8935,         /* B1 = -0.54541 */
-                 9612,          /* B0 = 0.293335 */
-                 31071,         /* A1 = 1.896484 */
-                 -32524,        /* A2 = -0.992584 */
-                 21596,         /* B2 = 0.659058 */
-                 -20667,        /* B1 = -1.261414 */
-                 21596,         /* B0 = 0.659058 */
-                 7,             /* Internal filter scaling */
-                 159,           /* Minimum in-band energy threshold */
-                 21,            /* 21/32 in-band to broad-band ratio */
-                 0x0FF5         /* shift-mask 0x0FF (look at 16 half-frames) bit count = 5 */
-        },
-        {                       /* f420 */
-                30914,          /* A1 = -1.886841 */
-                 -32584,        /* A2 = 0.994385 */
-                 -426,          /* B2 = -0.013020 */
-                 0,             /* B1 = 0.000000 */
-                 426,           /* B0 = 0.013020 */
-                 30914,         /* A1 = -1.886841 */
-                 -32679,        /* A2 = 0.997314 */
-                 17520,         /* B2 = 0.534668 */
-                 -16471,        /* B1 = -1.005310 */
-                 17520,         /* B0 = 0.534668 */
-                 31004,         /* A1 = -1.892334 */
-                 -32683,        /* A2 = 0.997406 */
-                 819,           /* B2 = 0.025023 */
-                 -780,          /* B1 = -0.047619 */
-                 819,           /* B0 = 0.025023 */
-                 5,             /* Internal filter scaling */
-                 159,           /* Minimum in-band energy threshold */
-                 21,            /* 21/32 in-band to broad-band ratio */
-                 0x0FF5         /* shift-mask 0x0FF (look at 16 half-frames) bit count = 5 */
-        },
-#if 0
-        {                       /* f425 */
-                30881,          /* A1 = -1.884827 */
-                 -32603,        /* A2 = 0.994965 */
-                 -496,          /* B2 = -0.015144 */
-                 0,             /* B1 = 0.000000 */
-                 496,           /* B0 = 0.015144 */
-                 30880,         /* A1 = -1.884766 */
-                 -32692,        /* A2 = 0.997711 */
-                 24767,         /* B2 = 0.755859 */
-                 -23290,        /* B1 = -1.421509 */
-                 24767,         /* B0 = 0.755859 */
-                 30967,         /* A1 = -1.890076 */
-                 -32694,        /* A2 = 0.997772 */
-                 728,           /* B2 = 0.022232 */
-                 -691,          /* B1 = -0.042194 */
-                 728,           /* B0 = 0.022232 */
-                 5,             /* Internal filter scaling */
-                 159,           /* Minimum in-band energy threshold */
-                 21,            /* 21/32 in-band to broad-band ratio */
-                 0x0FF5         /* shift-mask 0x0FF (look at 16 half-frames) bit count = 5 */
-        },
-#else
-        {
-                30850,
-                -32534,
-                -504,
-                0,
-                504,
-                30831,
-                -32669,
-                24303,
-                -22080,
-                24303,
-                30994,
-                -32673,
-                1905,
-                -1811,
-                1905,
-                5,
-                129,
-                17,
-                0xff5
-        },
-#endif
-        {                       /* f425_450[] */
-                30646,          /* A1 = 1.870544 */
-                 -32327,        /* A2 = -0.986572 */
-                 -287,          /* B2 = -0.008769 */
-                 0,             /* B1 = 0 */
-                 287,           /* B0 = 0.008769 */
-                 30627,         /* A1 = 1.869324 */
-                 -32607,        /* A2 = -0.995087 */
-                 13269,         /* B2 = 0.404968 */
-                 -12376,        /* B1 = -0.755432 */
-                 13269,         /* B0 = 0.404968 */
-                 30924,         /* A1 = 1.887512 */
-                 -32619,        /* A2 = -0.995453 */
-                 19950,         /* B2 = 0.608826 */
-                 -18940,        /* B1 = -1.156006 */
-                 19950,         /* B0 = 0.608826 */
-                 7,             /* Internal filter scaling */
-                 159,           /* Minimum in-band energy threshold */
-                 21,            /* 21/32 in-band to broad-band ratio */
-                 0x0FF5         /* shift-mask 0x0FF (look at 16 half-frames) bit count = 5 */
-        },
-        {                       /* f425_475[] */
-                30396,          /* A1 = 1.855225 */
-                 -32014,        /* A2 = -0.97699 */
-                 -395,          /* B2 = -0.012055 */
-                 0,             /* B1 = 0 */
-                 395,           /* B0 = 0.012055 */
-                 30343,         /* A1 = 1.85199 */
-                 -32482,        /* A2 = -0.991302 */
-                 17823,         /* B2 = 0.543945 */
-                 -16431,        /* B1 = -1.002869 */
-                 17823,         /* B0 = 0.543945 */
-                 30872,         /* A1 = 1.884338 */
-                 -32516,        /* A2 = -0.99231 */
-                 18124,         /* B2 = 0.553101 */
-                 -17246,        /* B1 = -1.052673 */
-                 18124,         /* B0 = 0.553101 */
-                 7,             /* Internal filter scaling */
-                 159,           /* Minimum in-band energy threshold */
-                 21,            /* 21/32 in-band to broad-band ratio */
-                 0x0FF5         /* shift-mask 0x0FF (look at 16 half-frames) bit count = 5 */
-        },
-        {                       /* f435 */
-                30796,          /* A1 = -1.879639 */
-                 -32603,        /* A2 = 0.994965 */
-                 -254,          /* B2 = -0.007762 */
-                 0,             /* B1 = 0.000000 */
-                 254,           /* B0 = 0.007762 */
-                 30793,         /* A1 = -1.879456 */
-                 -32692,        /* A2 = 0.997711 */
-                 18934,         /* B2 = 0.577820 */
-                 -17751,        /* B1 = -1.083496 */
-                 18934,         /* B0 = 0.577820 */
-                 30882,         /* A1 = -1.884888 */
-                 -32694,        /* A2 = 0.997772 */
-                 1858,          /* B2 = 0.056713 */
-                 -1758,         /* B1 = -0.107357 */
-                 1858,          /* B0 = 0.056713 */
-                 5,             /* Internal filter scaling */
-                 159,           /* Minimum in-band energy threshold */
-                 21,            /* 21/32 in-band to broad-band ratio */
-                 0x0FF5         /* shift-mask 0x0FF (look at 16 half-frames) bit count = 5 */
-        },
-        {                       /* f440_450[] */
-                30641,          /* A1 = 1.870239 */
-                 -32458,        /* A2 = -0.99057 */
-                 -155,          /* B2 = -0.004735 */
-                 0,             /* B1 = 0 */
-                 155,           /* B0 = 0.004735 */
-                 30631,         /* A1 = 1.869568 */
-                 -32630,        /* A2 = -0.995789 */
-                 11453,         /* B2 = 0.349548 */
-                 -10666,        /* B1 = -0.651001 */
-                 11453,         /* B0 = 0.349548 */
-                 30810,         /* A1 = 1.880554 */
-                 -32634,        /* A2 = -0.995941 */
-                 12237,         /* B2 = 0.373474 */
-                 -11588,        /* B1 = -0.707336 */
-                 12237,         /* B0 = 0.373474 */
-                 7,             /* Internal filter scaling */
-                 159,           /* Minimum in-band energy threshold */
-                 21,            /* 21/32 in-band to broad-band ratio */
-                 0x0FF5         /* shift-mask 0x0FF (look at 16 half-frames) bit count = 5 */
-        },
-        {                       /* f440_480[] */
-                30367,          /* A1 = 1.853455 */
-                 -32147,        /* A2 = -0.981079 */
-                 -495,          /* B2 = -0.015113 */
-                 0,             /* B1 = 0 */
-                 495,           /* B0 = 0.015113 */
-                 30322,         /* A1 = 1.850769 */
-                 -32543,        /* A2 = -0.993134 */
-                 10031,         /* B2 = 0.306152 */
-                 -9252,         /* B1 = -0.564728 */
-                 10031,         /* B0 = 0.306152 */
-                 30770,         /* A1 = 1.878052 */
-                 -32563,        /* A2 = -0.993774 */
-                 22674,         /* B2 = 0.691956 */
-                 -21465,        /* B1 = -1.31012 */
-                 22674,         /* B0 = 0.691956 */
-                 7,             /* Internal filter scaling */
-                 159,           /* Minimum in-band energy threshold */
-                 21,            /* 21/32 in-band to broad-band ratio */
-                 0x0FF5         /* shift-mask 0x0FF (look at 16 half-frames) bit count = 5 */
-        },
-        {                       /* f445 */
-                30709,          /* A1 = -1.874329 */
-                 -32603,        /* A2 = 0.994965 */
-                 -83,           /* B2 = -0.002545 */
-                 0,             /* B1 = 0.000000 */
-                 83,            /* B0 = 0.002545 */
-                 30704,         /* A1 = -1.874084 */
-                 -32692,        /* A2 = 0.997711 */
-                 10641,         /* B2 = 0.324738 */
-                 -9947,         /* B1 = -0.607147 */
-                 10641,         /* B0 = 0.324738 */
-                 30796,         /* A1 = -1.879639 */
-                 -32694,        /* A2 = 0.997772 */
-                 10079,         /* B2 = 0.307587 */
-                 9513,          /* B1 = 0.580688 */
-                 10079,         /* B0 = 0.307587 */
-                 5,             /* Internal filter scaling */
-                 159,           /* Minimum in-band energy threshold */
-                 21,            /* 21/32 in-band to broad-band ratio */
-                 0x0FF5         /* shift-mask 0x0FF (look at 16 half-frames) bit count = 5 */
-        },
-        {                       /* f450 */
-                30664,          /* A1 = -1.871643 */
-                 -32603,        /* A2 = 0.994965 */
-                 -164,          /* B2 = -0.005029 */
-                 0,             /* B1 = 0.000000 */
-                 164,           /* B0 = 0.005029 */
-                 30661,         /* A1 = -1.871399 */
-                 -32692,        /* A2 = 0.997711 */
-                 15294,         /* B2 = 0.466736 */
-                 -14275,        /* B1 = -0.871307 */
-                 15294,         /* B0 = 0.466736 */
-                 30751,         /* A1 = -1.876953 */
-                 -32694,        /* A2 = 0.997772 */
-                 3548,          /* B2 = 0.108284 */
-                 -3344,         /* B1 = -0.204155 */
-                 3548,          /* B0 = 0.108284 */
-                 5,             /* Internal filter scaling */
-                 159,           /* Minimum in-band energy threshold */
-                 21,            /* 21/32 in-band to broad-band ratio */
-                 0x0FF5         /* shift-mask 0x0FF (look at 16 half-frames) bit count = 5 */
-        },
-        {                       /* f452 */
-                30653,          /* A1 = -1.870911 */
-                 -32615,        /* A2 = 0.995361 */
-                 -209,          /* B2 = -0.006382 */
-                 0,             /* B1 = 0.000000 */
-                 209,           /* B0 = 0.006382 */
-                 30647,         /* A1 = -1.870605 */
-                 -32702,        /* A2 = 0.997986 */
-                 18971,         /* B2 = 0.578979 */
-                 -17716,        /* B1 = -1.081299 */
-                 18971,         /* B0 = 0.578979 */
-                 30738,         /* A1 = -1.876099 */
-                 -32702,        /* A2 = 0.998016 */
-                 2967,          /* B2 = 0.090561 */
-                 -2793,         /* B1 = -0.170502 */
-                 2967,          /* B0 = 0.090561 */
-                 5,             /* Internal filter scaling */
-                 159,           /* Minimum in-band energy threshold */
-                 21,            /* 21/32 in-band to broad-band ratio */
-                 0x0FF5         /* shift-mask 0x0FF (look at 16 half-frames) bit count = 5 */
-        },
-        {                       /* f475 */
-                30437,          /* A1 = -1.857727 */
-                 -32603,        /* A2 = 0.994965 */
-                 -264,          /* B2 = -0.008062 */
-                 0,             /* B1 = 0.000000 */
-                 264,           /* B0 = 0.008062 */
-                 30430,         /* A1 = -1.857300 */
-                 -32692,        /* A2 = 0.997711 */
-                 21681,         /* B2 = 0.661682 */
-                 -20082,        /* B1 = -1.225708 */
-                 21681,         /* B0 = 0.661682 */
-                 30526,         /* A1 = -1.863220 */
-                 -32694,        /* A2 = 0.997742 */
-                 1559,          /* B2 = 0.047600 */
-                 -1459,         /* B1 = -0.089096 */
-                 1559,          /* B0 = 0.047600 */
-                 5,             /* Internal filter scaling */
-                 159,           /* Minimum in-band energy threshold */
-                 21,            /* 21/32 in-band to broad-band ratio */
-                 0x0FF5         /* shift-mask 0x0FF (look at 16 half-frames) bit count = 5 */
-        },
-        {                       /* f480_620[] */
-                28975,          /* A1 = 1.768494 */
-                 -30955,        /* A2 = -0.944672 */
-                 -1026,         /* B2 = -0.03133 */
-                 0,             /* B1 = 0 */
-                 1026,          /* B0 = 0.03133 */
-                 28613,         /* A1 = 1.746399 */
-                 -32089,        /* A2 = -0.979309 */
-                 14214,         /* B2 = 0.433807 */
-                 -12202,        /* B1 = -0.744812 */
-                 14214,         /* B0 = 0.433807 */
-                 30243,         /* A1 = 1.845947 */
-                 -32238,        /* A2 = -0.983856 */
-                 24825,         /* B2 = 0.757629 */
-                 -23402,        /* B1 = -1.428345 */
-                 24825,         /* B0 = 0.757629 */
-                 7,             /* Internal filter scaling */
-                 159,           /* Minimum in-band energy threshold */
-                 21,            /* 21/32 in-band to broad-band ratio */
-                 0x0FF5         /* shift-mask 0x0FF (look at 16 half-frames) bit count = 5 */
-        },
-        {                       /* f494 */
-                30257,          /* A1 = -1.846741 */
-                 -32605,        /* A2 = 0.995056 */
-                 -249,          /* B2 = -0.007625 */
-                 0,             /* B1 = 0.000000 */
-                 249,           /* B0 = 0.007625 */
-                 30247,         /* A1 = -1.846191 */
-                 -32694,        /* A2 = 0.997772 */
-                 18088,         /* B2 = 0.552002 */
-                 -16652,        /* B1 = -1.016418 */
-                 18088,         /* B0 = 0.552002 */
-                 30348,         /* A1 = -1.852295 */
-                 -32696,        /* A2 = 0.997803 */
-                 2099,          /* B2 = 0.064064 */
-                 -1953,         /* B1 = -0.119202 */
-                 2099,          /* B0 = 0.064064 */
-                 5,             /* Internal filter scaling */
-                 159,           /* Minimum in-band energy threshold */
-                 21,            /* 21/32 in-band to broad-band ratio */
-                 0x0FF5         /* shift-mask 0x0FF (look at 16 half-frames) bit count = 5 */
-        },
-        {                       /* f500 */
-                30202,          /* A1 = -1.843431 */
-                 -32624,        /* A2 = 0.995622 */
-                 -413,          /* B2 = -0.012622 */
-                 0,             /* B1 = 0.000000 */
-                 413,           /* B0 = 0.012622 */
-                 30191,         /* A1 = -1.842721 */
-                 -32714,        /* A2 = 0.998364 */
-                 25954,         /* B2 = 0.792057 */
-                 -23890,        /* B1 = -1.458131 */
-                 25954,         /* B0 = 0.792057 */
-                 30296,         /* A1 = -1.849172 */
-                 -32715,        /* A2 = 0.998397 */
-                 2007,          /* B2 = 0.061264 */
-                 -1860,         /* B1 = -0.113568 */
-                 2007,          /* B0 = 0.061264 */
-                 5,             /* Internal filter scaling */
-                 159,           /* Minimum in-band energy threshold */
-                 21,            /* 21/32 in-band to broad-band ratio */
-                 0x0FF5         /* shift-mask 0x0FF (look at 16 half-frames) bit count = 5 */
-        },
-        {                       /* f520 */
-                30001,          /* A1 = -1.831116 */
-                 -32613,        /* A2 = 0.995270 */
-                 -155,          /* B2 = -0.004750 */
-                 0,             /* B1 = 0.000000 */
-                 155,           /* B0 = 0.004750 */
-                 29985,         /* A1 = -1.830200 */
-                 -32710,        /* A2 = 0.998260 */
-                 6584,          /* B2 = 0.200928 */
-                 -6018,         /* B1 = -0.367355 */
-                 6584,          /* B0 = 0.200928 */
-                 30105,         /* A1 = -1.837524 */
-                 -32712,        /* A2 = 0.998291 */
-                 23812,         /* B2 = 0.726685 */
-                 -21936,        /* B1 = -1.338928 */
-                 23812,         /* B0 = 0.726685 */
-                 5,             /* Internal filter scaling */
-                 159,           /* Minimum in-band energy threshold */
-                 21,            /* 21/32 in-band to broad-band ratio */
-                 0x0FF5         /* shift-mask 0x0FF (look at 16 half-frames) bit count = 5 */
-        },
-        {                       /* f523 */
-                29964,          /* A1 = -1.828918 */
-                 -32601,        /* A2 = 0.994904 */
-                 -101,          /* B2 = -0.003110 */
-                 0,             /* B1 = 0.000000 */
-                 101,           /* B0 = 0.003110 */
-                 29949,         /* A1 = -1.827942 */
-                 -32700,        /* A2 = 0.997925 */
-                 11041,         /* B2 = 0.336975 */
-                 -10075,        /* B1 = -0.614960 */
-                 11041,         /* B0 = 0.336975 */
-                 30070,         /* A1 = -1.835388 */
-                 -32702,        /* A2 = 0.997986 */
-                 16762,         /* B2 = 0.511536 */
-                 -15437,        /* B1 = -0.942230 */
-                 16762,         /* B0 = 0.511536 */
-                 5,             /* Internal filter scaling */
-                 159,           /* Minimum in-band energy threshold */
-                 21,            /* 21/32 in-band to broad-band ratio */
-                 0x0FF5         /* shift-mask 0x0FF (look at 16 half-frames) bit count = 5 */
-        },
-        {                       /* f525 */
-                29936,          /* A1 = -1.827209 */
-                 -32584,        /* A2 = 0.994415 */
-                 -91,           /* B2 = -0.002806 */
-                 0,             /* B1 = 0.000000 */
-                 91,            /* B0 = 0.002806 */
-                 29921,         /* A1 = -1.826233 */
-                 -32688,        /* A2 = 0.997559 */
-                 11449,         /* B2 = 0.349396 */
-                 -10426,        /* B1 = -0.636383 */
-                 11449,         /* B0 = 0.349396 */
-                 30045,         /* A1 = -1.833862 */
-                 -32688,        /* A2 = 0.997589 */
-                 13055,         /* B2 = 0.398407 */
-                 -12028,        /* B1 = -0.734161 */
-                 13055,         /* B0 = 0.398407 */
-                 5,             /* Internal filter scaling */
-                 159,           /* Minimum in-band energy threshold */
-                 21,            /* 21/32 in-band to broad-band ratio */
-                 0x0FF5         /* shift-mask 0x0FF (look at 16 half-frames) bit count = 5 */
-        },
-        {                       /* f540_660[] */
-                28499,          /* A1 = 1.739441 */
-                 -31129,        /* A2 = -0.949982 */
-                 -849,          /* B2 = -0.025922 */
-                 0,             /* B1 = 0 */
-                 849,           /* B0 = 0.025922 */
-                 28128,         /* A1 = 1.716797 */
-                 -32130,        /* A2 = -0.98056 */
-                 14556,         /* B2 = 0.444214 */
-                 -12251,        /* B1 = -0.747772 */
-                 14556,         /* B0 = 0.444244 */
-                 29667,         /* A1 = 1.81073 */
-                 -32244,        /* A2 = -0.984039 */
-                 23038,         /* B2 = 0.703064 */
-                 -21358,        /* B1 = -1.303589 */
-                 23040,         /* B0 = 0.703125 */
-                 7,             /* Internal filter scaling */
-                 159,           /* Minimum in-band energy threshold */
-                 21,            /* 21/32 in-band to broad-band ratio */
-                 0x0FF5         /* shift-mask 0x0FF (look at 16 half-frames) bit count = 5 */
-        },
-        {                       /* f587 */
-                29271,          /* A1 = -1.786560 */
-                 -32599,        /* A2 = 0.994873 */
-                 -490,          /* B2 = -0.014957 */
-                 0,             /* B1 = 0.000000 */
-                 490,           /* B0 = 0.014957 */
-                 29246,         /* A1 = -1.785095 */
-                 -32700,        /* A2 = 0.997925 */
-                 28961,         /* B2 = 0.883850 */
-                 -25796,        /* B1 = -1.574463 */
-                 28961,         /* B0 = 0.883850 */
-                 29383,         /* A1 = -1.793396 */
-                 -32700,        /* A2 = 0.997955 */
-                 1299,          /* B2 = 0.039650 */
-                 -1169,         /* B1 = -0.071396 */
-                 1299,          /* B0 = 0.039650 */
-                 5,             /* Internal filter scaling */
-                 159,           /* Minimum in-band energy threshold */
-                 21,            /* 21/32 in-band to broad-band ratio */
-                 0x0FF5         /* shift-mask 0x0FF (look at 16 half-frames) bit count = 5 */
-        },
-        {                       /* f590 */
-                29230,          /* A1 = -1.784058 */
-                 -32584,        /* A2 = 0.994415 */
-                 -418,          /* B2 = -0.012757 */
-                 0,             /* B1 = 0.000000 */
-                 418,           /* B0 = 0.012757 */
-                 29206,         /* A1 = -1.782593 */
-                 -32688,        /* A2 = 0.997559 */
-                 36556,         /* B2 = 1.115601 */
-                 -32478,        /* B1 = -1.982300 */
-                 36556,         /* B0 = 1.115601 */
-                 29345,         /* A1 = -1.791077 */
-                 -32688,        /* A2 = 0.997589 */
-                 897,           /* B2 = 0.027397 */
-                 -808,          /* B1 = -0.049334 */
-                 897,           /* B0 = 0.027397 */
-                 5,             /* Internal filter scaling */
-                 159,           /* Minimum in-band energy threshold */
-                 21,            /* 21/32 in-band to broad-band ratio */
-                 0x0FF5         /* shift-mask 0x0FF (look at 16 half-frames) bit count = 5 */
-        },
-        {                       /* f600 */
-                29116,          /* A1 = -1.777100 */
-                 -32603,        /* A2 = 0.994965 */
-                 -165,          /* B2 = -0.005039 */
-                 0,             /* B1 = 0.000000 */
-                 165,           /* B0 = 0.005039 */
-                 29089,         /* A1 = -1.775452 */
-                 -32708,        /* A2 = 0.998199 */
-                 6963,          /* B2 = 0.212494 */
-                 -6172,         /* B1 = -0.376770 */
-                 6963,          /* B0 = 0.212494 */
-                 29237,         /* A1 = -1.784485 */
-                 -32710,        /* A2 = 0.998230 */
-                 24197,         /* B2 = 0.738464 */
-                 -21657,        /* B1 = -1.321899 */
-                 24197,         /* B0 = 0.738464 */
-                 5,             /* Internal filter scaling */
-                 159,           /* Minimum in-band energy threshold */
-                 21,            /* 21/32 in-band to broad-band ratio */
-                 0x0FF5         /* shift-mask 0x0FF (look at 16 half-frames) bit count = 5 */
-        },
-        {                       /* f660 */
-                28376,          /* A1 = -1.731934 */
-                 -32567,        /* A2 = 0.993896 */
-                 -363,          /* B2 = -0.011102 */
-                 0,             /* B1 = 0.000000 */
-                 363,           /* B0 = 0.011102 */
-                 28337,         /* A1 = -1.729614 */
-                 -32683,        /* A2 = 0.997434 */
-                 21766,         /* B2 = 0.664246 */
-                 -18761,        /* B1 = -1.145081 */
-                 21766,         /* B0 = 0.664246 */
-                 28513,         /* A1 = -1.740356 */
-                 -32686,        /* A2 = 0.997498 */
-                 2509,          /* B2 = 0.076584 */
-                 -2196,         /* B1 = -0.134041 */
-                 2509,          /* B0 = 0.076584 */
-                 5,             /* Internal filter scaling */
-                 159,           /* Minimum in-band energy threshold */
-                 21,            /* 21/32 in-band to broad-band ratio */
-                 0x0FF5         /* shift-mask 0x0FF (look at 16 half-frames) bit count = 5 */
-        },
-        {                       /* f700 */
-                27844,          /* A1 = -1.699463 */
-                 -32563,        /* A2 = 0.993744 */
-                 -366,          /* B2 = -0.011187 */
-                 0,             /* B1 = 0.000000 */
-                 366,           /* B0 = 0.011187 */
-                 27797,         /* A1 = -1.696655 */
-                 -32686,        /* A2 = 0.997498 */
-                 22748,         /* B2 = 0.694214 */
-                 -19235,        /* B1 = -1.174072 */
-                 22748,         /* B0 = 0.694214 */
-                 27995,         /* A1 = -1.708740 */
-                 -32688,        /* A2 = 0.997559 */
-                 2964,          /* B2 = 0.090477 */
-                 -2546,         /* B1 = -0.155449 */
-                 2964,          /* B0 = 0.090477 */
-                 5,             /* Internal filter scaling */
-                 159,           /* Minimum in-band energy threshold */
-                 21,            /* 21/32 in-band to broad-band ratio */
-                 0x0FF5         /* shift-mask 0x0FF (look at 16 half-frames) bit count = 5 */
-        },
-        {                       /* f740 */
-                27297,          /* A1 = -1.666077 */
-                 -32551,        /* A2 = 0.993408 */
-                 -345,          /* B2 = -0.010540 */
-                 0,             /* B1 = 0.000000 */
-                 345,           /* B0 = 0.010540 */
-                 27240,         /* A1 = -1.662598 */
-                 -32683,        /* A2 = 0.997406 */
-                 22560,         /* B2 = 0.688477 */
-                 -18688,        /* B1 = -1.140625 */
-                 22560,         /* B0 = 0.688477 */
-                 27461,         /* A1 = -1.676147 */
-                 -32684,        /* A2 = 0.997467 */
-                 3541,          /* B2 = 0.108086 */
-                 -2985,         /* B1 = -0.182220 */
-                 3541,          /* B0 = 0.108086 */
-                 5,             /* Internal filter scaling */
-                 159,           /* Minimum in-band energy threshold */
-                 21,            /* 21/32 in-band to broad-band ratio */
-                 0x0FF5         /* shift-mask 0x0FF (look at 16 half-frames) bit count = 5 */
-        },
-        {                       /* f750 */
-                27155,          /* A1 = -1.657410 */
-                 -32551,        /* A2 = 0.993408 */
-                 -462,          /* B2 = -0.014117 */
-                 0,             /* B1 = 0.000000 */
-                 462,           /* B0 = 0.014117 */
-                 27097,         /* A1 = -1.653870 */
-                 -32683,        /* A2 = 0.997406 */
-                 32495,         /* B2 = 0.991699 */
-                 -26776,        /* B1 = -1.634338 */
-                 32495,         /* B0 = 0.991699 */
-                 27321,         /* A1 = -1.667542 */
-                 -32684,        /* A2 = 0.997467 */
-                 1835,          /* B2 = 0.056007 */
-                 -1539,         /* B1 = -0.093948 */
-                 1835,          /* B0 = 0.056007 */
-                 5,             /* Internal filter scaling */
-                 159,           /* Minimum in-band energy threshold */
-                 21,            /* 21/32 in-band to broad-band ratio */
-                 0x0FF5         /* shift-mask 0x0FF (look at 16 half-frames) bit count = 5 */
-        },
-        {                       /* f750_1450[] */
-                19298,          /* A1 = 1.177917 */
-                 -24471,        /* A2 = -0.746796 */
-                 -4152,         /* B2 = -0.126709 */
-                 0,             /* B1 = 0 */
-                 4152,          /* B0 = 0.126709 */
-                 12902,         /* A1 = 0.787476 */
-                 -29091,        /* A2 = -0.887817 */
-                 12491,         /* B2 = 0.38121 */
-                 -1794,         /* B1 = -0.109528 */
-                 12494,         /* B0 = 0.381317 */
-                 26291,         /* A1 = 1.604736 */
-                 -30470,        /* A2 = -0.929901 */
-                 28859,         /* B2 = 0.880737 */
-                 -26084,        /* B1 = -1.592102 */
-                 28861,         /* B0 = 0.880798 */
-                 7,             /* Internal filter scaling */
-                 159,           /* Minimum in-band energy threshold */
-                 21,            /* 21/32 in-band to broad-band ratio */
-                 0x0FF5         /* shift-mask 0x0FF (look at 16 half-frames) bit count = 5 */
-        },
-        {                       /* f770 */
-                26867,          /* A1 = -1.639832 */
-                 -32551,        /* A2 = 0.993408 */
-                 -123,          /* B2 = -0.003755 */
-                 0,             /* B1 = 0.000000 */
-                 123,           /* B0 = 0.003755 */
-                 26805,         /* A1 = -1.636108 */
-                 -32683,        /* A2 = 0.997406 */
-                 17297,         /* B2 = 0.527863 */
-                 -14096,        /* B1 = -0.860382 */
-                 17297,         /* B0 = 0.527863 */
-                 27034,         /* A1 = -1.650085 */
-                 -32684,        /* A2 = 0.997467 */
-                 12958,         /* B2 = 0.395477 */
-                 -10756,        /* B1 = -0.656525 */
-                 12958,         /* B0 = 0.395477 */
-                 5,             /* Internal filter scaling */
-                 159,           /* Minimum in-band energy threshold */
-                 21,            /* 21/32 in-band to broad-band ratio */
-                 0x0FF5         /* shift-mask 0x0FF (look at 16 half-frames) bit count = 5 */
-        },
-        {                       /* f800 */
-                26413,          /* A1 = -1.612122 */
-                 -32547,        /* A2 = 0.993286 */
-                 -223,          /* B2 = -0.006825 */
-                 0,             /* B1 = 0.000000 */
-                 223,           /* B0 = 0.006825 */
-                 26342,         /* A1 = -1.607849 */
-                 -32686,        /* A2 = 0.997498 */
-                 6391,          /* B2 = 0.195053 */
-                 -5120,         /* B1 = -0.312531 */
-                 6391,          /* B0 = 0.195053 */
-                 26593,         /* A1 = -1.623108 */
-                 -32688,        /* A2 = 0.997559 */
-                 23681,         /* B2 = 0.722717 */
-                 -19328,        /* B1 = -1.179688 */
-                 23681,         /* B0 = 0.722717 */
-                 5,             /* Internal filter scaling */
-                 159,           /* Minimum in-band energy threshold */
-                 21,            /* 21/32 in-band to broad-band ratio */
-                 0x0FF5         /* shift-mask 0x0FF (look at 16 half-frames) bit count = 5 */
-        },
-        {                       /* f816 */
-                26168,          /* A1 = -1.597209 */
-                 -32528,        /* A2 = 0.992706 */
-                 -235,          /* B2 = -0.007182 */
-                 0,             /* B1 = 0.000000 */
-                 235,           /* B0 = 0.007182 */
-                 26092,         /* A1 = -1.592590 */
-                 -32675,        /* A2 = 0.997192 */
-                 20823,         /* B2 = 0.635498 */
-                 -16510,        /* B1 = -1.007751 */
-                 20823,         /* B0 = 0.635498 */
-                 26363,         /* A1 = -1.609070 */
-                 -32677,        /* A2 = 0.997253 */
-                 6739,          /* B2 = 0.205688 */
-                 -5459,         /* B1 = -0.333206 */
-                 6739,          /* B0 = 0.205688 */
-                 5,             /* Internal filter scaling */
-                 159,           /* Minimum in-band energy threshold */
-                 21,            /* 21/32 in-band to broad-band ratio */
-                 0x0FF5         /* shift-mask 0x0FF (look at 16 half-frames) bit count = 5 */
-        },
-        {                       /* f850 */
-                25641,          /* A1 = -1.565063 */
-                 -32536,        /* A2 = 0.992950 */
-                 -121,          /* B2 = -0.003707 */
-                 0,             /* B1 = 0.000000 */
-                 121,           /* B0 = 0.003707 */
-                 25560,         /* A1 = -1.560059 */
-                 -32684,        /* A2 = 0.997437 */
-                 18341,         /* B2 = 0.559753 */
-                 -14252,        /* B1 = -0.869904 */
-                 18341,         /* B0 = 0.559753 */
-                 25837,         /* A1 = -1.577026 */
-                 -32684,        /* A2 = 0.997467 */
-                 16679,         /* B2 = 0.509003 */
-                 -13232,        /* B1 = -0.807648 */
-                 16679,         /* B0 = 0.509003 */
-                 5,             /* Internal filter scaling */
-                 159,           /* Minimum in-band energy threshold */
-                 21,            /* 21/32 in-band to broad-band ratio */
-                 0x0FF5         /* shift-mask 0x0FF (look at 16 half-frames) bit count = 5 */
-        },
-        {                       /* f857_1645[] */
-                16415,          /* A1 = 1.001953 */
-                 -23669,        /* A2 = -0.722321 */
-                 -4549,         /* B2 = -0.138847 */
-                 0,             /* B1 = 0 */
-                 4549,          /* B0 = 0.138847 */
-                 8456,          /* A1 = 0.516174 */
-                 -28996,        /* A2 = -0.884918 */
-                 13753,         /* B2 = 0.419724 */
-                 -12,           /* B1 = -0.000763 */
-                 13757,         /* B0 = 0.419846 */
-                 24632,         /* A1 = 1.503418 */
-                 -30271,        /* A2 = -0.923828 */
-                 29070,         /* B2 = 0.887146 */
-                 -25265,        /* B1 = -1.542114 */
-                 29073,         /* B0 = 0.887268 */
-                 7,             /* Internal filter scaling */
-                 159,           /* Minimum in-band energy threshold */
-                 21,            /* 21/32 in-band to broad-band ratio */
-                 0x0FF5         /* shift-mask 0x0FF (look at 16 half-frames) bit count = 5 */
-        },
-        {                       /* f900 */
-                24806,          /* A1 = -1.514099 */
-                 -32501,        /* A2 = 0.991852 */
-                 -326,          /* B2 = -0.009969 */
-                 0,             /* B1 = 0.000000 */
-                 326,           /* B0 = 0.009969 */
-                 24709,         /* A1 = -1.508118 */
-                 -32659,        /* A2 = 0.996674 */
-                 20277,         /* B2 = 0.618835 */
-                 -15182,        /* B1 = -0.926636 */
-                 20277,         /* B0 = 0.618835 */
-                 25022,         /* A1 = -1.527222 */
-                 -32661,        /* A2 = 0.996735 */
-                 4320,          /* B2 = 0.131836 */
-                 -3331,         /* B1 = -0.203339 */
-                 4320,          /* B0 = 0.131836 */
-                 5,             /* Internal filter scaling */
-                 159,           /* Minimum in-band energy threshold */
-                 21,            /* 21/32 in-band to broad-band ratio */
-                 0x0FF5         /* shift-mask 0x0FF (look at 16 half-frames) bit count = 5 */
-        },
-        {                       /* f900_1300[] */
-                19776,          /* A1 = 1.207092 */
-                 -27437,        /* A2 = -0.837341 */
-                 -2666,         /* B2 = -0.081371 */
-                 0,             /* B1 = 0 */
-                 2666,          /* B0 = 0.081371 */
-                 16302,         /* A1 = 0.995026 */
-                 -30354,        /* A2 = -0.926361 */
-                 10389,         /* B2 = 0.317062 */
-                 -3327,         /* B1 = -0.203064 */
-                 10389,         /* B0 = 0.317062 */
-                 24299,         /* A1 = 1.483154 */
-                 -30930,        /* A2 = -0.943909 */
-                 25016,         /* B2 = 0.763428 */
-                 -21171,        /* B1 = -1.292236 */
-                 25016,         /* B0 = 0.763428 */
-                 7,             /* Internal filter scaling */
-                 159,           /* Minimum in-band energy threshold */
-                 21,            /* 21/32 in-band to broad-band ratio */
-                 0x0FF5         /* shift-mask 0x0FF (look at 16 half-frames) bit count = 5 */
-        },
-        {                       /* f935_1215[] */
-                20554,          /* A1 = 1.254517 */
-                 -28764,        /* A2 = -0.877838 */
-                 -2048,         /* B2 = -0.062515 */
-                 0,             /* B1 = 0 */
-                 2048,          /* B0 = 0.062515 */
-                 18209,         /* A1 = 1.11145 */
-                 -30951,        /* A2 = -0.94458 */
-                 9390,          /* B2 = 0.286575 */
-                 -3955,         /* B1 = -0.241455 */
-                 9390,          /* B0 = 0.286575 */
-                 23902,         /* A1 = 1.458923 */
-                 -31286,        /* A2 = -0.954803 */
-                 23252,         /* B2 = 0.709595 */
-                 -19132,        /* B1 = -1.167725 */
-                 23252,         /* B0 = 0.709595 */
-                 7,             /* Internal filter scaling */
-                 159,           /* Minimum in-band energy threshold */
-                 21,            /* 21/32 in-band to broad-band ratio */
-                 0x0FF5         /* shift-mask 0x0FF (look at 16 half-frames) bit count = 5 */
-        },
-        {                       /* f941_1477[] */
-                17543,          /* A1 = 1.07074 */
-                 -26220,        /* A2 = -0.800201 */
-                 -3298,         /* B2 = -0.100647 */
-                 0,             /* B1 = 0 */
-                 3298,          /* B0 = 0.100647 */
-                 12423,         /* A1 = 0.75827 */
-                 -30036,        /* A2 = -0.916626 */
-                 12651,         /* B2 = 0.386078 */
-                 -2444,         /* B1 = -0.14917 */
-                 12653,         /* B0 = 0.386154 */
-                 23518,         /* A1 = 1.435425 */
-                 -30745,        /* A2 = -0.938293 */
-                 27282,         /* B2 = 0.832581 */
-                 -22529,        /* B1 = -1.375122 */
-                 27286,         /* B0 = 0.832703 */
-                 7,             /* Internal filter scaling */
-                 159,           /* Minimum in-band energy threshold */
-                 21,            /* 21/32 in-band to broad-band ratio */
-                 0x0FF5         /* shift-mask 0x0FF (look at 16 half-frames) bit count = 5 */
-        },
-        {                       /* f942 */
-                24104,          /* A1 = -1.471252 */
-                 -32507,        /* A2 = 0.992065 */
-                 -351,          /* B2 = -0.010722 */
-                 0,             /* B1 = 0.000000 */
-                 351,           /* B0 = 0.010722 */
-                 23996,         /* A1 = -1.464600 */
-                 -32671,        /* A2 = 0.997040 */
-                 22848,         /* B2 = 0.697266 */
-                 -16639,        /* B1 = -1.015564 */
-                 22848,         /* B0 = 0.697266 */
-                 24332,         /* A1 = -1.485168 */
-                 -32673,        /* A2 = 0.997101 */
-                 4906,          /* B2 = 0.149727 */
-                 -3672,         /* B1 = -0.224174 */
-                 4906,          /* B0 = 0.149727 */
-                 5,             /* Internal filter scaling */
-                 159,           /* Minimum in-band energy threshold */
-                 21,            /* 21/32 in-band to broad-band ratio */
-                 0x0FF5         /* shift-mask 0x0FF (look at 16 half-frames) bit count = 5 */
-        },
-        {                       /* f950 */
-                23967,          /* A1 = -1.462830 */
-                 -32507,        /* A2 = 0.992065 */
-                 -518,          /* B2 = -0.015821 */
-                 0,             /* B1 = 0.000000 */
-                 518,           /* B0 = 0.015821 */
-                 23856,         /* A1 = -1.456055 */
-                 -32671,        /* A2 = 0.997040 */
-                 26287,         /* B2 = 0.802246 */
-                 -19031,        /* B1 = -1.161560 */
-                 26287,         /* B0 = 0.802246 */
-                 24195,         /* A1 = -1.476746 */
-                 -32673,        /* A2 = 0.997101 */
-                 2890,          /* B2 = 0.088196 */
-                 -2151,         /* B1 = -0.131317 */
-                 2890,          /* B0 = 0.088196 */
-                 5,             /* Internal filter scaling */
-                 159,           /* Minimum in-band energy threshold */
-                 21,            /* 21/32 in-band to broad-band ratio */
-                 0x0FF5         /* shift-mask 0x0FF (look at 16 half-frames) bit count = 5 */
-        },
-        {                       /* f950_1400[] */
-                18294,          /* A1 = 1.116638 */
-                 -26962,        /* A2 = -0.822845 */
-                 -2914,         /* B2 = -0.088936 */
-                 0,             /* B1 = 0 */
-                 2914,          /* B0 = 0.088936 */
-                 14119,         /* A1 = 0.861786 */
-                 -30227,        /* A2 = -0.922455 */
-                 11466,         /* B2 = 0.349945 */
-                 -2833,         /* B1 = -0.172943 */
-                 11466,         /* B0 = 0.349945 */
-                 23431,         /* A1 = 1.430115 */
-                 -30828,        /* A2 = -0.940796 */
-                 25331,         /* B2 = 0.773071 */
-                 -20911,        /* B1 = -1.276367 */
-                 25331,         /* B0 = 0.773071 */
-                 7,             /* Internal filter scaling */
-                 159,           /* Minimum in-band energy threshold */
-                 21,            /* 21/32 in-band to broad-band ratio */
-                 0x0FF5         /* shift-mask 0x0FF (look at 16 half-frames) bit count = 5 */
-        },
-        {                       /* f975 */
-                23521,          /* A1 = -1.435608 */
-                 -32489,        /* A2 = 0.991516 */
-                 -193,          /* B2 = -0.005915 */
-                 0,             /* B1 = 0.000000 */
-                 193,           /* B0 = 0.005915 */
-                 23404,         /* A1 = -1.428467 */
-                 -32655,        /* A2 = 0.996582 */
-                 17740,         /* B2 = 0.541412 */
-                 -12567,        /* B1 = -0.767029 */
-                 17740,         /* B0 = 0.541412 */
-                 23753,         /* A1 = -1.449829 */
-                 -32657,        /* A2 = 0.996613 */
-                 9090,          /* B2 = 0.277405 */
-                 -6662,         /* B1 = -0.406647 */
-                 9090,          /* B0 = 0.277405 */
-                 5,             /* Internal filter scaling */
-                 159,           /* Minimum in-band energy threshold */
-                 21,            /* 21/32 in-band to broad-band ratio */
-                 0x0FF5         /* shift-mask 0x0FF (look at 16 half-frames) bit count = 5 */
-        },
-        {                       /* f1000 */
-                23071,          /* A1 = -1.408203 */
-                 -32489,        /* A2 = 0.991516 */
-                 -293,          /* B2 = -0.008965 */
-                 0,             /* B1 = 0.000000 */
-                 293,           /* B0 = 0.008965 */
-                 22951,         /* A1 = -1.400818 */
-                 -32655,        /* A2 = 0.996582 */
-                 5689,          /* B2 = 0.173645 */
-                 -3951,         /* B1 = -0.241150 */
-                 5689,          /* B0 = 0.173645 */
-                 23307,         /* A1 = -1.422607 */
-                 -32657,        /* A2 = 0.996613 */
-                 18692,         /* B2 = 0.570435 */
-                 -13447,        /* B1 = -0.820770 */
-                 18692,         /* B0 = 0.570435 */
-                 5,             /* Internal filter scaling */
-                 159,           /* Minimum in-band energy threshold */
-                 21,            /* 21/32 in-band to broad-band ratio */
-                 0x0FF5         /* shift-mask 0x0FF (look at 16 half-frames) bit count = 5 */
-        },
-        {                       /* f1020 */
-                22701,          /* A1 = -1.385620 */
-                 -32474,        /* A2 = 0.991058 */
-                 -292,          /* B2 = -0.008933 */
-                 0,             /*163840      , B1 = 10.000000 */
-                 292,           /* B0 = 0.008933 */
-                 22564,         /* A1 = -1.377258 */
-                 -32655,        /* A2 = 0.996552 */
-                 20756,         /* B2 = 0.633423 */
-                 -14176,        /* B1 = -0.865295 */
-                 20756,         /* B0 = 0.633423 */
-                 22960,         /* A1 = -1.401428 */
-                 -32657,        /* A2 = 0.996613 */
-                 6520,          /* B2 = 0.198990 */
-                 -4619,         /* B1 = -0.281937 */
-                 6520,          /* B0 = 0.198990 */
-                 5,             /* Internal filter scaling */
-                 159,           /* Minimum in-band energy threshold */
-                 21,            /* 21/32 in-band to broad-band ratio */
-                 0x0FF5         /* shift-mask 0x0FF (look at 16 half-frames) bit count = 5 */
-        },
-        {                       /* f1050 */
-                22142,          /* A1 = -1.351501 */
-                 -32474,        /* A2 = 0.991058 */
-                 -147,          /* B2 = -0.004493 */
-                 0,             /* B1 = 0.000000 */
-                 147,           /* B0 = 0.004493 */
-                 22000,         /* A1 = -1.342834 */
-                 -32655,        /* A2 = 0.996552 */
-                 15379,         /* B2 = 0.469360 */
-                 -10237,        /* B1 = -0.624847 */
-                 15379,         /* B0 = 0.469360 */
-                 22406,         /* A1 = -1.367554 */
-                 -32657,        /* A2 = 0.996613 */
-                 17491,         /* B2 = 0.533783 */
-                 -12096,        /* B1 = -0.738312 */
-                 17491,         /* B0 = 0.533783 */
-                 5,             /* Internal filter scaling */
-                 159,           /* Minimum in-band energy threshold */
-                 21,            /* 21/32 in-band to broad-band ratio */
-                 0x0FF5         /* shift-mask 0x0FF (look at 16 half-frames) bit count = 5 */
-        },
-        {                       /* f1100_1750[] */
-                12973,          /* A1 = 0.79184 */
-                 -24916,        /* A2 = -0.760376 */
-                 6655,          /* B2 = 0.203102 */
-                 367,           /* B1 = 0.0224 */
-                 6657,          /* B0 = 0.203171 */
-                 5915,          /* A1 = 0.361053 */
-                 -29560,        /* A2 = -0.90213 */
-                 -7777,         /* B2 = -0.23735 */
-                 0,             /* B1 = 0 */
-                 7777,          /* B0 = 0.23735 */
-                 20510,         /* A1 = 1.251892 */
-                 -30260,        /* A2 = -0.923462 */
-                 26662,         /* B2 = 0.81366 */
-                 -20573,        /* B1 = -1.255737 */
-                 26668,         /* B0 = 0.813843 */
-                 7,             /* Internal filter scaling */
-                 159,           /* Minimum in-band energy threshold */
-                 21,            /* 21/32 in-band to broad-band ratio */
-                 0x0FF5         /* shift-mask 0x0FF (look at 16 half-frames) bit count = 5 */
-        },
-        {                       /* f1140 */
-                20392,          /* A1 = -1.244629 */
-                 -32460,        /* A2 = 0.990601 */
-                 -270,          /* B2 = -0.008240 */
-                 0,             /* B1 = 0.000000 */
-                 270,           /* B0 = 0.008240 */
-                 20218,         /* A1 = -1.234009 */
-                 -32655,        /* A2 = 0.996582 */
-                 21337,         /* B2 = 0.651154 */
-                 -13044,        /* B1 = -0.796143 */
-                 21337,         /* B0 = 0.651154 */
-                 20684,         /* A1 = -1.262512 */
-                 -32657,        /* A2 = 0.996643 */
-                 8572,          /* B2 = 0.261612 */
-                 -5476,         /* B1 = -0.334244 */
-                 8572,          /* B0 = 0.261612 */
-                 5,             /* Internal filter scaling */
-                 159,           /* Minimum in-band energy threshold */
-                 21,            /* 21/32 in-band to broad-band ratio */
-                 0x0FF5         /* shift-mask 0x0FF (look at 16 half-frames) bit count = 5 */
-        },
-        {                       /* f1200 */
-                19159,          /* A1 = -1.169373 */
-                 -32456,        /* A2 = 0.990509 */
-                 -335,          /* B2 = -0.010252 */
-                 0,             /* B1 = 0.000000 */
-                 335,           /* B0 = 0.010252 */
-                 18966,         /* A1 = -1.157593 */
-                 -32661,        /* A2 = 0.996735 */
-                 6802,          /* B2 = 0.207588 */
-                 -3900,         /* B1 = -0.238098 */
-                 6802,          /* B0 = 0.207588 */
-                 19467,         /* A1 = -1.188232 */
-                 -32661,        /* A2 = 0.996765 */
-                 25035,         /* B2 = 0.764008 */
-                 -15049,        /* B1 = -0.918579 */
-                 25035,         /* B0 = 0.764008 */
-                 5,             /* Internal filter scaling */
-                 159,           /* Minimum in-band energy threshold */
-                 21,            /* 21/32 in-band to broad-band ratio */
-                 0x0FF5         /* shift-mask 0x0FF (look at 16 half-frames) bit count = 5 */
-        },
-        {                       /* f1209 */
-                18976,          /* A1 = -1.158264 */
-                 -32439,        /* A2 = 0.989990 */
-                 -183,          /* B2 = -0.005588 */
-                 0,             /* B1 = 0.000000 */
-                 183,           /* B0 = 0.005588 */
-                 18774,         /* A1 = -1.145874 */
-                 -32650,        /* A2 = 0.996429 */
-                 15468,         /* B2 = 0.472076 */
-                 -8768,         /* B1 = -0.535217 */
-                 15468,         /* B0 = 0.472076 */
-                 19300,         /* A1 = -1.177979 */
-                 -32652,        /* A2 = 0.996490 */
-                 19840,         /* B2 = 0.605499 */
-                 -11842,        /* B1 = -0.722809 */
-                 19840,         /* B0 = 0.605499 */
-                 5,             /* Internal filter scaling */
-                 159,           /* Minimum in-band energy threshold */
-                 21,            /* 21/32 in-band to broad-band ratio */
-                 0x0FF5         /* shift-mask 0x0FF (look at 16 half-frames) bit count = 5 */
-        },
-        {                       /* f1330 */
-                16357,          /* A1 = -0.998413 */
-                 -32368,        /* A2 = 0.987793 */
-                 -217,          /* B2 = -0.006652 */
-                 0,             /* B1 = 0.000000 */
-                 217,           /* B0 = 0.006652 */
-                 16107,         /* A1 = -0.983126 */
-                 -32601,        /* A2 = 0.994904 */
-                 11602,         /* B2 = 0.354065 */
-                 -5555,         /* B1 = -0.339111 */
-                 11602,         /* B0 = 0.354065 */
-                 16722,         /* A1 = -1.020630 */
-                 -32603,        /* A2 = 0.994965 */
-                 15574,         /* B2 = 0.475311 */
-                 -8176,         /* B1 = -0.499069 */
-                 15574,         /* B0 = 0.475311 */
-                 5,             /* Internal filter scaling */
-                 159,           /* Minimum in-band energy threshold */
-                 21,            /* 21/32 in-band to broad-band ratio */
-                 0x0FF5         /* shift-mask 0x0FF (look at 16 half-frames) bit count = 5 */
-        },
-        {                       /* f1336 */
-                16234,          /* A1 = -0.990875 */
-                 32404,         /* A2 = -0.988922 */
-                 -193,          /* B2 = -0.005908 */
-                 0,             /* B1 = 0.000000 */
-                 193,           /* B0 = 0.005908 */
-                 15986,         /* A1 = -0.975769 */
-                 -32632,        /* A2 = 0.995880 */
-                 18051,         /* B2 = 0.550903 */
-                 -8658,         /* B1 = -0.528473 */
-                 18051,         /* B0 = 0.550903 */
-                 16591,         /* A1 = -1.012695 */
-                 -32634,        /* A2 = 0.995941 */
-                 15736,         /* B2 = 0.480240 */
-                 -8125,         /* B1 = -0.495926 */
-                 15736,         /* B0 = 0.480240 */
-                 5,             /* Internal filter scaling */
-                 159,           /* Minimum in-band energy threshold */
-                 21,            /* 21/32 in-band to broad-band ratio */
-                 0x0FF5         /* shift-mask 0x0FF (look at 16 half-frames) bit count = 5 */
-        },
-        {                       /* f1366 */
-                15564,          /* A1 = -0.949982 */
-                 -32404,        /* A2 = 0.988922 */
-                 -269,          /* B2 = -0.008216 */
-                 0,             /* B1 = 0.000000 */
-                 269,           /* B0 = 0.008216 */
-                 15310,         /* A1 = -0.934479 */
-                 -32632,        /* A2 = 0.995880 */
-                 10815,         /* B2 = 0.330063 */
-                 -4962,         /* B1 = -0.302887 */
-                 10815,         /* B0 = 0.330063 */
-                 15924,         /* A1 = -0.971924 */
-                 -32634,        /* A2 = 0.995941 */
-                 18880,         /* B2 = 0.576172 */
-                 -9364,         /* B1 = -0.571594 */
-                 18880,         /* B0 = 0.576172 */
-                 5,             /* Internal filter scaling */
-                 159,           /* Minimum in-band energy threshold */
-                 21,            /* 21/32 in-band to broad-band ratio */
-                 0x0FF5         /* shift-mask 0x0FF (look at 16 half-frames) bit count = 5 */
-        },
-        {                       /* f1380 */
-                15247,          /* A1 = -0.930603 */
-                 -32397,        /* A2 = 0.988708 */
-                 -244,          /* B2 = -0.007451 */
-                 0,             /* B1 = 0.000000 */
-                 244,           /* B0 = 0.007451 */
-                 14989,         /* A1 = -0.914886 */
-                 -32627,        /* A2 = 0.995697 */
-                 18961,         /* B2 = 0.578644 */
-                 -8498,         /* B1 = -0.518707 */
-                 18961,         /* B0 = 0.578644 */
-                 15608,         /* A1 = -0.952667 */
-                 -32628,        /* A2 = 0.995758 */
-                 11145,         /* B2 = 0.340134 */
-                 -5430,         /* B1 = -0.331467 */
-                 11145,         /* B0 = 0.340134 */
-                 5,             /* Internal filter scaling */
-                 159,           /* Minimum in-band energy threshold */
-                 21,            /* 21/32 in-band to broad-band ratio */
-                 0x0FF5         /* shift-mask 0x0FF (look at 16 half-frames) bit count = 5 */
-        },
-        {                       /* f1400 */
-                14780,          /* A1 = -0.902130 */
-                 -32393,        /* A2 = 0.988586 */
-                 -396,          /* B2 = -0.012086 */
-                 0,             /* B1 = 0.000000 */
-                 396,           /* B0 = 0.012086 */
-                 14510,         /* A1 = -0.885651 */
-                 -32630,        /* A2 = 0.995819 */
-                 6326,          /* B2 = 0.193069 */
-                 -2747,         /* B1 = -0.167671 */
-                 6326,          /* B0 = 0.193069 */
-                 15154,         /* A1 = -0.924957 */
-                 -32632,        /* A2 = 0.995850 */
-                 23235,         /* B2 = 0.709076 */
-                 -10983,        /* B1 = -0.670380 */
-                 23235,         /* B0 = 0.709076 */
-                 5,             /* Internal filter scaling */
-                 159,           /* Minimum in-band energy threshold */
-                 21,            /* 21/32 in-band to broad-band ratio */
-                 0x0FF5         /* shift-mask 0x0FF (look at 16 half-frames) bit count = 5 */
-        },
-        {                       /* f1477 */
-                13005,          /* A1 = -0.793793 */
-                 -32368,        /* A2 = 0.987823 */
-                 -500,          /* B2 = -0.015265 */
-                 0,             /* B1 = 0.000000 */
-                 500,           /* B0 = 0.015265 */
-                 12708,         /* A1 = -0.775665 */
-                 -32615,        /* A2 = 0.995331 */
-                 11420,         /* B2 = 0.348526 */
-                 -4306,         /* B1 = -0.262833 */
-                 11420,         /* B0 = 0.348526 */
-                 13397,         /* A1 = -0.817688 */
-                 -32615,        /* A2 = 0.995361 */
-                 9454,          /* B2 = 0.288528 */
-                 -3981,         /* B1 = -0.243027 */
-                 9454,          /* B0 = 0.288528 */
-                 5,             /* Internal filter scaling */
-                 159,           /* Minimum in-band energy threshold */
-                 21,            /* 21/32 in-band to broad-band ratio */
-                 0x0FF5         /* shift-mask 0x0FF (look at 16 half-frames) bit count = 5 */
-        },
-        {                       /* f1600 */
-                10046,          /* A1 = -0.613190 */
-                 -32331,        /* A2 = 0.986694 */
-                 -455,          /* B2 = -0.013915 */
-                 0,             /* B1 = 0.000000 */
-                 455,           /* B0 = 0.013915 */
-                 9694,          /* A1 = -0.591705 */
-                 -32601,        /* A2 = 0.994934 */
-                 6023,          /* B2 = 0.183815 */
-                 -1708,         /* B1 = -0.104279 */
-                 6023,          /* B0 = 0.183815 */
-                 10478,         /* A1 = -0.639587 */
-                 -32603,        /* A2 = 0.994965 */
-                 22031,         /* B2 = 0.672333 */
-                 -7342,         /* B1 = -0.448151 */
-                 22031,         /* B0 = 0.672333 */
-                 5,             /* Internal filter scaling */
-                 159,           /* Minimum in-band energy threshold */
-                 21,            /* 21/32 in-band to broad-band ratio */
-                 0x0FF5         /* shift-mask 0x0FF (look at 16 half-frames) bit count = 5 */
-        },
-        {                       /* f1633_1638[] */
-                9181,           /* A1 = 0.560394 */
-                 -32256,        /* A2 = -0.984375 */
-                 -556,          /* B2 = -0.016975 */
-                 0,             /* B1 = 0 */
-                 556,           /* B0 = 0.016975 */
-                 8757,          /* A1 = 0.534515 */
-                 -32574,        /* A2 = -0.99408 */
-                 8443,          /* B2 = 0.25769 */
-                 -2135,         /* B1 = -0.130341 */
-                 8443,          /* B0 = 0.25769 */
-                 9691,          /* A1 = 0.591522 */
-                 -32574,        /* A2 = -0.99411 */
-                 15446,         /* B2 = 0.471375 */
-                 -4809,         /* B1 = -0.293579 */
-                 15446,         /* B0 = 0.471375 */
-                 7,             /* Internal filter scaling */
-                 159,           /* Minimum in-band energy threshold */
-                 21,            /* 21/32 in-band to broad-band ratio */
-                 0x0FF5         /* shift-mask 0x0FF (look at 16 half-frames) bit count = 5 */
-        },
-        {                       /* f1800 */
-                5076,           /* A1 = -0.309875 */
-                 -32304,        /* A2 = 0.985840 */
-                 -508,          /* B2 = -0.015503 */
-                 0,             /* B1 = 0.000000 */
-                 508,           /* B0 = 0.015503 */
-                 4646,          /* A1 = -0.283600 */
-                 -32605,        /* A2 = 0.995026 */
-                 6742,          /* B2 = 0.205780 */
-                 -878,          /* B1 = -0.053635 */
-                 6742,          /* B0 = 0.205780 */
-                 5552,          /* A1 = -0.338928 */
-                 -32605,        /* A2 = 0.995056 */
-                 23667,         /* B2 = 0.722260 */
-                 -4297,         /* B1 = -0.262329 */
-                 23667,         /* B0 = 0.722260 */
-                 5,             /* Internal filter scaling */
-                 159,           /* Minimum in-band energy threshold */
-                 21,            /* 21/32 in-band to broad-band ratio */
-                 0x0FF5         /* shift-mask 0x0FF (look at 16 half-frames) bit count = 5 */
-        },
-        {                       /* f1860 */
-                3569,           /* A1 = -0.217865 */
-                 -32292,        /* A2 = 0.985504 */
-                 -239,          /* B2 = -0.007322 */
-                 0,             /* B1 = 0.000000 */
-                 239,           /* B0 = 0.007322 */
-                 3117,          /* A1 = -0.190277 */
-                 -32603,        /* A2 = 0.994965 */
-                 18658,         /* B2 = 0.569427 */
-                 -1557,         /* B1 = -0.095032 */
-                 18658,         /* B0 = 0.569427 */
-                 4054,          /* A1 = -0.247437 */
-                 -32603,        /* A2 = 0.994965 */
-                 18886,         /* B2 = 0.576385 */
-                 -2566,         /* B1 = -0.156647 */
-                 18886,         /* B0 = 0.576385 */
-                 5,             /* Internal filter scaling */
-                 159,           /* Minimum in-band energy threshold */
-                 21,            /* 21/32 in-band to broad-band ratio */
-                 0x0FF5         /* shift-mask 0x0FF (look at 16 half-frames) bit count = 5 */
-        },
-};
-static int ixj_init_filter(IXJ *j, IXJ_FILTER * jf)
-{
-        unsigned short cmd;
-        int cnt, max;
-
-        if (jf->filter > 3) {
-                return -1;
-        }
-        if (ixj_WriteDSPCommand(0x5154 + jf->filter, j))        /* Select Filter */
-
-                return -1;
-        if (!jf->enable) {
-                if (ixj_WriteDSPCommand(0x5152, j))             /* Disable Filter */
-
-                        return -1;
-                else
-                        return 0;
-        } else {
-                if (ixj_WriteDSPCommand(0x5153, j))             /* Enable Filter */
-
-                        return -1;
-                /* Select the filter (f0 - f3) to use. */
-                if (ixj_WriteDSPCommand(0x5154 + jf->filter, j))
-                        return -1;
-        }
-        if (jf->freq < 12 && jf->freq > 3) {
-                /* Select the frequency for the selected filter. */
-                if (ixj_WriteDSPCommand(0x5170 + jf->freq, j))
-                        return -1;
-        } else if (jf->freq > 11) {
-                /* We need to load a programmable filter set for undefined */
-                /* frequencies.  So we will point the filter to a programmable set. */
-                /* Since there are only 4 filters and 4 programmable sets, we will */
-                /* just point the filter to the same number set and program it for the */
-                /* frequency we want. */
-                if (ixj_WriteDSPCommand(0x5170 + jf->filter, j))
-                        return -1;
-                if (j->ver.low != 0x12) {
-                        cmd = 0x515B;
-                        max = 19;
-                } else {
-                        cmd = 0x515E;
-                        max = 15;
-                }
-                if (ixj_WriteDSPCommand(cmd, j))
-                        return -1;
-                for (cnt = 0; cnt < max; cnt++) {
-                        if (ixj_WriteDSPCommand(tone_table[jf->freq - 12][cnt], j))
-                                return -1;
-                }
-        }
-        j->filter_en[jf->filter] = jf->enable;
-        return 0;
-}
-
-static int ixj_init_filter_raw(IXJ *j, IXJ_FILTER_RAW * jfr)
-{
-        unsigned short cmd;
-        int cnt, max;
-        if (jfr->filter > 3) {
-                return -1;
-        }
-        if (ixj_WriteDSPCommand(0x5154 + jfr->filter, j))       /* Select Filter */
-                return -1;
-
-        if (!jfr->enable) {
-                if (ixj_WriteDSPCommand(0x5152, j))             /* Disable Filter */
-                        return -1;
-                else
-                        return 0;
-        } else {
-                if (ixj_WriteDSPCommand(0x5153, j))             /* Enable Filter */
-                        return -1;
-                /* Select the filter (f0 - f3) to use. */
-                if (ixj_WriteDSPCommand(0x5154 + jfr->filter, j))
-                        return -1;
-        }
-        /* We need to load a programmable filter set for undefined */
-        /* frequencies.  So we will point the filter to a programmable set. */
-        /* Since there are only 4 filters and 4 programmable sets, we will */
-        /* just point the filter to the same number set and program it for the */
-        /* frequency we want. */
-        if (ixj_WriteDSPCommand(0x5170 + jfr->filter, j))
-                return -1;
-        if (j->ver.low != 0x12) {
-                cmd = 0x515B;
-                max = 19;
-        } else {
-                cmd = 0x515E;
-                max = 15;
-        }
-        if (ixj_WriteDSPCommand(cmd, j))
-                return -1;
-        for (cnt = 0; cnt < max; cnt++) {
-                if (ixj_WriteDSPCommand(jfr->coeff[cnt], j))
-                        return -1;
-        }
-        j->filter_en[jfr->filter] = jfr->enable;
-        return 0;
-}
-
-static int ixj_init_tone(IXJ *j, IXJ_TONE * ti)
-{
-        int freq0, freq1;
-        unsigned short data;
-        if (ti->freq0) {
-                freq0 = ti->freq0;
-        } else {
-                freq0 = 0x7FFF;
-        }
-
-        if (ti->freq1) {
-                freq1 = ti->freq1;
-        } else {
-                freq1 = 0x7FFF;
-        }
-
-        if(ti->tone_index > 12 && ti->tone_index < 28)
-        {
-                if (ixj_WriteDSPCommand(0x6800 + ti->tone_index, j))
-                        return -1;
-                if (ixj_WriteDSPCommand(0x6000 + (ti->gain1 << 4) + ti->gain0, j))
-                        return -1;
-                data = freq0;
-                if (ixj_WriteDSPCommand(data, j))
-                        return -1;
-                data = freq1;
-                if (ixj_WriteDSPCommand(data, j))
-                        return -1;
-        }
-        return freq0;
-}
-
diff --git a/drivers/staging/telephony/ixj.h b/drivers/staging/telephony/ixj.h
deleted file mode 100644
index 2c841134f61c..000000000000
--- a/drivers/staging/telephony/ixj.h
+++ /dev/null
@@ -1,1322 +0,0 @@
-/******************************************************************************
- *    ixj.h
- *
- *
- * Device Driver for Quicknet Technologies, Inc.'s Telephony cards
- * including the Internet PhoneJACK, Internet PhoneJACK Lite,
- * Internet PhoneJACK PCI, Internet LineJACK, Internet PhoneCARD and
- * SmartCABLE
- *
- *    (c) Copyright 1999-2001  Quicknet Technologies, Inc.
- *
- *    This program is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU General Public License
- *    as published by the Free Software Foundation; either version
- *    2 of the License, or (at your option) any later version.
- *
- * Author:          Ed Okerson, <eokerson@quicknet.net>
- *    
- * Contributors:    Greg Herlein, <gherlein@quicknet.net>
- *                  David W. Erhart, <derhart@quicknet.net>
- *                  John Sellers, <jsellers@quicknet.net>
- *                  Mike Preston, <mpreston@quicknet.net>
- *
- * More information about the hardware related to this driver can be found
- * at our website:    http://www.quicknet.net
- *
- * Fixes:
- *
- * IN NO EVENT SHALL QUICKNET TECHNOLOGIES, INC. BE LIABLE TO ANY PARTY FOR
- * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
- * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF QUICKNET
- * TECHNOLOGIES, INC.HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * QUICKNET TECHNOLOGIES, INC. SPECIFICALLY DISCLAIMS ANY WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND QUICKNET TECHNOLOGIES, INC. HAS NO OBLIGATION 
- * TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- *
- *****************************************************************************/
-#define IXJ_VERSION 3031
-
-#include <linux/types.h>
-
-#include <linux/ixjuser.h>
-#include <linux/phonedev.h>
-
-typedef __u16 WORD;
-typedef __u32 DWORD;
-typedef __u8 BYTE;
-
-#ifndef IXJMAX
-#define IXJMAX 16
-#endif
-
-/******************************************************************************
-*
-*  This structure when unioned with the structures below makes simple byte
-*  access to the registers easier.
-*
-******************************************************************************/
-typedef struct {
-        unsigned char low;
-        unsigned char high;
-} BYTES;
-
-typedef union {
-        BYTES bytes;
-        short word;
-} IXJ_WORD;
-
-typedef struct{
-        unsigned int b0:1;
-        unsigned int b1:1;
-        unsigned int b2:1;
-        unsigned int b3:1;
-        unsigned int b4:1;
-        unsigned int b5:1;
-        unsigned int b6:1;
-        unsigned int b7:1;
-} IXJ_CBITS;
-
-typedef union{
-        IXJ_CBITS cbits;
-          char  cbyte;
-} IXJ_CBYTE;
-
-/******************************************************************************
-*
-*  This structure represents the Hardware Control Register of the CT8020/8021
-*  The CT8020 is used in the Internet PhoneJACK, and the 8021 in the
-*  Internet LineJACK
-*
-******************************************************************************/
-typedef struct {
-        unsigned int rxrdy:1;
-        unsigned int txrdy:1;
-        unsigned int status:1;
-        unsigned int auxstatus:1;
-        unsigned int rxdma:1;
-        unsigned int txdma:1;
-        unsigned int rxburst:1;
-        unsigned int txburst:1;
-        unsigned int dmadir:1;
-        unsigned int cont:1;
-        unsigned int irqn:1;
-        unsigned int t:5;
-} HCRBIT;
-
-typedef union {
-        HCRBIT bits;
-        BYTES bytes;
-} HCR;
-
-/******************************************************************************
-*
-*  This structure represents the Hardware Status Register of the CT8020/8021
-*  The CT8020 is used in the Internet PhoneJACK, and the 8021 in the
-*  Internet LineJACK
-*
-******************************************************************************/
-typedef struct {
-        unsigned int controlrdy:1;
-        unsigned int auxctlrdy:1;
-        unsigned int statusrdy:1;
-        unsigned int auxstatusrdy:1;
-        unsigned int rxrdy:1;
-        unsigned int txrdy:1;
-        unsigned int restart:1;
-        unsigned int irqn:1;
-        unsigned int rxdma:1;
-        unsigned int txdma:1;
-        unsigned int cohostshutdown:1;
-        unsigned int t:5;
-} HSRBIT;
-
-typedef union {
-        HSRBIT bits;
-        BYTES bytes;
-} HSR;
-
-/******************************************************************************
-*
-*  This structure represents the General Purpose IO Register of the CT8020/8021
-*  The CT8020 is used in the Internet PhoneJACK, and the 8021 in the
-*  Internet LineJACK
-*
-******************************************************************************/
-typedef struct {
-        unsigned int x:1;
-        unsigned int gpio1:1;
-        unsigned int gpio2:1;
-        unsigned int gpio3:1;
-        unsigned int gpio4:1;
-        unsigned int gpio5:1;
-        unsigned int gpio6:1;
-        unsigned int gpio7:1;
-        unsigned int xread:1;
-        unsigned int gpio1read:1;
-        unsigned int gpio2read:1;
-        unsigned int gpio3read:1;
-        unsigned int gpio4read:1;
-        unsigned int gpio5read:1;
-        unsigned int gpio6read:1;
-        unsigned int gpio7read:1;
-} GPIOBIT;
-
-typedef union {
-        GPIOBIT bits;
-        BYTES bytes;
-        unsigned short word;
-} GPIO;
-
-/******************************************************************************
-*
-*  This structure represents the Line Monitor status response
-*
-******************************************************************************/
-typedef struct {
-        unsigned int digit:4;
-        unsigned int cpf_valid:1;
-        unsigned int dtmf_valid:1;
-        unsigned int peak:1;
-        unsigned int z:1;
-        unsigned int f0:1;
-        unsigned int f1:1;
-        unsigned int f2:1;
-        unsigned int f3:1;
-        unsigned int frame:4;
-} LMON;
-
-typedef union {
-        LMON bits;
-        BYTES bytes;
-} DTMF;
-
-typedef struct {
-        unsigned int z:7;
-        unsigned int dtmf_en:1;
-        unsigned int y:4;
-        unsigned int F3:1;
-        unsigned int F2:1;
-        unsigned int F1:1;
-        unsigned int F0:1;
-} CP;
-
-typedef union {
-        CP bits;
-        BYTES bytes;
-} CPTF;
-
-/******************************************************************************
-*
-*  This structure represents the Status Control Register on the Internet
-*  LineJACK
-*
-******************************************************************************/
-typedef struct {
-        unsigned int c0:1;
-        unsigned int c1:1;
-        unsigned int stereo:1;
-        unsigned int daafsyncen:1;
-        unsigned int led1:1;
-        unsigned int led2:1;
-        unsigned int led3:1;
-        unsigned int led4:1;
-} PSCRWI;                       /* Internet LineJACK and Internet PhoneJACK Lite */
-
-typedef struct {
-        unsigned int eidp:1;
-        unsigned int eisd:1;
-        unsigned int x:6;
-} PSCRWP;                       /* Internet PhoneJACK PCI */
-
-typedef union {
-        PSCRWI bits;
-        PSCRWP pcib;
-        char byte;
-} PLD_SCRW;
-
-typedef struct {
-        unsigned int c0:1;
-        unsigned int c1:1;
-        unsigned int x:1;
-        unsigned int d0ee:1;
-        unsigned int mixerbusy:1;
-        unsigned int sci:1;
-        unsigned int dspflag:1;
-        unsigned int daaflag:1;
-} PSCRRI;
-
-typedef struct {
-        unsigned int eidp:1;
-        unsigned int eisd:1;
-        unsigned int x:4;
-        unsigned int dspflag:1;
-        unsigned int det:1;
-} PSCRRP;
-
-typedef union {
-        PSCRRI bits;
-        PSCRRP pcib;
-        char byte;
-} PLD_SCRR;
-
-/******************************************************************************
-*
-*  These structures represents the SLIC Control Register on the
-*  Internet LineJACK
-*
-******************************************************************************/
-typedef struct {
-        unsigned int c1:1;
-        unsigned int c2:1;
-        unsigned int c3:1;
-        unsigned int b2en:1;
-        unsigned int spken:1;
-        unsigned int rly1:1;
-        unsigned int rly2:1;
-        unsigned int rly3:1;
-} PSLICWRITE;
-
-typedef struct {
-        unsigned int state:3;
-        unsigned int b2en:1;
-        unsigned int spken:1;
-        unsigned int c3:1;
-        unsigned int potspstn:1;
-        unsigned int det:1;
-} PSLICREAD;
-
-typedef struct {
-        unsigned int c1:1;
-        unsigned int c2:1;
-        unsigned int c3:1;
-        unsigned int b2en:1;
-        unsigned int e1:1;
-        unsigned int mic:1;
-        unsigned int spk:1;
-        unsigned int x:1;
-} PSLICPCI;
-
-typedef union {
-        PSLICPCI pcib;
-        PSLICWRITE bits;
-        PSLICREAD slic;
-        char byte;
-} PLD_SLICW;
-
-typedef union {
-        PSLICPCI pcib;
-        PSLICREAD bits;
-        char byte;
-} PLD_SLICR;
-
-/******************************************************************************
-*
-*  These structures represents the Clock Control Register on the
-*  Internet LineJACK
-*
-******************************************************************************/
-typedef struct {
-        unsigned int clk0:1;
-        unsigned int clk1:1;
-        unsigned int clk2:1;
-        unsigned int x0:1;
-        unsigned int slic_e1:1;
-        unsigned int x1:1;
-        unsigned int x2:1;
-        unsigned int x3:1;
-} PCLOCK;
-
-typedef union {
-        PCLOCK bits;
-        char byte;
-} PLD_CLOCK;
-
-/******************************************************************************
-*
-*  These structures deal with the mixer on the Internet LineJACK
-*
-******************************************************************************/
-
-typedef struct {
-        unsigned short vol[10];
-        unsigned int recsrc;
-        unsigned int modcnt;
-        unsigned short micpreamp;
-} MIX;
-
-/******************************************************************************
-*
-*  These structures deal with the control logic on the Internet PhoneCARD
-*
-******************************************************************************/
-typedef struct {
-        unsigned int x0:4;      /* unused bits */
-
-        unsigned int ed:1;      /* Event Detect */
-
-        unsigned int drf:1;     /* SmartCABLE Removal Flag 1=no cable */
-
-        unsigned int dspf:1;    /* DSP Flag 1=DSP Ready */
-
-        unsigned int crr:1;     /* Control Register Ready */
-
-} COMMAND_REG1;
-
-typedef union {
-        COMMAND_REG1 bits;
-        unsigned char byte;
-} PCMCIA_CR1;
-
-typedef struct {
-        unsigned int x0:4;      /* unused bits */
-
-        unsigned int rstc:1;    /* SmartCABLE Reset */
-
-        unsigned int pwr:1;     /* SmartCABLE Power */
-
-        unsigned int x1:2;      /* unused bits */
-
-} COMMAND_REG2;
-
-typedef union {
-        COMMAND_REG2 bits;
-        unsigned char byte;
-} PCMCIA_CR2;
-
-typedef struct {
-        unsigned int addr:5;    /* R/W SmartCABLE Register Address */
-
-        unsigned int rw:1;      /* Read / Write flag */
-
-        unsigned int dev:2;     /* 2 bit SmartCABLE Device Address */
-
-} CONTROL_REG;
-
-typedef union {
-        CONTROL_REG bits;
-        unsigned char byte;
-} PCMCIA_SCCR;
-
-typedef struct {
-        unsigned int hsw:1;
-        unsigned int det:1;
-        unsigned int led2:1;
-        unsigned int led1:1;
-        unsigned int ring1:1;
-        unsigned int ring0:1;
-        unsigned int x:1;
-        unsigned int powerdown:1;
-} PCMCIA_SLIC_REG;
-
-typedef union {
-        PCMCIA_SLIC_REG bits;
-        unsigned char byte;
-} PCMCIA_SLIC;
-
-typedef struct {
-        unsigned int cpd:1;     /* Chip Power Down */
-
-        unsigned int mpd:1;     /* MIC Bias Power Down */
-
-        unsigned int hpd:1;     /* Handset Drive Power Down */
-
-        unsigned int lpd:1;     /* Line Drive Power Down */
-
-        unsigned int spd:1;     /* Speaker Drive Power Down */
-
-        unsigned int x:2;       /* unused bits */
-
-        unsigned int sr:1;      /* Software Reset */
-
-} Si3CONTROL1;
-
-typedef union {
-        Si3CONTROL1 bits;
-        unsigned char byte;
-} Si3C1;
-
-typedef struct {
-        unsigned int al:1;      /* Analog Loopback DAC analog -> ADC analog */
-
-        unsigned int dl2:1;     /* Digital Loopback DAC -> ADC one bit */
-
-        unsigned int dl1:1;     /* Digital Loopback ADC -> DAC one bit */
-
-        unsigned int pll:1;     /* 1 = div 10, 0 = div 5 */
-
-        unsigned int hpd:1;     /* HPF disable */
-
-        unsigned int x:3;       /* unused bits */
-
-} Si3CONTROL2;
-
-typedef union {
-        Si3CONTROL2 bits;
-        unsigned char byte;
-} Si3C2;
-
-typedef struct {
-        unsigned int iir:1;     /* 1 enables IIR, 0 enables FIR */
-
-        unsigned int him:1;     /* Handset Input Mute */
-
-        unsigned int mcm:1;     /* MIC In Mute */
-
-        unsigned int mcg:2;     /* MIC In Gain */
-
-        unsigned int lim:1;     /* Line In Mute */
-
-        unsigned int lig:2;     /* Line In Gain */
-
-} Si3RXGAIN;
-
-typedef union {
-        Si3RXGAIN bits;
-        unsigned char byte;
-} Si3RXG;
-
-typedef struct {
-        unsigned int hom:1;     /* Handset Out Mute */
-
-        unsigned int lom:1;     /* Line Out Mute */
-
-        unsigned int rxg:5;     /* RX PGA Gain */
-
-        unsigned int x:1;       /* unused bit */
-
-} Si3ADCVOLUME;
-
-typedef union {
-        Si3ADCVOLUME bits;
-        unsigned char byte;
-} Si3ADC;
-
-typedef struct {
-        unsigned int srm:1;     /* Speaker Right Mute */
-
-        unsigned int slm:1;     /* Speaker Left Mute */
-
-        unsigned int txg:5;     /* TX PGA Gain */
-
-        unsigned int x:1;       /* unused bit */
-
-} Si3DACVOLUME;
-
-typedef union {
-        Si3DACVOLUME bits;
-        unsigned char byte;
-} Si3DAC;
-
-typedef struct {
-        unsigned int x:5;       /* unused bit */
-
-        unsigned int losc:1;    /* Line Out Short Circuit */
-
-        unsigned int srsc:1;    /* Speaker Right Short Circuit */
-
-        unsigned int slsc:1;    /* Speaker Left Short Circuit */
-
-} Si3STATUSREPORT;
-
-typedef union {
-        Si3STATUSREPORT bits;
-        unsigned char byte;
-} Si3STAT;
-
-typedef struct {
-        unsigned int sot:2;     /* Speaker Out Attenuation */
-
-        unsigned int lot:2;     /* Line Out Attenuation */
-
-        unsigned int x:4;       /* unused bits */
-
-} Si3ANALOGATTN;
-
-typedef union {
-        Si3ANALOGATTN bits;
-        unsigned char byte;
-} Si3AATT;
-
-/******************************************************************************
-*
-*  These structures deal with the DAA on the Internet LineJACK
-*
-******************************************************************************/
-
-typedef struct _DAA_REGS {
-        /*----------------------------------------------- */
-        /* SOP Registers */
-        /* */
-        BYTE bySOP;
-
-        union _SOP_REGS {
-                struct _SOP {
-                        union   /* SOP - CR0 Register */
-                         {
-                                BYTE reg;
-                                struct _CR0_BITREGS {
-                                        BYTE CLK_EXT:1;         /* cr0[0:0] */
-
-                                        BYTE RIP:1;     /* cr0[1:1] */
-
-                                        BYTE AR:1;      /* cr0[2:2] */
-
-                                        BYTE AX:1;      /* cr0[3:3] */
-
-                                        BYTE FRR:1;     /* cr0[4:4] */
-
-                                        BYTE FRX:1;     /* cr0[5:5] */
-
-                                        BYTE IM:1;      /* cr0[6:6] */
-
-                                        BYTE TH:1;      /* cr0[7:7] */
-
-                                } bitreg;
-                        } cr0;
-
-                        union   /* SOP - CR1 Register */
-                         {
-                                BYTE reg;
-                                struct _CR1_REGS {
-                                        BYTE RM:1;      /* cr1[0:0] */
-
-                                        BYTE RMR:1;     /* cr1[1:1] */
-
-                                        BYTE No_auto:1;         /* cr1[2:2] */
-
-                                        BYTE Pulse:1;   /* cr1[3:3] */
-
-                                        BYTE P_Tone1:1;         /* cr1[4:4] */
-
-                                        BYTE P_Tone2:1;         /* cr1[5:5] */
-
-                                        BYTE E_Tone1:1;         /* cr1[6:6] */
-
-                                        BYTE E_Tone2:1;         /* cr1[7:7] */
-
-                                } bitreg;
-                        } cr1;
-
-                        union   /* SOP - CR2 Register */
-                         {
-                                BYTE reg;
-                                struct _CR2_REGS {
-                                        BYTE Call_II:1;         /* CR2[0:0] */
-
-                                        BYTE Call_I:1;  /* CR2[1:1] */
-
-                                        BYTE Call_en:1;         /* CR2[2:2] */
-
-                                        BYTE Call_pon:1;        /* CR2[3:3] */
-
-                                        BYTE IDR:1;     /* CR2[4:4] */
-
-                                        BYTE COT_R:3;   /* CR2[5:7] */
-
-                                } bitreg;
-                        } cr2;
-
-                        union   /* SOP - CR3 Register */
-                         {
-                                BYTE reg;
-                                struct _CR3_REGS {
-                                        BYTE DHP_X:1;   /* CR3[0:0] */
-
-                                        BYTE DHP_R:1;   /* CR3[1:1] */
-
-                                        BYTE Cal_pctl:1;        /* CR3[2:2] */
-
-                                        BYTE SEL:1;     /* CR3[3:3] */
-
-                                        BYTE TestLoops:4;       /* CR3[4:7] */
-
-                                } bitreg;
-                        } cr3;
-
-                        union   /* SOP - CR4 Register */
-                         {
-                                BYTE reg;
-                                struct _CR4_REGS {
-                                        BYTE Fsc_en:1;  /* CR4[0:0] */
-
-                                        BYTE Int_en:1;  /* CR4[1:1] */
-
-                                        BYTE AGX:2;     /* CR4[2:3] */
-
-                                        BYTE AGR_R:2;   /* CR4[4:5] */
-
-                                        BYTE AGR_Z:2;   /* CR4[6:7] */
-
-                                } bitreg;
-                        } cr4;
-
-                        union   /* SOP - CR5 Register */
-                         {
-                                BYTE reg;
-                                struct _CR5_REGS {
-                                        BYTE V_0:1;     /* CR5[0:0] */
-
-                                        BYTE V_1:1;     /* CR5[1:1] */
-
-                                        BYTE V_2:1;     /* CR5[2:2] */
-
-                                        BYTE V_3:1;     /* CR5[3:3] */
-
-                                        BYTE V_4:1;     /* CR5[4:4] */
-
-                                        BYTE V_5:1;     /* CR5[5:5] */
-
-                                        BYTE V_6:1;     /* CR5[6:6] */
-
-                                        BYTE V_7:1;     /* CR5[7:7] */
-
-                                } bitreg;
-                        } cr5;
-
-                        union   /* SOP - CR6 Register */
-                         {
-                                BYTE reg;
-                                struct _CR6_REGS {
-                                        BYTE reserved:8;        /* CR6[0:7] */
-
-                                } bitreg;
-                        } cr6;
-
-                        union   /* SOP - CR7 Register */
-                         {
-                                BYTE reg;
-                                struct _CR7_REGS {
-                                        BYTE reserved:8;        /* CR7[0:7] */
-
-                                } bitreg;
-                        } cr7;
-                } SOP;
-
-                BYTE ByteRegs[sizeof(struct _SOP)];
-
-        } SOP_REGS;
-
-        /* DAA_REGS.SOP_REGS.SOP.CR5.reg */
-        /* DAA_REGS.SOP_REGS.SOP.CR5.bitreg */
-        /* DAA_REGS.SOP_REGS.SOP.CR5.bitreg.V_2 */
-        /* DAA_REGS.SOP_REGS.ByteRegs[5] */
-
-        /*----------------------------------------------- */
-        /* XOP Registers */
-        /* */
-        BYTE byXOP;
-
-        union _XOP_REGS {
-                struct _XOP {
-                        union   XOPXR0/* XOP - XR0 Register - Read values */
-                         {
-                                BYTE reg;
-                                struct _XR0_BITREGS {
-                                        BYTE SI_0:1;    /* XR0[0:0] - Read */
-
-                                        BYTE SI_1:1;    /* XR0[1:1] - Read */
-
-                                        BYTE VDD_OK:1;  /* XR0[2:2] - Read */
-
-                                        BYTE Caller_ID:1;       /* XR0[3:3] - Read */
-
-                                        BYTE RING:1;    /* XR0[4:4] - Read */
-
-                                        BYTE Cadence:1;         /* XR0[5:5] - Read */
-
-                                        BYTE Wake_up:1;         /* XR0[6:6] - Read */
-
-                                        BYTE RMR:1;     /* XR0[7:7] - Read */
-
-                                } bitreg;
-                        } xr0;
-
-                        union   /* XOP - XR1 Register */
-                         {
-                                BYTE reg;
-                                struct _XR1_BITREGS {
-                                        BYTE M_SI_0:1;  /* XR1[0:0] */
-
-                                        BYTE M_SI_1:1;  /* XR1[1:1] */
-
-                                        BYTE M_VDD_OK:1;        /* XR1[2:2] */
-
-                                        BYTE M_Caller_ID:1;     /* XR1[3:3] */
-
-                                        BYTE M_RING:1;  /* XR1[4:4] */
-
-                                        BYTE M_Cadence:1;       /* XR1[5:5] */
-
-                                        BYTE M_Wake_up:1;       /* XR1[6:6] */
-
-                                        BYTE unused:1;  /* XR1[7:7] */
-
-                                } bitreg;
-                        } xr1;
-
-                        union   /* XOP - XR2 Register */
-                         {
-                                BYTE reg;
-                                struct _XR2_BITREGS {
-                                        BYTE CTO0:1;    /* XR2[0:0] */
-
-                                        BYTE CTO1:1;    /* XR2[1:1] */
-
-                                        BYTE CTO2:1;    /* XR2[2:2] */
-
-                                        BYTE CTO3:1;    /* XR2[3:3] */
-
-                                        BYTE CTO4:1;    /* XR2[4:4] */
-
-                                        BYTE CTO5:1;    /* XR2[5:5] */
-
-                                        BYTE CTO6:1;    /* XR2[6:6] */
-
-                                        BYTE CTO7:1;    /* XR2[7:7] */
-
-                                } bitreg;
-                        } xr2;
-
-                        union   /* XOP - XR3 Register */
-                         {
-                                BYTE reg;
-                                struct _XR3_BITREGS {
-                                        BYTE DCR0:1;    /* XR3[0:0] */
-
-                                        BYTE DCR1:1;    /* XR3[1:1] */
-
-                                        BYTE DCI:1;     /* XR3[2:2] */
-
-                                        BYTE DCU0:1;    /* XR3[3:3] */
-
-                                        BYTE DCU1:1;    /* XR3[4:4] */
-
-                                        BYTE B_off:1;   /* XR3[5:5] */
-
-                                        BYTE AGB0:1;    /* XR3[6:6] */
-
-                                        BYTE AGB1:1;    /* XR3[7:7] */
-
-                                } bitreg;
-                        } xr3;
-
-                        union   /* XOP - XR4 Register */
-                         {
-                                BYTE reg;
-                                struct _XR4_BITREGS {
-                                        BYTE C_0:1;     /* XR4[0:0] */
-
-                                        BYTE C_1:1;     /* XR4[1:1] */
-
-                                        BYTE C_2:1;     /* XR4[2:2] */
-
-                                        BYTE C_3:1;     /* XR4[3:3] */
-
-                                        BYTE C_4:1;     /* XR4[4:4] */
-
-                                        BYTE C_5:1;     /* XR4[5:5] */
-
-                                        BYTE C_6:1;     /* XR4[6:6] */
-
-                                        BYTE C_7:1;     /* XR4[7:7] */
-
-                                } bitreg;
-                        } xr4;
-
-                        union   /* XOP - XR5 Register */
-                         {
-                                BYTE reg;
-                                struct _XR5_BITREGS {
-                                        BYTE T_0:1;     /* XR5[0:0] */
-
-                                        BYTE T_1:1;     /* XR5[1:1] */
-
-                                        BYTE T_2:1;     /* XR5[2:2] */
-
-                                        BYTE T_3:1;     /* XR5[3:3] */
-
-                                        BYTE T_4:1;     /* XR5[4:4] */
-
-                                        BYTE T_5:1;     /* XR5[5:5] */
-
-                                        BYTE T_6:1;     /* XR5[6:6] */
-
-                                        BYTE T_7:1;     /* XR5[7:7] */
-
-                                } bitreg;
-                        } xr5;
-
-                        union   /* XOP - XR6 Register - Read Values */
-                         {
-                                BYTE reg;
-                                struct _XR6_BITREGS {
-                                        BYTE CPS0:1;    /* XR6[0:0] */
-
-                                        BYTE CPS1:1;    /* XR6[1:1] */
-
-                                        BYTE unused1:2;         /* XR6[2:3] */
-
-                                        BYTE CLK_OFF:1;         /* XR6[4:4] */
-
-                                        BYTE unused2:3;         /* XR6[5:7] */
-
-                                } bitreg;
-                        } xr6;
-
-                        union   /* XOP - XR7 Register */
-                         {
-                                BYTE reg;
-                                struct _XR7_BITREGS {
-                                        BYTE unused1:1;         /* XR7[0:0] */
-
-                                        BYTE Vdd0:1;    /* XR7[1:1] */
-
-                                        BYTE Vdd1:1;    /* XR7[2:2] */
-
-                                        BYTE unused2:5;         /* XR7[3:7] */
-
-                                } bitreg;
-                        } xr7;
-                } XOP;
-
-                BYTE ByteRegs[sizeof(struct _XOP)];
-
-        } XOP_REGS;
-
-        /* DAA_REGS.XOP_REGS.XOP.XR7.reg */
-        /* DAA_REGS.XOP_REGS.XOP.XR7.bitreg */
-        /* DAA_REGS.XOP_REGS.XOP.XR7.bitreg.Vdd0 */
-        /* DAA_REGS.XOP_REGS.ByteRegs[7] */
-
-        /*----------------------------------------------- */
-        /* COP Registers */
-        /* */
-        BYTE byCOP;
-
-        union _COP_REGS {
-                struct _COP {
-                        BYTE THFilterCoeff_1[8];        /* COP - TH Filter Coefficients,      CODE=0, Part 1 */
-
-                        BYTE THFilterCoeff_2[8];        /* COP - TH Filter Coefficients,      CODE=1, Part 2 */
-
-                        BYTE THFilterCoeff_3[8];        /* COP - TH Filter Coefficients,      CODE=2, Part 3 */
-
-                        BYTE RingerImpendance_1[8];     /* COP - Ringer Impendance Coefficients,  CODE=3, Part 1 */
-
-                        BYTE IMFilterCoeff_1[8];        /* COP - IM Filter Coefficients,      CODE=4, Part 1 */
-
-                        BYTE IMFilterCoeff_2[8];        /* COP - IM Filter Coefficients,      CODE=5, Part 2 */
-
-                        BYTE RingerImpendance_2[8];     /* COP - Ringer Impendance Coefficients,  CODE=6, Part 2 */
-
-                        BYTE FRRFilterCoeff[8];         /* COP - FRR Filter Coefficients,      CODE=7 */
-
-                        BYTE FRXFilterCoeff[8];         /* COP - FRX Filter Coefficients,      CODE=8 */
-
-                        BYTE ARFilterCoeff[4];  /* COP - AR Filter Coefficients,      CODE=9 */
-
-                        BYTE AXFilterCoeff[4];  /* COP - AX Filter Coefficients,      CODE=10  */
-
-                        BYTE Tone1Coeff[4];     /* COP - Tone1 Coefficients,        CODE=11 */
-
-                        BYTE Tone2Coeff[4];     /* COP - Tone2 Coefficients,        CODE=12 */
-
-                        BYTE LevelmeteringRinging[4];   /* COP - Levelmetering Ringing,        CODE=13 */
-
-                        BYTE CallerID1stTone[8];        /* COP - Caller ID 1st Tone,        CODE=14 */
-
-                        BYTE CallerID2ndTone[8];        /* COP - Caller ID 2nd Tone,        CODE=15 */
-
-                } COP;
-
-                BYTE ByteRegs[sizeof(struct _COP)];
-
-        } COP_REGS;
-
-        /* DAA_REGS.COP_REGS.COP.XR7.Tone1Coeff[3] */
-        /* DAA_REGS.COP_REGS.COP.XR7.bitreg */
-        /* DAA_REGS.COP_REGS.COP.XR7.bitreg.Vdd0 */
-        /* DAA_REGS.COP_REGS.ByteRegs[57] */
-
-        /*----------------------------------------------- */
-        /* CAO Registers */
-        /* */
-        BYTE byCAO;
-
-        union _CAO_REGS {
-                struct _CAO {
-                        BYTE CallerID[512];     /* CAO - Caller ID Bytes */
-
-                } CAO;
-
-                BYTE ByteRegs[sizeof(struct _CAO)];
-        } CAO_REGS;
-
-        union                   /* XOP - XR0 Register - Write values */
-         {
-                BYTE reg;
-                struct _XR0_BITREGSW {
-                        BYTE SO_0:1;    /* XR1[0:0] - Write */
-
-                        BYTE SO_1:1;    /* XR1[1:1] - Write */
-
-                        BYTE SO_2:1;    /* XR1[2:2] - Write */
-
-                        BYTE unused:5;  /* XR1[3:7] - Write */
-
-                } bitreg;
-        } XOP_xr0_W;
-
-        union                   /* XOP - XR6 Register - Write values */
-         {
-                BYTE reg;
-                struct _XR6_BITREGSW {
-                        BYTE unused1:4;         /* XR6[0:3] */
-
-                        BYTE CLK_OFF:1;         /* XR6[4:4] */
-
-                        BYTE unused2:3;         /* XR6[5:7] */
-
-                } bitreg;
-        } XOP_xr6_W;
-
-} DAA_REGS;
-
-#define ALISDAA_ID_BYTE      0x81
-#define ALISDAA_CALLERID_SIZE  512
-
-/*------------------------------ */
-/* */
-/*  Misc definitions */
-/* */
-
-/* Power Up Operation */
-#define SOP_PU_SLEEP    0
-#define SOP_PU_RINGING    1
-#define SOP_PU_CONVERSATION  2
-#define SOP_PU_PULSEDIALING  3
-#define SOP_PU_RESET    4
-
-#define ALISDAA_CALLERID_SIZE 512
-
-#define PLAYBACK_MODE_COMPRESSED        0       /*        Selects: Compressed modes, TrueSpeech 8.5-4.1, G.723.1, G.722, G.728, G.729 */
-#define PLAYBACK_MODE_TRUESPEECH_V40    0       /*        Selects: TrueSpeech 8.5, 6.3, 5.3, 4.8 or 4.1 Kbps */
-#define PLAYBACK_MODE_TRUESPEECH        8       /*        Selects: TrueSpeech 8.5, 6.3, 5.3, 4.8 or 4.1 Kbps Version 5.1 */
-#define PLAYBACK_MODE_ULAW              2       /*        Selects: 64 Kbit/sec MuA-law PCM */
-#define PLAYBACK_MODE_ALAW              10      /*        Selects: 64 Kbit/sec A-law PCM */
-#define PLAYBACK_MODE_16LINEAR          6       /*        Selects: 128 Kbit/sec 16-bit linear */
-#define PLAYBACK_MODE_8LINEAR           4       /*        Selects: 64 Kbit/sec 8-bit signed linear */
-#define PLAYBACK_MODE_8LINEAR_WSS       5       /*        Selects: 64 Kbit/sec WSS 8-bit unsigned linear */
-
-#define RECORD_MODE_COMPRESSED          0       /*        Selects: Compressed modes, TrueSpeech 8.5-4.1, G.723.1, G.722, G.728, G.729 */
-#define RECORD_MODE_TRUESPEECH          0       /*        Selects: TrueSpeech 8.5, 6.3, 5.3, 4.8 or 4.1 Kbps */
-#define RECORD_MODE_ULAW                4       /*        Selects: 64 Kbit/sec Mu-law PCM */
-#define RECORD_MODE_ALAW                12      /*        Selects: 64 Kbit/sec A-law PCM */
-#define RECORD_MODE_16LINEAR            5       /*        Selects: 128 Kbit/sec 16-bit linear */
-#define RECORD_MODE_8LINEAR             6       /*        Selects: 64 Kbit/sec 8-bit signed linear */
-#define RECORD_MODE_8LINEAR_WSS         7       /*        Selects: 64 Kbit/sec WSS 8-bit unsigned linear */
-
-enum SLIC_STATES {
-        PLD_SLIC_STATE_OC = 0,
-        PLD_SLIC_STATE_RINGING,
-        PLD_SLIC_STATE_ACTIVE,
-        PLD_SLIC_STATE_OHT,
-        PLD_SLIC_STATE_TIPOPEN,
-        PLD_SLIC_STATE_STANDBY,
-        PLD_SLIC_STATE_APR,
-        PLD_SLIC_STATE_OHTPR
-};
-
-enum SCI_CONTROL {
-        SCI_End = 0,
-        SCI_Enable_DAA,
-        SCI_Enable_Mixer,
-        SCI_Enable_EEPROM
-};
-
-enum Mode {
-        T63, T53, T48, T40
-};
-enum Dir {
-        V3_TO_V4, V4_TO_V3, V4_TO_V5, V5_TO_V4
-};
-
-typedef struct Proc_Info_Tag {
-        enum Mode convert_mode;
-        enum Dir convert_dir;
-        int Prev_Frame_Type;
-        int Current_Frame_Type;
-} Proc_Info_Type;
-
-enum PREVAL {
-        NORMAL = 0,
-        NOPOST,
-        POSTONLY,
-        PREERROR
-};
-
-enum IXJ_EXTENSIONS {
-        G729LOADER = 0,
-        TS85LOADER,
-        PRE_READ,
-        POST_READ,
-        PRE_WRITE,
-        POST_WRITE,
-        PRE_IOCTL,
-        POST_IOCTL
-};
-
-typedef struct {
-        char enable;
-        char en_filter;
-        unsigned int filter;
-        unsigned int state;     /* State 0 when cadence has not started. */
-
-        unsigned int on1;       /* State 1 */
-
-        unsigned long on1min;   /* State 1 - 10% + jiffies */
-        unsigned long on1dot;   /* State 1 + jiffies */
-
-        unsigned long on1max;   /* State 1 + 10% + jiffies */
-
-        unsigned int off1;      /* State 2 */
-
-        unsigned long off1min;
-        unsigned long off1dot;  /* State 2 + jiffies */
-        unsigned long off1max;
-        unsigned int on2;       /* State 3 */
-
-        unsigned long on2min;
-        unsigned long on2dot;
-        unsigned long on2max;
-        unsigned int off2;      /* State 4 */
-
-        unsigned long off2min;
-        unsigned long off2dot;  /* State 4 + jiffies */
-        unsigned long off2max;
-        unsigned int on3;       /* State 5 */
-
-        unsigned long on3min;
-        unsigned long on3dot;
-        unsigned long on3max;
-        unsigned int off3;      /* State 6 */
-
-        unsigned long off3min;
-        unsigned long off3dot;  /* State 6 + jiffies */
-        unsigned long off3max;
-} IXJ_CADENCE_F;
-
-typedef struct {
-        unsigned int busytone:1;
-        unsigned int dialtone:1;
-        unsigned int ringback:1;
-        unsigned int ringing:1;
-        unsigned int playing:1;
-        unsigned int recording:1;
-        unsigned int cringing:1;
-        unsigned int play_first_frame:1;
-        unsigned int pstn_present:1;
-        unsigned int pstn_ringing:1;
-        unsigned int pots_correct:1;
-        unsigned int pots_pstn:1;
-        unsigned int g729_loaded:1;
-        unsigned int ts85_loaded:1;
-        unsigned int dtmf_oob:1;        /* DTMF Out-Of-Band */
-
-        unsigned int pcmciascp:1;       /* SmartCABLE Present */
-
-        unsigned int pcmciasct:2;       /* SmartCABLE Type */
-
-        unsigned int pcmciastate:3;     /* SmartCABLE Init State */
-
-        unsigned int inwrite:1; /* Currently writing */
-
-        unsigned int inread:1;  /* Currently reading */
-
-        unsigned int incheck:1; /* Currently checking the SmartCABLE */
-
-        unsigned int cidplay:1; /* Currently playing Caller ID */
-
-        unsigned int cidring:1; /* This is the ring for Caller ID */
-
-        unsigned int cidsent:1; /* Caller ID has been sent */
-
-        unsigned int cidcw_ack:1; /* Caller ID CW ACK (from CPE) */
-        unsigned int firstring:1; /* First ring cadence is complete */
-        unsigned int pstncheck:1;       /* Currently checking the PSTN Line */
-        unsigned int pstn_rmr:1;
-        unsigned int x:3;       /* unused bits */
-
-} IXJ_FLAGS;
-
-/******************************************************************************
-*
-*  This structure holds the state of all of the Quicknet cards
-*
-******************************************************************************/
-
-typedef struct {
-        int elements_used;
-        IXJ_CADENCE_TERM termination;
-        IXJ_CADENCE_ELEMENT *ce;
-} ixj_cadence;
-
-typedef struct {
-        struct phone_device p;
-        struct timer_list timer;
-        unsigned int board;
-        unsigned int DSPbase;
-        unsigned int XILINXbase;
-        unsigned int serial;
-        atomic_t DSPWrite;
-        struct phone_capability caplist[30];
-        unsigned int caps;
-        struct pnp_dev *dev;
-        unsigned int cardtype;
-        unsigned int rec_codec;
-        unsigned int cid_rec_codec;
-        unsigned int cid_rec_volume;
-        unsigned char cid_rec_flag;
-        signed char rec_mode;
-        unsigned int play_codec;
-        unsigned int cid_play_codec;
-        unsigned int cid_play_volume;
-        unsigned char cid_play_flag;
-        signed char play_mode;
-        IXJ_FLAGS flags;
-        unsigned long busyflags;
-        unsigned int rec_frame_size;
-        unsigned int play_frame_size;
-        unsigned int cid_play_frame_size;
-        unsigned int cid_base_frame_size;
-        unsigned long cidcw_wait;
-        int aec_level;
-        int cid_play_aec_level;
-        int readers, writers;
-        wait_queue_head_t poll_q;
-        wait_queue_head_t read_q;
-        char *read_buffer, *read_buffer_end;
-        char *read_convert_buffer;
-        size_t read_buffer_size;
-        unsigned int read_buffer_ready;
-        wait_queue_head_t write_q;
-        char *write_buffer, *write_buffer_end;
-        char *write_convert_buffer;
-        size_t write_buffer_size;
-        unsigned int write_buffers_empty;
-        unsigned long drybuffer;
-        char *write_buffer_rp, *write_buffer_wp;
-        char dtmfbuffer[80];
-        char dtmf_current;
-        int dtmf_wp, dtmf_rp, dtmf_state, dtmf_proc;
-        int tone_off_time, tone_on_time;
-        struct fasync_struct *async_queue;
-        unsigned long tone_start_jif;
-        char tone_index;
-        char tone_state;
-        char maxrings;
-        ixj_cadence *cadence_t;
-        ixj_cadence *cadence_r;
-        int tone_cadence_state;
-        IXJ_CADENCE_F cadence_f[6];
-        DTMF dtmf;
-        CPTF cptf;
-        BYTES dsp;
-        BYTES ver;
-        BYTES scr;
-        BYTES ssr;
-        BYTES baseframe;
-        HSR hsr;
-        GPIO gpio;
-        PLD_SCRR pld_scrr;
-        PLD_SCRW pld_scrw;
-        PLD_SLICW pld_slicw;
-        PLD_SLICR pld_slicr;
-        PLD_CLOCK pld_clock;
-        PCMCIA_CR1 pccr1;
-        PCMCIA_CR2 pccr2;
-        PCMCIA_SCCR psccr;
-        PCMCIA_SLIC pslic;
-        char pscdd;
-        Si3C1 sic1;
-        Si3C2 sic2;
-        Si3RXG sirxg;
-        Si3ADC siadc;
-        Si3DAC sidac;
-        Si3STAT sistat;
-        Si3AATT siaatt;
-        MIX mix;
-        unsigned short ring_cadence;
-        int ring_cadence_t;
-        unsigned long ring_cadence_jif;
-        unsigned long checkwait;
-        int intercom;
-        int m_hook;
-        int r_hook;
-        int p_hook;
-        char pstn_envelope;
-        char pstn_cid_intr;
-        unsigned char fskz;
-        unsigned char fskphase;
-        unsigned char fskcnt;
-        unsigned int cidsize;
-        unsigned int cidcnt;
-        unsigned long pstn_cid_received;
-        PHONE_CID cid;
-        PHONE_CID cid_send;
-        unsigned long pstn_ring_int;
-        unsigned long pstn_ring_start;
-        unsigned long pstn_ring_stop;
-        unsigned long pstn_winkstart;
-        unsigned long pstn_last_rmr;
-        unsigned long pstn_prev_rmr;
-        unsigned long pots_winkstart;
-        unsigned int winktime;
-        unsigned long flash_end;
-        char port;
-        char hookstate;
-        union telephony_exception ex;
-        union telephony_exception ex_sig;
-        int ixj_signals[35];
-        IXJ_SIGDEF sigdef;
-        char daa_mode;
-        char daa_country;
-        unsigned long pstn_sleeptil;
-        DAA_REGS m_DAAShadowRegs;
-        Proc_Info_Type Info_read;
-        Proc_Info_Type Info_write;
-        unsigned short frame_count;
-        unsigned int filter_hist[4];
-        unsigned char filter_en[6];
-        unsigned short proc_load;
-        unsigned long framesread;
-        unsigned long frameswritten;
-        unsigned long read_wait;
-        unsigned long write_wait;
-        unsigned long timerchecks;
-        unsigned long txreadycheck;
-        unsigned long rxreadycheck;
-        unsigned long statuswait;
-        unsigned long statuswaitfail;
-        unsigned long pcontrolwait;
-        unsigned long pcontrolwaitfail;
-        unsigned long iscontrolready;
-        unsigned long iscontrolreadyfail;
-        unsigned long pstnstatecheck;
-#ifdef IXJ_DYN_ALLOC
-        short *fskdata;
-#else
-        short fskdata[8000];
-#endif
-        int fsksize;
-        int fskdcnt;
-} IXJ;
-
-typedef int (*IXJ_REGFUNC) (IXJ * j, unsigned long arg);
-
-extern IXJ *ixj_pcmcia_probe(unsigned long, unsigned long);
-
diff --git a/drivers/staging/telephony/ixj_pcmcia.c b/drivers/staging/telephony/ixj_pcmcia.c
deleted file mode 100644
index 05032e2cc954..000000000000
--- a/drivers/staging/telephony/ixj_pcmcia.c
+++ /dev/null
@@ -1,187 +0,0 @@
-#include "ixj-ver.h"
-
-#include <linux/module.h>
-
-#include <linux/init.h>
-#include <linux/kernel.h>       /* printk() */
-#include <linux/fs.h>           /* everything... */
-#include <linux/errno.h>        /* error codes */
-#include <linux/slab.h>
-
-#include <pcmcia/cistpl.h>
-#include <pcmcia/ds.h>
-
-#include "ixj.h"
-
-/*
- *      PCMCIA service support for Quicknet cards
- */
- 
-
-typedef struct ixj_info_t {
-        int ndev;
-        struct ixj *port;
-} ixj_info_t;
-
-static void ixj_detach(struct pcmcia_device *p_dev);
-static int ixj_config(struct pcmcia_device * link);
-static void ixj_cs_release(struct pcmcia_device * link);
-
-static int ixj_probe(struct pcmcia_device *p_dev)
-{
-        dev_dbg(&p_dev->dev, "ixj_attach()\n");
-        /* Create new ixj device */
-        p_dev->priv = kzalloc(sizeof(struct ixj_info_t), GFP_KERNEL);
-        if (!p_dev->priv) {
-                return -ENOMEM;
-        }
-
-        return ixj_config(p_dev);
-}
-
-static void ixj_detach(struct pcmcia_device *link)
-{
-        dev_dbg(&link->dev, "ixj_detach\n");
-
-        ixj_cs_release(link);
-
-        kfree(link->priv);
-}
-
-static void ixj_get_serial(struct pcmcia_device * link, IXJ * j)
-{
-        char *str;
-        int i, place;
-        dev_dbg(&link->dev, "ixj_get_serial\n");
-
-        str = link->prod_id[0];
-        if (!str)
-                goto failed;
-        printk("%s", str);
-        str = link->prod_id[1];
-        if (!str)
-                goto failed;
-        printk(" %s", str);
-        str = link->prod_id[2];
-        if (!str)
-                goto failed;
-        place = 1;
-        for (i = strlen(str) - 1; i >= 0; i--) {
-                switch (str[i]) {
-                case '0':
-                case '1':
-                case '2':
-                case '3':
-                case '4':
-                case '5':
-                case '6':
-                case '7':
-                case '8':
-                case '9':
-                        j->serial += (str[i] - 48) * place;
-                        break;
-                case 'A':
-                case 'B':
-                case 'C':
-                case 'D':
-                case 'E':
-                case 'F':
-                        j->serial += (str[i] - 55) * place;
-                        break;
-                case 'a':
-                case 'b':
-                case 'c':
-                case 'd':
-                case 'e':
-                case 'f':
-                        j->serial += (str[i] - 87) * place;
-                        break;
-                }
-                place = place * 0x10;
-        }
-        str = link->prod_id[3];
-        if (!str)
-                goto failed;
-        printk(" version %s\n", str);
-failed:
-        return;
-}
-
-static int ixj_config_check(struct pcmcia_device *p_dev, void *priv_data)
-{
-        p_dev->resource[0]->flags &= ~IO_DATA_PATH_WIDTH;
-        p_dev->resource[0]->flags |= IO_DATA_PATH_WIDTH_8;
-        p_dev->resource[1]->flags &= ~IO_DATA_PATH_WIDTH;
-        p_dev->resource[1]->flags |= IO_DATA_PATH_WIDTH_8;
-        p_dev->io_lines = 3;
-
-        return pcmcia_request_io(p_dev);
-}
-
-static int ixj_config(struct pcmcia_device * link)
-{
-        IXJ *j;
-        ixj_info_t *info;
-
-        info = link->priv;
-        dev_dbg(&link->dev, "ixj_config\n");
-
-        link->config_flags = CONF_AUTO_SET_IO;
-
-        if (pcmcia_loop_config(link, ixj_config_check, NULL))
-                goto failed;
-
-        if (pcmcia_enable_device(link))
-                goto failed;
-
-        /*
-         *      Register the card with the core.
-         */
-        j = ixj_pcmcia_probe(link->resource[0]->start,
-                             link->resource[0]->start + 0x10);
-
-        info->ndev = 1;
-        ixj_get_serial(link, j);
-        return 0;
-
-failed:
-        ixj_cs_release(link);
-        return -ENODEV;
-}
-
-static void ixj_cs_release(struct pcmcia_device *link)
-{
-        ixj_info_t *info = link->priv;
-        dev_dbg(&link->dev, "ixj_cs_release\n");
-        info->ndev = 0;
-        pcmcia_disable_device(link);
-}
-
-static const struct pcmcia_device_id ixj_ids[] = {
-        PCMCIA_DEVICE_MANF_CARD(0x0257, 0x0600),
-        PCMCIA_DEVICE_NULL
-};
-MODULE_DEVICE_TABLE(pcmcia, ixj_ids);
-
-static struct pcmcia_driver ixj_driver = {
-        .owner          = THIS_MODULE,
-        .name           = "ixj_cs",
-        .probe          = ixj_probe,
-        .remove         = ixj_detach,
-        .id_table       = ixj_ids,
-};
-
-static int __init ixj_pcmcia_init(void)
-{
-        return pcmcia_register_driver(&ixj_driver);
-}
-
-static void ixj_pcmcia_exit(void)
-{
-        pcmcia_unregister_driver(&ixj_driver);
-}
-
-module_init(ixj_pcmcia_init);
-module_exit(ixj_pcmcia_exit);
-
-MODULE_LICENSE("GPL");
diff --git a/drivers/staging/telephony/phonedev.c b/drivers/staging/telephony/phonedev.c
deleted file mode 100644
index 1dd0b6717ccc..000000000000
--- a/drivers/staging/telephony/phonedev.c
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- *            Telephony registration for Linux
- *
- *              (c) Copyright 1999 Red Hat Software Inc.
- *
- *              This program is free software; you can redistribute it and/or
- *              modify it under the terms of the GNU General Public License
- *              as published by the Free Software Foundation; either version
- *              2 of the License, or (at your option) any later version.
- *
- * Author:      Alan Cox, <alan@lxorguk.ukuu.org.uk>
- *
- * Fixes:       Mar 01 2000 Thomas Sparr, <thomas.l.sparr@telia.com>
- *              phone_register_device now works with unit!=PHONE_UNIT_ANY
- */
-
-#include <linux/module.h>
-#include <linux/types.h>
-#include <linux/kernel.h>
-#include <linux/fs.h>
-#include <linux/mm.h>
-#include <linux/string.h>
-#include <linux/errno.h>
-#include <linux/phonedev.h>
-#include <linux/init.h>
-#include <asm/uaccess.h>
-
-#include <linux/kmod.h>
-#include <linux/sem.h>
-#include <linux/mutex.h>
-
-#define PHONE_NUM_DEVICES       256
-
-/*
- *    Active devices 
- */
-
-static struct phone_device *phone_device[PHONE_NUM_DEVICES];
-static DEFINE_MUTEX(phone_lock);
-
-/*
- *    Open a phone device.
- */
-
-static int phone_open(struct inode *inode, struct file *file)
-{
-        unsigned int minor = iminor(inode);
-        int err = 0;
-        struct phone_device *p;
-        const struct file_operations *old_fops, *new_fops = NULL;
-
-        if (minor >= PHONE_NUM_DEVICES)
-                return -ENODEV;
-
-        mutex_lock(&phone_lock);
-        p = phone_device[minor];
-        if (p)
-                new_fops = fops_get(p->f_op);
-        if (!new_fops) {
-                mutex_unlock(&phone_lock);
-                request_module("char-major-%d-%d", PHONE_MAJOR, minor);
-                mutex_lock(&phone_lock);
-                p = phone_device[minor];
-                if (p == NULL || (new_fops = fops_get(p->f_op)) == NULL)
-                {
-                        err=-ENODEV;
-                        goto end;
-                }
-        }
-        old_fops = file->f_op;
-        file->f_op = new_fops;
-        if (p->open)
-                err = p->open(p, file); /* Tell the device it is open */
-        if (err) {
-                fops_put(file->f_op);
-                file->f_op = fops_get(old_fops);
-        }
-        fops_put(old_fops);
-end:
-        mutex_unlock(&phone_lock);
-        return err;
-}
-
-/*
- *    Telephony For Linux device drivers request registration here.
- */
-
-int phone_register_device(struct phone_device *p, int unit)
-{
-        int base;
-        int end;
-        int i;
-
-        base = 0;
-        end = PHONE_NUM_DEVICES - 1;
-
-        if (unit != PHONE_UNIT_ANY) {
-                base = unit;
-                end = unit + 1;  /* enter the loop at least one time */
-        }
-        
-        mutex_lock(&phone_lock);
-        for (i = base; i < end; i++) {
-                if (phone_device[i] == NULL) {
-                        phone_device[i] = p;
-                        p->minor = i;
-                        mutex_unlock(&phone_lock);
-                        return 0;
-                }
-        }
-        mutex_unlock(&phone_lock);
-        return -ENFILE;
-}
-
-/*
- *    Unregister an unused Telephony for linux device
- */
-
-void phone_unregister_device(struct phone_device *pfd)
-{
-        mutex_lock(&phone_lock);
-        if (likely(phone_device[pfd->minor] == pfd))
-                phone_device[pfd->minor] = NULL;
-        mutex_unlock(&phone_lock);
-}
-
-
-static const struct file_operations phone_fops =
-{
-        .owner          = THIS_MODULE,
-        .open           = phone_open,
-        .llseek         = noop_llseek,
-};
-
-/*
- *      Board init functions
- */
- 
-
-/*
- *    Initialise Telephony for linux
- */
-
-static int __init telephony_init(void)
-{
-        printk(KERN_INFO "Linux telephony interface: v1.00\n");
-        if (register_chrdev(PHONE_MAJOR, "telephony", &phone_fops)) {
-                printk("phonedev: unable to get major %d\n", PHONE_MAJOR);
-                return -EIO;
-        }
-
-        return 0;
-}
-
-static void __exit telephony_exit(void)
-{
-        unregister_chrdev(PHONE_MAJOR, "telephony");
-}
-
-module_init(telephony_init);
-module_exit(telephony_exit);
-
-MODULE_LICENSE("GPL");
-
-EXPORT_SYMBOL(phone_register_device);
-EXPORT_SYMBOL(phone_unregister_device);
diff --git a/drivers/staging/tidspbridge/dynload/dload_internal.h b/drivers/staging/tidspbridge/dynload/dload_internal.h
index 7b77573fba53..b9d079b96190 100644
--- a/drivers/staging/tidspbridge/dynload/dload_internal.h
+++ b/drivers/staging/tidspbridge/dynload/dload_internal.h
@@ -313,14 +313,14 @@ extern uint32_t dload_reverse_checksum16(void *data, unsigned siz);
 /*
  * exported by reloc.c
  */
-extern void dload_relocate(struct dload_state *dlthis, tgt_au_t * data,
-                           struct reloc_record_t *rp, bool * tramps_generated,
+extern void dload_relocate(struct dload_state *dlthis, tgt_au_t *data,
+                           struct reloc_record_t *rp, bool *tramps_generated,
                            bool second_pass);
 
-extern rvalue dload_unpack(struct dload_state *dlthis, tgt_au_t * data,
+extern rvalue dload_unpack(struct dload_state *dlthis, tgt_au_t *data,
                            int fieldsz, int offset, unsigned sgn);
 
-extern int dload_repack(struct dload_state *dlthis, rvalue val, tgt_au_t * data,
+extern int dload_repack(struct dload_state *dlthis, rvalue val, tgt_au_t *data,
                         int fieldsz, int offset, unsigned sgn);
 
 /*
diff --git a/drivers/staging/tidspbridge/dynload/reloc.c b/drivers/staging/tidspbridge/dynload/reloc.c
index 7b28c07ed7c5..463abdb6392f 100644
--- a/drivers/staging/tidspbridge/dynload/reloc.c
+++ b/drivers/staging/tidspbridge/dynload/reloc.c
@@ -45,7 +45,7 @@ static const char bsssymbol[] = { ".bss" };
  * Effect:
  *      Extracts the specified field and returns it.
  ************************************************************************* */
-rvalue dload_unpack(struct dload_state *dlthis, tgt_au_t * data, int fieldsz,
+rvalue dload_unpack(struct dload_state *dlthis, tgt_au_t *data, int fieldsz,
                     int offset, unsigned sgn)
 {
         register rvalue objval;
@@ -98,7 +98,7 @@ rvalue dload_unpack(struct dload_state *dlthis, tgt_au_t * data, int fieldsz,
  ************************************************************************* */
 static const unsigned char ovf_limit[] = { 1, 2, 2 };
 
-int dload_repack(struct dload_state *dlthis, rvalue val, tgt_au_t * data,
+int dload_repack(struct dload_state *dlthis, rvalue val, tgt_au_t *data,
                  int fieldsz, int offset, unsigned sgn)
 {
         register urvalue objval, mask;
@@ -161,7 +161,7 @@ static const u8 c60_scale[SCALE_MASK + 1] = {
  * Effect:
  *      Performs the specified relocation operation
  ************************************************************************* */
-void dload_relocate(struct dload_state *dlthis, tgt_au_t * data,
+void dload_relocate(struct dload_state *dlthis, tgt_au_t *data,
                     struct reloc_record_t *rp, bool *tramps_generated,
                     bool second_pass)
 {
diff --git a/drivers/staging/tidspbridge/rmgr/drv_interface.c b/drivers/staging/tidspbridge/rmgr/drv_interface.c
index 701a11ac676d..e6f31d817d6b 100644
--- a/drivers/staging/tidspbridge/rmgr/drv_interface.c
+++ b/drivers/staging/tidspbridge/rmgr/drv_interface.c
@@ -471,7 +471,7 @@ err1:
         return err;
 }
 
-static int __devinit omap34_xx_bridge_probe(struct platform_device *pdev)
+static int omap34_xx_bridge_probe(struct platform_device *pdev)
 {
         int err;
         dev_t dev = 0;
@@ -527,7 +527,7 @@ err1:
         return err;
 }
 
-static int __devexit omap34_xx_bridge_remove(struct platform_device *pdev)
+static int omap34_xx_bridge_remove(struct platform_device *pdev)
 {
         dev_t devno;
         int status = 0;
@@ -606,7 +606,7 @@ static struct platform_driver bridge_driver = {
                    .name = "omap-dsp",
                    },
         .probe = omap34_xx_bridge_probe,
-        .remove = __devexit_p(omap34_xx_bridge_remove),
+        .remove = omap34_xx_bridge_remove,
 #ifdef CONFIG_PM
         .suspend = bridge_suspend,
         .resume = bridge_resume,
diff --git a/drivers/staging/usbip/stub_dev.c b/drivers/staging/usbip/stub_dev.c
index c8d79a7f0e0e..ee36415eb26d 100644
--- a/drivers/staging/usbip/stub_dev.c
+++ b/drivers/staging/usbip/stub_dev.c
@@ -18,6 +18,7 @@
  */
 
 #include <linux/device.h>
+#include <linux/file.h>
 #include <linux/kthread.h>
 #include <linux/module.h>
 
@@ -203,7 +204,7 @@ static void stub_shutdown_connection(struct usbip_device *ud)
          * not touch NULL socket.
          */
         if (ud->tcp_socket) {
-                sock_release(ud->tcp_socket);
+                fput(ud->tcp_socket->file);
                 ud->tcp_socket = NULL;
         }
 
@@ -432,6 +433,8 @@ static int stub_probe(struct usb_interface *interface,
                 dev_err(&interface->dev, "stub_add_files for %s\n", udev_busid);
                 usb_set_intfdata(interface, NULL);
                 usb_put_intf(interface);
+                usb_put_dev(udev);
+                kthread_stop_put(sdev->ud.eh);
 
                 busid_priv->interf_count = 0;
                 busid_priv->sdev = NULL;
@@ -477,19 +480,17 @@ static void stub_disconnect(struct usb_interface *interface)
         /* get stub_device */
         if (!sdev) {
                 dev_err(&interface->dev, "could not get device");
-                /* BUG(); */
                 return;
         }
 
         usb_set_intfdata(interface, NULL);
 
         /*
-         * NOTE:
-         * rx/tx threads are invoked for each usb_device.
+         * NOTE: rx/tx threads are invoked for each usb_device.
          */
         stub_remove_files(&interface->dev);
 
-        /*If usb reset called from event handler*/
+        /* If usb reset is called from event handler */
         if (busid_priv->sdev->ud.eh == current) {
                 busid_priv->interf_count--;
                 return;
@@ -504,13 +505,13 @@ static void stub_disconnect(struct usb_interface *interface)
 
         busid_priv->interf_count = 0;
 
-        /* 1. shutdown the current connection */
+        /* shutdown the current connection */
         shutdown_busid(busid_priv);
 
         usb_put_dev(sdev->udev);
         usb_put_intf(interface);
 
-        /* 3. free sdev */
+        /* free sdev */
         busid_priv->sdev = NULL;
         stub_device_free(sdev);
 
diff --git a/drivers/staging/usbip/stub_rx.c b/drivers/staging/usbip/stub_rx.c
index 694cfd7596f3..0572a15242b5 100644
--- a/drivers/staging/usbip/stub_rx.c
+++ b/drivers/staging/usbip/stub_rx.c
@@ -164,7 +164,6 @@ static int tweak_set_configuration_cmd(struct urb *urb)
                  config, dev_name(&urb->dev->dev));
 
         return 0;
-        /* return usb_driver_set_configuration(urb->dev, config); */
 }
 
 static int tweak_reset_device_cmd(struct urb *urb)
@@ -480,7 +479,7 @@ static void stub_recv_cmd_submit(struct stub_device *sdev,
                 return;
         }
 
-        /* set priv->urb->transfer_buffer */
+        /* allocate urb transfer buffer, if needed */
         if (pdu->u.cmd_submit.transfer_buffer_length > 0) {
                 priv->urb->transfer_buffer =
                         kzalloc(pdu->u.cmd_submit.transfer_buffer_length,
@@ -492,7 +491,7 @@ static void stub_recv_cmd_submit(struct stub_device *sdev,
                 }
         }
 
-        /* set priv->urb->setup_packet */
+        /* copy urb setup packet */
         priv->urb->setup_packet = kmemdup(&pdu->u.cmd_submit.setup, 8,
                                           GFP_KERNEL);
         if (!priv->urb->setup_packet) {
diff --git a/drivers/staging/usbip/stub_tx.c b/drivers/staging/usbip/stub_tx.c
index 023fda305be2..513961fef055 100644
--- a/drivers/staging/usbip/stub_tx.c
+++ b/drivers/staging/usbip/stub_tx.c
@@ -166,7 +166,7 @@ static int stub_send_ret_submit(struct stub_device *sdev)
                 int ret;
                 struct urb *urb = priv->urb;
                 struct usbip_header pdu_header;
-                void *iso_buffer = NULL;
+                struct usbip_iso_packet_descriptor *iso_buffer = NULL;
                 struct kvec *iov = NULL;
                 int iovnum = 0;
 
@@ -192,7 +192,6 @@ static int stub_send_ret_submit(struct stub_device *sdev)
                 setup_ret_submit_pdu(&pdu_header, urb);
                 usbip_dbg_stub_tx("setup txdata seqnum: %d urb: %p\n",
                                   pdu_header.base.seqnum, urb);
-                /*usbip_dump_header(pdu_header);*/
                 usbip_header_correct_endian(&pdu_header, 1);
 
                 iov[iovnum].iov_base = &pdu_header;
diff --git a/drivers/staging/usbip/usbip_common.c b/drivers/staging/usbip/usbip_common.c
index 57f11f9cd8a5..75189feac380 100644
--- a/drivers/staging/usbip/usbip_common.c
+++ b/drivers/staging/usbip/usbip_common.c
@@ -413,8 +413,10 @@ struct socket *sockfd_to_socket(unsigned int sockfd)
 
         inode = file->f_dentry->d_inode;
 
-        if (!inode || !S_ISSOCK(inode->i_mode))
+        if (!inode || !S_ISSOCK(inode->i_mode)) {
+                fput(file);
                 return NULL;
+        }
 
         socket = SOCKET_I(inode);
 
@@ -439,7 +441,6 @@ static void usbip_pack_cmd_submit(struct usbip_header *pdu, struct urb *urb,
          * will be discussed when usbip is ported to other operating systems.
          */
         if (pack) {
-                /* vhci_tx.c */
                 spdu->transfer_flags =
                         tweak_transfer_flags(urb->transfer_flags);
                 spdu->transfer_buffer_length    = urb->transfer_buffer_length;
@@ -447,9 +448,7 @@ static void usbip_pack_cmd_submit(struct usbip_header *pdu, struct urb *urb,
                 spdu->number_of_packets         = urb->number_of_packets;
                 spdu->interval                  = urb->interval;
         } else  {
-                /* stub_rx.c */
                 urb->transfer_flags         = spdu->transfer_flags;
-
                 urb->transfer_buffer_length = spdu->transfer_buffer_length;
                 urb->start_frame            = spdu->start_frame;
                 urb->number_of_packets      = spdu->number_of_packets;
@@ -463,16 +462,12 @@ static void usbip_pack_ret_submit(struct usbip_header *pdu, struct urb *urb,
         struct usbip_header_ret_submit *rpdu = &pdu->u.ret_submit;
 
         if (pack) {
-                /* stub_tx.c */
-
                 rpdu->status            = urb->status;
                 rpdu->actual_length     = urb->actual_length;
                 rpdu->start_frame       = urb->start_frame;
                 rpdu->number_of_packets = urb->number_of_packets;
                 rpdu->error_count       = urb->error_count;
         } else {
-                /* vhci_rx.c */
-
                 urb->status             = rpdu->status;
                 urb->actual_length      = rpdu->actual_length;
                 urb->start_frame        = rpdu->start_frame;
@@ -639,28 +634,26 @@ static void usbip_pack_iso(struct usbip_iso_packet_descriptor *iso,
 }
 
 /* must free buffer */
-void *usbip_alloc_iso_desc_pdu(struct urb *urb, ssize_t *bufflen)
+struct usbip_iso_packet_descriptor*
+usbip_alloc_iso_desc_pdu(struct urb *urb, ssize_t *bufflen)
 {
-        void *buff;
         struct usbip_iso_packet_descriptor *iso;
         int np = urb->number_of_packets;
         ssize_t size = np * sizeof(*iso);
         int i;
 
-        buff = kzalloc(size, GFP_KERNEL);
-        if (!buff)
+        iso = kzalloc(size, GFP_KERNEL);
+        if (!iso)
                 return NULL;
 
         for (i = 0; i < np; i++) {
-                iso = buff + (i * sizeof(*iso));
-
-                usbip_pack_iso(iso, &urb->iso_frame_desc[i], 1);
-                usbip_iso_packet_correct_endian(iso, 1);
+                usbip_pack_iso(&iso[i], &urb->iso_frame_desc[i], 1);
+                usbip_iso_packet_correct_endian(&iso[i], 1);
         }
 
         *bufflen = size;
 
-        return buff;
+        return iso;
 }
 EXPORT_SYMBOL_GPL(usbip_alloc_iso_desc_pdu);
 
@@ -680,8 +673,6 @@ int usbip_recv_iso(struct usbip_device *ud, struct urb *urb)
 
         /* my Bluetooth dongle gets ISO URBs which are np = 0 */
         if (np == 0) {
-                /* pr_info("iso np == 0\n"); */
-                /* usbip_dump_urb(urb); */
                 return 0;
         }
 
@@ -703,11 +694,10 @@ int usbip_recv_iso(struct usbip_device *ud, struct urb *urb)
                 return -EPIPE;
         }
 
+        iso = (struct usbip_iso_packet_descriptor *) buff;
         for (i = 0; i < np; i++) {
-                iso = buff + (i * sizeof(*iso));
-
-                usbip_iso_packet_correct_endian(iso, 0);
-                usbip_pack_iso(iso, &urb->iso_frame_desc[i], 0);
+                usbip_iso_packet_correct_endian(&iso[i], 0);
+                usbip_pack_iso(&iso[i], &urb->iso_frame_desc[i], 0);
                 total_length += urb->iso_frame_desc[i].actual_length;
         }
 
@@ -754,7 +744,7 @@ void usbip_pad_iso(struct usbip_device *ud, struct urb *urb)
         /*
          * if actual_length is transfer_buffer_length then no padding is
          * present.
-        */
+         */
         if (urb->actual_length == urb->transfer_buffer_length)
                 return;
 
@@ -778,14 +768,12 @@ int usbip_recv_xbuff(struct usbip_device *ud, struct urb *urb)
         int size;
 
         if (ud->side == USBIP_STUB) {
-                /* stub_rx.c */
                 /* the direction of urb must be OUT. */
                 if (usb_pipein(urb->pipe))
                         return 0;
 
                 size = urb->transfer_buffer_length;
         } else {
-                /* vhci_rx.c */
                 /* the direction of urb must be IN. */
                 if (usb_pipeout(urb->pipe))
                         return 0;
diff --git a/drivers/staging/usbip/usbip_common.h b/drivers/staging/usbip/usbip_common.h
index 5d89c0fd6f7b..7e6c5436d972 100644
--- a/drivers/staging/usbip/usbip_common.h
+++ b/drivers/staging/usbip/usbip_common.h
@@ -320,7 +320,9 @@ void usbip_pack_pdu(struct usbip_header *pdu, struct urb *urb, int cmd,
                     int pack);
 void usbip_header_correct_endian(struct usbip_header *pdu, int send);
 
-void *usbip_alloc_iso_desc_pdu(struct urb *urb, ssize_t *bufflen);
+struct usbip_iso_packet_descriptor*
+usbip_alloc_iso_desc_pdu(struct urb *urb, ssize_t *bufflen);
+
 /* some members of urb must be substituted before. */
 int usbip_recv_iso(struct usbip_device *ud, struct urb *urb);
 void usbip_pad_iso(struct usbip_device *ud, struct urb *urb);
diff --git a/drivers/staging/usbip/userspace/src/usbip_detach.c b/drivers/staging/usbip/userspace/src/usbip_detach.c
index 89bf3c195c28..dac5f065755a 100644
--- a/drivers/staging/usbip/userspace/src/usbip_detach.c
+++ b/drivers/staging/usbip/userspace/src/usbip_detach.c
@@ -19,6 +19,7 @@
 #include <sysfs/libsysfs.h>
 
 #include <ctype.h>
+#include <limits.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -46,6 +47,7 @@ static int detach_port(char *port)
 {
         int ret;
         uint8_t portnum;
+        char path[PATH_MAX+1];
 
         for (unsigned int i=0; i < strlen(port); i++)
                 if (!isdigit(port[i])) {
@@ -57,6 +59,13 @@ static int detach_port(char *port)
 
         portnum = atoi(port);
 
+        /* remove the port state file */
+
+        snprintf(path, PATH_MAX, VHCI_STATE_PATH"/port%d", portnum);
+
+        remove(path);
+        rmdir(VHCI_STATE_PATH);
+
         ret = usbip_vhci_driver_open();
         if (ret < 0) {
                 err("open vhci_driver");
diff --git a/drivers/staging/usbip/vhci.h b/drivers/staging/usbip/vhci.h
index c66b8b3f97b4..5dddc4d4b6a5 100644
--- a/drivers/staging/usbip/vhci.h
+++ b/drivers/staging/usbip/vhci.h
@@ -99,7 +99,6 @@ extern const struct attribute_group dev_attr_group;
 
 /* vhci_hcd.c */
 void rh_port_connect(int rhport, enum usb_device_speed speed);
-void rh_port_disconnect(int rhport);
 
 /* vhci_rx.c */
 struct urb *pickup_urb_and_free_priv(struct vhci_device *vdev, __u32 seqnum);
diff --git a/drivers/staging/usbip/vhci_hcd.c b/drivers/staging/usbip/vhci_hcd.c
index 620d1beb4587..c3aa2195f1a8 100644
--- a/drivers/staging/usbip/vhci_hcd.c
+++ b/drivers/staging/usbip/vhci_hcd.c
@@ -18,6 +18,7 @@
  */
 
 #include <linux/init.h>
+#include <linux/file.h>
 #include <linux/kernel.h>
 #include <linux/kthread.h>
 #include <linux/module.h>
@@ -140,32 +141,23 @@ void rh_port_connect(int rhport, enum usb_device_speed speed)
                 break;
         }
 
-        /* spin_lock(&the_controller->vdev[rhport].ud.lock);
-         * the_controller->vdev[rhport].ud.status = VDEV_CONNECT;
-         * spin_unlock(&the_controller->vdev[rhport].ud.lock); */
-
         spin_unlock_irqrestore(&the_controller->lock, flags);
 
         usb_hcd_poll_rh_status(vhci_to_hcd(the_controller));
 }
 
-void rh_port_disconnect(int rhport)
+static void rh_port_disconnect(int rhport)
 {
         unsigned long flags;
 
         usbip_dbg_vhci_rh("rh_port_disconnect %d\n", rhport);
 
         spin_lock_irqsave(&the_controller->lock, flags);
-        /* stop_activity(dum, driver); */
+
         the_controller->port_status[rhport] &= ~USB_PORT_STAT_CONNECTION;
         the_controller->port_status[rhport] |=
                                         (1 << USB_PORT_FEAT_C_CONNECTION);
 
-        /* not yet complete the disconnection
-         * spin_lock(&vdev->ud.lock);
-         * vdev->ud.status = VHC_ST_DISCONNECT;
-         * spin_unlock(&vdev->ud.lock); */
-
         spin_unlock_irqrestore(&the_controller->lock, flags);
         usb_hcd_poll_rh_status(vhci_to_hcd(the_controller));
 }
@@ -228,7 +220,6 @@ done:
         return changed ? retval : 0;
 }
 
-/* See hub_configure in hub.c */
 static inline void hub_descriptor(struct usb_hub_descriptor *desc)
 {
         memset(desc, 0, sizeof(*desc));
@@ -292,8 +283,6 @@ static int vhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
                         usbip_dbg_vhci_rh(" ClearPortFeature: "
                                           "USB_PORT_FEAT_POWER\n");
                         dum->port_status[rhport] = 0;
-                        /* dum->address = 0; */
-                        /* dum->hdev = 0; */
                         dum->resuming = 0;
                         break;
                 case USB_PORT_FEAT_C_RESET:
@@ -333,11 +322,11 @@ static int vhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
                         retval = -EPIPE;
                 }
 
-                /* we do no care of resume. */
+                /* we do not care about resume. */
 
                 /* whoever resets or resumes must GetPortStatus to
                  * complete it!!
-                 *                                   */
+                 */
                 if (dum->resuming && time_after(jiffies, dum->re_timeout)) {
                         dum->port_status[rhport] |=
                                 (1 << USB_PORT_FEAT_C_SUSPEND);
@@ -345,11 +334,6 @@ static int vhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
                                 ~(1 << USB_PORT_FEAT_SUSPEND);
                         dum->resuming = 0;
                         dum->re_timeout = 0;
-                        /* if (dum->driver && dum->driver->resume) {
-                         *      spin_unlock (&dum->lock);
-                         *      dum->driver->resume (&dum->gadget);
-                         *      spin_lock (&dum->lock);
-                         * } */
                 }
 
                 if ((dum->port_status[rhport] & (1 << USB_PORT_FEAT_RESET)) !=
@@ -411,9 +395,6 @@ static int vhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
 
         default:
                 pr_err("default: no such request\n");
-                /* dev_dbg (hardware,
-                 *              "hub control req%04x v%04x i%04x l%d\n",
-                 *              typeReq, wValue, wIndex, wLength); */
 
                 /* "protocol stall" on error */
                 retval = -EPIPE;
@@ -456,7 +437,6 @@ static void vhci_tx_urb(struct urb *urb)
 
         if (!vdev) {
                 pr_err("could not get virtual device");
-                /* BUG(); */
                 return;
         }
 
@@ -813,7 +793,7 @@ static void vhci_shutdown_connection(struct usbip_device *ud)
                 kernel_sock_shutdown(ud->tcp_socket, SHUT_RDWR);
         }
 
-        /* kill threads related to this sdev, if v.c. exists */
+        /* kill threads related to this sdev */
         if (vdev->ud.tcp_rx) {
                 kthread_stop_put(vdev->ud.tcp_rx);
                 vdev->ud.tcp_rx = NULL;
@@ -825,8 +805,8 @@ static void vhci_shutdown_connection(struct usbip_device *ud)
         pr_info("stop threads\n");
 
         /* active connection is closed */
-        if (vdev->ud.tcp_socket != NULL) {
-                sock_release(vdev->ud.tcp_socket);
+        if (vdev->ud.tcp_socket) {
+                fput(vdev->ud.tcp_socket->file);
                 vdev->ud.tcp_socket = NULL;
         }
         pr_info("release socket\n");
@@ -872,7 +852,10 @@ static void vhci_device_reset(struct usbip_device *ud)
                 usb_put_dev(vdev->udev);
         vdev->udev = NULL;
 
-        ud->tcp_socket = NULL;
+        if (ud->tcp_socket) {
+                fput(ud->tcp_socket->file);
+                ud->tcp_socket = NULL;
+        }
         ud->status = VDEV_ST_NULL;
 
         spin_unlock(&ud->lock);
@@ -928,7 +911,6 @@ static int vhci_start(struct usb_hcd *hcd)
         spin_lock_init(&vhci->lock);
 
         hcd->power_budget = 0; /* no limit */
-        hcd->state  = HC_STATE_RUNNING;
         hcd->uses_new_polling = 1;
 
         /* vhci_hcd is now ready to be controlled through sysfs */
@@ -976,8 +958,6 @@ static int vhci_bus_suspend(struct usb_hcd *hcd)
         dev_dbg(&hcd->self.root_hub->dev, "%s\n", __func__);
 
         spin_lock_irq(&vhci->lock);
-        /* vhci->rh_state = DUMMY_RH_SUSPENDED;
-         * set_link_state(vhci); */
         hcd->state = HC_STATE_SUSPENDED;
         spin_unlock_irq(&vhci->lock);
 
@@ -995,10 +975,6 @@ static int vhci_bus_resume(struct usb_hcd *hcd)
         if (!HCD_HW_ACCESSIBLE(hcd)) {
                 rc = -ESHUTDOWN;
         } else {
-                /* vhci->rh_state = DUMMY_RH_RUNNING;
-                 * set_link_state(vhci);
-                 * if (!list_empty(&vhci->urbp_list))
-                 *      mod_timer(&vhci->timer, jiffies); */
                 hcd->state = HC_STATE_RUNNING;
         }
         spin_unlock_irq(&vhci->lock);
@@ -1151,7 +1127,7 @@ static int vhci_hcd_resume(struct platform_device *pdev)
 
 static struct platform_driver vhci_driver = {
         .probe  = vhci_hcd_probe,
-        .remove = __devexit_p(vhci_hcd_remove),
+        .remove = vhci_hcd_remove,
         .suspend = vhci_hcd_suspend,
         .resume = vhci_hcd_resume,
         .driver = {
@@ -1175,7 +1151,6 @@ static struct platform_device the_pdev = {
         .name = (char *) driver_name,
         .id = -1,
         .dev = {
-                /* .driver = &vhci_driver, */
                 .release = the_pdev_release,
         },
 };
diff --git a/drivers/staging/usbip/vhci_rx.c b/drivers/staging/usbip/vhci_rx.c
index f0eaf04fa25b..ba5f1c079b69 100644
--- a/drivers/staging/usbip/vhci_rx.c
+++ b/drivers/staging/usbip/vhci_rx.c
@@ -167,7 +167,7 @@ static void vhci_recv_ret_unlink(struct vhci_device *vdev,
         } else {
                 usbip_dbg_vhci_rx("now giveback urb %p\n", urb);
 
-                /* If unlink is succeed, status is -ECONNRESET */
+                /* If unlink is successful, status is -ECONNRESET */
                 urb->status = pdu->u.ret_unlink.status;
                 pr_info("urb->status %d\n", urb->status);
 
diff --git a/drivers/staging/usbip/vhci_sysfs.c b/drivers/staging/usbip/vhci_sysfs.c
index 7ce9c2f7e442..c66e9c05c76b 100644
--- a/drivers/staging/usbip/vhci_sysfs.c
+++ b/drivers/staging/usbip/vhci_sysfs.c
@@ -18,6 +18,7 @@
  */
 
 #include <linux/kthread.h>
+#include <linux/file.h>
 #include <linux/net.h>
 
 #include "usbip_common.h"
@@ -189,7 +190,8 @@ static ssize_t store_attach(struct device *dev, struct device_attribute *attr,
         if (valid_args(rhport, speed) < 0)
                 return -EINVAL;
 
-        /* check sockfd */
+        /* Extract socket from fd. */
+        /* The correct way to clean this up is to fput(socket->file). */
         socket = sockfd_to_socket(sockfd);
         if (!socket)
                 return -EINVAL;
@@ -206,6 +208,8 @@ static ssize_t store_attach(struct device *dev, struct device_attribute *attr,
                 spin_unlock(&vdev->ud.lock);
                 spin_unlock(&the_controller->lock);
 
+                fput(socket->file);
+
                 dev_err(dev, "port %d already used\n", rhport);
                 return -EINVAL;
         }
diff --git a/drivers/staging/usbip/vhci_tx.c b/drivers/staging/usbip/vhci_tx.c
index 9b437e7ef1a7..b1f0dcd68f55 100644
--- a/drivers/staging/usbip/vhci_tx.c
+++ b/drivers/staging/usbip/vhci_tx.c
@@ -76,7 +76,7 @@ static int vhci_send_cmd_submit(struct vhci_device *vdev)
                 int ret;
                 struct urb *urb = priv->urb;
                 struct usbip_header pdu_header;
-                void *iso_buffer = NULL;
+                struct usbip_iso_packet_descriptor *iso_buffer = NULL;
 
                 txsize = 0;
                 memset(&pdu_header, 0, sizeof(pdu_header));
diff --git a/drivers/staging/vme/devices/vme_pio2.h b/drivers/staging/vme/devices/vme_pio2.h
index 72d9ce0bcb45..d5d94c43c074 100644
--- a/drivers/staging/vme/devices/vme_pio2.h
+++ b/drivers/staging/vme/devices/vme_pio2.h
@@ -243,7 +243,7 @@ struct pio2_card {
 int pio2_cntr_reset(struct pio2_card *);
 
 int pio2_gpio_reset(struct pio2_card *);
-int __devinit pio2_gpio_init(struct pio2_card *);
+int pio2_gpio_init(struct pio2_card *);
 void pio2_gpio_exit(struct pio2_card *);
 
 #endif /* _VME_PIO2_H_ */
diff --git a/drivers/staging/vme/devices/vme_pio2_core.c b/drivers/staging/vme/devices/vme_pio2_core.c
index dad8281915bf..0331178ca3b3 100644
--- a/drivers/staging/vme/devices/vme_pio2_core.c
+++ b/drivers/staging/vme/devices/vme_pio2_core.c
@@ -42,8 +42,8 @@ static int variant_num;
 static bool loopback;
 
 static int pio2_match(struct vme_dev *);
-static int __devinit pio2_probe(struct vme_dev *);
-static int __devexit pio2_remove(struct vme_dev *);
+static int pio2_probe(struct vme_dev *);
+static int pio2_remove(struct vme_dev *);
 
 static int pio2_get_led(struct pio2_card *card)
 {
@@ -156,7 +156,7 @@ static struct vme_driver pio2_driver = {
         .name = driver_name,
         .match = pio2_match,
         .probe = pio2_probe,
-        .remove = __devexit_p(pio2_remove),
+        .remove = pio2_remove,
 };
 
 
@@ -222,7 +222,7 @@ static int pio2_match(struct vme_dev *vdev)
         return 1;
 }
 
-static int __devinit pio2_probe(struct vme_dev *vdev)
+static int pio2_probe(struct vme_dev *vdev)
 {
         struct pio2_card *card;
         int retval;
@@ -455,7 +455,7 @@ err_struct:
         return retval;
 }
 
-static int __devexit pio2_remove(struct vme_dev *vdev)
+static int pio2_remove(struct vme_dev *vdev)
 {
         int vec;
         int i;
diff --git a/drivers/staging/vme/devices/vme_pio2_gpio.c b/drivers/staging/vme/devices/vme_pio2_gpio.c
index ad76a477825b..69d880517e07 100644
--- a/drivers/staging/vme/devices/vme_pio2_gpio.c
+++ b/drivers/staging/vme/devices/vme_pio2_gpio.c
@@ -186,7 +186,7 @@ int pio2_gpio_reset(struct pio2_card *card)
         return 0;
 }
 
-int __devinit pio2_gpio_init(struct pio2_card *card)
+int pio2_gpio_init(struct pio2_card *card)
 {
         int retval = 0;
         char *label;
diff --git a/drivers/staging/vme/devices/vme_user.c b/drivers/staging/vme/devices/vme_user.c
index c3f94f311ca7..4ef852c4c4e1 100644
--- a/drivers/staging/vme/devices/vme_user.c
+++ b/drivers/staging/vme/devices/vme_user.c
@@ -15,6 +15,8 @@
  * option) any later version.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/cdev.h>
 #include <linux/delay.h>
 #include <linux/device.h>
@@ -135,8 +137,8 @@ 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 vme_user_match(struct vme_dev *);
-static int __devinit vme_user_probe(struct vme_dev *);
-static int __devexit vme_user_remove(struct vme_dev *);
+static int vme_user_probe(struct vme_dev *);
+static int vme_user_remove(struct vme_dev *);
 
 static const struct file_operations vme_user_fops = {
         .open = vme_user_open,
@@ -170,7 +172,7 @@ static int vme_user_open(struct inode *inode, struct file *file)
         mutex_lock(&image[minor].mutex);
         /* Allow device to be opened if a resource is needed and allocated. */
         if (minor < CONTROL_MINOR && image[minor].resource == NULL) {
-                printk(KERN_ERR "No resources allocated for device\n");
+                pr_err("No resources allocated for device\n");
                 err = -EINVAL;
                 goto err_res;
         }
@@ -225,13 +227,13 @@ static ssize_t resource_to_user(int minor, char __user *buf, size_t count,
                         (unsigned long)copied);
                 if (retval != 0) {
                         copied = (copied - retval);
-                        printk(KERN_INFO "User copy failed\n");
+                        pr_info("User copy failed\n");
                         return -EINVAL;
                 }
 
         } else {
                 /* XXX Need to write this */
-                printk(KERN_INFO "Currently don't support large transfers\n");
+                pr_info("Currently don't support large transfers\n");
                 /* Map in pages from userspace */
 
                 /* Call vme_master_read to do the transfer */
@@ -265,7 +267,7 @@ static ssize_t resource_from_user(unsigned int minor, const char __user *buf,
                         image[minor].kern_buf, copied, *ppos);
         } else {
                 /* XXX Need to write this */
-                printk(KERN_INFO "Currently don't support large transfers\n");
+                pr_info("Currently don't support large transfers\n");
                 /* Map in pages from userspace */
 
                 /* Call vme_master_write to do the transfer */
@@ -286,7 +288,7 @@ static ssize_t buffer_to_user(unsigned int minor, char __user *buf,
         retval = __copy_to_user(buf, image_ptr, (unsigned long)count);
         if (retval != 0) {
                 retval = (count - retval);
-                printk(KERN_WARNING "Partial copy to userspace\n");
+                pr_warn("Partial copy to userspace\n");
         } else
                 retval = count;
 
@@ -305,7 +307,7 @@ static ssize_t buffer_from_user(unsigned int minor, const char __user *buf,
         retval = __copy_from_user(image_ptr, buf, (unsigned long)count);
         if (retval != 0) {
                 retval = (count - retval);
-                printk(KERN_WARNING "Partial copy to userspace\n");
+                pr_warn("Partial copy to userspace\n");
         } else
                 retval = count;
 
@@ -476,7 +478,7 @@ static int vme_user_ioctl(struct inode *inode, struct file *file,
                         copied = copy_from_user(&irq_req, argp,
                                                 sizeof(struct vme_irq_id));
                         if (copied != 0) {
-                                printk(KERN_WARNING "Partial copy from userspace\n");
+                                pr_warn("Partial copy from userspace\n");
                                 return -EFAULT;
                         }
 
@@ -503,8 +505,7 @@ static int vme_user_ioctl(struct inode *inode, struct file *file,
                         copied = copy_to_user(argp, &master,
                                 sizeof(struct vme_master));
                         if (copied != 0) {
-                                printk(KERN_WARNING "Partial copy to "
-                                        "userspace\n");
+                                pr_warn("Partial copy to userspace\n");
                                 return -EFAULT;
                         }
 
@@ -515,8 +516,7 @@ static int vme_user_ioctl(struct inode *inode, struct file *file,
 
                         copied = copy_from_user(&master, argp, sizeof(master));
                         if (copied != 0) {
-                                printk(KERN_WARNING "Partial copy from "
-                                        "userspace\n");
+                                pr_warn("Partial copy from userspace\n");
                                 return -EFAULT;
                         }
 
@@ -546,8 +546,7 @@ static int vme_user_ioctl(struct inode *inode, struct file *file,
                         copied = copy_to_user(argp, &slave,
                                 sizeof(struct vme_slave));
                         if (copied != 0) {
-                                printk(KERN_WARNING "Partial copy to "
-                                        "userspace\n");
+                                pr_warn("Partial copy to userspace\n");
                                 return -EFAULT;
                         }
 
@@ -558,8 +557,7 @@ static int vme_user_ioctl(struct inode *inode, struct file *file,
 
                         copied = copy_from_user(&slave, argp, sizeof(slave));
                         if (copied != 0) {
-                                printk(KERN_WARNING "Partial copy from "
-                                        "userspace\n");
+                                pr_warn("Partial copy from userspace\n");
                                 return -EFAULT;
                         }
 
@@ -599,8 +597,8 @@ static void buf_unalloc(int num)
 {
         if (image[num].kern_buf) {
 #ifdef VME_DEBUG
-                printk(KERN_DEBUG "UniverseII:Releasing buffer at %p\n",
-                        image[num].pci_buf);
+                pr_debug("UniverseII:Releasing buffer at %p\n",
+                         image[num].pci_buf);
 #endif
 
                 vme_free_consistent(image[num].resource, image[num].size_buf,
@@ -612,7 +610,7 @@ static void buf_unalloc(int num)
 
 #ifdef VME_DEBUG
         } else {
-                printk(KERN_DEBUG "UniverseII: Buffer not allocated\n");
+                pr_debug("UniverseII: Buffer not allocated\n");
 #endif
         }
 }
@@ -621,7 +619,7 @@ static struct vme_driver vme_user_driver = {
         .name = driver_name,
         .match = vme_user_match,
         .probe = vme_user_probe,
-        .remove = __devexit_p(vme_user_remove),
+        .remove = vme_user_remove,
 };
 
 
@@ -629,11 +627,10 @@ static int __init vme_user_init(void)
 {
         int retval = 0;
 
-        printk(KERN_INFO "VME User Space Access Driver\n");
+        pr_info("VME User Space Access Driver\n");
 
         if (bus_num == 0) {
-                printk(KERN_ERR "%s: No cards, skipping registration\n",
-                        driver_name);
+                pr_err("No cards, skipping registration\n");
                 retval = -ENODEV;
                 goto err_nocard;
         }
@@ -642,8 +639,8 @@ static int __init vme_user_init(void)
          * in future revisions if that ever becomes necessary.
          */
         if (bus_num > VME_USER_BUS_MAX) {
-                printk(KERN_ERR "%s: Driver only able to handle %d buses\n",
-                        driver_name, VME_USER_BUS_MAX);
+                pr_err("Driver only able to handle %d buses\n",
+                       VME_USER_BUS_MAX);
                 bus_num = VME_USER_BUS_MAX;
         }
 
@@ -676,15 +673,14 @@ static int vme_user_match(struct vme_dev *vdev)
  * 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 __devinit vme_user_probe(struct vme_dev *vdev)
+static int vme_user_probe(struct vme_dev *vdev)
 {
         int i, err;
         char name[12];
 
         /* Save pointer to the bridge device */
         if (vme_user_bridge != NULL) {
-                printk(KERN_ERR "%s: Driver can only be loaded for 1 device\n",
-                        driver_name);
+                dev_err(&vdev->dev, "Driver can only be loaded for 1 device\n");
                 err = -EINVAL;
                 goto err_dev;
         }
@@ -707,8 +703,8 @@ static int __devinit vme_user_probe(struct vme_dev *vdev)
         err = register_chrdev_region(MKDEV(VME_MAJOR, 0), VME_DEVS,
                 driver_name);
         if (err) {
-                printk(KERN_WARNING "%s: Error getting Major Number %d for "
-                "driver.\n", driver_name, VME_MAJOR);
+                dev_warn(&vdev->dev, "Error getting Major Number %d for driver.\n",
+                         VME_MAJOR);
                 goto err_region;
         }
 
@@ -718,7 +714,7 @@ static int __devinit vme_user_probe(struct vme_dev *vdev)
         vme_user_cdev->owner = THIS_MODULE;
         err = cdev_add(vme_user_cdev, MKDEV(VME_MAJOR, 0), VME_DEVS);
         if (err) {
-                printk(KERN_WARNING "%s: cdev_all failed\n", driver_name);
+                dev_warn(&vdev->dev, "cdev_all failed\n");
                 goto err_char;
         }
 
@@ -732,16 +728,16 @@ static int __devinit vme_user_probe(struct vme_dev *vdev)
                 image[i].resource = vme_slave_request(vme_user_bridge,
                         VME_A24, VME_SCT);
                 if (image[i].resource == NULL) {
-                        printk(KERN_WARNING "Unable to allocate slave "
-                                "resource\n");
+                        dev_warn(&vdev->dev,
+                                 "Unable to allocate slave resource\n");
                         goto err_slave;
                 }
                 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);
                 if (image[i].kern_buf == NULL) {
-                        printk(KERN_WARNING "Unable to allocate memory for "
-                                "buffer\n");
+                        dev_warn(&vdev->dev,
+                                 "Unable to allocate memory for buffer\n");
                         image[i].pci_buf = 0;
                         vme_slave_free(image[i].resource);
                         err = -ENOMEM;
@@ -758,15 +754,15 @@ static int __devinit vme_user_probe(struct vme_dev *vdev)
                 image[i].resource = vme_master_request(vme_user_bridge,
                         VME_A32, VME_SCT, VME_D32);
                 if (image[i].resource == NULL) {
-                        printk(KERN_WARNING "Unable to allocate master "
-                                "resource\n");
+                        dev_warn(&vdev->dev,
+                                 "Unable to allocate master resource\n");
                         goto err_master;
                 }
                 image[i].size_buf = PCI_BUF_SIZE;
                 image[i].kern_buf = kmalloc(image[i].size_buf, GFP_KERNEL);
                 if (image[i].kern_buf == NULL) {
-                        printk(KERN_WARNING "Unable to allocate memory for "
-                                "master window buffers\n");
+                        dev_warn(&vdev->dev,
+                                 "Unable to allocate memory for master window buffers\n");
                         err = -ENOMEM;
                         goto err_master_buf;
                 }
@@ -775,7 +771,7 @@ static int __devinit vme_user_probe(struct vme_dev *vdev)
         /* Create sysfs entries - on udev systems this creates the dev files */
         vme_user_sysfs_class = class_create(THIS_MODULE, driver_name);
         if (IS_ERR(vme_user_sysfs_class)) {
-                printk(KERN_ERR "Error creating vme_user class.\n");
+                dev_err(&vdev->dev, "Error creating vme_user class.\n");
                 err = PTR_ERR(vme_user_sysfs_class);
                 goto err_class;
         }
@@ -803,8 +799,7 @@ static int __devinit vme_user_probe(struct vme_dev *vdev)
                 image[i].device = device_create(vme_user_sysfs_class, NULL,
                                         MKDEV(VME_MAJOR, i), NULL, name, num);
                 if (IS_ERR(image[i].device)) {
-                        printk(KERN_INFO "%s: Error creating sysfs device\n",
-                                driver_name);
+                        dev_info(&vdev->dev, "Error creating sysfs device\n");
                         err = PTR_ERR(image[i].device);
                         goto err_sysfs;
                 }
@@ -851,7 +846,7 @@ err_dev:
         return err;
 }
 
-static int __devexit vme_user_remove(struct vme_dev *dev)
+static int vme_user_remove(struct vme_dev *dev)
 {
         int i;
 
diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c
index 9e3b3f2bbe53..453c83d7fe8c 100644
--- a/drivers/staging/vt6655/device_main.c
+++ b/drivers/staging/vt6655/device_main.c
@@ -356,7 +356,7 @@ static char* get_chip_name(int chip_id)
         return chip_info_table[i].name;
 }
 
-static void __devexit vt6655_remove(struct pci_dev *pcid)
+static void vt6655_remove(struct pci_dev *pcid)
 {
         PSDevice pDevice = pci_get_drvdata(pcid);
 
@@ -902,7 +902,7 @@ static const struct net_device_ops device_netdev_ops = {
         .ndo_set_rx_mode        = device_set_multi,
 };
 
-static int __devinit
+static int
 vt6655_probe(struct pci_dev *pcid, const struct pci_device_id *ent)
 {
     static bool bFirst = true;
@@ -1099,7 +1099,7 @@ static void device_print_info(PSDevice pDevice)
 
 }
 
-static void __devinit vt6655_init_info(struct pci_dev* pcid, PSDevice* ppDevice,
+static void vt6655_init_info(struct pci_dev* pcid, PSDevice* ppDevice,
     PCHIP_INFO pChip_info) {
 
     PSDevice p;
diff --git a/drivers/staging/vt6655/hostap.c b/drivers/staging/vt6655/hostap.c
index 67b1b88b1b89..5f13890cf124 100644
--- a/drivers/staging/vt6655/hostap.c
+++ b/drivers/staging/vt6655/hostap.c
@@ -596,9 +596,9 @@ static int hostap_set_encryption(PSDevice pDevice,
 
         if (param->u.crypt.seq) {
             memcpy(&abySeq, param->u.crypt.seq, 8);
-                for (ii = 0 ; ii < 8 ; ii++) {
-                 KeyRSC |= (abySeq[ii] << (ii * 8));
-                }
+                for (ii = 0 ; ii < 8 ; ii++)
+                        KeyRSC |= (unsigned long)abySeq[ii] << (ii * 8);
+
                 dwKeyIndex |= 1 << 29;
                 pMgmt->sNodeDBTable[iNodeIndex].KeyRSC = KeyRSC;
         }
diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c
index 4972e57845c2..875ee4442386 100644
--- a/drivers/staging/vt6655/rxtx.c
+++ b/drivers/staging/vt6655/rxtx.c
@@ -242,7 +242,7 @@ s_vFillTxKey (
         }
         // Append IV after Mac Header
         *pdwIV &= WEP_IV_MASK;//00000000 11111111 11111111 11111111
-        *pdwIV |= (byKeyIndex << 30);
+        *pdwIV |= (unsigned long)byKeyIndex << 30;
         *pdwIV = cpu_to_le32(*pdwIV);
         pDevice->dwIVCounter++;
         if (pDevice->dwIVCounter > WEP_IV_MASK) {
diff --git a/drivers/staging/vt6655/wcmd.c b/drivers/staging/vt6655/wcmd.c
index 94bd1fc42c93..6d0b87a14267 100644
--- a/drivers/staging/vt6655/wcmd.c
+++ b/drivers/staging/vt6655/wcmd.c
@@ -412,6 +412,7 @@ vCommandTimer (
                 if (!is_channel_valid(pMgmt->uScanChannel)) {
                     DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Invalid channel pMgmt->uScanChannel = %d \n",pMgmt->uScanChannel);
                     s_bCommandComplete(pDevice);
+                    spin_unlock_irq(&pDevice->lock);
                     return;
                 }
 //printk("chester-pMgmt->uScanChannel=%d,pDevice->byMaxChannel=%d\n",pMgmt->uScanChannel,pDevice->byMaxChannel);
diff --git a/drivers/staging/vt6656/80211mgr.c b/drivers/staging/vt6656/80211mgr.c
index 39f98423dc02..e6ced95e6fa7 100644
--- a/drivers/staging/vt6656/80211mgr.c
+++ b/drivers/staging/vt6656/80211mgr.c
@@ -52,11 +52,11 @@
  *
  */
 
+#include "device.h"
 #include "tmacro.h"
 #include "tether.h"
 #include "80211mgr.h"
 #include "80211hdr.h"
-#include "device.h"
 #include "wpa.h"
 
 /*---------------------  Static Definitions -------------------------*/
diff --git a/drivers/staging/vt6656/Makefile b/drivers/staging/vt6656/Makefile
index 41ed06bb6654..c998547884c0 100644
--- a/drivers/staging/vt6656/Makefile
+++ b/drivers/staging/vt6656/Makefile
@@ -20,7 +20,6 @@ vt6656_stage-y +=	main_usb.o \
                         rc4.o \
                         tether.o \
                         tcrc.o \
-                        ioctl.o \
                         hostap.o \
                         wpa.o \
                         key.o \
diff --git a/drivers/staging/vt6656/bssdb.c b/drivers/staging/vt6656/bssdb.c
index 2ac066df8340..6a1394192248 100644
--- a/drivers/staging/vt6656/bssdb.c
+++ b/drivers/staging/vt6656/bssdb.c
@@ -882,7 +882,6 @@ void BSSvSecondCallBack(void *hDeviceContext)
     unsigned int            uSleepySTACnt = 0;
     unsigned int            uNonShortSlotSTACnt = 0;
     unsigned int            uLongPreambleSTACnt = 0;
-    viawget_wpa_header *wpahdr;
 
     spin_lock_irq(&pDevice->lock);
 
@@ -913,7 +912,6 @@ if(pDevice->byReAssocCount > 0) {
    if((pDevice->byReAssocCount > 10) && (pDevice->bLinkPass != TRUE)) {  //10 sec timeout
                      printk("Re-association timeout!!!\n");
                    pDevice->byReAssocCount = 0;
-                     #ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
                     // if(pDevice->bWPASuppWextEnabled == TRUE)
                         {
                         union iwreq_data  wrqu;
@@ -922,20 +920,11 @@ if(pDevice->byReAssocCount > 0) {
                         PRINT_K("wireless_send_event--->SIOCGIWAP(disassociated)\n");
                         wireless_send_event(pDevice->dev, SIOCGIWAP, &wrqu, NULL);
                        }
-                    #endif
      }
    else if(pDevice->bLinkPass == TRUE)
         pDevice->byReAssocCount = 0;
 }
 
-if((pMgmt->eCurrState!=WMAC_STATE_ASSOC) &&
-     (pMgmt->eLastState==WMAC_STATE_ASSOC))
-{
-  union iwreq_data      wrqu;
-  memset(&wrqu, 0, sizeof(wrqu));
-  wrqu.data.flags = RT_DISCONNECTED_EVENT_FLAG;
-  wireless_send_event(pDevice->dev, IWEVCUSTOM, &wrqu, NULL);
-}
  pMgmt->eLastState = pMgmt->eCurrState ;
 
    s_uCalculateLinkQual((void *)pDevice);
@@ -1102,21 +1091,6 @@ if((pMgmt->eCurrState!=WMAC_STATE_ASSOC) &&
 
                 DBG_PRT(MSG_LEVEL_NOTICE, KERN_INFO "Lost AP beacon [%d] sec, disconnected !\n", pMgmt->sNodeDBTable[0].uInActiveCount);
                 /* let wpa supplicant know AP may disconnect */
-        if ((pDevice->bWPADEVUp) && (pDevice->skb != NULL)) {
-             wpahdr = (viawget_wpa_header *)pDevice->skb->data;
-             wpahdr->type = VIAWGET_DISASSOC_MSG;
-             wpahdr->resp_ie_len = 0;
-             wpahdr->req_ie_len = 0;
-             skb_put(pDevice->skb, sizeof(viawget_wpa_header));
-             pDevice->skb->dev = pDevice->wpadev;
-             skb_reset_mac_header(pDevice->skb);
-             pDevice->skb->pkt_type = PACKET_HOST;
-             pDevice->skb->protocol = htons(ETH_P_802_2);
-             memset(pDevice->skb->cb, 0, sizeof(pDevice->skb->cb));
-             netif_rx(pDevice->skb);
-             pDevice->skb = dev_alloc_skb((int)pDevice->rx_buf_sz);
-         }
-   #ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
       {
         union iwreq_data  wrqu;
         memset(&wrqu, 0, sizeof (wrqu));
@@ -1124,7 +1098,6 @@ if((pMgmt->eCurrState!=WMAC_STATE_ASSOC) &&
         PRINT_K("wireless_send_event--->SIOCGIWAP(disassociated)\n");
         wireless_send_event(pDevice->dev, SIOCGIWAP, &wrqu, NULL);
      }
-  #endif
             }
         }
         else if (pItemSSID->len != 0) {
@@ -1144,20 +1117,6 @@ DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "bIsRoaming %d, !\n", pDevice->bIsRoaming );
                 pDevice->uAutoReConnectTime = 0;
                 pDevice->uIsroamingTime = 0;
                 pDevice->bRoaming = FALSE;
-
-             wpahdr = (viawget_wpa_header *)pDevice->skb->data;
-             wpahdr->type = VIAWGET_CCKM_ROAM_MSG;
-             wpahdr->resp_ie_len = 0;
-             wpahdr->req_ie_len = 0;
-             skb_put(pDevice->skb, sizeof(viawget_wpa_header));
-             pDevice->skb->dev = pDevice->wpadev;
-             skb_reset_mac_header(pDevice->skb);
-             pDevice->skb->pkt_type = PACKET_HOST;
-             pDevice->skb->protocol = htons(ETH_P_802_2);
-             memset(pDevice->skb->cb, 0, sizeof(pDevice->skb->cb));
-             netif_rx(pDevice->skb);
-            pDevice->skb = dev_alloc_skb((int)pDevice->rx_buf_sz);
-
           }
       else if ((pDevice->bRoaming == FALSE)&&(pDevice->bIsRoaming == TRUE)) {
                             pDevice->uIsroamingTime++;
@@ -1169,11 +1128,9 @@ DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "bIsRoaming %d, !\n", pDevice->bIsRoaming );
 else {
             if (pDevice->uAutoReConnectTime < 10) {
                 pDevice->uAutoReConnectTime++;
-               #ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
                 //network manager support need not do Roaming scan???
                 if(pDevice->bWPASuppWextEnabled ==TRUE)
                  pDevice->uAutoReConnectTime = 0;
-             #endif
             }
             else {
             //mike use old encryption status for wpa reauthen
diff --git a/drivers/staging/vt6656/desc.h b/drivers/staging/vt6656/desc.h
index b68b2ec96eaa..5007e98d1b0e 100644
--- a/drivers/staging/vt6656/desc.h
+++ b/drivers/staging/vt6656/desc.h
@@ -298,7 +298,7 @@ typedef const SCTS_FB *PCSCTS_FB;
 // Tx FIFO header
 //
 typedef struct tagSTxBufHead {
-    DWORD   adwTxKey[4];
+        u32 adwTxKey[4];
     WORD    wFIFOCtl;
     WORD    wTimeStamp;
     WORD    wFragCtl;
@@ -376,24 +376,24 @@ typedef const STxDataHead_a_FB *PCSTxDataHead_a_FB;
 // MICHDR data header
 //
 typedef struct tagSMICHDRHead {
-    DWORD   adwHDR0[4];
-    DWORD   adwHDR1[4];
-    DWORD   adwHDR2[4];
+        u32 adwHDR0[4];
+        u32 adwHDR1[4];
+        u32 adwHDR2[4];
 } __attribute__ ((__packed__))
 SMICHDRHead, *PSMICHDRHead;
 
 typedef const SMICHDRHead *PCSMICHDRHead;
 
 typedef struct tagSBEACONCtl {
-    DWORD   BufReady : 1;
-    DWORD   TSF : 15;
-    DWORD   BufLen : 11;
-    DWORD   Reserved : 5;
+        u32 BufReady:1;
+        u32 TSF:15;
+        u32 BufLen:11;
+        u32 Reserved:5;
 } __attribute__ ((__packed__))
 SBEACONCtl;
 
 typedef struct tagSSecretKey {
-    DWORD   dwLowDword;
+        u32 dwLowDword;
     BYTE    byHighByte;
 } __attribute__ ((__packed__))
 SSecretKey;
@@ -402,11 +402,11 @@ typedef struct tagSKeyEntry {
     BYTE  abyAddrHi[2];
     WORD  wKCTL;
     BYTE  abyAddrLo[4];
-    DWORD dwKey0[4];
-    DWORD dwKey1[4];
-    DWORD dwKey2[4];
-    DWORD dwKey3[4];
-    DWORD dwKey4[4];
+        u32 dwKey0[4];
+        u32 dwKey1[4];
+        u32 dwKey2[4];
+        u32 dwKey3[4];
+        u32 dwKey4[4];
 } __attribute__ ((__packed__))
 SKeyEntry;
 
diff --git a/drivers/staging/vt6656/device.h b/drivers/staging/vt6656/device.h
index 6370d1039103..25bf03af7733 100644
--- a/drivers/staging/vt6656/device.h
+++ b/drivers/staging/vt6656/device.h
@@ -30,47 +30,28 @@
 #define __DEVICE_H__
 
 #include <linux/module.h>
-#include <linux/types.h>
-#include <linux/init.h>
-#include <linux/mm.h>
-#include <linux/errno.h>
-#include <linux/ioport.h>
-#include <linux/pci.h>
 #include <linux/kernel.h>
-#include <linux/netdevice.h>
-#include <linux/etherdevice.h>
-#include <linux/skbuff.h>
-#include <linux/delay.h>
-#include <linux/timer.h>
 #include <linux/slab.h>
-#include <linux/interrupt.h>
-#include <linux/string.h>
-#include <linux/wait.h>
+#include <linux/init.h>
+#include <linux/delay.h>
+#include <linux/device.h>
+#include <linux/firmware.h>
+#include <linux/etherdevice.h>
+#include <linux/suspend.h>
 #include <linux/if_arp.h>
-#include <linux/sched.h>
-#include <linux/if.h>
-#include <linux/rtnetlink.h>//James
-#include <linux/proc_fs.h>
-#include <linux/inetdevice.h>
-#include <linux/reboot.h>
+#include <linux/wireless.h>
+#include <net/iw_handler.h>
+#include <net/cfg80211.h>
+#include <linux/timer.h>
 #include <linux/usb.h>
-#include <linux/signal.h>
-#include <linux/firmware.h>
-#include <asm/io.h>
-#include <asm/uaccess.h>
+
+
 #ifdef SIOCETHTOOL
 #define DEVICE_ETHTOOL_IOCTL_SUPPORT
 #include <linux/ethtool.h>
 #else
 #undef DEVICE_ETHTOOL_IOCTL_SUPPORT
 #endif
-/* Include Wireless Extension definition and check version - Jean II */
-#include <linux/wireless.h>
-#include <net/iw_handler.h>     // New driver API
-
-#ifndef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
-#define WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
-#endif
 
 //please copy below macro to driver_event.c for API
 #define RT_INSMOD_EVENT_FLAG                             0x0101
@@ -418,7 +399,6 @@ typedef struct __device_info {
     struct net_device*          dev;
     struct net_device_stats     stats;
 
-    const struct firmware       *firmware;
 
     OPTIONS                     sOpts;
 
@@ -734,7 +714,6 @@ typedef struct __device_info {
     BYTE                    byKeyIndex;
 
     BOOL                    bAES;
-    BYTE                    byCntMeasure;
 
     unsigned int                    uKeyLength;
     BYTE                    abyKey[WLAN_WEP232_KEYLEN];
@@ -814,16 +793,13 @@ typedef struct __device_info {
     //WPA supplicant daemon
         struct net_device       *wpadev;
         BOOL                    bWPADEVUp;
-    struct sk_buff          *skb;
     //--
 
-#ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
         BOOL                 bwextstep0;
         BOOL                 bwextstep1;
         BOOL                 bwextstep2;
         BOOL                 bwextstep3;
         BOOL                 bWPASuppWextEnabled;
-#endif
 
 #ifdef HOSTAP
     // user space daemon: hostapd, is used for HOSTAP
diff --git a/drivers/staging/vt6656/dpc.c b/drivers/staging/vt6656/dpc.c
index 28edf9e7efcb..e94f6a1647a3 100644
--- a/drivers/staging/vt6656/dpc.c
+++ b/drivers/staging/vt6656/dpc.c
@@ -332,7 +332,7 @@ RXbBulkInProcessData (
     PBYTE           pbyFrame;
     BOOL            bDeFragRx = FALSE;
     unsigned int            cbHeaderOffset;
-    unsigned int            FrameSize;
+        u32 FrameSize;
     WORD            wEtherType = 0;
     signed int             iSANodeIndex = -1;
     signed int             iDANodeIndex = -1;
@@ -351,7 +351,7 @@ RXbBulkInProcessData (
     /* signed long ldBm = 0; */
     BOOL            bIsWEP = FALSE;
     BOOL            bExtIV = FALSE;
-    DWORD           dwWbkStatus;
+        u32 dwWbkStatus;
     PRCB            pRCBIndicate = pRCB;
     PBYTE           pbyDAddress;
     PWORD           pwPLCP_Length;
@@ -366,15 +366,15 @@ RXbBulkInProcessData (
 
     skb = pRCB->skb;
 
-    //[31:16]RcvByteCount ( not include 4-byte Status )
-    dwWbkStatus =  *( (PDWORD)(skb->data) );
-    FrameSize = (unsigned int)(dwWbkStatus >> 16);
-    FrameSize += 4;
+        /* [31:16]RcvByteCount ( not include 4-byte Status ) */
+        dwWbkStatus = *((u32 *)(skb->data));
+        FrameSize = dwWbkStatus >> 16;
+        FrameSize += 4;
 
-    if (BytesToIndicate != FrameSize) {
-        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"---------- WRONG Length 1 \n");
-        return FALSE;
-    }
+        if (BytesToIndicate != FrameSize) {
+                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"------- WRONG Length 1\n");
+                return FALSE;
+        }
 
     if ((BytesToIndicate > 2372) || (BytesToIndicate <= 40)) {
         // Frame Size error drop this packet.
@@ -617,7 +617,7 @@ RXbBulkInProcessData (
                 //Discard beacon packet which channel is 0
                 if ( (WLAN_GET_FC_FSTYPE((pRxPacket->p80211Header->sA3.wFrameCtl)) == WLAN_FSTYPE_BEACON) ||
                      (WLAN_GET_FC_FSTYPE((pRxPacket->p80211Header->sA3.wFrameCtl)) == WLAN_FSTYPE_PROBERESP) ) {
-                    return TRUE;
+                        return FALSE;
                 }
             }
             pRxPacket->byRxChannel = (*pbyRxSts) >> 2;
@@ -818,7 +818,6 @@ RXbBulkInProcessData (
             DWORD           dwMICKey0 = 0, dwMICKey1 = 0;
             DWORD           dwLocalMIC_L = 0;
             DWORD           dwLocalMIC_R = 0;
-            viawget_wpa_header *wpahdr;
 
 
             if (pMgmt->eCurrMode == WMAC_MODE_ESS_AP) {
@@ -864,7 +863,6 @@ RXbBulkInProcessData (
                             pDevice->dev->name);
                     }
                 }
-       #ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
                                 //send event to wpa_supplicant
                                 //if(pDevice->bWPASuppWextEnabled == TRUE)
                                 {
@@ -889,31 +887,6 @@ RXbBulkInProcessData (
                                         wireless_send_event(pDevice->dev, IWEVMICHAELMICFAILURE, &wrqu, (char *)&ev);
 
                                 }
-         #endif
-
-
-                if ((pDevice->bWPADEVUp) && (pDevice->skb != NULL)) {
-                     wpahdr = (viawget_wpa_header *)pDevice->skb->data;
-                     if ((pMgmt->eCurrMode == WMAC_MODE_ESS_STA) &&
-                         (pMgmt->eCurrState == WMAC_STATE_ASSOC) &&
-                         (*pbyRsr & (RSR_ADDRBROAD | RSR_ADDRMULTI)) == 0) {
-                         //s802_11_Status.Flags = NDIS_802_11_AUTH_REQUEST_PAIRWISE_ERROR;
-                         wpahdr->type = VIAWGET_PTK_MIC_MSG;
-                     } else {
-                         //s802_11_Status.Flags = NDIS_802_11_AUTH_REQUEST_GROUP_ERROR;
-                         wpahdr->type = VIAWGET_GTK_MIC_MSG;
-                     }
-                     wpahdr->resp_ie_len = 0;
-                     wpahdr->req_ie_len = 0;
-                     skb_put(pDevice->skb, sizeof(viawget_wpa_header));
-                     pDevice->skb->dev = pDevice->wpadev;
-                     skb_reset_mac_header(pDevice->skb);
-                     pDevice->skb->pkt_type = PACKET_HOST;
-                     pDevice->skb->protocol = htons(ETH_P_802_2);
-                     memset(pDevice->skb->cb, 0, sizeof(pDevice->skb->cb));
-                     netif_rx(pDevice->skb);
-                     pDevice->skb = dev_alloc_skb((int)pDevice->rx_buf_sz);
-                 }
 
                 return FALSE;
 
@@ -1217,7 +1190,7 @@ static BOOL s_bHandleRxEncryption (
     if (byDecMode == KEY_CTL_WEP) {
         // handle WEP
         if ((pDevice->byLocalID <= REV_ID_VT3253_A1) ||
-            (((PSKeyTable)(pKey->pvKeyTable))->bSoftWEP == TRUE)) {
+                (((PSKeyTable)(&pKey->pvKeyTable))->bSoftWEP == TRUE)) {
             // Software WEP
             // 1. 3253A
             // 2. WEP 256
@@ -1238,7 +1211,7 @@ static BOOL s_bHandleRxEncryption (
 
         PayloadLen -= (WLAN_HDR_ADDR3_LEN + 8 + 4); // 24 is 802.11 header, 8 is IV&ExtIV, 4 is crc
         *pdwRxTSC47_16 = cpu_to_le32(*(PDWORD)(pbyIV + 4));
-        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"ExtIV: %lx\n",*pdwRxTSC47_16);
+        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"ExtIV: %x\n", *pdwRxTSC47_16);
         if (byDecMode == KEY_CTL_TKIP) {
             *pwRxTSC15_0 = cpu_to_le16(MAKEWORD(*(pbyIV+2), *pbyIV));
         } else {
@@ -1324,9 +1297,9 @@ static BOOL s_bHostWepRxEncryption (
 
     if (byDecMode == KEY_CTL_WEP) {
         // handle WEP
-        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"byDecMode == KEY_CTL_WEP \n");
+        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"byDecMode == KEY_CTL_WEP\n");
         if ((pDevice->byLocalID <= REV_ID_VT3253_A1) ||
-            (((PSKeyTable)(pKey->pvKeyTable))->bSoftWEP == TRUE) ||
+                (((PSKeyTable)(&pKey->pvKeyTable))->bSoftWEP == TRUE) ||
             (bOnFly == FALSE)) {
             // Software WEP
             // 1. 3253A
@@ -1349,7 +1322,7 @@ static BOOL s_bHostWepRxEncryption (
 
         PayloadLen -= (WLAN_HDR_ADDR3_LEN + 8 + 4); // 24 is 802.11 header, 8 is IV&ExtIV, 4 is crc
         *pdwRxTSC47_16 = cpu_to_le32(*(PDWORD)(pbyIV + 4));
-        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"ExtIV: %lx\n",*pdwRxTSC47_16);
+        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"ExtIV: %x\n", *pdwRxTSC47_16);
 
         if (byDecMode == KEY_CTL_TKIP) {
             *pwRxTSC15_0 = cpu_to_le16(MAKEWORD(*(pbyIV+2), *pbyIV));
@@ -1534,6 +1507,11 @@ RXvFreeRCB(
     ASSERT(!pRCB->Ref);     // should be 0
     ASSERT(pRCB->pDevice);  // shouldn't be NULL
 
+        if (bReAllocSkb == FALSE) {
+                kfree_skb(pRCB->skb);
+                bReAllocSkb = TRUE;
+        }
+
     if (bReAllocSkb == TRUE) {
         pRCB->skb = dev_alloc_skb((int)pDevice->rx_buf_sz);
         // todo error handling
diff --git a/drivers/staging/vt6656/firmware.c b/drivers/staging/vt6656/firmware.c
index 8c8126a3540b..8831ea03c001 100644
--- a/drivers/staging/vt6656/firmware.c
+++ b/drivers/staging/vt6656/firmware.c
@@ -61,28 +61,24 @@ FIRMWAREbDownload(
      PSDevice pDevice
     )
 {
+        struct device *dev = &pDevice->usb->dev;
         const struct firmware *fw;
         int NdisStatus;
         void *pBuffer = NULL;
         BOOL result = FALSE;
         u16 wLength;
-        int ii;
+        int ii, rc;
+
 
         DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"---->Download firmware\n");
         spin_unlock_irq(&pDevice->lock);
 
-        if (!pDevice->firmware) {
-                struct device *dev = &pDevice->usb->dev;
-                int rc;
-
-                rc = request_firmware(&pDevice->firmware, FIRMWARE_NAME, dev);
-                if (rc) {
-                        dev_err(dev, "firmware file %s request failed (%d)\n",
-                                FIRMWARE_NAME, rc);
+        rc = request_firmware(&fw, FIRMWARE_NAME, dev);
+        if (rc) {
+                dev_err(dev, "firmware file %s request failed (%d)\n",
+                        FIRMWARE_NAME, rc);
                         goto out;
-                }
         }
-        fw = pDevice->firmware;
 
         pBuffer = kmalloc(FIRMWARE_CHUNK_SIZE, GFP_KERNEL);
         if (!pBuffer)
@@ -103,10 +99,12 @@ FIRMWAREbDownload(
                 DBG_PRT(MSG_LEVEL_DEBUG,
                         KERN_INFO"Download firmware...%d %zu\n", ii, fw->size);
                 if (NdisStatus != STATUS_SUCCESS)
-                        goto out;
+                        goto free_fw;
         }
 
         result = TRUE;
+free_fw:
+        release_firmware(fw);
 
 out:
         kfree(pBuffer);
diff --git a/drivers/staging/vt6656/hostap.c b/drivers/staging/vt6656/hostap.c
index 0a73d4060ee1..26a7d0e4b048 100644
--- a/drivers/staging/vt6656/hostap.c
+++ b/drivers/staging/vt6656/hostap.c
@@ -542,9 +542,9 @@ static int hostap_set_encryption(PSDevice pDevice,
 
         if (param->u.crypt.seq) {
             memcpy(&abySeq, param->u.crypt.seq, 8);
-                for (ii = 0 ; ii < 8 ; ii++) {
-                 KeyRSC |= (abySeq[ii] << (ii * 8));
-                }
+                for (ii = 0 ; ii < 8 ; ii++)
+                        KeyRSC |= (unsigned long)abySeq[ii] << (ii * 8);
+
                 dwKeyIndex |= 1 << 29;
                 pMgmt->sNodeDBTable[iNodeIndex].KeyRSC = KeyRSC;
         }
diff --git a/drivers/staging/vt6656/int.h b/drivers/staging/vt6656/int.h
index 3734e2c953d9..5d8faf9f96ec 100644
--- a/drivers/staging/vt6656/int.h
+++ b/drivers/staging/vt6656/int.h
@@ -48,8 +48,8 @@ typedef struct tagSINTData {
         BYTE byTSR3;
         BYTE byPkt3;
         WORD wTime3;
-        DWORD dwLoTSF;
-        DWORD dwHiTSF;
+        u32 dwLoTSF;
+        u32 dwHiTSF;
         BYTE byISR0;
         BYTE byISR1;
         BYTE byRTSSuccess;
diff --git a/drivers/staging/vt6656/ioctl.c b/drivers/staging/vt6656/ioctl.c
deleted file mode 100644
index b6af5f691128..000000000000
--- a/drivers/staging/vt6656/ioctl.c
+++ /dev/null
@@ -1,648 +0,0 @@
-/*
- * Copyright (c) 1996, 2003 VIA Networking Technologies, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * File: ioctl.c
- *
- * Purpose:  private ioctl functions
- *
- * Author: Lyndon Chen
- *
- * Date: Auguest 20, 2003
- *
- * Functions:
- *
- * Revision History:
- *
- */
-
-#include "ioctl.h"
-#include "iocmd.h"
-#include "mac.h"
-#include "card.h"
-#include "hostap.h"
-#include "wpactl.h"
-#include "control.h"
-#include "rndis.h"
-#include "rf.h"
-
-SWPAResult wpa_Result;
-static int msglevel = MSG_LEVEL_INFO;
-
-int private_ioctl(PSDevice pDevice, struct ifreq *rq)
-{
-
-        PSCmdRequest    pReq = (PSCmdRequest)rq;
-        PSMgmtObject    pMgmt = &(pDevice->sMgmtObj);
-        int             result = 0;
-        PWLAN_IE_SSID   pItemSSID;
-        SCmdBSSJoin     sJoinCmd;
-        SCmdZoneTypeSet sZoneTypeCmd;
-        SCmdScan        sScanCmd;
-        SCmdStartAP     sStartAPCmd;
-        SCmdSetWEP      sWEPCmd;
-        SCmdValue       sValue;
-        SBSSIDList      sList;
-        SNodeList       sNodeList;
-        PSBSSIDList     pList;
-        PSNodeList      pNodeList;
-        unsigned int    cbListCount;
-        PKnownBSS       pBSS;
-        PKnownNodeDB    pNode;
-        unsigned int    ii, jj;
-        SCmdLinkStatus  sLinkStatus;
-        BYTE            abySuppRates[] = {WLAN_EID_SUPP_RATES, 4, 0x02, 0x04, 0x0B, 0x16};
-        BYTE            abyNullAddr[] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-        DWORD           dwKeyIndex = 0;
-        BYTE            abyScanSSID[WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1];
-        signed long     ldBm;
-
-        pReq->wResult = 0;
-
-        switch (pReq->wCmdCode) {
-        case WLAN_CMD_BSS_SCAN:
-                if (copy_from_user(&sScanCmd, pReq->data, sizeof(SCmdScan))) {
-                        result = -EFAULT;
-                        break;
-                }
-
-                pItemSSID = (PWLAN_IE_SSID)sScanCmd.ssid;
-                if (pItemSSID->len > WLAN_SSID_MAXLEN + 1)
-                        return -EINVAL;
-                if (pItemSSID->len != 0) {
-                        memset(abyScanSSID, 0, WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1);
-                        memcpy(abyScanSSID, pItemSSID, pItemSSID->len + WLAN_IEHDR_LEN);
-                }
-                spin_lock_irq(&pDevice->lock);
-
-                if (memcmp(pMgmt->abyCurrBSSID, &abyNullAddr[0], 6) == 0)
-                        BSSvClearBSSList(pDevice, FALSE);
-                else
-                        BSSvClearBSSList(pDevice, pDevice->bLinkPass);
-
-                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "WLAN_CMD_BSS_SCAN..begin\n");
-
-                if (pItemSSID->len != 0)
-                        bScheduleCommand(pDevice, WLAN_CMD_BSSID_SCAN,
-                                         abyScanSSID);
-                else
-                        bScheduleCommand(pDevice, WLAN_CMD_BSSID_SCAN, NULL);
-
-                spin_unlock_irq(&pDevice->lock);
-                break;
-
-        case WLAN_CMD_ZONETYPE_SET:
-                result = -EOPNOTSUPP;
-                break;
-
-                if (copy_from_user(&sZoneTypeCmd, pReq->data, sizeof(SCmdZoneTypeSet))) {
-                        result = -EFAULT;
-                        break;
-                }
-
-                if (sZoneTypeCmd.bWrite == TRUE) {
-                        /* write zonetype */
-                        if (sZoneTypeCmd.ZoneType == ZoneType_USA) {
-                                /* set to USA */
-                                printk("set_ZoneType:USA\n");
-                        } else if (sZoneTypeCmd.ZoneType == ZoneType_Japan) {
-                                /* set to Japan */
-                                printk("set_ZoneType:Japan\n");
-                        } else if (sZoneTypeCmd.ZoneType == ZoneType_Europe) {
-                                /* set to Europe */
-                                printk("set_ZoneType:Europe\n");
-                        }
-                } else {
-                        /* read zonetype */
-                        BYTE zonetype = 0;
-
-                        if (zonetype == 0x00) {        /* USA */
-                                sZoneTypeCmd.ZoneType = ZoneType_USA;
-                        } else if (zonetype == 0x01) { /* Japan */
-                                sZoneTypeCmd.ZoneType = ZoneType_Japan;
-                        } else if (zonetype == 0x02) { /* Europe */
-                                sZoneTypeCmd.ZoneType = ZoneType_Europe;
-                        } else {                       /* Unknown ZoneType */
-                                printk("Error:ZoneType[%x] Unknown ???\n", zonetype);
-                                result = -EFAULT;
-                                break;
-                        }
-
-                        if (copy_to_user(pReq->data, &sZoneTypeCmd,
-                                                sizeof(SCmdZoneTypeSet))) {
-                                result = -EFAULT;
-                                break;
-                        }
-                }
-                break;
-
-        case WLAN_CMD_BSS_JOIN:
-                if (copy_from_user(&sJoinCmd, pReq->data, sizeof(SCmdBSSJoin))) {
-                        result = -EFAULT;
-                        break;
-                }
-
-                pItemSSID = (PWLAN_IE_SSID)sJoinCmd.ssid;
-                if (pItemSSID->len > WLAN_SSID_MAXLEN + 1)
-                        return -EINVAL;
-                memset(pMgmt->abyDesireSSID, 0, WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1);
-                memcpy(pMgmt->abyDesireSSID, pItemSSID, pItemSSID->len + WLAN_IEHDR_LEN);
-                if (sJoinCmd.wBSSType == ADHOC) {
-                        pMgmt->eConfigMode = WMAC_CONFIG_IBSS_STA;
-                        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "ioct set to adhoc mode\n");
-                } else {
-                        pMgmt->eConfigMode = WMAC_CONFIG_ESS_STA;
-                        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "ioct set to STA mode\n");
-                }
-                if (sJoinCmd.bPSEnable == TRUE) {
-                        pDevice->ePSMode = WMAC_POWER_FAST;
-                        pMgmt->wListenInterval = 2;
-                        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Power Saving On\n");
-                } else {
-                        pDevice->ePSMode = WMAC_POWER_CAM;
-                        pMgmt->wListenInterval = 1;
-                        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Power Saving Off\n");
-                }
-
-                if (sJoinCmd.bShareKeyAuth == TRUE) {
-                        pMgmt->bShareKeyAlgorithm = TRUE;
-                        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Share Key\n");
-                } else {
-                        pMgmt->bShareKeyAlgorithm = FALSE;
-                        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Open System\n");
-                }
-
-                pDevice->uChannel = sJoinCmd.uChannel;
-                netif_stop_queue(pDevice->dev);
-                spin_lock_irq(&pDevice->lock);
-                pMgmt->eCurrState = WMAC_STATE_IDLE;
-                bScheduleCommand(pDevice, WLAN_CMD_BSSID_SCAN,
-                                 pMgmt->abyDesireSSID);
-                bScheduleCommand(pDevice, WLAN_CMD_SSID, NULL);
-                spin_unlock_irq(&pDevice->lock);
-                break;
-
-        case WLAN_CMD_SET_WEP:
-                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "WLAN_CMD_SET_WEP Key.\n");
-                memset(&sWEPCmd, 0, sizeof(SCmdSetWEP));
-                if (copy_from_user(&sWEPCmd, pReq->data, sizeof(SCmdSetWEP))) {
-                        result = -EFAULT;
-                        break;
-                }
-                if (sWEPCmd.bEnableWep != TRUE) {
-                        int uu;
-
-                        pDevice->bEncryptionEnable = FALSE;
-                        pDevice->eEncryptionStatus = Ndis802_11EncryptionDisabled;
-                        spin_lock_irq(&pDevice->lock);
-                        for (uu = 0; uu < MAX_KEY_TABLE; uu++)
-                                MACvDisableKeyEntry(pDevice, uu);
-                        spin_unlock_irq(&pDevice->lock);
-                        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "WEP function disable.\n");
-                        break;
-                }
-
-                for (ii = 0; ii < WLAN_WEP_NKEYS; ii++) {
-                        if (sWEPCmd.bWepKeyAvailable[ii]) {
-                                if (ii == sWEPCmd.byKeyIndex)
-                                        dwKeyIndex = ii | (1 << 31);
-                                else
-                                        dwKeyIndex = ii;
-                                spin_lock_irq(&pDevice->lock);
-                                KeybSetDefaultKey(pDevice, &(pDevice->sKey),
-                                                  dwKeyIndex,
-                                                  sWEPCmd.auWepKeyLength[ii],
-                                                  NULL,
-                                                  (PBYTE)&sWEPCmd.abyWepKey[ii][0],
-                                                  KEY_CTL_WEP);
-                                spin_unlock_irq(&pDevice->lock);
-                        }
-                }
-                pDevice->byKeyIndex = sWEPCmd.byKeyIndex;
-                pDevice->bTransmitKey = TRUE;
-                pDevice->bEncryptionEnable = TRUE;
-                pDevice->eEncryptionStatus = Ndis802_11Encryption1Enabled;
-                break;
-
-        case WLAN_CMD_GET_LINK:
-                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "WLAN_CMD_GET_LINK status.\n");
-
-                memset(sLinkStatus.abySSID, 0, WLAN_SSID_MAXLEN + 1);
-
-                if (pMgmt->eCurrMode == WMAC_MODE_IBSS_STA)
-                        sLinkStatus.wBSSType = ADHOC;
-                else
-                        sLinkStatus.wBSSType = INFRA;
-
-                if (pMgmt->eCurrState == WMAC_STATE_JOINTED)
-                        sLinkStatus.byState = ADHOC_JOINTED;
-                else
-                        sLinkStatus.byState = ADHOC_STARTED;
-
-                sLinkStatus.uChannel = pMgmt->uCurrChannel;
-                if (pDevice->bLinkPass == TRUE) {
-                        sLinkStatus.bLink = TRUE;
-                        pItemSSID = (PWLAN_IE_SSID)pMgmt->abyCurrSSID;
-                        memcpy(sLinkStatus.abySSID, pItemSSID->abySSID, pItemSSID->len);
-                        memcpy(sLinkStatus.abyBSSID, pMgmt->abyCurrBSSID, WLAN_BSSID_LEN);
-                        sLinkStatus.uLinkRate = pMgmt->sNodeDBTable[0].wTxDataRate;
-                        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Link Success!\n");
-                } else {
-                        sLinkStatus.bLink = FALSE;
-                        sLinkStatus.uLinkRate = 0;
-                }
-                if (copy_to_user(pReq->data, &sLinkStatus,
-                                        sizeof(SCmdLinkStatus))) {
-                        result = -EFAULT;
-                        break;
-                }
-                break;
-
-        case WLAN_CMD_GET_LISTLEN:
-                cbListCount = 0;
-                pBSS = &(pMgmt->sBSSList[0]);
-                for (ii = 0; ii < MAX_BSS_NUM; ii++) {
-                        pBSS = &(pMgmt->sBSSList[ii]);
-                        if (!pBSS->bActive)
-                                continue;
-                        cbListCount++;
-                }
-                sList.uItem = cbListCount;
-                if (copy_to_user(pReq->data, &sList, sizeof(SBSSIDList))) {
-                        result = -EFAULT;
-                        break;
-                }
-                pReq->wResult = 0;
-                break;
-
-        case WLAN_CMD_GET_LIST:
-                if (copy_from_user(&sList, pReq->data, sizeof(SBSSIDList))) {
-                        result = -EFAULT;
-                        break;
-                }
-                if (sList.uItem > (ULONG_MAX - sizeof(SBSSIDList)) / sizeof(SBSSIDItem)) {
-                        result = -EINVAL;
-                        break;
-                }
-                pList = kmalloc(sizeof(SBSSIDList) + (sList.uItem * sizeof(SBSSIDItem)), GFP_ATOMIC);
-                if (pList == NULL) {
-                        result = -ENOMEM;
-                        break;
-                }
-                pList->uItem = sList.uItem;
-                pBSS = &(pMgmt->sBSSList[0]);
-                for (ii = 0, jj = 0; jj < MAX_BSS_NUM ; jj++) {
-                        pBSS = &(pMgmt->sBSSList[jj]);
-                        if (pBSS->bActive) {
-                                pList->sBSSIDList[ii].uChannel = pBSS->uChannel;
-                                pList->sBSSIDList[ii].wBeaconInterval = pBSS->wBeaconInterval;
-                                pList->sBSSIDList[ii].wCapInfo = pBSS->wCapInfo;
-                                RFvRSSITodBm(pDevice, (BYTE)(pBSS->uRSSI), &ldBm);
-                                pList->sBSSIDList[ii].uRSSI = (unsigned int)ldBm;
-                                /* pList->sBSSIDList[ii].uRSSI = pBSS->uRSSI; */
-                                memcpy(pList->sBSSIDList[ii].abyBSSID, pBSS->abyBSSID, WLAN_BSSID_LEN);
-                                pItemSSID = (PWLAN_IE_SSID)pBSS->abySSID;
-                                memset(pList->sBSSIDList[ii].abySSID, 0, WLAN_SSID_MAXLEN + 1);
-                                memcpy(pList->sBSSIDList[ii].abySSID, pItemSSID->abySSID, pItemSSID->len);
-                                if (WLAN_GET_CAP_INFO_ESS(pBSS->wCapInfo)) {
-                                        pList->sBSSIDList[ii].byNetType = INFRA;
-                                } else {
-                                        pList->sBSSIDList[ii].byNetType = ADHOC;
-                                }
-                                if (WLAN_GET_CAP_INFO_PRIVACY(pBSS->wCapInfo)) {
-                                        pList->sBSSIDList[ii].bWEPOn = TRUE;
-                                } else {
-                                        pList->sBSSIDList[ii].bWEPOn = FALSE;
-                                }
-                                ii++;
-                                if (ii >= pList->uItem)
-                                        break;
-                        }
-                }
-
-                if (copy_to_user(pReq->data, pList, sizeof(SBSSIDList) + (sList.uItem * sizeof(SBSSIDItem)))) {
-                        result = -EFAULT;
-                        break;
-                }
-                kfree(pList);
-                pReq->wResult = 0;
-                break;
-
-        case WLAN_CMD_GET_MIB:
-                if (copy_to_user(pReq->data, &(pDevice->s802_11Counter), sizeof(SDot11MIBCount))) {
-                        result = -EFAULT;
-                        break;
-                }
-                break;
-
-        case WLAN_CMD_GET_STAT:
-                if (copy_to_user(pReq->data, &(pDevice->scStatistic), sizeof(SStatCounter))) {
-                        result = -EFAULT;
-                        break;
-                }
-                break;
-
-        case WLAN_CMD_STOP_MAC:
-                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "WLAN_CMD_STOP_MAC\n");
-                /* Todo xxxxxx */
-                netif_stop_queue(pDevice->dev);
-                spin_lock_irq(&pDevice->lock);
-                if (pDevice->bRadioOff == FALSE) {
-                        CARDbRadioPowerOff(pDevice);
-                }
-                pDevice->bLinkPass = FALSE;
-                ControlvMaskByte(pDevice, MESSAGE_REQUEST_MACREG, MAC_REG_PAPEDELAY, LEDSTS_STS, LEDSTS_SLOW);
-                memset(pMgmt->abyCurrBSSID, 0, 6);
-                pMgmt->eCurrState = WMAC_STATE_IDLE;
-                /* del_timer(&pDevice->sTimerCommand); */
-                /* del_timer(&pMgmt->sTimerSecondCallback); */
-                pDevice->bCmdRunning = FALSE;
-                spin_unlock_irq(&pDevice->lock);
-                break;
-
-        case WLAN_CMD_START_MAC:
-                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "WLAN_CMD_START_MAC\n");
-                /* Todo xxxxxxx */
-                if (pDevice->bRadioOff == TRUE)
-                        CARDbRadioPowerOn(pDevice);
-                break;
-
-        case WLAN_CMD_SET_HOSTAPD:
-                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "WLAN_CMD_SET_HOSTAPD\n");
-
-                if (copy_from_user(&sValue, pReq->data, sizeof(SCmdValue))) {
-                        result = -EFAULT;
-                        break;
-                }
-                if (sValue.dwValue == 1) {
-                        if (vt6656_hostap_set_hostapd(pDevice, 1, 1) == 0) {
-                                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Enable HOSTAP\n");
-                        } else {
-                                result = -EFAULT;
-                                break;
-                        }
-                } else {
-                        vt6656_hostap_set_hostapd(pDevice, 0, 1);
-                        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Disable HOSTAP\n");
-                }
-                break;
-
-        case WLAN_CMD_SET_HOSTAPD_STA:
-                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "WLAN_CMD_SET_HOSTAPD_STA\n");
-                break;
-
-        case WLAN_CMD_SET_802_1X:
-                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "WLAN_CMD_SET_802_1X\n");
-                if (copy_from_user(&sValue, pReq->data, sizeof(SCmdValue))) {
-                        result = -EFAULT;
-                        break;
-                }
-
-                if (sValue.dwValue == 1) {
-                        pDevice->bEnable8021x = TRUE;
-                        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Enable 802.1x\n");
-                } else {
-                        pDevice->bEnable8021x = FALSE;
-                        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Disable 802.1x\n");
-                }
-                break;
-
-        case WLAN_CMD_SET_HOST_WEP:
-                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "WLAN_CMD_SET_HOST_WEP\n");
-                if (copy_from_user(&sValue, pReq->data, sizeof(SCmdValue))) {
-                        result = -EFAULT;
-                        break;
-                }
-
-                if (sValue.dwValue == 1) {
-                        pDevice->bEnableHostWEP = TRUE;
-                        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Enable HostWEP\n");
-                } else {
-                        pDevice->bEnableHostWEP = FALSE;
-                        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Disable HostWEP\n");
-                }
-                break;
-
-        case WLAN_CMD_SET_WPA:
-                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "WLAN_CMD_SET_WPA\n");
-
-                if (copy_from_user(&sValue, pReq->data, sizeof(SCmdValue))) {
-                        result = -EFAULT;
-                        break;
-                }
-                if (sValue.dwValue == 1) {
-                        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "up wpadev\n");
-                        memcpy(pDevice->wpadev->dev_addr, pDevice->dev->dev_addr,
-                               ETH_ALEN);
-                        pDevice->bWPADEVUp = TRUE;
-                } else {
-                        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "close wpadev\n");
-                        pDevice->bWPADEVUp = FALSE;
-                }
-                break;
-
-        case WLAN_CMD_AP_START:
-                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "WLAN_CMD_AP_START\n");
-                if (pDevice->bRadioOff == TRUE) {
-                        CARDbRadioPowerOn(pDevice);
-                        add_timer(&pMgmt->sTimerSecondCallback);
-                }
-                if (copy_from_user(&sStartAPCmd, pReq->data, sizeof(SCmdStartAP))) {
-                        result = -EFAULT;
-                        break;
-                }
-
-                if (sStartAPCmd.wBSSType == AP) {
-                        pMgmt->eConfigMode = WMAC_CONFIG_AP;
-                        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "ioct set to AP mode\n");
-                } else {
-                        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "ioct BSS type not set to AP mode\n");
-                        result = -EFAULT;
-                        break;
-                }
-
-                if (sStartAPCmd.wBBPType == PHY80211g) {
-                        pMgmt->byAPBBType = PHY_TYPE_11G;
-                } else if (sStartAPCmd.wBBPType == PHY80211a) {
-                        pMgmt->byAPBBType = PHY_TYPE_11A;
-                } else {
-                        pMgmt->byAPBBType = PHY_TYPE_11B;
-                }
-
-                pItemSSID = (PWLAN_IE_SSID)sStartAPCmd.ssid;
-                if (pItemSSID->len > WLAN_SSID_MAXLEN + 1)
-                        return -EINVAL;
-                memset(pMgmt->abyDesireSSID, 0, WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1);
-                memcpy(pMgmt->abyDesireSSID, pItemSSID, pItemSSID->len + WLAN_IEHDR_LEN);
-
-                if ((sStartAPCmd.uChannel > 0) && (sStartAPCmd.uChannel <= 14))
-                        pDevice->uChannel = sStartAPCmd.uChannel;
-
-                if ((sStartAPCmd.uBeaconInt >= 20) && (sStartAPCmd.uBeaconInt <= 1000))
-                        pMgmt->wIBSSBeaconPeriod = sStartAPCmd.uBeaconInt;
-                else
-                        pMgmt->wIBSSBeaconPeriod = 100;
-
-                if (sStartAPCmd.bShareKeyAuth == TRUE) {
-                        pMgmt->bShareKeyAlgorithm = TRUE;
-                        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Share Key\n");
-                } else {
-                        pMgmt->bShareKeyAlgorithm = FALSE;
-                        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Open System\n");
-                }
-                memcpy(pMgmt->abyIBSSSuppRates, abySuppRates, 6);
-
-                if (sStartAPCmd.byBasicRate & BIT3) {
-                        pMgmt->abyIBSSSuppRates[2] |= BIT7;
-                        pMgmt->abyIBSSSuppRates[3] |= BIT7;
-                        pMgmt->abyIBSSSuppRates[4] |= BIT7;
-                        pMgmt->abyIBSSSuppRates[5] |= BIT7;
-                } else if (sStartAPCmd.byBasicRate & BIT2) {
-                        pMgmt->abyIBSSSuppRates[2] |= BIT7;
-                        pMgmt->abyIBSSSuppRates[3] |= BIT7;
-                        pMgmt->abyIBSSSuppRates[4] |= BIT7;
-                } else if (sStartAPCmd.byBasicRate & BIT1) {
-                        pMgmt->abyIBSSSuppRates[2] |= BIT7;
-                        pMgmt->abyIBSSSuppRates[3] |= BIT7;
-                } else if (sStartAPCmd.byBasicRate & BIT1) {
-                        pMgmt->abyIBSSSuppRates[2] |= BIT7;
-                } else {
-                        /* default 1,2M */
-                        pMgmt->abyIBSSSuppRates[2] |= BIT7;
-                        pMgmt->abyIBSSSuppRates[3] |= BIT7;
-                }
-
-                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Support Rate= %*ph\n",
-                        4, pMgmt->abyIBSSSuppRates + 2);
-
-                netif_stop_queue(pDevice->dev);
-                spin_lock_irq(&pDevice->lock);
-                bScheduleCommand(pDevice, WLAN_CMD_RUN_AP, NULL);
-                spin_unlock_irq(&pDevice->lock);
-                break;
-
-        case WLAN_CMD_GET_NODE_CNT:
-                cbListCount = 0;
-                pNode = &(pMgmt->sNodeDBTable[0]);
-                for (ii = 0; ii < (MAX_NODE_NUM + 1); ii++) {
-                        pNode = &(pMgmt->sNodeDBTable[ii]);
-                        if (!pNode->bActive)
-                                continue;
-                        cbListCount++;
-                }
-
-                sNodeList.uItem = cbListCount;
-                if (copy_to_user(pReq->data, &sNodeList, sizeof(SNodeList))) {
-                        result = -EFAULT;
-                        break;
-                }
-                pReq->wResult = 0;
-                break;
-
-        case WLAN_CMD_GET_NODE_LIST:
-                if (copy_from_user(&sNodeList, pReq->data, sizeof(SNodeList))) {
-                        result = -EFAULT;
-                        break;
-                }
-                if (sNodeList.uItem > (ULONG_MAX - sizeof(SNodeList)) / sizeof(SNodeItem)) {
-                        result = -ENOMEM;
-                        break;
-                }
-                pNodeList = kmalloc(sizeof(SNodeList) + (sNodeList.uItem * sizeof(SNodeItem)), GFP_ATOMIC);
-                if (pNodeList == NULL) {
-                        result = -ENOMEM;
-                        break;
-                }
-                pNodeList->uItem = sNodeList.uItem;
-                pNode = &(pMgmt->sNodeDBTable[0]);
-                for (ii = 0, jj = 0; ii < (MAX_NODE_NUM + 1); ii++) {
-                        pNode = &(pMgmt->sNodeDBTable[ii]);
-                        if (pNode->bActive) {
-                                pNodeList->sNodeList[jj].wAID = pNode->wAID;
-                                memcpy(pNodeList->sNodeList[jj].abyMACAddr, pNode->abyMACAddr, WLAN_ADDR_LEN);
-                                pNodeList->sNodeList[jj].wTxDataRate = pNode->wTxDataRate;
-                                pNodeList->sNodeList[jj].wInActiveCount = (WORD)pNode->uInActiveCount;
-                                pNodeList->sNodeList[jj].wEnQueueCnt = (WORD)pNode->wEnQueueCnt;
-                                pNodeList->sNodeList[jj].wFlags = (WORD)pNode->dwFlags;
-                                pNodeList->sNodeList[jj].bPWBitOn = pNode->bPSEnable;
-                                pNodeList->sNodeList[jj].byKeyIndex = pNode->byKeyIndex;
-                                pNodeList->sNodeList[jj].wWepKeyLength = pNode->uWepKeyLength;
-                                memcpy(&(pNodeList->sNodeList[jj].abyWepKey[0]), &(pNode->abyWepKey[0]), WEP_KEYMAXLEN);
-                                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "key= %2.2X:%2.2X:%2.2X:%2.2X:%2.2X\n",
-                                        pNodeList->sNodeList[jj].abyWepKey[0],
-                                        pNodeList->sNodeList[jj].abyWepKey[1],
-                                        pNodeList->sNodeList[jj].abyWepKey[2],
-                                        pNodeList->sNodeList[jj].abyWepKey[3],
-                                        pNodeList->sNodeList[jj].abyWepKey[4]);
-                                pNodeList->sNodeList[jj].bIsInFallback = pNode->bIsInFallback;
-                                pNodeList->sNodeList[jj].uTxFailures = pNode->uTxFailures;
-                                pNodeList->sNodeList[jj].uTxAttempts = pNode->uTxAttempts;
-                                pNodeList->sNodeList[jj].wFailureRatio = (WORD)pNode->uFailureRatio;
-                                jj++;
-                                if (jj >= pNodeList->uItem)
-                                        break;
-                        }
-                }
-                if (copy_to_user(pReq->data, pNodeList, sizeof(SNodeList) + (sNodeList.uItem * sizeof(SNodeItem)))) {
-                        kfree(pNodeList);
-                        result = -EFAULT;
-                        break;
-                }
-                kfree(pNodeList);
-                pReq->wResult = 0;
-                break;
-
-        case 0xFF:
-                memset(wpa_Result.ifname, 0, sizeof(wpa_Result.ifname));
-                wpa_Result.proto = 0;
-                wpa_Result.key_mgmt = 0;
-                wpa_Result.eap_type = 0;
-                wpa_Result.authenticated = FALSE;
-                pDevice->fWPA_Authened = FALSE;
-                if (copy_from_user(&wpa_Result, pReq->data, sizeof(wpa_Result))) {
-                        result = -EFAULT;
-                        break;
-                }
-                /* for some AP's maybe a good authentication */
-                if (wpa_Result.key_mgmt == 0x20)
-                        pMgmt->Cisco_cckm = 1;
-                else
-                        pMgmt->Cisco_cckm = 0;
-
-                if (wpa_Result.authenticated == TRUE) {
-                        {
-                                union iwreq_data wrqu;
-
-                                pItemSSID = (PWLAN_IE_SSID)pMgmt->abyCurrSSID;
-                                memset(&wrqu, 0, sizeof(wrqu));
-                                wrqu.data.flags = RT_WPACONNECTED_EVENT_FLAG;
-                                wrqu.data.length = pItemSSID->len;
-                                wireless_send_event(pDevice->dev, IWEVCUSTOM, &wrqu, pItemSSID->abySSID);
-                        }
-
-                        pDevice->fWPA_Authened = TRUE; /* is successful peer to wpa_Result.authenticated? */
-                }
-
-                pReq->wResult = 0;
-                break;
-
-        default:
-                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Private command not supported..\n");
-        }
-
-        return result;
-}
diff --git a/drivers/staging/vt6656/ioctl.h b/drivers/staging/vt6656/ioctl.h
deleted file mode 100644
index caa4ac963d93..000000000000
--- a/drivers/staging/vt6656/ioctl.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 1996, 2003 VIA Networking Technologies, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * File: hostap.h
- *
- * Purpose:
- *
- * Author: Lyndon Chen
- *
- * Date: May 21, 2003
- *
- */
-
-#ifndef __IOCTL_H__
-#define __IOCTL_H__
-
-#include "device.h"
-
-/*---------------------  Export Definitions -------------------------*/
-
-
-/*---------------------  Export Classes  ----------------------------*/
-
-/*---------------------  Export Variables  --------------------------*/
-
-/*---------------------  Export Functions  --------------------------*/
-
-int private_ioctl(PSDevice pDevice, struct ifreq *rq);
-
-/*
-void vConfigWEPKey (
-     PSDevice pDevice,
-     DWORD    dwKeyIndex,
-     PBYTE    pbyKey,
-     unsigned long    uKeyLength
-    );
-*/
-
-#endif /* __IOCTL_H__ */
diff --git a/drivers/staging/vt6656/iwctl.c b/drivers/staging/vt6656/iwctl.c
index 8f198749ca51..52fce6902508 100644
--- a/drivers/staging/vt6656/iwctl.c
+++ b/drivers/staging/vt6656/iwctl.c
@@ -31,26 +31,17 @@
  */
 
 #include "device.h"
-#include "ioctl.h"
-#include "iocmd.h"
+#include "iwctl.h"
 #include "mac.h"
 #include "card.h"
 #include "hostap.h"
 #include "power.h"
 #include "rf.h"
-
-#ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
 #include "iowpa.h"
 #include "wpactl.h"
-#endif
-
-#include <net/iw_handler.h>
+#include "control.h"
+#include "rndis.h"
 
-#ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
-#define SUPPORTED_WIRELESS_EXT 18
-#else
-#define SUPPORTED_WIRELESS_EXT 17
-#endif
 
 static const long frequency_list[] = {
         2412, 2417, 2422, 2427, 2432, 2437, 2442, 2447, 2452, 2457, 2462, 2467, 2472, 2484,
@@ -88,9 +79,9 @@ struct iw_statistics *iwctl_get_wireless_stats(struct net_device *dev)
  * Wireless Handler: get protocol name
  */
 int iwctl_giwname(struct net_device *dev, struct iw_request_info *info,
-                char *wrq, char *extra)
+                union iwreq_data *wrqu, char *extra)
 {
-        strcpy(wrq, "802.11-a/b/g");
+        strcpy(wrqu->name, "802.11-a/b/g");
         return 0;
 }
 
@@ -98,9 +89,10 @@ int iwctl_giwname(struct net_device *dev, struct iw_request_info *info,
  * Wireless Handler: set scan
  */
 int iwctl_siwscan(struct net_device *dev, struct iw_request_info *info,
-                struct iw_point *wrq, char *extra)
+                union iwreq_data *wrqu, char *extra)
 {
         PSDevice pDevice = netdev_priv(dev);
+        struct iw_point *wrq = &wrqu->data;
         PSMgmtObject pMgmt = &(pDevice->sMgmtObj);
         struct iw_scan_req *req = (struct iw_scan_req *)extra;
         BYTE abyScanSSID[WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1];
@@ -109,7 +101,10 @@ int iwctl_siwscan(struct net_device *dev, struct iw_request_info *info,
         if (!(pDevice->flags & DEVICE_FLAGS_OPENED))
                 return -EINVAL;
 
-        PRINT_K(" SIOCSIWSCAN \n");
+        PRINT_K(" SIOCSIWSCAN\n");
+
+        if (pMgmt == NULL)
+                return -EFAULT;
 
         if (pMgmt->eScanState ==  WMAC_IS_SCANNING) {
                 // In scanning..
@@ -137,9 +132,9 @@ int iwctl_siwscan(struct net_device *dev, struct iw_request_info *info,
                         pItemSSID = (PWLAN_IE_SSID)abyScanSSID;
                         pItemSSID->byElementID = WLAN_EID_SSID;
                         memcpy(pItemSSID->abySSID, req->essid, (int)req->essid_len);
-                        if (pItemSSID->abySSID[req->essid_len - 1] == '\0') {
+                        if (pItemSSID->abySSID[req->essid_len] == '\0') {
                                 if (req->essid_len > 0)
-                                        pItemSSID->len = req->essid_len - 1;
+                                        pItemSSID->len = req->essid_len;
                         } else {
                                 pItemSSID->len = req->essid_len;
                         }
@@ -168,8 +163,9 @@ int iwctl_siwscan(struct net_device *dev, struct iw_request_info *info,
  * Wireless Handler : get scan results
  */
 int iwctl_giwscan(struct net_device *dev, struct iw_request_info *info,
-                struct iw_point *wrq, char *extra)
+                union iwreq_data *wrqu, char *extra)
 {
+        struct iw_point *wrq = &wrqu->data;
         int ii;
         int jj;
         int kk;
@@ -184,10 +180,12 @@ int iwctl_giwscan(struct net_device *dev, struct iw_request_info *info,
         char *current_val = NULL;
         struct iw_event iwe;
         long ldBm;
-        char buf[MAX_WPA_IE_LEN * 2 + 30];
 
         DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWSCAN\n");
 
+        if (pMgmt == NULL)
+                return -EFAULT;
+
         if (pMgmt->eScanState ==  WMAC_IS_SCANNING) {
                 // In scanning..
                 return -EAGAIN;
@@ -286,12 +284,6 @@ int iwctl_giwscan(struct net_device *dev, struct iw_request_info *info,
                         if ((current_val - current_ev) > IW_EV_LCP_LEN)
                                 current_ev = current_val;
 
-                        memset(&iwe, 0, sizeof(iwe));
-                        iwe.cmd = IWEVCUSTOM;
-                        sprintf(buf, "bcn_int=%d", pBSS->wBeaconInterval);
-                        iwe.u.data.length = strlen(buf);
-                        current_ev = iwe_stream_add_point(info, current_ev, end_buf, &iwe, buf);
-
                         if ((pBSS->wWPALen > 0) && (pBSS->wWPALen <= MAX_WPA_IE_LEN)) {
                                 memset(&iwe, 0, sizeof(iwe));
                                 iwe.cmd = IWEVGENIE;
@@ -315,12 +307,13 @@ int iwctl_giwscan(struct net_device *dev, struct iw_request_info *info,
  * Wireless Handler: set frequence or channel
  */
 int iwctl_siwfreq(struct net_device *dev, struct iw_request_info *info,
-                struct iw_freq *wrq, char *extra)
+                union iwreq_data *wrqu, char *extra)
 {
         PSDevice pDevice = netdev_priv(dev);
+        struct iw_freq *wrq = &wrqu->freq;
         int rc = 0;
 
-        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWFREQ \n");
+        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWFREQ\n");
 
         // If setting by frequency, convert to a channel
         if ((wrq->e == 1) && (wrq->m >= (int)2.412e8) &&
@@ -353,12 +346,17 @@ int iwctl_siwfreq(struct net_device *dev, struct iw_request_info *info,
  * Wireless Handler: get frequence or channel
  */
 int iwctl_giwfreq(struct net_device *dev, struct iw_request_info *info,
-                struct iw_freq *wrq, char *extra)
+                union iwreq_data *wrqu, char *extra)
 {
         PSDevice pDevice = netdev_priv(dev);
+        struct iw_freq *wrq = &wrqu->freq;
         PSMgmtObject pMgmt = &(pDevice->sMgmtObj);
 
-        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWFREQ \n");
+        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWFREQ\n");
+
+        if (pMgmt == NULL)
+                return -EFAULT;
+
 
 #ifdef WEXT_USECHANNELS
         wrq->m = (int)pMgmt->uCurrChannel;
@@ -379,16 +377,21 @@ int iwctl_giwfreq(struct net_device *dev, struct iw_request_info *info,
  * Wireless Handler: set operation mode
  */
 int iwctl_siwmode(struct net_device *dev, struct iw_request_info *info,
-                __u32 *wmode, char *extra)
+                union iwreq_data *wrqu, char *extra)
 {
         PSDevice pDevice = netdev_priv(dev);
+        __u32 *wmode = &wrqu->mode;
         PSMgmtObject pMgmt = &(pDevice->sMgmtObj);
         int rc = 0;
 
-        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWMODE \n");
+        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWMODE\n");
+
+        if (pMgmt == NULL)
+                return -EFAULT;
 
         if (pMgmt->eCurrMode == WMAC_MODE_ESS_AP && pDevice->bEnableHostapd) {
-                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Can't set operation mode, hostapd is running \n");
+                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO
+                        "Can't set operation mode, hostapd is running\n");
                 return rc;
         }
 
@@ -432,19 +435,72 @@ int iwctl_siwmode(struct net_device *dev, struct iw_request_info *info,
                 rc = -EINVAL;
         }
 
+        if (pDevice->bCommit) {
+                if (pMgmt->eConfigMode == WMAC_CONFIG_AP) {
+                        netif_stop_queue(pDevice->dev);
+                        spin_lock_irq(&pDevice->lock);
+                        bScheduleCommand((void *) pDevice,
+                                WLAN_CMD_RUN_AP, NULL);
+                        spin_unlock_irq(&pDevice->lock);
+                } else {
+                        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO
+                                "Commit the settings\n");
+
+                        spin_lock_irq(&pDevice->lock);
+
+                        if (pDevice->bLinkPass &&
+                                memcmp(pMgmt->abyCurrSSID,
+                                        pMgmt->abyDesireSSID,
+                                        WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN)) {
+                                bScheduleCommand((void *) pDevice,
+                                        WLAN_CMD_DISASSOCIATE, NULL);
+                        } else {
+                                pDevice->bLinkPass = FALSE;
+                                pMgmt->eCurrState = WMAC_STATE_IDLE;
+                                memset(pMgmt->abyCurrBSSID, 0, 6);
+                        }
+
+                        ControlvMaskByte(pDevice,
+                                MESSAGE_REQUEST_MACREG, MAC_REG_PAPEDELAY,
+                                        LEDSTS_STS, LEDSTS_SLOW);
+
+                        netif_stop_queue(pDevice->dev);
+
+                        pMgmt->eScanType = WMAC_SCAN_ACTIVE;
+
+                        if (!pDevice->bWPASuppWextEnabled)
+                                bScheduleCommand((void *) pDevice,
+                                         WLAN_CMD_BSSID_SCAN,
+                                         pMgmt->abyDesireSSID);
+
+                        bScheduleCommand((void *) pDevice,
+                                 WLAN_CMD_SSID,
+                                 NULL);
+
+                        spin_unlock_irq(&pDevice->lock);
+                }
+                pDevice->bCommit = FALSE;
+        }
+
+
         return rc;
 }
 
 /*
  * Wireless Handler: get operation mode
  */
-void iwctl_giwmode(struct net_device *dev, struct iw_request_info *info,
-                __u32 *wmode, char *extra)
+int iwctl_giwmode(struct net_device *dev, struct iw_request_info *info,
+                union iwreq_data *wrqu, char *extra)
 {
         PSDevice pDevice = netdev_priv(dev);
+        __u32 *wmode = &wrqu->mode;
         PSMgmtObject pMgmt = &(pDevice->sMgmtObj);
 
-        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWMODE \n");
+        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWMODE\n");
+
+        if (pMgmt == NULL)
+                return -EFAULT;
+
         // If not managed, assume it's ad-hoc
         switch (pMgmt->eConfigMode) {
         case WMAC_CONFIG_ESS_STA:
@@ -462,14 +518,17 @@ void iwctl_giwmode(struct net_device *dev, struct iw_request_info *info,
         default:
                 *wmode = IW_MODE_ADHOC;
         }
+
+        return 0;
 }
 
 /*
  * Wireless Handler: get capability range
  */
-void iwctl_giwrange(struct net_device *dev, struct iw_request_info *info,
-                struct iw_point *wrq, char *extra)
+int iwctl_giwrange(struct net_device *dev, struct iw_request_info *info,
+                union iwreq_data *wrqu, char *extra)
 {
+        struct iw_point *wrq = &wrqu->data;
         struct iw_range *range = (struct iw_range *)extra;
         int i;
         int k;
@@ -546,7 +605,7 @@ void iwctl_giwrange(struct net_device *dev, struct iw_request_info *info,
                 range->txpower[0] = 100;
                 range->num_txpower = 1;
                 range->txpower_capa = IW_TXPOW_MWATT;
-                range->we_version_source = SUPPORTED_WIRELESS_EXT;
+                range->we_version_source = WIRELESS_EXT;
                 range->we_version_compiled = WIRELESS_EXT;
                 range->retry_capa = IW_RETRY_LIMIT | IW_RETRY_LIFETIME;
                 range->retry_flags = IW_RETRY_LIMIT;
@@ -562,20 +621,26 @@ void iwctl_giwrange(struct net_device *dev, struct iw_request_info *info,
                 range->avg_qual.level = 176; // -80 dBm
                 range->avg_qual.noise = 0;
         }
+
+        return 0;
 }
 
 /*
  * Wireless Handler : set ap mac address
  */
 int iwctl_siwap(struct net_device *dev, struct iw_request_info *info,
-                struct sockaddr *wrq, char *extra)
+                union iwreq_data *wrqu, char *extra)
 {
         PSDevice pDevice = netdev_priv(dev);
+        struct sockaddr *wrq = &wrqu->ap_addr;
         PSMgmtObject pMgmt = &(pDevice->sMgmtObj);
         int rc = 0;
         BYTE ZeroBSSID[WLAN_BSSID_LEN] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
 
-        PRINT_K(" SIOCSIWAP \n");
+        PRINT_K(" SIOCSIWAP\n");
+
+        if (pMgmt == NULL)
+                return -EFAULT;
 
         if (wrq->sa_family != ARPHRD_ETHER) {
                 rc = -EINVAL;
@@ -616,12 +681,16 @@ int iwctl_siwap(struct net_device *dev, struct iw_request_info *info,
  * Wireless Handler: get ap mac address
  */
 int iwctl_giwap(struct net_device *dev, struct iw_request_info *info,
-                struct sockaddr *wrq, char *extra)
+                union iwreq_data *wrqu, char *extra)
 {
         PSDevice pDevice = netdev_priv(dev);
+        struct sockaddr *wrq = &wrqu->ap_addr;
         PSMgmtObject pMgmt = &(pDevice->sMgmtObj);
 
-        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWAP \n");
+        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWAP\n");
+
+        if (pMgmt == NULL)
+                return -EFAULT;
 
         memcpy(wrq->sa_data, pMgmt->abyCurrBSSID, 6);
 
@@ -639,59 +708,77 @@ int iwctl_giwap(struct net_device *dev, struct iw_request_info *info,
  * Wireless Handler: get ap list
  */
 int iwctl_giwaplist(struct net_device *dev, struct iw_request_info *info,
-                struct iw_point *wrq, char *extra)
+                union iwreq_data *wrqu, char *extra)
 {
+        struct iw_point *wrq = &wrqu->data;
+        struct sockaddr *sock;
+        struct iw_quality *qual;
+        PSDevice pDevice = netdev_priv(dev);
+        PSMgmtObject pMgmt = &pDevice->sMgmtObj;
+        PKnownBSS pBSS = &pMgmt->sBSSList[0];
         int ii;
         int jj;
-        int rc = 0;
-        struct sockaddr sock[IW_MAX_AP];
-        struct iw_quality qual[IW_MAX_AP];
-        PSDevice pDevice = netdev_priv(dev);
-        PSMgmtObject pMgmt = &(pDevice->sMgmtObj);
 
-        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWAPLIST \n");
-        // Only super-user can see AP list
+        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWAPLIST\n");
+        /* Only super-user can see AP list */
 
-        if (!capable(CAP_NET_ADMIN)) {
-                rc = -EPERM;
-                return rc;
-        }
+        if (pBSS == NULL)
+                return -ENODEV;
 
-        if (wrq->pointer) {
-                PKnownBSS pBSS = &(pMgmt->sBSSList[0]);
+        if (!capable(CAP_NET_ADMIN))
+                return -EPERM;
 
-                for (ii = 0, jj= 0; ii < MAX_BSS_NUM; ii++) {
-                        pBSS = &(pMgmt->sBSSList[ii]);
-                        if (!pBSS->bActive)
-                                continue;
-                        if (jj >= IW_MAX_AP)
-                                break;
-                        memcpy(sock[jj].sa_data, pBSS->abyBSSID, 6);
-                        sock[jj].sa_family = ARPHRD_ETHER;
-                        qual[jj].level = pBSS->uRSSI;
-                        qual[jj].qual = qual[jj].noise = 0;
-                        qual[jj].updated = 2;
-                        jj++;
-                }
+        if (!wrq->pointer)
+                return -EINVAL;
 
-                wrq->flags = 1; // Should be defined
-                wrq->length = jj;
-                memcpy(extra, sock, sizeof(struct sockaddr) * jj);
-                memcpy(extra + sizeof(struct sockaddr) * jj, qual, sizeof(struct iw_quality) * jj);
+        sock = kzalloc(sizeof(struct sockaddr) * IW_MAX_AP, GFP_KERNEL);
+        if (sock == NULL)
+                return -ENOMEM;
+        qual = kzalloc(sizeof(struct iw_quality) * IW_MAX_AP, GFP_KERNEL);
+        if (qual == NULL) {
+                kfree(sock);
+                return -ENOMEM;
         }
-        return rc;
+
+        for (ii = 0, jj = 0; ii < MAX_BSS_NUM; ii++) {
+                if (!pBSS[ii].bActive)
+                        continue;
+                if (jj >= IW_MAX_AP)
+                        break;
+                memcpy(sock[jj].sa_data, pBSS[ii].abyBSSID, 6);
+                sock[jj].sa_family = ARPHRD_ETHER;
+                qual[jj].level = pBSS[ii].uRSSI;
+                qual[jj].qual = qual[jj].noise = 0;
+                qual[jj].updated = 2;
+                jj++;
+        }
+
+        wrq->flags = 1; /* Should be defined */
+        wrq->length = jj;
+        memcpy(extra, sock, sizeof(struct sockaddr) * jj);
+        memcpy(extra + sizeof(struct sockaddr) * jj, qual,
+                sizeof(struct iw_quality) * jj);
+
+        kfree(sock);
+        kfree(qual);
+
+        return 0;
 }
 
 /*
  * Wireless Handler: set essid
  */
 int iwctl_siwessid(struct net_device *dev, struct iw_request_info *info,
-                struct iw_point *wrq, char *extra)
+                union iwreq_data *wrqu, char *extra)
 {
         PSDevice pDevice = netdev_priv(dev);
+        struct iw_point *wrq = &wrqu->essid;
         PSMgmtObject pMgmt = &(pDevice->sMgmtObj);
         PWLAN_IE_SSID pItemSSID;
 
+        if (pMgmt == NULL)
+                return -EFAULT;
+
         if (!(pDevice->flags & DEVICE_FLAGS_OPENED))
                 return -EINVAL;
 
@@ -704,10 +791,8 @@ int iwctl_siwessid(struct net_device *dev, struct iw_request_info *info,
                 memset(pMgmt->abyDesireSSID, 0, WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1);
                 memset(pMgmt->abyDesireBSSID, 0xFF,6);
                 PRINT_K("set essid to 'any' \n");
-#ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
                 // Unknown desired AP, so here need not associate??
                 return 0;
-#endif
         } else {
                 // Set the SSID
                 memset(pMgmt->abyDesireSSID, 0, WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1);
@@ -715,9 +800,9 @@ int iwctl_siwessid(struct net_device *dev, struct iw_request_info *info,
                 pItemSSID->byElementID = WLAN_EID_SSID;
 
                 memcpy(pItemSSID->abySSID, extra, wrq->length);
-                if (pItemSSID->abySSID[wrq->length - 1] == '\0') {
+                if (pItemSSID->abySSID[wrq->length] == '\0') {
                         if (wrq->length>0)
-                                pItemSSID->len = wrq->length - 1;
+                                pItemSSID->len = wrq->length;
                 } else {
                         pItemSSID->len = wrq->length;
                 }
@@ -729,7 +814,6 @@ int iwctl_siwessid(struct net_device *dev, struct iw_request_info *info,
                         return 0;
                 }
 
-#ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
                 // Wext wil order another command of siwap to link
                 // with desired AP, so here need not associate??
                 if (pDevice->bWPASuppWextEnabled == TRUE)  {
@@ -778,7 +862,6 @@ int iwctl_siwessid(struct net_device *dev, struct iw_request_info *info,
                         }
                         return 0;
                 }
-#endif
 
                 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "set essid = %s \n", pItemSSID->abySSID);
         }
@@ -792,14 +875,18 @@ int iwctl_siwessid(struct net_device *dev, struct iw_request_info *info,
 /*
  * Wireless Handler: get essid
  */
-void iwctl_giwessid(struct net_device *dev, struct iw_request_info *info,
-                struct iw_point *wrq, char *extra)
+int iwctl_giwessid(struct net_device *dev, struct iw_request_info *info,
+                union iwreq_data *wrqu, char *extra)
 {
         PSDevice pDevice = netdev_priv(dev);
+        struct iw_point *wrq = &wrqu->essid;
         PSMgmtObject pMgmt = &(pDevice->sMgmtObj);
         PWLAN_IE_SSID pItemSSID;
 
-        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWESSID \n");
+        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWESSID\n");
+
+        if (pMgmt == NULL)
+                return -EFAULT;
 
         // Note: if wrq->u.data.flags != 0, we should get the relevant
         // SSID from the SSID list...
@@ -811,15 +898,18 @@ void iwctl_giwessid(struct net_device *dev, struct iw_request_info *info,
 
         wrq->length = pItemSSID->len;
         wrq->flags = 1; // active
+
+        return 0;
 }
 
 /*
  * Wireless Handler: set data rate
  */
 int iwctl_siwrate(struct net_device *dev, struct iw_request_info *info,
-                struct iw_param *wrq, char *extra)
+                union iwreq_data *wrqu, char *extra)
 {
         PSDevice pDevice = netdev_priv(dev);
+        struct iw_param *wrq = &wrqu->bitrate;
         int rc = 0;
         u8 brate = 0;
         int i;
@@ -893,13 +983,18 @@ int iwctl_siwrate(struct net_device *dev, struct iw_request_info *info,
 /*
  * Wireless Handler: get data rate
  */
-void iwctl_giwrate(struct net_device *dev, struct iw_request_info *info,
-                struct iw_param *wrq, char *extra)
+int iwctl_giwrate(struct net_device *dev, struct iw_request_info *info,
+                union iwreq_data *wrqu, char *extra)
 {
         PSDevice pDevice = netdev_priv(dev);
+        struct iw_param *wrq = &wrqu->bitrate;
         PSMgmtObject pMgmt = &(pDevice->sMgmtObj);
 
-        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWRATE \n");
+        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWRATE\n");
+
+        if (pMgmt == NULL)
+                return -EFAULT;
+
         {
                 BYTE abySupportedRates[13] = {
                         0x02, 0x04, 0x0B, 0x16, 0x0c, 0x12, 0x18, 0x24, 0x30,
@@ -932,14 +1027,18 @@ void iwctl_giwrate(struct net_device *dev, struct iw_request_info *info,
                 if (pDevice->bFixRate == TRUE)
                         wrq->fixed = TRUE;
         }
+
+        return 0;
 }
 
 /*
  * Wireless Handler: set rts threshold
  */
-int iwctl_siwrts(struct net_device *dev, struct iw_param *wrq)
+int iwctl_siwrts(struct net_device *dev, struct iw_request_info *info,
+                union iwreq_data *wrqu, char *extra)
 {
         PSDevice pDevice = netdev_priv(dev);
+        struct iw_param *wrq = &wrqu->rts;
 
         if ((wrq->value < 0 || wrq->value > 2312) && !wrq->disabled)
                 return -EINVAL;
@@ -956,11 +1055,12 @@ int iwctl_siwrts(struct net_device *dev, struct iw_param *wrq)
  * Wireless Handler: get rts
  */
 int iwctl_giwrts(struct net_device *dev, struct iw_request_info *info,
-                struct iw_param *wrq, char *extra)
+                union iwreq_data *wrqu, char *extra)
 {
         PSDevice pDevice = netdev_priv(dev);
+        struct iw_param *wrq = &wrqu->rts;
 
-        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWRTS \n");
+        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWRTS\n");
         wrq->value = pDevice->wRTSThreshold;
         wrq->disabled = (wrq->value >= 2312);
         wrq->fixed = 1;
@@ -971,13 +1071,14 @@ int iwctl_giwrts(struct net_device *dev, struct iw_request_info *info,
  * Wireless Handler: set fragment threshold
  */
 int iwctl_siwfrag(struct net_device *dev, struct iw_request_info *info,
-                struct iw_param *wrq, char *extra)
+                union iwreq_data *wrqu, char *extra)
 {
         PSDevice pDevice = netdev_priv(dev);
+        struct iw_param *wrq = &wrqu->frag;
         int rc = 0;
         int fthr = wrq->value;
 
-        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWFRAG \n");
+        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWFRAG\n");
 
         if (wrq->disabled)
                 fthr = 2312;
@@ -994,11 +1095,12 @@ int iwctl_siwfrag(struct net_device *dev, struct iw_request_info *info,
  * Wireless Handler: get fragment threshold
  */
 int iwctl_giwfrag(struct net_device *dev, struct iw_request_info *info,
-                struct iw_param *wrq, char *extra)
+                union iwreq_data *wrqu, char *extra)
 {
         PSDevice pDevice = netdev_priv(dev);
+        struct iw_param *wrq = &wrqu->frag;
 
-        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWFRAG \n");
+        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWFRAG\n");
         wrq->value = pDevice->wFragmentationThreshold;
         wrq->disabled = (wrq->value >= 2312);
         wrq->fixed = 1;
@@ -1009,12 +1111,13 @@ int iwctl_giwfrag(struct net_device *dev, struct iw_request_info *info,
  * Wireless Handler: set retry threshold
  */
 int iwctl_siwretry(struct net_device *dev, struct iw_request_info *info,
-                struct iw_param *wrq, char *extra)
+                union iwreq_data *wrqu, char *extra)
 {
         PSDevice pDevice = netdev_priv(dev);
+        struct iw_param *wrq = &wrqu->retry;
         int rc = 0;
 
-        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWRETRY \n");
+        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWRETRY\n");
 
         if (wrq->disabled) {
                 rc = -EINVAL;
@@ -1041,10 +1144,11 @@ int iwctl_siwretry(struct net_device *dev, struct iw_request_info *info,
  * Wireless Handler: get retry threshold
  */
 int iwctl_giwretry(struct net_device *dev, struct iw_request_info *info,
-                struct iw_param *wrq, char *extra)
+                union iwreq_data *wrqu, char *extra)
 {
         PSDevice pDevice = netdev_priv(dev);
-        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWRETRY \n");
+        struct iw_param *wrq = &wrqu->retry;
+        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWRETRY\n");
         wrq->disabled = 0; // Can't be disabled
 
         // Note: by default, display the min retry number
@@ -1067,17 +1171,21 @@ int iwctl_giwretry(struct net_device *dev, struct iw_request_info *info,
  * Wireless Handler: set encode mode
  */
 int iwctl_siwencode(struct net_device *dev, struct iw_request_info *info,
-                struct iw_point *wrq, char *extra)
+                union iwreq_data *wrqu, char *extra)
 {
         PSDevice pDevice = netdev_priv(dev);
         PSMgmtObject pMgmt = &(pDevice->sMgmtObj);
-        DWORD dwKeyIndex = (DWORD)(wrq->flags & IW_ENCODE_INDEX);
+        struct iw_point *wrq = &wrqu->encoding;
+        u32 dwKeyIndex = (u32)(wrq->flags & IW_ENCODE_INDEX);
         int ii;
         int uu;
         int rc = 0;
         int index = (wrq->flags & IW_ENCODE_INDEX);
 
-        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWENCODE \n");
+        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWENCODE\n");
+
+        if (pMgmt == NULL)
+                return -EFAULT;
 
         // Check the size of the key
         if (wrq->length > WLAN_WEP232_KEYLEN) {
@@ -1155,17 +1263,17 @@ int iwctl_siwencode(struct net_device *dev, struct iw_request_info *info,
                 pMgmt->bShareKeyAlgorithm = FALSE;
         }
 
-#ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
         memset(pMgmt->abyDesireBSSID, 0xFF, 6);
-#endif
+
         return rc;
 }
 
 int iwctl_giwencode(struct net_device *dev, struct iw_request_info *info,
-                struct iw_point *wrq, char *extra)
+                union iwreq_data *wrqu, char *extra)
 {
         PSDevice pDevice = netdev_priv(dev);
         PSMgmtObject pMgmt = &(pDevice->sMgmtObj);
+        struct iw_point *wrq = &wrqu->encoding;
         char abyKey[WLAN_WEP232_KEYLEN];
 
         unsigned index = (unsigned)(wrq->flags & IW_ENCODE_INDEX);
@@ -1173,6 +1281,9 @@ int iwctl_giwencode(struct net_device *dev, struct iw_request_info *info,
 
         DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWENCODE\n");
 
+        if (pMgmt == NULL)
+                return -EFAULT;
+
         if (index > WLAN_WEP_NKEYS)
                 return  -EINVAL;
         if (index < 1) { // get default key
@@ -1220,13 +1331,17 @@ int iwctl_giwencode(struct net_device *dev, struct iw_request_info *info,
  * Wireless Handler: set power mode
  */
 int iwctl_siwpower(struct net_device *dev, struct iw_request_info *info,
-                struct iw_param *wrq, char *extra)
+                union iwreq_data *wrqu, char *extra)
 {
         PSDevice pDevice = netdev_priv(dev);
         PSMgmtObject pMgmt = &(pDevice->sMgmtObj);
+        struct iw_param *wrq = &wrqu->power;
         int rc = 0;
 
-        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWPOWER \n");
+        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWPOWER\n");
+
+        if (pMgmt == NULL)
+                return -EFAULT;
 
         if (!(pDevice->flags & DEVICE_FLAGS_OPENED)) {
                 rc = -EINVAL;
@@ -1268,24 +1383,31 @@ int iwctl_siwpower(struct net_device *dev, struct iw_request_info *info,
  * Wireless Handler: get power mode
  */
 int iwctl_giwpower(struct net_device *dev, struct iw_request_info *info,
-                struct iw_param *wrq, char *extra)
+                union iwreq_data *wrqu, char *extra)
 {
         PSDevice pDevice = netdev_priv(dev);
         PSMgmtObject pMgmt = &(pDevice->sMgmtObj);
+        struct iw_param *wrq = &wrqu->power;
         int mode = pDevice->ePSMode;
 
-        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWPOWER \n");
+        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWPOWER\n");
+
+        if (pMgmt == NULL)
+                return -EFAULT;
 
         if ((wrq->disabled = (mode == WMAC_POWER_CAM)))
                 return 0;
 
         if ((wrq->flags & IW_POWER_TYPE) == IW_POWER_TIMEOUT) {
-                wrq->value = (int)((pMgmt->wListenInterval * pMgmt->wCurrBeaconPeriod) << 10);
+                wrq->value = (int)((pMgmt->wListenInterval *
+                        pMgmt->wCurrBeaconPeriod) / 100);
                 wrq->flags = IW_POWER_TIMEOUT;
         } else {
-                wrq->value = (int)((pMgmt->wListenInterval * pMgmt->wCurrBeaconPeriod) << 10);
+                wrq->value = (int)((pMgmt->wListenInterval *
+                        pMgmt->wCurrBeaconPeriod) / 100);
                 wrq->flags = IW_POWER_PERIOD;
         }
+
         wrq->flags |= IW_POWER_ALL_R;
         return 0;
 }
@@ -1294,12 +1416,13 @@ int iwctl_giwpower(struct net_device *dev, struct iw_request_info *info,
  * Wireless Handler: get Sensitivity
  */
 int iwctl_giwsens(struct net_device *dev, struct iw_request_info *info,
-                struct iw_param *wrq, char *extra)
+                union iwreq_data *wrqu, char *extra)
 {
         PSDevice pDevice = netdev_priv(dev);
+        struct iw_param *wrq = &wrqu->sens;
         long ldBm;
 
-        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWSENS \n");
+        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWSENS\n");
         if (pDevice->bLinkPass == TRUE) {
                 RFvRSSITodBm(pDevice, (BYTE)(pDevice->uCurrRSSI), &ldBm);
                 wrq->value = ldBm;
@@ -1311,18 +1434,20 @@ int iwctl_giwsens(struct net_device *dev, struct iw_request_info *info,
         return 0;
 }
 
-#ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
-
 int iwctl_siwauth(struct net_device *dev, struct iw_request_info *info,
-                struct iw_param *wrq, char *extra)
+                union iwreq_data *wrqu, char *extra)
 {
         PSDevice pDevice = netdev_priv(dev);
         PSMgmtObject pMgmt = &(pDevice->sMgmtObj);
+        struct iw_param *wrq = &wrqu->param;
         int ret = 0;
         static int wpa_version = 0; // must be static to save the last value, einsn liu
         static int pairwise = 0;
 
-        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWAUTH \n");
+        if (pMgmt == NULL)
+                return -EFAULT;
+
+        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWAUTH\n");
         switch (wrq->flags & IW_AUTH_INDEX) {
         case IW_AUTH_WPA_VERSION:
                 wpa_version = wrq->value;
@@ -1406,6 +1531,7 @@ int iwctl_siwauth(struct net_device *dev, struct iw_request_info *info,
                 }
                 break;
         default:
+                PRINT_K("iwctl_siwauth: not supported %x\n", wrq->flags);
                 ret = -EOPNOTSUPP;
                 break;
         }
@@ -1413,18 +1539,22 @@ int iwctl_siwauth(struct net_device *dev, struct iw_request_info *info,
 }
 
 int iwctl_giwauth(struct net_device *dev, struct iw_request_info *info,
-                struct iw_param *wrq, char *extra)
+                union iwreq_data *wrqu, char *extra)
 {
         return -EOPNOTSUPP;
 }
 
 int iwctl_siwgenie(struct net_device *dev, struct iw_request_info *info,
-                struct iw_point *wrq, char *extra)
+                union iwreq_data *wrqu, char *extra)
 {
         PSDevice pDevice = netdev_priv(dev);
         PSMgmtObject pMgmt = &(pDevice->sMgmtObj);
+        struct iw_point *wrq = &wrqu->data;
         int ret = 0;
 
+        if (pMgmt == NULL)
+                return -EFAULT;
+
         if (wrq->length){
                 if ((wrq->length < 2) || (extra[1] + 2 != wrq->length)) {
                         ret = -EINVAL;
@@ -1450,13 +1580,17 @@ out: // not completely ...not necessary in wpa_supplicant 0.5.8
 }
 
 int iwctl_giwgenie(struct net_device *dev, struct iw_request_info *info,
-                struct iw_point *wrq, char *extra)
+                union iwreq_data *wrqu, char *extra)
 {
         PSDevice pDevice = netdev_priv(dev);
         PSMgmtObject pMgmt = &(pDevice->sMgmtObj);
+        struct iw_point *wrq = &wrqu->data;
         int ret = 0;
         int space = wrq->length;
 
+        if (pMgmt == NULL)
+                return -EFAULT;
+
         wrq->length = 0;
         if (pMgmt->wWPAIELen > 0) {
                 wrq->length = pMgmt->wWPAIELen;
@@ -1472,10 +1606,11 @@ int iwctl_giwgenie(struct net_device *dev, struct iw_request_info *info,
 }
 
 int iwctl_siwencodeext(struct net_device *dev, struct iw_request_info *info,
-                struct iw_point *wrq, char *extra)
+                union iwreq_data *wrqu, char *extra)
 {
         PSDevice pDevice = netdev_priv(dev);
         PSMgmtObject pMgmt = &(pDevice->sMgmtObj);
+        struct iw_point *wrq = &wrqu->encoding;
         struct iw_encode_ext *ext = (struct iw_encode_ext*)extra;
         struct viawget_wpa_param *param=NULL;
 // original member
@@ -1488,17 +1623,18 @@ int iwctl_siwencodeext(struct net_device *dev, struct iw_request_info *info,
         size_t seq_len = 0;
         size_t key_len = 0;
         u8 *buf;
-        size_t blen;
         u8 key_array[64];
         int ret = 0;
 
-        PRINT_K("SIOCSIWENCODEEXT...... \n");
+        PRINT_K("SIOCSIWENCODEEXT......\n");
 
-        blen = sizeof(*param);
-        buf = kmalloc((int)blen, (int)GFP_KERNEL);
+        if (pMgmt == NULL)
+                return -EFAULT;
+
+        buf = kzalloc(sizeof(struct viawget_wpa_param), GFP_KERNEL);
         if (buf == NULL)
                 return -ENOMEM;
-        memset(buf, 0, blen);
+
         param = (struct viawget_wpa_param *)buf;
 
 // recover alg_name
@@ -1588,28 +1724,33 @@ int iwctl_siwencodeext(struct net_device *dev, struct iw_request_info *info,
         }
 /*******/
         spin_lock_irq(&pDevice->lock);
-        ret = wpa_set_keys(pDevice, param, TRUE);
+        ret = wpa_set_keys(pDevice, param);
         spin_unlock_irq(&pDevice->lock);
 
 error:
-        kfree(param);
+        kfree(buf);
         return ret;
 }
 
 int iwctl_giwencodeext(struct net_device *dev, struct iw_request_info *info,
-                struct iw_point *wrq, char *extra)
+                union iwreq_data *wrqu, char *extra)
 {
         return -EOPNOTSUPP;
 }
 
 int iwctl_siwmlme(struct net_device *dev, struct iw_request_info *info,
-                struct iw_point *wrq, char *extra)
+                union iwreq_data *wrqu, char *extra)
 {
         PSDevice pDevice = netdev_priv(dev);
         PSMgmtObject pMgmt = &(pDevice->sMgmtObj);
         struct iw_mlme *mlme = (struct iw_mlme *)extra;
         int ret = 0;
 
+        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWMLME\n");
+
+        if (pMgmt == NULL)
+                return -EFAULT;
+
         if (memcmp(pMgmt->abyCurrBSSID, mlme->addr.sa_data, ETH_ALEN)) {
                 ret = -EINVAL;
                 return ret;
@@ -1629,81 +1770,62 @@ int iwctl_siwmlme(struct net_device *dev, struct iw_request_info *info,
         return ret;
 }
 
-#endif
+static int iwctl_config_commit(struct net_device *dev,
+        struct iw_request_info *info, union iwreq_data *wrqu, char *extra)
+{
+        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "SIOCSIWCOMMIT\n");
+
+        return 0;
+}
 
 static const iw_handler iwctl_handler[] = {
-        (iw_handler)NULL, // SIOCSIWCOMMIT
-        (iw_handler)NULL, // SIOCGIWNAME
-        (iw_handler)NULL, // SIOCSIWNWID
-        (iw_handler)NULL, // SIOCGIWNWID
-        (iw_handler)NULL, // SIOCSIWFREQ
-        (iw_handler)NULL, // SIOCGIWFREQ
-        (iw_handler)NULL, // SIOCSIWMODE
-        (iw_handler)NULL, // SIOCGIWMODE
-        (iw_handler)NULL, // SIOCSIWSENS
-        (iw_handler)NULL, // SIOCGIWSENS
-        (iw_handler)NULL, // SIOCSIWRANGE
-        (iw_handler)iwctl_giwrange, // SIOCGIWRANGE
-        (iw_handler)NULL, // SIOCSIWPRIV
-        (iw_handler)NULL, // SIOCGIWPRIV
-        (iw_handler)NULL, // SIOCSIWSTATS
-        (iw_handler)NULL, // SIOCGIWSTATS
-        (iw_handler)NULL, // SIOCSIWSPY
-        (iw_handler)NULL, // SIOCGIWSPY
-        (iw_handler)NULL, // -- hole --
-        (iw_handler)NULL, // -- hole --
-        (iw_handler)NULL, // SIOCSIWAP
-        (iw_handler)NULL, // SIOCGIWAP
-        (iw_handler)NULL, // -- hole -- 0x16
-        (iw_handler)NULL, // SIOCGIWAPLIST
-        (iw_handler)iwctl_siwscan, // SIOCSIWSCAN
-        (iw_handler)iwctl_giwscan, // SIOCGIWSCAN
-        (iw_handler)NULL, // SIOCSIWESSID
-        (iw_handler)NULL, // SIOCGIWESSID
-        (iw_handler)NULL, // SIOCSIWNICKN
-        (iw_handler)NULL, // SIOCGIWNICKN
-        (iw_handler)NULL, // -- hole --
-        (iw_handler)NULL, // -- hole --
-        (iw_handler)NULL, // SIOCSIWRATE 0x20
-        (iw_handler)NULL, // SIOCGIWRATE
-        (iw_handler)NULL, // SIOCSIWRTS
-        (iw_handler)NULL, // SIOCGIWRTS
-        (iw_handler)NULL, // SIOCSIWFRAG
-        (iw_handler)NULL, // SIOCGIWFRAG
-        (iw_handler)NULL, // SIOCSIWTXPOW
-        (iw_handler)NULL, // SIOCGIWTXPOW
-        (iw_handler)NULL, // SIOCSIWRETRY
-        (iw_handler)NULL, // SIOCGIWRETRY
-        (iw_handler)NULL, // SIOCSIWENCODE
-        (iw_handler)NULL, // SIOCGIWENCODE
-        (iw_handler)NULL, // SIOCSIWPOWER
-        (iw_handler)NULL, // SIOCGIWPOWER
-        (iw_handler)NULL, // -- hole --
-        (iw_handler)NULL, // -- hole --
-        (iw_handler)NULL, // SIOCSIWGENIE
-        (iw_handler)NULL, // SIOCGIWGENIE
-        (iw_handler)NULL, // SIOCSIWAUTH
-        (iw_handler)NULL, // SIOCGIWAUTH
-        (iw_handler)NULL, // SIOCSIWENCODEEXT
-        (iw_handler)NULL, // SIOCGIWENCODEEXT
-        (iw_handler)NULL, // SIOCSIWPMKSA
-        (iw_handler)NULL, // -- hole --
+        IW_HANDLER(SIOCSIWCOMMIT, iwctl_config_commit),
+        IW_HANDLER(SIOCGIWNAME, iwctl_giwname),
+        IW_HANDLER(SIOCSIWFREQ, iwctl_siwfreq),
+        IW_HANDLER(SIOCGIWFREQ, iwctl_giwfreq),
+        IW_HANDLER(SIOCSIWMODE, iwctl_siwmode),
+        IW_HANDLER(SIOCGIWMODE, iwctl_giwmode),
+        IW_HANDLER(SIOCGIWSENS, iwctl_giwsens),
+        IW_HANDLER(SIOCGIWRANGE, iwctl_giwrange),
+        IW_HANDLER(SIOCSIWAP, iwctl_siwap),
+        IW_HANDLER(SIOCGIWAP, iwctl_giwap),
+        IW_HANDLER(SIOCSIWMLME, iwctl_siwmlme),
+        IW_HANDLER(SIOCGIWAPLIST, iwctl_giwaplist),
+        IW_HANDLER(SIOCSIWSCAN, iwctl_siwscan),
+        IW_HANDLER(SIOCGIWSCAN, iwctl_giwscan),
+        IW_HANDLER(SIOCSIWESSID, iwctl_siwessid),
+        IW_HANDLER(SIOCGIWESSID, iwctl_giwessid),
+        IW_HANDLER(SIOCSIWRATE, iwctl_siwrate),
+        IW_HANDLER(SIOCGIWRATE, iwctl_giwrate),
+        IW_HANDLER(SIOCSIWRTS, iwctl_siwrts),
+        IW_HANDLER(SIOCGIWRTS, iwctl_giwrts),
+        IW_HANDLER(SIOCSIWFRAG, iwctl_siwfrag),
+        IW_HANDLER(SIOCGIWFRAG, iwctl_giwfrag),
+        IW_HANDLER(SIOCSIWRETRY, iwctl_siwretry),
+        IW_HANDLER(SIOCGIWRETRY, iwctl_giwretry),
+        IW_HANDLER(SIOCSIWENCODE, iwctl_siwencode),
+        IW_HANDLER(SIOCGIWENCODE, iwctl_giwencode),
+        IW_HANDLER(SIOCSIWPOWER, iwctl_siwpower),
+        IW_HANDLER(SIOCGIWPOWER, iwctl_giwpower),
+        IW_HANDLER(SIOCSIWGENIE, iwctl_siwgenie),
+        IW_HANDLER(SIOCGIWGENIE, iwctl_giwgenie),
+        IW_HANDLER(SIOCSIWMLME, iwctl_siwmlme),
+        IW_HANDLER(SIOCSIWAUTH, iwctl_siwauth),
+        IW_HANDLER(SIOCGIWAUTH, iwctl_giwauth),
+        IW_HANDLER(SIOCSIWENCODEEXT, iwctl_siwencodeext),
+        IW_HANDLER(SIOCGIWENCODEEXT, iwctl_giwencodeext)
 };
 
 static const iw_handler iwctl_private_handler[] = {
         NULL, // SIOCIWFIRSTPRIV
 };
 
-struct iw_priv_args iwctl_private_args[] = {
-        { IOCTL_CMD_SET, IW_PRIV_TYPE_CHAR | 1024, 0, "set" },
-};
-
 const struct iw_handler_def iwctl_handler_def = {
         .get_wireless_stats     = &iwctl_get_wireless_stats,
-        .num_standard           = sizeof(iwctl_handler) / sizeof(iw_handler),
+        .num_standard           = ARRAY_SIZE(iwctl_handler),
         .num_private            = 0,
         .num_private_args       = 0,
-        .standard               = (iw_handler *)iwctl_handler,
+        .standard               = iwctl_handler,
         .private                = NULL,
         .private_args           = NULL,
 };
diff --git a/drivers/staging/vt6656/iwctl.h b/drivers/staging/vt6656/iwctl.h
index d056f83a9158..b594a10db318 100644
--- a/drivers/staging/vt6656/iwctl.h
+++ b/drivers/staging/vt6656/iwctl.h
@@ -42,106 +42,105 @@
 struct iw_statistics *iwctl_get_wireless_stats(struct net_device *dev);
 
 int iwctl_siwap(struct net_device *dev, struct iw_request_info *info,
-                struct sockaddr *wrq, char *extra);
+                union iwreq_data *wrqu, char *extra);
 
-void iwctl_giwrange(struct net_device *dev, struct iw_request_info *info,
-                struct iw_point *wrq, char *extra);
+int iwctl_giwrange(struct net_device *dev, struct iw_request_info *info,
+                union iwreq_data *wrqu, char *extra);
 
-void iwctl_giwmode(struct net_device *dev, struct iw_request_info *info,
-                __u32 *wmode, char *extra);
+int iwctl_giwmode(struct net_device *dev, struct iw_request_info *info,
+                union iwreq_data *wrqu, char *extra);
 
 int iwctl_siwmode(struct net_device *dev, struct iw_request_info *info,
-                __u32 *wmode, char *extra);
+                union iwreq_data *wrqu, char *extra);
 
 int iwctl_giwfreq(struct net_device *dev, struct iw_request_info *info,
-                struct iw_freq *wrq, char *extra);
+                union iwreq_data *wrqu, char *extra);
 
 int iwctl_siwfreq(struct net_device *dev, struct iw_request_info *info,
-                struct iw_freq *wrq, char *extra);
+                union iwreq_data *wrqu, char *extra);
 
 int iwctl_giwname(struct net_device *dev, struct iw_request_info *info,
-                char *wrq, char *extra);
+                union iwreq_data *wrqu, char *extra);
 
 int iwctl_giwsens(struct net_device *dev, struct iw_request_info *info,
-                struct iw_param *wrq, char *extra);
+                union iwreq_data *wrqu, char *extra);
 
 int iwctl_giwap(struct net_device *dev, struct iw_request_info *info,
-                struct sockaddr *wrq, char *extra);
+                union iwreq_data *wrqu, char *extra);
 
 int iwctl_giwaplist(struct net_device *dev, struct iw_request_info *info,
-                struct iw_point *wrq, char *extra);
+                union iwreq_data *wrqu, char *extra);
 
 int iwctl_siwessid(struct net_device *dev, struct iw_request_info *info,
-                struct iw_point *wrq, char *extra);
+                union iwreq_data *wrqu, char *extra);
 
-void iwctl_giwessid(struct net_device *dev, struct iw_request_info *info,
-                struct iw_point *wrq, char *extra);
+int iwctl_giwessid(struct net_device *dev, struct iw_request_info *info,
+                union iwreq_data *wrqu, char *extra);
 
 int iwctl_siwrate(struct net_device *dev, struct iw_request_info *info,
-                struct iw_param *wrq, char *extra);
+                union iwreq_data *wrqu, char *extra);
 
-void iwctl_giwrate(struct net_device *dev, struct iw_request_info *info,
-                struct iw_param *wrq, char *extra);
+int iwctl_giwrate(struct net_device *dev, struct iw_request_info *info,
+                union iwreq_data *wrqu, char *extra);
 
-int iwctl_siwrts(struct net_device *dev, struct iw_param *wrq);
+int iwctl_siwrts(struct net_device *dev, struct iw_request_info *info,
+                union iwreq_data *wrqu, char *extra);
 
 int iwctl_giwrts(struct net_device *dev, struct iw_request_info *info,
-                struct iw_param *wrq, char *extra);
+                union iwreq_data *wrqu, char *extra);
 
 int iwctl_siwfrag(struct net_device *dev, struct iw_request_info *info,
-                struct iw_param *wrq, char *extra);
+                union iwreq_data *wrqu, char *extra);
 
 int iwctl_giwfrag(struct net_device *dev, struct iw_request_info *info,
-                struct iw_param *wrq, char *extra);
+                union iwreq_data *wrqu, char *extra);
 
 int iwctl_siwretry(struct net_device *dev, struct iw_request_info *info,
-                struct iw_param *wrq, char *extra);
+                union iwreq_data *wrqu, char *extra);
 
 int iwctl_giwretry(struct net_device *dev, struct iw_request_info *info,
-                struct iw_param *wrq, char *extra);
+                union iwreq_data *wrqu, char *extra);
 
 int iwctl_siwencode(struct net_device *dev, struct iw_request_info *info,
-                struct iw_point *wrq, char *extra);
+                union iwreq_data *wrqu, char *extra);
 
 int iwctl_giwencode(struct net_device *dev, struct iw_request_info *info,
-                struct iw_point *wrq, char *extra);
+                union iwreq_data *wrqu, char *extra);
 
 int iwctl_siwpower(struct net_device *dev, struct iw_request_info *info,
-                struct iw_param *wrq, char *extra);
+                union iwreq_data *wrqu, char *extra);
 
 int iwctl_giwpower(struct net_device *dev, struct iw_request_info *info,
-                struct iw_param *wrq, char *extra);
+                union iwreq_data *wrqu, char *extra);
 
 int iwctl_giwscan(struct net_device *dev, struct iw_request_info *info,
-                struct iw_point *wrq, char *extra);
+                union iwreq_data *wrqu, char *extra);
 
 int iwctl_siwscan(struct net_device *dev, struct iw_request_info *info,
-                struct iw_param *wrq, char *extra);
+                union iwreq_data *wrqu, char *extra);
 
-#ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
 int iwctl_siwauth(struct net_device *dev, struct iw_request_info *info,
-                struct iw_param *wrq, char *extra);
+                union iwreq_data *wrqu, char *extra);
 
 int iwctl_giwauth(struct net_device *dev, struct iw_request_info *info,
-                struct iw_param *wrq, char *extra);
+                union iwreq_data *wrqu, char *extra);
 
 int iwctl_siwgenie(struct net_device *dev, struct iw_request_info *info,
-                struct iw_point *wrq, char *extra);
+                union iwreq_data *wrqu, char *extra);
 
 int iwctl_giwgenie(struct net_device *dev, struct iw_request_info *info,
-                struct iw_point *wrq, char *extra);
+                union iwreq_data *wrqu, char *extra);
 
 int iwctl_siwencodeext(struct net_device *dev, struct iw_request_info *info,
-                struct iw_point *wrq, char *extra);
+                union iwreq_data *wrqu, char *extra);
 
 int iwctl_giwencodeext(struct net_device *dev, struct iw_request_info *info,
-                struct iw_point *wrq, char *extra);
+                union iwreq_data *wrqu, char *extra);
 
 int iwctl_siwmlme(struct net_device *dev, struct iw_request_info *info,
-                struct iw_point *wrq, char *extra);
-#endif // #ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
+                union iwreq_data *wrqu, char *extra);
 
 extern const struct iw_handler_def iwctl_handler_def;
-extern const struct iw_priv_args iwctl_private_args;
+extern const struct iw_priv_args iwctl_priv_args;
 
 #endif /* __IWCTL_H__ */
diff --git a/drivers/staging/vt6656/key.c b/drivers/staging/vt6656/key.c
index a61fcb9591aa..8c78b86b5c80 100644
--- a/drivers/staging/vt6656/key.c
+++ b/drivers/staging/vt6656/key.c
@@ -36,9 +36,9 @@
  *
  */
 
+#include "mac.h"
 #include "tmacro.h"
 #include "key.h"
-#include "mac.h"
 #include "rndis.h"
 #include "control.h"
 
@@ -223,7 +223,7 @@ BOOL KeybSetKey(
     PSKeyManagement pTable,
     PBYTE           pbyBSSID,
     DWORD           dwKeyIndex,
-    unsigned long           uKeyLength,
+        u32 uKeyLength,
     PQWORD          pKeyRSC,
     PBYTE           pbyKey,
     BYTE            byKeyDecMode
@@ -235,7 +235,8 @@ BOOL KeybSetKey(
     PSKeyItem   pKey;
     unsigned int        uKeyIdx;
 
-    DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Enter KeybSetKey: %lX\n", dwKeyIndex);
+        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO
+                "Enter KeybSetKey: %X\n", dwKeyIndex);
 
     j = (MAX_KEY_TABLE-1);
     for (i=0;i<(MAX_KEY_TABLE-1);i++) {
@@ -261,7 +262,9 @@ BOOL KeybSetKey(
                 if ((dwKeyIndex & TRANSMIT_KEY) != 0)  {
                     // Group transmit key
                     pTable->KeyTable[i].dwGTKeyIndex = dwKeyIndex;
-                    DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Group transmit key(R)[%lX]: %d\n", pTable->KeyTable[i].dwGTKeyIndex, i);
+                        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO
+                                "Group transmit key(R)[%X]: %d\n",
+                                        pTable->KeyTable[i].dwGTKeyIndex, i);
                 }
                 pTable->KeyTable[i].wKeyCtl &= 0xFF0F;          // clear group key control filed
                 pTable->KeyTable[i].wKeyCtl |= (byKeyDecMode << 4);
@@ -302,9 +305,12 @@ BOOL KeybSetKey(
             }
             DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"\n");
 
-            DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->dwTSC47_16: %lx\n ", pKey->dwTSC47_16);
-            DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->wTSC15_0: %x\n ", pKey->wTSC15_0);
-            DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->dwKeyIndex: %lx\n ", pKey->dwKeyIndex);
+                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->dwTSC47_16: %x\n ",
+                        pKey->dwTSC47_16);
+                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->wTSC15_0: %x\n ",
+                        pKey->wTSC15_0);
+                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->dwKeyIndex: %x\n ",
+                        pKey->dwKeyIndex);
 
             return (TRUE);
         }
@@ -326,7 +332,9 @@ BOOL KeybSetKey(
             if ((dwKeyIndex & TRANSMIT_KEY) != 0)  {
                 // Group transmit key
                 pTable->KeyTable[j].dwGTKeyIndex = dwKeyIndex;
-                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Group transmit key(N)[%lX]: %d\n", pTable->KeyTable[j].dwGTKeyIndex, j);
+                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO
+                        "Group transmit key(N)[%X]: %d\n",
+                                pTable->KeyTable[j].dwGTKeyIndex, j);
             }
             pTable->KeyTable[j].wKeyCtl &= 0xFF0F;          // clear group key control filed
             pTable->KeyTable[j].wKeyCtl |= (byKeyDecMode << 4);
@@ -367,9 +375,11 @@ BOOL KeybSetKey(
         }
         DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"\n");
 
-        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->dwTSC47_16: %lx\n ", pKey->dwTSC47_16);
+        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->dwTSC47_16: %x\n ",
+                pKey->dwTSC47_16);
         DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->wTSC15_0: %x\n ", pKey->wTSC15_0);
-        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->dwKeyIndex: %lx\n ", pKey->dwKeyIndex);
+        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->dwKeyIndex: %x\n ",
+                pKey->dwKeyIndex);
 
         return (TRUE);
     }
@@ -597,7 +607,8 @@ BOOL KeybGetTransmitKey(PSKeyManagement pTable, PBYTE pbyBSSID, DWORD dwKeyType,
                             DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"%x ", pTable->KeyTable[i].abyBSSID[ii]);
                         }
                         DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"\n");
-                        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"dwGTKeyIndex: %lX\n", pTable->KeyTable[i].dwGTKeyIndex);
+                        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"dwGTKeyIndex: %X\n",
+                                pTable->KeyTable[i].dwGTKeyIndex);
 
                     return (TRUE);
                 }
@@ -664,7 +675,7 @@ BOOL KeybSetDefaultKey(
     void *pDeviceHandler,
     PSKeyManagement pTable,
     DWORD           dwKeyIndex,
-    unsigned long           uKeyLength,
+        u32 uKeyLength,
     PQWORD          pKeyRSC,
     PBYTE           pbyKey,
     BYTE            byKeyDecMode
@@ -696,7 +707,10 @@ BOOL KeybSetDefaultKey(
     if ((dwKeyIndex & TRANSMIT_KEY) != 0)  {
         // Group transmit key
         pTable->KeyTable[MAX_KEY_TABLE-1].dwGTKeyIndex = dwKeyIndex;
-        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Group transmit key(R)[%lX]: %d\n", pTable->KeyTable[MAX_KEY_TABLE-1].dwGTKeyIndex, MAX_KEY_TABLE-1);
+                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO
+                "Group transmit key(R)[%X]: %d\n",
+                pTable->KeyTable[MAX_KEY_TABLE-1].dwGTKeyIndex,
+                MAX_KEY_TABLE-1);
 
     }
     pTable->KeyTable[MAX_KEY_TABLE-1].wKeyCtl &= 0x7F00;          // clear all key control filed
@@ -747,9 +761,11 @@ BOOL KeybSetDefaultKey(
     }
     DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"\n");
 
-    DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->dwTSC47_16: %lx\n", pKey->dwTSC47_16);
+        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->dwTSC47_16: %x\n",
+                pKey->dwTSC47_16);
     DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->wTSC15_0: %x\n", pKey->wTSC15_0);
-    DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->dwKeyIndex: %lx\n", pKey->dwKeyIndex);
+        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->dwKeyIndex: %x\n",
+                pKey->dwKeyIndex);
 
     return (TRUE);
 }
@@ -775,7 +791,7 @@ BOOL KeybSetAllGroupKey(
     void *pDeviceHandler,
     PSKeyManagement pTable,
     DWORD           dwKeyIndex,
-    unsigned long           uKeyLength,
+        u32 uKeyLength,
     PQWORD          pKeyRSC,
     PBYTE           pbyKey,
     BYTE            byKeyDecMode
@@ -787,7 +803,8 @@ BOOL KeybSetAllGroupKey(
     PSKeyItem   pKey;
     unsigned int        uKeyIdx;
 
-    DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Enter KeybSetAllGroupKey: %lX\n", dwKeyIndex);
+        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Enter KeybSetAllGroupKey: %X\n",
+                dwKeyIndex);
 
 
     if ((dwKeyIndex & PAIRWISE_KEY) != 0) {                  // Pairwise key
@@ -804,7 +821,9 @@ BOOL KeybSetAllGroupKey(
             if ((dwKeyIndex & TRANSMIT_KEY) != 0)  {
                 // Group transmit key
                 pTable->KeyTable[i].dwGTKeyIndex = dwKeyIndex;
-                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Group transmit key(R)[%lX]: %d\n", pTable->KeyTable[i].dwGTKeyIndex, i);
+                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO
+                        "Group transmit key(R)[%X]: %d\n",
+                        pTable->KeyTable[i].dwGTKeyIndex, i);
 
             }
             pTable->KeyTable[i].wKeyCtl &= 0xFF0F;          // clear group key control filed
diff --git a/drivers/staging/vt6656/key.h b/drivers/staging/vt6656/key.h
index f749c7a027d3..bd35d39621ae 100644
--- a/drivers/staging/vt6656/key.h
+++ b/drivers/staging/vt6656/key.h
@@ -58,7 +58,7 @@
 typedef struct tagSKeyItem
 {
     BOOL        bKeyValid;
-    unsigned long       uKeyLength;
+        u32 uKeyLength;
     BYTE        abyKey[MAX_KEY_LEN];
     QWORD       KeyRSC;
     DWORD       dwTSC47_16;
@@ -107,7 +107,7 @@ BOOL KeybSetKey(
     PSKeyManagement pTable,
     PBYTE           pbyBSSID,
     DWORD           dwKeyIndex,
-    unsigned long           uKeyLength,
+        u32 uKeyLength,
     PQWORD          pKeyRSC,
     PBYTE           pbyKey,
     BYTE            byKeyDecMode
@@ -146,7 +146,7 @@ BOOL KeybSetDefaultKey(
     void *pDeviceHandler,
     PSKeyManagement pTable,
     DWORD           dwKeyIndex,
-    unsigned long           uKeyLength,
+        u32 uKeyLength,
     PQWORD          pKeyRSC,
     PBYTE           pbyKey,
     BYTE            byKeyDecMode
@@ -156,7 +156,7 @@ BOOL KeybSetAllGroupKey(
     void *pDeviceHandler,
     PSKeyManagement pTable,
     DWORD           dwKeyIndex,
-    unsigned long           uKeyLength,
+        u32 uKeyLength,
     PQWORD          pKeyRSC,
     PBYTE           pbyKey,
     BYTE            byKeyDecMode
diff --git a/drivers/staging/vt6656/mac.c b/drivers/staging/vt6656/mac.c
index af4a29d14775..8fddc7b3930b 100644
--- a/drivers/staging/vt6656/mac.c
+++ b/drivers/staging/vt6656/mac.c
@@ -260,7 +260,8 @@ BYTE            pbyData[24];
     dwData1 <<= 16;
     dwData1 |= MAKEWORD(*(pbyAddr+4), *(pbyAddr+5));
 
-    DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"1. wOffset: %d, Data: %lX, KeyCtl:%X\n", wOffset, dwData1, wKeyCtl);
+        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"1. wOffset: %d, Data: %X,"\
+                " KeyCtl:%X\n", wOffset, dwData1, wKeyCtl);
 
     //VNSvOutPortW(dwIoBase + MAC_REG_MISCFFNDEX, wOffset);
     //VNSvOutPortD(dwIoBase + MAC_REG_MISCFFDATA, dwData);
@@ -277,7 +278,8 @@ BYTE            pbyData[24];
     dwData2 <<= 8;
     dwData2 |= *(pbyAddr+0);
 
-    DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"2. wOffset: %d, Data: %lX\n", wOffset, dwData2);
+        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"2. wOffset: %d, Data: %X\n",
+                wOffset, dwData2);
 
     //VNSvOutPortW(dwIoBase + MAC_REG_MISCFFNDEX, wOffset);
     //VNSvOutPortD(dwIoBase + MAC_REG_MISCFFDATA, dwData);
diff --git a/drivers/staging/vt6656/main_usb.c b/drivers/staging/vt6656/main_usb.c
index ad422dea702b..f33086d66496 100644
--- a/drivers/staging/vt6656/main_usb.c
+++ b/drivers/staging/vt6656/main_usb.c
@@ -61,7 +61,6 @@
 #include "bssdb.h"
 #include "hostap.h"
 #include "wpactl.h"
-#include "ioctl.h"
 #include "iwctl.h"
 #include "dpc.h"
 #include "datarate.h"
@@ -244,7 +243,6 @@ static int Config_FileGetParameter(unsigned char *string,
                                    unsigned char *dest,
                                    unsigned char *source);
 
-static BOOL device_release_WPADEV(PSDevice pDevice);
 
 static void usb_device_reset(PSDevice pDevice);
 
@@ -634,40 +632,6 @@ static BOOL device_init_registers(PSDevice pDevice, DEVICE_INIT_TYPE InitType)
     return TRUE;
 }
 
-static BOOL device_release_WPADEV(PSDevice pDevice)
-{
-  viawget_wpa_header *wpahdr;
-  int ii=0;
- // wait_queue_head_t   Set_wait;
-  //send device close to wpa_supplicant layer
-    if (pDevice->bWPADEVUp==TRUE) {
-                 wpahdr = (viawget_wpa_header *)pDevice->skb->data;
-                 wpahdr->type = VIAWGET_DEVICECLOSE_MSG;
-                 wpahdr->resp_ie_len = 0;
-                 wpahdr->req_ie_len = 0;
-                 skb_put(pDevice->skb, sizeof(viawget_wpa_header));
-                 pDevice->skb->dev = pDevice->wpadev;
-                 skb_reset_mac_header(pDevice->skb);
-                 pDevice->skb->pkt_type = PACKET_HOST;
-                 pDevice->skb->protocol = htons(ETH_P_802_2);
-                 memset(pDevice->skb->cb, 0, sizeof(pDevice->skb->cb));
-                 netif_rx(pDevice->skb);
-                 pDevice->skb = dev_alloc_skb((int)pDevice->rx_buf_sz);
-
- //wait release WPADEV
-              //    init_waitqueue_head(&Set_wait);
-              //    wait_event_timeout(Set_wait, ((pDevice->wpadev==NULL)&&(pDevice->skb == NULL)),5*HZ);    //1s wait
-              while(pDevice->bWPADEVUp==TRUE) {
-                set_current_state(TASK_UNINTERRUPTIBLE);
-                 schedule_timeout (HZ/20);          //wait 50ms
-                 ii++;
-                if(ii>20)
-                  break;
-              }
-           }
-    return TRUE;
-}
-
 #ifdef CONFIG_PM        /* Minimal support for suspend and resume */
 
 static int vt6656_suspend(struct usb_interface *intf, pm_message_t message)
@@ -711,7 +675,7 @@ static const struct net_device_ops device_netdev_ops = {
     .ndo_set_rx_mode        = device_set_multi,
 };
 
-static int __devinit
+static int
 vt6656_probe(struct usb_interface *intf, const struct usb_device_id *id)
 {
         u8 fake_mac[ETH_ALEN] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x01};
@@ -758,17 +722,6 @@ vt6656_probe(struct usb_interface *intf, const struct usb_device_id *id)
 
         usb_device_reset(pDevice);
 
-        {
-                union iwreq_data wrqu;
-                memset(&wrqu, 0, sizeof(wrqu));
-                wrqu.data.flags = RT_INSMOD_EVENT_FLAG;
-                wrqu.data.length = IFNAMSIZ;
-                wireless_send_event(pDevice->dev,
-                                    IWEVCUSTOM,
-                                    &wrqu,
-                                    pDevice->dev->name);
-        }
-
         return 0;
 
 err_netdev:
@@ -991,12 +944,6 @@ BOOL device_alloc_frag_buf(PSDevice pDevice, PSDeFragControlBlock pDeF) {
 static int  device_open(struct net_device *dev) {
     PSDevice    pDevice=(PSDevice) netdev_priv(dev);
 
-     extern SWPAResult wpa_Result;
-     memset(wpa_Result.ifname,0,sizeof(wpa_Result.ifname));
-     wpa_Result.proto = 0;
-     wpa_Result.key_mgmt = 0;
-     wpa_Result.eap_type = 0;
-     wpa_Result.authenticated = FALSE;
      pDevice->fWPA_Authened = FALSE;
 
     DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " device_open...\n");
@@ -1056,13 +1003,11 @@ static int  device_open(struct net_device *dev) {
     pDevice->bEventAvailable = FALSE;
 
    pDevice->bWPADEVUp = FALSE;
-#ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
      pDevice->bwextstep0 = FALSE;
      pDevice->bwextstep1 = FALSE;
      pDevice->bwextstep2 = FALSE;
      pDevice->bwextstep3 = FALSE;
      pDevice->bWPASuppWextEnabled = FALSE;
-#endif
     pDevice->byReAssocCount = 0;
 
     RXvWorkItem(pDevice);
@@ -1096,15 +1041,8 @@ static int  device_open(struct net_device *dev) {
     netif_stop_queue(pDevice->dev);
     pDevice->flags |= DEVICE_FLAGS_OPENED;
 
-{
-  union iwreq_data      wrqu;
-  memset(&wrqu, 0, sizeof(wrqu));
-  wrqu.data.flags = RT_UPDEV_EVENT_FLAG;
-  wireless_send_event(pDevice->dev, IWEVCUSTOM, &wrqu, NULL);
-}
-
-    DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "device_open success.. \n");
-    return 0;
+        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "device_open success..\n");
+        return 0;
 
 free_all:
     device_free_frag_bufs(pDevice);
@@ -1133,19 +1071,11 @@ static int  device_close(struct net_device *dev) {
     if (pDevice == NULL)
         return -ENODEV;
 
-{
-  union iwreq_data      wrqu;
-  memset(&wrqu, 0, sizeof(wrqu));
-  wrqu.data.flags = RT_DOWNDEV_EVENT_FLAG;
-  wireless_send_event(pDevice->dev, IWEVCUSTOM, &wrqu, NULL);
-}
-
     if (pDevice->bLinkPass) {
         bScheduleCommand((void *) pDevice, WLAN_CMD_DISASSOCIATE, NULL);
         mdelay(30);
     }
 
-device_release_WPADEV(pDevice);
 
         memset(pMgmt->abyDesireSSID, 0, WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1);
         pMgmt->bShareKeyAlgorithm = FALSE;
@@ -1204,22 +1134,13 @@ device_release_WPADEV(pDevice);
     return 0;
 }
 
-static void __devexit vt6656_disconnect(struct usb_interface *intf)
+static void vt6656_disconnect(struct usb_interface *intf)
 {
         PSDevice device = usb_get_intfdata(intf);
 
         if (!device)
                 return;
 
-        {
-                union iwreq_data req;
-                memset(&req, 0, sizeof(req));
-                req.data.flags = RT_RMMOD_EVENT_FLAG;
-                wireless_send_event(device->dev, IWEVCUSTOM, &req, NULL);
-        }
-
-        device_release_WPADEV(device);
-        release_firmware(device->firmware);
 
         usb_set_intfdata(intf, NULL);
         usb_put_dev(interface_to_usbdev(intf));
@@ -1228,9 +1149,9 @@ static void __devexit vt6656_disconnect(struct usb_interface *intf)
 
         if (device->dev) {
                 unregister_netdev(device->dev);
-                wpa_set_wpadev(device, 0);
                 free_netdev(device->dev);
         }
+
 }
 
 static int device_dma0_tx_80211(struct sk_buff *skb, struct net_device *dev)
@@ -1549,470 +1470,35 @@ static void device_set_multi(struct net_device *dev) {
 
 }
 
-
-static struct net_device_stats *device_get_stats(struct net_device *dev) {
+static struct net_device_stats *device_get_stats(struct net_device *dev)
+{
     PSDevice pDevice=(PSDevice) netdev_priv(dev);
 
     return &pDevice->stats;
 }
 
-
-static int  device_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) {
-        PSDevice                pDevice = (PSDevice)netdev_priv(dev);
-    PSMgmtObject        pMgmt = &(pDevice->sMgmtObj);
-    PSCmdRequest        pReq;
-    //BOOL                bCommit = FALSE;
+static int device_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
+{
+        PSDevice pDevice = (PSDevice)netdev_priv(dev);
         struct iwreq *wrq = (struct iwreq *) rq;
-        int                 rc =0;
-
-    if (pMgmt == NULL) {
-        rc = -EFAULT;
-        return rc;
-    }
-
-    switch(cmd) {
-
-        case SIOCGIWNAME:
-                rc = iwctl_giwname(dev, NULL, (char *)&(wrq->u.name), NULL);
-                break;
-
-        case SIOCSIWNWID:
-        case SIOCGIWNWID:     //0x8b03  support
-                rc = -EOPNOTSUPP;
-                break;
-
-                // Set frequency/channel
-        case SIOCSIWFREQ:
-            rc = iwctl_siwfreq(dev, NULL, &(wrq->u.freq), NULL);
-                break;
-
-                // Get frequency/channel
-        case SIOCGIWFREQ:
-                rc = iwctl_giwfreq(dev, NULL, &(wrq->u.freq), NULL);
-                break;
-
-                // Set desired network name (ESSID)
-        case SIOCSIWESSID:
-
-                {
-                        char essid[IW_ESSID_MAX_SIZE+1];
-                        if (wrq->u.essid.length > IW_ESSID_MAX_SIZE) {
-                                rc = -E2BIG;
-                                break;
-                        }
-                        if (copy_from_user(essid, wrq->u.essid.pointer,
-                                           wrq->u.essid.length)) {
-                                rc = -EFAULT;
-                                break;
-                        }
-                        rc = iwctl_siwessid(dev, NULL,
-                                            &(wrq->u.essid), essid);
-                }
-                break;
-
-
-                // Get current network name (ESSID)
-        case SIOCGIWESSID:
-
-                {
-                        char essid[IW_ESSID_MAX_SIZE+1];
-                        if (wrq->u.essid.pointer) {
-                                iwctl_giwessid(dev, NULL,
-                                            &(wrq->u.essid), essid);
-                                if (copy_to_user(wrq->u.essid.pointer,
-                                                         essid,
-                                                         wrq->u.essid.length) )
-                                        rc = -EFAULT;
-                        }
-                }
-                break;
-
-        case SIOCSIWAP:
-
-                rc = iwctl_siwap(dev, NULL, &(wrq->u.ap_addr), NULL);
-                break;
-
-
-                // Get current Access Point (BSSID)
-        case SIOCGIWAP:
-                rc = iwctl_giwap(dev, NULL, &(wrq->u.ap_addr), NULL);
-                break;
-
-
-                // Set desired station name
-        case SIOCSIWNICKN:
-        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWNICKN \n");
-        rc = -EOPNOTSUPP;
-                break;
-
-                // Get current station name
-        case SIOCGIWNICKN:
-        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWNICKN \n");
-        rc = -EOPNOTSUPP;
-                break;
-
-                // Set the desired bit-rate
-        case SIOCSIWRATE:
-                rc = iwctl_siwrate(dev, NULL, &(wrq->u.bitrate), NULL);
-                break;
-
-        // Get the current bit-rate
-        case SIOCGIWRATE:
-                iwctl_giwrate(dev, NULL, &(wrq->u.bitrate), NULL);
-                break;
-
-        // Set the desired RTS threshold
-        case SIOCSIWRTS:
-
-                rc = iwctl_siwrts(dev, &(wrq->u.rts));
-                break;
-
-        // Get the current RTS threshold
-        case SIOCGIWRTS:
-
-                rc = iwctl_giwrts(dev, NULL, &(wrq->u.rts), NULL);
-                break;
-
-                // Set the desired fragmentation threshold
-        case SIOCSIWFRAG:
-
-                rc = iwctl_siwfrag(dev, NULL, &(wrq->u.frag), NULL);
-            break;
-
-        // Get the current fragmentation threshold
-        case SIOCGIWFRAG:
-
-                rc = iwctl_giwfrag(dev, NULL, &(wrq->u.frag), NULL);
-                break;
-
-                // Set mode of operation
-        case SIOCSIWMODE:
-        rc = iwctl_siwmode(dev, NULL, &(wrq->u.mode), NULL);
-                break;
-
-                // Get mode of operation
-        case SIOCGIWMODE:
-                iwctl_giwmode(dev, NULL, &(wrq->u.mode), NULL);
-                break;
-
-                // Set WEP keys and mode
-        case SIOCSIWENCODE:
-                {
-            char abyKey[WLAN_WEP232_KEYLEN];
-
-                        if (wrq->u.encoding.pointer) {
-
-
-                                if (wrq->u.encoding.length > WLAN_WEP232_KEYLEN) {
-                                        rc = -E2BIG;
-                                        break;
-                                }
-                                memset(abyKey, 0, WLAN_WEP232_KEYLEN);
-                                if (copy_from_user(abyKey,
-                                                  wrq->u.encoding.pointer,
-                                                  wrq->u.encoding.length)) {
-                                        rc = -EFAULT;
-                                        break;
-                                }
-                        } else if (wrq->u.encoding.length != 0) {
-                                rc = -EINVAL;
-                                break;
-                        }
-                        rc = iwctl_siwencode(dev, NULL, &(wrq->u.encoding), abyKey);
-                }
-                break;
-
-                // Get the WEP keys and mode
-        case SIOCGIWENCODE:
-
-                if (!capable(CAP_NET_ADMIN)) {
-                        rc = -EPERM;
-                        break;
-                }
-                {
-                    char abyKey[WLAN_WEP232_KEYLEN];
-
-                    rc = iwctl_giwencode(dev, NULL, &(wrq->u.encoding), abyKey);
-                    if (rc != 0) break;
-                        if (wrq->u.encoding.pointer) {
-                                if (copy_to_user(wrq->u.encoding.pointer,
-                                                        abyKey,
-                                                        wrq->u.encoding.length))
-                                        rc = -EFAULT;
-                        }
-                }
-                break;
-
-                // Get the current Tx-Power
-        case SIOCGIWTXPOW:
-        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWTXPOW \n");
-        rc = -EOPNOTSUPP;
-                break;
-
-        case SIOCSIWTXPOW:
-        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWTXPOW \n");
-        rc = -EOPNOTSUPP;
-                break;
-
-        case SIOCSIWRETRY:
-
-                rc = iwctl_siwretry(dev, NULL, &(wrq->u.retry), NULL);
-                break;
-
-        case SIOCGIWRETRY:
-
-                rc = iwctl_giwretry(dev, NULL, &(wrq->u.retry), NULL);
-                break;
-
-                // Get range of parameters
-        case SIOCGIWRANGE:
-
-                {
-                        struct iw_range range;
-
-                        iwctl_giwrange(dev, NULL, &(wrq->u.data), (char *) &range);
-                        if (copy_to_user(wrq->u.data.pointer, &range, sizeof(struct iw_range)))
-                                rc = -EFAULT;
-                }
-
-                break;
-
-        case SIOCGIWPOWER:
-
-                rc = iwctl_giwpower(dev, NULL, &(wrq->u.power), NULL);
-                break;
-
-
-        case SIOCSIWPOWER:
-
-                rc = iwctl_siwpower(dev, NULL, &(wrq->u.power), NULL);
-                break;
-
-
-        case SIOCGIWSENS:
-
-            rc = iwctl_giwsens(dev, NULL, &(wrq->u.sens), NULL);
-                break;
-
-        case SIOCSIWSENS:
-        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWSENS \n");
-                rc = -EOPNOTSUPP;
-                break;
-
-        case SIOCGIWAPLIST:
-            {
-            char buffer[IW_MAX_AP * (sizeof(struct sockaddr) + sizeof(struct iw_quality))];
-
-                    if (wrq->u.data.pointer) {
-                        rc = iwctl_giwaplist(dev, NULL, &(wrq->u.data), buffer);
-                        if (rc == 0) {
-                    if (copy_to_user(wrq->u.data.pointer,
-                                                        buffer,
-                                                       (wrq->u.data.length * (sizeof(struct sockaddr) +  sizeof(struct iw_quality)))
-                                        ))
-                                    rc = -EFAULT;
-                        }
-            }
-        }
-                break;
-
-
-#ifdef WIRELESS_SPY
-                // Set the spy list
-        case SIOCSIWSPY:
-
-        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWSPY \n");
-                rc = -EOPNOTSUPP;
-                break;
-
-                // Get the spy list
-        case SIOCGIWSPY:
-
-        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWSPY \n");
-                rc = -EOPNOTSUPP;
-                break;
-
-#endif // WIRELESS_SPY
-
-        case SIOCGIWPRIV:
-        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWPRIV \n");
-                rc = -EOPNOTSUPP;
-/*
-                if(wrq->u.data.pointer) {
-                        wrq->u.data.length = sizeof(iwctl_private_args) / sizeof( iwctl_private_args[0]);
-
-                        if(copy_to_user(wrq->u.data.pointer,
-                                        (u_char *) iwctl_private_args,
-                                        sizeof(iwctl_private_args)))
-                                rc = -EFAULT;
-                }
-*/
-                break;
-
-#ifdef  WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
-        case SIOCSIWAUTH:
-                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWAUTH\n");
-                rc = iwctl_siwauth(dev, NULL, &(wrq->u.param), NULL);
-                break;
-
-        case SIOCGIWAUTH:
-                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWAUTH \n");
-                rc = iwctl_giwauth(dev, NULL, &(wrq->u.param), NULL);
-                break;
-
-        case SIOCSIWGENIE:
-                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWGENIE \n");
-                rc = iwctl_siwgenie(dev, NULL, &(wrq->u.data), wrq->u.data.pointer);
-                break;
-
-        case SIOCGIWGENIE:
-                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWGENIE \n");
-                rc = iwctl_giwgenie(dev, NULL, &(wrq->u.data), wrq->u.data.pointer);
-                break;
-
-        case SIOCSIWENCODEEXT:
-                {
-                        char extra[sizeof(struct iw_encode_ext)+MAX_KEY_LEN+1];
-                        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWENCODEEXT \n");
-                        if(wrq->u.encoding.pointer){
-                                memset(extra, 0, sizeof(struct iw_encode_ext)+MAX_KEY_LEN+1);
-                                if(wrq->u.encoding.length > (sizeof(struct iw_encode_ext)+ MAX_KEY_LEN)){
-                                        rc = -E2BIG;
-                                        break;
-                                }
-                                if(copy_from_user(extra, wrq->u.encoding.pointer,wrq->u.encoding.length)){
-                                        rc = -EFAULT;
-                                        break;
-                                }
-                        }else if(wrq->u.encoding.length != 0){
-                                rc = -EINVAL;
-                                break;
-                        }
-                        rc = iwctl_siwencodeext(dev, NULL, &(wrq->u.encoding), extra);
-                }
-                break;
-
-        case SIOCGIWENCODEEXT:
-                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWENCODEEXT \n");
-                rc = iwctl_giwencodeext(dev, NULL, &(wrq->u.encoding), NULL);
-                break;
-
-        case SIOCSIWMLME:
-                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWMLME \n");
-                rc = iwctl_siwmlme(dev, NULL, &(wrq->u.data), wrq->u.data.pointer);
-                break;
-
-#endif // #ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
-
-    case IOCTL_CMD_TEST:
-
-                if (!(pDevice->flags & DEVICE_FLAGS_OPENED)) {
-                    rc = -EFAULT;
-                    break;
-                } else {
-                    rc = 0;
-                }
-        pReq = (PSCmdRequest)rq;
-
-   //20080130-01,<Remark> by Mike Liu
-      // if(pDevice->bLinkPass==TRUE)
-          pReq->wResult = MAGIC_CODE;         //Linking status:0x3142
-   //20080130-02,<Remark> by Mike Liu
-      //  else
-      //         pReq->wResult = MAGIC_CODE+1;    //disconnect status:0x3143
-        break;
-
-    case IOCTL_CMD_SET:
-                if (!(pDevice->flags & DEVICE_FLAGS_OPENED) &&
-                       (((PSCmdRequest)rq)->wCmdCode !=WLAN_CMD_SET_WPA))
-                {
-                    rc = -EFAULT;
-                    break;
-                } else {
-                    rc = 0;
-                }
+        int rc = 0;
 
-            if (test_and_set_bit( 0, (void*)&(pMgmt->uCmdBusy))) {
-                    return -EBUSY;
-            }
-        rc = private_ioctl(pDevice, rq);
-        clear_bit( 0, (void*)&(pMgmt->uCmdBusy));
-        break;
+        switch (cmd) {
 
-    case IOCTL_CMD_HOSTAPD:
+        case IOCTL_CMD_HOSTAPD:
 
-                if (!(pDevice->flags & DEVICE_FLAGS_OPENED)) {
-                    rc = -EFAULT;
-                    break;
-                } else {
-                    rc = 0;
-                }
+                if (!(pDevice->flags & DEVICE_FLAGS_OPENED))
+                        rc = -EFAULT;
 
                 rc = vt6656_hostap_ioctl(pDevice, &wrq->u.data);
-        break;
-
-    case IOCTL_CMD_WPA:
-
-                if (!(pDevice->flags & DEVICE_FLAGS_OPENED)) {
-                    rc = -EFAULT;
-                    break;
-                } else {
-                    rc = 0;
-                }
-
-                rc = wpa_ioctl(pDevice, &wrq->u.data);
-        break;
+                break;
 
         case SIOCETHTOOL:
-        return ethtool_ioctl(dev, (void *) rq->ifr_data);
-        // All other calls are currently unsupported
-
-        default:
-                rc = -EOPNOTSUPP;
-        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Ioctl command not supported..%x\n", cmd);
-
-
-    }
-
-    if (pDevice->bCommit) {
-       if (pMgmt->eConfigMode == WMAC_CONFIG_AP) {
-           netif_stop_queue(pDevice->dev);
-           spin_lock_irq(&pDevice->lock);
-        bScheduleCommand((void *) pDevice, WLAN_CMD_RUN_AP, NULL);
-           spin_unlock_irq(&pDevice->lock);
-       }
-       else {
-           DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Commit the settings\n");
-           spin_lock_irq(&pDevice->lock);
-//2007-1121-01<Modify>by EinsnLiu
-            if (pDevice->bLinkPass &&
-                  memcmp(pMgmt->abyCurrSSID,pMgmt->abyDesireSSID,WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN)) {
-                bScheduleCommand((void *) pDevice, WLAN_CMD_DISASSOCIATE, NULL);
-             } else {
-           pDevice->bLinkPass = FALSE;
-           pMgmt->eCurrState = WMAC_STATE_IDLE;
-           memset(pMgmt->abyCurrBSSID, 0, 6);
-                 }
-           ControlvMaskByte(pDevice,MESSAGE_REQUEST_MACREG,MAC_REG_PAPEDELAY,LEDSTS_STS,LEDSTS_SLOW);
-//End Modify
-           netif_stop_queue(pDevice->dev);
-#ifdef  WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
-           pMgmt->eScanType = WMAC_SCAN_ACTIVE;
-           if (!pDevice->bWPASuppWextEnabled)
-#endif
-                bScheduleCommand((void *) pDevice,
-                                 WLAN_CMD_BSSID_SCAN,
-                                 pMgmt->abyDesireSSID);
-                bScheduleCommand((void *) pDevice,
-                                 WLAN_CMD_SSID,
-                                 NULL);
-           spin_unlock_irq(&pDevice->lock);
-      }
-      pDevice->bCommit = FALSE;
-    }
+                return ethtool_ioctl(dev, (void *) rq->ifr_data);
 
+        }
 
-    return rc;
+        return rc;
 }
 
 
diff --git a/drivers/staging/vt6656/mib.c b/drivers/staging/vt6656/mib.c
index 8a6ee72f4409..d4c7b0cc7ecd 100644
--- a/drivers/staging/vt6656/mib.c
+++ b/drivers/staging/vt6656/mib.c
@@ -37,7 +37,6 @@
  *
  */
 
-#include "upc.h"
 #include "mac.h"
 #include "tether.h"
 #include "mib.h"
diff --git a/drivers/staging/vt6656/mib.h b/drivers/staging/vt6656/mib.h
index 82d69a9cc209..85c28e923663 100644
--- a/drivers/staging/vt6656/mib.h
+++ b/drivers/staging/vt6656/mib.h
@@ -68,7 +68,6 @@ typedef struct tagSDot11Counters {
     unsigned long long   TKIPLocalMICFailures;
     unsigned long long   TKIPRemoteMICFailures;
     unsigned long long   TKIPICVErrors;
-    unsigned long long   TKIPCounterMeasuresInvoked;
     unsigned long long   TKIPReplays;
     unsigned long long   CCMPFormatErrors;
     unsigned long long   CCMPReplays;
diff --git a/drivers/staging/vt6656/rf.c b/drivers/staging/vt6656/rf.c
index 593cdc713b0e..74c0598e37b7 100644
--- a/drivers/staging/vt6656/rf.c
+++ b/drivers/staging/vt6656/rf.c
@@ -769,6 +769,9 @@ BYTE    byPwr = pDevice->byCCKPwr;
         return TRUE;
     }
 
+        if (uCH == 0)
+                return -EINVAL;
+
     switch (uRATE) {
     case RATE_1M:
     case RATE_2M:
diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c
index 339083879883..83c04e120935 100644
--- a/drivers/staging/vt6656/rxtx.c
+++ b/drivers/staging/vt6656/rxtx.c
@@ -355,7 +355,7 @@ s_vFillTxKey (
         }
         // Append IV after Mac Header
         *pdwIV &= WEP_IV_MASK;//00000000 11111111 11111111 11111111
-        *pdwIV |= (pDevice->byKeyIndex << 30);
+        *pdwIV |= (u32)pDevice->byKeyIndex << 30;
         *pdwIV = cpu_to_le32(*pdwIV);
         pDevice->dwIVCounter++;
         if (pDevice->dwIVCounter > WEP_IV_MASK) {
@@ -375,7 +375,8 @@ s_vFillTxKey (
         *(pbyIVHead+3) = (BYTE)(((pDevice->byKeyIndex << 6) & 0xc0) | 0x20); // 0x20 is ExtIV
         // Append IV&ExtIV after Mac Header
         *pdwExtIV = cpu_to_le32(pTransmitKey->dwTSC47_16);
-        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"vFillTxKey()---- pdwExtIV: %lx\n", *pdwExtIV);
+        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"vFillTxKey()---- pdwExtIV: %x\n",
+                *pdwExtIV);
 
     } else if (pTransmitKey->byCipherSuite == KEY_CTL_CCMP) {
         pTransmitKey->wTSC15_0++;
@@ -1452,12 +1453,10 @@ s_bPacketToWirelessUsb(
 
 
     pvRrvTime = pMICHDR = pvRTS = pvCTS = pvTxDataHd = NULL;
-    if ((bNeedEncryption) && (pTransmitKey != NULL))  {
-        if (((PSKeyTable) (pTransmitKey->pvKeyTable))->bSoftWEP == TRUE) {
-            // WEP 256
-            bSoftWEP = TRUE;
-        }
-    }
+        if (bNeedEncryption && pTransmitKey->pvKeyTable) {
+                if (((PSKeyTable)&pTransmitKey->pvKeyTable)->bSoftWEP == TRUE)
+                        bSoftWEP = TRUE; /* WEP 256 */
+        }
 
     pTxBufHead = (PTX_BUFFER) usbPacketBuf;
     memset(pTxBufHead, 0, sizeof(TX_BUFFER));
@@ -1751,7 +1750,8 @@ s_bPacketToWirelessUsb(
         MIC_vAppend((PBYTE)&(psEthHeader->abyDstAddr[0]), 12);
         dwMIC_Priority = 0;
         MIC_vAppend((PBYTE)&dwMIC_Priority, 4);
-        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"MIC KEY: %lX, %lX\n", dwMICKey0, dwMICKey1);
+        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"MIC KEY: %X, %X\n",
+                dwMICKey0, dwMICKey1);
 
         ///////////////////////////////////////////////////////////////////
 
@@ -2633,7 +2633,8 @@ vDMA0_tx_80211(PSDevice  pDevice, struct sk_buff *skb) {
             MIC_vAppend((PBYTE)&(sEthHeader.abyDstAddr[0]), 12);
             dwMIC_Priority = 0;
             MIC_vAppend((PBYTE)&dwMIC_Priority, 4);
-            DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"DMA0_tx_8021:MIC KEY: %lX, %lX\n", dwMICKey0, dwMICKey1);
+                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"DMA0_tx_8021:MIC KEY:"\
+                        " %X, %X\n", dwMICKey0, dwMICKey1);
 
             uLength = cbHeaderSize + cbMacHdLen + uPadding + cbIVlen;
 
@@ -2653,7 +2654,8 @@ vDMA0_tx_80211(PSDevice  pDevice, struct sk_buff *skb) {
 
             DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"uLength: %d, %d\n", uLength, cbFrameBodySize);
             DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"cbReqCount:%d, %d, %d, %d\n", cbReqCount, cbHeaderSize, uPadding, cbIVlen);
-            DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"MIC:%lx, %lx\n", *pdwMIC_L, *pdwMIC_R);
+                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"MIC:%x, %x\n",
+                        *pdwMIC_L, *pdwMIC_R);
 
         }
 
@@ -3027,21 +3029,18 @@ int nsDMA_tx_packet(PSDevice pDevice, unsigned int uDMAIdx, struct sk_buff *skb)
                         DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"error: KEY is GTK!!~~\n");
                     }
                     else {
-                        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Find PTK [%lX]\n", pTransmitKey->dwKeyIndex);
+                        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Find PTK [%X]\n",
+                                pTransmitKey->dwKeyIndex);
                         bNeedEncryption = TRUE;
                     }
                 }
             }
 
-            if (pDevice->byCntMeasure == 2) {
-                bNeedDeAuth = TRUE;
-                pDevice->s802_11Counter.TKIPCounterMeasuresInvoked++;
-            }
-
             if (pDevice->bEnableHostWEP) {
                 if ((uNodeIndex != 0) &&
                     (pMgmt->sNodeDBTable[uNodeIndex].dwKeyIndex & PAIRWISE_KEY)) {
-                    DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Find PTK [%lX]\n", pTransmitKey->dwKeyIndex);
+                        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Find PTK [%X]\n",
+                                pTransmitKey->dwKeyIndex);
                     bNeedEncryption = TRUE;
                  }
              }
@@ -3050,6 +3049,7 @@ int nsDMA_tx_packet(PSDevice pDevice, unsigned int uDMAIdx, struct sk_buff *skb)
 
             if (pTransmitKey == NULL) {
                 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"return no tx key\n");
+                pContext->bBoolInUse = FALSE;
                 dev_kfree_skb_irq(skb);
                 pStats->tx_dropped++;
                 return STATUS_FAILURE;
diff --git a/drivers/staging/vt6656/rxtx.h b/drivers/staging/vt6656/rxtx.h
index f99acf1d8eb9..dd2198acc636 100644
--- a/drivers/staging/vt6656/rxtx.h
+++ b/drivers/staging/vt6656/rxtx.h
@@ -61,9 +61,9 @@ typedef struct tagSCTSDataF {
 // MICHDR data header
 //
 typedef struct tagSMICHDR {
-    DWORD   adwHDR0[4];
-    DWORD   adwHDR1[4];
-    DWORD   adwHDR2[4];
+        u32 adwHDR0[4];
+        u32 adwHDR1[4];
+        u32 adwHDR2[4];
 } SMICHDR, *PSMICHDR;
 
 
@@ -630,7 +630,7 @@ typedef struct tagSTX_BUFFER
     BYTE                            byPKTNO;
     WORD                            wTxByteCount;
 
-    DWORD                           adwTxKey[4];
+        u32 adwTxKey[4];
     WORD                            wFIFOCtl;
     WORD                            wTimeStamp;
     WORD                            wFragCtl;
diff --git a/drivers/staging/vt6656/tkip.c b/drivers/staging/vt6656/tkip.c
index 003123e550f6..282c08d65761 100644
--- a/drivers/staging/vt6656/tkip.c
+++ b/drivers/staging/vt6656/tkip.c
@@ -189,27 +189,25 @@ void TKIPvMixKey(
     PBYTE   pbyRC4Key
     )
 {
-    unsigned int p1k[5];
-//    unsigned int ttak0, ttak1, ttak2, ttak3, ttak4;
-    unsigned int tsc0, tsc1, tsc2;
-    unsigned int ppk0, ppk1, ppk2, ppk3, ppk4, ppk5;
-    unsigned long int pnl,pnh;
-
-    int i, j;
-
-    pnl = wTSC15_0;
-    pnh = dwTSC47_16;
-
-    tsc0 = (unsigned int)((pnh >> 16) % 65536); /* msb */
-    tsc1 = (unsigned int)(pnh % 65536);
-    tsc2 = (unsigned int)(pnl % 65536); /* lsb */
-
-    /* Phase 1, step 1 */
-    p1k[0] = tsc1;
-    p1k[1] = tsc0;
-    p1k[2] = (unsigned int)(pbyTA[0] + (pbyTA[1]*256));
-    p1k[3] = (unsigned int)(pbyTA[2] + (pbyTA[3]*256));
-    p1k[4] = (unsigned int)(pbyTA[4] + (pbyTA[5]*256));
+        u32 p1k[5];
+        u32 tsc0, tsc1, tsc2;
+        u32 ppk0, ppk1, ppk2, ppk3, ppk4, ppk5;
+        u32 pnl, pnh;
+        int i, j;
+
+        pnl = (u32)wTSC15_0;
+        pnh = (u32)(dwTSC47_16 & 0xffffffff);
+
+        tsc0 = (u32)((pnh >> 16) % 65536); /* msb */
+        tsc1 = (u32)(pnh % 65536);
+        tsc2 = (u32)(pnl % 65536); /* lsb */
+
+        /* Phase 1, step 1 */
+        p1k[0] = tsc1;
+        p1k[1] = tsc0;
+        p1k[2] = (u32)(pbyTA[0] + (pbyTA[1]*256));
+        p1k[3] = (u32)(pbyTA[2] + (pbyTA[3]*256));
+        p1k[4] = (u32)(pbyTA[4] + (pbyTA[5]*256));
 
     /* Phase 1, step 2 */
     for (i=0; i<8; i++) {
diff --git a/drivers/staging/vt6656/ttype.h b/drivers/staging/vt6656/ttype.h
index 8e9450ef3997..dfbf74713a80 100644
--- a/drivers/staging/vt6656/ttype.h
+++ b/drivers/staging/vt6656/ttype.h
@@ -29,6 +29,8 @@
 #ifndef __TTYPE_H__
 #define __TTYPE_H__
 
+#include <linux/types.h>
+
 /******* Common definitions and typedefs ***********************************/
 
 typedef int             BOOL;
@@ -42,17 +44,17 @@ typedef int             BOOL;
 
 /****** Simple typedefs  ***************************************************/
 
-typedef unsigned char   BYTE;           //  8-bit
-typedef unsigned short  WORD;           // 16-bit
-typedef unsigned long   DWORD;          // 32-bit
+typedef u8 BYTE;
+typedef u16 WORD;
+typedef u32 DWORD;
 
 // QWORD is for those situation that we want
 // an 8-byte-aligned 8 byte long structure
 // which is NOT really a floating point number.
 typedef union tagUQuadWord {
     struct {
-        DWORD   dwLowDword;
-        DWORD   dwHighDword;
+        u32 dwLowDword;
+        u32 dwHighDword;
     } u;
     double      DoNotUseThisField;
 } UQuadWord;
@@ -60,8 +62,8 @@ typedef UQuadWord       QWORD;          // 64-bit
 
 /****** Common pointer types ***********************************************/
 
-typedef unsigned long   ULONG_PTR;      // 32-bit
-typedef unsigned long   DWORD_PTR;      // 32-bit
+typedef u32 ULONG_PTR;
+typedef u32 DWORD_PTR;
 
 // boolean pointer
 
diff --git a/drivers/staging/vt6656/upc.h b/drivers/staging/vt6656/upc.h
deleted file mode 100644
index b33aba4b12c9..000000000000
--- a/drivers/staging/vt6656/upc.h
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * Copyright (c) 1996, 2003 VIA Networking Technologies, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * File: upc.h
- *
- * Purpose: Macros to access device
- *
- * Author: Tevin Chen
- *
- * Date: Mar 17, 1997
- *
- */
-
-#ifndef __UPC_H__
-#define __UPC_H__
-
-#include "device.h"
-#include "ttype.h"
-
-/*---------------------  Export Definitions -------------------------*/
-
-
-//
-//  For IO mapped
-//
-
-#ifdef IO_MAP
-
-#define VNSvInPortB(dwIOAddress, pbyData) {                     \
-        *(pbyData) = inb(dwIOAddress);                              \
-}
-
-
-#define VNSvInPortW(dwIOAddress, pwData) {                      \
-            *(pwData) = inw(dwIOAddress);                           \
-}
-
-#define VNSvInPortD(dwIOAddress, pdwData) {                     \
-            *(pdwData) = inl(dwIOAddress);                          \
-}
-
-
-#define VNSvOutPortB(dwIOAddress, byData) {                     \
-        outb(byData, dwIOAddress);                              \
-}
-
-
-#define VNSvOutPortW(dwIOAddress, wData) {                      \
-        outw(wData, dwIOAddress);                               \
-}
-
-#define VNSvOutPortD(dwIOAddress, dwData) {                     \
-        outl(dwData, dwIOAddress);                              \
-}
-
-#else
-
-//
-//  For memory mapped IO
-//
-
-
-#define VNSvInPortB(dwIOAddress, pbyData) {                     \
-        volatile BYTE* pbyAddr = ((PBYTE)(dwIOAddress));            \
-        *(pbyData) = readb(pbyAddr);                           \
-}
-
-
-#define VNSvInPortW(dwIOAddress, pwData) {                      \
-        volatile WORD* pwAddr = ((PWORD)(dwIOAddress));             \
-        *(pwData) = readw(pwAddr);                             \
-}
-
-#define VNSvInPortD(dwIOAddress, pdwData) {                     \
-        volatile DWORD* pdwAddr = ((PDWORD)(dwIOAddress));          \
-        *(pdwData) = readl(pdwAddr);                           \
-}
-
-
-#define VNSvOutPortB(dwIOAddress, byData) {                     \
-    volatile BYTE* pbyAddr = ((PBYTE)(dwIOAddress));            \
-    writeb((BYTE)byData, pbyAddr);                                                      \
-}
-
-
-#define VNSvOutPortW(dwIOAddress, wData) {                      \
-    volatile WORD* pwAddr = ((PWORD)(dwIOAddress));             \
-    writew((WORD)wData, pwAddr);                                                        \
-}
-
-#define VNSvOutPortD(dwIOAddress, dwData) {                     \
-    volatile DWORD* pdwAddr = ((PDWORD)(dwIOAddress));          \
-    writel((DWORD)dwData, pdwAddr);                                         \
-}
-
-#endif
-
-
-//
-// ALWAYS IO-Mapped IO when in 16-bit/32-bit environment
-//
-#define PCBvInPortB(dwIOAddress, pbyData) {     \
-            *(pbyData) = inb(dwIOAddress);          \
-}
-
-#define PCBvInPortW(dwIOAddress, pwData) {      \
-            *(pwData) = inw(dwIOAddress);           \
-}
-
-#define PCBvInPortD(dwIOAddress, pdwData) {     \
-            *(pdwData) = inl(dwIOAddress);          \
-}
-
-#define PCBvOutPortB(dwIOAddress, byData) {     \
-        outb(byData, dwIOAddress);              \
-}
-
-#define PCBvOutPortW(dwIOAddress, wData) {      \
-        outw(wData, dwIOAddress);               \
-}
-
-#define PCBvOutPortD(dwIOAddress, dwData) {     \
-        outl(dwData, dwIOAddress);              \
-}
-
-
-#define PCAvDelayByIO(uDelayUnit) {             \
-    BYTE    byData;                             \
-    unsigned long   ii;                                 \
-                                                \
-    if (uDelayUnit <= 50) {                     \
-        udelay(uDelayUnit);                     \
-    }                                           \
-    else {                                      \
-        for (ii = 0; ii < (uDelayUnit); ii++)   \
-                     byData = inb(0x61);                                \
-    }                                           \
-}
-
-
-/*---------------------  Export Classes  ----------------------------*/
-
-/*---------------------  Export Variables  --------------------------*/
-
-/*---------------------  Export Functions  --------------------------*/
-
-#endif /* __UPC_H__ */
diff --git a/drivers/staging/vt6656/usbpipe.c b/drivers/staging/vt6656/usbpipe.c
index 609e8fa10b98..fc68518526e0 100644
--- a/drivers/staging/vt6656/usbpipe.c
+++ b/drivers/staging/vt6656/usbpipe.c
@@ -575,7 +575,8 @@ s_nsBulkInUsbIoCompleteRead(
 //            MP_SET_FLAG(pDevice, fMP_DISCONNECTED);
 //        }
     } else {
-        bIndicateReceive = TRUE;
+        if (bytesRead)
+                bIndicateReceive = TRUE;
         pDevice->ulBulkInContCRCError = 0;
         pDevice->ulBulkInBytesRead += bytesRead;
 
@@ -660,6 +661,7 @@ PIPEnsSendBulkOut(
         if (status != 0)
         {
                 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Submit Tx URB failed %d\n", status);
+                pContext->bBoolInUse = FALSE;
                 return STATUS_FAILURE;
         }
         return STATUS_PENDING;
diff --git a/drivers/staging/vt6656/wcmd.c b/drivers/staging/vt6656/wcmd.c
index 586fbe1627f7..22f6b41cfd19 100644
--- a/drivers/staging/vt6656/wcmd.c
+++ b/drivers/staging/vt6656/wcmd.c
@@ -316,17 +316,19 @@ s_MgrMakeProbeRequest(
     return pTxPacket;
 }
 
-void vCommandTimerWait(void *hDeviceContext, unsigned int MSecond)
+void vCommandTimerWait(void *hDeviceContext, unsigned long MSecond)
 {
-    PSDevice        pDevice = (PSDevice)hDeviceContext;
+        PSDevice pDevice = (PSDevice)hDeviceContext;
 
-    init_timer(&pDevice->sTimerCommand);
-    pDevice->sTimerCommand.data = (unsigned long)pDevice;
-    pDevice->sTimerCommand.function = (TimerFunction)vRunCommand;
-    // RUN_AT :1 msec ~= (HZ/1024)
-    pDevice->sTimerCommand.expires = (unsigned int)RUN_AT((MSecond * HZ) >> 10);
-    add_timer(&pDevice->sTimerCommand);
-    return;
+        init_timer(&pDevice->sTimerCommand);
+
+        pDevice->sTimerCommand.data = (unsigned long)pDevice;
+        pDevice->sTimerCommand.function = (TimerFunction)vRunCommand;
+        pDevice->sTimerCommand.expires = RUN_AT((MSecond * HZ) / 1000);
+
+        add_timer(&pDevice->sTimerCommand);
+
+        return;
 }
 
 void vRunCommand(void *hDeviceContext)
@@ -340,6 +342,7 @@ void vRunCommand(void *hDeviceContext)
     BYTE            byMask[8] = {1, 2, 4, 8, 0x10, 0x20, 0x40, 0x80};
     struct sk_buff  *skb;
     BYTE            byData;
+        union iwreq_data wrqu;
 
 
     if (pDevice->dwDiagRefCount != 0)
@@ -501,16 +504,11 @@ void vRunCommand(void *hDeviceContext)
             pMgmt->eScanState = WMAC_NO_SCANNING;
             pDevice->bStopDataPkt = FALSE;
 
-#ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
-        if(pMgmt->eScanType == WMAC_SCAN_PASSIVE)
-                {
-                        //send scan event to wpa_Supplicant
-                                union iwreq_data wrqu;
-                                PRINT_K("wireless_send_event--->SIOCGIWSCAN(scan done)\n");
-                                memset(&wrqu, 0, sizeof(wrqu));
-                                wireless_send_event(pDevice->dev, SIOCGIWSCAN, &wrqu, NULL);
-                        }
-#endif
+                /*send scan event to wpa_Supplicant*/
+                PRINT_K("wireless_send_event--->SIOCGIWSCAN(scan done)\n");
+                memset(&wrqu, 0, sizeof(wrqu));
+                wireless_send_event(pDevice->dev, SIOCGIWSCAN, &wrqu, NULL);
+
             s_bCommandComplete(pDevice);
             break;
 
@@ -523,13 +521,11 @@ void vRunCommand(void *hDeviceContext)
                 return;
             } else {
 
-          #ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
                       pDevice->bwextstep0 = FALSE;
                         pDevice->bwextstep1 = FALSE;
                         pDevice->bwextstep2 = FALSE;
                         pDevice->bwextstep3 = FALSE;
                    pDevice->bWPASuppWextEnabled = FALSE;
-         #endif
                    pDevice->fWPA_Authened = FALSE;
 
                 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Send Disassociation Packet..\n");
@@ -672,7 +668,6 @@ void vRunCommand(void *hDeviceContext)
                 }
                 else {
                     DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Disconnect SSID none\n");
-                     #ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
                     // if(pDevice->bWPASuppWextEnabled == TRUE)
                         {
                         union iwreq_data  wrqu;
@@ -681,7 +676,6 @@ void vRunCommand(void *hDeviceContext)
                         PRINT_K("wireless_send_event--->SIOCGIWAP(disassociated:vMgrJoinBSSBegin Fail !!)\n");
                         wireless_send_event(pDevice->dev, SIOCGIWAP, &wrqu, NULL);
                        }
-                    #endif
                 }
             }
             s_bCommandComplete(pDevice);
@@ -924,7 +918,6 @@ void vRunCommand(void *hDeviceContext)
                 // unlock command busy
                         pMgmt->eCurrState = WMAC_STATE_IDLE;
                         pMgmt->sNodeDBTable[0].bActive = FALSE;
-                     #ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
                     // if(pDevice->bWPASuppWextEnabled == TRUE)
                         {
                         union iwreq_data  wrqu;
@@ -933,15 +926,12 @@ void vRunCommand(void *hDeviceContext)
                         PRINT_K("wireless_send_event--->SIOCGIWAP(disassociated)\n");
                         wireless_send_event(pDevice->dev, SIOCGIWAP, &wrqu, NULL);
                        }
-                    #endif
                 }
-               #ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
                        pDevice->bwextstep0 = FALSE;
                         pDevice->bwextstep1 = FALSE;
                         pDevice->bwextstep2 = FALSE;
                         pDevice->bwextstep3 = FALSE;
                       pDevice->bWPASuppWextEnabled = FALSE;
-                #endif
                           //clear current SSID
                   pItemSSID = (PWLAN_IE_SSID)pMgmt->abyCurrSSID;
                   pItemSSID->len = 0;
diff --git a/drivers/staging/vt6656/wmgr.c b/drivers/staging/vt6656/wmgr.c
index 7db6a8d3508b..95ddc8303bb3 100644
--- a/drivers/staging/vt6656/wmgr.c
+++ b/drivers/staging/vt6656/wmgr.c
@@ -925,7 +925,6 @@ s_vMgrRxAssocResponse(
     WLAN_FR_ASSOCRESP   sFrame;
     PWLAN_IE_SSID   pItemSSID;
     PBYTE   pbyIEs;
-    viawget_wpa_header *wpahdr;
 
 
 
@@ -973,32 +972,7 @@ s_vMgrRxAssocResponse(
             DBG_PRT(MSG_LEVEL_INFO, KERN_INFO "Link with AP(SSID): %s\n", pItemSSID->abySSID);
             pDevice->bLinkPass = TRUE;
             ControlvMaskByte(pDevice,MESSAGE_REQUEST_MACREG,MAC_REG_PAPEDELAY,LEDSTS_STS,LEDSTS_INTER);
-            if ((pDevice->bWPADEVUp) && (pDevice->skb != NULL)) {
-               if(skb_tailroom(pDevice->skb) <(sizeof(viawget_wpa_header)+pMgmt->sAssocInfo.AssocInfo.ResponseIELength+
-                                                                         pMgmt->sAssocInfo.AssocInfo.RequestIELength)) {    //data room not enough
-                     dev_kfree_skb(pDevice->skb);
-                   pDevice->skb = dev_alloc_skb((int)pDevice->rx_buf_sz);
-                }
-                wpahdr = (viawget_wpa_header *)pDevice->skb->data;
-                wpahdr->type = VIAWGET_ASSOC_MSG;
-                wpahdr->resp_ie_len = pMgmt->sAssocInfo.AssocInfo.ResponseIELength;
-                wpahdr->req_ie_len = pMgmt->sAssocInfo.AssocInfo.RequestIELength;
-                memcpy(pDevice->skb->data + sizeof(viawget_wpa_header), pMgmt->sAssocInfo.abyIEs, wpahdr->req_ie_len);
-                memcpy(pDevice->skb->data + sizeof(viawget_wpa_header) + wpahdr->req_ie_len,
-                       pbyIEs,
-                       wpahdr->resp_ie_len
-                       );
-                skb_put(pDevice->skb, sizeof(viawget_wpa_header) + wpahdr->resp_ie_len + wpahdr->req_ie_len);
-                pDevice->skb->dev = pDevice->wpadev;
-                skb_reset_mac_header(pDevice->skb);
-                pDevice->skb->pkt_type = PACKET_HOST;
-                pDevice->skb->protocol = htons(ETH_P_802_2);
-                memset(pDevice->skb->cb, 0, sizeof(pDevice->skb->cb));
-                netif_rx(pDevice->skb);
-                pDevice->skb = dev_alloc_skb((int)pDevice->rx_buf_sz);
-            }
 
-#ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
         //if(pDevice->bWPASuppWextEnabled == TRUE)
            {
                 BYTE buf[512];
@@ -1037,7 +1011,6 @@ s_vMgrRxAssocResponse(
         wireless_send_event(pDevice->dev, SIOCGIWAP, &wrqu, NULL);
 
         }
-#endif //#ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
 
         }
         else {
@@ -1053,14 +1026,12 @@ s_vMgrRxAssocResponse(
 
     }
 
-#ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
 //need clear flags related to Networkmanager
               pDevice->bwextstep0 = FALSE;
               pDevice->bwextstep1 = FALSE;
               pDevice->bwextstep2 = FALSE;
               pDevice->bwextstep3 = FALSE;
               pDevice->bWPASuppWextEnabled = FALSE;
-#endif
 
 if(pMgmt->eCurrState == WMAC_STATE_ASSOC)
       timer_expire(pDevice->sTimerCommand, 0);
@@ -1587,7 +1558,6 @@ s_vMgrRxDisassociation(
     WLAN_FR_DISASSOC    sFrame;
     unsigned int        uNodeIndex = 0;
     CMD_STATUS          CmdStatus;
-    viawget_wpa_header *wpahdr;
 
     if ( pMgmt->eCurrMode == WMAC_MODE_ESS_AP ){
         // if is acting an AP..
@@ -1608,20 +1578,6 @@ s_vMgrRxDisassociation(
         DBG_PRT(MSG_LEVEL_NOTICE, KERN_INFO "AP disassociated me, reason=%d.\n", cpu_to_le16(*(sFrame.pwReason)));
 
           pDevice->fWPA_Authened = FALSE;
-        if ((pDevice->bWPADEVUp) && (pDevice->skb != NULL)) {
-             wpahdr = (viawget_wpa_header *)pDevice->skb->data;
-             wpahdr->type = VIAWGET_DISASSOC_MSG;
-             wpahdr->resp_ie_len = 0;
-             wpahdr->req_ie_len = 0;
-             skb_put(pDevice->skb, sizeof(viawget_wpa_header));
-             pDevice->skb->dev = pDevice->wpadev;
-             skb_reset_mac_header(pDevice->skb);
-             pDevice->skb->pkt_type = PACKET_HOST;
-             pDevice->skb->protocol = htons(ETH_P_802_2);
-             memset(pDevice->skb->cb, 0, sizeof(pDevice->skb->cb));
-             netif_rx(pDevice->skb);
-             pDevice->skb = dev_alloc_skb((int)pDevice->rx_buf_sz);
-         }
 
         //TODO: do something let upper layer know or
         //try to send associate packet again because of inactivity timeout
@@ -1638,7 +1594,6 @@ s_vMgrRxDisassociation(
               }
         }
 
-   #ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
   // if(pDevice->bWPASuppWextEnabled == TRUE)
       {
         union iwreq_data  wrqu;
@@ -1647,7 +1602,6 @@ s_vMgrRxDisassociation(
         PRINT_K("wireless_send_event--->SIOCGIWAP(disassociated)\n");
         wireless_send_event(pDevice->dev, SIOCGIWAP, &wrqu, NULL);
      }
-  #endif
     }
     /* else, ignore it */
 
@@ -1676,7 +1630,6 @@ s_vMgrRxDeauthentication(
 {
     WLAN_FR_DEAUTHEN    sFrame;
     unsigned int        uNodeIndex = 0;
-    viawget_wpa_header *wpahdr;
 
 
     if (pMgmt->eCurrMode == WMAC_MODE_ESS_AP ){
@@ -1712,22 +1665,6 @@ s_vMgrRxDeauthentication(
                 }
             }
 
-            if ((pDevice->bWPADEVUp) && (pDevice->skb != NULL)) {
-                 wpahdr = (viawget_wpa_header *)pDevice->skb->data;
-                 wpahdr->type = VIAWGET_DISASSOC_MSG;
-                 wpahdr->resp_ie_len = 0;
-                 wpahdr->req_ie_len = 0;
-                 skb_put(pDevice->skb, sizeof(viawget_wpa_header));
-                 pDevice->skb->dev = pDevice->wpadev;
-                 skb_reset_mac_header(pDevice->skb);
-                 pDevice->skb->pkt_type = PACKET_HOST;
-                 pDevice->skb->protocol = htons(ETH_P_802_2);
-                 memset(pDevice->skb->cb, 0, sizeof(pDevice->skb->cb));
-                 netif_rx(pDevice->skb);
-                 pDevice->skb = dev_alloc_skb((int)pDevice->rx_buf_sz);
-           }
-
-   #ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
   // if(pDevice->bWPASuppWextEnabled == TRUE)
       {
         union iwreq_data  wrqu;
@@ -1736,7 +1673,6 @@ s_vMgrRxDeauthentication(
         PRINT_K("wireless_send_event--->SIOCGIWAP(disauthen)\n");
         wireless_send_event(pDevice->dev, SIOCGIWAP, &wrqu, NULL);
      }
-  #endif
 
         }
         /* else, ignore it.  TODO: IBSS authentication service
@@ -2645,10 +2581,8 @@ void vMgrJoinBSSBegin(void *hDeviceContext, PCMD_STATUS pStatus)
 */
         }
 
-#ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
         //if(pDevice->bWPASuppWextEnabled == TRUE)
             Encyption_Rebuild(pDevice, pCurr);
-#endif
 
         // Infrastructure BSS
         s_vMgrSynchBSS(pDevice,
diff --git a/drivers/staging/vt6656/wmgr.h b/drivers/staging/vt6656/wmgr.h
index 13dfb3bf8328..52b1b562b141 100644
--- a/drivers/staging/vt6656/wmgr.h
+++ b/drivers/staging/vt6656/wmgr.h
@@ -89,44 +89,44 @@ typedef void (*TimerFunction)(unsigned long);
 
 //+++ NDIS related
 
-typedef unsigned char NDIS_802_11_MAC_ADDRESS[ETH_ALEN];
+typedef u8 NDIS_802_11_MAC_ADDRESS[ETH_ALEN];
 typedef struct _NDIS_802_11_AI_REQFI
 {
-    unsigned short Capabilities;
-    unsigned short ListenInterval;
+        u16 Capabilities;
+        u16 ListenInterval;
     NDIS_802_11_MAC_ADDRESS  CurrentAPAddress;
 } NDIS_802_11_AI_REQFI, *PNDIS_802_11_AI_REQFI;
 
 typedef struct _NDIS_802_11_AI_RESFI
 {
-    unsigned short Capabilities;
-    unsigned short StatusCode;
-    unsigned short AssociationId;
+        u16 Capabilities;
+        u16 StatusCode;
+        u16 AssociationId;
 } NDIS_802_11_AI_RESFI, *PNDIS_802_11_AI_RESFI;
 
 typedef struct _NDIS_802_11_ASSOCIATION_INFORMATION
 {
-    unsigned long                   Length;
-    unsigned short                  AvailableRequestFixedIEs;
-    NDIS_802_11_AI_REQFI    RequestFixedIEs;
-    unsigned long                   RequestIELength;
-    unsigned long                   OffsetRequestIEs;
-    unsigned short                  AvailableResponseFixedIEs;
-    NDIS_802_11_AI_RESFI    ResponseFixedIEs;
-    unsigned long                   ResponseIELength;
-    unsigned long                   OffsetResponseIEs;
+        u32 Length;
+        u16 AvailableRequestFixedIEs;
+        NDIS_802_11_AI_REQFI RequestFixedIEs;
+        u32 RequestIELength;
+        u32 OffsetRequestIEs;
+        u16 AvailableResponseFixedIEs;
+        NDIS_802_11_AI_RESFI ResponseFixedIEs;
+        u32 ResponseIELength;
+        u32 OffsetResponseIEs;
 } NDIS_802_11_ASSOCIATION_INFORMATION, *PNDIS_802_11_ASSOCIATION_INFORMATION;
 
 
 
 typedef struct tagSAssocInfo {
-    NDIS_802_11_ASSOCIATION_INFORMATION     AssocInfo;
-    BYTE                                    abyIEs[WLAN_BEACON_FR_MAXLEN+WLAN_BEACON_FR_MAXLEN];
-    // store ReqIEs set by OID_802_11_ASSOCIATION_INFORMATION
-    unsigned long                                   RequestIELength;
-    BYTE                                    abyReqIEs[WLAN_BEACON_FR_MAXLEN];
+        NDIS_802_11_ASSOCIATION_INFORMATION AssocInfo;
+        u8 abyIEs[WLAN_BEACON_FR_MAXLEN+WLAN_BEACON_FR_MAXLEN];
+        /* store ReqIEs set by OID_802_11_ASSOCIATION_INFORMATION */
+        u32 RequestIELength;
+        u8 abyReqIEs[WLAN_BEACON_FR_MAXLEN];
 } SAssocInfo, *PSAssocInfo;
-//---
+
 
 
 
diff --git a/drivers/staging/vt6656/wpa2.c b/drivers/staging/vt6656/wpa2.c
index c0926976627d..616e24dcf42b 100644
--- a/drivers/staging/vt6656/wpa2.c
+++ b/drivers/staging/vt6656/wpa2.c
@@ -31,8 +31,8 @@
  *
  */
 
-#include "wpa2.h"
 #include "device.h"
+#include "wpa2.h"
 
 /*---------------------  Static Definitions -------------------------*/
 static int          msglevel                =MSG_LEVEL_INFO;
diff --git a/drivers/staging/vt6656/wpa2.h b/drivers/staging/vt6656/wpa2.h
index 46c295905b48..c359252a6b0e 100644
--- a/drivers/staging/vt6656/wpa2.h
+++ b/drivers/staging/vt6656/wpa2.h
@@ -45,8 +45,8 @@ typedef struct tagsPMKIDInfo {
 } PMKIDInfo, *PPMKIDInfo;
 
 typedef struct tagSPMKIDCache {
-    unsigned long       BSSIDInfoCount;
-    PMKIDInfo   BSSIDInfo[MAX_PMKID_CACHE];
+        u32 BSSIDInfoCount;
+        PMKIDInfo BSSIDInfo[MAX_PMKID_CACHE];
 } SPMKIDCache, *PSPMKIDCache;
 
 
diff --git a/drivers/staging/vt6656/wpactl.c b/drivers/staging/vt6656/wpactl.c
index 3e65aa132011..cc1d48bced2d 100644
--- a/drivers/staging/vt6656/wpactl.c
+++ b/drivers/staging/vt6656/wpactl.c
@@ -44,13 +44,6 @@
 
 /*---------------------  Static Definitions -------------------------*/
 
-#define VIAWGET_WPA_MAX_BUF_SIZE 1024
-
-static const int frequency_list[] = {
-        2412, 2417, 2422, 2427, 2432, 2437, 2442,
-        2447, 2452, 2457, 2462, 2467, 2472, 2484
-};
-
 /*---------------------  Static Classes  ----------------------------*/
 
 /*---------------------  Static Variables  --------------------------*/
@@ -59,118 +52,7 @@ static int msglevel = MSG_LEVEL_INFO;
 /*---------------------  Static Functions  --------------------------*/
 
 /*---------------------  Export Variables  --------------------------*/
-static void wpadev_setup(struct net_device *dev)
-{
-        dev->type               = ARPHRD_IEEE80211;
-        dev->hard_header_len    = ETH_HLEN;
-        dev->mtu                = 2048;
-        dev->addr_len           = ETH_ALEN;
-        dev->tx_queue_len       = 1000;
 
-        memset(dev->broadcast, 0xFF, ETH_ALEN);
-
-        dev->flags              = IFF_BROADCAST | IFF_MULTICAST;
-}
-
-/*
- * Description:
- *      register netdev for wpa supplicant daemon
- *
- * Parameters:
- *  In:
- *      pDevice             -
- *      enable              -
- *  Out:
- *
- * Return Value:
- *
- */
-static int wpa_init_wpadev(PSDevice pDevice)
-{
-        PSDevice wpadev_priv;
-        struct net_device *dev = pDevice->dev;
-        int ret = 0;
-
-        pDevice->wpadev = alloc_netdev(sizeof(PSDevice), "vntwpa", wpadev_setup);
-        if (pDevice->wpadev == NULL)
-                return -ENOMEM;
-
-        wpadev_priv = netdev_priv(pDevice->wpadev);
-        *wpadev_priv = *pDevice;
-        memcpy(pDevice->wpadev->dev_addr, dev->dev_addr, ETH_ALEN);
-        pDevice->wpadev->base_addr = dev->base_addr;
-        pDevice->wpadev->irq = dev->irq;
-        pDevice->wpadev->mem_start = dev->mem_start;
-        pDevice->wpadev->mem_end = dev->mem_end;
-        ret = register_netdev(pDevice->wpadev);
-        if (ret) {
-                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "%s: register_netdev(WPA) failed!\n",
-                        dev->name);
-                free_netdev(pDevice->wpadev);
-                return -1;
-        }
-
-        if (pDevice->skb == NULL) {
-                pDevice->skb = dev_alloc_skb((int)pDevice->rx_buf_sz);
-                if (pDevice->skb == NULL)
-                        return -ENOMEM;
-        }
-
-        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "%s: Registered netdev %s for WPA management\n",
-                dev->name, pDevice->wpadev->name);
-
-        return 0;
-}
-
-/*
- * Description:
- *      unregister net_device (wpadev)
- *
- * Parameters:
- *  In:
- *      pDevice             -
- *  Out:
- *
- * Return Value:
- *
- */
-static int wpa_release_wpadev(PSDevice pDevice)
-{
-        if (pDevice->skb) {
-                dev_kfree_skb(pDevice->skb);
-                pDevice->skb = NULL;
-        }
-
-        if (pDevice->wpadev) {
-                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "%s: Netdevice %s unregistered\n",
-                        pDevice->dev->name, pDevice->wpadev->name);
-                unregister_netdev(pDevice->wpadev);
-                free_netdev(pDevice->wpadev);
-                pDevice->wpadev = NULL;
-        }
-
-        return 0;
-}
-
-/*
- * Description:
- *      Set enable/disable dev for wpa supplicant daemon
- *
- * Parameters:
- *  In:
- *      pDevice             -
- *      val                 -
- *  Out:
- *
- * Return Value:
- *
- */
-int wpa_set_wpadev(PSDevice pDevice, int val)
-{
-        if (val)
-                return wpa_init_wpadev(pDevice);
-        return wpa_release_wpadev(pDevice);
-}
 
 /*
  * Description:
@@ -185,7 +67,7 @@ int wpa_set_wpadev(PSDevice pDevice, int val)
  * Return Value:
  *
  */
- int wpa_set_keys(PSDevice pDevice, void *ctx, BOOL  fcpfkernel)
+int wpa_set_keys(PSDevice pDevice, void *ctx)
 {
         struct viawget_wpa_param *param = ctx;
         PSMgmtObject pMgmt = &pDevice->sMgmtObj;
@@ -217,18 +99,7 @@ int wpa_set_wpadev(PSDevice pDevice, int val)
         if (param->u.wpa_key.key && param->u.wpa_key.key_len > sizeof(abyKey))
                 return -EINVAL;
 
-        spin_unlock_irq(&pDevice->lock);
-        if (param->u.wpa_key.key && fcpfkernel) {
-                memcpy(&abyKey[0], param->u.wpa_key.key, param->u.wpa_key.key_len);
-        } else {
-                if (param->u.wpa_key.key &&
-                        copy_from_user(&abyKey[0], param->u.wpa_key.key,
-                                param->u.wpa_key.key_len)) {
-                        spin_lock_irq(&pDevice->lock);
-                        return -EINVAL;
-                }
-        }
-        spin_lock_irq(&pDevice->lock);
+        memcpy(&abyKey[0], param->u.wpa_key.key, param->u.wpa_key.key_len);
 
         dwKeyIndex = (DWORD)(param->u.wpa_key.key_index);
 
@@ -260,18 +131,7 @@ int wpa_set_wpadev(PSDevice pDevice, int val)
         if (param->u.wpa_key.seq && param->u.wpa_key.seq_len > sizeof(abySeq))
                 return -EINVAL;
 
-        spin_unlock_irq(&pDevice->lock);
-        if (param->u.wpa_key.seq && fcpfkernel) {
-                memcpy(&abySeq[0], param->u.wpa_key.seq, param->u.wpa_key.seq_len);
-        } else {
-                if (param->u.wpa_key.seq &&
-                        copy_from_user(&abySeq[0], param->u.wpa_key.seq,
-                                param->u.wpa_key.seq_len)) {
-                        spin_lock_irq(&pDevice->lock);
-                        return -EINVAL;
-                }
-        }
-        spin_lock_irq(&pDevice->lock);
+        memcpy(&abySeq[0], param->u.wpa_key.seq, param->u.wpa_key.seq_len);
 
         if (param->u.wpa_key.seq_len > 0) {
                 for (ii = 0 ; ii < param->u.wpa_key.seq_len ; ii++) {
@@ -399,521 +259,3 @@ int wpa_set_wpadev(PSDevice pDevice, int val)
 }
 
 
-/*
- * Description:
- *      enable wpa auth & mode
- *
- * Parameters:
- *  In:
- *      pDevice   -
- *      param     -
- *  Out:
- *
- * Return Value:
- *
- */
-static int wpa_set_wpa(PSDevice pDevice, struct viawget_wpa_param *param)
-{
-        PSMgmtObject pMgmt = &pDevice->sMgmtObj;
-        int ret = 0;
-
-        pMgmt->eAuthenMode = WMAC_AUTH_OPEN;
-        pMgmt->bShareKeyAlgorithm = FALSE;
-
-        return ret;
-}
-
- /*
- * Description:
- *      set disassociate
- *
- * Parameters:
- *  In:
- *      pDevice   -
- *      param     -
- *  Out:
- *
- * Return Value:
- *
- */
-static int wpa_set_disassociate(PSDevice pDevice, struct viawget_wpa_param *param)
-{
-        PSMgmtObject pMgmt = &pDevice->sMgmtObj;
-        int ret = 0;
-
-        spin_lock_irq(&pDevice->lock);
-        if (pDevice->bLinkPass) {
-                if (!memcmp(param->addr, pMgmt->abyCurrBSSID, 6))
-                        bScheduleCommand((void *)pDevice, WLAN_CMD_DISASSOCIATE, NULL);
-        }
-        spin_unlock_irq(&pDevice->lock);
-
-        return ret;
-}
-
-/*
- * Description:
- *      enable scan process
- *
- * Parameters:
- *  In:
- *      pDevice   -
- *      param     -
- *  Out:
- *
- * Return Value:
- *
- */
-static int wpa_set_scan(PSDevice pDevice, struct viawget_wpa_param *param)
-{
-        int ret = 0;
-
-/**set ap_scan=1&&scan_ssid=1 under hidden ssid mode**/
-        PSMgmtObject pMgmt = &pDevice->sMgmtObj;
-        PWLAN_IE_SSID pItemSSID;
-        printk("wpa_set_scan-->desired [ssid=%s,ssid_len=%d]\n",
-                param->u.scan_req.ssid,param->u.scan_req.ssid_len);
-// Set the SSID
-        memset(pMgmt->abyDesireSSID, 0, WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1);
-        pItemSSID = (PWLAN_IE_SSID)pMgmt->abyDesireSSID;
-        pItemSSID->byElementID = WLAN_EID_SSID;
-        memcpy(pItemSSID->abySSID, param->u.scan_req.ssid, param->u.scan_req.ssid_len);
-        pItemSSID->len = param->u.scan_req.ssid_len;
-
-        spin_lock_irq(&pDevice->lock);
-        BSSvClearBSSList((void *) pDevice, pDevice->bLinkPass);
-        bScheduleCommand((void *) pDevice, WLAN_CMD_BSSID_SCAN,
-                        pMgmt->abyDesireSSID);
-        spin_unlock_irq(&pDevice->lock);
-
-        return ret;
-}
-
-/*
- * Description:
- *      get bssid
- *
- * Parameters:
- *  In:
- *      pDevice   -
- *      param     -
- *  Out:
- *
- * Return Value:
- *
- */
-static int wpa_get_bssid(PSDevice pDevice, struct viawget_wpa_param *param)
-{
-    PSMgmtObject pMgmt = &pDevice->sMgmtObj;
-    int ret = 0;
-    memcpy(param->u.wpa_associate.bssid, pMgmt->abyCurrBSSID, 6);
-
-    return ret;
-}
-
-/*
- * Description:
- *      get bssid
- *
- * Parameters:
- *  In:
- *      pDevice   -
- *      param     -
- *  Out:
- *
- * Return Value:
- *
- */
-static int wpa_get_ssid(PSDevice pDevice, struct viawget_wpa_param *param)
-{
-        PSMgmtObject pMgmt = &pDevice->sMgmtObj;
-        PWLAN_IE_SSID pItemSSID;
-        int ret = 0;
-
-        pItemSSID = (PWLAN_IE_SSID)pMgmt->abyCurrSSID;
-
-        memcpy(param->u.wpa_associate.ssid, pItemSSID->abySSID, pItemSSID->len);
-        param->u.wpa_associate.ssid_len = pItemSSID->len;
-
-        return ret;
-}
-
-/*
- * Description:
- *      get scan results
- *
- * Parameters:
- *  In:
- *      pDevice   -
- *      param     -
- *  Out:
- *
- * Return Value:
- *
- */
-static int wpa_get_scan(PSDevice pDevice, struct viawget_wpa_param *param)
-{
-        struct viawget_scan_result *scan_buf;
-        PSMgmtObject pMgmt = &pDevice->sMgmtObj;
-        PWLAN_IE_SSID pItemSSID;
-        PKnownBSS pBSS;
-        PBYTE pBuf;
-        int ret = 0;
-        u16 count = 0;
-        u16 ii;
-        u16 jj;
-        long ldBm; //James //add
-
-//******mike:bubble sort by stronger RSSI*****//
-        PBYTE ptempBSS;
-
-        ptempBSS = kmalloc(sizeof(KnownBSS), GFP_ATOMIC);
-
-        if (ptempBSS == NULL) {
-                printk("bubble sort kmalloc memory fail@@@\n");
-                ret = -ENOMEM;
-                return ret;
-        }
-
-        for (ii = 0; ii < MAX_BSS_NUM; ii++) {
-                for (jj = 0; jj < MAX_BSS_NUM - ii - 1; jj++) {
-                        if ((pMgmt->sBSSList[jj].bActive != TRUE)
-                                || ((pMgmt->sBSSList[jj].uRSSI > pMgmt->sBSSList[jj + 1].uRSSI)
-                                        && (pMgmt->sBSSList[jj + 1].bActive != FALSE))) {
-                                memcpy(ptempBSS,&pMgmt->sBSSList[jj], sizeof(KnownBSS));
-                                memcpy(&pMgmt->sBSSList[jj], &pMgmt->sBSSList[jj + 1],
-                                        sizeof(KnownBSS));
-                                memcpy(&pMgmt->sBSSList[jj + 1], ptempBSS, sizeof(KnownBSS));
-                        }
-                }
-        }
-        kfree(ptempBSS);
-
-        count = 0;
-        pBSS = &(pMgmt->sBSSList[0]);
-        for (ii = 0; ii < MAX_BSS_NUM; ii++) {
-                pBSS = &(pMgmt->sBSSList[ii]);
-                if (!pBSS->bActive)
-                        continue;
-                count++;
-        }
-
-        pBuf = kcalloc(count, sizeof(struct viawget_scan_result), GFP_ATOMIC);
-
-        if (pBuf == NULL) {
-                ret = -ENOMEM;
-                return ret;
-        }
-        scan_buf = (struct viawget_scan_result *)pBuf;
-        pBSS = &(pMgmt->sBSSList[0]);
-        for (ii = 0, jj = 0; ii < MAX_BSS_NUM; ii++) {
-                pBSS = &(pMgmt->sBSSList[ii]);
-                if (pBSS->bActive) {
-                        if (jj >= count)
-                                break;
-                        memcpy(scan_buf->bssid, pBSS->abyBSSID, WLAN_BSSID_LEN);
-                        pItemSSID = (PWLAN_IE_SSID)pBSS->abySSID;
-                        memcpy(scan_buf->ssid, pItemSSID->abySSID, pItemSSID->len);
-                        scan_buf->ssid_len = pItemSSID->len;
-                        scan_buf->freq = frequency_list[pBSS->uChannel-1];
-                        scan_buf->caps = pBSS->wCapInfo; // DavidWang for sharemode
-
-                        RFvRSSITodBm(pDevice, (BYTE)(pBSS->uRSSI), &ldBm);
-                        if (-ldBm < 50)
-                                scan_buf->qual = 100;
-                        else if (-ldBm > 90)
-                                scan_buf->qual = 0;
-                        else
-                                scan_buf->qual=(40-(-ldBm-50))*100/40;
-
-                        //James
-                        //scan_buf->caps = pBSS->wCapInfo;
-                        //scan_buf->qual =
-                        scan_buf->noise = 0;
-                        scan_buf->level = ldBm;
-
-                        //scan_buf->maxrate =
-                        if (pBSS->wWPALen != 0) {
-                                scan_buf->wpa_ie_len = pBSS->wWPALen;
-                                memcpy(scan_buf->wpa_ie, pBSS->byWPAIE, pBSS->wWPALen);
-                        }
-                        if (pBSS->wRSNLen != 0) {
-                                scan_buf->rsn_ie_len = pBSS->wRSNLen;
-                                memcpy(scan_buf->rsn_ie, pBSS->byRSNIE, pBSS->wRSNLen);
-                        }
-                        scan_buf = (struct viawget_scan_result *)((PBYTE)scan_buf + sizeof(struct viawget_scan_result));
-                        jj ++;
-                }
-        }
-
-        if (jj < count)
-                count = jj;
-
-        if (copy_to_user(param->u.scan_results.buf, pBuf, sizeof(struct viawget_scan_result) * count))
-                ret = -EFAULT;
-
-        param->u.scan_results.scan_count = count;
-        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " param->u.scan_results.scan_count = %d\n", count);
-
-        kfree(pBuf);
-        return ret;
-}
-
-/*
- * Description:
- *      set associate with AP
- *
- * Parameters:
- *  In:
- *      pDevice   -
- *      param     -
- *  Out:
- *
- * Return Value:
- *
- */
-static int wpa_set_associate(PSDevice pDevice, struct viawget_wpa_param *param)
-{
-        PSMgmtObject pMgmt = &pDevice->sMgmtObj;
-        PWLAN_IE_SSID pItemSSID;
-        BYTE abyNullAddr[] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-        BYTE abyWPAIE[64];
-        int ret = 0;
-        BOOL bwepEnabled=FALSE;
-
-        // set key type & algorithm
-        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "pairwise_suite = %d\n", param->u.wpa_associate.pairwise_suite);
-        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "group_suite = %d\n", param->u.wpa_associate.group_suite);
-        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "key_mgmt_suite = %d\n", param->u.wpa_associate.key_mgmt_suite);
-        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "auth_alg = %d\n", param->u.wpa_associate.auth_alg);
-        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "mode = %d\n", param->u.wpa_associate.mode);
-        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "wpa_ie_len = %d\n", param->u.wpa_associate.wpa_ie_len);
-        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Roaming dBm = %d\n", param->u.wpa_associate.roam_dbm); // Davidwang
-
-        if (param->u.wpa_associate.wpa_ie) {
-                if (param->u.wpa_associate.wpa_ie_len > sizeof(abyWPAIE))
-                        return -EINVAL;
-
-                if (copy_from_user(&abyWPAIE[0], param->u.wpa_associate.wpa_ie,
-                                        param->u.wpa_associate.wpa_ie_len))
-                        return -EFAULT;
-        }
-
-        if (param->u.wpa_associate.mode == 1)
-                pMgmt->eConfigMode = WMAC_CONFIG_IBSS_STA;
-        else
-                pMgmt->eConfigMode = WMAC_CONFIG_ESS_STA;
-
-        // set bssid
-        if (memcmp(param->u.wpa_associate.bssid, &abyNullAddr[0], 6) != 0)
-                memcpy(pMgmt->abyDesireBSSID, param->u.wpa_associate.bssid, 6);
-        // set ssid
-        memset(pMgmt->abyDesireSSID, 0, WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1);
-        pItemSSID = (PWLAN_IE_SSID)pMgmt->abyDesireSSID;
-        pItemSSID->byElementID = WLAN_EID_SSID;
-        pItemSSID->len = param->u.wpa_associate.ssid_len;
-        memcpy(pItemSSID->abySSID, param->u.wpa_associate.ssid, pItemSSID->len);
-
-        if (param->u.wpa_associate.wpa_ie_len == 0) {
-                if (param->u.wpa_associate.auth_alg & AUTH_ALG_SHARED_KEY)
-                        pMgmt->eAuthenMode = WMAC_AUTH_SHAREKEY;
-                else
-                        pMgmt->eAuthenMode = WMAC_AUTH_OPEN;
-        } else if (abyWPAIE[0] == RSN_INFO_ELEM) {
-                if (param->u.wpa_associate.key_mgmt_suite == KEY_MGMT_PSK)
-                        pMgmt->eAuthenMode = WMAC_AUTH_WPA2PSK;
-                else
-                        pMgmt->eAuthenMode = WMAC_AUTH_WPA2;
-        } else {
-                if (param->u.wpa_associate.key_mgmt_suite == KEY_MGMT_WPA_NONE)
-                        pMgmt->eAuthenMode = WMAC_AUTH_WPANONE;
-                else if (param->u.wpa_associate.key_mgmt_suite == KEY_MGMT_PSK)
-                        pMgmt->eAuthenMode = WMAC_AUTH_WPAPSK;
-                else
-                        pMgmt->eAuthenMode = WMAC_AUTH_WPA;
-        }
-
-        switch (param->u.wpa_associate.pairwise_suite) {
-        case CIPHER_CCMP:
-                pDevice->eEncryptionStatus = Ndis802_11Encryption3Enabled;
-                break;
-        case CIPHER_TKIP:
-                pDevice->eEncryptionStatus = Ndis802_11Encryption2Enabled;
-                break;
-        case CIPHER_WEP40:
-        case CIPHER_WEP104:
-                pDevice->eEncryptionStatus = Ndis802_11Encryption1Enabled;
-                bwepEnabled = TRUE;
-                break;
-        case CIPHER_NONE:
-                if (param->u.wpa_associate.group_suite == CIPHER_CCMP)
-                        pDevice->eEncryptionStatus = Ndis802_11Encryption3Enabled;
-                else
-                        pDevice->eEncryptionStatus = Ndis802_11Encryption2Enabled;
-                break;
-        default:
-                pDevice->eEncryptionStatus = Ndis802_11EncryptionDisabled;
-        }
-
-        pMgmt->Roam_dbm = param->u.wpa_associate.roam_dbm;
-        if (pMgmt->eAuthenMode == WMAC_AUTH_SHAREKEY) { // @wep-sharekey
-                pDevice->eEncryptionStatus = Ndis802_11Encryption1Enabled;
-                pMgmt->bShareKeyAlgorithm = TRUE;
-        } else if (pMgmt->eAuthenMode == WMAC_AUTH_OPEN) {
-                if(bwepEnabled==TRUE) { //@open-wep
-                        pDevice->eEncryptionStatus = Ndis802_11Encryption1Enabled;
-                } else {
-                        // @only open
-                        pDevice->eEncryptionStatus = Ndis802_11EncryptionDisabled;
-                }
-        }
-        // mike save old encryption status
-        pDevice->eOldEncryptionStatus = pDevice->eEncryptionStatus;
-
-        if (pDevice->eEncryptionStatus !=  Ndis802_11EncryptionDisabled)
-                pDevice->bEncryptionEnable = TRUE;
-        else
-                pDevice->bEncryptionEnable = FALSE;
-
-        if ((pMgmt->eAuthenMode == WMAC_AUTH_SHAREKEY) ||
-                ((pMgmt->eAuthenMode == WMAC_AUTH_OPEN) && (bwepEnabled==TRUE)))  {
-                // mike re-comment:open-wep && sharekey-wep needn't do initial key!!
-        } else {
-                KeyvInitTable(pDevice,&pDevice->sKey);
-        }
-
-        spin_lock_irq(&pDevice->lock);
-        pDevice->bLinkPass = FALSE;
-        ControlvMaskByte(pDevice, MESSAGE_REQUEST_MACREG, MAC_REG_PAPEDELAY, LEDSTS_STS, LEDSTS_SLOW);
-        memset(pMgmt->abyCurrBSSID, 0, 6);
-        pMgmt->eCurrState = WMAC_STATE_IDLE;
-        netif_stop_queue(pDevice->dev);
-
-/******* search if ap_scan=2, which is associating request in hidden ssid mode ****/
-        {
-                PKnownBSS pCurr = NULL;
-                pCurr = BSSpSearchBSSList(pDevice,
-                                        pMgmt->abyDesireBSSID,
-                                        pMgmt->abyDesireSSID,
-                                        pDevice->eConfigPHYMode
-                        );
-
-                if (pCurr == NULL){
-                        printk("wpa_set_associate---->hidden mode site survey before associate.......\n");
-                        bScheduleCommand((void *)pDevice,
-                                        WLAN_CMD_BSSID_SCAN,
-                                        pMgmt->abyDesireSSID);
-                }
-        }
-/****************************************************************/
-
-        bScheduleCommand((void *)pDevice, WLAN_CMD_SSID, NULL);
-        spin_unlock_irq(&pDevice->lock);
-
-        return ret;
-}
-
-/*
- * Description:
- *      wpa_ioctl main function supported for wpa supplicant
- *
- * Parameters:
- *  In:
- *      pDevice   -
- *      iw_point  -
- *  Out:
- *
- * Return Value:
- *
- */
-int wpa_ioctl(PSDevice pDevice, struct iw_point *p)
-{
-        struct viawget_wpa_param *param;
-        int ret = 0;
-        int wpa_ioctl = 0;
-
-        if (p->length < sizeof(struct viawget_wpa_param) ||
-                p->length > VIAWGET_WPA_MAX_BUF_SIZE || !p->pointer)
-                return -EINVAL;
-
-        param = kmalloc((int)p->length, GFP_KERNEL);
-        if (param == NULL)
-                return -ENOMEM;
-
-        if (copy_from_user(param, p->pointer, p->length)) {
-                ret = -EFAULT;
-                goto out;
-        }
-
-        switch (param->cmd) {
-        case VIAWGET_SET_WPA:
-                ret = wpa_set_wpa(pDevice, param);
-                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "VIAWGET_SET_WPA \n");
-                break;
-
-        case VIAWGET_SET_KEY:
-                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "VIAWGET_SET_KEY \n");
-                spin_lock_irq(&pDevice->lock);
-                ret = wpa_set_keys(pDevice, param, FALSE);
-                spin_unlock_irq(&pDevice->lock);
-                break;
-
-        case VIAWGET_SET_SCAN:
-                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "VIAWGET_SET_SCAN \n");
-                ret = wpa_set_scan(pDevice, param);
-                break;
-
-        case VIAWGET_GET_SCAN:
-                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "VIAWGET_GET_SCAN\n");
-                ret = wpa_get_scan(pDevice, param);
-                wpa_ioctl = 1;
-                break;
-
-        case VIAWGET_GET_SSID:
-                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "VIAWGET_GET_SSID \n");
-                ret = wpa_get_ssid(pDevice, param);
-                wpa_ioctl = 1;
-                break;
-
-        case VIAWGET_GET_BSSID:
-                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "VIAWGET_GET_BSSID \n");
-                ret = wpa_get_bssid(pDevice, param);
-                wpa_ioctl = 1;
-                break;
-
-        case VIAWGET_SET_ASSOCIATE:
-                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "VIAWGET_SET_ASSOCIATE \n");
-                ret = wpa_set_associate(pDevice, param);
-                break;
-
-        case VIAWGET_SET_DISASSOCIATE:
-                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "VIAWGET_SET_DISASSOCIATE \n");
-                ret = wpa_set_disassociate(pDevice, param);
-                break;
-
-        case VIAWGET_SET_DROP_UNENCRYPT:
-                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "VIAWGET_SET_DROP_UNENCRYPT \n");
-                break;
-
-        case VIAWGET_SET_DEAUTHENTICATE:
-                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "VIAWGET_SET_DEAUTHENTICATE \n");
-                break;
-
-        default:
-                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "wpa_ioctl: unknown cmd=%d\n",
-                        param->cmd);
-                kfree(param);
-                return -EOPNOTSUPP;
-        }
-
-        if ((ret == 0) && wpa_ioctl) {
-                if (copy_to_user(p->pointer, param, p->length)) {
-                        ret = -EFAULT;
-                        goto out;
-                }
-        }
-
-out:
-        kfree(param);
-        return ret;
-}
diff --git a/drivers/staging/vt6656/wpactl.h b/drivers/staging/vt6656/wpactl.h
index 00c8451ab50b..b4ec6b0e1c67 100644
--- a/drivers/staging/vt6656/wpactl.h
+++ b/drivers/staging/vt6656/wpactl.h
@@ -30,9 +30,7 @@
 #define __WPACTL_H__
 
 #include "device.h"
-#ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
 #include "iowpa.h"
-#endif
 
 /*---------------------  Export Definitions -------------------------*/
 
@@ -40,17 +38,11 @@
 //WPA related
 
 typedef enum { WPA_ALG_NONE, WPA_ALG_WEP, WPA_ALG_TKIP, WPA_ALG_CCMP } wpa_alg;
-typedef enum { CIPHER_NONE, CIPHER_WEP40, CIPHER_TKIP, CIPHER_CCMP,
-               CIPHER_WEP104 } wpa_cipher;
-typedef enum { KEY_MGMT_802_1X, KEY_MGMT_PSK, KEY_MGMT_NONE,
-               KEY_MGMT_802_1X_NO_WPA, KEY_MGMT_WPA_NONE, KEY_MGMT_CCKM } wpa_key_mgmt;//20080717-02,<Modify> by James Li
 
 #define AUTH_ALG_OPEN_SYSTEM    0x01
 #define AUTH_ALG_SHARED_KEY     0x02
 #define AUTH_ALG_LEAP           0x04
 
-#define GENERIC_INFO_ELEM 0xdd
-#define RSN_INFO_ELEM 0x30
 
 typedef unsigned long long NDIS_802_11_KEY_RSC;
 
@@ -60,8 +52,6 @@ typedef unsigned long long NDIS_802_11_KEY_RSC;
 
 /*---------------------  Export Functions  --------------------------*/
 
-int wpa_set_wpadev(PSDevice pDevice, int val);
-int wpa_ioctl(PSDevice pDevice, struct iw_point *p);
-int wpa_set_keys(PSDevice pDevice, void *ctx, BOOL  fcpfkernel);
+int wpa_set_keys(PSDevice pDevice, void *ctx);
 
 #endif /* __WPACL_H__ */
diff --git a/drivers/staging/winbond/mds.c b/drivers/staging/winbond/mds.c
index 1b8b8ace39e0..faa93f0ee102 100644
--- a/drivers/staging/winbond/mds.c
+++ b/drivers/staging/winbond/mds.c
@@ -315,7 +315,7 @@ static void Mds_HeaderCopy(struct wbsoft_priv *adapter, struct wb35_descriptor *
 
         pT00->T00_tx_packet_id = pDes->Descriptor_ID; /* Set packet ID */
         pT00->T00_header_length = 24; /* Set header length */
-        pT01->T01_retry_abort_ebable = 1; /* 921013 931130.5.h */
+        pT01->T01_retry_abort_enable = 1; /* 921013 931130.5.h */
 
         /* Key ID setup */
         pT01->T01_wep_id = 0;
@@ -476,11 +476,8 @@ Mds_Tx(struct wbsoft_priv *adapter)
                         /* 931130.5.b */
                         FragmentCount = PacketSize/FragmentThreshold + 1;
                         stmp = PacketSize + FragmentCount*32 + 8; /* 931130.5.c 8:MIC */
-                        if ((XmitBufSize + stmp) >= MAX_USB_TX_BUFFER) {
-                                printk("[Mds_Tx] Excess max tx buffer.\n");
+                        if ((XmitBufSize + stmp) >= MAX_USB_TX_BUFFER)
                                 break; /* buffer is not enough */
-                        }
-
 
                         /*
                          * Start transmitting
diff --git a/drivers/staging/winbond/wb35rx_f.h b/drivers/staging/winbond/wb35rx_f.h
index 1fdf65ea6041..559bdca12e1a 100644
--- a/drivers/staging/winbond/wb35rx_f.h
+++ b/drivers/staging/winbond/wb35rx_f.h
@@ -4,12 +4,12 @@
 #include <net/mac80211.h>
 #include "wbhal.h"
 
-//====================================
-// Interface function declare
-//====================================
-unsigned char           Wb35Rx_initial(  struct hw_data * pHwData );
-void            Wb35Rx_destroy(  struct hw_data * pHwData );
-void            Wb35Rx_stop(  struct hw_data * pHwData );
+/*
+ * Interface function declaration
+ */
+unsigned char   Wb35Rx_initial(struct hw_data *pHwData);
+void            Wb35Rx_destroy(struct hw_data *pHwData);
+void            Wb35Rx_stop(struct hw_data *pHwData);
 void            Wb35Rx_start(struct ieee80211_hw *hw);
 
 #endif
diff --git a/drivers/staging/winbond/wb35rx_s.h b/drivers/staging/winbond/wb35rx_s.h
index 4b03274a7d28..545bc9500723 100644
--- a/drivers/staging/winbond/wb35rx_s.h
+++ b/drivers/staging/winbond/wb35rx_s.h
@@ -1,44 +1,44 @@
-//============================================================================
-// wb35rx.h --
-//============================================================================
+#ifndef __WINBOND_35RX_S_H
+#define __WINBOND_35RX_S_H
 
-// Definition for this module used
-#define MAX_USB_RX_BUFFER       4096    // This parameter must be 4096 931130.4.f
+/* Definition for this module used */
+#define MAX_USB_RX_BUFFER               4096    /* This parameter must be 4096 931130.4.f */
+#define MAX_USB_RX_BUFFER_NUMBER        ETHERNET_RX_DESCRIPTORS /* Maximum 254, 255 is RESERVED ID */
+#define RX_INTERFACE                    0       /* Interface 1 */
+#define RX_PIPE                         2       /* Pipe 3 */
+#define MAX_PACKET_SIZE                 1600    /* 1568 = 8 + 1532 + 4 + 24(IV EIV MIC ICV CRC) for check DMA data 931130.4.g */
+#define RX_END_TAG                      0x0badbeef
 
-#define MAX_USB_RX_BUFFER_NUMBER        ETHERNET_RX_DESCRIPTORS         // Maximum 254, 255 is RESERVED ID
-#define RX_INTERFACE                            0       // Interface 1
-#define RX_PIPE                                         2       // Pipe 3
-#define MAX_PACKET_SIZE                         1600 //1568     // 8 + 1532 + 4 + 24(IV EIV MIC ICV CRC) for check DMA data 931130.4.g
-#define RX_END_TAG                                      0x0badbeef
 
-
-//====================================
-// Internal variable for module
-//====================================
+/*
+ * Internal variable for module
+ */
 struct wb35_rx {
-        u32                     ByteReceived;// For calculating throughput of BulkIn
-        atomic_t                RxFireCounter;// Does Wb35Rx module fire?
+        u32             ByteReceived; /* For calculating throughput of BulkIn */
+        atomic_t        RxFireCounter;/* Does Wb35Rx module fire? */
 
-        u8      RxBuffer[ MAX_USB_RX_BUFFER_NUMBER ][ ((MAX_USB_RX_BUFFER+3) & ~0x03 ) ];
-        u16     RxBufferSize[ ((MAX_USB_RX_BUFFER_NUMBER+1) & ~0x01) ];
-        u8      RxOwner[ ((MAX_USB_RX_BUFFER_NUMBER+3) & ~0x03 ) ];//Ownership of buffer  0: SW 1:HW
+        u8              RxBuffer[MAX_USB_RX_BUFFER_NUMBER][((MAX_USB_RX_BUFFER+3) & ~0x03)];
+        u16             RxBufferSize[((MAX_USB_RX_BUFFER_NUMBER+1) & ~0x01)];
+        u8              RxOwner[((MAX_USB_RX_BUFFER_NUMBER+3) & ~0x03)]; /* Ownership of buffer  0:SW 1:HW */
 
-        u32     RxProcessIndex;//The next index to process
-        u32     RxBufferId;
-        u32     EP3vm_state;
+        u32             RxProcessIndex; /* The next index to process */
+        u32             RxBufferId;
+        u32             EP3vm_state;
 
-        u32     rx_halt; // For VM stopping
+        u32             rx_halt; /* For VM stopping */
 
-        u16     MoreDataSize;
-        u16     PacketSize;
+        u16             MoreDataSize;
+        u16             PacketSize;
 
-        u32     CurrentRxBufferId; // For complete routine usage
-        u32     Rx3UrbCancel;
+        u32             CurrentRxBufferId; /* For complete routine usage */
+        u32             Rx3UrbCancel;
 
-        u32     LastR1; // For RSSI reporting
-        struct urb *                            RxUrb;
-        u32             Ep3ErrorCount2; // 20060625.1 Usbd for Rx DMA error count
+        u32             LastR1; /* For RSSI reporting */
+        struct urb      *RxUrb;
+        u32             Ep3ErrorCount2; /* 20060625.1 Usbd for Rx DMA error count */
 
         int             EP3VM_status;
-        u8 *    pDRx;
+        u8              *pDRx;
 };
+
+#endif /* __WINBOND_35RX_S_H */
diff --git a/drivers/staging/winbond/wbhal.h b/drivers/staging/winbond/wbhal.h
index 39e84a0d9729..289ee549146d 100644
--- a/drivers/staging/winbond/wbhal.h
+++ b/drivers/staging/winbond/wbhal.h
@@ -226,11 +226,11 @@ struct T01_descriptor {
                         u32     T01_add_challenge_text:1;
                         u32     T01_inhibit_crc:1;
                         u32     T01_loop_back_wep_mode:1;
-                        u32     T01_retry_abort_ebable:1;
+                        u32     T01_retry_abort_enable:1;
                 };
 #else
                 struct {
-                        u32     T01_retry_abort_ebable:1;
+                        u32     T01_retry_abort_enable:1;
                         u32     T01_loop_back_wep_mode:1;
                         u32     T01_inhibit_crc:1;
                         u32     T01_add_challenge_text:1;
diff --git a/drivers/staging/winbond/wbusb.c b/drivers/staging/winbond/wbusb.c
index 48aa1361903e..3fa1ae4d3d76 100644
--- a/drivers/staging/winbond/wbusb.c
+++ b/drivers/staging/winbond/wbusb.c
@@ -79,18 +79,15 @@ static int wbsoft_add_interface(struct ieee80211_hw *dev,
 static void wbsoft_remove_interface(struct ieee80211_hw *dev,
                                     struct ieee80211_vif *vif)
 {
-        printk("wbsoft_remove interface called\n");
 }
 
 static void wbsoft_stop(struct ieee80211_hw *hw)
 {
-        printk(KERN_INFO "%s called\n", __func__);
 }
 
 static int wbsoft_get_stats(struct ieee80211_hw *hw,
                             struct ieee80211_low_level_stats *stats)
 {
-        printk(KERN_INFO "%s called\n", __func__);
         return 0;
 }
 
@@ -179,12 +176,9 @@ static void hal_set_current_channel_ex(struct hw_data *pHwData, struct chan_info
         if (pHwData->SurpriseRemove)
                 return;
 
-        printk("Going to channel: %d/%d\n", channel.band, channel.ChanNo);
-
         RFSynthesizer_SwitchingChannel(pHwData, channel); /* Switch channel */
         pHwData->Channel = channel.ChanNo;
         pHwData->band = channel.band;
-        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,
@@ -264,8 +258,6 @@ static int wbsoft_config(struct ieee80211_hw *dev, u32 changed)
         struct wbsoft_priv *priv = dev->priv;
         struct chan_info ch;
 
-        printk("wbsoft_config called\n");
-
         /* Should use channel_num, or something, as that is already pre-translated */
         ch.band = 1;
         ch.ChanNo = 1;
@@ -282,7 +274,6 @@ static int wbsoft_config(struct ieee80211_hw *dev, u32 changed)
 
 static u64 wbsoft_get_tsf(struct ieee80211_hw *dev, struct ieee80211_vif *vif)
 {
-        printk("wbsoft_get_tsf called\n");
         return 0;
 }
 
@@ -716,7 +707,6 @@ static int wb35_hw_init(struct ieee80211_hw *hw)
         }
 
         priv->sLocalPara.bAntennaNo = hal_get_antenna_number(pHwData);
-        pr_debug("Driver init, antenna no = %d\n", priv->sLocalPara.bAntennaNo);
         hal_get_hw_radio_off(pHwData);
 
         /* Waiting for HAL setting OK */
@@ -782,9 +772,6 @@ static int wb35_probe(struct usb_interface *intf,
         interface = intf->cur_altsetting;
         endpoint = &interface->endpoint[0].desc;
 
-        if (endpoint[2].wMaxPacketSize == 512)
-                printk("[w35und] Working on USB 2.0\n");
-
         err = wb35_hw_init(dev);
         if (err)
                 goto error_free_hw;
@@ -836,7 +823,6 @@ static void wb35_hw_halt(struct wbsoft_priv *adapter)
 {
         /* Turn off Rx and Tx hardware ability */
         hal_stop(&adapter->sHwData);
-        pr_debug("[w35und] Hal_stop O.K.\n");
         /* Waiting Irp completed */
         msleep(100);
 
diff --git a/drivers/staging/wlags49_h2/ap_h2.c b/drivers/staging/wlags49_h2/ap_h2.c
index eb8244c4d6f0..e524153e925d 100644
--- a/drivers/staging/wlags49_h2/ap_h2.c
+++ b/drivers/staging/wlags49_h2/ap_h2.c
@@ -25,10 +25,10 @@
  */
 
 
-#include "hcfcfg.h"                             /* to get hcf_16 etc defined as well as */
+#include "hcfcfg.h"                     /* to get hcf_16 etc defined as well as */
                                         /* possible settings which inluence mdd.h or dhf.h */
-#include "mdd.h"                                /* to get COMP_ID_STA etc defined */
-#include "dhf.h"                                /* used to be "fhfmem.h", to get memblock,plugrecord, */
+#include "mdd.h"                        /* to get COMP_ID_STA etc defined */
+#include "dhf.h"                        /* used to be "fhfmem.h", to get memblock,plugrecord, */
 
 static const hcf_8 fw_image_1_data[] = {
          0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -3301,7 +3301,7 @@ static const CFG_RANGE20_STRCT fw_image_infocompat[] = {
                 COMP_ROLE_SUPL,
                 COMP_ID_APF,
                 {
-                        { 2, 2, 4 }                             /* variant, bottom, top */
+                        { 2, 2, 4 }                             /* variant, bottom, top */
                 }
         },
         {       3 + ((20 * sizeof(CFG_RANGE_SPEC_STRCT)) / sizeof(hcf_16)),
@@ -3309,9 +3309,9 @@ static const CFG_RANGE20_STRCT fw_image_infocompat[] = {
                 COMP_ROLE_ACT,
                 COMP_ID_MFI,
                 {
-                        { 4, 6, 7 },                            /* variant, bottom, top */
-                        { 5, 6, 7 },                            /* variant, bottom, top */
-                        { 6, 6, 7 }                             /* variant, bottom, top */
+                        { 4, 6, 7 },                            /* variant, bottom, top */
+                        { 5, 6, 7 },                            /* variant, bottom, top */
+                        { 6, 6, 7 }                             /* variant, bottom, top */
                 }
         },
         {       3 + ((20 * sizeof(CFG_RANGE_SPEC_STRCT)) / sizeof(hcf_16)),
@@ -3319,7 +3319,7 @@ static const CFG_RANGE20_STRCT fw_image_infocompat[] = {
                 COMP_ROLE_ACT,
                 COMP_ID_CFI,
                 {
-                        { 2, 1, 2 }                             /* variant, bottom, top */
+                        { 2, 1, 2 }                             /* variant, bottom, top */
                 }
         },
         { 0000, 0000, 0000, 0000, { { 0000, 0000, 0000 } } }                    /* endsentinel */
diff --git a/drivers/staging/wlags49_h2/man/wlags49.4 b/drivers/staging/wlags49_h2/man/wlags49.4
index a34588530740..37df99879183 100644
--- a/drivers/staging/wlags49_h2/man/wlags49.4
+++ b/drivers/staging/wlags49_h2/man/wlags49.4
@@ -108,7 +108,7 @@ with the I/O base address and MAC address used by the card.
  \- Card power management
  \- Support for Hermes-II & Hermes-II.5 based PCMCIA, Mini PCI, and CardBus cards
  \- Wired Equivalent Privacy (WEP)
- \- WPA-PSK support (EXPERIMENTAL)
+ \- WPA-PSK support
  \- Driver utility interface (UIL)
  \- Wireless Extensions
  \- Software AP mode
diff --git a/drivers/staging/wlags49_h2/wl_if.h b/drivers/staging/wlags49_h2/wl_if.h
index 6d66dabf032c..425d3733b362 100644
--- a/drivers/staging/wlags49_h2/wl_if.h
+++ b/drivers/staging/wlags49_h2/wl_if.h
@@ -71,45 +71,39 @@
 #define MAX_LTV_BUF_SIZE            (512 - (sizeof(hcf_16) * 2))
 
 #define HCF_TALLIES_SIZE            (sizeof(CFG_HERMES_TALLIES_STRCT) + \
-                                     (sizeof(hcf_16) * 2))
+                                    (sizeof(hcf_16) * 2))
 
 #define HCF_MAX_MULTICAST           16
 #define HCF_MAX_NAME_LEN            32
-#define MAX_LINE_SIZE                           256
+#define MAX_LINE_SIZE               256
 #define HCF_NUM_IO_PORTS            0x80
 #define TX_TIMEOUT                  ((800 * HZ) / 1000)
 
 
-//#define HCF_MIN_COMM_QUALITY        0
-//#define HCF_MAX_COMM_QUALITY        92
-//#define HCF_MIN_SIGNAL_LEVEL        47
-//#define HCF_MAX_SIGNAL_LEVEL        138
-//#define HCF_MIN_NOISE_LEVEL         47
-//#define HCF_MAX_NOISE_LEVEL         138
-//#define HCF_0DBM_OFFSET             149
-
-// PE1DNN
-// Better data from the real world. Not scientific but empirical data gathered
-// from a Thomson Speedtouch 110 which is identified as:
-// PCMCIA Info: "Agere Systems" "Wireless PC Card Model 0110"
-//              Manufacture ID: 0156,0003
-// Lowest measurment for noise floor seen is value 54
-// Highest signal strength in close proximity to the AP seen is value 118
-// Very good must be around 100 (otherwise its never "full scale"
-// All other constants are derrived from these. This makes the signal gauge
-// work for me...
+/* PE1DNN
+ * Better data from the real world. Not scientific but empirical data gathered
+ * from a Thomson Speedtouch 110 which is identified as:
+ * PCMCIA Info: "Agere Systems" "Wireless PC Card Model 0110"
+ *              Manufacture ID: 0156,0003
+ * Lowest measurment for noise floor seen is value 54
+ * Highest signal strength in close proximity to the AP seen is value 118
+ * Very good must be around 100 (otherwise its never "full scale"
+ * All other constants are derrived from these. This makes the signal gauge
+ * work for me...
+ */
 #define HCF_MIN_SIGNAL_LEVEL        54
 #define HCF_MAX_SIGNAL_LEVEL        100
 #define HCF_MIN_NOISE_LEVEL         HCF_MIN_SIGNAL_LEVEL
 #define HCF_MAX_NOISE_LEVEL         HCF_MAX_SIGNAL_LEVEL
 #define HCF_0DBM_OFFSET             (HCF_MAX_SIGNAL_LEVEL + 1)
 #define HCF_MIN_COMM_QUALITY        0
-#define HCF_MAX_COMM_QUALITY        (HCF_MAX_SIGNAL_LEVEL - HCF_MIN_NOISE_LEVEL + 1)
+#define HCF_MAX_COMM_QUALITY        (HCF_MAX_SIGNAL_LEVEL - \
+                                        HCF_MIN_NOISE_LEVEL + 1)
 
 
 /* For encryption (WEP) */
-#define MIN_KEY_SIZE                5       // 40 bits RC4 - WEP
-#define MAX_KEY_SIZE                13      // 104 bits
+#define MIN_KEY_SIZE                5       /* 40 bits RC4 - WEP */
+#define MAX_KEY_SIZE                13      /* 104 bits */
 #define MAX_KEYS                    4
 
 #define RADIO_CHANNELS              14
@@ -121,12 +115,12 @@
 #define MAX_RTS_BYTES               2347
 
 #define MAX_RATES                   8
-#define MEGABIT                     1024*1024
+#define MEGABIT                     (1024 * 1024)
 
 #define HCF_FAILURE                 0xFF
 #define UIL_FAILURE                         0xFF
-#define CFG_UIL_CONNECT             0xA123          // Define differently?
-#define CFG_UIL_CONNECT_ACK_CODE    0x5653435A      // VSCZ
+#define CFG_UIL_CONNECT             0xA123          /* Define differently? */
+#define CFG_UIL_CONNECT_ACK_CODE    0x5653435A      /* VSCZ */
 #define WVLAN2_UIL_CONNECTED        (0x01L << 0)
 #define WVLAN2_UIL_BUSY             (0x01L << 1)
 
@@ -154,15 +148,15 @@ UIL_FUN_GET_INFO
 UIL_FUN_PUT_INFO
 */
 
-#define SIOCSIWNETNAME              SIOCDEVPRIVATE+1
-#define SIOCGIWNETNAME              SIOCDEVPRIVATE+2
-#define SIOCSIWSTANAME              SIOCDEVPRIVATE+3
-#define SIOCGIWSTANAME              SIOCDEVPRIVATE+4
-#define SIOCSIWPORTTYPE             SIOCDEVPRIVATE+5
-#define SIOCGIWPORTTYPE             SIOCDEVPRIVATE+6
+#define SIOCSIWNETNAME              (SIOCDEVPRIVATE + 1)
+#define SIOCGIWNETNAME              (SIOCDEVPRIVATE + 2)
+#define SIOCSIWSTANAME              (SIOCDEVPRIVATE + 3)
+#define SIOCGIWSTANAME              (SIOCDEVPRIVATE + 4)
+#define SIOCSIWPORTTYPE             (SIOCDEVPRIVATE + 5)
+#define SIOCGIWPORTTYPE             (SIOCDEVPRIVATE + 6)
 
 /* IOCTL code for the RTS interface */
-#define WL_IOCTL_RTS                SIOCDEVPRIVATE+7
+#define WL_IOCTL_RTS                (SIOCDEVPRIVATE + 7)
 
 /* IOCTL subcodes for WL_IOCTL_RTS */
 #define WL_IOCTL_RTS_READ           1
@@ -174,61 +168,54 @@ UIL_FUN_PUT_INFO
 /*******************************************************************************
  * STRUCTURE DEFINITIONS
  ******************************************************************************/
-typedef struct
-{
-    __u16   length;
-    __u8    name[HCF_MAX_NAME_LEN];
+typedef struct {
+        __u16   length;
+        __u8    name[HCF_MAX_NAME_LEN];
 }
 wvName_t;
 
 
-typedef struct
-{
-    hcf_16      len;
-    hcf_16      typ;
-    union
-    {
-        hcf_8       u8[MAX_LTV_BUF_SIZE / sizeof(hcf_8)];
-        hcf_16      u16[MAX_LTV_BUF_SIZE / sizeof(hcf_16)];
-        hcf_32      u32[MAX_LTV_BUF_SIZE / sizeof(hcf_32)];
-    } u;
+typedef struct {
+        hcf_16      len;
+        hcf_16      typ;
+        union {
+                hcf_8       u8[MAX_LTV_BUF_SIZE / sizeof(hcf_8)];
+                hcf_16      u16[MAX_LTV_BUF_SIZE / sizeof(hcf_16)];
+                hcf_32      u32[MAX_LTV_BUF_SIZE / sizeof(hcf_32)];
+        } u;
 }
 ltv_t;
 
 
-struct uilreq
-{
-    union
-    {
-        char    ifrn_name[IFNAMSIZ];
-    } ifr_ifrn;
+struct uilreq {
+        union {
+                char    ifrn_name[IFNAMSIZ];
+        } ifr_ifrn;
 
-    IFBP        hcfCtx;
-    __u8        command;
-    __u8        result;
+        IFBP        hcfCtx;
+        __u8        command;
+        __u8        result;
 
-    /* The data field in this structure is typically an LTV of some type. The
-       len field is the size of the buffer in bytes, as opposed to words (like
-       the L-field in the LTV */
-    __u16       len;
-    void       *data;
+        /* The data field in this structure is typically an LTV of some type.
+           The len field is the size of the buffer in bytes, as opposed to words
+           (like the L-field in the LTV */
+        __u16       len;
+        void       *data;
 };
 
 
-struct rtsreq
-{
-    union
-    {
-        char    ifrn_name[IFNAMSIZ];
-    }
-    ifr_ifrn;
+struct rtsreq {
+        union {
+                char    ifrn_name[IFNAMSIZ];
+        }
+        ifr_ifrn;
 
-    __u16   typ;
-    __u16   reg;
-    __u16   len;
-    __u16   *data;
+        __u16   typ;
+        __u16   reg;
+        __u16   len;
+        __u16   *data;
 };
 
 
-#endif  // __WAVELAN2_IF_H__
+#endif  /* __WAVELAN2_IF_H__ */
 
diff --git a/drivers/staging/wlags49_h2/wl_pci.c b/drivers/staging/wlags49_h2/wl_pci.c
index a09c3ac793a2..6226e5eebf3a 100644
--- a/drivers/staging/wlags49_h2/wl_pci.c
+++ b/drivers/staging/wlags49_h2/wl_pci.c
@@ -111,7 +111,7 @@ extern dbg_info_t *DbgInfo;
 #endif  // DBG
 
 /* define the PCI device Table Cardname and id tables */
-static struct pci_device_id wl_pci_tbl[] __devinitdata = {
+static struct pci_device_id wl_pci_tbl[] = {
         { PCI_DEVICE(PCI_VENDOR_ID_WL_LKM, PCI_DEVICE_ID_WL_LKM_0), },
         { PCI_DEVICE(PCI_VENDOR_ID_WL_LKM, PCI_DEVICE_ID_WL_LKM_1), },
         { PCI_DEVICE(PCI_VENDOR_ID_WL_LKM, PCI_DEVICE_ID_WL_LKM_2), },
@@ -124,9 +124,9 @@ MODULE_DEVICE_TABLE(pci, wl_pci_tbl);
 /*******************************************************************************
  * function prototypes
  ******************************************************************************/
-int __devinit wl_pci_probe( struct pci_dev *pdev,
+int wl_pci_probe( struct pci_dev *pdev,
                                 const struct pci_device_id *ent );
-void __devexit wl_pci_remove(struct pci_dev *pdev);
+void wl_pci_remove(struct pci_dev *pdev);
 int wl_pci_setup( struct pci_dev *pdev );
 void wl_pci_enable_cardbus_interrupts( struct pci_dev *pdev );
 
@@ -160,14 +160,13 @@ void wl_pci_dma_hcf_reclaim_rx( struct wl_private *lp );
 /*******************************************************************************
  * PCI module function registration
  ******************************************************************************/
-static struct pci_driver wl_driver =
-{
-        name:           MODULE_NAME,
-    id_table:   wl_pci_tbl,
-        probe:          wl_pci_probe,
-        remove:         __devexit_p(wl_pci_remove),
-    suspend:    NULL,
-    resume:     NULL,
+static struct pci_driver wl_driver = {
+        .name     = MODULE_NAME,
+        .id_table = wl_pci_tbl,
+        .probe    = wl_pci_probe,
+        .remove   = wl_pci_remove,
+        .suspend  = NULL,
+        .resume   = NULL
 };
 
 /*******************************************************************************
@@ -399,7 +398,7 @@ int wl_adapter_is_open( struct net_device *dev )
  *      errno value otherwise
  *
  ******************************************************************************/
-int __devinit wl_pci_probe( struct pci_dev *pdev,
+int wl_pci_probe( struct pci_dev *pdev,
                                 const struct pci_device_id *ent )
 {
     int result;
@@ -436,7 +435,7 @@ int __devinit wl_pci_probe( struct pci_dev *pdev,
  *      N/A
  *
  ******************************************************************************/
-void __devexit wl_pci_remove(struct pci_dev *pdev)
+void wl_pci_remove(struct pci_dev *pdev)
 {
     struct net_device       *dev = NULL;
     /*------------------------------------------------------------------------*/
diff --git a/drivers/staging/wlan-ng/hfa384x_usb.c b/drivers/staging/wlan-ng/hfa384x_usb.c
index f180c3d8b012..c1a8cb625154 100644
--- a/drivers/staging/wlan-ng/hfa384x_usb.c
+++ b/drivers/staging/wlan-ng/hfa384x_usb.c
@@ -171,11 +171,11 @@ static void hfa384x_ctlxout_callback(struct urb *urb);
 static void hfa384x_usbin_callback(struct urb *urb);
 
 static void
-hfa384x_usbin_txcompl(wlandevice_t *wlandev, hfa384x_usbin_t * usbin);
+hfa384x_usbin_txcompl(wlandevice_t *wlandev, hfa384x_usbin_t *usbin);
 
 static void hfa384x_usbin_rx(wlandevice_t *wlandev, struct sk_buff *skb);
 
-static void hfa384x_usbin_info(wlandevice_t *wlandev, hfa384x_usbin_t * usbin);
+static void hfa384x_usbin_info(wlandevice_t *wlandev, hfa384x_usbin_t *usbin);
 
 static void
 hfa384x_usbout_tx(wlandevice_t *wlandev, hfa384x_usbout_t *usbout);
@@ -285,7 +285,7 @@ static inline const char *ctlxstr(CTLX_STATE s)
         return ctlx_str[s];
 };
 
-static inline hfa384x_usbctlx_t *get_active_ctlx(hfa384x_t * hw)
+static inline hfa384x_usbctlx_t *get_active_ctlx(hfa384x_t *hw)
 {
         return list_entry(hw->ctlxq.active.next, hfa384x_usbctlx_t, list);
 }
diff --git a/drivers/staging/xgifb/TODO b/drivers/staging/xgifb/TODO
index 13d9bc25797d..392b29d8f134 100644
--- a/drivers/staging/xgifb/TODO
+++ b/drivers/staging/xgifb/TODO
@@ -1,4 +1,4 @@
-This drivers still need a lot of work. I can list all cleanups to do but it's
+This drivers still needs a lot of work. I can list all cleanups to do but it's
 going to be long. So, I'm writing "cleanups" and not the list.
 
 Arnaud
diff --git a/drivers/staging/xgifb/XGI_main_26.c b/drivers/staging/xgifb/XGI_main_26.c
index f775c5453845..e0f745de7e7a 100644
--- a/drivers/staging/xgifb/XGI_main_26.c
+++ b/drivers/staging/xgifb/XGI_main_26.c
@@ -73,9 +73,9 @@ static int XGIfb_mode_rate_to_dclock(struct vb_device_info *XGI_Pr,
         RefreshRateTableIndex = XGI_GetRatePtrCRT2(HwDeviceExtension, ModeNo,
                         ModeIdIndex, XGI_Pr);
 
-        ClockIndex = XGI_Pr->RefIndex[RefreshRateTableIndex].Ext_CRTVCLK;
+        ClockIndex = XGI330_RefIndex[RefreshRateTableIndex].Ext_CRTVCLK;
 
-        Clock = XGI_Pr->VCLKData[ClockIndex].CLOCK * 1000;
+        Clock = XGI_VCLKData[ClockIndex].CLOCK * 1000;
 
         return Clock;
 }
@@ -101,35 +101,35 @@ static int XGIfb_mode_rate_to_ddata(struct vb_device_info *XGI_Pr,
                 return 0;
         RefreshRateTableIndex = XGI_GetRatePtrCRT2(HwDeviceExtension, ModeNo,
                         ModeIdIndex, XGI_Pr);
-        index = XGI_Pr->RefIndex[RefreshRateTableIndex].Ext_CRT1CRTC;
+        index = XGI330_RefIndex[RefreshRateTableIndex].Ext_CRT1CRTC;
 
-        sr_data = XGI_Pr->XGINEWUB_CRT1Table[index].CR[5];
+        sr_data = XGI_CRT1Table[index].CR[5];
 
-        cr_data = XGI_Pr->XGINEWUB_CRT1Table[index].CR[0];
+        cr_data = XGI_CRT1Table[index].CR[0];
 
         /* Horizontal total */
         HT = (cr_data & 0xff) | ((unsigned short) (sr_data & 0x03) << 8);
         A = HT + 5;
 
-        HDE = (XGI_Pr->RefIndex[RefreshRateTableIndex].XRes >> 3) - 1;
+        HDE = (XGI330_RefIndex[RefreshRateTableIndex].XRes >> 3) - 1;
         E = HDE + 1;
 
-        cr_data = XGI_Pr->XGINEWUB_CRT1Table[index].CR[3];
+        cr_data = XGI_CRT1Table[index].CR[3];
 
         /* Horizontal retrace (=sync) start */
         HRS = (cr_data & 0xff) | ((unsigned short) (sr_data & 0xC0) << 2);
         F = HRS - E - 3;
 
-        cr_data = XGI_Pr->XGINEWUB_CRT1Table[index].CR[1];
+        cr_data = XGI_CRT1Table[index].CR[1];
 
         /* Horizontal blank start */
         HBS = (cr_data & 0xff) | ((unsigned short) (sr_data & 0x30) << 4);
 
-        sr_data = XGI_Pr->XGINEWUB_CRT1Table[index].CR[6];
+        sr_data = XGI_CRT1Table[index].CR[6];
 
-        cr_data = XGI_Pr->XGINEWUB_CRT1Table[index].CR[2];
+        cr_data = XGI_CRT1Table[index].CR[2];
 
-        cr_data2 = XGI_Pr->XGINEWUB_CRT1Table[index].CR[4];
+        cr_data2 = XGI_CRT1Table[index].CR[4];
 
         /* Horizontal blank end */
         HBE = (cr_data & 0x1f) | ((unsigned short) (cr_data2 & 0x80) >> 2)
@@ -150,11 +150,11 @@ static int XGIfb_mode_rate_to_ddata(struct vb_device_info *XGI_Pr,
         *right_margin = F * 8;
         *hsync_len = C * 8;
 
-        sr_data = XGI_Pr->XGINEWUB_CRT1Table[index].CR[14];
+        sr_data = XGI_CRT1Table[index].CR[14];
 
-        cr_data = XGI_Pr->XGINEWUB_CRT1Table[index].CR[8];
+        cr_data = XGI_CRT1Table[index].CR[8];
 
-        cr_data2 = XGI_Pr->XGINEWUB_CRT1Table[index].CR[9];
+        cr_data2 = XGI_CRT1Table[index].CR[9];
 
         /* Vertical total */
         VT = (cr_data & 0xFF) | ((unsigned short) (cr_data2 & 0x01) << 8)
@@ -162,10 +162,10 @@ static int XGIfb_mode_rate_to_ddata(struct vb_device_info *XGI_Pr,
                         | ((unsigned short) (sr_data & 0x01) << 10);
         A = VT + 2;
 
-        VDE = XGI_Pr->RefIndex[RefreshRateTableIndex].YRes - 1;
+        VDE = XGI330_RefIndex[RefreshRateTableIndex].YRes - 1;
         E = VDE + 1;
 
-        cr_data = XGI_Pr->XGINEWUB_CRT1Table[index].CR[10];
+        cr_data = XGI_CRT1Table[index].CR[10];
 
         /* Vertical retrace (=sync) start */
         VRS = (cr_data & 0xff) | ((unsigned short) (cr_data2 & 0x04) << 6)
@@ -173,23 +173,23 @@ static int XGIfb_mode_rate_to_ddata(struct vb_device_info *XGI_Pr,
                         | ((unsigned short) (sr_data & 0x08) << 7);
         F = VRS + 1 - E;
 
-        cr_data = XGI_Pr->XGINEWUB_CRT1Table[index].CR[12];
+        cr_data = XGI_CRT1Table[index].CR[12];
 
-        cr_data3 = (XGI_Pr->XGINEWUB_CRT1Table[index].CR[14] & 0x80) << 5;
+        cr_data3 = (XGI_CRT1Table[index].CR[14] & 0x80) << 5;
 
         /* Vertical blank start */
         VBS = (cr_data & 0xff) | ((unsigned short) (cr_data2 & 0x08) << 5)
                         | ((unsigned short) (cr_data3 & 0x20) << 4)
                         | ((unsigned short) (sr_data & 0x04) << 8);
 
-        cr_data = XGI_Pr->XGINEWUB_CRT1Table[index].CR[13];
+        cr_data = XGI_CRT1Table[index].CR[13];
 
         /* Vertical blank end */
         VBE = (cr_data & 0xff) | ((unsigned short) (sr_data & 0x10) << 4);
         temp = VBE - ((E - 1) & 511);
         B = (temp > 0) ? temp : (temp + 512);
 
-        cr_data = XGI_Pr->XGINEWUB_CRT1Table[index].CR[11];
+        cr_data = XGI_CRT1Table[index].CR[11];
 
         /* Vertical retrace (=sync) end */
         VRE = (cr_data & 0x0f) | ((sr_data & 0x20) >> 1);
@@ -202,25 +202,25 @@ static int XGIfb_mode_rate_to_ddata(struct vb_device_info *XGI_Pr,
         *lower_margin = F;
         *vsync_len = C;
 
-        if (XGI_Pr->RefIndex[RefreshRateTableIndex].Ext_InfoFlag & 0x8000)
+        if (XGI330_RefIndex[RefreshRateTableIndex].Ext_InfoFlag & 0x8000)
                 *sync &= ~FB_SYNC_VERT_HIGH_ACT;
         else
                 *sync |= FB_SYNC_VERT_HIGH_ACT;
 
-        if (XGI_Pr->RefIndex[RefreshRateTableIndex].Ext_InfoFlag & 0x4000)
+        if (XGI330_RefIndex[RefreshRateTableIndex].Ext_InfoFlag & 0x4000)
                 *sync &= ~FB_SYNC_HOR_HIGH_ACT;
         else
                 *sync |= FB_SYNC_HOR_HIGH_ACT;
 
         *vmode = FB_VMODE_NONINTERLACED;
-        if (XGI_Pr->RefIndex[RefreshRateTableIndex].Ext_InfoFlag & 0x0080)
+        if (XGI330_RefIndex[RefreshRateTableIndex].Ext_InfoFlag & 0x0080)
                 *vmode = FB_VMODE_INTERLACED;
         else {
                 j = 0;
-                while (XGI_Pr->EModeIDTable[j].Ext_ModeID != 0xff) {
-                        if (XGI_Pr->EModeIDTable[j].Ext_ModeID ==
-                            XGI_Pr->RefIndex[RefreshRateTableIndex].ModeID) {
-                                if (XGI_Pr->EModeIDTable[j].Ext_ModeFlag &
+                while (XGI330_EModeIDTable[j].Ext_ModeID != 0xff) {
+                        if (XGI330_EModeIDTable[j].Ext_ModeID ==
+                            XGI330_RefIndex[RefreshRateTableIndex].ModeID) {
+                                if (XGI330_EModeIDTable[j].Ext_ModeFlag &
                                     DoubleScanMode) {
                                         *vmode = FB_VMODE_DOUBLE;
                                 }
@@ -1695,7 +1695,7 @@ static int __init XGIfb_setup(char *options)
         return 0;
 }
 
-static int __devinit xgifb_probe(struct pci_dev *pdev,
+static int xgifb_probe(struct pci_dev *pdev,
                 const struct pci_device_id *ent)
 {
         u8 reg, reg1;
@@ -2103,7 +2103,7 @@ error:
 /*                PCI DEVICE HANDLING                */
 /*****************************************************/
 
-static void __devexit xgifb_remove(struct pci_dev *pdev)
+static void xgifb_remove(struct pci_dev *pdev)
 {
         struct xgifb_video_info *xgifb_info = pci_get_drvdata(pdev);
         struct fb_info *fb_info = xgifb_info->fb_info;
@@ -2127,7 +2127,7 @@ static struct pci_driver xgifb_driver = {
         .name = "xgifb",
         .id_table = xgifb_pci_table,
         .probe = xgifb_probe,
-        .remove = __devexit_p(xgifb_remove)
+        .remove = xgifb_remove
 };
 
 
diff --git a/drivers/staging/xgifb/vb_def.h b/drivers/staging/xgifb/vb_def.h
index 77137e4452a0..148f6373c9a2 100644
--- a/drivers/staging/xgifb/vb_def.h
+++ b/drivers/staging/xgifb/vb_def.h
@@ -254,9 +254,16 @@
 #define XGI330_SR1F 0
 #define XGI330_SR23 0xf6
 #define XGI330_SR24 0x0d
-#define XGI330_SR25 0
 #define XGI330_SR31 0xc0
 #define XGI330_SR32 0x11
 #define XGI330_SR33 0
 
+extern const struct XGI_ExtStruct XGI330_EModeIDTable[];
+extern const struct XGI_Ext2Struct XGI330_RefIndex[];
+extern const struct XGI_CRT1TableStruct XGI_CRT1Table[];
+extern const struct XGI_ECLKDataStruct XGI340_ECLKData[];
+extern const struct SiS_VCLKData XGI_VCLKData[];
+extern const unsigned char XGI340_CR6B[][4];
+extern const unsigned char XGI340_AGPReg[];
+
 #endif
diff --git a/drivers/staging/xgifb/vb_init.c b/drivers/staging/xgifb/vb_init.c
index 7739dbd9f029..2b791c10eb15 100644
--- a/drivers/staging/xgifb/vb_init.c
+++ b/drivers/staging/xgifb/vb_init.c
@@ -94,8 +94,8 @@ static void XGINew_DDR1x_MRS_340(unsigned long P3c4,
                       0x18,
                       pVBInfo->SR15[2][pVBInfo->ram_type]); /* SR18 */
         xgifb_reg_set(P3c4, 0x19, 0x01);
-        xgifb_reg_set(P3c4, 0x16, pVBInfo->SR16[0]);
-        xgifb_reg_set(P3c4, 0x16, pVBInfo->SR16[1]);
+        xgifb_reg_set(P3c4, 0x16, 0x03);
+        xgifb_reg_set(P3c4, 0x16, 0x83);
         mdelay(1);
         xgifb_reg_set(P3c4, 0x1B, 0x03);
         udelay(500);
@@ -103,8 +103,8 @@ static void XGINew_DDR1x_MRS_340(unsigned long P3c4,
                       0x18,
                       pVBInfo->SR15[2][pVBInfo->ram_type]); /* SR18 */
         xgifb_reg_set(P3c4, 0x19, 0x00);
-        xgifb_reg_set(P3c4, 0x16, pVBInfo->SR16[2]);
-        xgifb_reg_set(P3c4, 0x16, pVBInfo->SR16[3]);
+        xgifb_reg_set(P3c4, 0x16, 0x03);
+        xgifb_reg_set(P3c4, 0x16, 0x83);
         xgifb_reg_set(P3c4, 0x1B, 0x00);
 }
 
@@ -124,13 +124,13 @@ static void XGINew_SetMemoryClock(struct xgi_hw_device_info *HwDeviceExtension,
 
         xgifb_reg_set(pVBInfo->P3c4,
                       0x2E,
-                      pVBInfo->ECLKData[pVBInfo->ram_type].SR2E);
+                      XGI340_ECLKData[pVBInfo->ram_type].SR2E);
         xgifb_reg_set(pVBInfo->P3c4,
                       0x2F,
-                      pVBInfo->ECLKData[pVBInfo->ram_type].SR2F);
+                      XGI340_ECLKData[pVBInfo->ram_type].SR2F);
         xgifb_reg_set(pVBInfo->P3c4,
                       0x30,
-                      pVBInfo->ECLKData[pVBInfo->ram_type].SR30);
+                      XGI340_ECLKData[pVBInfo->ram_type].SR30);
 
         /* When XG42 ECLK = MCLK = 207MHz, Set SR32 D[1:0] = 10b */
         /* Modify SR32 value, when MCLK=207MHZ, ELCK=250MHz,
@@ -138,10 +138,10 @@ static void XGINew_SetMemoryClock(struct xgi_hw_device_info *HwDeviceExtension,
         if (HwDeviceExtension->jChipType == XG42) {
                 if ((pVBInfo->MCLKData[pVBInfo->ram_type].SR28 == 0x1C) &&
                     (pVBInfo->MCLKData[pVBInfo->ram_type].SR29 == 0x01) &&
-                    (((pVBInfo->ECLKData[pVBInfo->ram_type].SR2E == 0x1C) &&
-                      (pVBInfo->ECLKData[pVBInfo->ram_type].SR2F == 0x01)) ||
-                     ((pVBInfo->ECLKData[pVBInfo->ram_type].SR2E == 0x22) &&
-                      (pVBInfo->ECLKData[pVBInfo->ram_type].SR2F == 0x01))))
+                    (((XGI340_ECLKData[pVBInfo->ram_type].SR2E == 0x1C) &&
+                      (XGI340_ECLKData[pVBInfo->ram_type].SR2F == 0x01)) ||
+                     ((XGI340_ECLKData[pVBInfo->ram_type].SR2E == 0x22) &&
+                      (XGI340_ECLKData[pVBInfo->ram_type].SR2F == 0x01))))
                         xgifb_reg_set(pVBInfo->P3c4,
                                       0x32,
                                       ((unsigned char) xgifb_reg_get(
@@ -429,7 +429,7 @@ static void XGINew_SetDRAMDefaultRegister340(
         temp2 = 0;
         for (i = 0; i < 4; i++) {
                 /* CR6B DQS fine tune delay */
-                temp = pVBInfo->CR6B[pVBInfo->ram_type][i];
+                temp = XGI340_CR6B[pVBInfo->ram_type][i];
                 for (j = 0; j < 4; j++) {
                         temp1 = ((temp >> (2 * j)) & 0x03) << 2;
                         temp2 |= temp1;
@@ -444,7 +444,7 @@ static void XGINew_SetDRAMDefaultRegister340(
         temp2 = 0;
         for (i = 0; i < 4; i++) {
                 /* CR6E DQM fine tune delay */
-                temp = pVBInfo->CR6E[pVBInfo->ram_type][i];
+                temp = 0;
                 for (j = 0; j < 4; j++) {
                         temp1 = ((temp >> (2 * j)) & 0x03) << 2;
                         temp2 |= temp1;
@@ -463,7 +463,7 @@ static void XGINew_SetDRAMDefaultRegister340(
                 temp2 = 0;
                 for (i = 0; i < 8; i++) {
                         /* CR6F DQ fine tune delay */
-                        temp = pVBInfo->CR6F[pVBInfo->ram_type][8 * k + i];
+                        temp = 0;
                         for (j = 0; j < 4; j++) {
                                 temp1 = (temp >> (2 * j)) & 0x03;
                                 temp2 |= temp1;
@@ -486,7 +486,7 @@ static void XGINew_SetDRAMDefaultRegister340(
 
         temp2 = 0x80;
         /* CR89 terminator type select */
-        temp = pVBInfo->CR89[pVBInfo->ram_type][0];
+        temp = 0;
         for (j = 0; j < 4; j++) {
                 temp1 = (temp >> (2 * j)) & 0x03;
                 temp2 |= temp1;
@@ -496,7 +496,7 @@ static void XGINew_SetDRAMDefaultRegister340(
                 temp2 += 0x10;
         }
 
-        temp = pVBInfo->CR89[pVBInfo->ram_type][1];
+        temp = 0;
         temp1 = temp & 0x03;
         temp2 |= temp1;
         xgifb_reg_set(P3d4, 0x89, temp2);
@@ -1378,17 +1378,17 @@ unsigned char XGIInitNew(struct pci_dev *pdev)
                 for (i = 0x47; i <= 0x4C; i++)
                         xgifb_reg_set(pVBInfo->P3d4,
                                       i,
-                                      pVBInfo->AGPReg[i - 0x47]);
+                                      XGI340_AGPReg[i - 0x47]);
 
                 for (i = 0x70; i <= 0x71; i++)
                         xgifb_reg_set(pVBInfo->P3d4,
                                       i,
-                                      pVBInfo->AGPReg[6 + i - 0x70]);
+                                      XGI340_AGPReg[6 + i - 0x70]);
 
                 for (i = 0x74; i <= 0x77; i++)
                         xgifb_reg_set(pVBInfo->P3d4,
                                       i,
-                                      pVBInfo->AGPReg[8 + i - 0x74]);
+                                      XGI340_AGPReg[8 + i - 0x74]);
 
                 pci_read_config_dword(pdev, 0x50, &Temp);
                 Temp >>= 20;
@@ -1401,7 +1401,7 @@ unsigned char XGIInitNew(struct pci_dev *pdev)
         /* Set PCI */
         xgifb_reg_set(pVBInfo->P3c4, 0x23, XGI330_SR23);
         xgifb_reg_set(pVBInfo->P3c4, 0x24, XGI330_SR24);
-        xgifb_reg_set(pVBInfo->P3c4, 0x25, XGI330_SR25);
+        xgifb_reg_set(pVBInfo->P3c4, 0x25, 0);
 
         if (HwDeviceExtension->jChipType < XG20) {
                 /* Set VB */
@@ -1482,11 +1482,8 @@ unsigned char XGIInitNew(struct pci_dev *pdev)
 
         XGINew_SetDRAMSize_340(xgifb_info, HwDeviceExtension, pVBInfo);
 
-        xgifb_reg_set(pVBInfo->P3c4,
-                      0x22,
-                      (unsigned char) ((pVBInfo->SR22) & 0xFE));
-
-        xgifb_reg_set(pVBInfo->P3c4, 0x21, pVBInfo->SR21);
+        xgifb_reg_set(pVBInfo->P3c4, 0x22, 0xfa);
+        xgifb_reg_set(pVBInfo->P3c4, 0x21, 0xa3);
 
         XGINew_ChkSenseStatus(HwDeviceExtension, pVBInfo);
         XGINew_SetModeScratch(HwDeviceExtension, pVBInfo);
diff --git a/drivers/staging/xgifb/vb_init.h b/drivers/staging/xgifb/vb_init.h
index a27b4fe0bb7b..d54898322548 100644
--- a/drivers/staging/xgifb/vb_init.h
+++ b/drivers/staging/xgifb/vb_init.h
@@ -1,6 +1,5 @@
 #ifndef _VBINIT_
 #define _VBINIT_
 extern unsigned char XGIInitNew(struct pci_dev *pdev);
-extern struct XGI21_LVDSCapStruct  XGI21_LCDCapList[13];
 #endif
 
diff --git a/drivers/staging/xgifb/vb_setmode.c b/drivers/staging/xgifb/vb_setmode.c
index e95a1655a6ce..d723a2571995 100644
--- a/drivers/staging/xgifb/vb_setmode.c
+++ b/drivers/staging/xgifb/vb_setmode.c
@@ -23,18 +23,7 @@ static const unsigned short XGINew_VGA_DAC[] = {
 
 void InitTo330Pointer(unsigned char ChipType, struct vb_device_info *pVBInfo)
 {
-        pVBInfo->StandTable = &XGI330_StandTable;
-        pVBInfo->EModeIDTable = XGI330_EModeIDTable;
-        pVBInfo->RefIndex = XGI330_RefIndex;
-        pVBInfo->XGINEWUB_CRT1Table = XGI_CRT1Table;
-
         pVBInfo->MCLKData = XGI340New_MCLKData;
-        pVBInfo->ECLKData = XGI340_ECLKData;
-        pVBInfo->VCLKData = XGI_VCLKData;
-        pVBInfo->VBVCLKData = XGI_VBVCLKData;
-        pVBInfo->ScreenOffset = XGI330_ScreenOffset;
-        pVBInfo->StResInfo = XGI330_StResInfo;
-        pVBInfo->ModeResInfo = XGI330_ModeResInfo;
 
         pVBInfo->LCDResInfo = 0;
         pVBInfo->LCDTypeInfo = 0;
@@ -44,19 +33,6 @@ void InitTo330Pointer(unsigned char ChipType, struct vb_device_info *pVBInfo)
 
         pVBInfo->SR15 = XGI340_SR13;
         pVBInfo->CR40 = XGI340_cr41;
-        pVBInfo->CR6B = XGI340_CR6B;
-        pVBInfo->CR6E = XGI340_CR6E;
-        pVBInfo->CR6F = XGI340_CR6F;
-        pVBInfo->CR89 = XGI340_CR89;
-        pVBInfo->AGPReg = XGI340_AGPReg;
-        pVBInfo->SR16 = XGI340_SR16;
-
-        pVBInfo->SR21 = 0xa3;
-        pVBInfo->SR22 = 0xfb;
-
-        pVBInfo->TimingH = XGI_TimingH;
-        pVBInfo->TimingV = XGI_TimingV;
-        pVBInfo->UpdateCRT1 = XGI_UpdateCRT1Table;
 
         /* 310 customization related */
         if ((pVBInfo->VBType & VB_SIS301LV) || (pVBInfo->VBType & VB_SIS302LV))
@@ -90,10 +66,10 @@ static void XGI_SetSeqRegs(unsigned short ModeNo,
         unsigned char tempah, SRdata;
         unsigned short i, modeflag;
 
-        modeflag = pVBInfo->EModeIDTable[ModeIdIndex].Ext_ModeFlag;
+        modeflag = XGI330_EModeIDTable[ModeIdIndex].Ext_ModeFlag;
 
         xgifb_reg_set(pVBInfo->P3c4, 0x00, 0x03); /* Set SR0 */
-        tempah = pVBInfo->StandTable->SR[0];
+        tempah = XGI330_StandTable.SR[0];
 
         i = XGI_SetCRT2ToLCDA;
         if (pVBInfo->VBInfo & XGI_SetCRT2ToLCDA) {
@@ -108,7 +84,7 @@ static void XGI_SetSeqRegs(unsigned short ModeNo,
 
         for (i = 02; i <= 04; i++) {
                 /* Get SR2,3,4 from file */
-                SRdata = pVBInfo->StandTable->SR[i - 1];
+                SRdata = XGI330_StandTable.SR[i - 1];
                 xgifb_reg_set(pVBInfo->P3c4, i, SRdata); /* Set SR2 3 4 */
         }
 }
@@ -125,7 +101,7 @@ static void XGI_SetCRTCRegs(struct xgi_hw_device_info *HwDeviceExtension,
 
         for (i = 0; i <= 0x18; i++) {
                 /* Get CRTC from file */
-                CRTCdata = pVBInfo->StandTable->CRTC[i];
+                CRTCdata = XGI330_StandTable.CRTC[i];
                 xgifb_reg_set(pVBInfo->P3d4, i, CRTCdata); /* Set CRTC(3d4) */
         }
 }
@@ -137,10 +113,10 @@ static void XGI_SetATTRegs(unsigned short ModeNo,
         unsigned char ARdata;
         unsigned short i, modeflag;
 
-        modeflag = pVBInfo->EModeIDTable[ModeIdIndex].Ext_ModeFlag;
+        modeflag = XGI330_EModeIDTable[ModeIdIndex].Ext_ModeFlag;
 
         for (i = 0; i <= 0x13; i++) {
-                ARdata = pVBInfo->StandTable->ATTR[i];
+                ARdata = XGI330_StandTable.ATTR[i];
 
                 if ((modeflag & Charx8Dot) && i == 0x13) { /* ifndef Dot9 */
                         if (pVBInfo->VBInfo & XGI_SetCRT2ToLCDA) {
@@ -171,7 +147,7 @@ static void XGI_SetGRCRegs(struct vb_device_info *pVBInfo)
 
         for (i = 0; i <= 0x08; i++) {
                 /* Get GR from file */
-                GRdata = pVBInfo->StandTable->GRC[i];
+                GRdata = XGI330_StandTable.GRC[i];
                 xgifb_reg_set(pVBInfo->P3ce, i, GRdata); /* Set GR(3ce) */
         }
 
@@ -194,12 +170,12 @@ static unsigned char XGI_SetDefaultVCLK(struct vb_device_info *pVBInfo)
 {
 
         xgifb_reg_and_or(pVBInfo->P3c4, 0x31, ~0x30, 0x20);
-        xgifb_reg_set(pVBInfo->P3c4, 0x2B, pVBInfo->VCLKData[0].SR2B);
-        xgifb_reg_set(pVBInfo->P3c4, 0x2C, pVBInfo->VCLKData[0].SR2C);
+        xgifb_reg_set(pVBInfo->P3c4, 0x2B, XGI_VCLKData[0].SR2B);
+        xgifb_reg_set(pVBInfo->P3c4, 0x2C, XGI_VCLKData[0].SR2C);
 
         xgifb_reg_and_or(pVBInfo->P3c4, 0x31, ~0x30, 0x10);
-        xgifb_reg_set(pVBInfo->P3c4, 0x2B, pVBInfo->VCLKData[1].SR2B);
-        xgifb_reg_set(pVBInfo->P3c4, 0x2C, pVBInfo->VCLKData[1].SR2C);
+        xgifb_reg_set(pVBInfo->P3c4, 0x2B, XGI_VCLKData[1].SR2B);
+        xgifb_reg_set(pVBInfo->P3c4, 0x2C, XGI_VCLKData[1].SR2C);
 
         xgifb_reg_and(pVBInfo->P3c4, 0x31, ~0x30);
         return 0;
@@ -212,9 +188,9 @@ static unsigned char XGI_AjustCRT2Rate(unsigned short ModeNo,
 {
         unsigned short tempax, tempbx, resinfo, modeflag, infoflag;
 
-        modeflag = pVBInfo->EModeIDTable[ModeIdIndex].Ext_ModeFlag;
-        resinfo = pVBInfo->EModeIDTable[ModeIdIndex].Ext_RESINFO;
-        tempbx = pVBInfo->RefIndex[RefreshRateTableIndex + (*i)].ModeID;
+        modeflag = XGI330_EModeIDTable[ModeIdIndex].Ext_ModeFlag;
+        resinfo = XGI330_EModeIDTable[ModeIdIndex].Ext_RESINFO;
+        tempbx = XGI330_RefIndex[RefreshRateTableIndex + (*i)].ModeID;
         tempax = 0;
 
         if (pVBInfo->IF_DEF_LVDS == 0) {
@@ -279,9 +255,9 @@ static unsigned char XGI_AjustCRT2Rate(unsigned short ModeNo,
                 }
         }
 
-        for (; pVBInfo->RefIndex[RefreshRateTableIndex + (*i)].ModeID ==
+        for (; XGI330_RefIndex[RefreshRateTableIndex + (*i)].ModeID ==
                tempbx; (*i)--) {
-                infoflag = pVBInfo->RefIndex[RefreshRateTableIndex + (*i)].
+                infoflag = XGI330_RefIndex[RefreshRateTableIndex + (*i)].
                                 Ext_InfoFlag;
                 if (infoflag & tempax)
                         return 1;
@@ -291,9 +267,9 @@ static unsigned char XGI_AjustCRT2Rate(unsigned short ModeNo,
         }
 
         for ((*i) = 0;; (*i)++) {
-                infoflag = pVBInfo->RefIndex[RefreshRateTableIndex + (*i)].
+                infoflag = XGI330_RefIndex[RefreshRateTableIndex + (*i)].
                                 Ext_InfoFlag;
-                if (pVBInfo->RefIndex[RefreshRateTableIndex + (*i)].ModeID
+                if (XGI330_RefIndex[RefreshRateTableIndex + (*i)].ModeID
                                 != tempbx) {
                         return 0;
                 }
@@ -310,7 +286,7 @@ static void XGI_SetSync(unsigned short RefreshRateTableIndex,
         unsigned short sync, temp;
 
         /* di+0x00 */
-        sync = pVBInfo->RefIndex[RefreshRateTableIndex].Ext_InfoFlag >> 8;
+        sync = XGI330_RefIndex[RefreshRateTableIndex].Ext_InfoFlag >> 8;
         sync &= 0xC0;
         temp = 0x2F;
         temp |= sync;
@@ -328,22 +304,22 @@ static void XGI_SetCRT1Timing_H(struct vb_device_info *pVBInfo,
         data &= 0x7F;
         xgifb_reg_set(pVBInfo->P3d4, 0x11, data);
 
-        data = pVBInfo->TimingH[0].data[0];
+        data = pVBInfo->TimingH.data[0];
         xgifb_reg_set(pVBInfo->P3d4, 0, data);
 
         for (i = 0x01; i <= 0x04; i++) {
-                data = pVBInfo->TimingH[0].data[i];
+                data = pVBInfo->TimingH.data[i];
                 xgifb_reg_set(pVBInfo->P3d4, (unsigned short) (i + 1), data);
         }
 
         for (i = 0x05; i <= 0x06; i++) {
-                data = pVBInfo->TimingH[0].data[i];
+                data = pVBInfo->TimingH.data[i];
                 xgifb_reg_set(pVBInfo->P3c4, (unsigned short) (i + 6), data);
         }
 
         j = (unsigned char) xgifb_reg_get(pVBInfo->P3c4, 0x0e);
         j &= 0x1F;
-        data = pVBInfo->TimingH[0].data[7];
+        data = pVBInfo->TimingH.data[7];
         data &= 0xE0;
         data |= j;
         xgifb_reg_set(pVBInfo->P3c4, 0x0e, data);
@@ -385,32 +361,32 @@ static void XGI_SetCRT1Timing_V(unsigned short ModeIdIndex,
         unsigned short i, j;
 
         for (i = 0x00; i <= 0x01; i++) {
-                data = pVBInfo->TimingV[0].data[i];
+                data = pVBInfo->TimingV.data[i];
                 xgifb_reg_set(pVBInfo->P3d4, (unsigned short) (i + 6), data);
         }
 
         for (i = 0x02; i <= 0x03; i++) {
-                data = pVBInfo->TimingV[0].data[i];
+                data = pVBInfo->TimingV.data[i];
                 xgifb_reg_set(pVBInfo->P3d4, (unsigned short) (i + 0x0e), data);
         }
 
         for (i = 0x04; i <= 0x05; i++) {
-                data = pVBInfo->TimingV[0].data[i];
+                data = pVBInfo->TimingV.data[i];
                 xgifb_reg_set(pVBInfo->P3d4, (unsigned short) (i + 0x11), data);
         }
 
         j = (unsigned char) xgifb_reg_get(pVBInfo->P3c4, 0x0a);
         j &= 0xC0;
-        data = pVBInfo->TimingV[0].data[6];
+        data = pVBInfo->TimingV.data[6];
         data &= 0x3F;
         data |= j;
         xgifb_reg_set(pVBInfo->P3c4, 0x0a, data);
 
-        data = pVBInfo->TimingV[0].data[6];
+        data = pVBInfo->TimingV.data[6];
         data &= 0x80;
         data = data >> 2;
 
-        i = pVBInfo->EModeIDTable[ModeIdIndex].Ext_ModeFlag;
+        i = XGI330_EModeIDTable[ModeIdIndex].Ext_ModeFlag;
         i &= DoubleScanMode;
         if (i)
                 data |= 0x80;
@@ -430,7 +406,7 @@ static void XGI_SetCRT1CRTC(unsigned short ModeNo, unsigned short ModeIdIndex,
         unsigned short i;
 
         /* Get index */
-        index = pVBInfo->RefIndex[RefreshRateTableIndex].Ext_CRT1CRTC;
+        index = XGI330_RefIndex[RefreshRateTableIndex].Ext_CRT1CRTC;
         index = index & IndexMask;
 
         data = (unsigned char) xgifb_reg_get(pVBInfo->P3d4, 0x11);
@@ -438,12 +414,12 @@ static void XGI_SetCRT1CRTC(unsigned short ModeNo, unsigned short ModeIdIndex,
         xgifb_reg_set(pVBInfo->P3d4, 0x11, data); /* Unlock CRTC */
 
         for (i = 0; i < 8; i++)
-                pVBInfo->TimingH[0].data[i]
-                                = pVBInfo->XGINEWUB_CRT1Table[index].CR[i];
+                pVBInfo->TimingH.data[i]
+                                = XGI_CRT1Table[index].CR[i];
 
         for (i = 0; i < 7; i++)
-                pVBInfo->TimingV[0].data[i]
-                                = pVBInfo->XGINEWUB_CRT1Table[index].CR[i + 8];
+                pVBInfo->TimingV.data[i]
+                                = XGI_CRT1Table[index].CR[i + 8];
 
         XGI_SetCRT1Timing_H(pVBInfo, HwDeviceExtension);
 
@@ -466,23 +442,23 @@ static void XGI_SetXG21CRTC(unsigned short ModeNo, unsigned short ModeIdIndex,
         unsigned char index, Tempax, Tempbx, Tempcx, Tempdx;
         unsigned short Temp1, Temp2, Temp3;
 
-        index = pVBInfo->RefIndex[RefreshRateTableIndex].Ext_CRT1CRTC;
+        index = XGI330_RefIndex[RefreshRateTableIndex].Ext_CRT1CRTC;
         /* Tempax: CR4 HRS */
-        Tempax = pVBInfo->XGINEWUB_CRT1Table[index].CR[3];
+        Tempax = XGI_CRT1Table[index].CR[3];
         Tempcx = Tempax; /* Tempcx: HRS */
         /* SR2E[7:0]->HRS */
         xgifb_reg_set(pVBInfo->P3c4, 0x2E, Tempax);
 
-        Tempdx = pVBInfo->XGINEWUB_CRT1Table[index].CR[5]; /* SRB */
+        Tempdx = XGI_CRT1Table[index].CR[5]; /* SRB */
         Tempdx &= 0xC0; /* Tempdx[7:6]: SRB[7:6] */
         Temp1 = Tempdx; /* Temp1[7:6]: HRS[9:8] */
         Temp1 <<= 2; /* Temp1[9:8]: HRS[9:8] */
         Temp1 |= Tempax; /* Temp1[9:0]: HRS[9:0] */
 
-        Tempax = pVBInfo->XGINEWUB_CRT1Table[index].CR[4]; /* CR5 HRE */
+        Tempax = XGI_CRT1Table[index].CR[4]; /* CR5 HRE */
         Tempax &= 0x1F; /* Tempax[4:0]: HRE[4:0] */
 
-        Tempbx = pVBInfo->XGINEWUB_CRT1Table[index].CR[6]; /* SRC */
+        Tempbx = XGI_CRT1Table[index].CR[6]; /* SRC */
         Tempbx &= 0x04; /* Tempbx[2]: HRE[5] */
         Tempbx <<= 3; /* Tempbx[5]: HRE[5] */
         Tempax |= Tempbx; /* Tempax[5:0]: HRE[5:0] */
@@ -504,12 +480,12 @@ static void XGI_SetXG21CRTC(unsigned short ModeNo, unsigned short ModeIdIndex,
         xgifb_reg_and_or(pVBInfo->P3c4, 0x30, 0xE3, 00);
 
         /* CR10 VRS */
-        Tempax = pVBInfo->XGINEWUB_CRT1Table[index].CR[10];
+        Tempax = XGI_CRT1Table[index].CR[10];
         Tempbx = Tempax; /* Tempbx: VRS */
         Tempax &= 0x01; /* Tempax[0]: VRS[0] */
         xgifb_reg_or(pVBInfo->P3c4, 0x33, Tempax); /* SR33[0]->VRS[0] */
         /* CR7[2][7] VRE */
-        Tempax = pVBInfo->XGINEWUB_CRT1Table[index].CR[9];
+        Tempax = XGI_CRT1Table[index].CR[9];
         Tempcx = Tempbx >> 1; /* Tempcx[6:0]: VRS[7:1] */
         Tempdx = Tempax & 0x04; /* Tempdx[2]: CR7[2] */
         Tempdx <<= 5; /* Tempdx[7]: VRS[8] */
@@ -523,17 +499,17 @@ static void XGI_SetXG21CRTC(unsigned short ModeNo, unsigned short ModeIdIndex,
         Temp2 = Tempax << 2; /* Temp2[9]: VRS[9] */
         Temp1 |= Temp2; /* Temp1[9:0]: VRS[9:0] */
         /* Tempax: SRA */
-        Tempax = pVBInfo->XGINEWUB_CRT1Table[index].CR[14];
+        Tempax = XGI_CRT1Table[index].CR[14];
         Tempax &= 0x08; /* Tempax[3]: VRS[3] */
         Temp2 = Tempax;
         Temp2 <<= 7; /* Temp2[10]: VRS[10] */
         Temp1 |= Temp2; /* Temp1[10:0]: VRS[10:0] */
 
         /* Tempax: CR11 VRE */
-        Tempax = pVBInfo->XGINEWUB_CRT1Table[index].CR[11];
+        Tempax = XGI_CRT1Table[index].CR[11];
         Tempax &= 0x0F; /* Tempax[3:0]: VRE[3:0] */
         /* Tempbx: SRA */
-        Tempbx = pVBInfo->XGINEWUB_CRT1Table[index].CR[14];
+        Tempbx = XGI_CRT1Table[index].CR[14];
         Tempbx &= 0x20; /* Tempbx[5]: VRE[5] */
         Tempbx >>= 1; /* Tempbx[4]: VRE[4] */
         Tempax |= Tempbx; /* Tempax[4:0]: VRE[4:0] */
@@ -563,23 +539,23 @@ static void XGI_SetXG27CRTC(unsigned short ModeNo,
 {
         unsigned short index, Tempax, Tempbx, Tempcx;
 
-        index = pVBInfo->RefIndex[RefreshRateTableIndex].Ext_CRT1CRTC;
+        index = XGI330_RefIndex[RefreshRateTableIndex].Ext_CRT1CRTC;
         /* Tempax: CR4 HRS */
-        Tempax = pVBInfo->XGINEWUB_CRT1Table[index].CR[3];
+        Tempax = XGI_CRT1Table[index].CR[3];
         Tempbx = Tempax; /* Tempbx: HRS[7:0] */
         /* SR2E[7:0]->HRS */
         xgifb_reg_set(pVBInfo->P3c4, 0x2E, Tempax);
 
         /* SR0B */
-        Tempax = pVBInfo->XGINEWUB_CRT1Table[index].CR[5];
+        Tempax = XGI_CRT1Table[index].CR[5];
         Tempax &= 0xC0; /* Tempax[7:6]: SR0B[7:6]: HRS[9:8]*/
         Tempbx |= (Tempax << 2); /* Tempbx: HRS[9:0] */
 
-        Tempax = pVBInfo->XGINEWUB_CRT1Table[index].CR[4]; /* CR5 HRE */
+        Tempax = XGI_CRT1Table[index].CR[4]; /* CR5 HRE */
         Tempax &= 0x1F; /* Tempax[4:0]: HRE[4:0] */
         Tempcx = Tempax; /* Tempcx: HRE[4:0] */
 
-        Tempax = pVBInfo->XGINEWUB_CRT1Table[index].CR[6]; /* SRC */
+        Tempax = XGI_CRT1Table[index].CR[6]; /* SRC */
         Tempax &= 0x04; /* Tempax[2]: HRE[5] */
         Tempax <<= 3; /* Tempax[5]: HRE[5] */
         Tempcx |= Tempax; /* Tempcx[5:0]: HRE[5:0] */
@@ -588,12 +564,12 @@ static void XGI_SetXG27CRTC(unsigned short ModeNo,
         Tempbx |= Tempcx; /* Tempbx: HRS[9:6]HRE[5:0] */
 
         /* Tempax: CR4 HRS */
-        Tempax = pVBInfo->XGINEWUB_CRT1Table[index].CR[3];
+        Tempax = XGI_CRT1Table[index].CR[3];
         Tempax &= 0x3F; /* Tempax: HRS[5:0] */
         if (Tempcx <= Tempax) /* HRE[5:0] < HRS[5:0] */
                 Tempbx += 0x40; /* Tempbx= Tempbx + 0x40 : HRE[9:0]*/
 
-        Tempax = pVBInfo->XGINEWUB_CRT1Table[index].CR[5]; /* SR0B */
+        Tempax = XGI_CRT1Table[index].CR[5]; /* SR0B */
         Tempax &= 0xC0; /* Tempax[7:6]: SR0B[7:6]: HRS[9:8]*/
         Tempax >>= 6; /* Tempax[1:0]: HRS[9:8]*/
         Tempax |= ((Tempbx << 2) & 0xFF); /* Tempax[7:2]: HRE[5:0] */
@@ -602,13 +578,13 @@ static void XGI_SetXG27CRTC(unsigned short ModeNo,
         xgifb_reg_and_or(pVBInfo->P3c4, 0x30, 0xE3, 00);
 
         /* CR10 VRS */
-        Tempax = pVBInfo->XGINEWUB_CRT1Table[index].CR[10];
+        Tempax = XGI_CRT1Table[index].CR[10];
         /* SR34[7:0]->VRS[7:0] */
         xgifb_reg_set(pVBInfo->P3c4, 0x34, Tempax);
 
         Tempcx = Tempax; /* Tempcx <= VRS[7:0] */
         /* CR7[7][2] VRS[9][8] */
-        Tempax = pVBInfo->XGINEWUB_CRT1Table[index].CR[9];
+        Tempax = XGI_CRT1Table[index].CR[9];
         Tempbx = Tempax; /* Tempbx <= CR07[7:0] */
         Tempax = Tempax & 0x04; /* Tempax[2]: CR7[2]: VRS[8] */
         Tempax >>= 2; /* Tempax[0]: VRS[8] */
@@ -617,15 +593,15 @@ static void XGI_SetXG27CRTC(unsigned short ModeNo,
         Tempcx |= (Tempax << 8); /* Tempcx <= VRS[8:0] */
         Tempcx |= ((Tempbx & 0x80) << 2); /* Tempcx <= VRS[9:0] */
         /* Tempax: SR0A */
-        Tempax = pVBInfo->XGINEWUB_CRT1Table[index].CR[14];
+        Tempax = XGI_CRT1Table[index].CR[14];
         Tempax &= 0x08; /* SR0A[3] VRS[10] */
         Tempcx |= (Tempax << 7); /* Tempcx <= VRS[10:0] */
 
         /* Tempax: CR11 VRE */
-        Tempax = pVBInfo->XGINEWUB_CRT1Table[index].CR[11];
+        Tempax = XGI_CRT1Table[index].CR[11];
         Tempax &= 0x0F; /* Tempax[3:0]: VRE[3:0] */
         /* Tempbx: SR0A */
-        Tempbx = pVBInfo->XGINEWUB_CRT1Table[index].CR[14];
+        Tempbx = XGI_CRT1Table[index].CR[14];
         Tempbx &= 0x20; /* Tempbx[5]: SR0A[5]: VRE[4] */
         Tempbx >>= 1; /* Tempbx[4]: VRE[4] */
         Tempax |= Tempbx; /* Tempax[4:0]: VRE[4:0] */
@@ -698,7 +674,7 @@ static void xgifb_set_lcd(int chip_id,
         xgifb_reg_and(pVBInfo->P3c4, 0x30, ~0x20); /* Hsync polarity */
         xgifb_reg_and(pVBInfo->P3c4, 0x35, ~0x80); /* Vsync polarity */
 
-        Data = pVBInfo->RefIndex[RefreshRateTableIndex].Ext_InfoFlag;
+        Data = XGI330_RefIndex[RefreshRateTableIndex].Ext_InfoFlag;
         if (Data & 0x4000)
                 /* Hsync polarity */
                 xgifb_reg_or(pVBInfo->P3c4, 0x30, 0x20);
@@ -721,10 +697,10 @@ static void XGI_UpdateXG21CRTC(unsigned short ModeNo,
 
         xgifb_reg_and(pVBInfo->P3d4, 0x11, 0x7F); /* Unlock CR0~7 */
         if (ModeNo == 0x2E &&
-            (pVBInfo->RefIndex[RefreshRateTableIndex].Ext_CRT1CRTC ==
+            (XGI330_RefIndex[RefreshRateTableIndex].Ext_CRT1CRTC ==
                                                       RES640x480x60))
                 index = 12;
-        else if (ModeNo == 0x2E && (pVBInfo->RefIndex[RefreshRateTableIndex].
+        else if (ModeNo == 0x2E && (XGI330_RefIndex[RefreshRateTableIndex].
                                 Ext_CRT1CRTC == RES640x480x72))
                 index = 13;
         else if (ModeNo == 0x2F)
@@ -736,13 +712,13 @@ static void XGI_UpdateXG21CRTC(unsigned short ModeNo,
 
         if (index != -1) {
                 xgifb_reg_set(pVBInfo->P3d4, 0x02,
-                                pVBInfo->UpdateCRT1[index].CR02);
+                                XGI_UpdateCRT1Table[index].CR02);
                 xgifb_reg_set(pVBInfo->P3d4, 0x03,
-                                pVBInfo->UpdateCRT1[index].CR03);
+                                XGI_UpdateCRT1Table[index].CR03);
                 xgifb_reg_set(pVBInfo->P3d4, 0x15,
-                                pVBInfo->UpdateCRT1[index].CR15);
+                                XGI_UpdateCRT1Table[index].CR15);
                 xgifb_reg_set(pVBInfo->P3d4, 0x16,
-                                pVBInfo->UpdateCRT1[index].CR16);
+                                XGI_UpdateCRT1Table[index].CR16);
         }
 }
 
@@ -755,11 +731,11 @@ static void XGI_SetCRT1DE(struct xgi_hw_device_info *HwDeviceExtension,
 
         unsigned char data;
 
-        resindex = pVBInfo->EModeIDTable[ModeIdIndex].Ext_RESINFO;
+        resindex = XGI330_EModeIDTable[ModeIdIndex].Ext_RESINFO;
 
-        modeflag = pVBInfo->EModeIDTable[ModeIdIndex].Ext_ModeFlag;
-        tempax = pVBInfo->ModeResInfo[resindex].HTotal;
-        tempbx = pVBInfo->ModeResInfo[resindex].VTotal;
+        modeflag = XGI330_EModeIDTable[ModeIdIndex].Ext_ModeFlag;
+        tempax = XGI330_ModeResInfo[resindex].HTotal;
+        tempbx = XGI330_ModeResInfo[resindex].VTotal;
 
         if (modeflag & HalfDCLK)
                 tempax = tempax >> 1;
@@ -767,7 +743,7 @@ static void XGI_SetCRT1DE(struct xgi_hw_device_info *HwDeviceExtension,
         if (modeflag & HalfDCLK)
                 tempax = tempax << 1;
 
-        temp = pVBInfo->RefIndex[RefreshRateTableIndex].Ext_InfoFlag;
+        temp = XGI330_RefIndex[RefreshRateTableIndex].Ext_InfoFlag;
 
         if (temp & InterlaceMode)
                 tempbx = tempbx >> 1;
@@ -819,11 +795,11 @@ static void XGI_SetCRT1Offset(unsigned short ModeNo,
         unsigned short temp, ah, al, temp2, i, DisplayUnit;
 
         /* GetOffset */
-        temp = pVBInfo->EModeIDTable[ModeIdIndex].Ext_ModeInfo;
+        temp = XGI330_EModeIDTable[ModeIdIndex].Ext_ModeInfo;
         temp = temp >> 8;
-        temp = pVBInfo->ScreenOffset[temp];
+        temp = XGI330_ScreenOffset[temp];
 
-        temp2 = pVBInfo->RefIndex[RefreshRateTableIndex].Ext_InfoFlag;
+        temp2 = XGI330_RefIndex[RefreshRateTableIndex].Ext_InfoFlag;
         temp2 &= InterlaceMode;
 
         if (temp2)
@@ -874,7 +850,7 @@ static void XGI_SetCRT1Offset(unsigned short ModeNo,
         xgifb_reg_set(pVBInfo->P3d4, 0x13, temp);
 
         /* SetDisplayUnit */
-        temp2 = pVBInfo->RefIndex[RefreshRateTableIndex].Ext_InfoFlag;
+        temp2 = XGI330_RefIndex[RefreshRateTableIndex].Ext_InfoFlag;
         temp2 &= InterlaceMode;
         if (temp2)
                 DisplayUnit >>= 1;
@@ -904,9 +880,9 @@ static unsigned short XGI_GetVCLK2Ptr(unsigned short ModeNo,
         unsigned short modeflag, resinfo;
 
         /* si+Ext_ResInfo */
-        modeflag = pVBInfo->EModeIDTable[ModeIdIndex].Ext_ModeFlag;
-        resinfo = pVBInfo->EModeIDTable[ModeIdIndex].Ext_RESINFO;
-        CRT2Index = pVBInfo->RefIndex[RefreshRateTableIndex].Ext_CRT2CRTC;
+        modeflag = XGI330_EModeIDTable[ModeIdIndex].Ext_ModeFlag;
+        resinfo = XGI330_EModeIDTable[ModeIdIndex].Ext_RESINFO;
+        CRT2Index = XGI330_RefIndex[RefreshRateTableIndex].Ext_CRT2CRTC;
 
         if (pVBInfo->IF_DEF_LVDS == 0) {
                 CRT2Index = CRT2Index >> 6; /*  for LCD */
@@ -947,7 +923,7 @@ static unsigned short XGI_GetVCLK2Ptr(unsigned short ModeNo,
                                 VCLKIndex = TVCLKBASE_315_25 + TVVCLK;
                 } else { /* for CRT2 */
                         /* di+Ext_CRTVCLK */
-                        VCLKIndex = pVBInfo->RefIndex[RefreshRateTableIndex].
+                        VCLKIndex = XGI330_RefIndex[RefreshRateTableIndex].
                                                                 Ext_CRTVCLK;
                         VCLKIndex &= IndexMask;
                 }
@@ -971,13 +947,11 @@ static void XGI_SetCRT1VCLK(unsigned short ModeNo,
         unsigned short vclkindex;
 
         if (pVBInfo->IF_DEF_LVDS == 1) {
-                index = pVBInfo->RefIndex[RefreshRateTableIndex].Ext_CRTVCLK;
+                index = XGI330_RefIndex[RefreshRateTableIndex].Ext_CRTVCLK;
                 data = xgifb_reg_get(pVBInfo->P3c4, 0x31) & 0xCF;
                 xgifb_reg_set(pVBInfo->P3c4, 0x31, data);
-                xgifb_reg_set(pVBInfo->P3c4, 0x2B,
-                                pVBInfo->VCLKData[index].SR2B);
-                xgifb_reg_set(pVBInfo->P3c4, 0x2C,
-                                pVBInfo->VCLKData[index].SR2C);
+                xgifb_reg_set(pVBInfo->P3c4, 0x2B, XGI_VCLKData[index].SR2B);
+                xgifb_reg_set(pVBInfo->P3c4, 0x2C, XGI_VCLKData[index].SR2C);
                 xgifb_reg_set(pVBInfo->P3c4, 0x2D, 0x01);
         } else if ((pVBInfo->VBType & (VB_SIS301B | VB_SIS302B | VB_SIS301LV
                         | VB_SIS302LV | VB_XGI301C)) && (pVBInfo->VBInfo
@@ -987,24 +961,22 @@ static void XGI_SetCRT1VCLK(unsigned short ModeNo,
                                 pVBInfo);
                 data = xgifb_reg_get(pVBInfo->P3c4, 0x31) & 0xCF;
                 xgifb_reg_set(pVBInfo->P3c4, 0x31, data);
-                data = pVBInfo->VBVCLKData[vclkindex].Part4_A;
+                data = XGI_VBVCLKData[vclkindex].Part4_A;
                 xgifb_reg_set(pVBInfo->P3c4, 0x2B, data);
-                data = pVBInfo->VBVCLKData[vclkindex].Part4_B;
+                data = XGI_VBVCLKData[vclkindex].Part4_B;
                 xgifb_reg_set(pVBInfo->P3c4, 0x2C, data);
                 xgifb_reg_set(pVBInfo->P3c4, 0x2D, 0x01);
         } else {
-                index = pVBInfo->RefIndex[RefreshRateTableIndex].Ext_CRTVCLK;
+                index = XGI330_RefIndex[RefreshRateTableIndex].Ext_CRTVCLK;
                 data = xgifb_reg_get(pVBInfo->P3c4, 0x31) & 0xCF;
                 xgifb_reg_set(pVBInfo->P3c4, 0x31, data);
-                xgifb_reg_set(pVBInfo->P3c4, 0x2B,
-                                pVBInfo->VCLKData[index].SR2B);
-                xgifb_reg_set(pVBInfo->P3c4, 0x2C,
-                                pVBInfo->VCLKData[index].SR2C);
+                xgifb_reg_set(pVBInfo->P3c4, 0x2B, XGI_VCLKData[index].SR2B);
+                xgifb_reg_set(pVBInfo->P3c4, 0x2C, XGI_VCLKData[index].SR2C);
                 xgifb_reg_set(pVBInfo->P3c4, 0x2D, 0x01);
         }
 
         if (HwDeviceExtension->jChipType >= XG20) {
-                if (pVBInfo->EModeIDTable[ModeIdIndex].Ext_ModeFlag &
+                if (XGI330_EModeIDTable[ModeIdIndex].Ext_ModeFlag &
                     HalfDCLK) {
                         data = xgifb_reg_get(pVBInfo->P3c4, 0x2B);
                         xgifb_reg_set(pVBInfo->P3c4, 0x2B, data);
@@ -1064,9 +1036,9 @@ static void XGI_SetVCLKState(struct xgi_hw_device_info *HwDeviceExtension,
 
         unsigned char index;
 
-        index = pVBInfo->RefIndex[RefreshRateTableIndex].Ext_CRTVCLK;
+        index = XGI330_RefIndex[RefreshRateTableIndex].Ext_CRTVCLK;
         index &= IndexMask;
-        VCLK = pVBInfo->VCLKData[index].CLOCK;
+        VCLK = XGI_VCLKData[index].CLOCK;
 
         data = xgifb_reg_get(pVBInfo->P3c4, 0x32);
         data &= 0xf3;
@@ -1102,8 +1074,8 @@ static void XGI_SetCRT1ModeRegs(struct xgi_hw_device_info *HwDeviceExtension,
         unsigned short data, data2, data3, infoflag = 0, modeflag, resindex,
                         xres;
 
-        modeflag = pVBInfo->EModeIDTable[ModeIdIndex].Ext_ModeFlag;
-        infoflag = pVBInfo->RefIndex[RefreshRateTableIndex].Ext_InfoFlag;
+        modeflag = XGI330_EModeIDTable[ModeIdIndex].Ext_ModeFlag;
+        infoflag = XGI330_RefIndex[RefreshRateTableIndex].Ext_InfoFlag;
 
         if (xgifb_reg_get(pVBInfo->P3d4, 0x31) & 0x01)
                 xgifb_reg_and_or(pVBInfo->P3c4, 0x1F, 0x3F, 0x00);
@@ -1120,8 +1092,8 @@ static void XGI_SetCRT1ModeRegs(struct xgi_hw_device_info *HwDeviceExtension,
                 data2 |= 0x20;
 
         xgifb_reg_and_or(pVBInfo->P3c4, 0x06, ~0x3F, data2);
-        resindex = pVBInfo->EModeIDTable[ModeIdIndex].Ext_RESINFO;
-        xres = pVBInfo->ModeResInfo[resindex].HTotal; /* xres->ax */
+        resindex = XGI330_EModeIDTable[ModeIdIndex].Ext_RESINFO;
+        xres = XGI330_ModeResInfo[resindex].HTotal; /* xres->ax */
 
         data = 0x0000;
         if (infoflag & InterlaceMode) {
@@ -1282,13 +1254,13 @@ static void XGI_GetLVDSResInfo(unsigned short ModeNo,
         unsigned short resindex, xres, yres, modeflag;
 
         /* si+Ext_ResInfo */
-        modeflag = pVBInfo->EModeIDTable[ModeIdIndex].Ext_RESINFO;
+        modeflag = XGI330_EModeIDTable[ModeIdIndex].Ext_RESINFO;
 
         /* si+Ext_ResInfo */
-        resindex = pVBInfo->EModeIDTable[ModeIdIndex].Ext_RESINFO;
+        resindex = XGI330_EModeIDTable[ModeIdIndex].Ext_RESINFO;
 
-        xres = pVBInfo->ModeResInfo[resindex].HTotal;
-        yres = pVBInfo->ModeResInfo[resindex].VTotal;
+        xres = XGI330_ModeResInfo[resindex].HTotal;
+        yres = XGI330_ModeResInfo[resindex].VTotal;
 
         if (modeflag & HalfDCLK)
                 xres = xres << 1;
@@ -1305,64 +1277,21 @@ static void XGI_GetLVDSResInfo(unsigned short ModeNo,
         pVBInfo->VDE = yres;
 }
 
-static void *XGI_GetLcdPtr(unsigned short BX, unsigned short ModeNo,
+static void const *XGI_GetLcdPtr(struct XGI330_LCDDataTablStruct const *table,
+                unsigned short ModeNo,
                 unsigned short ModeIdIndex,
                 unsigned short RefreshRateTableIndex,
                 struct vb_device_info *pVBInfo)
 {
-        unsigned short i, tempdx, tempbx, tempal, modeflag, table;
-
-        struct XGI330_LCDDataTablStruct *tempdi = NULL;
-
-        tempbx = BX;
-
-        modeflag = pVBInfo->EModeIDTable[ModeIdIndex].Ext_ModeFlag;
-        tempal = pVBInfo->RefIndex[RefreshRateTableIndex].Ext_CRT2CRTC;
-
-        tempal = tempal & 0x0f;
-
-        if (tempbx <= 1) { /* ExpLink */
-                tempal = pVBInfo->RefIndex[RefreshRateTableIndex].Ext_CRT2CRTC;
-
-                if (pVBInfo->VBInfo & XGI_SetCRT2ToLCDA) {
-                        tempal = pVBInfo->RefIndex[RefreshRateTableIndex].
-                                                        Ext_CRT2CRTC2;
-                }
+        unsigned short i, tempdx, tempbx, modeflag;
 
-                if (tempbx & 0x01)
-                        tempal = (tempal >> 4);
-
-                tempal = (tempal & 0x0f);
-        }
-
-        switch (tempbx) {
-        case 0:
-        case 1:
-                tempdi = xgifb_epllcd_crt1;
-                break;
-        case 2:
-                tempdi = XGI_EPLLCDDataPtr;
-                break;
-        case 3:
-                tempdi = XGI_EPLLCDDesDataPtr;
-                break;
-        case 4:
-                tempdi = XGI_LCDDataTable;
-                break;
-        case 5:
-                tempdi = XGI_LCDDesDataTable;
-                break;
-        default:
-                break;
-        }
+        tempbx = 0;
 
-        if (tempdi == NULL) /* OEMUtil */
-                return NULL;
+        modeflag = XGI330_EModeIDTable[ModeIdIndex].Ext_ModeFlag;
 
-        table = tempbx;
         i = 0;
 
-        while (tempdi[i].PANELID != 0xff) {
+        while (table[i].PANELID != 0xff) {
                 tempdx = pVBInfo->LCDResInfo;
                 if (tempbx & 0x0080) { /* OEMUtil */
                         tempbx &= (~0x0080);
@@ -1372,341 +1301,21 @@ static void *XGI_GetLcdPtr(unsigned short BX, unsigned short ModeNo,
                 if (pVBInfo->LCDInfo & EnableScalingLCD)
                         tempdx &= (~PanelResInfo);
 
-                if (tempdi[i].PANELID == tempdx) {
-                        tempbx = tempdi[i].MASK;
+                if (table[i].PANELID == tempdx) {
+                        tempbx = table[i].MASK;
                         tempdx = pVBInfo->LCDInfo;
 
                         if (modeflag & HalfDCLK)
                                 tempdx |= SetLCDLowResolution;
 
                         tempbx &= tempdx;
-                        if (tempbx == tempdi[i].CAP)
+                        if (tempbx == table[i].CAP)
                                 break;
                 }
                 i++;
         }
 
-        if (table == 0) {
-                switch (tempdi[i].DATAPTR) {
-                case 0:
-                        return &XGI_LVDSCRT11024x768_1_H[tempal];
-                        break;
-                case 1:
-                        return &XGI_LVDSCRT11024x768_2_H[tempal];
-                        break;
-                case 2:
-                        return &XGI_LVDSCRT11280x1024_1_H[tempal];
-                        break;
-                case 3:
-                        return &XGI_LVDSCRT11280x1024_2_H[tempal];
-                        break;
-                case 4:
-                        return &XGI_LVDSCRT11400x1050_1_H[tempal];
-                        break;
-                case 5:
-                        return &XGI_LVDSCRT11400x1050_2_H[tempal];
-                        break;
-                case 6:
-                        return &XGI_LVDSCRT11600x1200_1_H[tempal];
-                        break;
-                case 7:
-                        return &XGI_LVDSCRT11024x768_1_Hx75[tempal];
-                        break;
-                case 8:
-                        return &XGI_LVDSCRT11024x768_2_Hx75[tempal];
-                        break;
-                case 9:
-                        return &XGI_LVDSCRT11280x1024_1_Hx75[tempal];
-                        break;
-                case 10:
-                        return &XGI_LVDSCRT11280x1024_2_Hx75[tempal];
-                        break;
-                default:
-                        break;
-                }
-        } else if (table == 1) {
-                switch (tempdi[i].DATAPTR) {
-                case 0:
-                        return &XGI_LVDSCRT11024x768_1_V[tempal];
-                        break;
-                case 1:
-                        return &XGI_LVDSCRT11024x768_2_V[tempal];
-                        break;
-                case 2:
-                        return &XGI_LVDSCRT11280x1024_1_V[tempal];
-                        break;
-                case 3:
-                        return &XGI_LVDSCRT11280x1024_2_V[tempal];
-                        break;
-                case 4:
-                        return &XGI_LVDSCRT11400x1050_1_V[tempal];
-                        break;
-                case 5:
-                        return &XGI_LVDSCRT11400x1050_2_V[tempal];
-                        break;
-                case 6:
-                        return &XGI_LVDSCRT11600x1200_1_V[tempal];
-                        break;
-                case 7:
-                        return &XGI_LVDSCRT11024x768_1_Vx75[tempal];
-                        break;
-                case 8:
-                        return &XGI_LVDSCRT11024x768_2_Vx75[tempal];
-                        break;
-                case 9:
-                        return &XGI_LVDSCRT11280x1024_1_Vx75[tempal];
-                        break;
-                case 10:
-                        return &XGI_LVDSCRT11280x1024_2_Vx75[tempal];
-                        break;
-                default:
-                        break;
-                }
-        } else if (table == 2) {
-                switch (tempdi[i].DATAPTR) {
-                case 0:
-                        return &XGI_LVDS1024x768Data_1[tempal];
-                        break;
-                case 1:
-                        return &XGI_LVDS1024x768Data_2[tempal];
-                        break;
-                case 2:
-                        return &XGI_LVDS1280x1024Data_1[tempal];
-                        break;
-                case 3:
-                        return &XGI_LVDS1280x1024Data_2[tempal];
-                        break;
-                case 4:
-                        return &XGI_LVDS1400x1050Data_1[tempal];
-                        break;
-                case 5:
-                        return &XGI_LVDS1400x1050Data_2[tempal];
-                        break;
-                case 6:
-                        return &XGI_LVDS1600x1200Data_1[tempal];
-                        break;
-                case 7:
-                        return &XGI_LVDSNoScalingData[tempal];
-                        break;
-                case 8:
-                        return &XGI_LVDS1024x768Data_1x75[tempal];
-                        break;
-                case 9:
-                        return &XGI_LVDS1024x768Data_2x75[tempal];
-                        break;
-                case 10:
-                        return &XGI_LVDS1280x1024Data_1x75[tempal];
-                        break;
-                case 11:
-                        return &XGI_LVDS1280x1024Data_2x75[tempal];
-                        break;
-                case 12:
-                        return &XGI_LVDSNoScalingDatax75[tempal];
-                        break;
-                default:
-                        break;
-                }
-        } else if (table == 3) {
-                switch (tempdi[i].DATAPTR) {
-                case 0:
-                        return &XGI_LVDS1024x768Des_1[tempal];
-                        break;
-                case 1:
-                        return &XGI_LVDS1024x768Des_3[tempal];
-                        break;
-                case 2:
-                        return &XGI_LVDS1024x768Des_2[tempal];
-                        break;
-                case 3:
-                        return &XGI_LVDS1280x1024Des_1[tempal];
-                        break;
-                case 4:
-                        return &XGI_LVDS1280x1024Des_2[tempal];
-                        break;
-                case 5:
-                        return &XGI_LVDS1400x1050Des_1[tempal];
-                        break;
-                case 6:
-                        return &XGI_LVDS1400x1050Des_2[tempal];
-                        break;
-                case 7:
-                        return &XGI_LVDS1600x1200Des_1[tempal];
-                        break;
-                case 8:
-                        return &XGI_LVDSNoScalingDesData[tempal];
-                        break;
-                case 9:
-                        return &XGI_LVDS1024x768Des_1x75[tempal];
-                        break;
-                case 10:
-                        return &XGI_LVDS1024x768Des_3x75[tempal];
-                        break;
-                case 11:
-                        return &XGI_LVDS1024x768Des_2x75[tempal];
-                        break;
-                case 12:
-                        return &XGI_LVDS1280x1024Des_1x75[tempal];
-                        break;
-                case 13:
-                        return &XGI_LVDS1280x1024Des_2x75[tempal];
-                        break;
-                case 14:
-                        return &XGI_LVDSNoScalingDesDatax75[tempal];
-                        break;
-                default:
-                        break;
-                }
-        } else if (table == 4) {
-                switch (tempdi[i].DATAPTR) {
-                case 0:
-                        return &XGI_ExtLCD1024x768Data[tempal];
-                        break;
-                case 1:
-                        return &XGI_StLCD1024x768Data[tempal];
-                        break;
-                case 2:
-                        return &XGI_CetLCD1024x768Data[tempal];
-                        break;
-                case 3:
-                        return &XGI_ExtLCD1280x1024Data[tempal];
-                        break;
-                case 4:
-                        return &XGI_StLCD1280x1024Data[tempal];
-                        break;
-                case 5:
-                        return &XGI_CetLCD1280x1024Data[tempal];
-                        break;
-                case 6:
-                case 7:
-                        return &xgifb_lcd_1400x1050[tempal];
-                        break;
-                case 8:
-                        return &XGI_CetLCD1400x1050Data[tempal];
-                        break;
-                case 9:
-                        return &XGI_ExtLCD1600x1200Data[tempal];
-                        break;
-                case 10:
-                        return &XGI_StLCD1600x1200Data[tempal];
-                        break;
-                case 11:
-                        return &XGI_NoScalingData[tempal];
-                        break;
-                case 12:
-                        return &XGI_ExtLCD1024x768x75Data[tempal];
-                        break;
-                case 13:
-                        return &XGI_ExtLCD1024x768x75Data[tempal];
-                        break;
-                case 14:
-                        return &XGI_CetLCD1024x768x75Data[tempal];
-                        break;
-                case 15:
-                case 16:
-                        return &xgifb_lcd_1280x1024x75[tempal];
-                        break;
-                case 17:
-                        return &XGI_CetLCD1280x1024x75Data[tempal];
-                        break;
-                case 18:
-                        return &XGI_NoScalingDatax75[tempal];
-                        break;
-                default:
-                        break;
-                }
-        } else if (table == 5) {
-                switch (tempdi[i].DATAPTR) {
-                case 0:
-                        return &XGI_ExtLCDDes1024x768Data[tempal];
-                        break;
-                case 1:
-                        return &XGI_StLCDDes1024x768Data[tempal];
-                        break;
-                case 2:
-                        return &XGI_CetLCDDes1024x768Data[tempal];
-                        break;
-                case 3:
-                        if ((pVBInfo->VBType & VB_SIS301LV) ||
-                                (pVBInfo->VBType & VB_SIS302LV))
-                                return &XGI_ExtLCDDLDes1280x1024Data[tempal];
-                        else
-                                return &XGI_ExtLCDDes1280x1024Data[tempal];
-                        break;
-                case 4:
-                        if ((pVBInfo->VBType & VB_SIS301LV) ||
-                            (pVBInfo->VBType & VB_SIS302LV))
-                                return &XGI_StLCDDLDes1280x1024Data[tempal];
-                        else
-                                return &XGI_StLCDDes1280x1024Data[tempal];
-                        break;
-                case 5:
-                        if ((pVBInfo->VBType & VB_SIS301LV) ||
-                            (pVBInfo->VBType & VB_SIS302LV))
-                                return &XGI_CetLCDDLDes1280x1024Data[tempal];
-                        else
-                                return &XGI_CetLCDDes1280x1024Data[tempal];
-                        break;
-                case 6:
-                case 7:
-                        if ((pVBInfo->VBType & VB_SIS301LV) ||
-                            (pVBInfo->VBType & VB_SIS302LV))
-                                return &xgifb_lcddldes_1400x1050[tempal];
-                        else
-                                return &xgifb_lcddes_1400x1050[tempal];
-                        break;
-                case 8:
-                        return &XGI_CetLCDDes1400x1050Data[tempal];
-                        break;
-                case 9:
-                        return &XGI_CetLCDDes1400x1050Data2[tempal];
-                        break;
-                case 10:
-                        if ((pVBInfo->VBType & VB_SIS301LV) ||
-                            (pVBInfo->VBType & VB_SIS302LV))
-                                return &XGI_ExtLCDDLDes1600x1200Data[tempal];
-                        else
-                                return &XGI_ExtLCDDes1600x1200Data[tempal];
-                        break;
-                case 11:
-                        if ((pVBInfo->VBType & VB_SIS301LV) ||
-                            (pVBInfo->VBType & VB_SIS302LV))
-                                return &XGI_StLCDDLDes1600x1200Data[tempal];
-                        else
-                                return &XGI_StLCDDes1600x1200Data[tempal];
-                        break;
-                case 12:
-                        return &XGI_NoScalingDesData[tempal];
-                        break;
-                case 13:
-                case 14:
-                        return &xgifb_lcddes_1024x768x75[tempal];
-                        break;
-                case 15:
-                        return &XGI_CetLCDDes1024x768x75Data[tempal];
-                        break;
-                case 16:
-                case 17:
-                        if ((pVBInfo->VBType & VB_SIS301LV) ||
-                            (pVBInfo->VBType & VB_SIS302LV))
-                                return &xgifb_lcddldes_1280x1024x75[tempal];
-                        else
-                                return &xgifb_lcddes_1280x1024x75[tempal];
-                        break;
-                case 18:
-                        if ((pVBInfo->VBType & VB_SIS301LV) ||
-                            (pVBInfo->VBType & VB_SIS302LV))
-                                return &XGI_CetLCDDLDes1280x1024x75Data[tempal];
-                        else
-                                return &XGI_CetLCDDes1280x1024x75Data[tempal];
-                        break;
-                case 19:
-                        return &XGI_NoScalingDesDatax75[tempal];
-                        break;
-                default:
-                        break;
-                }
-        }
-        return NULL;
+        return table[i].DATAPTR;
 }
 
 static struct SiS_TVData const *XGI_GetTVPtr(unsigned short ModeNo,
@@ -1716,8 +1325,8 @@ static struct SiS_TVData const *XGI_GetTVPtr(unsigned short ModeNo,
 {
         unsigned short i, tempdx, tempal, modeflag;
 
-        modeflag = pVBInfo->EModeIDTable[ModeIdIndex].Ext_ModeFlag;
-        tempal = pVBInfo->RefIndex[RefreshRateTableIndex].Ext_CRT2CRTC;
+        modeflag = XGI330_EModeIDTable[ModeIdIndex].Ext_ModeFlag;
+        tempal = XGI330_RefIndex[RefreshRateTableIndex].Ext_CRT2CRTC;
         tempal = tempal & 0x3f;
         tempdx = pVBInfo->TVInfo;
 
@@ -1743,40 +1352,35 @@ static void XGI_GetLVDSData(unsigned short ModeNo, unsigned short ModeIdIndex,
                 unsigned short RefreshRateTableIndex,
                 struct vb_device_info *pVBInfo)
 {
-        unsigned short tempbx;
-        struct SiS_LVDSData *LCDPtr = NULL;
+        struct SiS_LVDSData const *LCDPtr;
 
-        tempbx = 2;
+        if (!(pVBInfo->VBInfo & (SetCRT2ToLCD | XGI_SetCRT2ToLCDA)))
+                return;
 
-        if (pVBInfo->VBInfo & (SetCRT2ToLCD | XGI_SetCRT2ToLCDA)) {
-                LCDPtr = XGI_GetLcdPtr(tempbx, ModeNo, ModeIdIndex,
-                                       RefreshRateTableIndex, pVBInfo);
-                pVBInfo->VGAHT = LCDPtr->VGAHT;
-                pVBInfo->VGAVT = LCDPtr->VGAVT;
-                pVBInfo->HT = LCDPtr->LCDHT;
-                pVBInfo->VT = LCDPtr->LCDVT;
-        }
+        LCDPtr = XGI_GetLcdPtr(XGI_EPLLCDDataPtr, ModeNo, ModeIdIndex,
+                               RefreshRateTableIndex, pVBInfo);
+        pVBInfo->VGAHT  = LCDPtr->VGAHT;
+        pVBInfo->VGAVT  = LCDPtr->VGAVT;
+        pVBInfo->HT     = LCDPtr->LCDHT;
+        pVBInfo->VT     = LCDPtr->LCDVT;
 
-        if (pVBInfo->VBInfo & (SetCRT2ToLCD | XGI_SetCRT2ToLCDA)) {
-                if (!(pVBInfo->LCDInfo & (SetLCDtoNonExpanding
-                                | EnableScalingLCD))) {
-                        if ((pVBInfo->LCDResInfo == Panel_1024x768) ||
-                            (pVBInfo->LCDResInfo == Panel_1024x768x75)) {
-                                pVBInfo->HDE = 1024;
-                                pVBInfo->VDE = 768;
-                        } else if ((pVBInfo->LCDResInfo == Panel_1280x1024) ||
-                                   (pVBInfo->LCDResInfo ==
-                                        Panel_1280x1024x75)) {
-                                pVBInfo->HDE = 1280;
-                                pVBInfo->VDE = 1024;
-                        } else if (pVBInfo->LCDResInfo == Panel_1400x1050) {
-                                pVBInfo->HDE = 1400;
-                                pVBInfo->VDE = 1050;
-                        } else {
-                                pVBInfo->HDE = 1600;
-                                pVBInfo->VDE = 1200;
-                        }
-                }
+        if (pVBInfo->LCDInfo & (SetLCDtoNonExpanding | EnableScalingLCD))
+                return;
+
+        if ((pVBInfo->LCDResInfo == Panel_1024x768) ||
+            (pVBInfo->LCDResInfo == Panel_1024x768x75)) {
+                pVBInfo->HDE = 1024;
+                pVBInfo->VDE = 768;
+        } else if ((pVBInfo->LCDResInfo == Panel_1280x1024) ||
+                   (pVBInfo->LCDResInfo == Panel_1280x1024x75)) {
+                pVBInfo->HDE = 1280;
+                pVBInfo->VDE = 1024;
+        } else if (pVBInfo->LCDResInfo == Panel_1400x1050) {
+                pVBInfo->HDE = 1400;
+                pVBInfo->VDE = 1050;
+        } else {
+                pVBInfo->HDE = 1600;
+                pVBInfo->VDE = 1200;
         }
 }
 
@@ -1786,32 +1390,29 @@ static void XGI_ModCRT1Regs(unsigned short ModeNo, unsigned short ModeIdIndex,
                 struct vb_device_info *pVBInfo)
 {
         unsigned char index;
-        unsigned short tempbx, i;
-        struct XGI_LVDSCRT1HDataStruct *LCDPtr = NULL;
-        struct XGI_LVDSCRT1VDataStruct *LCDPtr1 = NULL;
+        unsigned short i;
+        struct XGI_LVDSCRT1HDataStruct const *LCDPtr = NULL;
+        struct XGI_LVDSCRT1VDataStruct const *LCDPtr1 = NULL;
 
-        index = pVBInfo->RefIndex[RefreshRateTableIndex].Ext_CRT2CRTC;
+        index = XGI330_RefIndex[RefreshRateTableIndex].Ext_CRT2CRTC;
         index = index & IndexMask;
 
-        tempbx = 0;
-
         if (pVBInfo->VBInfo & (SetCRT2ToLCD | XGI_SetCRT2ToLCDA)) {
-                LCDPtr = XGI_GetLcdPtr(tempbx, ModeNo, ModeIdIndex,
+                LCDPtr = XGI_GetLcdPtr(xgifb_epllcd_crt1_h, ModeNo, ModeIdIndex,
                                        RefreshRateTableIndex, pVBInfo);
 
                 for (i = 0; i < 8; i++)
-                        pVBInfo->TimingH[0].data[i] = LCDPtr[0].Reg[i];
+                        pVBInfo->TimingH.data[i] = LCDPtr[0].Reg[i];
         }
 
         XGI_SetCRT1Timing_H(pVBInfo, HwDeviceExtension);
 
-        tempbx = 1;
-
         if (pVBInfo->VBInfo & (SetCRT2ToLCD | XGI_SetCRT2ToLCDA)) {
-                LCDPtr1 = XGI_GetLcdPtr(tempbx, ModeNo, ModeIdIndex,
-                                        RefreshRateTableIndex, pVBInfo);
+                LCDPtr1 = XGI_GetLcdPtr(xgifb_epllcd_crt1_v, ModeNo,
+                                        ModeIdIndex, RefreshRateTableIndex,
+                                        pVBInfo);
                 for (i = 0; i < 7; i++)
-                        pVBInfo->TimingV[0].data[i] = LCDPtr1[0].Reg[i];
+                        pVBInfo->TimingV.data[i] = LCDPtr1[0].Reg[i];
         }
 
         XGI_SetCRT1Timing_V(ModeIdIndex, ModeNo, pVBInfo);
@@ -1895,17 +1496,18 @@ static void XGI_SetLVDSRegs(unsigned short ModeNo, unsigned short ModeIdIndex,
 {
         unsigned short tempbx, tempax, tempcx, tempdx, push1, push2, modeflag;
         unsigned long temp, temp1, temp2, temp3, push3;
-        struct XGI_LCDDesStruct *LCDPtr = NULL;
-        struct XGI330_LCDDataDesStruct2 *LCDPtr1 = NULL;
+        struct XGI_LCDDesStruct const *LCDPtr = NULL;
+        struct XGI330_LCDDataDesStruct2 const *LCDPtr1 = NULL;
 
-        modeflag = pVBInfo->EModeIDTable[ModeIdIndex].Ext_ModeFlag;
-        tempbx = 3;
+        modeflag = XGI330_EModeIDTable[ModeIdIndex].Ext_ModeFlag;
         if (pVBInfo->LCDInfo & EnableScalingLCD)
-                LCDPtr1 = XGI_GetLcdPtr(tempbx, ModeNo, ModeIdIndex,
-                                        RefreshRateTableIndex, pVBInfo);
+                LCDPtr1 = XGI_GetLcdPtr(XGI_EPLLCDDesDataPtr, ModeNo,
+                                        ModeIdIndex, RefreshRateTableIndex,
+                                        pVBInfo);
         else
-                LCDPtr = XGI_GetLcdPtr(tempbx, ModeNo, ModeIdIndex,
-                                       RefreshRateTableIndex, pVBInfo);
+                LCDPtr = XGI_GetLcdPtr(XGI_EPLLCDDesDataPtr, ModeNo,
+                                       ModeIdIndex, RefreshRateTableIndex,
+                                       pVBInfo);
 
         XGI_GetLCDSync(&tempax, &tempbx, pVBInfo);
         push1 = tempbx;
@@ -2179,7 +1781,7 @@ static unsigned char XGI_GetVCLKPtr(unsigned short RefreshRateTableIndex,
         unsigned char tempal;
 
         /* si+Ext_ResInfo */
-        modeflag = pVBInfo->EModeIDTable[ModeIdIndex].Ext_ModeFlag;
+        modeflag = XGI330_EModeIDTable[ModeIdIndex].Ext_ModeFlag;
 
         if ((pVBInfo->SetFlag & ProgrammingCRT2) &&
             (!(pVBInfo->LCDInfo & EnableScalingLCD))) { /* {LCDA/LCDB} */
@@ -2241,7 +1843,7 @@ static unsigned char XGI_GetVCLKPtr(unsigned short RefreshRateTableIndex,
         if ((pVBInfo->LCDInfo & EnableScalingLCD) && (modeflag & Charx8Dot))
                 tempal = tempal ^ tempal; /* ; set to VCLK25MHz always */
 
-        tempal = pVBInfo->RefIndex[RefreshRateTableIndex].Ext_CRTVCLK;
+        tempal = XGI330_RefIndex[RefreshRateTableIndex].Ext_CRTVCLK;
         return tempal;
 }
 
@@ -2425,7 +2027,7 @@ static void XGI_GetVBInfo(unsigned short ModeNo, unsigned short ModeIdIndex,
 {
         unsigned short tempax, push, tempbx, temp, modeflag;
 
-        modeflag = pVBInfo->EModeIDTable[ModeIdIndex].Ext_ModeFlag;
+        modeflag = XGI330_EModeIDTable[ModeIdIndex].Ext_ModeFlag;
         pVBInfo->SetFlag = 0;
         pVBInfo->ModeType = modeflag & ModeTypeMask;
         tempbx = 0;
@@ -2501,7 +2103,7 @@ static void XGI_GetVBInfo(unsigned short ModeNo, unsigned short ModeIdIndex,
                 } else {
                         temp = 0x017C;
                 }
-        } else { /* 3nd party chip */
+        } else { /* 3rd party chip */
                 temp = SetCRT2ToLCD;
         }
 
@@ -2611,8 +2213,8 @@ static void XGI_GetTVInfo(unsigned short ModeNo, unsigned short ModeIdIndex,
         resinfo = 0;
 
         if (pVBInfo->VBInfo & SetCRT2ToTV) {
-                modeflag = pVBInfo->EModeIDTable[ModeIdIndex].Ext_ModeFlag;
-                resinfo = pVBInfo->EModeIDTable[ModeIdIndex].Ext_RESINFO;
+                modeflag = XGI330_EModeIDTable[ModeIdIndex].Ext_ModeFlag;
+                resinfo = XGI330_EModeIDTable[ModeIdIndex].Ext_RESINFO;
 
                 if (pVBInfo->VBInfo & SetCRT2ToTV) {
                         temp = xgifb_reg_get(pVBInfo->P3d4, 0x35);
@@ -2697,9 +2299,9 @@ static unsigned char XGI_GetLCDInfo(unsigned short ModeNo,
         pVBInfo->LCDTypeInfo = 0;
         pVBInfo->LCDInfo = 0;
 
-        modeflag = pVBInfo->EModeIDTable[ModeIdIndex].Ext_ModeFlag;
+        modeflag = XGI330_EModeIDTable[ModeIdIndex].Ext_ModeFlag;
         /* si+Ext_ResInfo // */
-        resinfo = pVBInfo->EModeIDTable[ModeIdIndex].Ext_RESINFO;
+        resinfo = XGI330_EModeIDTable[ModeIdIndex].Ext_RESINFO;
         temp = xgifb_reg_get(pVBInfo->P3d4, 0x36); /* Get LCD Res.Info */
         tempbx = temp & 0x0F;
 
@@ -2778,9 +2380,9 @@ unsigned char XGI_SearchModeID(unsigned short ModeNo,
                 unsigned short *ModeIdIndex, struct vb_device_info *pVBInfo)
 {
         for (*ModeIdIndex = 0;; (*ModeIdIndex)++) {
-                if (pVBInfo->EModeIDTable[*ModeIdIndex].Ext_ModeID == ModeNo)
+                if (XGI330_EModeIDTable[*ModeIdIndex].Ext_ModeID == ModeNo)
                         break;
-                if (pVBInfo->EModeIDTable[*ModeIdIndex].Ext_ModeID == 0xFF)
+                if (XGI330_EModeIDTable[*ModeIdIndex].Ext_ModeID == 0xFF)
                         return 0;
         }
 
@@ -3020,11 +2622,11 @@ static void XGI_GetCRT2ResInfo(unsigned short ModeNo,
 {
         unsigned short xres, yres, modeflag, resindex;
 
-        resindex = pVBInfo->EModeIDTable[ModeIdIndex].Ext_RESINFO;
-        xres = pVBInfo->ModeResInfo[resindex].HTotal; /* xres->ax */
-        yres = pVBInfo->ModeResInfo[resindex].VTotal; /* yres->bx */
+        resindex = XGI330_EModeIDTable[ModeIdIndex].Ext_RESINFO;
+        xres = XGI330_ModeResInfo[resindex].HTotal; /* xres->ax */
+        yres = XGI330_ModeResInfo[resindex].VTotal; /* yres->bx */
         /* si+St_ModeFlag */
-        modeflag = pVBInfo->EModeIDTable[ModeIdIndex].Ext_ModeFlag;
+        modeflag = XGI330_EModeIDTable[ModeIdIndex].Ext_ModeFlag;
 
         if (modeflag & HalfDCLK)
                 xres *= 2;
@@ -3099,19 +2701,19 @@ static void XGI_GetRAMDAC2DATA(unsigned short ModeNo,
 
         pVBInfo->RVBHCMAX = 1;
         pVBInfo->RVBHCFACT = 1;
-        modeflag = pVBInfo->EModeIDTable[ModeIdIndex].Ext_ModeFlag;
-        CRT1Index = pVBInfo->RefIndex[RefreshRateTableIndex].Ext_CRT1CRTC;
+        modeflag = XGI330_EModeIDTable[ModeIdIndex].Ext_ModeFlag;
+        CRT1Index = XGI330_RefIndex[RefreshRateTableIndex].Ext_CRT1CRTC;
         CRT1Index &= IndexMask;
-        temp1 = (unsigned short) pVBInfo->XGINEWUB_CRT1Table[CRT1Index].CR[0];
-        temp2 = (unsigned short) pVBInfo->XGINEWUB_CRT1Table[CRT1Index].CR[5];
+        temp1 = (unsigned short) XGI_CRT1Table[CRT1Index].CR[0];
+        temp2 = (unsigned short) XGI_CRT1Table[CRT1Index].CR[5];
         tempax = (temp1 & 0xFF) | ((temp2 & 0x03) << 8);
-        tempbx = (unsigned short) pVBInfo->XGINEWUB_CRT1Table[CRT1Index].CR[8];
+        tempbx = (unsigned short) XGI_CRT1Table[CRT1Index].CR[8];
         tempcx = (unsigned short)
-                        pVBInfo->XGINEWUB_CRT1Table[CRT1Index].CR[14] << 8;
+                        XGI_CRT1Table[CRT1Index].CR[14] << 8;
         tempcx &= 0x0100;
         tempcx = tempcx << 2;
         tempbx |= tempcx;
-        temp1 = (unsigned short) pVBInfo->XGINEWUB_CRT1Table[CRT1Index].CR[9];
+        temp1 = (unsigned short) XGI_CRT1Table[CRT1Index].CR[9];
 
         if (temp1 & 0x01)
                 tempbx |= 0x0100;
@@ -3136,13 +2738,13 @@ static void XGI_GetCRT2Data(unsigned short ModeNo, unsigned short ModeIdIndex,
                 unsigned short RefreshRateTableIndex,
                 struct vb_device_info *pVBInfo)
 {
-        unsigned short tempax = 0, tempbx, modeflag, resinfo;
+        unsigned short tempax = 0, tempbx = 0, modeflag, resinfo;
 
-        struct SiS_LCDData *LCDPtr = NULL;
+        struct SiS_LCDData const *LCDPtr = NULL;
 
         /* si+Ext_ResInfo */
-        modeflag = pVBInfo->EModeIDTable[ModeIdIndex].Ext_ModeFlag;
-        resinfo = pVBInfo->EModeIDTable[ModeIdIndex].Ext_RESINFO;
+        modeflag = XGI330_EModeIDTable[ModeIdIndex].Ext_ModeFlag;
+        resinfo = XGI330_EModeIDTable[ModeIdIndex].Ext_RESINFO;
         pVBInfo->NewFlickerMode = 0;
         pVBInfo->RVBHRS = 50;
 
@@ -3152,10 +2754,8 @@ static void XGI_GetCRT2Data(unsigned short ModeNo, unsigned short ModeIdIndex,
                 return;
         }
 
-        tempbx = 4;
-
         if (pVBInfo->VBInfo & (SetCRT2ToLCD | XGI_SetCRT2ToLCDA)) {
-                LCDPtr = XGI_GetLcdPtr(tempbx, ModeNo, ModeIdIndex,
+                LCDPtr = XGI_GetLcdPtr(XGI_LCDDataTable, ModeNo, ModeIdIndex,
                                        RefreshRateTableIndex, pVBInfo);
 
                 pVBInfo->RVBHCMAX = LCDPtr->RVBHCMAX;
@@ -3345,7 +2945,7 @@ static unsigned short XGI_GetColorDepth(unsigned short ModeNo,
         short index;
         unsigned short modeflag;
 
-        modeflag = pVBInfo->EModeIDTable[ModeIdIndex].Ext_ModeFlag;
+        modeflag = XGI330_EModeIDTable[ModeIdIndex].Ext_ModeFlag;
         index = (modeflag & ModeTypeMask) - ModeEGA;
 
         if (index < 0)
@@ -3363,12 +2963,12 @@ static unsigned short XGI_GetOffset(unsigned short ModeNo,
         unsigned short temp, colordepth, modeinfo, index, infoflag,
                         ColorDepth[] = { 0x01, 0x02, 0x04 };
 
-        modeinfo = pVBInfo->EModeIDTable[ModeIdIndex].Ext_ModeInfo;
-        infoflag = pVBInfo->RefIndex[RefreshRateTableIndex].Ext_InfoFlag;
+        modeinfo = XGI330_EModeIDTable[ModeIdIndex].Ext_ModeInfo;
+        infoflag = XGI330_RefIndex[RefreshRateTableIndex].Ext_InfoFlag;
 
         index = (modeinfo >> 8) & 0xFF;
 
-        temp = pVBInfo->ScreenOffset[index];
+        temp = XGI330_ScreenOffset[index];
 
         if (infoflag & InterlaceMode)
                 temp = temp << 1;
@@ -3424,9 +3024,9 @@ static void XGI_PreSetGroup1(unsigned short ModeNo, unsigned short ModeIdIndex,
 {
         unsigned short tempcx = 0, CRT1Index = 0, resinfo = 0;
 
-        CRT1Index = pVBInfo->RefIndex[RefreshRateTableIndex].Ext_CRT1CRTC;
+        CRT1Index = XGI330_RefIndex[RefreshRateTableIndex].Ext_CRT1CRTC;
         CRT1Index &= IndexMask;
-        resinfo = pVBInfo->EModeIDTable[ModeIdIndex].Ext_RESINFO;
+        resinfo = XGI330_EModeIDTable[ModeIdIndex].Ext_RESINFO;
 
         XGI_SetCRT2Offset(ModeNo, ModeIdIndex, RefreshRateTableIndex,
                         HwDeviceExtension, pVBInfo);
@@ -3447,10 +3047,10 @@ static void XGI_SetGroup1(unsigned short ModeNo, unsigned short ModeIdIndex,
         unsigned short temp = 0, tempax = 0, tempbx = 0, tempcx = 0,
                         pushbx = 0, CRT1Index = 0, modeflag, resinfo = 0;
 
-        CRT1Index = pVBInfo->RefIndex[RefreshRateTableIndex].Ext_CRT1CRTC;
+        CRT1Index = XGI330_RefIndex[RefreshRateTableIndex].Ext_CRT1CRTC;
         CRT1Index &= IndexMask;
-        resinfo = pVBInfo->EModeIDTable[ModeIdIndex].Ext_RESINFO;
-        modeflag = pVBInfo->EModeIDTable[ModeIdIndex].Ext_ModeFlag;
+        resinfo = XGI330_EModeIDTable[ModeIdIndex].Ext_RESINFO;
+        modeflag = XGI330_EModeIDTable[ModeIdIndex].Ext_ModeFlag;
 
         /* bainy change table name */
         if (modeflag & HalfDCLK) {
@@ -3469,14 +3069,13 @@ static void XGI_SetGroup1(unsigned short ModeNo, unsigned short ModeIdIndex,
                 tempcx += tempbx;
 
                 if (pVBInfo->VBInfo & SetCRT2ToRAMDAC) {
-                        tempbx = pVBInfo->XGINEWUB_CRT1Table[CRT1Index].CR[4];
-                        tempbx |= ((pVBInfo->
-                                        XGINEWUB_CRT1Table[CRT1Index].CR[14] &
+                        tempbx = XGI_CRT1Table[CRT1Index].CR[4];
+                        tempbx |= ((XGI_CRT1Table[CRT1Index].CR[14] &
                                                 0xC0) << 2);
                         tempbx = (tempbx - 3) << 3; /* (VGAHRS-3)*8 */
-                        tempcx = pVBInfo->XGINEWUB_CRT1Table[CRT1Index].CR[5];
+                        tempcx = XGI_CRT1Table[CRT1Index].CR[5];
                         tempcx &= 0x1F;
-                        temp = pVBInfo->XGINEWUB_CRT1Table[CRT1Index].CR[15];
+                        temp = XGI_CRT1Table[CRT1Index].CR[15];
                         temp = (temp & 0x04) << (5 - 2); /* VGAHRE D[5] */
                         tempcx = ((tempcx | temp) - 3) << 3; /* (VGAHRE-3)*8 */
                 }
@@ -3505,14 +3104,13 @@ static void XGI_SetGroup1(unsigned short ModeNo, unsigned short ModeIdIndex,
                 tempcx += tempbx;
 
                 if (pVBInfo->VBInfo & SetCRT2ToRAMDAC) {
-                        tempbx = pVBInfo->XGINEWUB_CRT1Table[CRT1Index].CR[3];
-                        tempbx |= ((pVBInfo->
-                                        XGINEWUB_CRT1Table[CRT1Index].CR[5] &
+                        tempbx = XGI_CRT1Table[CRT1Index].CR[3];
+                        tempbx |= ((XGI_CRT1Table[CRT1Index].CR[5] &
                                                 0xC0) << 2);
                         tempbx = (tempbx - 3) << 3; /* (VGAHRS-3)*8 */
-                        tempcx = pVBInfo->XGINEWUB_CRT1Table[CRT1Index].CR[4];
+                        tempcx = XGI_CRT1Table[CRT1Index].CR[4];
                         tempcx &= 0x1F;
-                        temp = pVBInfo->XGINEWUB_CRT1Table[CRT1Index].CR[6];
+                        temp = XGI_CRT1Table[CRT1Index].CR[6];
                         temp = (temp & 0x04) << (5 - 2); /* VGAHRE D[5] */
                         tempcx = ((tempcx | temp) - 3) << 3; /* (VGAHRE-3)*8 */
                         tempbx += 16;
@@ -3554,8 +3152,8 @@ static void XGI_SetGroup1(unsigned short ModeNo, unsigned short ModeIdIndex,
         tempcx = ((pVBInfo->VGAVT - pVBInfo->VGAVDE) >> 4) + tempbx + 1;
 
         if (pVBInfo->VBInfo & SetCRT2ToRAMDAC) {
-                tempbx = pVBInfo->XGINEWUB_CRT1Table[CRT1Index].CR[10];
-                temp = pVBInfo->XGINEWUB_CRT1Table[CRT1Index].CR[9];
+                tempbx = XGI_CRT1Table[CRT1Index].CR[10];
+                temp = XGI_CRT1Table[CRT1Index].CR[9];
 
                 if (temp & 0x04)
                         tempbx |= 0x0100;
@@ -3563,12 +3161,12 @@ static void XGI_SetGroup1(unsigned short ModeNo, unsigned short ModeIdIndex,
                 if (temp & 0x080)
                         tempbx |= 0x0200;
 
-                temp = pVBInfo->XGINEWUB_CRT1Table[CRT1Index].CR[14];
+                temp = XGI_CRT1Table[CRT1Index].CR[14];
 
                 if (temp & 0x08)
                         tempbx |= 0x0400;
 
-                temp = pVBInfo->XGINEWUB_CRT1Table[CRT1Index].CR[11];
+                temp = XGI_CRT1Table[CRT1Index].CR[11];
                 tempcx = (tempcx & 0xFF00) | (temp & 0x00FF);
         }
 
@@ -3609,9 +3207,9 @@ static void XGI_SetLockRegs(unsigned short ModeNo, unsigned short ModeIdIndex,
                         modeflag, CRT1Index;
 
         /* si+Ext_ResInfo */
-        modeflag = pVBInfo->EModeIDTable[ModeIdIndex].Ext_ModeFlag;
-        resinfo = pVBInfo->EModeIDTable[ModeIdIndex].Ext_RESINFO;
-        CRT1Index = pVBInfo->RefIndex[RefreshRateTableIndex].Ext_CRT1CRTC;
+        modeflag = XGI330_EModeIDTable[ModeIdIndex].Ext_ModeFlag;
+        resinfo = XGI330_EModeIDTable[ModeIdIndex].Ext_RESINFO;
+        CRT1Index = XGI330_RefIndex[RefreshRateTableIndex].Ext_CRT1CRTC;
         CRT1Index &= IndexMask;
 
         if (!(pVBInfo->VBInfo & SetInSlaveMode))
@@ -3909,9 +3507,9 @@ static void XGI_SetGroup2(unsigned short ModeNo, unsigned short ModeIdIndex,
         unsigned long longtemp, tempeax, tempebx, temp2, tempecx;
 
         /* si+Ext_ResInfo */
-        modeflag = pVBInfo->EModeIDTable[ModeIdIndex].Ext_ModeFlag;
-        resinfo = pVBInfo->EModeIDTable[ModeIdIndex].Ext_RESINFO;
-        crt2crtc = pVBInfo->RefIndex[RefreshRateTableIndex].Ext_CRT2CRTC;
+        modeflag = XGI330_EModeIDTable[ModeIdIndex].Ext_ModeFlag;
+        resinfo = XGI330_EModeIDTable[ModeIdIndex].Ext_RESINFO;
+        crt2crtc = XGI330_RefIndex[RefreshRateTableIndex].Ext_CRT2CRTC;
 
         tempax = 0;
 
@@ -4345,12 +3943,12 @@ static void XGI_SetLCDRegs(unsigned short ModeNo, unsigned short ModeIdIndex,
         unsigned short push1, push2, pushbx, tempax, tempbx, tempcx, temp,
                         tempah, tempbh, tempch, resinfo, modeflag, CRT1Index;
 
-        struct XGI_LCDDesStruct *LCDBDesPtr = NULL;
+        struct XGI_LCDDesStruct const *LCDBDesPtr = NULL;
 
         /* si+Ext_ResInfo */
-        modeflag = pVBInfo->EModeIDTable[ModeIdIndex].Ext_ModeFlag;
-        resinfo = pVBInfo->EModeIDTable[ModeIdIndex].Ext_RESINFO;
-        CRT1Index = pVBInfo->RefIndex[RefreshRateTableIndex].Ext_CRT1CRTC;
+        modeflag = XGI330_EModeIDTable[ModeIdIndex].Ext_ModeFlag;
+        resinfo = XGI330_EModeIDTable[ModeIdIndex].Ext_RESINFO;
+        CRT1Index = XGI330_RefIndex[RefreshRateTableIndex].Ext_CRT1CRTC;
         CRT1Index &= IndexMask;
 
         if (!(pVBInfo->VBInfo & SetCRT2ToLCD))
@@ -4390,10 +3988,15 @@ static void XGI_SetLCDRegs(unsigned short ModeNo, unsigned short ModeIdIndex,
         xgifb_reg_and_or(pVBInfo->Part2Port, 0x17, 0xFB, 0x00);
         xgifb_reg_and_or(pVBInfo->Part2Port, 0x18, 0xDF, 0x00);
 
-        /* Customized LCDB Des no add */
-        tempbx = 5;
-        LCDBDesPtr = XGI_GetLcdPtr(tempbx, ModeNo, ModeIdIndex,
-                                   RefreshRateTableIndex, pVBInfo);
+        /* Customized LCDB Does not add */
+        if ((pVBInfo->VBType & VB_SIS301LV) || (pVBInfo->VBType & VB_SIS302LV))
+                LCDBDesPtr = XGI_GetLcdPtr(xgifb_lcddldes, ModeNo, ModeIdIndex,
+                                           RefreshRateTableIndex, pVBInfo);
+        else
+                LCDBDesPtr = XGI_GetLcdPtr(XGI_LCDDesDataTable, ModeNo,
+                                           ModeIdIndex, RefreshRateTableIndex,
+                                           pVBInfo);
+
         tempah = pVBInfo->LCDResInfo;
         tempah &= PanelResInfo;
 
@@ -4545,12 +4148,11 @@ static void XGI_SetLCDRegs(unsigned short ModeNo, unsigned short ModeIdIndex,
 /* Output : di -> Tap4 Reg. Setting Pointer */
 /* Description : */
 /* --------------------------------------------------------------------- */
-static struct XGI301C_Tap4TimingStruct *XGI_GetTap4Ptr(unsigned short tempcx,
-                struct vb_device_info *pVBInfo)
+static struct XGI301C_Tap4TimingStruct const
+*XGI_GetTap4Ptr(unsigned short tempcx, struct vb_device_info *pVBInfo)
 {
         unsigned short tempax, tempbx, i;
-
-        struct XGI301C_Tap4TimingStruct *Tap4TimingPtr;
+        struct XGI301C_Tap4TimingStruct const *Tap4TimingPtr;
 
         if (tempcx == 0) {
                 tempax = pVBInfo->VGAHDE;
@@ -4591,8 +4193,7 @@ static struct XGI301C_Tap4TimingStruct *XGI_GetTap4Ptr(unsigned short tempcx,
 static void XGI_SetTap4Regs(struct vb_device_info *pVBInfo)
 {
         unsigned short i, j;
-
-        struct XGI301C_Tap4TimingStruct *Tap4TimingPtr;
+        struct XGI301C_Tap4TimingStruct const *Tap4TimingPtr;
 
         if (!(pVBInfo->VBType & VB_XGI301C))
                 return;
@@ -4628,7 +4229,7 @@ static void XGI_SetGroup3(unsigned short ModeNo, unsigned short ModeIdIndex,
         unsigned short modeflag;
 
         /* si+Ext_ResInfo */
-        modeflag = pVBInfo->EModeIDTable[ModeIdIndex].Ext_ModeFlag;
+        modeflag = XGI330_EModeIDTable[ModeIdIndex].Ext_ModeFlag;
 
         xgifb_reg_set(pVBInfo->Part3Port, 0x00, 0x00);
         if (pVBInfo->TVInfo & TVSetPAL) {
@@ -4687,7 +4288,7 @@ static void XGI_SetGroup4(unsigned short ModeNo, unsigned short ModeIdIndex,
         unsigned long tempebx, tempeax, templong;
 
         /* si+Ext_ResInfo */
-        modeflag = pVBInfo->EModeIDTable[ModeIdIndex].Ext_ModeFlag;
+        modeflag = XGI330_EModeIDTable[ModeIdIndex].Ext_ModeFlag;
         temp = pVBInfo->RVBHCFACT;
         xgifb_reg_set(pVBInfo->Part4Port, 0x13, temp);
 
@@ -4890,11 +4491,11 @@ static unsigned char XGI_XG21CheckLVDSMode(struct xgifb_video_info *xgifb_info,
 {
         unsigned short xres, yres, colordepth, modeflag, resindex;
 
-        resindex = pVBInfo->EModeIDTable[ModeIdIndex].Ext_RESINFO;
-        xres = pVBInfo->ModeResInfo[resindex].HTotal; /* xres->ax */
-        yres = pVBInfo->ModeResInfo[resindex].VTotal; /* yres->bx */
+        resindex = XGI330_EModeIDTable[ModeIdIndex].Ext_RESINFO;
+        xres = XGI330_ModeResInfo[resindex].HTotal; /* xres->ax */
+        yres = XGI330_ModeResInfo[resindex].VTotal; /* yres->bx */
         /* si+St_ModeFlag */
-        modeflag = pVBInfo->EModeIDTable[ModeIdIndex].Ext_ModeFlag;
+        modeflag = XGI330_EModeIDTable[ModeIdIndex].Ext_ModeFlag;
 
         if (!(modeflag & Charx8Dot)) {
                 xres /= 9;
@@ -4952,11 +4553,11 @@ static void xgifb_set_lvds(struct xgifb_video_info *xgifb_info,
         else
                 XGI_SetXG21FPBits(pVBInfo);
 
-        resindex = pVBInfo->EModeIDTable[ModeIdIndex].Ext_RESINFO;
-        xres = pVBInfo->ModeResInfo[resindex].HTotal; /* xres->ax */
-        yres = pVBInfo->ModeResInfo[resindex].VTotal; /* yres->bx */
+        resindex = XGI330_EModeIDTable[ModeIdIndex].Ext_RESINFO;
+        xres = XGI330_ModeResInfo[resindex].HTotal; /* xres->ax */
+        yres = XGI330_ModeResInfo[resindex].VTotal; /* yres->bx */
         /* si+St_ModeFlag */
-        modeflag = pVBInfo->EModeIDTable[ModeIdIndex].Ext_ModeFlag;
+        modeflag = XGI330_EModeIDTable[ModeIdIndex].Ext_ModeFlag;
 
         if (!(modeflag & Charx8Dot))
                 xres = xres * 8 / 9;
@@ -5619,8 +5220,8 @@ static void XGI_SetYFilter(unsigned short ModeNo, unsigned short ModeIdIndex,
                 struct vb_device_info *pVBInfo)
 {
         unsigned short tempbx, index;
-
-        unsigned char tempcl, tempch, tempal, *filterPtr;
+        unsigned char const *filterPtr;
+        unsigned char tempcl, tempch, tempal;
 
         XGI_GetTVPtrIndex2(&tempbx, &tempcl, &tempch, pVBInfo); /* bx, cl, ch */
 
@@ -5653,7 +5254,7 @@ static void XGI_SetYFilter(unsigned short ModeNo, unsigned short ModeIdIndex,
                 return;
         }
 
-        tempal = pVBInfo->EModeIDTable[ModeIdIndex].VB_ExtTVYFilterIndex;
+        tempal = XGI330_EModeIDTable[ModeIdIndex].VB_ExtTVYFilterIndex;
         if (tempcl == 0)
                 index = tempal * 4;
         else
@@ -5915,7 +5516,7 @@ unsigned short XGI_GetRatePtrCRT2(struct xgi_hw_device_info *pXGIHWDE,
 
         unsigned short RefreshRateTableIndex, i, modeflag, index, temp;
 
-        modeflag = pVBInfo->EModeIDTable[ModeIdIndex].Ext_ModeFlag;
+        modeflag = XGI330_EModeIDTable[ModeIdIndex].Ext_ModeFlag;
 
         index = xgifb_reg_get(pVBInfo->P3d4, 0x33);
         index = index >> pVBInfo->SelectCRT2Rate;
@@ -5948,31 +5549,30 @@ unsigned short XGI_GetRatePtrCRT2(struct xgi_hw_device_info *pXGIHWDE,
                 }
         }
 
-        RefreshRateTableIndex = pVBInfo->EModeIDTable[ModeIdIndex].REFindex;
-        ModeNo = pVBInfo->RefIndex[RefreshRateTableIndex].ModeID;
+        RefreshRateTableIndex = XGI330_EModeIDTable[ModeIdIndex].REFindex;
+        ModeNo = XGI330_RefIndex[RefreshRateTableIndex].ModeID;
         if (pXGIHWDE->jChipType >= XG20) { /* for XG20, XG21, XG27 */
-                if ((pVBInfo->RefIndex[RefreshRateTableIndex].XRes == 800) &&
-                    (pVBInfo->RefIndex[RefreshRateTableIndex].YRes == 600)) {
+                if ((XGI330_RefIndex[RefreshRateTableIndex].XRes == 800) &&
+                    (XGI330_RefIndex[RefreshRateTableIndex].YRes == 600)) {
                         index++;
                 }
                 /* do the similar adjustment like XGISearchCRT1Rate() */
-                if ((pVBInfo->RefIndex[RefreshRateTableIndex].XRes == 1024) &&
-                    (pVBInfo->RefIndex[RefreshRateTableIndex].YRes == 768)) {
+                if ((XGI330_RefIndex[RefreshRateTableIndex].XRes == 1024) &&
+                    (XGI330_RefIndex[RefreshRateTableIndex].YRes == 768)) {
                         index++;
                 }
-                if ((pVBInfo->RefIndex[RefreshRateTableIndex].XRes == 1280) &&
-                    (pVBInfo->RefIndex[RefreshRateTableIndex].YRes == 1024)) {
+                if ((XGI330_RefIndex[RefreshRateTableIndex].XRes == 1280) &&
+                    (XGI330_RefIndex[RefreshRateTableIndex].YRes == 1024)) {
                         index++;
                 }
         }
 
         i = 0;
         do {
-                if (pVBInfo->RefIndex[RefreshRateTableIndex + i].
+                if (XGI330_RefIndex[RefreshRateTableIndex + i].
                         ModeID != ModeNo)
                         break;
-                temp = pVBInfo->RefIndex[RefreshRateTableIndex + i].
-                        Ext_InfoFlag;
+                temp = XGI330_RefIndex[RefreshRateTableIndex + i].Ext_InfoFlag;
                 temp &= ModeTypeMask;
                 if (temp < pVBInfo->ModeType)
                         break;
@@ -5982,7 +5582,7 @@ unsigned short XGI_GetRatePtrCRT2(struct xgi_hw_device_info *pXGIHWDE,
         } while (index != 0xFFFF);
         if (!(pVBInfo->VBInfo & SetCRT2ToRAMDAC)) {
                 if (pVBInfo->VBInfo & SetInSlaveMode) {
-                        temp = pVBInfo->RefIndex[RefreshRateTableIndex + i - 1].
+                        temp = XGI330_RefIndex[RefreshRateTableIndex + i - 1].
                                 Ext_InfoFlag;
                         if (temp & InterlaceMode)
                                 i++;
@@ -6272,7 +5872,7 @@ static void XGI_SetCRT1Group(struct xgifb_video_info *xgifb_info,
         unsigned short RefreshRateTableIndex, temp;
 
         XGI_SetSeqRegs(ModeNo, ModeIdIndex, pVBInfo);
-        outb(pVBInfo->StandTable->MISC, pVBInfo->P3c2);
+        outb(XGI330_StandTable.MISC, pVBInfo->P3c2);
         XGI_SetCRTCRegs(HwDeviceExtension, pVBInfo);
         XGI_SetATTRegs(ModeNo, ModeIdIndex, pVBInfo);
         XGI_SetGRCRegs(pVBInfo);
@@ -6458,7 +6058,7 @@ unsigned char XGISetModeNew(struct xgifb_video_info *xgifb_info,
                                                    pVBInfo))
                                 return 0;
 
-                pVBInfo->ModeType = pVBInfo->EModeIDTable[ModeIdIndex].
+                pVBInfo->ModeType = XGI330_EModeIDTable[ModeIdIndex].
                                                 Ext_ModeFlag & ModeTypeMask;
 
                 pVBInfo->SetFlag = 0;
diff --git a/drivers/staging/xgifb/vb_struct.h b/drivers/staging/xgifb/vb_struct.h
index 70158c2c68af..acf6e7fbbaed 100644
--- a/drivers/staging/xgifb/vb_struct.h
+++ b/drivers/staging/xgifb/vb_struct.h
@@ -56,7 +56,7 @@ struct XGI330_LCDDataTablStruct {
         unsigned char  PANELID;
         unsigned short MASK;
         unsigned short CAP;
-        unsigned short DATAPTR;
+        void const *DATAPTR;
 };
 
 struct XGI330_TVDataTablStruct {
@@ -158,40 +158,18 @@ struct vb_device_info {
         void __iomem *FBAddr;
         unsigned long BaseAddr;
 
-        unsigned char (*CR6B)[4];
-        unsigned char (*CR6E)[4];
-        unsigned char (*CR6F)[32];
-        unsigned char (*CR89)[2];
+        unsigned char const (*SR15)[8];
+        unsigned char const (*CR40)[8];
 
-        unsigned char (*SR15)[8];
-        unsigned char (*CR40)[8];
+        struct SiS_MCLKData const *MCLKData;
 
-        unsigned char  *AGPReg;
-        unsigned char  *SR16;
-        unsigned char  SR21;
-        unsigned char  SR22;
-        unsigned char  SR25;
-        struct SiS_MCLKData  *MCLKData;
-        struct XGI_ECLKDataStruct  *ECLKData;
-
-        unsigned char   *ScreenOffset;
         unsigned char   *pXGINew_DRAMTypeDefinition;
         unsigned char   XGINew_CR97;
 
-        struct XGI330_LCDCapStruct  *LCDCapList;
-
-        struct XGI_TimingHStruct  *TimingH;
-        struct XGI_TimingVStruct  *TimingV;
+        struct XGI330_LCDCapStruct const *LCDCapList;
 
-        struct SiS_StandTable_S  *StandTable;
-        struct XGI_ExtStruct         *EModeIDTable;
-        struct XGI_Ext2Struct        *RefIndex;
-        struct XGI_CRT1TableStruct    *XGINEWUB_CRT1Table;
-        struct SiS_VCLKData    *VCLKData;
-        struct SiS_VBVCLKData  *VBVCLKData;
-        struct SiS_StResInfo_S   *StResInfo;
-        struct SiS_ModeResInfo_S *ModeResInfo;
-        struct XGI_XG21CRT1Struct         *UpdateCRT1;
+        struct XGI_TimingHStruct TimingH;
+        struct XGI_TimingVStruct TimingV;
 
         int ram_type;
         int ram_channel;
diff --git a/drivers/staging/xgifb/vb_table.h b/drivers/staging/xgifb/vb_table.h
index 180aae042cea..39f528b14f01 100644
--- a/drivers/staging/xgifb/vb_table.h
+++ b/drivers/staging/xgifb/vb_table.h
@@ -1,6 +1,6 @@
 #ifndef _VB_TABLE_
 #define _VB_TABLE_
-static struct SiS_MCLKData XGI340New_MCLKData[] = {
+static const struct SiS_MCLKData XGI340New_MCLKData[] = {
         {0x16, 0x01, 0x01, 166},
         {0x19, 0x02, 0x01, 124},
         {0x7C, 0x08, 0x01, 200},
@@ -11,7 +11,7 @@ static struct SiS_MCLKData XGI340New_MCLKData[] = {
         {0x5c, 0x23, 0x01, 166}
 };
 
-static struct SiS_MCLKData XGI27New_MCLKData[] = {
+static const struct SiS_MCLKData XGI27New_MCLKData[] = {
         {0x5c, 0x23, 0x01, 166},
         {0x19, 0x02, 0x01, 124},
         {0x7C, 0x08, 0x80, 200},
@@ -22,7 +22,7 @@ static struct SiS_MCLKData XGI27New_MCLKData[] = {
         {0x5c, 0x23, 0x01, 166}
 };
 
-static struct XGI_ECLKDataStruct XGI340_ECLKData[] = {
+const struct XGI_ECLKDataStruct XGI340_ECLKData[] = {
         {0x5c, 0x23, 0x01, 166},
         {0x55, 0x84, 0x01, 123},
         {0x7C, 0x08, 0x01, 200},
@@ -33,21 +33,21 @@ static struct XGI_ECLKDataStruct XGI340_ECLKData[] = {
         {0x5c, 0x23, 0x01, 166}
 };
 
-static unsigned char XG27_SR13[4][8] = {
+static const unsigned char XG27_SR13[4][8] = {
         {0x35, 0x45, 0xb1, 0x00, 0x00, 0x00, 0x00, 0x00}, /* SR13 */
         {0x41, 0x51, 0x5c, 0x00, 0x00, 0x00, 0x00, 0x00}, /* SR14 */
         {0x32, 0x32, 0x42, 0x00, 0x00, 0x00, 0x00, 0x00}, /* SR18 */
         {0x03, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00}  /* SR1B */
 };
 
-static unsigned char XGI340_SR13[4][8] = {
+static const unsigned char XGI340_SR13[4][8] = {
         {0x35, 0x45, 0xb1, 0x00, 0x00, 0x00, 0x00, 0x00}, /* SR13 */
         {0x41, 0x51, 0x5c, 0x00, 0x00, 0x00, 0x00, 0x00}, /* SR14 */
         {0x31, 0x42, 0x42, 0x00, 0x00, 0x00, 0x00, 0x00}, /* SR18 */
         {0x03, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00}  /* SR1B */
 };
 
-static unsigned char XGI340_cr41[24][8] = {
+static const unsigned char XGI340_cr41[24][8] = {
         {0x20, 0x50, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00}, /* 0 CR41 */
         {0xc4, 0x40, 0x84, 0x00, 0x00, 0x00, 0x00, 0x00}, /* 1 CR8A */
         {0xc4, 0x40, 0x84, 0x00, 0x00, 0x00, 0x00, 0x00}, /* 2 CR8B */
@@ -74,7 +74,7 @@ static unsigned char XGI340_cr41[24][8] = {
         {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}  /* 23 CRC5 */
 };
 
-static unsigned char XGI27_cr41[24][8] = {
+static const unsigned char XGI27_cr41[24][8] = {
         {0x20, 0x40, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00}, /* 0 CR41 */
         {0xC4, 0x40, 0x84, 0x00, 0x00, 0x00, 0x00, 0x00}, /* 1 CR8A */
         {0xC4, 0x40, 0x84, 0x00, 0x00, 0x00, 0x00, 0x00}, /* 2 CR8B */
@@ -103,7 +103,7 @@ static unsigned char XGI27_cr41[24][8] = {
         {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}  /* 23 CRC5 */
 };
 
-static unsigned char XGI340_CR6B[8][4] = {
+const unsigned char XGI340_CR6B[8][4] = {
         {0xaa, 0xaa, 0xaa, 0xaa},
         {0xaa, 0xaa, 0xaa, 0xaa},
         {0xaa, 0xaa, 0xaa, 0xaa},
@@ -114,21 +114,13 @@ static unsigned char XGI340_CR6B[8][4] = {
         {0x00, 0x00, 0x00, 0x00}
 };
 
-static unsigned char XGI340_CR6E[8][4];
-
-static unsigned char XGI340_CR6F[8][32];
-
-static unsigned char XGI340_CR89[8][2];
-
 /* CR47,CR48,CR49,CR4A,CR4B,CR4C,CR70,CR71,CR74,CR75,CR76,CR77 */
-static unsigned char XGI340_AGPReg[12] = {
+const unsigned char XGI340_AGPReg[12] = {
         0x28, 0x23, 0x00, 0x20, 0x00, 0x20,
         0x00, 0x05, 0xd0, 0x10, 0x10, 0x00
 };
 
-static unsigned char XGI340_SR16[4] = {0x03, 0x83, 0x03, 0x83};
-
-static struct XGI_ExtStruct XGI330_EModeIDTable[] = {
+const struct XGI_ExtStruct XGI330_EModeIDTable[] = {
         {0x2e, 0x0a1b, 0x0306, 0x06, 0x05, 0x06},
         {0x2f, 0x0a1b, 0x0305, 0x05, 0x05, 0x05},
         {0x30, 0x2a1b, 0x0407, 0x07, 0x07, 0x0e},
@@ -200,7 +192,7 @@ static struct XGI_ExtStruct XGI330_EModeIDTable[] = {
         {0xff, 0x0000, 0x0000, 0x00, 0x00, 0x00}
 };
 
-static struct SiS_StandTable_S XGI330_StandTable = {
+static const struct SiS_StandTable_S XGI330_StandTable = {
 /* ExtVGATable */
         0x00, 0x00, 0x00, 0x0000,
         {0x01, 0x0f, 0x00, 0x0e},
@@ -216,11 +208,7 @@ static struct SiS_StandTable_S XGI330_StandTable = {
          0xff}
 };
 
-static struct XGI_TimingHStruct XGI_TimingH[1];
-
-static struct XGI_TimingVStruct XGI_TimingV[1];
-
-static struct XGI_XG21CRT1Struct XGI_UpdateCRT1Table[] = {
+static const struct XGI_XG21CRT1Struct XGI_UpdateCRT1Table[] = {
         {0x01, 0x27, 0x91, 0x8f, 0xc0}, /* 00 */
         {0x03, 0x4f, 0x83, 0x8f, 0xc0}, /* 01 */
         {0x05, 0x27, 0x91, 0x8f, 0xc0}, /* 02 */
@@ -240,7 +228,7 @@ static struct XGI_XG21CRT1Struct XGI_UpdateCRT1Table[] = {
         {0x59, 0x27, 0x91, 0x8f, 0xc0}  /* 16 */
 };
 
-static struct XGI_CRT1TableStruct XGI_CRT1Table[] = {
+const struct XGI_CRT1TableStruct XGI_CRT1Table[] = {
         { {0x2d, 0x28, 0x90, 0x2c, 0x90, 0x00, 0x04, 0x00,
           0xbf, 0x1f, 0x9c, 0x8e, 0x96, 0xb9, 0x30} }, /* 0x0 */
         { {0x2d, 0x28, 0x90, 0x2c, 0x90, 0x00, 0x04, 0x00,
@@ -404,7 +392,7 @@ static struct XGI_CRT1TableStruct XGI_CRT1Table[] = {
 };
 
 /*add for new UNIVGABIOS*/
-static struct SiS_LCDData  XGI_StLCD1024x768Data[] = {
+static const struct SiS_LCDData XGI_StLCD1024x768Data[] = {
         {62,  25, 800,  546, 1344, 806},
         {32,  15, 930,  546, 1344, 806},
         {62,  25, 800,  546, 1344, 806}, /*chiawenfordot9->dot8*/
@@ -414,7 +402,7 @@ static struct SiS_LCDData  XGI_StLCD1024x768Data[] = {
         {1,   1,  1344, 806, 1344, 806}
 };
 
-static struct SiS_LCDData  XGI_ExtLCD1024x768Data[] = {
+static const struct SiS_LCDData XGI_ExtLCD1024x768Data[] = {
         {42, 25, 1536, 419, 1344, 806},
         {48, 25, 1536, 369, 1344, 806},
         {42, 25, 1536, 419, 1344, 806},
@@ -430,7 +418,7 @@ static struct SiS_LCDData  XGI_ExtLCD1024x768Data[] = {
         {1,  1,  1344, 806, 1344, 806}
 };
 
-static struct SiS_LCDData  XGI_CetLCD1024x768Data[] = {
+static const struct SiS_LCDData XGI_CetLCD1024x768Data[] = {
         {1, 1, 1344, 806, 1344, 806}, /* ; 00 (320x200,320x400,
                                                640x200,640x400) */
         {1, 1, 1344, 806, 1344, 806}, /* 01 (320x350,640x350) */
@@ -441,7 +429,7 @@ static struct SiS_LCDData  XGI_CetLCD1024x768Data[] = {
         {1, 1, 1344, 806, 1344, 806}  /* 06 (1024x768x60Hz) */
 };
 
-static struct SiS_LCDData  XGI_StLCD1280x1024Data[] = {
+static const struct SiS_LCDData XGI_StLCD1280x1024Data[] = {
         {22,  5,  800,  510,  1650, 1088},
         {22,  5,  800,  510,  1650, 1088},
         {176, 45, 900,  510,  1650, 1088},
@@ -452,7 +440,7 @@ static struct SiS_LCDData  XGI_StLCD1280x1024Data[] = {
         {1,   1,  1688, 1066, 1688, 1066}
 };
 
-static struct SiS_LCDData  XGI_ExtLCD1280x1024Data[] = {
+static const struct SiS_LCDData XGI_ExtLCD1280x1024Data[] = {
         {211, 60,  1024, 501,  1688, 1066},
         {211, 60,  1024, 508,  1688, 1066},
         {211, 60,  1024, 501,  1688, 1066},
@@ -463,7 +451,7 @@ static struct SiS_LCDData  XGI_ExtLCD1280x1024Data[] = {
         {1,   1,   1688, 1066, 1688, 1066}
 };
 
-static struct SiS_LCDData  XGI_CetLCD1280x1024Data[] = {
+static const struct SiS_LCDData XGI_CetLCD1280x1024Data[] = {
         {1, 1, 1688, 1066, 1688, 1066}, /* 00 (320x200,320x400,
                                                640x200,640x400) */
         {1, 1, 1688, 1066, 1688, 1066}, /* 01 (320x350,640x350) */
@@ -476,7 +464,7 @@ static struct SiS_LCDData  XGI_CetLCD1280x1024Data[] = {
         {1, 1, 1688, 1066, 1688, 1066}  /* 08 (1400x1050x60Hz) */
 };
 
-static struct SiS_LCDData xgifb_lcd_1400x1050[] = {
+static const struct SiS_LCDData xgifb_lcd_1400x1050[] = {
         {211, 100, 2100, 408,  1688, 1066}, /* 00 (320x200,320x400,
                                                    640x200,640x400) */
         {211, 64,  1536, 358,  1688, 1066}, /* 01 (320x350,640x350) */
@@ -490,7 +478,7 @@ static struct SiS_LCDData xgifb_lcd_1400x1050[] = {
         {1,   1,   1688, 1066, 1688, 1066}  /* 08 (1400x1050x60Hz) */
 };
 
-static struct SiS_LCDData  XGI_ExtLCD1600x1200Data[] = {
+static const struct SiS_LCDData XGI_ExtLCD1600x1200Data[] = {
         {4,  1,  1620, 420,  2160, 1250}, /* 00 (320x200,320x400,
                                                  640x200,640x400)*/
         {27, 7,  1920, 375,  2160, 1250}, /* 01 (320x350,640x350) */
@@ -504,7 +492,7 @@ static struct SiS_LCDData  XGI_ExtLCD1600x1200Data[] = {
         {1,  1,  2160, 1250, 2160, 1250}  /* 09 (1600x1200x60Hz) ;302lv */
 };
 
-static struct SiS_LCDData  XGI_StLCD1600x1200Data[] = {
+static const struct SiS_LCDData XGI_StLCD1600x1200Data[] = {
         {27,  4,  800,  500,  2160, 1250}, /* 00 (320x200,320x400,
                                                   640x200,640x400) */
         {27,  4,  800,  500,  2160, 1250}, /* 01 (320x350,640x350) */
@@ -520,7 +508,7 @@ static struct SiS_LCDData  XGI_StLCD1600x1200Data[] = {
 
 #define XGI_CetLCD1400x1050Data XGI_CetLCD1280x1024Data
 
-static struct SiS_LCDData  XGI_NoScalingData[] = {
+static const struct SiS_LCDData XGI_NoScalingData[] = {
         {1, 1, 800,  449,  800,  449},
         {1, 1, 800,  449,  800,  449},
         {1, 1, 900,  449,  900,  449},
@@ -531,7 +519,7 @@ static struct SiS_LCDData  XGI_NoScalingData[] = {
         {1, 1, 1688, 1066, 1688, 1066}
 };
 
-static struct SiS_LCDData  XGI_ExtLCD1024x768x75Data[] = {
+static const struct SiS_LCDData XGI_ExtLCD1024x768x75Data[] = {
         {42, 25, 1536, 419, 1344, 806}, /* ; 00 (320x200,320x400,
                                                  640x200,640x400) */
         {48, 25, 1536, 369, 1344, 806}, /* ; 01 (320x350,640x350) */
@@ -542,7 +530,7 @@ static struct SiS_LCDData  XGI_ExtLCD1024x768x75Data[] = {
         {1,  1,  1312, 800, 1312, 800}  /* ; 06 (1024x768x75Hz) */
 };
 
-static struct SiS_LCDData  XGI_CetLCD1024x768x75Data[] = {
+static const struct SiS_LCDData XGI_CetLCD1024x768x75Data[] = {
         {1, 1, 1312, 800, 1312, 800}, /* ; 00 (320x200,320x400,
                                                640x200,640x400) */
         {1, 1, 1312, 800, 1312, 800}, /* ; 01 (320x350,640x350) */
@@ -553,7 +541,7 @@ static struct SiS_LCDData  XGI_CetLCD1024x768x75Data[] = {
         {1, 1, 1312, 800, 1312, 800}  /* ; 06 (1024x768x75Hz) */
 };
 
-static struct SiS_LCDData xgifb_lcd_1280x1024x75[] = {
+static const struct SiS_LCDData xgifb_lcd_1280x1024x75[] = {
         {211, 60,  1024, 501,  1688, 1066}, /* ; 00 (320x200,320x400,
                                                      640x200,640x400) */
         {211, 60,  1024, 508,  1688, 1066}, /* ; 01 (320x350,640x350) */
@@ -567,7 +555,7 @@ static struct SiS_LCDData xgifb_lcd_1280x1024x75[] = {
 
 #define XGI_CetLCD1280x1024x75Data XGI_CetLCD1280x1024Data
 
-static struct SiS_LCDData  XGI_NoScalingDatax75[] = {
+static const struct SiS_LCDData XGI_NoScalingDatax75[] = {
         {1, 1, 800,  449,  800,  449},  /* ; 00 (320x200, 320x400,
                                                  640x200, 640x400) */
         {1, 1, 800,  449,  800,  449},  /* ; 01 (320x350, 640x350) */
@@ -582,7 +570,7 @@ static struct SiS_LCDData  XGI_NoScalingDatax75[] = {
         {1, 1, 1688, 806,  1688, 806}   /* ; 0A (1280x768x75Hz) */
 };
 
-static struct XGI_LCDDesStruct XGI_ExtLCDDes1024x768Data[] = {
+static const struct XGI_LCDDesStruct XGI_ExtLCDDes1024x768Data[] = {
         {9, 1057, 0,   771}, /* ; 00 (320x200,320x400,640x200,640x400) */
         {9, 1057, 0,   771}, /* ; 01 (320x350,640x350) */
         {9, 1057, 0,   771}, /* ; 02 (360x400,720x400) */
@@ -592,7 +580,7 @@ static struct XGI_LCDDesStruct XGI_ExtLCDDes1024x768Data[] = {
         {9, 1057, 805, 770}  /* ; 06 (1024x768x60Hz) */
 };
 
-static struct XGI_LCDDesStruct XGI_StLCDDes1024x768Data[] = {
+static const struct XGI_LCDDesStruct XGI_StLCDDes1024x768Data[] = {
         {9, 1057, 737, 703}, /* ; 00 (320x200,320x400,640x200,640x400) */
         {9, 1057, 686, 651}, /* ; 01 (320x350,640x350) */
         {9, 1057, 737, 703}, /* ; 02 (360x400,720x400) */
@@ -602,7 +590,7 @@ static struct XGI_LCDDesStruct XGI_StLCDDes1024x768Data[] = {
         {9, 1057, 805, 770}  /* ; 06 (1024x768x60Hz) */
 };
 
-static struct XGI_LCDDesStruct XGI_CetLCDDes1024x768Data[] = {
+static const struct XGI_LCDDesStruct XGI_CetLCDDes1024x768Data[] = {
         {1152, 856,  622, 587}, /* ; 00 (320x200,320x400,640x200,640x400) */
         {1152, 856,  597, 562}, /* ; 01 (320x350,640x350) */
         {1152, 856,  622, 587}, /* ; 02 (360x400,720x400) */
@@ -612,7 +600,7 @@ static struct XGI_LCDDesStruct XGI_CetLCDDes1024x768Data[] = {
         {0,    1048, 805, 770}  /* ; 06 (1024x768x60Hz) */
 };
 
-static struct XGI_LCDDesStruct XGI_ExtLCDDLDes1280x1024Data[] = {
+static const struct XGI_LCDDesStruct XGI_ExtLCDDLDes1280x1024Data[] = {
         {18, 1346, 981,  940},  /* 00 (320x200,320x400,640x200,640x400) */
         {18, 1346, 926,  865},  /* 01 (320x350,640x350) */
         {18, 1346, 981,  940},  /* 02 (360x400,720x400) */
@@ -623,7 +611,7 @@ static struct XGI_LCDDesStruct XGI_ExtLCDDLDes1280x1024Data[] = {
         {18, 1346, 1065, 1024}  /* 07 (1280x1024x60Hz) */
 };
 
-static struct XGI_LCDDesStruct XGI_StLCDDLDes1280x1024Data[] = {
+static const struct XGI_LCDDesStruct XGI_StLCDDLDes1280x1024Data[] = {
         {18, 1346, 970,  907},  /* 00 (320x200,320x400,640x200,640x400) */
         {18, 1346, 917,  854},  /* 01 (320x350,640x350) */
         {18, 1346, 970,  907},  /* 02 (360x400,720x400) */
@@ -634,7 +622,7 @@ static struct XGI_LCDDesStruct XGI_StLCDDLDes1280x1024Data[] = {
         {18, 1346, 1065, 1024}  /* 07 (1280x1024x60Hz) */
 };
 
-static struct XGI_LCDDesStruct XGI_CetLCDDLDes1280x1024Data[] = {
+static const struct XGI_LCDDesStruct XGI_CetLCDDLDes1280x1024Data[] = {
         {1368, 1008, 752,  711}, /* 00 (320x200,320x400,640x200,640x400) */
         {1368, 1008, 729,  688}, /* 01 (320x350,640x350) */
         {1368, 1008, 752,  711}, /* 02 (360x400,720x400) */
@@ -645,7 +633,7 @@ static struct XGI_LCDDesStruct XGI_CetLCDDLDes1280x1024Data[] = {
         {18,   1346, 1065, 1024} /* 07 (1280x1024x60Hz) */
 };
 
-static struct XGI_LCDDesStruct XGI_ExtLCDDes1280x1024Data[] = {
+static const struct XGI_LCDDesStruct XGI_ExtLCDDes1280x1024Data[] = {
         {9, 1337, 981,  940},  /* ; 00 (320x200,320x400,640x200,640x400) */
         {9, 1337, 926,  884},  /* ; 01 (320x350,640x350) alan, 2003/09/30 */
         {9, 1337, 981,  940},  /* ; 02 (360x400,720x400) */
@@ -656,7 +644,7 @@ static struct XGI_LCDDesStruct XGI_ExtLCDDes1280x1024Data[] = {
         {9, 1337, 1065, 1024}  /* ; 07 (1280x1024x60Hz) */
 };
 
-static struct XGI_LCDDesStruct XGI_StLCDDes1280x1024Data[] = {
+static const struct XGI_LCDDesStruct XGI_StLCDDes1280x1024Data[] = {
         {9, 1337, 970,  907},  /* ; 00 (320x200,320x400,640x200,640x400) */
         {9, 1337, 917,  854},  /* ; 01 (320x350,640x350) */
         {9, 1337, 970,  907},  /* ; 02 (360x400,720x400) */
@@ -667,7 +655,7 @@ static struct XGI_LCDDesStruct XGI_StLCDDes1280x1024Data[] = {
         {9, 1337, 1065, 1024}  /* ; 07 (1280x1024x60Hz) */
 };
 
-static struct XGI_LCDDesStruct XGI_CetLCDDes1280x1024Data[] = {
+static const struct XGI_LCDDesStruct XGI_CetLCDDes1280x1024Data[] = {
         {1368, 1008, 752,  711}, /* 00 (320x200,320x400,640x200,640x400) */
         {1368, 1008, 729,  688}, /* 01 (320x350,640x350) */
         {1368, 1008, 752,  711}, /* 02 (360x400,720x400) */
@@ -678,7 +666,7 @@ static struct XGI_LCDDesStruct XGI_CetLCDDes1280x1024Data[] = {
         {9,    1337, 1065, 1024} /* 07 (1280x1024x60Hz) */
 };
 
-static struct XGI_LCDDesStruct xgifb_lcddldes_1400x1050[] = {
+static const struct XGI_LCDDesStruct xgifb_lcddldes_1400x1050[] = {
         {18,   1464, 0,    1051}, /* 00 (320x200,320x400,640x200,640x400) */
         {18,   1464, 0,    1051}, /* 01 (320x350,640x350) */
         {18,   1464, 0,    1051}, /* 02 (360x400,720x400) */
@@ -690,7 +678,7 @@ static struct XGI_LCDDesStruct xgifb_lcddldes_1400x1050[] = {
         {18,   1464, 0,    1051}  /* 08 (1400x1050x60Hz) */
 };
 
-static struct XGI_LCDDesStruct xgifb_lcddes_1400x1050[] = {
+static const struct XGI_LCDDesStruct xgifb_lcddes_1400x1050[] = {
         {9,    1455, 0,    1051}, /* 00 (320x200,320x400,640x200,640x400) */
         {9,    1455, 0,    1051}, /* 01 (320x350,640x350) */
         {9,    1455, 0,    1051}, /* 02 (360x400,720x400) */
@@ -702,7 +690,7 @@ static struct XGI_LCDDesStruct xgifb_lcddes_1400x1050[] = {
         {9,    1455, 0,    1051}  /* 08 (1400x1050x60Hz) */
 };
 
-static struct XGI_LCDDesStruct XGI_CetLCDDes1400x1050Data[] = {
+static const struct XGI_LCDDesStruct XGI_CetLCDDes1400x1050Data[] = {
         {1308, 1068, 781,  766},  /* 00 (320x200,320x400,640x200,640x400) */
         {1308, 1068, 781,  766},  /* 01 (320x350,640x350) */
         {1308, 1068, 781,  766},  /* 02 (360x400,720x400) */
@@ -714,7 +702,7 @@ static struct XGI_LCDDesStruct XGI_CetLCDDes1400x1050Data[] = {
         {18,   1464, 0,    1051}  /* 08 (1400x1050x60Hz) */
 };
 
-static struct XGI_LCDDesStruct XGI_CetLCDDes1400x1050Data2[] = {
+static const struct XGI_LCDDesStruct XGI_CetLCDDes1400x1050Data2[] = {
         {0, 1448, 0, 1051}, /* 00 (320x200,320x400,640x200,640x400) */
         {0, 1448, 0, 1051}, /* 01 (320x350,640x350) */
         {0, 1448, 0, 1051}, /* 02 (360x400,720x400) */
@@ -722,7 +710,7 @@ static struct XGI_LCDDesStruct XGI_CetLCDDes1400x1050Data2[] = {
         {0, 1448, 0, 1051}  /* 04 (640x480x60Hz) */
 };
 
-static struct XGI_LCDDesStruct XGI_ExtLCDDLDes1600x1200Data[] = {
+static const struct XGI_LCDDesStruct XGI_ExtLCDDLDes1600x1200Data[] = {
         {18, 1682, 0, 1201}, /* 00 (320x200,320x400,640x200,640x400) */
         {18, 1682, 0, 1201}, /* 01 (320x350,640x350) */
         {18, 1682, 0, 1201}, /* 02 (360x400,720x400) */
@@ -735,7 +723,7 @@ static struct XGI_LCDDesStruct XGI_ExtLCDDLDes1600x1200Data[] = {
         {18, 1682, 0, 1201}  /* 09 (1600x1200x60Hz) */
 };
 
-static struct XGI_LCDDesStruct XGI_StLCDDLDes1600x1200Data[] = {
+static const struct XGI_LCDDesStruct XGI_StLCDDLDes1600x1200Data[] = {
         {18, 1682, 1150, 1101}, /* 00 (320x200,320x400,640x200,640x400) */
         {18, 1682, 1083, 1034}, /* 01 (320x350,640x350) */
         {18, 1682, 1150, 1101}, /* 02 (360x400,720x400) */
@@ -748,7 +736,7 @@ static struct XGI_LCDDesStruct XGI_StLCDDLDes1600x1200Data[] = {
         {18, 1682, 0,    1201} /* 09 (1600x1200x60Hz) */
 };
 
-static struct XGI_LCDDesStruct XGI_ExtLCDDes1600x1200Data[] = {
+static const struct XGI_LCDDesStruct XGI_ExtLCDDes1600x1200Data[] = {
         {9, 1673, 0, 1201}, /* 00 (320x200,320x400,640x200,640x400) */
         {9, 1673, 0, 1201}, /* 01 (320x350,640x350) */
         {9, 1673, 0, 1201}, /* 02 (360x400,720x400) */
@@ -761,7 +749,7 @@ static struct XGI_LCDDesStruct XGI_ExtLCDDes1600x1200Data[] = {
         {9, 1673, 0, 1201}  /* 09 (1600x1200x60Hz) */
 };
 
-static struct XGI_LCDDesStruct XGI_StLCDDes1600x1200Data[] = {
+static const struct XGI_LCDDesStruct XGI_StLCDDes1600x1200Data[] = {
         {9, 1673, 1150, 1101}, /* 00 (320x200,320x400,640x200,640x400) */
         {9, 1673, 1083, 1034}, /* 01 (320x350,640x350) */
         {9, 1673, 1150, 1101}, /* 02 (360x400,720x400) */
@@ -774,7 +762,7 @@ static struct XGI_LCDDesStruct XGI_StLCDDes1600x1200Data[] = {
         {9, 1673, 0,    1201}  /* 09 (1600x1200x60Hz) */
 };
 
-static struct XGI330_LCDDataDesStruct2  XGI_NoScalingDesData[] = {
+static const struct XGI330_LCDDataDesStruct2  XGI_NoScalingDesData[] = {
         {9, 657,  448, 405,  96,   2}, /* 00 (320x200,320x400,
                                               640x200,640x400) */
         {9, 657,  448, 355,  96,   2}, /* 01 (320x350,640x350) */
@@ -790,7 +778,7 @@ static struct XGI330_LCDDataDesStruct2  XGI_NoScalingDesData[] = {
 };
 
 /* ;;1024x768x75Hz */
-static struct XGI_LCDDesStruct xgifb_lcddes_1024x768x75[] = {
+static const struct XGI_LCDDesStruct xgifb_lcddes_1024x768x75[] = {
         {9, 1049, 0, 769}, /* ; 00 (320x200,320x400,640x200,640x400) */
         {9, 1049, 0, 769}, /* ; 01 (320x350,640x350) */
         {9, 1049, 0, 769}, /* ; 02 (360x400,720x400) */
@@ -801,7 +789,7 @@ static struct XGI_LCDDesStruct xgifb_lcddes_1024x768x75[] = {
 };
 
 /* ;;1024x768x75Hz */
-static struct XGI_LCDDesStruct XGI_CetLCDDes1024x768x75Data[] = {
+static const struct XGI_LCDDesStruct XGI_CetLCDDes1024x768x75Data[] = {
         {1152, 856,  622, 587}, /* ; 00 (320x200,320x400,640x200,640x400) */
         {1152, 856,  597, 562}, /* ; 01 (320x350,640x350) */
         {1192, 896,  622, 587}, /* ; 02 (360x400,720x400) */
@@ -812,7 +800,7 @@ static struct XGI_LCDDesStruct XGI_CetLCDDes1024x768x75Data[] = {
 };
 
 /* ;;1280x1024x75Hz */
-static struct XGI_LCDDesStruct xgifb_lcddldes_1280x1024x75[] = {
+static const struct XGI_LCDDesStruct xgifb_lcddldes_1280x1024x75[] = {
         {18, 1314, 0, 1025}, /* ; 00 (320x200,320x400,640x200,640x400) */
         {18, 1314, 0, 1025}, /* ; 01 (320x350,640x350) */
         {18, 1314, 0, 1025}, /* ; 02 (360x400,720x400) */
@@ -824,7 +812,7 @@ static struct XGI_LCDDesStruct xgifb_lcddldes_1280x1024x75[] = {
 };
 
 /* 1280x1024x75Hz */
-static struct XGI_LCDDesStruct XGI_CetLCDDLDes1280x1024x75Data[] = {
+static const struct XGI_LCDDesStruct XGI_CetLCDDLDes1280x1024x75Data[] = {
         {1368, 1008, 752, 711}, /* ; 00 (320x200,320x400,640x200,640x400) */
         {1368, 1008, 729, 688}, /* ; 01 (320x350,640x350) */
         {1408, 1048, 752, 711}, /* ; 02 (360x400,720x400) */
@@ -836,7 +824,7 @@ static struct XGI_LCDDesStruct XGI_CetLCDDLDes1280x1024x75Data[] = {
 };
 
 /* ;;1280x1024x75Hz */
-static struct XGI_LCDDesStruct xgifb_lcddes_1280x1024x75[] = {
+static const struct XGI_LCDDesStruct xgifb_lcddes_1280x1024x75[] = {
         {9, 1305, 0, 1025}, /* ; 00 (320x200,320x400,640x200,640x400) */
         {9, 1305, 0, 1025}, /* ; 01 (320x350,640x350) */
         {9, 1305, 0, 1025}, /* ; 02 (360x400,720x400) */
@@ -848,7 +836,7 @@ static struct XGI_LCDDesStruct xgifb_lcddes_1280x1024x75[] = {
 };
 
 /* 1280x1024x75Hz */
-static struct XGI_LCDDesStruct XGI_CetLCDDes1280x1024x75Data[] = {
+static const struct XGI_LCDDesStruct XGI_CetLCDDes1280x1024x75Data[] = {
         {1368, 1008, 752, 711}, /* ; 00 (320x200,320x400,640x200,640x400) */
         {1368, 1008, 729, 688}, /* ; 01 (320x350,640x350) */
         {1408, 1048, 752, 711}, /* ; 02 (360x400,720x400) */
@@ -860,7 +848,7 @@ static struct XGI_LCDDesStruct XGI_CetLCDDes1280x1024x75Data[] = {
 };
 
 /* Scaling LCD 75Hz */
-static struct XGI330_LCDDataDesStruct2 XGI_NoScalingDesDatax75[] =  {
+static const struct XGI330_LCDDataDesStruct2 XGI_NoScalingDesDatax75[] =  {
         {9, 657,  448, 405,  96,  2}, /* ; 00 (320x200,320x400,
                                                640x200,640x400) */
         {9, 657,  448, 355,  96,  2}, /* ; 01 (320x350,640x350) */
@@ -1174,7 +1162,7 @@ static const unsigned char XGI330_Ren750pGroup3[] = {
         0x18, 0x1D, 0x23, 0x28, 0x4C, 0xAA, 0x01
 };
 
-static struct SiS_LVDSData  XGI_LVDS1024x768Data_1[] = {
+static const struct SiS_LVDSData XGI_LVDS1024x768Data_1[] = {
         { 960, 438, 1344, 806}, /* 00 (320x200,320x400,640x200,640x400) */
         { 960, 388, 1344, 806}, /* 01 (320x350,640x350) */
         {1040, 438, 1344, 806}, /* 02 (360x400,720x400) */
@@ -1185,7 +1173,7 @@ static struct SiS_LVDSData  XGI_LVDS1024x768Data_1[] = {
 };
 
 
-static struct SiS_LVDSData  XGI_LVDS1024x768Data_2[] = {
+static const struct SiS_LVDSData XGI_LVDS1024x768Data_2[] = {
         {1344, 806, 1344, 806},
         {1344, 806, 1344, 806},
         {1344, 806, 1344, 806},
@@ -1197,7 +1185,7 @@ static struct SiS_LVDSData  XGI_LVDS1024x768Data_2[] = {
         {800,  525, 1280, 813}
 };
 
-static struct SiS_LVDSData  XGI_LVDS1280x1024Data_1[] = {
+static const struct SiS_LVDSData XGI_LVDS1280x1024Data_1[] = {
         {1048, 442,  1688, 1066},
         {1048, 392,  1688, 1066},
         {1048, 442,  1688, 1066},
@@ -1210,7 +1198,7 @@ static struct SiS_LVDSData  XGI_LVDS1280x1024Data_1[] = {
 
 #define XGI_LVDS1280x1024Data_2 XGI_LVDS1024x768Data_2
 
-static struct SiS_LVDSData  XGI_LVDS1400x1050Data_1[] = {
+static const struct SiS_LVDSData XGI_LVDS1400x1050Data_1[] = {
         {928,   416, 1688, 1066},
         {928,   366, 1688, 1066},
         {928,   416, 1688, 1066},
@@ -1222,7 +1210,7 @@ static struct SiS_LVDSData  XGI_LVDS1400x1050Data_1[] = {
         {1688, 1066, 1688, 1066}
 };
 
-static struct SiS_LVDSData  XGI_LVDS1400x1050Data_2[] = {
+static const struct SiS_LVDSData XGI_LVDS1400x1050Data_2[] = {
         {1688, 1066, 1688, 1066},
         {1688, 1066, 1688, 1066},
         {1688, 1066, 1688, 1066},
@@ -1235,7 +1223,7 @@ static struct SiS_LVDSData  XGI_LVDS1400x1050Data_2[] = {
 };
 
 /* ;;[ycchen] 12/05/02 LCDHTxLCDVT=2048x1320 */
-static struct SiS_LVDSData XGI_LVDS1600x1200Data_1[] = {
+static const struct SiS_LVDSData XGI_LVDS1600x1200Data_1[] = {
         {1088, 520,  2048, 1320}, /* 00 (320x200,320x400,640x200,640x400) */
         {1088, 470,  2048, 1320}, /* 01 (320x350,640x350) */
         {1088, 520,  2048, 1320}, /* 02 (360x400,720x400) */
@@ -1248,7 +1236,7 @@ static struct SiS_LVDSData XGI_LVDS1600x1200Data_1[] = {
         {2048, 1320, 2048, 1320}  /* 09 (1600x1200) */
 };
 
-static struct SiS_LVDSData XGI_LVDSNoScalingData[] = {
+static const struct SiS_LVDSData XGI_LVDSNoScalingData[] = {
         { 800,  449,  800,  449}, /* 00 (320x200,320x400,640x200,640x400) */
         { 800,  449,  800,  449}, /* 01 (320x350,640x350) */
         { 800,  449,  800,  449}, /* 02 (360x400,720x400) */
@@ -1262,7 +1250,7 @@ static struct SiS_LVDSData XGI_LVDSNoScalingData[] = {
         {1688,  806, 1688,  806}  /* 0A (1280x768x60Hz) */
 };
 
-static struct SiS_LVDSData XGI_LVDS1024x768Data_1x75[] = {
+static const struct SiS_LVDSData XGI_LVDS1024x768Data_1x75[] = {
         { 960, 438, 1312, 800}, /* 00 (320x200,320x400,640x200,640x400) */
         { 960, 388, 1312, 800}, /* 01 (320x350,640x350) */
         {1040, 438, 1312, 800}, /* 02 (360x400,720x400) */
@@ -1273,7 +1261,7 @@ static struct SiS_LVDSData XGI_LVDS1024x768Data_1x75[] = {
 };
 
 
-static struct SiS_LVDSData XGI_LVDS1024x768Data_2x75[] = {
+static const struct SiS_LVDSData XGI_LVDS1024x768Data_2x75[] = {
         {1312, 800, 1312, 800}, /* ; 00 (320x200,320x400,640x200,640x400) */
         {1312, 800, 1312, 800}, /* ; 01 (320x350,640x350) */
         {1312, 800, 1312, 800}, /* ; 02 (360x400,720x400) */
@@ -1283,7 +1271,7 @@ static struct SiS_LVDSData XGI_LVDS1024x768Data_2x75[] = {
         {1312, 800, 1312, 800}, /* ; 06 (512x384,1024x768) */
 };
 
-static struct SiS_LVDSData XGI_LVDS1280x1024Data_1x75[] = {
+static const struct SiS_LVDSData XGI_LVDS1280x1024Data_1x75[] = {
         {1048,  442, 1688, 1066  }, /* ; 00 (320x200,320x400,640x200,640x400) */
         {1048,  392, 1688, 1066  }, /* ; 01 (320x350,640x350) */
         {1128,  442, 1688, 1066  }, /* ; 02 (360x400,720x400) */
@@ -1294,7 +1282,7 @@ static struct SiS_LVDSData XGI_LVDS1280x1024Data_1x75[] = {
         {1688, 1066, 1688, 1066 },  /* ; 06; 07 (640x512,1280x1024) */
 };
 
-static struct SiS_LVDSData XGI_LVDS1280x1024Data_2x75[] = {
+static const struct SiS_LVDSData XGI_LVDS1280x1024Data_2x75[] = {
         {1688, 1066, 1688, 1066 }, /* ; 00 (320x200,320x400,640x200,640x400) */
         {1688, 1066, 1688, 1066 }, /* ; 01 (320x350,640x350) */
         {1688, 1066, 1688, 1066 }, /* ; 02 (360x400,720x400) */
@@ -1305,7 +1293,7 @@ static struct SiS_LVDSData XGI_LVDS1280x1024Data_2x75[] = {
         {1688, 1066, 1688, 1066 }, /* ; 06; 07 (640x512,1280x1024) */
 };
 
-static struct SiS_LVDSData XGI_LVDSNoScalingDatax75[] = {
+static const struct SiS_LVDSData XGI_LVDSNoScalingDatax75[] = {
         { 800,  449,  800, 449},  /* ; 00 (320x200,320x400,640x200,640x400) */
         { 800,  449,  800, 449},  /* ; 01 (320x350,640x350) */
         { 900,  449,  900, 449},  /* ; 02 (360x400,720x400) */
@@ -1320,7 +1308,7 @@ static struct SiS_LVDSData XGI_LVDSNoScalingDatax75[] = {
         {1688,  806, 1688, 806},  /* ; 0A (1280x768x75Hz) */
 };
 
-static struct SiS_LVDSData XGI_LVDS1024x768Des_1[] = {
+static const struct SiS_LVDSData XGI_LVDS1024x768Des_1[] = {
         {0, 1048,   0, 771}, /* 00 (320x200,320x400,640x200,640x400) */
         {0, 1048,   0, 771}, /* 01 (320x350,640x350) */
         {0, 1048,   0, 771}, /* 02 (360x400,720x400) */
@@ -1330,7 +1318,7 @@ static struct SiS_LVDSData XGI_LVDS1024x768Des_1[] = {
         {0, 1048, 805, 770}  /* 06 (1024x768x60Hz) */
 } ;
 
-static struct SiS_LVDSData XGI_LVDS1024x768Des_2[] = {
+static const struct SiS_LVDSData XGI_LVDS1024x768Des_2[] = {
         {1142,  856, 622, 587}, /* 00 (320x200,320x400,640x200,640x400) */
         {1142,  856, 597, 562}, /* 01 (320x350,640x350) */
         {1142,  856, 622, 587}, /* 02 (360x400,720x400) */
@@ -1340,7 +1328,7 @@ static struct SiS_LVDSData XGI_LVDS1024x768Des_2[] = {
         {   0, 1048, 805, 771}  /* 06 (1024x768x60Hz) */
 };
 
-static struct SiS_LVDSData XGI_LVDS1024x768Des_3[] = {
+static const struct SiS_LVDSData XGI_LVDS1024x768Des_3[] = {
         {320, 24, 622, 587}, /* 00 (320x200,320x400,640x200,640x400) */
         {320, 24, 597, 562}, /* 01 (320x350,640x350) */
         {320, 24, 622, 587}, /* 02 (360x400,720x400) */
@@ -1348,7 +1336,7 @@ static struct SiS_LVDSData XGI_LVDS1024x768Des_3[] = {
         {320, 24, 722, 687}  /* 04 (640x480x60Hz) */
 };
 
-static struct SiS_LVDSData XGI_LVDS1280x1024Des_1[] = {
+static const struct SiS_LVDSData XGI_LVDS1280x1024Des_1[] = {
         {0, 1328,    0, 1025}, /* 00 (320x200,320x400,640x200,640x400) */
         {0, 1328,    0, 1025}, /* 01 (320x350,640x350) */
         {0, 1328,    0, 1025}, /* 02 (360x400,720x400) */
@@ -1360,7 +1348,7 @@ static struct SiS_LVDSData XGI_LVDS1280x1024Des_1[] = {
 };
 
  /* The Display setting for DE Mode Panel */
-static struct SiS_LVDSData XGI_LVDS1280x1024Des_2[] = {
+static const struct SiS_LVDSData XGI_LVDS1280x1024Des_2[] = {
         {1368, 1008, 752, 711}, /* 00 (320x200,320x400,640x200,640x400) */
         {1368, 1008, 729, 688}, /* 01 (320x350,640x350) */
         {1408, 1048, 752, 711}, /* 02 (360x400,720x400) */
@@ -1371,7 +1359,7 @@ static struct SiS_LVDSData XGI_LVDS1280x1024Des_2[] = {
         {0000, 1328,   0, 1025} /* 07 (1280x1024x60Hz) */
 };
 
-static struct SiS_LVDSData XGI_LVDS1400x1050Des_1[] = {
+static const struct SiS_LVDSData XGI_LVDS1400x1050Des_1[] = {
         {0, 1448, 0, 1051}, /* 00 (320x200,320x400,640x200,640x400) */
         {0, 1448, 0, 1051}, /* 01 (320x350,640x350) */
         {0, 1448, 0, 1051}, /* 02 (360x400,720x400) */
@@ -1383,7 +1371,7 @@ static struct SiS_LVDSData XGI_LVDS1400x1050Des_1[] = {
         {0, 1448, 0, 1051}  /* 08 (1400x1050x60Hz) */
 };
 
-static struct SiS_LVDSData XGI_LVDS1400x1050Des_2[] = {
+static const struct SiS_LVDSData XGI_LVDS1400x1050Des_2[] = {
         {1308, 1068,  781,  766}, /* 00 (320x200,320x400,640x200,640x400) */
         {1308, 1068,  781,  766}, /* 01 (320x350,640x350) */
         {1308, 1068,  781,  766}, /* 02 (360x400,720x400) */
@@ -1395,7 +1383,7 @@ static struct SiS_LVDSData XGI_LVDS1400x1050Des_2[] = {
         {   0, 1448,    0, 1051}  /* 08 (1400x1050x60Hz) */
 };
 
-static struct SiS_LVDSData XGI_LVDS1600x1200Des_1[] = {
+static const struct SiS_LVDSData XGI_LVDS1600x1200Des_1[] = {
         {0, 1664, 0, 1201}, /* 00 (320x200,320x400,640x200,640x400) */
         {0, 1664, 0, 1201}, /* 01 (320x350,640x350) */
         {0, 1664, 0, 1201}, /* 02 (360x400,720x400) */
@@ -1408,7 +1396,7 @@ static struct SiS_LVDSData XGI_LVDS1600x1200Des_1[] = {
         {0, 1664, 0, 1201}  /* 09 (1600x1200x60Hz) */
 };
 
-static struct XGI330_LCDDataDesStruct2  XGI_LVDSNoScalingDesData[] = {
+static const struct XGI330_LCDDataDesStruct2  XGI_LVDSNoScalingDesData[] = {
         {0,  648,  448,  405,  96, 2}, /* 00 (320x200,320x400,
                                               640x200,640x400) */
         {0,  648,  448,  355,  96, 2}, /* 01 (320x350,640x350) */
@@ -1424,7 +1412,7 @@ static struct XGI330_LCDDataDesStruct2  XGI_LVDSNoScalingDesData[] = {
 };
 
 /* ; 1024x768 Full-screen */
-static struct SiS_LVDSData XGI_LVDS1024x768Des_1x75[] = {
+static const struct SiS_LVDSData XGI_LVDS1024x768Des_1x75[] = {
         {0, 1040, 0, 769}, /* ; 00 (320x200,320x400,640x200,640x400) */
         {0, 1040, 0, 769}, /* ; 01 (320x350,640x350) */
         {0, 1040, 0, 769}, /* ; 02 (360x400,720x400) */
@@ -1435,7 +1423,7 @@ static struct SiS_LVDSData XGI_LVDS1024x768Des_1x75[] = {
 };
 
 /* ; 1024x768 center-screen (Enh. Mode) */
-static struct SiS_LVDSData XGI_LVDS1024x768Des_2x75[] = {
+static const struct SiS_LVDSData XGI_LVDS1024x768Des_2x75[] = {
         {1142,  856, 622, 587}, /* 00 (320x200,320x400,640x200,640x400) */
         {1142,  856, 597, 562}, /* 01 (320x350,640x350) */
         {1142,  856, 622, 587}, /* 02 (360x400,720x400) */
@@ -1446,7 +1434,7 @@ static struct SiS_LVDSData XGI_LVDS1024x768Des_2x75[] = {
 };
 
 /* ; 1024x768 center-screen (St.Mode) */
-static struct SiS_LVDSData XGI_LVDS1024x768Des_3x75[] =  {
+static const struct SiS_LVDSData XGI_LVDS1024x768Des_3x75[] =  {
         {320, 24, 622, 587}, /* ; 00 (320x200,320x400,640x200,640x400) */
         {320, 24, 597, 562}, /* ; 01 (320x350,640x350) */
         {320, 24, 622, 587}, /* ; 02 (360x400,720x400) */
@@ -1454,7 +1442,7 @@ static struct SiS_LVDSData XGI_LVDS1024x768Des_3x75[] =  {
         {320, 24, 722, 687}  /* ; 04 (640x480x60Hz) */
 };
 
-static struct SiS_LVDSData XGI_LVDS1280x1024Des_1x75[] = {
+static const struct SiS_LVDSData XGI_LVDS1280x1024Des_1x75[] = {
         {0, 1296, 0, 1025}, /* ; 00 (320x200,320x400,640x200,640x400) */
         {0, 1296, 0, 1025}, /* ; 01 (320x350,640x350) */
         {0, 1296, 0, 1025}, /* ; 02 (360x400,720x400) */
@@ -1467,7 +1455,7 @@ static struct SiS_LVDSData XGI_LVDS1280x1024Des_1x75[] = {
 
 /* The Display setting for DE Mode Panel */
 /* Set DE as default */
-static struct SiS_LVDSData XGI_LVDS1280x1024Des_2x75[] = {
+static const struct SiS_LVDSData XGI_LVDS1280x1024Des_2x75[] = {
         {1368,  976, 752,  711}, /* ; 00 (320x200,320x400,640x200,640x400) */
         {1368,  976, 729,  688}, /* ; 01 (320x350,640x350) */
         {1408,  976, 752,  711}, /* ; 02 (360x400,720x400) */
@@ -1479,7 +1467,7 @@ static struct SiS_LVDSData XGI_LVDS1280x1024Des_2x75[] = {
 };
 
 /* Scaling LCD 75Hz */
-static struct XGI330_LCDDataDesStruct2 XGI_LVDSNoScalingDesDatax75[] = {
+static const struct XGI330_LCDDataDesStruct2 XGI_LVDSNoScalingDesDatax75[] = {
         {0,  648, 448,  405,  96, 2}, /* ; 00 (320x200,320x400,
                                                640x200,640x400) */
         {0,  648, 448,  355,  96, 2}, /* ; 01 (320x350,640x350) */
@@ -1495,7 +1483,7 @@ static struct XGI330_LCDDataDesStruct2 XGI_LVDSNoScalingDesDatax75[] = {
 };
 
 /* CR00,CR02,CR03,CR04,CR05,SR0B,SR0C,SR0E */
-static struct XGI_LVDSCRT1HDataStruct  XGI_LVDSCRT11024x768_1_H[] = {
+static const struct XGI_LVDSCRT1HDataStruct  XGI_LVDSCRT11024x768_1_H[] = {
         { {0x4B, 0x27, 0x8F, 0x32, 0x1B, 0x00, 0x45, 0x00} }, /* 00 (320x) */
         { {0x4B, 0x27, 0x8F, 0x2B, 0x03, 0x00, 0x44, 0x00} }, /* 01 (360x) */
         { {0x55, 0x31, 0x99, 0x46, 0x1D, 0x00, 0x55, 0x00} }, /* 02 (400x) */
@@ -1507,7 +1495,7 @@ static struct XGI_LVDSCRT1HDataStruct  XGI_LVDSCRT11024x768_1_H[] = {
 };
 
 /* CR00,CR02,CR03,CR04,CR05,SR0B,SR0C,SR0E */
-static struct XGI_LVDSCRT1HDataStruct  XGI_LVDSCRT11280x1024_1_H[] = {
+static const struct XGI_LVDSCRT1HDataStruct  XGI_LVDSCRT11280x1024_1_H[] = {
         { {0x56, 0x27, 0x9A, 0x30, 0x1E, 0x00, 0x05, 0x00 } }, /* 00 (320x) */
         { {0x56, 0x27, 0x9A, 0x30, 0x1E, 0x00, 0x05, 0x00 } }, /* 01 (360x) */
         { {0x60, 0x31, 0x84, 0x3A, 0x88, 0x00, 0x01, 0x00 } }, /* 02 (400x) */
@@ -1520,7 +1508,7 @@ static struct XGI_LVDSCRT1HDataStruct  XGI_LVDSCRT11280x1024_1_H[] = {
 };
 
 /* CR00,CR02,CR03,CR04,CR05,SR0B,SR0C,SR0E */
-static struct XGI_LVDSCRT1HDataStruct  XGI_LVDSCRT11024x768_2_H[] = {
+static const struct XGI_LVDSCRT1HDataStruct  XGI_LVDSCRT11024x768_2_H[] = {
         { {0x63, 0x27, 0x87, 0x3B, 0x8C, 0x00, 0x01, 0x00} }, /* 00 (320x) */
         { {0x63, 0x27, 0x87, 0x3B, 0x8C, 0x00, 0x01, 0x00} }, /* 01 (360x) */
         { {0x63, 0x31, 0x87, 0x3D, 0x8E, 0x00, 0x01, 0x00} }, /* 02 (400x) */
@@ -1532,7 +1520,7 @@ static struct XGI_LVDSCRT1HDataStruct  XGI_LVDSCRT11024x768_2_H[] = {
 };
 
 /* CR00,CR02,CR03,CR04,CR05,SR0B,SR0C,SR0E */
-static struct XGI_LVDSCRT1HDataStruct  XGI_LVDSCRT11280x1024_2_H[] = {
+static const struct XGI_LVDSCRT1HDataStruct  XGI_LVDSCRT11280x1024_2_H[] = {
         { {0x7E, 0x3B, 0x9A, 0x44, 0x12, 0x00, 0x01, 0x00} }, /* 00 (320x) */
         { {0x7E, 0x3B, 0x9A, 0x44, 0x12, 0x00, 0x01, 0x00} }, /* 01 (360x) */
         { {0x7E, 0x40, 0x84, 0x49, 0x91, 0x00, 0x01, 0x00} }, /* 02 (400x) */
@@ -1545,7 +1533,7 @@ static struct XGI_LVDSCRT1HDataStruct  XGI_LVDSCRT11280x1024_2_H[] = {
 };
 
 /* CR00,CR02,CR03,CR04,CR05,SR0B,SR0C,SR0E */
-static struct XGI_LVDSCRT1HDataStruct XGI_LVDSCRT11400x1050_1_H[] = {
+static const struct XGI_LVDSCRT1HDataStruct XGI_LVDSCRT11400x1050_1_H[] = {
         { {0x47, 0x27, 0x8B, 0x2C, 0x1A, 0x00, 0x05, 0x00} }, /* 00 (320x) */
         { {0x47, 0x27, 0x8B, 0x30, 0x1E, 0x00, 0x05, 0x00} }, /* 01 (360x) */
         { {0x51, 0x31, 0x95, 0x36, 0x04, 0x00, 0x01, 0x00} }, /* 02 (400x) */
@@ -1559,7 +1547,7 @@ static struct XGI_LVDSCRT1HDataStruct XGI_LVDSCRT11400x1050_1_H[] = {
 };
 
 /* CR00,CR02,CR03,CR04,CR05,SR0B,SR0C,SR0E */
-static struct XGI_LVDSCRT1HDataStruct XGI_LVDSCRT11400x1050_2_H[] = {
+static const struct XGI_LVDSCRT1HDataStruct XGI_LVDSCRT11400x1050_2_H[] = {
         { {0x76, 0x3F, 0x83, 0x45, 0x8C, 0x00, 0x41, 0x00} }, /* 00 (320x) */
         { {0x76, 0x3F, 0x83, 0x45, 0x8C, 0x00, 0x41, 0x00} }, /* 01 (360x) */
         { {0x76, 0x31, 0x9A, 0x48, 0x9F, 0x00, 0x41, 0x00} }, /* 02 (400x) */
@@ -1574,7 +1562,7 @@ static struct XGI_LVDSCRT1HDataStruct XGI_LVDSCRT11400x1050_2_H[] = {
 
 /* ;302lv channelA [ycchen] 12/05/02 LCDHT=2048 */
 /* ; CR00,CR02,CR03,CR04,CR05,SR0B,SR0C,SR0E */
-static struct XGI_LVDSCRT1HDataStruct XGI_LVDSCRT11600x1200_1_H[] = {
+static const struct XGI_LVDSCRT1HDataStruct XGI_LVDSCRT11600x1200_1_H[] = {
         { {0x5B, 0x27, 0x9F, 0x32, 0x0A, 0x00, 0x01, 0x00} }, /* 00 (320x) */
         { {0x5B, 0x27, 0x9F, 0x32, 0x0A, 0x00, 0x01, 0x00} }, /* 01 (360x) */
         { {0x65, 0x31, 0x89, 0x3C, 0x94, 0x00, 0x01, 0x00} }, /* 02 (400x) */
@@ -1589,7 +1577,7 @@ static struct XGI_LVDSCRT1HDataStruct XGI_LVDSCRT11600x1200_1_H[] = {
 };
 
 /* CR06,CR07,CR10,CR11,CR15,CR16,SR0A+CR09(5->7) */
-static struct XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11024x768_1_V[] = {
+static const struct XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11024x768_1_V[] = {
         { {0x97, 0x1F, 0x60, 0x87, 0x5D, 0x83, 0x10} }, /* 00 (x350) */
         { {0xB4, 0x1F, 0x92, 0x89, 0x8F, 0xB5, 0x30} }, /* 01 (x400) */
         { {0x04, 0x3E, 0xE2, 0x89, 0xDF, 0x05, 0x00} }, /* 02 (x480) */
@@ -1598,7 +1586,7 @@ static struct XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11024x768_1_V[] = {
 };
 
 /* CR06,CR07,CR10,CR11,CR15,CR16,SR0A */
-static struct XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11024x768_2_V[] = {
+static const struct XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11024x768_2_V[] = {
         { {0x24, 0xBB, 0x31, 0x87, 0x5D, 0x25, 0x30} }, /* 00 (x350) */
         { {0x24, 0xBB, 0x4A, 0x80, 0x8F, 0x25, 0x30} }, /* 01 (x400) */
         { {0x24, 0xBB, 0x72, 0x88, 0xDF, 0x25, 0x30} }, /* 02 (x480) */
@@ -1607,7 +1595,7 @@ static struct XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11024x768_2_V[] = {
 };
 
 /* CR06,CR07,CR10,CR11,CR15,CR16,SR0A */
-static struct XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11280x1024_1_V[] = {
+static const struct XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11280x1024_1_V[] = {
         { {0x86, 0x1F, 0x5E, 0x82, 0x5D, 0x87, 0x00} }, /* 00 (x350) */
         { {0xB8, 0x1F, 0x90, 0x84, 0x8F, 0xB9, 0x30} }, /* 01 (x400) */
         { {0x08, 0x3E, 0xE0, 0x84, 0xDF, 0x09, 0x00} }, /* 02 (x480) */
@@ -1617,7 +1605,7 @@ static struct XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11280x1024_1_V[] = {
 };
 
 /* CR06,CR07,CR10,CR11,CR15,CR16,SR0A */
-static struct XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11280x1024_2_V[] = {
+static const struct XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11280x1024_2_V[] = {
         { {0x28, 0xD2, 0xAF, 0x83, 0xAE, 0xD8, 0xA1} }, /* 00 (x350) */
         { {0x28, 0xD2, 0xC8, 0x8C, 0xC7, 0xF2, 0x81} }, /* 01 (x400) */
         { {0x28, 0xD2, 0xF0, 0x84, 0xEF, 0x1A, 0xB1} }, /* 02 (x480) */
@@ -1627,7 +1615,7 @@ static struct XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11280x1024_2_V[] = {
 };
 
 /* CR06,CR07,CR10,CR11,CR15,CR16,SR0A */
-static struct XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11400x1050_1_V[] = {
+static const struct XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11400x1050_1_V[] = {
         { {0x6C, 0x1F, 0x60, 0x84, 0x5D, 0x6D, 0x10} }, /* 00 (x350) */
         { {0x9E, 0x1F, 0x93, 0x86, 0x8F, 0x9F, 0x30} }, /* 01 (x400) */
         { {0xEE, 0x1F, 0xE2, 0x86, 0xDF, 0xEF, 0x10} }, /* 02 (x480) */
@@ -1638,7 +1626,7 @@ static struct XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11400x1050_1_V[] = {
 };
 
 /* CR06,CR07,CR10,CR11,CR15,CR16,SR0A */
-static struct XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11400x1050_2_V[] = {
+static const struct XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11400x1050_2_V[] = {
         { {0x28, 0x92, 0xB6, 0x83, 0xB5, 0xCF, 0x81} }, /* 00 (x350) */
         { {0x28, 0x92, 0xD5, 0x82, 0xD4, 0xEE, 0x81} }, /* 01 (x400) */
         { {0x28, 0x92, 0xFD, 0x8A, 0xFC, 0x16, 0xB1} }, /* 02 (x480) */
@@ -1649,7 +1637,7 @@ static struct XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11400x1050_2_V[] = {
 };
 
 /* CR06,CR07,CR10,CR11,CR15,CR16,SR0A+CR09(5->7) */
-static struct XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11600x1200_1_V[] = {
+static const struct XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11600x1200_1_V[] = {
         { {0xd4, 0x1F, 0x81, 0x84, 0x5D, 0xd5, 0x10} }, /* 00 (x350) */
         { {0x06, 0x3e, 0xb3, 0x86, 0x8F, 0x07, 0x20} }, /* 01 (x400) */
         { {0x56, 0xba, 0x03, 0x86, 0xDF, 0x57, 0x00} }, /* 02 (x480) */
@@ -1661,7 +1649,7 @@ static struct XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11600x1200_1_V[] = {
 };
 
 /* CR00,CR02,CR03,CR04,CR05,SR0B,SR0C,SR0E */
-static struct XGI_LVDSCRT1HDataStruct XGI_LVDSCRT11024x768_1_Hx75[] = {
+static const struct XGI_LVDSCRT1HDataStruct XGI_LVDSCRT11024x768_1_Hx75[] = {
         { {0x4B, 0x27, 0x8F, 0x32, 0x1B, 0x00, 0x45, 0x00} },/* ; 00 (320x) */
         { {0x4B, 0x27, 0x8F, 0x2B, 0x03, 0x00, 0x44, 0x00} },/* ; 01 (360x) */
         { {0x55, 0x31, 0x99, 0x46, 0x1D, 0x00, 0x55, 0x00} },/* ; 02 (400x) */
@@ -1673,7 +1661,7 @@ static struct XGI_LVDSCRT1HDataStruct XGI_LVDSCRT11024x768_1_Hx75[] = {
 };
 
 /* CR06,CR07,CR10,CR11,CR15,CR16,SR0A+CR09(5->7) */
-static struct XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11024x768_1_Vx75[] = {
+static const struct XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11024x768_1_Vx75[] = {
         { {0x97, 0x1F, 0x60, 0x87, 0x5D, 0x83, 0x10} },/* ; 00 (x350) */
         { {0xB4, 0x1F, 0x92, 0x89, 0x8F, 0xB5, 0x30} },/* ; 01 (x400) */
         { {0xFE, 0x1F, 0xE0, 0x84, 0xDF, 0xFF, 0x10} },/* ; 02 (x480) */
@@ -1682,7 +1670,7 @@ static struct XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11024x768_1_Vx75[] = {
 };
 
 /* CR00,CR02,CR03,CR04,CR05,SR0B,SR0C,SR0E */
-static struct XGI_LVDSCRT1HDataStruct XGI_LVDSCRT11024x768_2_Hx75[] = {
+static const struct XGI_LVDSCRT1HDataStruct XGI_LVDSCRT11024x768_2_Hx75[] = {
         { {0x63, 0x27, 0x87, 0x3B, 0x8C, 0x00, 0x01, 0x00} },/* ; 00 (320x) */
         { {0x63, 0x27, 0x87, 0x3B, 0x8C, 0x00, 0x01, 0x00} },/* ; 01 (360x) */
         { {0x63, 0x31, 0x87, 0x3D, 0x8E, 0x00, 0x01, 0x00} },/* ; 02 (400x) */
@@ -1694,7 +1682,7 @@ static struct XGI_LVDSCRT1HDataStruct XGI_LVDSCRT11024x768_2_Hx75[] = {
 };
 
 /* CR06,CR07,CR10,CR11,CR15,CR16,SR0A */
-static struct XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11024x768_2_Vx75[] = {
+static const struct XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11024x768_2_Vx75[] = {
         { {0x24, 0xBB, 0x31, 0x87, 0x5D, 0x25, 0x30} },/* ; 00 (x350) */
         { {0x24, 0xBB, 0x4A, 0x80, 0x8F, 0x25, 0x30} },/* ; 01 (x400) */
         { {0x24, 0xBB, 0x72, 0x88, 0xDF, 0x25, 0x30} },/* ; 02 (x480) */
@@ -1703,7 +1691,7 @@ static struct XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11024x768_2_Vx75[] = {
 };
 
 /* CR00,CR02,CR03,CR04,CR05,SR0B,SR0C,SR0E */
-static struct XGI_LVDSCRT1HDataStruct XGI_LVDSCRT11280x1024_1_Hx75[] = {
+static const struct XGI_LVDSCRT1HDataStruct XGI_LVDSCRT11280x1024_1_Hx75[] = {
         { {0x56, 0x27, 0x9A, 0x30, 0x1E, 0x00, 0x05, 0x00} },/* ; 00 (320x) */
         { {0x56, 0x27, 0x9A, 0x30, 0x1E, 0x00, 0x05, 0x00} },/* ; 01 (360x) */
         { {0x60, 0x31, 0x84, 0x3A, 0x88, 0x00, 0x01, 0x00} },/* ; 02 (400x) */
@@ -1716,7 +1704,7 @@ static struct XGI_LVDSCRT1HDataStruct XGI_LVDSCRT11280x1024_1_Hx75[] = {
 };
 
 /* CR06,CR07,CR10,CR11,CR15,CR16,SR0A */
-static struct XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11280x1024_1_Vx75[] = {
+static const struct XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11280x1024_1_Vx75[] = {
         { {0x86, 0xD1, 0xBC, 0x80, 0xBB, 0xE5, 0x00} },/* ; 00 (x350) */
         { {0xB8, 0x1F, 0x90, 0x84, 0x8F, 0xB9, 0x30} },/* ; 01 (x400) */
         { {0x08, 0x3E, 0xE0, 0x84, 0xDF, 0x09, 0x00} },/* ; 02 (x480) */
@@ -1725,7 +1713,7 @@ static struct XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11280x1024_1_Vx75[] = {
         { {0x28, 0x5A, 0x13, 0x87, 0xFF, 0x29, 0xA9} } /* ; 05 (x1024) */
 };
 /* CR00,CR02,CR03,CR04,CR05,SR0B,SR0C,SR0E */
-static struct XGI_LVDSCRT1HDataStruct XGI_LVDSCRT11280x1024_2_Hx75[] = {
+static const struct XGI_LVDSCRT1HDataStruct XGI_LVDSCRT11280x1024_2_Hx75[] = {
         { {0x7E, 0x3B, 0x9A, 0x44, 0x12, 0x00, 0x01, 0x00} },/* ; 00 (320x) */
         { {0x7E, 0x3B, 0x9A, 0x44, 0x12, 0x00, 0x01, 0x00} },/* ; 01 (360x) */
         { {0x7E, 0x40, 0x84, 0x49, 0x91, 0x00, 0x01, 0x00} },/* ; 02 (400x) */
@@ -1738,7 +1726,7 @@ static struct XGI_LVDSCRT1HDataStruct XGI_LVDSCRT11280x1024_2_Hx75[] = {
 };
 
 /* CR06,CR07,CR10,CR11,CR15,CR16,SR0A */
-static struct XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11280x1024_2_Vx75[] = {
+static const struct XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11280x1024_2_Vx75[] = {
         { {0x28, 0xD2, 0xAF, 0x83, 0xAE, 0xD8, 0xA1} },/* ; 00 (x350) */
         { {0x28, 0xD2, 0xC8, 0x8C, 0xC7, 0xF2, 0x81} },/* ; 01 (x400) */
         { {0x28, 0xD2, 0xF0, 0x84, 0xEF, 0x1A, 0xB1} },/* ; 02 (x480) */
@@ -1748,115 +1736,141 @@ static struct XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11280x1024_2_Vx75[] = {
 };
 
 /*add for new UNIVGABIOS*/
-static struct XGI330_LCDDataTablStruct XGI_LCDDataTable[] = {
-        {Panel_1024x768, 0x0019, 0x0001, 0}, /* XGI_ExtLCD1024x768Data */
-        {Panel_1024x768, 0x0019, 0x0000, 1}, /* XGI_StLCD1024x768Data */
-        {Panel_1024x768, 0x0018, 0x0010, 2}, /* XGI_CetLCD1024x768Data */
-        {Panel_1280x1024, 0x0019, 0x0001, 3}, /* XGI_ExtLCD1280x1024Data */
-        {Panel_1280x1024, 0x0019, 0x0000, 4}, /* XGI_StLCD1280x1024Data */
-        {Panel_1280x1024, 0x0018, 0x0010, 5}, /* XGI_CetLCD1280x1024Data */
-        {Panel_1400x1050, 0x0019, 0x0001, 6}, /* XGI_ExtLCD1400x1050Data */
-        {Panel_1400x1050, 0x0019, 0x0000, 7}, /* XGI_StLCD1400x1050Data */
-        {Panel_1400x1050, 0x0018, 0x0010, 8}, /* XGI_CetLCD1400x1050Data */
-        {Panel_1600x1200, 0x0019, 0x0001, 9}, /* XGI_ExtLCD1600x1200Data */
-        {Panel_1600x1200, 0x0019, 0x0000, 10}, /* XGI_StLCD1600x1200Data */
-        {PanelRef60Hz, 0x0008, 0x0008, 11}, /* XGI_NoScalingData */
-        {Panel_1024x768x75, 0x0019, 0x0001, 12}, /* XGI_ExtLCD1024x768x75Data */
-        {Panel_1024x768x75, 0x0019, 0x0000, 13}, /* XGI_StLCD1024x768x75Data */
-        {Panel_1024x768x75, 0x0018, 0x0010, 14}, /* XGI_CetLCD1024x768x75Data */
-        /* XGI_ExtLCD1280x1024x75Data */
-        {Panel_1280x1024x75, 0x0019, 0x0001, 15},
-        /* XGI_StLCD1280x1024x75Data */
-        {Panel_1280x1024x75, 0x0019, 0x0000, 16},
-        /* XGI_CetLCD1280x1024x75Data */
-        {Panel_1280x1024x75, 0x0018, 0x0010, 17},
-        {PanelRef75Hz, 0x0008, 0x0008, 18}, /* XGI_NoScalingDatax75 */
-        {0xFF, 0x0000, 0x0000, 0} /* End of table */
-};
-
-static struct XGI330_LCDDataTablStruct XGI_LCDDesDataTable[] = {
-        {Panel_1024x768, 0x0019, 0x0001, 0}, /* XGI_ExtLCDDes1024x768Data */
-        {Panel_1024x768, 0x0019, 0x0000, 1}, /* XGI_StLCDDes1024x768Data */
-        {Panel_1024x768, 0x0018, 0x0010, 2}, /* XGI_CetLCDDes1024x768Data */
-        {Panel_1280x1024, 0x0019, 0x0001, 3}, /* XGI_ExtLCDDes1280x1024Data */
-        {Panel_1280x1024, 0x0019, 0x0000, 4}, /* XGI_StLCDDes1280x1024Data */
-        {Panel_1280x1024, 0x0018, 0x0010, 5}, /* XGI_CetLCDDes1280x1024Data */
-        {Panel_1400x1050, 0x0019, 0x0001, 6}, /* XGI_ExtLCDDes1400x1050Data */
-        {Panel_1400x1050, 0x0019, 0x0000, 7}, /* XGI_StLCDDes1400x1050Data */
-        {Panel_1400x1050, 0x0418, 0x0010, 8}, /* XGI_CetLCDDes1400x1050Data */
-        {Panel_1400x1050, 0x0418, 0x0410, 9}, /* XGI_CetLCDDes1400x1050Data2 */
-        {Panel_1600x1200, 0x0019, 0x0001, 10}, /* XGI_ExtLCDDes1600x1200Data */
-        {Panel_1600x1200, 0x0019, 0x0000, 11}, /* XGI_StLCDDes1600x1200Data */
-        {PanelRef60Hz, 0x0008, 0x0008, 12}, /* XGI_NoScalingDesData */
-        /* XGI_ExtLCDDes1024x768x75Data */
-        {Panel_1024x768x75, 0x0019, 0x0001, 13},
-        /* XGI_StLCDDes1024x768x75Data */
-        {Panel_1024x768x75, 0x0019, 0x0000, 14},
-        /* XGI_CetLCDDes1024x768x75Data */
-        {Panel_1024x768x75, 0x0018, 0x0010, 15},
-        /* XGI_ExtLCDDes1280x1024x75Data */
-        {Panel_1280x1024x75, 0x0019, 0x0001, 16},
-        /* XGI_StLCDDes1280x1024x75Data */
-        {Panel_1280x1024x75, 0x0019, 0x0000, 17},
-        /* XGI_CetLCDDes1280x1024x75Data */
-        {Panel_1280x1024x75, 0x0018, 0x0010, 18},
-        {PanelRef75Hz, 0x0008, 0x0008, 19}, /* XGI_NoScalingDesDatax75 */
-        {0xFF, 0x0000, 0x0000, 0}
-};
-
-static struct XGI330_LCDDataTablStruct xgifb_epllcd_crt1[] = {
-        {Panel_1024x768, 0x0018, 0x0000, 0}, /* XGI_LVDSCRT11024x768_1 */
-        {Panel_1024x768, 0x0018, 0x0010, 1}, /* XGI_LVDSCRT11024x768_2 */
-        {Panel_1280x1024, 0x0018, 0x0000, 2}, /* XGI_LVDSCRT11280x1024_1 */
-        {Panel_1280x1024, 0x0018, 0x0010, 3}, /* XGI_LVDSCRT11280x1024_2 */
-        {Panel_1400x1050, 0x0018, 0x0000, 4}, /* XGI_LVDSCRT11400x1050_1 */
-        {Panel_1400x1050, 0x0018, 0x0010, 5}, /* XGI_LVDSCRT11400x1050_2 */
-        {Panel_1600x1200, 0x0018, 0x0000, 6}, /* XGI_LVDSCRT11600x1200_1 */
-        {Panel_1024x768x75, 0x0018, 0x0000, 7}, /* XGI_LVDSCRT11024x768_1x75 */
-        {Panel_1024x768x75, 0x0018, 0x0010, 8}, /* XGI_LVDSCRT11024x768_2x75 */
-        {Panel_1280x1024x75, 0x0018, 0x0000, 9}, /*XGI_LVDSCRT11280x1024_1x75*/
-        {Panel_1280x1024x75, 0x0018, 0x0010, 10},/*XGI_LVDSCRT11280x1024_2x75*/
-        {0xFF, 0x0000, 0x0000, 0}
-};
-
-static struct XGI330_LCDDataTablStruct XGI_EPLLCDDataPtr[] = {
-        {Panel_1024x768, 0x0018, 0x0000, 0}, /* XGI_LVDS1024x768Data_1 */
-        {Panel_1024x768, 0x0018, 0x0010, 1}, /* XGI_LVDS1024x768Data_2 */
-        {Panel_1280x1024, 0x0018, 0x0000, 2}, /* XGI_LVDS1280x1024Data_1 */
-        {Panel_1280x1024, 0x0018, 0x0010, 3}, /* XGI_LVDS1280x1024Data_2 */
-        {Panel_1400x1050, 0x0018, 0x0000, 4}, /* XGI_LVDS1400x1050Data_1 */
-        {Panel_1400x1050, 0x0018, 0x0010, 5}, /* XGI_LVDS1400x1050Data_2 */
-        {Panel_1600x1200, 0x0018, 0x0000, 6}, /* XGI_LVDS1600x1200Data_1 */
-        {PanelRef60Hz, 0x0008, 0x0008, 7}, /* XGI_LVDSNoScalingData */
-        {Panel_1024x768x75, 0x0018, 0x0000, 8}, /* XGI_LVDS1024x768Data_1x75 */
-        {Panel_1024x768x75, 0x0018, 0x0010, 9}, /* XGI_LVDS1024x768Data_2x75 */
-        /* XGI_LVDS1280x1024Data_1x75 */
-        {Panel_1280x1024x75, 0x0018, 0x0000, 10},
-        /* XGI_LVDS1280x1024Data_2x75 */
-        {Panel_1280x1024x75, 0x0018, 0x0010, 11},
-        {PanelRef75Hz, 0x0008, 0x0008, 12}, /* XGI_LVDSNoScalingDatax75 */
-        {0xFF, 0x0000, 0x0000, 0}
-};
-
-static struct XGI330_LCDDataTablStruct XGI_EPLLCDDesDataPtr[] = {
-        {Panel_1024x768, 0x0018, 0x0000, 0}, /* XGI_LVDS1024x768Des_1 */
-        {Panel_1024x768, 0x0618, 0x0410, 1}, /* XGI_LVDS1024x768Des_3 */
-        {Panel_1024x768, 0x0018, 0x0010, 2}, /* XGI_LVDS1024x768Des_2 */
-        {Panel_1280x1024, 0x0018, 0x0000, 3}, /* XGI_LVDS1280x1024Des_1 */
-        {Panel_1280x1024, 0x0018, 0x0010, 4}, /* XGI_LVDS1280x1024Des_2 */
-        {Panel_1400x1050, 0x0018, 0x0000, 5}, /* XGI_LVDS1400x1050Des_1 */
-        {Panel_1400x1050, 0x0018, 0x0010, 6}, /* XGI_LVDS1400x1050Des_2 */
-        {Panel_1600x1200, 0x0018, 0x0000, 7}, /* XGI_LVDS1600x1200Des_1 */
-        {PanelRef60Hz, 0x0008, 0x0008, 8},  /* XGI_LVDSNoScalingDesData */
-        {Panel_1024x768x75, 0x0018, 0x0000, 9}, /* XGI_LVDS1024x768Des_1x75 */
-        {Panel_1024x768x75, 0x0618, 0x0410, 10}, /* XGI_LVDS1024x768Des_3x75 */
-        {Panel_1024x768x75, 0x0018, 0x0010, 11}, /* XGI_LVDS1024x768Des_2x75 */
-        /* XGI_LVDS1280x1024Des_1x75 */
-        {Panel_1280x1024x75, 0x0018, 0x0000, 12},
-        /* XGI_LVDS1280x1024Des_2x75 */
-        {Panel_1280x1024x75, 0x0018, 0x0010, 13},
-        {PanelRef75Hz, 0x0008, 0x0008, 14}, /* XGI_LVDSNoScalingDesDatax75 */
-        {0xFF, 0x0000, 0x0000, 0}
+static const struct XGI330_LCDDataTablStruct XGI_LCDDataTable[] = {
+        {Panel_1024x768, 0x0019, 0x0001, XGI_ExtLCD1024x768Data },
+        {Panel_1024x768, 0x0019, 0x0000, XGI_StLCD1024x768Data },
+        {Panel_1024x768, 0x0018, 0x0010, XGI_CetLCD1024x768Data },
+        {Panel_1280x1024, 0x0019, 0x0001, XGI_ExtLCD1280x1024Data },
+        {Panel_1280x1024, 0x0019, 0x0000, XGI_StLCD1280x1024Data },
+        {Panel_1280x1024, 0x0018, 0x0010, XGI_CetLCD1280x1024Data },
+        {Panel_1400x1050, 0x0019, 0x0001, xgifb_lcd_1400x1050 },
+        {Panel_1400x1050, 0x0019, 0x0000, xgifb_lcd_1400x1050 },
+        {Panel_1400x1050, 0x0018, 0x0010, XGI_CetLCD1400x1050Data },
+        {Panel_1600x1200, 0x0019, 0x0001, XGI_ExtLCD1600x1200Data },
+        {Panel_1600x1200, 0x0019, 0x0000, XGI_StLCD1600x1200Data },
+        {PanelRef60Hz, 0x0008, 0x0008, XGI_NoScalingData },
+        {Panel_1024x768x75, 0x0019, 0x0001, XGI_ExtLCD1024x768x75Data },
+        {Panel_1024x768x75, 0x0019, 0x0000, XGI_ExtLCD1024x768x75Data },
+        {Panel_1024x768x75, 0x0018, 0x0010, XGI_CetLCD1024x768x75Data },
+        {Panel_1280x1024x75, 0x0019, 0x0001, xgifb_lcd_1280x1024x75 },
+        {Panel_1280x1024x75, 0x0019, 0x0000, xgifb_lcd_1280x1024x75 },
+        {Panel_1280x1024x75, 0x0018, 0x0010, XGI_CetLCD1280x1024x75Data },
+        {PanelRef75Hz, 0x0008, 0x0008, XGI_NoScalingDatax75 },
+        {0xFF, 0x0000, 0x0000, NULL } /* End of table */
+};
+
+static const struct XGI330_LCDDataTablStruct XGI_LCDDesDataTable[] = {
+        {Panel_1024x768, 0x0019, 0x0001, XGI_ExtLCDDes1024x768Data },
+        {Panel_1024x768, 0x0019, 0x0000, XGI_StLCDDes1024x768Data },
+        {Panel_1024x768, 0x0018, 0x0010, XGI_CetLCDDes1024x768Data },
+        {Panel_1280x1024, 0x0019, 0x0001, XGI_ExtLCDDes1280x1024Data },
+        {Panel_1280x1024, 0x0019, 0x0000, XGI_StLCDDes1280x1024Data },
+        {Panel_1280x1024, 0x0018, 0x0010, XGI_CetLCDDes1280x1024Data },
+        {Panel_1400x1050, 0x0019, 0x0001, xgifb_lcddes_1400x1050 },
+        {Panel_1400x1050, 0x0019, 0x0000, xgifb_lcddes_1400x1050 },
+        {Panel_1400x1050, 0x0418, 0x0010, XGI_CetLCDDes1400x1050Data },
+        {Panel_1400x1050, 0x0418, 0x0410, XGI_CetLCDDes1400x1050Data2 },
+        {Panel_1600x1200, 0x0019, 0x0001, XGI_ExtLCDDes1600x1200Data },
+        {Panel_1600x1200, 0x0019, 0x0000, XGI_StLCDDes1600x1200Data },
+        {PanelRef60Hz, 0x0008, 0x0008, XGI_NoScalingDesData },
+        {Panel_1024x768x75, 0x0019, 0x0001, xgifb_lcddes_1024x768x75 },
+        {Panel_1024x768x75, 0x0019, 0x0000, xgifb_lcddes_1024x768x75 },
+        {Panel_1024x768x75, 0x0018, 0x0010, XGI_CetLCDDes1024x768x75Data },
+        {Panel_1280x1024x75, 0x0019, 0x0001, xgifb_lcddes_1280x1024x75 },
+        {Panel_1280x1024x75, 0x0019, 0x0000, xgifb_lcddes_1280x1024x75 },
+        {Panel_1280x1024x75, 0x0018, 0x0010, XGI_CetLCDDes1280x1024x75Data },
+        {PanelRef75Hz, 0x0008, 0x0008, XGI_NoScalingDesDatax75 },
+        {0xFF, 0x0000, 0x0000, NULL }
+};
+
+static const struct XGI330_LCDDataTablStruct xgifb_lcddldes[] = {
+        {Panel_1024x768, 0x0019, 0x0001, XGI_ExtLCDDes1024x768Data },
+        {Panel_1024x768, 0x0019, 0x0000, XGI_StLCDDes1024x768Data },
+        {Panel_1024x768, 0x0018, 0x0010, XGI_CetLCDDes1024x768Data },
+        {Panel_1280x1024, 0x0019, 0x0001, XGI_ExtLCDDLDes1280x1024Data },
+        {Panel_1280x1024, 0x0019, 0x0000, XGI_StLCDDLDes1280x1024Data },
+        {Panel_1280x1024, 0x0018, 0x0010, XGI_CetLCDDLDes1280x1024Data },
+        {Panel_1400x1050, 0x0019, 0x0001, xgifb_lcddldes_1400x1050 },
+        {Panel_1400x1050, 0x0019, 0x0000, xgifb_lcddldes_1400x1050 },
+        {Panel_1400x1050, 0x0418, 0x0010, XGI_CetLCDDes1400x1050Data },
+        {Panel_1400x1050, 0x0418, 0x0410, XGI_CetLCDDes1400x1050Data2 },
+        {Panel_1600x1200, 0x0019, 0x0001, XGI_ExtLCDDLDes1600x1200Data },
+        {Panel_1600x1200, 0x0019, 0x0000, XGI_StLCDDLDes1600x1200Data },
+        {PanelRef60Hz, 0x0008, 0x0008, XGI_NoScalingDesData },
+        {Panel_1024x768x75, 0x0019, 0x0001, xgifb_lcddes_1024x768x75 },
+        {Panel_1024x768x75, 0x0019, 0x0000, xgifb_lcddes_1024x768x75 },
+        {Panel_1024x768x75, 0x0018, 0x0010, XGI_CetLCDDes1024x768x75Data },
+        {Panel_1280x1024x75, 0x0019, 0x0001, xgifb_lcddldes_1280x1024x75 },
+        {Panel_1280x1024x75, 0x0019, 0x0000, xgifb_lcddldes_1280x1024x75 },
+        {Panel_1280x1024x75, 0x0018, 0x0010, XGI_CetLCDDLDes1280x1024x75Data },
+        {PanelRef75Hz, 0x0008, 0x0008, XGI_NoScalingDesDatax75 },
+        {0xFF, 0x0000, 0x0000, NULL }
+};
+
+static const struct XGI330_LCDDataTablStruct xgifb_epllcd_crt1_h[] = {
+        {Panel_1024x768, 0x0018, 0x0000, XGI_LVDSCRT11024x768_1_H },
+        {Panel_1024x768, 0x0018, 0x0010, XGI_LVDSCRT11024x768_2_H },
+        {Panel_1280x1024, 0x0018, 0x0000, XGI_LVDSCRT11280x1024_1_H },
+        {Panel_1280x1024, 0x0018, 0x0010, XGI_LVDSCRT11280x1024_2_H },
+        {Panel_1400x1050, 0x0018, 0x0000, XGI_LVDSCRT11400x1050_1_H },
+        {Panel_1400x1050, 0x0018, 0x0010, XGI_LVDSCRT11400x1050_2_H },
+        {Panel_1600x1200, 0x0018, 0x0000, XGI_LVDSCRT11600x1200_1_H },
+        {Panel_1024x768x75, 0x0018, 0x0000, XGI_LVDSCRT11024x768_1_Hx75 },
+        {Panel_1024x768x75, 0x0018, 0x0010, XGI_LVDSCRT11024x768_2_Hx75 },
+        {Panel_1280x1024x75, 0x0018, 0x0000, XGI_LVDSCRT11280x1024_1_Hx75 },
+        {Panel_1280x1024x75, 0x0018, 0x0010, XGI_LVDSCRT11280x1024_2_Hx75 },
+        {0xFF, 0x0000, 0x0000, NULL }
+};
+
+static const struct XGI330_LCDDataTablStruct xgifb_epllcd_crt1_v[] = {
+        {Panel_1024x768, 0x0018, 0x0000, XGI_LVDSCRT11024x768_1_V },
+        {Panel_1024x768, 0x0018, 0x0010, XGI_LVDSCRT11024x768_2_V },
+        {Panel_1280x1024, 0x0018, 0x0000, XGI_LVDSCRT11280x1024_1_V },
+        {Panel_1280x1024, 0x0018, 0x0010, XGI_LVDSCRT11280x1024_2_V },
+        {Panel_1400x1050, 0x0018, 0x0000, XGI_LVDSCRT11400x1050_1_V },
+        {Panel_1400x1050, 0x0018, 0x0010, XGI_LVDSCRT11400x1050_2_V },
+        {Panel_1600x1200, 0x0018, 0x0000, XGI_LVDSCRT11600x1200_1_V },
+        {Panel_1024x768x75, 0x0018, 0x0000, XGI_LVDSCRT11024x768_1_Vx75 },
+        {Panel_1024x768x75, 0x0018, 0x0010, XGI_LVDSCRT11024x768_2_Vx75 },
+        {Panel_1280x1024x75, 0x0018, 0x0000, XGI_LVDSCRT11280x1024_1_Vx75 },
+        {Panel_1280x1024x75, 0x0018, 0x0010, XGI_LVDSCRT11280x1024_2_Vx75 },
+        {0xFF, 0x0000, 0x0000, NULL }
+};
+
+static const struct XGI330_LCDDataTablStruct XGI_EPLLCDDataPtr[] = {
+        {Panel_1024x768, 0x0018, 0x0000, XGI_LVDS1024x768Data_1 },
+        {Panel_1024x768, 0x0018, 0x0010, XGI_LVDS1024x768Data_2 },
+        {Panel_1280x1024, 0x0018, 0x0000, XGI_LVDS1280x1024Data_1 },
+        {Panel_1280x1024, 0x0018, 0x0010, XGI_LVDS1280x1024Data_2 },
+        {Panel_1400x1050, 0x0018, 0x0000, XGI_LVDS1400x1050Data_1 },
+        {Panel_1400x1050, 0x0018, 0x0010, XGI_LVDS1400x1050Data_2 },
+        {Panel_1600x1200, 0x0018, 0x0000, XGI_LVDS1600x1200Data_1 },
+        {PanelRef60Hz, 0x0008, 0x0008, XGI_LVDSNoScalingData },
+        {Panel_1024x768x75, 0x0018, 0x0000, XGI_LVDS1024x768Data_1x75 },
+        {Panel_1024x768x75, 0x0018, 0x0010, XGI_LVDS1024x768Data_2x75 },
+        {Panel_1280x1024x75, 0x0018, 0x0000, XGI_LVDS1280x1024Data_1x75 },
+        {Panel_1280x1024x75, 0x0018, 0x0010, XGI_LVDS1280x1024Data_2x75 },
+        {PanelRef75Hz, 0x0008, 0x0008, XGI_LVDSNoScalingDatax75 },
+        {0xFF, 0x0000, 0x0000, NULL }
+};
+
+static const struct XGI330_LCDDataTablStruct XGI_EPLLCDDesDataPtr[] = {
+        {Panel_1024x768, 0x0018, 0x0000, XGI_LVDS1024x768Des_1 },
+        {Panel_1024x768, 0x0618, 0x0410, XGI_LVDS1024x768Des_3 },
+        {Panel_1024x768, 0x0018, 0x0010, XGI_LVDS1024x768Des_2 },
+        {Panel_1280x1024, 0x0018, 0x0000, XGI_LVDS1280x1024Des_1 },
+        {Panel_1280x1024, 0x0018, 0x0010, XGI_LVDS1280x1024Des_2 },
+        {Panel_1400x1050, 0x0018, 0x0000, XGI_LVDS1400x1050Des_1 },
+        {Panel_1400x1050, 0x0018, 0x0010, XGI_LVDS1400x1050Des_2 },
+        {Panel_1600x1200, 0x0018, 0x0000, XGI_LVDS1600x1200Des_1 },
+        {PanelRef60Hz, 0x0008, 0x0008, XGI_LVDSNoScalingDesData },
+        {Panel_1024x768x75, 0x0018, 0x0000, XGI_LVDS1024x768Des_1x75 },
+        {Panel_1024x768x75, 0x0618, 0x0410, XGI_LVDS1024x768Des_3x75 },
+        {Panel_1024x768x75, 0x0018, 0x0010, XGI_LVDS1024x768Des_2x75 },
+        {Panel_1280x1024x75, 0x0018, 0x0000, XGI_LVDS1280x1024Des_1x75 },
+        {Panel_1280x1024x75, 0x0018, 0x0010, XGI_LVDS1280x1024Des_2x75 },
+        {PanelRef75Hz, 0x0008, 0x0008, XGI_LVDSNoScalingDesDatax75 },
+        {0xFF, 0x0000, 0x0000, NULL }
 };
 
 static const struct XGI330_TVDataTablStruct XGI_TVDataTable[] = {
@@ -1877,7 +1891,7 @@ static const struct XGI330_TVDataTablStruct XGI_TVDataTable[] = {
 };
 
 /* Dual link only */
-static struct XGI330_LCDCapStruct  XGI_LCDDLCapList[] = {
+static const struct XGI330_LCDCapStruct XGI_LCDDLCapList[] = {
 /* LCDCap1024x768 */
         {Panel_1024x768, DefaultLCDCap, 0, 0x88, 0x06, VCLK65_315,
         0x6C, 0xC3, 0x35, 0x62, 0x02, 0x14, 0x0A, 0x02, 0x00,
@@ -1912,7 +1926,7 @@ static struct XGI330_LCDCapStruct  XGI_LCDDLCapList[] = {
         0x30, 0x10, 0x5A, 0x10, 0x10, 0x0A, 0xC0, 0x28, 0x10}
 };
 
-static struct XGI330_LCDCapStruct  XGI_LCDCapList[] = {
+static const struct XGI330_LCDCapStruct XGI_LCDCapList[] = {
 /* LCDCap1024x768 */
         {Panel_1024x768, DefaultLCDCap, 0, 0x88, 0x06, VCLK65_315,
         0x6C, 0xC3, 0x35, 0x62, 0x02, 0x14, 0x0A, 0x02, 0x00,
@@ -1947,7 +1961,7 @@ static struct XGI330_LCDCapStruct  XGI_LCDCapList[] = {
         0x30, 0x10, 0x5A, 0x10, 0x10, 0x0A, 0xC0, 0x28, 0x10}
 };
 
-static struct XGI_Ext2Struct XGI330_RefIndex[] = {
+const struct XGI_Ext2Struct XGI330_RefIndex[] = {
         {Mode32Bpp + SupportAllCRT2 + SyncPN, RES320x200, VCLK25_175,
         0x00, 0x10, 0x59, 320, 200},/* 00 */
         {Mode32Bpp + SupportAllCRT2 + SyncPN, RES320x200, VCLK25_175,
@@ -2101,21 +2115,13 @@ static struct XGI_Ext2Struct XGI330_RefIndex[] = {
         0x30, 0x47, 0x37, 1024, 768},/* 48 1024x768x160Hz */
 };
 
-static unsigned char XGI330_ScreenOffset[] = {
+static const unsigned char XGI330_ScreenOffset[] = {
         0x14, 0x19, 0x20, 0x28, 0x32, 0x40,
         0x50, 0x64, 0x78, 0x80, 0x2d, 0x35,
         0x57, 0x48
 };
 
-static struct SiS_StResInfo_S XGI330_StResInfo[] = {
-        {640, 400},
-        {640, 350},
-        {720, 400},
-        {720, 350},
-        {640, 480}
-};
-
-static struct SiS_ModeResInfo_S XGI330_ModeResInfo[] = {
+static const struct SiS_ModeResInfo_S XGI330_ModeResInfo[] = {
         { 320,  200, 8,  8},
         { 320,  240, 8,  8},
         { 320,  400, 8,  8},
@@ -2141,7 +2147,7 @@ static struct SiS_ModeResInfo_S XGI330_ModeResInfo[] = {
         {1152,  864, 8, 16}
 };
 
-static struct SiS_VCLKData XGI_VCLKData[] = {
+const struct SiS_VCLKData XGI_VCLKData[] = {
         /* SR2B,SR2C,SR2D */
         {0x1B, 0xE1,  25}, /* 00 (25.175MHz) */
         {0x4E, 0xE4,  28}, /* 01 (28.322MHz) */
@@ -2234,7 +2240,7 @@ static struct SiS_VCLKData XGI_VCLKData[] = {
         {0xFF, 0x00,   0}  /* End mark */
 };
 
-static struct SiS_VBVCLKData XGI_VBVCLKData[] = {
+static const struct SiS_VBVCLKData XGI_VBVCLKData[] = {
         {0x1B, 0xE1,  25}, /* 00 (25.175MHz) */
         {0x4E, 0xE4,  28}, /* 01 (28.322MHz) */
         {0x57, 0xE4,  31}, /* 02 (31.500MHz) */
@@ -2329,7 +2335,7 @@ static struct SiS_VBVCLKData XGI_VBVCLKData[] = {
 #define XGI301TVDelay 0x22
 #define XGI301LCDDelay 0x12
 
-static unsigned char TVAntiFlickList[] = {/* NTSCAntiFlicker */
+static const unsigned char TVAntiFlickList[] = {/* NTSCAntiFlicker */
         0x04, /* ; 0 Adaptive */
         0x00, /* ; 1 new anti-flicker ? */
 
@@ -2341,7 +2347,7 @@ static unsigned char TVAntiFlickList[] = {/* NTSCAntiFlicker */
 };
 
 
-static unsigned char TVEdgeList[] = {
+static const unsigned char TVEdgeList[] = {
         0x00, /* ; 0 NTSC No Edge enhance */
         0x04, /* ; 1 NTSC Adaptive Edge enhance */
         0x00, /* ; 0 PAL No Edge enhance */
@@ -2350,7 +2356,7 @@ static unsigned char TVEdgeList[] = {
         0x00  /* ; 1 HiTV */
 };
 
-static unsigned long TVPhaseList[] = {
+static const unsigned long TVPhaseList[] = {
         0x08BAED21, /* ; 0 NTSC phase */
         0x00E3052A, /* ; 1 PAL phase */
         0x9B2EE421, /* ; 2 PAL-M phase */
@@ -2367,7 +2373,7 @@ static unsigned long TVPhaseList[] = {
         0xE00A831E  /* ; D PAL-M 1024x768 */
 };
 
-static unsigned char NTSCYFilter1[] = {
+static const unsigned char NTSCYFilter1[] = {
         0x00, 0xF4, 0x10, 0x38, /* 0 : 320x text mode */
         0x00, 0xF4, 0x10, 0x38, /* 1 : 360x text mode */
         0xEB, 0x04, 0x25, 0x18, /* 2 : 640x text mode */
@@ -2377,7 +2383,7 @@ static unsigned char NTSCYFilter1[] = {
         0xEB, 0x15, 0x25, 0xF6  /* 6 : 800x gra. mode */
 };
 
-static unsigned char PALYFilter1[] = {
+static const unsigned char PALYFilter1[] = {
         0x00, 0xF4, 0x10, 0x38, /* 0 : 320x text mode */
         0x00, 0xF4, 0x10, 0x38, /* 1 : 360x text mode */
         0xF1, 0xF7, 0x1F, 0x32, /* 2 : 640x text mode */
@@ -2387,7 +2393,7 @@ static unsigned char PALYFilter1[] = {
         0xFC, 0xFB, 0x14, 0x2A  /* 6 : 800x gra. mode */
 };
 
-static unsigned char xgifb_palmn_yfilter1[] = {
+static const unsigned char xgifb_palmn_yfilter1[] = {
         0x00, 0xF4, 0x10, 0x38, /* 0 : 320x text mode */
         0x00, 0xF4, 0x10, 0x38, /* 1 : 360x text mode */
         0xEB, 0x04, 0x10, 0x18, /* 2 : 640x text mode */
@@ -2398,7 +2404,7 @@ static unsigned char xgifb_palmn_yfilter1[] = {
         0xFF, 0xFF, 0xFF, 0xFF  /* End of Table */
 };
 
-static unsigned char xgifb_yfilter2[] = {
+static const unsigned char xgifb_yfilter2[] = {
         0xFF, 0x03, 0x02, 0xF6, 0xFC, 0x27, 0x46, /* 0 : 320x text mode */
         0x01, 0x02, 0xFE, 0xF7, 0x03, 0x27, 0x3C, /* 1 : 360x text mode */
         0xFF, 0x03, 0x02, 0xF6, 0xFC, 0x27, 0x46, /* 2 : 640x text mode */
@@ -2409,13 +2415,13 @@ static unsigned char xgifb_yfilter2[] = {
         0xFF, 0xFF, 0xFC, 0x00, 0x0F, 0x22, 0x28  /* 7 : 1024xgra. mode */
 };
 
-static unsigned char XGI_NTSC1024AdjTime[] = {
+static const unsigned char XGI_NTSC1024AdjTime[] = {
         0xa7, 0x07, 0xf2, 0x6e, 0x17, 0x8b, 0x73, 0x53,
         0x13, 0x40, 0x34, 0xF4, 0x63, 0xBB, 0xCC, 0x7A,
         0x58, 0xe4, 0x73, 0xd0, 0x13
 };
 
-static struct XGI301C_Tap4TimingStruct xgifb_tap4_timing[] = {
+static const struct XGI301C_Tap4TimingStruct xgifb_tap4_timing[] = {
         {0, {
         0x00, 0x20, 0x00, 0x00, 0x7F, 0x20, 0x02, 0x7F, /* ; C0-C7 */
         0x7D, 0x20, 0x04, 0x7F, 0x7D, 0x1F, 0x06, 0x7E, /* ; C8-CF */
@@ -2429,7 +2435,7 @@ static struct XGI301C_Tap4TimingStruct xgifb_tap4_timing[] = {
         }
 };
 
-static struct XGI301C_Tap4TimingStruct PALTap4Timing[] = {
+static const struct XGI301C_Tap4TimingStruct PALTap4Timing[] = {
         {600,   {
                 0x05, 0x19, 0x05, 0x7D, 0x03, 0x19, 0x06, 0x7E, /* ; C0-C7 */
                 0x02, 0x19, 0x08, 0x7D, 0x01, 0x18, 0x0A, 0x7D, /* ; C8-CF */
@@ -2465,7 +2471,7 @@ static struct XGI301C_Tap4TimingStruct PALTap4Timing[] = {
         }
 };
 
-static struct XGI301C_Tap4TimingStruct xgifb_ntsc_525_tap4_timing[] = {
+static const struct XGI301C_Tap4TimingStruct xgifb_ntsc_525_tap4_timing[] = {
         {480,   {
                 0x04, 0x1A, 0x04, 0x7E, 0x03, 0x1A, 0x06, 0x7D, /* ; C0-C7 */
                 0x01, 0x1A, 0x08, 0x7D, 0x00, 0x19, 0x0A, 0x7D, /* ; C8-CF */
@@ -2501,7 +2507,7 @@ static struct XGI301C_Tap4TimingStruct xgifb_ntsc_525_tap4_timing[] = {
         }
 };
 
-static struct XGI301C_Tap4TimingStruct YPbPr750pTap4Timing[] = {
+static const struct XGI301C_Tap4TimingStruct YPbPr750pTap4Timing[] = {
         {0xFFFF, {
                  0x05, 0x19, 0x05, 0x7D, 0x03, 0x19, 0x06, 0x7E, /* ; C0-C7 */
                  0x02, 0x19, 0x08, 0x7D, 0x01, 0x18, 0x0A, 0x7D, /* ; C8-CF */
diff --git a/drivers/staging/zram/zram_drv.c b/drivers/staging/zram/zram_drv.c
index 6edefde23722..fb4a7c94aed3 100644
--- a/drivers/staging/zram/zram_drv.c
+++ b/drivers/staging/zram/zram_drv.c
@@ -183,62 +183,25 @@ static inline int is_partial_io(struct bio_vec *bvec)
         return bvec->bv_len != PAGE_SIZE;
 }
 
-static int zram_bvec_read(struct zram *zram, struct bio_vec *bvec,
-                          u32 index, int offset, struct bio *bio)
+static int zram_decompress_page(struct zram *zram, char *mem, u32 index)
 {
-        int ret;
-        size_t clen;
-        struct page *page;
-        unsigned char *user_mem, *cmem, *uncmem = NULL;
-
-        page = bvec->bv_page;
-
-        if (zram_test_flag(zram, index, ZRAM_ZERO)) {
-                handle_zero_page(bvec);
-                return 0;
-        }
+        int ret = LZO_E_OK;
+        size_t clen = PAGE_SIZE;
+        unsigned char *cmem;
+        unsigned long handle = zram->table[index].handle;
 
-        /* Requested page is not present in compressed area */
-        if (unlikely(!zram->table[index].handle)) {
-                pr_debug("Read before write: sector=%lu, size=%u",
-                         (ulong)(bio->bi_sector), bio->bi_size);
-                handle_zero_page(bvec);
+        if (!handle || zram_test_flag(zram, index, ZRAM_ZERO)) {
+                memset(mem, 0, PAGE_SIZE);
                 return 0;
         }
 
-        if (is_partial_io(bvec)) {
-                /* Use  a temporary buffer to decompress the page */
-                uncmem = kmalloc(PAGE_SIZE, GFP_KERNEL);
-                if (!uncmem) {
-                        pr_info("Error allocating temp memory!\n");
-                        return -ENOMEM;
-                }
-        }
-
-        user_mem = kmap_atomic(page);
-        if (!is_partial_io(bvec))
-                uncmem = user_mem;
-        clen = PAGE_SIZE;
-
-        cmem = zs_map_object(zram->mem_pool, zram->table[index].handle,
-                                ZS_MM_RO);
-
-        if (zram->table[index].size == PAGE_SIZE) {
-                memcpy(uncmem, cmem, PAGE_SIZE);
-                ret = LZO_E_OK;
-        } else {
+        cmem = zs_map_object(zram->mem_pool, handle, ZS_MM_RO);
+        if (zram->table[index].size == PAGE_SIZE)
+                memcpy(mem, cmem, PAGE_SIZE);
+        else
                 ret = lzo1x_decompress_safe(cmem, zram->table[index].size,
-                                    uncmem, &clen);
-        }
-
-        if (is_partial_io(bvec)) {
-                memcpy(user_mem + bvec->bv_offset, uncmem + offset,
-                       bvec->bv_len);
-                kfree(uncmem);
-        }
-
-        zs_unmap_object(zram->mem_pool, zram->table[index].handle);
-        kunmap_atomic(user_mem);
+                                                mem, &clen);
+        zs_unmap_object(zram->mem_pool, handle);
 
         /* Should NEVER happen. Return bio error if it does. */
         if (unlikely(ret != LZO_E_OK)) {
@@ -247,36 +210,56 @@ static int zram_bvec_read(struct zram *zram, struct bio_vec *bvec,
                 return ret;
         }
 
-        flush_dcache_page(page);
-
         return 0;
 }
 
-static int zram_read_before_write(struct zram *zram, char *mem, u32 index)
+static int zram_bvec_read(struct zram *zram, struct bio_vec *bvec,
+                          u32 index, int offset, struct bio *bio)
 {
         int ret;
-        size_t clen = PAGE_SIZE;
-        unsigned char *cmem;
-        unsigned long handle = zram->table[index].handle;
+        struct page *page;
+        unsigned char *user_mem, *uncmem = NULL;
 
-        if (zram_test_flag(zram, index, ZRAM_ZERO) || !handle) {
-                memset(mem, 0, PAGE_SIZE);
+        page = bvec->bv_page;
+
+        if (unlikely(!zram->table[index].handle) ||
+                        zram_test_flag(zram, index, ZRAM_ZERO)) {
+                handle_zero_page(bvec);
                 return 0;
         }
 
-        cmem = zs_map_object(zram->mem_pool, handle, ZS_MM_RO);
-        ret = lzo1x_decompress_safe(cmem, zram->table[index].size,
-                                    mem, &clen);
-        zs_unmap_object(zram->mem_pool, handle);
+        user_mem = kmap_atomic(page);
+        if (is_partial_io(bvec))
+                /* Use  a temporary buffer to decompress the page */
+                uncmem = kmalloc(PAGE_SIZE, GFP_KERNEL);
+        else
+                uncmem = user_mem;
 
+        if (!uncmem) {
+                pr_info("Unable to allocate temp memory\n");
+                ret = -ENOMEM;
+                goto out_cleanup;
+        }
+
+        ret = zram_decompress_page(zram, uncmem, index);
         /* Should NEVER happen. Return bio error if it does. */
         if (unlikely(ret != LZO_E_OK)) {
                 pr_err("Decompression failed! err=%d, page=%u\n", ret, index);
                 zram_stat64_inc(zram, &zram->stats.failed_reads);
-                return ret;
+                goto out_cleanup;
         }
 
-        return 0;
+        if (is_partial_io(bvec))
+                memcpy(user_mem + bvec->bv_offset, uncmem + offset,
+                                bvec->bv_len);
+
+        flush_dcache_page(page);
+        ret = 0;
+out_cleanup:
+        kunmap_atomic(user_mem);
+        if (is_partial_io(bvec))
+                kfree(uncmem);
+        return ret;
 }
 
 static int zram_bvec_write(struct zram *zram, struct bio_vec *bvec, u32 index,
@@ -302,7 +285,7 @@ static int zram_bvec_write(struct zram *zram, struct bio_vec *bvec, u32 index,
                         ret = -ENOMEM;
                         goto out;
                 }
-                ret = zram_read_before_write(zram, uncmem, index);
+                ret = zram_decompress_page(zram, uncmem, index);
                 if (ret) {
                         kfree(uncmem);
                         goto out;
diff --git a/drivers/staging/zram/zram_drv.h b/drivers/staging/zram/zram_drv.h
index 572c0b1551d4..df2eec407db6 100644
--- a/drivers/staging/zram/zram_drv.h
+++ b/drivers/staging/zram/zram_drv.h
@@ -39,8 +39,8 @@ static const size_t max_zpage_size = PAGE_SIZE / 4 * 3;
 
 /*
  * NOTE: max_zpage_size must be less than or equal to:
- *   ZS_MAX_ALLOC_SIZE - sizeof(struct zobj_header)
- * otherwise, xv_malloc() would always return failure.
+ *   ZS_MAX_ALLOC_SIZE. Otherwise, zs_malloc() would
+ * always return failure.
  */
 
 /*-- End of configurable params */
diff --git a/drivers/staging/zram/zram_sysfs.c b/drivers/staging/zram/zram_sysfs.c
index edb0ed4125d5..de1eacf65dbd 100644
--- a/drivers/staging/zram/zram_sysfs.c
+++ b/drivers/staging/zram/zram_sysfs.c
@@ -15,6 +15,7 @@
 #include <linux/device.h>
 #include <linux/genhd.h>
 #include <linux/mm.h>
+#include <linux/kernel.h>
 
 #include "zram_drv.h"
 
@@ -54,13 +55,12 @@ static ssize_t disksize_show(struct device *dev,
 static ssize_t disksize_store(struct device *dev,
                 struct device_attribute *attr, const char *buf, size_t len)
 {
-        int ret;
         u64 disksize;
         struct zram *zram = dev_to_zram(dev);
 
-        ret = kstrtoull(buf, 10, &disksize);
-        if (ret)
-                return ret;
+        disksize = memparse(buf, NULL);
+        if (!disksize)
+                return -EINVAL;
 
         down_write(&zram->init_lock);
         if (zram->init_done) {
diff --git a/drivers/vme/boards/vme_vmivme7805.c b/drivers/vme/boards/vme_vmivme7805.c
index 8e05bb4e135a..dd22b5072e21 100644
--- a/drivers/vme/boards/vme_vmivme7805.c
+++ b/drivers/vme/boards/vme_vmivme7805.c
@@ -19,10 +19,8 @@
 
 #include "vme_vmivme7805.h"
 
-static int __init vmic_init(void);
 static int vmic_probe(struct pci_dev *, const struct pci_device_id *);
 static void vmic_remove(struct pci_dev *);
-static void __exit vmic_exit(void);
 
 /** Base address to access FPGA register */
 static void *vmic_base;
@@ -41,11 +39,6 @@ static struct pci_driver vmic_driver = {
         .remove = vmic_remove,
 };
 
-static int __init vmic_init(void)
-{
-        return pci_register_driver(&vmic_driver);
-}
-
 static int vmic_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 {
         int retval;
@@ -109,15 +102,9 @@ static void vmic_remove(struct pci_dev *pdev)
 
 }
 
-static void __exit vmic_exit(void)
-{
-        pci_unregister_driver(&vmic_driver);
-}
+module_pci_driver(vmic_driver);
 
 MODULE_DESCRIPTION("VMIVME-7805 board support driver");
 MODULE_AUTHOR("Arthur Benilov <arthur.benilov@iba-group.com>");
 MODULE_LICENSE("GPL");
 
-module_init(vmic_init);
-module_exit(vmic_exit);
-
diff --git a/drivers/vme/bridges/vme_ca91cx42.c b/drivers/vme/bridges/vme_ca91cx42.c
index 1425d22cf956..64bfea314429 100644
--- a/drivers/vme/bridges/vme_ca91cx42.c
+++ b/drivers/vme/bridges/vme_ca91cx42.c
@@ -34,10 +34,8 @@
 #include "../vme_bridge.h"
 #include "vme_ca91cx42.h"
 
-static int __init ca91cx42_init(void);
 static int ca91cx42_probe(struct pci_dev *, const struct pci_device_id *);
 static void ca91cx42_remove(struct pci_dev *);
-static void __exit ca91cx42_exit(void);
 
 /* Module parameters */
 static int geoid;
@@ -1523,11 +1521,6 @@ static void ca91cx42_free_consistent(struct device *parent, size_t size,
         pci_free_consistent(pdev, size, vaddr, dma);
 }
 
-static int __init ca91cx42_init(void)
-{
-        return pci_register_driver(&ca91cx42_driver);
-}
-
 /*
  * Configure CR/CSR space
  *
@@ -1944,16 +1937,10 @@ static void ca91cx42_remove(struct pci_dev *pdev)
         kfree(ca91cx42_bridge);
 }
 
-static void __exit ca91cx42_exit(void)
-{
-        pci_unregister_driver(&ca91cx42_driver);
-}
+module_pci_driver(ca91cx42_driver);
 
 MODULE_PARM_DESC(geoid, "Override geographical addressing");
 module_param(geoid, int, 0);
 
 MODULE_DESCRIPTION("VME driver for the Tundra Universe II VME bridge");
 MODULE_LICENSE("GPL");
-
-module_init(ca91cx42_init);
-module_exit(ca91cx42_exit);
diff --git a/drivers/vme/bridges/vme_tsi148.c b/drivers/vme/bridges/vme_tsi148.c
index 5fbd08ffb9c2..9c1aa4dc39c9 100644
--- a/drivers/vme/bridges/vme_tsi148.c
+++ b/drivers/vme/bridges/vme_tsi148.c
@@ -35,10 +35,8 @@
 #include "../vme_bridge.h"
 #include "vme_tsi148.h"
 
-static int __init tsi148_init(void);
 static int tsi148_probe(struct pci_dev *, const struct pci_device_id *);
 static void tsi148_remove(struct pci_dev *);
-static void __exit tsi148_exit(void);
 
 
 /* Module parameter */
@@ -2244,11 +2242,6 @@ static void tsi148_free_consistent(struct device *parent, size_t size,
         pci_free_consistent(pdev, size, vaddr, dma);
 }
 
-static int __init tsi148_init(void)
-{
-        return pci_register_driver(&tsi148_driver);
-}
-
 /*
  * Configure CR/CSR space
  *
@@ -2754,10 +2747,7 @@ static void tsi148_remove(struct pci_dev *pdev)
         kfree(tsi148_bridge);
 }
 
-static void __exit tsi148_exit(void)
-{
-        pci_unregister_driver(&tsi148_driver);
-}
+module_pci_driver(tsi148_driver);
 
 MODULE_PARM_DESC(err_chk, "Check for VME errors on reads and writes");
 module_param(err_chk, bool, 0);
@@ -2767,6 +2757,3 @@ module_param(geoid, int, 0);
 
 MODULE_DESCRIPTION("VME driver for the Tundra Tempe VME bridge");
 MODULE_LICENSE("GPL");
-
-module_init(tsi148_init);
-module_exit(tsi148_exit);