Skip to content

Commit 5c2833c

Browse files
Uwe Kleine-Königgroeck
authored andcommitted
hwmon: (smsc47m1) 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 <u.kleine-koenig@pengutronix.de> Link: https://lore.kernel.org/r/a732270539ef63094a32d0ff582f78e640caf3e4.1701957841.git.u.kleine-koenig@pengutronix.de Signed-off-by: Guenter Roeck <linux@roeck-us.net>
1 parent 3b01839 commit 5c2833c

1 file changed

Lines changed: 2 additions & 4 deletions

File tree

drivers/hwmon/smsc47m1.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -840,14 +840,12 @@ static int __init smsc47m1_probe(struct platform_device *pdev)
840840
return err;
841841
}
842842

843-
static int __exit smsc47m1_remove(struct platform_device *pdev)
843+
static void __exit smsc47m1_remove(struct platform_device *pdev)
844844
{
845845
struct smsc47m1_data *data = platform_get_drvdata(pdev);
846846

847847
hwmon_device_unregister(data->hwmon_dev);
848848
smsc47m1_remove_files(&pdev->dev);
849-
850-
return 0;
851849
}
852850

853851
/*
@@ -860,7 +858,7 @@ static struct platform_driver smsc47m1_driver __refdata = {
860858
.driver = {
861859
.name = DRVNAME,
862860
},
863-
.remove = __exit_p(smsc47m1_remove),
861+
.remove_new = __exit_p(smsc47m1_remove),
864862
};
865863

866864
static int __init smsc47m1_device_add(unsigned short address,

0 commit comments

Comments
 (0)