1 files changed, 433 insertions, 0 deletions
diff --git a/printk.patch b/printk.patch
new file mode 100644
index 00000000000000..77ee51d54c98c0
--- /dev/null
+++ b/printk.patch
@@ -0,0 +1,433 @@
+---
+ drivers/usb/serial/console.c |    4 +-
+ drivers/usb/serial/pl2303.c  |   84 ++++++++++++++++++++++---------------------
+ drivers/usb/serial/visor.c   |   28 +++++++-------
+ 3 files changed, 60 insertions(+), 56 deletions(-)
+
+--- a/drivers/usb/serial/console.c
++++ b/drivers/usb/serial/console.c
+@@ -68,8 +68,6 @@ static int usb_console_setup(struct cons
+ 	struct tty_struct *tty = NULL;
+ 	struct ktermios dummy;
+ 
+-	dbg("%s", __func__);
+-
+ 	if (options) {
+ 		baud = simple_strtoul(options, NULL, 10);
+ 		s = options;
+@@ -117,6 +115,8 @@ static int usb_console_setup(struct cons
+ 		return -ENODEV;
+ 	}
+ 
++	dev_dbg(&serial->dev->dev, "%s\n", __func__);
++
+ 	retval = usb_autopm_get_interface(serial->interface);
+ 	if (retval)
+ 		goto error_get_interface;
+--- a/drivers/usb/serial/pl2303.c
++++ b/drivers/usb/serial/pl2303.c
+@@ -161,8 +161,9 @@ static int pl2303_vendor_read(__u16 valu
+ 	int res = usb_control_msg(serial->dev, usb_rcvctrlpipe(serial->dev, 0),
+ 			VENDOR_READ_REQUEST, VENDOR_READ_REQUEST_TYPE,
+ 			value, index, buf, 1, 100);
+-	dbg("0x%x:0x%x:0x%x:0x%x  %d - %x", VENDOR_READ_REQUEST_TYPE,
+-			VENDOR_READ_REQUEST, value, index, res, buf[0]);
++	dev_dbg(&serial->dev->dev, "0x%x:0x%x:0x%x:0x%x  %d - %x\n",
++		VENDOR_READ_REQUEST_TYPE, VENDOR_READ_REQUEST, value, index,
++		res, buf[0]);
+ 	return res;
+ }
+ 
+@@ -172,8 +173,9 @@ static int pl2303_vendor_write(__u16 val
+ 	int res = usb_control_msg(serial->dev, usb_sndctrlpipe(serial->dev, 0),
+ 			VENDOR_WRITE_REQUEST, VENDOR_WRITE_REQUEST_TYPE,
+ 			value, index, NULL, 0, 100);
+-	dbg("0x%x:0x%x:0x%x:0x%x  %d", VENDOR_WRITE_REQUEST_TYPE,
+-			VENDOR_WRITE_REQUEST, value, index, res);
++	dev_dbg(&serial->dev->dev, "0x%x:0x%x:0x%x:0x%x  %d\n",
++		VENDOR_WRITE_REQUEST_TYPE, VENDOR_WRITE_REQUEST, value, index,
++		res);
+ 	return res;
+ }
+ 
+@@ -196,7 +198,7 @@ static int pl2303_startup(struct usb_ser
+ 		type = type_1;
+ 	else if (serial->dev->descriptor.bDeviceClass == 0xFF)
+ 		type = type_1;
+-	dbg("device type: %d", type);
++	dev_dbg(&serial->interface->dev, "device type: %d\n", type);
+ 
+ 	for (i = 0; i < serial->num_ports; ++i) {
+ 		priv = kzalloc(sizeof(struct pl2303_private), GFP_KERNEL);
+@@ -243,7 +245,8 @@ static int set_control_lines(struct usb_
+ 	retval = usb_control_msg(dev, usb_sndctrlpipe(dev, 0),
+ 				 SET_CONTROL_REQUEST, SET_CONTROL_REQUEST_TYPE,
+ 				 value, 0, NULL, 0, 100);
+-	dbg("%s - value = %d, retval = %d", __func__, value, retval);
++	dev_dbg(&dev->dev, "%s - value = %d, retval = %d\n", __func__,
++		value, retval);
+ 	return retval;
+ }
+ 
+@@ -265,7 +268,7 @@ static void pl2303_set_termios(struct tt
+ 	int baud_floor, baud_ceil;
+ 	int k;
+ 
+-	dbg("%s -  port %d", __func__, port->number);
++	dev_dbg(&port->dev, "%s\n", __func__);
+ 
+ 	/* The PL2303 is reported to lose bytes if you change
+ 	   serial settings even to the same values as before. Thus
+@@ -287,7 +290,7 @@ static void pl2303_set_termios(struct tt
+ 	i = usb_control_msg(serial->dev, usb_rcvctrlpipe(serial->dev, 0),
+ 			    GET_LINE_REQUEST, GET_LINE_REQUEST_TYPE,
+ 			    0, 0, buf, 7, 100);
+-	dbg("0xa1:0x21:0:0  %d - %x %x %x %x %x %x %x", i,
++	dev_dbg(&port->dev, "0xa1:0x21:0:0  %d - %x %x %x %x %x %x %x\n", i,
+ 	    buf[0], buf[1], buf[2], buf[3], buf[4], buf[5], buf[6]);
+ 
+ 	if (cflag & CSIZE) {
+@@ -306,7 +309,7 @@ static void pl2303_set_termios(struct tt
+ 			buf[6] = 8;
+ 			break;
+ 		}
+-		dbg("%s - data bits = %d", __func__, buf[6]);
++		dev_dbg(&port->dev, "data bits = %d\n", buf[6]);
+ 	}
+ 
+ 	/* For reference buf[0]:buf[3] baud rate value */
+@@ -315,7 +318,7 @@ static void pl2303_set_termios(struct tt
+ 	 *          9600 baud (at least my PL2303X always does)
+ 	 */
+ 	baud = tty_get_baud_rate(tty);
+-	dbg("%s - baud requested = %d", __func__, baud);
++	dev_dbg(&port->dev, "baud requested = %d\n", baud);
+ 	if (baud) {
+ 		/* Set baudrate to nearest supported value */
+ 		for (k=0; k<ARRAY_SIZE(baud_sup); k++) {
+@@ -341,7 +344,7 @@ static void pl2303_set_termios(struct tt
+ 			else if (baud > 6000000)
+ 				baud = 6000000;
+ 		}
+-		dbg("%s - baud set = %d", __func__, baud);
++		dev_dbg(&port->dev, "baud set = %d\n", baud);
+ 		if (baud <= 115200) {
+ 			buf[0] = baud & 0xff;
+ 			buf[1] = (baud >> 8) & 0xff;
+@@ -372,14 +375,14 @@ static void pl2303_set_termios(struct tt
+ 		 */
+ 		if ((cflag & CSIZE) == CS5) {
+ 			buf[4] = 1;
+-			dbg("%s - stop bits = 1.5", __func__);
++			dev_dbg(&port->dev, "stop bits = 1.5\n");
+ 		} else {
+ 			buf[4] = 2;
+-			dbg("%s - stop bits = 2", __func__);
++			dev_dbg(&port->dev, "stop bits = 2\n");
+ 		}
+ 	} else {
+ 		buf[4] = 0;
+-		dbg("%s - stop bits = 1", __func__);
++		dev_dbg(&port->dev, "stop bits = 1\n");
+ 	}
+ 
+ 	if (cflag & PARENB) {
+@@ -391,29 +394,29 @@ static void pl2303_set_termios(struct tt
+ 		if (cflag & PARODD) {
+ 			if (cflag & CMSPAR) {
+ 				buf[5] = 3;
+-				dbg("%s - parity = mark", __func__);
++				dev_dbg(&port->dev, "parity = mark\n");
+ 			} else {
+ 				buf[5] = 1;
+-				dbg("%s - parity = odd", __func__);
++				dev_dbg(&port->dev, "parity = odd\n");
+ 			}
+ 		} else {
+ 			if (cflag & CMSPAR) {
+ 				buf[5] = 4;
+-				dbg("%s - parity = space", __func__);
++				dev_dbg(&port->dev, "parity = space\n");
+ 			} else {
+ 				buf[5] = 2;
+-				dbg("%s - parity = even", __func__);
++				dev_dbg(&port->dev, "parity = even\n");
+ 			}
+ 		}
+ 	} else {
+ 		buf[5] = 0;
+-		dbg("%s - parity = none", __func__);
++		dev_dbg(&port->dev, "parity = none\n");
+ 	}
+ 
+ 	i = usb_control_msg(serial->dev, usb_sndctrlpipe(serial->dev, 0),
+ 			    SET_LINE_REQUEST, SET_LINE_REQUEST_TYPE,
+ 			    0, 0, buf, 7, 100);
+-	dbg("0x21:0x20:0:0  %d", i);
++	dev_dbg(&port->dev, "0x21:0x20:0:0  %d\n", i);
+ 
+ 	/* change control lines if we are switching to or from B0 */
+ 	spin_lock_irqsave(&priv->lock, flags);
+@@ -435,7 +438,7 @@ static void pl2303_set_termios(struct tt
+ 	i = usb_control_msg(serial->dev, usb_rcvctrlpipe(serial->dev, 0),
+ 			    GET_LINE_REQUEST, GET_LINE_REQUEST_TYPE,
+ 			    0, 0, buf, 7, 100);
+-	dbg("0xa1:0x21:0:0  %d - %x %x %x %x %x %x %x", i,
++	dev_dbg(&port->dev, "0xa1:0x21:0:0  %d - %x %x %x %x %x %x %x\n", i,
+ 	     buf[0], buf[1], buf[2], buf[3], buf[4], buf[5], buf[6]);
+ 
+ 	if (cflag & CRTSCTS) {
+@@ -473,7 +476,7 @@ static void pl2303_dtr_rts(struct usb_se
+ 
+ static void pl2303_close(struct usb_serial_port *port)
+ {
+-	dbg("%s - port %d", __func__, port->number);
++	dev_dbg(&port->dev, "%s\n", __func__);
+ 
+ 	usb_serial_generic_close(port);
+ 	usb_kill_urb(port->interrupt_in_urb);
+@@ -486,7 +489,7 @@ static int pl2303_open(struct tty_struct
+ 	struct pl2303_private *priv = usb_get_serial_port_data(port);
+ 	int result;
+ 
+-	dbg("%s -  port %d", __func__, port->number);
++	dev_dbg(&port->dev, "%s\n", __func__);
+ 
+ 	if (priv->type != HX) {
+ 		usb_clear_halt(serial->dev, port->write_urb->pipe);
+@@ -501,7 +504,7 @@ static int pl2303_open(struct tty_struct
+ 	if (tty)
+ 		pl2303_set_termios(tty, port, &tmp_termios);
+ 
+-	dbg("%s - submitting interrupt urb", __func__);
++	dev_dbg(&port->dev, "submitting interrupt urb\n");
+ 	result = usb_submit_urb(port->interrupt_in_urb, GFP_KERNEL);
+ 	if (result) {
+ 		dev_err(&port->dev, "%s - failed submitting interrupt urb,"
+@@ -554,7 +557,7 @@ static int pl2303_tiocmget(struct tty_st
+ 	unsigned int status;
+ 	unsigned int result;
+ 
+-	dbg("%s (%d)", __func__, port->number);
++	dev_dbg(&port->dev, "%s\n", __func__);
+ 
+ 	if (!usb_get_intfdata(port->serial->interface))
+ 		return -ENODEV;
+@@ -571,7 +574,7 @@ static int pl2303_tiocmget(struct tty_st
+ 		  | ((status & UART_RING)	? TIOCM_RI  : 0)
+ 		  | ((status & UART_DCD)	? TIOCM_CD  : 0);
+ 
+-	dbg("%s - result = %x", __func__, result);
++	dev_dbg(&port->dev, "%s - result = %x\n", __func__, result);
+ 
+ 	return result;
+ }
+@@ -625,7 +628,8 @@ static int pl2303_ioctl(struct tty_struc
+ {
+ 	struct serial_struct ser;
+ 	struct usb_serial_port *port = tty->driver_data;
+-	dbg("%s (%d) cmd = 0x%04x", __func__, port->number, cmd);
++
++	dev_dbg(&port->dev, "%s cmd = 0x%04x\n", __func__, cmd);
+ 
+ 	switch (cmd) {
+ 	case TIOCGSERIAL:
+@@ -641,10 +645,10 @@ static int pl2303_ioctl(struct tty_struc
+ 		return 0;
+ 
+ 	case TIOCMIWAIT:
+-		dbg("%s (%d) TIOCMIWAIT", __func__,  port->number);
++		dev_dbg(&port->dev, "%s TIOCMIWAIT\n", __func__);
+ 		return wait_modem_info(port, arg);
+ 	default:
+-		dbg("%s not supported = 0x%04x", __func__, cmd);
++		dev_dbg(&port->dev, "%s not supported = 0x%04x\n", __func__, cmd);
+ 		break;
+ 	}
+ 	return -ENOIOCTLCMD;
+@@ -657,20 +661,20 @@ static void pl2303_break_ctl(struct tty_
+ 	u16 state;
+ 	int result;
+ 
+-	dbg("%s - port %d", __func__, port->number);
++	dev_dbg(&port->dev, "%s\n", __func__);
+ 
+ 	if (break_state == 0)
+ 		state = BREAK_OFF;
+ 	else
+ 		state = BREAK_ON;
+-	dbg("%s - turning break %s", __func__,
++	dev_dbg(&port->dev, "%s - turning break %s\n", __func__,
+ 			state == BREAK_OFF ? "off" : "on");
+ 
+ 	result = usb_control_msg(serial->dev, usb_sndctrlpipe(serial->dev, 0),
+ 				 BREAK_REQUEST, BREAK_REQUEST_TYPE, state,
+ 				 0, NULL, 0, 100);
+ 	if (result)
+-		dbg("%s - error sending break = %d", __func__, result);
++		dev_err(&port->dev, "error sending break = %d\n", result);
+ }
+ 
+ static void pl2303_release(struct usb_serial *serial)
+@@ -678,7 +682,7 @@ static void pl2303_release(struct usb_se
+ 	int i;
+ 	struct pl2303_private *priv;
+ 
+-	dbg("%s", __func__);
++	dev_dbg(&serial->dev->dev, "%s\n", __func__);
+ 
+ 	for (i = 0; i < serial->num_ports; ++i) {
+ 		priv = usb_get_serial_port_data(serial->port[i]);
+@@ -742,7 +746,7 @@ static void pl2303_read_int_callback(str
+ 	int status = urb->status;
+ 	int retval;
+ 
+-	dbg("%s (%d)", __func__, port->number);
++	dev_dbg(&port->dev, "%s\n", __func__);
+ 
+ 	switch (status) {
+ 	case 0:
+@@ -752,12 +756,12 @@ static void pl2303_read_int_callback(str
+ 	case -ENOENT:
+ 	case -ESHUTDOWN:
+ 		/* this urb is terminated, clean up */
+-		dbg("%s - urb shutting down with status: %d", __func__,
+-		    status);
++		dev_dbg(&port->dev, "%s - urb shutting down with status: %d\n",
++			__func__, status);
+ 		return;
+ 	default:
+-		dbg("%s - nonzero urb status received: %d", __func__,
+-		    status);
++		dev_dbg(&port->dev, "%s - nonzero urb status received: %d\n",
++			__func__, status);
+ 		goto exit;
+ 	}
+ 
+@@ -769,7 +773,7 @@ static void pl2303_read_int_callback(str
+ exit:
+ 	retval = usb_submit_urb(urb, GFP_ATOMIC);
+ 	if (retval)
+-		dev_err(&urb->dev->dev,
++		dev_err(&port->dev,
+ 			"%s - usb_submit_urb failed with result %d\n",
+ 			__func__, retval);
+ }
+@@ -807,7 +811,7 @@ static void pl2303_process_read_urb(stru
+ 		tty_flag = TTY_PARITY;
+ 	else if (line_status & UART_FRAME_ERROR)
+ 		tty_flag = TTY_FRAME;
+-	dbg("%s - tty_flag = %d", __func__, tty_flag);
++	dev_dbg(&port->dev, "%s - tty_flag = %d\n", __func__, tty_flag);
+ 
+ 	/* overrun is special, not associated with a char */
+ 	if (line_status & UART_OVERRUN_ERROR)
+--- a/drivers/usb/serial/visor.c
++++ b/drivers/usb/serial/visor.c
+@@ -244,7 +244,7 @@ static int visor_open(struct tty_struct
+ {
+ 	int result = 0;
+ 
+-	dbg("%s - port %d", __func__, port->number);
++	dev_dbg(&port->dev, "%s\n", __func__);
+ 
+ 	if (!port->read_urb) {
+ 		/* this is needed for some brain dead Sony devices */
+@@ -258,7 +258,7 @@ static int visor_open(struct tty_struct
+ 		goto exit;
+ 
+ 	if (port->interrupt_in_urb) {
+-		dbg("%s - adding interrupt input for treo", __func__);
++		dev_dbg(&port->dev, "adding interrupt input for treo\n");
+ 		result = usb_submit_urb(port->interrupt_in_urb, GFP_KERNEL);
+ 		if (result)
+ 			dev_err(&port->dev,
+@@ -274,7 +274,7 @@ static void visor_close(struct usb_seria
+ {
+ 	unsigned char *transfer_buffer;
+ 
+-	dbg("%s - port %d", __func__, port->number);
++	dev_dbg(&port->dev, "%s\n", __func__);
+ 
+ 	/* shutdown our urbs */
+ 	usb_serial_generic_close(port);
+@@ -310,12 +310,12 @@ static void visor_read_int_callback(stru
+ 	case -ENOENT:
+ 	case -ESHUTDOWN:
+ 		/* this urb is terminated, clean up */
+-		dbg("%s - urb shutting down with status: %d",
+-		    __func__, status);
++		dev_dbg(&port->dev, "%s - urb shutting down with status: %d\n",
++			__func__, status);
+ 		return;
+ 	default:
+-		dbg("%s - nonzero urb status received: %d",
+-		    __func__, status);
++		dev_dbg(&port->dev, "%s - nonzero urb status received: %d\n",
++			__func__, status);
+ 		goto exit;
+ 	}
+ 
+@@ -348,7 +348,7 @@ static int palm_os_3_probe(struct usb_se
+ 	int i;
+ 	int num_ports = 0;
+ 
+-	dbg("%s", __func__);
++	dev_dbg(dev, "%s\n", __func__);
+ 
+ 	transfer_buffer = kmalloc(sizeof(*connection_info), GFP_KERNEL);
+ 	if (!transfer_buffer) {
+@@ -445,7 +445,7 @@ static int palm_os_4_probe(struct usb_se
+ 	unsigned char *transfer_buffer;
+ 	int retval;
+ 
+-	dbg("%s", __func__);
++	dev_dbg(dev, "%s\n", __func__);
+ 
+ 	transfer_buffer =  kmalloc(sizeof(*connection_info), GFP_KERNEL);
+ 	if (!transfer_buffer) {
+@@ -478,7 +478,7 @@ static int visor_probe(struct usb_serial
+ 	int (*startup)(struct usb_serial *serial,
+ 					const struct usb_device_id *id);
+ 
+-	dbg("%s", __func__);
++	dev_dbg(&serial->dev->dev, "%s\n", __func__);
+ 
+ 	/*
+ 	 * some Samsung Android phones in modem mode have the same ID
+@@ -521,7 +521,7 @@ static int clie_3_5_startup(struct usb_s
+ 	int result;
+ 	u8 *data;
+ 
+-	dbg("%s", __func__);
++	dev_dbg(dev, "%s\n", __func__);
+ 
+ 	data = kmalloc(1, GFP_KERNEL);
+ 	if (!data)
+@@ -576,6 +576,8 @@ static int treo_attach(struct usb_serial
+ {
+ 	struct usb_serial_port *swap_port;
+ 
++	dev_dbg(&serial->dev->dev, "%s\n", __func__);
++
+ 	/* Only do this endpoint hack for the Handspring devices with
+ 	 * interrupt in endpoints, which for now are the Treo devices. */
+ 	if (!((le16_to_cpu(serial->dev->descriptor.idVendor)
+@@ -585,8 +587,6 @@ static int treo_attach(struct usb_serial
+ 		(serial->num_interrupt_in == 0))
+ 		return 0;
+ 
+-	dbg("%s", __func__);
+-
+ 	/*
+ 	* It appears that Treos and Kyoceras want to use the
+ 	* 1st bulk in endpoint to communicate with the 2nd bulk out endpoint,
+@@ -622,7 +622,7 @@ static int clie_5_attach(struct usb_seri
+ 	unsigned int pipe;
+ 	int j;
+ 
+-	dbg("%s", __func__);
++	dev_dbg(&port->dev, "%s\n", __func__);
+ 
+ 	/* TH55 registers 2 ports.
+ 	   Communication in from the UX50/TH55 uses bulk_in_endpointAddress