| Message ID | 1374490981-24373-9-git-send-email-sachin.kamat@linaro.org |
|---|---|
| State | Accepted |
| Headers | show |
On 07/22/13 12:03, Sachin Kamat wrote: > Using devm_iio_device_alloc makes code simpler. > > Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> > Cc: Laxman Dewangan <ldewangan@nvidia.com> Applied to the togreg branch of iio.git Thanks for all of these. > --- > drivers/staging/iio/light/isl29028.c | 13 ++++--------- > 1 file changed, 4 insertions(+), 9 deletions(-) > > diff --git a/drivers/staging/iio/light/isl29028.c b/drivers/staging/iio/light/isl29028.c > index 8bb0d03..6014625 100644 > --- a/drivers/staging/iio/light/isl29028.c > +++ b/drivers/staging/iio/light/isl29028.c > @@ -482,7 +482,7 @@ static int isl29028_probe(struct i2c_client *client, > struct iio_dev *indio_dev; > int ret; > > - indio_dev = iio_device_alloc(sizeof(*chip)); > + indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*chip)); > if (!indio_dev) { > dev_err(&client->dev, "iio allocation fails\n"); > return -ENOMEM; > @@ -498,13 +498,13 @@ static int isl29028_probe(struct i2c_client *client, > if (IS_ERR(chip->regmap)) { > ret = PTR_ERR(chip->regmap); > dev_err(chip->dev, "regmap initialization failed: %d\n", ret); > - goto exit_iio_free; > + return ret; > } > > ret = isl29028_chip_init(chip); > if (ret < 0) { > dev_err(chip->dev, "chip initialization failed: %d\n", ret); > - goto exit_iio_free; > + return ret; > } > > indio_dev->info = &isl29028_info; > @@ -517,13 +517,9 @@ static int isl29028_probe(struct i2c_client *client, > if (ret < 0) { > dev_err(chip->dev, "iio registration fails with error %d\n", > ret); > - goto exit_iio_free; > + return ret; > } > return 0; > - > -exit_iio_free: > - iio_device_free(indio_dev); > - return ret; > } > > static int isl29028_remove(struct i2c_client *client) > @@ -531,7 +527,6 @@ static int isl29028_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; > } > >
diff --git a/drivers/staging/iio/light/isl29028.c b/drivers/staging/iio/light/isl29028.c index 8bb0d03..6014625 100644 --- a/drivers/staging/iio/light/isl29028.c +++ b/drivers/staging/iio/light/isl29028.c @@ -482,7 +482,7 @@ static int isl29028_probe(struct i2c_client *client, struct iio_dev *indio_dev; int ret; - indio_dev = iio_device_alloc(sizeof(*chip)); + indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*chip)); if (!indio_dev) { dev_err(&client->dev, "iio allocation fails\n"); return -ENOMEM; @@ -498,13 +498,13 @@ static int isl29028_probe(struct i2c_client *client, if (IS_ERR(chip->regmap)) { ret = PTR_ERR(chip->regmap); dev_err(chip->dev, "regmap initialization failed: %d\n", ret); - goto exit_iio_free; + return ret; } ret = isl29028_chip_init(chip); if (ret < 0) { dev_err(chip->dev, "chip initialization failed: %d\n", ret); - goto exit_iio_free; + return ret; } indio_dev->info = &isl29028_info; @@ -517,13 +517,9 @@ static int isl29028_probe(struct i2c_client *client, if (ret < 0) { dev_err(chip->dev, "iio registration fails with error %d\n", ret); - goto exit_iio_free; + return ret; } return 0; - -exit_iio_free: - iio_device_free(indio_dev); - return ret; } static int isl29028_remove(struct i2c_client *client) @@ -531,7 +527,6 @@ static int isl29028_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; }
Using devm_iio_device_alloc makes code simpler. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Cc: Laxman Dewangan <ldewangan@nvidia.com> --- drivers/staging/iio/light/isl29028.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-)