Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 303732
b: refs/heads/master
c: a09aa7d
h: refs/heads/master
v: v3
  • Loading branch information
Greg Kroah-Hartman committed May 3, 2012
1 parent 7ee28a3 commit 652f07d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 35 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: b6ea163b6d784e92266f33936d096f7dc83d7b22
refs/heads/master: a09aa7dda46b2beb157d3a360898bdd77566d3e7
35 changes: 1 addition & 34 deletions trunk/drivers/usb/serial/ftdi_sio.c
Original file line number Diff line number Diff line change
Expand Up @@ -1285,8 +1285,6 @@ static int read_latency_timer(struct usb_serial_port *port)
unsigned char *buf;
int rv;

dbg("%s", __func__);

buf = kmalloc(1, GFP_KERNEL);
if (!buf)
return -ENOMEM;
Expand Down Expand Up @@ -1593,8 +1591,6 @@ static int create_sysfs_attrs(struct usb_serial_port *port)
struct ftdi_private *priv = usb_get_serial_port_data(port);
int retval = 0;

dbg("%s", __func__);

/* XXX I've no idea if the original SIO supports the event_char
* sysfs parameter, so I'm playing it safe. */
if (priv->chip_type != SIO) {
Expand All @@ -1619,8 +1615,6 @@ static void remove_sysfs_attrs(struct usb_serial_port *port)
{
struct ftdi_private *priv = usb_get_serial_port_data(port);

dbg("%s", __func__);

/* XXX see create_sysfs_attrs */
if (priv->chip_type != SIO) {
device_remove_file(&port->dev, &dev_attr_event_char);
Expand Down Expand Up @@ -1667,8 +1661,6 @@ static int ftdi_sio_port_probe(struct usb_serial_port *port)
struct ftdi_sio_quirk *quirk = usb_get_serial_data(port->serial);


dbg("%s", __func__);

priv = kzalloc(sizeof(struct ftdi_private), GFP_KERNEL);
if (!priv) {
dev_err(&port->dev, "%s- kmalloc(%Zd) failed.\n", __func__,
Expand Down Expand Up @@ -1704,8 +1696,6 @@ static int ftdi_sio_port_probe(struct usb_serial_port *port)
/* Called from usbserial:serial_probe */
static void ftdi_USB_UIRT_setup(struct ftdi_private *priv)
{
dbg("%s", __func__);

priv->flags |= ASYNC_SPD_CUST;
priv->custom_divisor = 77;
priv->force_baud = 38400;
Expand All @@ -1716,8 +1706,6 @@ static void ftdi_USB_UIRT_setup(struct ftdi_private *priv)

static void ftdi_HE_TIRA1_setup(struct ftdi_private *priv)
{
dbg("%s", __func__);

priv->flags |= ASYNC_SPD_CUST;
priv->custom_divisor = 240;
priv->force_baud = 38400;
Expand Down Expand Up @@ -1767,8 +1755,6 @@ static int ftdi_jtag_probe(struct usb_serial *serial)
struct usb_device *udev = serial->dev;
struct usb_interface *interface = serial->interface;

dbg("%s", __func__);

if (interface == udev->actconfig->interface[0]) {
dev_info(&udev->dev,
"Ignoring serial port reserved for JTAG\n");
Expand All @@ -1782,8 +1768,6 @@ static int ftdi_8u2232c_probe(struct usb_serial *serial)
{
struct usb_device *udev = serial->dev;

dbg("%s", __func__);

if ((udev->manufacturer && !strcmp(udev->manufacturer, "CALAO Systems")) ||
(udev->product && !strcmp(udev->product, "BeagleBone/XDS100")))
return ftdi_jtag_probe(serial);
Expand All @@ -1800,8 +1784,6 @@ static int ftdi_stmclite_probe(struct usb_serial *serial)
struct usb_device *udev = serial->dev;
struct usb_interface *interface = serial->interface;

dbg("%s", __func__);

if (interface == udev->actconfig->interface[2])
return 0;

Expand Down Expand Up @@ -1839,8 +1821,6 @@ static int ftdi_sio_port_remove(struct usb_serial_port *port)
{
struct ftdi_private *priv = usb_get_serial_port_data(port);

dbg("%s", __func__);

priv->dev_gone = true;
wake_up_interruptible_all(&priv->delta_msr_wait);

Expand All @@ -1858,8 +1838,6 @@ static int ftdi_open(struct tty_struct *tty, struct usb_serial_port *port)
struct ftdi_private *priv = usb_get_serial_port_data(port);
int result;

dbg("%s", __func__);

/* No error checking for this (will get errors later anyway) */
/* See ftdi_sio.h for description of what is reset */
usb_control_msg(dev, usb_sndctrlpipe(dev, 0),
Expand Down Expand Up @@ -1918,8 +1896,6 @@ static void ftdi_close(struct usb_serial_port *port)
{
struct ftdi_private *priv = usb_get_serial_port_data(port);

dbg("%s", __func__);

usb_serial_generic_close(port);
kref_put(&priv->kref, ftdi_sio_priv_release);
}
Expand Down Expand Up @@ -1976,8 +1952,6 @@ static int ftdi_process_packet(struct tty_struct *tty,
char flag;
char *ch;

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

if (len < 2) {
dbg("malformed packet");
return 0;
Expand Down Expand Up @@ -2121,8 +2095,6 @@ static void ftdi_set_termios(struct tty_struct *tty,
unsigned char vstop;
unsigned char vstart;

dbg("%s", __func__);

/* Force baud rate if this device requires it, unless it is set to
B0. */
if (priv->force_baud && ((termios->c_cflag & CBAUD) != B0)) {
Expand Down Expand Up @@ -2295,8 +2267,6 @@ static int ftdi_tiocmget(struct tty_struct *tty)
int len;
int ret;

dbg("%s TIOCMGET", __func__);

buf = kmalloc(2, GFP_KERNEL);
if (!buf)
return -ENOMEM;
Expand Down Expand Up @@ -2346,7 +2316,7 @@ static int ftdi_tiocmset(struct tty_struct *tty,
unsigned int set, unsigned int clear)
{
struct usb_serial_port *port = tty->driver_data;
dbg("%s TIOCMSET", __func__);

return update_mctrl(port, set, clear);
}

Expand Down Expand Up @@ -2435,7 +2405,6 @@ static int __init ftdi_init(void)
{
int retval;

dbg("%s", __func__);
if (vendor > 0 && product > 0) {
/* Add user specified VID/PID to reserved element of table. */
int i;
Expand All @@ -2454,8 +2423,6 @@ static int __init ftdi_init(void)

static void __exit ftdi_exit(void)
{
dbg("%s", __func__);

usb_serial_deregister_drivers(&ftdi_driver, serial_drivers);
}

Expand Down

0 comments on commit 652f07d

Please sign in to comment.