backlight: Remove uneeded nvidia set_power calls

nvidia_bl_set_power isn't needed since the backlight class handles
this by receiving fb events itself and calling update_status so
remove it.

Signed-off-by: Richard Purdie <rpurdie@rpsys.net>

diff --git a/drivers/video/nvidia/nv_backlight.c b/drivers/video/nvidia/nv_backlight.c
index f5e42d0bd0dae808df211bc4996284900dbaac7f..695b6bf54d9213f21e486e762345196db9c83bef 100644 (file)
--- a/drivers/video/nvidia/nv_backlight.c
+++ b/drivers/video/nvidia/nv_backlight.c
@@ -109,18 +109,6 @@ static struct backlight_properties nvidia_bl_data = {
        .max_brightness = (FB_BACKLIGHT_LEVELS - 1),
 };
 
-void nvidia_bl_set_power(struct fb_info *info, int power)
-{
-       mutex_lock(&info->bl_mutex);
-
-       if (info->bl_dev) {
-               info->bl_dev->props->power = power;
-               __nvidia_bl_update_status(info->bl_dev);
-       }
-
-       mutex_unlock(&info->bl_mutex);
-}
-
 void nvidia_bl_init(struct nvidia_par *par)
 {
        struct fb_info *info = pci_get_drvdata(par->pci_dev);

diff --git a/drivers/video/nvidia/nv_proto.h b/drivers/video/nvidia/nv_proto.h
index 43058d0cf5b7b86a47961dacd2da8a77708d89f1..ff5c410355ea46d9d853ecb3a7479c32a9d9cc66 100644 (file)
--- a/drivers/video/nvidia/nv_proto.h
+++ b/drivers/video/nvidia/nv_proto.h
@@ -67,11 +67,9 @@ extern int nvidiafb_sync(struct fb_info *info);
 #ifdef CONFIG_FB_NVIDIA_BACKLIGHT
 extern void nvidia_bl_init(struct nvidia_par *par);
 extern void nvidia_bl_exit(struct nvidia_par *par);
-extern void nvidia_bl_set_power(struct fb_info *info, int power);
 #else
 static inline void nvidia_bl_init(struct nvidia_par *par) {}
 static inline void nvidia_bl_exit(struct nvidia_par *par) {}
-static inline void nvidia_bl_set_power(struct fb_info *info, int power) {}
 #endif
 
 #endif                         /* __NV_PROTO_H__ */

diff --git a/drivers/video/nvidia/nvidia.c b/drivers/video/nvidia/nvidia.c
index 8e5b484db6498253fceaea43d818a13cbaa6970f..64f59119c4227a44c27311e0fe1d9970af3507d4 100644 (file)
--- a/drivers/video/nvidia/nvidia.c
+++ b/drivers/video/nvidia/nvidia.c
@@ -938,8 +938,6 @@ static int nvidiafb_blank(int blank, struct fb_info *info)
        NVWriteSeq(par, 0x01, tmp);
        NVWriteCrtc(par, 0x1a, vesa);
 
-       nvidia_bl_set_power(info, blank);
-
        NVTRACE_LEAVE();
 
        return 0;