iio: adc: viperboard_adc: Use devm_iio_device_alloc

Using devm_iio_device_alloc makes code simpler.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Cc: Lars Poeschel <poeschel@lemonage.de>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
This commit is contained in:
Sachin Kamat 2013-07-23 09:58:00 +01:00 committed by Jonathan Cameron
parent 99e94b6d56
commit 3ef50f8830

View File

@ -124,7 +124,7 @@ static int vprbrd_adc_probe(struct platform_device *pdev)
int ret; int ret;
/* registering iio */ /* registering iio */
indio_dev = iio_device_alloc(sizeof(*adc)); indio_dev = devm_iio_device_alloc(&pdev->dev, sizeof(*adc));
if (!indio_dev) { if (!indio_dev) {
dev_err(&pdev->dev, "failed allocating iio device\n"); dev_err(&pdev->dev, "failed allocating iio device\n");
return -ENOMEM; return -ENOMEM;
@ -142,16 +142,12 @@ static int vprbrd_adc_probe(struct platform_device *pdev)
ret = iio_device_register(indio_dev); ret = iio_device_register(indio_dev);
if (ret) { if (ret) {
dev_err(&pdev->dev, "could not register iio (adc)"); dev_err(&pdev->dev, "could not register iio (adc)");
goto error; return ret;
} }
platform_set_drvdata(pdev, indio_dev); platform_set_drvdata(pdev, indio_dev);
return 0; return 0;
error:
iio_device_free(indio_dev);
return ret;
} }
static int vprbrd_adc_remove(struct platform_device *pdev) static int vprbrd_adc_remove(struct platform_device *pdev)
@ -159,7 +155,6 @@ static int vprbrd_adc_remove(struct platform_device *pdev)
struct iio_dev *indio_dev = platform_get_drvdata(pdev); struct iio_dev *indio_dev = platform_get_drvdata(pdev);
iio_device_unregister(indio_dev); iio_device_unregister(indio_dev);
iio_device_free(indio_dev);
return 0; return 0;
} }