Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

sony-laptop: Use struct dev_pm_ops for power management

Browse source 
Make the sony-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: Rafael J. Wysocki <rjw@sisk.pl>
This commit is contained in:
Rafael J. Wysocki 2012-06-27 23:27:33 +02:00
parent 4ce05b4260
commit bb6b98d6e4
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
drivers/platform/x86/sony-laptop.c
View file

@ -1452,7 +1452,7 @@ static void sony_nc_function_resume(void)
&result); &result);
} }
static int sony_nc_resume(struct acpi_device *device) static int sony_nc_resume(struct device *dev)
{ {
struct sony_nc_value *item; struct sony_nc_value *item;
acpi_handle handle; acpi_handle handle;
@ -1484,6 +1484,8 @@ static int sony_nc_resume(struct acpi_device *device)
return 0; return 0;
} }
static SIMPLE_DEV_PM_OPS(sony_nc_pm, NULL, sony_nc_resume);
static void sony_nc_rfkill_cleanup(void) static void sony_nc_rfkill_cleanup(void)
{ {
int i; int i;
@ -2728,9 +2730,9 @@ static struct acpi_driver sony_nc_driver = {
.ops = { .ops = {
.add = sony_nc_add, .add = sony_nc_add,
.remove = sony_nc_remove, .remove = sony_nc_remove,
.resume = sony_nc_resume,
.notify = sony_nc_notify, .notify = sony_nc_notify,
}, },
.drv.pm = &sony_nc_pm,
}; };
/*********** SPIC (SNY6001) Device ***********/ /*********** SPIC (SNY6001) Device ***********/
@ -4243,19 +4245,22 @@ static int sony_pic_add(struct acpi_device *device)
return result; return result;
} }
static int sony_pic_suspend(struct acpi_device *device) static int sony_pic_suspend(struct device *dev)
{ {
if (sony_pic_disable(device)) if (sony_pic_disable(to_acpi_device(dev)))
return -ENXIO; return -ENXIO;
return 0; return 0;
} }
static int sony_pic_resume(struct acpi_device *device) static int sony_pic_resume(struct device *dev)
{ {
sony_pic_enable(device, spic_dev.cur_ioport, spic_dev.cur_irq); sony_pic_enable(to_acpi_device(dev),
spic_dev.cur_ioport, spic_dev.cur_irq);
return 0; return 0;
} }
static SIMPLE_DEV_PM_OPS(sony_pic_pm, sony_pic_suspend, sony_pic_resume);
static const struct acpi_device_id sony_pic_device_ids[] = { static const struct acpi_device_id sony_pic_device_ids[] = {
{SONY_PIC_HID, 0}, {SONY_PIC_HID, 0},
{"", 0}, {"", 0},
@ -4269,9 +4274,8 @@ static struct acpi_driver sony_pic_driver = {
.ops = { .ops = {
.add = sony_pic_add, .add = sony_pic_add,
.remove = sony_pic_remove, .remove = sony_pic_remove,
.suspend = sony_pic_suspend,
.resume = sony_pic_resume,
}, },
.drv.pm = &sony_pic_pm,
}; };
static struct dmi_system_id __initdata sonypi_dmi_table[] = { static struct dmi_system_id __initdata sonypi_dmi_table[] = {