|
@@ -25,11 +25,9 @@ static int st_press_i2c_probe(struct i2c_client *client,
|
|
|
struct st_sensor_data *pdata;
|
|
|
int err;
|
|
|
|
|
|
- indio_dev = iio_device_alloc(sizeof(*pdata));
|
|
|
- if (indio_dev == NULL) {
|
|
|
- err = -ENOMEM;
|
|
|
- goto iio_device_alloc_error;
|
|
|
- }
|
|
|
+ indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*pdata));
|
|
|
+ if (!indio_dev)
|
|
|
+ return -ENOMEM;
|
|
|
|
|
|
pdata = iio_priv(indio_dev);
|
|
|
pdata->dev = &client->dev;
|
|
@@ -38,14 +36,9 @@ static int st_press_i2c_probe(struct i2c_client *client,
|
|
|
|
|
|
err = st_press_common_probe(indio_dev, client->dev.platform_data);
|
|
|
if (err < 0)
|
|
|
- goto st_press_common_probe_error;
|
|
|
+ return err;
|
|
|
|
|
|
return 0;
|
|
|
-
|
|
|
-st_press_common_probe_error:
|
|
|
- iio_device_free(indio_dev);
|
|
|
-iio_device_alloc_error:
|
|
|
- return err;
|
|
|
}
|
|
|
|
|
|
static int st_press_i2c_remove(struct i2c_client *client)
|