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

Pull staging tree merge from Greg KH:
 "Here's the bit staging tree pull request for 3.12-rc1.

  Lots of staging driver updates, and fixes.  Lustre is finally enabled
  in the build, and lots of cleanup started happening in it.  There's a
  new wireless driver in here, and 2 new TTY drivers, which cause the
  overall lines added/removed to be quite large on the "added" side.

  The IIO driver updates are also coming through here, as they are tied
  to the staging iio drivers"

* tag 'staging-3.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (942 commits)
  staging: dwc2: make dwc2_core_params documentation more complete
  staging: dwc2: validate the value for phy_utmi_width
  staging: dwc2: interpret all hwcfg and related register at init time
  staging: dwc2: properly mask the GRXFSIZ register
  staging: dwc2: remove redundant register reads
  staging: dwc2: re-use hptxfsiz variable
  staging: dwc2: simplify debug output in dwc_hc_init
  staging: dwc2: add missing shift
  staging: dwc2: simplify register shift expressions
  staging: dwc2: only read the snpsid register once
  staging: dwc2: unshift non-bool register value constants
  staging: dwc2: fix off-by-one in check for max_packet_count parameter
  staging: dwc2: remove specific fifo size constants
  Staging:BCM:DDRInit.c:Renaming __FUNCTION__
  staging: bcm: remove Version.h file.
  staging: rtl8188eu: off by one in rtw_set_802_11_add_wep()
  staging: r8188eu: copying one byte too much
  staging: rtl8188eu: || vs && typo
  staging: r8188eu: off by one bugs
  staging: crystalhd: Resolve sparse 'different base types' warnings.
  ...

8 files changed, 583 insertions, 99 deletions

diff --git a/drivers/iio/light/Kconfig b/drivers/iio/light/Kconfig
index 5ef1a396e0c9..bf9fa0d7aff9 100644
--- a/drivers/iio/light/Kconfig
+++ b/drivers/iio/light/Kconfig
@@ -1,6 +1,8 @@
 #
 # Light sensors
 #
+# When adding new entries keep the list in alphabetical order
+
 menu "Light sensors"
 
 config ADJD_S311
@@ -15,6 +17,27 @@ config ADJD_S311
          This driver can also be built as a module.  If so, the module
          will be called adjd_s311.
 
+config APDS9300
+        tristate "APDS9300 ambient light sensor"
+        depends on I2C
+        help
+         Say Y here if you want to build a driver for the Avago APDS9300
+         ambient light sensor.
+
+         To compile this driver as a module, choose M here: the
+         module will be called apds9300.
+
+config HID_SENSOR_ALS
+        depends on HID_SENSOR_HUB
+        select IIO_BUFFER
+        select IIO_TRIGGERED_BUFFER
+        select HID_SENSOR_IIO_COMMON
+        select HID_SENSOR_IIO_TRIGGER
+        tristate "HID ALS"
+        help
+          Say yes here to build support for the HID SENSOR
+          Ambient light sensor.
+
 config SENSORS_LM3533
         tristate "LM3533 ambient light sensor"
         depends on MFD_LM3533
@@ -52,15 +75,4 @@ config VCNL4000
          To compile this driver as a module, choose M here: the
          module will be called vcnl4000.
 
-config HID_SENSOR_ALS
-        depends on HID_SENSOR_HUB
-        select IIO_BUFFER
-        select IIO_TRIGGERED_BUFFER
-        select HID_SENSOR_IIO_COMMON
-        select HID_SENSOR_IIO_TRIGGER
-        tristate "HID ALS"
-        help
-          Say yes here to build support for the HID SENSOR
-          Ambient light sensor.
-
 endmenu
diff --git a/drivers/iio/light/Makefile b/drivers/iio/light/Makefile
index 040d9c75f8e6..354ee9ab2379 100644
--- a/drivers/iio/light/Makefile
+++ b/drivers/iio/light/Makefile
@@ -2,8 +2,10 @@
 # Makefile for IIO Light sensors
 #
 
+# When adding new entries keep the list in alphabetical order
 obj-$(CONFIG_ADJD_S311)         += adjd_s311.o
+obj-$(CONFIG_APDS9300)          += apds9300.o
+obj-$(CONFIG_HID_SENSOR_ALS)    += hid-sensor-als.o
 obj-$(CONFIG_SENSORS_LM3533)    += lm3533-als.o
 obj-$(CONFIG_SENSORS_TSL2563)   += tsl2563.o
 obj-$(CONFIG_VCNL4000)          += vcnl4000.o
