| Message ID | 20220208210824.2238981-2-daniel.vetter@ffwll.ch (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | fbcon patches, take two | expand |
Am 08.02.22 um 22:08 schrieb Daniel Vetter: > I didn't bother with any code movement to fix the others, these just > got a bit in the way. > > v2: Rebase on top of Helge's reverts. > > Acked-by: Sam Ravnborg <sam@ravnborg.org> (v1) > Reviewed-by: Geert Uytterhoeven <geert@linux-m68k.org> (v1) > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> > Cc: Helge Deller <deller@gmx.de> > Cc: Daniel Vetter <daniel@ffwll.ch> > Cc: Thomas Zimmermann <tzimmermann@suse.de> > Cc: Du Cheng <ducheng2@gmail.com> > Cc: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> > Cc: Claudio Suarez <cssk@net-c.es> > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Acked-by: Thomas Zimmermann <tzimmermann@suse.de> > --- > drivers/video/fbdev/core/fbcon.c | 17 +---------------- > 1 file changed, 1 insertion(+), 16 deletions(-) > > diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c > index 2fc1b80a26ad..235eaab37d84 100644 > --- a/drivers/video/fbdev/core/fbcon.c > +++ b/drivers/video/fbdev/core/fbcon.c > @@ -163,29 +163,14 @@ static int fbcon_cursor_noblink; > * Interface used by the world > */ > > -static const char *fbcon_startup(void); > -static void fbcon_init(struct vc_data *vc, int init); > -static void fbcon_deinit(struct vc_data *vc); > -static void fbcon_clear(struct vc_data *vc, int sy, int sx, int height, > - int width); > -static void fbcon_putc(struct vc_data *vc, int c, int ypos, int xpos); > -static void fbcon_putcs(struct vc_data *vc, const unsigned short *s, > - int count, int ypos, int xpos); > static void fbcon_clear_margins(struct vc_data *vc, int bottom_only); > -static void fbcon_cursor(struct vc_data *vc, int mode); > static void fbcon_bmove(struct vc_data *vc, int sy, int sx, int dy, int dx, > int height, int width); > -static int fbcon_switch(struct vc_data *vc); > -static int fbcon_blank(struct vc_data *vc, int blank, int mode_switch); > static void fbcon_set_palette(struct vc_data *vc, const unsigned char *table); > > /* > * Internal routines > */ > -static __inline__ void ywrap_up(struct vc_data *vc, int count); > -static __inline__ void ywrap_down(struct vc_data *vc, int count); > -static __inline__ void ypan_up(struct vc_data *vc, int count); > -static __inline__ void ypan_down(struct vc_data *vc, int count); > static void fbcon_bmove_rec(struct vc_data *vc, struct fbcon_display *p, int sy, int sx, > int dy, int dx, int height, int width, u_int y_break); > static void fbcon_set_disp(struct fb_info *info, struct fb_var_screeninfo *var, > @@ -194,8 +179,8 @@ static void fbcon_redraw_move(struct vc_data *vc, struct fbcon_display *p, > int line, int count, int dy); > static void fbcon_modechanged(struct fb_info *info); > static void fbcon_set_all_vcs(struct fb_info *info); > -static void fbcon_start(void); > static void fbcon_exit(void); > + > static struct device *fbcon_device; > > #ifdef CONFIG_FRAMEBUFFER_CONSOLE_ROTATION
diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c index 2fc1b80a26ad..235eaab37d84 100644 --- a/drivers/video/fbdev/core/fbcon.c +++ b/drivers/video/fbdev/core/fbcon.c @@ -163,29 +163,14 @@ static int fbcon_cursor_noblink; * Interface used by the world */ -static const char *fbcon_startup(void); -static void fbcon_init(struct vc_data *vc, int init); -static void fbcon_deinit(struct vc_data *vc); -static void fbcon_clear(struct vc_data *vc, int sy, int sx, int height, - int width); -static void fbcon_putc(struct vc_data *vc, int c, int ypos, int xpos); -static void fbcon_putcs(struct vc_data *vc, const unsigned short *s, - int count, int ypos, int xpos); static void fbcon_clear_margins(struct vc_data *vc, int bottom_only); -static void fbcon_cursor(struct vc_data *vc, int mode); static void fbcon_bmove(struct vc_data *vc, int sy, int sx, int dy, int dx, int height, int width); -static int fbcon_switch(struct vc_data *vc); -static int fbcon_blank(struct vc_data *vc, int blank, int mode_switch); static void fbcon_set_palette(struct vc_data *vc, const unsigned char *table); /* * Internal routines */ -static __inline__ void ywrap_up(struct vc_data *vc, int count); -static __inline__ void ywrap_down(struct vc_data *vc, int count); -static __inline__ void ypan_up(struct vc_data *vc, int count); -static __inline__ void ypan_down(struct vc_data *vc, int count); static void fbcon_bmove_rec(struct vc_data *vc, struct fbcon_display *p, int sy, int sx, int dy, int dx, int height, int width, u_int y_break); static void fbcon_set_disp(struct fb_info *info, struct fb_var_screeninfo *var, @@ -194,8 +179,8 @@ static void fbcon_redraw_move(struct vc_data *vc, struct fbcon_display *p, int line, int count, int dy); static void fbcon_modechanged(struct fb_info *info); static void fbcon_set_all_vcs(struct fb_info *info); -static void fbcon_start(void); static void fbcon_exit(void); + static struct device *fbcon_device; #ifdef CONFIG_FRAMEBUFFER_CONSOLE_ROTATION