Skip to content

Commit

Permalink
platform/x86: asus-wmi: Move asus_wmi_input_init and _exit lower in t…
Browse files Browse the repository at this point in the history
…he file

Move the asus_wmi_input_init() and asus_wmi_input_exit() functions to
below the WMI helpers, so that further patches in this patch-set can use
the WMI helpers inside asus_wmi_input_init() without needing a forward
declaration.

Note this commit makes no functional changes, the moved block of code
is completely unchanged.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
  • Loading branch information
Hans de Goede authored and Andy Shevchenko committed May 12, 2020
1 parent 6568d0c commit fed5003
Showing 1 changed file with 39 additions and 39 deletions.
78 changes: 39 additions & 39 deletions drivers/platform/x86/asus-wmi.c
Original file line number Diff line number Diff line change
Expand Up @@ -222,45 +222,6 @@ struct asus_wmi {
struct asus_wmi_driver *driver;
};

/* Input **********************************************************************/

static int asus_wmi_input_init(struct asus_wmi *asus)
{
int err;

asus->inputdev = input_allocate_device();
if (!asus->inputdev)
return -ENOMEM;

asus->inputdev->name = asus->driver->input_name;
asus->inputdev->phys = asus->driver->input_phys;
asus->inputdev->id.bustype = BUS_HOST;
asus->inputdev->dev.parent = &asus->platform_device->dev;
set_bit(EV_REP, asus->inputdev->evbit);

err = sparse_keymap_setup(asus->inputdev, asus->driver->keymap, NULL);
if (err)
goto err_free_dev;

err = input_register_device(asus->inputdev);
if (err)
goto err_free_dev;

return 0;

err_free_dev:
input_free_device(asus->inputdev);
return err;
}

static void asus_wmi_input_exit(struct asus_wmi *asus)
{
if (asus->inputdev)
input_unregister_device(asus->inputdev);

asus->inputdev = NULL;
}

/* WMI ************************************************************************/

static int asus_wmi_evaluate_method3(u32 method_id,
Expand Down Expand Up @@ -381,6 +342,45 @@ static bool asus_wmi_dev_is_present(struct asus_wmi *asus, u32 dev_id)
return status == 0 && (retval & ASUS_WMI_DSTS_PRESENCE_BIT);
}

/* Input **********************************************************************/

static int asus_wmi_input_init(struct asus_wmi *asus)
{
int err;

asus->inputdev = input_allocate_device();
if (!asus->inputdev)
return -ENOMEM;

asus->inputdev->name = asus->driver->input_name;
asus->inputdev->phys = asus->driver->input_phys;
asus->inputdev->id.bustype = BUS_HOST;
asus->inputdev->dev.parent = &asus->platform_device->dev;
set_bit(EV_REP, asus->inputdev->evbit);

err = sparse_keymap_setup(asus->inputdev, asus->driver->keymap, NULL);
if (err)
goto err_free_dev;

err = input_register_device(asus->inputdev);
if (err)
goto err_free_dev;

return 0;

err_free_dev:
input_free_device(asus->inputdev);
return err;
}

static void asus_wmi_input_exit(struct asus_wmi *asus)
{
if (asus->inputdev)
input_unregister_device(asus->inputdev);

asus->inputdev = NULL;
}

/* Battery ********************************************************************/

/* The battery maximum charging percentage */
Expand Down

0 comments on commit fed5003

Please sign in to comment.