OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

platform/x86: fujitsu-laptop: cleanup error labels in fujitsu_init() 

Error labels currently used in fujitsu_init() are really hard to follow:
some (fail_laptop) indicate which operation has failed, others
(fail_sysfs_group) indicate where unrolling should start and the rest
(fail_platform_driver) is simply confusing.  Change them to follow the
pattern used throughout the rest of the module, i.e. make every label
indicate the first unrolling operation it leads to.

Signed-off-by: Michał Kępień <kernel@kempniu.pl>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-and-tested-by: Jonathan Woithe <jwoithe@just42.net>
This commit is contained in:
Michał Kępień 2017-03-10 11:50:36 +01:00 committed by Darren Hart
parent aea3137c2c
commit c2cddd4f7d
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/platform/x86/fujitsu-laptop.c
View File

@ -1236,60 +1236,60 @@ static int __init fujitsu_init(void)
ret = acpi_bus_register_driver(&acpi_fujitsu_bl_driver); ret = acpi_bus_register_driver(&acpi_fujitsu_bl_driver);
if (ret) if (ret)
goto fail_acpi; goto err_free_fujitsu_bl;
/* Register platform stuff */ /* Register platform stuff */
fujitsu_bl->pf_device = platform_device_alloc("fujitsu-laptop", -1); fujitsu_bl->pf_device = platform_device_alloc("fujitsu-laptop", -1);
if (!fujitsu_bl->pf_device) { if (!fujitsu_bl->pf_device) {
ret = -ENOMEM; ret = -ENOMEM;
goto fail_platform_driver; goto err_unregister_acpi;
} }
ret = platform_device_add(fujitsu_bl->pf_device); ret = platform_device_add(fujitsu_bl->pf_device);
if (ret) if (ret)
goto fail_platform_device1; goto err_put_platform_device;
ret = ret =
sysfs_create_group(&fujitsu_bl->pf_device->dev.kobj, sysfs_create_group(&fujitsu_bl->pf_device->dev.kobj,
&fujitsu_pf_attribute_group); &fujitsu_pf_attribute_group);
if (ret) if (ret)
goto fail_platform_device2; goto err_del_platform_device;
ret = platform_driver_register(&fujitsu_pf_driver); ret = platform_driver_register(&fujitsu_pf_driver);
if (ret) if (ret)
goto fail_sysfs_group; goto err_remove_sysfs_group;
/* Register laptop driver */ /* Register laptop driver */
fujitsu_laptop = kzalloc(sizeof(struct fujitsu_laptop), GFP_KERNEL); fujitsu_laptop = kzalloc(sizeof(struct fujitsu_laptop), GFP_KERNEL);
if (!fujitsu_laptop) { if (!fujitsu_laptop) {
ret = -ENOMEM; ret = -ENOMEM;
goto fail_laptop; goto err_unregister_platform_driver;
} }
ret = acpi_bus_register_driver(&acpi_fujitsu_laptop_driver); ret = acpi_bus_register_driver(&acpi_fujitsu_laptop_driver);
if (ret) if (ret)
goto fail_laptop1; goto err_free_fujitsu_laptop;
pr_info("driver " FUJITSU_DRIVER_VERSION " successfully loaded\n"); pr_info("driver " FUJITSU_DRIVER_VERSION " successfully loaded\n");
return 0; return 0;
fail_laptop1: err_free_fujitsu_laptop:
kfree(fujitsu_laptop); kfree(fujitsu_laptop);
fail_laptop: err_unregister_platform_driver:
platform_driver_unregister(&fujitsu_pf_driver); platform_driver_unregister(&fujitsu_pf_driver);
fail_sysfs_group: err_remove_sysfs_group:
sysfs_remove_group(&fujitsu_bl->pf_device->dev.kobj, sysfs_remove_group(&fujitsu_bl->pf_device->dev.kobj,
&fujitsu_pf_attribute_group); &fujitsu_pf_attribute_group);
fail_platform_device2: err_del_platform_device:
platform_device_del(fujitsu_bl->pf_device); platform_device_del(fujitsu_bl->pf_device);
fail_platform_device1: err_put_platform_device:
platform_device_put(fujitsu_bl->pf_device); platform_device_put(fujitsu_bl->pf_device);
fail_platform_driver: err_unregister_acpi:
acpi_bus_unregister_driver(&acpi_fujitsu_bl_driver); acpi_bus_unregister_driver(&acpi_fujitsu_bl_driver);
fail_acpi: err_free_fujitsu_bl:
kfree(fujitsu_bl); kfree(fujitsu_bl);
return ret; return ret;