USB: sisusbvga: remove console support
Subsystems (5)
Jiri Slaby (SUSE)
maintainerPATCH 2/3 USB: sisusbvga: rename sisusb.c to sisusbvga.c
In reply to Jiri Slaby (SUSE)As it's the only source for the sisusbvga module, there is no need for a 2-steps build.
---
drivers/usb/misc/sisusbvga/Makefile | 2 --
drivers/usb/misc/sisusbvga/{sisusb.c => sisusbvga.c} | 0
2 files changed, 2 deletions(-)
rename drivers/usb/misc/sisusbvga/{sisusb.c => sisusbvga.c} (100%)drivers/usb/misc/sisusbvga/Makefile +0 -2
@@ -4,5 +4,3 @@ # obj-$(CONFIG_USB_SISUSBVGA) += sisusbvga.o - -sisusbvga-y := sisusb.o
drivers/usb/misc/sisusbvga/sisusbvga.c renamed from drivers/usb/misc/sisusbvga/sisusb.c +0 -0
Signature · 1 line
2.38.1
Jiri Slaby (SUSE)
maintainerPATCH 1/3 USB: sisusbvga: remove console support
It was marked as BROKEN since commit 862ee699fefe (USB: sisusbvga: Make console support depend on BROKEN) 2 years ago. Since noone stepped up to fix it, remove it completely.
--- arch/powerpc/configs/ppc6xx_defconfig | 1 - arch/sh/configs/landisk_defconfig | 1 - drivers/usb/misc/sisusbvga/Kconfig | 34 - drivers/usb/misc/sisusbvga/Makefile | 1 - drivers/usb/misc/sisusbvga/sisusb.c | 276 +--- drivers/usb/misc/sisusbvga/sisusb.h | 21 - drivers/usb/misc/sisusbvga/sisusb_con.c | 1496 ---------------------- drivers/usb/misc/sisusbvga/sisusb_init.c | 955 -------------- drivers/usb/misc/sisusbvga/sisusb_init.h | 180 --- 9 files changed, 6 insertions(+), 2959 deletions(-) delete mode 100644 drivers/usb/misc/sisusbvga/sisusb_con.c delete mode 100644 drivers/usb/misc/sisusbvga/sisusb_init.c delete mode 100644 drivers/usb/misc/sisusbvga/sisusb_init.h
arch/powerpc/configs/ppc6xx_defconfig +0 -1
@@ -911,7 +911,6 @@ CONFIG_USB_IDMOUSE=m CONFIG_USB_FTDI_ELAN=m CONFIG_USB_APPLEDISPLAY=m CONFIG_USB_SISUSBVGA=m -CONFIG_USB_SISUSBVGA_CON=y CONFIG_USB_LD=m CONFIG_USB_TRANCEVIBRATOR=m CONFIG_USB_IOWARRIOR=m
arch/sh/configs/landisk_defconfig +0 -1
@@ -92,7 +92,6 @@ CONFIG_USB_SERIAL_PL2303=m CONFIG_USB_EMI62=m CONFIG_USB_EMI26=m CONFIG_USB_SISUSBVGA=m -CONFIG_USB_SISUSBVGA_CON=y CONFIG_EXT2_FS=y CONFIG_EXT3_FS=y # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
drivers/usb/misc/sisusbvga/Kconfig +0 -34
@@ -3,7 +3,6 @@ config USB_SISUSBVGA tristate "USB 2.0 SVGA dongle support (Net2280/SiS315)" depends on (USB_MUSB_HDRC || USB_EHCI_HCD) - select FONT_SUPPORT if USB_SISUSBVGA_CON help Say Y here if you intend to attach a USB2VGA dongle based on a Net2280 and a SiS315 chip.
@@ -13,36 +12,3 @@ config USB_SISUSBVGA To compile this driver as a module, choose M here; the module will be called sisusbvga. If unsure, say N. - -config USB_SISUSBVGA_CON - bool "Text console and mode switching support" if USB_SISUSBVGA - depends on VT && BROKEN - select FONT_8x16 - help - Say Y here if you want a VGA text console via the USB dongle or - want to support userland applications that utilize the driver's - display mode switching capabilities. - - Note that this console supports VGA/EGA text mode only. - - By default, the console part of the driver will not kick in when - the driver is initialized. If you want the driver to take over - one or more of the consoles, you need to specify the number of - the first and last consoles (starting at 1) as driver parameters. - - For example, if the driver is compiled as a module: - - modprobe sisusbvga first=1 last=5 - - If you use hotplug, add this to your modutils config files with - the "options" keyword, such as eg. - - options sisusbvga first=1 last=5 - - If the driver is compiled into the kernel image, the parameters - must be given in the kernel command like, such as - - sisusbvga.first=1 sisusbvga.last=5 - - -
drivers/usb/misc/sisusbvga/Makefile +0 -1
@@ -6,4 +6,3 @@ obj-$(CONFIG_USB_SISUSBVGA) += sisusbvga.o sisusbvga-y := sisusb.o -sisusbvga-$(CONFIG_USB_SISUSBVGA_CON) += sisusb_con.o sisusb_init.o
drivers/usb/misc/sisusbvga/sisusb.c +6 -270
384 lines not on this page · raw message
drivers/usb/misc/sisusbvga/sisusb.h +0 -21
@@ -48,7 +48,6 @@/* Include console and mode switching code? */ -#include <linux/console.h> #include <linux/vt_kern.h> #include "sisusb_struct.h"
@@ -126,26 +125,6 @@ struct sisusb_usb_data {unsigned char gfxinit;/* graphics core initialized? */ unsigned short chipid, chipvendor;unsigned short chiprevision; -#ifdef CONFIG_USB_SISUSBVGA_CON -struct SiS_Private *SiS_Pr; -unsigned long scrbuf; -unsigned int scrbuf_size; -int haveconsole, con_first, con_last; -int havethisconsole[MAX_NR_CONSOLES ]; -int textmodedestroyed; -unsigned int sisusb_num_columns;/* real number, not vt's idea */ -int cur_start_addr, con_rolled_over; -int sisusb_cursor_loc, bad_cursor_pos; -int sisusb_cursor_size_from; -int sisusb_cursor_size_to; -int current_font_height, current_font_512; -int font_backup_size, font_backup_height, font_backup_512; -char *font_backup; -int font_slot; -struct vc_data *sisusb_display_fg; -int is_gfx; -int con_blanked; -#endif };#define to_sisusb_dev (d) container_of(d, struct sisusb_usb_data, kref)
drivers/usb/misc/sisusbvga/sisusb_con.c deleted +0 -1496
1,496 lines not on this page · raw message
drivers/usb/misc/sisusbvga/sisusb_init.c deleted +0 -955
955 lines not on this page · raw message
drivers/usb/misc/sisusbvga/sisusb_init.h deleted +0 -180
71 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.38.1
Part of the diff is not shown here. View the raw message.
Jiri Slaby (SUSE)
maintainerPATCH 3/3 USB: sisusbvga: use module_usb_driver()
Now, that we only do usb_register() and usb_sisusb_exit() in module_init() and module_exit() respectivelly, we can simply use module_usb_driver().
--- drivers/usb/misc/sisusbvga/sisusbvga.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-)
drivers/usb/misc/sisusbvga/sisusbvga.c +1 -12
@@ -2947,18 +2947,7 @@ static struct usb_driver sisusb_driver = { .id_table = sisusb_table, }; -static int __init usb_sisusb_init (void ) -{ -return usb_register (&sisusb_driver); -} - -static void __exit usb_sisusb_exit(void) -{ -usb_deregister (&sisusb_driver); -} - -module_init (usb_sisusb_init); -module_exit (usb_sisusb_exit); +module_usb_driver (sisusb_driver);MODULE_AUTHOR ("Thomas Winischhofer <[email protected]>" );MODULE_DESCRIPTION ("sisusbvga - Driver for Net2280/SiS315-based USB2VGA dongles" );
Signature · 1 line
2.38.1