|
@@ -699,11 +699,9 @@ static int ad7746_probe(struct i2c_client *client,
|
|
|
int ret = 0;
|
|
|
unsigned char regval = 0;
|
|
|
|
|
|
- indio_dev = iio_device_alloc(sizeof(*chip));
|
|
|
- if (indio_dev == NULL) {
|
|
|
- ret = -ENOMEM;
|
|
|
- goto error_ret;
|
|
|
- }
|
|
|
+ indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*chip));
|
|
|
+ if (!indio_dev)
|
|
|
+ return -ENOMEM;
|
|
|
chip = iio_priv(indio_dev);
|
|
|
/* this is only used for device removal purposes */
|
|
|
i2c_set_clientdata(client, indio_dev);
|
|
@@ -748,20 +746,15 @@ static int ad7746_probe(struct i2c_client *client,
|
|
|
ret = i2c_smbus_write_byte_data(chip->client,
|
|
|
AD7746_REG_EXC_SETUP, regval);
|
|
|
if (ret < 0)
|
|
|
- goto error_free_dev;
|
|
|
+ return ret;
|
|
|
|
|
|
ret = iio_device_register(indio_dev);
|
|
|
if (ret)
|
|
|
- goto error_free_dev;
|
|
|
+ return ret;
|
|
|
|
|
|
dev_info(&client->dev, "%s capacitive sensor registered\n", id->name);
|
|
|
|
|
|
return 0;
|
|
|
-
|
|
|
-error_free_dev:
|
|
|
- iio_device_free(indio_dev);
|
|
|
-error_ret:
|
|
|
- return ret;
|
|
|
}
|
|
|
|
|
|
static int ad7746_remove(struct i2c_client *client)
|
|
@@ -769,7 +762,6 @@ static int ad7746_remove(struct i2c_client *client)
|
|
|
struct iio_dev *indio_dev = i2c_get_clientdata(client);
|
|
|
|
|
|
iio_device_unregister(indio_dev);
|
|
|
- iio_device_free(indio_dev);
|
|
|
|
|
|
return 0;
|
|
|
}
|