git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
backlight: Convert from struct class_device to struct device
[safe/jmp/linux-2.6]
/
drivers
/
video
/
riva
/
fbdev.c
diff --git
a/drivers/video/riva/fbdev.c
b/drivers/video/riva/fbdev.c
index
9c6bd09
..
d251174
100644
(file)
--- a/
drivers/video/riva/fbdev.c
+++ b/
drivers/video/riva/fbdev.c
@@
-307,7
+307,7
@@
static int riva_bl_get_level_brightness(struct riva_par *par,
static int riva_bl_update_status(struct backlight_device *bd)
{
static int riva_bl_update_status(struct backlight_device *bd)
{
- struct riva_par *par =
class_get_devdata(&bd->class_dev
);
+ struct riva_par *par =
bl_get_data(bd
);
U032 tmp_pcrt, tmp_pmc;
int level;
U032 tmp_pcrt, tmp_pmc;
int level;
@@
-317,15
+317,15
@@
static int riva_bl_update_status(struct backlight_device *bd)
else
level = bd->props.brightness;
else
level = bd->props.brightness;
- tmp_pmc =
par->riva.PMC[0x10F0/4]
& 0x0000FFFF;
- tmp_pcrt =
par->riva.PCRTC0[0x081C/4]
& 0xFFFFFFFC;
+ tmp_pmc =
NV_RD32(par->riva.PMC, 0x10F0)
& 0x0000FFFF;
+ tmp_pcrt =
NV_RD32(par->riva.PCRTC0, 0x081C)
& 0xFFFFFFFC;
if(level > 0) {
tmp_pcrt |= 0x1;
tmp_pmc |= (1 << 31); /* backlight bit */
tmp_pmc |= riva_bl_get_level_brightness(par, level) << 16; /* level */
}
if(level > 0) {
tmp_pcrt |= 0x1;
tmp_pmc |= (1 << 31); /* backlight bit */
tmp_pmc |= riva_bl_get_level_brightness(par, level) << 16; /* level */
}
-
par->riva.PCRTC0[0x081C/4] = tmp_pcrt
;
-
par->riva.PMC[0x10F0/4] = tmp_pmc
;
+
NV_WR32(par->riva.PCRTC0, 0x081C, tmp_pcrt)
;
+
NV_WR32(par->riva.PMC, 0x10F0, tmp_pmc)
;
return 0;
}
return 0;
}
@@
-1788,8
+1788,10
@@
static int __devinit riva_get_EDID_i2c(struct fb_info *info)
NVTRACE_ENTER();
riva_create_i2c_busses(par);
NVTRACE_ENTER();
riva_create_i2c_busses(par);
- for (i = 0; i < par->bus; i++) {
- riva_probe_i2c_connector(par, i+1, &par->EDID);
+ for (i = 0; i < 3; i++) {
+ if (!par->chan[i].par)
+ continue;
+ riva_probe_i2c_connector(par, i, &par->EDID);
if (par->EDID && !fb_parse_edid(par->EDID, &var)) {
printk(PFX "Found EDID Block from BUS %i\n", i);
break;
if (par->EDID && !fb_parse_edid(par->EDID, &var)) {
printk(PFX "Found EDID Block from BUS %i\n", i);
break;
@@
-2104,7
+2106,7
@@
err_ret:
return ret;
}
return ret;
}
-static void __exit rivafb_remove(struct pci_dev *pd)
+static void __
dev
exit rivafb_remove(struct pci_dev *pd)
{
struct fb_info *info = pci_get_drvdata(pd);
struct riva_par *par = info->par;
{
struct fb_info *info = pci_get_drvdata(pd);
struct riva_par *par = info->par;
@@
-2185,7
+2187,7
@@
static struct pci_driver rivafb_driver = {
.name = "rivafb",
.id_table = rivafb_pci_tbl,
.probe = rivafb_probe,
.name = "rivafb",
.id_table = rivafb_pci_tbl,
.probe = rivafb_probe,
- .remove = __exit_p(rivafb_remove),
+ .remove = __
dev
exit_p(rivafb_remove),
};
};