-obj-$(CONFIG_HID_SENSOR_ALS)    += hid-sensor-als.o
diff --git a/drivers/iio/light/adjd_s311.c b/drivers/iio/light/adjd_s311.c
index c1cd5698b8ae..23cff798598a 100644
--- a/drivers/iio/light/adjd_s311.c
+++ b/drivers/iio/light/adjd_s311.c
@@ -37,22 +37,14 @@
 #define ADJD_S311_CAP_GREEN     0x07
 #define ADJD_S311_CAP_BLUE      0x08
 #define ADJD_S311_CAP_CLEAR     0x09
-#define ADJD_S311_INT_RED_LO    0x0a
-#define ADJD_S311_INT_RED_HI    0x0b
-#define ADJD_S311_INT_GREEN_LO  0x0c
-#define ADJD_S311_INT_GREEN_HI  0x0d
-#define ADJD_S311_INT_BLUE_LO   0x0e
-#define ADJD_S311_INT_BLUE_HI   0x0f
-#define ADJD_S311_INT_CLEAR_LO  0x10
-#define ADJD_S311_INT_CLEAR_HI  0x11
-#define ADJD_S311_DATA_RED_LO   0x40
-#define ADJD_S311_DATA_RED_HI   0x41
-#define ADJD_S311_DATA_GREEN_LO 0x42
-#define ADJD_S311_DATA_GREEN_HI 0x43
-#define ADJD_S311_DATA_BLUE_LO  0x44
-#define ADJD_S311_DATA_BLUE_HI  0x45
-#define ADJD_S311_DATA_CLEAR_LO 0x46
-#define ADJD_S311_DATA_CLEAR_HI 0x47
+#define ADJD_S311_INT_RED       0x0a
+#define ADJD_S311_INT_GREEN     0x0c
+#define ADJD_S311_INT_BLUE      0x0e
+#define ADJD_S311_INT_CLEAR     0x10
+#define ADJD_S311_DATA_RED      0x40
+#define ADJD_S311_DATA_GREEN    0x42
+#define ADJD_S311_DATA_BLUE     0x44
+#define ADJD_S311_DATA_CLEAR    0x46
 #define ADJD_S311_OFFSET_RED    0x48
 #define ADJD_S311_OFFSET_GREEN  0x49
 #define ADJD_S311_OFFSET_BLUE   0x4a
@@ -73,8 +65,8 @@ enum adjd_s311_channel_idx {
         IDX_RED, IDX_GREEN, IDX_BLUE, IDX_CLEAR
 };
 
-#define ADJD_S311_DATA_REG(chan) (ADJD_S311_DATA_RED_LO + (chan) * 2)
-#define ADJD_S311_INT_REG(chan) (ADJD_S311_INT_RED_LO + (chan) * 2)
+#define ADJD_S311_DATA_REG(chan) (ADJD_S311_DATA_RED + (chan) * 2)
+#define ADJD_S311_INT_REG(chan) (ADJD_S311_INT_RED + (chan) * 2)
 #define ADJD_S311_CAP_REG(chan) (ADJD_S311_CAP_RED + (chan))
 
 static int adjd_s311_req_data(struct iio_dev *indio_dev)
@@ -294,11 +286,10 @@ static int adjd_s311_probe(struct i2c_client *client,
         struct iio_dev *indio_dev;
         int err;
 
-        indio_dev = iio_device_alloc(sizeof(*data));
-        if (indio_dev == NULL) {
-                err = -ENOMEM;
-                goto exit;
-        }
+        indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*data));
+        if (indio_dev == NULL)
+                return -ENOMEM;
+
         data = iio_priv(indio_dev);
         i2c_set_clientdata(client, indio_dev);
         data->client = client;
@@ -313,7 +304,7 @@ static int adjd_s311_probe(struct i2c_client *client,
         err = iio_triggered_buffer_setup(indio_dev, NULL,
                 adjd_s311_trigger_handler, NULL);
         if (err < 0)
-                goto exit_free_device;
+                return err;
 
         err = iio_device_register(indio_dev);
         if (err)
@@ -325,9 +316,6 @@ static int adjd_s311_probe(struct i2c_client *client,
 
 exit_unreg_buffer:
         iio_triggered_buffer_cleanup(indio_dev);
-exit_free_device:
-        iio_device_free(indio_dev);
-exit:
         return err;
 }
 
@@ -339,7 +327,6 @@ static int adjd_s311_remove(struct i2c_client *client)
         iio_device_unregister(indio_dev);
         iio_triggered_buffer_cleanup(indio_dev);
         kfree(data->buffer);
-        iio_device_free(indio_dev);
 
         return 0;
 }
