diff options
| author | Sachin Kamat <sachin.kamat@linaro.org> | 2013-07-30 10:24:00 +0400 |
|---|---|---|
| committer | Jonathan Cameron <jic23@kernel.org> | 2013-08-04 00:02:38 +0400 |
| commit | d0fe8c8b3b683979f31dfe2ebba6bb1eade21ccd (patch) | |
| tree | 1548940892c5de17a9661836d97964fdf21ee0ad /drivers/iio/pressure/st_pressure_i2c.c | |
| parent | b46400c639de7b0b3abce226b7ba0cbb253a4806 (diff) | |
| download | linux-d0fe8c8b3b683979f31dfe2ebba6bb1eade21ccd.tar.xz | |
iio: pressure: st_pressure: Use devm_iio_device_alloc
Using devm_iio_device_alloc makes code simpler.
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Cc: Denis Ciocca <denis.ciocca@st.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Diffstat (limited to 'drivers/iio/pressure/st_pressure_i2c.c')
| -rw-r--r-- | drivers/iio/pressure/st_pressure_i2c.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/drivers/iio/pressure/st_pressure_i2c.c b/drivers/iio/pressure/st_pressure_i2c.c index 306599307a96..08aac5e6251d 100644 --- a/drivers/iio/pressure/st_pressure_i2c.c +++ b/drivers/iio/pressure/st_pressure_i2c.c @@ -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) |