3 files changed, 16 insertions, 8 deletions

diff --git a/drivers/iio/light/hid-sensor-als.c b/drivers/iio/light/hid-sensor-als.c
index 8e8b9d722853..621541fb10a9 100644
--- a/drivers/iio/light/hid-sensor-als.c
+++ b/drivers/iio/light/hid-sensor-als.c
@@ -229,6 +229,17 @@ static int als_parse_report(struct platform_device *pdev,
         dev_dbg(&pdev->dev, "als %x:%x\n", st->als_illum.index,
                         st->als_illum.report_id);
 
+        /* Set Sensitivity field ids, when there is no individual modifier */
+        if (st->common_attributes.sensitivity.index < 0) {
+                sensor_hub_input_get_attribute_info(hsdev,
+                        HID_FEATURE_REPORT, usage_id,
+                        HID_USAGE_SENSOR_DATA_MOD_CHANGE_SENSITIVITY_ABS |
+                        HID_USAGE_SENSOR_DATA_LIGHT,
+                        &st->common_attributes.sensitivity);
+                dev_dbg(&pdev->dev, "Sensitivity index:report %d:%d\n",
+                        st->common_attributes.sensitivity.index,
+                        st->common_attributes.sensitivity.report_id);
+        }
         return ret;
 }
 
diff --git a/drivers/iio/light/tsl2563.c b/drivers/iio/light/tsl2563.c
index 5e5d9dea22c5..0c6e459c86b1 100644
--- a/drivers/iio/light/tsl2563.c
+++ b/drivers/iio/light/tsl2563.c
@@ -714,6 +714,7 @@ static int tsl2563_probe(struct i2c_client *client,
         struct iio_dev *indio_dev;
         struct tsl2563_chip *chip;
         struct tsl2563_platform_data *pdata = client->dev.platform_data;
+        struct device_node *np = client->dev.of_node;
         int err = 0;
         u8 id = 0;
 
@@ -750,6 +751,9 @@ static int tsl2563_probe(struct i2c_client *client,
 
         if (pdata)
                 chip->cover_comp_gain = pdata->cover_comp_gain;
+        else if (np)
+                of_property_read_u32(np, "amstaos,cover-comp-gain",
+                                     &chip->cover_comp_gain);
         else
                 chip->cover_comp_gain = 1;
 
diff --git a/drivers/iio/light/vcnl4000.c b/drivers/iio/light/vcnl4000.c
index ecb3341ef9c0..384ac23f576f 100644
--- a/drivers/iio/light/vcnl4000.c
+++ b/drivers/iio/light/vcnl4000.c
@@ -179,13 +179,7 @@ static int vcnl4000_probe(struct i2c_client *client,
         indio_dev->name = VCNL4000_DRV_NAME;
         indio_dev->modes = INDIO_DIRECT_MODE;
 
-        return iio_device_register(indio_dev);
-}
-
-static int vcnl4000_remove(struct i2c_client *client)
-{
-        iio_device_unregister(i2c_get_clientdata(client));
-        return 0;
+        return devm_iio_device_register(&client->dev, indio_dev);
 }
 
 static struct i2c_driver vcnl4000_driver = {
@@ -194,7 +188,6 @@ static struct i2c_driver vcnl4000_driver = {
                 .owner  = THIS_MODULE,
         },
         .probe  = vcnl4000_probe,
-        .remove = vcnl4000_remove,
         .id_table = vcnl4000_id,
 };