OSDN Git Service

iio:common: Set the device pointer into ST common sensors library
authorDenis CIOCCA <denis.ciocca@st.com>
Fri, 3 Oct 2014 15:35:41 +0000 (17:35 +0200)
committerJonathan Cameron <jic23@kernel.org>
Sat, 4 Oct 2014 10:26:21 +0000 (11:26 +0100)
Signed-off-by: Denis Ciocca <denis.ciocca@st.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
drivers/iio/accel/st_accel_i2c.c
drivers/iio/accel/st_accel_spi.c
drivers/iio/common/st_sensors/st_sensors_i2c.c
drivers/iio/common/st_sensors/st_sensors_spi.c
drivers/iio/gyro/st_gyro_i2c.c
drivers/iio/gyro/st_gyro_spi.c
drivers/iio/magnetometer/st_magn_i2c.c
drivers/iio/magnetometer/st_magn_spi.c
drivers/iio/pressure/st_pressure_i2c.c
drivers/iio/pressure/st_pressure_spi.c

index 40adc7e..c7246bd 100644 (file)
@@ -79,7 +79,6 @@ static int st_accel_i2c_probe(struct i2c_client *client,
                return -ENOMEM;
 
        adata = iio_priv(indio_dev);
-       adata->dev = &client->dev;
        st_sensors_of_i2c_probe(client, st_accel_of_match);
 
        st_sensors_i2c_configure(indio_dev, client, adata);
index 2090d80..12ec293 100644 (file)
@@ -29,7 +29,6 @@ static int st_accel_spi_probe(struct spi_device *spi)
                return -ENOMEM;
 
        adata = iio_priv(indio_dev);
-       adata->dev = &spi->dev;
 
        st_sensors_spi_configure(indio_dev, spi, adata);
 
index bb6f308..98cfee2 100644 (file)
@@ -72,6 +72,7 @@ void st_sensors_i2c_configure(struct iio_dev *indio_dev,
        indio_dev->dev.parent = &client->dev;
        indio_dev->name = client->name;
 
+       sdata->dev = &client->dev;
        sdata->tf = &st_sensors_tf_i2c;
        sdata->get_irq_data_ready = st_sensors_i2c_get_irq;
 }
index 251baf6..78a6a1a 100644 (file)
@@ -111,6 +111,7 @@ void st_sensors_spi_configure(struct iio_dev *indio_dev,
        indio_dev->dev.parent = &spi->dev;
        indio_dev->name = spi->modalias;
 
+       sdata->dev = &spi->dev;
        sdata->tf = &st_sensors_tf_spi;
        sdata->get_irq_data_ready = st_sensors_spi_get_irq;
 }
index 94d01fb..64480b1 100644 (file)
@@ -67,7 +67,6 @@ static int st_gyro_i2c_probe(struct i2c_client *client,
                return -ENOMEM;
 
        gdata = iio_priv(indio_dev);
-       gdata->dev = &client->dev;
        st_sensors_of_i2c_probe(client, st_gyro_of_match);
 
        st_sensors_i2c_configure(indio_dev, client, gdata);
index 3e7a01a..e59bead 100644 (file)
@@ -29,7 +29,6 @@ static int st_gyro_spi_probe(struct spi_device *spi)
                return -ENOMEM;
 
        gdata = iio_priv(indio_dev);
-       gdata->dev = &spi->dev;
 
        st_sensors_spi_configure(indio_dev, spi, gdata);
 
index f8a6823..92e5c15 100644 (file)
@@ -51,7 +51,6 @@ 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);
index f642142..7adacf1 100644 (file)
@@ -29,7 +29,6 @@ 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);
 
index 8859e93..137788b 100644 (file)
@@ -51,7 +51,6 @@ static int st_press_i2c_probe(struct i2c_client *client,
                return -ENOMEM;
 
        press_data = iio_priv(indio_dev);
-       press_data->dev = &client->dev;
        st_sensors_of_i2c_probe(client, st_press_of_match);
 
        st_sensors_i2c_configure(indio_dev, client, press_data);
index 10c9624..1ffa6d4 100644 (file)
@@ -29,7 +29,6 @@ static int st_press_spi_probe(struct spi_device *spi)
                return -ENOMEM;
 
        press_data = iio_priv(indio_dev);
-       press_data->dev = &spi->dev;
 
        st_sensors_spi_configure(indio_dev, spi, press_data);