mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-01-13 00:29:50 +00:00
iio: gyro: itg3200_core: Use devm_iio_device_alloc
Using devm_iio_device_alloc makes code simpler. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Cc: Christian Strobel <christian.strobel@iis.fraunhofer.de> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
This commit is contained in:
parent
6694cf9652
commit
d243b3c06d
@ -309,11 +309,9 @@ static int itg3200_probe(struct i2c_client *client,
|
|||||||
|
|
||||||
dev_dbg(&client->dev, "probe I2C dev with IRQ %i", client->irq);
|
dev_dbg(&client->dev, "probe I2C dev with IRQ %i", client->irq);
|
||||||
|
|
||||||
indio_dev = iio_device_alloc(sizeof(*st));
|
indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*st));
|
||||||
if (indio_dev == NULL) {
|
if (!indio_dev)
|
||||||
ret = -ENOMEM;
|
return -ENOMEM;
|
||||||
goto error_ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
st = iio_priv(indio_dev);
|
st = iio_priv(indio_dev);
|
||||||
|
|
||||||
@ -330,7 +328,7 @@ static int itg3200_probe(struct i2c_client *client,
|
|||||||
|
|
||||||
ret = itg3200_buffer_configure(indio_dev);
|
ret = itg3200_buffer_configure(indio_dev);
|
||||||
if (ret)
|
if (ret)
|
||||||
goto error_free_dev;
|
return ret;
|
||||||
|
|
||||||
if (client->irq) {
|
if (client->irq) {
|
||||||
ret = itg3200_probe_trigger(indio_dev);
|
ret = itg3200_probe_trigger(indio_dev);
|
||||||
@ -353,9 +351,6 @@ error_remove_trigger:
|
|||||||
itg3200_remove_trigger(indio_dev);
|
itg3200_remove_trigger(indio_dev);
|
||||||
error_unconfigure_buffer:
|
error_unconfigure_buffer:
|
||||||
itg3200_buffer_unconfigure(indio_dev);
|
itg3200_buffer_unconfigure(indio_dev);
|
||||||
error_free_dev:
|
|
||||||
iio_device_free(indio_dev);
|
|
||||||
error_ret:
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -370,8 +365,6 @@ static int itg3200_remove(struct i2c_client *client)
|
|||||||
|
|
||||||
itg3200_buffer_unconfigure(indio_dev);
|
itg3200_buffer_unconfigure(indio_dev);
|
||||||
|
|
||||||
iio_device_free(indio_dev);
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user