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

[firefly-linux-kernel-4.4.55.git] / drivers / iio / gyro / st_gyro_i2c.c

diff --git a/drivers/iio/gyro/st_gyro_i2c.c b/drivers/iio/gyro/st_gyro_i2c.c
index 8a310500573d964b7b5b8b164e8c4aab31b22a85..16b8b8d70bf127973b43f819999c3876f7a8683d 100644 (file)
--- a/drivers/iio/gyro/st_gyro_i2c.c
+++ b/drivers/iio/gyro/st_gyro_i2c.c
@@ -25,27 +25,21 @@ static int st_gyro_i2c_probe(struct i2c_client *client,
        struct st_sensor_data *gdata;
        int err;
 
-       indio_dev = iio_device_alloc(sizeof(*gdata));
-       if (indio_dev == NULL) {
-               err = -ENOMEM;
-               goto iio_device_alloc_error;
-       }
+       indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*gdata));
+       if (!indio_dev)
+               return -ENOMEM;
 
        gdata = iio_priv(indio_dev);
        gdata->dev = &client->dev;
 
        st_sensors_i2c_configure(indio_dev, client, gdata);
 
-       err = st_gyro_common_probe(indio_dev);
+       err = st_gyro_common_probe(indio_dev,
+                               (struct st_sensors_platform_data *)&gyro_pdata);
        if (err < 0)
-               goto st_gyro_common_probe_error;
+               return err;
 
        return 0;
-
-st_gyro_common_probe_error:
-       iio_device_free(indio_dev);
-iio_device_alloc_error:
-       return err;
 }
 
 static int st_gyro_i2c_remove(struct i2c_client *client)