From 5e33a2507e437409e842a28bc61d20788d9daaa0 Mon Sep 17 00:00:00 2001
From: "Rafael J. Wysocki" <rjw@sisk.pl>
Date: Fri, 6 Jul 2012 19:06:19 +0200
Subject: [PATCH] --- yaml --- r: 312763 b: refs/heads/master c:
 9033132ddff7d096f3e54704c4250384c5ab3aa2 h: refs/heads/master i:   312761:
 ab0d5a77e7c77928be635ad685e95a7f3e880afe   312759:
 fc531cc8aec6af4f8a91de2602eea9f6502d04de v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/platform/x86/msi-laptop.c | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 22a0d64634d0..481fbab8d9cc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e25d5c11eeeec610af2e0ff51e60d7cdadefe0f2
+refs/heads/master: 9033132ddff7d096f3e54704c4250384c5ab3aa2
diff --git a/trunk/drivers/platform/x86/msi-laptop.c b/trunk/drivers/platform/x86/msi-laptop.c
index bb5132128b33..f64441844317 100644
--- a/trunk/drivers/platform/x86/msi-laptop.c
+++ b/trunk/drivers/platform/x86/msi-laptop.c
@@ -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;