Commit aee3c311 authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

fbdev/ffb: Use initializer macro for struct fb_ops 



Initialize struct fb_ops to the correct default values with the
internal __FB_DEFAULT_SBUS_OPS_*() macros. Rename the ioctl and
mmap callbacks to use the infix _sbusfb_. This makes them fit the
SBUS helpers' naming pattern.

It is not possible to use set all defaults via FB_DEAFULT_SBUS_OPS(),
as ffb provides its own implementation of fb_fillrect, fb_copyarea,
and fb_imageblit. Hence we also avoid FB_SBUS_HELPERS, but let the
driver select its dependencies individually instead.

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-9-tzimmermann@suse.de
parent 17397471

drivers/video/fbdev/ffb.c

+8 −9
Original line number Diff line number Diff line
@@ -36,16 +36,18 @@ static void ffb_imageblit(struct fb_info *, const struct fb_image *); 
static void ffb_fillrect(struct fb_info *, const struct fb_fillrect *);

static void ffb_copyarea(struct fb_info *, const struct fb_copyarea *);

static int ffb_sync(struct fb_info *);

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

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

static int ffb_pan_display(struct fb_var_screeninfo *, struct fb_info *);



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

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



/*

 *  Frame buffer operations

 */



static const struct fb_ops ffb_ops = {

	.owner			= THIS_MODULE,

	__FB_DEFAULT_SBUS_OPS_RDWR(ffb),

	.fb_setcolreg		= ffb_setcolreg,

	.fb_blank		= ffb_blank,

	.fb_pan_display		= ffb_pan_display,
@@ -53,11 +55,8 @@ static const struct fb_ops ffb_ops = { 
	.fb_copyarea		= ffb_copyarea,

	.fb_imageblit		= ffb_imageblit,

	.fb_sync		= ffb_sync,

	.fb_mmap		= ffb_mmap,

	.fb_ioctl		= ffb_ioctl,

#ifdef CONFIG_COMPAT

	.fb_compat_ioctl	= sbusfb_compat_ioctl,

#endif

	__FB_DEFAULT_SBUS_OPS_IOCTL(ffb),

	__FB_DEFAULT_SBUS_OPS_MMAP(ffb),

};



/* Register layout and definitions */
@@ -849,7 +848,7 @@ static struct sbus_mmap_map ffb_mmap_map[] = { 
	{ .size = 0 }

};



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

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

{

	struct ffb_par *par = (struct ffb_par *)info->par;
@@ -858,7 +857,7 @@ static int ffb_mmap(struct fb_info *info, struct vm_area_struct *vma) 
				  0, vma);

}



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

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

{

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