platform/x86: fujitsu: Reorder code to avoid forward declarations

Move the definitions of acpi_fujitsu_bl_notify() and
acpi_fujitsu_laptop_notify() along with some helpers above
the definitions of the functions that will refer to them
after subsequent changes, to avoid having to add forward
declarations of them.

No intentional functional impact.

Acked-by: Jonathan Woithe <jwoithe@just42.net>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Link: https://patch.msgid.link/1950259.tdWV9SEqCh@rafael.j.wysocki
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>

diff --git a/drivers/platform/x86/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c
index 931fbcdd21b88659ecd4998aa2559b1875c8eefb..1adce90ae3e65e430bf5c19dc2148c37111cf0c7 100644 (file)
--- a/drivers/platform/x86/fujitsu-laptop.c
+++ b/drivers/platform/x86/fujitsu-laptop.c
@@ -500,6 +500,36 @@ static int fujitsu_backlight_register(struct acpi_device *device)
        return 0;
 }
 
+/* Brightness notify */
+
+static void acpi_fujitsu_bl_notify(struct acpi_device *device, u32 event)
+{
+       struct fujitsu_bl *priv = acpi_driver_data(device);
+       int oldb, newb;
+
+       if (event != ACPI_FUJITSU_NOTIFY_CODE) {
+               acpi_handle_info(device->handle, "unsupported event [0x%x]\n",
+                                event);
+               sparse_keymap_report_event(priv->input, -1, 1, true);
+               return;
+       }
+
+       oldb = priv->brightness_level;
+       get_lcd_level(device);
+       newb = priv->brightness_level;
+
+       acpi_handle_debug(device->handle,
+                         "brightness button event [%i -> %i]\n", oldb, newb);
+
+       if (oldb == newb)
+               return;
+
+       if (!disable_brightness_adjust)
+               set_lcd_level(device, newb);
+
+       sparse_keymap_report_event(priv->input, oldb < newb, 1, true);
+}
+
 static int acpi_fujitsu_bl_add(struct acpi_device *device)
 {
        struct fujitsu_bl *priv;
@@ -531,36 +561,6 @@ static int acpi_fujitsu_bl_add(struct acpi_device *device)
        return fujitsu_backlight_register(device);
 }
 
-/* Brightness notify */
-
-static void acpi_fujitsu_bl_notify(struct acpi_device *device, u32 event)
-{
-       struct fujitsu_bl *priv = acpi_driver_data(device);
-       int oldb, newb;
-
-       if (event != ACPI_FUJITSU_NOTIFY_CODE) {
-               acpi_handle_info(device->handle, "unsupported event [0x%x]\n",
-                                event);
-               sparse_keymap_report_event(priv->input, -1, 1, true);
-               return;
-       }
-
-       oldb = priv->brightness_level;
-       get_lcd_level(device);
-       newb = priv->brightness_level;
-
-       acpi_handle_debug(device->handle,
-                         "brightness button event [%i -> %i]\n", oldb, newb);
-
-       if (oldb == newb)
-               return;
-
-       if (!disable_brightness_adjust)
-               set_lcd_level(device, newb);
-
-       sparse_keymap_report_event(priv->input, oldb < newb, 1, true);
-}
-
 /* ACPI device for hotkey handling */
 
 static const struct key_entry keymap_default[] = {
@@ -908,6 +908,84 @@ static int acpi_fujitsu_laptop_leds_register(struct acpi_device *device)
        return 0;
 }
 