diff --git a/drivers/iio/light/apds9300.c b/drivers/iio/light/apds9300.c
new file mode 100644
index 000000000000..66a58bda6dc8
--- /dev/null
+++ b/drivers/iio/light/apds9300.c
@@ -0,0 +1,512 @@
+/*
+ * apds9300.c - IIO driver for Avago APDS9300 ambient light sensor
+ *
+ * Copyright 2013 Oleksandr Kravchenko <o.v.kravchenko@globallogic.com>
+ *
+ * This file is subject to the terms and conditions of version 2 of
+ * the GNU General Public License.  See the file COPYING in the main
+ * directory of this archive for more details.
+ */
+
+#include <linux/module.h>
+#include <linux/slab.h>
+#include <linux/pm.h>
+#include <linux/i2c.h>
+#include <linux/err.h>
+#include <linux/mutex.h>
+#include <linux/interrupt.h>
+#include <linux/iio/iio.h>
+#include <linux/iio/sysfs.h>
+#include <linux/iio/events.h>
+
+#define APDS9300_DRV_NAME "apds9300"
+#define APDS9300_IRQ_NAME "apds9300_event"
+
+/* Command register bits */
+#define APDS9300_CMD    BIT(7) /* Select command register. Must write as 1 */
+#define APDS9300_WORD   BIT(5) /* I2C write/read: if 1 word, if 0 byte */
+#define APDS9300_CLEAR  BIT(6) /* Interrupt clear. Clears pending interrupt */
+
+/* Register set */
+#define APDS9300_CONTROL        0x00 /* Control of basic functions */
+#define APDS9300_THRESHLOWLOW   0x02 /* Low byte of low interrupt threshold */
+#define APDS9300_THRESHHIGHLOW  0x04 /* Low byte of high interrupt threshold */
+#define APDS9300_INTERRUPT      0x06 /* Interrupt control */
+#define APDS9300_DATA0LOW       0x0c /* Low byte of ADC channel 0 */
+#define APDS9300_DATA1LOW       0x0e /* Low byte of ADC channel 1 */
+
+/* Power on/off value for APDS9300_CONTROL register */
+#define APDS9300_POWER_ON       0x03
+#define APDS9300_POWER_OFF      0x00
+
+/* Interrupts */
+#define APDS9300_INTR_ENABLE    0x10
+/* Interrupt Persist Function: Any value outside of threshold range */
+#define APDS9300_THRESH_INTR    0x01
+
+#define APDS9300_THRESH_MAX     0xffff /* Max threshold value */
+
+struct apds9300_data {
+        struct i2c_client *client;
+        struct mutex mutex;
+        int power_state;
+        int thresh_low;
+        int thresh_hi;
+        int intr_en;
+};
+
+/* Lux calculation */
+
+/* Calculated values 1000 * (CH1/CH0)^1.4 for CH1/CH0 from 0 to 0.52 */
+static const u16 apds9300_lux_ratio[] = {
+        0, 2, 4, 7, 11, 15, 19, 24, 29, 34, 40, 45, 51, 57, 64, 70, 77, 84, 91,
+        98, 105, 112, 120, 128, 136, 144, 152, 160, 168, 177, 185, 194, 203,
+        212, 221, 230, 239, 249, 258, 268, 277, 287, 297, 307, 317, 327, 337,
+        347, 358, 368, 379, 390, 400,
+};
+
+static unsigned long apds9300_calculate_lux(u16 ch0, u16 ch1)
+{
+        unsigned long lux, tmp;
+
+        /* avoid division by zero */
+        if (ch0 == 0)
+                return 0;
+
+        tmp = DIV_ROUND_UP(ch1 * 100, ch0);
+        if (tmp <= 52) {
+                lux = 3150 * ch0 - (unsigned long)DIV_ROUND_UP_ULL(ch0
+                                * apds9300_lux_ratio[tmp] * 5930ull, 1000);
+        } else if (tmp <= 65) {
+                lux = 2290 * ch0 - 2910 * ch1;
+        } else if (tmp <= 80) {
+                lux = 1570 * ch0 - 1800 * ch1;
+        } else if (tmp <= 130) {
+                lux = 338 * ch0 - 260 * ch1;
+        } else {
+                lux = 0;
+        }
+
+        return lux / 100000;
+}
+
+static int apds9300_get_adc_val(struct apds9300_data *data, int adc_number)
+{
+        int ret;
+        u8 flags = APDS9300_CMD | APDS9300_WORD;
+
+        if (!data->power_state)
+                return -EBUSY;
+
+        /* Select ADC0 or ADC1 data register */
+        flags |= adc_number ? APDS9300_DATA1LOW : APDS9300_DATA0LOW;
+
+        ret = i2c_smbus_read_word_data(data->client, flags);
+        if (ret < 0)
+                dev_err(&data->client->dev,
+                        "failed to read ADC%d value\n", adc_number);
+
+        return ret;
+}
+
+static int apds9300_set_thresh_low(struct apds9300_data *data, int value)
+{
+        int ret;
+
+        if (!data->power_state)
+                return -EBUSY;
+
+        if (value > APDS9300_THRESH_MAX)
+                return -EINVAL;
+
+        ret = i2c_smbus_write_word_data(data->client, APDS9300_THRESHLOWLOW
+                        | APDS9300_CMD | APDS9300_WORD, value);
+        if (ret) {
+                dev_err(&data->client->dev, "failed to set thresh_low\n");
+                return ret;
+        }
+        data->thresh_low = value;
+
+        return 0;
+}
+
+static int apds9300_set_thresh_hi(struct apds9300_data *data, int value)
+{
+        int ret;
+
+        if (!data->power_state)
+                return -EBUSY;
+
+        if (value > APDS9300_THRESH_MAX)
+                return -EINVAL;
+
+        ret = i2c_smbus_write_word_data(data->client, APDS9300_THRESHHIGHLOW
+                        | APDS9300_CMD | APDS9300_WORD, value);
+        if (ret) {
+                dev_err(&data->client->dev, "failed to set thresh_hi\n");
+                return ret;
+        }
+        data->thresh_hi = value;
+
+        return 0;
+}
+
+static int apds9300_set_intr_state(struct apds9300_data *data, int state)
+{
+        int ret;
+        u8 cmd;
+
+        if (!data->power_state)
+                return -EBUSY;
+
+        cmd = state ? APDS9300_INTR_ENABLE | APDS9300_THRESH_INTR : 0x00;
+        ret = i2c_smbus_write_byte_data(data->client,
+                        APDS9300_INTERRUPT | APDS9300_CMD, cmd);
+        if (ret) {
+                dev_err(&data->client->dev,
+                        "failed to set interrupt state %d\n", state);
+                return ret;
+        }
+        data->intr_en = state;
+
+        return 0;
+}
+
+static int apds9300_set_power_state(struct apds9300_data *data, int state)
+{
+        int ret;
+        u8 cmd;
+
+        cmd = state ? APDS9300_POWER_ON : APDS9300_POWER_OFF;
+        ret = i2c_smbus_write_byte_data(data->client,
+                        APDS9300_CONTROL | APDS9300_CMD, cmd);
+        if (ret) {
+                dev_err(&data->client->dev,
+                        "failed to set power state %d\n", state);
+                return ret;
+        }
+        data->power_state = state;
+
+        return 0;
+}
+
+static void apds9300_clear_intr(struct apds9300_data *data)
+{
+        int ret;
+
+        ret = i2c_smbus_write_byte(data->client, APDS9300_CLEAR | APDS9300_CMD);
+        if (ret < 0)
+                dev_err(&data->client->dev, "failed to clear interrupt\n");
+}
+
+static int apds9300_chip_init(struct apds9300_data *data)
+{
+        int ret;
+
+        /* Need to set power off to ensure that the chip is off */
+        ret = apds9300_set_power_state(data, 0);
+        if (ret < 0)
+                goto err;
+        /*
+         * Probe the chip. To do so we try to power up the device and then to
+         * read back the 0x03 code
+         */
+        ret = apds9300_set_power_state(data, 1);
+        if (ret < 0)
+                goto err;
+        ret = i2c_smbus_read_byte_data(data->client,
+                        APDS9300_CONTROL | APDS9300_CMD);
+        if (ret != APDS9300_POWER_ON) {
+                ret = -ENODEV;
+                goto err;
+        }
+        /*
+         * Disable interrupt to ensure thai it is doesn't enable
+         * i.e. after device soft reset
+         */
+        ret = apds9300_set_intr_state(data, 0);
+        if (ret < 0)
+                goto err;
+
+        return 0;
+
+err:
+        dev_err(&data->client->dev, "failed to init the chip\n");
+        return ret;
+}
+
+static int apds9300_read_raw(struct iio_dev *indio_dev,
+                struct iio_chan_spec const *chan, int *val, int *val2,
+                long mask)
+{
+        int ch0, ch1, ret = -EINVAL;
+        struct apds9300_data *data = iio_priv(indio_dev);
+
+        mutex_lock(&data->mutex);
+        switch (chan->type) {
+        case IIO_LIGHT:
+                ch0 = apds9300_get_adc_val(data, 0);
+                if (ch0 < 0) {
+                        ret = ch0;
+                        break;
+                }
+                ch1 = apds9300_get_adc_val(data, 1);
+                if (ch1 < 0) {
+                        ret = ch1;
+                        break;
+                }
+                *val = apds9300_calculate_lux(ch0, ch1);
+                ret = IIO_VAL_INT;
+                break;
+        case IIO_INTENSITY:
+                ret = apds9300_get_adc_val(data, chan->channel);
+                if (ret < 0)
+                        break;
+                *val = ret;
+                ret = IIO_VAL_INT;
+                break;
+        default:
+                break;
+        }
+        mutex_unlock(&data->mutex);
+
+        return ret;
+}
+
+static int apds9300_read_thresh(struct iio_dev *indio_dev, u64 event_code,
+                int *val)
+{
+        struct apds9300_data *data = iio_priv(indio_dev);
+
+        switch (IIO_EVENT_CODE_EXTRACT_DIR(event_code)) {
+        case IIO_EV_DIR_RISING:
+                *val = data->thresh_hi;
+                break;
+        case IIO_EV_DIR_FALLING:
+                *val = data->thresh_low;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+static int apds9300_write_thresh(struct iio_dev *indio_dev, u64 event_code,
+                int val)
+{
+        struct apds9300_data *data = iio_priv(indio_dev);
+        int ret;
+
+        mutex_lock(&data->mutex);
+        if (IIO_EVENT_CODE_EXTRACT_DIR(event_code) == IIO_EV_DIR_RISING)
+                ret = apds9300_set_thresh_hi(data, val);
+        else
+                ret = apds9300_set_thresh_low(data, val);
+        mutex_unlock(&data->mutex);
+
+        return ret;
+}
+
+static int apds9300_read_interrupt_config(struct iio_dev *indio_dev,
+                u64 event_code)
+{
+        struct apds9300_data *data = iio_priv(indio_dev);
+
+        return data->intr_en;
+}
+
+static int apds9300_write_interrupt_config(struct iio_dev *indio_dev,
+                u64 event_code, int state)
+{
+        struct apds9300_data *data = iio_priv(indio_dev);
+        int ret;
+
+        mutex_lock(&data->mutex);
+        ret = apds9300_set_intr_state(data, state);
+        mutex_unlock(&data->mutex);
+
+        return ret;
+}
+
+static const struct iio_info apds9300_info_no_irq = {
+        .driver_module  = THIS_MODULE,
+        .read_raw       = apds9300_read_raw,
+};
+
+static const struct iio_info apds9300_info = {
+        .driver_module          = THIS_MODULE,
+        .read_raw               = apds9300_read_raw,
+        .read_event_value       = apds9300_read_thresh,
+        .write_event_value      = apds9300_write_thresh,
+        .read_event_config      = apds9300_read_interrupt_config,
+        .write_event_config     = apds9300_write_interrupt_config,
+};
+
+static const struct iio_chan_spec apds9300_channels[] = {
+        {
+                .type = IIO_LIGHT,
+                .channel = 0,
+                .indexed = true,
+                .info_mask_separate = BIT(IIO_CHAN_INFO_PROCESSED),
+        }, {
+                .type = IIO_INTENSITY,
+                .channel = 0,
+                .channel2 = IIO_MOD_LIGHT_BOTH,
+                .indexed = true,
+                .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
+                .event_mask = (IIO_EV_BIT(IIO_EV_TYPE_THRESH,
+                                          IIO_EV_DIR_RISING) |
+                               IIO_EV_BIT(IIO_EV_TYPE_THRESH,
+                                          IIO_EV_DIR_FALLING)),
+        }, {
+                .type = IIO_INTENSITY,
+                .channel = 1,
+                .channel2 = IIO_MOD_LIGHT_IR,
+                .indexed = true,
+                .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
+        },
+};
+
+static irqreturn_t apds9300_interrupt_handler(int irq, void *private)
+{
+        struct iio_dev *dev_info = private;
+        struct apds9300_data *data = iio_priv(dev_info);
+
+        iio_push_event(dev_info,
+                       IIO_UNMOD_EVENT_CODE(IIO_INTENSITY, 0,
+                                            IIO_EV_TYPE_THRESH,
+                                            IIO_EV_DIR_EITHER),
+                       iio_get_time_ns());
+
+        apds9300_clear_intr(data);
+
+        return IRQ_HANDLED;
+}
+
+static int apds9300_probe(struct i2c_client *client,
+                const struct i2c_device_id *id)
+{
+        struct apds9300_data *data;
+        struct iio_dev *indio_dev;
+        int ret;
+
+        indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*data));
+        if (!indio_dev)
+                return -ENOMEM;
+
+        data = iio_priv(indio_dev);
+        i2c_set_clientdata(client, indio_dev);
+        data->client = client;
+
+        ret = apds9300_chip_init(data);
+        if (ret < 0)
+                goto err;
+
+        mutex_init(&data->mutex);
+
+        indio_dev->dev.parent = &client->dev;
+        indio_dev->channels = apds9300_channels;
+        indio_dev->num_channels = ARRAY_SIZE(apds9300_channels);
+        indio_dev->name = APDS9300_DRV_NAME;
+        indio_dev->modes = INDIO_DIRECT_MODE;
+
+        if (client->irq)
+                indio_dev->info = &apds9300_info;
+        else
+                indio_dev->info = &apds9300_info_no_irq;
+
+        if (client->irq) {
+                ret = devm_request_threaded_irq(&client->dev, client->irq,
+                                NULL, apds9300_interrupt_handler,
+                                IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
+                                APDS9300_IRQ_NAME, indio_dev);
+                if (ret) {
+                        dev_err(&client->dev, "irq request error %d\n", -ret);
+                        goto err;
+                }
+        }
+
+        ret = iio_device_register(indio_dev);
+        if (ret < 0)
+                goto err;
+
+        return 0;
+
+err:
+        /* Ensure that power off in case of error */
+        apds9300_set_power_state(data, 0);
+        return ret;
+}
+
+static int apds9300_remove(struct i2c_client *client)
+{
+        struct iio_dev *indio_dev = i2c_get_clientdata(client);
+        struct apds9300_data *data = iio_priv(indio_dev);
+
+        iio_device_unregister(indio_dev);
+
+        /* Ensure that power off and interrupts are disabled */
+        apds9300_set_intr_state(data, 0);
+        apds9300_set_power_state(data, 0);
+
+        return 0;
+}
+
+#ifdef CONFIG_PM_SLEEP
+static int apds9300_suspend(struct device *dev)
+{
+        struct iio_dev *indio_dev = i2c_get_clientdata(to_i2c_client(dev));
+        struct apds9300_data *data = iio_priv(indio_dev);
+        int ret;
+
+        mutex_lock(&data->mutex);
+        ret = apds9300_set_power_state(data, 0);
+        mutex_unlock(&data->mutex);
+
+        return ret;
+}
+
+static int apds9300_resume(struct device *dev)
+{
+        struct iio_dev *indio_dev = i2c_get_clientdata(to_i2c_client(dev));
+        struct apds9300_data *data = iio_priv(indio_dev);
+        int ret;
+
+        mutex_lock(&data->mutex);
+        ret = apds9300_set_power_state(data, 1);
+        mutex_unlock(&data->mutex);
+
+        return ret;
+}
+
+static SIMPLE_DEV_PM_OPS(apds9300_pm_ops, apds9300_suspend, apds9300_resume);
+#define APDS9300_PM_OPS (&apds9300_pm_ops)
+#else
+#define APDS9300_PM_OPS NULL
+#endif
+
+static struct i2c_device_id apds9300_id[] = {
+        { APDS9300_DRV_NAME, 0 },
+        { }
+};
+
+MODULE_DEVICE_TABLE(i2c, apds9300_id);
+
+static struct i2c_driver apds9300_driver = {
+        .driver = {
+                .name   = APDS9300_DRV_NAME,
+                .owner  = THIS_MODULE,
+                .pm     = APDS9300_PM_OPS,
+        },
+        .probe          = apds9300_probe,
+        .remove         = apds9300_remove,
+        .id_table       = apds9300_id,
+};
+
+module_i2c_driver(apds9300_driver);
+
+MODULE_AUTHOR("Kravchenko Oleksandr <o.v.kravchenko@globallogic.com>");
+MODULE_AUTHOR("GlobalLogic inc.");
+MODULE_DESCRIPTION("APDS9300 ambient light photo sensor driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/iio/light/hid-sensor-als.c b/drivers/iio/light/hid-sensor-als.c
index cdc2cad0f01b..e59d00c3139c 100644
--- a/drivers/iio/light/hid-sensor-als.c
+++ b/drivers/iio/light/hid-sensor-als.c
@@ -30,10 +30,6 @@
 #include <linux/iio/triggered_buffer.h>
 #include "../common/hid-sensors/hid-sensor-trigger.h"
 
-/*Format: HID-SENSOR-usage_id_in_hex*/
-/*Usage ID from spec for Ambiant-Light: 0x200041*/
-#define DRIVER_NAME "HID-SENSOR-200041"
-
 #define CHANNEL_SCAN_INDEX_ILLUM 0
 
 struct als_state {
@@ -158,18 +154,10 @@ static int als_write_raw(struct iio_dev *indio_dev,
         return ret;
 }
 
-static int als_write_raw_get_fmt(struct iio_dev *indio_dev,
-                               struct iio_chan_spec const *chan,
-                               long mask)
-{
-        return IIO_VAL_INT_PLUS_MICRO;
-}
-
 static const struct iio_info als_info = {
         .driver_module = THIS_MODULE,
         .read_raw = &als_read_raw,
         .write_raw = &als_write_raw,
-        .write_raw_get_fmt = &als_write_raw_get_fmt,
 };
 
 /* Function to push data to buffer */
@@ -253,11 +241,9 @@ static int hid_als_probe(struct platform_device *pdev)
         struct hid_sensor_hub_device *hsdev = pdev->dev.platform_data;
         struct iio_chan_spec *channels;
 
-        indio_dev = iio_device_alloc(sizeof(struct als_state));
-        if (indio_dev == NULL) {
-                ret = -ENOMEM;
-                goto error_ret;
-        }
+        indio_dev = devm_iio_device_alloc(&pdev->dev, sizeof(struct als_state));
+        if (!indio_dev)
+                return -ENOMEM;
         platform_set_drvdata(pdev, indio_dev);
 
         als_state = iio_priv(indio_dev);
@@ -268,14 +254,13 @@ static int hid_als_probe(struct platform_device *pdev)
                                         &als_state->common_attributes);
         if (ret) {
                 dev_err(&pdev->dev, "failed to setup common attributes\n");
-                goto error_free_dev;
+                return ret;
         }
 
         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;
+                return -ENOMEM;
         }
 
         ret = als_parse_report(pdev, hsdev, channels,
@@ -333,9 +318,6 @@ error_unreg_buffer_funcs:
         iio_triggered_buffer_cleanup(indio_dev);
 error_free_dev_mem:
         kfree(indio_dev->channels);
-error_free_dev:
-        iio_device_free(indio_dev);
-error_ret:
         return ret;
 }
 
