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

Commit c248f24c authored by Rafael J. Wysocki's avatar Rafael J. Wysocki Committed by Guenter Roeck
Browse files

hwmon: (abituguru3) Use struct dev_pm_ops for power management 



Make the Abit uGuru rev. 3 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>
[linux@roeck-us.net: CONFIG_PM->CONFIG_PM_SLEEP, and remove unnecessary ()]
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
parent 4f0928c6

drivers/hwmon/abituguru3.c

+10 −9
Original line number Diff line number Diff line
@@ -1141,10 +1141,10 @@ static struct abituguru3_data *abituguru3_update_device(struct device *dev) 
		return NULL;

}



#ifdef CONFIG_PM

static int abituguru3_suspend(struct platform_device *pdev, pm_message_t state)

#ifdef CONFIG_PM_SLEEP

static int abituguru3_suspend(struct device *dev)

{

	struct abituguru3_data *data = platform_get_drvdata(pdev);

	struct abituguru3_data *data = dev_get_drvdata(dev);

	/*

	 * make sure all communications with the uguru3 are done and no new

	 * ones are started
@@ -1153,26 +1153,27 @@ static int abituguru3_suspend(struct platform_device *pdev, pm_message_t state) 
	return 0;

}



static int abituguru3_resume(struct platform_device *pdev)

static int abituguru3_resume(struct device *dev)

{

	struct abituguru3_data *data = platform_get_drvdata(pdev);

	struct abituguru3_data *data = dev_get_drvdata(dev);

	mutex_unlock(&data->update_lock);

	return 0;

}



static SIMPLE_DEV_PM_OPS(abituguru3_pm, abituguru3_suspend, abituguru3_resume);

#define ABIT_UGURU3_PM	&abituguru3_pm

#else

#define abituguru3_suspend	NULL

#define abituguru3_resume	NULL

#define ABIT_UGURU3_PM	NULL

#endif /* CONFIG_PM */



static struct platform_driver abituguru3_driver = {

	.driver = {

		.owner	= THIS_MODULE,

		.name	= ABIT_UGURU3_NAME,

		.pm	= ABIT_UGURU3_PM

	},

	.probe	= abituguru3_probe,

	.remove	= __devexit_p(abituguru3_remove),

	.suspend = abituguru3_suspend,

	.resume = abituguru3_resume

};



static int __init abituguru3_dmi_detect(void)