aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/video/backlight/kb3886_bl.c18
1 files changed, 8 insertions, 10 deletions
diff --git a/drivers/video/backlight/kb3886_bl.c b/drivers/video/backlight/kb3886_bl.c
index 6c5ed6b242cc..bca6ccc74dfb 100644
--- a/drivers/video/backlight/kb3886_bl.c
+++ b/drivers/video/backlight/kb3886_bl.c
@@ -106,29 +106,28 @@ static int kb3886bl_send_intensity(struct backlight_device *bd)
106 return 0; 106 return 0;
107} 107}
108 108
109#ifdef CONFIG_PM 109#ifdef CONFIG_PM_SLEEP
110static int kb3886bl_suspend(struct platform_device *pdev, pm_message_t state) 110static int kb3886bl_suspend(struct device *dev)
111{ 111{
112 struct backlight_device *bd = platform_get_drvdata(pdev); 112 struct backlight_device *bd = dev_get_drvdata(dev);
113 113
114 kb3886bl_flags |= KB3886BL_SUSPENDED; 114 kb3886bl_flags |= KB3886BL_SUSPENDED;
115 backlight_update_status(bd); 115 backlight_update_status(bd);
116 return 0; 116 return 0;
117} 117}
118 118
119static int kb3886bl_resume(struct platform_device *pdev) 119static int kb3886bl_resume(struct device *dev)
120{ 120{
121 struct backlight_device *bd = platform_get_drvdata(pdev); 121 struct backlight_device *bd = dev_get_drvdata(dev);
122 122
123 kb3886bl_flags &= ~KB3886BL_SUSPENDED; 123 kb3886bl_flags &= ~KB3886BL_SUSPENDED;
124 backlight_update_status(bd); 124 backlight_update_status(bd);
125 return 0; 125 return 0;
126} 126}
127#else
128#define kb3886bl_suspend NULL
129#define kb3886bl_resume NULL
130#endif 127#endif
131 128
129static SIMPLE_DEV_PM_OPS(kb3886bl_pm_ops, kb3886bl_suspend, kb3886bl_resume);
130
132static int kb3886bl_get_intensity(struct backlight_device *bd) 131static int kb3886bl_get_intensity(struct backlight_device *bd)
133{ 132{
134 return kb3886bl_intensity; 133 return kb3886bl_intensity;
@@ -179,10 +178,9 @@ static int kb3886bl_remove(struct platform_device *pdev)
179static struct platform_driver kb3886bl_driver = { 178static struct platform_driver kb3886bl_driver = {
180 .probe = kb3886bl_probe, 179 .probe = kb3886bl_probe,
181 .remove = kb3886bl_remove, 180 .remove = kb3886bl_remove,
182 .suspend = kb3886bl_suspend,
183 .resume = kb3886bl_resume,
184 .driver = { 181 .driver = {
185 .name = "kb3886-bl", 182 .name = "kb3886-bl",
183 .pm = &kb3886bl_pm_ops,
186 }, 184 },
187}; 185};
188 186