@@ -350,14 +332,23 @@ static int hid_als_remove(struct platform_device *pdev)
         hid_sensor_remove_trigger(indio_dev);
         iio_triggered_buffer_cleanup(indio_dev);
         kfree(indio_dev->channels);
-        iio_device_free(indio_dev);
 
         return 0;
 }
 
+static struct platform_device_id hid_als_ids[] = {
+        {
+                /* Format: HID-SENSOR-usage_id_in_hex_lowercase */
+                .name = "HID-SENSOR-200041",
+        },
+        { /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(platform, hid_als_ids);
+
 static struct platform_driver hid_als_platform_driver = {
+        .id_table = hid_als_ids,
         .driver = {
-                .name   = DRIVER_NAME,
+                .name   = KBUILD_MODNAME,
                 .owner  = THIS_MODULE,
         },
         .probe          = hid_als_probe,
diff --git a/drivers/iio/light/lm3533-als.c b/drivers/iio/light/lm3533-als.c
index 5fa31a4ef82a..c1aadc6b865a 100644
--- a/drivers/iio/light/lm3533-als.c
+++ b/drivers/iio/light/lm3533-als.c
@@ -847,7 +847,7 @@ static int lm3533_als_probe(struct platform_device *pdev)
                 return -EINVAL;
         }
 
-        indio_dev = iio_device_alloc(sizeof(*als));
+        indio_dev = devm_iio_device_alloc(&pdev->dev, sizeof(*als));
         if (!indio_dev)
                 return -ENOMEM;
 
@@ -870,7 +870,7 @@ static int lm3533_als_probe(struct platform_device *pdev)
         if (als->irq) {
                 ret = lm3533_als_setup_irq(als, indio_dev);
                 if (ret)
-                        goto err_free_dev;
+                        return ret;
         }
 
         ret = lm3533_als_setup(als, pdata);
@@ -894,8 +894,6 @@ err_disable:
 err_free_irq:
         if (als->irq)
                 free_irq(als->irq, indio_dev);
-err_free_dev:
-        iio_device_free(indio_dev);
 
         return ret;
 }
@@ -910,7 +908,6 @@ static int lm3533_als_remove(struct platform_device *pdev)
         lm3533_als_disable(als);
         if (als->irq)
                 free_irq(als->irq, indio_dev);
-        iio_device_free(indio_dev);
 
         return 0;
 }
