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

Commit 199ac052 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

sonypi: Use struct dev_pm_ops for power management 



Make the sonypi 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 avatarMattia Dongili <malattia@linux.it>
parent 8ff847fc

drivers/char/sonypi.c

+7 −6
Original line number Diff line number Diff line
@@ -1459,7 +1459,7 @@ static int __devexit sonypi_remove(struct platform_device *dev) 
#ifdef CONFIG_PM

static int old_camera_power;



static int sonypi_suspend(struct platform_device *dev, pm_message_t state)

static int sonypi_suspend(struct device *dev)

{

	old_camera_power = sonypi_device.camera_power;

	sonypi_disable();
@@ -1467,14 +1467,16 @@ static int sonypi_suspend(struct platform_device *dev, pm_message_t state) 
	return 0;

}



static int sonypi_resume(struct platform_device *dev)

static int sonypi_resume(struct device *dev)

{

	sonypi_enable(old_camera_power);

	return 0;

}



static SIMPLE_DEV_PM_OPS(sonypi_pm, sonypi_suspend, sonypi_resume);

#define SONYPI_PM	(&sonypi_pm)

#else

#define sonypi_suspend	NULL

#define sonypi_resume	NULL

#define SONYPI_PM	NULL

#endif



static void sonypi_shutdown(struct platform_device *dev)
@@ -1486,12 +1488,11 @@ static struct platform_driver sonypi_driver = { 
	.driver		= {

		.name	= "sonypi",

		.owner	= THIS_MODULE,

		.pm	= SONYPI_PM,

	},

	.probe		= sonypi_probe,

	.remove		= __devexit_p(sonypi_remove),

	.shutdown	= sonypi_shutdown,

	.suspend	= sonypi_suspend,

	.resume		= sonypi_resume,

};



static struct platform_device *sonypi_platform_device;