Skip to content

Commit c900dc6

Browse files
Jiri Slaby (SUSE)hdeller
authored andcommitted
vgacon: remove unused xpos from vgacon_set_cursor_size()
xpos is unused, remove it. 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 Signed-off-by: Helge Deller <deller@gmx.de>
1 parent 6ceed69 commit c900dc6

1 file changed

Lines changed: 10 additions & 15 deletions

File tree

drivers/video/console/vgacon.c

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,7 @@ static void vgacon_invert_region(struct vc_data *c, u16 * p, int count)
437437
}
438438
}
439439

440-
static void vgacon_set_cursor_size(int xpos, int from, int to)
440+
static void vgacon_set_cursor_size(int from, int to)
441441
{
442442
unsigned long flags;
443443
int curs, cure;
@@ -479,54 +479,49 @@ static void vgacon_cursor(struct vc_data *c, int mode)
479479
case CM_ERASE:
480480
write_vga(14, (c->vc_pos - vga_vram_base) / 2);
481481
if (vga_video_type >= VIDEO_TYPE_VGAC)
482-
vgacon_set_cursor_size(c->state.x, 31, 30);
482+
vgacon_set_cursor_size(31, 30);
483483
else
484-
vgacon_set_cursor_size(c->state.x, 31, 31);
484+
vgacon_set_cursor_size(31, 31);
485485
break;
486486

487487
case CM_MOVE:
488488
case CM_DRAW:
489489
write_vga(14, (c->vc_pos - vga_vram_base) / 2);
490490
switch (CUR_SIZE(c->vc_cursor_type)) {
491491
case CUR_UNDERLINE:
492-
vgacon_set_cursor_size(c->state.x,
493-
c->vc_cell_height -
492+
vgacon_set_cursor_size(c->vc_cell_height -
494493
(c->vc_cell_height <
495494
10 ? 2 : 3),
496495
c->vc_cell_height -
497496
(c->vc_cell_height <
498497
10 ? 1 : 2));
499498
break;
500499
case CUR_TWO_THIRDS:
501-
vgacon_set_cursor_size(c->state.x,
502-
c->vc_cell_height / 3,
500+
vgacon_set_cursor_size(c->vc_cell_height / 3,
503501
c->vc_cell_height -
504502
(c->vc_cell_height <
505503
10 ? 1 : 2));
506504
break;
507505
case CUR_LOWER_THIRD:
508-
vgacon_set_cursor_size(c->state.x,
509-
(c->vc_cell_height * 2) / 3,
506+
vgacon_set_cursor_size((c->vc_cell_height * 2) / 3,
510507
c->vc_cell_height -
511508
(c->vc_cell_height <
512509
10 ? 1 : 2));
513510
break;
514511
case CUR_LOWER_HALF:
515-
vgacon_set_cursor_size(c->state.x,
516-
c->vc_cell_height / 2,
512+
vgacon_set_cursor_size(c->vc_cell_height / 2,
517513
c->vc_cell_height -
518514
(c->vc_cell_height <
519515
10 ? 1 : 2));
520516
break;
521517
case CUR_NONE:
522518
if (vga_video_type >= VIDEO_TYPE_VGAC)
523-
vgacon_set_cursor_size(c->state.x, 31, 30);
519+
vgacon_set_cursor_size(31, 30);
524520
else
525-
vgacon_set_cursor_size(c->state.x, 31, 31);
521+
vgacon_set_cursor_size(31, 31);
526522
break;
527523
default:
528-
vgacon_set_cursor_size(c->state.x, 1,
529-
c->vc_cell_height);
524+
vgacon_set_cursor_size(1, c->vc_cell_height);
530525
break;
531526
}
532527
break;

0 commit comments

Comments
 (0)