platform/x86: fujitsu-laptop: Unify local variable naming

Different functions in the module use varying names (error, result,
status) for a local variable storing the return value of a function call
that has to be checked for errors.  Use a common name (ret) for all
these local variables to improve code consistency.  Merge integer
variable declarations in acpi_fujitsu_laptop_add() into one line.

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 2cfbd3fa5136002362bdc558c14d00e40ed56e22..b5f782807bfa9140eeaa7ce2d0c6ed5d8b6311cf 100644 (file)
--- a/drivers/platform/x86/fujitsu-laptop.c
+++ b/drivers/platform/x86/fujitsu-laptop.c
@@ -385,7 +385,7 @@ static int fujitsu_backlight_register(struct acpi_device *device)
 static int acpi_fujitsu_bl_add(struct acpi_device *device)
 {
        struct fujitsu_bl *priv;
-       int error;
+       int ret;
 
        if (acpi_video_get_backlight_type() != acpi_backlight_vendor)
                return -ENODEV;
@@ -399,9 +399,9 @@ static int acpi_fujitsu_bl_add(struct acpi_device *device)
        strcpy(acpi_device_class(device), ACPI_FUJITSU_CLASS);
        device->driver_data = priv;
 
-       error = acpi_fujitsu_bl_input_setup(device);
-       if (error)
-               return error;
+       ret = acpi_fujitsu_bl_input_setup(device);
+       if (ret)
+               return ret;
 
        pr_info("ACPI: %s [%s]\n",
                acpi_device_name(device), acpi_device_bid(device));
@@ -410,9 +410,9 @@ static int acpi_fujitsu_bl_add(struct acpi_device *device)
                priv->max_brightness = FUJITSU_LCD_N_LEVELS;
        get_lcd_level(device);
 
-       error = fujitsu_backlight_register(device);
-       if (error)
-               return error;
+       ret = fujitsu_backlight_register(device);
+       if (ret)
+               return ret;
 
        return 0;
 }
