Commit 6e424134 authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

fbdev/cg3: Use initializer macro for struct fb_ops 



Initialize struct fb_ops to the correct default values with the
macro FB_DEFAULT_SBUS_OPS(). Rename the ioctl and mmap callbacks
to use the infix _sbusfb_. This makes them fit the SBUS helpers'
naming pattern. Also make the driver depend on FB_SBUS_HELPERS,
which selects the correct modules.

Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: default avatarSam Ravnborg <sam@ravnborg.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20230806120926.5368-7-tzimmermann@suse.de
parent 1d3bba30

drivers/video/fbdev/Kconfig

+1 −3
Original line number Diff line number Diff line
@@ -534,9 +534,7 @@ config FB_BW2 
config FB_CG3

	bool "CGthree support"

	depends on (FB = y) && (SPARC && FB_SBUS)

	select FB_CFB_FILLRECT

	select FB_CFB_COPYAREA

	select FB_CFB_IMAGEBLIT

	select FB_SBUS_HELPERS

	help

	  This is the frame buffer device driver for the CGthree frame buffer.

drivers/video/fbdev/cg3.c

+5 −12
Original line number Diff line number Diff line
@@ -32,8 +32,8 @@ static int cg3_setcolreg(unsigned, unsigned, unsigned, unsigned, 
			 unsigned, struct fb_info *);

static int cg3_blank(int, struct fb_info *);



static int cg3_mmap(struct fb_info *, struct vm_area_struct *);

static int cg3_ioctl(struct fb_info *, unsigned int, unsigned long);

static int cg3_sbusfb_mmap(struct fb_info *info, struct vm_area_struct *vma);

static int cg3_sbusfb_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg);



/*

 *  Frame buffer operations
@@ -41,16 +41,9 @@ static int cg3_ioctl(struct fb_info *, unsigned int, unsigned long); 


static const struct fb_ops cg3_ops = {

	.owner			= THIS_MODULE,

	FB_DEFAULT_SBUS_OPS(cg3),

	.fb_setcolreg		= cg3_setcolreg,

	.fb_blank		= cg3_blank,

	.fb_fillrect		= cfb_fillrect,

	.fb_copyarea		= cfb_copyarea,

	.fb_imageblit		= cfb_imageblit,

	.fb_mmap		= cg3_mmap,

	.fb_ioctl		= cg3_ioctl,

#ifdef CONFIG_COMPAT

	.fb_compat_ioctl	= sbusfb_compat_ioctl,

#endif

};
@@ -224,7 +217,7 @@ static struct sbus_mmap_map cg3_mmap_map[] = { 
	{ .size = 0 }

};



static int cg3_mmap(struct fb_info *info, struct vm_area_struct *vma)

static int cg3_sbusfb_mmap(struct fb_info *info, struct vm_area_struct *vma)

{

	struct cg3_par *par = (struct cg3_par *)info->par;
@@ -234,7 +227,7 @@ static int cg3_mmap(struct fb_info *info, struct vm_area_struct *vma) 
				  vma);

}



static int cg3_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg)

static int cg3_sbusfb_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg)

{

	return sbusfb_ioctl_helper(cmd, arg, info,

				   FBTYPE_SUN3COLOR, 8, info->fix.smem_len);