Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[firefly-linux-kernel-4.4.55.git] / drivers / iio / accel / st_accel_i2c.c

diff --git a/drivers/iio/accel/st_accel_i2c.c b/drivers/iio/accel/st_accel_i2c.c
index ffc9d097e484b81a96b78fe422eb948b29a23f67..d7bedbdfc81dff86bf050d01c23d3d23419abec7 100644 (file)
--- a/drivers/iio/accel/st_accel_i2c.c
+++ b/drivers/iio/accel/st_accel_i2c.c
@@ -25,27 +25,20 @@ static int st_accel_i2c_probe(struct i2c_client *client,
        struct st_sensor_data *adata;
        int err;
 
-       indio_dev = iio_device_alloc(sizeof(*adata));
-       if (indio_dev == NULL) {
-               err = -ENOMEM;
-               goto iio_device_alloc_error;
-       }
+       indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*adata));
+       if (!indio_dev)
+               return -ENOMEM;
 
        adata = iio_priv(indio_dev);
        adata->dev = &client->dev;
 
        st_sensors_i2c_configure(indio_dev, client, adata);
 
-       err = st_accel_common_probe(indio_dev);
+       err = st_accel_common_probe(indio_dev, client->dev.platform_data);
        if (err < 0)
-               goto st_accel_common_probe_error;
+               return err;
 
        return 0;
-
-st_accel_common_probe_error:
-       iio_device_free(indio_dev);
-iio_device_alloc_error:
-       return err;
 }
 
 static int st_accel_i2c_remove(struct i2c_client *client)