Move code responsible for backlight device registration to a separate
function in order to simplify error handling and decrease indentation.
Simplify initialization of struct backlight_properties.  Use
KBUILD_MODNAME as device name to avoid repeating the same string literal
throughout the module.

Signed-off-by: Michał Kępień <ker...@kempniu.pl>
---
 drivers/platform/x86/fujitsu-laptop.c | 38 ++++++++++++++++++++---------------
 1 file changed, 22 insertions(+), 16 deletions(-)

diff --git a/drivers/platform/x86/fujitsu-laptop.c 
b/drivers/platform/x86/fujitsu-laptop.c
index 9f62d9e1b0de..df1cd0a0231d 100644
--- a/drivers/platform/x86/fujitsu-laptop.c
+++ b/drivers/platform/x86/fujitsu-laptop.c
@@ -1174,9 +1174,28 @@ static const struct acpi_device_id fujitsu_ids[] __used 
= {
 };
 MODULE_DEVICE_TABLE(acpi, fujitsu_ids);
 
+static int __init fujitsu_backlight_init(void)
+{
+       struct backlight_properties props = {
+               .brightness = fujitsu->brightness_level,
+               .max_brightness = fujitsu->max_brightness - 1,
+               .type = BACKLIGHT_PLATFORM
+       };
+       struct backlight_device *bd;
+
+       bd = backlight_device_register(KBUILD_MODNAME, NULL, NULL,
+                                      &fujitsubl_ops, &props);
+       if (IS_ERR(bd))
+               return PTR_ERR(bd);
+
+       fujitsu->bl_device = bd;
+
+       return 0;
+}
+
 static int __init fujitsu_init(void)
 {
-       int ret, max_brightness;
+       int ret;
 
        if (acpi_disabled)
                return -ENODEV;
@@ -1216,22 +1235,9 @@ static int __init fujitsu_init(void)
        /* Register backlight stuff */
 
        if (acpi_video_get_backlight_type() == acpi_backlight_vendor) {
-               struct backlight_properties props;
-
-               memset(&props, 0, sizeof(struct backlight_properties));
-               max_brightness = fujitsu->max_brightness;
-               props.type = BACKLIGHT_PLATFORM;
-               props.max_brightness = max_brightness - 1;
-               fujitsu->bl_device = backlight_device_register("fujitsu-laptop",
-                                                              NULL, NULL,
-                                                              &fujitsubl_ops,
-                                                              &props);
-               if (IS_ERR(fujitsu->bl_device)) {
-                       ret = PTR_ERR(fujitsu->bl_device);
-                       fujitsu->bl_device = NULL;
+               ret = fujitsu_backlight_init();
+               if (ret)
                        goto fail_sysfs_group;
-               }
-               fujitsu->bl_device->props.brightness = 
fujitsu->brightness_level;
        }
 
        ret = platform_driver_register(&fujitsupf_driver);
-- 
2.11.0

Reply via email to