aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/i810/i810_accel.c
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/i810_accel.c
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/i810_accel.c')
-rw-r--r--drivers/video/i810/i810_accel.c26
1 files changed, 13 insertions, 13 deletions
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