Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c019c0ec authored by Antonino A. Daplas's avatar Antonino A. Daplas Committed by Linus Torvalds
Browse files

[PATCH] fbdev: i810fb: Driver cleanups 



- remove redundant casts

Signed-off-by: default avatarAntonino Daplas <adaplas@pol.net>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent b8901b09

drivers/video/i810/i810-i2c.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -42,7 +42,7 @@ 




static void i810i2c_setscl(void *data, int state)

static void i810i2c_setscl(void *data, int state)

{

{

        struct i810fb_i2c_chan    *chan = (struct i810fb_i2c_chan *)data;

        struct i810fb_i2c_chan    *chan = data;

        struct i810fb_par         *par = chan->par;

        struct i810fb_par         *par = chan->par;

	u8                        __iomem *mmio = par->mmio_start_virtual;

	u8                        __iomem *mmio = par->mmio_start_virtual;

drivers/video/i810/i810_accel.c

+13 −13
Original line number Original line Diff line number Diff line
@@ -57,7 +57,7 @@ static inline void i810_report_error(u8 __iomem *mmio) 
 */	

 */	

static inline int wait_for_space(struct fb_info *info, u32 space)

static inline int wait_for_space(struct fb_info *info, u32 space)

{

{

	struct i810fb_par *par = (struct i810fb_par *) info->par;

	struct i810fb_par *par = info->par;

	u32 head, count = WAIT_COUNT, tail;

	u32 head, count = WAIT_COUNT, tail;

	u8 __iomem *mmio = par->mmio_start_virtual;

	u8 __iomem *mmio = par->mmio_start_virtual;
@@ -88,7 +88,7 @@ static inline int wait_for_space(struct fb_info *info, u32 space) 
 */

 */

static inline int wait_for_engine_idle(struct fb_info *info)

static inline int wait_for_engine_idle(struct fb_info *info)

{

{

	struct i810fb_par *par = (struct i810fb_par *) info->par;

	struct i810fb_par *par = info->par;

	u8 __iomem *mmio = par->mmio_start_virtual;

	u8 __iomem *mmio = par->mmio_start_virtual;

	int count = WAIT_COUNT;

	int count = WAIT_COUNT;
@@ -116,7 +116,7 @@ static inline int wait_for_engine_idle(struct fb_info *info) 
 */ 

 */ 

static inline u32 begin_iring(struct fb_info *info, u32 space)

static inline u32 begin_iring(struct fb_info *info, u32 space)

{

{

	struct i810fb_par *par = (struct i810fb_par *) info->par;

	struct i810fb_par *par = info->par;





	if (par->dev_flags & ALWAYS_SYNC) 

	if (par->dev_flags & ALWAYS_SYNC) 

		wait_for_engine_idle(info);

		wait_for_engine_idle(info);
@@ -161,7 +161,7 @@ static inline void source_copy_blit(int dwidth, int dheight, int dpitch, 
				    int xdir, int src, int dest, int rop, 

				    int xdir, int src, int dest, int rop, 

				    int blit_bpp, struct fb_info *info)

				    int blit_bpp, struct fb_info *info)

{

{

	struct i810fb_par *par = (struct i810fb_par *) info->par;

	struct i810fb_par *par = info->par;





	if (begin_iring(info, 24 + IRING_PAD)) return;

	if (begin_iring(info, 24 + IRING_PAD)) return;
@@ -195,7 +195,7 @@ static inline void color_blit(int width, int height, int pitch, int dest, 
			      int rop, int what, int blit_bpp, 

			      int rop, int what, int blit_bpp, 

			      struct fb_info *info)

			      struct fb_info *info)

{

{

	struct i810fb_par *par = (struct i810fb_par *) info->par;

	struct i810fb_par *par = info->par;





	if (begin_iring(info, 24 + IRING_PAD)) return;

	if (begin_iring(info, 24 + IRING_PAD)) return;
@@ -236,7 +236,7 @@ static inline void mono_src_copy_imm_blit(int dwidth, int dheight, int dpitch, 
					  int dest, const u32 *src, int bg,

					  int dest, const u32 *src, int bg,

					  int fg, struct fb_info *info)

					  int fg, struct fb_info *info)

{

{

	struct i810fb_par *par = (struct i810fb_par *) info->par;

	struct i810fb_par *par = info->par;





	if (begin_iring(info, 24 + (dsize << 2) + IRING_PAD)) return;

	if (begin_iring(info, 24 + (dsize << 2) + IRING_PAD)) return;
@@ -254,7 +254,7 @@ static inline void mono_src_copy_imm_blit(int dwidth, int dheight, int dpitch, 




static inline void load_front(int offset, struct fb_info *info)

static inline void load_front(int offset, struct fb_info *info)

{

{

	struct i810fb_par *par = (struct i810fb_par *) info->par;

	struct i810fb_par *par = info->par;





	if (begin_iring(info, 8 + IRING_PAD)) return;

	if (begin_iring(info, 8 + IRING_PAD)) return;
@@ -296,7 +296,7 @@ static inline void i810fb_iring_enable(struct i810fb_par *par, u32 mode) 




void i810fb_fillrect(struct fb_info *info, const struct fb_fillrect *rect)

void i810fb_fillrect(struct fb_info *info, const struct fb_fillrect *rect)

{

{

	struct i810fb_par *par = (struct i810fb_par *) info->par;

	struct i810fb_par *par = info->par;

	u32 dx, dy, width, height, dest, rop = 0, color = 0;

	u32 dx, dy, width, height, dest, rop = 0, color = 0;





	if (!info->var.accel_flags || par->dev_flags & LOCKUP ||

	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) 
	

	

void i810fb_copyarea(struct fb_info *info, const struct fb_copyarea *region) 

void i810fb_copyarea(struct fb_info *info, const struct fb_copyarea *region) 

{

{

	struct i810fb_par *par = (struct i810fb_par *) info->par;

	struct i810fb_par *par = info->par;

	u32 sx, sy, dx, dy, pitch, width, height, src, dest, xdir;

	u32 sx, sy, dx, dy, pitch, width, height, src, dest, xdir;





	if (!info->var.accel_flags || par->dev_flags & LOCKUP ||

	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) 




void i810fb_imageblit(struct fb_info *info, const struct fb_image *image)

void i810fb_imageblit(struct fb_info *info, const struct fb_image *image)

{

{

	struct i810fb_par *par = (struct i810fb_par *) info->par;

	struct i810fb_par *par = info->par;

	u32 fg = 0, bg = 0, size, dst;

	u32 fg = 0, bg = 0, size, dst;

	

	

	if (!info->var.accel_flags || par->dev_flags & LOCKUP ||

	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) 




int i810fb_sync(struct fb_info *info)

int i810fb_sync(struct fb_info *info)

{

{

	struct i810fb_par *par = (struct i810fb_par *) info->par;

	struct i810fb_par *par = info->par;

	

	

	if (!info->var.accel_flags || par->dev_flags & LOCKUP)

	if (!info->var.accel_flags || par->dev_flags & LOCKUP)

		return 0;

		return 0;
@@ -407,7 +407,7 @@ int i810fb_sync(struct fb_info *info) 




void i810fb_load_front(u32 offset, struct fb_info *info)

void i810fb_load_front(u32 offset, struct fb_info *info)

{

{

	struct i810fb_par *par = (struct i810fb_par *) info->par;

	struct i810fb_par *par = info->par;

	u8 __iomem *mmio = par->mmio_start_virtual;

	u8 __iomem *mmio = par->mmio_start_virtual;





	if (!info->var.accel_flags || par->dev_flags & LOCKUP)

	if (!info->var.accel_flags || par->dev_flags & LOCKUP)
@@ -427,7 +427,7 @@ void i810fb_load_front(u32 offset, struct fb_info *info) 
 */

 */

void i810fb_init_ringbuffer(struct fb_info *info)

void i810fb_init_ringbuffer(struct fb_info *info)

{

{

	struct i810fb_par *par = (struct i810fb_par *) info->par;

	struct i810fb_par *par = info->par;

	u32 tmp1, tmp2;

	u32 tmp1, tmp2;

	u8 __iomem *mmio = par->mmio_start_virtual;

	u8 __iomem *mmio = par->mmio_start_virtual;

drivers/video/i810/i810_main.c

+15 −15
Original line number Original line Diff line number Diff line
@@ -776,7 +776,7 @@ static void i810_load_cursor_image(int width, int height, u8 *data, 




static void i810_load_cursor_colors(int fg, int bg, struct fb_info *info)

static void i810_load_cursor_colors(int fg, int bg, struct fb_info *info)

{

{

	struct i810fb_par *par = (struct i810fb_par *) info->par;

	struct i810fb_par *par = info->par;

	u8 __iomem *mmio = par->mmio_start_virtual;

	u8 __iomem *mmio = par->mmio_start_virtual;

	u8 red, green, blue, trans, temp;

	u8 red, green, blue, trans, temp;
@@ -949,7 +949,7 @@ static void set_color_bitfields(struct fb_var_screeninfo *var) 
static int i810_check_params(struct fb_var_screeninfo *var, 

static int i810_check_params(struct fb_var_screeninfo *var, 

			     struct fb_info *info)

			     struct fb_info *info)

{

{

	struct i810fb_par *par = (struct i810fb_par *) info->par;

	struct i810fb_par *par = info->par;

	int line_length, vidmem, mode_valid = 0, retval = 0;

	int line_length, vidmem, mode_valid = 0, retval = 0;

	u32 vyres = var->yres_virtual, vxres = var->xres_virtual;

	u32 vyres = var->yres_virtual, vxres = var->xres_virtual;

	/*

	/*
@@ -1043,7 +1043,7 @@ static int i810_check_params(struct fb_var_screeninfo *var, 
 */

 */

static int encode_fix(struct fb_fix_screeninfo *fix, struct fb_info *info)

static int encode_fix(struct fb_fix_screeninfo *fix, struct fb_info *info)

{

{

	struct i810fb_par *par = (struct i810fb_par *) info->par;

	struct i810fb_par *par = info->par;





    	memset(fix, 0, sizeof(struct fb_fix_screeninfo));

    	memset(fix, 0, sizeof(struct fb_fix_screeninfo));
@@ -1154,7 +1154,7 @@ static void decode_var(const struct fb_var_screeninfo *var, 
static int i810fb_getcolreg(u8 regno, u8 *red, u8 *green, u8 *blue, 

static int i810fb_getcolreg(u8 regno, u8 *red, u8 *green, u8 *blue, 

			    u8 *transp, struct fb_info *info)

			    u8 *transp, struct fb_info *info)

{

{

	struct i810fb_par *par = (struct i810fb_par *) info->par;

	struct i810fb_par *par = info->par;

	u8 __iomem *mmio = par->mmio_start_virtual;

	u8 __iomem *mmio = par->mmio_start_virtual;

	u8 temp;

	u8 temp;
@@ -1193,7 +1193,7 @@ static int i810fb_getcolreg(u8 regno, u8 *red, u8 *green, u8 *blue, 




static int i810fb_open(struct fb_info *info, int user)

static int i810fb_open(struct fb_info *info, int user)

{

{

	struct i810fb_par *par = (struct i810fb_par *) info->par;

	struct i810fb_par *par = info->par;

	u32 count = atomic_read(&par->use_count);

	u32 count = atomic_read(&par->use_count);

	

	

	if (count == 0) {

	if (count == 0) {
@@ -1212,7 +1212,7 @@ static int i810fb_open(struct fb_info *info, int user) 




static int i810fb_release(struct fb_info *info, int user)

static int i810fb_release(struct fb_info *info, int user)

{

{

	struct i810fb_par *par = (struct i810fb_par *) info->par;

	struct i810fb_par *par = info->par;

	u32 count;

	u32 count;

	

	

	count = atomic_read(&par->use_count);

	count = atomic_read(&par->use_count);
@@ -1234,7 +1234,7 @@ static int i810fb_setcolreg(unsigned regno, unsigned red, unsigned green, 
			    unsigned blue, unsigned transp, 

			    unsigned blue, unsigned transp, 

			    struct fb_info *info)

			    struct fb_info *info)

{

{

	struct i810fb_par *par = (struct i810fb_par *) info->par;

	struct i810fb_par *par = info->par;

	u8 __iomem *mmio = par->mmio_start_virtual;

	u8 __iomem *mmio = par->mmio_start_virtual;

	u8 temp;

	u8 temp;

	int i;

	int i;
@@ -1328,7 +1328,7 @@ static int i810fb_setcolreg(unsigned regno, unsigned red, unsigned green, 
static int i810fb_pan_display(struct fb_var_screeninfo *var, 

static int i810fb_pan_display(struct fb_var_screeninfo *var, 

			      struct fb_info *info)

			      struct fb_info *info)

{

{

	struct i810fb_par *par = (struct i810fb_par *) info->par;

	struct i810fb_par *par = info->par;

	u32 total;

	u32 total;

	

	

	total = var->xoffset * par->depth + 

	total = var->xoffset * par->depth +
@@ -1340,7 +1340,7 @@ static int i810fb_pan_display(struct fb_var_screeninfo *var, 




static int i810fb_blank (int blank_mode, struct fb_info *info)

static int i810fb_blank (int blank_mode, struct fb_info *info)

{

{

	struct i810fb_par *par = (struct i810fb_par *) info->par;

	struct i810fb_par *par = info->par;

	u8 __iomem *mmio = par->mmio_start_virtual;

	u8 __iomem *mmio = par->mmio_start_virtual;

	int mode = 0, pwr, scr_off = 0;

	int mode = 0, pwr, scr_off = 0;
@@ -1385,7 +1385,7 @@ static int i810fb_blank (int blank_mode, struct fb_info *info) 




static int i810fb_set_par(struct fb_info *info)

static int i810fb_set_par(struct fb_info *info)

{

{

	struct i810fb_par *par = (struct i810fb_par *) info->par;

	struct i810fb_par *par = info->par;





	decode_var(&info->var, par);

	decode_var(&info->var, par);

	i810_load_regs(par);

	i810_load_regs(par);
@@ -1429,7 +1429,7 @@ static int i810fb_check_var(struct fb_var_screeninfo *var, 




static int i810fb_cursor(struct fb_info *info, struct fb_cursor *cursor)

static int i810fb_cursor(struct fb_info *info, struct fb_cursor *cursor)

{

{

	struct i810fb_par *par = (struct i810fb_par *)info->par;

	struct i810fb_par *par = info->par;

	u8 __iomem *mmio = par->mmio_start_virtual;

	u8 __iomem *mmio = par->mmio_start_virtual;





	if (!par->dev_flags & LOCKUP)

	if (!par->dev_flags & LOCKUP)
@@ -1516,7 +1516,7 @@ static struct fb_ops i810fb_ops __devinitdata = { 
static int i810fb_suspend(struct pci_dev *dev, pm_message_t state)

static int i810fb_suspend(struct pci_dev *dev, pm_message_t state)

{

{

	struct fb_info *info = pci_get_drvdata(dev);

	struct fb_info *info = pci_get_drvdata(dev);

	struct i810fb_par *par = (struct i810fb_par *) info->par;

	struct i810fb_par *par = info->par;

	int blank = 0, prev_state = par->cur_state;

	int blank = 0, prev_state = par->cur_state;





	if (state.event == prev_state)

	if (state.event == prev_state)
@@ -1553,7 +1553,7 @@ static int i810fb_suspend(struct pci_dev *dev, pm_message_t state) 
static int i810fb_resume(struct pci_dev *dev) 

static int i810fb_resume(struct pci_dev *dev) 

{

{

	struct fb_info *info = pci_get_drvdata(dev);

	struct fb_info *info = pci_get_drvdata(dev);

	struct i810fb_par *par = (struct i810fb_par *) info->par;

	struct i810fb_par *par = info->par;





	if (par->cur_state == 0)

	if (par->cur_state == 0)

		return 0;

		return 0;
@@ -1610,7 +1610,7 @@ static void __devinit i810_fix_offsets(struct i810fb_par *par) 




static int __devinit i810_alloc_agp_mem(struct fb_info *info)

static int __devinit i810_alloc_agp_mem(struct fb_info *info)

{

{

	struct i810fb_par *par = (struct i810fb_par *) info->par;

	struct i810fb_par *par = info->par;

	int size;

	int size;

	struct agp_bridge_data *bridge;

	struct agp_bridge_data *bridge;
@@ -2074,7 +2074,7 @@ static void i810fb_release_resource(struct fb_info *info, 
static void __exit i810fb_remove_pci(struct pci_dev *dev)

static void __exit i810fb_remove_pci(struct pci_dev *dev)

{

{

	struct fb_info *info = pci_get_drvdata(dev);

	struct fb_info *info = pci_get_drvdata(dev);

	struct i810fb_par *par = (struct i810fb_par *) info->par;

	struct i810fb_par *par = info->par;





	unregister_framebuffer(info);  

	unregister_framebuffer(info);  

	i810fb_release_resource(info, par);

	i810fb_release_resource(info, par);