diff options
Diffstat (limited to 'drivers/usb/serial/ipaq.c')
-rw-r--r-- | drivers/usb/serial/ipaq.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/drivers/usb/serial/ipaq.c b/drivers/usb/serial/ipaq.c index cd62825a9ac3..2545d45ce16f 100644 --- a/drivers/usb/serial/ipaq.c +++ b/drivers/usb/serial/ipaq.c | |||
@@ -76,11 +76,9 @@ static int initial_wait; | |||
76 | /* Function prototypes for an ipaq */ | 76 | /* Function prototypes for an ipaq */ |
77 | static int ipaq_open(struct tty_struct *tty, | 77 | static int ipaq_open(struct tty_struct *tty, |
78 | struct usb_serial_port *port, struct file *filp); | 78 | struct usb_serial_port *port, struct file *filp); |
79 | static void ipaq_close(struct tty_struct *tty, | 79 | static void ipaq_close(struct usb_serial_port *port); |
80 | struct usb_serial_port *port, struct file *filp); | ||
81 | static int ipaq_calc_num_ports(struct usb_serial *serial); | 80 | static int ipaq_calc_num_ports(struct usb_serial *serial); |
82 | static int ipaq_startup(struct usb_serial *serial); | 81 | static int ipaq_startup(struct usb_serial *serial); |
83 | static void ipaq_shutdown(struct usb_serial *serial); | ||
84 | static int ipaq_write(struct tty_struct *tty, struct usb_serial_port *port, | 82 | static int ipaq_write(struct tty_struct *tty, struct usb_serial_port *port, |
85 | const unsigned char *buf, int count); | 83 | const unsigned char *buf, int count); |
86 | static int ipaq_write_bulk(struct usb_serial_port *port, | 84 | static int ipaq_write_bulk(struct usb_serial_port *port, |
@@ -577,7 +575,6 @@ static struct usb_serial_driver ipaq_device = { | |||
577 | .close = ipaq_close, | 575 | .close = ipaq_close, |
578 | .attach = ipaq_startup, | 576 | .attach = ipaq_startup, |
579 | .calc_num_ports = ipaq_calc_num_ports, | 577 | .calc_num_ports = ipaq_calc_num_ports, |
580 | .shutdown = ipaq_shutdown, | ||
581 | .write = ipaq_write, | 578 | .write = ipaq_write, |
582 | .write_room = ipaq_write_room, | 579 | .write_room = ipaq_write_room, |
583 | .chars_in_buffer = ipaq_chars_in_buffer, | 580 | .chars_in_buffer = ipaq_chars_in_buffer, |
@@ -714,8 +711,7 @@ error: | |||
714 | } | 711 | } |
715 | 712 | ||
716 | 713 | ||
717 | static void ipaq_close(struct tty_struct *tty, | 714 | static void ipaq_close(struct usb_serial_port *port) |
718 | struct usb_serial_port *port, struct file *filp) | ||
719 | { | 715 | { |
720 | struct ipaq_private *priv = usb_get_serial_port_data(port); | 716 | struct ipaq_private *priv = usb_get_serial_port_data(port); |
721 | 717 | ||
@@ -992,11 +988,6 @@ static int ipaq_startup(struct usb_serial *serial) | |||
992 | return usb_reset_configuration(serial->dev); | 988 | return usb_reset_configuration(serial->dev); |
993 | } | 989 | } |
994 | 990 | ||
995 | static void ipaq_shutdown(struct usb_serial *serial) | ||
996 | { | ||
997 | dbg("%s", __func__); | ||
998 | } | ||
999 | |||
1000 | static int __init ipaq_init(void) | 991 | static int __init ipaq_init(void) |
1001 | { | 992 | { |
1002 | int retval; | 993 | int retval; |