diff options
Diffstat (limited to 'drivers/video/i810/i810_main.c')
-rw-r--r-- | drivers/video/i810/i810_main.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/drivers/video/i810/i810_main.c b/drivers/video/i810/i810_main.c index c0c974b1afaa..692337dc5a40 100644 --- a/drivers/video/i810/i810_main.c +++ b/drivers/video/i810/i810_main.c | |||
@@ -776,7 +776,7 @@ static void i810_load_cursor_image(int width, int height, u8 *data, | |||
776 | 776 | ||
777 | static void i810_load_cursor_colors(int fg, int bg, struct fb_info *info) | 777 | static void i810_load_cursor_colors(int fg, int bg, struct fb_info *info) |
778 | { | 778 | { |
779 | struct i810fb_par *par = (struct i810fb_par *) info->par; | 779 | struct i810fb_par *par = info->par; |
780 | u8 __iomem *mmio = par->mmio_start_virtual; | 780 | u8 __iomem *mmio = par->mmio_start_virtual; |
781 | u8 red, green, blue, trans, temp; | 781 | u8 red, green, blue, trans, temp; |
782 | 782 | ||
@@ -949,7 +949,7 @@ static void set_color_bitfields(struct fb_var_screeninfo *var) | |||
949 | static int i810_check_params(struct fb_var_screeninfo *var, | 949 | static int i810_check_params(struct fb_var_screeninfo *var, |
950 | struct fb_info *info) | 950 | struct fb_info *info) |
951 | { | 951 | { |
952 | struct i810fb_par *par = (struct i810fb_par *) info->par; | 952 | struct i810fb_par *par = info->par; |
953 | int line_length, vidmem, mode_valid = 0, retval = 0; | 953 | int line_length, vidmem, mode_valid = 0, retval = 0; |
954 | u32 vyres = var->yres_virtual, vxres = var->xres_virtual; | 954 | u32 vyres = var->yres_virtual, vxres = var->xres_virtual; |
955 | /* | 955 | /* |
@@ -1043,7 +1043,7 @@ static int i810_check_params(struct fb_var_screeninfo *var, | |||
1043 | */ | 1043 | */ |
1044 | static int encode_fix(struct fb_fix_screeninfo *fix, struct fb_info *info) | 1044 | static int encode_fix(struct fb_fix_screeninfo *fix, struct fb_info *info) |
1045 | { | 1045 | { |
1046 | struct i810fb_par *par = (struct i810fb_par *) info->par; | 1046 | struct i810fb_par *par = info->par; |
1047 | 1047 | ||
1048 | memset(fix, 0, sizeof(struct fb_fix_screeninfo)); | 1048 | memset(fix, 0, sizeof(struct fb_fix_screeninfo)); |
1049 | 1049 | ||
@@ -1154,7 +1154,7 @@ static void decode_var(const struct fb_var_screeninfo *var, | |||
1154 | static int i810fb_getcolreg(u8 regno, u8 *red, u8 *green, u8 *blue, | 1154 | static int i810fb_getcolreg(u8 regno, u8 *red, u8 *green, u8 *blue, |
1155 | u8 *transp, struct fb_info *info) | 1155 | u8 *transp, struct fb_info *info) |
1156 | { | 1156 | { |
1157 | struct i810fb_par *par = (struct i810fb_par *) info->par; | 1157 | struct i810fb_par *par = info->par; |
1158 | u8 __iomem *mmio = par->mmio_start_virtual; | 1158 | u8 __iomem *mmio = par->mmio_start_virtual; |
1159 | u8 temp; | 1159 | u8 temp; |
1160 | 1160 | ||
@@ -1193,7 +1193,7 @@ static int i810fb_getcolreg(u8 regno, u8 *red, u8 *green, u8 *blue, | |||
1193 | 1193 | ||
1194 | static int i810fb_open(struct fb_info *info, int user) | 1194 | static int i810fb_open(struct fb_info *info, int user) |
1195 | { | 1195 | { |
1196 | struct i810fb_par *par = (struct i810fb_par *) info->par; | 1196 | struct i810fb_par *par = info->par; |
1197 | u32 count = atomic_read(&par->use_count); | 1197 | u32 count = atomic_read(&par->use_count); |
1198 | 1198 | ||
1199 | if (count == 0) { | 1199 | if (count == 0) { |
@@ -1212,7 +1212,7 @@ static int i810fb_open(struct fb_info *info, int user) | |||
1212 | 1212 | ||
1213 | static int i810fb_release(struct fb_info *info, int user) | 1213 | static int i810fb_release(struct fb_info *info, int user) |
1214 | { | 1214 | { |
1215 | struct i810fb_par *par = (struct i810fb_par *) info->par; | 1215 | struct i810fb_par *par = info->par; |
1216 | u32 count; | 1216 | u32 count; |
1217 | 1217 | ||
1218 | count = atomic_read(&par->use_count); | 1218 | count = atomic_read(&par->use_count); |
@@ -1234,7 +1234,7 @@ static int i810fb_setcolreg(unsigned regno, unsigned red, unsigned green, | |||
1234 | unsigned blue, unsigned transp, | 1234 | unsigned blue, unsigned transp, |
1235 | struct fb_info *info) | 1235 | struct fb_info *info) |
1236 | { | 1236 | { |
1237 | struct i810fb_par *par = (struct i810fb_par *) info->par; | 1237 | struct i810fb_par *par = info->par; |
1238 | u8 __iomem *mmio = par->mmio_start_virtual; | 1238 | u8 __iomem *mmio = par->mmio_start_virtual; |
1239 | u8 temp; | 1239 | u8 temp; |
1240 | int i; | 1240 | int i; |
@@ -1328,7 +1328,7 @@ static int i810fb_setcolreg(unsigned regno, unsigned red, unsigned green, | |||
1328 | static int i810fb_pan_display(struct fb_var_screeninfo *var, | 1328 | static int i810fb_pan_display(struct fb_var_screeninfo *var, |
1329 | struct fb_info *info) | 1329 | struct fb_info *info) |
1330 | { | 1330 | { |
1331 | struct i810fb_par *par = (struct i810fb_par *) info->par; | 1331 | struct i810fb_par *par = info->par; |
1332 | u32 total; | 1332 | u32 total; |
1333 | 1333 | ||
1334 | total = var->xoffset * par->depth + | 1334 | total = var->xoffset * par->depth + |
@@ -1340,7 +1340,7 @@ static int i810fb_pan_display(struct fb_var_screeninfo *var, | |||
1340 | 1340 | ||
1341 | static int i810fb_blank (int blank_mode, struct fb_info *info) | 1341 | static int i810fb_blank (int blank_mode, struct fb_info *info) |
1342 | { | 1342 | { |
1343 | struct i810fb_par *par = (struct i810fb_par *) info->par; | 1343 | struct i810fb_par *par = info->par; |
1344 | u8 __iomem *mmio = par->mmio_start_virtual; | 1344 | u8 __iomem *mmio = par->mmio_start_virtual; |
1345 | int mode = 0, pwr, scr_off = 0; | 1345 | int mode = 0, pwr, scr_off = 0; |
1346 | 1346 | ||
@@ -1385,7 +1385,7 @@ static int i810fb_blank (int blank_mode, struct fb_info *info) | |||
1385 | 1385 | ||
1386 | static int i810fb_set_par(struct fb_info *info) | 1386 | static int i810fb_set_par(struct fb_info *info) |
1387 | { | 1387 | { |
1388 | struct i810fb_par *par = (struct i810fb_par *) info->par; | 1388 | struct i810fb_par *par = info->par; |
1389 | 1389 | ||
1390 | decode_var(&info->var, par); | 1390 | decode_var(&info->var, par); |
1391 | i810_load_regs(par); | 1391 | i810_load_regs(par); |
@@ -1429,7 +1429,7 @@ static int i810fb_check_var(struct fb_var_screeninfo *var, | |||
1429 | 1429 | ||
1430 | static int i810fb_cursor(struct fb_info *info, struct fb_cursor *cursor) | 1430 | static int i810fb_cursor(struct fb_info *info, struct fb_cursor *cursor) |
1431 | { | 1431 | { |
1432 | struct i810fb_par *par = (struct i810fb_par *)info->par; | 1432 | struct i810fb_par *par = info->par; |
1433 | u8 __iomem *mmio = par->mmio_start_virtual; | 1433 | u8 __iomem *mmio = par->mmio_start_virtual; |
1434 | 1434 | ||
1435 | if (!par->dev_flags & LOCKUP) | 1435 | if (!par->dev_flags & LOCKUP) |
@@ -1516,7 +1516,7 @@ static struct fb_ops i810fb_ops __devinitdata = { | |||
1516 | static int i810fb_suspend(struct pci_dev *dev, pm_message_t state) | 1516 | static int i810fb_suspend(struct pci_dev *dev, pm_message_t state) |
1517 | { | 1517 | { |
1518 | struct fb_info *info = pci_get_drvdata(dev); | 1518 | struct fb_info *info = pci_get_drvdata(dev); |
1519 | struct i810fb_par *par = (struct i810fb_par *) info->par; | 1519 | struct i810fb_par *par = info->par; |
1520 | int blank = 0, prev_state = par->cur_state; | 1520 | int blank = 0, prev_state = par->cur_state; |
1521 | 1521 | ||
1522 | if (state.event == prev_state) | 1522 | if (state.event == prev_state) |
@@ -1553,7 +1553,7 @@ static int i810fb_suspend(struct pci_dev *dev, pm_message_t state) | |||
1553 | static int i810fb_resume(struct pci_dev *dev) | 1553 | static int i810fb_resume(struct pci_dev *dev) |
1554 | { | 1554 | { |
1555 | struct fb_info *info = pci_get_drvdata(dev); | 1555 | struct fb_info *info = pci_get_drvdata(dev); |
1556 | struct i810fb_par *par = (struct i810fb_par *) info->par; | 1556 | struct i810fb_par *par = info->par; |
1557 | 1557 | ||
1558 | if (par->cur_state == 0) | 1558 | if (par->cur_state == 0) |
1559 | return 0; | 1559 | return 0; |
@@ -1610,7 +1610,7 @@ static void __devinit i810_fix_offsets(struct i810fb_par *par) | |||
1610 | 1610 | ||
1611 | static int __devinit i810_alloc_agp_mem(struct fb_info *info) | 1611 | static int __devinit i810_alloc_agp_mem(struct fb_info *info) |
1612 | { | 1612 | { |
1613 | struct i810fb_par *par = (struct i810fb_par *) info->par; | 1613 | struct i810fb_par *par = info->par; |
1614 | int size; | 1614 | int size; |
1615 | struct agp_bridge_data *bridge; | 1615 | struct agp_bridge_data *bridge; |
1616 | 1616 | ||
@@ -2074,7 +2074,7 @@ static void i810fb_release_resource(struct fb_info *info, | |||
2074 | static void __exit i810fb_remove_pci(struct pci_dev *dev) | 2074 | static void __exit i810fb_remove_pci(struct pci_dev *dev) |
2075 | { | 2075 | { |
2076 | struct fb_info *info = pci_get_drvdata(dev); | 2076 | struct fb_info *info = pci_get_drvdata(dev); |
2077 | struct i810fb_par *par = (struct i810fb_par *) info->par; | 2077 | struct i810fb_par *par = info->par; |
2078 | 2078 | ||
2079 | unregister_framebuffer(info); | 2079 | unregister_framebuffer(info); |
2080 | i810fb_release_resource(info, par); | 2080 | i810fb_release_resource(info, par); |