Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

tty: vt, remove consw->con_bmove

It is never called since commit 81732c3b2fede (tty vt: Fix line
garbage in virtual console on command line edition) in 3.7. So remove
all the callbacks.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Cc: Thomas Winischhofer <thomas@winischhofer.net>
Cc: linux-usb@vger.kernel.org
Cc: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: "James E.J. Bottomley" <jejb@parisc-linux.org>
Cc: Helge Deller <deller@gmx.de>
Cc: linux-fbdev@vger.kernel.org
Cc: linux-parisc@vger.kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Jiri Slaby and committed by
Greg Kroah-Hartman
52ad1f38 709280da

-118
-35
drivers/usb/misc/sisusbvga/sisusb_con.c
··· 477 477 mutex_unlock(&sisusb->lock); 478 478 } 479 479 480 - /* Interface routine */ 481 - static void 482 - sisusbcon_bmove(struct vc_data *c, int sy, int sx, 483 - int dy, int dx, int height, int width) 484 - { 485 - struct sisusb_usb_data *sisusb; 486 - int cols, length; 487 - 488 - if (width <= 0 || height <= 0) 489 - return; 490 - 491 - sisusb = sisusb_get_sisusb_lock_and_check(c->vc_num); 492 - if (!sisusb) 493 - return; 494 - 495 - /* sisusb->lock is down */ 496 - 497 - cols = sisusb->sisusb_num_columns; 498 - 499 - if (sisusb_is_inactive(c, sisusb)) { 500 - mutex_unlock(&sisusb->lock); 501 - return; 502 - } 503 - 504 - length = ((height * cols) - dx - (cols - width - dx)) * 2; 505 - 506 - 507 - sisusb_copy_memory(sisusb, (unsigned char *)SISUSB_VADDR(dx, dy), 508 - (long)SISUSB_HADDR(dx, dy), length); 509 - 510 - mutex_unlock(&sisusb->lock); 511 - } 512 - 513 480 /* interface routine */ 514 481 static int 515 482 sisusbcon_switch(struct vc_data *c) ··· 1338 1371 .con_putcs = sisusbcon_putcs, 1339 1372 .con_cursor = sisusbcon_cursor, 1340 1373 .con_scroll = sisusbcon_scroll, 1341 - .con_bmove = sisusbcon_bmove, 1342 1374 .con_switch = sisusbcon_switch, 1343 1375 .con_blank = sisusbcon_blank, 1344 1376 .con_font_set = sisusbcon_font_set, ··· 1385 1419 .con_putcs = SISUSBCONDUMMY, 1386 1420 .con_cursor = SISUSBCONDUMMY, 1387 1421 .con_scroll = SISUSBCONDUMMY, 1388 - .con_bmove = SISUSBCONDUMMY, 1389 1422 .con_switch = SISUSBCONDUMMY, 1390 1423 .con_blank = SISUSBCONDUMMY, 1391 1424 .con_font_set = SISUSBCONDUMMY,
-1
drivers/video/console/dummycon.c
··· 64 64 .con_putcs = DUMMY, 65 65 .con_cursor = DUMMY, 66 66 .con_scroll = DUMMY, 67 - .con_bmove = DUMMY, 68 67 .con_switch = DUMMY, 69 68 .con_blank = DUMMY, 70 69 .con_font_set = DUMMY,
-1
drivers/video/console/fbcon.c
··· 3334 3334 .con_putcs = fbcon_putcs, 3335 3335 .con_cursor = fbcon_cursor, 3336 3336 .con_scroll = fbcon_scroll, 3337 - .con_bmove = fbcon_bmove, 3338 3337 .con_switch = fbcon_switch, 3339 3338 .con_blank = fbcon_blank, 3340 3339 .con_font_set = fbcon_set_font,
-33
drivers/video/console/mdacon.c
··· 444 444 } 445 445 } 446 446 447 - static void mdacon_bmove(struct vc_data *c, int sy, int sx, 448 - int dy, int dx, int height, int width) 449 - { 450 - u16 *src, *dest; 451 - 452 - if (width <= 0 || height <= 0) 453 - return; 454 - 455 - if (sx==0 && dx==0 && width==mda_num_columns) { 456 - scr_memmovew(MDA_ADDR(0,dy), MDA_ADDR(0,sy), height*width*2); 457 - 458 - } else if (dy < sy || (dy == sy && dx < sx)) { 459 - src = MDA_ADDR(sx, sy); 460 - dest = MDA_ADDR(dx, dy); 461 - 462 - for (; height > 0; height--) { 463 - scr_memmovew(dest, src, width*2); 464 - src += mda_num_columns; 465 - dest += mda_num_columns; 466 - } 467 - } else { 468 - src = MDA_ADDR(sx, sy+height-1); 469 - dest = MDA_ADDR(dx, dy+height-1); 470 - 471 - for (; height > 0; height--) { 472 - scr_memmovew(dest, src, width*2); 473 - src -= mda_num_columns; 474 - dest -= mda_num_columns; 475 - } 476 - } 477 - } 478 - 479 447 static int mdacon_switch(struct vc_data *c) 480 448 { 481 449 return 1; /* redrawing needed */ ··· 532 564 .con_putcs = mdacon_putcs, 533 565 .con_cursor = mdacon_cursor, 534 566 .con_scroll = mdacon_scroll, 535 - .con_bmove = mdacon_bmove, 536 567 .con_switch = mdacon_switch, 537 568 .con_blank = mdacon_blank, 538 569 .con_build_attr = mdacon_build_attr,
-29
drivers/video/console/newport_con.c
··· 673 673 return 1; 674 674 } 675 675 676 - static void newport_bmove(struct vc_data *vc, int sy, int sx, int dy, 677 - int dx, int h, int w) 678 - { 679 - short xs, ys, xe, ye, xoffs, yoffs; 680 - 681 - xs = sx << 3; 682 - xe = ((sx + w) << 3) - 1; 683 - /* 684 - * as bmove is only used to move stuff around in the same line 685 - * (h == 1), we don't care about wrap arounds caused by topscan != 0 686 - */ 687 - ys = ((sy << 4) + topscan) & 0x3ff; 688 - ye = (((sy + h) << 4) - 1 + topscan) & 0x3ff; 689 - xoffs = (dx - sx) << 3; 690 - yoffs = (dy - sy) << 4; 691 - if (xoffs > 0) { 692 - /* move to the right, exchange starting points */ 693 - swap(xe, xs); 694 - } 695 - newport_wait(npregs); 696 - npregs->set.drawmode0 = (NPORT_DMODE0_S2S | NPORT_DMODE0_BLOCK | 697 - NPORT_DMODE0_DOSETUP | NPORT_DMODE0_STOPX 698 - | NPORT_DMODE0_STOPY); 699 - npregs->set.xystarti = (xs << 16) | ys; 700 - npregs->set.xyendi = (xe << 16) | ye; 701 - npregs->go.xymove = (xoffs << 16) | yoffs; 702 - } 703 - 704 676 static int newport_dummy(struct vc_data *c) 705 677 { 706 678 return 0; ··· 690 718 .con_putcs = newport_putcs, 691 719 .con_cursor = newport_cursor, 692 720 .con_scroll = newport_scroll, 693 - .con_bmove = newport_bmove, 694 721 .con_switch = newport_switch, 695 722 .con_blank = newport_blank, 696 723 .con_font_set = newport_font_set,
-17
drivers/video/console/sticon.c
··· 177 177 return 0; 178 178 } 179 179 180 - static void sticon_bmove(struct vc_data *conp, int sy, int sx, 181 - int dy, int dx, int height, int width) 182 - { 183 - if (!width || !height) 184 - return; 185 - #if 0 186 - if (((sy <= p->cursor_y) && (p->cursor_y < sy+height) && 187 - (sx <= p->cursor_x) && (p->cursor_x < sx+width)) || 188 - ((dy <= p->cursor_y) && (p->cursor_y < dy+height) && 189 - (dx <= p->cursor_x) && (p->cursor_x < dx+width))) 190 - sticon_cursor(p, CM_ERASE /*|CM_SOFTBACK*/); 191 - #endif 192 - 193 - sti_bmove(sticon_sti, sy, sx, dy, dx, height, width); 194 - } 195 - 196 180 static void sticon_init(struct vc_data *c, int init) 197 181 { 198 182 struct sti_struct *sti = sticon_sti; ··· 329 345 .con_putcs = sticon_putcs, 330 346 .con_cursor = sticon_cursor, 331 347 .con_scroll = sticon_scroll, 332 - .con_bmove = sticon_bmove, 333 348 .con_switch = sticon_switch, 334 349 .con_blank = sticon_blank, 335 350 .con_set_origin = sticon_set_origin,
-1
drivers/video/console/vgacon.c
··· 1421 1421 .con_putcs = DUMMY, 1422 1422 .con_cursor = vgacon_cursor, 1423 1423 .con_scroll = vgacon_scroll, 1424 - .con_bmove = DUMMY, 1425 1424 .con_switch = vgacon_switch, 1426 1425 .con_blank = vgacon_blank, 1427 1426 .con_font_set = vgacon_font_set,
-1
include/linux/console.h
··· 45 45 void (*con_putcs)(struct vc_data *, const unsigned short *, int, int, int); 46 46 void (*con_cursor)(struct vc_data *, int); 47 47 int (*con_scroll)(struct vc_data *, int, int, int, int); 48 - void (*con_bmove)(struct vc_data *, int, int, int, int, int, int); 49 48 int (*con_switch)(struct vc_data *); 50 49 int (*con_blank)(struct vc_data *, int, int); 51 50 int (*con_font_set)(struct vc_data *, struct console_font *, unsigned);