Commit a8619505 authored by Johan Hovold's avatar Johan Hovold
Browse files

USB: serial: ftdi_sio: move driver structure 



Move the definition of the USB serial driver structure to the end of the
file where it is used and drop the now redundant forward declarations.

Reviewed-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
parent c142bdc5

drivers/usb/serial/ftdi_sio.c

+35 −66
Original line number Diff line number Diff line
@@ -1108,77 +1108,11 @@ static const char *ftdi_chip_name[] = { 
#define FTDI_STATUS_B1_MASK	(FTDI_RS_BI)

/* End TIOCMIWAIT */



/* function prototypes for a FTDI serial converter */

static int  ftdi_sio_probe(struct usb_serial *serial,

					const struct usb_device_id *id);

static int  ftdi_sio_port_probe(struct usb_serial_port *port);

static void ftdi_sio_port_remove(struct usb_serial_port *port);

static int  ftdi_open(struct tty_struct *tty, struct usb_serial_port *port);

static void ftdi_dtr_rts(struct usb_serial_port *port, int on);

static void ftdi_process_read_urb(struct urb *urb);

static int ftdi_prepare_write_buffer(struct usb_serial_port *port,

						void *dest, size_t size);

static void ftdi_set_termios(struct tty_struct *tty,

			struct usb_serial_port *port, struct ktermios *old);

static int  ftdi_tiocmget(struct tty_struct *tty);

static int  ftdi_tiocmset(struct tty_struct *tty,

			unsigned int set, unsigned int clear);

static int  ftdi_ioctl(struct tty_struct *tty,

			unsigned int cmd, unsigned long arg);

static void get_serial_info(struct tty_struct *tty, struct serial_struct *ss);

static int set_serial_info(struct tty_struct *tty,

				struct serial_struct *ss);

static void ftdi_break_ctl(struct tty_struct *tty, int break_state);

static bool ftdi_tx_empty(struct usb_serial_port *port);

static int ftdi_get_modem_status(struct usb_serial_port *port,

						unsigned char status[2]);



static unsigned short int ftdi_232am_baud_base_to_divisor(int baud, int base);

static unsigned short int ftdi_232am_baud_to_divisor(int baud);

static u32 ftdi_232bm_baud_base_to_divisor(int baud, int base);

static u32 ftdi_232bm_baud_to_divisor(int baud);

static u32 ftdi_2232h_baud_base_to_divisor(int baud, int base);

static u32 ftdi_2232h_baud_to_divisor(int baud);



static const struct attribute_group *ftdi_groups[];



static struct usb_serial_driver ftdi_sio_device = {

	.driver = {

		.owner =	THIS_MODULE,

		.name =		"ftdi_sio",

		.dev_groups =	ftdi_groups,

	},

	.description =		"FTDI USB Serial Device",

	.id_table =		id_table_combined,

	.num_ports =		1,

	.bulk_in_size =		512,

	.bulk_out_size =	256,

	.probe =		ftdi_sio_probe,

	.port_probe =		ftdi_sio_port_probe,

	.port_remove =		ftdi_sio_port_remove,

	.open =			ftdi_open,

	.dtr_rts =		ftdi_dtr_rts,

	.throttle =		usb_serial_generic_throttle,

	.unthrottle =		usb_serial_generic_unthrottle,

	.process_read_urb =	ftdi_process_read_urb,

	.prepare_write_buffer =	ftdi_prepare_write_buffer,

	.tiocmget =		ftdi_tiocmget,

	.tiocmset =		ftdi_tiocmset,

	.tiocmiwait =		usb_serial_generic_tiocmiwait,

	.get_icount =           usb_serial_generic_get_icount,

	.ioctl =		ftdi_ioctl,

	.get_serial =		get_serial_info,

	.set_serial =		set_serial_info,

	.set_termios =		ftdi_set_termios,

	.break_ctl =		ftdi_break_ctl,

	.tx_empty =		ftdi_tx_empty,

};



static struct usb_serial_driver * const serial_drivers[] = {

	&ftdi_sio_device, NULL

};





#define WDR_TIMEOUT 5000 /* default urb timeout */

#define WDR_SHORT_TIMEOUT 1000	/* shorter urb timeout */
@@ -2931,6 +2865,41 @@ static int ftdi_ioctl(struct tty_struct *tty, 
	return -ENOIOCTLCMD;

}



static struct usb_serial_driver ftdi_sio_device = {

	.driver = {

		.owner =	THIS_MODULE,

		.name =		"ftdi_sio",

		.dev_groups =	ftdi_groups,

	},

	.description =		"FTDI USB Serial Device",

	.id_table =		id_table_combined,

	.num_ports =		1,

	.bulk_in_size =		512,

	.bulk_out_size =	256,

	.probe =		ftdi_sio_probe,

	.port_probe =		ftdi_sio_port_probe,

	.port_remove =		ftdi_sio_port_remove,

	.open =			ftdi_open,

	.dtr_rts =		ftdi_dtr_rts,

	.throttle =		usb_serial_generic_throttle,

	.unthrottle =		usb_serial_generic_unthrottle,

	.process_read_urb =	ftdi_process_read_urb,

	.prepare_write_buffer =	ftdi_prepare_write_buffer,

	.tiocmget =		ftdi_tiocmget,

	.tiocmset =		ftdi_tiocmset,

	.tiocmiwait =		usb_serial_generic_tiocmiwait,

	.get_icount =		usb_serial_generic_get_icount,

	.ioctl =		ftdi_ioctl,

	.get_serial =		get_serial_info,

	.set_serial =		set_serial_info,

	.set_termios =		ftdi_set_termios,

	.break_ctl =		ftdi_break_ctl,

	.tx_empty =		ftdi_tx_empty,

};



static struct usb_serial_driver * const serial_drivers[] = {

	&ftdi_sio_device, NULL

};

module_usb_serial_driver(serial_drivers, id_table_combined);



MODULE_AUTHOR(DRIVER_AUTHOR);