platform/x86: fujitsu-laptop: allocate fujitsu_laptop in acpi_fujitsu_laptop_add()

Only allocate memory for struct fujitsu_laptop when the FUJ02E3 ACPI
device is present.  Use devm_kzalloc() for allocating memory to simplify
cleanup.

Signed-off-by: Michał Kępień <kernel@kempniu.pl>
Reviewed-by: Jonathan Woithe <jwoithe@just42.net>
Signed-off-by: Darren Hart (VMware) <dvhart@infradead.org>

diff --git a/drivers/platform/x86/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c
index 1124070aad2de4079415d51293687115f07f1c57..3916f0ae59f3f603f102795d07a9ac7355c4da3a 100644 (file)
--- a/drivers/platform/x86/fujitsu-laptop.c
+++ b/drivers/platform/x86/fujitsu-laptop.c
@@ -776,6 +776,7 @@ static int acpi_fujitsu_laptop_leds_register(struct acpi_device *device)
 
 static int acpi_fujitsu_laptop_add(struct acpi_device *device)
 {
+       struct fujitsu_laptop *priv;
        int state = 0;
        int error;
        int i;
@@ -783,11 +784,16 @@ static int acpi_fujitsu_laptop_add(struct acpi_device *device)
        if (!device)
                return -EINVAL;
 
+       priv = devm_kzalloc(&device->dev, sizeof(*priv), GFP_KERNEL);
+       if (!priv)
+               return -ENOMEM;
+
+       fujitsu_laptop = priv;
        fujitsu_laptop->acpi_handle = device->handle;
        sprintf(acpi_device_name(device), "%s",
                ACPI_FUJITSU_LAPTOP_DEVICE_NAME);
        sprintf(acpi_device_class(device), "%s", ACPI_FUJITSU_CLASS);
-       device->driver_data = fujitsu_laptop;
+       device->driver_data = priv;
 
        /* kfifo */
        spin_lock_init(&fujitsu_laptop->fifo_lock);
@@ -1014,22 +1020,14 @@ static int __init fujitsu_init(void)
 
        /* Register laptop driver */
 
-       fujitsu_laptop = kzalloc(sizeof(struct fujitsu_laptop), GFP_KERNEL);
-       if (!fujitsu_laptop) {
-               ret = -ENOMEM;
-               goto err_unregister_platform_driver;
-       }
-
        ret = acpi_bus_register_driver(&acpi_fujitsu_laptop_driver);
        if (ret)
-               goto err_free_fujitsu_laptop;
+               goto err_unregister_platform_driver;
 
        pr_info("driver " FUJITSU_DRIVER_VERSION " successfully loaded\n");
 
        return 0;
 
-err_free_fujitsu_laptop:
-       kfree(fujitsu_laptop);
 err_unregister_platform_driver:
        platform_driver_unregister(&fujitsu_pf_driver);
 err_unregister_acpi:
@@ -1042,8 +1040,6 @@ static void __exit fujitsu_cleanup(void)
 {
        acpi_bus_unregister_driver(&acpi_fujitsu_laptop_driver);
 
-       kfree(fujitsu_laptop);
-
        platform_driver_unregister(&fujitsu_pf_driver);
 
        acpi_bus_unregister_driver(&acpi_fujitsu_bl_driver);