Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 7935
b: refs/heads/master
c: 81671dd
h: refs/heads/master
i:
  7933: 9c58a61
  7931: 47af9bb
  7927: 2c998a2
  7919: 16426e3
  7903: e43d7e1
  7871: 4c285d4
  7807: 362c2ea
  7679: 424844c
v: v3
  • Loading branch information
Tobias Klauser authored and Greg Kroah-Hartman committed Sep 8, 2005
1 parent d87caf8 commit b221087
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 13 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: 7bb75aeeeec7417a961920b3f63a83007475260f
refs/heads/master: 81671ddb7e24e9d1f84812dba8ed810935f77d40
24 changes: 12 additions & 12 deletions trunk/drivers/usb/serial/usb-serial.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -531,7 +531,7 @@ static int serial_open (struct tty_struct *tty, struct file * filp)

static void serial_close(struct tty_struct *tty, struct file * filp)
{
struct usb_serial_port *port = (struct usb_serial_port *) tty->driver_data;
struct usb_serial_port *port = tty->driver_data;

if (!port)
return;
Expand Down Expand Up @@ -561,7 +561,7 @@ static void serial_close(struct tty_struct *tty, struct file * filp)

static int serial_write (struct tty_struct * tty, const unsigned char *buf, int count)
{
struct usb_serial_port *port = (struct usb_serial_port *) tty->driver_data;
struct usb_serial_port *port = tty->driver_data;
int retval = -EINVAL;

dbg("%s - port %d, %d byte(s)", __FUNCTION__, port->number, count);
Expand All @@ -580,7 +580,7 @@ static int serial_write (struct tty_struct * tty, const unsigned char *buf, int

static int serial_write_room (struct tty_struct *tty)
{
struct usb_serial_port *port = (struct usb_serial_port *) tty->driver_data;
struct usb_serial_port *port = tty->driver_data;
int retval = -EINVAL;

dbg("%s - port %d", __FUNCTION__, port->number);
Expand All @@ -599,7 +599,7 @@ static int serial_write_room (struct tty_struct *tty)

static int serial_chars_in_buffer (struct tty_struct *tty)
{
struct usb_serial_port *port = (struct usb_serial_port *) tty->driver_data;
struct usb_serial_port *port = tty->driver_data;
int retval = -EINVAL;

dbg("%s = port %d", __FUNCTION__, port->number);
Expand All @@ -618,7 +618,7 @@ static int serial_chars_in_buffer (struct tty_struct *tty)

static void serial_throttle (struct tty_struct * tty)
{
struct usb_serial_port *port = (struct usb_serial_port *) tty->driver_data;
struct usb_serial_port *port = tty->driver_data;

dbg("%s - port %d", __FUNCTION__, port->number);

Expand All @@ -634,7 +634,7 @@ static void serial_throttle (struct tty_struct * tty)

static void serial_unthrottle (struct tty_struct * tty)
{
struct usb_serial_port *port = (struct usb_serial_port *) tty->driver_data;
struct usb_serial_port *port = tty->driver_data;

dbg("%s - port %d", __FUNCTION__, port->number);

Expand All @@ -650,7 +650,7 @@ static void serial_unthrottle (struct tty_struct * tty)

static int serial_ioctl (struct tty_struct *tty, struct file * file, unsigned int cmd, unsigned long arg)
{
struct usb_serial_port *port = (struct usb_serial_port *) tty->driver_data;
struct usb_serial_port *port = tty->driver_data;
int retval = -ENODEV;

dbg("%s - port %d, cmd 0x%.4x", __FUNCTION__, port->number, cmd);
Expand All @@ -672,7 +672,7 @@ static int serial_ioctl (struct tty_struct *tty, struct file * file, unsigned in

static void serial_set_termios (struct tty_struct *tty, struct termios * old)
{
struct usb_serial_port *port = (struct usb_serial_port *) tty->driver_data;
struct usb_serial_port *port = tty->driver_data;

dbg("%s - port %d", __FUNCTION__, port->number);

Expand All @@ -688,7 +688,7 @@ static void serial_set_termios (struct tty_struct *tty, struct termios * old)

static void serial_break (struct tty_struct *tty, int break_state)
{
struct usb_serial_port *port = (struct usb_serial_port *) tty->driver_data;
struct usb_serial_port *port = tty->driver_data;

dbg("%s - port %d", __FUNCTION__, port->number);

Expand Down Expand Up @@ -749,7 +749,7 @@ static int serial_read_proc (char *page, char **start, off_t off, int count, int

static int serial_tiocmget (struct tty_struct *tty, struct file *file)
{
struct usb_serial_port *port = (struct usb_serial_port *) tty->driver_data;
struct usb_serial_port *port = tty->driver_data;

dbg("%s - port %d", __FUNCTION__, port->number);

Expand All @@ -768,7 +768,7 @@ static int serial_tiocmget (struct tty_struct *tty, struct file *file)
static int serial_tiocmset (struct tty_struct *tty, struct file *file,
unsigned int set, unsigned int clear)
{
struct usb_serial_port *port = (struct usb_serial_port *) tty->driver_data;
struct usb_serial_port *port = tty->driver_data;

dbg("%s - port %d", __FUNCTION__, port->number);

Expand All @@ -786,7 +786,7 @@ static int serial_tiocmset (struct tty_struct *tty, struct file *file,

void usb_serial_port_softint(void *private)
{
struct usb_serial_port *port = (struct usb_serial_port *)private;
struct usb_serial_port *port = private;
struct tty_struct *tty;

dbg("%s - port %d", __FUNCTION__, port->number);
Expand Down

0 comments on commit b221087

Please sign in to comment.