[FFB]: source cleanup (f9c97e5d) · Commits · 戴 / test

drivers/video/ffb.c

+78 −83

Original line number	Diff line number	Diff line
		@@ -382,7 +382,9 @@ static void FFBFifo(struct ffb_par *par, int n)

		if (cache - n < 0) {
		fbc = par->fbc;
		do { cache = (upa_readl(&fbc->ucsr) & FFB_UCSR_FIFO_MASK) - 8;
		do {
		cache = (upa_readl(&fbc->ucsr) & FFB_UCSR_FIFO_MASK);
		cache -= 8;
		} while (cache - n < 0);
		}
		par->fifo_cache = cache - n;
		@@ -468,9 +470,7 @@ static int ffb_pan_display(struct fb_var_screeninfo var, struct fb_info info)
		}

		/**
		* ffb_fillrect - REQUIRED function. Can use generic routines if
		* non acclerated hardware and packed pixel based.
		* Draws a rectangle on the screen.
		* ffb_fillrect - Draws a rectangle on the screen.
		*
		* @info: frame buffer structure that represents a single frame buffer
		* @rect: structure defining the rectagle and operation.
		@@ -494,9 +494,9 @@ static void ffb_fillrect(struct fb_info info, const struct fb_fillrect rect)
		par->fg_cache = fg;
		}

		ffb_rop(par, (rect->rop == ROP_COPY ?
		ffb_rop(par, rect->rop == ROP_COPY ?
		FFB_ROP_NEW :
		FFB_ROP_NEW_XOR_OLD));
		FFB_ROP_NEW_XOR_OLD);

		FFBFifo(par, 5);
		upa_writel(FFB_DRAWOP_RECTANGLE, &fbc->drawop);
		@@ -509,16 +509,13 @@ static void ffb_fillrect(struct fb_info info, const struct fb_fillrect rect)
		}

		/**
		* ffb_copyarea - REQUIRED function. Can use generic routines if
		* non acclerated hardware and packed pixel based.
		* Copies on area of the screen to another area.
		* ffb_copyarea - Copies on area of the screen to another area.
		*
		* @info: frame buffer structure that represents a single frame buffer
		* @area: structure defining the source and destination.
		*/

		static void
		ffb_copyarea(struct fb_info info, const struct fb_copyarea area)
		static void ffb_copyarea(struct fb_info info, const struct fb_copyarea area)
		{
		struct ffb_par par = (struct ffb_par )info->par;
		struct ffb_fbc __iomem *fbc = par->fbc;
		@@ -547,9 +544,7 @@ ffb_copyarea(struct fb_info info, const struct fb_copyarea area)
		}

		/**
		* ffb_imageblit - REQUIRED function. Can use generic routines if
		* non acclerated hardware and packed pixel based.
		* Copies a image from system memory to the screen.
		* ffb_imageblit - Copies a image from system memory to the screen.
		*
		* @info: frame buffer structure that represents a single frame buffer
		* @image: structure defining the image.
		@@ -644,7 +639,8 @@ static void ffb_fixup_var_rgb(struct fb_var_screeninfo *var)
		}

		/**
		* ffb_setcolreg - Optional function. Sets a color register.
		* ffb_setcolreg - Sets a color register.
		*
		* @regno: boolean, 0 copy local, 1 get_user() function
		* @red: frame buffer colormap structure
		* @green: The green value which can be up to 16 bits wide
		@@ -676,8 +672,7 @@ static int ffb_setcolreg(unsigned regno,
		* @blank_mode: the blank mode we want.
		* @info: frame buffer structure that represents a single frame buffer
		*/
		static int
		ffb_blank(int blank, struct fb_info *info)
		static int ffb_blank(int blank, struct fb_info *info)
		{
		struct ffb_par par = (struct ffb_par )info->par;
		struct ffb_dac __iomem *dac = par->dac;
		@@ -877,8 +872,7 @@ static int ffb_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg)
		* Initialisation
		*/

		static void
		ffb_init_fix(struct fb_info *info)
		static void ffb_init_fix(struct fb_info *info)
		{
		struct ffb_par par = (struct ffb_par )info->par;
		const char *ffb_type_name;
		@@ -902,7 +896,8 @@ ffb_init_fix(struct fb_info *info)
		info->fix.accel = FB_ACCEL_SUN_CREATOR;
		}

		static int __devinit ffb_probe(struct of_device op, const struct of_device_id match)
		static int __devinit ffb_probe(struct of_device *op,
		const struct of_device_id *match)
		{
		struct device_node *dp = op->node;
		struct ffb_fbc __iomem *fbc;

Admin message