Skip to content

Commit

Permalink
msi-laptop: Use struct dev_pm_ops for power management
Browse files Browse the repository at this point in the history
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: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Lee, Chun-Yi <jlee@suse.com>
  • Loading branch information
Rafael J. Wysocki committed Jul 6, 2012
1 parent e25d5c1 commit 9033132
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions drivers/platform/x86/msi-laptop.c
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 9033132

Please sign in to comment.