Merge tag 'iio-for-3.19a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next

Jonathan writes:

First round of new drivers, features and cleanups for IIO in the 3.19 cycle.

New drivers / supported parts
* rockchip - rk3066-tsadc variant
* si7020 humidity and temperature sensor
* mcp320x - add mcp3001, mcp3002, mcp3004, mcp3008, mcp3201, mcp3202
* bmp280 pressure and temperature sensor
* Qualcomm SPMI PMIC current ADC driver
* Exynos_adc - support exynos7

New features
* vf610-adc - add temperature sensor support
* Documentation of current attributes, scaled pressure, offset and
  scaled humidity, RGBC intensity gain factor and scale applied to
  differential voltage channels.
* Bring iio_event_monitor up to date with newer modifiers.
* Add of_xlate function to allow for complex channel mappings from the
  device tree.
* Add -g parameter to generic_buffer example to allow for devices with
  directly fed (no trigger) buffers.
* Move exynos driver over to syscon for PMU register access.

Cleanups, fixes for new drivers
* lis3l02dq drop an unneeded else.
* st sensors - renam st_sensors to st_sensor_settings (for clarity)
* st sensors - drop an unused parameter from all the probe utility
  functions.
* vf610 better error handling and tidy up.
* si7020 - cleanups following merge
* as3935 - drop some unnecessary semicolons.
* bmp280 - fix the pressure calculation.

4 files changed, 12 insertions, 15 deletions

diff --git a/drivers/iio/magnetometer/st_magn.h b/drivers/iio/magnetometer/st_magn.h
index 694e33e0fb72..7e81d00ef0c3 100644
--- a/drivers/iio/magnetometer/st_magn.h
+++ b/drivers/iio/magnetometer/st_magn.h
@@ -18,8 +18,7 @@
 #define LSM303DLM_MAGN_DEV_NAME         "lsm303dlm_magn"
 #define LIS3MDL_MAGN_DEV_NAME           "lis3mdl"
 
-int st_magn_common_probe(struct iio_dev *indio_dev,
-                                        struct st_sensors_platform_data *pdata);
+int st_magn_common_probe(struct iio_dev *indio_dev);
 void st_magn_common_remove(struct iio_dev *indio_dev);
 
 #ifdef CONFIG_IIO_BUFFER
diff --git a/drivers/iio/magnetometer/st_magn_core.c b/drivers/iio/magnetometer/st_magn_core.c
index 68cae86dbd29..8ade473f99fe 100644
--- a/drivers/iio/magnetometer/st_magn_core.c
+++ b/drivers/iio/magnetometer/st_magn_core.c
@@ -149,7 +149,7 @@ static const struct iio_chan_spec st_magn_2_16bit_channels[] = {
         IIO_CHAN_SOFT_TIMESTAMP(3)
 };
 
-static const struct st_sensors st_magn_sensors[] = {
+static const struct st_sensor_settings st_magn_sensors_settings[] = {
         {
                 .wai = ST_MAGN_1_WAI_EXP,
                 .sensors_supported = {
@@ -361,8 +361,7 @@ static const struct iio_info magn_info = {
         .write_raw = &st_magn_write_raw,
 };
 
-int st_magn_common_probe(struct iio_dev *indio_dev,
-                                        struct st_sensors_platform_data *pdata)
+int st_magn_common_probe(struct iio_dev *indio_dev)
 {
         struct st_sensor_data *mdata = iio_priv(indio_dev);
         int irq = mdata->get_irq_data_ready(indio_dev);
@@ -374,20 +373,21 @@ int st_magn_common_probe(struct iio_dev *indio_dev,
         st_sensors_power_enable(indio_dev);
 
         err = st_sensors_check_device_support(indio_dev,
-                                ARRAY_SIZE(st_magn_sensors), st_magn_sensors);
+                                        ARRAY_SIZE(st_magn_sensors_settings),
+                                        st_magn_sensors_settings);
         if (err < 0)
                 return err;
 
         mdata->num_data_channels = ST_MAGN_NUMBER_DATA_CHANNELS;
-        mdata->multiread_bit = mdata->sensor->multi_read_bit;
-        indio_dev->channels = mdata->sensor->ch;
+        mdata->multiread_bit = mdata->sensor_settings->multi_read_bit;
+        indio_dev->channels = mdata->sensor_settings->ch;
         indio_dev->num_channels = ST_SENSORS_NUMBER_ALL_CHANNELS;
 
         mdata->current_fullscale = (struct st_sensor_fullscale_avl *)
-                                                &mdata->sensor->fs.fs_avl[0];
-        mdata->odr = mdata->sensor->odr.odr_avl[0].hz;
+                                        &mdata->sensor_settings->fs.fs_avl[0];
+        mdata->odr = mdata->sensor_settings->odr.odr_avl[0].hz;
 
-        err = st_sensors_init_sensor(indio_dev, pdata);
+        err = st_sensors_init_sensor(indio_dev, NULL);
         if (err < 0)
                 return err;
 
diff --git a/drivers/iio/magnetometer/st_magn_i2c.c b/drivers/iio/magnetometer/st_magn_i2c.c
index 689250058442..92e5c15452a3 100644
--- a/drivers/iio/magnetometer/st_magn_i2c.c
+++ b/drivers/iio/magnetometer/st_magn_i2c.c
@@ -51,12 +51,11 @@ static int st_magn_i2c_probe(struct i2c_client *client,
                 return -ENOMEM;
 
         mdata = iio_priv(indio_dev);
-        mdata->dev = &client->dev;
         st_sensors_of_i2c_probe(client, st_magn_of_match);
 
         st_sensors_i2c_configure(indio_dev, client, mdata);
 
-        err = st_magn_common_probe(indio_dev, NULL);
+        err = st_magn_common_probe(indio_dev);
         if (err < 0)
                 return err;
 
diff --git a/drivers/iio/magnetometer/st_magn_spi.c b/drivers/iio/magnetometer/st_magn_spi.c
index a6143ea51dfc..7adacf160146 100644
--- a/drivers/iio/magnetometer/st_magn_spi.c
+++ b/drivers/iio/magnetometer/st_magn_spi.c
@@ -29,11 +29,10 @@ static int st_magn_spi_probe(struct spi_device *spi)
                 return -ENOMEM;
 
         mdata = iio_priv(indio_dev);
-        mdata->dev = &spi->dev;
 
         st_sensors_spi_configure(indio_dev, spi, mdata);
 
-        err = st_magn_common_probe(indio_dev, NULL);
+        err = st_magn_common_probe(indio_dev);
         if (err < 0)
                 return err;