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

Commit 9033132d authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

msi-laptop: Use struct dev_pm_ops for power management 



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

Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
Acked-by: default avatarLee, Chun-Yi <jlee@suse.com>
parent e25d5c11

drivers/platform/x86/msi-laptop.c

+4 −3
Original line number Diff line number Diff line
@@ -85,7 +85,8 @@ 
#define MSI_STANDARD_EC_TOUCHPAD_ADDRESS	0xe4

#define MSI_STANDARD_EC_TOUCHPAD_MASK		(1 << 4)



static int msi_laptop_resume(struct platform_device *device);

static int msi_laptop_resume(struct device *device);

static SIMPLE_DEV_PM_OPS(msi_laptop_pm, NULL, msi_laptop_resume);



#define MSI_STANDARD_EC_DEVICES_EXISTS_ADDRESS	0x2f
@@ -437,8 +438,8 @@ static struct platform_driver msipf_driver = { 
	.driver = {

		.name = "msi-laptop-pf",

		.owner = THIS_MODULE,

		.pm = &msi_laptop_pm,

	},

	.resume = msi_laptop_resume,

};



static struct platform_device *msipf_device;
@@ -752,7 +753,7 @@ static int rfkill_init(struct platform_device *sdev) 
	return retval;

}



static int msi_laptop_resume(struct platform_device *device)

static int msi_laptop_resume(struct device *device)

{

	u8 data;

	int result;