| Message ID | 20230712085942.5064-2-jirislaby@kernel.org (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Headers | show |
| Series | [1/7] vgacon: switch vgacon_scrolldelta() and vgacon_restore_screen() | expand |
On 7/12/23 10:59, Jiri Slaby (SUSE) wrote: > Switch vgacon_scrolldelta() and vgacon_restore_screen() positions, so > that the former is not needed to be forward-declared. > > Signed-off-by: Jiri Slaby (SUSE) <jirislaby@kernel.org> > Cc: Helge Deller <deller@gmx.de> > Cc: linux-fbdev@vger.kernel.org > Cc: dri-devel@lists.freedesktop.org Thanks Jiri ! I've applied this series to the fbdev git tree. Helge > --- > drivers/video/console/vgacon.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/drivers/video/console/vgacon.c b/drivers/video/console/vgacon.c > index e25ba523892e..fbed2862c317 100644 > --- a/drivers/video/console/vgacon.c > +++ b/drivers/video/console/vgacon.c > @@ -142,12 +142,6 @@ static inline void vga_set_mem_top(struct vc_data *c) > write_vga(12, (c->vc_visible_origin - vga_vram_base) / 2); > } > > -static void vgacon_restore_screen(struct vc_data *c) > -{ > - if (c->vc_origin != c->vc_visible_origin) > - vgacon_scrolldelta(c, 0); > -} > - > static void vgacon_scrolldelta(struct vc_data *c, int lines) > { > vc_scrolldelta_helper(c, lines, vga_rolled_over, (void *)vga_vram_base, > @@ -155,6 +149,12 @@ static void vgacon_scrolldelta(struct vc_data *c, int lines) > vga_set_mem_top(c); > } > > +static void vgacon_restore_screen(struct vc_data *c) > +{ > + if (c->vc_origin != c->vc_visible_origin) > + vgacon_scrolldelta(c, 0); > +} > + > static const char *vgacon_startup(void) > { > const char *display_desc = NULL;
diff --git a/drivers/video/console/vgacon.c b/drivers/video/console/vgacon.c index e25ba523892e..fbed2862c317 100644 --- a/drivers/video/console/vgacon.c +++ b/drivers/video/console/vgacon.c @@ -142,12 +142,6 @@ static inline void vga_set_mem_top(struct vc_data *c) write_vga(12, (c->vc_visible_origin - vga_vram_base) / 2); } -static void vgacon_restore_screen(struct vc_data *c) -{ - if (c->vc_origin != c->vc_visible_origin) - vgacon_scrolldelta(c, 0); -} - static void vgacon_scrolldelta(struct vc_data *c, int lines) { vc_scrolldelta_helper(c, lines, vga_rolled_over, (void *)vga_vram_base, @@ -155,6 +149,12 @@ static void vgacon_scrolldelta(struct vc_data *c, int lines) vga_set_mem_top(c); } +static void vgacon_restore_screen(struct vc_data *c) +{ + if (c->vc_origin != c->vc_visible_origin) + vgacon_scrolldelta(c, 0); +} + static const char *vgacon_startup(void) { const char *display_desc = NULL;
Switch vgacon_scrolldelta() and vgacon_restore_screen() positions, so that the former is not needed to be forward-declared. Signed-off-by: Jiri Slaby (SUSE) <jirislaby@kernel.org> Cc: Helge Deller <deller@gmx.de> Cc: linux-fbdev@vger.kernel.org Cc: dri-devel@lists.freedesktop.org --- drivers/video/console/vgacon.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)