Commit f913c308 authored by Hans de Goede's avatar Hans de Goede Committed by Andy Shevchenko
Browse files

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: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
parent 10d7ff74

drivers/platform/x86/intel-vbtn.c

+18 −18
Original line number Diff line number Diff line
@@ -60,6 +60,24 @@ struct intel_vbtn_priv { 
	bool wakeup_mode;

};



static void detect_tablet_mode(struct platform_device *device)

{

	struct intel_vbtn_priv *priv = dev_get_drvdata(&device->dev);

	acpi_handle handle = ACPI_HANDLE(&device->dev);

	unsigned long long vgbs;

	acpi_status status;

	int m;



	status = acpi_evaluate_integer(handle, "VGBS", NULL, &vgbs);

	if (ACPI_FAILURE(status))

		return;



	m = !(vgbs & TABLET_MODE_FLAG);

	input_report_switch(priv->input_dev, SW_TABLET_MODE, m);

	m = (vgbs & DOCK_MODE_FLAG) ? 1 : 0;

	input_report_switch(priv->input_dev, SW_DOCK, m);

}



static int intel_vbtn_input_setup(struct platform_device *device)

{

	struct intel_vbtn_priv *priv = dev_get_drvdata(&device->dev);
@@ -138,24 +156,6 @@ out_unknown: 
	dev_dbg(&device->dev, "unknown event index 0x%x\n", event);

}



static void detect_tablet_mode(struct platform_device *device)

{

	struct intel_vbtn_priv *priv = dev_get_drvdata(&device->dev);

	acpi_handle handle = ACPI_HANDLE(&device->dev);

	unsigned long long vgbs;

	acpi_status status;

	int m;



	status = acpi_evaluate_integer(handle, "VGBS", NULL, &vgbs);

	if (ACPI_FAILURE(status))

		return;



	m = !(vgbs & TABLET_MODE_FLAG);

	input_report_switch(priv->input_dev, SW_TABLET_MODE, m);

	m = (vgbs & DOCK_MODE_FLAG) ? 1 : 0;

	input_report_switch(priv->input_dev, SW_DOCK, m);

}



static bool intel_vbtn_has_buttons(acpi_handle handle)

{

	acpi_status status;

CRA Git | Maintained and supported by SUSTech CRA and CCSE