remove patches that have been applied to 3.5-rc1

author: Greg Kroah-Hartman <gregkh@linuxfoundation.org> 2012-06-08 17:12:38 +0900
committer: Greg Kroah-Hartman <gregkh@linuxfoundation.org> 2012-06-08 17:12:38 +0900
commit: 92bc28ba5d710658a2600c55a35a6d2acecc4825 (patch)
tree: 14e255f827eadab96f53589593b313d24a438750
parent: 4b54b72c5d696dae9276cdc16550a49cd1926067 (diff)
download: patches-92bc28ba5d710658a2600c55a35a6d2acecc4825.tar.gz
8 files changed, 39 insertions, 4164 deletions
diff --git a/hfsplus-bugfixes.patch b/hfsplus-bugfixes.patch
deleted file mode 100644
index 6675e2acc37da9..00000000000000
--- a/hfsplus-bugfixes.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From foo@baz Fri May  4 12:02:41 PDT 2012
-Date: Fri, 04 May 2012 12:02:41 -0700
-To: Greg KH <gregkh@linuxfoundation.org>
-From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Subject: [PATCH] hfsplus: Fix potential buffer overflows
-
-commit ec81aecb29668ad71f699f4e7b96ec46691895b6 (hfs: fix a potential
-buffer overflow) fixed a few potential buffer overflows in the hfs
-filesystem.  But as Timo Warns pointed out, these changes also need to
-be made on the hfsplus filesystem as well.
-
-Reported-by: Timo Warns <warns@pre-sense.de>
-Signed-off-by: WANG Cong <amwang@redhat.com>
-Cc: Alexey Khoroshilov <khoroshilov@ispras.ru>
-Cc: Cong Wang <amwang@redhat.com>
-Cc: Miklos Szeredi <mszeredi@suse.cz>
-Cc: Sage Weil <sage@newdream.net>
-Cc: Eugene Teo <eteo@redhat.com>
-Cc: Roman Zippel <zippel@linux-m68k.org>
-Cc: Al Viro <viro@zeniv.linux.org.uk>
-Cc: Christoph Hellwig <hch@lst.de>
-Cc: Alexey Dobriyan <adobriyan@gmail.com>
-Cc: Dave Anderson <anderson@redhat.com>
-Cc: stable <stable@vger.kernel.org>
-Cc: Andrew Morton <akpm@linux-foundation.org>
-Cc: Linus Torvalds <torvalds@linux-foundation.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- fs/hfsplus/catalog.c |    4 ++++
- fs/hfsplus/dir.c     |   11 +++++++++++
- 2 files changed, 15 insertions(+)
-
---- a/fs/hfsplus/catalog.c
-+++ b/fs/hfsplus/catalog.c
-@@ -366,6 +366,10 @@ int hfsplus_rename_cat(u32 cnid,
- 	err = hfs_brec_find(&src_fd);
- 	if (err)
- 		goto out;
-+	if (src_fd.entrylength > sizeof(entry) || src_fd.entrylength < 0) {
-+		err = -EIO;
-+		goto out;
-+	}
- 
- 	hfs_bnode_read(src_fd.bnode, &entry, src_fd.entryoffset,
- 				src_fd.entrylength);
---- a/fs/hfsplus/dir.c
-+++ b/fs/hfsplus/dir.c
-@@ -150,6 +150,11 @@ static int hfsplus_readdir(struct file *
- 		filp->f_pos++;
- 		/* fall through */
- 	case 1:
-+		if (fd.entrylength > sizeof(entry) || fd.entrylength < 0) {
-+			err = -EIO;
-+			goto out;
-+		}
-+
- 		hfs_bnode_read(fd.bnode, &entry, fd.entryoffset,
- 			fd.entrylength);
- 		if (be16_to_cpu(entry.type) != HFSPLUS_FOLDER_THREAD) {
-@@ -181,6 +186,12 @@ static int hfsplus_readdir(struct file *
- 			err = -EIO;
- 			goto out;
- 		}
-+
-+		if (fd.entrylength > sizeof(entry) || fd.entrylength < 0) {
-+			err = -EIO;
-+			goto out;
-+		}
-+
- 		hfs_bnode_read(fd.bnode, &entry, fd.entryoffset,
- 			fd.entrylength);
- 		type = be16_to_cpu(entry.type);
diff --git a/ipaq.patch b/ipaq.patch
deleted file mode 100644
index d2470c051e2217..00000000000000
--- a/ipaq.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From foo@baz Thu Apr 19 15:13:59 PDT 2012
-Date: Thu, 19 Apr 2012 15:13:59 -0700
-To: Greg KH <gregkh@linuxfoundation.org>
-From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Subject: USB: serial: ipaq: remove product and vendor module parameters
-
-This driver is for devices that are no longer being made, so the ability
-to add new device ids when loading the module is not a feature that
-anyone uses anymore.  So remove it, which simplifies the startup code a
-lot, and saves space.
-
-If you still need to dynamically load device ids, that can be done
-through sysfs.
-
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/usb/serial/ipaq.c |   33 +--------------------------------
- 1 file changed, 1 insertion(+), 32 deletions(-)
-
---- a/drivers/usb/serial/ipaq.c
-+++ b/drivers/usb/serial/ipaq.c
-@@ -33,7 +33,6 @@
- #define DRIVER_AUTHOR "Ganesh Varadarajan <ganesh@veritas.com>"
- #define DRIVER_DESC "USB PocketPC PDA driver"
- 
--static __u16 product, vendor;
- static bool debug;
- static int connect_retries = KP_RETRIES;
- static int initial_wait;
-@@ -45,7 +44,6 @@ static int  ipaq_calc_num_ports(struct u
- static int  ipaq_startup(struct usb_serial *serial);
- 
- static struct usb_device_id ipaq_id_table [] = {
--	/* The first entry is a placeholder for the insmod-specified device */
- 	{ USB_DEVICE(0x049F, 0x0003) },
- 	{ USB_DEVICE(0x0104, 0x00BE) }, /* Socket USB Sync */
- 	{ USB_DEVICE(0x03F0, 0x1016) }, /* HP USB Sync */
-@@ -619,30 +617,7 @@ static int ipaq_startup(struct usb_seria
- 	return usb_reset_configuration(serial->dev);
- }
- 
--static int __init ipaq_init(void)
--{
--	int retval;
--
--	if (vendor) {
--		ipaq_id_table[0].idVendor = vendor;
--		ipaq_id_table[0].idProduct = product;
--	}
--
--	retval = usb_serial_register_drivers(&ipaq_driver, serial_drivers);
--	if (retval == 0)
--		printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
--			       DRIVER_DESC "\n");
--	return retval;
--}
--
--static void __exit ipaq_exit(void)
--{
--	usb_serial_deregister_drivers(&ipaq_driver, serial_drivers);
--}
--
--
--module_init(ipaq_init);
--module_exit(ipaq_exit);
-+module_usb_serial_driver(ipaq_driver, serial_drivers);
- 
- MODULE_AUTHOR(DRIVER_AUTHOR);
- MODULE_DESCRIPTION(DRIVER_DESC);
-@@ -651,12 +626,6 @@ MODULE_LICENSE("GPL");
- module_param(debug, bool, S_IRUGO | S_IWUSR);
- MODULE_PARM_DESC(debug, "Debug enabled or not");
- 
--module_param(vendor, ushort, 0);
--MODULE_PARM_DESC(vendor, "User specified USB idVendor");
--
--module_param(product, ushort, 0);
--MODULE_PARM_DESC(product, "User specified USB idProduct");
--
- module_param(connect_retries, int, S_IRUGO|S_IWUSR);
- MODULE_PARM_DESC(connect_retries,
- 		"Maximum number of connect retries (one second each)");
diff --git a/modpost-use-proper-kernel-style-for-autogenerated-files.patch b/modpost-use-proper-kernel-style-for-autogenerated-files.patch
deleted file mode 100644
index 331a3b1f190e29..00000000000000
--- a/modpost-use-proper-kernel-style-for-autogenerated-files.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From foo@baz Wed Apr 25 11:06:38 PDT 2012
-Date: Wed, 25 Apr 2012 11:06:38 -0700
-To: Rusty Russell <rusty@rustcorp.com.au>
-Cc: linux-kernel@vger.kernel.org
-Cc: Alessio Igor Bogani <abogani@kernel.org>
-Cc: Tony Lindgren <tony@atomide.com>
-Cc: Ben Hutchings <ben@decadent.org.uk>
-Cc: Russell King <rmk+kernel@arm.linux.org.uk>
-From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Subject: [PATCH] modpost: use proper kernel style for autogenerated files
-
-If the kernel build process is creating files automatically, the least
-it can do is create them in a properly formatted manner.  Sure, it's a
-minor issue, but being consistent is nice.
-
-Cc: Rusty Russell <rusty@rustcorp.com.au>
-Cc: Alessio Igor Bogani <abogani@kernel.org>
-Cc: Tony Lindgren <tony@atomide.com>
-Cc: Ben Hutchings <ben@decadent.org.uk>
-Cc: Russell King <rmk+kernel@arm.linux.org.uk>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- scripts/mod/modpost.c |    8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
---- a/scripts/mod/modpost.c
-+++ b/scripts/mod/modpost.c
-@@ -1850,14 +1850,14 @@ static void add_header(struct buffer *b,
- 	buf_printf(b, "\n");
- 	buf_printf(b, "struct module __this_module\n");
- 	buf_printf(b, "__attribute__((section(\".gnu.linkonce.this_module\"))) = {\n");
--	buf_printf(b, " .name = KBUILD_MODNAME,\n");
-+	buf_printf(b, "\t.name = KBUILD_MODNAME,\n");
- 	if (mod->has_init)
--		buf_printf(b, " .init = init_module,\n");
-+		buf_printf(b, "\t.init = init_module,\n");
- 	if (mod->has_cleanup)
- 		buf_printf(b, "#ifdef CONFIG_MODULE_UNLOAD\n"
--			      " .exit = cleanup_module,\n"
-+			      "\t.exit = cleanup_module,\n"
- 			      "#endif\n");
--	buf_printf(b, " .arch = MODULE_ARCH_INIT,\n");
-+	buf_printf(b, "\t.arch = MODULE_ARCH_INIT,\n");
- 	buf_printf(b, "};\n");
- }
- 
diff --git a/perf-turn-off-compiler-warnings-for-flex-and-bison-generated-files.patch b/perf-turn-off-compiler-warnings-for-flex-and-bison-generated-files.patch
deleted file mode 100644
index e8c89e70dbeda5..00000000000000
--- a/perf-turn-off-compiler-warnings-for-flex-and-bison-generated-files.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From foo@baz Fri May  4 11:27:46 PDT 2012
-Date: Fri, 04 May 2012 11:27:46 -0700
-To: Peter Zijlstra <a.p.zijlstra@chello.nl>
-To: Paul Mackerras <paulus@samba.org>
-To: Ingo Molnar <mingo@redhat.com>
-To: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
-From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Subject: [PATCH] perf: turn off compiler warnings for flex and bison generated files
-
-We don't know what types of warnings different versions of flex and bison
-combined with different versions of gcc is going to generate, so just punt and
-don't warn about anything.
-
-This fixes the build of perf for me on an openSUSE 12.1 system.
-
-Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
-Cc: Paul Mackerras <paulus@samba.org>
-Cc: Ingo Molnar <mingo@redhat.com>
-Cc: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
-Note, I don't really like this, but how else are we going to ensure that we
-catch all warnings?  Pick them off one by one?  Better ideas are accepted...
-
- tools/perf/Makefile |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/tools/perf/Makefile
-+++ b/tools/perf/Makefile
-@@ -774,10 +774,10 @@ $(OUTPUT)perf.o perf.spec \
- # over the general rule for .o
- 
- $(OUTPUT)util/%-flex.o: $(OUTPUT)util/%-flex.c $(OUTPUT)PERF-CFLAGS
--	$(QUIET_CC)$(CC) -o $@ -c $(ALL_CFLAGS) -Iutil/ -Wno-redundant-decls -Wno-switch-default -Wno-unused-function $<
-+	$(QUIET_CC)$(CC) -o $@ -c $(ALL_CFLAGS) -Iutil/ -w $<
- 
- $(OUTPUT)util/%-bison.o: $(OUTPUT)util/%-bison.c $(OUTPUT)PERF-CFLAGS
--	$(QUIET_CC)$(CC) -o $@ -c $(ALL_CFLAGS) -DYYENABLE_NLS=0 -DYYLTYPE_IS_TRIVIAL=0 -Iutil/ -Wno-redundant-decls -Wno-switch-default -Wno-unused-function $<
-+	$(QUIET_CC)$(CC) -o $@ -c $(ALL_CFLAGS) -DYYENABLE_NLS=0 -DYYLTYPE_IS_TRIVIAL=0 -Iutil/ -w $<
- 
- $(OUTPUT)%.o: %.c $(OUTPUT)PERF-CFLAGS
- 	$(QUIET_CC)$(CC) -o $@ -c $(ALL_CFLAGS) $<
diff --git a/printk.patch b/printk.patch
deleted file mode 100644
index b8ed3ec1db13fc..00000000000000
--- a/printk.patch
+++ /dev/null
@@ -1,3693 +0,0 @@
----
- drivers/usb/serial/belkin_sa.c        |   10 ----
- drivers/usb/serial/ch341.c            |   22 ---------
- drivers/usb/serial/console.c          |    6 --
- drivers/usb/serial/cp210x.c           |   11 ----
- drivers/usb/serial/cyberjack.c        |   18 -------
- drivers/usb/serial/cypress_m8.c       |   36 --------------
- drivers/usb/serial/digi_acceleport.c  |   25 ----------
- drivers/usb/serial/empeg.c            |    4 -
- drivers/usb/serial/ezusb.c            |    2 
- drivers/usb/serial/f81232.c           |    3 -
- drivers/usb/serial/ftdi_sio.c         |   35 --------------
- drivers/usb/serial/garmin_gps.c       |   19 -------
- drivers/usb/serial/generic.c          |   22 ---------
- drivers/usb/serial/ipaq.c             |    4 -
- drivers/usb/serial/ipw.c              |    2 
- drivers/usb/serial/ir-usb.c           |   13 -----
- drivers/usb/serial/iuu_phoenix.c      |   38 ---------------
- drivers/usb/serial/keyspan.c          |   51 --------------------
- drivers/usb/serial/keyspan_pda.c      |    8 ---
- drivers/usb/serial/kl5kusb105.c       |    9 ---
- drivers/usb/serial/kobil_sct.c        |    7 --
- drivers/usb/serial/mct_u232.c         |   17 ------
- drivers/usb/serial/mos7720.c          |   34 +++++--------
- drivers/usb/serial/mos7840.c          |   59 ------------------------
- drivers/usb/serial/navman.c           |    6 --
- drivers/usb/serial/omninet.c          |   13 -----
- drivers/usb/serial/opticon.c          |   18 -------
- drivers/usb/serial/option.c           |    2 
- drivers/usb/serial/oti6858.c          |   29 -----------
- drivers/usb/serial/pl2303.c           |   83 ++++++++++++++--------------------
- drivers/usb/serial/qcserial.c         |    3 -
- drivers/usb/serial/sierra.c           |   36 +-------------
- drivers/usb/serial/spcp8x5.c          |    2 
- drivers/usb/serial/ssu100.c           |   19 -------
- drivers/usb/serial/symbolserial.c     |   13 -----
- drivers/usb/serial/ti_usb_3410_5052.c |   38 ---------------
- drivers/usb/serial/usb_wwan.c         |   23 ---------
- drivers/usb/serial/visor.c            |   26 ++--------
- drivers/usb/serial/whiteheat.c        |   30 ------------
- 39 files changed, 68 insertions(+), 728 deletions(-)
-
---- a/drivers/usb/serial/belkin_sa.c
-+++ b/drivers/usb/serial/belkin_sa.c
-@@ -159,8 +159,6 @@ static void belkin_sa_release(struct usb
- {
- 	int i;
- 
--	dbg("%s", __func__);
--
- 	for (i = 0; i < serial->num_ports; ++i)
- 		kfree(usb_get_serial_port_data(serial->port[i]));
- }
-@@ -170,8 +168,6 @@ static int belkin_sa_open(struct tty_str
- {
- 	int retval;
- 
--	dbg("%s port %d", __func__, port->number);
--
- 	retval = usb_submit_urb(port->interrupt_in_urb, GFP_KERNEL);
- 	if (retval) {
- 		dev_err(&port->dev, "usb_submit_urb(read int) failed\n");
-@@ -187,8 +183,6 @@ static int belkin_sa_open(struct tty_str
- 
- static void belkin_sa_close(struct usb_serial_port *port)
- {
--	dbg("%s port %d", __func__, port->number);
--
- 	usb_serial_generic_close(port);
- 	usb_kill_urb(port->interrupt_in_urb);
- }
-@@ -463,8 +457,6 @@ static int belkin_sa_tiocmget(struct tty
- 	unsigned long control_state;
- 	unsigned long flags;
- 
--	dbg("%s", __func__);
--
- 	spin_lock_irqsave(&priv->lock, flags);
- 	control_state = priv->control_state;
- 	spin_unlock_irqrestore(&priv->lock, flags);
-@@ -484,8 +476,6 @@ static int belkin_sa_tiocmset(struct tty
- 	int rts = 0;
- 	int dtr = 0;
- 
--	dbg("%s", __func__);
--
- 	spin_lock_irqsave(&priv->lock, flags);
- 	control_state = priv->control_state;
- 
---- a/drivers/usb/serial/ch341.c
-+++ b/drivers/usb/serial/ch341.c
-@@ -125,8 +125,6 @@ static int ch341_set_baudrate(struct usb
- 	unsigned long factor;
- 	short divisor;
- 
--	dbg("ch341_set_baudrate(%d)", priv->baud_rate);
--
- 	if (!priv->baud_rate)
- 		return -EINVAL;
- 	factor = (CH341_BAUDBASE_FACTOR / priv->baud_rate);
-@@ -153,7 +151,6 @@ static int ch341_set_baudrate(struct usb
- 
- static int ch341_set_handshake(struct usb_device *dev, u8 control)
- {
--	dbg("ch341_set_handshake(0x%02x)", control);
- 	return ch341_control_out(dev, 0xa4, ~control, 0);
- }
- 
-@@ -164,8 +161,6 @@ static int ch341_get_status(struct usb_d
- 	const unsigned size = 8;
- 	unsigned long flags;
- 
--	dbg("ch341_get_status()");
--
- 	buffer = kmalloc(size, GFP_KERNEL);
- 	if (!buffer)
- 		return -ENOMEM;
-@@ -196,8 +191,6 @@ static int ch341_configure(struct usb_de
- 	int r;
- 	const unsigned size = 8;
- 
--	dbg("ch341_configure()");
--
- 	buffer = kmalloc(size, GFP_KERNEL);
- 	if (!buffer)
- 		return -ENOMEM;
-@@ -254,8 +247,6 @@ static int ch341_attach(struct usb_seria
- 	struct ch341_private *priv;
- 	int r;
- 
--	dbg("ch341_attach()");
--
- 	/* private data */
- 	priv = kzalloc(sizeof(struct ch341_private), GFP_KERNEL);
- 	if (!priv)
-@@ -290,7 +281,6 @@ static void ch341_dtr_rts(struct usb_ser
- 	struct ch341_private *priv = usb_get_serial_port_data(port);
- 	unsigned long flags;
- 
--	dbg("%s - port %d", __func__, port->number);
- 	/* drop DTR and RTS */
- 	spin_lock_irqsave(&priv->lock, flags);
- 	if (on)
-@@ -304,8 +294,6 @@ static void ch341_dtr_rts(struct usb_ser
- 
- static void ch341_close(struct usb_serial_port *port)
- {
--	dbg("%s - port %d", __func__, port->number);
--
- 	usb_serial_generic_close(port);
- 	usb_kill_urb(port->interrupt_in_urb);
- }
-@@ -318,8 +306,6 @@ static int ch341_open(struct tty_struct
- 	struct ch341_private *priv = usb_get_serial_port_data(serial->port[0]);
- 	int r;
- 
--	dbg("ch341_open()");
--
- 	priv->baud_rate = DEFAULT_BAUD_RATE;
- 
- 	r = ch341_configure(serial->dev, priv);
-@@ -358,8 +344,6 @@ static void ch341_set_termios(struct tty
- 	unsigned baud_rate;
- 	unsigned long flags;
- 
--	dbg("ch341_set_termios()");
--
- 	baud_rate = tty_get_baud_rate(tty);
- 
- 	priv->baud_rate = baud_rate;
-@@ -393,8 +377,6 @@ static void ch341_break_ctl(struct tty_s
- 	uint16_t reg_contents;
- 	uint8_t *break_reg;
- 
--	dbg("%s()", __func__);
--
- 	break_reg = kmalloc(2, GFP_KERNEL);
- 	if (!break_reg) {
- 		dev_err(&port->dev, "%s - kmalloc failed\n", __func__);
-@@ -461,8 +443,6 @@ static void ch341_read_int_callback(stru
- 	unsigned int actual_length = urb->actual_length;
- 	int status;
- 
--	dbg("%s (%d)", __func__, port->number);
--
- 	switch (urb->status) {
- 	case 0:
- 		/* success */
-@@ -580,8 +560,6 @@ static int ch341_tiocmget(struct tty_str
- 	u8 status;
- 	unsigned int result;
- 
--	dbg("%s (%d)", __func__, port->number);
--
- 	spin_lock_irqsave(&priv->lock, flags);
- 	mcr = priv->line_control;
- 	status = priv->line_status;
---- 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;
-@@ -82,7 +80,7 @@ static int usb_console_setup(struct cons
- 		if (*s)
- 			doflow = (*s++ == 'r');
- 	}
--	
-+
- 	/* Sane default */
- 	if (baud == 0)
- 		baud = 9600;
-@@ -212,8 +210,6 @@ static void usb_console_write(struct con
- 	if (count == 0)
- 		return;
- 
--	dbg("%s - port %d, %d byte(s)", __func__, port->number, count);
--
- 	if (!port->port.console) {
- 		dbg("%s - port not opened", __func__);
- 		return;
---- a/drivers/usb/serial/cp210x.c
-+++ b/drivers/usb/serial/cp210x.c
-@@ -422,8 +422,6 @@ static int cp210x_open(struct tty_struct
- {
- 	int result;
- 
--	dbg("%s - port %d", __func__, port->number);
--
- 	result = cp210x_set_config_single(port, CP210X_IFC_ENABLE,
- 								UART_ENABLE);
- 	if (result) {
-@@ -443,8 +441,6 @@ static int cp210x_open(struct tty_struct
- 
- static void cp210x_close(struct usb_serial_port *port)
- {
--	dbg("%s - port %d", __func__, port->number);
--
- 	usb_serial_generic_close(port);
- 
- 	mutex_lock(&port->serial->disc_mutex);
-@@ -488,8 +484,6 @@ static void cp210x_get_termios_port(stru
- 	unsigned int baud;
- 	unsigned int bits;
- 
--	dbg("%s - port %d", __func__, port->number);
--
- 	cp210x_get_config(port, CP210X_GET_BAUDRATE, &baud, 4);
- 
- 	dbg("%s - baud rate = %d", __func__, baud);
-@@ -787,8 +781,6 @@ static int cp210x_tiocmset_port(struct u
- {
- 	unsigned int control = 0;
- 
--	dbg("%s - port %d", __func__, port->number);
--
- 	if (set & TIOCM_RTS) {
- 		control |= CONTROL_RTS;
- 		control |= CONTROL_WRITE_RTS;
-@@ -825,8 +817,6 @@ static int cp210x_tiocmget (struct tty_s
- 	unsigned int control;
- 	int result;
- 
--	dbg("%s - port %d", __func__, port->number);
--
- 	cp210x_get_config(port, CP210X_GET_MDMSTS, &control, 1);
- 
- 	result = ((control & CONTROL_DTR) ? TIOCM_DTR : 0)
-@@ -846,7 +836,6 @@ static void cp210x_break_ctl (struct tty
- 	struct usb_serial_port *port = tty->driver_data;
- 	unsigned int state;
- 
--	dbg("%s - port %d", __func__, port->number);
- 	if (break_state == 0)
- 		state = BREAK_OFF;
- 	else
---- a/drivers/usb/serial/cyberjack.c
-+++ b/drivers/usb/serial/cyberjack.c
-@@ -122,8 +122,6 @@ static int cyberjack_startup(struct usb_
- 	struct cyberjack_private *priv;
- 	int i;
- 
--	dbg("%s", __func__);
--
- 	/* allocate the private data structure */
- 	priv = kmalloc(sizeof(struct cyberjack_private), GFP_KERNEL);
- 	if (!priv)
-@@ -155,8 +153,6 @@ static void cyberjack_disconnect(struct
- {
- 	int i;
- 
--	dbg("%s", __func__);
--
- 	for (i = 0; i < serial->num_ports; ++i)
- 		usb_kill_urb(serial->port[i]->interrupt_in_urb);
- }
-@@ -165,8 +161,6 @@ static void cyberjack_release(struct usb
- {
- 	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]));
-@@ -180,8 +174,6 @@ static int  cyberjack_open(struct tty_st
- 	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);
- 
-@@ -197,8 +189,6 @@ static int  cyberjack_open(struct tty_st
- 
- 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);
-@@ -214,8 +204,6 @@ static int cyberjack_write(struct tty_st
- 	int result;
- 	int wrexpected;
- 
--	dbg("%s - port %d", __func__, port->number);
--
- 	if (count == 0) {
- 		dbg("%s - write request of 0 bytes", __func__);
- 		return 0;
-@@ -307,8 +295,6 @@ static void cyberjack_read_int_callback(
- 	int status = urb->status;
- 	int result;
- 
--	dbg("%s - port %d", __func__, port->number);
--
- 	/* the urb might have been killed. */
- 	if (status)
- 		return;
-@@ -367,8 +353,6 @@ static void cyberjack_read_bulk_callback
- 	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) {
-@@ -417,8 +401,6 @@ static void cyberjack_write_bulk_callbac
- 	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",
---- a/drivers/usb/serial/cypress_m8.c
-+++ b/drivers/usb/serial/cypress_m8.c
-@@ -305,8 +305,6 @@ static int cypress_serial_control(struct
- 	const unsigned int feature_len = 5;
- 	unsigned long flags;
- 
--	dbg("%s", __func__);
--
- 	priv = usb_get_serial_port_data(port);
- 
- 	if (!priv->comm_is_ok)
-@@ -451,8 +449,6 @@ static int generic_startup(struct usb_se
- 	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;
-@@ -505,8 +501,6 @@ static int cypress_earthmate_startup(str
- 	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);
-@@ -537,8 +531,6 @@ static int cypress_hidcom_startup(struct
- {
- 	struct cypress_private *priv;
- 
--	dbg("%s", __func__);
--
- 	if (generic_startup(serial)) {
- 		dbg("%s - Failed setting up port %d", __func__,
- 				serial->port[0]->number);
-@@ -556,8 +548,6 @@ static int cypress_ca42v2_startup(struct
- {
- 	struct cypress_private *priv;
- 
--	dbg("%s", __func__);
--
- 	if (generic_startup(serial)) {
- 		dbg("%s - Failed setting up port %d", __func__,
- 				serial->port[0]->number);
-@@ -575,10 +565,7 @@ static void cypress_release(struct usb_s
- {
- 	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) {
-@@ -595,8 +582,6 @@ static int cypress_open(struct tty_struc
- 	unsigned long flags;
- 	int result = 0;
- 
--	dbg("%s - port %d", __func__, port->number);
--
- 	if (!priv->comm_is_ok)
- 		return -EIO;
- 
-@@ -661,8 +646,6 @@ static void cypress_close(struct usb_ser
- 	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) {
-@@ -720,7 +703,6 @@ static void cypress_send(struct usb_seri
- 	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);
- 
-@@ -828,8 +810,6 @@ static int cypress_write_room(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);
-@@ -847,8 +827,6 @@ static int cypress_tiocmget(struct tty_s
- 	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;
-@@ -874,8 +852,6 @@ static int cypress_tiocmset(struct tty_s
- 	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;
-@@ -948,8 +924,6 @@ static void cypress_set_termios(struct t
- 	__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 */
-@@ -1096,8 +1070,6 @@ static int cypress_chars_in_buffer(struc
- 	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);
-@@ -1112,8 +1084,6 @@ static void cypress_throttle(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);
-@@ -1126,8 +1096,6 @@ static void cypress_unthrottle(struct tt
- 	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;
-@@ -1161,8 +1129,6 @@ static void cypress_read_int_callback(st
- 	int i = 0;
- 	int status = urb->status;
- 
--	dbg("%s - port %d", __func__, port->number);
--
- 	switch (status) {
- 	case 0: /* success */
- 		break;
-@@ -1303,8 +1269,6 @@ static void cypress_write_int_callback(s
- 	int result;
- 	int status = urb->status;
- 
--	dbg("%s - port %d", __func__, port->number);
--
- 	switch (status) {
- 	case 0:
- 		/* success */
---- a/drivers/usb/serial/digi_acceleport.c
-+++ b/drivers/usb/serial/digi_acceleport.c
-@@ -657,9 +657,6 @@ static void digi_rx_throttle(struct tty_
- 	struct usb_serial_port *port = tty->driver_data;
- 	struct digi_port *priv = usb_get_serial_port_data(port);
- 
--
--	dbg("digi_rx_throttle: TOP: port=%d", priv->dp_port_num);
--
- 	/* stop receiving characters by not resubmitting the read urb */
- 	spin_lock_irqsave(&priv->dp_port_lock, flags);
- 	priv->dp_throttled = 1;
-@@ -675,8 +672,6 @@ static void digi_rx_unthrottle(struct tt
- 	struct usb_serial_port *port = tty->driver_data;
- 	struct digi_port *priv = usb_get_serial_port_data(port);
- 
--	dbg("digi_rx_unthrottle: TOP: port=%d", priv->dp_port_num);
--
- 	spin_lock_irqsave(&priv->dp_port_lock, flags);
- 
- 	/* restart read chain */
-@@ -904,8 +899,6 @@ static int digi_tiocmget(struct tty_stru
- 	unsigned int val;
- 	unsigned long flags;
- 
--	dbg("%s: TOP: port=%d", __func__, priv->dp_port_num);
--
- 	spin_lock_irqsave(&priv->dp_port_lock, flags);
- 	val = priv->dp_modem_signals;
- 	spin_unlock_irqrestore(&priv->dp_port_lock, flags);
-@@ -921,8 +914,6 @@ static int digi_tiocmset(struct tty_stru
- 	unsigned int val;
- 	unsigned long flags;
- 
--	dbg("%s: TOP: port=%d", __func__, priv->dp_port_num);
--
- 	spin_lock_irqsave(&priv->dp_port_lock, flags);
- 	val = (priv->dp_modem_signals & ~clear) | set;
- 	spin_unlock_irqrestore(&priv->dp_port_lock, flags);
-@@ -1013,8 +1004,6 @@ static void digi_write_bulk_callback(str
- 	int ret = 0;
- 	int status = urb->status;
- 
--	dbg("digi_write_bulk_callback: TOP, status=%d", status);
--
- 	/* port and serial sanity check */
- 	if (port == NULL || (priv = usb_get_serial_port_data(port)) == NULL) {
- 		pr_err("%s: port or port->private is NULL, status=%d\n",
-@@ -1121,8 +1110,6 @@ static int digi_open(struct tty_struct *
- 	struct digi_port *priv = usb_get_serial_port_data(port);
- 	struct ktermios not_termios;
- 
--	dbg("digi_open: TOP: port=%d", priv->dp_port_num);
--
- 	/* be sure the device is started up */
- 	if (digi_startup_device(port->serial) != 0)
- 		return -ENXIO;
-@@ -1160,8 +1147,6 @@ static void digi_close(struct usb_serial
- 	unsigned char buf[32];
- 	struct digi_port *priv = usb_get_serial_port_data(port);
- 
--	dbg("digi_close: TOP: port=%d", priv->dp_port_num);
--
- 	mutex_lock(&port->serial->disc_mutex);
- 	/* if disconnected, just clear flags */
- 	if (port->serial->disconnected)
-@@ -1220,7 +1205,6 @@ exit:
- 	wake_up_interruptible(&priv->dp_close_wait);
- 	spin_unlock_irq(&priv->dp_port_lock);
- 	mutex_unlock(&port->serial->disc_mutex);
--	dbg("digi_close: done");
- }
- 
- 
-@@ -1269,8 +1253,6 @@ static int digi_startup(struct usb_seria
- 	struct digi_port *priv;
- 	struct digi_serial *serial_priv;
- 
--	dbg("digi_startup: TOP");
--
- 	/* allocate the private data structures for all ports */
- 	/* number of regular ports + 1 for the out-of-band port */
- 	for (i = 0; i < serial->type->num_ports + 1; i++) {
-@@ -1325,7 +1307,6 @@ static int digi_startup(struct usb_seria
- static void digi_disconnect(struct usb_serial *serial)
- {
- 	int i;
--	dbg("digi_disconnect: TOP, in_interrupt()=%ld", in_interrupt());
- 
- 	/* stop reads and writes on all ports */
- 	for (i = 0; i < serial->type->num_ports + 1; i++) {
-@@ -1338,7 +1319,6 @@ static void digi_disconnect(struct usb_s
- static void digi_release(struct usb_serial *serial)
- {
- 	int i;
--	dbg("digi_release: TOP, in_interrupt()=%ld", in_interrupt());
- 
- 	/* free the private data structures for all ports */
- 	/* number of regular ports + 1 for the out-of-band port */
-@@ -1356,8 +1336,6 @@ static void digi_read_bulk_callback(stru
- 	int ret;
- 	int status = urb->status;
- 
--	dbg("digi_read_bulk_callback: TOP");
--
- 	/* port sanity check, do not resubmit if port is not valid */
- 	if (port == NULL)
- 		return;
-@@ -1507,9 +1485,6 @@ static int digi_read_oob_callback(struct
- 	int i;
- 	unsigned int rts;
- 
--	dbg("digi_read_oob_callback: port=%d, len=%d",
--			priv->dp_port_num, urb->actual_length);
--
- 	/* handle each oob command */
- 	for (i = 0; i < urb->actual_length - 3;) {
- 		opcode = ((unsigned char *)urb->transfer_buffer)[i++];
---- a/drivers/usb/serial/empeg.c
-+++ b/drivers/usb/serial/empeg.c
-@@ -80,14 +80,12 @@ static int empeg_startup(struct usb_seri
- {
- 	int r;
- 
--	dbg("%s", __func__);
--
- 	if (serial->dev->actconfig->desc.bConfigurationValue != 1) {
- 		dev_err(&serial->dev->dev, "active config #%d != 1 ??\n",
- 			serial->dev->actconfig->desc.bConfigurationValue);
- 		return -ENODEV;
- 	}
--	dbg("%s - reset config", __func__);
-+
- 	r = usb_reset_configuration(serial->dev);
- 
- 	/* continue on with initialization */
---- a/drivers/usb/serial/ezusb.c
-+++ b/drivers/usb/serial/ezusb.c
-@@ -26,7 +26,6 @@ int ezusb_writememory(struct usb_serial
- 	int result;
- 	unsigned char *transfer_buffer;
- 
--	/* dbg("ezusb_writememory %x, %d", address, length); */
- 	if (!serial->dev) {
- 		printk(KERN_ERR "ezusb: %s - no physical device present, "
- 		       "failing.\n", __func__);
-@@ -50,7 +49,6 @@ int ezusb_set_reset(struct usb_serial *s
- {
- 	int response;
- 
--	/* dbg("%s - %d", __func__, reset_bit); */
- 	response = ezusb_writememory(serial, CPUCS_REG, &reset_bit, 1, 0xa0);
- 	if (response < 0)
- 		dev_err(&serial->dev->dev, "%s- %d failed\n",
---- a/drivers/usb/serial/f81232.c
-+++ b/drivers/usb/serial/f81232.c
-@@ -68,8 +68,6 @@ static void f81232_read_int_callback(str
- 	int status = urb->status;
- 	int retval;
- 
--	dbg("%s (%d)", __func__, port->number);
--
- 	switch (status) {
- 	case 0:
- 		/* success */
-@@ -203,7 +201,6 @@ static int f81232_open(struct tty_struct
- 	if (tty)
- 		f81232_set_termios(tty, port, &tmp_termios);
- 
--	dbg("%s - submitting interrupt urb", __func__);
- 	result = usb_submit_urb(port->interrupt_in_urb, GFP_KERNEL);
- 	if (result) {
- 		dev_err(&port->dev, "%s - failed submitting interrupt urb,"
---- a/drivers/usb/serial/ftdi_sio.c
-+++ b/drivers/usb/serial/ftdi_sio.c
-@@ -1285,8 +1285,6 @@ static int read_latency_timer(struct usb
- 	unsigned char *buf;
- 	int rv;
- 
--	dbg("%s", __func__);
--
- 	buf = kmalloc(1, GFP_KERNEL);
- 	if (!buf)
- 		return -ENOMEM;
-@@ -1593,8 +1591,6 @@ static int create_sysfs_attrs(struct usb
- 	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) {
-@@ -1619,8 +1615,6 @@ static void remove_sysfs_attrs(struct us
- {
- 	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);
-@@ -1667,8 +1661,6 @@ static int ftdi_sio_port_probe(struct us
- 	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__,
-@@ -1704,8 +1696,6 @@ static int ftdi_sio_port_probe(struct us
- /* 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;
-@@ -1716,8 +1706,6 @@ static void ftdi_USB_UIRT_setup(struct f
- 
- 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;
-@@ -1767,8 +1755,6 @@ static int ftdi_jtag_probe(struct usb_se
- 	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");
-@@ -1782,8 +1768,6 @@ static int ftdi_8u2232c_probe(struct usb
- {
- 	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);
-@@ -1800,8 +1784,6 @@ static int ftdi_stmclite_probe(struct us
- 	struct usb_device *udev = serial->dev;
- 	struct usb_interface *interface = serial->interface;
- 
--	dbg("%s", __func__);
--
- 	if (interface == udev->actconfig->interface[2])
- 		return 0;
- 
-@@ -1839,8 +1821,6 @@ static int ftdi_sio_port_remove(struct u
- {
- 	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);
- 
-@@ -1858,8 +1838,6 @@ static int ftdi_open(struct tty_struct *
- 	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),
-@@ -1918,8 +1896,6 @@ static void ftdi_close(struct usb_serial
- {
- 	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);
- }
-@@ -1976,8 +1952,6 @@ static int ftdi_process_packet(struct tt
- 	char flag;
- 	char *ch;
- 
--	dbg("%s - port %d", __func__, port->number);
--
- 	if (len < 2) {
- 		dbg("malformed packet");
- 		return 0;
-@@ -2121,8 +2095,6 @@ static void ftdi_set_termios(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)) {
-@@ -2295,8 +2267,6 @@ static int ftdi_tiocmget(struct tty_stru
- 	int len;
- 	int ret;
- 
--	dbg("%s TIOCMGET", __func__);
--
- 	buf = kmalloc(2, GFP_KERNEL);
- 	if (!buf)
- 		return -ENOMEM;
-@@ -2346,7 +2316,7 @@ static int ftdi_tiocmset(struct tty_stru
- 			unsigned int set, unsigned int clear)
- {
- 	struct usb_serial_port *port = tty->driver_data;
--	dbg("%s TIOCMSET", __func__);
-+
- 	return update_mctrl(port, set, clear);
- }
- 
-@@ -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;
-@@ -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);
- }
- 
---- a/drivers/usb/serial/garmin_gps.c
-+++ b/drivers/usb/serial/garmin_gps.c
-@@ -345,8 +345,6 @@ static void pkt_clear(struct garmin_data
- 	unsigned long flags;
- 	struct garmin_packet *result = NULL;
- 
--	dbg("%s", __func__);
--
- 	spin_lock_irqsave(&garmin_data_p->lock, flags);
- 	while (!list_empty(&garmin_data_p->pktlist)) {
- 		result = (struct garmin_packet *)garmin_data_p->pktlist.next;
-@@ -939,8 +937,6 @@ static int garmin_open(struct tty_struct
- 	int status = 0;
- 	struct garmin_data *garmin_data_p = usb_get_serial_port_data(port);
- 
--	dbg("%s - port %d", __func__, port->number);
--
- 	spin_lock_irqsave(&garmin_data_p->lock, flags);
- 	garmin_data_p->mode  = initial_mode;
- 	garmin_data_p->count = 0;
-@@ -996,8 +992,6 @@ static void garmin_write_bulk_callback(s
- 		struct garmin_data *garmin_data_p =
- 					usb_get_serial_port_data(port);
- 
--		dbg("%s - port %d", __func__, port->number);
--
- 		if (GARMIN_LAYERID_APPL == getLayerId(urb->transfer_buffer)) {
- 
- 			if (garmin_data_p->mode == MODE_GARMIN_SERIAL) {
-@@ -1027,9 +1021,6 @@ static int garmin_write_bulk(struct usb_
- 	unsigned char *buffer;
- 	int status;
- 
--	dbg("%s - port %d, state %d", __func__, port->number,
--		garmin_data_p->state);
--
- 	spin_lock_irqsave(&garmin_data_p->lock, flags);
- 	garmin_data_p->flags &= ~FLAGS_DROP_DATA;
- 	spin_unlock_irqrestore(&garmin_data_p->lock, flags);
-@@ -1224,8 +1215,6 @@ static void garmin_read_bulk_callback(st
- 	int status = urb->status;
- 	int retval;
- 
--	dbg("%s - port %d", __func__, port->number);
--
- 	if (!serial) {
- 		dbg("%s - bad serial pointer, exiting", __func__);
- 		return;
-@@ -1384,7 +1373,6 @@ static void garmin_throttle(struct tty_s
- 	struct usb_serial_port *port = tty->driver_data;
- 	struct garmin_data *garmin_data_p = usb_get_serial_port_data(port);
- 
--	dbg("%s - port %d", __func__, port->number);
- 	/* set flag, data received will be put into a queue
- 	   for later processing */
- 	spin_lock_irq(&garmin_data_p->lock);
-@@ -1399,7 +1387,6 @@ static void garmin_unthrottle(struct tty
- 	struct garmin_data *garmin_data_p = usb_get_serial_port_data(port);
- 	int status;
- 
--	dbg("%s - port %d", __func__, port->number);
- 	spin_lock_irq(&garmin_data_p->lock);
- 	garmin_data_p->flags &= ~FLAGS_THROTTLED;
- 	spin_unlock_irq(&garmin_data_p->lock);
-@@ -1441,8 +1428,6 @@ static int garmin_attach(struct usb_seri
- 	struct usb_serial_port *port = serial->port[0];
- 	struct garmin_data *garmin_data_p = NULL;
- 
--	dbg("%s", __func__);
--
- 	garmin_data_p = kzalloc(sizeof(struct garmin_data), GFP_KERNEL);
- 	if (garmin_data_p == NULL) {
- 		dev_err(&port->dev, "%s - Out of memory\n", __func__);
-@@ -1471,8 +1456,6 @@ static void garmin_disconnect(struct usb
- 	struct usb_serial_port *port = serial->port[0];
- 	struct garmin_data *garmin_data_p = usb_get_serial_port_data(port);
- 
--	dbg("%s", __func__);
--
- 	usb_kill_urb(port->interrupt_in_urb);
- 	del_timer_sync(&garmin_data_p->timer);
- }
-@@ -1483,8 +1466,6 @@ static void garmin_release(struct usb_se
- 	struct usb_serial_port *port = serial->port[0];
- 	struct garmin_data *garmin_data_p = usb_get_serial_port_data(port);
- 
--	dbg("%s", __func__);
--
- 	kfree(garmin_data_p);
- }
- 
---- a/drivers/usb/serial/generic.c
-+++ b/drivers/usb/serial/generic.c
-@@ -117,8 +117,6 @@ int usb_serial_generic_open(struct tty_s
- 	int result = 0;
- 	unsigned long flags;
- 
--	dbg("%s - port %d", __func__, port->number);
--
- 	/* clear the throttle flags */
- 	spin_lock_irqsave(&port->lock, flags);
- 	port->throttled = 0;
-@@ -139,8 +137,6 @@ static void generic_cleanup(struct usb_s
- 	unsigned long flags;
- 	int i;
- 
--	dbg("%s - port %d", __func__, port->number);
--
- 	if (serial->dev) {
- 		/* shutdown any bulk transfers that might be going on */
- 		if (port->bulk_out_size) {
-@@ -161,7 +157,6 @@ static void generic_cleanup(struct usb_s
- 
- void usb_serial_generic_close(struct usb_serial_port *port)
- {
--	dbg("%s - port %d", __func__, port->number);
- 	generic_cleanup(port);
- }
- EXPORT_SYMBOL_GPL(usb_serial_generic_close);
-@@ -249,8 +244,6 @@ int usb_serial_generic_write(struct tty_
- {
- 	int result;
- 
--	dbg("%s - port %d", __func__, port->number);
--
- 	/* only do something if we have a bulk out endpoint */
- 	if (!port->bulk_out_size)
- 		return -ENODEV;
-@@ -273,8 +266,6 @@ int usb_serial_generic_write_room(struct
- 	unsigned long flags;
- 	int room;
- 
--	dbg("%s - port %d", __func__, port->number);
--
- 	if (!port->bulk_out_size)
- 		return 0;
- 
-@@ -292,8 +283,6 @@ int usb_serial_generic_chars_in_buffer(s
- 	unsigned long flags;
- 	int chars;
- 
--	dbg("%s - port %d", __func__, port->number);
--
- 	if (!port->bulk_out_size)
- 		return 0;
- 
-@@ -335,8 +324,6 @@ int usb_serial_generic_submit_read_urbs(
- 	int res;
- 	int i;
- 
--	dbg("%s - port %d", __func__, port->number);
--
- 	for (i = 0; i < ARRAY_SIZE(port->read_urbs); ++i) {
- 		res = usb_serial_generic_submit_read_urb(port, i, mem_flags);
- 		if (res)
-@@ -424,8 +411,6 @@ void usb_serial_generic_write_bulk_callb
- 	int status = urb->status;
- 	int i;
- 
--	dbg("%s - port %d", __func__, port->number);
--
- 	for (i = 0; i < ARRAY_SIZE(port->write_urbs); ++i)
- 		if (port->write_urbs[i] == urb)
- 			break;
-@@ -454,8 +439,6 @@ void usb_serial_generic_throttle(struct
- 	struct usb_serial_port *port = tty->driver_data;
- 	unsigned long flags;
- 
--	dbg("%s - port %d", __func__, port->number);
--
- 	/* Set the throttle request flag. It will be picked up
- 	 * by usb_serial_generic_read_bulk_callback(). */
- 	spin_lock_irqsave(&port->lock, flags);
-@@ -469,8 +452,6 @@ void usb_serial_generic_unthrottle(struc
- 	struct usb_serial_port *port = tty->driver_data;
- 	int was_throttled;
- 
--	dbg("%s - port %d", __func__, port->number);
--
- 	/* Clear the throttle flags */
- 	spin_lock_irq(&port->lock);
- 	was_throttled = port->throttled;
-@@ -566,8 +547,6 @@ void usb_serial_generic_disconnect(struc
- {
- 	int i;
- 
--	dbg("%s", __func__);
--
- 	/* stop reads and writes on all ports */
- 	for (i = 0; i < serial->num_ports; ++i)
- 		generic_cleanup(serial->port[i]);
-@@ -576,5 +555,4 @@ EXPORT_SYMBOL_GPL(usb_serial_generic_dis
- 
- void usb_serial_generic_release(struct usb_serial *serial)
- {
--	dbg("%s", __func__);
- }
---- a/drivers/usb/serial/ipaq.c
-+++ b/drivers/usb/serial/ipaq.c
-@@ -539,8 +539,6 @@ static int ipaq_open(struct tty_struct *
- 	int			result = 0;
- 	int			retries = connect_retries;
- 
--	dbg("%s - port %d", __func__, port->number);
--
- 	msleep(1000*initial_wait);
- 
- 	/*
-@@ -596,8 +594,6 @@ static int ipaq_calc_num_ports(struct us
- 
- static int ipaq_startup(struct usb_serial *serial)
- {
--	dbg("%s", __func__);
--
- 	/* Some of the devices in ipaq_id_table[] are composite, and we
- 	 * shouldn't bind to all the interfaces.  This test will rule out
- 	 * some obviously invalid possibilities.
---- a/drivers/usb/serial/ipw.c
-+++ b/drivers/usb/serial/ipw.c
-@@ -155,8 +155,6 @@ static int ipw_open(struct tty_struct *t
- 	u8 *buf_flow_init;
- 	int result;
- 
--	dbg("%s", __func__);
--
- 	buf_flow_init = kmemdup(buf_flow_static, 16, GFP_KERNEL);
- 	if (!buf_flow_init)
- 		return -ENOMEM;
---- a/drivers/usb/serial/ir-usb.c
-+++ b/drivers/usb/serial/ir-usb.c
-@@ -264,8 +264,6 @@ static int ir_open(struct tty_struct *tt
- {
- 	int i;
- 
--	dbg("%s - port %d", __func__, port->number);
--
- 	for (i = 0; i < ARRAY_SIZE(port->write_urbs); ++i)
- 		port->write_urbs[i]->transfer_flags = URB_ZERO_PACKET;
- 
-@@ -322,15 +320,10 @@ static void ir_process_read_urb(struct u
- 
- static void ir_set_termios_callback(struct urb *urb)
- {
--	struct usb_serial_port *port = urb->context;
--	int status = urb->status;
--
--	dbg("%s - port %d", __func__, port->number);
--
- 	kfree(urb->transfer_buffer);
- 
--	if (status)
--		dbg("%s - non-zero urb status: %d", __func__, status);
-+	if (urb->status)
-+		dbg("%s - non-zero urb status: %d", __func__, urb->status);
- }
- 
- static void ir_set_termios(struct tty_struct *tty,
-@@ -342,8 +335,6 @@ static void ir_set_termios(struct tty_st
- 	speed_t baud;
- 	int ir_baud;
- 
--	dbg("%s - port %d", __func__, port->number);
--
- 	baud = tty_get_baud_rate(tty);
- 
- 	/*
---- a/drivers/usb/serial/iuu_phoenix.c
-+++ b/drivers/usb/serial/iuu_phoenix.c
-@@ -135,8 +135,6 @@ static void iuu_release(struct usb_seria
- 	if (!port)
- 		return;
- 
--	dbg("%s", __func__);
--
- 	if (priv) {
- 		iuu_free_buf(priv);
- 		dbg("%s - I will free all", __func__);
-@@ -198,8 +196,6 @@ static void iuu_rxcmd(struct urb *urb)
- 	int result;
- 	int status = urb->status;
- 
--	dbg("%s - enter", __func__);
--
- 	if (status) {
- 		dbg("%s - status = %d", __func__, status);
- 		/* error stop all */
-@@ -221,7 +217,6 @@ static int iuu_reset(struct usb_serial_p
- 	struct iuu_private *priv = usb_get_serial_port_data(port);
- 	int result;
- 	char *buf_ptr = port->write_urb->transfer_buffer;
--	dbg("%s - enter", __func__);
- 
- 	/* Prepare the reset sequence */
- 
-@@ -255,8 +250,6 @@ static void iuu_update_status_callback(s
- 	u8 *st;
- 	int status = urb->status;
- 
--	dbg("%s - enter", __func__);
--
- 	if (status) {
- 		dbg("%s - status = %d", __func__, status);
- 		/* error stop all */
-@@ -299,8 +292,6 @@ static int iuu_status(struct usb_serial_
- {
- 	int result;
- 
--	dbg("%s - enter", __func__);
--
- 	memset(port->write_urb->transfer_buffer, IUU_GET_STATE_REGISTER, 1);
- 	usb_fill_bulk_urb(port->write_urb, port->serial->dev,
- 			  usb_sndbulkpipe(port->serial->dev,
-@@ -318,8 +309,6 @@ static int bulk_immediate(struct usb_ser
- 	struct usb_serial *serial = port->serial;
- 	int actual = 0;
- 
--	dbg("%s - enter", __func__);
--
- 	/* send the data out the bulk port */
- 
- 	status =
-@@ -341,10 +330,7 @@ static int read_immediate(struct usb_ser
- 	struct usb_serial *serial = port->serial;
- 	int actual = 0;
- 
--	dbg("%s - enter", __func__);
--
- 	/* send the data out the bulk port */
--
- 	status =
- 	    usb_bulk_msg(serial->dev,
- 			 usb_rcvbulkpipe(serial->dev,
-@@ -367,8 +353,6 @@ static int iuu_led(struct usb_serial_por
- 	if (!buf)
- 		return -ENOMEM;
- 
--	dbg("%s - enter", __func__);
--
- 	buf[0] = IUU_SET_LED;
- 	buf[1] = R & 0xFF;
- 	buf[2] = (R >> 8) & 0xFF;
-@@ -460,8 +444,6 @@ static int iuu_clk(struct usb_serial_por
- 	unsigned int P2 = 0;
- 	int frq = (int)dwFrq;
- 
--	dbg("%s - enter", __func__);
--
- 	if (frq == 0) {
- 		priv->buf[Count++] = IUU_UART_WRITE_I2C;
- 		priv->buf[Count++] = FrqGenAdr << 1;
-@@ -590,8 +572,6 @@ static int iuu_uart_flush(struct usb_ser
- 	u8 rxcmd = IUU_UART_RX;
- 	struct iuu_private *priv = usb_get_serial_port_data(port);
- 
--	dbg("%s - enter", __func__);
--
- 	if (iuu_led(port, 0xF000, 0, 0, 0xFF) < 0)
- 		return -EIO;
- 
-@@ -630,8 +610,6 @@ static void read_buf_callback(struct urb
- 	struct tty_struct *tty;
- 	int status = urb->status;
- 
--	dbg("%s - status = %d", __func__, status);
--
- 	if (status) {
- 		if (status == -EPROTO) {
- 			/* reschedule needed */
-@@ -659,7 +637,6 @@ static int iuu_bulk_write(struct usb_ser
- 	int i;
- 	int buf_len;
- 	char *buf_ptr = port->write_urb->transfer_buffer;
--	dbg("%s - enter", __func__);
- 
- 	spin_lock_irqsave(&priv->lock, flags);
- 	*buf_ptr++ = IUU_UART_ESC;
-@@ -691,7 +668,6 @@ static int iuu_bulk_write(struct usb_ser
- static int iuu_read_buf(struct usb_serial_port *port, int len)
- {
- 	int result;
--	dbg("%s - enter", __func__);
- 
- 	usb_fill_bulk_urb(port->read_urb, port->serial->dev,
- 			  usb_rcvbulkpipe(port->serial->dev,
-@@ -713,8 +689,6 @@ static void iuu_uart_read_callback(struc
- 	unsigned char *data = urb->transfer_buffer;
- 	priv->poll++;
- 
--	dbg("%s - enter", __func__);
--
- 	if (status) {
- 		dbg("%s - status = %d", __func__, status);
- 		/* error stop all */
-@@ -771,7 +745,6 @@ static int iuu_uart_write(struct tty_str
- {
- 	struct iuu_private *priv = usb_get_serial_port_data(port);
- 	unsigned long flags;
--	dbg("%s - enter", __func__);
- 
- 	if (count > 256)
- 		return -ENOMEM;
-@@ -792,8 +765,6 @@ static void read_rxcmd_callback(struct u
- 	int result;
- 	int status = urb->status;
- 
--	dbg("%s - status = %d", __func__, status);
--
- 	if (status) {
- 		/* error stop all */
- 		return;
-@@ -1015,8 +986,6 @@ static void iuu_close(struct usb_serial_
- 	if (!serial)
- 		return;
- 
--	dbg("%s - port %d", __func__, port->number);
--
- 	iuu_uart_off(port);
- 	if (serial->dev) {
- 		/* free writebuf */
-@@ -1031,7 +1000,6 @@ static void iuu_close(struct usb_serial_
- 
- static void iuu_init_termios(struct tty_struct *tty)
- {
--	dbg("%s - enter", __func__);
- 	*(tty->termios) = tty_std_termios;
- 	tty->termios->c_cflag = CLOCAL | CREAD | CS8 | B9600
- 				| TIOCM_CTS | CSTOPB | PARENB;
-@@ -1188,8 +1156,6 @@ static int iuu_vcc_set(struct usb_serial
- 	if (!buf)
- 		return -ENOMEM;
- 
--	dbg("%s - enter", __func__);
--
- 	buf[0] = IUU_SET_VCC;
- 	buf[1] = vcc & 0xFF;
- 	buf[2] = (vcc >> 8) & 0xFF;
-@@ -1250,15 +1216,11 @@ static DEVICE_ATTR(vcc_mode, S_IRUSR | S
- 
- static int iuu_create_sysfs_attrs(struct usb_serial_port *port)
- {
--	dbg("%s", __func__);
--
- 	return device_create_file(&port->dev, &dev_attr_vcc_mode);
- }
- 
- static int iuu_remove_sysfs_attrs(struct usb_serial_port *port)
- {
--	dbg("%s", __func__);
--
- 	device_remove_file(&port->dev, &dev_attr_vcc_mode);
- 	return 0;
- }
---- a/drivers/usb/serial/keyspan.c
-+++ b/drivers/usb/serial/keyspan.c
-@@ -137,8 +137,6 @@ static void keyspan_break_ctl(struct tty
- 	struct usb_serial_port *port = tty->driver_data;
- 	struct keyspan_port_private 	*p_priv;
- 
--	dbg("%s", __func__);
--
- 	p_priv = usb_get_serial_port_data(port);
- 
- 	if (break_state == -1)
-@@ -158,8 +156,6 @@ static void keyspan_set_termios(struct t
- 	const struct keyspan_device_details	*d_details;
- 	unsigned int 			cflag;
- 
--	dbg("%s", __func__);
--
- 	p_priv = usb_get_serial_port_data(port);
- 	d_details = p_priv->device_details;
- 	cflag = tty->termios->c_cflag;
-@@ -306,8 +302,6 @@ static void	usa26_indat_callback(struct
- 	unsigned char 		*data = urb->transfer_buffer;
- 	int status = urb->status;
- 
--	dbg("%s", __func__);
--
- 	endpoint = usb_pipeendpoint(urb->pipe);
- 
- 	if (status) {
-@@ -369,8 +363,6 @@ static void	usa2x_outdat_callback(struct
- 
- static void	usa26_inack_callback(struct urb *urb)
- {
--	dbg("%s", __func__);
--
- }
- 
- static void	usa26_outcont_callback(struct urb *urb)
-@@ -452,7 +444,6 @@ exit: ;
- 
- static void	usa26_glocont_callback(struct urb *urb)
- {
--	dbg("%s", __func__);
- }
- 
- 
-@@ -465,8 +456,6 @@ static void usa28_indat_callback(struct
- 	struct keyspan_port_private             *p_priv;
- 	int status = urb->status;
- 
--	dbg("%s", __func__);
--
- 	port =  urb->context;
- 	p_priv = usb_get_serial_port_data(port);
- 	data = urb->transfer_buffer;
-@@ -505,7 +494,6 @@ static void usa28_indat_callback(struct
- 
- static void	usa28_inack_callback(struct urb *urb)
- {
--	dbg("%s", __func__);
- }
- 
- static void	usa28_outcont_callback(struct urb *urb)
-@@ -585,7 +573,6 @@ exit: ;
- 
- static void	usa28_glocont_callback(struct urb *urb)
- {
--	dbg("%s", __func__);
- }
- 
- 
-@@ -596,8 +583,6 @@ static void	usa49_glocont_callback(struc
- 	struct keyspan_port_private *p_priv;
- 	int i;
- 
--	dbg("%s", __func__);
--
- 	serial =  urb->context;
- 	for (i = 0; i < serial->num_ports; ++i) {
- 		port = serial->port[i];
-@@ -625,8 +610,6 @@ static void	usa49_instat_callback(struct
- 	int old_dcd_state;
- 	int status = urb->status;
- 
--	dbg("%s", __func__);
--
- 	serial =  urb->context;
- 
- 	if (status) {
-@@ -679,7 +662,6 @@ exit:	;
- 
- static void	usa49_inack_callback(struct urb *urb)
- {
--	dbg("%s", __func__);
- }
- 
- static void	usa49_indat_callback(struct urb *urb)
-@@ -691,8 +673,6 @@ static void	usa49_indat_callback(struct
- 	unsigned char 		*data = urb->transfer_buffer;
- 	int status = urb->status;
- 
--	dbg("%s", __func__);
--
- 	endpoint = usb_pipeendpoint(urb->pipe);
- 
- 	if (status) {
-@@ -742,8 +722,6 @@ static void usa49wg_indat_callback(struc
- 	unsigned char 		*data = urb->transfer_buffer;
- 	int status = urb->status;
- 
--	dbg("%s", __func__);
--
- 	serial = urb->context;
- 
- 	if (status) {
-@@ -806,7 +784,6 @@ static void usa49wg_indat_callback(struc
- /* not used, usa-49 doesn't have per-port control endpoints */
- static void usa49_outcont_callback(struct urb *urb)
- {
--	dbg("%s", __func__);
- }
- 
- static void usa90_indat_callback(struct urb *urb)
-@@ -819,8 +796,6 @@ static void usa90_indat_callback(struct
- 	unsigned char 		*data = urb->transfer_buffer;
- 	int status = urb->status;
- 
--	dbg("%s", __func__);
--
- 	endpoint = usb_pipeendpoint(urb->pipe);
- 
- 	if (status) {
-@@ -957,8 +932,6 @@ static void	usa67_instat_callback(struct
- 	int old_dcd_state;
- 	int status = urb->status;
- 
--	dbg("%s", __func__);
--
- 	serial = urb->context;
- 
- 	if (status) {
-@@ -1010,8 +983,6 @@ static void usa67_glocont_callback(struc
- 	struct keyspan_port_private *p_priv;
- 	int i;
- 
--	dbg("%s", __func__);
--
- 	serial = urb->context;
- 	for (i = 0; i < serial->num_ports; ++i) {
- 		port = serial->port[i];
-@@ -1035,7 +1006,6 @@ static int keyspan_write_room(struct tty
- 	int				data_len;
- 	struct urb			*this_urb;
- 
--	dbg("%s", __func__);
- 	p_priv = usb_get_serial_port_data(port);
- 	d_details = p_priv->device_details;
- 
-@@ -1078,8 +1048,6 @@ static int keyspan_open(struct tty_struc
- 	p_priv = usb_get_serial_port_data(port);
- 	d_details = p_priv->device_details;
- 
--	dbg("%s - port%d.", __func__, port->number);
--
- 	/* Set some sane defaults */
- 	p_priv->rts_state = 1;
- 	p_priv->dtr_state = 1;
-@@ -1165,7 +1133,6 @@ static void keyspan_close(struct usb_ser
- 	struct keyspan_serial_private 	*s_priv;
- 	struct keyspan_port_private 	*p_priv;
- 
--	dbg("%s", __func__);
- 	s_priv = usb_get_serial_data(serial);
- 	p_priv = usb_get_serial_port_data(port);
- 
-@@ -1438,8 +1405,6 @@ static void keyspan_setup_urbs(struct us
- 	struct callbacks		*cback;
- 	int				endp;
- 
--	dbg("%s", __func__);
--
- 	s_priv = usb_get_serial_data(serial);
- 	d_details = s_priv->device_details;
- 
-@@ -1853,8 +1818,6 @@ static int keyspan_usa28_send_setup(stru
- 	struct urb				*this_urb;
- 	int 					device_port, err;
- 
--	dbg("%s", __func__);
--
- 	s_priv = usb_get_serial_data(serial);
- 	p_priv = usb_get_serial_port_data(port);
- 	d_details = s_priv->device_details;
-@@ -1980,8 +1943,6 @@ static int keyspan_usa49_send_setup(stru
- 	struct urb				*this_urb;
- 	int 					err, device_port;
- 
--	dbg("%s", __func__);
--
- 	s_priv = usb_get_serial_data(serial);
- 	p_priv = usb_get_serial_port_data(port);
- 	d_details = s_priv->device_details;
-@@ -2168,8 +2129,6 @@ static int keyspan_usa90_send_setup(stru
- 	int 					err;
- 	u8						prescaler;
- 
--	dbg("%s", __func__);
--
- 	s_priv = usb_get_serial_data(serial);
- 	p_priv = usb_get_serial_port_data(port);
- 	d_details = s_priv->device_details;
-@@ -2300,8 +2259,6 @@ static int keyspan_usa67_send_setup(stru
- 	struct urb				*this_urb;
- 	int 					err, device_port;
- 
--	dbg("%s", __func__);
--
- 	s_priv = usb_get_serial_data(serial);
- 	p_priv = usb_get_serial_port_data(port);
- 	d_details = s_priv->device_details;
-@@ -2442,8 +2399,6 @@ static void keyspan_send_setup(struct us
- 	struct keyspan_serial_private *s_priv;
- 	const struct keyspan_device_details *d_details;
- 
--	dbg("%s", __func__);
--
- 	s_priv = usb_get_serial_data(serial);
- 	d_details = s_priv->device_details;
- 
-@@ -2477,8 +2432,6 @@ static int keyspan_startup(struct usb_se
- 	struct keyspan_port_private	*p_priv;
- 	const struct keyspan_device_details	*d_details;
- 
--	dbg("%s", __func__);
--
- 	for (i = 0; (d_details = keyspan_devices[i]) != NULL; ++i)
- 		if (d_details->product_id ==
- 				le16_to_cpu(serial->dev->descriptor.idProduct))
-@@ -2538,8 +2491,6 @@ static void keyspan_disconnect(struct us
- 	struct keyspan_serial_private 	*s_priv;
- 	struct keyspan_port_private	*p_priv;
- 
--	dbg("%s", __func__);
--
- 	s_priv = usb_get_serial_data(serial);
- 
- 	/* Stop reading/writing urbs */
-@@ -2579,8 +2530,6 @@ static void keyspan_release(struct usb_s
- 	struct usb_serial_port		*port;
- 	struct keyspan_serial_private 	*s_priv;
- 
--	dbg("%s", __func__);
--
- 	s_priv = usb_get_serial_data(serial);
- 
- 	/*  dbg("Freeing serial->private."); */
---- a/drivers/usb/serial/keyspan_pda.c
-+++ b/drivers/usb/serial/keyspan_pda.c
-@@ -131,7 +131,6 @@ static void keyspan_pda_request_unthrott
- 	struct usb_serial *serial = priv->serial;
- 	int result;
- 
--	dbg(" request_unthrottle");
- 	/* ask the device to tell us when the tx buffer becomes
- 	   sufficiently empty */
- 	result = usb_control_msg(serial->dev,
-@@ -226,7 +225,7 @@ static void keyspan_pda_rx_throttle(stru
- 	   send an XOFF, although it might make sense to foist that off
- 	   upon the device too. */
- 	struct usb_serial_port *port = tty->driver_data;
--	dbg("keyspan_pda_rx_throttle port %d", port->number);
-+
- 	usb_kill_urb(port->interrupt_in_urb);
- }
- 
-@@ -235,7 +234,7 @@ static void keyspan_pda_rx_unthrottle(st
- {
- 	struct usb_serial_port *port = tty->driver_data;
- 	/* just restart the receive interrupt URB */
--	dbg("keyspan_pda_rx_unthrottle port %d", port->number);
-+
- 	if (usb_submit_urb(port->interrupt_in_urb, GFP_KERNEL))
- 		dbg(" usb_submit_urb(read urb) failed");
- }
-@@ -466,7 +465,6 @@ static int keyspan_pda_write(struct tty_
- 	   select() or poll() too) until we receive that unthrottle interrupt.
- 	   Block if we can't write anything at all, otherwise write as much as
- 	   we can. */
--	dbg("keyspan_pda_write(%d)", count);
- 	if (count == 0) {
- 		dbg(" write request of 0 bytes");
- 		return 0;
-@@ -766,8 +764,6 @@ static int keyspan_pda_startup(struct us
- 
- static void keyspan_pda_release(struct usb_serial *serial)
- {
--	dbg("%s", __func__);
--
- 	kfree(usb_get_serial_port_data(serial->port[0]));
- }
- 
---- a/drivers/usb/serial/kl5kusb105.c
-+++ b/drivers/usb/serial/kl5kusb105.c
-@@ -282,8 +282,6 @@ static void klsi_105_release(struct usb_
- {
- 	int i;
- 
--	dbg("%s", __func__);
--
- 	for (i = 0; i < serial->num_ports; ++i)
- 		kfree(usb_get_serial_port_data(serial->port[i]));
- }
-@@ -298,8 +296,6 @@ static int  klsi_105_open(struct tty_str
- 	struct klsi_105_port_settings *cfg;
- 	unsigned long flags;
- 
--	dbg("%s port %d", __func__, port->number);
--
- 	/* Do a defined restart:
- 	 * Set up sane default baud rate and send the 'READ_ON'
- 	 * vendor command.
-@@ -376,8 +372,6 @@ static void klsi_105_close(struct usb_se
- {
- 	int rc;
- 
--	dbg("%s port %d", __func__, port->number);
--
- 	mutex_lock(&port->serial->disc_mutex);
- 	if (!port->serial->disconnected) {
- 		/* send READ_OFF */
-@@ -646,7 +640,6 @@ static int klsi_105_tiocmget(struct tty_
- 	unsigned long flags;
- 	int rc;
- 	unsigned long line_state;
--	dbg("%s - request, just guessing", __func__);
- 
- 	rc = klsi_105_get_line_state(port, &line_state);
- 	if (rc < 0) {
-@@ -668,8 +661,6 @@ static int klsi_105_tiocmset(struct tty_
- {
- 	int retval = -EINVAL;
- 
--	dbg("%s", __func__);
--
- /* if this ever gets implemented, it should be done something like this:
- 	struct usb_serial *serial = port->serial;
- 	struct klsi_105_private *priv = usb_get_serial_port_data(port);
---- a/drivers/usb/serial/kobil_sct.c
-+++ b/drivers/usb/serial/kobil_sct.c
-@@ -193,7 +193,6 @@ static int kobil_startup(struct usb_seri
- static void kobil_release(struct usb_serial *serial)
- {
- 	int i;
--	dbg("%s - port %d", __func__, serial->port[0]->number);
- 
- 	for (i = 0; i < serial->num_ports; ++i)
- 		kfree(usb_get_serial_port_data(serial->port[i]));
-@@ -217,7 +216,6 @@ static int kobil_open(struct tty_struct
- 	int transfer_buffer_length = 8;
- 	int write_urb_transfer_buffer_length = 8;
- 
--	dbg("%s - port %d", __func__, port->number);
- 	priv = usb_get_serial_port_data(port);
- 
- 	/* allocate memory for transfer buffer */
-@@ -327,8 +325,6 @@ static int kobil_open(struct tty_struct
- 
- static void kobil_close(struct usb_serial_port *port)
- {
--	dbg("%s - port %d", __func__, port->number);
--
- 	/* FIXME: Add rts/dtr methods */
- 	if (port->write_urb) {
- 		usb_poison_urb(port->write_urb);
-@@ -349,8 +345,6 @@ static void kobil_read_int_callback(stru
- 	int status = urb->status;
- /*	char *dbg_data; */
- 
--	dbg("%s - port %d", __func__, port->number);
--
- 	if (status) {
- 		dbg("%s - port %d Read int status not zero: %d",
- 		    __func__, port->number, status);
-@@ -474,7 +468,6 @@ static int kobil_write(struct tty_struct
- 
- static int kobil_write_room(struct tty_struct *tty)
- {
--	/* dbg("%s - port %d", __func__, port->number); */
- 	/* FIXME */
- 	return 8;
- }
---- a/drivers/usb/serial/mct_u232.c
-+++ b/drivers/usb/serial/mct_u232.c
-@@ -427,8 +427,6 @@ static void mct_u232_release(struct usb_
- 	struct mct_u232_private *priv;
- 	int i;
- 
--	dbg("%s", __func__);
--
- 	for (i = 0; i < serial->num_ports; ++i) {
- 		/* My special items, the standard routines free my urbs */
- 		priv = usb_get_serial_port_data(serial->port[i]);
-@@ -446,8 +444,6 @@ static int  mct_u232_open(struct tty_str
- 	unsigned char last_lcr;
- 	unsigned char last_msr;
- 
--	dbg("%s port %d", __func__, port->number);
--
- 	/* Compensate for a hardware bug: although the Sitecom U232-P25
- 	 * device reports a maximum output packet size of 32 bytes,
- 	 * it seems to be able to accept only 16 bytes (and that's what
-@@ -528,8 +524,6 @@ static void mct_u232_dtr_rts(struct usb_
- 
- static void mct_u232_close(struct usb_serial_port *port)
- {
--	dbg("%s port %d", __func__, port->number);
--
- 	if (port->serial->dev) {
- 		/* shutdown our urbs */
- 		usb_kill_urb(port->write_urb);
-@@ -572,7 +566,6 @@ static void mct_u232_read_int_callback(s
- 		return;
- 	}
- 
--	dbg("%s - port %d", __func__, port->number);
- 	usb_serial_debug_data(debug, &port->dev, __func__,
- 					urb->actual_length, data);
- 
-@@ -733,8 +726,6 @@ static void mct_u232_break_ctl(struct tt
- 	unsigned char lcr;
- 	unsigned long flags;
- 
--	dbg("%sstate=%d", __func__, break_state);
--
- 	spin_lock_irqsave(&priv->lock, flags);
- 	lcr = priv->last_lcr;
- 
-@@ -753,8 +744,6 @@ static int mct_u232_tiocmget(struct tty_
- 	unsigned int control_state;
- 	unsigned long flags;
- 
--	dbg("%s", __func__);
--
- 	spin_lock_irqsave(&priv->lock, flags);
- 	control_state = priv->control_state;
- 	spin_unlock_irqrestore(&priv->lock, flags);
-@@ -771,8 +760,6 @@ static int mct_u232_tiocmset(struct tty_
- 	unsigned int control_state;
- 	unsigned long flags;
- 
--	dbg("%s", __func__);
--
- 	spin_lock_irqsave(&priv->lock, flags);
- 	control_state = priv->control_state;
- 
-@@ -796,8 +783,6 @@ static void mct_u232_throttle(struct tty
- 	struct mct_u232_private *priv = usb_get_serial_port_data(port);
- 	unsigned int control_state;
- 
--	dbg("%s - port %d", __func__, port->number);
--
- 	spin_lock_irq(&priv->lock);
- 	priv->rx_flags |= THROTTLED;
- 	if (C_CRTSCTS(tty)) {
-@@ -816,8 +801,6 @@ static void mct_u232_unthrottle(struct t
- 	struct mct_u232_private *priv = usb_get_serial_port_data(port);
- 	unsigned int control_state;
- 
--	dbg("%s - port %d", __func__, port->number);
--
- 	spin_lock_irq(&priv->lock);
- 	if ((priv->rx_flags & THROTTLED) && C_CRTSCTS(tty)) {
- 		priv->rx_flags &= ~THROTTLED;
---- a/drivers/usb/serial/mos7720.c
-+++ b/drivers/usb/serial/mos7720.c
-@@ -257,7 +257,6 @@ static void destroy_mos_parport(struct k
- 	struct mos7715_parport *mos_parport =
- 		container_of(kref, struct mos7715_parport, ref_count);
- 
--	dbg("%s called", __func__);
- 	kfree(mos_parport);
- }
- 
-@@ -266,7 +265,7 @@ static void destroy_urbtracker(struct kr
- 	struct urbtracker *urbtrack =
- 		container_of(kref, struct urbtracker, ref_count);
- 	struct mos7715_parport *mos_parport = urbtrack->mos_parport;
--	dbg("%s called", __func__);
-+
- 	usb_free_urb(urbtrack->urb);
- 	kfree(urbtrack);
- 	kref_put(&mos_parport->ref_count, destroy_mos_parport);
-@@ -285,8 +284,6 @@ static void send_deferred_urbs(unsigned
- 	struct urbtracker *urbtrack;
- 	struct list_head *cursor, *next;
- 
--	dbg("%s called", __func__);
--
- 	/* if release function ran, game over */
- 	if (unlikely(mos_parport->serial == NULL))
- 		return;
-@@ -335,7 +332,7 @@ static void async_complete(struct urb *u
- {
- 	struct urbtracker *urbtrack = urb->context;
- 	int status = urb->status;
--	dbg("%s called", __func__);
-+
- 	if (unlikely(status))
- 		dbg("%s - nonzero urb status received: %d", __func__, status);
- 
-@@ -355,7 +352,6 @@ static int write_parport_reg_nonblock(st
- 	struct usb_ctrlrequest setup;
- 	struct usb_serial *serial = mos_parport->serial;
- 	struct usb_device *usbdev = serial->dev;
--	dbg("%s called", __func__);
- 
- 	/* create and initialize the control urb and containing urbtracker */
- 	urbtrack = kmalloc(sizeof(struct urbtracker), GFP_ATOMIC);
-@@ -476,7 +472,7 @@ static inline void parport_epilogue(stru
- static void parport_mos7715_write_data(struct parport *pp, unsigned char d)
- {
- 	struct mos7715_parport *mos_parport = pp->private_data;
--	dbg("%s called: %2.2x", __func__, d);
-+
- 	if (parport_prologue(pp) < 0)
- 		return;
- 	mos7715_change_mode(mos_parport, SPP);
-@@ -488,7 +484,7 @@ static unsigned char parport_mos7715_rea
- {
- 	struct mos7715_parport *mos_parport = pp->private_data;
- 	unsigned char d;
--	dbg("%s called", __func__);
-+
- 	if (parport_prologue(pp) < 0)
- 		return 0;
- 	read_mos_reg(mos_parport->serial, dummy, DPR, &d);
-@@ -500,7 +496,7 @@ static void parport_mos7715_write_contro
- {
- 	struct mos7715_parport *mos_parport = pp->private_data;
- 	__u8 data;
--	dbg("%s called: %2.2x", __func__, d);
-+
- 	if (parport_prologue(pp) < 0)
- 		return;
- 	data = ((__u8)d & 0x0f) | (mos_parport->shadowDCR & 0xf0);
-@@ -513,7 +509,7 @@ static unsigned char parport_mos7715_rea
- {
- 	struct mos7715_parport *mos_parport = pp->private_data;
- 	__u8 dcr;
--	dbg("%s called", __func__);
-+
- 	spin_lock(&release_lock);
- 	mos_parport = pp->private_data;
- 	if (unlikely(mos_parport == NULL)) {
-@@ -531,7 +527,7 @@ static unsigned char parport_mos7715_fro
- {
- 	struct mos7715_parport *mos_parport = pp->private_data;
- 	__u8 dcr;
--	dbg("%s called", __func__);
-+
- 	mask &= 0x0f;
- 	val &= 0x0f;
- 	if (parport_prologue(pp) < 0)
-@@ -547,7 +543,7 @@ static unsigned char parport_mos7715_rea
- {
- 	unsigned char status;
- 	struct mos7715_parport *mos_parport = pp->private_data;
--	dbg("%s called", __func__);
-+
- 	spin_lock(&release_lock);
- 	mos_parport = pp->private_data;
- 	if (unlikely(mos_parport == NULL)) {	/* release called */
-@@ -561,17 +557,16 @@ static unsigned char parport_mos7715_rea
- 
- static void parport_mos7715_enable_irq(struct parport *pp)
- {
--	dbg("%s called", __func__);
- }
-+
- static void parport_mos7715_disable_irq(struct parport *pp)
- {
--	dbg("%s called", __func__);
- }
- 
- static void parport_mos7715_data_forward(struct parport *pp)
- {
- 	struct mos7715_parport *mos_parport = pp->private_data;
--	dbg("%s called", __func__);
-+
- 	if (parport_prologue(pp) < 0)
- 		return;
- 	mos7715_change_mode(mos_parport, PS2);
-@@ -583,7 +578,7 @@ static void parport_mos7715_data_forward
- static void parport_mos7715_data_reverse(struct parport *pp)
- {
- 	struct mos7715_parport *mos_parport = pp->private_data;
--	dbg("%s called", __func__);
-+
- 	if (parport_prologue(pp) < 0)
- 		return;
- 	mos7715_change_mode(mos_parport, PS2);
-@@ -595,7 +590,6 @@ static void parport_mos7715_data_reverse
- static void parport_mos7715_init_state(struct pardevice *dev,
- 				       struct parport_state *s)
- {
--	dbg("%s called", __func__);
- 	s->u.pc.ctr = DCR_INIT_VAL;
- 	s->u.pc.ecr = ECR_INIT_VAL;
- }
-@@ -605,7 +599,7 @@ static void parport_mos7715_save_state(s
- 				       struct parport_state *s)
- {
- 	struct mos7715_parport *mos_parport;
--	dbg("%s called", __func__);
-+
- 	spin_lock(&release_lock);
- 	mos_parport = pp->private_data;
- 	if (unlikely(mos_parport == NULL)) {	/* release called */
-@@ -622,7 +616,7 @@ static void parport_mos7715_restore_stat
- 					  struct parport_state *s)
- {
- 	struct mos7715_parport *mos_parport;
--	dbg("%s called", __func__);
-+
- 	spin_lock(&release_lock);
- 	mos_parport = pp->private_data;
- 	if (unlikely(mos_parport == NULL)) {	/* release called */
-@@ -641,7 +635,7 @@ static size_t parport_mos7715_write_comp
- 	int retval;
- 	struct mos7715_parport *mos_parport = pp->private_data;
- 	int actual_len;
--	dbg("%s called: %u chars", __func__, (unsigned int)len);
-+
- 	if (parport_prologue(pp) < 0)
- 		return 0;
- 	mos7715_change_mode(mos_parport, PPF);
---- a/drivers/usb/serial/mos7840.c
-+++ b/drivers/usb/serial/mos7840.c
-@@ -591,8 +591,6 @@ static void mos7840_interrupt_callback(s
- 	__u16 wval, wreg = 0;
- 	int status = urb->status;
- 
--	dbg("%s", " : Entering");
--
- 	switch (status) {
- 	case 0:
- 		/* success */
-@@ -766,12 +764,8 @@ static void mos7840_bulk_in_callback(str
- 		return;
- 	}
- 
--	dbg("%s", "Entering... ");
--
- 	data = urb->transfer_buffer;
- 
--	dbg("%s", "Entering ...........");
--
- 	if (urb->actual_length) {
- 		tty = tty_port_tty_get(&mos7840_port->port->port);
- 		if (tty) {
-@@ -835,8 +829,6 @@ static void mos7840_bulk_out_data_callba
- 		return;
- 	}
- 
--	dbg("%s", "Entering .........");
--
- 	tty = tty_port_tty_get(&mos7840_port->port->port);
- 	if (tty && mos7840_port->open)
- 		tty_wakeup(tty);
-@@ -878,8 +870,6 @@ static int mos7840_open(struct tty_struc
- 	struct moschip_port *mos7840_port;
- 	struct moschip_port *port0;
- 
--	dbg ("%s enter", __func__);
--
- 	if (mos7840_port_paranoia_check(port, __func__)) {
- 		dbg("%s", "Port Paranoia failed");
- 		return -ENODEV;
-@@ -1151,10 +1141,7 @@ static int mos7840_open(struct tty_struc
- 	dbg("usb_serial serial:%p       mos7840_port:%p\n      usb_serial_port port:%p",
- 				serial, mos7840_port, port);
- 
--	dbg ("%s leave", __func__);
--
- 	return 0;
--
- }
- 
- /*****************************************************************************
-@@ -1175,18 +1162,14 @@ static int mos7840_chars_in_buffer(struc
- 	unsigned long flags;
- 	struct moschip_port *mos7840_port;
- 
--	dbg("%s", " mos7840_chars_in_buffer:entering ...........");
--
- 	if (mos7840_port_paranoia_check(port, __func__)) {
- 		dbg("%s", "Invalid port");
- 		return 0;
- 	}
- 
- 	mos7840_port = mos7840_get_port_private(port);
--	if (mos7840_port == NULL) {
--		dbg("%s", "mos7840_break:leaving ...........");
-+	if (mos7840_port == NULL)
- 		return 0;
--	}
- 
- 	spin_lock_irqsave(&mos7840_port->pool_lock, flags);
- 	for (i = 0; i < NUM_URBS; ++i)
-@@ -1211,8 +1194,6 @@ static void mos7840_close(struct usb_ser
- 	int j;
- 	__u16 Data;
- 
--	dbg("%s", "mos7840_close:entering...");
--
- 	if (mos7840_port_paranoia_check(port, __func__)) {
- 		dbg("%s", "Port Paranoia failed");
- 		return;
-@@ -1287,8 +1268,6 @@ static void mos7840_close(struct usb_ser
- 	mos7840_set_uart_reg(port, INTERRUPT_ENABLE_REGISTER, Data);
- 
- 	mos7840_port->open = 0;
--
--	dbg("%s", "Leaving ............");
- }
- 
- /************************************************************************
-@@ -1343,9 +1322,6 @@ static void mos7840_break(struct tty_str
- 	struct usb_serial *serial;
- 	struct moschip_port *mos7840_port;
- 
--	dbg("%s", "Entering ...........");
--	dbg("mos7840_break: Start");
--
- 	if (mos7840_port_paranoia_check(port, __func__)) {
- 		dbg("%s", "Port Paranoia failed");
- 		return;
-@@ -1395,8 +1371,6 @@ static int mos7840_write_room(struct tty
- 	unsigned long flags;
- 	struct moschip_port *mos7840_port;
- 
--	dbg("%s", " mos7840_write_room:entering ...........");
--
- 	if (mos7840_port_paranoia_check(port, __func__)) {
- 		dbg("%s", "Invalid port");
- 		dbg("%s", " mos7840_write_room:leaving ...........");
-@@ -1445,9 +1419,6 @@ static int mos7840_write(struct tty_stru
- 	/* __u16 Data; */
- 	const unsigned char *current_position = data;
- 	unsigned char *data1;
--	dbg("%s", "entering ...........");
--	/* dbg("mos7840_write: mos7840_port->shadowLCR is %x",
--					mos7840_port->shadowLCR); */
- 
- #ifdef NOTMOS7840
- 	Data = 0x00;
-@@ -1602,8 +1573,6 @@ static void mos7840_throttle(struct tty_
- 		return;
- 	}
- 
--	dbg("%s", "Entering ..........");
--
- 	/* if we are implementing XON/XOFF, send the stop character */
- 	if (I_IXOFF(tty)) {
- 		unsigned char stop_char = STOP_CHAR(tty);
-@@ -1646,8 +1615,6 @@ static void mos7840_unthrottle(struct tt
- 		return;
- 	}
- 
--	dbg("%s", "Entering ..........");
--
- 	/* if we are implementing XON/XOFF, send the start character */
- 	if (I_IXOFF(tty)) {
- 		unsigned char start_char = START_CHAR(tty);
-@@ -1676,8 +1643,6 @@ static int mos7840_tiocmget(struct tty_s
- 	int status;
- 	mos7840_port = mos7840_get_port_private(port);
- 
--	dbg("%s - port %d", __func__, port->number);
--
- 	if (mos7840_port == NULL)
- 		return -ENODEV;
- 
-@@ -1704,8 +1669,6 @@ static int mos7840_tiocmset(struct tty_s
- 	unsigned int mcr;
- 	int status;
- 
--	dbg("%s - port %d", __func__, port->number);
--
- 	mos7840_port = mos7840_get_port_private(port);
- 
- 	if (mos7840_port == NULL)
-@@ -1746,7 +1709,6 @@ static int mos7840_tiocmset(struct tty_s
- static int mos7840_calc_baud_rate_divisor(int baudRate, int *divisor,
- 					  __u16 *clk_sel_val)
- {
--
- 	dbg("%s - %d", __func__, baudRate);
- 
- 	if (baudRate <= 115200) {
-@@ -1839,8 +1801,6 @@ static int mos7840_send_cmd_write_baud_r
- 		return -1;
- 	}
- 
--	dbg("%s", "Entering ..........");
--
- 	number = mos7840_port->port->number - mos7840_port->port->serial->minor;
- 
- 	dbg("%s - port = %d, baud = %d", __func__,
-@@ -1966,8 +1926,6 @@ static void mos7840_change_port_settings
- 		return;
- 	}
- 
--	dbg("%s", "Entering ..........");
--
- 	lData = LCR_BITS_8;
- 	lStop = LCR_STOP_1;
- 	lParity = LCR_PAR_NONE;
-@@ -2108,7 +2066,7 @@ static void mos7840_set_termios(struct t
- 	unsigned int cflag;
- 	struct usb_serial *serial;
- 	struct moschip_port *mos7840_port;
--	dbg("mos7840_set_termios: START");
-+
- 	if (mos7840_port_paranoia_check(port, __func__)) {
- 		dbg("%s", "Invalid port");
- 		return;
-@@ -2361,9 +2319,7 @@ static int mos7840_startup(struct usb_se
- 	struct moschip_port *mos7840_port;
- 	struct usb_device *dev;
- 	int i, status;
--
- 	__u16 Data;
--	dbg("%s", "mos7840_startup :Entering..........");
- 
- 	if (!serial) {
- 		dbg("%s", "Invalid Handler");
-@@ -2372,9 +2328,6 @@ static int mos7840_startup(struct usb_se
- 
- 	dev = serial->dev;
- 
--	dbg("%s", "Entering...");
--	dbg ("mos7840_startup: serial = %p", serial);
--
- 	/* we set up the pointers to the endpoints in the mos7840_open *
- 	 * function, as the structures aren't created yet.             */
- 
-@@ -2602,7 +2555,6 @@ static void mos7840_disconnect(struct us
- 	int i;
- 	unsigned long flags;
- 	struct moschip_port *mos7840_port;
--	dbg("%s", " disconnect :entering..........");
- 
- 	if (!serial) {
- 		dbg("%s", "Invalid Handler");
-@@ -2624,9 +2576,6 @@ static void mos7840_disconnect(struct us
- 			usb_kill_urb(mos7840_port->control_urb);
- 		}
- 	}
--
--	dbg("%s", "Thank u :: ");
--
- }
- 
- /****************************************************************************
-@@ -2638,7 +2587,6 @@ static void mos7840_release(struct usb_s
- {
- 	int i;
- 	struct moschip_port *mos7840_port;
--	dbg("%s", " release :entering..........");
- 
- 	if (!serial) {
- 		dbg("%s", "Invalid Handler");
-@@ -2659,9 +2607,6 @@ static void mos7840_release(struct usb_s
- 			kfree(mos7840_port);
- 		}
- 	}
--
--	dbg("%s", "Thank u :: ");
--
- }
- 
- static struct usb_driver io_driver = {
---- a/drivers/usb/serial/navman.c
-+++ b/drivers/usb/serial/navman.c
-@@ -84,8 +84,6 @@ static int navman_open(struct tty_struct
- {
- 	int result = 0;
- 
--	dbg("%s - port %d", __func__, port->number);
--
- 	if (port->interrupt_in_urb) {
- 		dbg("%s - adding interrupt input for treo", __func__);
- 		result = usb_submit_urb(port->interrupt_in_urb, GFP_KERNEL);
-@@ -99,16 +97,12 @@ static int navman_open(struct tty_struct
- 
- static void navman_close(struct usb_serial_port *port)
- {
--	dbg("%s - port %d", __func__, port->number);
--
- 	usb_kill_urb(port->interrupt_in_urb);
- }
- 
- static int navman_write(struct tty_struct *tty, struct usb_serial_port *port,
- 			const unsigned char *buf, int count)
- {
--	dbg("%s - port %d", __func__, port->number);
--
- 	/*
- 	 * This device can't write any data, only read from the device
- 	 */
---- a/drivers/usb/serial/omninet.c
-+++ b/drivers/usb/serial/omninet.c
-@@ -144,8 +144,6 @@ static int omninet_open(struct tty_struc
- 	struct usb_serial_port	*wport;
- 	int			result = 0;
- 
--	dbg("%s - port %d", __func__, port->number);
--
- 	wport = serial->port[1];
- 	tty_port_tty_set(&wport->port, tty);
- 
-@@ -160,7 +158,6 @@ static int omninet_open(struct tty_struc
- 
- static void omninet_close(struct usb_serial_port *port)
- {
--	dbg("%s - port %d", __func__, port->number);
- 	usb_kill_urb(port->read_urb);
- }
- 
-@@ -178,8 +175,6 @@ static void omninet_read_bulk_callback(s
- 	int result;
- 	int i;
- 
--	dbg("%s - port %d", __func__, port->number);
--
- 	if (status) {
- 		dbg("%s - nonzero read bulk status received: %d",
- 		    __func__, status);
-@@ -225,8 +220,6 @@ static int omninet_write(struct tty_stru
- 
- 	int			result;
- 
--	dbg("%s - port %d", __func__, port->number);
--
- 	if (count == 0) {
- 		dbg("%s - write request of 0 bytes", __func__);
- 		return 0;
-@@ -289,8 +282,6 @@ static void omninet_write_bulk_callback(
- 	struct usb_serial_port 	*port   =  urb->context;
- 	int status = urb->status;
- 
--	dbg("%s - port %0x", __func__, port->number);
--
- 	set_bit(0, &port->write_urbs_free);
- 	if (status) {
- 		dbg("%s - nonzero write bulk status received: %d",
-@@ -306,8 +297,6 @@ static void omninet_disconnect(struct us
- {
- 	struct usb_serial_port *wport = serial->port[1];
- 
--	dbg("%s", __func__);
--
- 	usb_kill_urb(wport->write_urb);
- }
- 
-@@ -316,8 +305,6 @@ static void omninet_release(struct usb_s
- {
- 	struct usb_serial_port *port = serial->port[0];
- 
--	dbg("%s", __func__);
--
- 	kfree(usb_get_serial_port_data(port));
- }
- 
---- a/drivers/usb/serial/opticon.c
-+++ b/drivers/usb/serial/opticon.c
-@@ -70,8 +70,6 @@ static void opticon_read_bulk_callback(s
- 	int data_length;
- 	unsigned long flags;
- 
--	dbg("%s - port %d", __func__, port->number);
--
- 	switch (status) {
- 	case 0:
- 		/* success */
-@@ -179,8 +177,6 @@ static int opticon_open(struct tty_struc
- 	unsigned long flags;
- 	int result = 0;
- 
--	dbg("%s - port %d", __func__, port->number);
--
- 	spin_lock_irqsave(&priv->lock, flags);
- 	priv->throttled = false;
- 	priv->actually_throttled = false;
-@@ -216,8 +212,6 @@ static void opticon_close(struct usb_ser
- {
- 	struct opticon_private *priv = usb_get_serial_data(port->serial);
- 
--	dbg("%s - port %d", __func__, port->number);
--
- 	/* shutdown our urbs */
- 	usb_kill_urb(priv->bulk_read_urb);
- }
-@@ -256,8 +250,6 @@ static int opticon_write(struct tty_stru
- 	int status;
- 	struct usb_ctrlrequest *dr;
- 
--	dbg("%s - port %d", __func__, port->number);
--
- 	spin_lock_irqsave(&priv->lock, flags);
- 	if (priv->outstanding_urbs > URB_UPPER_LIMIT) {
- 		spin_unlock_irqrestore(&priv->lock, flags);
-@@ -338,8 +330,6 @@ static int opticon_write_room(struct tty
- 	struct opticon_private *priv = usb_get_serial_data(port->serial);
- 	unsigned long flags;
- 
--	dbg("%s - port %d", __func__, port->number);
--
- 	/*
- 	 * We really can take almost anything the user throws at us
- 	 * but let's pick a nice big number to tell the tty
-@@ -362,7 +352,6 @@ static void opticon_throttle(struct tty_
- 	struct opticon_private *priv = usb_get_serial_data(port->serial);
- 	unsigned long flags;
- 
--	dbg("%s - port %d", __func__, port->number);
- 	spin_lock_irqsave(&priv->lock, flags);
- 	priv->throttled = true;
- 	spin_unlock_irqrestore(&priv->lock, flags);
-@@ -376,8 +365,6 @@ static void opticon_unthrottle(struct tt
- 	unsigned long flags;
- 	int result, was_throttled;
- 
--	dbg("%s - port %d", __func__, port->number);
--
- 	spin_lock_irqsave(&priv->lock, flags);
- 	priv->throttled = false;
- 	was_throttled = priv->actually_throttled;
-@@ -400,7 +387,6 @@ static int opticon_tiocmget(struct tty_s
- 	unsigned long flags;
- 	int result = 0;
- 
--	dbg("%s - port %d", __func__, port->number);
- 	if (!usb_get_intfdata(port->serial->interface))
- 		return -ENODEV;
- 
-@@ -555,8 +541,6 @@ static void opticon_disconnect(struct us
- {
- 	struct opticon_private *priv = usb_get_serial_data(serial);
- 
--	dbg("%s", __func__);
--
- 	usb_kill_urb(priv->bulk_read_urb);
- 	usb_free_urb(priv->bulk_read_urb);
- }
-@@ -565,8 +549,6 @@ static void opticon_release(struct usb_s
- {
- 	struct opticon_private *priv = usb_get_serial_data(serial);
- 
--	dbg("%s", __func__);
--
- 	kfree(priv->bulk_in_buffer);
- 	kfree(priv);
- }
---- a/drivers/usb/serial/option.c
-+++ b/drivers/usb/serial/option.c
-@@ -1375,7 +1375,6 @@ static void option_instat_callback(struc
- 	struct usb_serial_port *port =  urb->context;
- 	struct option_port_private *portdata = usb_get_serial_port_data(port);
- 
--	dbg("%s", __func__);
- 	dbg("%s: urb %p port %p has data %p", __func__, urb, port, portdata);
- 
- 	if (status == 0) {
-@@ -1437,7 +1436,6 @@ static int option_send_setup(struct usb_
- 	struct option_port_private *portdata;
- 	int ifNum = serial->interface->cur_altsetting->desc.bInterfaceNumber;
- 	int val = 0;
--	dbg("%s", __func__);
- 
- 	if (is_blacklisted(ifNum, OPTION_BLACKLIST_SENDSETUP,
- 			(struct option_blacklist_info *) intfdata->private)) {
---- a/drivers/usb/serial/oti6858.c
-+++ b/drivers/usb/serial/oti6858.c
-@@ -211,8 +211,6 @@ static void setup_line(struct work_struc
- 	unsigned long flags;
- 	int result;
- 
--	dbg("%s(port = %d)", __func__, port->number);
--
- 	new_setup = kmalloc(OTI6858_CTRL_PKT_SIZE, GFP_KERNEL);
- 	if (new_setup == NULL) {
- 		dev_err(&port->dev, "%s(): out of memory!\n", __func__);
-@@ -282,8 +280,6 @@ static void send_data(struct work_struct
- 	unsigned long flags;
- 	u8 *allow;
- 
--	dbg("%s(port = %d)", __func__, port->number);
--
- 	spin_lock_irqsave(&priv->lock, flags);
- 	if (priv->flags.write_urb_in_use) {
- 		spin_unlock_irqrestore(&priv->lock, flags);
-@@ -379,8 +375,6 @@ static int oti6858_startup(struct usb_se
- static int oti6858_write(struct tty_struct *tty, struct usb_serial_port *port,
- 			const unsigned char *buf, int count)
- {
--	dbg("%s(port = %d, count = %d)", __func__, port->number, count);
--
- 	if (!count)
- 		return count;
- 
-@@ -395,8 +389,6 @@ static int oti6858_write_room(struct tty
- 	int room = 0;
- 	unsigned long flags;
- 
--	dbg("%s(port = %d)", __func__, port->number);
--
- 	spin_lock_irqsave(&port->lock, flags);
- 	room = kfifo_avail(&port->write_fifo);
- 	spin_unlock_irqrestore(&port->lock, flags);
-@@ -410,8 +402,6 @@ static int oti6858_chars_in_buffer(struc
- 	int chars = 0;
- 	unsigned long flags;
- 
--	dbg("%s(port = %d)", __func__, port->number);
--
- 	spin_lock_irqsave(&port->lock, flags);
- 	chars = kfifo_len(&port->write_fifo);
- 	spin_unlock_irqrestore(&port->lock, flags);
-@@ -437,8 +427,6 @@ static void oti6858_set_termios(struct t
- 	__le16 divisor;
- 	int br;
- 
--	dbg("%s(port = %d)", __func__, port->number);
--
- 	if (!tty) {
- 		dbg("%s(): no tty structures", __func__);
- 		return;
-@@ -545,8 +533,6 @@ static int oti6858_open(struct tty_struc
- 	unsigned long flags;
- 	int result;
- 
--	dbg("%s(port = %d)", __func__, port->number);
--
- 	usb_clear_halt(serial->dev, port->write_urb->pipe);
- 	usb_clear_halt(serial->dev, port->read_urb->pipe);
- 
-@@ -602,8 +588,6 @@ static void oti6858_close(struct usb_ser
- 	struct oti6858_private *priv = usb_get_serial_port_data(port);
- 	unsigned long flags;
- 
--	dbg("%s(port = %d)", __func__, port->number);
--
- 	spin_lock_irqsave(&port->lock, flags);
- 	/* clear out any remaining data in the buffer */
- 	kfifo_reset_out(&port->write_fifo);
-@@ -663,8 +647,6 @@ static int oti6858_tiocmget(struct tty_s
- 	unsigned pin_state;
- 	unsigned result = 0;
- 
--	dbg("%s(port = %d)", __func__, port->number);
--
- 	if (!usb_get_intfdata(port->serial->interface))
- 		return -ENODEV;
- 
-@@ -750,8 +732,6 @@ static void oti6858_release(struct usb_s
- {
- 	int i;
- 
--	dbg("%s()", __func__);
--
- 	for (i = 0; i < serial->num_ports; ++i)
- 		kfree(usb_get_serial_port_data(serial->port[i]));
- }
-@@ -763,9 +743,6 @@ static void oti6858_read_int_callback(st
- 	int transient = 0, can_recv = 0, resubmit = 1;
- 	int status = urb->status;
- 
--	dbg("%s(port = %d, status = %d)",
--				__func__, port->number, status);
--
- 	switch (status) {
- 	case 0:
- 		/* success */
-@@ -882,9 +859,6 @@ static void oti6858_read_bulk_callback(s
- 	int status = urb->status;
- 	int result;
- 
--	dbg("%s(port = %d, status = %d)",
--				__func__, port->number, status);
--
- 	spin_lock_irqsave(&priv->lock, flags);
- 	priv->flags.read_urb_in_use = 0;
- 	spin_unlock_irqrestore(&priv->lock, flags);
-@@ -916,9 +890,6 @@ static void oti6858_write_bulk_callback(
- 	int status = urb->status;
- 	int result;
- 
--	dbg("%s(port = %d, status = %d)",
--				__func__, port->number, status);
--
- 	switch (status) {
- 	case 0:
- 		/* success */
---- 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,8 +268,6 @@ static void pl2303_set_termios(struct tt
- 	int baud_floor, baud_ceil;
- 	int k;
- 
--	dbg("%s -  port %d", __func__, port->number);
--
- 	/* The PL2303 is reported to lose bytes if you change
- 	   serial settings even to the same values as before. Thus
- 	   we actually need to filter in this specific case */
-@@ -287,7 +288,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 +307,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 +316,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 +342,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 +373,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 +392,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 +436,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,8 +474,6 @@ static void pl2303_dtr_rts(struct usb_se
- 
- static void pl2303_close(struct usb_serial_port *port)
- {
--	dbg("%s - port %d", __func__, port->number);
--
- 	usb_serial_generic_close(port);
- 	usb_kill_urb(port->interrupt_in_urb);
- }
-@@ -486,8 +485,6 @@ 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);
--
- 	if (priv->type != HX) {
- 		usb_clear_halt(serial->dev, port->write_urb->pipe);
- 		usb_clear_halt(serial->dev, port->read_urb->pipe);
-@@ -501,7 +498,6 @@ static int pl2303_open(struct tty_struct
- 	if (tty)
- 		pl2303_set_termios(tty, port, &tmp_termios);
- 
--	dbg("%s - submitting interrupt urb", __func__);
- 	result = usb_submit_urb(port->interrupt_in_urb, GFP_KERNEL);
- 	if (result) {
- 		dev_err(&port->dev, "%s - failed submitting interrupt urb,"
-@@ -554,8 +550,6 @@ static int pl2303_tiocmget(struct tty_st
- 	unsigned int status;
- 	unsigned int result;
- 
--	dbg("%s (%d)", __func__, port->number);
--
- 	if (!usb_get_intfdata(port->serial->interface))
- 		return -ENODEV;
- 
-@@ -571,7 +565,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 +619,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 +636,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 +652,18 @@ static void pl2303_break_ctl(struct tty_
- 	u16 state;
- 	int result;
- 
--	dbg("%s - port %d", __func__, port->number);
--
- 	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,8 +671,6 @@ static void pl2303_release(struct usb_se
- 	int i;
- 	struct pl2303_private *priv;
- 
--	dbg("%s", __func__);
--
- 	for (i = 0; i < serial->num_ports; ++i) {
- 		priv = usb_get_serial_port_data(serial->port[i]);
- 		kfree(priv);
-@@ -742,8 +733,6 @@ static void pl2303_read_int_callback(str
- 	int status = urb->status;
- 	int retval;
- 
--	dbg("%s (%d)", __func__, port->number);
--
- 	switch (status) {
- 	case 0:
- 		/* success */
-@@ -752,12 +741,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 +758,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 +796,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/qcserial.c
-+++ b/drivers/usb/serial/qcserial.c
-@@ -131,7 +131,6 @@ static int qcprobe(struct usb_serial *se
- 	__u8 ifnum;
- 	bool is_gobi1k = id->driver_info ? true : false;
- 
--	dbg("%s", __func__);
- 	dbg("Is Gobi 1000 = %d", is_gobi1k);
- 
- 	nintf = serial->dev->actconfig->desc.bNumInterfaces;
-@@ -250,8 +249,6 @@ static void qc_release(struct usb_serial
- {
- 	struct usb_wwan_intf_private *priv = usb_get_serial_data(serial);
- 
--	dbg("%s", __func__);
--
- 	/* Call usb_wwan release & free the private data allocated in qcprobe */
- 	usb_wwan_release(serial);
- 	usb_set_serial_data(serial, NULL);
---- a/drivers/usb/serial/sierra.c
-+++ b/drivers/usb/serial/sierra.c
-@@ -63,9 +63,7 @@ struct sierra_intf_private {
- 
- static int sierra_set_power_state(struct usb_device *udev, __u16 swiState)
- {
--	int result;
--	dev_dbg(&udev->dev, "%s\n", __func__);
--	result = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
-+	return usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
- 			SWIMS_USB_REQUEST_SetPower,	/* __u8 request      */
- 			USB_TYPE_VENDOR,		/* __u8 request type */
- 			swiState,			/* __u16 value       */
-@@ -73,14 +71,11 @@ static int sierra_set_power_state(struct
- 			NULL,				/* void *data        */
- 			0,				/* __u16 size 	     */
- 			USB_CTRL_SET_TIMEOUT);		/* int timeout 	     */
--	return result;
- }
- 
- static int sierra_vsc_set_nmea(struct usb_device *udev, __u16 enable)
- {
--	int result;
--	dev_dbg(&udev->dev, "%s\n", __func__);
--	result = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
-+	return usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
- 			SWIMS_USB_REQUEST_SetNmea,	/* __u8 request      */
- 			USB_TYPE_VENDOR,		/* __u8 request type */
- 			enable,				/* __u16 value       */
-@@ -88,7 +83,6 @@ static int sierra_vsc_set_nmea(struct us
- 			NULL,				/* void *data        */
- 			0,				/* __u16 size 	     */
- 			USB_CTRL_SET_TIMEOUT);		/* int timeout       */
--	return result;
- }
- 
- static int sierra_calc_num_ports(struct usb_serial *serial)
-@@ -96,8 +90,6 @@ static int sierra_calc_num_ports(struct
- 	int num_ports = 0;
- 	u8 ifnum, numendpoints;
- 
--	dev_dbg(&serial->dev->dev, "%s\n", __func__);
--
- 	ifnum = serial->interface->cur_altsetting->desc.bInterfaceNumber;
- 	numendpoints = serial->interface->cur_altsetting->desc.bNumEndpoints;
- 
-@@ -150,7 +142,6 @@ static int sierra_calc_interface(struct
- 	int interface;
- 	struct usb_interface *p_interface;
- 	struct usb_host_interface *p_host_interface;
--	dev_dbg(&serial->dev->dev, "%s\n", __func__);
- 
- 	/* Get the interface structure pointer from the serial struct */
- 	p_interface = serial->interface;
-@@ -175,9 +166,8 @@ static int sierra_probe(struct usb_seria
- 	u8 ifnum;
- 
- 	udev = serial->dev;
--	dev_dbg(&udev->dev, "%s\n", __func__);
--
- 	ifnum = sierra_calc_interface(serial);
-+
- 	/*
- 	 * If this interface supports more than 1 alternate
- 	 * select the 2nd one
-@@ -344,8 +334,6 @@ static int sierra_send_setup(struct usb_
- 	int do_send = 0;
- 	int retval;
- 
--	dev_dbg(&port->dev, "%s\n", __func__);
--
- 	portdata = usb_get_serial_port_data(port);
- 
- 	if (portdata->dtr_state)
-@@ -393,7 +381,6 @@ static int sierra_send_setup(struct usb_
- static void sierra_set_termios(struct tty_struct *tty,
- 		struct usb_serial_port *port, struct ktermios *old_termios)
- {
--	dev_dbg(&port->dev, "%s\n", __func__);
- 	tty_termios_copy_hw(tty->termios, old_termios);
- 	sierra_send_setup(port);
- }
-@@ -404,7 +391,6 @@ static int sierra_tiocmget(struct tty_st
- 	unsigned int value;
- 	struct sierra_port_private *portdata;
- 
--	dev_dbg(&port->dev, "%s\n", __func__);
- 	portdata = usb_get_serial_port_data(port);
- 
- 	value = ((portdata->rts_state) ? TIOCM_RTS : 0) |
-@@ -441,8 +427,7 @@ static void sierra_release_urb(struct ur
- {
- 	struct usb_serial_port *port;
- 	if (urb) {
--		port =  urb->context;
--		dev_dbg(&port->dev, "%s: %p\n", __func__, urb);
-+		port = urb->context;
- 		kfree(urb->transfer_buffer);
- 		usb_free_urb(urb);
- 	}
-@@ -455,7 +440,6 @@ static void sierra_outdat_callback(struc
- 	struct sierra_intf_private *intfdata;
- 	int status = urb->status;
- 
--	dev_dbg(&port->dev, "%s - port %d\n", __func__, port->number);
- 	intfdata = port->serial->private;
- 
- 	/* free up the transfer buffer, as usb_free_urb() does not do this */
-@@ -598,8 +582,6 @@ static void sierra_indat_callback(struct
- 	endpoint = usb_pipeendpoint(urb->pipe);
- 	port = urb->context;
- 
--	dev_dbg(&port->dev, "%s: %p\n", __func__, urb);
--
- 	if (status) {
- 		dev_dbg(&port->dev, "%s: nonzero status: %d on"
- 			" endpoint %02x\n", __func__, status, endpoint);
-@@ -697,8 +679,6 @@ static int sierra_write_room(struct tty_
- 	struct sierra_port_private *portdata = usb_get_serial_port_data(port);
- 	unsigned long flags;
- 
--	dev_dbg(&port->dev, "%s - port %d\n", __func__, port->number);
--
- 	/* try to give a good number back based on if we have any free urbs at
- 	 * this point in time */
- 	spin_lock_irqsave(&portdata->lock, flags);
-@@ -805,8 +785,6 @@ static void sierra_close(struct usb_seri
- 	struct sierra_port_private *portdata;
- 	struct sierra_intf_private *intfdata = port->serial->private;
- 
--
--	dev_dbg(&port->dev, "%s\n", __func__);
- 	portdata = usb_get_serial_port_data(port);
- 
- 	portdata->rts_state = 0;
-@@ -851,8 +829,6 @@ static int sierra_open(struct tty_struct
- 
- 	portdata = usb_get_serial_port_data(port);
- 
--	dev_dbg(&port->dev, "%s\n", __func__);
--
- 	/* Set some sane defaults */
- 	portdata->rts_state = 1;
- 	portdata->dtr_state = 1;
-@@ -915,8 +891,6 @@ static int sierra_startup(struct usb_ser
- 	int i;
- 	u8 ifnum;
- 
--	dev_dbg(&serial->dev->dev, "%s\n", __func__);
--
- 	/* Set Device mode to D0 */
- 	sierra_set_power_state(serial->dev, 0x0000);
- 
-@@ -977,8 +951,6 @@ static void sierra_release(struct usb_se
- 	struct usb_serial_port *port;
- 	struct sierra_port_private *portdata;
- 
--	dev_dbg(&serial->dev->dev, "%s\n", __func__);
--
- 	for (i = 0; i < serial->num_ports; ++i) {
- 		port = serial->port[i];
- 		if (!port)
---- a/drivers/usb/serial/spcp8x5.c
-+++ b/drivers/usb/serial/spcp8x5.c
-@@ -454,8 +454,6 @@ static int spcp8x5_open(struct tty_struc
- 	u8 status = 0x30;
- 	/* status 0x30 means DSR and CTS = 1 other CDC RI and delta = 0 */
- 
--	dbg("%s -  port %d", __func__, port->number);
--
- 	usb_clear_halt(serial->dev, port->write_urb->pipe);
- 	usb_clear_halt(serial->dev, port->read_urb->pipe);
- 
---- a/drivers/usb/serial/ssu100.c
-+++ b/drivers/usb/serial/ssu100.c
-@@ -85,7 +85,6 @@ static void ssu100_release(struct usb_se
- {
- 	struct ssu100_port_private *priv = usb_get_serial_port_data(*serial->port);
- 
--	dbg("%s", __func__);
- 	kfree(priv);
- }
- 
-@@ -171,8 +170,6 @@ static int ssu100_initdevice(struct usb_
- 	u8 *data;
- 	int result = 0;
- 
--	dbg("%s", __func__);
--
- 	data = kzalloc(3, GFP_KERNEL);
- 	if (!data)
- 		return -ENOMEM;
-@@ -237,8 +234,6 @@ static void ssu100_set_termios(struct tt
- 	u16 urb_value = 0; /* will hold the new flags */
- 	int result;
- 
--	dbg("%s", __func__);
--
- 	if (cflag & PARENB) {
- 		if (cflag & PARODD)
- 			urb_value |= UART_LCR_PARITY;
-@@ -312,8 +307,6 @@ static int ssu100_open(struct tty_struct
- 	int result;
- 	unsigned long flags;
- 
--	dbg("%s - port %d", __func__, port->number);
--
- 	data = kzalloc(2, GFP_KERNEL);
- 	if (!data)
- 		return -ENOMEM;
-@@ -348,7 +341,6 @@ static int ssu100_open(struct tty_struct
- 
- static void ssu100_close(struct usb_serial_port *port)
- {
--	dbg("%s", __func__);
- 	usb_serial_generic_close(port);
- }
- 
-@@ -467,8 +459,6 @@ static int ssu100_attach(struct usb_seri
- 	struct ssu100_port_private *priv;
- 	struct usb_serial_port *port = *serial->port;
- 
--	dbg("%s", __func__);
--
- 	priv = kzalloc(sizeof(*priv), GFP_KERNEL);
- 	if (!priv) {
- 		dev_err(&port->dev, "%s- kmalloc(%Zd) failed.\n", __func__,
-@@ -490,8 +480,6 @@ static int ssu100_tiocmget(struct tty_st
- 	u8 *d;
- 	int r;
- 
--	dbg("%s\n", __func__);
--
- 	d = kzalloc(2, GFP_KERNEL);
- 	if (!d)
- 		return -ENOMEM;
-@@ -522,7 +510,6 @@ static int ssu100_tiocmset(struct tty_st
- 	struct usb_serial_port *port = tty->driver_data;
- 	struct usb_device *dev = port->serial->dev;
- 
--	dbg("%s\n", __func__);
- 	return update_mctrl(dev, set, clear);
- }
- 
-@@ -530,8 +517,6 @@ static void ssu100_dtr_rts(struct usb_se
- {
- 	struct usb_device *dev = port->serial->dev;
- 
--	dbg("%s\n", __func__);
--
- 	mutex_lock(&port->serial->disc_mutex);
- 	if (!port->serial->disconnected) {
- 		/* Disable flow control */
-@@ -618,8 +603,6 @@ static int ssu100_process_packet(struct
- 	int i;
- 	char *ch;
- 
--	dbg("%s - port %d", __func__, port->number);
--
- 	if ((len >= 4) &&
- 	    (packet[0] == 0x1b) && (packet[1] == 0x1b) &&
- 	    ((packet[2] == 0x00) || (packet[2] == 0x01))) {
-@@ -656,8 +639,6 @@ static void ssu100_process_read_urb(stru
- 	struct tty_struct *tty;
- 	int count;
- 
--	dbg("%s", __func__);
--
- 	tty = tty_port_tty_get(&port->port);
- 	if (!tty)
- 		return;
---- a/drivers/usb/serial/symbolserial.c
-+++ b/drivers/usb/serial/symbolserial.c
-@@ -54,8 +54,6 @@ static void symbol_int_callback(struct u
- 	int result;
- 	int data_length;
- 
--	dbg("%s - port %d", __func__, port->number);
--
- 	switch (status) {
- 	case 0:
- 		/* success */
-@@ -125,8 +123,6 @@ static int symbol_open(struct tty_struct
- 	unsigned long flags;
- 	int result = 0;
- 
--	dbg("%s - port %d", __func__, port->number);
--
- 	spin_lock_irqsave(&priv->lock, flags);
- 	priv->throttled = false;
- 	priv->actually_throttled = false;
-@@ -150,8 +146,6 @@ static void symbol_close(struct usb_seri
- {
- 	struct symbol_private *priv = usb_get_serial_data(port->serial);
- 
--	dbg("%s - port %d", __func__, port->number);
--
- 	/* shutdown our urbs */
- 	usb_kill_urb(priv->int_urb);
- }
-@@ -161,7 +155,6 @@ static void symbol_throttle(struct tty_s
- 	struct usb_serial_port *port = tty->driver_data;
- 	struct symbol_private *priv = usb_get_serial_data(port->serial);
- 
--	dbg("%s - port %d", __func__, port->number);
- 	spin_lock_irq(&priv->lock);
- 	priv->throttled = true;
- 	spin_unlock_irq(&priv->lock);
-@@ -174,8 +167,6 @@ static void symbol_unthrottle(struct tty
- 	int result;
- 	bool was_throttled;
- 
--	dbg("%s - port %d", __func__, port->number);
--
- 	spin_lock_irq(&priv->lock);
- 	priv->throttled = false;
- 	was_throttled = priv->actually_throttled;
-@@ -266,8 +257,6 @@ static void symbol_disconnect(struct usb
- {
- 	struct symbol_private *priv = usb_get_serial_data(serial);
- 
--	dbg("%s", __func__);
--
- 	usb_kill_urb(priv->int_urb);
- 	usb_free_urb(priv->int_urb);
- }
-@@ -276,8 +265,6 @@ static void symbol_release(struct usb_se
- {
- 	struct symbol_private *priv = usb_get_serial_data(serial);
- 
--	dbg("%s", __func__);
--
- 	kfree(priv->int_buffer);
- 	kfree(priv);
- }
---- a/drivers/usb/serial/ti_usb_3410_5052.c
-+++ b/drivers/usb/serial/ti_usb_3410_5052.c
-@@ -463,8 +463,6 @@ static void ti_release(struct usb_serial
- 	struct ti_device *tdev = usb_get_serial_data(serial);
- 	struct ti_port *tport;
- 
--	dbg("%s", __func__);
--
- 	for (i = 0; i < serial->num_ports; ++i) {
- 		tport = usb_get_serial_port_data(serial->port[i]);
- 		if (tport) {
-@@ -489,8 +487,6 @@ static int ti_open(struct tty_struct *tt
- 			     TI_PIPE_TIMEOUT_ENABLE |
- 			     (TI_TRANSFER_TIMEOUT << 2));
- 
--	dbg("%s - port %d", __func__, port->number);
--
- 	if (tport == NULL)
- 		return -ENODEV;
- 
-@@ -631,8 +627,6 @@ static void ti_close(struct usb_serial_p
- 	int status;
- 	int do_unlock;
- 
--	dbg("%s - port %d", __func__, port->number);
--
- 	tdev = usb_get_serial_data(port->serial);
- 	tport = usb_get_serial_port_data(port);
- 	if (tdev == NULL || tport == NULL)
-@@ -666,8 +660,6 @@ static void ti_close(struct usb_serial_p
- 	}
- 	if (do_unlock)
- 		mutex_unlock(&tdev->td_open_close_lock);
--
--	dbg("%s - exit", __func__);
- }
- 
- 
-@@ -676,8 +668,6 @@ static int ti_write(struct tty_struct *t
- {
- 	struct ti_port *tport = usb_get_serial_port_data(port);
- 
--	dbg("%s - port %d", __func__, port->number);
--
- 	if (count == 0) {
- 		dbg("%s - write request of 0 bytes", __func__);
- 		return 0;
-@@ -701,8 +691,6 @@ static int ti_write_room(struct tty_stru
- 	int room = 0;
- 	unsigned long flags;
- 
--	dbg("%s - port %d", __func__, port->number);
--
- 	if (tport == NULL)
- 		return 0;
- 
-@@ -722,8 +710,6 @@ static int ti_chars_in_buffer(struct tty
- 	int chars = 0;
- 	unsigned long flags;
- 
--	dbg("%s - port %d", __func__, port->number);
--
- 	if (tport == NULL)
- 		return 0;
- 
-@@ -741,8 +727,6 @@ static void ti_throttle(struct tty_struc
- 	struct usb_serial_port *port = tty->driver_data;
- 	struct ti_port *tport = usb_get_serial_port_data(port);
- 
--	dbg("%s - port %d", __func__, port->number);
--
- 	if (tport == NULL)
- 		return;
- 
-@@ -758,8 +742,6 @@ static void ti_unthrottle(struct tty_str
- 	struct ti_port *tport = usb_get_serial_port_data(port);
- 	int status;
- 
--	dbg("%s - port %d", __func__, port->number);
--
- 	if (tport == NULL)
- 		return;
- 
-@@ -854,8 +836,6 @@ static void ti_set_termios(struct tty_st
- 	int port_number = port->number - port->serial->minor;
- 	unsigned int mcr;
- 
--	dbg("%s - port %d", __func__, port->number);
--
- 	cflag = tty->termios->c_cflag;
- 	iflag = tty->termios->c_iflag;
- 
-@@ -988,8 +968,6 @@ static int ti_tiocmget(struct tty_struct
- 	unsigned int mcr;
- 	unsigned long flags;
- 
--	dbg("%s - port %d", __func__, port->number);
--
- 	if (tport == NULL)
- 		return -ENODEV;
- 
-@@ -1020,8 +998,6 @@ static int ti_tiocmset(struct tty_struct
- 	unsigned int mcr;
- 	unsigned long flags;
- 
--	dbg("%s - port %d", __func__, port->number);
--
- 	if (tport == NULL)
- 		return -ENODEV;
- 
-@@ -1084,8 +1060,6 @@ static void ti_interrupt_callback(struct
- 	int retval;
- 	__u8 msr;
- 
--	dbg("%s", __func__);
--
- 	switch (status) {
- 	case 0:
- 		break;
-@@ -1165,8 +1139,6 @@ static void ti_bulk_in_callback(struct u
- 	int retval = 0;
- 	struct tty_struct *tty;
- 
--	dbg("%s", __func__);
--
- 	switch (status) {
- 	case 0:
- 		break;
-@@ -1233,8 +1205,6 @@ static void ti_bulk_out_callback(struct
- 	struct usb_serial_port *port = tport->tp_port;
- 	int status = urb->status;
- 
--	dbg("%s - port %d", __func__, port->number);
--
- 	tport->tp_write_urb_in_use = 0;
- 
- 	switch (status) {
-@@ -1287,9 +1257,6 @@ static void ti_send(struct ti_port *tpor
- 	struct tty_struct *tty = tty_port_tty_get(&port->port);	/* FIXME */
- 	unsigned long flags;
- 
--
--	dbg("%s - port %d", __func__, port->number);
--
- 	spin_lock_irqsave(&tport->tp_lock, flags);
- 
- 	if (tport->tp_write_urb_in_use)
-@@ -1366,8 +1333,6 @@ static int ti_get_lsr(struct ti_port *tp
- 	int port_number = port->number - port->serial->minor;
- 	struct ti_port_status *data;
- 
--	dbg("%s - port %d", __func__, port->number);
--
- 	size = sizeof(struct ti_port_status);
- 	data = kmalloc(size, GFP_KERNEL);
- 	if (!data) {
-@@ -1480,8 +1445,6 @@ static void ti_drain(struct ti_port *tpo
- 	struct usb_serial_port *port = tport->tp_port;
- 	wait_queue_t wait;
- 
--	dbg("%s - port %d", __func__, port->number);
--
- 	spin_lock_irq(&tport->tp_lock);
- 
- 	/* wait for data to drain from the buffer */
-@@ -1679,7 +1642,6 @@ static int ti_download_firmware(struct t
- 	const struct firmware *fw_p;
- 	char buf[32];
- 
--	dbg("%s\n", __func__);
- 	/* try ID specific firmware first, then try generic firmware */
- 	sprintf(buf, "ti_usb-v%04x-p%04x.fw", dev->descriptor.idVendor,
- 	    dev->descriptor.idProduct);
---- a/drivers/usb/serial/usb_wwan.c
-+++ b/drivers/usb/serial/usb_wwan.c
-@@ -43,11 +43,8 @@ void usb_wwan_dtr_rts(struct usb_serial_
- {
- 	struct usb_serial *serial = port->serial;
- 	struct usb_wwan_port_private *portdata;
--
- 	struct usb_wwan_intf_private *intfdata;
- 
--	dbg("%s", __func__);
--
- 	intfdata = port->serial->private;
- 
- 	if (!intfdata->send_setup)
-@@ -69,8 +66,6 @@ void usb_wwan_set_termios(struct tty_str
- {
- 	struct usb_wwan_intf_private *intfdata = port->serial->private;
- 
--	dbg("%s", __func__);
--
- 	/* Doesn't support option setting */
- 	tty_termios_copy_hw(tty->termios, old_termios);
- 
-@@ -286,8 +281,6 @@ static void usb_wwan_indat_callback(stru
- 	unsigned char *data = urb->transfer_buffer;
- 	int status = urb->status;
- 
--	dbg("%s: %p", __func__, urb);
--
- 	endpoint = usb_pipeendpoint(urb->pipe);
- 	port = urb->context;
- 
-@@ -331,8 +324,6 @@ static void usb_wwan_outdat_callback(str
- 	struct usb_wwan_intf_private *intfdata;
- 	int i;
- 
--	dbg("%s", __func__);
--
- 	port = urb->context;
- 	intfdata = port->serial->private;
- 
-@@ -406,8 +397,6 @@ int usb_wwan_open(struct tty_struct *tty
- 	portdata = usb_get_serial_port_data(port);
- 	intfdata = serial->private;
- 
--	dbg("%s", __func__);
--
- 	/* Start reading from the IN endpoint */
- 	for (i = 0; i < N_IN_URB; i++) {
- 		urb = portdata->in_urbs[i];
-@@ -441,7 +430,6 @@ void usb_wwan_close(struct usb_serial_po
- 	struct usb_wwan_port_private *portdata;
- 	struct usb_wwan_intf_private *intfdata = port->serial->private;
- 
--	dbg("%s", __func__);
- 	portdata = usb_get_serial_port_data(port);
- 
- 	if (serial->dev) {
-@@ -492,8 +480,6 @@ static void usb_wwan_setup_urbs(struct u
- 	struct usb_serial_port *port;
- 	struct usb_wwan_port_private *portdata;
- 
--	dbg("%s", __func__);
--
- 	for (i = 0; i < serial->num_ports; i++) {
- 		port = serial->port[i];
- 		portdata = usb_get_serial_port_data(port);
-@@ -534,8 +520,6 @@ int usb_wwan_startup(struct usb_serial *
- 	struct usb_wwan_port_private *portdata;
- 	u8 *buffer;
- 
--	dbg("%s", __func__);
--
- 	/* Now setup per port private data */
- 	for (i = 0; i < serial->num_ports; i++) {
- 		port = serial->port[i];
-@@ -603,8 +587,6 @@ static void stop_read_write_urbs(struct
- 
- void usb_wwan_disconnect(struct usb_serial *serial)
- {
--	dbg("%s", __func__);
--
- 	stop_read_write_urbs(serial);
- }
- EXPORT_SYMBOL(usb_wwan_disconnect);
-@@ -615,8 +597,6 @@ void usb_wwan_release(struct usb_serial
- 	struct usb_serial_port *port;
- 	struct usb_wwan_port_private *portdata;
- 
--	dbg("%s", __func__);
--
- 	/* Now free them */
- 	for (i = 0; i < serial->num_ports; ++i) {
- 		port = serial->port[i];
-@@ -649,8 +629,6 @@ int usb_wwan_suspend(struct usb_serial *
- 	struct usb_wwan_intf_private *intfdata = serial->private;
- 	int b;
- 
--	dbg("%s entered", __func__);
--
- 	if (PMSG_IS_AUTO(message)) {
- 		spin_lock_irq(&intfdata->susp_lock);
- 		b = intfdata->in_flight;
-@@ -714,7 +692,6 @@ int usb_wwan_resume(struct usb_serial *s
- 	struct urb *urb;
- 	int err = 0;
- 
--	dbg("%s entered", __func__);
- 	/* get the interrupt URBs resubmitted unconditionally */
- 	for (i = 0; i < serial->num_ports; i++) {
- 		port = serial->port[i];
---- a/drivers/usb/serial/visor.c
-+++ b/drivers/usb/serial/visor.c
-@@ -244,8 +244,6 @@ static int visor_open(struct tty_struct
- {
- 	int result = 0;
- 
--	dbg("%s - port %d", __func__, port->number);
--
- 	if (!port->read_urb) {
- 		/* this is needed for some brain dead Sony devices */
- 		dev_err(&port->dev, "Device lied about number of ports, please use a lower one.\n");
-@@ -258,7 +256,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,8 +272,6 @@ static void visor_close(struct usb_seria
- {
- 	unsigned char *transfer_buffer;
- 
--	dbg("%s - port %d", __func__, port->number);
--
- 	/* shutdown our urbs */
- 	usb_serial_generic_close(port);
- 	usb_kill_urb(port->interrupt_in_urb);
-@@ -310,12 +306,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,8 +344,6 @@ static int palm_os_3_probe(struct usb_se
- 	int i;
- 	int num_ports = 0;
- 
--	dbg("%s", __func__);
--
- 	transfer_buffer = kmalloc(sizeof(*connection_info), GFP_KERNEL);
- 	if (!transfer_buffer) {
- 		dev_err(dev, "%s - kmalloc(%Zd) failed.\n", __func__,
-@@ -445,8 +439,6 @@ static int palm_os_4_probe(struct usb_se
- 	unsigned char *transfer_buffer;
- 	int retval;
- 
--	dbg("%s", __func__);
--
- 	transfer_buffer =  kmalloc(sizeof(*connection_info), GFP_KERNEL);
- 	if (!transfer_buffer) {
- 		dev_err(dev, "%s - kmalloc(%Zd) failed.\n", __func__,
-@@ -478,8 +470,6 @@ static int visor_probe(struct usb_serial
- 	int (*startup)(struct usb_serial *serial,
- 					const struct usb_device_id *id);
- 
--	dbg("%s", __func__);
--
- 	/*
- 	 * some Samsung Android phones in modem mode have the same ID
- 	 * as SPH-I500, but they are ACM devices, so dont bind to them
-@@ -521,8 +511,6 @@ static int clie_3_5_startup(struct usb_s
- 	int result;
- 	u8 *data;
- 
--	dbg("%s", __func__);
--
- 	data = kmalloc(1, GFP_KERNEL);
- 	if (!data)
- 		return -ENOMEM;
-@@ -585,8 +573,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,8 +608,6 @@ static int clie_5_attach(struct usb_seri
- 	unsigned int pipe;
- 	int j;
- 
--	dbg("%s", __func__);
--
- 	/* TH55 registers 2 ports.
- 	   Communication in from the UX50/TH55 uses bulk_in_endpointAddress
- 	   from port 0. Communication out to the UX50/TH55 uses
---- a/drivers/usb/serial/whiteheat.c
-+++ b/drivers/usb/serial/whiteheat.c
-@@ -247,8 +247,6 @@ static int whiteheat_firmware_download(s
- 	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,
-@@ -577,8 +575,6 @@ static void whiteheat_release(struct usb
- 	struct list_head *tmp2;
- 	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));
-@@ -610,8 +606,6 @@ static int whiteheat_open(struct tty_str
- {
- 	int		retval = 0;
- 
--	dbg("%s - port %d", __func__, port->number);
--
- 	retval = start_command_port(port->serial);
- 	if (retval)
- 		goto exit;
-@@ -665,8 +659,6 @@ static void whiteheat_close(struct usb_s
- 	struct list_head *tmp;
- 	struct list_head *tmp2;
- 
--	dbg("%s - port %d", __func__, port->number);
--
- 	firm_report_tx_done(port);
- 	firm_close(port);
- 
-@@ -711,8 +703,6 @@ static int whiteheat_write(struct tty_st
- 	unsigned long flags;
- 	struct list_head *tmp;
- 
--	dbg("%s - port %d", __func__, port->number);
--
- 	if (count == 0) {
- 		dbg("%s - write request of 0 bytes", __func__);
- 		return (0);
-@@ -768,8 +758,6 @@ static int whiteheat_write_room(struct t
- 	int room = 0;
- 	unsigned long flags;
- 
--	dbg("%s - port %d", __func__, port->number);
--
- 	spin_lock_irqsave(&info->lock, flags);
- 	list_for_each(tmp, &info->tx_urbs_free)
- 		room++;
-@@ -786,8 +774,6 @@ static int whiteheat_tiocmget(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;
-@@ -803,8 +789,6 @@ static int whiteheat_tiocmset(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)
-@@ -876,8 +860,6 @@ static int whiteheat_chars_in_buffer(str
- 	int chars = 0;
- 	unsigned long flags;
- 
--	dbg("%s - port %d", __func__, port->number);
--
- 	spin_lock_irqsave(&info->lock, flags);
- 	list_for_each(tmp, &info->tx_urbs_submitted) {
- 		wrap = list_entry(tmp, struct whiteheat_urb_wrap, list);
-@@ -895,8 +877,6 @@ static void whiteheat_throttle(struct tt
- 	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);
--
- 	spin_lock_irq(&info->lock);
- 	info->flags |= THROTTLED;
- 	spin_unlock_irq(&info->lock);
-@@ -909,8 +889,6 @@ static void whiteheat_unthrottle(struct
- 	struct whiteheat_private *info = usb_get_serial_port_data(port);
- 	int actually_throttled;
- 
--	dbg("%s - port %d", __func__, port->number);
--
- 	spin_lock_irq(&info->lock);
- 	actually_throttled = info->flags & ACTUALLY_THROTTLED;
- 	info->flags &= ~(THROTTLED | ACTUALLY_THROTTLED);
-@@ -928,8 +906,6 @@ static void command_port_write_callback(
- {
- 	int status = urb->status;
- 
--	dbg("%s", __func__);
--
- 	if (status) {
- 		dbg("nonzero urb status: %d", status);
- 		return;
-@@ -945,8 +921,6 @@ static void command_port_read_callback(s
- 	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__);
-@@ -997,8 +971,6 @@ static void whiteheat_read_callback(stru
- 	struct whiteheat_private *info = usb_get_serial_port_data(port);
- 	int status = urb->status;
- 
--	dbg("%s - port %d", __func__, port->number);
--
- 	spin_lock(&info->lock);
- 	wrap = urb_to_wrap(urb, &info->rx_urbs_submitted);
- 	if (!wrap) {
-@@ -1041,8 +1013,6 @@ static void whiteheat_write_callback(str
- 	struct whiteheat_urb_wrap *wrap;
- 	int status = urb->status;
- 
--	dbg("%s - port %d", __func__, port->number);
--
- 	spin_lock(&info->lock);
- 	wrap = urb_to_wrap(urb, &info->tx_urbs_submitted);
- 	if (!wrap) {
diff --git a/series b/series
index 94b385bfee5dfb..55e7eb78c80956 100644
--- a/series
+++ b/series
@@ -1,13 +1,7 @@
 # My specific stuff, at the top to make it easier to work stuff below.
 staging-add-csr-wifi-os-helper-module.patch
 time-don-t-inline-export_symbol-functions.patch
-perf-turn-off-compiler-warnings-for-flex-and-bison-generated-files.patch
-hfsplus-bugfixes.patch
 usb-rename-the-usb-misc-class-from-usb-to-usbmisc.patch
-modpost-use-proper-kernel-style-for-autogenerated-files.patch
-printk.patch
-ipaq.patch
-visor.patch
 gregkh/gkh-version.patch
 
 #####################################################################
diff --git a/staging-add-csr-wifi-os-helper-module.patch b/staging-add-csr-wifi-os-helper-module.patch
index fe6cb7b2176008..fc5f9f1f650a43 100644
--- a/staging-add-csr-wifi-os-helper-module.patch
+++ b/staging-add-csr-wifi-os-helper-module.patch
@@ -13,29 +13,55 @@ for now is needed as the CSR driver relies on it.
 Cc: Mikko Virkkilä <mikko.virkkila@bluegiga.com>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
-diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
-index 97d412d..3cf7223 100644
+---
+ drivers/staging/Kconfig                  |    2 
+ drivers/staging/Makefile                 |    1 
+ drivers/staging/csr/Kconfig              |    7 +
+ drivers/staging/csr/Makefile             |    1 
+ drivers/staging/csr/oska/Makefile        |   12 +
+ drivers/staging/csr/oska/all.h           |   61 +++++++++
+ drivers/staging/csr/oska/alloc.h         |   41 ++++++
+ drivers/staging/csr/oska/compat.c        |   54 ++++++++
+ drivers/staging/csr/oska/event.c         |   82 ++++++++++++
+ drivers/staging/csr/oska/event.h         |   33 +++++
+ drivers/staging/csr/oska/io.h            |   63 +++++++++
+ drivers/staging/csr/oska/kernel-compat.h |  199 +++++++++++++++++++++++++++++++
+ drivers/staging/csr/oska/list.c          |  103 ++++++++++++++++
+ drivers/staging/csr/oska/list.h          |  115 +++++++++++++++++
+ drivers/staging/csr/oska/mutex.h         |   42 ++++++
+ drivers/staging/csr/oska/oska_module.c   |   21 +++
+ drivers/staging/csr/oska/print.c         |   44 ++++++
+ drivers/staging/csr/oska/print.h         |   32 ++++
+ drivers/staging/csr/oska/refcount.c      |   47 +++++++
+ drivers/staging/csr/oska/refcount.h      |   86 +++++++++++++
+ drivers/staging/csr/oska/semaphore.h     |   70 ++++++++++
+ drivers/staging/csr/oska/spinlock.h      |   43 ++++++
+ drivers/staging/csr/oska/thread.c        |   66 ++++++++++
+ drivers/staging/csr/oska/thread.h        |   39 ++++++
+ drivers/staging/csr/oska/time.h          |   34 +++++
+ drivers/staging/csr/oska/timer.c         |   28 ++++
+ drivers/staging/csr/oska/timer.h         |   40 ++++++
+ drivers/staging/csr/oska/trace.h         |   23 +++
+ drivers/staging/csr/oska/types.h         |   14 ++
+ drivers/staging/csr/oska/util.h          |   48 +++++++
+ 30 files changed, 1451 insertions(+)
+
 --- a/drivers/staging/Kconfig
 +++ b/drivers/staging/Kconfig
-@@ -132,4 +132,6 @@ source "drivers/staging/ramster/Kconfig"
+@@ -132,4 +132,6 @@ source "drivers/staging/ipack/Kconfig"
  
- source "drivers/staging/ozwpan/Kconfig"
+ source "drivers/staging/gdm72xx/Kconfig"
  
 +source "drivers/staging/csr/Kconfig"
 +
  endif # STAGING
-diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
-index ffe7d44..845ee64 100644
 --- a/drivers/staging/Makefile
 +++ b/drivers/staging/Makefile
-@@ -57,3 +57,4 @@ obj-$(CONFIG_ANDROID)		+= android/
- obj-$(CONFIG_PHONE)		+= telephony/
- obj-$(CONFIG_RAMSTER)		+= ramster/
+@@ -58,3 +58,4 @@ obj-$(CONFIG_RAMSTER)		+= ramster/
  obj-$(CONFIG_USB_WPAN_HCD)	+= ozwpan/
+ obj-$(CONFIG_USB_G_CCG)		+= ccg/
+ obj-$(CONFIG_WIMAX_GDM72XX)	+= gdm72xx/
 +obj-$(CONFIG_CSR_WIFI)		+= csr/
-diff --git a/drivers/staging/csr/Kconfig b/drivers/staging/csr/Kconfig
-new file mode 100644
-index 0000000..5d7b800
 --- /dev/null
 +++ b/drivers/staging/csr/Kconfig
 @@ -0,0 +1,7 @@
@@ -46,16 +72,10 @@ index 0000000..5d7b800
 +	  Driver for the CSR wireless SDIO device.
 +
 +	  If unsure, select N.
-diff --git a/drivers/staging/csr/Makefile b/drivers/staging/csr/Makefile
-new file mode 100644
-index 0000000..b9ba3b3
 --- /dev/null
 +++ b/drivers/staging/csr/Makefile
 @@ -0,0 +1 @@
 +obj-$(CONFIG_CSR_WIFI)	+= oska/
-diff --git a/drivers/staging/csr/oska/Makefile b/drivers/staging/csr/oska/Makefile
-new file mode 100644
-index 0000000..3a0b648
 --- /dev/null
 +++ b/drivers/staging/csr/oska/Makefile
 @@ -0,0 +1,12 @@
@@ -71,9 +91,6 @@ index 0000000..3a0b648
 +       thread.o \
 +       timer.o
 +
-diff --git a/drivers/staging/csr/oska/all.h b/drivers/staging/csr/oska/all.h
-new file mode 100644
-index 0000000..5fe8583
 --- /dev/null
 +++ b/drivers/staging/csr/oska/all.h
 @@ -0,0 +1,61 @@
@@ -138,9 +155,6 @@ index 0000000..5fe8583
 +#include "util.h"
 +
 +#endif /* __OSKA_ALL_H */
-diff --git a/drivers/staging/csr/oska/alloc.h b/drivers/staging/csr/oska/alloc.h
-new file mode 100644
-index 0000000..0f10601
 --- /dev/null
 +++ b/drivers/staging/csr/oska/alloc.h
 @@ -0,0 +1,41 @@
@@ -185,9 +199,6 @@ index 0000000..0f10601
 +}
 +
 +#endif /* #ifndef __OSKA_LINUX_ALLOC_H */
-diff --git a/drivers/staging/csr/oska/compat.c b/drivers/staging/csr/oska/compat.c
-new file mode 100644
-index 0000000..790b97a
 --- /dev/null
 +++ b/drivers/staging/csr/oska/compat.c
 @@ -0,0 +1,54 @@
@@ -245,9 +256,6 @@ index 0000000..790b97a
 +EXPORT_SYMBOL_GPL(class_find_device);
 +
 +#endif /* Linux kernel < 2.6.25 */
-diff --git a/drivers/staging/csr/oska/event.c b/drivers/staging/csr/oska/event.c
-new file mode 100644
-index 0000000..36bfcd9
 --- /dev/null
 +++ b/drivers/staging/csr/oska/event.c
 @@ -0,0 +1,82 @@
@@ -325,7 +333,7 @@ index 0000000..36bfcd9
 +void os_event_raise(os_event_t *evt, uint16_t events)
 +{
 +    unsigned long flags;
-+    
++
 +    spin_lock_irqsave(&evt->lock, flags);
 +    evt->events |= events;
 +    spin_unlock_irqrestore(&evt->lock, flags);
@@ -333,9 +341,6 @@ index 0000000..36bfcd9
 +    wake_up(&evt->wq);
 +}
 +EXPORT_SYMBOL(os_event_raise);
-diff --git a/drivers/staging/csr/oska/event.h b/drivers/staging/csr/oska/event.h
-new file mode 100644
-index 0000000..be52e42
 --- /dev/null
 +++ b/drivers/staging/csr/oska/event.h
 @@ -0,0 +1,33 @@
@@ -372,9 +377,6 @@ index 0000000..be52e42
 +void os_event_raise(os_event_t *evt, uint16_t events);
 +
 +#endif /* #ifndef __OSKA_LINUX_EVENT_H */
-diff --git a/drivers/staging/csr/oska/io.h b/drivers/staging/csr/oska/io.h
-new file mode 100644
-index 0000000..c6c406c
 --- /dev/null
 +++ b/drivers/staging/csr/oska/io.h
 @@ -0,0 +1,63 @@
@@ -441,9 +443,6 @@ index 0000000..c6c406c
 +}
 +
 +#endif /* #ifndef __OSKA_LINUX_IO_H */
-diff --git a/drivers/staging/csr/oska/kernel-compat.h b/drivers/staging/csr/oska/kernel-compat.h
-new file mode 100644
-index 0000000..b6d27d3
 --- /dev/null
 +++ b/drivers/staging/csr/oska/kernel-compat.h
 @@ -0,0 +1,199 @@
@@ -646,9 +645,6 @@ index 0000000..b6d27d3
 +#endif
 +
 +#endif /* #ifndef __LINUX_KERNEL_COMPAT_H */
-diff --git a/drivers/staging/csr/oska/list.c b/drivers/staging/csr/oska/list.c
-new file mode 100644
-index 0000000..b5e884e
 --- /dev/null
 +++ b/drivers/staging/csr/oska/list.c
 @@ -0,0 +1,103 @@
@@ -755,9 +751,6 @@ index 0000000..b5e884e
 +{
 +    return &list->head;
 +}
-diff --git a/drivers/staging/csr/oska/list.h b/drivers/staging/csr/oska/list.h
-new file mode 100644
-index 0000000..a69b3b7
 --- /dev/null
 +++ b/drivers/staging/csr/oska/list.h
 @@ -0,0 +1,115 @@
@@ -876,9 +869,6 @@ index 0000000..a69b3b7
 +#endif
 +
 +#endif /* #ifndef __OSKA_LIST_H */
-diff --git a/drivers/staging/csr/oska/mutex.h b/drivers/staging/csr/oska/mutex.h
-new file mode 100644
-index 0000000..9138b28
 --- /dev/null
 +++ b/drivers/staging/csr/oska/mutex.h
 @@ -0,0 +1,42 @@
@@ -924,9 +914,6 @@ index 0000000..9138b28
 +}
 +
 +#endif /* __OSKA_LINUX_MUTEX_H */
-diff --git a/drivers/staging/csr/oska/oska_module.c b/drivers/staging/csr/oska/oska_module.c
-new file mode 100644
-index 0000000..da12564
 --- /dev/null
 +++ b/drivers/staging/csr/oska/oska_module.c
 @@ -0,0 +1,21 @@
@@ -951,9 +938,6 @@ index 0000000..da12564
 +MODULE_DESCRIPTION("Operating System Kernel Abstraction");
 +MODULE_AUTHOR("Cambridge Silicon Radio Ltd.");
 +MODULE_LICENSE("GPL and additional rights");
-diff --git a/drivers/staging/csr/oska/print.c b/drivers/staging/csr/oska/print.c
-new file mode 100644
-index 0000000..5f5b263
 --- /dev/null
 +++ b/drivers/staging/csr/oska/print.c
 @@ -0,0 +1,44 @@
@@ -1001,9 +985,6 @@ index 0000000..5f5b263
 +    printk("%s\n", buf);
 +}
 +EXPORT_SYMBOL(os_vprint);
-diff --git a/drivers/staging/csr/oska/print.h b/drivers/staging/csr/oska/print.h
-new file mode 100644
-index 0000000..f48bb83
 --- /dev/null
 +++ b/drivers/staging/csr/oska/print.h
 @@ -0,0 +1,32 @@
@@ -1039,9 +1020,6 @@ index 0000000..f48bb83
 +
 +
 +#endif /* #ifndef __OSKA_LINUX_PRINT_H */
-diff --git a/drivers/staging/csr/oska/refcount.c b/drivers/staging/csr/oska/refcount.c
-new file mode 100644
-index 0000000..28abb64
 --- /dev/null
 +++ b/drivers/staging/csr/oska/refcount.c
 @@ -0,0 +1,47 @@
@@ -1092,9 +1070,6 @@ index 0000000..28abb64
 +        refcount->func(refcount->arg);
 +    }
 +}
-diff --git a/drivers/staging/csr/oska/refcount.h b/drivers/staging/csr/oska/refcount.h
-new file mode 100644
-index 0000000..741b00a
 --- /dev/null
 +++ b/drivers/staging/csr/oska/refcount.h
 @@ -0,0 +1,86 @@
@@ -1184,9 +1159,6 @@ index 0000000..741b00a
 +void os_refcount_put(os_refcount_t *refcount);
 +
 +#endif /* #ifndef __OSKA_REFCOUNT_H */
-diff --git a/drivers/staging/csr/oska/semaphore.h b/drivers/staging/csr/oska/semaphore.h
-new file mode 100644
-index 0000000..965bfe8
 --- /dev/null
 +++ b/drivers/staging/csr/oska/semaphore.h
 @@ -0,0 +1,70 @@
@@ -1260,9 +1232,6 @@ index 0000000..965bfe8
 +}
 +
 +#endif /* __OSKA_LINUX_SEMAPHORE_H */
-diff --git a/drivers/staging/csr/oska/spinlock.h b/drivers/staging/csr/oska/spinlock.h
-new file mode 100644
-index 0000000..157b350
 --- /dev/null
 +++ b/drivers/staging/csr/oska/spinlock.h
 @@ -0,0 +1,43 @@
@@ -1309,9 +1278,6 @@ index 0000000..157b350
 +}
 +
 +#endif /* #ifndef __OSKA_LINUX_SPINLOCK_H */
-diff --git a/drivers/staging/csr/oska/thread.c b/drivers/staging/csr/oska/thread.c
-new file mode 100644
-index 0000000..f680cef
 --- /dev/null
 +++ b/drivers/staging/csr/oska/thread.c
 @@ -0,0 +1,66 @@
@@ -1381,9 +1347,6 @@ index 0000000..f680cef
 +    return thread->stop;
 +}
 +EXPORT_SYMBOL(os_thread_should_stop);
-diff --git a/drivers/staging/csr/oska/thread.h b/drivers/staging/csr/oska/thread.h
-new file mode 100644
-index 0000000..8816dc8
 --- /dev/null
 +++ b/drivers/staging/csr/oska/thread.h
 @@ -0,0 +1,39 @@
@@ -1426,9 +1389,6 @@ index 0000000..8816dc8
 +}
 +
 +#endif /* __OSKA_LINUX_THREAD_H */
-diff --git a/drivers/staging/csr/oska/time.h b/drivers/staging/csr/oska/time.h
-new file mode 100644
-index 0000000..d246ce9
 --- /dev/null
 +++ b/drivers/staging/csr/oska/time.h
 @@ -0,0 +1,34 @@
@@ -1466,9 +1426,6 @@ index 0000000..d246ce9
 +#define os_time_after(a, b) time_after((a), (b))
 +
 +#endif /* __OSKA_LINUX_TIME_H */
-diff --git a/drivers/staging/csr/oska/timer.c b/drivers/staging/csr/oska/timer.c
-new file mode 100644
-index 0000000..67d3423
 --- /dev/null
 +++ b/drivers/staging/csr/oska/timer.c
 @@ -0,0 +1,28 @@
@@ -1500,9 +1457,6 @@ index 0000000..67d3423
 +    init_timer(&timer->timer);
 +}
 +EXPORT_SYMBOL(os_timer_init);
-diff --git a/drivers/staging/csr/oska/timer.h b/drivers/staging/csr/oska/timer.h
-new file mode 100644
-index 0000000..3045fc3
 --- /dev/null
 +++ b/drivers/staging/csr/oska/timer.h
 @@ -0,0 +1,40 @@
@@ -1546,9 +1500,6 @@ index 0000000..3045fc3
 +}
 +
 +#endif /* #ifndef __OSKA_LINUX_TIMER_H */
-diff --git a/drivers/staging/csr/oska/trace.h b/drivers/staging/csr/oska/trace.h
-new file mode 100644
-index 0000000..b28f37d
 --- /dev/null
 +++ b/drivers/staging/csr/oska/trace.h
 @@ -0,0 +1,23 @@
@@ -1575,9 +1526,6 @@ index 0000000..b28f37d
 +#define os_trace_dbg(format, ...)  printk(KERN_DEBUG OS_TRACE_PREFIX format "\n", ## __VA_ARGS__)
 +
 +#endif /* #ifndef __OSKA_LINUX_TRACE_H */
-diff --git a/drivers/staging/csr/oska/types.h b/drivers/staging/csr/oska/types.h
-new file mode 100644
-index 0000000..18d7c11
 --- /dev/null
 +++ b/drivers/staging/csr/oska/types.h
 @@ -0,0 +1,14 @@
@@ -1595,9 +1543,6 @@ index 0000000..18d7c11
 +#include <linux/types.h>
 +
 +#endif /* #ifndef __OSKA_LINUX_TYPES_H */
-diff --git a/drivers/staging/csr/oska/util.h b/drivers/staging/csr/oska/util.h
-new file mode 100644
-index 0000000..bf29e2d
 --- /dev/null
 +++ b/drivers/staging/csr/oska/util.h
 @@ -0,0 +1,48 @@
diff --git a/visor.patch b/visor.patch
deleted file mode 100644
index b785f555c703ca..00000000000000
--- a/visor.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-From foo@baz Thu Apr 19 15:15:43 PDT 2012
-Date: Thu, 19 Apr 2012 15:15:43 -0700
-To: Greg KH <gregkh@linuxfoundation.org>
-From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Subject: USB: serial: visor: remove product and vendor module parameters
-
-This driver is for devices that are no longer being made, so the ability
-to add new device ids when loading the module is not a feature that
-anyone uses anymore.  So remove it, which simplifies the startup code a
-lot, and saves space.
-
-If you still need to dynamically load device ids, that can be done
-through sysfs.
-
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/usb/serial/visor.c |   65 ---------------------------------------------
- 1 file changed, 1 insertion(+), 64 deletions(-)
-
---- a/drivers/usb/serial/visor.c
-+++ b/drivers/usb/serial/visor.c
-@@ -53,8 +53,6 @@ static int palm_os_4_probe(struct usb_se
- 
- /* Parameters that may be passed into the module. */
- static bool debug;
--static __u16 vendor;
--static __u16 product;
- 
- static struct usb_device_id id_table [] = {
- 	{ USB_DEVICE(HANDSPRING_VENDOR_ID, HANDSPRING_VISOR_ID),
-@@ -115,14 +113,12 @@ static struct usb_device_id id_table []
- 		.driver_info = (kernel_ulong_t)&palm_os_4_probe },
- 	{ USB_DEVICE(FOSSIL_VENDOR_ID, FOSSIL_ABACUS_ID),
- 		.driver_info = (kernel_ulong_t)&palm_os_4_probe },
--	{ },					/* optional parameter entry */
- 	{ }					/* Terminating entry */
- };
- 
- static struct usb_device_id clie_id_5_table [] = {
- 	{ USB_DEVICE(SONY_VENDOR_ID, SONY_CLIE_UX50_ID),
- 		.driver_info = (kernel_ulong_t)&palm_os_4_probe },
--	{ },					/* optional parameter entry */
- 	{ }					/* Terminating entry */
- };
- 
-@@ -162,7 +158,6 @@ static struct usb_device_id id_table_com
- 	{ USB_DEVICE(ACEECA_VENDOR_ID, ACEECA_MEZ1000_ID) },
- 	{ USB_DEVICE(KYOCERA_VENDOR_ID, KYOCERA_7135_ID) },
- 	{ USB_DEVICE(FOSSIL_VENDOR_ID, FOSSIL_ABACUS_ID) },
--	{ },					/* optional parameter entry */
- 	{ }					/* Terminating entry */
- };
- 
-@@ -632,59 +627,7 @@ static int clie_5_attach(struct usb_seri
- 	return 0;
- }
- 
--static int __init visor_init(void)
--{
--	int i, retval;
--	/* Only if parameters were passed to us */
--	if (vendor > 0 && product > 0) {
--		struct usb_device_id usb_dev_temp[] = {
--			{
--				USB_DEVICE(vendor, product),
--				.driver_info =
--					(kernel_ulong_t) &palm_os_4_probe
--			}
--		};
--
--		/* Find the last entry in id_table */
--		for (i = 0;; i++) {
--			if (id_table[i].idVendor == 0) {
--				id_table[i] = usb_dev_temp[0];
--				break;
--			}
--		}
--		/* Find the last entry in id_table_combined */
--		for (i = 0;; i++) {
--			if (id_table_combined[i].idVendor == 0) {
--				id_table_combined[i] = usb_dev_temp[0];
--				break;
--			}
--		}
--		printk(KERN_INFO KBUILD_MODNAME
--		       ": Untested USB device specified at time of module insertion\n");
--		printk(KERN_INFO KBUILD_MODNAME
--		       ": Warning: This is not guaranteed to work\n");
--		printk(KERN_INFO KBUILD_MODNAME
--		       ": Using a newer kernel is preferred to this method\n");
--		printk(KERN_INFO KBUILD_MODNAME
--		       ": Adding Palm OS protocol 4.x support for unknown device: 0x%x/0x%x\n",
--			vendor, product);
--	}
--
--	retval = usb_serial_register_drivers(&visor_driver, serial_drivers);
--	if (retval == 0)
--		printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_DESC "\n");
--	return retval;
--}
--
--
--static void __exit visor_exit (void)
--{
--	usb_serial_deregister_drivers(&visor_driver, serial_drivers);
--}
--
--
--module_init(visor_init);
--module_exit(visor_exit);
-+module_usb_serial_driver(visor_driver, serial_drivers);
- 
- MODULE_AUTHOR(DRIVER_AUTHOR);
- MODULE_DESCRIPTION(DRIVER_DESC);
-@@ -692,9 +635,3 @@ MODULE_LICENSE("GPL");
- 
- module_param(debug, bool, S_IRUGO | S_IWUSR);
- MODULE_PARM_DESC(debug, "Debug enabled or not");
--
--module_param(vendor, ushort, 0);
--MODULE_PARM_DESC(vendor, "User specified vendor ID");
--module_param(product, ushort, 0);
--MODULE_PARM_DESC(product, "User specified product ID");
--
author	Greg Kroah-Hartman <gregkh@linuxfoundation.org>	2012-06-08 17:12:38 +0900
committer	Greg Kroah-Hartman <gregkh@linuxfoundation.org>	2012-06-08 17:12:38 +0900
commit	92bc28ba5d710658a2600c55a35a6d2acecc4825 (patch)
tree	14e255f827eadab96f53589593b313d24a438750
parent	4b54b72c5d696dae9276cdc16550a49cd1926067 (diff)
download	patches-92bc28ba5d710658a2600c55a35a6d2acecc4825.tar.gz