[PATCH v4 31/36] iio: magnetometer: hid-sensor-magn-3d: drop hid_sensor_remove_trigger() using devm API
From: Sanjay Chitroda
Date: Sun May 24 2026 - 15:35:39 EST
From: Sanjay Chitroda <sanjayembeddedse@xxxxxxxxx>
Use devm_hid_sensor_setup_trigger() to automatically release resource
during fail, unbind or removal of driver using devres framework.
This simplify the setup, remove goto, avoid manual resource cleanup in
teardown path.
Signed-off-by: Sanjay Chitroda <sanjayembeddedse@xxxxxxxxx>
---
drivers/iio/magnetometer/hid-sensor-magn-3d.c | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/drivers/iio/magnetometer/hid-sensor-magn-3d.c b/drivers/iio/magnetometer/hid-sensor-magn-3d.c
index 22c7b24e2e3a..3019de46731a 100644
--- a/drivers/iio/magnetometer/hid-sensor-magn-3d.c
+++ b/drivers/iio/magnetometer/hid-sensor-magn-3d.c
@@ -516,8 +516,8 @@ static int hid_magn_3d_probe(struct platform_device *pdev)
atomic_set(&magn_state->magn_flux_attributes.data_ready, 0);
- ret = hid_sensor_setup_trigger(indio_dev, name,
- &magn_state->magn_flux_attributes);
+ ret = devm_hid_sensor_setup_trigger(dev, indio_dev, name,
+ &magn_state->magn_flux_attributes);
if (ret < 0) {
dev_err(dev, "trigger setup failed\n");
return ret;
@@ -526,7 +526,7 @@ static int hid_magn_3d_probe(struct platform_device *pdev)
ret = iio_device_register(indio_dev);
if (ret) {
dev_err(dev, "device register failed\n");
- goto error_remove_trigger;
+ return ret;
}
magn_state->callbacks.send_event = magn_3d_proc_event;
@@ -543,8 +543,6 @@ static int hid_magn_3d_probe(struct platform_device *pdev)
error_iio_unreg:
iio_device_unregister(indio_dev);
-error_remove_trigger:
- hid_sensor_remove_trigger(&magn_state->magn_flux_attributes);
return ret;
}
@@ -553,11 +551,9 @@ static void hid_magn_3d_remove(struct platform_device *pdev)
{
struct hid_sensor_hub_device *hsdev = dev_get_platdata(&pdev->dev);
struct iio_dev *indio_dev = platform_get_drvdata(pdev);
- struct magn_3d_state *magn_state = iio_priv(indio_dev);
sensor_hub_remove_callback(hsdev, HID_USAGE_SENSOR_COMPASS_3D);
iio_device_unregister(indio_dev);
- hid_sensor_remove_trigger(&magn_state->magn_flux_attributes);
}
static const struct platform_device_id hid_magn_3d_ids[] = {
--
2.34.1