aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/i810
diff options
context:
space:
mode:
authorAntonino A. Daplas <adaplas@gmail.com>2006-01-09 23:53:03 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-10 11:01:44 -0500
commitc019c0ec97548d545c42961e960cbe2e8a6aabe9 (patch)
tree3a1eb5ba31af5633a7d3e7bb178562919e9509a6 /drivers/video/i810
parentb8901b091db260b0f0101d6395ce5c6016835a47 (diff)
[PATCH] fbdev: i810fb: Driver cleanups
- remove redundant casts Signed-off-by: Antonino Daplas <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/video/i810')
-rw-r--r--drivers/video/i810/i810-i2c.c2
-rw-r--r--drivers/video/i810/i810_accel.c26
-rw-r--r--drivers/video/i810/i810_main.c30
3 files changed, 29 insertions, 29 deletions
diff --git a/drivers/video/i810/i810-i2c.c b/drivers/video/i810/i810-i2c.c
index c61bad0da20f..13c17438fb8c 100644
--- a/drivers/video/i810/i810-i2c.c
+++ b/drivers/video/i810/i810-i2c.c
@@ -42,7 +42,7 @@
42 42
43static void i810i2c_setscl(void *data, int state) 43static void i810i2c_setscl(void *data, int state)
44{ 44{
45 struct i810fb_i2c_chan *chan = (struct i810fb_i2c_chan *)data; 45 struct i810fb_i2c_chan *chan = data;
46 struct i810fb_par *par = chan->par; 46 struct i810fb_par *par = chan->par;
47 u8 __iomem *mmio = par->mmio_start_virtual; 47 u8 __iomem *mmio = par->mmio_start_virtual;
48 48
diff --git a/drivers/video/i810/i810_accel.c b/drivers/video/i810/i810_accel.c
index 64cd1c827cf0..84f9cc10636f 100644
--- a/drivers/video/i810/i810_accel.c
+++ b/drivers/video/i810/i810_accel.c
@@ -57,7 +57,7 @@ static inline void i810_report_error(u8 __iomem *mmio)
57 */ 57 */
58static inline int wait_for_space(struct fb_info *info, u32 space) 58static inline int wait_for_space(struct fb_info *info, u32 space)
59{ 59{
60 struct i810fb_par *par = (struct i810fb_par *) info->par; 60 struct i810fb_par *par = info->par;
61 u32 head, count = WAIT_COUNT, tail; 61 u32 head, count = WAIT_COUNT, tail;
62 u8 __iomem *mmio = par->mmio_start_virtual; 62 u8 __iomem *mmio = par->mmio_start_virtual;
63 63
@@ -88,7 +88,7 @@ static inline int wait_for_space(struct fb_info *info, u32 space)
88 */ 88 */
89static inline int wait_for_engine_idle(struct fb_info *info) 89static inline int wait_for_engine_idle(struct fb_info *info)
90{ 90{
91 struct i810fb_par *par = (struct i810fb_par *) info->par; 91 struct i810fb_par *par = info->par;
92 u8 __iomem *mmio = par->mmio_start_virtual; 92 u8 __iomem *mmio = par->mmio_start_virtual;
93 int count = WAIT_COUNT; 93 int count = WAIT_COUNT;
94 94
@@ -116,7 +116,7 @@ static inline int wait_for_engine_idle(struct fb_info *info)
116 */ 116 */
117static inline u32 begin_iring(struct fb_info *info, u32 space) 117static inline u32 begin_iring(struct fb_info *info, u32 space)
118{ 118{
119 struct i810fb_par *par = (struct i810fb_par *) info->par; 119 struct i810fb_par *par = info->par;
120 120
121 if (par->dev_flags & ALWAYS_SYNC) 121 if (par->dev_flags & ALWAYS_SYNC)
122 wait_for_engine_idle(info); 122 wait_for_engine_idle(info);
@@ -161,7 +161,7 @@ static inline void source_copy_blit(int dwidth, int dheight, int dpitch,
161 int xdir, int src, int dest, int rop, 161 int xdir, int src, int dest, int rop,
162 int blit_bpp, struct fb_info *info) 162 int blit_bpp, struct fb_info *info)
163{ 163{
164 struct i810fb_par *par = (struct i810fb_par *) info->par; 164 struct i810fb_par *par = info->par;
165 165
166 if (begin_iring(info, 24 + IRING_PAD)) return; 166 if (begin_iring(info, 24 + IRING_PAD)) return;
167 167
@@ -195,7 +195,7 @@ static inline void color_blit(int width, int height, int pitch, int dest,
195 int rop, int what, int blit_bpp, 195 int rop, int what, int blit_bpp,
196 struct fb_info *info) 196 struct fb_info *info)
197{ 197{
198 struct i810fb_par *par = (struct i810fb_par *) info->par; 198 struct i810fb_par *par = info->par;
199 199
200 if (begin_iring(info, 24 + IRING_PAD)) return; 200 if (begin_iring(info, 24 + IRING_PAD)) return;
201 201
@@ -236,7 +236,7 @@ static inline void mono_src_copy_imm_blit(int dwidth, int dheight, int dpitch,
236 int dest, const u32 *src, int bg, 236 int dest, const u32 *src, int bg,
237 int fg, struct fb_info *info) 237 int fg, struct fb_info *info)
238{ 238{
239 struct i810fb_par *par = (struct i810fb_par *) info->par; 239 struct i810fb_par *par = info->par;
240 240
241 if (begin_iring(info, 24 + (dsize << 2) + IRING_PAD)) return; 241 if (begin_iring(info, 24 + (dsize << 2) + IRING_PAD)) return;
242 242
@@ -254,7 +254,7 @@ static inline void mono_src_copy_imm_blit(int dwidth, int dheight, int dpitch,
254 254
255static inline void load_front(int offset, struct fb_info *info) 255static inline void load_front(int offset, struct fb_info *info)
256{ 256{
257 struct i810fb_par *par = (struct i810fb_par *) info->par; 257 struct i810fb_par *par = info->par;
258 258
259 if (begin_iring(info, 8 + IRING_PAD)) return; 259 if (begin_iring(info, 8 + IRING_PAD)) return;
260 260
@@ -296,7 +296,7 @@ static inline void i810fb_iring_enable(struct i810fb_par *par, u32 mode)
296 296
297void i810fb_fillrect(struct fb_info *info, const struct fb_fillrect *rect) 297void i810fb_fillrect(struct fb_info *info, const struct fb_fillrect *rect)
298{ 298{
299 struct i810fb_par *par = (struct i810fb_par *) info->par; 299 struct i810fb_par *par = info->par;
300 u32 dx, dy, width, height, dest, rop = 0, color = 0; 300 u32 dx, dy, width, height, dest, rop = 0, color = 0;
301 301
302 if (!info->var.accel_flags || par->dev_flags & LOCKUP || 302 if (!info->var.accel_flags || par->dev_flags & LOCKUP ||
@@ -322,7 +322,7 @@ void i810fb_fillrect(struct fb_info *info, const struct fb_fillrect *rect)
322 322
323void i810fb_copyarea(struct fb_info *info, const struct fb_copyarea *region) 323void i810fb_copyarea(struct fb_info *info, const struct fb_copyarea *region)
324{ 324{
325 struct i810fb_par *par = (struct i810fb_par *) info->par; 325 struct i810fb_par *par = info->par;
326 u32 sx, sy, dx, dy, pitch, width, height, src, dest, xdir; 326 u32 sx, sy, dx, dy, pitch, width, height, src, dest, xdir;
327 327
328 if (!info->var.accel_flags || par->dev_flags & LOCKUP || 328 if (!info->var.accel_flags || par->dev_flags & LOCKUP ||
@@ -361,7 +361,7 @@ void i810fb_copyarea(struct fb_info *info, const struct fb_copyarea *region)
361 361
362void i810fb_imageblit(struct fb_info *info, const struct fb_image *image) 362void i810fb_imageblit(struct fb_info *info, const struct fb_image *image)
363{ 363{
364 struct i810fb_par *par = (struct i810fb_par *) info->par; 364 struct i810fb_par *par = info->par;
365 u32 fg = 0, bg = 0, size, dst; 365 u32 fg = 0, bg = 0, size, dst;
366 366
367 if (!info->var.accel_flags || par->dev_flags & LOCKUP || 367 if (!info->var.accel_flags || par->dev_flags & LOCKUP ||
@@ -397,7 +397,7 @@ void i810fb_imageblit(struct fb_info *info, const struct fb_image *image)
397 397
398int i810fb_sync(struct fb_info *info) 398int i810fb_sync(struct fb_info *info)
399{ 399{
400 struct i810fb_par *par = (struct i810fb_par *) info->par; 400 struct i810fb_par *par = info->par;
401 401
402 if (!info->var.accel_flags || par->dev_flags & LOCKUP) 402 if (!info->var.accel_flags || par->dev_flags & LOCKUP)
403 return 0; 403 return 0;
@@ -407,7 +407,7 @@ int i810fb_sync(struct fb_info *info)
407 407
408void i810fb_load_front(u32 offset, struct fb_info *info) 408void i810fb_load_front(u32 offset, struct fb_info *info)
409{ 409{
410 struct i810fb_par *par = (struct i810fb_par *) info->par; 410 struct i810fb_par *par = info->par;
411 u8 __iomem *mmio = par->mmio_start_virtual; 411 u8 __iomem *mmio = par->mmio_start_virtual;
412 412
413 if (!info->var.accel_flags || par->dev_flags & LOCKUP) 413 if (!info->var.accel_flags || par->dev_flags & LOCKUP)
@@ -427,7 +427,7 @@ void i810fb_load_front(u32 offset, struct fb_info *info)
427 */ 427 */
428void i810fb_init_ringbuffer(struct fb_info *info) 428void i810fb_init_ringbuffer(struct fb_info *info)
429{ 429{
430 struct i810fb_par *par = (struct i810fb_par *) info->par; 430 struct i810fb_par *par = info->par;
431 u32 tmp1, tmp2; 431 u32 tmp1, tmp2;
432 u8 __iomem *mmio = par->mmio_start_virtual; 432 u8 __iomem *mmio = par->mmio_start_virtual;
433 433
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
777static void i810_load_cursor_colors(int fg, int bg, struct fb_info *info) 777static 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)
949static int i810_check_params(struct fb_var_screeninfo *var, 949static 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 */
1044static int encode_fix(struct fb_fix_screeninfo *fix, struct fb_info *info) 1044static 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,
1154static int i810fb_getcolreg(u8 regno, u8 *red, u8 *green, u8 *blue, 1154static 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
1194static int i810fb_open(struct fb_info *info, int user) 1194static 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
1213static int i810fb_release(struct fb_info *info, int user) 1213static 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,
1328static int i810fb_pan_display(struct fb_var_screeninfo *var, 1328static 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
1341static int i810fb_blank (int blank_mode, struct fb_info *info) 1341static 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
1386static int i810fb_set_par(struct fb_info *info) 1386static 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
1430static int i810fb_cursor(struct fb_info *info, struct fb_cursor *cursor) 1430static 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 = {
1516static int i810fb_suspend(struct pci_dev *dev, pm_message_t state) 1516static 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)
1553static int i810fb_resume(struct pci_dev *dev) 1553static 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
1611static int __devinit i810_alloc_agp_mem(struct fb_info *info) 1611static 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,
2074static void __exit i810fb_remove_pci(struct pci_dev *dev) 2074static 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);