OpenSDV
/
original_kernel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hwmon: (gpio-fan) Use struct dev_pm_ops for power management 

Make the gpio-fan 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>
[linux@roeck-us.net: CONFIG_PM->CONFIG_PM_SLEEP, and remove unnecessary ()]
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
This commit is contained in:
Rafael J. Wysocki 2012-07-08 00:01:03 +02:00 committed by Guenter Roeck
parent c248f24cff
commit 6d20a6c060
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/hwmon/gpio-fan.c
View File

@ -41,7 +41,7 @@ struct gpio_fan_data {
int num_speed; int num_speed;
struct gpio_fan_speed *speed; struct gpio_fan_speed *speed;
int speed_index; int speed_index;
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
int resume_speed; int resume_speed;
#endif #endif
bool pwm_enable; bool pwm_enable;
@ -476,10 +476,10 @@ static int __devexit gpio_fan_remove(struct platform_device *pdev)
return 0; return 0;
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
static int gpio_fan_suspend(struct platform_device *pdev, pm_message_t state) static int gpio_fan_suspend(struct device *dev)
{ {
struct gpio_fan_data *fan_data = platform_get_drvdata(pdev); struct gpio_fan_data *fan_data = dev_get_drvdata(dev);
if (fan_data->ctrl) { if (fan_data->ctrl) {
fan_data->resume_speed = fan_data->speed_index; fan_data->resume_speed = fan_data->speed_index;
@ -489,27 +489,28 @@ static int gpio_fan_suspend(struct platform_device *pdev, pm_message_t state)
return 0; return 0;
} }
static int gpio_fan_resume(struct platform_device *pdev) static int gpio_fan_resume(struct device *dev)
{ {
struct gpio_fan_data *fan_data = platform_get_drvdata(pdev); struct gpio_fan_data *fan_data = dev_get_drvdata(dev);
if (fan_data->ctrl) if (fan_data->ctrl)
set_fan_speed(fan_data, fan_data->resume_speed); set_fan_speed(fan_data, fan_data->resume_speed);
return 0; return 0;
} }
static SIMPLE_DEV_PM_OPS(gpio_fan_pm, gpio_fan_suspend, gpio_fan_resume);
#define GPIO_FAN_PM &gpio_fan_pm
#else #else
#define gpio_fan_suspend NULL #define GPIO_FAN_PM NULL
#define gpio_fan_resume NULL
#endif #endif
static struct platform_driver gpio_fan_driver = { static struct platform_driver gpio_fan_driver = {
.probe = gpio_fan_probe, .probe = gpio_fan_probe,
.remove = __devexit_p(gpio_fan_remove), .remove = __devexit_p(gpio_fan_remove),
.suspend = gpio_fan_suspend,
.resume = gpio_fan_resume,
.driver = { .driver = {
.name = "gpio-fan", .name = "gpio-fan",
.pm = GPIO_FAN_PM,
}, },
}; };