Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 303754
b: refs/heads/master
c: bb7a9c4
h: refs/heads/master
v: v3
  • Loading branch information
Greg Kroah-Hartman committed May 3, 2012
1 parent 2f526d9 commit fe8d742
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 20 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 76533636aa6b044b32de9747fcc614b1e75b2c85
refs/heads/master: bb7a9c4a42995fe84af3e9c3a99f4c35d1567437
19 changes: 0 additions & 19 deletions trunk/drivers/usb/serial/ssu100.c
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@ static void ssu100_release(struct usb_serial *serial)
{
struct ssu100_port_private *priv = usb_get_serial_port_data(*serial->port);

dbg("%s", __func__);
kfree(priv);
}

Expand Down Expand Up @@ -171,8 +170,6 @@ static int ssu100_initdevice(struct usb_device *dev)
u8 *data;
int result = 0;

dbg("%s", __func__);

data = kzalloc(3, GFP_KERNEL);
if (!data)
return -ENOMEM;
Expand Down Expand Up @@ -237,8 +234,6 @@ static void ssu100_set_termios(struct tty_struct *tty,
u16 urb_value = 0; /* will hold the new flags */
int result;

dbg("%s", __func__);

if (cflag & PARENB) {
if (cflag & PARODD)
urb_value |= UART_LCR_PARITY;
Expand Down Expand Up @@ -312,8 +307,6 @@ static int ssu100_open(struct tty_struct *tty, struct usb_serial_port *port)
int result;
unsigned long flags;

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

data = kzalloc(2, GFP_KERNEL);
if (!data)
return -ENOMEM;
Expand Down Expand Up @@ -348,7 +341,6 @@ static int ssu100_open(struct tty_struct *tty, struct usb_serial_port *port)

static void ssu100_close(struct usb_serial_port *port)
{
dbg("%s", __func__);
usb_serial_generic_close(port);
}

Expand Down Expand Up @@ -467,8 +459,6 @@ static int ssu100_attach(struct usb_serial *serial)
struct ssu100_port_private *priv;
struct usb_serial_port *port = *serial->port;

dbg("%s", __func__);

priv = kzalloc(sizeof(*priv), GFP_KERNEL);
if (!priv) {
dev_err(&port->dev, "%s- kmalloc(%Zd) failed.\n", __func__,
Expand All @@ -490,8 +480,6 @@ static int ssu100_tiocmget(struct tty_struct *tty)
u8 *d;
int r;

dbg("%s\n", __func__);

d = kzalloc(2, GFP_KERNEL);
if (!d)
return -ENOMEM;
Expand Down Expand Up @@ -522,16 +510,13 @@ static int ssu100_tiocmset(struct tty_struct *tty,
struct usb_serial_port *port = tty->driver_data;
struct usb_device *dev = port->serial->dev;

dbg("%s\n", __func__);
return update_mctrl(dev, set, clear);
}

static void ssu100_dtr_rts(struct usb_serial_port *port, int on)
{
struct usb_device *dev = port->serial->dev;

dbg("%s\n", __func__);

mutex_lock(&port->serial->disc_mutex);
if (!port->serial->disconnected) {
/* Disable flow control */
Expand Down Expand Up @@ -618,8 +603,6 @@ static int ssu100_process_packet(struct urb *urb,
int i;
char *ch;

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

if ((len >= 4) &&
(packet[0] == 0x1b) && (packet[1] == 0x1b) &&
((packet[2] == 0x00) || (packet[2] == 0x01))) {
Expand Down Expand Up @@ -656,8 +639,6 @@ static void ssu100_process_read_urb(struct urb *urb)
struct tty_struct *tty;
int count;

dbg("%s", __func__);

tty = tty_port_tty_get(&port->port);
if (!tty)
return;
Expand Down

0 comments on commit fe8d742

Please sign in to comment.