Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 303750
b: refs/heads/master
c: 77b3b30
h: refs/heads/master
v: v3
  • Loading branch information
Greg Kroah-Hartman committed May 3, 2012
1 parent 4a1362d commit 270a61b
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 30 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: e79a8a4be4a741c3b4608dcdaaffb172f7b01877
refs/heads/master: 77b3b30d18c1a4301441ca1be8bb404ac82408ae
29 changes: 0 additions & 29 deletions trunk/drivers/usb/serial/oti6858.c
Original file line number Diff line number Diff line change
Expand Up @@ -211,8 +211,6 @@ static void setup_line(struct work_struct *work)
unsigned long flags;
int result;

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

new_setup = kmalloc(OTI6858_CTRL_PKT_SIZE, GFP_KERNEL);
if (new_setup == NULL) {
dev_err(&port->dev, "%s(): out of memory!\n", __func__);
Expand Down Expand Up @@ -282,8 +280,6 @@ static void send_data(struct work_struct *work)
unsigned long flags;
u8 *allow;

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

spin_lock_irqsave(&priv->lock, flags);
if (priv->flags.write_urb_in_use) {
spin_unlock_irqrestore(&priv->lock, flags);
Expand Down Expand Up @@ -379,8 +375,6 @@ static int oti6858_startup(struct usb_serial *serial)
static int oti6858_write(struct tty_struct *tty, struct usb_serial_port *port,
const unsigned char *buf, int count)
{
dbg("%s(port = %d, count = %d)", __func__, port->number, count);

if (!count)
return count;

Expand All @@ -395,8 +389,6 @@ static int oti6858_write_room(struct tty_struct *tty)
int room = 0;
unsigned long flags;

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

spin_lock_irqsave(&port->lock, flags);
room = kfifo_avail(&port->write_fifo);
spin_unlock_irqrestore(&port->lock, flags);
Expand All @@ -410,8 +402,6 @@ static int oti6858_chars_in_buffer(struct tty_struct *tty)
int chars = 0;
unsigned long flags;

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

spin_lock_irqsave(&port->lock, flags);
chars = kfifo_len(&port->write_fifo);
spin_unlock_irqrestore(&port->lock, flags);
Expand All @@ -437,8 +427,6 @@ static void oti6858_set_termios(struct tty_struct *tty,
__le16 divisor;
int br;

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

if (!tty) {
dbg("%s(): no tty structures", __func__);
return;
Expand Down Expand Up @@ -545,8 +533,6 @@ static int oti6858_open(struct tty_struct *tty, struct usb_serial_port *port)
unsigned long flags;
int result;

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

usb_clear_halt(serial->dev, port->write_urb->pipe);
usb_clear_halt(serial->dev, port->read_urb->pipe);

Expand Down Expand Up @@ -602,8 +588,6 @@ static void oti6858_close(struct usb_serial_port *port)
struct oti6858_private *priv = usb_get_serial_port_data(port);
unsigned long flags;

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

spin_lock_irqsave(&port->lock, flags);
/* clear out any remaining data in the buffer */
kfifo_reset_out(&port->write_fifo);
Expand Down Expand Up @@ -660,8 +644,6 @@ static int oti6858_tiocmget(struct tty_struct *tty)
unsigned pin_state;
unsigned result = 0;

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

spin_lock_irqsave(&priv->lock, flags);
pin_state = priv->status.pin_state & PIN_MASK;
spin_unlock_irqrestore(&priv->lock, flags);
Expand Down Expand Up @@ -744,8 +726,6 @@ static void oti6858_release(struct usb_serial *serial)
{
int i;

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

for (i = 0; i < serial->num_ports; ++i)
kfree(usb_get_serial_port_data(serial->port[i]));
}
Expand All @@ -757,9 +737,6 @@ static void oti6858_read_int_callback(struct urb *urb)
int transient = 0, can_recv = 0, resubmit = 1;
int status = urb->status;

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

switch (status) {
case 0:
/* success */
Expand Down Expand Up @@ -876,9 +853,6 @@ static void oti6858_read_bulk_callback(struct urb *urb)
int status = urb->status;
int result;

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

spin_lock_irqsave(&priv->lock, flags);
priv->flags.read_urb_in_use = 0;
spin_unlock_irqrestore(&priv->lock, flags);
Expand Down Expand Up @@ -910,9 +884,6 @@ static void oti6858_write_bulk_callback(struct urb *urb)
int status = urb->status;
int result;

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

switch (status) {
case 0:
/* success */
Expand Down

0 comments on commit 270a61b

Please sign in to comment.