diff --git a/drivers/iio/light/tsl2563.c b/drivers/iio/light/tsl2563.c
index 1f529f36f138..ebb962c5c323 100644
--- a/drivers/iio/light/tsl2563.c
+++ b/drivers/iio/light/tsl2563.c
@@ -702,7 +702,7 @@ static int tsl2563_probe(struct i2c_client *client,
         int err = 0;
         u8 id = 0;
 
-        indio_dev = iio_device_alloc(sizeof(*chip));
+        indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*chip));
         if (!indio_dev)
                 return -ENOMEM;
 
@@ -714,13 +714,13 @@ static int tsl2563_probe(struct i2c_client *client,
         err = tsl2563_detect(chip);
         if (err) {
                 dev_err(&client->dev, "detect error %d\n", -err);
-                goto fail1;
+                return err;
         }
 
         err = tsl2563_read_id(chip, &id);
         if (err) {
                 dev_err(&client->dev, "read id error %d\n", -err);
-                goto fail1;
+                return err;
         }
 
         mutex_init(&chip->lock);
@@ -751,7 +751,7 @@ static int tsl2563_probe(struct i2c_client *client,
                 indio_dev->info = &tsl2563_info_no_irq;
 
         if (client->irq) {
-                err = request_threaded_irq(client->irq,
+                err = devm_request_threaded_irq(&client->dev, client->irq,
                                            NULL,
                                            &tsl2563_event_handler,
                                            IRQF_TRIGGER_RISING | IRQF_ONESHOT,
@@ -759,14 +759,14 @@ static int tsl2563_probe(struct i2c_client *client,
                                            indio_dev);
                 if (err) {
                         dev_err(&client->dev, "irq request error %d\n", -err);
-                        goto fail1;
+                        return err;
                 }
         }
 
         err = tsl2563_configure(chip);
         if (err) {
                 dev_err(&client->dev, "configure error %d\n", -err);
-                goto fail2;
+                return err;
         }
 
         INIT_DELAYED_WORK(&chip->poweroff_work, tsl2563_poweroff_work);
@@ -777,19 +777,14 @@ static int tsl2563_probe(struct i2c_client *client,
         err = iio_device_register(indio_dev);
         if (err) {
                 dev_err(&client->dev, "iio registration error %d\n", -err);
-                goto fail3;
+                goto fail;
         }
 
         return 0;
 
-fail3:
+fail:
         cancel_delayed_work(&chip->poweroff_work);
         flush_scheduled_work();
-fail2:
-        if (client->irq)
-                free_irq(client->irq, indio_dev);
-fail1:
-        iio_device_free(indio_dev);
         return err;
 }
 
@@ -807,10 +802,6 @@ static int tsl2563_remove(struct i2c_client *client)
                                   chip->intr);
         flush_scheduled_work();
         tsl2563_set_power(chip, 0);
-        if (client->irq)
-                free_irq(client->irq, indio_dev);
-
-        iio_device_free(indio_dev);
 
         return 0;
 }
diff --git a/drivers/iio/light/vcnl4000.c b/drivers/iio/light/vcnl4000.c
index 1014943d949a..2bb304215b1d 100644
--- a/drivers/iio/light/vcnl4000.c
+++ b/drivers/iio/light/vcnl4000.c
@@ -157,7 +157,7 @@ static int vcnl4000_probe(struct i2c_client *client,
         struct iio_dev *indio_dev;
         int ret;
 
-        indio_dev = iio_device_alloc(sizeof(*data));
+        indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*data));
         if (!indio_dev)
                 return -ENOMEM;
 
@@ -167,7 +167,7 @@ static int vcnl4000_probe(struct i2c_client *client,
 
         ret = i2c_smbus_read_byte_data(data->client, VCNL4000_PROD_REV);
         if (ret < 0)
-                goto error_free_dev;
+                return ret;
 
         dev_info(&client->dev, "VCNL4000 Ambient light/proximity sensor, Prod %02x, Rev: %02x\n",
                 ret >> 4, ret & 0xf);
@@ -181,22 +181,14 @@ static int vcnl4000_probe(struct i2c_client *client,
 
         ret = iio_device_register(indio_dev);
         if (ret < 0)
-                goto error_free_dev;
+                return ret;
 
         return 0;
-
-error_free_dev:
-        iio_device_free(indio_dev);
-        return ret;
 }
 
 static int vcnl4000_remove(struct i2c_client *client)
 {
-        struct iio_dev *indio_dev = i2c_get_clientdata(client);
-
-        iio_device_unregister(indio_dev);
-        iio_device_free(indio_dev);
-
+        iio_device_unregister(i2c_get_clientdata(client));
         return 0;
 }