@@ -693,7 +693,7 @@ static int acpi_fujitsu_laptop_leds_register(struct acpi_device *device)
 {
        struct fujitsu_laptop *priv = acpi_driver_data(device);
        struct led_classdev *led;
-       int result;
+       int ret;
 
        if (call_fext_func(device,
                           FUNC_LEDS, 0x0, 0x0, 0x0) & LOGOLAMP_POWERON) {
@@ -704,9 +704,9 @@ static int acpi_fujitsu_laptop_leds_register(struct acpi_device *device)
                led->name = "fujitsu::logolamp";
                led->brightness_set_blocking = logolamp_set;
                led->brightness_get = logolamp_get;
-               result = devm_led_classdev_register(&device->dev, led);
-               if (result)
-                       return result;
+               ret = devm_led_classdev_register(&device->dev, led);
+               if (ret)
+                       return ret;
        }
 
        if ((call_fext_func(device,
@@ -719,9 +719,9 @@ static int acpi_fujitsu_laptop_leds_register(struct acpi_device *device)
                led->name = "fujitsu::kblamps";
                led->brightness_set_blocking = kblamps_set;
                led->brightness_get = kblamps_get;
-               result = devm_led_classdev_register(&device->dev, led);
-               if (result)
-                       return result;
+               ret = devm_led_classdev_register(&device->dev, led);
+               if (ret)
+                       return ret;
        }
 
        /*
@@ -742,9 +742,9 @@ static int acpi_fujitsu_laptop_leds_register(struct acpi_device *device)
                led->brightness_set_blocking = radio_led_set;
                led->brightness_get = radio_led_get;
                led->default_trigger = "rfkill-any";
-               result = devm_led_classdev_register(&device->dev, led);
-               if (result)
-                       return result;
+               ret = devm_led_classdev_register(&device->dev, led);
+               if (ret)
+                       return ret;
        }
 
        /* Support for eco led is not always signaled in bit corresponding
@@ -762,9 +762,9 @@ static int acpi_fujitsu_laptop_leds_register(struct acpi_device *device)
                led->name = "fujitsu::eco_led";
                led->brightness_set_blocking = eco_led_set;
                led->brightness_get = eco_led_get;
-               result = devm_led_classdev_register(&device->dev, led);
-               if (result)
-                       return result;
+               ret = devm_led_classdev_register(&device->dev, led);
+               if (ret)
+                       return ret;
        }
 
        return 0;
@@ -773,8 +773,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 error;
-       int i;
+       int ret, i = 0;
 
        priv = devm_kzalloc(&device->dev, sizeof(*priv), GFP_KERNEL);
        if (!priv)
@@ -789,23 +788,22 @@ static int acpi_fujitsu_laptop_add(struct acpi_device *device)
 
        /* kfifo */
        spin_lock_init(&priv->fifo_lock);
-       error = kfifo_alloc(&priv->fifo, RINGBUFFERSIZE * sizeof(int),
-                           GFP_KERNEL);
-       if (error) {
+       ret = kfifo_alloc(&priv->fifo, RINGBUFFERSIZE * sizeof(int),
+                         GFP_KERNEL);
+       if (ret) {
                pr_err("kfifo_alloc failed\n");
                goto err_stop;
        }
 
-       error = acpi_fujitsu_laptop_input_setup(device);
-       if (error)
+       ret = acpi_fujitsu_laptop_input_setup(device);
+       if (ret)
                goto err_free_fifo;
 
        pr_info("ACPI: %s [%s]\n",
                acpi_device_name(device), acpi_device_bid(device));
 
-       i = 0;
-       while (call_fext_func(device, FUNC_BUTTONS, 0x1, 0x0, 0x0) != 0
-               && (i++) < MAX_HOTKEY_RINGBUFFER_SIZE)
+       while (call_fext_func(device, FUNC_BUTTONS, 0x1, 0x0, 0x0) != 0 &&
+              i++ < MAX_HOTKEY_RINGBUFFER_SIZE)
                ; /* No action, result is discarded */
        acpi_handle_debug(device->handle, "Discarded %i ringbuffer entries\n",
                          i);
@@ -835,12 +833,12 @@ static int acpi_fujitsu_laptop_add(struct acpi_device *device)
                        fujitsu_bl->bl_device->props.power = FB_BLANK_UNBLANK;
        }
 
-       error = acpi_fujitsu_laptop_leds_register(device);
-       if (error)
+       ret = acpi_fujitsu_laptop_leds_register(device);
+       if (ret)
                goto err_free_fifo;
 
-       error = fujitsu_laptop_platform_add(device);
-       if (error)
+       ret = fujitsu_laptop_platform_add(device);
+       if (ret)
                goto err_free_fifo;
 
        return 0;
@@ -848,7 +846,7 @@ static int acpi_fujitsu_laptop_add(struct acpi_device *device)
 err_free_fifo:
        kfifo_free(&priv->fifo);
 err_stop:
-       return error;
+       return ret;
 }
 
 static int acpi_fujitsu_laptop_remove(struct acpi_device *device)
@@ -865,11 +863,11 @@ static int acpi_fujitsu_laptop_remove(struct acpi_device *device)
 static void acpi_fujitsu_laptop_press(struct acpi_device *device, int scancode)
 {
        struct fujitsu_laptop *priv = acpi_driver_data(device);
-       int status;
+       int ret;
 
-       status = kfifo_in_locked(&priv->fifo, (unsigned char *)&scancode,
-                                sizeof(scancode), &priv->fifo_lock);
-       if (status != sizeof(scancode)) {
+       ret = kfifo_in_locked(&priv->fifo, (unsigned char *)&scancode,
+                             sizeof(scancode), &priv->fifo_lock);
+       if (ret != sizeof(scancode)) {
                dev_info(&priv->input->dev, "Could not push scancode [0x%x]\n",
                         scancode);
                return;
@@ -882,13 +880,12 @@ static void acpi_fujitsu_laptop_press(struct acpi_device *device, int scancode)
 static void acpi_fujitsu_laptop_release(struct acpi_device *device)
 {
        struct fujitsu_laptop *priv = acpi_driver_data(device);
-       int scancode, status;
+       int scancode, ret;
 
        while (true) {
-               status = kfifo_out_locked(&priv->fifo,
-                                         (unsigned char *)&scancode,
-                                         sizeof(scancode), &priv->fifo_lock);
-               if (status != sizeof(scancode))
+               ret = kfifo_out_locked(&priv->fifo, (unsigned char *)&scancode,
+                                      sizeof(scancode), &priv->fifo_lock);
+               if (ret != sizeof(scancode))
                        return;
                sparse_keymap_report_event(priv->input, scancode, 0, false);
                dev_dbg(&priv->input->dev,