On 08/19/13 12:38, Sachin Kamat wrote:
> Using devm_iio_device_alloc makes code simpler.
>
> Signed-off-by: Sachin Kamat <sachin.kamat@xxxxxxxxxx>
> Cc: Roland Stigge <stigge@xxxxxxxxx>
Applied to the togreg branch of iio.git
p.s. Roland, hope you don't mind. This one seems trivial
enough that I didn't think you'd mind me applying it without an
ack.
Jonathan
> ---
> drivers/iio/dac/max517.c | 17 ++++-------------
> 1 file changed, 4 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/iio/dac/max517.c b/drivers/iio/dac/max517.c
> index ebfaa41..83adcbf 100644
> --- a/drivers/iio/dac/max517.c
> +++ b/drivers/iio/dac/max517.c
> @@ -164,11 +164,9 @@ static int max517_probe(struct i2c_client *client,
> struct max517_platform_data *platform_data = client->dev.platform_data;
> int err;
>
> - indio_dev = iio_device_alloc(sizeof(*data));
> - if (indio_dev == NULL) {
> - err = -ENOMEM;
> - goto exit;
> - }
> + indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*data));
> + if (!indio_dev)
> + return -ENOMEM;
> data = iio_priv(indio_dev);
> i2c_set_clientdata(client, indio_dev);
> data->client = client;
> @@ -198,23 +196,16 @@ static int max517_probe(struct i2c_client *client,
>
> err = iio_device_register(indio_dev);
> if (err)
> - goto exit_free_device;
> + return err;
>
> dev_info(&client->dev, "DAC registered\n");
>
> return 0;
> -
> -exit_free_device:
> - iio_device_free(indio_dev);
> -exit:
> - return err;
> }
>
> static int max517_remove(struct i2c_client *client)
> {
> iio_device_unregister(i2c_get_clientdata(client));
> - iio_device_free(i2c_get_clientdata(client));
> -
> return 0;
> }
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-iio" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
