Skip to content

Commit 9eeec41

Browse files
Uwe Kleine-Königgregkh
authored andcommitted
firmware: qemu_fw_cfg: 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> Acked-by: Michael S. Tsirkin <mst@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> Link: https://lore.kernel.org/r/8d7d86a24ea36985845c17b6da0933fedbf99ad8.1703693980.git.u.kleine-koenig@pengutronix.de Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent ab45e1f commit 9eeec41

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

drivers/firmware/qemu_fw_cfg.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -731,15 +731,14 @@ static int fw_cfg_sysfs_probe(struct platform_device *pdev)
731731
return err;
732732
}
733733

734-
static int fw_cfg_sysfs_remove(struct platform_device *pdev)
734+
static void fw_cfg_sysfs_remove(struct platform_device *pdev)
735735
{
736736
pr_debug("fw_cfg: unloading.\n");
737737
fw_cfg_sysfs_cache_cleanup();
738738
sysfs_remove_file(fw_cfg_top_ko, &fw_cfg_rev_attr.attr);
739739
fw_cfg_io_cleanup();
740740
fw_cfg_kset_unregister_recursive(fw_cfg_fname_kset);
741741
fw_cfg_kobj_cleanup(fw_cfg_sel_ko);
742-
return 0;
743742
}
744743

745744
static const struct of_device_id fw_cfg_sysfs_mmio_match[] = {
@@ -758,7 +757,7 @@ MODULE_DEVICE_TABLE(acpi, fw_cfg_sysfs_acpi_match);
758757

759758
static struct platform_driver fw_cfg_sysfs_driver = {
760759
.probe = fw_cfg_sysfs_probe,
761-
.remove = fw_cfg_sysfs_remove,
760+
.remove_new = fw_cfg_sysfs_remove,
762761
.driver = {
763762
.name = "fw_cfg",
764763
.of_match_table = fw_cfg_sysfs_mmio_match,

0 commit comments

Comments
 (0)