aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Simmons <jsimmons@infradead.org>2006-12-19 15:56:16 -0500
committerLen Brown <len.brown@intel.com>2006-12-20 01:43:42 -0500
commita8274d57afb83e4954ddcb3f8b7dd1c03a379bd4 (patch)
treed5e8f8b475df8d06724cde6a4f3f53ed5b93ddee
parent519ab5f2be65b72cf12ae99c89752bbe79b44df6 (diff)
fbdev: update after backlight argument change
Update the frambuffer drivers to the backlight_device_registers changes. Signed-off-by: James Simmons <jsimmons@infradead.org> Cc: Luming Yu <Luming.yu@intel.com> Cc: "Antonino A. Daplas" <adaplas@pol.net> Cc: Greg KH <greg@kroah.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Len Brown <len.brown@intel.com>
-rw-r--r--drivers/video/aty/aty128fb.c2
-rw-r--r--drivers/video/aty/atyfb_base.c2
-rw-r--r--drivers/video/aty/radeon_backlight.c2
-rw-r--r--drivers/video/nvidia/nv_backlight.c2
-rw-r--r--drivers/video/riva/fbdev.c2
5 files changed, 5 insertions, 5 deletions
diff --git a/drivers/video/aty/aty128fb.c b/drivers/video/aty/aty128fb.c
index 276a21530b95..5341462b6b48 100644
--- a/drivers/video/aty/aty128fb.c
+++ b/drivers/video/aty/aty128fb.c
@@ -1829,7 +1829,7 @@ static void aty128_bl_init(struct aty128fb_par *par)
1829 1829
1830 snprintf(name, sizeof(name), "aty128bl%d", info->node); 1830 snprintf(name, sizeof(name), "aty128bl%d", info->node);
1831 1831
1832 bd = backlight_device_register(name, par, &aty128_bl_data); 1832 bd = backlight_device_register(name, info->dev, par, &aty128_bl_data);
1833 if (IS_ERR(bd)) { 1833 if (IS_ERR(bd)) {
1834 info->bl_dev = NULL; 1834 info->bl_dev = NULL;
1835 printk(KERN_WARNING "aty128: Backlight registration failed\n"); 1835 printk(KERN_WARNING "aty128: Backlight registration failed\n");
diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c
index b77b30923928..cc4bd8089fe2 100644
--- a/drivers/video/aty/atyfb_base.c
+++ b/drivers/video/aty/atyfb_base.c
@@ -2221,7 +2221,7 @@ static void aty_bl_init(struct atyfb_par *par)
2221 2221
2222 snprintf(name, sizeof(name), "atybl%d", info->node); 2222 snprintf(name, sizeof(name), "atybl%d", info->node);
2223 2223
2224 bd = backlight_device_register(name, par, &aty_bl_data); 2224 bd = backlight_device_register(name, info->dev, par, &aty_bl_data);
2225 if (IS_ERR(bd)) { 2225 if (IS_ERR(bd)) {
2226 info->bl_dev = NULL; 2226 info->bl_dev = NULL;
2227 printk(KERN_WARNING "aty: Backlight registration failed\n"); 2227 printk(KERN_WARNING "aty: Backlight registration failed\n");
diff --git a/drivers/video/aty/radeon_backlight.c b/drivers/video/aty/radeon_backlight.c
index 585eb7b9e636..3abfd4a380cc 100644
--- a/drivers/video/aty/radeon_backlight.c
+++ b/drivers/video/aty/radeon_backlight.c
@@ -163,7 +163,7 @@ void radeonfb_bl_init(struct radeonfb_info *rinfo)
163 163
164 snprintf(name, sizeof(name), "radeonbl%d", rinfo->info->node); 164 snprintf(name, sizeof(name), "radeonbl%d", rinfo->info->node);
165 165
166 bd = backlight_device_register(name, pdata, &radeon_bl_data); 166 bd = backlight_device_register(name, rinfo->info->dev, pdata, &radeon_bl_data);
167 if (IS_ERR(bd)) { 167 if (IS_ERR(bd)) {
168 rinfo->info->bl_dev = NULL; 168 rinfo->info->bl_dev = NULL;
169 printk("radeonfb: Backlight registration failed\n"); 169 printk("radeonfb: Backlight registration failed\n");
diff --git a/drivers/video/nvidia/nv_backlight.c b/drivers/video/nvidia/nv_backlight.c
index 5b75ae4e9457..df934bd21899 100644
--- a/drivers/video/nvidia/nv_backlight.c
+++ b/drivers/video/nvidia/nv_backlight.c
@@ -141,7 +141,7 @@ void nvidia_bl_init(struct nvidia_par *par)
141 141
142 snprintf(name, sizeof(name), "nvidiabl%d", info->node); 142 snprintf(name, sizeof(name), "nvidiabl%d", info->node);
143 143
144 bd = backlight_device_register(name, par, &nvidia_bl_data); 144 bd = backlight_device_register(name, info->dev, par, &nvidia_bl_data);
145 if (IS_ERR(bd)) { 145 if (IS_ERR(bd)) {
146 info->bl_dev = NULL; 146 info->bl_dev = NULL;
147 printk(KERN_WARNING "nvidia: Backlight registration failed\n"); 147 printk(KERN_WARNING "nvidia: Backlight registration failed\n");
diff --git a/drivers/video/riva/fbdev.c b/drivers/video/riva/fbdev.c
index a433cc78ef90..a160c4de2ca2 100644
--- a/drivers/video/riva/fbdev.c
+++ b/drivers/video/riva/fbdev.c
@@ -383,7 +383,7 @@ static void riva_bl_init(struct riva_par *par)
383 383
384 snprintf(name, sizeof(name), "rivabl%d", info->node); 384 snprintf(name, sizeof(name), "rivabl%d", info->node);
385 385
386 bd = backlight_device_register(name, par, &riva_bl_data); 386 bd = backlight_device_register(name, info->dev, par, &riva_bl_data);
387 if (IS_ERR(bd)) { 387 if (IS_ERR(bd)) {
388 info->bl_dev = NULL; 388 info->bl_dev = NULL;
389 printk(KERN_WARNING "riva: Backlight registration failed\n"); 389 printk(KERN_WARNING "riva: Backlight registration failed\n");