Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 303758
b: refs/heads/master
c: 4db02fe
h: refs/heads/master
v: v3
  • Loading branch information
Greg Kroah-Hartman committed May 3, 2012
1 parent feb3130 commit 93349b4
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 18 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: d2bad7818c53a06a67b07d94f54e1a7e9bd0c09b
refs/heads/master: 4db02fecb4c2f1ce67bfd3fbb014d7dcb10a115a
17 changes: 0 additions & 17 deletions trunk/drivers/usb/serial/whiteheat.c
Original file line number Diff line number Diff line change
Expand Up @@ -205,8 +205,6 @@ static int whiteheat_firmware_download(struct usb_serial *serial,
const struct firmware *loader_fw = NULL, *firmware_fw = NULL;
const struct ihex_binrec *record;

dbg("%s", __func__);

if (request_ihex_firmware(&firmware_fw, "whiteheat.fw",
&serial->dev->dev)) {
dev_err(&serial->dev->dev,
Expand Down Expand Up @@ -437,8 +435,6 @@ static void whiteheat_release(struct usb_serial *serial)
struct whiteheat_private *info;
int i;

dbg("%s", __func__);

/* free up our private data for our command port */
command_port = serial->port[COMMAND_PORT];
kfree(usb_get_serial_port_data(command_port));
Expand All @@ -453,8 +449,6 @@ static int whiteheat_open(struct tty_struct *tty, struct usb_serial_port *port)
{
int retval;

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

retval = start_command_port(port->serial);
if (retval)
goto exit;
Expand Down Expand Up @@ -487,15 +481,12 @@ static int whiteheat_open(struct tty_struct *tty, struct usb_serial_port *port)
goto exit;
}
exit:
dbg("%s - exit, retval = %d", __func__, retval);
return retval;
}


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

firm_report_tx_done(port);
firm_close(port);

Expand All @@ -510,8 +501,6 @@ static int whiteheat_tiocmget(struct tty_struct *tty)
struct whiteheat_private *info = usb_get_serial_port_data(port);
unsigned int modem_signals = 0;

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

firm_get_dtr_rts(port);
if (info->mcr & UART_MCR_DTR)
modem_signals |= TIOCM_DTR;
Expand All @@ -527,8 +516,6 @@ static int whiteheat_tiocmset(struct tty_struct *tty,
struct usb_serial_port *port = tty->driver_data;
struct whiteheat_private *info = usb_get_serial_port_data(port);

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

if (set & TIOCM_RTS)
info->mcr |= UART_MCR_RTS;
if (set & TIOCM_DTR)
Expand Down Expand Up @@ -598,8 +585,6 @@ static void command_port_write_callback(struct urb *urb)
{
int status = urb->status;

dbg("%s", __func__);

if (status) {
dbg("nonzero urb status: %d", status);
return;
Expand All @@ -615,8 +600,6 @@ static void command_port_read_callback(struct urb *urb)
unsigned char *data = urb->transfer_buffer;
int result;

dbg("%s", __func__);

command_info = usb_get_serial_port_data(command_port);
if (!command_info) {
dbg("%s - command_info is NULL, exiting.", __func__);
Expand Down

0 comments on commit 93349b4

Please sign in to comment.