summaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial/empeg.c
diff options
context:
space:
mode:
authorAlan Cox <alan@linux.intel.com>2009-09-19 22:13:26 +0200
committerLive-CD User <linux@linux.site>2009-09-19 22:13:26 +0200
commita509a7e478e4766114d69f12d19d644ac63e9765 (patch)
tree2b994dabb7b97ceadac959f51d29ddf68216cb59 /drivers/usb/serial/empeg.c
parentvt: add an activate and lock (diff)
downloadlinux-a509a7e478e4766114d69f12d19d644ac63e9765.tar.xz
linux-a509a7e478e4766114d69f12d19d644ac63e9765.zip
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;
#define EMPEG_PRODUCT_ID 0x0001
/* function prototypes for an empeg-car player */
-static int empeg_open(struct tty_struct *tty, struct usb_serial_port *port,
- struct file *filp);
+static int empeg_open(struct tty_struct *tty, struct usb_serial_port *port);
static void empeg_close(struct usb_serial_port *port);
static int empeg_write(struct tty_struct *tty, struct usb_serial_port *port,
const unsigned char *buf,
@@ -142,8 +141,7 @@ static int bytes_out;
/******************************************************************************
* Empeg specific driver functions
******************************************************************************/
-static int empeg_open(struct tty_struct *tty, struct usb_serial_port *port,
- struct file *filp)
+static int empeg_open(struct tty_struct *tty,struct usb_serial_port *port)
{
struct usb_serial *serial = port->serial;
int result = 0;
@@ -151,7 +149,7 @@ static int empeg_open(struct tty_struct *tty, struct usb_serial_port *port,
dbg("%s - port %d", __func__, port->number);
/* Force default termio settings */
- empeg_set_termios(tty, port, NULL) ;
+ empeg_set_termios(tty, port, NULL);
bytes_in = 0;
bytes_out = 0;