Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 81bc4954 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

classmate-laptop: Use struct dev_pm_ops for power management 



Make the classmate-laptop driver define its PM callbacks through
a struct dev_pm_ops object rather than by using legacy PM hooks
in struct acpi_device_ops.

Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
Acked-by: default avatarThadeu Lima de Souza Cascardo <cascardo@holoscopio.com>
parent 44cb98c4

drivers/platform/x86/classmate-laptop.c

+8 −5
Original line number Original line Diff line number Diff line
@@ -362,15 +362,18 @@ static int cmpc_tablet_remove(struct acpi_device *acpi, int type) 
	return cmpc_remove_acpi_notify_device(acpi);

	return cmpc_remove_acpi_notify_device(acpi);

}

}





static int cmpc_tablet_resume(struct acpi_device *acpi)

static int cmpc_tablet_resume(struct device *dev)

{

{

	struct input_dev *inputdev = dev_get_drvdata(&acpi->dev);

	struct input_dev *inputdev = dev_get_drvdata(dev);



	unsigned long long val = 0;

	unsigned long long val = 0;

	if (ACPI_SUCCESS(cmpc_get_tablet(acpi->handle, &val)))

	if (ACPI_SUCCESS(cmpc_get_tablet(to_acpi_device(dev)->handle, &val)))

		input_report_switch(inputdev, SW_TABLET_MODE, !val);

		input_report_switch(inputdev, SW_TABLET_MODE, !val);

	return 0;

	return 0;

}

}





static SIMPLE_DEV_PM_OPS(cmpc_tablet_pm, NULL, cmpc_tablet_resume);



static const struct acpi_device_id cmpc_tablet_device_ids[] = {

static const struct acpi_device_id cmpc_tablet_device_ids[] = {

	{CMPC_TABLET_HID, 0},

	{CMPC_TABLET_HID, 0},

	{"", 0}

	{"", 0}
@@ -384,9 +387,9 @@ static struct acpi_driver cmpc_tablet_acpi_driver = { 
	.ops = {

	.ops = {

		.add = cmpc_tablet_add,

		.add = cmpc_tablet_add,

		.remove = cmpc_tablet_remove,

		.remove = cmpc_tablet_remove,

		.resume = cmpc_tablet_resume,

		.notify = cmpc_tablet_handler,

		.notify = cmpc_tablet_handler,

	}

	},

	.drv.pm = &cmpc_tablet_pm,

};

};