diff options
-rw-r--r-- | drivers/video/nvidia/nv_backlight.c | 12 | ||||
-rw-r--r-- | drivers/video/nvidia/nv_proto.h | 2 | ||||
-rw-r--r-- | drivers/video/nvidia/nvidia.c | 2 |
3 files changed, 0 insertions, 16 deletions
diff --git a/drivers/video/nvidia/nv_backlight.c b/drivers/video/nvidia/nv_backlight.c index f5e42d0bd0da..695b6bf54d92 100644 --- 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 = { | |||
109 | .max_brightness = (FB_BACKLIGHT_LEVELS - 1), | 109 | .max_brightness = (FB_BACKLIGHT_LEVELS - 1), |
110 | }; | 110 | }; |
111 | 111 | ||
112 | void nvidia_bl_set_power(struct fb_info *info, int power) | ||
113 | { | ||
114 | mutex_lock(&info->bl_mutex); | ||
115 | |||
116 | if (info->bl_dev) { | ||
117 | info->bl_dev->props->power = power; | ||
118 | __nvidia_bl_update_status(info->bl_dev); | ||
119 | } | ||
120 | |||
121 | mutex_unlock(&info->bl_mutex); | ||
122 | } | ||
123 | |||
124 | void nvidia_bl_init(struct nvidia_par *par) | 112 | void nvidia_bl_init(struct nvidia_par *par) |
125 | { | 113 | { |
126 | struct fb_info *info = pci_get_drvdata(par->pci_dev); | 114 | 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 43058d0cf5b7..ff5c410355ea 100644 --- 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); | |||
67 | #ifdef CONFIG_FB_NVIDIA_BACKLIGHT | 67 | #ifdef CONFIG_FB_NVIDIA_BACKLIGHT |
68 | extern void nvidia_bl_init(struct nvidia_par *par); | 68 | extern void nvidia_bl_init(struct nvidia_par *par); |
69 | extern void nvidia_bl_exit(struct nvidia_par *par); | 69 | extern void nvidia_bl_exit(struct nvidia_par *par); |
70 | extern void nvidia_bl_set_power(struct fb_info *info, int power); | ||
71 | #else | 70 | #else |
72 | static inline void nvidia_bl_init(struct nvidia_par *par) {} | 71 | static inline void nvidia_bl_init(struct nvidia_par *par) {} |
73 | static inline void nvidia_bl_exit(struct nvidia_par *par) {} | 72 | static inline void nvidia_bl_exit(struct nvidia_par *par) {} |
74 | static inline void nvidia_bl_set_power(struct fb_info *info, int power) {} | ||
75 | #endif | 73 | #endif |
76 | 74 | ||
77 | #endif /* __NV_PROTO_H__ */ | 75 | #endif /* __NV_PROTO_H__ */ |
diff --git a/drivers/video/nvidia/nvidia.c b/drivers/video/nvidia/nvidia.c index 8e5b484db649..64f59119c422 100644 --- 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) | |||
938 | NVWriteSeq(par, 0x01, tmp); | 938 | NVWriteSeq(par, 0x01, tmp); |
939 | NVWriteCrtc(par, 0x1a, vesa); | 939 | NVWriteCrtc(par, 0x1a, vesa); |
940 | 940 | ||
941 | nvidia_bl_set_power(info, blank); | ||
942 | |||
943 | NVTRACE_LEAVE(); | 941 | NVTRACE_LEAVE(); |
944 | 942 | ||
945 | return 0; | 943 | return 0; |