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

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

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

1 files changed, 730 insertions, 0 deletions

diff --git a/drivers/staging/iio/meter/ade7753.c b/drivers/staging/iio/meter/ade7753.c
new file mode 100644
index 00000000000..e72afbd2b84
--- /dev/null
+++ b/drivers/staging/iio/meter/ade7753.c
@@ -0,0 +1,730 @@
+/*
+ * ADE7753 Single-Phase Multifunction Metering IC with di/dt Sensor Interface Driver
+ *
+ * Copyright 2010 Analog Devices Inc.
+ *
+ * Licensed under the GPL-2 or later.
+ */
+
+#include <linux/interrupt.h>
+#include <linux/irq.h>
+#include <linux/gpio.h>
+#include <linux/delay.h>
+#include <linux/mutex.h>
+#include <linux/device.h>
+#include <linux/kernel.h>
+#include <linux/spi/spi.h>
+#include <linux/slab.h>
+#include <linux/sysfs.h>
+#include <linux/list.h>
+
+#include "../iio.h"
+#include "../sysfs.h"
+#include "meter.h"
+#include "ade7753.h"
+
+int ade7753_spi_write_reg_8(struct device *dev,
+                u8 reg_address,
+                u8 val)
+{
+        int ret;
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct ade7753_state *st = iio_dev_get_devdata(indio_dev);
+
+        mutex_lock(&st->buf_lock);
+        st->tx[0] = ADE7753_WRITE_REG(reg_address);
+        st->tx[1] = val;
+
+        ret = spi_write(st->us, st->tx, 2);
+        mutex_unlock(&st->buf_lock);
+
+        return ret;
+}
+
+static int ade7753_spi_write_reg_16(struct device *dev,
+                u8 reg_address,
+                u16 value)
+{
+        int ret;
+        struct spi_message msg;
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct ade7753_state *st = iio_dev_get_devdata(indio_dev);
+        struct spi_transfer xfers[] = {
+                {
+                        .tx_buf = st->tx,
+                        .bits_per_word = 8,
+                        .len = 3,
+                }
+        };
+
+        mutex_lock(&st->buf_lock);
+        st->tx[0] = ADE7753_WRITE_REG(reg_address);
+        st->tx[1] = (value >> 8) & 0xFF;
+        st->tx[2] = value & 0xFF;
+
+        spi_message_init(&msg);
+        spi_message_add_tail(xfers, &msg);
+        ret = spi_sync(st->us, &msg);
+        mutex_unlock(&st->buf_lock);
+
+        return ret;
+}
+
+static int ade7753_spi_read_reg_8(struct device *dev,
+                u8 reg_address,
+                u8 *val)
+{
+        struct spi_message msg;
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct ade7753_state *st = iio_dev_get_devdata(indio_dev);
+        int ret;
+        struct spi_transfer xfers[] = {
+                {
+                        .tx_buf = st->tx,
+                        .rx_buf = st->rx,
+                        .bits_per_word = 8,
+                        .len = 2,
+                },
+        };
+
+        mutex_lock(&st->buf_lock);
+        st->tx[0] = ADE7753_READ_REG(reg_address);
+        st->tx[1] = 0;
+
+        spi_message_init(&msg);
+        spi_message_add_tail(xfers, &msg);
+        ret = spi_sync(st->us, &msg);
+        if (ret) {
+                dev_err(&st->us->dev, "problem when reading 8 bit register 0x%02X",
+                                reg_address);
+                goto error_ret;
+        }
+        *val = st->rx[1];
+
+error_ret:
+        mutex_unlock(&st->buf_lock);
+        return ret;
+}
+
+static int ade7753_spi_read_reg_16(struct device *dev,
+                u8 reg_address,
+                u16 *val)
+{
+        struct spi_message msg;
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct ade7753_state *st = iio_dev_get_devdata(indio_dev);
+        int ret;
+        struct spi_transfer xfers[] = {
+                {
+                        .tx_buf = st->tx,
+                        .rx_buf = st->rx,
+                        .bits_per_word = 8,
+                        .len = 3,
+                },
+        };
+
+        mutex_lock(&st->buf_lock);
+        st->tx[0] = ADE7753_READ_REG(reg_address);
+        st->tx[1] = 0;
+        st->tx[2] = 0;
+
+        spi_message_init(&msg);
+        spi_message_add_tail(xfers, &msg);
+        ret = spi_sync(st->us, &msg);
+        if (ret) {
+                dev_err(&st->us->dev, "problem when reading 16 bit register 0x%02X",
+                                reg_address);
+                goto error_ret;
+        }
+        *val = (st->rx[1] << 8) | st->rx[2];
+
+error_ret:
+        mutex_unlock(&st->buf_lock);
+        return ret;
+}
+
+static int ade7753_spi_read_reg_24(struct device *dev,
+                u8 reg_address,
+                u32 *val)
+{
+        struct spi_message msg;
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct ade7753_state *st = iio_dev_get_devdata(indio_dev);
+        int ret;
+        struct spi_transfer xfers[] = {
+                {
+                        .tx_buf = st->tx,
+                        .rx_buf = st->rx,
+                        .bits_per_word = 8,
+                        .len = 4,
+                },
+        };
+
+        mutex_lock(&st->buf_lock);
+        st->tx[0] = ADE7753_READ_REG(reg_address);
+        st->tx[1] = 0;
+        st->tx[2] = 0;
+        st->tx[3] = 0;
+
+        spi_message_init(&msg);
+        spi_message_add_tail(xfers, &msg);
+        ret = spi_sync(st->us, &msg);
+        if (ret) {
+                dev_err(&st->us->dev, "problem when reading 24 bit register 0x%02X",
+                                reg_address);
+                goto error_ret;
+        }
+        *val = (st->rx[1] << 16) | (st->rx[2] << 8) | st->rx[3];
+
+error_ret:
+        mutex_unlock(&st->buf_lock);
+        return ret;
+}
+
+static ssize_t ade7753_read_8bit(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        int ret;
+        u8 val = 0;
+        struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
+
+        ret = ade7753_spi_read_reg_8(dev, this_attr->address, &val);
+        if (ret)
+                return ret;
+
+        return sprintf(buf, "%u\n", val);
+}
+
+static ssize_t ade7753_read_16bit(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        int ret;
+        u16 val = 0;
+        struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
+
+        ret = ade7753_spi_read_reg_16(dev, this_attr->address, &val);
+        if (ret)
+                return ret;
+
+        return sprintf(buf, "%u\n", val);
+}
+
+static ssize_t ade7753_read_24bit(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        int ret;
+        u32 val = 0;
+        struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
+
+        ret = ade7753_spi_read_reg_24(dev, this_attr->address, &val);
+        if (ret)
+                return ret;
+
+        return sprintf(buf, "%u\n", val & 0xFFFFFF);
+}
+
+static ssize_t ade7753_write_8bit(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
+        int ret;
+        long val;
+
+        ret = strict_strtol(buf, 10, &val);
+        if (ret)
+                goto error_ret;
+        ret = ade7753_spi_write_reg_8(dev, this_attr->address, val);
+
+error_ret:
+        return ret ? ret : len;
+}
+
+static ssize_t ade7753_write_16bit(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
+        int ret;
+        long val;
+
+        ret = strict_strtol(buf, 10, &val);
+        if (ret)
+                goto error_ret;
+        ret = ade7753_spi_write_reg_16(dev, this_attr->address, val);
+
+error_ret:
+        return ret ? ret : len;
+}
+
+static int ade7753_reset(struct device *dev)
+{
+        int ret;
+        u16 val;
+        ade7753_spi_read_reg_16(dev,
+                        ADE7753_MODE,
+                        &val);
+        val |= 1 << 6; /* Software Chip Reset */
+        ret = ade7753_spi_write_reg_16(dev,
+                        ADE7753_MODE,
+                        val);
+
+        return ret;
+}
+
+static ssize_t ade7753_write_reset(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf, size_t len)
+{
+        if (len < 1)
+                return -1;
+        switch (buf[0]) {
+        case '1':
+        case 'y':
+        case 'Y':
+                return ade7753_reset(dev);
+        }
+        return -1;
+}
+
+static IIO_DEV_ATTR_AENERGY(ade7753_read_24bit, ADE7753_AENERGY);
+static IIO_DEV_ATTR_LAENERGY(ade7753_read_24bit, ADE7753_LAENERGY);
+static IIO_DEV_ATTR_VAENERGY(ade7753_read_24bit, ADE7753_VAENERGY);
+static IIO_DEV_ATTR_LVAENERGY(ade7753_read_24bit, ADE7753_LVAENERGY);
+static IIO_DEV_ATTR_CFDEN(S_IWUSR | S_IRUGO,
+                ade7753_read_16bit,
+                ade7753_write_16bit,
+                ADE7753_CFDEN);
+static IIO_DEV_ATTR_CFNUM(S_IWUSR | S_IRUGO,
+                ade7753_read_8bit,
+                ade7753_write_8bit,
+                ADE7753_CFNUM);
+static IIO_DEV_ATTR_CHKSUM(ade7753_read_8bit, ADE7753_CHKSUM);
+static IIO_DEV_ATTR_PHCAL(S_IWUSR | S_IRUGO,
+                ade7753_read_16bit,
+                ade7753_write_16bit,
+                ADE7753_PHCAL);
+static IIO_DEV_ATTR_APOS(S_IWUSR | S_IRUGO,
+                ade7753_read_16bit,
+                ade7753_write_16bit,
+                ADE7753_APOS);
+static IIO_DEV_ATTR_SAGCYC(S_IWUSR | S_IRUGO,
+                ade7753_read_8bit,
+                ade7753_write_8bit,
+                ADE7753_SAGCYC);
+static IIO_DEV_ATTR_SAGLVL(S_IWUSR | S_IRUGO,
+                ade7753_read_8bit,
+                ade7753_write_8bit,
+                ADE7753_SAGLVL);
+static IIO_DEV_ATTR_LINECYC(S_IWUSR | S_IRUGO,
+                ade7753_read_8bit,
+                ade7753_write_8bit,
+                ADE7753_LINECYC);
+static IIO_DEV_ATTR_WDIV(S_IWUSR | S_IRUGO,
+                ade7753_read_8bit,
+                ade7753_write_8bit,
+                ADE7753_WDIV);
+static IIO_DEV_ATTR_IRMS(S_IWUSR | S_IRUGO,
+                ade7753_read_24bit,
+                NULL,
+                ADE7753_IRMS);
+static IIO_DEV_ATTR_VRMS(S_IRUGO,
+                ade7753_read_24bit,
+                NULL,
+                ADE7753_VRMS);
+static IIO_DEV_ATTR_IRMSOS(S_IWUSR | S_IRUGO,
+                ade7753_read_16bit,
+                ade7753_write_16bit,
+                ADE7753_IRMSOS);
+static IIO_DEV_ATTR_VRMSOS(S_IWUSR | S_IRUGO,
+                ade7753_read_16bit,
+                ade7753_write_16bit,
+                ADE7753_VRMSOS);
+static IIO_DEV_ATTR_WGAIN(S_IWUSR | S_IRUGO,
+                ade7753_read_16bit,
+                ade7753_write_16bit,
+                ADE7753_WGAIN);
+static IIO_DEV_ATTR_VAGAIN(S_IWUSR | S_IRUGO,
+                ade7753_read_16bit,
+                ade7753_write_16bit,
+                ADE7753_VAGAIN);
+static IIO_DEV_ATTR_PGA_GAIN(S_IWUSR | S_IRUGO,
+                ade7753_read_16bit,
+                ade7753_write_16bit,
+                ADE7753_GAIN);
+static IIO_DEV_ATTR_IPKLVL(S_IWUSR | S_IRUGO,
+                ade7753_read_8bit,
+                ade7753_write_8bit,
+                ADE7753_IPKLVL);
+static IIO_DEV_ATTR_VPKLVL(S_IWUSR | S_IRUGO,
+                ade7753_read_8bit,
+                ade7753_write_8bit,
+                ADE7753_VPKLVL);
+static IIO_DEV_ATTR_IPEAK(S_IRUGO,
+                ade7753_read_24bit,
+                NULL,
+                ADE7753_IPEAK);
+static IIO_DEV_ATTR_VPEAK(S_IRUGO,
+                ade7753_read_24bit,
+                NULL,
+                ADE7753_VPEAK);
+static IIO_DEV_ATTR_VPERIOD(S_IRUGO,
+                ade7753_read_16bit,
+                NULL,
+                ADE7753_PERIOD);
+static IIO_DEV_ATTR_CH_OFF(1, S_IWUSR | S_IRUGO,
+                ade7753_read_8bit,
+                ade7753_write_8bit,
+                ADE7753_CH1OS);
+static IIO_DEV_ATTR_CH_OFF(2, S_IWUSR | S_IRUGO,
+                ade7753_read_8bit,
+                ade7753_write_8bit,
+                ADE7753_CH2OS);
+
+static int ade7753_set_irq(struct device *dev, bool enable)
+{
+        int ret;
+        u8 irqen;
+        ret = ade7753_spi_read_reg_8(dev, ADE7753_IRQEN, &irqen);
+        if (ret)
+                goto error_ret;
+
+        if (enable)
+                irqen |= 1 << 3; /* Enables an interrupt when a data is
+                                    present in the waveform register */
+        else
+                irqen &= ~(1 << 3);
+
+        ret = ade7753_spi_write_reg_8(dev, ADE7753_IRQEN, irqen);
+        if (ret)
+                goto error_ret;
+
+error_ret:
+        return ret;
+}
+
+/* Power down the device */
+int ade7753_stop_device(struct device *dev)
+{
+        int ret;
+        u16 val;
+        ade7753_spi_read_reg_16(dev,
+                        ADE7753_MODE,
+                        &val);
+        val |= 1 << 4;  /* AD converters can be turned off */
+        ret = ade7753_spi_write_reg_16(dev,
+                        ADE7753_MODE,
+                        val);
+
+        return ret;
+}
+
+static int ade7753_initial_setup(struct ade7753_state *st)
+{
+        int ret;
+        struct device *dev = &st->indio_dev->dev;
+
+        /* use low spi speed for init */
+        st->us->mode = SPI_MODE_3;
+        spi_setup(st->us);
+
+        /* Disable IRQ */
+        ret = ade7753_set_irq(dev, false);
+        if (ret) {
+                dev_err(dev, "disable irq failed");
+                goto err_ret;
+        }
+
+        ade7753_reset(dev);
+        msleep(ADE7753_STARTUP_DELAY);
+
+err_ret:
+        return ret;
+}
+
+static ssize_t ade7753_read_frequency(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        int ret, len = 0;
+        u8 t;
+        int sps;
+        ret = ade7753_spi_read_reg_8(dev,
+                        ADE7753_MODE,
+                        &t);
+        if (ret)
+                return ret;
+
+        t = (t >> 11) & 0x3;
+        sps = 27900 / (1 + t);
+
+        len = sprintf(buf, "%d SPS\n", sps);
+        return len;
+}
+
+static ssize_t ade7753_write_frequency(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct ade7753_state *st = iio_dev_get_devdata(indio_dev);
+        unsigned long val;
+        int ret;
+        u16 reg, t;
+
+        ret = strict_strtol(buf, 10, &val);
+        if (ret)
+                return ret;
+
+        mutex_lock(&indio_dev->mlock);
+
+        t = (27900 / val);
+        if (t > 0)
+                t--;
+
+        if (t > 1)
+                st->us->max_speed_hz = ADE7753_SPI_SLOW;
+        else
+                st->us->max_speed_hz = ADE7753_SPI_FAST;
+
+        ret = ade7753_spi_read_reg_16(dev,
+                        ADE7753_MODE,
+                        &reg);
+        if (ret)
+                goto out;
+
+        reg &= ~(3 << 11);
+        reg |= t << 11;
+
+        ret = ade7753_spi_write_reg_16(dev,
+                        ADE7753_MODE,
+                        reg);
+
+out:
+        mutex_unlock(&indio_dev->mlock);
+
+        return ret ? ret : len;
+}
+static IIO_DEV_ATTR_TEMP_RAW(ade7753_read_8bit);
+static IIO_CONST_ATTR(temp_offset, "-25 C");
+static IIO_CONST_ATTR(temp_scale, "0.67 C");
+
+static IIO_DEV_ATTR_SAMP_FREQ(S_IWUSR | S_IRUGO,
+                ade7753_read_frequency,
+                ade7753_write_frequency);
+
+static IIO_DEV_ATTR_RESET(ade7753_write_reset);
+
+static IIO_CONST_ATTR_SAMP_FREQ_AVAIL("27900 14000 7000 3500");
+
+static IIO_CONST_ATTR(name, "ade7753");
+
+static struct attribute *ade7753_event_attributes[] = {
+        NULL
+};
+
+static struct attribute_group ade7753_event_attribute_group = {
+        .attrs = ade7753_event_attributes,
+};
+
+static struct attribute *ade7753_attributes[] = {
+        &iio_dev_attr_temp_raw.dev_attr.attr,
+        &iio_const_attr_temp_offset.dev_attr.attr,
+        &iio_const_attr_temp_scale.dev_attr.attr,
+        &iio_dev_attr_sampling_frequency.dev_attr.attr,
+        &iio_const_attr_sampling_frequency_available.dev_attr.attr,
+        &iio_dev_attr_reset.dev_attr.attr,
+        &iio_const_attr_name.dev_attr.attr,
+        &iio_dev_attr_phcal.dev_attr.attr,
+        &iio_dev_attr_cfden.dev_attr.attr,
+        &iio_dev_attr_aenergy.dev_attr.attr,
+        &iio_dev_attr_laenergy.dev_attr.attr,
+        &iio_dev_attr_vaenergy.dev_attr.attr,
+        &iio_dev_attr_lvaenergy.dev_attr.attr,
+        &iio_dev_attr_cfnum.dev_attr.attr,
+        &iio_dev_attr_apos.dev_attr.attr,
+        &iio_dev_attr_sagcyc.dev_attr.attr,
+        &iio_dev_attr_saglvl.dev_attr.attr,
+        &iio_dev_attr_linecyc.dev_attr.attr,
+        &iio_dev_attr_chksum.dev_attr.attr,
+        &iio_dev_attr_pga_gain.dev_attr.attr,
+        &iio_dev_attr_wgain.dev_attr.attr,
+        &iio_dev_attr_choff_1.dev_attr.attr,
+        &iio_dev_attr_choff_2.dev_attr.attr,
+        &iio_dev_attr_wdiv.dev_attr.attr,
+        &iio_dev_attr_irms.dev_attr.attr,
+        &iio_dev_attr_vrms.dev_attr.attr,
+        &iio_dev_attr_irmsos.dev_attr.attr,
+        &iio_dev_attr_vrmsos.dev_attr.attr,
+        &iio_dev_attr_vagain.dev_attr.attr,
+        &iio_dev_attr_ipklvl.dev_attr.attr,
+        &iio_dev_attr_vpklvl.dev_attr.attr,
+        &iio_dev_attr_ipeak.dev_attr.attr,
+        &iio_dev_attr_vpeak.dev_attr.attr,
+        &iio_dev_attr_vperiod.dev_attr.attr,
+        NULL,
+};
+
+static const struct attribute_group ade7753_attribute_group = {
+        .attrs = ade7753_attributes,
+};
+
+static int __devinit ade7753_probe(struct spi_device *spi)
+{
+        int ret, regdone = 0;
+        struct ade7753_state *st = kzalloc(sizeof *st, GFP_KERNEL);
+        if (!st) {
+                ret =  -ENOMEM;
+                goto error_ret;
+        }
+        /* this is only used for removal purposes */
+        spi_set_drvdata(spi, st);
+
+        /* Allocate the comms buffers */
+        st->rx = kzalloc(sizeof(*st->rx)*ADE7753_MAX_RX, GFP_KERNEL);
+        if (st->rx == NULL) {
+                ret = -ENOMEM;
+                goto error_free_st;
+        }
+        st->tx = kzalloc(sizeof(*st->tx)*ADE7753_MAX_TX, GFP_KERNEL);
+        if (st->tx == NULL) {
+                ret = -ENOMEM;
+                goto error_free_rx;
+        }
+        st->us = spi;
+        mutex_init(&st->buf_lock);
+        /* setup the industrialio driver allocated elements */
+        st->indio_dev = iio_allocate_device();
+        if (st->indio_dev == NULL) {
+                ret = -ENOMEM;
+                goto error_free_tx;
+        }
+
+        st->indio_dev->dev.parent = &spi->dev;
+        st->indio_dev->num_interrupt_lines = 1;
+        st->indio_dev->event_attrs = &ade7753_event_attribute_group;
+        st->indio_dev->attrs = &ade7753_attribute_group;
+        st->indio_dev->dev_data = (void *)(st);
+        st->indio_dev->driver_module = THIS_MODULE;
+        st->indio_dev->modes = INDIO_DIRECT_MODE;
+
+        ret = ade7753_configure_ring(st->indio_dev);
+        if (ret)
+                goto error_free_dev;
+
+        ret = iio_device_register(st->indio_dev);
+        if (ret)
+                goto error_unreg_ring_funcs;
+        regdone = 1;
+
+        ret = ade7753_initialize_ring(st->indio_dev->ring);
+        if (ret) {
+                printk(KERN_ERR "failed to initialize the ring\n");
+                goto error_unreg_ring_funcs;
+        }
+
+        if (spi->irq) {
+                ret = iio_register_interrupt_line(spi->irq,
+                                st->indio_dev,
+                                0,
+                                IRQF_TRIGGER_FALLING,
+                                "ade7753");
+                if (ret)
+                        goto error_uninitialize_ring;
+
+                ret = ade7753_probe_trigger(st->indio_dev);
+                if (ret)
+                        goto error_unregister_line;
+        }
+
+        /* Get the device into a sane initial state */
+        ret = ade7753_initial_setup(st);
+        if (ret)
+                goto error_remove_trigger;
+        return 0;
+
+error_remove_trigger:
+        if (st->indio_dev->modes & INDIO_RING_TRIGGERED)
+                ade7753_remove_trigger(st->indio_dev);
+error_unregister_line:
+        if (st->indio_dev->modes & INDIO_RING_TRIGGERED)
+                iio_unregister_interrupt_line(st->indio_dev, 0);
+error_uninitialize_ring:
+        ade7753_uninitialize_ring(st->indio_dev->ring);
+error_unreg_ring_funcs:
+        ade7753_unconfigure_ring(st->indio_dev);
+error_free_dev:
+        if (regdone)
+                iio_device_unregister(st->indio_dev);
+        else
+                iio_free_device(st->indio_dev);
+error_free_tx:
+        kfree(st->tx);
+error_free_rx:
+        kfree(st->rx);
+error_free_st:
+        kfree(st);
+error_ret:
+        return ret;
+}
+
+/* fixme, confirm ordering in this function */
+static int ade7753_remove(struct spi_device *spi)
+{
+        int ret;
+        struct ade7753_state *st = spi_get_drvdata(spi);
+        struct iio_dev *indio_dev = st->indio_dev;
+
+        ret = ade7753_stop_device(&(indio_dev->dev));
+        if (ret)
+                goto err_ret;
+
+        flush_scheduled_work();
+
+        ade7753_remove_trigger(indio_dev);
+        if (spi->irq && gpio_is_valid(irq_to_gpio(spi->irq)) > 0)
+                iio_unregister_interrupt_line(indio_dev, 0);
+
+        ade7753_uninitialize_ring(indio_dev->ring);
+        ade7753_unconfigure_ring(indio_dev);
+        iio_device_unregister(indio_dev);
+        kfree(st->tx);
+        kfree(st->rx);
+        kfree(st);
+
+        return 0;
+
+err_ret:
+        return ret;
+}
+
+static struct spi_driver ade7753_driver = {
+        .driver = {
+                .name = "ade7753",
+                .owner = THIS_MODULE,
+        },
+        .probe = ade7753_probe,
+        .remove = __devexit_p(ade7753_remove),
+};
+
+static __init int ade7753_init(void)
+{
+        return spi_register_driver(&ade7753_driver);
+}
+module_init(ade7753_init);
+
+static __exit void ade7753_exit(void)
+{
+        spi_unregister_driver(&ade7753_driver);
+}
+module_exit(ade7753_exit);
+
+MODULE_AUTHOR("Barry Song <21cnbao@gmail.com>");
+MODULE_DESCRIPTION("Analog Devices ADE7753/6 Single-Phase Multifunction Metering IC Driver");
+MODULE_LICENSE("GPL v2");