Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 303727
b: refs/heads/master
c: 108feb6
h: refs/heads/master
i:
  303725: 4e7f393
  303723: c5b888c
  303719: 117e77c
  303711: 955bda0
v: v3
  • Loading branch information
Greg Kroah-Hartman committed May 3, 2012
1 parent 72e224a commit 12e5dad
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 37 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: b627488c19451439de9ec8a7bf2fa1649110fc1b
refs/heads/master: 108feb66ac273ab0f949a3f78526dc0c03ee9d87
36 changes: 0 additions & 36 deletions trunk/drivers/usb/serial/cypress_m8.c
Original file line number Diff line number Diff line change
Expand Up @@ -305,8 +305,6 @@ static int cypress_serial_control(struct tty_struct *tty,
const unsigned int feature_len = 5;
unsigned long flags;

dbg("%s", __func__);

priv = usb_get_serial_port_data(port);

if (!priv->comm_is_ok)
Expand Down Expand Up @@ -451,8 +449,6 @@ static int generic_startup(struct usb_serial *serial)
struct cypress_private *priv;
struct usb_serial_port *port = serial->port[0];

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

priv = kzalloc(sizeof(struct cypress_private), GFP_KERNEL);
if (!priv)
return -ENOMEM;
Expand Down Expand Up @@ -505,8 +501,6 @@ static int cypress_earthmate_startup(struct usb_serial *serial)
struct cypress_private *priv;
struct usb_serial_port *port = serial->port[0];

dbg("%s", __func__);

if (generic_startup(serial)) {
dbg("%s - Failed setting up port %d", __func__,
port->number);
Expand Down Expand Up @@ -537,8 +531,6 @@ static int cypress_hidcom_startup(struct usb_serial *serial)
{
struct cypress_private *priv;

dbg("%s", __func__);

if (generic_startup(serial)) {
dbg("%s - Failed setting up port %d", __func__,
serial->port[0]->number);
Expand All @@ -556,8 +548,6 @@ static int cypress_ca42v2_startup(struct usb_serial *serial)
{
struct cypress_private *priv;

dbg("%s", __func__);

if (generic_startup(serial)) {
dbg("%s - Failed setting up port %d", __func__,
serial->port[0]->number);
Expand All @@ -575,10 +565,7 @@ static void cypress_release(struct usb_serial *serial)
{
struct cypress_private *priv;

dbg("%s - port %d", __func__, serial->port[0]->number);

/* all open ports are closed at this point */

priv = usb_get_serial_port_data(serial->port[0]);

if (priv) {
Expand All @@ -595,8 +582,6 @@ static int cypress_open(struct tty_struct *tty, struct usb_serial_port *port)
unsigned long flags;
int result = 0;

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

if (!priv->comm_is_ok)
return -EIO;

Expand Down Expand Up @@ -661,8 +646,6 @@ static void cypress_close(struct usb_serial_port *port)
struct cypress_private *priv = usb_get_serial_port_data(port);
unsigned long flags;

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

/* writing is potentially harmful, lock must be taken */
mutex_lock(&port->serial->disc_mutex);
if (port->serial->disconnected) {
Expand Down Expand Up @@ -720,7 +703,6 @@ static void cypress_send(struct usb_serial_port *port)
if (!priv->comm_is_ok)
return;

dbg("%s - port %d", __func__, port->number);
dbg("%s - interrupt out size is %d", __func__,
port->interrupt_out_size);

Expand Down Expand Up @@ -828,8 +810,6 @@ static int cypress_write_room(struct tty_struct *tty)
int room = 0;
unsigned long flags;

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

spin_lock_irqsave(&priv->lock, flags);
room = kfifo_avail(&priv->write_fifo);
spin_unlock_irqrestore(&priv->lock, flags);
Expand All @@ -847,8 +827,6 @@ static int cypress_tiocmget(struct tty_struct *tty)
unsigned int result = 0;
unsigned long flags;

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

spin_lock_irqsave(&priv->lock, flags);
control = priv->line_control;
status = priv->current_status;
Expand All @@ -874,8 +852,6 @@ static int cypress_tiocmset(struct tty_struct *tty,
struct cypress_private *priv = usb_get_serial_port_data(port);
unsigned long flags;

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

spin_lock_irqsave(&priv->lock, flags);
if (set & TIOCM_RTS)
priv->line_control |= CONTROL_RTS;
Expand Down Expand Up @@ -948,8 +924,6 @@ static void cypress_set_termios(struct tty_struct *tty,
__u8 oldlines;
int linechange = 0;

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

spin_lock_irqsave(&priv->lock, flags);
/* We can't clean this one up as we don't know the device type
early enough */
Expand Down Expand Up @@ -1096,8 +1070,6 @@ static int cypress_chars_in_buffer(struct tty_struct *tty)
int chars = 0;
unsigned long flags;

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

spin_lock_irqsave(&priv->lock, flags);
chars = kfifo_len(&priv->write_fifo);
spin_unlock_irqrestore(&priv->lock, flags);
Expand All @@ -1112,8 +1084,6 @@ static void cypress_throttle(struct tty_struct *tty)
struct usb_serial_port *port = tty->driver_data;
struct cypress_private *priv = usb_get_serial_port_data(port);

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

spin_lock_irq(&priv->lock);
priv->rx_flags = THROTTLED;
spin_unlock_irq(&priv->lock);
Expand All @@ -1126,8 +1096,6 @@ static void cypress_unthrottle(struct tty_struct *tty)
struct cypress_private *priv = usb_get_serial_port_data(port);
int actually_throttled, result;

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

spin_lock_irq(&priv->lock);
actually_throttled = priv->rx_flags & ACTUALLY_THROTTLED;
priv->rx_flags = 0;
Expand Down Expand Up @@ -1161,8 +1129,6 @@ static void cypress_read_int_callback(struct urb *urb)
int i = 0;
int status = urb->status;

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

switch (status) {
case 0: /* success */
break;
Expand Down Expand Up @@ -1303,8 +1269,6 @@ static void cypress_write_int_callback(struct urb *urb)
int result;
int status = urb->status;

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

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

0 comments on commit 12e5dad

Please sign in to comment.