hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Using devm_iio_device_alloc makes code simpler.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Cc: Srinivas Pandruvada <srinivas.pandruvada@intel.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
This commit is contained in:
Sachin Kamat 2013-07-23 07:47:00 +01:00 committed by Jonathan Cameron
parent 80cab1da70
commit 6b545eed65
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/iio/accel/hid-sensor-accel-3d.c
View File

@ -282,11 +282,11 @@ static int hid_accel_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 accel_3d_state)); indio_dev = devm_iio_device_alloc(&pdev->dev,
if (indio_dev == NULL) { sizeof(struct accel_3d_state));
ret = -ENOMEM; if (indio_dev == NULL)
goto error_ret; return -ENOMEM;
}
platform_set_drvdata(pdev, indio_dev); platform_set_drvdata(pdev, indio_dev);
accel_state = iio_priv(indio_dev); accel_state = iio_priv(indio_dev);
@ -298,15 +298,14 @@ static int hid_accel_3d_probe(struct platform_device *pdev)
&accel_state->common_attributes); &accel_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(accel_3d_channels, sizeof(accel_3d_channels), channels = kmemdup(accel_3d_channels, sizeof(accel_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 = accel_3d_parse_report(pdev, hsdev, channels, ret = accel_3d_parse_report(pdev, hsdev, channels,
@ -363,9 +362,6 @@ error_unreg_buffer_funcs:
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 +376,6 @@ static int hid_accel_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;
} }