| Message ID | 1370128047-2444-1-git-send-email-shuah.kh@samsung.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Sunday, June 02, 2013 8:07 AM, Shuah Khan wrote: > > Convert drivers/video/backlight/class to use dev_pm_ops for power > management and remove Legacy PM ops hooks. With this change, backlight > 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 backlight class. > > Signed-off-by: Shuah Khan <shuah.kh@samsung.com> > Cc: Shuah Khan <shuahkhan@gmail.com> CC'ed Andrew Morton, It looks good. Acked-by: Jingoo Han <jg1.han@samsung.com> Best regards, Jingoo Han > --- > > v2: Updated changelog to correct device class. > v3: Updated changelog to correct device class. > > drivers/video/backlight/backlight.c | 8 +++++--- > 1 file changed, 5 insertions(+), 3 deletions(-) > > diff --git a/drivers/video/backlight/backlight.c b/drivers/video/backlight/backlight.c > index c74e7aa..0ffb251 100644 > --- a/drivers/video/backlight/backlight.c > +++ b/drivers/video/backlight/backlight.c > @@ -208,7 +208,7 @@ static ssize_t backlight_show_actual_brightness(struct device *dev, > > static struct class *backlight_class; > > -static int backlight_suspend(struct device *dev, pm_message_t state) > +static int backlight_suspend(struct device *dev) > { > struct backlight_device *bd = to_backlight_device(dev); > > @@ -236,6 +236,9 @@ static int backlight_resume(struct device *dev) > return 0; > } > > +static SIMPLE_DEV_PM_OPS(backlight_class_dev_pm_ops, backlight_suspend, > + backlight_resume); > + > static void bl_device_release(struct device *dev) > { > struct backlight_device *bd = to_backlight_device(dev); > @@ -414,8 +417,7 @@ static int __init backlight_class_init(void) > } > > backlight_class->dev_attrs = bl_device_attributes; > - backlight_class->suspend = backlight_suspend; > - backlight_class->resume = backlight_resume; > + backlight_class->pm = &backlight_class_dev_pm_ops; > return 0; > } > > -- > 1.7.10.4 > -- To unsubscribe from this list: send the line "unsubscribe linux-fbdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Monday 03 June 2013 13:10:10 Jingoo Han wrote: > On Sunday, June 02, 2013 8:07 AM, Shuah Khan wrote: > > > > Convert drivers/video/backlight/class to use dev_pm_ops for power > > management and remove Legacy PM ops hooks. With this change, backlight > > 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 backlight class. > > > > Signed-off-by: Shuah Khan <shuah.kh@samsung.com> > > Cc: Shuah Khan <shuahkhan@gmail.com> > > CC'ed Andrew Morton, > > It looks good. > > Acked-by: Jingoo Han <jg1.han@samsung.com> > I'm getting this build warning now: arnd@wuerfel:/git/arm-soc$ cat build/omap1_defconfig/faillog /git/arm-soc/drivers/video/backlight/backlight.c:212:12: warning: 'backlight_suspend' defined but not used [-Wunused-function] static int backlight_suspend(struct device *dev) ^ /git/arm-soc/drivers/video/backlight/backlight.c:226:12: warning: 'backlight_resume' defined but not used [-Wunused-function] static int backlight_resume(struct device *dev) Arnd -- To unsubscribe from this list: send the line "unsubscribe linux-fbdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Friday, June 07, 2013 6:28 AM, Arnd Bergmann wrote: > On Monday 03 June 2013 13:10:10 Jingoo Han wrote: > > On Sunday, June 02, 2013 8:07 AM, Shuah Khan wrote: > > > > > > Convert drivers/video/backlight/class to use dev_pm_ops for power > > > management and remove Legacy PM ops hooks. With this change, backlight > > > 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 backlight class. > > > > > > Signed-off-by: Shuah Khan <shuah.kh@samsung.com> > > > Cc: Shuah Khan <shuahkhan@gmail.com> > > > > CC'ed Andrew Morton, > > > > It looks good. > > > > Acked-by: Jingoo Han <jg1.han@samsung.com> > > > > I'm getting this build warning now: > > arnd@wuerfel:/git/arm-soc$ cat build/omap1_defconfig/faillog > /git/arm-soc/drivers/video/backlight/backlight.c:212:12: warning: 'backlight_suspend' defined but not > used [-Wunused-function] > static int backlight_suspend(struct device *dev) > ^ > /git/arm-soc/drivers/video/backlight/backlight.c:226:12: warning: 'backlight_resume' defined but not > used [-Wunused-function] > static int backlight_resume(struct device *dev) Hi Arnd Bergmann, I see what happens. This build warning happens when CONFIG_PM is selected and CONFIG_PM_SLEEP is not selected. So, I will add '#ifdef CONFIG_PM_SLEEP' to './drivers/video/backlight/backlight.c' and send it soon. Thank you. Best regards, Jingoo Han > > Arnd -- To unsubscribe from this list: send the line "unsubscribe linux-fbdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/video/backlight/backlight.c b/drivers/video/backlight/backlight.c index c74e7aa..0ffb251 100644 --- a/drivers/video/backlight/backlight.c +++ b/drivers/video/backlight/backlight.c @@ -208,7 +208,7 @@ static ssize_t backlight_show_actual_brightness(struct device *dev, static struct class *backlight_class; -static int backlight_suspend(struct device *dev, pm_message_t state) +static int backlight_suspend(struct device *dev) { struct backlight_device *bd = to_backlight_device(dev); @@ -236,6 +236,9 @@ static int backlight_resume(struct device *dev) return 0; } +static SIMPLE_DEV_PM_OPS(backlight_class_dev_pm_ops, backlight_suspend, + backlight_resume); + static void bl_device_release(struct device *dev) { struct backlight_device *bd = to_backlight_device(dev); @@ -414,8 +417,7 @@ static int __init backlight_class_init(void) } backlight_class->dev_attrs = bl_device_attributes; - backlight_class->suspend = backlight_suspend; - backlight_class->resume = backlight_resume; + backlight_class->pm = &backlight_class_dev_pm_ops; return 0; }
Convert drivers/video/backlight/class to use dev_pm_ops for power management and remove Legacy PM ops hooks. With this change, backlight 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 backlight class. Signed-off-by: Shuah Khan <shuah.kh@samsung.com> Cc: Shuah Khan <shuahkhan@gmail.com> --- v2: Updated changelog to correct device class. v3: Updated changelog to correct device class. drivers/video/backlight/backlight.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)