video: fbdev: controlfb: remove function prototypes part #1 (946e8fd4) · Commits · 戴 / test

drivers/video/fbdev/controlfb.c

+13 −28

Original line number	Diff line number	Diff line
		@@ -141,20 +141,6 @@ struct fb_info_control {
		#define CNTRL_REG(INFO,REG) (&(((INFO)->control_regs->REG).r))


		/****************** Prototypes for exported functions ******************/
		/*
		* struct fb_ops
		*/
		static int controlfb_pan_display(struct fb_var_screeninfo *var,
		struct fb_info *info);
		static int controlfb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
		u_int transp, struct fb_info *info);
		static int controlfb_blank(int blank_mode, struct fb_info *info);
		static int controlfb_mmap(struct fb_info *info,
		struct vm_area_struct *vma);
		static int controlfb_set_par (struct fb_info *info);
		static int controlfb_check_var (struct fb_var_screeninfo var, struct fb_info info);

		/****************** Prototypes for internal functions ********************/

		static void set_control_clock(unsigned char *params);
		@@ -181,20 +167,6 @@ static int default_vmode __initdata = VMODE_NVRAM;
		static int default_cmode __initdata = CMODE_NVRAM;


		static const struct fb_ops controlfb_ops = {
		.owner = THIS_MODULE,
		.fb_check_var = controlfb_check_var,
		.fb_set_par = controlfb_set_par,
		.fb_setcolreg = controlfb_setcolreg,
		.fb_pan_display = controlfb_pan_display,
		.fb_blank = controlfb_blank,
		.fb_mmap = controlfb_mmap,
		.fb_fillrect = cfb_fillrect,
		.fb_copyarea = cfb_copyarea,
		.fb_imageblit = cfb_imageblit,
		};


		/****************** The functions for controlfb_ops ******************/

		/*
		@@ -1011,6 +983,19 @@ static void control_par_to_var(struct fb_par_control *par, struct fb_var_screeni
		var->pixclock >>= par->regvals.clock_params[2];
		}

		static const struct fb_ops controlfb_ops = {
		.owner = THIS_MODULE,
		.fb_check_var = controlfb_check_var,
		.fb_set_par = controlfb_set_par,
		.fb_setcolreg = controlfb_setcolreg,
		.fb_pan_display = controlfb_pan_display,
		.fb_blank = controlfb_blank,
		.fb_mmap = controlfb_mmap,
		.fb_fillrect = cfb_fillrect,
		.fb_copyarea = cfb_copyarea,
		.fb_imageblit = cfb_imageblit,
		};

		/*
		* Set misc info vars for this driver
		*/

Admin message