Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 303726
b: refs/heads/master
c: b627488
h: refs/heads/master
v: v3
  • Loading branch information
Greg Kroah-Hartman committed May 3, 2012
1 parent 4e7f393 commit 72e224a
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 19 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: b978a5a11b6e1b65cebe2bb8aaff8abe2e29fca7
refs/heads/master: b627488c19451439de9ec8a7bf2fa1649110fc1b
18 changes: 0 additions & 18 deletions trunk/drivers/usb/serial/cyberjack.c
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,6 @@ static int cyberjack_startup(struct usb_serial *serial)
struct cyberjack_private *priv;
int i;

dbg("%s", __func__);

/* allocate the private data structure */
priv = kmalloc(sizeof(struct cyberjack_private), GFP_KERNEL);
if (!priv)
Expand Down Expand Up @@ -155,8 +153,6 @@ static void cyberjack_disconnect(struct usb_serial *serial)
{
int i;

dbg("%s", __func__);

for (i = 0; i < serial->num_ports; ++i)
usb_kill_urb(serial->port[i]->interrupt_in_urb);
}
Expand All @@ -165,8 +161,6 @@ static void cyberjack_release(struct usb_serial *serial)
{
int i;

dbg("%s", __func__);

for (i = 0; i < serial->num_ports; ++i) {
/* My special items, the standard routines free my urbs */
kfree(usb_get_serial_port_data(serial->port[i]));
Expand All @@ -180,8 +174,6 @@ static int cyberjack_open(struct tty_struct *tty,
unsigned long flags;
int result = 0;

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

dbg("%s - usb_clear_halt", __func__);
usb_clear_halt(port->serial->dev, port->write_urb->pipe);

Expand All @@ -197,8 +189,6 @@ static int cyberjack_open(struct tty_struct *tty,

static void cyberjack_close(struct usb_serial_port *port)
{
dbg("%s - port %d", __func__, port->number);

if (port->serial->dev) {
/* shutdown any bulk reads that might be going on */
usb_kill_urb(port->write_urb);
Expand All @@ -214,8 +204,6 @@ static int cyberjack_write(struct tty_struct *tty,
int result;
int wrexpected;

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

if (count == 0) {
dbg("%s - write request of 0 bytes", __func__);
return 0;
Expand Down Expand Up @@ -307,8 +295,6 @@ static void cyberjack_read_int_callback(struct urb *urb)
int status = urb->status;
int result;

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

/* the urb might have been killed. */
if (status)
return;
Expand Down Expand Up @@ -367,8 +353,6 @@ static void cyberjack_read_bulk_callback(struct urb *urb)
int result;
int status = urb->status;

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

usb_serial_debug_data(debug, &port->dev, __func__,
urb->actual_length, data);
if (status) {
Expand Down Expand Up @@ -417,8 +401,6 @@ static void cyberjack_write_bulk_callback(struct urb *urb)
struct cyberjack_private *priv = usb_get_serial_port_data(port);
int status = urb->status;

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

set_bit(0, &port->write_urbs_free);
if (status) {
dbg("%s - nonzero write bulk status received: %d",
Expand Down

0 comments on commit 72e224a

Please sign in to comment.