mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-15 16:24:13 +08:00
iio: max1363: Use devm_iio_device_alloc
Using devm_iio_device_alloc makes code simpler. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
This commit is contained in:
parent
ebeb021af2
commit
6917e1d9af
@ -1498,16 +1498,15 @@ static int max1363_probe(struct i2c_client *client,
|
||||
struct iio_dev *indio_dev;
|
||||
struct regulator *vref;
|
||||
|
||||
indio_dev = iio_device_alloc(sizeof(struct max1363_state));
|
||||
if (indio_dev == NULL) {
|
||||
ret = -ENOMEM;
|
||||
goto error_out;
|
||||
}
|
||||
indio_dev = devm_iio_device_alloc(&client->dev,
|
||||
sizeof(struct max1363_state));
|
||||
if (!indio_dev)
|
||||
return -ENOMEM;
|
||||
|
||||
indio_dev->dev.of_node = client->dev.of_node;
|
||||
ret = iio_map_array_register(indio_dev, client->dev.platform_data);
|
||||
if (ret < 0)
|
||||
goto error_free_device;
|
||||
return ret;
|
||||
|
||||
st = iio_priv(indio_dev);
|
||||
|
||||
@ -1590,9 +1589,6 @@ error_disable_reg:
|
||||
regulator_disable(st->reg);
|
||||
error_unregister_map:
|
||||
iio_map_array_unregister(indio_dev);
|
||||
error_free_device:
|
||||
iio_device_free(indio_dev);
|
||||
error_out:
|
||||
return ret;
|
||||
}
|
||||
|
||||
@ -1607,7 +1603,6 @@ static int max1363_remove(struct i2c_client *client)
|
||||
regulator_disable(st->vref);
|
||||
regulator_disable(st->reg);
|
||||
iio_map_array_unregister(indio_dev);
|
||||
iio_device_free(indio_dev);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user