Skip to content

Commit afbc301

Browse files
Uwe Kleine-KönigJiri Kosina
authored andcommitted
HID: hid-sensor-custom: Convert to platform remove callback returning void
The .remove() callback for a platform driver returns an int which makes many driver authors wrongly assume it's possible to do error handling by returning an error code. However the value returned is ignored (apart from emitting a warning) and this typically results in resource leaks. To improve here there is a quest to make the remove callback return void. In the first step of this quest all drivers are converted to .remove_new(), which already returns void. Eventually after all drivers are converted, .remove_new() will be renamed to .remove(). Trivially convert this driver from always returning zero in the remove callback to the void returning variant. Signed-off-by: Uwe Kleine-König <[email protected]> Acked-by: Srinivas Pandruvada <[email protected]> Reviewed-by: Jonathan Cameron <[email protected]> Signed-off-by: Jiri Kosina <[email protected]>
1 parent d030061 commit afbc301

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

drivers/hid/hid-sensor-custom.c

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1032,23 +1032,21 @@ static int hid_sensor_custom_probe(struct platform_device *pdev)
10321032
return ret;
10331033
}
10341034

1035-
static int hid_sensor_custom_remove(struct platform_device *pdev)
1035+
static void hid_sensor_custom_remove(struct platform_device *pdev)
10361036
{
10371037
struct hid_sensor_custom *sensor_inst = platform_get_drvdata(pdev);
10381038
struct hid_sensor_hub_device *hsdev = pdev->dev.platform_data;
10391039

10401040
if (sensor_inst->custom_pdev) {
10411041
platform_device_unregister(sensor_inst->custom_pdev);
1042-
return 0;
1042+
return;
10431043
}
10441044

10451045
hid_sensor_custom_dev_if_remove(sensor_inst);
10461046
hid_sensor_custom_remove_attributes(sensor_inst);
10471047
sysfs_remove_group(&sensor_inst->pdev->dev.kobj,
10481048
&enable_sensor_attr_group);
10491049
sensor_hub_remove_callback(hsdev, hsdev->usage);
1050-
1051-
return 0;
10521050
}
10531051

10541052
static const struct platform_device_id hid_sensor_custom_ids[] = {
@@ -1068,7 +1066,7 @@ static struct platform_driver hid_sensor_custom_platform_driver = {
10681066
.name = KBUILD_MODNAME,
10691067
},
10701068
.probe = hid_sensor_custom_probe,
1071-
.remove = hid_sensor_custom_remove,
1069+
.remove_new = hid_sensor_custom_remove,
10721070
};
10731071
module_platform_driver(hid_sensor_custom_platform_driver);
10741072

0 commit comments

Comments
 (0)