+static void acpi_fujitsu_laptop_press(struct acpi_device *device, int scancode)
+{
+       struct fujitsu_laptop *priv = acpi_driver_data(device);
+       int ret;
+
+       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;
+       }
+       sparse_keymap_report_event(priv->input, scancode, 1, false);
+       dev_dbg(&priv->input->dev, "Push scancode into ringbuffer [0x%x]\n",
+               scancode);
+}
+
+static void acpi_fujitsu_laptop_release(struct acpi_device *device)
+{
+       struct fujitsu_laptop *priv = acpi_driver_data(device);
+       int scancode, ret;
+
+       while (true) {
+               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,
+                       "Pop scancode from ringbuffer [0x%x]\n", scancode);
+       }
+}
+
+static void acpi_fujitsu_laptop_notify(struct acpi_device *device, u32 event)
+{
+       struct fujitsu_laptop *priv = acpi_driver_data(device);
+       unsigned long flags;
+       int scancode, i = 0;
+       unsigned int irb;
+
+       if (event != ACPI_FUJITSU_NOTIFY_CODE) {
+               acpi_handle_info(device->handle, "Unsupported event [0x%x]\n",
+                                event);
+               sparse_keymap_report_event(priv->input, -1, 1, true);
+               return;
+       }
+
+       if (priv->flags_supported)
+               priv->flags_state = call_fext_func(device, FUNC_FLAGS, 0x4, 0x0,
+                                                  0x0);
+
+       while ((irb = call_fext_func(device,
+                                    FUNC_BUTTONS, 0x1, 0x0, 0x0)) != 0 &&
+              i++ < MAX_HOTKEY_RINGBUFFER_SIZE) {
+               scancode = irb & 0x4ff;
+               if (sparse_keymap_entry_from_scancode(priv->input, scancode))
+                       acpi_fujitsu_laptop_press(device, scancode);
+               else if (scancode == 0)
+                       acpi_fujitsu_laptop_release(device);
+               else
+                       acpi_handle_info(device->handle,
+                                        "Unknown GIRB result [%x]\n", irb);
+       }
+
+       /*
+        * First seen on the Skylake-based Lifebook E736/E746/E756), the
+        * touchpad toggle hotkey (Fn+F4) is handled in software. Other models
+        * have since added additional "soft keys". These are reported in the
+        * status flags queried using FUNC_FLAGS.
+        */
+       if (priv->flags_supported & (FLAG_SOFTKEYS)) {
+               flags = call_fext_func(device, FUNC_FLAGS, 0x1, 0x0, 0x0);
+               flags &= (FLAG_SOFTKEYS);
+               for_each_set_bit(i, &flags, BITS_PER_LONG)
+                       sparse_keymap_report_event(priv->input, BIT(i), 1, true);
+       }
+}
+
 static int acpi_fujitsu_laptop_add(struct acpi_device *device)
 {
        struct fujitsu_laptop *priv;
@@ -1001,84 +1079,6 @@ static void acpi_fujitsu_laptop_remove(struct acpi_device *device)
        kfifo_free(&priv->fifo);
 }
 
-static void acpi_fujitsu_laptop_press(struct acpi_device *device, int scancode)
-{
-       struct fujitsu_laptop *priv = acpi_driver_data(device);
-       int ret;
-
-       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;
-       }
-       sparse_keymap_report_event(priv->input, scancode, 1, false);
-       dev_dbg(&priv->input->dev, "Push scancode into ringbuffer [0x%x]\n",
-               scancode);
-}
-
-static void acpi_fujitsu_laptop_release(struct acpi_device *device)
-{
-       struct fujitsu_laptop *priv = acpi_driver_data(device);
-       int scancode, ret;
-
-       while (true) {
-               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,
-                       "Pop scancode from ringbuffer [0x%x]\n", scancode);
-       }
-}
-
-static void acpi_fujitsu_laptop_notify(struct acpi_device *device, u32 event)
-{
-       struct fujitsu_laptop *priv = acpi_driver_data(device);
-       unsigned long flags;
-       int scancode, i = 0;
-       unsigned int irb;
-
-       if (event != ACPI_FUJITSU_NOTIFY_CODE) {
-               acpi_handle_info(device->handle, "Unsupported event [0x%x]\n",
-                                event);
-               sparse_keymap_report_event(priv->input, -1, 1, true);
-               return;
-       }
-
-       if (priv->flags_supported)
-               priv->flags_state = call_fext_func(device, FUNC_FLAGS, 0x4, 0x0,
-                                                  0x0);
-
-       while ((irb = call_fext_func(device,
-                                    FUNC_BUTTONS, 0x1, 0x0, 0x0)) != 0 &&
-              i++ < MAX_HOTKEY_RINGBUFFER_SIZE) {
-               scancode = irb & 0x4ff;
-               if (sparse_keymap_entry_from_scancode(priv->input, scancode))
-                       acpi_fujitsu_laptop_press(device, scancode);
-               else if (scancode == 0)
-                       acpi_fujitsu_laptop_release(device);
-               else
-                       acpi_handle_info(device->handle,
-                                        "Unknown GIRB result [%x]\n", irb);
-       }
-
-       /*
-        * First seen on the Skylake-based Lifebook E736/E746/E756), the
-        * touchpad toggle hotkey (Fn+F4) is handled in software. Other models
-        * have since added additional "soft keys". These are reported in the
-        * status flags queried using FUNC_FLAGS.
-        */
-       if (priv->flags_supported & (FLAG_SOFTKEYS)) {
-               flags = call_fext_func(device, FUNC_FLAGS, 0x1, 0x0, 0x0);
-               flags &= (FLAG_SOFTKEYS);
-               for_each_set_bit(i, &flags, BITS_PER_LONG)
-                       sparse_keymap_report_event(priv->input, BIT(i), 1, true);
-       }
-}
-
 /* Initialization */
 
 static const struct acpi_device_id fujitsu_bl_device_ids[] = {