Commit 1ba15cf2 authored by Sachin Kamat's avatar Sachin Kamat Committed by Jonathan Cameron

iio: hid-sensor-gyro-3d: Use devm_iio_device_alloc

Using devm_iio_device_alloc makes code simpler.
Signed-off-by: default avatarSachin Kamat <sachin.kamat@linaro.org>
Cc: Srinivas Pandruvada <srinivas.pandruvada@intel.com>
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
parent 827b14a8
...@@ -282,11 +282,9 @@ static int hid_gyro_3d_probe(struct platform_device *pdev) ...@@ -282,11 +282,9 @@ static int hid_gyro_3d_probe(struct platform_device *pdev)
struct hid_sensor_hub_device *hsdev = pdev->dev.platform_data; struct hid_sensor_hub_device *hsdev = pdev->dev.platform_data;
struct iio_chan_spec *channels; struct iio_chan_spec *channels;
indio_dev = iio_device_alloc(sizeof(struct gyro_3d_state)); indio_dev = devm_iio_device_alloc(&pdev->dev, sizeof(*gyro_state));
if (indio_dev == NULL) { if (!indio_dev)
ret = -ENOMEM; return -ENOMEM;
goto error_ret;
}
platform_set_drvdata(pdev, indio_dev); platform_set_drvdata(pdev, indio_dev);
gyro_state = iio_priv(indio_dev); gyro_state = iio_priv(indio_dev);
...@@ -298,15 +296,14 @@ static int hid_gyro_3d_probe(struct platform_device *pdev) ...@@ -298,15 +296,14 @@ static int hid_gyro_3d_probe(struct platform_device *pdev)
&gyro_state->common_attributes); &gyro_state->common_attributes);
if (ret) { if (ret) {
dev_err(&pdev->dev, "failed to setup common attributes\n"); dev_err(&pdev->dev, "failed to setup common attributes\n");
goto error_free_dev; return ret;
} }
channels = kmemdup(gyro_3d_channels, sizeof(gyro_3d_channels), channels = kmemdup(gyro_3d_channels, sizeof(gyro_3d_channels),
GFP_KERNEL); GFP_KERNEL);
if (!channels) { if (!channels) {
ret = -ENOMEM;
dev_err(&pdev->dev, "failed to duplicate channels\n"); dev_err(&pdev->dev, "failed to duplicate channels\n");
goto error_free_dev; return -ENOMEM;
} }
ret = gyro_3d_parse_report(pdev, hsdev, channels, ret = gyro_3d_parse_report(pdev, hsdev, channels,
...@@ -363,9 +360,6 @@ static int hid_gyro_3d_probe(struct platform_device *pdev) ...@@ -363,9 +360,6 @@ static int hid_gyro_3d_probe(struct platform_device *pdev)
iio_triggered_buffer_cleanup(indio_dev); iio_triggered_buffer_cleanup(indio_dev);
error_free_dev_mem: error_free_dev_mem:
kfree(indio_dev->channels); kfree(indio_dev->channels);
error_free_dev:
iio_device_free(indio_dev);
error_ret:
return ret; return ret;
} }
...@@ -380,7 +374,6 @@ static int hid_gyro_3d_remove(struct platform_device *pdev) ...@@ -380,7 +374,6 @@ static int hid_gyro_3d_remove(struct platform_device *pdev)
hid_sensor_remove_trigger(indio_dev); hid_sensor_remove_trigger(indio_dev);
iio_triggered_buffer_cleanup(indio_dev); iio_triggered_buffer_cleanup(indio_dev);
kfree(indio_dev->channels); kfree(indio_dev->channels);
iio_device_free(indio_dev);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment