diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2008-10-15 11:51:16 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-10-15 11:51:16 -0700 |
| commit | be662c314a93133f8295d13e08419a4f5722b0f9 (patch) | |
| tree | c7157d6f62043a659bcbe26ad365be5499daac6f /usb | |
| parent | cd700aa4ceaa2bce5b4dacb66e8f5503441a56af (diff) | |
| download | patches-be662c314a93133f8295d13e08419a4f5722b0f9.tar.gz | |
2.6.27-git5 resync (lots of modifications and fixups)
Diffstat (limited to 'usb')
14 files changed, 204 insertions, 2012 deletions
diff --git a/usb/hso-fix-hso_serial_close-refcounting.patch b/usb/hso-fix-hso_serial_close-refcounting.patch index 5b14ba694044dd..06991f4f5b25b0 100644 --- a/usb/hso-fix-hso_serial_close-refcounting.patch +++ b/usb/hso-fix-hso_serial_close-refcounting.patch @@ -21,7 +21,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/net/usb/hso.c +++ b/drivers/net/usb/hso.c -@@ -1108,7 +1108,6 @@ static void hso_serial_close(struct tty_ +@@ -1290,7 +1290,6 @@ static void hso_serial_close(struct tty_ /* reset the rts and dtr */ /* do the actual close */ serial->open_count--; @@ -29,9 +29,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> if (serial->open_count <= 0) { serial->open_count = 0; if (serial->tty) { -@@ -1121,6 +1120,7 @@ static void hso_serial_close(struct tty_ - if (!usb_gone) +@@ -1307,6 +1306,7 @@ static void hso_serial_close(struct tty_ usb_autopm_put_interface(serial->parent->interface); + mutex_unlock(&serial->parent->mutex); + kref_put(&serial->parent->ref, hso_serial_ref_free); } diff --git a/usb/hso-put-linefeeds-on-printk-s-in-hso.c.patch b/usb/hso-put-linefeeds-on-printk-s-in-hso.c.patch index 1247e42313aed4..cd104605207760 100644 --- a/usb/hso-put-linefeeds-on-printk-s-in-hso.c.patch +++ b/usb/hso-put-linefeeds-on-printk-s-in-hso.c.patch @@ -13,12 +13,12 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- - drivers/net/usb/hso.c | 24 ++++++++++++------------ - 1 file changed, 12 insertions(+), 12 deletions(-) + drivers/net/usb/hso.c | 22 +++++++++++----------- + 1 file changed, 11 insertions(+), 11 deletions(-) --- a/drivers/net/usb/hso.c +++ b/drivers/net/usb/hso.c -@@ -725,7 +725,7 @@ static int hso_net_start_xmit(struct sk_ +@@ -750,7 +750,7 @@ static int hso_net_start_xmit(struct sk_ result = usb_submit_urb(odev->mux_bulk_tx_urb, GFP_ATOMIC); if (result) { dev_warn(&odev->parent->interface->dev, @@ -27,7 +27,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> net->stats.tx_errors++; netif_start_queue(net); } else { -@@ -974,7 +974,7 @@ static void read_bulk_callback(struct ur +@@ -999,7 +999,7 @@ static void read_bulk_callback(struct ur result = usb_submit_urb(urb, GFP_ATOMIC); if (result) dev_warn(&odev->parent->interface->dev, @@ -36,7 +36,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> result); } -@@ -1356,7 +1356,7 @@ static int mux_device_request(struct hso +@@ -1542,7 +1542,7 @@ static int mux_device_request(struct hso result = usb_submit_urb(ctrl_urb, GFP_ATOMIC); if (result) { dev_err(&ctrl_urb->dev->dev, @@ -45,16 +45,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> result, type); return result; } -@@ -1632,7 +1632,7 @@ static void hso_std_serial_read_bulk_cal - * arrives. */ - result = usb_submit_urb(urb, GFP_ATOMIC); - if (result) { -- dev_err(&urb->dev->dev, "%s failed submit serial rx_urb %d", -+ dev_err(&urb->dev->dev, "%s failed submit serial rx_urb %d\n", - __func__, result); - } - } -@@ -1896,12 +1896,12 @@ static int hso_serial_common_create(stru +@@ -2037,12 +2037,12 @@ static int hso_serial_common_create(stru serial->tx_data_length = tx_size; serial->tx_data = kzalloc(serial->tx_data_length, GFP_KERNEL); if (!serial->tx_data) { @@ -69,7 +60,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> goto exit; } -@@ -2049,13 +2049,13 @@ static void hso_create_rfkill(struct hso +@@ -2190,13 +2190,13 @@ static void hso_create_rfkill(struct hso hso_net->rfkill = rfkill_allocate(&interface_to_usbdev(interface)->dev, RFKILL_TYPE_WLAN); if (!hso_net->rfkill) { @@ -85,7 +76,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return; } snprintf(rfkn, 20, "hso-%d", -@@ -2068,7 +2068,7 @@ static void hso_create_rfkill(struct hso +@@ -2209,7 +2209,7 @@ static void hso_create_rfkill(struct hso kfree(rfkn); hso_net->rfkill->name = NULL; rfkill_free(hso_net->rfkill); @@ -94,7 +85,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return; } } -@@ -2324,13 +2324,13 @@ struct hso_shared_int *hso_create_shared +@@ -2466,13 +2466,13 @@ struct hso_shared_int *hso_create_shared mux->shared_intr_urb = usb_alloc_urb(0, GFP_KERNEL); if (!mux->shared_intr_urb) { @@ -110,7 +101,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> goto exit; } -@@ -2724,7 +2724,7 @@ static int hso_mux_submit_intr_urb(struc +@@ -2866,7 +2866,7 @@ static int hso_mux_submit_intr_urb(struc result = usb_submit_urb(shared_int->shared_intr_urb, gfp); if (result) diff --git a/usb/usb-ftdi_sio-fix-product-parameter-description.patch b/usb/usb-ftdi_sio-fix-product-parameter-description.patch index 573309ab2f39cc..e92be994510940 100644 --- a/usb/usb-ftdi_sio-fix-product-parameter-description.patch +++ b/usb/usb-ftdi_sio-fix-product-parameter-description.patch @@ -16,7 +16,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c -@@ -2456,5 +2456,5 @@ module_param(vendor, ushort, 0); +@@ -2459,5 +2459,5 @@ module_param(vendor, ushort, 0); MODULE_PARM_DESC(vendor, "User specified vendor ID (default=" __MODULE_STRING(FTDI_VID)")"); module_param(product, ushort, 0); diff --git a/usb/usb-hub.c-add-initial_descriptor_timeout-module-parameter-for-usbcore.patch b/usb/usb-hub.c-add-initial_descriptor_timeout-module-parameter-for-usbcore.patch index 032e046db3141b..c36f0370387962 100644 --- a/usb/usb-hub.c-add-initial_descriptor_timeout-module-parameter-for-usbcore.patch +++ b/usb/usb-hub.c-add-initial_descriptor_timeout-module-parameter-for-usbcore.patch @@ -29,7 +29,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt -@@ -2213,6 +2213,25 @@ and is between 256 and 4096 characters. +@@ -2252,6 +2252,25 @@ and is between 256 and 4096 characters. autosuspended. Devices for which the delay is set to a negative value won't be autosuspended at all. diff --git a/usb/usb-remove-code-associated-with-config_ppc_merge.patch b/usb/usb-remove-code-associated-with-config_ppc_merge.patch index 3810c87264d5d6..2b3393f6c9b5de 100644 --- a/usb/usb-remove-code-associated-with-config_ppc_merge.patch +++ b/usb/usb-remove-code-associated-with-config_ppc_merge.patch @@ -27,7 +27,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/usb/host/ehci.h +++ b/drivers/usb/host/ehci.h -@@ -740,16 +740,7 @@ ehci_port_speed(struct ehci_hcd *ehci, u +@@ -604,16 +604,7 @@ ehci_port_speed(struct ehci_hcd *ehci, u /* * Big-endian read/write functions are arch-specific. * Other arches can be added if/when they're needed. diff --git a/usb/usb-remove-info-macro-from-usb-hid-drivers.patch b/usb/usb-remove-info-macro-from-usb-hid-drivers.patch deleted file mode 100644 index 5a1e030daa1a4d..00000000000000 --- a/usb/usb-remove-info-macro-from-usb-hid-drivers.patch +++ /dev/null @@ -1,85 +0,0 @@ -From foo@baz Tue Apr 9 12:12:43 2002 -Date: Mon, 18 Aug 2008 13:21:04 -0700 (PDT) -To: Greg KH <greg@kroah.com> -From: Greg Kroah-Hartman <gregkh@suse.de> -Subject: USB: remove info() macro from usb HID drivers - -USB should not be having it's own printk macros, so remove info() and -use the system-wide standard of dev_info() wherever possible. - -Cc: Jiri Kosina <jkosina@suse.cz> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> ---- - drivers/hid/usbhid/hid-core.c | 3 ++- - drivers/hid/usbhid/hid-tmff.c | 3 ++- - drivers/hid/usbhid/usbkbd.c | 9 ++++++--- - drivers/hid/usbhid/usbmouse.c | 3 ++- - 4 files changed, 12 insertions(+), 6 deletions(-) - ---- a/drivers/hid/usbhid/hid-core.c -+++ b/drivers/hid/usbhid/hid-core.c -@@ -1122,7 +1122,8 @@ static int __init hid_init(void) - retval = usb_register(&hid_driver); - if (retval) - goto usb_register_fail; -- info(DRIVER_VERSION ":" DRIVER_DESC); -+ printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":" -+ DRIVER_DESC "\n"); - - return 0; - usb_register_fail: ---- a/drivers/hid/usbhid/hid-tmff.c -+++ b/drivers/hid/usbhid/hid-tmff.c -@@ -221,7 +221,8 @@ int hid_tmff_init(struct hid_device *hid - if (error) - goto fail; - -- info("Force feedback for ThrustMaster devices by Zinx Verituse <zinx@epicsol.org>"); -+ dev_info(hid->dev, -+ "Force feedback for ThrustMaster devices by Zinx Verituse <zinx@epicsol.org>\n"); - return 0; - - fail: ---- a/drivers/hid/usbhid/usbkbd.c -+++ b/drivers/hid/usbhid/usbkbd.c -@@ -105,14 +105,16 @@ static void usb_kbd_irq(struct urb *urb) - if (usb_kbd_keycode[kbd->old[i]]) - input_report_key(kbd->dev, usb_kbd_keycode[kbd->old[i]], 0); - else -- info("Unknown key (scancode %#x) released.", kbd->old[i]); -+ dev_info(&urb->dev->dev, -+ "Unknown key (scancode %#x) released.\n", kbd->old[i]); - } - - if (kbd->new[i] > 3 && memscan(kbd->old + 2, kbd->new[i], 6) == kbd->old + 8) { - if (usb_kbd_keycode[kbd->new[i]]) - input_report_key(kbd->dev, usb_kbd_keycode[kbd->new[i]], 1); - else -- info("Unknown key (scancode %#x) pressed.", kbd->new[i]); -+ dev_info(&urb->dev->dev, -+ "Unknown key (scancode %#x) released.\n", kbd->new[i]); - } - } - -@@ -353,7 +355,8 @@ static int __init usb_kbd_init(void) - { - int result = usb_register(&usb_kbd_driver); - if (result == 0) -- info(DRIVER_VERSION ":" DRIVER_DESC); -+ printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":" -+ DRIVER_DESC "\n"); - return result; - } - ---- a/drivers/hid/usbhid/usbmouse.c -+++ b/drivers/hid/usbhid/usbmouse.c -@@ -240,7 +240,8 @@ static int __init usb_mouse_init(void) - { - int retval = usb_register(&usb_mouse_driver); - if (retval == 0) -- info(DRIVER_VERSION ":" DRIVER_DESC); -+ printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":" -+ DRIVER_DESC "\n"); - return retval; - } - diff --git a/usb/usb-remove-info-macro-from-usb-media-drivers.patch b/usb/usb-remove-info-macro-from-usb-media-drivers.patch deleted file mode 100644 index 8f0fffe4c16652..00000000000000 --- a/usb/usb-remove-info-macro-from-usb-media-drivers.patch +++ /dev/null @@ -1,1541 +0,0 @@ -From foo@baz Tue Apr 9 12:12:43 2002 -Date: Mon, 18 Aug 2008 13:21:04 -0700 (PDT) -To: Greg KH <greg@kroah.com> -From: Greg Kroah-Hartman <gregkh@suse.de> -Subject: USB: remove info() macro from usb media drivers - -USB should not be having it's own printk macros, so remove info() and -use the system-wide standard of dev_info() wherever possible. - -Cc: Mauro Carvalho Chehab <mchehab@infradead.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> ---- - drivers/media/radio/dsbr100.c | 3 - drivers/media/video/dabusb.c | 3 - drivers/media/video/ov511.c | 105 +++++++------- - drivers/media/video/ov511.h | 3 - drivers/media/video/pvrusb2/pvrusb2-main.c | 8 - - drivers/media/video/se401.c | 37 ++-- - drivers/media/video/stv680.c | 6 - drivers/media/video/usbvideo/ibmcam.c | 78 ++++++---- - drivers/media/video/usbvideo/konicawc.c | 17 +- - drivers/media/video/usbvideo/quickcam_messenger.c | 3 - drivers/media/video/usbvideo/ultracam.c | 29 ++- - drivers/media/video/usbvideo/usbvideo.c | 163 ++++++++++++++-------- - drivers/media/video/usbvision/usbvision-core.c | 3 - drivers/media/video/usbvision/usbvision-i2c.c | 3 - drivers/media/video/usbvision/usbvision-video.c | 3 - drivers/media/video/zr364xx.c | 50 +++--- - 16 files changed, 312 insertions(+), 202 deletions(-) - ---- a/drivers/media/radio/dsbr100.c -+++ b/drivers/media/radio/dsbr100.c -@@ -510,7 +510,8 @@ static int usb_dsbr100_probe(struct usb_ - static int __init dsbr100_init(void) - { - int retval = usb_register(&usb_dsbr100_driver); -- info(DRIVER_VERSION ":" DRIVER_DESC); -+ printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":" -+ DRIVER_DESC "\n"); - return retval; - } - ---- a/drivers/media/video/dabusb.c -+++ b/drivers/media/video/dabusb.c -@@ -866,7 +866,8 @@ static int __init dabusb_init (void) - - dbg("dabusb_init: driver registered"); - -- info(DRIVER_VERSION ":" DRIVER_DESC); -+ printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":" -+ DRIVER_DESC "\n"); - - out: - return retval; ---- a/drivers/media/video/ov511.c -+++ b/drivers/media/video/ov511.c -@@ -974,14 +974,14 @@ dump_i2c_range(struct usb_ov511 *ov, int - - for (i = reg1; i <= regn; i++) { - rc = i2c_r(ov, i); -- info("Sensor[0x%02X] = 0x%02X", i, rc); -+ dev_info(&ov->dev->dev, "Sensor[0x%02X] = 0x%02X\n", i, rc); - } - } - - static void - dump_i2c_regs(struct usb_ov511 *ov) - { -- info("I2C REGS"); -+ dev_info(&ov->dev->dev, "I2C REGS\n"); - dump_i2c_range(ov, 0x00, 0x7C); - } - -@@ -992,28 +992,28 @@ dump_reg_range(struct usb_ov511 *ov, int - - for (i = reg1; i <= regn; i++) { - rc = reg_r(ov, i); -- info("OV511[0x%02X] = 0x%02X", i, rc); -+ dev_info(&ov->dev->dev, "OV511[0x%02X] = 0x%02X\n", i, rc); - } - } - - static void - ov511_dump_regs(struct usb_ov511 *ov) - { -- info("CAMERA INTERFACE REGS"); -+ dev_info(&ov->dev->dev, "CAMERA INTERFACE REGS\n"); - dump_reg_range(ov, 0x10, 0x1f); -- info("DRAM INTERFACE REGS"); -+ dev_info(&ov->dev->dev, "DRAM INTERFACE REGS\n"); - dump_reg_range(ov, 0x20, 0x23); -- info("ISO FIFO REGS"); -+ dev_info(&ov->dev->dev, "ISO FIFO REGS\n"); - dump_reg_range(ov, 0x30, 0x31); -- info("PIO REGS"); -+ dev_info(&ov->dev->dev, "PIO REGS\n"); - dump_reg_range(ov, 0x38, 0x39); - dump_reg_range(ov, 0x3e, 0x3e); -- info("I2C REGS"); -+ dev_info(&ov->dev->dev, "I2C REGS\n"); - dump_reg_range(ov, 0x40, 0x49); -- info("SYSTEM CONTROL REGS"); -+ dev_info(&ov->dev->dev, "SYSTEM CONTROL REGS\n"); - dump_reg_range(ov, 0x50, 0x55); - dump_reg_range(ov, 0x5e, 0x5f); -- info("OmniCE REGS"); -+ dev_info(&ov->dev->dev, "OmniCE REGS\n"); - dump_reg_range(ov, 0x70, 0x79); - /* NOTE: Quantization tables are not readable. You will get the value - * in reg. 0x79 for every table register */ -@@ -1025,25 +1025,25 @@ ov511_dump_regs(struct usb_ov511 *ov) - static void - ov518_dump_regs(struct usb_ov511 *ov) - { -- info("VIDEO MODE REGS"); -+ dev_info(&ov->dev->dev, "VIDEO MODE REGS\n"); - dump_reg_range(ov, 0x20, 0x2f); -- info("DATA PUMP AND SNAPSHOT REGS"); -+ dev_info(&ov->dev->dev, "DATA PUMP AND SNAPSHOT REGS\n"); - dump_reg_range(ov, 0x30, 0x3f); -- info("I2C REGS"); -+ dev_info(&ov->dev->dev, "I2C REGS\n"); - dump_reg_range(ov, 0x40, 0x4f); -- info("SYSTEM CONTROL AND VENDOR REGS"); -+ dev_info(&ov->dev->dev, "SYSTEM CONTROL AND VENDOR REGS\n"); - dump_reg_range(ov, 0x50, 0x5f); -- info("60 - 6F"); -+ dev_info(&ov->dev->dev, "60 - 6F\n"); - dump_reg_range(ov, 0x60, 0x6f); -- info("70 - 7F"); -+ dev_info(&ov->dev->dev, "70 - 7F\n"); - dump_reg_range(ov, 0x70, 0x7f); -- info("Y QUANTIZATION TABLE"); -+ dev_info(&ov->dev->dev, "Y QUANTIZATION TABLE\n"); - dump_reg_range(ov, 0x80, 0x8f); -- info("UV QUANTIZATION TABLE"); -+ dev_info(&ov->dev->dev, "UV QUANTIZATION TABLE\n"); - dump_reg_range(ov, 0x90, 0x9f); -- info("A0 - BF"); -+ dev_info(&ov->dev->dev, "A0 - BF\n"); - dump_reg_range(ov, 0xa0, 0xbf); -- info("CBR"); -+ dev_info(&ov->dev->dev, "CBR\n"); - dump_reg_range(ov, 0xc0, 0xcf); - } - #endif -@@ -3208,9 +3208,10 @@ ov511_move_data(struct usb_ov511 *ov, un - */ - - if (printph) { -- info("ph(%3d): %2x %2x %2x %2x %2x %2x %2x %2x %2x %2x %2x %2x", -- pnum, in[0], in[1], in[2], in[3], in[4], in[5], in[6], -- in[7], in[8], in[9], in[10], in[11]); -+ dev_info(&ov->dev->dev, -+ "ph(%3d): %2x %2x %2x %2x %2x %2x %2x %2x %2x %2x %2x %2x\n", -+ pnum, in[0], in[1], in[2], in[3], in[4], in[5], in[6], -+ in[7], in[8], in[9], in[10], in[11]); - } - - /* Check for SOF/EOF packet */ -@@ -3369,8 +3370,10 @@ ov518_move_data(struct usb_ov511 *ov, un - * the definitive SOF/EOF format */ - if ((!(in[0] | in[1] | in[2] | in[3] | in[5])) && in[6]) { - if (printph) { -- info("ph: %2x %2x %2x %2x %2x %2x %2x %2x", in[0], -- in[1], in[2], in[3], in[4], in[5], in[6], in[7]); -+ dev_info(&ov->dev->dev, -+ "ph: %2x %2x %2x %2x %2x %2x %2x %2x\n", -+ in[0], in[1], in[2], in[3], in[4], in[5], -+ in[6], in[7]); - } - - if (frame->scanstate == STATE_LINES) { -@@ -3649,14 +3652,16 @@ ov51x_init_isoc(struct usb_ov511 *ov) - if (packetsize == -1) { - ov518_set_packet_size(ov, 640); - } else { -- info("Forcing packet size to %d", packetsize); -+ dev_info(&ov->dev->dev, "Forcing packet size to %d\n", -+ packetsize); - ov518_set_packet_size(ov, packetsize); - } - } else { - if (packetsize == -1) { - ov511_set_packet_size(ov, size); - } else { -- info("Forcing packet size to %d", packetsize); -+ dev_info(&ov->dev->dev, "Forcing packet size to %d\n", -+ packetsize); - ov511_set_packet_size(ov, packetsize); - } - } -@@ -4124,7 +4129,7 @@ ov51x_v4l1_ioctl_internal(struct inode * - return -EIO; - - if (force_palette && p->palette != force_palette) { -- info("Palette rejected (%s)", -+ dev_info(&ov->dev->dev, "Palette rejected (%s)\n", - symbolic(v4l1_plist, p->palette)); - return -EINVAL; - } -@@ -4852,26 +4857,27 @@ ov7xx0_configure(struct usb_ov511 *ov) - err("Error detecting sensor type"); - return -1; - } else if ((rc & 3) == 3) { -- info("Sensor is an OV7610"); -+ dev_info(&ov->dev->dev, "Sensor is an OV7610\n"); - ov->sensor = SEN_OV7610; - } else if ((rc & 3) == 1) { - /* I don't know what's different about the 76BE yet. */ - if (i2c_r(ov, 0x15) & 1) -- info("Sensor is an OV7620AE"); -+ dev_info(&ov->dev->dev, "Sensor is an OV7620AE\n"); - else -- info("Sensor is an OV76BE"); -+ dev_info(&ov->dev->dev, "Sensor is an OV76BE\n"); - - /* OV511+ will return all zero isoc data unless we - * configure the sensor as a 7620. Someone needs to - * find the exact reg. setting that causes this. */ - if (ov->bridge == BRG_OV511PLUS) { -- info("Enabling 511+/7620AE workaround"); -+ dev_info(&ov->dev->dev, -+ "Enabling 511+/7620AE workaround\n"); - ov->sensor = SEN_OV7620; - } else { - ov->sensor = SEN_OV76BE; - } - } else if ((rc & 3) == 0) { -- info("Sensor is an OV7620"); -+ dev_info(&ov->dev->dev, "Sensor is an OV7620\n"); - ov->sensor = SEN_OV7620; - } else { - err("Unknown image sensor version: %d", rc & 3); -@@ -5027,16 +5033,16 @@ ov6xx0_configure(struct usb_ov511 *ov) - - if ((rc & 3) == 0) { - ov->sensor = SEN_OV6630; -- info("Sensor is an OV6630"); -+ dev_info(&ov->dev->dev, "Sensor is an OV6630\n"); - } else if ((rc & 3) == 1) { - ov->sensor = SEN_OV6620; -- info("Sensor is an OV6620"); -+ dev_info(&ov->dev->dev, "Sensor is an OV6620\n"); - } else if ((rc & 3) == 2) { - ov->sensor = SEN_OV6630; -- info("Sensor is an OV6630AE"); -+ dev_info(&ov->dev->dev, "Sensor is an OV6630AE\n"); - } else if ((rc & 3) == 3) { - ov->sensor = SEN_OV6630; -- info("Sensor is an OV6630AF"); -+ dev_info(&ov->dev->dev, "Sensor is an OV6630AF\n"); - } - - /* Set sensor-specific vars */ -@@ -5091,10 +5097,10 @@ ks0127_configure(struct usb_ov511 *ov) - err("Error detecting sensor type"); - return -1; - } else if ((rc & 0x0f) == 0) { -- info("Sensor is a KS0127"); -+ dev_info(&ov->dev->dev, "Sensor is a KS0127\n"); - ov->sensor = SEN_KS0127; - } else if ((rc & 0x0f) == 9) { -- info("Sensor is a KS0127B Rev. A"); -+ dev_info(&ov->dev->dev, "Sensor is a KS0127B Rev. A\n"); - ov->sensor = SEN_KS0127B; - } - } else { -@@ -5203,7 +5209,8 @@ saa7111a_configure(struct usb_ov511 *ov) - err("Error detecting sensor version"); - return -1; - } else { -- info("Sensor is an SAA7111A (version 0x%x)", rc); -+ dev_info(&ov->dev->dev, -+ "Sensor is an SAA7111A (version 0x%x)\n", rc); - ov->sensor = SEN_SAA7111A; - } - -@@ -5266,7 +5273,7 @@ ov511_configure(struct usb_ov511 *ov) - - PDEBUG (1, "CustomID = %d", ov->customid); - ov->desc = symbolic(camlist, ov->customid); -- info("model: %s", ov->desc); -+ dev_info(&ov->dev->dev, "model: %s\n", ov->desc); - - if (0 == strcmp(ov->desc, NOT_DEFINED_STR)) { - err("Camera type (%d) not recognized", ov->customid); -@@ -5430,7 +5437,8 @@ ov518_configure(struct usb_ov511 *ov) - PDEBUG(4, ""); - - /* First 5 bits of custom ID reg are a revision ID on OV518 */ -- info("Device revision %d", 0x1F & reg_r(ov, R511_SYS_CUST_ID)); -+ dev_info(&ov->dev->dev, "Device revision %d\n", -+ 0x1F & reg_r(ov, R511_SYS_CUST_ID)); - - /* Give it the default description */ - ov->desc = symbolic(camlist, 0); -@@ -5778,7 +5786,8 @@ ov51x_probe(struct usb_interface *intf, - goto error; - } - -- info("USB %s video device found", symbolic(brglist, ov->bridge)); -+ dev_info(&intf->dev, "USB %s video device found\n", -+ symbolic(brglist, ov->bridge)); - - init_waitqueue_head(&ov->wq); - -@@ -5859,8 +5868,8 @@ ov51x_probe(struct usb_interface *intf, - goto error; - } - -- info("Device at %s registered to minor %d", ov->usb_path, -- ov->vdev->minor); -+ dev_info(&intf->dev, "Device at %s registered to minor %d\n", -+ ov->usb_path, ov->vdev->minor); - - usb_set_intfdata(intf, ov); - if (ov_create_sysfs(ov->vdev)) { -@@ -5963,7 +5972,8 @@ usb_ov511_init(void) - if (retval) - goto out; - -- info(DRIVER_VERSION " : " DRIVER_DESC); -+ printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":" -+ DRIVER_DESC "\n"); - - out: - return retval; -@@ -5973,8 +5983,7 @@ static void __exit - usb_ov511_exit(void) - { - usb_deregister(&ov511_driver); -- info("driver deregistered"); -- -+ printk(KERN_INFO KBUILD_MODNAME ": driver deregistered\n"); - } - - module_init(usb_ov511_init); ---- a/drivers/media/video/ov511.h -+++ b/drivers/media/video/ov511.h -@@ -12,7 +12,8 @@ - - #ifdef OV511_DEBUG - #define PDEBUG(level, fmt, args...) \ -- if (debug >= (level)) info("[%s:%d] " fmt, \ -+ if (debug >= (level)) \ -+ printk(KERN_INFO KBUILD_MODNAME "[%s:%d] \n" fmt, \ - __func__, __LINE__ , ## args) - #else - #define PDEBUG(level, fmt, args...) do {} while(0) ---- a/drivers/media/video/pvrusb2/pvrusb2-main.c -+++ b/drivers/media/video/pvrusb2/pvrusb2-main.c -@@ -137,9 +137,11 @@ static int __init pvr_init(void) - ret = usb_register(&pvr_driver); - - if (ret == 0) -- info(DRIVER_DESC " : " DRIVER_VERSION); -- if (pvrusb2_debug) info("Debug mask is %d (0x%x)", -- pvrusb2_debug,pvrusb2_debug); -+ printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":" -+ DRIVER_DESC "\n"); -+ if (pvrusb2_debug) -+ printk(KERN_INFO KBUILD_MODNAME ": Debug mask is %d (0x%x)\n", -+ pvrusb2_debug,pvrusb2_debug); - - pvr2_trace(PVR2_TRACE_INIT,"pvr_init complete"); - ---- a/drivers/media/video/se401.c -+++ b/drivers/media/video/se401.c -@@ -288,7 +288,7 @@ static void se401_button_irq(struct urb - int status; - - if (!se401->dev) { -- info("ohoh: device vapourished"); -+ dev_info(&urb->dev->dev, "device vapourished\n"); - return; - } - -@@ -328,7 +328,7 @@ static void se401_video_irq(struct urb * - return; - - if (!se401->dev) { -- info ("ohoh: device vapourished"); -+ dev_info(&urb->dev->dev, "device vapourished\n"); - return; - } - -@@ -375,7 +375,7 @@ static void se401_video_irq(struct urb * - urb->status=0; - urb->dev=se401->dev; - if(usb_submit_urb(urb, GFP_KERNEL)) -- info("urb burned down"); -+ dev_info(&urb->dev->dev, "urb burned down\n"); - return; - } - -@@ -860,7 +860,8 @@ static int se401_newframe(struct usb_se4 - ); - if (se401->nullpackets > SE401_MAX_NULLPACKETS) { - se401->nullpackets=0; -- info("to many null length packets, restarting capture"); -+ dev_info(&se401->dev->dev, -+ "too many null length packets, restarting capture\n"); - se401_stop_stream(se401); - se401_start_stream(se401); - } else { -@@ -880,7 +881,8 @@ static int se401_newframe(struct usb_se4 - se401->scratch_use=0; - if (errors > SE401_MAX_ERRORS) { - errors=0; -- info("to much errors, restarting capture"); -+ dev_info(&se401->dev->dev, -+ "too many errors, restarting capture\n"); - se401_stop_stream(se401); - se401_start_stream(se401); - } -@@ -913,7 +915,7 @@ static void usb_se401_remove_disconnecte - usb_kill_urb(se401->inturb); - usb_free_urb(se401->inturb); - } -- info("%s disconnected", se401->camera_name); -+ dev_info(&se401->dev->dev, "%s disconnected", se401->camera_name); - - /* Free the memory */ - kfree(se401->width); -@@ -956,8 +958,8 @@ static int se401_close(struct inode *ino - - rvfree(se401->fbuf, se401->maxframesize * SE401_NUMFRAMES); - if (se401->removed) { -+ dev_info(&se401->dev->dev, "device unregistered\n"); - usb_se401_remove_disconnected(se401); -- info("device unregistered"); - } else { - for (i=0; i<SE401_NUMFRAMES; i++) - se401->frame[i].grabstate=FRAME_UNUSED; -@@ -1271,7 +1273,7 @@ static int se401_init(struct usb_se401 * - for (i=0; i<se401->sizes; i++) { - sprintf(temp, "%s %dx%d", temp, se401->width[i], se401->height[i]); - } -- info("%s", temp); -+ dev_info(&se401->dev->dev, "%s\n", temp); - se401->maxframesize=se401->width[se401->sizes-1]*se401->height[se401->sizes-1]*3; - - rc=se401_sndctrl(0, se401, SE401_REQ_GET_WIDTH, 0, cp, sizeof(cp)); -@@ -1305,7 +1307,8 @@ static int se401_init(struct usb_se401 * - if (button) { - se401->inturb=usb_alloc_urb(0, GFP_KERNEL); - if (!se401->inturb) { -- info("Allocation of inturb failed"); -+ dev_info(&se401->dev->dev, -+ "Allocation of inturb failed\n"); - return 1; - } - usb_fill_int_urb(se401->inturb, se401->dev, -@@ -1316,7 +1319,7 @@ static int se401_init(struct usb_se401 * - 8 - ); - if (usb_submit_urb(se401->inturb, GFP_KERNEL)) { -- info("int urb burned down"); -+ dev_info(&se401->dev->dev, "int urb burned down\n"); - return 1; - } - } else -@@ -1373,7 +1376,7 @@ static int se401_probe(struct usb_interf - return -ENODEV; - - /* We found one */ -- info("SE401 camera found: %s", camera_name); -+ dev_info(&intf->dev, "SE401 camera found: %s\n", camera_name); - - if ((se401 = kzalloc(sizeof(*se401), GFP_KERNEL)) == NULL) { - err("couldn't kmalloc se401 struct"); -@@ -1384,7 +1387,8 @@ static int se401_probe(struct usb_interf - se401->iface = interface->bInterfaceNumber; - se401->camera_name = camera_name; - -- info("firmware version: %02x", le16_to_cpu(dev->descriptor.bcdDevice) & 255); -+ dev_info(&intf->dev, "firmware version: %02x\n", -+ le16_to_cpu(dev->descriptor.bcdDevice) & 255); - - if (se401_init(se401, button)) { - kfree(se401); -@@ -1402,7 +1406,8 @@ static int se401_probe(struct usb_interf - err("video_register_device failed"); - return -EIO; - } -- info("registered new video device: video%d", se401->vdev.minor); -+ dev_info(&intf->dev, "registered new video device: video%d\n", -+ se401->vdev.minor); - - usb_set_intfdata (intf, se401); - return 0; -@@ -1446,10 +1451,10 @@ static struct usb_driver se401_driver = - - static int __init usb_se401_init(void) - { -- info("SE401 usb camera driver version %s registering", version); -+ printk(KERN_INFO "SE401 usb camera driver version %s registering\n", version); - if (flickerless) - if (flickerless!=50 && flickerless!=60) { -- info("Invallid flickerless value, use 0, 50 or 60."); -+ printk(KERN_ERR "Invallid flickerless value, use 0, 50 or 60.\n"); - return -1; - } - return usb_register(&se401_driver); -@@ -1458,7 +1463,7 @@ static int __init usb_se401_init(void) - static void __exit usb_se401_exit(void) - { - usb_deregister(&se401_driver); -- info("SE401 driver deregistered"); -+ printk(KERN_INFO "SE401 driver deregistered\frame"); - } - - module_init(usb_se401_init); ---- a/drivers/media/video/stv680.c -+++ b/drivers/media/video/stv680.c -@@ -84,7 +84,8 @@ static unsigned int debug; - #define PDEBUG(level, fmt, args...) \ - do { \ - if (debug >= level) \ -- info("[%s:%d] " fmt, __func__, __LINE__ , ## args); \ -+ printk(KERN_INFO KBUILD_MODNAME " [%s:%d] \n" fmt, \ -+ __func__, __LINE__ , ## args); \ - } while (0) - - -@@ -1550,7 +1551,8 @@ static int __init usb_stv680_init (void) - } - PDEBUG (0, "STV(i): usb camera driver version %s registering", DRIVER_VERSION); - -- info(DRIVER_DESC " " DRIVER_VERSION); -+ printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":" -+ DRIVER_DESC "\n"); - return 0; - } - ---- a/drivers/media/video/usbvideo/ibmcam.c -+++ b/drivers/media/video/usbvideo/ibmcam.c -@@ -258,7 +258,9 @@ static enum ParseState ibmcam_find_heade - (RING_QUEUE_PEEK(&uvd->dp, 2) == 0x00)) - { - #if 0 /* This code helps to detect new frame markers */ -- info("Header sig: 00 FF 00 %02X", RING_QUEUE_PEEK(&uvd->dp, 3)); -+ dev_info(&uvd->dev->dev, -+ "Header sig: 00 FF 00 %02X\n", -+ RING_QUEUE_PEEK(&uvd->dp, 3)); - #endif - frame->header = RING_QUEUE_PEEK(&uvd->dp, 3); - if ((frame->header == HDRSIG_MODEL1_128x96) || -@@ -266,7 +268,8 @@ static enum ParseState ibmcam_find_heade - (frame->header == HDRSIG_MODEL1_352x288)) - { - #if 0 -- info("Header found."); -+ dev_info(&uvd->dev->dev, -+ "Header found.\n"); - #endif - RING_QUEUE_DEQUEUE_BYTES(&uvd->dp, marker_len); - icam->has_hdr = 1; -@@ -295,7 +298,7 @@ case IBMCAM_MODEL_4: - (RING_QUEUE_PEEK(&uvd->dp, 1) == 0xFF)) - { - #if 0 -- info("Header found."); -+ dev_info(&uvd->dev->dev, "Header found.\n"); - #endif - RING_QUEUE_DEQUEUE_BYTES(&uvd->dp, marker_len); - icam->has_hdr = 1; -@@ -338,7 +341,7 @@ case IBMCAM_MODEL_4: - byte4 = RING_QUEUE_PEEK(&uvd->dp, 3); - frame->header = (byte3 << 8) | byte4; - #if 0 -- info("Header found."); -+ dev_info(&uvd->dev->dev, "Header found.\n"); - #endif - RING_QUEUE_DEQUEUE_BYTES(&uvd->dp, marker_len); - icam->has_hdr = 1; -@@ -354,7 +357,8 @@ case IBMCAM_MODEL_4: - } - if (!icam->has_hdr) { - if (uvd->debug > 2) -- info("Skipping frame, no header"); -+ dev_info(&uvd->dev->dev, -+ "Skipping frame, no header\n"); - return scan_EndParse; - } - -@@ -881,7 +885,9 @@ static enum ParseState ibmcam_model3_par - */ - if ((frame->curline + 1) >= data_h) { - if (uvd->debug >= 3) -- info("Reached line %d. (frame is done)", frame->curline); -+ dev_info(&uvd->dev->dev, -+ "Reached line %d. (frame is done)\n", -+ frame->curline); - return scan_NextFrame; - } - -@@ -954,8 +960,9 @@ static enum ParseState ibmcam_model3_par - - if (frame->curline >= VIDEOSIZE_Y(frame->request)) { - if (uvd->debug >= 3) { -- info("All requested lines (%ld.) done.", -- VIDEOSIZE_Y(frame->request)); -+ dev_info(&uvd->dev->dev, -+ "All requested lines (%ld.) done.\n", -+ VIDEOSIZE_Y(frame->request)); - } - return scan_NextFrame; - } else -@@ -1000,7 +1007,9 @@ static enum ParseState ibmcam_model4_128 - */ - if ((frame->curline + 1) >= data_h) { - if (uvd->debug >= 3) -- info("Reached line %d. (frame is done)", frame->curline); -+ dev_info(&uvd->dev->dev, -+ "Reached line %d. (frame is done)\n", -+ frame->curline); - return scan_NextFrame; - } - -@@ -1049,8 +1058,9 @@ static enum ParseState ibmcam_model4_128 - - if (frame->curline >= VIDEOSIZE_Y(frame->request)) { - if (uvd->debug >= 3) { -- info("All requested lines (%ld.) done.", -- VIDEOSIZE_Y(frame->request)); -+ dev_info(&uvd->dev->dev, -+ "All requested lines (%ld.) done.\n", -+ VIDEOSIZE_Y(frame->request)); - } - return scan_NextFrame; - } else -@@ -1171,10 +1181,11 @@ static int ibmcam_veio( - sizeof(cp), - 1000); - #if 0 -- info("USB => %02x%02x%02x%02x%02x%02x%02x%02x " -- "(req=$%02x val=$%04x ind=$%04x)", -- cp[0],cp[1],cp[2],cp[3],cp[4],cp[5],cp[6],cp[7], -- req, value, index); -+ dev_info(&uvd->dev->dev, -+ "USB => %02x%02x%02x%02x%02x%02x%02x%02x " -+ "(req=$%02x val=$%04x ind=$%04x)\n", -+ cp[0],cp[1],cp[2],cp[3],cp[4],cp[5],cp[6],cp[7], -+ req, value, index); - #endif - } else { - i = usb_control_msg( -@@ -1449,10 +1460,9 @@ static void ibmcam_adjust_contrast(struc - */ - static void ibmcam_change_lighting_conditions(struct uvd *uvd) - { -- static const char proc[] = "ibmcam_change_lighting_conditions"; -- - if (debug > 0) -- info("%s: Set lighting to %hu.", proc, lighting); -+ dev_info(&uvd->dev->dev, -+ "%s: Set lighting to %hu.\n", __func__, lighting); - - switch (IBMCAM_T(uvd)->camera_model) { - case IBMCAM_MODEL_1: -@@ -1495,8 +1505,6 @@ static void ibmcam_change_lighting_condi - */ - static void ibmcam_set_sharpness(struct uvd *uvd) - { -- static const char proc[] = "ibmcam_set_sharpness"; -- - switch (IBMCAM_T(uvd)->camera_model) { - case IBMCAM_MODEL_1: - { -@@ -1505,7 +1513,8 @@ static void ibmcam_set_sharpness(struct - - RESTRICT_TO_RANGE(sharpness, SHARPNESS_MIN, SHARPNESS_MAX); - if (debug > 0) -- info("%s: Set sharpness to %hu.", proc, sharpness); -+ dev_info(&uvd->dev->dev, "%s: Set sharpness to %hu.\n", -+ __func__, sharpness); - - sv = sa[sharpness - SHARPNESS_MIN]; - for (i=0; i < 2; i++) { -@@ -1564,11 +1573,11 @@ static void ibmcam_set_sharpness(struct - */ - static void ibmcam_set_brightness(struct uvd *uvd) - { -- static const char proc[] = "ibmcam_set_brightness"; - static const unsigned short n = 1; - - if (debug > 0) -- info("%s: Set brightness to %hu.", proc, uvd->vpic.brightness); -+ dev_info(&uvd->dev->dev, "%s: Set brightness to %hu.\n", -+ __func__, uvd->vpic.brightness); - - switch (IBMCAM_T(uvd)->camera_model) { - case IBMCAM_MODEL_1: -@@ -2115,7 +2124,8 @@ static void ibmcam_model2_setup_after_vi - break; - } - if (uvd->debug > 0) -- info("Framerate (hardware): %hd.", hw_fps); -+ dev_info(&uvd->dev->dev, "Framerate (hardware): %hd.\n", -+ hw_fps); - RESTRICT_TO_RANGE(hw_fps, 0, 31); - ibmcam_model2_Packet1(uvd, mod2_set_framerate, hw_fps); - } -@@ -3487,7 +3497,7 @@ static void ibmcam_model3_setup_after_vi - /* 01.01.08 - Added for RCA video in support -LO */ - if(init_model3_input) { - if (debug > 0) -- info("Setting input to RCA."); -+ dev_info(&uvd->dev->dev, "Setting input to RCA.\n"); - for (i=0; i < ARRAY_SIZE(initData); i++) { - ibmcam_veio(uvd, initData[i].req, initData[i].value, initData[i].index); - } -@@ -3685,7 +3695,7 @@ static int ibmcam_probe(struct usb_inter - unsigned char video_ep = 0; - - if (debug >= 1) -- info("ibmcam_probe(%p,%u.)", intf, ifnum); -+ dev_info(&uvd->dev->dev, "ibmcam_probe(%p,%u.)\n", intf, ifnum); - - /* We don't handle multi-config cameras */ - if (dev->descriptor.bNumConfigurations != 1) -@@ -3736,14 +3746,16 @@ static int ibmcam_probe(struct usb_inter - brand = "IBM PC Camera"; /* a.k.a. Xirlink C-It */ - break; - } -- info("%s USB camera found (model %d, rev. 0x%04x)", -- brand, model, le16_to_cpu(dev->descriptor.bcdDevice)); -+ dev_info(&uvd->dev->dev, -+ "%s USB camera found (model %d, rev. 0x%04x)\n", -+ brand, model, le16_to_cpu(dev->descriptor.bcdDevice)); - } while (0); - - /* Validate found interface: must have one ISO endpoint */ - nas = intf->num_altsetting; - if (debug > 0) -- info("Number of alternate settings=%d.", nas); -+ dev_info(&uvd->dev->dev, "Number of alternate settings=%d.\n", -+ nas); - if (nas < 2) { - err("Too few alternate settings for this camera!"); - return -ENODEV; -@@ -3787,7 +3799,9 @@ static int ibmcam_probe(struct usb_inter - actInterface = i; - maxPS = le16_to_cpu(endpoint->wMaxPacketSize); - if (debug > 0) -- info("Active setting=%d. maxPS=%d.", i, maxPS); -+ dev_info(&uvd->dev->dev, -+ "Active setting=%d. " -+ "maxPS=%d.\n", i, maxPS); - } else - err("More than one active alt. setting! Ignoring #%d.", i); - } -@@ -3826,7 +3840,7 @@ static int ibmcam_probe(struct usb_inter - RESTRICT_TO_RANGE(framerate, 0, 5); - break; - default: -- info("IBM camera: using 320x240"); -+ dev_info(&uvd->dev->dev, "IBM camera: using 320x240\n"); - size = SIZE_320x240; - /* No break here */ - case SIZE_320x240: -@@ -3855,7 +3869,7 @@ static int ibmcam_probe(struct usb_inter - canvasY = 120; - break; - default: -- info("IBM NetCamera: using 176x144"); -+ dev_info(&uvd->dev->dev, "IBM NetCamera: using 176x144\n"); - size = SIZE_176x144; - /* No break here */ - case SIZE_176x144: ---- a/drivers/media/video/usbvideo/konicawc.c -+++ b/drivers/media/video/usbvideo/konicawc.c -@@ -339,7 +339,8 @@ static int konicawc_compress_iso(struct - } - - if((sts > 0x01) && (sts < 0x80)) { -- info("unknown status %2.2x", sts); -+ dev_info(&uvd->dev->dev, "unknown status %2.2x\n", -+ sts); - bad++; - continue; - } -@@ -570,8 +571,12 @@ static void konicawc_process_isoc(struct - fdrops = (0x80 + curframe - cam->lastframe) & 0x7F; - fdrops--; - if(fdrops) { -- info("Dropped %d frames (%d -> %d)", fdrops, -- cam->lastframe, curframe); -+ dev_info(&uvd->dev->dev, -+ "Dropped %d frames " -+ "(%d -> %d)\n", -+ fdrops, -+ cam->lastframe, -+ curframe); - } - } - cam->lastframe = curframe; -@@ -786,7 +791,8 @@ static int konicawc_probe(struct usb_int - if (dev->descriptor.bNumConfigurations != 1) - return -ENODEV; - -- info("Konica Webcam (rev. 0x%04x)", le16_to_cpu(dev->descriptor.bcdDevice)); -+ dev_info(&intf->dev, "Konica Webcam (rev. 0x%04x)\n", -+ le16_to_cpu(dev->descriptor.bcdDevice)); - RESTRICT_TO_RANGE(speed, 0, MAX_SPEED); - - /* Validate found interface: must have one ISO endpoint */ -@@ -927,7 +933,8 @@ static struct usb_device_id id_table[] = - static int __init konicawc_init(void) - { - struct usbvideo_cb cbTbl; -- info(DRIVER_DESC " " DRIVER_VERSION); -+ printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":" -+ DRIVER_DESC "\n"); - memset(&cbTbl, 0, sizeof(cbTbl)); - cbTbl.probe = konicawc_probe; - cbTbl.setupOnOpen = konicawc_setup_on_open; ---- a/drivers/media/video/usbvideo/quickcam_messenger.c -+++ b/drivers/media/video/usbvideo/quickcam_messenger.c -@@ -1082,7 +1082,8 @@ static struct usbvideo_cb qcm_driver = { - - static int __init qcm_init(void) - { -- info(DRIVER_DESC " " DRIVER_VERSION); -+ printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":" -+ DRIVER_DESC "\n"); - - return usbvideo_register( - &cams, ---- a/drivers/media/video/usbvideo/ultracam.c -+++ b/drivers/media/video/usbvideo/ultracam.c -@@ -156,10 +156,11 @@ static int ultracam_veio( - sizeof(cp), - 1000); - #if 1 -- info("USB => %02x%02x%02x%02x%02x%02x%02x%02x " -- "(req=$%02x val=$%04x ind=$%04x)", -- cp[0],cp[1],cp[2],cp[3],cp[4],cp[5],cp[6],cp[7], -- req, value, index); -+ dev_info(&uvd->dev->dev, -+ "USB => %02x%02x%02x%02x%02x%02x%02x%02x " -+ "(req=$%02x val=$%04x ind=$%04x)\n", -+ cp[0],cp[1],cp[2],cp[3],cp[4],cp[5],cp[6],cp[7], -+ req, value, index); - #endif - } else { - i = usb_control_msg( -@@ -517,19 +518,20 @@ static int ultracam_probe(struct usb_int - unsigned char video_ep = 0; - - if (debug >= 1) -- info("ultracam_probe(%p)", intf); -+ dev_info(&intf->dev, "ultracam_probe\n"); - - /* We don't handle multi-config cameras */ - if (dev->descriptor.bNumConfigurations != 1) - return -ENODEV; - -- info("IBM Ultra camera found (rev. 0x%04x)", -- le16_to_cpu(dev->descriptor.bcdDevice)); -+ dev_info(&intf->dev, "IBM Ultra camera found (rev. 0x%04x)\n", -+ le16_to_cpu(dev->descriptor.bcdDevice)); - - /* Validate found interface: must have one ISO endpoint */ - nas = intf->num_altsetting; - if (debug > 0) -- info("Number of alternate settings=%d.", nas); -+ dev_info(&intf->dev, "Number of alternate settings=%d.\n", -+ nas); - if (nas < 8) { - err("Too few alternate settings for this camera!"); - return -ENODEV; -@@ -576,7 +578,9 @@ static int ultracam_probe(struct usb_int - actInterface = i; - maxPS = le16_to_cpu(endpoint->wMaxPacketSize); - if (debug > 0) -- info("Active setting=%d. maxPS=%d.", i, maxPS); -+ dev_info(&intf->dev, -+ "Active setting=%d. " -+ "maxPS=%d.\n", i, maxPS); - } else { - /* Got another active alt. setting */ - if (maxPS < le16_to_cpu(endpoint->wMaxPacketSize)) { -@@ -584,8 +588,11 @@ static int ultracam_probe(struct usb_int - actInterface = i; - maxPS = le16_to_cpu(endpoint->wMaxPacketSize); - if (debug > 0) { -- info("Even better ctive setting=%d. maxPS=%d.", -- i, maxPS); -+ dev_info(&intf->dev, -+ "Even better ctive " -+ "setting=%d. " -+ "maxPS=%d.\n", -+ i, maxPS); - } - } - } ---- a/drivers/media/video/usbvideo/usbvideo.c -+++ b/drivers/media/video/usbvideo/usbvideo.c -@@ -468,8 +468,9 @@ static void usbvideo_ReportStatistics(co - percent = (100 * goodPackets) / allPackets; - else - percent = goodPackets / (allPackets / 100); -- info("Packet Statistics: Total=%lu. Empty=%lu. Usage=%lu%%", -- allPackets, badPackets, percent); -+ dev_info(&uvd->dev->dev, -+ "Packet Statistics: Total=%lu. Empty=%lu. Usage=%lu%%\n", -+ allPackets, badPackets, percent); - if (uvd->iso_packet_len > 0) { - unsigned long allBytes, xferBytes; - char multiplier = ' '; -@@ -497,8 +498,9 @@ static void usbvideo_ReportStatistics(co - } - } - } -- info("Transfer Statistics: Transferred=%lu%cB Usage=%lu%%", -- xferBytes, multiplier, percent); -+ dev_info(&uvd->dev->dev, -+ "Transfer Statistics: Transferred=%lu%cB Usage=%lu%%\n", -+ xferBytes, multiplier, percent); - } - } - } -@@ -545,7 +547,7 @@ void usbvideo_TestPattern(struct uvd *uv - { /* For debugging purposes only */ - char tmp[20]; - usbvideo_VideosizeToString(tmp, sizeof(tmp), frame->request); -- info("testpattern: frame=%s", tmp); -+ dev_info(&uvd->dev->dev, "testpattern: frame=%s\n", tmp); - } - #endif - /* Form every scan line */ -@@ -854,7 +856,7 @@ static void usbvideo_Disconnect(struct u - - usbvideo_ClientIncModCount(uvd); - if (uvd->debug > 0) -- info("%s(%p.)", __func__, intf); -+ dev_info(&intf->dev, "%s(%p.)\n", __func__, intf); - - mutex_lock(&uvd->lock); - uvd->remove_pending = 1; /* Now all ISO data will be ignored */ -@@ -870,14 +872,15 @@ static void usbvideo_Disconnect(struct u - - video_unregister_device(&uvd->vdev); - if (uvd->debug > 0) -- info("%s: Video unregistered.", __func__); -+ dev_info(&intf->dev, "%s: Video unregistered.\n", __func__); - - if (uvd->user) -- info("%s: In use, disconnect pending.", __func__); -+ dev_info(&intf->dev, "%s: In use, disconnect pending.\n", -+ __func__); - else - usbvideo_CameraRelease(uvd); - mutex_unlock(&uvd->lock); -- info("USB camera disconnected."); -+ dev_info(&intf->dev, "USB camera disconnected.\n"); - - usbvideo_ClientDecModCount(uvd); - } -@@ -1015,14 +1018,17 @@ int usbvideo_RegisterVideoDevice(struct - return -EINVAL; - } - if (uvd->video_endp == 0) { -- info("%s: No video endpoint specified; data pump disabled.", __func__); -+ dev_info(&uvd->dev->dev, -+ "%s: No video endpoint specified; data pump disabled.\n", -+ __func__); - } - if (uvd->paletteBits == 0) { - err("%s: No palettes specified!", __func__); - return -EINVAL; - } - if (uvd->defaultPalette == 0) { -- info("%s: No default palette!", __func__); -+ dev_info(&uvd->dev->dev, "%s: No default palette!\n", -+ __func__); - } - - uvd->max_frame_size = VIDEOSIZE_X(uvd->canvas) * -@@ -1031,8 +1037,10 @@ int usbvideo_RegisterVideoDevice(struct - usbvideo_VideosizeToString(tmp2, sizeof(tmp2), uvd->canvas); - - if (uvd->debug > 0) { -- info("%s: iface=%d. endpoint=$%02x paletteBits=$%08lx", -- __func__, uvd->iface, uvd->video_endp, uvd->paletteBits); -+ dev_info(&uvd->dev->dev, -+ "%s: iface=%d. endpoint=$%02x paletteBits=$%08lx\n", -+ __func__, uvd->iface, uvd->video_endp, -+ uvd->paletteBits); - } - if (uvd->dev == NULL) { - err("%s: uvd->dev == NULL", __func__); -@@ -1044,12 +1052,13 @@ int usbvideo_RegisterVideoDevice(struct - return -EPIPE; - } - if (uvd->debug > 1) { -- info("%s: video_register_device() successful", __func__); -+ dev_info(&uvd->dev->dev, -+ "%s: video_register_device() successful\n", __func__); - } - -- info("%s on /dev/video%d: canvas=%s videosize=%s", -- (uvd->handle != NULL) ? uvd->handle->drvName : "???", -- uvd->vdev.minor, tmp2, tmp1); -+ dev_info(&uvd->dev->dev, "%s on /dev/video%d: canvas=%s videosize=%s\n", -+ (uvd->handle != NULL) ? uvd->handle->drvName : "???", -+ uvd->vdev.minor, tmp2, tmp1); - - usb_get_dev(uvd->dev); - return 0; -@@ -1111,7 +1120,7 @@ static int usbvideo_v4l_open(struct inod - int i, errCode = 0; - - if (uvd->debug > 1) -- info("%s($%p)", __func__, dev); -+ dev_info(&uvd->dev->dev, "%s($%p)\n", __func__, dev); - - if (0 < usbvideo_ClientIncModCount(uvd)) - return -ENODEV; -@@ -1178,19 +1187,25 @@ static int usbvideo_v4l_open(struct inod - if (errCode == 0) { - if (VALID_CALLBACK(uvd, setupOnOpen)) { - if (uvd->debug > 1) -- info("%s: setupOnOpen callback", __func__); -+ dev_info(&uvd->dev->dev, -+ "%s: setupOnOpen callback\n", -+ __func__); - errCode = GET_CALLBACK(uvd, setupOnOpen)(uvd); - if (errCode < 0) { - err("%s: setupOnOpen callback failed (%d.).", - __func__, errCode); - } else if (uvd->debug > 1) { -- info("%s: setupOnOpen callback successful", __func__); -+ dev_info(&uvd->dev->dev, -+ "%s: setupOnOpen callback successful\n", -+ __func__); - } - } - if (errCode == 0) { - uvd->settingsAdjusted = 0; - if (uvd->debug > 1) -- info("%s: Open succeeded.", __func__); -+ dev_info(&uvd->dev->dev, -+ "%s: Open succeeded.\n", -+ __func__); - uvd->user++; - file->private_data = uvd; - } -@@ -1200,7 +1215,8 @@ static int usbvideo_v4l_open(struct inod - if (errCode != 0) - usbvideo_ClientDecModCount(uvd); - if (uvd->debug > 0) -- info("%s: Returning %d.", __func__, errCode); -+ dev_info(&uvd->dev->dev, "%s: Returning %d.\n", __func__, -+ errCode); - return errCode; - } - -@@ -1223,7 +1239,7 @@ static int usbvideo_v4l_close(struct ino - int i; - - if (uvd->debug > 1) -- info("%s($%p)", __func__, dev); -+ dev_info(&uvd->dev->dev, "%s($%p)\n", __func__, dev); - - mutex_lock(&uvd->lock); - GET_CALLBACK(uvd, stopDataPump)(uvd); -@@ -1243,14 +1259,15 @@ static int usbvideo_v4l_close(struct ino - uvd->user--; - if (uvd->remove_pending) { - if (uvd->debug > 0) -- info("usbvideo_v4l_close: Final disconnect."); -+ dev_info(&uvd->dev->dev, "%s: Final disconnect.\n", -+ __func__); - usbvideo_CameraRelease(uvd); - } - mutex_unlock(&uvd->lock); - usbvideo_ClientDecModCount(uvd); - - if (uvd->debug > 1) -- info("%s: Completed.", __func__); -+ dev_info(&uvd->dev->dev, "%s: Completed.\n", __func__); - file->private_data = NULL; - return 0; - } -@@ -1364,8 +1381,9 @@ static int usbvideo_v4l_do_ioctl(struct - struct video_mmap *vm = arg; - - if (uvd->debug >= 1) { -- info("VIDIOCMCAPTURE: frame=%d. size=%dx%d, format=%d.", -- vm->frame, vm->width, vm->height, vm->format); -+ dev_info(&uvd->dev->dev, -+ "VIDIOCMCAPTURE: frame=%d. size=%dx%d, format=%d.\n", -+ vm->frame, vm->width, vm->height, vm->format); - } - /* - * Check if the requested size is supported. If the requestor -@@ -1383,18 +1401,24 @@ static int usbvideo_v4l_do_ioctl(struct - if ((vm->width > VIDEOSIZE_X(uvd->canvas)) || - (vm->height > VIDEOSIZE_Y(uvd->canvas))) { - if (uvd->debug > 0) { -- info("VIDIOCMCAPTURE: Size=%dx%d too large; " -- "allowed only up to %ldx%ld", vm->width, vm->height, -- VIDEOSIZE_X(uvd->canvas), VIDEOSIZE_Y(uvd->canvas)); -+ dev_info(&uvd->dev->dev, -+ "VIDIOCMCAPTURE: Size=%dx%d " -+ "too large; allowed only up " -+ "to %ldx%ld\n", vm->width, -+ vm->height, -+ VIDEOSIZE_X(uvd->canvas), -+ VIDEOSIZE_Y(uvd->canvas)); - } - return -EINVAL; - } - /* Check if the palette is supported */ - if (((1L << vm->format) & uvd->paletteBits) == 0) { - if (uvd->debug > 0) { -- info("VIDIOCMCAPTURE: format=%d. not supported" -- " (paletteBits=$%08lx)", -- vm->format, uvd->paletteBits); -+ dev_info(&uvd->dev->dev, -+ "VIDIOCMCAPTURE: format=%d. " -+ "not supported " -+ "(paletteBits=$%08lx)\n", -+ vm->format, uvd->paletteBits); - } - return -EINVAL; - } -@@ -1422,7 +1446,9 @@ static int usbvideo_v4l_do_ioctl(struct - return -EINVAL; - - if (uvd->debug >= 1) -- info("VIDIOCSYNC: syncing to frame %d.", *frameNum); -+ dev_info(&uvd->dev->dev, -+ "VIDIOCSYNC: syncing to frame %d.\n", -+ *frameNum); - if (uvd->flags & FLAGS_NO_DECODING) - ret = usbvideo_GetFrame(uvd, *frameNum); - else if (VALID_CALLBACK(uvd, getFrame)) { -@@ -1504,7 +1530,9 @@ static ssize_t usbvideo_v4l_read(struct - return -EFAULT; - - if (uvd->debug >= 1) -- info("%s: %Zd. bytes, noblock=%d.", __func__, count, noblock); -+ dev_info(&uvd->dev->dev, -+ "%s: %Zd. bytes, noblock=%d.\n", -+ __func__, count, noblock); - - mutex_lock(&uvd->lock); - -@@ -1685,18 +1713,21 @@ static void usbvideo_IsocIrq(struct urb - return; - #if 0 - if (urb->actual_length > 0) { -- info("urb=$%p status=%d. errcount=%d. length=%d.", -- urb, urb->status, urb->error_count, urb->actual_length); -+ dev_info(&uvd->dev->dev, -+ "urb=$%p status=%d. errcount=%d. length=%d.\n", -+ urb, urb->status, urb->error_count, -+ urb->actual_length); - } else { - static int c = 0; - if (c++ % 100 == 0) -- info("No Isoc data"); -+ dev_info(&uvd->dev->dev, "No Isoc data\n"); - } - #endif - - if (!uvd->streaming) { - if (uvd->debug >= 1) -- info("Not streaming, but interrupt!"); -+ dev_info(&uvd->dev->dev, -+ "Not streaming, but interrupt!\n"); - return; - } - -@@ -1741,7 +1772,7 @@ static int usbvideo_StartDataPump(struct - int i, errFlag; - - if (uvd->debug > 1) -- info("%s($%p)", __func__, uvd); -+ dev_info(&uvd->dev->dev, "%s($%p)\n", __func__, uvd); - - if (!CAMERA_IS_OPERATIONAL(uvd)) { - err("%s: Camera is not operational", __func__); -@@ -1789,7 +1820,9 @@ static int usbvideo_StartDataPump(struct - - uvd->streaming = 1; - if (uvd->debug > 1) -- info("%s: streaming=1 video_endp=$%02x", __func__, uvd->video_endp); -+ dev_info(&uvd->dev->dev, -+ "%s: streaming=1 video_endp=$%02x\n", __func__, -+ uvd->video_endp); - return 0; - } - -@@ -1811,14 +1844,14 @@ static void usbvideo_StopDataPump(struct - return; - - if (uvd->debug > 1) -- info("%s($%p)", __func__, uvd); -+ dev_info(&uvd->dev->dev, "%s($%p)\n", __func__, uvd); - - /* Unschedule all of the iso td's */ - for (i=0; i < USBVIDEO_NUMSBUF; i++) { - usb_kill_urb(uvd->sbuf[i].urb); - } - if (uvd->debug > 1) -- info("%s: streaming=0", __func__); -+ dev_info(&uvd->dev->dev, "%s: streaming=0\n", __func__); - uvd->streaming = 0; - - if (!uvd->remove_pending) { -@@ -1850,7 +1883,8 @@ static int usbvideo_NewFrame(struct uvd - int n; - - if (uvd->debug > 1) -- info("usbvideo_NewFrame($%p,%d.)", uvd, framenum); -+ dev_info(&uvd->dev->dev, "usbvideo_NewFrame($%p,%d.)\n", uvd, -+ framenum); - - /* If we're not grabbing a frame right now and the other frame is */ - /* ready to be grabbed into, then use it instead */ -@@ -1955,12 +1989,14 @@ static int usbvideo_GetFrame(struct uvd - struct usbvideo_frame *frame = &uvd->frame[frameNum]; - - if (uvd->debug >= 2) -- info("%s($%p,%d.)", __func__, uvd, frameNum); -+ dev_info(&uvd->dev->dev, "%s($%p,%d.)\n", __func__, uvd, -+ frameNum); - - switch (frame->frameState) { - case FrameState_Unused: - if (uvd->debug >= 2) -- info("%s: FrameState_Unused", __func__); -+ dev_info(&uvd->dev->dev, "%s: FrameState_Unused\n", -+ __func__); - return -EINVAL; - case FrameState_Ready: - case FrameState_Grabbing: -@@ -1970,7 +2006,9 @@ static int usbvideo_GetFrame(struct uvd - redo: - if (!CAMERA_IS_OPERATIONAL(uvd)) { - if (uvd->debug >= 2) -- info("%s: Camera is not operational (1)", __func__); -+ dev_info(&uvd->dev->dev, -+ "%s: Camera is not operational (1)\n", -+ __func__); - return -EIO; - } - ntries = 0; -@@ -1979,24 +2017,33 @@ static int usbvideo_GetFrame(struct uvd - signalPending = signal_pending(current); - if (!CAMERA_IS_OPERATIONAL(uvd)) { - if (uvd->debug >= 2) -- info("%s: Camera is not operational (2)", __func__); -+ dev_info(&uvd->dev->dev, -+ "%s: Camera is not " -+ "operational (2)\n", __func__); - return -EIO; - } - assert(uvd->fbuf != NULL); - if (signalPending) { - if (uvd->debug >= 2) -- info("%s: Signal=$%08x", __func__, signalPending); -+ dev_info(&uvd->dev->dev, -+ "%s: Signal=$%08x\n", __func__, -+ signalPending); - if (uvd->flags & FLAGS_RETRY_VIDIOCSYNC) { - usbvideo_TestPattern(uvd, 1, 0); - uvd->curframe = -1; - uvd->stats.frame_num++; - if (uvd->debug >= 2) -- info("%s: Forced test pattern screen", __func__); -+ dev_info(&uvd->dev->dev, -+ "%s: Forced test " -+ "pattern screen\n", -+ __func__); - return 0; - } else { - /* Standard answer: Interrupted! */ - if (uvd->debug >= 2) -- info("%s: Interrupted!", __func__); -+ dev_info(&uvd->dev->dev, -+ "%s: Interrupted!\n", -+ __func__); - return -EINTR; - } - } else { -@@ -2010,8 +2057,10 @@ static int usbvideo_GetFrame(struct uvd - } - } while (frame->frameState == FrameState_Grabbing); - if (uvd->debug >= 2) { -- info("%s: Grabbing done; state=%d. (%lu. bytes)", -- __func__, frame->frameState, frame->seqRead_Length); -+ dev_info(&uvd->dev->dev, -+ "%s: Grabbing done; state=%d. (%lu. bytes)\n", -+ __func__, frame->frameState, -+ frame->seqRead_Length); - } - if (frame->frameState == FrameState_Error) { - int ret = usbvideo_NewFrame(uvd, frameNum); -@@ -2048,7 +2097,9 @@ static int usbvideo_GetFrame(struct uvd - } - frame->frameState = FrameState_Done_Hold; - if (uvd->debug >= 2) -- info("%s: Entered FrameState_Done_Hold state.", __func__); -+ dev_info(&uvd->dev->dev, -+ "%s: Entered FrameState_Done_Hold state.\n", -+ __func__); - return 0; - - case FrameState_Done_Hold: -@@ -2059,7 +2110,9 @@ static int usbvideo_GetFrame(struct uvd - * it will be released back into the wild to roam freely. - */ - if (uvd->debug >= 2) -- info("%s: FrameState_Done_Hold state.", __func__); -+ dev_info(&uvd->dev->dev, -+ "%s: FrameState_Done_Hold state.\n", -+ __func__); - return 0; - } - ---- a/drivers/media/video/usbvision/usbvision-core.c -+++ b/drivers/media/video/usbvision/usbvision-core.c -@@ -84,7 +84,8 @@ MODULE_PARM_DESC(adjust_Y_Offset, "adjus - #ifdef USBVISION_DEBUG - #define PDEBUG(level, fmt, args...) { \ - if (core_debug & (level)) \ -- info("[%s:%d] " fmt, __func__, __LINE__ , ## args); \ -+ printk(KERN_INFO KBUILD_MODNAME ":[%s:%d] " fmt, \ -+ __func__, __LINE__ , ## args); \ - } - #else - #define PDEBUG(level, fmt, args...) do {} while(0) ---- a/drivers/media/video/usbvision/usbvision-i2c.c -+++ b/drivers/media/video/usbvision/usbvision-i2c.c -@@ -47,7 +47,8 @@ MODULE_PARM_DESC(i2c_debug, "enable debu - - #define PDEBUG(level, fmt, args...) { \ - if (i2c_debug & (level)) \ -- info("[%s:%d] " fmt, __func__, __LINE__ , ## args); \ -+ printk(KERN_INFO KBUILD_MODNAME ":[%s:%d] " fmt, \ -+ __func__, __LINE__ , ## args); \ - } - - static int usbvision_i2c_write(struct usb_usbvision *usbvision, unsigned char addr, char *buf, ---- a/drivers/media/video/usbvision/usbvision-video.c -+++ b/drivers/media/video/usbvision/usbvision-video.c -@@ -98,7 +98,8 @@ USBVISION_DRIVER_VERSION_PATCHLEVEL) - #ifdef USBVISION_DEBUG - #define PDEBUG(level, fmt, args...) { \ - if (video_debug & (level)) \ -- info("[%s:%d] " fmt, __func__, __LINE__ , ## args); \ -+ printk(KERN_INFO KBUILD_MODNAME ":[%s:%d] " fmt, \ -+ __func__, __LINE__ , ## args); \ - } - #else - #define PDEBUG(level, fmt, args...) do {} while(0) ---- a/drivers/media/video/zr364xx.c -+++ b/drivers/media/video/zr364xx.c -@@ -52,7 +52,7 @@ - - - /* Debug macro */ --#define DBG(x...) if (debug) info(x) -+#define DBG(x...) if (debug) printk(KERN_INFO KBUILD_MODNAME x) - - - /* Init methods, need to find nicer names for these -@@ -127,7 +127,7 @@ static int send_control_msg(struct usb_d - - unsigned char *transfer_buffer = kmalloc(size, GFP_KERNEL); - if (!transfer_buffer) { -- info("kmalloc(%d) failed", size); -+ dev_err(&udev->dev, "kmalloc(%d) failed\n", size); - return -ENOMEM; - } - -@@ -143,7 +143,8 @@ static int send_control_msg(struct usb_d - kfree(transfer_buffer); - - if (status < 0) -- info("Failed sending control message, error %d.", status); -+ dev_err(&udev->dev, -+ "Failed sending control message, error %d.\n", status); - - return status; - } -@@ -303,11 +304,11 @@ static int read_frame(struct zr364xx_cam - DBG("buffer : %d %d", cam->buffer[0], cam->buffer[1]); - DBG("bulk : n=%d size=%d", n, actual_length); - if (n < 0) { -- info("error reading bulk msg"); -+ dev_err(&cam->udev->dev, "error reading bulk msg\n"); - return 0; - } - if (actual_length < 0 || actual_length > BUFFER_SIZE) { -- info("wrong number of bytes"); -+ dev_err(&cam->udev->dev, "wrong number of bytes\n"); - return 0; - } - -@@ -650,7 +651,7 @@ static int zr364xx_open(struct inode *in - if (!cam->framebuf) { - cam->framebuf = vmalloc_32(MAX_FRAME_SIZE * FRAMES); - if (!cam->framebuf) { -- info("vmalloc_32 failed!"); -+ dev_err(&cam->udev->dev, "vmalloc_32 failed!\n"); - return -ENOMEM; - } - } -@@ -662,7 +663,8 @@ static int zr364xx_open(struct inode *in - 0, init[cam->method][i].bytes, - init[cam->method][i].size); - if (err < 0) { -- info("error during open sequence: %d", i); -+ dev_err(&cam->udev->dev, -+ "error during open sequence: %d\n", i); - mutex_unlock(&cam->lock); - return err; - } -@@ -703,7 +705,7 @@ static int zr364xx_release(struct inode - 0, init[i][cam->method].bytes, - init[cam->method][i].size); - if (err < 0) { -- info("error during release sequence"); -+ dev_err(&udev->dev, "error during release sequence\n"); - mutex_unlock(&cam->lock); - return err; - } -@@ -801,13 +803,14 @@ static int zr364xx_probe(struct usb_inte - - DBG("probing..."); - -- info(DRIVER_DESC " compatible webcam plugged"); -- info("model %04x:%04x detected", udev->descriptor.idVendor, -- udev->descriptor.idProduct); -+ dev_info(&intf->dev, DRIVER_DESC " compatible webcam plugged\n"); -+ dev_info(&intf->dev, "model %04x:%04x detected\n", -+ le16_to_cpu(udev->descriptor.idVendor), -+ le16_to_cpu(udev->descriptor.idProduct)); - - cam = kzalloc(sizeof(struct zr364xx_camera), GFP_KERNEL); - if (cam == NULL) { -- info("cam: out of memory !"); -+ dev_err(&udev->dev, "cam: out of memory !\n"); - return -ENOMEM; - } - /* save the init method used by this camera */ -@@ -815,7 +818,7 @@ static int zr364xx_probe(struct usb_inte - - cam->vdev = video_device_alloc(); - if (cam->vdev == NULL) { -- info("cam->vdev: out of memory !"); -+ dev_err(&udev->dev, "cam->vdev: out of memory !\n"); - kfree(cam); - return -ENOMEM; - } -@@ -827,7 +830,7 @@ static int zr364xx_probe(struct usb_inte - cam->udev = udev; - - if ((cam->buffer = kmalloc(BUFFER_SIZE, GFP_KERNEL)) == NULL) { -- info("cam->buffer: out of memory !"); -+ dev_info(&udev->dev, "cam->buffer: out of memory !\n"); - video_device_release(cam->vdev); - kfree(cam); - return -ENODEV; -@@ -835,17 +838,17 @@ static int zr364xx_probe(struct usb_inte - - switch (mode) { - case 1: -- info("160x120 mode selected"); -+ dev_info(&udev->dev, "160x120 mode selected\n"); - cam->width = 160; - cam->height = 120; - break; - case 2: -- info("640x480 mode selected"); -+ dev_info(&udev->dev, "640x480 mode selected\n"); - cam->width = 640; - cam->height = 480; - break; - default: -- info("320x240 mode selected"); -+ dev_info(&udev->dev, "320x240 mode selected\n"); - cam->width = 320; - cam->height = 240; - break; -@@ -865,7 +868,7 @@ static int zr364xx_probe(struct usb_inte - - err = video_register_device(cam->vdev, VFL_TYPE_GRABBER, -1); - if (err) { -- info("video_register_device failed"); -+ dev_err(&udev->dev, "video_register_device failed\n"); - video_device_release(cam->vdev); - kfree(cam->buffer); - kfree(cam); -@@ -874,7 +877,8 @@ static int zr364xx_probe(struct usb_inte - - usb_set_intfdata(intf, cam); - -- info(DRIVER_DESC " controlling video device %d", cam->vdev->minor); -+ dev_info(&udev->dev, DRIVER_DESC " controlling video device %d\n", -+ cam->vdev->minor); - return 0; - } - -@@ -884,7 +888,7 @@ static void zr364xx_disconnect(struct us - struct zr364xx_camera *cam = usb_get_intfdata(intf); - usb_set_intfdata(intf, NULL); - dev_set_drvdata(&intf->dev, NULL); -- info(DRIVER_DESC " webcam unplugged"); -+ dev_info(&intf->dev, DRIVER_DESC " webcam unplugged\n"); - if (cam->vdev) - video_unregister_device(cam->vdev); - cam->vdev = NULL; -@@ -913,16 +917,16 @@ static int __init zr364xx_init(void) - int retval; - retval = usb_register(&zr364xx_driver); - if (retval) -- info("usb_register failed!"); -+ printk(KERN_ERR KBUILD_MODNAME ": usb_register failed!\n"); - else -- info(DRIVER_DESC " module loaded"); -+ printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_DESC "\n"); - return retval; - } - - - static void __exit zr364xx_exit(void) - { -- info(DRIVER_DESC " module unloaded"); -+ printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_DESC " module unloaded\n"); - usb_deregister(&zr364xx_driver); - } - diff --git a/usb/usb-remove-info-macro-from-usb-serial-drivers.patch b/usb/usb-remove-info-macro-from-usb-serial-drivers.patch index 1ce17fbfbf8bb6..c47b044c70fb3e 100644 --- a/usb/usb-remove-info-macro-from-usb-serial-drivers.patch +++ b/usb/usb-remove-info-macro-from-usb-serial-drivers.patch @@ -54,7 +54,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> le16_to_cpu(dev->descriptor.bcdDevice), priv->bad_flow_control); -@@ -576,7 +576,8 @@ static int __init belkin_sa_init(void) +@@ -577,7 +577,8 @@ static int __init belkin_sa_init(void) retval = usb_register(&belkin_driver); if (retval) goto failed_usb_register; @@ -78,7 +78,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/usb/serial/cyberjack.c +++ b/drivers/usb/serial/cyberjack.c -@@ -498,8 +498,9 @@ static int __init cyberjack_init(void) +@@ -499,8 +499,9 @@ static int __init cyberjack_init(void) if (retval) goto failed_usb_register; @@ -92,7 +92,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> failed_usb_register: --- a/drivers/usb/serial/cypress_m8.c +++ b/drivers/usb/serial/cypress_m8.c -@@ -1657,7 +1657,8 @@ static int __init cypress_init(void) +@@ -1658,7 +1658,8 @@ static int __init cypress_init(void) if (retval) goto failed_usb_register; @@ -104,7 +104,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> failed_usb_register: --- a/drivers/usb/serial/digi_acceleport.c +++ b/drivers/usb/serial/digi_acceleport.c -@@ -1847,7 +1847,8 @@ static int __init digi_init(void) +@@ -1854,7 +1854,8 @@ static int __init digi_init(void) retval = usb_register(&digi_driver); if (retval) goto failed_usb_register; @@ -157,7 +157,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } return 0; -@@ -2423,7 +2425,8 @@ static int __init ftdi_init(void) +@@ -2426,7 +2428,8 @@ static int __init ftdi_init(void) if (retval) goto failed_usb_register; @@ -169,7 +169,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> usb_serial_deregister(&ftdi_sio_device); --- a/drivers/usb/serial/garmin_gps.c +++ b/drivers/usb/serial/garmin_gps.c -@@ -1584,7 +1584,8 @@ static int __init garmin_init(void) +@@ -1585,7 +1585,8 @@ static int __init garmin_init(void) retval = usb_register(&garmin_driver); if (retval) goto failed_usb_register; @@ -193,7 +193,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> usb_serial_deregister(&hp49gp_device); --- a/drivers/usb/serial/io_edgeport.c +++ b/drivers/usb/serial/io_edgeport.c -@@ -3238,7 +3238,8 @@ static int __init edgeport_init(void) +@@ -3253,7 +3253,8 @@ static int __init edgeport_init(void) if (retval) goto failed_usb_register; atomic_set(&CmdUrbs, 0); @@ -205,7 +205,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> failed_usb_register: --- a/drivers/usb/serial/io_ti.c +++ b/drivers/usb/serial/io_ti.c -@@ -2966,7 +2966,8 @@ static int __init edgeport_init(void) +@@ -2978,7 +2978,8 @@ static int __init edgeport_init(void) retval = usb_register(&io_driver); if (retval) goto failed_usb_register; @@ -217,7 +217,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> usb_serial_deregister(&edgeport_2port_device); --- a/drivers/usb/serial/ipaq.c +++ b/drivers/usb/serial/ipaq.c -@@ -975,7 +975,6 @@ static int __init ipaq_init(void) +@@ -976,7 +976,6 @@ static int __init ipaq_init(void) retval = usb_serial_register(&ipaq_device); if (retval) goto failed_usb_serial_register; @@ -225,7 +225,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> if (vendor) { ipaq_id_table[0].idVendor = vendor; ipaq_id_table[0].idProduct = product; -@@ -984,6 +983,8 @@ static int __init ipaq_init(void) +@@ -985,6 +984,8 @@ static int __init ipaq_init(void) if (retval) goto failed_usb_register; @@ -236,7 +236,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> usb_serial_deregister(&ipaq_device); --- a/drivers/usb/serial/ipw.c +++ b/drivers/usb/serial/ipw.c -@@ -484,7 +484,8 @@ static int usb_ipw_init(void) +@@ -485,7 +485,8 @@ static int usb_ipw_init(void) usb_serial_deregister(&ipw_device); return retval; } @@ -248,7 +248,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/usb/serial/ir-usb.c +++ b/drivers/usb/serial/ir-usb.c -@@ -601,7 +601,8 @@ static int __init ir_init(void) +@@ -602,7 +602,8 @@ static int __init ir_init(void) if (retval) goto failed_usb_register; @@ -260,7 +260,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/usb/serial/iuu_phoenix.c +++ b/drivers/usb/serial/iuu_phoenix.c -@@ -1184,7 +1184,8 @@ static int __init iuu_init(void) +@@ -1185,7 +1185,8 @@ static int __init iuu_init(void) retval = usb_register(&iuu_driver); if (retval) goto failed_usb_register; @@ -284,7 +284,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> failed_usb_register: --- a/drivers/usb/serial/keyspan_pda.c +++ b/drivers/usb/serial/keyspan_pda.c -@@ -870,7 +870,8 @@ static int __init keyspan_pda_init(void) +@@ -874,7 +874,8 @@ static int __init keyspan_pda_init(void) retval = usb_register(&keyspan_pda_driver); if (retval) goto failed_usb_register; @@ -344,7 +344,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } /* klsi_105_close */ -@@ -959,7 +959,8 @@ static int __init klsi_105_init(void) +@@ -960,7 +960,8 @@ static int __init klsi_105_init(void) if (retval) goto failed_usb_register; @@ -356,7 +356,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> usb_serial_deregister(&kl5kusb105d_device); --- a/drivers/usb/serial/kobil_sct.c +++ b/drivers/usb/serial/kobil_sct.c -@@ -743,8 +743,8 @@ static int __init kobil_init(void) +@@ -744,8 +744,8 @@ static int __init kobil_init(void) if (retval) goto failed_usb_register; @@ -369,7 +369,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> failed_usb_register: --- a/drivers/usb/serial/mct_u232.c +++ b/drivers/usb/serial/mct_u232.c -@@ -815,7 +815,8 @@ static int __init mct_u232_init(void) +@@ -817,7 +817,8 @@ static int __init mct_u232_init(void) retval = usb_register(&mct_u232_driver); if (retval) goto failed_usb_register; @@ -381,7 +381,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> usb_serial_deregister(&mct_u232_device); --- a/drivers/usb/serial/mos7720.c +++ b/drivers/usb/serial/mos7720.c -@@ -1613,7 +1613,8 @@ static int __init moschip7720_init(void) +@@ -1585,7 +1585,8 @@ static int __init moschip7720_init(void) if (retval) goto failed_port_device_register; @@ -393,7 +393,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> retval = usb_register(&usb_driver); --- a/drivers/usb/serial/mos7840.c +++ b/drivers/usb/serial/mos7840.c -@@ -2742,7 +2742,8 @@ static int __init moschip7840_init(void) +@@ -2743,7 +2743,8 @@ static int __init moschip7840_init(void) goto failed_port_device_register; dbg("%s\n", "Entring..."); @@ -405,7 +405,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> retval = usb_register(&io_driver); --- a/drivers/usb/serial/omninet.c +++ b/drivers/usb/serial/omninet.c -@@ -362,7 +362,8 @@ static int __init omninet_init(void) +@@ -364,7 +364,8 @@ static int __init omninet_init(void) retval = usb_register(&omninet_driver); if (retval) goto failed_usb_register; @@ -429,7 +429,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/usb/serial/pl2303.c +++ b/drivers/usb/serial/pl2303.c -@@ -1158,7 +1158,7 @@ static int __init pl2303_init(void) +@@ -1147,7 +1147,7 @@ static int __init pl2303_init(void) retval = usb_register(&pl2303_driver); if (retval) goto failed_usb_register; @@ -440,7 +440,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> usb_serial_deregister(&pl2303_device); --- a/drivers/usb/serial/safe_serial.c +++ b/drivers/usb/serial/safe_serial.c -@@ -248,8 +248,8 @@ static void safe_read_bulk_callback(stru +@@ -250,8 +250,8 @@ static void safe_read_bulk_callback(stru if (!fcs) { int actual_length = data[length - 2] >> 2; if (actual_length <= (length - 2)) { @@ -448,10 +448,10 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - actual_length); + dev_info(&urb->dev->dev, "%s - actual: %d\n", + __func__, actual_length); - tty_insert_flip_string(port->port.tty, + tty_insert_flip_string(tty, data, actual_length); - tty_flip_buffer_push(port->port.tty); -@@ -425,14 +425,13 @@ static int __init safe_init(void) + tty_flip_buffer_push(tty); +@@ -428,14 +428,13 @@ static int __init safe_init(void) { int i, retval; @@ -472,7 +472,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> if (!id_table[i].idVendor && !id_table[i].idProduct) { --- a/drivers/usb/serial/sierra.c +++ b/drivers/usb/serial/sierra.c -@@ -748,7 +748,8 @@ static int __init sierra_init(void) +@@ -750,7 +750,8 @@ static int __init sierra_init(void) if (retval) goto failed_driver_register; @@ -484,7 +484,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/usb/serial/spcp8x5.c +++ b/drivers/usb/serial/spcp8x5.c -@@ -1053,7 +1053,8 @@ static int __init spcp8x5_init(void) +@@ -1054,7 +1054,8 @@ static int __init spcp8x5_init(void) retval = usb_register(&spcp8x5_driver); if (retval) goto failed_usb_register; @@ -508,7 +508,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/usb/serial/usb-serial.c +++ b/drivers/usb/serial/usb-serial.c -@@ -1154,7 +1154,7 @@ static int __init usb_serial_init(void) +@@ -1160,7 +1160,7 @@ static int __init usb_serial_init(void) goto exit_generic; } @@ -517,7 +517,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return result; -@@ -1231,7 +1231,7 @@ int usb_serial_register(struct usb_seria +@@ -1237,7 +1237,7 @@ int usb_serial_register(struct usb_seria retval, driver->description); list_del(&driver->driver_list); } else @@ -526,7 +526,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> driver->description); return retval; -@@ -1242,7 +1242,8 @@ EXPORT_SYMBOL_GPL(usb_serial_register); +@@ -1248,7 +1248,8 @@ EXPORT_SYMBOL_GPL(usb_serial_register); void usb_serial_deregister(struct usb_serial_driver *device) { /* must be called with BKL held */ @@ -538,7 +538,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } --- a/drivers/usb/serial/visor.c +++ b/drivers/usb/serial/visor.c -@@ -967,11 +967,14 @@ static int __init visor_init(void) +@@ -971,11 +971,14 @@ static int __init visor_init(void) break; } } @@ -558,7 +558,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> vendor, product); } retval = usb_serial_register(&handspring_device); -@@ -986,7 +989,7 @@ static int __init visor_init(void) +@@ -990,7 +993,7 @@ static int __init visor_init(void) retval = usb_register(&visor_driver); if (retval) goto failed_usb_register; @@ -581,7 +581,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> for (i = 0; i < serial->num_ports; i++) { port = serial->port[i]; -@@ -1554,7 +1555,8 @@ static int __init whiteheat_init(void) +@@ -1556,7 +1557,8 @@ static int __init whiteheat_init(void) retval = usb_register(&whiteheat_driver); if (retval) goto failed_usb_register; diff --git a/usb/usb-remove-use-of-err-in-drivers-usb-serial.patch b/usb/usb-remove-use-of-err-in-drivers-usb-serial.patch index fe943d0d0fc5fb..fe3c3f45112936 100644 --- a/usb/usb-remove-use-of-err-in-drivers-usb-serial.patch +++ b/usb/usb-remove-use-of-err-in-drivers-usb-serial.patch @@ -11,17 +11,17 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- - drivers/usb/serial/aircable.c | 11 +-- + drivers/usb/serial/aircable.c | 8 +- drivers/usb/serial/belkin_sa.c | 34 +++++----- drivers/usb/serial/cyberjack.c | 23 ++++--- drivers/usb/serial/cypress_m8.c | 18 +++-- drivers/usb/serial/digi_acceleport.c | 65 ++++++++++++-------- drivers/usb/serial/empeg.c | 8 +- drivers/usb/serial/ezusb.c | 3 - drivers/usb/serial/ftdi_sio.c | 79 ++++++++++++++---------- + drivers/usb/serial/ftdi_sio.c | 68 ++++++++++++--------- drivers/usb/serial/io_edgeport.c | 16 ++-- drivers/usb/serial/ipaq.c | 27 ++++---- - drivers/usb/serial/keyspan_pda.c | 19 +++-- + drivers/usb/serial/keyspan_pda.c | 14 ++-- drivers/usb/serial/kl5kusb105.c | 46 ++++++++------ drivers/usb/serial/mct_u232.c | 39 +++++++----- drivers/usb/serial/mos7720.c | 19 +++-- @@ -32,7 +32,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> drivers/usb/serial/usb-serial.c | 19 +++-- drivers/usb/serial/visor.c | 2 drivers/usb/serial/whiteheat.c | 113 ++++++++++++++++++++--------------- - 21 files changed, 357 insertions(+), 251 deletions(-) + 21 files changed, 346 insertions(+), 243 deletions(-) --- a/drivers/usb/serial/aircable.c +++ b/drivers/usb/serial/aircable.c @@ -56,17 +56,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return ; } -@@ -287,7 +287,8 @@ static void aircable_read(struct work_st - - tty_prepare_flip_string(tty, &data, count); - if (!data) { -- err("%s- kzalloc(%d) failed.", __func__, count); -+ dev_err(&port->dev, "%s- kzalloc(%d) failed.\n", -+ __func__, count); - return; - } - -@@ -334,7 +335,7 @@ static int aircable_attach(struct usb_se +@@ -336,7 +336,7 @@ static int aircable_attach(struct usb_se priv = kzalloc(sizeof(struct aircable_private), GFP_KERNEL); if (!priv) { @@ -95,7 +85,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } exit: -@@ -341,8 +341,8 @@ static void belkin_sa_read_int_callback( +@@ -342,8 +342,8 @@ static void belkin_sa_read_int_callback( exit: retval = usb_submit_urb(urb, GFP_ATOMIC); if (retval) @@ -106,7 +96,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } static void belkin_sa_set_termios(struct tty_struct *tty, -@@ -381,12 +381,12 @@ static void belkin_sa_set_termios(struct +@@ -382,12 +382,12 @@ static void belkin_sa_set_termios(struct if ((old_cflag & CBAUD) == B0) { control_state |= (TIOCM_DTR|TIOCM_RTS); if (BSA_USB_CMD(BELKIN_SA_SET_DTR_REQUEST, 1) < 0) @@ -121,7 +111,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } } -@@ -402,18 +402,18 @@ static void belkin_sa_set_termios(struct +@@ -403,18 +403,18 @@ static void belkin_sa_set_termios(struct /* Report the actual baud rate back to the caller */ tty_encode_baud_rate(tty, baud, baud); if (BSA_USB_CMD(BELKIN_SA_SET_BAUDRATE_REQUEST, urb_value) < 0) @@ -144,7 +134,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } /* set the parity */ -@@ -424,7 +424,7 @@ static void belkin_sa_set_termios(struct +@@ -425,7 +425,7 @@ static void belkin_sa_set_termios(struct else urb_value = BELKIN_SA_PARITY_NONE; if (BSA_USB_CMD(BELKIN_SA_SET_PARITY_REQUEST, urb_value) < 0) @@ -153,7 +143,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } /* set the number of data bits */ -@@ -447,7 +447,7 @@ static void belkin_sa_set_termios(struct +@@ -448,7 +448,7 @@ static void belkin_sa_set_termios(struct break; } if (BSA_USB_CMD(BELKIN_SA_SET_DATA_BITS_REQUEST, urb_value) < 0) @@ -162,7 +152,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } /* set the number of stop bits */ -@@ -456,7 +456,7 @@ static void belkin_sa_set_termios(struct +@@ -457,7 +457,7 @@ static void belkin_sa_set_termios(struct : BELKIN_SA_STOP_BITS(1); if (BSA_USB_CMD(BELKIN_SA_SET_STOP_BITS_REQUEST, urb_value) < 0) @@ -171,7 +161,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } /* Set flow control */ -@@ -477,7 +477,7 @@ static void belkin_sa_set_termios(struct +@@ -478,7 +478,7 @@ static void belkin_sa_set_termios(struct urb_value &= ~(BELKIN_SA_FLOW_IRTS); if (BSA_USB_CMD(BELKIN_SA_SET_FLOW_CTRL_REQUEST, urb_value) < 0) @@ -180,7 +170,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } /* save off the modified port settings */ -@@ -493,7 +493,7 @@ static void belkin_sa_break_ctl(struct t +@@ -494,7 +494,7 @@ static void belkin_sa_break_ctl(struct t struct usb_serial *serial = port->serial; if (BSA_USB_CMD(BELKIN_SA_SET_BREAK_REQUEST, break_state ? 1 : 0) < 0) @@ -189,7 +179,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } -@@ -553,13 +553,13 @@ static int belkin_sa_tiocmset(struct tty +@@ -554,13 +554,13 @@ static int belkin_sa_tiocmset(struct tty retval = BSA_USB_CMD(BELKIN_SA_SET_RTS_REQUEST, rts); if (retval < 0) { @@ -249,7 +239,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> dbg("%s - usb_submit_urb(int urb)", __func__); } -@@ -413,8 +417,8 @@ static void cyberjack_read_bulk_callback +@@ -414,8 +418,8 @@ static void cyberjack_read_bulk_callback port->read_urb->dev = port->serial->dev; result = usb_submit_urb(port->read_urb, GFP_ATOMIC); if (result) @@ -260,7 +250,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> dbg("%s - usb_submit_urb(read urb)", __func__); } } -@@ -461,8 +465,9 @@ static void cyberjack_write_bulk_callbac +@@ -462,8 +466,9 @@ static void cyberjack_write_bulk_callbac /* send the data out the bulk port */ result = usb_submit_urb(port->write_urb, GFP_ATOMIC); if (result) { @@ -329,7 +319,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> spin_lock_irqsave(&priv->lock, flags); --- a/drivers/usb/serial/digi_acceleport.c +++ b/drivers/usb/serial/digi_acceleport.c -@@ -659,7 +659,8 @@ static int digi_write_oob_command(struct +@@ -661,7 +661,8 @@ static int digi_write_oob_command(struct } spin_unlock_irqrestore(&oob_priv->dp_port_lock, flags); if (ret) @@ -339,7 +329,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return ret; } -@@ -741,7 +742,8 @@ static int digi_write_inb_command(struct +@@ -743,7 +744,8 @@ static int digi_write_inb_command(struct spin_unlock_irqrestore(&priv->dp_port_lock, flags); if (ret) @@ -349,7 +339,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> __func__, ret, priv->dp_port_num); return ret; } -@@ -810,7 +812,8 @@ static int digi_set_modem_signals(struct +@@ -812,7 +814,8 @@ static int digi_set_modem_signals(struct spin_unlock(&port_priv->dp_port_lock); spin_unlock_irqrestore(&oob_priv->dp_port_lock, flags); if (ret) @@ -359,7 +349,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return ret; } -@@ -905,7 +908,8 @@ static void digi_rx_unthrottle(struct tt +@@ -907,7 +910,8 @@ static void digi_rx_unthrottle(struct tt spin_unlock_irqrestore(&priv->dp_port_lock, flags); if (ret) @@ -369,7 +359,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> __func__, ret, priv->dp_port_num); } -@@ -1212,7 +1216,8 @@ static int digi_write(struct tty_struct +@@ -1214,7 +1218,8 @@ static int digi_write(struct tty_struct /* return length of new data written, or error */ spin_unlock_irqrestore(&priv->dp_port_lock, flags); if (ret < 0) @@ -379,7 +369,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> __func__, ret, priv->dp_port_num); dbg("digi_write: returning %d", ret); return ret; -@@ -1233,14 +1238,16 @@ static void digi_write_bulk_callback(str +@@ -1235,14 +1240,16 @@ static void digi_write_bulk_callback(str /* port and serial sanity check */ if (port == NULL || (priv = usb_get_serial_port_data(port)) == NULL) { @@ -400,7 +390,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return; } -@@ -1282,7 +1289,8 @@ static void digi_write_bulk_callback(str +@@ -1284,7 +1291,8 @@ static void digi_write_bulk_callback(str spin_unlock(&priv->dp_port_lock); if (ret) @@ -410,7 +400,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> __func__, ret, priv->dp_port_num); } -@@ -1516,8 +1524,9 @@ static int digi_startup_device(struct us +@@ -1518,8 +1526,9 @@ static int digi_startup_device(struct us port->write_urb->dev = port->serial->dev; ret = usb_submit_urb(port->read_urb, GFP_KERNEL); if (ret != 0) { @@ -422,7 +412,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> break; } } -@@ -1616,22 +1625,26 @@ static void digi_read_bulk_callback(stru +@@ -1618,22 +1627,26 @@ static void digi_read_bulk_callback(stru dbg("digi_read_bulk_callback: TOP"); /* port sanity check, do not resubmit if port is not valid */ @@ -456,7 +446,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return; } -@@ -1648,8 +1661,9 @@ static void digi_read_bulk_callback(stru +@@ -1650,8 +1663,9 @@ static void digi_read_bulk_callback(stru urb->dev = port->serial->dev; ret = usb_submit_urb(urb, GFP_ATOMIC); if (ret != 0) { @@ -468,7 +458,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } } -@@ -1685,10 +1699,11 @@ static int digi_read_inb_callback(struct +@@ -1687,10 +1701,11 @@ static int digi_read_inb_callback(struct /* short/multiple packet check */ if (urb->actual_length != len + 2) { @@ -528,17 +518,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c -@@ -861,7 +861,8 @@ static int update_mctrl(struct usb_seria - - kfree(buf); - if (rv < 0) { -- err("%s Error from MODEM_CTRL urb: DTR %s, RTS %s", -+ dev_err(&port->dev, -+ "%s Error from MODEM_CTRL urb: DTR %s, RTS %s\n", - __func__, - (set & TIOCM_DTR) ? "HIGH" : - (clear & TIOCM_DTR) ? "LOW" : "unchanged", -@@ -1327,7 +1328,7 @@ static int ftdi_sio_port_probe(struct us +@@ -1327,7 +1327,7 @@ static int ftdi_sio_port_probe(struct us priv = kzalloc(sizeof(struct ftdi_private), GFP_KERNEL); if (!priv) { @@ -547,7 +527,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> sizeof(struct ftdi_private)); return -ENOMEM; } -@@ -1524,8 +1525,9 @@ static int ftdi_open(struct tty_struct * +@@ -1524,8 +1524,9 @@ static int ftdi_open(struct tty_struct * ftdi_read_bulk_callback, port); result = usb_submit_urb(port->read_urb, GFP_KERNEL); if (result) @@ -559,7 +539,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return result; -@@ -1559,7 +1561,7 @@ static void ftdi_close(struct tty_struct +@@ -1559,7 +1560,7 @@ static void ftdi_close(struct tty_struct FTDI_SIO_SET_FLOW_CTRL_REQUEST_TYPE, 0, priv->interface, buf, 0, WDR_TIMEOUT) < 0) { @@ -568,7 +548,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } /* drop RTS and DTR */ -@@ -1624,14 +1626,15 @@ static int ftdi_write(struct tty_struct +@@ -1624,14 +1625,15 @@ static int ftdi_write(struct tty_struct buffer = kmalloc(transfer_size, GFP_ATOMIC); if (!buffer) { @@ -586,7 +566,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> count = -ENOMEM; goto error_no_urb; } -@@ -1675,8 +1678,9 @@ static int ftdi_write(struct tty_struct +@@ -1675,8 +1677,9 @@ static int ftdi_write(struct tty_struct status = usb_submit_urb(urb, GFP_ATOMIC); if (status) { @@ -598,7 +578,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> count = status; goto error; } else { -@@ -1783,7 +1787,8 @@ static int ftdi_chars_in_buffer(struct t +@@ -1783,7 +1786,8 @@ static int ftdi_chars_in_buffer(struct t buffered = (int)priv->tx_outstanding_bytes; spin_unlock_irqrestore(&priv->tx_lock, flags); if (buffered < 0) { @@ -608,7 +588,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> buffered = 0; } return buffered; -@@ -1799,11 +1804,12 @@ static void ftdi_read_bulk_callback(stru +@@ -1799,11 +1803,12 @@ static void ftdi_read_bulk_callback(stru int status = urb->status; if (urb->number_of_packets > 0) { @@ -626,7 +606,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } dbg("%s - port %d", __func__, port->number); -@@ -1824,7 +1830,7 @@ static void ftdi_read_bulk_callback(stru +@@ -1824,7 +1829,7 @@ static void ftdi_read_bulk_callback(stru } if (urb != port->read_urb) @@ -635,7 +615,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> if (status) { /* This will happen at close every time so it is a dbg not an -@@ -1926,7 +1932,8 @@ static void ftdi_process_read(struct wor +@@ -1927,7 +1932,8 @@ static void ftdi_process_read(struct wor length = min(PKTSZ, urb->actual_length-packet_offset)-2; if (length < 0) { @@ -645,7 +625,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> length = 0; } -@@ -2041,8 +2048,9 @@ static void ftdi_process_read(struct wor +@@ -2042,8 +2048,9 @@ static void ftdi_process_read(struct wor result = usb_submit_urb(port->read_urb, GFP_ATOMIC); if (result) @@ -655,9 +635,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + "%s - failed resubmitting read urb, error %d\n", + __func__, result); } - } /* ftdi_process_read */ - -@@ -2069,8 +2077,8 @@ static void ftdi_break_ctl(struct tty_st + out: + tty_kref_put(tty); +@@ -2072,8 +2079,8 @@ static void ftdi_break_ctl(struct tty_st FTDI_SIO_SET_DATA_REQUEST_TYPE, urb_value , priv->interface, buf, 0, WDR_TIMEOUT) < 0) { @@ -668,7 +648,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } dbg("%s break state is %d - urb is %d", __func__, -@@ -2142,7 +2150,7 @@ static void ftdi_set_termios(struct tty_ +@@ -2145,7 +2152,7 @@ static void ftdi_set_termios(struct tty_ case CS7: urb_value |= 7; dbg("Setting CS7"); break; case CS8: urb_value |= 8; dbg("Setting CS8"); break; default: @@ -677,7 +657,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } } -@@ -2155,7 +2163,8 @@ static void ftdi_set_termios(struct tty_ +@@ -2158,7 +2165,8 @@ static void ftdi_set_termios(struct tty_ FTDI_SIO_SET_DATA_REQUEST_TYPE, urb_value , priv->interface, buf, 0, WDR_SHORT_TIMEOUT) < 0) { @@ -687,7 +667,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } /* Now do the baudrate */ -@@ -2166,14 +2175,17 @@ static void ftdi_set_termios(struct tty_ +@@ -2169,14 +2177,17 @@ static void ftdi_set_termios(struct tty_ FTDI_SIO_SET_FLOW_CTRL_REQUEST_TYPE, 0, priv->interface, buf, 0, WDR_TIMEOUT) < 0) { @@ -707,7 +687,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /* Ensure RTS and DTR are raised when baudrate changed from 0 */ if (!old_termios || (old_termios->c_cflag & CBAUD) == B0) set_mctrl(port, TIOCM_DTR | TIOCM_RTS); -@@ -2189,7 +2201,8 @@ static void ftdi_set_termios(struct tty_ +@@ -2192,7 +2203,8 @@ static void ftdi_set_termios(struct tty_ FTDI_SIO_SET_FLOW_CTRL_REQUEST_TYPE, 0 , (FTDI_SIO_RTS_CTS_HS | priv->interface), buf, 0, WDR_TIMEOUT) < 0) { @@ -717,7 +697,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } } else { -@@ -2220,7 +2233,8 @@ static void ftdi_set_termios(struct tty_ +@@ -2223,7 +2235,8 @@ static void ftdi_set_termios(struct tty_ urb_value , (FTDI_SIO_XON_XOFF_HS | priv->interface), buf, 0, WDR_TIMEOUT) < 0) { @@ -727,7 +707,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } } else { /* else clause to only run if cflag ! CRTSCTS and iflag -@@ -2233,7 +2247,8 @@ static void ftdi_set_termios(struct tty_ +@@ -2236,7 +2249,8 @@ static void ftdi_set_termios(struct tty_ FTDI_SIO_SET_FLOW_CTRL_REQUEST_TYPE, 0, priv->interface, buf, 0, WDR_TIMEOUT) < 0) { @@ -737,31 +717,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } } -@@ -2259,8 +2274,8 @@ static int ftdi_tiocmget(struct tty_stru - 0, 0, - buf, 1, WDR_TIMEOUT); - if (ret < 0) { -- err("%s Could not get modem status of device - err: %d", __func__, -- ret); -+ dev_err(&port->dev, "%s Could not get modem status " -+ "of device - err: %d\n", __func__, ret); - return ret; - } - break; -@@ -2278,8 +2293,8 @@ static int ftdi_tiocmget(struct tty_stru - 0, priv->interface, - buf, 2, WDR_TIMEOUT); - if (ret < 0) { -- err("%s Could not get modem status of device - err: %d", __func__, -- ret); -+ dev_err(&port->dev, "%s Could not get modem status " -+ "of device - err: %d\n", __func__, ret); - return ret; - } - break; --- a/drivers/usb/serial/io_edgeport.c +++ b/drivers/usb/serial/io_edgeport.c -@@ -3094,13 +3094,13 @@ static int edge_startup(struct usb_seria +@@ -3109,13 +3109,13 @@ static int edge_startup(struct usb_seria edge_serial->interrupt_read_urb = usb_alloc_urb(0, GFP_KERNEL); if (!edge_serial->interrupt_read_urb) { @@ -777,7 +735,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> usb_free_urb(edge_serial->interrupt_read_urb); return -ENOMEM; } -@@ -3131,13 +3131,13 @@ static int edge_startup(struct usb_seria +@@ -3146,13 +3146,13 @@ static int edge_startup(struct usb_seria edge_serial->read_urb = usb_alloc_urb(0, GFP_KERNEL); if (!edge_serial->read_urb) { @@ -793,7 +751,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> usb_free_urb(edge_serial->read_urb); return -ENOMEM; } -@@ -3166,7 +3166,8 @@ static int edge_startup(struct usb_seria +@@ -3181,7 +3181,8 @@ static int edge_startup(struct usb_seria } if (!interrupt_in_found || !bulk_in_found || !bulk_out_found) { @@ -803,7 +761,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return -ENODEV; } -@@ -3175,8 +3176,9 @@ static int edge_startup(struct usb_seria +@@ -3190,8 +3191,9 @@ static int edge_startup(struct usb_seria response = usb_submit_urb(edge_serial->interrupt_read_urb, GFP_KERNEL); if (response) @@ -857,7 +815,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> error: ipaq_destroy_lists(port); kfree(priv); -@@ -780,8 +780,9 @@ static void ipaq_read_bulk_callback(stru +@@ -781,8 +781,9 @@ static void ipaq_read_bulk_callback(stru ipaq_read_bulk_callback, port); result = usb_submit_urb(port->read_urb, GFP_ATOMIC); if (result) @@ -869,7 +827,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return; } -@@ -846,7 +847,8 @@ static int ipaq_write_bulk(struct usb_se +@@ -847,7 +848,8 @@ static int ipaq_write_bulk(struct usb_se spin_unlock_irqrestore(&write_list_lock, flags); result = usb_submit_urb(port->write_urb, GFP_ATOMIC); if (result) @@ -879,7 +837,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> __func__, result); } else { spin_unlock_irqrestore(&write_list_lock, flags); -@@ -908,8 +910,9 @@ static void ipaq_write_bulk_callback(str +@@ -909,8 +911,9 @@ static void ipaq_write_bulk_callback(str spin_unlock_irqrestore(&write_list_lock, flags); result = usb_submit_urb(port->write_urb, GFP_ATOMIC); if (result) @@ -891,7 +849,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } else { priv->active = 0; spin_unlock_irqrestore(&write_list_lock, flags); -@@ -956,7 +959,7 @@ static int ipaq_startup(struct usb_seria +@@ -957,7 +960,7 @@ static int ipaq_startup(struct usb_seria { dbg("%s", __func__); if (serial->dev->actconfig->desc.bConfigurationValue != 1) { @@ -902,19 +860,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } --- a/drivers/usb/serial/keyspan_pda.c +++ b/drivers/usb/serial/keyspan_pda.c -@@ -261,8 +261,9 @@ static void keyspan_pda_rx_interrupt(str - exit: - retval = usb_submit_urb(urb, GFP_ATOMIC); - if (retval) -- err("%s - usb_submit_urb failed with result %d", -- __func__, retval); -+ dev_err(&port->dev, -+ "%s - usb_submit_urb failed with result %d\n", -+ __func__, retval); - } - - -@@ -738,11 +739,13 @@ static int keyspan_pda_fake_startup(stru +@@ -742,11 +742,13 @@ static int keyspan_pda_fake_startup(stru fw_name = "keyspan_pda/xircom_pgs.fw"; #endif else { @@ -930,7 +876,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return -ENOENT; } record = (const struct ihex_binrec *)fw->data; -@@ -752,10 +755,10 @@ static int keyspan_pda_fake_startup(stru +@@ -756,10 +758,10 @@ static int keyspan_pda_fake_startup(stru (unsigned char *)record->data, be16_to_cpu(record->len), 0xa0); if (response < 0) { @@ -1039,7 +985,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> goto exit; } buf += size; -@@ -693,8 +701,9 @@ static void klsi_105_read_bulk_callback( +@@ -694,8 +702,9 @@ static void klsi_105_read_bulk_callback( port); rc = usb_submit_urb(port->read_urb, GFP_ATOMIC); if (rc) @@ -1051,7 +997,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } /* klsi_105_read_bulk_callback */ -@@ -798,7 +807,8 @@ static void klsi_105_set_termios(struct +@@ -799,7 +808,8 @@ static void klsi_105_set_termios(struct priv->cfg.databits = kl5kusb105a_dtb_8; break; default: @@ -1061,7 +1007,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> priv->cfg.databits = kl5kusb105a_dtb_8; break; } -@@ -885,7 +895,8 @@ static int klsi_105_tiocmget(struct tty_ +@@ -886,7 +896,8 @@ static int klsi_105_tiocmget(struct tty_ rc = klsi_105_get_line_state(port, &line_state); if (rc < 0) { @@ -1071,7 +1017,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /* better return value? EAGAIN? */ return rc; } -@@ -943,8 +954,9 @@ static void klsi_105_unthrottle(struct t +@@ -944,8 +955,9 @@ static void klsi_105_unthrottle(struct t port->read_urb->dev = port->serial->dev; result = usb_submit_urb(port->read_urb, GFP_ATOMIC); if (result) @@ -1172,7 +1118,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> goto error; } return 0; -@@ -610,8 +617,9 @@ static void mct_u232_read_int_callback(s +@@ -612,8 +619,9 @@ static void mct_u232_read_int_callback(s exit: retval = usb_submit_urb(urb, GFP_ATOMIC); if (retval) @@ -1184,7 +1130,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } /* mct_u232_read_int_callback */ static void mct_u232_set_termios(struct tty_struct *tty, -@@ -678,7 +686,8 @@ static void mct_u232_set_termios(struct +@@ -680,7 +688,8 @@ static void mct_u232_set_termios(struct case CS8: last_lcr |= MCT_U232_DATA_BITS_8; break; default: @@ -1196,7 +1142,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } --- a/drivers/usb/serial/mos7720.c +++ b/drivers/usb/serial/mos7720.c -@@ -353,14 +353,16 @@ static int mos7720_open(struct tty_struc +@@ -355,14 +355,16 @@ static int mos7720_open(struct tty_struc mos7720_port->write_urb_pool[j] = urb; if (urb == NULL) { @@ -1215,7 +1161,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> usb_free_urb(mos7720_port->write_urb_pool[j]); mos7720_port->write_urb_pool[j] = NULL; continue; -@@ -692,7 +694,8 @@ static int mos7720_write(struct tty_stru +@@ -694,7 +696,8 @@ static int mos7720_write(struct tty_stru urb->transfer_buffer = kmalloc(URB_TRANSFER_BUFFER_SIZE, GFP_KERNEL); if (urb->transfer_buffer == NULL) { @@ -1225,7 +1171,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> goto exit; } } -@@ -712,8 +715,8 @@ static int mos7720_write(struct tty_stru +@@ -714,8 +717,8 @@ static int mos7720_write(struct tty_stru /* send it down the pipe */ status = usb_submit_urb(urb, GFP_ATOMIC); if (status) { @@ -1236,7 +1182,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> bytes_sent = status; goto exit; } -@@ -973,7 +976,7 @@ static int send_cmd_write_baud_rate(stru +@@ -975,7 +978,7 @@ static int send_cmd_write_baud_rate(stru /* Calculate the Divisor */ status = calc_baud_rate_divisor(baudrate, &divisor); if (status) { @@ -1245,7 +1191,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return status; } -@@ -1506,7 +1509,7 @@ static int mos7720_startup(struct usb_se +@@ -1478,7 +1481,7 @@ static int mos7720_startup(struct usb_se /* create our private serial structure */ mos7720_serial = kzalloc(sizeof(struct moschip_serial), GFP_KERNEL); if (mos7720_serial == NULL) { @@ -1254,7 +1200,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return -ENOMEM; } -@@ -1519,7 +1522,7 @@ static int mos7720_startup(struct usb_se +@@ -1491,7 +1494,7 @@ static int mos7720_startup(struct usb_se for (i = 0; i < serial->num_ports; ++i) { mos7720_port = kzalloc(sizeof(struct moschip_port), GFP_KERNEL); if (mos7720_port == NULL) { @@ -1265,7 +1211,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return -ENOMEM; --- a/drivers/usb/serial/mos7840.c +++ b/drivers/usb/serial/mos7840.c -@@ -843,7 +843,7 @@ static int mos7840_open(struct tty_struc +@@ -844,7 +844,7 @@ static int mos7840_open(struct tty_struc mos7840_port->write_urb_pool[j] = urb; if (urb == NULL) { @@ -1274,7 +1220,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> continue; } -@@ -852,7 +852,9 @@ static int mos7840_open(struct tty_struc +@@ -853,7 +853,9 @@ static int mos7840_open(struct tty_struc if (!urb->transfer_buffer) { usb_free_urb(urb); mos7840_port->write_urb_pool[j] = NULL; @@ -1285,7 +1231,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> continue; } } -@@ -1020,8 +1022,8 @@ static int mos7840_open(struct tty_struc +@@ -1021,8 +1023,8 @@ static int mos7840_open(struct tty_struc usb_submit_urb(serial->port[0]->interrupt_in_urb, GFP_KERNEL); if (response) { @@ -1296,7 +1242,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } } -@@ -1054,8 +1056,8 @@ static int mos7840_open(struct tty_struc +@@ -1055,8 +1057,8 @@ static int mos7840_open(struct tty_struc port->bulk_in_endpointAddress); response = usb_submit_urb(mos7840_port->read_urb, GFP_KERNEL); if (response) { @@ -1307,7 +1253,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } /* initialize our wait queues */ -@@ -1491,7 +1493,8 @@ static int mos7840_write(struct tty_stru +@@ -1492,7 +1494,8 @@ static int mos7840_write(struct tty_stru kmalloc(URB_TRANSFER_BUFFER_SIZE, GFP_KERNEL); if (urb->transfer_buffer == NULL) { @@ -1317,7 +1263,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> goto exit; } } -@@ -1516,8 +1519,8 @@ static int mos7840_write(struct tty_stru +@@ -1517,8 +1520,8 @@ static int mos7840_write(struct tty_stru if (status) { mos7840_port->busy[i] = 0; @@ -1328,7 +1274,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> bytes_sent = status; goto exit; } -@@ -1855,8 +1858,7 @@ static int mos7840_send_cmd_write_baud_r +@@ -1856,8 +1859,7 @@ static int mos7840_send_cmd_write_baud_r /* Calculate the Divisor */ if (status) { @@ -1338,7 +1284,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return status; } /* Enable access to divisor latch */ -@@ -2445,7 +2447,7 @@ static int mos7840_startup(struct usb_se +@@ -2446,7 +2448,7 @@ static int mos7840_startup(struct usb_se for (i = 0; i < serial->num_ports; ++i) { mos7840_port = kzalloc(sizeof(struct moschip_port), GFP_KERNEL); if (mos7840_port == NULL) { @@ -1372,7 +1318,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return result; } -@@ -242,8 +243,9 @@ static void omninet_read_bulk_callback(s +@@ -244,8 +245,9 @@ static void omninet_read_bulk_callback(s omninet_read_bulk_callback, port); result = usb_submit_urb(urb, GFP_ATOMIC); if (result) @@ -1384,7 +1330,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return; } -@@ -296,8 +298,9 @@ static int omninet_write(struct tty_stru +@@ -298,8 +300,9 @@ static int omninet_write(struct tty_stru result = usb_submit_urb(wport->write_urb, GFP_ATOMIC); if (result) { wport->write_urb_busy = 0; @@ -1398,9 +1344,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/usb/serial/safe_serial.c +++ b/drivers/usb/serial/safe_serial.c -@@ -254,11 +254,12 @@ static void safe_read_bulk_callback(stru +@@ -256,11 +256,12 @@ static void safe_read_bulk_callback(stru data, actual_length); - tty_flip_buffer_push(port->port.tty); + tty_flip_buffer_push(tty); } else { - err("%s - inconsistent lengths %d:%d", + dev_err(&port->dev, @@ -1412,8 +1358,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + dev_err(&port->dev, "%s - bad CRC %x\n", __func__, fcs); } } else { - tty_insert_flip_string(port->port.tty, data, length); -@@ -274,8 +275,9 @@ static void safe_read_bulk_callback(stru + tty_insert_flip_string(tty, data, length); +@@ -277,8 +278,9 @@ static void safe_read_bulk_callback(stru result = usb_submit_urb(urb, GFP_ATOMIC); if (result) @@ -1425,7 +1371,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /* FIXME: Need a mechanism to retry later if this happens */ } -@@ -366,8 +368,9 @@ static int safe_write(struct tty_struct +@@ -369,8 +371,9 @@ static int safe_write(struct tty_struct result = usb_submit_urb(port->write_urb, GFP_KERNEL); if (result) { port->write_urb_busy = 0; @@ -1462,7 +1408,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> if (cflag & CRTSCTS) { --- a/drivers/usb/serial/usb-serial.c +++ b/drivers/usb/serial/usb-serial.c -@@ -1115,7 +1115,8 @@ static int __init usb_serial_init(void) +@@ -1121,7 +1121,8 @@ static int __init usb_serial_init(void) result = bus_register(&usb_serial_bus_type); if (result) { @@ -1472,7 +1418,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> goto exit_bus; } -@@ -1136,21 +1137,24 @@ static int __init usb_serial_init(void) +@@ -1142,21 +1143,24 @@ static int __init usb_serial_init(void) tty_set_operations(usb_serial_tty_driver, &serial_ops); result = tty_register_driver(usb_serial_tty_driver); if (result) { @@ -1500,7 +1446,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> goto exit_generic; } -@@ -1168,7 +1172,8 @@ exit_reg_driver: +@@ -1174,7 +1178,8 @@ exit_reg_driver: bus_unregister(&usb_serial_bus_type); exit_bus: @@ -1510,7 +1456,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> put_tty_driver(usb_serial_tty_driver); return result; } -@@ -1227,8 +1232,8 @@ int usb_serial_register(struct usb_seria +@@ -1233,8 +1238,8 @@ int usb_serial_register(struct usb_seria retval = usb_serial_bus_register(driver); if (retval) { @@ -1523,7 +1469,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> printk(KERN_INFO "USB Serial support registered for %s\n", --- a/drivers/usb/serial/visor.c +++ b/drivers/usb/serial/visor.c -@@ -764,7 +764,7 @@ static int visor_probe(struct usb_serial +@@ -768,7 +768,7 @@ static int visor_probe(struct usb_serial dbg("%s", __func__); if (serial->dev->actconfig->desc.bConfigurationValue != 1) { diff --git a/usb/usb-remove-warn-macro-from-hid-core.patch b/usb/usb-remove-warn-macro-from-hid-core.patch new file mode 100644 index 00000000000000..007719daff5011 --- /dev/null +++ b/usb/usb-remove-warn-macro-from-hid-core.patch @@ -0,0 +1,35 @@ +From foo@baz Tue Apr 9 12:12:43 2002 +Date: Wed, 15 Oct 2008 11:30:07 -0700 +To: Greg KH <greg@kroah.com> +From: Greg Kroah-Hartman <gregkh@suse.de> +Subject: USB: remove warn macro from HID core + +There were two stragglers that got missed in the last merge of the HID tree that forgot to change the warn() calls to dev_warn(). This patch fixes them up. + +Cc: Jiri Kosina <jkosina@suse.cz> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/hid/usbhid/hid-core.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/drivers/hid/usbhid/hid-core.c ++++ b/drivers/hid/usbhid/hid-core.c +@@ -428,7 +428,7 @@ void usbhid_submit_report(struct hid_dev + usbhid->out[usbhid->outhead].raw_report = kmalloc(len, GFP_ATOMIC); + if (!usbhid->out[usbhid->outhead].raw_report) { + spin_unlock_irqrestore(&usbhid->outlock, flags); +- warn("output queueing failed"); ++ dev_warn(&hid->dev, "output queueing failed\n"); + return; + } + hid_output_report(report, usbhid->out[usbhid->outhead].raw_report); +@@ -455,7 +455,7 @@ void usbhid_submit_report(struct hid_dev + usbhid->ctrl[usbhid->ctrlhead].raw_report = kmalloc(len, GFP_ATOMIC); + if (!usbhid->ctrl[usbhid->ctrlhead].raw_report) { + spin_unlock_irqrestore(&usbhid->ctrllock, flags); +- warn("control queueing failed"); ++ dev_warn(&hid->dev, "control queueing failed\n"); + return; + } + hid_output_report(report, usbhid->ctrl[usbhid->ctrlhead].raw_report); diff --git a/usb/usb-remove-warn-macro-from-usb-drivers.patch b/usb/usb-remove-warn-macro-from-usb-drivers.patch index 1eaa21d48b5b33..882e077fec82da 100644 --- a/usb/usb-remove-warn-macro-from-usb-drivers.patch +++ b/usb/usb-remove-warn-macro-from-usb-drivers.patch @@ -60,7 +60,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> if (!merge_length) merge_start = (unsigned char *)urb->transfer_buffer + urb->iso_frame_desc[i].offset; -@@ -1189,7 +1189,7 @@ int usbatm_usb_probe(struct usb_interfac +@@ -1188,7 +1188,7 @@ int usbatm_usb_probe(struct usb_interfac struct urb *urb; unsigned int iso_packets = usb_pipeisoc(channel->endpoint) ? channel->buf_size / channel->packet_size : 0; diff --git a/usb/usb-remove-warn-macro-from-usb-hid-drivers.patch b/usb/usb-remove-warn-macro-from-usb-hid-drivers.patch deleted file mode 100644 index b5a25c97f016ba..00000000000000 --- a/usb/usb-remove-warn-macro-from-usb-hid-drivers.patch +++ /dev/null @@ -1,143 +0,0 @@ -From foo@baz Tue Apr 9 12:12:43 2002 -Date: Thu, 14 Aug 2008 09:37:34 -0700 -To: Greg KH <greg@kroah.com> -From: Greg Kroah-Hartman <gregkh@suse.de> -Subject: USB: remove warn() macro from usb hid drivers - -USB should not be having it's own printk macros, so remove warn() and -use the system-wide standard of dev_warn() wherever possible. In the -few places that will not work out, use a basic printk(). - -Cc: Jiri Kosina <jkosina@suse.cz> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/hid/usbhid/hid-core.c | 17 ++++++++++------- - drivers/hid/usbhid/hid-tmff.c | 16 +++++++++++----- - drivers/hid/usbhid/usbkbd.c | 3 ++- - 3 files changed, 23 insertions(+), 13 deletions(-) - ---- a/drivers/hid/usbhid/hid-core.c -+++ b/drivers/hid/usbhid/hid-core.c -@@ -221,7 +221,8 @@ static void hid_irq_in(struct urb *urb) - hid_io_error(hid); - return; - default: /* error */ -- warn("input irq status %d received", urb->status); -+ dev_warn(&urb->dev->dev, "input irq status %d " -+ "received\n", urb->status); - } - - status = usb_submit_urb(urb, GFP_ATOMIC); -@@ -329,7 +330,8 @@ static void hid_irq_out(struct urb *urb) - case -ENOENT: - break; - default: /* error */ -- warn("output irq status %d received", urb->status); -+ dev_warn(&urb->dev->dev, "output irq status %d " -+ "received\n", urb->status); - } - - spin_lock_irqsave(&usbhid->outlock, flags); -@@ -381,7 +383,8 @@ static void hid_ctrl(struct urb *urb) - case -EPIPE: /* report not available */ - break; - default: /* error */ -- warn("ctrl urb status %d received", urb->status); -+ dev_warn(&urb->dev->dev, "ctrl urb status %d " -+ "received\n", urb->status); - } - - if (unplug) -@@ -418,7 +421,7 @@ void usbhid_submit_report(struct hid_dev - - if ((head = (usbhid->outhead + 1) & (HID_OUTPUT_FIFO_SIZE - 1)) == usbhid->outtail) { - spin_unlock_irqrestore(&usbhid->outlock, flags); -- warn("output queue full"); -+ dev_warn(hid->dev, "output queue full\n"); - return; - } - -@@ -437,7 +440,7 @@ void usbhid_submit_report(struct hid_dev - - if ((head = (usbhid->ctrlhead + 1) & (HID_CONTROL_FIFO_SIZE - 1)) == usbhid->ctrltail) { - spin_unlock_irqrestore(&usbhid->ctrllock, flags); -- warn("control queue full"); -+ dev_warn(hid->dev, "control queue full\n"); - return; - } - -@@ -465,7 +468,7 @@ static int usb_hidinput_input_event(stru - return -1; - - if ((offset = hidinput_find_field(hid, type, code, &field)) == -1) { -- warn("event field not found"); -+ dev_warn(&dev->dev, "event field not found\n"); - return -1; - } - -@@ -568,7 +571,7 @@ void usbhid_init_reports(struct hid_devi - } - - if (err) -- warn("timeout initializing reports"); -+ dev_warn(hid->dev, "timeout initializing reports\n"); - } - - /* ---- a/drivers/hid/usbhid/hid-tmff.c -+++ b/drivers/hid/usbhid/hid-tmff.c -@@ -163,22 +163,26 @@ int hid_tmff_init(struct hid_device *hid - switch (field->usage[0].hid) { - case THRUSTMASTER_USAGE_FF: - if (field->report_count < 2) { -- warn("ignoring FF field with report_count < 2"); -+ dev_warn(hid->dev, -+ "ignoring FF field with report_count < 2\n"); - continue; - } - - if (field->logical_maximum == field->logical_minimum) { -- warn("ignoring FF field with logical_maximum == logical_minimum"); -+ dev_warn(hid->dev, -+ "ignoring FF field with logical_maximum == logical_minimum\n"); - continue; - } - - if (tmff->report && tmff->report != report) { -- warn("ignoring FF field in other report"); -+ dev_warn(hid->dev, -+ "ignoring FF field in other report\n"); - continue; - } - - if (tmff->ff_field && tmff->ff_field != field) { -- warn("ignoring duplicate FF field"); -+ dev_warn(hid->dev, -+ "ignoring duplicate FF field\n"); - continue; - } - -@@ -199,7 +203,9 @@ int hid_tmff_init(struct hid_device *hid - break; - - default: -- warn("ignoring unknown output usage %08x", field->usage[0].hid); -+ dev_warn(hid->dev, -+ "ignoring unknown output usage %08x\n", -+ field->usage[0].hid); - continue; - } - } ---- a/drivers/hid/usbhid/usbkbd.c -+++ b/drivers/hid/usbhid/usbkbd.c -@@ -159,7 +159,8 @@ static void usb_kbd_led(struct urb *urb) - struct usb_kbd *kbd = urb->context; - - if (urb->status) -- warn("led urb status %d received", urb->status); -+ dev_warn(&urb->dev->dev, "led urb status %d received\n", -+ urb->status); - - if (*(kbd->leds) == kbd->newleds) - return; diff --git a/usb/usb-remove-warn-macro-from-usb-media-drivers.patch b/usb/usb-remove-warn-macro-from-usb-media-drivers.patch index 68adb6685782ae..41399a644a35ec 100644 --- a/usb/usb-remove-warn-macro-from-usb-media-drivers.patch +++ b/usb/usb-remove-warn-macro-from-usb-media-drivers.patch @@ -12,26 +12,13 @@ Cc: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- - drivers/media/dvb/cinergyT2/cinergyT2.c | 3 ++- drivers/media/radio/dsbr100.c | 13 ++++++++----- drivers/media/video/dabusb.c | 4 ++-- drivers/media/video/ov511.c | 19 ++++++++++++------- drivers/media/video/usbvideo/konicawc.c | 8 +++++--- drivers/media/video/usbvideo/quickcam_messenger.c | 14 ++++++++------ - 6 files changed, 37 insertions(+), 24 deletions(-) + 5 files changed, 35 insertions(+), 23 deletions(-) ---- a/drivers/media/dvb/cinergyT2/cinergyT2.c -+++ b/drivers/media/dvb/cinergyT2/cinergyT2.c -@@ -548,7 +548,8 @@ static int cinergyt2_release (struct ino - mutex_unlock(&cinergyt2->wq_sem); - - if (atomic_dec_and_test(&cinergyt2->inuse) && cinergyt2->disconnect_pending) { -- warn("delayed unregister in release"); -+ dev_warn(&cinergyt2->udev->dev, -+ "delayed unregister in release\n"); - cinergyt2_unregister(cinergyt2); - } - --- a/drivers/media/radio/dsbr100.c +++ b/drivers/media/radio/dsbr100.c @@ -310,7 +310,7 @@ static int vidioc_s_frequency(struct fil @@ -43,22 +30,24 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return 0; } -@@ -361,10 +361,12 @@ static int vidioc_s_ctrl(struct file *fi +@@ -361,12 +361,14 @@ static int vidioc_s_ctrl(struct file *fi case V4L2_CID_AUDIO_MUTE: if (ctrl->value) { - if (dsbr100_stop(radio)==-1) + if (dsbr100_stop(radio) == -1) { - warn("Radio did not respond properly"); + dev_warn(&radio->usbdev->dev, + "Radio did not respond properly\n"); + return -EBUSY; + } } else { - if (dsbr100_start(radio)==-1) + if (dsbr100_start(radio) == -1) { - warn("Radio did not respond properly"); + dev_warn(&radio->usbdev->dev, + "Radio did not respond properly\n"); + return -EBUSY; + } } - return 0; - } -@@ -411,7 +413,8 @@ static int usb_dsbr100_open(struct inode +@@ -416,7 +418,8 @@ static int usb_dsbr100_open(struct inode radio->muted = 1; if (dsbr100_start(radio)<0) { @@ -66,9 +55,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + dev_warn(&radio->usbdev->dev, + "Radio did not start up properly\n"); radio->users = 0; + unlock_kernel(); return -EIO; - } -@@ -494,7 +497,7 @@ static int usb_dsbr100_probe(struct usb_ +@@ -501,7 +504,7 @@ static int usb_dsbr100_probe(struct usb_ radio->curfreq = FREQ_MIN*FREQ_MUL; video_set_drvdata(radio->videodev, radio); if (video_register_device(radio->videodev, VFL_TYPE_RADIO, radio_nr) < 0) { @@ -132,7 +121,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } return status; -@@ -5210,7 +5213,8 @@ saa7111a_configure(struct usb_ov511 *ov) +@@ -5217,7 +5220,8 @@ saa7111a_configure(struct usb_ov511 *ov) if (ov->bclass == BCL_OV511) reg_w(ov, 0x11, 0x00); else @@ -142,7 +131,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return 0; } -@@ -5448,7 +5452,8 @@ ov518_configure(struct usb_ov511 *ov) +@@ -5456,7 +5460,8 @@ ov518_configure(struct usb_ov511 *ov) * required. OV518 has no uncompressed mode, to save RAM. */ if (!dumppix && !ov->compress) { ov->compress = 1; diff --git a/usb/usb-serial-sierra-debug-message-fix.patch b/usb/usb-serial-sierra-debug-message-fix.patch index b0e21131c560ba..c1bce7ebcf9252 100644 --- a/usb/usb-serial-sierra-debug-message-fix.patch +++ b/usb/usb-serial-sierra-debug-message-fix.patch @@ -89,18 +89,18 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + dev_dbg(&port->dev, "%s: nonzero status: %d on" + " endpoint %02x.", __func__, status, endpoint); } else { - tty = port->port.tty; if (urb->actual_length) { -@@ -446,7 +447,8 @@ static void sierra_indat_callback(struct - tty_insert_flip_string(tty, data, urb->actual_length); + tty = tty_port_tty_get(&port->port); +@@ -447,7 +448,8 @@ static void sierra_indat_callback(struct tty_flip_buffer_push(tty); - } else { + tty_kref_put(tty); + } else - dbg("%s: empty read urb received", __func__); + dev_dbg(&port->dev, "%s: empty read urb" + " received", __func__); - } /* Resubmit urb so we continue receiving */ + if (port->port.count && status != -ESHUTDOWN) { @@ -468,15 +470,17 @@ static void sierra_instat_callback(struc struct sierra_port_private *portdata = usb_get_serial_port_data(port); struct usb_serial *serial = port->serial; @@ -122,9 +122,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return; } if ((req_pkt->bRequestType == 0xA1) && -@@ -486,7 +490,8 @@ static void sierra_instat_callback(struc - urb->transfer_buffer + +@@ -487,7 +491,8 @@ static void sierra_instat_callback(struc sizeof(struct usb_ctrlrequest)); + struct tty_struct *tty; - dbg("%s: signal x%x", __func__, signals); + dev_dbg(&port->dev, "%s: signal x%x", __func__, @@ -132,9 +132,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> old_dcd_state = portdata->dcd_state; portdata->cts_state = 1; -@@ -498,19 +503,20 @@ static void sierra_instat_callback(struc - old_dcd_state && !portdata->dcd_state) - tty_hangup(port->port.tty); +@@ -501,19 +506,20 @@ static void sierra_instat_callback(struc + tty_hangup(tty); + tty_kref_put(tty); } else { - dbg("%s: type %x req %x", __func__, - req_pkt->bRequestType, req_pkt->bRequest); @@ -158,7 +158,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } } -@@ -520,14 +526,14 @@ static int sierra_write_room(struct tty_ +@@ -523,14 +529,14 @@ static int sierra_write_room(struct tty_ struct sierra_port_private *portdata = usb_get_serial_port_data(port); unsigned long flags; @@ -175,7 +175,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return 0; } spin_unlock_irqrestore(&portdata->lock, flags); -@@ -546,7 +552,7 @@ static int sierra_open(struct tty_struct +@@ -549,7 +555,7 @@ static int sierra_open(struct tty_struct portdata = usb_get_serial_port_data(port); @@ -184,7 +184,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /* Set some sane defaults */ portdata->rts_state = 1; -@@ -558,8 +564,8 @@ static int sierra_open(struct tty_struct +@@ -561,8 +567,8 @@ static int sierra_open(struct tty_struct if (!urb) continue; if (urb->dev != serial->dev) { @@ -195,7 +195,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> continue; } -@@ -598,7 +604,7 @@ static void sierra_close(struct tty_stru +@@ -601,7 +607,7 @@ static void sierra_close(struct tty_stru struct usb_serial *serial = port->serial; struct sierra_port_private *portdata; @@ -204,7 +204,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> portdata = usb_get_serial_port_data(port); portdata->rts_state = 0; -@@ -628,7 +634,7 @@ static int sierra_startup(struct usb_ser +@@ -630,7 +636,7 @@ static int sierra_startup(struct usb_ser int i; int j; @@ -213,7 +213,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /* Set Device mode to D0 */ sierra_set_power_state(serial->dev, 0x0000); -@@ -642,8 +648,9 @@ static int sierra_startup(struct usb_ser +@@ -644,8 +650,9 @@ static int sierra_startup(struct usb_ser port = serial->port[i]; portdata = kzalloc(sizeof(*portdata), GFP_KERNEL); if (!portdata) { @@ -225,7 +225,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return -ENOMEM; } spin_lock_init(&portdata->lock); -@@ -663,8 +670,8 @@ static int sierra_startup(struct usb_ser +@@ -665,8 +672,8 @@ static int sierra_startup(struct usb_ser for (j = 0; j < N_IN_URB; ++j) { urb = usb_alloc_urb(0, GFP_KERNEL); if (urb == NULL) { @@ -236,7 +236,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> continue; } /* Fill URB using supplied data. */ -@@ -686,7 +693,7 @@ static void sierra_shutdown(struct usb_s +@@ -688,7 +695,7 @@ static void sierra_shutdown(struct usb_s struct usb_serial_port *port; struct sierra_port_private *portdata; |