aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial/empeg.c
diff options
context:
space:
mode:
authorAlan Cox <alan@linux.intel.com>2009-09-19 16:13:26 -0400
committerLive-CD User <linux@linux.site>2009-09-19 16:13:26 -0400
commita509a7e478e4766114d69f12d19d644ac63e9765 (patch)
tree2b994dabb7b97ceadac959f51d29ddf68216cb59 /drivers/usb/serial/empeg.c
parentd3b5cffcf84a8bdc7073dce4745d67c72629af85 (diff)
tty: USB does not need the filp argument in the drivers
And indeed none of them use it. Clean this up as it will make moving to a standard open method rather easier. Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/serial/empeg.c')
-rw-r--r--drivers/usb/serial/empeg.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/usb/serial/empeg.c b/drivers/usb/serial/empeg.c
index 80cb3471adbe..da559a773b51 100644
--- a/drivers/usb/serial/empeg.c
+++ b/drivers/usb/serial/empeg.c
@@ -79,8 +79,7 @@ static int debug;
79#define EMPEG_PRODUCT_ID 0x0001 79#define EMPEG_PRODUCT_ID 0x0001
80 80
81/* function prototypes for an empeg-car player */ 81/* function prototypes for an empeg-car player */
82static int empeg_open(struct tty_struct *tty, struct usb_serial_port *port, 82static int empeg_open(struct tty_struct *tty, struct usb_serial_port *port);
83 struct file *filp);
84static void empeg_close(struct usb_serial_port *port); 83static void empeg_close(struct usb_serial_port *port);
85static int empeg_write(struct tty_struct *tty, struct usb_serial_port *port, 84static int empeg_write(struct tty_struct *tty, struct usb_serial_port *port,
86 const unsigned char *buf, 85 const unsigned char *buf,
@@ -142,8 +141,7 @@ static int bytes_out;
142/****************************************************************************** 141/******************************************************************************
143 * Empeg specific driver functions 142 * Empeg specific driver functions
144 ******************************************************************************/ 143 ******************************************************************************/
145static int empeg_open(struct tty_struct *tty, struct usb_serial_port *port, 144static int empeg_open(struct tty_struct *tty,struct usb_serial_port *port)
146 struct file *filp)
147{ 145{
148 struct usb_serial *serial = port->serial; 146 struct usb_serial *serial = port->serial;
149 int result = 0; 147 int result = 0;
@@ -151,7 +149,7 @@ static int empeg_open(struct tty_struct *tty, struct usb_serial_port *port,
151 dbg("%s - port %d", __func__, port->number); 149 dbg("%s - port %d", __func__, port->number);
152 150
153 /* Force default termio settings */ 151 /* Force default termio settings */
154 empeg_set_termios(tty, port, NULL) ; 152 empeg_set_termios(tty, port, NULL);
155 153
156 bytes_in = 0; 154 bytes_in = 0;
157 bytes_out = 0; 155 bytes_out = 0;