2013-06-20 19:08:52

by Shuah Khan

Subject: [PATCH] leds: Convert led class driver from legacy pm ops to dev_pm_ops

Convert drivers/leds/led-class to use dev_pm_ops for power management and
remove Legacy PM ops hooks. With this change, led class registers
suspend/resume callbacks via class->pm (dev_pm_ops) instead of Legacy
class->suspend/resume. When __device_suspend() runs call-backs, it will
find class->pm ops for the led class.

Signed-off-by: Shuah Khan <[email protected]>
---
drivers/leds/led-class.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/drivers/leds/led-class.c b/drivers/leds/led-class.c
index a20752f..4336e37 100644
--- a/drivers/leds/led-class.c
+++ b/drivers/leds/led-class.c
@@ -156,7 +156,7 @@ void led_classdev_resume(struct led_classdev *led_cdev)
}
EXPORT_SYMBOL_GPL(led_classdev_resume);

-static int led_suspend(struct device *dev, pm_message_t state)
+static int led_suspend(struct device *dev)
{
struct led_classdev *led_cdev = dev_get_drvdata(dev);

@@ -176,6 +176,11 @@ static int led_resume(struct device *dev)
return 0;
}

+static const struct dev_pm_ops leds_class_dev_pm_ops = {
+ .suspend = led_suspend,
+ .resume = led_resume,
+};
+
/**
* led_classdev_register - register a new object of led_classdev class.
* @parent: The device to register.
@@ -252,8 +257,7 @@ static int __init leds_init(void)
leds_class = class_create(THIS_MODULE, "leds");
if (IS_ERR(leds_class))
return PTR_ERR(leds_class);
- leds_class->suspend = led_suspend;
- leds_class->resume = led_resume;
+ leds_class->pm = &leds_class_dev_pm_ops;
leds_class->dev_attrs = led_class_attrs;
return 0;
}
--
1.7.10.4

2013-06-20 23:24:08

by Bryan Wu

Subject: Re: [PATCH] leds: Convert led class driver from legacy pm ops to dev_pm_ops

On Thu, Jun 20, 2013 at 12:08 PM, Shuah Khan <[email protected]> wrote:
> Convert drivers/leds/led-class to use dev_pm_ops for power management and
> remove Legacy PM ops hooks. With this change, led class registers
> suspend/resume callbacks via class->pm (dev_pm_ops) instead of Legacy
> class->suspend/resume. When __device_suspend() runs call-backs, it will
> find class->pm ops for the led class.
>

Looks good to me, merged.

Thanks,
-Bryan

> Signed-off-by: Shuah Khan <[email protected]>
> ---
> drivers/leds/led-class.c | 10 +++++++---
> 1 file changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/leds/led-class.c b/drivers/leds/led-class.c
> index a20752f..4336e37 100644
> --- a/drivers/leds/led-class.c
> +++ b/drivers/leds/led-class.c
> @@ -156,7 +156,7 @@ void led_classdev_resume(struct led_classdev *led_cdev)
> }
> EXPORT_SYMBOL_GPL(led_classdev_resume);
>
> -static int led_suspend(struct device *dev, pm_message_t state)
> +static int led_suspend(struct device *dev)
> {
> struct led_classdev *led_cdev = dev_get_drvdata(dev);
>
> @@ -176,6 +176,11 @@ static int led_resume(struct device *dev)
> return 0;
> }
>
> +static const struct dev_pm_ops leds_class_dev_pm_ops = {
> + .suspend = led_suspend,
> + .resume = led_resume,
> +};
> +
> /**
> * led_classdev_register - register a new object of led_classdev class.
> * @parent: The device to register.
> @@ -252,8 +257,7 @@ static int __init leds_init(void)
> leds_class = class_create(THIS_MODULE, "leds");
> if (IS_ERR(leds_class))
> return PTR_ERR(leds_class);
> - leds_class->suspend = led_suspend;
> - leds_class->resume = led_resume;
> + leds_class->pm = &leds_class_dev_pm_ops;
> leds_class->dev_attrs = led_class_attrs;
> return 0;
> }
> --
> 1.7.10.4
>