Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 235539
b: refs/heads/master
c: 00a0d0d
h: refs/heads/master
i:
  235537: ef19382
  235535: 5348a26
v: v3
  • Loading branch information
Alan Cox authored and Greg Kroah-Hartman committed Feb 17, 2011
1 parent 0d93b14 commit 5cb4682
Show file tree
Hide file tree
Showing 23 changed files with 30 additions and 31 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 20b9d17715017ae4dd4ec87fabc36d33b9de708e
refs/heads/master: 00a0d0d65b61241a718d0aee96f46b9a2d93bf26
2 changes: 1 addition & 1 deletion trunk/drivers/staging/quatech_usb2/quatech_usb2.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -852,7 +852,7 @@ static int qt2_chars_in_buffer(struct tty_struct *tty)
* TIOCMGET and TIOCMSET are filtered off to their own methods before they get
* here, so we don't have to handle them.
*/
static int qt2_ioctl(struct tty_struct *tty, struct file *file,
static int qt2_ioctl(struct tty_struct *tty,
unsigned int cmd, unsigned long arg)
{
struct usb_serial_port *port = tty->driver_data;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/serqt_usb2/serqt_usb2.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1191,7 +1191,7 @@ static int qt_write_room(struct tty_struct *tty)

}

static int qt_ioctl(struct tty_struct *tty, struct file *file,
static int qt_ioctl(struct tty_struct *tty,
unsigned int cmd, unsigned long arg)
{
struct usb_serial_port *port = tty->driver_data;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/usb/serial/ark3116.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,7 @@ static int ark3116_get_icount(struct tty_struct *tty,
return 0;
}

static int ark3116_ioctl(struct tty_struct *tty, struct file *file,
static int ark3116_ioctl(struct tty_struct *tty,
unsigned int cmd, unsigned long arg)
{
struct usb_serial_port *port = tty->driver_data;
Expand Down
3 changes: 1 addition & 2 deletions trunk/drivers/usb/serial/ch341.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -552,8 +552,7 @@ static int wait_modem_info(struct usb_serial_port *port, unsigned int arg)
return 0;
}

/*static int ch341_ioctl(struct usb_serial_port *port, struct file *file,*/
static int ch341_ioctl(struct tty_struct *tty, struct file *file,
static int ch341_ioctl(struct tty_struct *tty,
unsigned int cmd, unsigned long arg)
{
struct usb_serial_port *port = tty->driver_data;
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/usb/serial/cypress_m8.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ static int cypress_write(struct tty_struct *tty, struct usb_serial_port *port,
const unsigned char *buf, int count);
static void cypress_send(struct usb_serial_port *port);
static int cypress_write_room(struct tty_struct *tty);
static int cypress_ioctl(struct tty_struct *tty, struct file *file,
static int cypress_ioctl(struct tty_struct *tty,
unsigned int cmd, unsigned long arg);
static void cypress_set_termios(struct tty_struct *tty,
struct usb_serial_port *port, struct ktermios *old);
Expand Down Expand Up @@ -917,7 +917,7 @@ static int cypress_tiocmset(struct tty_struct *tty,
}


static int cypress_ioctl(struct tty_struct *tty, struct file *file,
static int cypress_ioctl(struct tty_struct *tty,
unsigned int cmd, unsigned long arg)
{
struct usb_serial_port *port = tty->driver_data;
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/usb/serial/ftdi_sio.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -859,7 +859,7 @@ static void ftdi_set_termios(struct tty_struct *tty,
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, struct file *file,
static int ftdi_ioctl(struct tty_struct *tty,
unsigned int cmd, unsigned long arg);
static void ftdi_break_ctl(struct tty_struct *tty, int break_state);

Expand Down Expand Up @@ -2210,7 +2210,7 @@ static int ftdi_tiocmset(struct tty_struct *tty,
return update_mctrl(port, set, clear);
}

static int ftdi_ioctl(struct tty_struct *tty, struct file *file,
static int ftdi_ioctl(struct tty_struct *tty,
unsigned int cmd, unsigned long arg)
{
struct usb_serial_port *port = tty->driver_data;
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/usb/serial/io_edgeport.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ static void edge_unthrottle(struct tty_struct *tty);
static void edge_set_termios(struct tty_struct *tty,
struct usb_serial_port *port,
struct ktermios *old_termios);
static int edge_ioctl(struct tty_struct *tty, struct file *file,
static int edge_ioctl(struct tty_struct *tty,
unsigned int cmd, unsigned long arg);
static void edge_break(struct tty_struct *tty, int break_state);
static int edge_tiocmget(struct tty_struct *tty);
Expand Down Expand Up @@ -1679,7 +1679,7 @@ static int get_serial_info(struct edgeport_port *edge_port,
* SerialIoctl
* this function handles any ioctl calls to the driver
*****************************************************************************/
static int edge_ioctl(struct tty_struct *tty, struct file *file,
static int edge_ioctl(struct tty_struct *tty,
unsigned int cmd, unsigned long arg)
{
struct usb_serial_port *port = tty->driver_data;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/usb/serial/io_ti.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2552,7 +2552,7 @@ static int get_serial_info(struct edgeport_port *edge_port,
return 0;
}

static int edge_ioctl(struct tty_struct *tty, struct file *file,
static int edge_ioctl(struct tty_struct *tty,
unsigned int cmd, unsigned long arg)
{
struct usb_serial_port *port = tty->driver_data;
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/usb/serial/kobil_sct.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ static void kobil_close(struct usb_serial_port *port);
static int kobil_write(struct tty_struct *tty, struct usb_serial_port *port,
const unsigned char *buf, int count);
static int kobil_write_room(struct tty_struct *tty);
static int kobil_ioctl(struct tty_struct *tty, struct file *file,
static int kobil_ioctl(struct tty_struct *tty,
unsigned int cmd, unsigned long arg);
static int kobil_tiocmget(struct tty_struct *tty);
static int kobil_tiocmset(struct tty_struct *tty,
Expand Down Expand Up @@ -668,7 +668,7 @@ static void kobil_set_termios(struct tty_struct *tty,
);
}

static int kobil_ioctl(struct tty_struct *tty, struct file *file,
static int kobil_ioctl(struct tty_struct *tty,
unsigned int cmd, unsigned long arg)
{
struct usb_serial_port *port = tty->driver_data;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/usb/serial/mos7720.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1987,7 +1987,7 @@ static int get_serial_info(struct moschip_port *mos7720_port,
return 0;
}

static int mos7720_ioctl(struct tty_struct *tty, struct file *file,
static int mos7720_ioctl(struct tty_struct *tty,
unsigned int cmd, unsigned long arg)
{
struct usb_serial_port *port = tty->driver_data;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/usb/serial/mos7840.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2235,7 +2235,7 @@ static int mos7840_get_icount(struct tty_struct *tty,
* this function handles any ioctl calls to the driver
*****************************************************************************/

static int mos7840_ioctl(struct tty_struct *tty, struct file *file,
static int mos7840_ioctl(struct tty_struct *tty,
unsigned int cmd, unsigned long arg)
{
struct usb_serial_port *port = tty->driver_data;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/usb/serial/opticon.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,7 @@ static int get_serial_info(struct opticon_private *priv,
return 0;
}

static int opticon_ioctl(struct tty_struct *tty, struct file *file,
static int opticon_ioctl(struct tty_struct *tty,
unsigned int cmd, unsigned long arg)
{
struct usb_serial_port *port = tty->driver_data;
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/usb/serial/oti6858.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ static void oti6858_close(struct usb_serial_port *port);
static void oti6858_set_termios(struct tty_struct *tty,
struct usb_serial_port *port, struct ktermios *old);
static void oti6858_init_termios(struct tty_struct *tty);
static int oti6858_ioctl(struct tty_struct *tty, struct file *file,
static int oti6858_ioctl(struct tty_struct *tty,
unsigned int cmd, unsigned long arg);
static void oti6858_read_int_callback(struct urb *urb);
static void oti6858_read_bulk_callback(struct urb *urb);
Expand Down Expand Up @@ -728,7 +728,7 @@ static int wait_modem_info(struct usb_serial_port *port, unsigned int arg)
return 0;
}

static int oti6858_ioctl(struct tty_struct *tty, struct file *file,
static int oti6858_ioctl(struct tty_struct *tty,
unsigned int cmd, unsigned long arg)
{
struct usb_serial_port *port = tty->driver_data;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/usb/serial/pl2303.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -606,7 +606,7 @@ static int wait_modem_info(struct usb_serial_port *port, unsigned int arg)
return 0;
}

static int pl2303_ioctl(struct tty_struct *tty, struct file *file,
static int pl2303_ioctl(struct tty_struct *tty,
unsigned int cmd, unsigned long arg)
{
struct serial_struct ser;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/usb/serial/spcp8x5.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -576,7 +576,7 @@ static int spcp8x5_wait_modem_info(struct usb_serial_port *port,
return 0;
}

static int spcp8x5_ioctl(struct tty_struct *tty, struct file *file,
static int spcp8x5_ioctl(struct tty_struct *tty,
unsigned int cmd, unsigned long arg)
{
struct usb_serial_port *port = tty->driver_data;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/usb/serial/ssu100.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -439,7 +439,7 @@ static int ssu100_get_icount(struct tty_struct *tty,



static int ssu100_ioctl(struct tty_struct *tty, struct file *file,
static int ssu100_ioctl(struct tty_struct *tty,
unsigned int cmd, unsigned long arg)
{
struct usb_serial_port *port = tty->driver_data;
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/usb/serial/ti_usb_3410_5052.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ static int ti_write_room(struct tty_struct *tty);
static int ti_chars_in_buffer(struct tty_struct *tty);
static void ti_throttle(struct tty_struct *tty);
static void ti_unthrottle(struct tty_struct *tty);
static int ti_ioctl(struct tty_struct *tty, struct file *file,
static int ti_ioctl(struct tty_struct *tty,
unsigned int cmd, unsigned long arg);
static int ti_get_icount(struct tty_struct *tty,
struct serial_icounter_struct *icount);
Expand Down Expand Up @@ -818,7 +818,7 @@ static int ti_get_icount(struct tty_struct *tty,
return 0;
}

static int ti_ioctl(struct tty_struct *tty, struct file *file,
static int ti_ioctl(struct tty_struct *tty,
unsigned int cmd, unsigned long arg)
{
struct usb_serial_port *port = tty->driver_data;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/usb/serial/usb-serial.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,7 @@ static int serial_ioctl(struct tty_struct *tty, struct file *file,
/* pass on to the driver specific version of this function
if it is available */
if (port->serial->type->ioctl) {
retval = port->serial->type->ioctl(tty, file, cmd, arg);
retval = port->serial->type->ioctl(tty, cmd, arg);
} else
retval = -ENOIOCTLCMD;
return retval;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/usb/serial/usb-wwan.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ extern void usb_wwan_set_termios(struct tty_struct *tty,
extern int usb_wwan_tiocmget(struct tty_struct *tty);
extern int usb_wwan_tiocmset(struct tty_struct *tty,
unsigned int set, unsigned int clear);
extern int usb_wwan_ioctl(struct tty_struct *tty, struct file *file,
extern int usb_wwan_ioctl(struct tty_struct *tty,
unsigned int cmd, unsigned long arg);
extern int usb_wwan_send_setup(struct usb_serial_port *port);
extern int usb_wwan_write(struct tty_struct *tty, struct usb_serial_port *port,
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/usb/serial/usb_wwan.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ static int set_serial_info(struct usb_serial_port *port,
return retval;
}

int usb_wwan_ioctl(struct tty_struct *tty, struct file *file,
int usb_wwan_ioctl(struct tty_struct *tty,
unsigned int cmd, unsigned long arg)
{
struct usb_serial_port *port = tty->driver_data;
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/usb/serial/whiteheat.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ static int whiteheat_write(struct tty_struct *tty,
struct usb_serial_port *port,
const unsigned char *buf, int count);
static int whiteheat_write_room(struct tty_struct *tty);
static int whiteheat_ioctl(struct tty_struct *tty, struct file *file,
static int whiteheat_ioctl(struct tty_struct *tty,
unsigned int cmd, unsigned long arg);
static void whiteheat_set_termios(struct tty_struct *tty,
struct usb_serial_port *port, struct ktermios *old);
Expand Down Expand Up @@ -874,7 +874,7 @@ static int whiteheat_tiocmset(struct tty_struct *tty,
}


static int whiteheat_ioctl(struct tty_struct *tty, struct file *file,
static int whiteheat_ioctl(struct tty_struct *tty,
unsigned int cmd, unsigned long arg)
{
struct usb_serial_port *port = tty->driver_data;
Expand Down
2 changes: 1 addition & 1 deletion trunk/include/linux/usb/serial.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ struct usb_serial_driver {
const unsigned char *buf, int count);
/* Called only by the tty layer */
int (*write_room)(struct tty_struct *tty);
int (*ioctl)(struct tty_struct *tty, struct file *file,
int (*ioctl)(struct tty_struct *tty,
unsigned int cmd, unsigned long arg);
void (*set_termios)(struct tty_struct *tty,
struct usb_serial_port *port, struct ktermios *old);
Expand Down

0 comments on commit 5cb4682

Please sign in to comment.