Skip to content

Commit f913c30

Browse files
jwrdegoedeandy-shev
authored andcommitted
platform/x86: intel-vbtn: Move detect_tablet_mode() to higher in the file
This is a preparation patch for calling detect_tablet_mode() from intel_vbtn_input_setup() 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 <[email protected]> Signed-off-by: Andy Shevchenko <[email protected]>
1 parent 10d7ff7 commit f913c30

File tree

1 file changed

+18
-18
lines changed

1 file changed

+18
-18
lines changed

drivers/platform/x86/intel-vbtn.c

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,24 @@ struct intel_vbtn_priv {
6060
bool wakeup_mode;
6161
};
6262

63+
static void detect_tablet_mode(struct platform_device *device)
64+
{
65+
struct intel_vbtn_priv *priv = dev_get_drvdata(&device->dev);
66+
acpi_handle handle = ACPI_HANDLE(&device->dev);
67+
unsigned long long vgbs;
68+
acpi_status status;
69+
int m;
70+
71+
status = acpi_evaluate_integer(handle, "VGBS", NULL, &vgbs);
72+
if (ACPI_FAILURE(status))
73+
return;
74+
75+
m = !(vgbs & TABLET_MODE_FLAG);
76+
input_report_switch(priv->input_dev, SW_TABLET_MODE, m);
77+
m = (vgbs & DOCK_MODE_FLAG) ? 1 : 0;
78+
input_report_switch(priv->input_dev, SW_DOCK, m);
79+
}
80+
6381
static int intel_vbtn_input_setup(struct platform_device *device)
6482
{
6583
struct intel_vbtn_priv *priv = dev_get_drvdata(&device->dev);
@@ -138,24 +156,6 @@ static void notify_handler(acpi_handle handle, u32 event, void *context)
138156
dev_dbg(&device->dev, "unknown event index 0x%x\n", event);
139157
}
140158

141-
static void detect_tablet_mode(struct platform_device *device)
142-
{
143-
struct intel_vbtn_priv *priv = dev_get_drvdata(&device->dev);
144-
acpi_handle handle = ACPI_HANDLE(&device->dev);
145-
unsigned long long vgbs;
146-
acpi_status status;
147-
int m;
148-
149-
status = acpi_evaluate_integer(handle, "VGBS", NULL, &vgbs);
150-
if (ACPI_FAILURE(status))
151-
return;
152-
153-
m = !(vgbs & TABLET_MODE_FLAG);
154-
input_report_switch(priv->input_dev, SW_TABLET_MODE, m);
155-
m = (vgbs & DOCK_MODE_FLAG) ? 1 : 0;
156-
input_report_switch(priv->input_dev, SW_DOCK, m);
157-
}
158-
159159
static bool intel_vbtn_has_buttons(acpi_handle handle)
160160
{
161161
acpi_status status;

0 commit comments

Comments
 (0)