Commit 907c0a0a authored by Sachin Kamat's avatar Sachin Kamat Committed by Jonathan Cameron

iio: magnetometer: hid-sensor-magn-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 555d5a9f
...@@ -283,11 +283,11 @@ static int hid_magn_3d_probe(struct platform_device *pdev) ...@@ -283,11 +283,11 @@ static int hid_magn_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 magn_3d_state)); indio_dev = devm_iio_device_alloc(&pdev->dev,
if (indio_dev == NULL) { sizeof(struct magn_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);
magn_state = iio_priv(indio_dev); magn_state = iio_priv(indio_dev);
...@@ -299,15 +299,14 @@ static int hid_magn_3d_probe(struct platform_device *pdev) ...@@ -299,15 +299,14 @@ static int hid_magn_3d_probe(struct platform_device *pdev)
&magn_state->common_attributes); &magn_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(magn_3d_channels, sizeof(magn_3d_channels), channels = kmemdup(magn_3d_channels, sizeof(magn_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 = magn_3d_parse_report(pdev, hsdev, channels, ret = magn_3d_parse_report(pdev, hsdev, channels,
...@@ -364,9 +363,6 @@ static int hid_magn_3d_probe(struct platform_device *pdev) ...@@ -364,9 +363,6 @@ static int hid_magn_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;
} }
...@@ -381,7 +377,6 @@ static int hid_magn_3d_remove(struct platform_device *pdev) ...@@ -381,7 +377,6 @@ static int hid_magn_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