diff options
34 files changed, 23 insertions, 3407 deletions
diff --git a/driver-core/driver-core-use-dev_get_drvdata-accessors.patch b/driver-core/driver-core-use-dev_get_drvdata-accessors.patch index 88741f21640d57..242c6fc5e5ef32 100644 --- a/driver-core/driver-core-use-dev_get_drvdata-accessors.patch +++ b/driver-core/driver-core-use-dev_get_drvdata-accessors.patch @@ -30,7 +30,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> drivers/net/wireless/ipw2200.c | 46 +++++++++++++-------------- drivers/net/wireless/iwlwifi/iwl3945-base.c | 22 ++++++------- drivers/net/xen-netfront.c | 10 ++--- - drivers/pcmcia/ds.c | 6 +-- + drivers/pcmcia/ds.c | 8 ++-- drivers/s390/block/dasd_devmap.c | 6 +-- drivers/s390/char/con3215.c | 16 ++++----- drivers/s390/char/raw3270.c | 16 ++++----- @@ -47,7 +47,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> drivers/thermal/thermal_sys.c | 4 +- drivers/video/xen-fbfront.c | 8 ++-- include/linux/eisa.h | 4 +- - 34 files changed, 234 insertions(+), 207 deletions(-) + 34 files changed, 235 insertions(+), 208 deletions(-) --- a/drivers/block/xen-blkfront.c +++ b/drivers/block/xen-blkfront.c @@ -985,25 +985,34 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/pcmcia/ds.c +++ b/drivers/pcmcia/ds.c -@@ -461,7 +461,7 @@ static int pcmcia_device_probe(struct de +@@ -427,7 +427,7 @@ static int pcmcia_device_probe(struct de + p_drv = to_pcmcia_drv(dev->driver); + s = p_dev->socket; + +- /* The PCMCIA code passes the match data in via dev->driver_data ++ /* The PCMCIA code passes the match data in via driver data + * which is an ugly hack. Once the driver probe is called it may + * and often will overwrite the match data so we must save it first + * +@@ -437,7 +437,7 @@ static int pcmcia_device_probe(struct de * call which will then check whether there are two * pseudo devices, and if not, add the second one. */ - did = p_dev->dev.driver_data; -+ did = dev_get_drvdata(dev); - if (did && (did->match_flags & PCMCIA_DEV_ID_MATCH_DEVICE_NO) && - (p_dev->socket->device_count == 1) && (p_dev->device_no == 0)) - pcmcia_add_device_later(p_dev->socket, 0); -@@ -526,7 +526,7 @@ static int pcmcia_device_remove(struct d ++ did = dev_get_drvdata(&p_dev->dev); + + ds_dbg(1, "trying to bind %s to %s\n", p_dev->dev.bus_id, + p_drv->drv.name); +@@ -531,7 +531,7 @@ static int pcmcia_device_remove(struct d * pseudo multi-function card, we need to unbind * all devices */ - did = p_dev->dev.driver_data; -+ did = dev_get_drvdata(&p_dev->dev); ++ did = dev_get_drvdata(dev); if (did && (did->match_flags & PCMCIA_DEV_ID_MATCH_DEVICE_NO) && (p_dev->socket->device_count != 0) && (p_dev->device_no == 0)) -@@ -1017,7 +1017,7 @@ static inline int pcmcia_devmatch(struct +@@ -1022,7 +1022,7 @@ static inline int pcmcia_devmatch(struct return 0; } diff --git a/driver-core/sysfs-revert-netns-fix-device-renaming-for-sysfs.patch b/driver-core/sysfs-revert-netns-fix-device-renaming-for-sysfs.patch index dafdd64a19532e..2a43d62b49995f 100644 --- a/driver-core/sysfs-revert-netns-fix-device-renaming-for-sysfs.patch +++ b/driver-core/sysfs-revert-netns-fix-device-renaming-for-sysfs.patch @@ -46,7 +46,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -4005,7 +4005,6 @@ int register_netdevice(struct net_device +@@ -4007,7 +4007,6 @@ int register_netdevice(struct net_device if (dev->features & NETIF_F_SG) dev->features |= NETIF_F_GSO; @@ -54,7 +54,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> ret = netdev_register_kobject(dev); if (ret) goto err_uninit; -@@ -4467,8 +4466,7 @@ int dev_change_net_namespace(struct net_ +@@ -4469,8 +4468,7 @@ int dev_change_net_namespace(struct net_ } /* Fixup kobjects */ @@ -17,30 +17,6 @@ driver-core.current/modules-fix-module-notes-kobject-leak.patch ################################# # USB patches for 2.6.27 ################################# -usb.current/usb-storage-sierra-non-configurable-tru-install.patch -usb.current/usb-serial-sierra-device-addition-version-rev.patch -usb.current/usb-ehci-fix-some-ehci-hangs-and-crashes.patch -usb.current/usb-fix-the-nokia-6300-storage-mode.patch -usb.current/usb-correct-sierra-wireless-usb-evdo-modem-device-id.patch -usb.current/usb-fix-hcd-interrupt-disabling.patch -usb.current/usb-update-of-documentation-usb-anchors.txt.patch -usb.current/usb-gadget-fix-omap_udc-dma-regression.patch -usb.current/usb-fixing-nokia-3310c-in-storage-mode.patch -usb.current/usb-musb-fix-include-path.patch -usb.current/usb-fix-ehci-periodic-transfers.patch -usb.current/usb-serial-add-siemens-ef81-to-pl-2303-hack-triggers.patch -usb.current/usb-serial-cp2101-add-device-ids.patch -usb.current/usb-unusual_devs-addition-for-rockchip-mp3-player.patch -usb.current/usb-fsl_usb2_udc-fix-vdbg-format-string.patch -usb.current/usb-serial-ti_usb_3410_5052-obviously-broken-by-firmware-changes.patch -usb.current/usb-ftdi_sio-add-0x5050-0x0900-usb-ids.patch -usb.current/usb-serial-add-zte-cdma-tech-id-to-option-driver.patch -usb.current/usb-serial-sierra-add-mc8785-vid-pid.patch -usb.current/usb-drivers-usb-musb-disable-it-on-superh.patch -usb.current/usb-ftdi_sio-add-support-for-domintell-devices.patch -usb.current/usb-unusual-devs-patch-for-nokia-5310-music-xpress.patch -usb.current/usb-revert-recovery-from-transient-errors.patch - usb.current/usb-added-driver-for-a-delcom-usb-7-segment-led-display.patch usb.current/usb-add-usb-test-and-measurement-class-driver.patch diff --git a/staging-add-taint_crap-for-all-drivers-staging-code.patch b/staging-add-taint_crap-for-all-drivers-staging-code.patch index b6cbe9981f119e..48f1b64ca0e4d3 100644 --- a/staging-add-taint_crap-for-all-drivers-staging-code.patch +++ b/staging-add-taint_crap-for-all-drivers-staging-code.patch @@ -30,7 +30,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/Documentation/sysctl/kernel.txt +++ b/Documentation/sysctl/kernel.txt -@@ -368,4 +368,5 @@ can be ORed together: +@@ -369,4 +369,5 @@ can be ORed together: 2 - A module was force loaded by insmod -f. Set by modutils >= 2.4.9 and module-init-tools. 4 - Unsafe SMP processors: SMP with CPUs not designed for SMP. diff --git a/usb.current/usb-correct-sierra-wireless-usb-evdo-modem-device-id.patch b/usb.current/usb-correct-sierra-wireless-usb-evdo-modem-device-id.patch deleted file mode 100644 index e97336738891f8..00000000000000 --- a/usb.current/usb-correct-sierra-wireless-usb-evdo-modem-device-id.patch +++ /dev/null @@ -1,150 +0,0 @@ -From murraytony@gmail.com Wed Aug 27 10:56:00 2008 -From: Tony Murray <murraytony@gmail.com> -Date: Fri, 22 Aug 2008 17:30:44 -0500 -Subject: USB: Correct Sierra Wireless USB EVDO Modem Device ID -To: klloyd@sierrawireless.com, linux-kernel@vger.kernel.org, linux-serial@vger.kernel.org, linux-usb@vger.kernel.org -Message-ID: <2f5034170808221530h6bea5dc9hcb63a839a9589d2e@mail.gmail.com> -Content-Disposition: inline - -From: Tony Murray <murraytony@gmail.com> - -I was trying to figure out why my device wasn't supported by the -drivers/usb/serial/sierra.c driver, while looking throught the device -IDs I spotted what I believe to be a typo in the device IDs. Please -apply the following patch - -If you look down further, there is another HP wireless broadband card, -which has a vendor ID of 03f0, like my device. Below is my "lsusb -v --d 03f0:1b1d". - -Bus 001 Device 005: ID 03f0:1b1d Hewlett-Packard -Device Descriptor: - bLength 18 - bDescriptorType 1 - bcdUSB 1.10 - bDeviceClass 0 (Defined at Interface level) - bDeviceSubClass 0 - bDeviceProtocol 0 - bMaxPacketSize0 64 - idVendor 0x03f0 Hewlett-Packard - idProduct 0x1b1d - bcdDevice 0.01 - iManufacturer 1 HP - iProduct 2 HP ev2200 1xEV-DO Broadband Wireless Module - iSerial 0 - bNumConfigurations 1 - Configuration Descriptor: - bLength 9 - bDescriptorType 2 - wTotalLength 67 - bNumInterfaces 1 - bConfigurationValue 1 - iConfiguration 0 - bmAttributes 0xe0 - Self Powered - Remote Wakeup - MaxPower 0mA - Interface Descriptor: - bLength 9 - bDescriptorType 4 - bInterfaceNumber 0 - bAlternateSetting 0 - bNumEndpoints 7 - bInterfaceClass 255 Vendor Specific Class - bInterfaceSubClass 255 Vendor Specific Subclass - bInterfaceProtocol 255 Vendor Specific Protocol - iInterface 3 Data Interface - Endpoint Descriptor: - bLength 7 - bDescriptorType 5 - bEndpointAddress 0x81 EP 1 IN - bmAttributes 3 - Transfer Type Interrupt - Synch Type None - Usage Type Data - wMaxPacketSize 0x0010 1x 16 bytes - bInterval 128 - Endpoint Descriptor: - bLength 7 - bDescriptorType 5 - bEndpointAddress 0x82 EP 2 IN - bmAttributes 2 - Transfer Type Bulk - Synch Type None - Usage Type Data - wMaxPacketSize 0x0040 1x 64 bytes - bInterval 0 - Endpoint Descriptor: - bLength 7 - bDescriptorType 5 - bEndpointAddress 0x02 EP 2 OUT - bmAttributes 2 - Transfer Type Bulk - Synch Type None - Usage Type Data - wMaxPacketSize 0x0040 1x 64 bytes - bInterval 0 - Endpoint Descriptor: - bLength 7 - bDescriptorType 5 - bEndpointAddress 0x84 EP 4 IN - bmAttributes 2 - Transfer Type Bulk - Synch Type None - Usage Type Data - wMaxPacketSize 0x0040 1x 64 bytes - bInterval 0 - Endpoint Descriptor: - bLength 7 - bDescriptorType 5 - bEndpointAddress 0x04 EP 4 OUT - bmAttributes 2 - Transfer Type Bulk - Synch Type None - Usage Type Data - wMaxPacketSize 0x0040 1x 64 bytes - bInterval 0 - Endpoint Descriptor: - bLength 7 - bDescriptorType 5 - bEndpointAddress 0x85 EP 5 IN - bmAttributes 2 - Transfer Type Bulk - Synch Type None - Usage Type Data - wMaxPacketSize 0x0040 1x 64 bytes - bInterval 0 - Endpoint Descriptor: - bLength 7 - bDescriptorType 5 - bEndpointAddress 0x05 EP 5 OUT - bmAttributes 2 - Transfer Type Bulk - Synch Type None - Usage Type Data - wMaxPacketSize 0x0040 1x 64 bytes - bInterval 0 -Device Status: 0x0000 - (Bus Powered) - -From: Tony Murray <murraytony@gmail.com> -Cc: Kevin Lloyd <klloyd@sierrawireless.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - - - ---- - drivers/usb/serial/sierra.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/usb/serial/sierra.c -+++ b/drivers/usb/serial/sierra.c -@@ -160,7 +160,7 @@ static struct usb_device_id id_table [] - { USB_DEVICE(0x1199, 0x0017) }, /* Sierra Wireless EM5625 */ - { USB_DEVICE(0x1199, 0x0018) }, /* Sierra Wireless MC5720 */ - { USB_DEVICE(0x1199, 0x0218) }, /* Sierra Wireless MC5720 */ -- { USB_DEVICE(0x0f30, 0x1b1d) }, /* Sierra Wireless MC5720 */ -+ { USB_DEVICE(0x03f0, 0x1b1d) }, /* HP ev2200 a.k.a MC5720 */ - { USB_DEVICE(0x1199, 0x0020) }, /* Sierra Wireless MC5725 */ - { USB_DEVICE(0x1199, 0x0024) }, /* Sierra Wireless MC5727 */ - { USB_DEVICE(0x1199, 0x0220) }, /* Sierra Wireless MC5725 */ diff --git a/usb.current/usb-drivers-usb-musb-disable-it-on-superh.patch b/usb.current/usb-drivers-usb-musb-disable-it-on-superh.patch deleted file mode 100644 index fc7e41fc5782b0..00000000000000 --- a/usb.current/usb-drivers-usb-musb-disable-it-on-superh.patch +++ /dev/null @@ -1,49 +0,0 @@ -From akpm@linux-foundation.org Tue Sep 23 13:17:44 2008 -From: Andrew Morton <akpm@linux-foundation.org> -Date: Mon, 22 Sep 2008 15:00:08 -0700 -Subject: USB: drivers/usb/musb/: disable it on SuperH -To: greg@kroah.com -Cc: linux-usb@vger.kernel.org, akpm@linux-foundation.org, kkeil@suse.de, lethal@linux-sh.org -Message-ID: <200809222200.m8MM08xT032597@imap1.linux-foundation.org> - - -From: Andrew Morton <akpm@linux-foundation.org> - -In file included from drivers/usb/musb/musb_core.h:59, - from drivers/usb/musb/musb_core.c:108: -drivers/usb/musb/musb_io.h:42: error: conflicting types for '__raw_readsl' -/usr/src/devel/arch/sh/include/asm/io.h:112: error: previous declaration of '__raw_readsl' was here -drivers/usb/musb/musb_io.h:42: error: conflicting types for '__raw_readsl' -/usr/src/devel/arch/sh/include/asm/io.h:112: error: previous declaration of '__raw_readsl' was here -drivers/usb/musb/musb_io.h:44: error: conflicting types for 'readsw' -/usr/src/devel/arch/sh/include/asm/io.h:164: error: previous definition of 'readsw' was here -drivers/usb/musb/musb_io.h:46: error: conflicting types for 'readsb' -/usr/src/devel/arch/sh/include/asm/io.h:163: error: previous definition of 'readsb' was here -drivers/usb/musb/musb_io.h:49: error: conflicting types for '__raw_writesl' -/usr/src/devel/arch/sh/include/asm/io.h:111: error: previous declaration of '__raw_writesl' was here -drivers/usb/musb/musb_io.h:49: error: conflicting types for '__raw_writesl' -/usr/src/devel/arch/sh/include/asm/io.h:111: error: previous declaration of '__raw_writesl' was here -drivers/usb/musb/musb_io.h:51: error: conflicting types for 'writesw' -/usr/src/devel/arch/sh/include/asm/io.h:164: error: previous definition of 'writesw' was here -drivers/usb/musb/musb_io.h:53: error: conflicting types for 'writesb' -/usr/src/devel/arch/sh/include/asm/io.h:163: error: previous definition of 'writesb' was here - -Cc: Karsten Keil <kkeil@suse.de> -Cc: Paul Mundt <lethal@linux-sh.org> -Signed-off-by: Andrew Morton <akpm@linux-foundation.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/musb/Kconfig | 1 + - 1 file changed, 1 insertion(+) - ---- a/drivers/usb/musb/Kconfig -+++ b/drivers/usb/musb/Kconfig -@@ -9,6 +9,7 @@ comment "Enable Host or Gadget support t - # (M)HDRC = (Multipoint) Highspeed Dual-Role Controller - config USB_MUSB_HDRC - depends on (USB || USB_GADGET) && HAVE_CLK -+ depends on !SUPERH - select TWL4030_USB if MACH_OMAP_3430SDP - tristate 'Inventra Highspeed Dual Role Controller (TI, ...)' - help diff --git a/usb.current/usb-ehci-fix-some-ehci-hangs-and-crashes.patch b/usb.current/usb-ehci-fix-some-ehci-hangs-and-crashes.patch deleted file mode 100644 index b726768a7bb84b..00000000000000 --- a/usb.current/usb-ehci-fix-some-ehci-hangs-and-crashes.patch +++ /dev/null @@ -1,69 +0,0 @@ -From david-b@pacbell.net Wed Aug 27 10:51:56 2008 -From: David Brownell <david-b@pacbell.net> -Date: Tue, 26 Aug 2008 14:43:46 -0700 -Subject: USB: ehci: fix some ehci hangs and crashes -To: Alan Stern <stern@rowland.harvard.edu> -Cc: Karsten Wiese <fzu@wemgehoertderstaat.de>, amruth <amruth_pv@yahoo.com>, Oliver Neukum <oliver@neukum.org>, Greg KH <greg@kroah.com> -Message-ID: <200808261443.47064.david-b@pacbell.net> -Content-Disposition: inline - -From: David Brownell <dbrownell@users.sourceforge.net> - -I noticed that the "Refactor "if (handshake()) state = HC_STATE_HALT" -patch from earlier this year perpetuated a potential problem: it can -mark the controller as halted when it's still running (but not acting -as, perhaps wrongly, expected). - -That caused some hangs and crashes, rather than more polite failure -modes of a truly halted controller. This patch forces a true halt, -and emits a (previously missing) diagnostic. - -Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/host/ehci-hcd.c | 26 ++++++++++++++++---------- - 1 file changed, 16 insertions(+), 10 deletions(-) - ---- a/drivers/usb/host/ehci-hcd.c -+++ b/drivers/usb/host/ehci-hcd.c -@@ -145,16 +145,6 @@ static int handshake (struct ehci_hcd *e - return -ETIMEDOUT; - } - --static int handshake_on_error_set_halt(struct ehci_hcd *ehci, void __iomem *ptr, -- u32 mask, u32 done, int usec) --{ -- int error = handshake(ehci, ptr, mask, done, usec); -- if (error) -- ehci_to_hcd(ehci)->state = HC_STATE_HALT; -- -- return error; --} -- - /* force HC to halt state from unknown (EHCI spec section 2.3) */ - static int ehci_halt (struct ehci_hcd *ehci) - { -@@ -173,6 +163,22 @@ static int ehci_halt (struct ehci_hcd *e - STS_HALT, STS_HALT, 16 * 125); - } - -+static int handshake_on_error_set_halt(struct ehci_hcd *ehci, void __iomem *ptr, -+ u32 mask, u32 done, int usec) -+{ -+ int error; -+ -+ error = handshake(ehci, ptr, mask, done, usec); -+ if (error) { -+ ehci_halt(ehci); -+ ehci_to_hcd(ehci)->state = HC_STATE_HALT; -+ ehci_err(ehci, "force halt; handhake %p %08x %08x -> %d\n", -+ ptr, mask, done, error); -+ } -+ -+ return error; -+} -+ - /* put TDI/ARC silicon into EHCI mode */ - static void tdi_reset (struct ehci_hcd *ehci) - { diff --git a/usb.current/usb-fix-ehci-periodic-transfers.patch b/usb.current/usb-fix-ehci-periodic-transfers.patch deleted file mode 100644 index a9b2333b22786b..00000000000000 --- a/usb.current/usb-fix-ehci-periodic-transfers.patch +++ /dev/null @@ -1,127 +0,0 @@ -From david-b@pacbell.net Wed Sep 3 11:20:17 2008 -From: David Brownell <david-b@pacbell.net> -Date: Tue, 26 Aug 2008 23:35:04 -0700 -Subject: USB: fix EHCI periodic transfers -To: amruth_pv@yahoo.com -Cc: Alan Stern <stern@rowland.harvard.edu>, Karsten Wiese <fzu@wemgehoertderstaat.de>, Oliver Neukum <oliver@neukum.org>, Greg KH <greg@kroah.com> -Message-ID: <200808262335.05204.david-b@pacbell.net> -Content-Disposition: inline - -From: David Brownell <dbrownell@users.sourceforge.net> - -As noted by Stefan Neis <Stefan.Neis@kobil.com>, we had a recent -regression with EHCI periodic transfers, in some (seemingly not -all that common) cases. - -The root cause was that the schedule activation was only loosely -coupled to the addition or removal of transfers, so two different -execution contexts could both think they had to deactivate (or -conversely activate) the schedule. So this fix tightens that -coupling, managing it more like a refcount. - -Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/host/ehci-sched.c | 32 ++++++++++++++------------------ - 1 file changed, 14 insertions(+), 18 deletions(-) - ---- a/drivers/usb/host/ehci-sched.c -+++ b/drivers/usb/host/ehci-sched.c -@@ -437,6 +437,9 @@ static int enable_periodic (struct ehci_ - u32 cmd; - int status; - -+ if (ehci->periodic_sched++) -+ return 0; -+ - /* did clearing PSE did take effect yet? - * takes effect only at frame boundaries... - */ -@@ -461,6 +464,9 @@ static int disable_periodic (struct ehci - u32 cmd; - int status; - -+ if (--ehci->periodic_sched) -+ return 0; -+ - /* did setting PSE not take effect yet? - * takes effect only at frame boundaries... - */ -@@ -544,13 +550,10 @@ static int qh_link_periodic (struct ehci - : (qh->usecs * 8); - - /* maybe enable periodic schedule processing */ -- if (!ehci->periodic_sched++) -- return enable_periodic (ehci); -- -- return 0; -+ return enable_periodic(ehci); - } - --static void qh_unlink_periodic (struct ehci_hcd *ehci, struct ehci_qh *qh) -+static int qh_unlink_periodic(struct ehci_hcd *ehci, struct ehci_qh *qh) - { - unsigned i; - unsigned period; -@@ -586,9 +589,7 @@ static void qh_unlink_periodic (struct e - qh_put (qh); - - /* maybe turn off periodic schedule */ -- ehci->periodic_sched--; -- if (!ehci->periodic_sched) -- (void) disable_periodic (ehci); -+ return disable_periodic(ehci); - } - - static void intr_deschedule (struct ehci_hcd *ehci, struct ehci_qh *qh) -@@ -1562,9 +1563,7 @@ itd_link_urb ( - urb->hcpriv = NULL; - - timer_action (ehci, TIMER_IO_WATCHDOG); -- if (unlikely (!ehci->periodic_sched++)) -- return enable_periodic (ehci); -- return 0; -+ return enable_periodic(ehci); - } - - #define ISO_ERRS (EHCI_ISOC_BUF_ERR | EHCI_ISOC_BABBLE | EHCI_ISOC_XACTERR) -@@ -1642,7 +1641,7 @@ itd_complete ( - ehci_urb_done(ehci, urb, 0); - retval = true; - urb = NULL; -- ehci->periodic_sched--; -+ (void) disable_periodic(ehci); - ehci_to_hcd(ehci)->self.bandwidth_isoc_reqs--; - - if (unlikely (list_empty (&stream->td_list))) { -@@ -1951,9 +1950,7 @@ sitd_link_urb ( - urb->hcpriv = NULL; - - timer_action (ehci, TIMER_IO_WATCHDOG); -- if (!ehci->periodic_sched++) -- return enable_periodic (ehci); -- return 0; -+ return enable_periodic(ehci); - } - - /*-------------------------------------------------------------------------*/ -@@ -2019,7 +2016,7 @@ sitd_complete ( - ehci_urb_done(ehci, urb, 0); - retval = true; - urb = NULL; -- ehci->periodic_sched--; -+ (void) disable_periodic(ehci); - ehci_to_hcd(ehci)->self.bandwidth_isoc_reqs--; - - if (list_empty (&stream->td_list)) { -@@ -2243,8 +2240,7 @@ restart: - if (unlikely (modified)) { - if (likely(ehci->periodic_sched > 0)) - goto restart; -- /* maybe we can short-circuit this scan! */ -- disable_periodic(ehci); -+ /* short-circuit this scan */ - now_uframe = clock; - break; - } diff --git a/usb.current/usb-fix-hcd-interrupt-disabling.patch b/usb.current/usb-fix-hcd-interrupt-disabling.patch deleted file mode 100644 index f0ec3c84b3fb40..00000000000000 --- a/usb.current/usb-fix-hcd-interrupt-disabling.patch +++ /dev/null @@ -1,49 +0,0 @@ -From geoffrey.levand@am.sony.com Wed Aug 27 10:58:58 2008 -From: Geoff Levand <geoffrey.levand@am.sony.com> -Date: Fri, 22 Aug 2008 14:13:00 -0700 -Subject: USB: fix hcd interrupt disabling -To: Greg Kroah-Hartman <gregkh@suse.de> -Cc: linux-usb@vger.kernel.org, Stefan Becker <Stefan.Becker@nokia.com> -Message-ID: <48AF2BDC.7090507@am.sony.com> - -From: Geoff Levand <geoffrey.levand@am.sony.com> - -Commit de85422b94ddb23c021126815ea49414047c13dc, 'USB: fix interrupt -disabling for HCDs with shared interrupt handlers' changed usb_add_hcd() -to strip IRQF_DISABLED from irqflags prior to calling request_irq() -with the justification that such a removal was necessary for shared -interrupts to work properly. Unfortunately, the change in that commit -unconditionally removes the IRQF_DISABLED flag, causing problems on -platforms that don't use a shared interrupt but require IRQF_DISABLED. -This change adds a check for IRQF_SHARED prior to removing the -IRQF_DISABLED flag. - -Fixes the PS3 system startup hang reported with recent Fedora and -OpenSUSE kernels. - -Note that this problem is hidden when CONFIG_LOCKDEP=y (ps3_defconfig), -as local_irq_enable_in_hardirq() is defined as a null statement for -that config. - -CC: stable <stable@kernel.org> -Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com> -Cc: Alan Stern <stern@rowland.harvard.edu> -Cc: Stefan Becker <Stefan.Becker@nokia.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/core/hcd.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - ---- a/drivers/usb/core/hcd.c -+++ b/drivers/usb/core/hcd.c -@@ -1876,7 +1876,8 @@ int usb_add_hcd(struct usb_hcd *hcd, - * with IRQF_SHARED. As usb_hcd_irq() will always disable - * interrupts we can remove it here. - */ -- irqflags &= ~IRQF_DISABLED; -+ if (irqflags & IRQF_SHARED) -+ irqflags &= ~IRQF_DISABLED; - - snprintf(hcd->irq_descr, sizeof(hcd->irq_descr), "%s:usb%d", - hcd->driver->description, hcd->self.busnum); diff --git a/usb.current/usb-fix-the-nokia-6300-storage-mode.patch b/usb.current/usb-fix-the-nokia-6300-storage-mode.patch deleted file mode 100644 index bc79c6982e36a4..00000000000000 --- a/usb.current/usb-fix-the-nokia-6300-storage-mode.patch +++ /dev/null @@ -1,61 +0,0 @@ -From RichardNauber@web.de Wed Aug 27 10:53:32 2008 -From: Richard Nauber <RichardNauber@web.de> -Date: Tue, 26 Aug 2008 23:34:11 +0200 -Subject: USB: Fix the Nokia 6300 storage-mode. -To: <phil@ipom.com> -Cc: linux-usb@vger.kernel.org, usb-storage@lists.one-eyed-alien.net -Message-ID: <48B476D3.7000002@web.de> - -From: Richard Nauber <RichardNauber@web.de> - -This patch fixes that behavior: - -... -Aug 26 22:39:23 rnauber sd 2:0:0:0: [sda] Sense Key : 0x0 [current] -Aug 26 22:39:23 rnauber sd 2:0:0:0: [sda] ASC=0x0 ASCQ=0x0 -Aug 26 22:39:23 rnauber sd 2:0:0:0: [sda] Sense Key : 0x0 [current] -Aug 26 22:39:23 rnauber sd 2:0:0:0: [sda] ASC=0x0 ASCQ=0x0 -Aug 26 22:39:23 rnauber sd 2:0:0:0: [sda] Sense Key : 0x0 [current] -Aug 26 22:39:23 rnauber sd 2:0:0:0: [sda] ASC=0x0 ASCQ=0x0 -Aug 26 22:39:23 rnauber sd 2:0:0:0: [sda] Sense Key : 0x0 [current] -... - - -cat /proc/bus/usb/devices -... -T: Bus=04 Lev=01 Prnt=01 Port=00 Cnt=01 Dev#= 3 Spd=12 MxCh= 0 -D: Ver= 2.00 Cls=00(>ifc ) Sub=00 Prot=00 MxPS=64 #Cfgs= 1 -P: Vendor=0421 ProdID=04fa Rev= 6.01 -S: Manufacturer=Nokia -S: Product=Nokia 6300 -S: SerialNumber=35XXXXXXXX -C:* #Ifs= 1 Cfg#= 1 Atr=c0 MxPwr=100mA -I:* If#= 0 Alt= 0 #EPs= 2 Cls=08(stor.) Sub=06 Prot=50 Driver=usb-storage -E: Ad=81(I) Atr=02(Bulk) MxPS= 64 Ivl=0ms -E: Ad=01(O) Atr=02(Bulk) MxPS= 64 Ivl=0ms -... - -From: Richard Nauber <RichardNauber@web.de> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - - ---- - drivers/usb/storage/unusual_devs.h | 7 +++++++ - 1 file changed, 7 insertions(+) - ---- a/drivers/usb/storage/unusual_devs.h -+++ b/drivers/usb/storage/unusual_devs.h -@@ -232,6 +232,13 @@ UNUSUAL_DEV( 0x0421, 0x04b9, 0x0551, 0x - US_SC_DEVICE, US_PR_DEVICE, NULL, - US_FL_FIX_CAPACITY ), - -+/* Reported by Richard Nauber <RichardNauber@web.de> */ -+UNUSUAL_DEV( 0x0421, 0x04fa, 0x0601, 0x0601, -+ "Nokia", -+ "6300", -+ US_SC_DEVICE, US_PR_DEVICE, NULL, -+ US_FL_FIX_CAPACITY ), -+ - /* Reported by Olaf Hering <olh@suse.de> from novell bug #105878 */ - UNUSUAL_DEV( 0x0424, 0x0fdc, 0x0210, 0x0210, - "SMSC", diff --git a/usb.current/usb-fixing-nokia-3310c-in-storage-mode.patch b/usb.current/usb-fixing-nokia-3310c-in-storage-mode.patch deleted file mode 100644 index ef8f99ec2bf181..00000000000000 --- a/usb.current/usb-fixing-nokia-3310c-in-storage-mode.patch +++ /dev/null @@ -1,36 +0,0 @@ -From filip@blueturtle.nu Wed Sep 3 11:18:04 2008 -From: Filip Joelsson <filip@blueturtle.nu> -Date: Sun, 31 Aug 2008 08:22:16 +0200 -Subject: USB: Fixing Nokia 3310c in storage mode -To: phil@ipom.com -Cc: linux-usb@vger.kernel.org, usb-storage@lists.one-eyed-alien.net -Message-ID: <48BA3898.7010707@blueturtle.nu> - - -I had trouble connecting my cell phone as a storage device - so I added -it to the unusual_devs.h list. I had trouble with the bcdDeviceMin and -Max values - so after some experimenting I made it pretty inclusive. - -From: Filip Joelsson <filip@blueturtle.nu> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/storage/unusual_devs.h | 7 +++++++ - 1 file changed, 7 insertions(+) - ---- a/drivers/usb/storage/unusual_devs.h -+++ b/drivers/usb/storage/unusual_devs.h -@@ -160,6 +160,13 @@ UNUSUAL_DEV( 0x0421, 0x0019, 0x0592, 0x - US_SC_DEVICE, US_PR_DEVICE, NULL, - US_FL_MAX_SECTORS_64 ), - -+/* Reported by Filip Joelsson <filip@blueturtle.nu> */ -+UNUSUAL_DEV( 0x0421, 0x005d, 0x0001, 0x0600, -+ "Nokia", -+ "Nokia 3110c", -+ US_SC_DEVICE, US_PR_DEVICE, NULL, -+ US_FL_FIX_CAPACITY ), -+ - /* Reported by Mario Rettig <mariorettig@web.de> */ - UNUSUAL_DEV( 0x0421, 0x042e, 0x0100, 0x0100, - "Nokia", diff --git a/usb.current/usb-fsl_usb2_udc-fix-vdbg-format-string.patch b/usb.current/usb-fsl_usb2_udc-fix-vdbg-format-string.patch deleted file mode 100644 index 4e1fee9243855b..00000000000000 --- a/usb.current/usb-fsl_usb2_udc-fix-vdbg-format-string.patch +++ /dev/null @@ -1,33 +0,0 @@ -From jacmet@gmail.com Mon Sep 15 10:11:30 2008 -From: Peter Korsgaard <jacmet@sunsite.dk> -Date: Mon, 8 Sep 2008 10:08:59 +0200 -Subject: USB: fsl_usb2_udc: fix VDBG() format string -To: david-b@pacbell.net, gregkh@suse.de, leoli@freescale.com, linux-usb@vger.kernel.org -Cc: Peter Korsgaard <jacmet@sunsite.dk> -Message-ID: <1220861339-14967-1-git-send-email-jacmet@sunsite.dk> - - -Fixes: -drivers/usb/gadget/fsl_usb2_udc.c: In function 'dr_controller_setup': -drivers/usb/gadget/fsl_usb2_udc.c:229: warning: format '%p' expects type -'void *', but argument 3 has type 'int' - -Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - - ---- - drivers/usb/gadget/fsl_usb2_udc.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/usb/gadget/fsl_usb2_udc.c -+++ b/drivers/usb/gadget/fsl_usb2_udc.c -@@ -223,7 +223,7 @@ static int dr_controller_setup(struct fs - fsl_writel(tmp, &dr_regs->endpointlistaddr); - - VDBG("vir[qh_base] is %p phy[qh_base] is 0x%8x reg is 0x%8x", -- (int)udc->ep_qh, (int)tmp, -+ udc->ep_qh, (int)tmp, - fsl_readl(&dr_regs->endpointlistaddr)); - - /* Config PHY interface */ diff --git a/usb.current/usb-ftdi_sio-add-0x5050-0x0900-usb-ids.patch b/usb.current/usb-ftdi_sio-add-0x5050-0x0900-usb-ids.patch deleted file mode 100644 index cbf7b4eaf1d06a..00000000000000 --- a/usb.current/usb-ftdi_sio-add-0x5050-0x0900-usb-ids.patch +++ /dev/null @@ -1,39 +0,0 @@ -From linux-usb-owner@vger.kernel.org Tue Sep 16 09:19:18 2008 -From: Jaroslav Kysela <perex@perex.cz> -Date: Tue, 16 Sep 2008 15:46:50 +0200 (CEST) -Subject: USB: ftdi_sio: Add 0x5050/0x0900 USB IDs (Papouch Quido USB 4/4) -To: linux-usb@vger.kernel.org -Message-ID: <Pine.LNX.4.61.0809161544140.10962@tm8103-a.perex-int.cz> - -From: Jaroslav Kysela <perex@perex.cz> - -USB: ftdi_sio: Add 0x5050/0x0900 USB IDs (Papouch Quido USB 4/4) - -Signed-off-by: Jaroslav Kysela <perex@perex.cz> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/serial/ftdi_sio.c | 1 + - drivers/usb/serial/ftdi_sio.h | 1 + - 2 files changed, 2 insertions(+) - ---- a/drivers/usb/serial/ftdi_sio.c -+++ b/drivers/usb/serial/ftdi_sio.c -@@ -654,6 +654,7 @@ static struct usb_device_id id_table_com - .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, - { USB_DEVICE(RATOC_VENDOR_ID, RATOC_PRODUCT_ID_USB60F) }, - { USB_DEVICE(FTDI_VID, FTDI_REU_TINY_PID) }, -+ { USB_DEVICE(PAPOUCH_VID, PAPOUCH_QUIDO4x4_PID) }, - { }, /* Optional parameter entry */ - { } /* Terminating entry */ - }; ---- a/drivers/usb/serial/ftdi_sio.h -+++ b/drivers/usb/serial/ftdi_sio.h -@@ -750,6 +750,7 @@ - - #define PAPOUCH_VID 0x5050 /* Vendor ID */ - #define PAPOUCH_TMU_PID 0x0400 /* TMU USB Thermometer */ -+#define PAPOUCH_QUIDO4x4_PID 0x0900 /* Quido 4/4 Module */ - - /* - * ACG Identification Technologies GmbH products (http://www.acg.de/). diff --git a/usb.current/usb-ftdi_sio-add-support-for-domintell-devices.patch b/usb.current/usb-ftdi_sio-add-support-for-domintell-devices.patch deleted file mode 100644 index ac96134042004c..00000000000000 --- a/usb.current/usb-ftdi_sio-add-support-for-domintell-devices.patch +++ /dev/null @@ -1,49 +0,0 @@ -From akpm@linux-foundation.org Tue Sep 23 13:18:34 2008 -From: Gaetan Carlier <gcpatch@gmail.com> -Date: Mon, 22 Sep 2008 15:00:09 -0700 -Subject: usb: ftdi_sio: add support for Domintell devices -To: greg@kroah.com -Cc: linux-usb@vger.kernel.org, akpm@linux-foundation.org, gcpatch@gmail.com, abbotti@mev.co.uk, gregkh@suse.de -Message-ID: <200809222200.m8MM09nE032601@imap1.linux-foundation.org> - - -From: Gaetan Carlier <gcpatch@gmail.com> - -Support for Domintell devices (FTDI FT232BM based) : DGQG and DUSB01 -module. PIDs were missing. - -Signed-off-by: Gaetan Carlier <gcpatch@gmail.com> -Cc: Greg Kroah-Hartman <gregkh@suse.de> -Cc: Ian Abbott <abbotti@mev.co.uk> -Signed-off-by: Andrew Morton <akpm@linux-foundation.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/serial/ftdi_sio.c | 2 ++ - drivers/usb/serial/ftdi_sio.h | 4 ++++ - 2 files changed, 6 insertions(+) - ---- a/drivers/usb/serial/ftdi_sio.c -+++ b/drivers/usb/serial/ftdi_sio.c -@@ -655,6 +655,8 @@ static struct usb_device_id id_table_com - { USB_DEVICE(RATOC_VENDOR_ID, RATOC_PRODUCT_ID_USB60F) }, - { USB_DEVICE(FTDI_VID, FTDI_REU_TINY_PID) }, - { USB_DEVICE(PAPOUCH_VID, PAPOUCH_QUIDO4x4_PID) }, -+ { USB_DEVICE(FTDI_VID, FTDI_DOMINTELL_DGQG_PID) }, -+ { USB_DEVICE(FTDI_VID, FTDI_DOMINTELL_DUSB_PID) }, - { }, /* Optional parameter entry */ - { } /* Terminating entry */ - }; ---- a/drivers/usb/serial/ftdi_sio.h -+++ b/drivers/usb/serial/ftdi_sio.h -@@ -839,6 +839,10 @@ - /* Rig Expert Ukraine devices */ - #define FTDI_REU_TINY_PID 0xED22 /* RigExpert Tiny */ - -+/* Domintell products http://www.domintell.com */ -+#define FTDI_DOMINTELL_DGQG_PID 0xEF50 /* Master */ -+#define FTDI_DOMINTELL_DUSB_PID 0xEF51 /* DUSB01 module */ -+ - /* Commands */ - #define FTDI_SIO_RESET 0 /* Reset the port */ - #define FTDI_SIO_MODEM_CTRL 1 /* Set the modem control register */ diff --git a/usb.current/usb-gadget-fix-omap_udc-dma-regression.patch b/usb.current/usb-gadget-fix-omap_udc-dma-regression.patch deleted file mode 100644 index f080e9458eff7b..00000000000000 --- a/usb.current/usb-gadget-fix-omap_udc-dma-regression.patch +++ /dev/null @@ -1,45 +0,0 @@ -From david-b@pacbell.net Wed Sep 3 11:17:37 2008 -From: David Brownell <david-b@pacbell.net> -Date: Sun, 31 Aug 2008 18:04:27 -0700 -Subject: usb gadget: fix omap_udc DMA regression -To: linux-usb@vger.kernel.org -Cc: Greg KH <greg@kroah.com>, Russell King <rmk@arm.linux.org.uk> -Message-ID: <200808311804.27829.david-b@pacbell.net> -Content-Disposition: inline - - -From: David Brownell <dbrownell@users.sourceforge.net> - -This resolves another regression caused by the "use omap_read/write -instead of __REG" patch: the hardware address used for DMA to/from -the UDC became wrong. Bug noted by Russell King. - -Reported-by: Russell King <rmk@arm.linux.org.uk> -Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> -Acked-by: Russell King <rmk@arm.linux.org.uk> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/gadget/omap_udc.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/drivers/usb/gadget/omap_udc.c -+++ b/drivers/usb/gadget/omap_udc.c -@@ -787,7 +787,7 @@ static void dma_channel_claim(struct oma - omap_set_dma_dest_params(ep->lch, - OMAP_DMA_PORT_TIPB, - OMAP_DMA_AMODE_CONSTANT, -- (unsigned long) io_v2p(UDC_DATA_DMA), -+ UDC_DATA_DMA, - 0, 0); - } - } else { -@@ -804,7 +804,7 @@ static void dma_channel_claim(struct oma - omap_set_dma_src_params(ep->lch, - OMAP_DMA_PORT_TIPB, - OMAP_DMA_AMODE_CONSTANT, -- (unsigned long) io_v2p(UDC_DATA_DMA), -+ UDC_DATA_DMA, - 0, 0); - /* EMIFF or SDRC */ - omap_set_dma_dest_burst_mode(ep->lch, diff --git a/usb.current/usb-musb-fix-include-path.patch b/usb.current/usb-musb-fix-include-path.patch deleted file mode 100644 index 894face50961fd..00000000000000 --- a/usb.current/usb-musb-fix-include-path.patch +++ /dev/null @@ -1,61 +0,0 @@ -From me@felipebalbi.com Wed Sep 3 11:18:46 2008 -From: Felipe Balbi <me@felipebalbi.com> -Date: Sat, 30 Aug 2008 19:42:02 +0300 -Subject: usb: musb: fix include path -To: linux-usb@vger.kernel.org -Cc: Felipe Balbi <felipe.balbi@nokia.com> -Message-ID: <1220114522-18213-1-git-send-email-me@felipebalbi.com> - - -From: Felipe Balbi <felipe.balbi@nokia.com> - -headers were moved, fixing. - -Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/musb/musb_core.c | 4 ++-- - drivers/usb/musb/omap2430.c | 4 ++-- - drivers/usb/musb/omap2430.h | 4 ++-- - 3 files changed, 6 insertions(+), 6 deletions(-) - ---- a/drivers/usb/musb/musb_core.c -+++ b/drivers/usb/musb/musb_core.c -@@ -100,8 +100,8 @@ - #include <linux/io.h> - - #ifdef CONFIG_ARM --#include <asm/arch/hardware.h> --#include <asm/arch/memory.h> -+#include <mach/hardware.h> -+#include <mach/memory.h> - #include <asm/mach-types.h> - #endif - ---- a/drivers/usb/musb/omap2430.c -+++ b/drivers/usb/musb/omap2430.c -@@ -35,8 +35,8 @@ - #include <linux/io.h> - - #include <asm/mach-types.h> --#include <asm/arch/hardware.h> --#include <asm/arch/mux.h> -+#include <mach/hardware.h> -+#include <mach/mux.h> - - #include "musb_core.h" - #include "omap2430.h" ---- a/drivers/usb/musb/omap2430.h -+++ b/drivers/usb/musb/omap2430.h -@@ -11,8 +11,8 @@ - #define __MUSB_OMAP243X_H__ - - #if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3430) --#include <asm/arch/hardware.h> --#include <asm/arch/usb.h> -+#include <mach/hardware.h> -+#include <mach/usb.h> - - /* - * OMAP2430-specific definitions diff --git a/usb.current/usb-revert-recovery-from-transient-errors.patch b/usb.current/usb-revert-recovery-from-transient-errors.patch deleted file mode 100644 index 662930ed6179b6..00000000000000 --- a/usb.current/usb-revert-recovery-from-transient-errors.patch +++ /dev/null @@ -1,109 +0,0 @@ -From stern@rowland.harvard.edu Tue Sep 23 13:20:45 2008 -From: Alan Stern <stern@rowland.harvard.edu> -Date: Mon, 22 Sep 2008 14:43:08 -0400 (EDT) -Subject: USB: revert recovery from transient errors -To: Greg KH <greg@kroah.com> -Cc: Frans Pop <elendil@planet.nl>, USB list <linux-usb@vger.kernel.org> -Message-ID: <Pine.LNX.4.44L0.0809221429350.2361-100000@iolanthe.rowland.org> - - -This patch (as1135) essentially reverts the major parts of two earlier -patches to usbcore, because they ended up causing a regression. - -Trying to recover from transient communication errors can lead to -other problems, because operations that failed during the error period -are not always retried. The simplest example is the initial -Set-Config request sent after device enumeration; if it gets lost then -it will not be retried and the device will remain unconfigured. - -This patch restores the old behavior in which any port disconnect or -port disable causes the entire device structure to be removed, fixing a -reported regression. - -Signed-off-by: Alan Stern <stern@rowland.harvard.edu> -Tested-by: Frans Pop <elendil@planet.nl> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - - ---- - drivers/usb/core/hub.c | 39 +++++++++++++++++---------------------- - 1 file changed, 17 insertions(+), 22 deletions(-) - ---- a/drivers/usb/core/hub.c -+++ b/drivers/usb/core/hub.c -@@ -2683,35 +2683,17 @@ static void hub_port_connect_change(stru - USB_PORT_STAT_C_ENABLE); - #endif - -- /* Try to use the debounce delay for protection against -- * port-enable changes caused, for example, by EMI. -- */ -- if (portchange & (USB_PORT_STAT_C_CONNECTION | -- USB_PORT_STAT_C_ENABLE)) { -- status = hub_port_debounce(hub, port1); -- if (status < 0) { -- if (printk_ratelimit()) -- dev_err (hub_dev, "connect-debounce failed, " -- "port %d disabled\n", port1); -- portstatus &= ~USB_PORT_STAT_CONNECTION; -- } else { -- portstatus = status; -- } -- } -- - /* Try to resuscitate an existing device */ - udev = hdev->children[port1-1]; - if ((portstatus & USB_PORT_STAT_CONNECTION) && udev && - udev->state != USB_STATE_NOTATTACHED) { -- - usb_lock_device(udev); - if (portstatus & USB_PORT_STAT_ENABLE) { - status = 0; /* Nothing to do */ -- } else if (!udev->persist_enabled) { -- status = -ENODEV; /* Mustn't resuscitate */ - - #ifdef CONFIG_USB_SUSPEND -- } else if (udev->state == USB_STATE_SUSPENDED) { -+ } else if (udev->state == USB_STATE_SUSPENDED && -+ udev->persist_enabled) { - /* For a suspended device, treat this as a - * remote wakeup event. - */ -@@ -2726,7 +2708,7 @@ static void hub_port_connect_change(stru - #endif - - } else { -- status = usb_reset_device(udev); -+ status = -ENODEV; /* Don't resuscitate */ - } - usb_unlock_device(udev); - -@@ -2741,6 +2723,19 @@ static void hub_port_connect_change(stru - usb_disconnect(&hdev->children[port1-1]); - clear_bit(port1, hub->change_bits); - -+ if (portchange & (USB_PORT_STAT_C_CONNECTION | -+ USB_PORT_STAT_C_ENABLE)) { -+ status = hub_port_debounce(hub, port1); -+ if (status < 0) { -+ if (printk_ratelimit()) -+ dev_err(hub_dev, "connect-debounce failed, " -+ "port %d disabled\n", port1); -+ portstatus &= ~USB_PORT_STAT_CONNECTION; -+ } else { -+ portstatus = status; -+ } -+ } -+ - /* Return now if debouncing failed or nothing is connected */ - if (!(portstatus & USB_PORT_STAT_CONNECTION)) { - -@@ -2748,7 +2743,7 @@ static void hub_port_connect_change(stru - if ((wHubCharacteristics & HUB_CHAR_LPSM) < 2 - && !(portstatus & (1 << USB_PORT_FEAT_POWER))) - set_port_feature(hdev, port1, USB_PORT_FEAT_POWER); -- -+ - if (portstatus & USB_PORT_STAT_ENABLE) - goto done; - return; diff --git a/usb.current/usb-serial-add-siemens-ef81-to-pl-2303-hack-triggers.patch b/usb.current/usb-serial-add-siemens-ef81-to-pl-2303-hack-triggers.patch deleted file mode 100644 index a2ba336eb0ed7e..00000000000000 --- a/usb.current/usb-serial-add-siemens-ef81-to-pl-2303-hack-triggers.patch +++ /dev/null @@ -1,32 +0,0 @@ -From andreas@infernal.debian.net Mon Sep 15 10:06:04 2008 -From: Andreas Bombe <andreas.bombe@mytum.de> -Date: Sun, 14 Sep 2008 01:58:55 +0200 -Subject: usb-serial: Add Siemens EF81 to PL-2303 hack triggers -To: Greg KH <greg@kroah.com> -Message-ID: <20080913235855.GA6655@infernal.debian.net> -Content-Disposition: inline - -From: Andreas Bombe <aeb@debian.org> - -This hardware needs the pl2303 hack in order to work properly :( - -Signed-off-by: Andreas Bombe <aeb@debian.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/serial/usb-serial.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - ---- a/drivers/usb/serial/usb-serial.c -+++ b/drivers/usb/serial/usb-serial.c -@@ -733,7 +733,9 @@ int usb_serial_probe(struct usb_interfac - ((le16_to_cpu(dev->descriptor.idVendor) == ATEN_VENDOR_ID) && - (le16_to_cpu(dev->descriptor.idProduct) == ATEN_PRODUCT_ID)) || - ((le16_to_cpu(dev->descriptor.idVendor) == ALCOR_VENDOR_ID) && -- (le16_to_cpu(dev->descriptor.idProduct) == ALCOR_PRODUCT_ID))) { -+ (le16_to_cpu(dev->descriptor.idProduct) == ALCOR_PRODUCT_ID)) || -+ ((le16_to_cpu(dev->descriptor.idVendor) == SIEMENS_VENDOR_ID) && -+ (le16_to_cpu(dev->descriptor.idProduct) == SIEMENS_PRODUCT_ID_EF81))) { - if (interface != dev->actconfig->interface[0]) { - /* check out the endpoints of the other interface*/ - iface_desc = dev->actconfig->interface[0]->cur_altsetting; diff --git a/usb.current/usb-serial-add-zte-cdma-tech-id-to-option-driver.patch b/usb.current/usb-serial-add-zte-cdma-tech-id-to-option-driver.patch deleted file mode 100644 index 85d8ae923279ef..00000000000000 --- a/usb.current/usb-serial-add-zte-cdma-tech-id-to-option-driver.patch +++ /dev/null @@ -1,34 +0,0 @@ -From otavio@ossystems.com.br Wed Sep 17 14:14:47 2008 -From: Otavio Salvador <otavio@ossystems.com.br> -Date: Wed, 17 Sep 2008 14:40:46 -0300 -Subject: USB: serial: add ZTE CDMA Tech id to option driver -To: gregkh@suse.de -Cc: linux-usb@vger.kernel.org, Otavio Salvador <otavio@ossystems.com.br> -Message-ID: <1221673246-3082-1-git-send-email-otavio@ossystems.com.br> - - -Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/serial/option.c | 2 ++ - 1 file changed, 2 insertions(+) - ---- a/drivers/usb/serial/option.c -+++ b/drivers/usb/serial/option.c -@@ -218,6 +218,7 @@ static int option_send_setup(struct tty - /* ZTE PRODUCTS */ - #define ZTE_VENDOR_ID 0x19d2 - #define ZTE_PRODUCT_MF628 0x0015 -+#define ZTE_PRODUCT_CDMA_TECH 0xfffe - - static struct usb_device_id option_ids[] = { - { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COLT) }, -@@ -347,6 +348,7 @@ static struct usb_device_id option_ids[] - { USB_DEVICE(MAXON_VENDOR_ID, 0x6280) }, /* BP3-USB & BP3-EXT HSDPA */ - { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_UC864E) }, - { USB_DEVICE(ZTE_VENDOR_ID, ZTE_PRODUCT_MF628) }, -+ { USB_DEVICE(ZTE_VENDOR_ID, ZTE_PRODUCT_CDMA_TECH) }, - { } /* Terminating entry */ - }; - MODULE_DEVICE_TABLE(usb, option_ids); diff --git a/usb.current/usb-serial-cp2101-add-device-ids.patch b/usb.current/usb-serial-cp2101-add-device-ids.patch deleted file mode 100644 index 0b661a155b5c26..00000000000000 --- a/usb.current/usb-serial-cp2101-add-device-ids.patch +++ /dev/null @@ -1,45 +0,0 @@ -From craig@microtron.org.uk Mon Sep 15 10:08:59 2008 -From: Craig Shelley <craig@microtron.org.uk> -Date: Thu, 4 Sep 2008 21:28:21 +0100 -Subject: USB: SERIAL CP2101 add device IDs -To: greg@kroah.com -Cc: linux-usb@vger.kernel.org, Craig Shelley <craig@microtron.org.uk> -Message-ID: <12205601012085-git-send-email-craig@microtron.org.uk> - - -From: Craig Shelley <craig@microtron.org.uk> - - -Signed-off-by: Craig Shelley <craig@microtron.org.uk> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/serial/cp2101.c | 3 +++ - 1 file changed, 3 insertions(+) - ---- a/drivers/usb/serial/cp2101.c -+++ b/drivers/usb/serial/cp2101.c -@@ -72,6 +72,7 @@ static struct usb_device_id id_table [] - { USB_DEVICE(0x10C4, 0x80CA) }, /* Degree Controls Inc */ - { USB_DEVICE(0x10C4, 0x80DD) }, /* Tracient RFID */ - { USB_DEVICE(0x10C4, 0x80F6) }, /* Suunto sports instrument */ -+ { USB_DEVICE(0x10C4, 0x8115) }, /* Arygon NFC/Mifare Reader */ - { USB_DEVICE(0x10C4, 0x813D) }, /* Burnside Telecom Deskmobile */ - { USB_DEVICE(0x10C4, 0x814A) }, /* West Mountain Radio RIGblaster P&P */ - { USB_DEVICE(0x10C4, 0x814B) }, /* West Mountain Radio RIGtalk */ -@@ -83,6 +84,7 @@ static struct usb_device_id id_table [] - { USB_DEVICE(0x10C4, 0x81E7) }, /* Aerocomm Radio */ - { USB_DEVICE(0x10C4, 0x8218) }, /* Lipowsky Industrie Elektronik GmbH, HARP-1 */ - { USB_DEVICE(0x10c4, 0x8293) }, /* Telegesys ETRX2USB */ -+ { USB_DEVICE(0x10C4, 0x8341) }, /* Siemens MC35PU GPRS Modem */ - { USB_DEVICE(0x10C4, 0xEA60) }, /* Silicon Labs factory default */ - { USB_DEVICE(0x10C4, 0xEA61) }, /* Silicon Labs factory default */ - { USB_DEVICE(0x10C4, 0xF001) }, /* Elan Digital Systems USBscope50 */ -@@ -93,6 +95,7 @@ static struct usb_device_id id_table [] - { USB_DEVICE(0x13AD, 0x9999) }, /* Baltech card reader */ - { USB_DEVICE(0x166A, 0x0303) }, /* Clipsal 5500PCU C-Bus USB interface */ - { USB_DEVICE(0x16D6, 0x0001) }, /* Jablotron serial interface */ -+ { USB_DEVICE(0x18EF, 0xE00F) }, /* ELV USB-I2C-Interface */ - { } /* Terminating Entry */ - }; - diff --git a/usb.current/usb-serial-sierra-add-mc8785-vid-pid.patch b/usb.current/usb-serial-sierra-add-mc8785-vid-pid.patch deleted file mode 100644 index c1deaf49f46046..00000000000000 --- a/usb.current/usb-serial-sierra-add-mc8785-vid-pid.patch +++ /dev/null @@ -1,30 +0,0 @@ -From klloyd@sierrawireless.com Wed Sep 17 14:15:42 2008 -From: Kevin Lloyd <klloyd@sierrawireless.com> -Date: Wed, 17 Sep 2008 09:03:38 -0700 -Subject: USB Serial: Sierra: Add MC8785 VID/PID -To: gregkh@suse.de, linux-usb@vger.kernel.org -Cc: klloyd@sierrawireless.com -Message-ID: <1221667418.27612.2.camel@linux-z60t> - - -From: Kevin Lloyd <klloyd@sierrawireless.com> - -Add another MC8785 VID/PID - -Signed-off-by: Kevin Lloyd <klloyd@sierrawireless.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/serial/sierra.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/drivers/usb/serial/sierra.c -+++ b/drivers/usb/serial/sierra.c -@@ -186,6 +186,7 @@ static struct usb_device_id id_table [] - { USB_DEVICE(0x1199, 0x6821) }, /* Sierra Wireless AirCard 875U */ - { USB_DEVICE(0x1199, 0x6832) }, /* Sierra Wireless MC8780 */ - { USB_DEVICE(0x1199, 0x6833) }, /* Sierra Wireless MC8781 */ -+ { USB_DEVICE(0x1199, 0x683A) }, /* Sierra Wireless MC8785 */ - { USB_DEVICE(0x1199, 0x683B) }, /* Sierra Wireless MC8785 Composite */ - { USB_DEVICE(0x1199, 0x683C) }, /* Sierra Wireless MC8790 */ - { USB_DEVICE(0x1199, 0x683D) }, /* Sierra Wireless MC8790 */ diff --git a/usb.current/usb-serial-sierra-device-addition-version-rev.patch b/usb.current/usb-serial-sierra-device-addition-version-rev.patch deleted file mode 100644 index a8277555fad977..00000000000000 --- a/usb.current/usb-serial-sierra-device-addition-version-rev.patch +++ /dev/null @@ -1,59 +0,0 @@ -From klloyd@sierrawireless.com Wed Aug 27 10:50:40 2008 -From: Kevin Lloyd <klloyd@sierrawireless.com> -Date: Mon, 25 Aug 2008 19:20:40 -0700 -Subject: USB Serial: Sierra: Device addition & version rev -To: gregkh@suse.de -Cc: linux-usb@vger.kernel.org, klloyd@sierrawireless.com -Message-ID: <48B36878.2060501@sierrawireless.com> - - -From: Kevin Lloyd <klloyd@sierrawireless.com> - -This patch adds devices to the sierra driver and rev's the driver version. - -Signed-off-by: Kevin Lloyd <klloyd@sierrawireless.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/serial/sierra.c | 9 +++++---- - 1 file changed, 5 insertions(+), 4 deletions(-) - ---- a/drivers/usb/serial/sierra.c -+++ b/drivers/usb/serial/sierra.c -@@ -14,7 +14,7 @@ - Whom based his on the Keyspan driver by Hugh Blemings <hugh@blemings.org> - */ - --#define DRIVER_VERSION "v.1.2.13a" -+#define DRIVER_VERSION "v.1.3.2" - #define DRIVER_AUTHOR "Kevin Lloyd <klloyd@sierrawireless.com>" - #define DRIVER_DESC "USB Driver for Sierra Wireless USB modems" - -@@ -30,9 +30,6 @@ - - #define SWIMS_USB_REQUEST_SetPower 0x00 - #define SWIMS_USB_REQUEST_SetNmea 0x07 --#define SWIMS_USB_REQUEST_SetMode 0x0B --#define SWIMS_USB_REQUEST_GetSwocInfo 0x0A --#define SWIMS_SET_MODE_Modem 0x0001 - - /* per port private data */ - #define N_IN_URB 4 -@@ -175,6 +172,8 @@ static struct usb_device_id id_table [] - /* Sierra Wireless Device */ - { USB_DEVICE_AND_INTERFACE_INFO(0x1199, 0x0025, 0xFF, 0xFF, 0xFF) }, - { USB_DEVICE(0x1199, 0x0026) }, /* Sierra Wireless Device */ -+ { USB_DEVICE(0x1199, 0x0027) }, /* Sierra Wireless Device */ -+ { USB_DEVICE(0x1199, 0x0028) }, /* Sierra Wireless Device */ - - { USB_DEVICE(0x1199, 0x6802) }, /* Sierra Wireless MC8755 */ - { USB_DEVICE(0x1199, 0x6804) }, /* Sierra Wireless MC8755 */ -@@ -204,6 +203,8 @@ static struct usb_device_id id_table [] - /* Sierra Wireless Device */ - { USB_DEVICE_AND_INTERFACE_INFO(0x1199, 0x6890, 0xFF, 0xFF, 0xFF)}, - /* Sierra Wireless Device */ -+ { USB_DEVICE_AND_INTERFACE_INFO(0x1199, 0x6891, 0xFF, 0xFF, 0xFF)}, -+ /* Sierra Wireless Device */ - { USB_DEVICE_AND_INTERFACE_INFO(0x1199, 0x6892, 0xFF, 0xFF, 0xFF)}, - - { USB_DEVICE(0x1199, 0x0112) }, /* Sierra Wireless AirCard 580 */ diff --git a/usb.current/usb-serial-ti_usb_3410_5052-obviously-broken-by-firmware-changes.patch b/usb.current/usb-serial-ti_usb_3410_5052-obviously-broken-by-firmware-changes.patch deleted file mode 100644 index e63b37ce6850d6..00000000000000 --- a/usb.current/usb-serial-ti_usb_3410_5052-obviously-broken-by-firmware-changes.patch +++ /dev/null @@ -1,36 +0,0 @@ -From akpm@linux-foundation.org Mon Sep 15 10:12:27 2008 -From: Chris Adams <cmadams@hiwaay.net> -Date: Wed, 10 Sep 2008 14:11:38 -0700 -Subject: usb serial: ti_usb_3410_5052 obviously broken by firmware changes -To: mm-commits@vger.kernel.org -Cc: cmadams@hiwaay.net, greg@kroah.com -Message-ID: <200809102111.m8ALBco5026392@imap1.linux-foundation.org> - -From: Chris Adams <cmadams@hiwaay.net> - -While making some other changes to ti_usb_3410_5052, I noticed that the -changes made to move the firmware loading to a separate function are -broken (in ti_download_firmware(), status is set to -ENOMEM and never -changed). This means the driver will never initialize the device -properly. It looks like status was supposed to get the result of -ti_do_download(). - -Signed-off-by: Chris Adams <cmadams@hiwaay.net> -Signed-off-by: Andrew Morton <akpm@linux-foundation.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/serial/ti_usb_3410_5052.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/usb/serial/ti_usb_3410_5052.c -+++ b/drivers/usb/serial/ti_usb_3410_5052.c -@@ -1744,7 +1744,7 @@ static int ti_download_firmware(struct t - if (buffer) { - memcpy(buffer, fw_p->data, fw_p->size); - memset(buffer + fw_p->size, 0xff, buffer_size - fw_p->size); -- ti_do_download(dev, pipe, buffer, fw_p->size); -+ status = ti_do_download(dev, pipe, buffer, fw_p->size); - kfree(buffer); - } - release_firmware(fw_p); diff --git a/usb.current/usb-storage-sierra-non-configurable-tru-install.patch b/usb.current/usb-storage-sierra-non-configurable-tru-install.patch deleted file mode 100644 index 88ba751da78272..00000000000000 --- a/usb.current/usb-storage-sierra-non-configurable-tru-install.patch +++ /dev/null @@ -1,89 +0,0 @@ -From klloyd@sierrawireless.com Wed Aug 27 10:49:37 2008 -From: Kevin Lloyd <klloyd@sierrawireless.com> -Date: Tue, 26 Aug 2008 18:30:45 -0700 -Subject: USB Storage: Sierra: Non-configurable TRU-Install -To: gregkh@suse.de -Cc: linux-usb@vger.kernel.org, klloyd@sierrawireless.com -Message-ID: <48B4AE45.5030008@sierrawireless.com> - - -From: Kevin Lloyd <klloyd@sierrawireless.com> - -This patch alters the Sierra Mass Storage patch so that it is non-configurable. - -Signed-off-by: Kevin Lloyd <klloyd@sierrawireless.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/storage/Kconfig | 12 ------------ - drivers/usb/storage/Makefile | 3 +-- - drivers/usb/storage/unusual_devs.h | 2 -- - drivers/usb/storage/usb.c | 2 -- - 4 files changed, 1 insertion(+), 18 deletions(-) - ---- a/drivers/usb/storage/Kconfig -+++ b/drivers/usb/storage/Kconfig -@@ -146,18 +146,6 @@ config USB_STORAGE_KARMA - on the resulting scsi device node returns the Karma to normal - operation. - --config USB_STORAGE_SIERRA -- bool "Sierra Wireless TRU-Install Feature Support" -- depends on USB_STORAGE -- help -- Say Y here to include additional code to support Sierra Wireless -- products with the TRU-Install feature (e.g., AC597E, AC881U). -- -- This code switches the Sierra Wireless device from being in -- Mass Storage mode to Modem mode. It also has the ability to -- support host software upgrades should full Linux support be added -- to TRU-Install. -- - config USB_STORAGE_CYPRESS_ATACB - bool "SAT emulation on Cypress USB/ATA Bridge with ATACB" - depends on USB_STORAGE ---- a/drivers/usb/storage/Makefile -+++ b/drivers/usb/storage/Makefile -@@ -21,11 +21,10 @@ usb-storage-obj-$(CONFIG_USB_STORAGE_JUM - usb-storage-obj-$(CONFIG_USB_STORAGE_ALAUDA) += alauda.o - usb-storage-obj-$(CONFIG_USB_STORAGE_ONETOUCH) += onetouch.o - usb-storage-obj-$(CONFIG_USB_STORAGE_KARMA) += karma.o --usb-storage-obj-$(CONFIG_USB_STORAGE_SIERRA) += sierra_ms.o - usb-storage-obj-$(CONFIG_USB_STORAGE_CYPRESS_ATACB) += cypress_atacb.o - - usb-storage-objs := scsiglue.o protocol.o transport.o usb.o \ -- initializers.o $(usb-storage-obj-y) -+ initializers.o sierra_ms.o $(usb-storage-obj-y) - - ifneq ($(CONFIG_USB_LIBUSUAL),) - obj-$(CONFIG_USB) += libusual.o ---- a/drivers/usb/storage/unusual_devs.h -+++ b/drivers/usb/storage/unusual_devs.h -@@ -1576,7 +1576,6 @@ UNUSUAL_DEV( 0x10d6, 0x2200, 0x0100, 0x - US_SC_DEVICE, US_PR_DEVICE, NULL, - 0), - --#ifdef CONFIG_USB_STORAGE_SIERRA - /* Reported by Kevin Lloyd <linux@sierrawireless.com> - * Entry is needed for the initializer function override, - * which instructs the device to load as a modem -@@ -1587,7 +1586,6 @@ UNUSUAL_DEV( 0x1199, 0x0fff, 0x0000, 0x - "USB MMC Storage", - US_SC_DEVICE, US_PR_DEVICE, sierra_ms_init, - 0), --#endif - - /* Reported by Jaco Kroon <jaco@kroon.co.za> - * The usb-storage module found on the Digitech GNX4 (and supposedly other ---- a/drivers/usb/storage/usb.c -+++ b/drivers/usb/storage/usb.c -@@ -102,9 +102,7 @@ - #ifdef CONFIG_USB_STORAGE_CYPRESS_ATACB - #include "cypress_atacb.h" - #endif --#ifdef CONFIG_USB_STORAGE_SIERRA - #include "sierra_ms.h" --#endif - - /* Some informational data */ - MODULE_AUTHOR("Matthew Dharm <mdharm-usb@one-eyed-alien.net>"); diff --git a/usb.current/usb-unusual-devs-patch-for-nokia-5310-music-xpress.patch b/usb.current/usb-unusual-devs-patch-for-nokia-5310-music-xpress.patch deleted file mode 100644 index fe0006a4677194..00000000000000 --- a/usb.current/usb-unusual-devs-patch-for-nokia-5310-music-xpress.patch +++ /dev/null @@ -1,39 +0,0 @@ -From akpm@linux-foundation.org Tue Sep 23 13:19:08 2008 -From: David Almaroad <dalmaroad@gmail.com> -Date: Mon, 22 Sep 2008 15:00:11 -0700 -Subject: usb: unusual devs patch for Nokia 5310 Music Xpress -To: greg@kroah.com -Cc: linux-usb@vger.kernel.org, akpm@linux-foundation.org, dalmaroad@gmail.com, mdharm-usb@one-eyed-alien.net -Message-ID: <200809222200.m8MM0B3e032607@imap1.linux-foundation.org> - - -From: David Almaroad <dalmaroad@gmail.com> - -The Nokia 5310 Music Xpress phone reports one too many sectors in -usb-storage mode. This patch resolves that. - -Signed-off-by: David Almaroad <dalmaroad@gmail.com> -Cc: Matthew Dharm <mdharm-usb@one-eyed-alien.net> -Signed-off-by: Andrew Morton <akpm@linux-foundation.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/storage/unusual_devs.h | 7 +++++++ - 1 file changed, 7 insertions(+) - ---- a/drivers/usb/storage/unusual_devs.h -+++ b/drivers/usb/storage/unusual_devs.h -@@ -246,6 +246,13 @@ UNUSUAL_DEV( 0x0421, 0x04fa, 0x0601, 0x - US_SC_DEVICE, US_PR_DEVICE, NULL, - US_FL_FIX_CAPACITY ), - -+/* Patch for Nokia 5310 capacity */ -+UNUSUAL_DEV( 0x0421, 0x006a, 0x0000, 0x0591, -+ "Nokia", -+ "5310", -+ US_SC_DEVICE, US_PR_DEVICE, NULL, -+ US_FL_FIX_CAPACITY ), -+ - /* Reported by Olaf Hering <olh@suse.de> from novell bug #105878 */ - UNUSUAL_DEV( 0x0424, 0x0fdc, 0x0210, 0x0210, - "SMSC", diff --git a/usb.current/usb-unusual_devs-addition-for-rockchip-mp3-player.patch b/usb.current/usb-unusual_devs-addition-for-rockchip-mp3-player.patch deleted file mode 100644 index 712beef5c6e5e1..00000000000000 --- a/usb.current/usb-unusual_devs-addition-for-rockchip-mp3-player.patch +++ /dev/null @@ -1,36 +0,0 @@ -From stern+48acf28e@rowland.harvard.edu Mon Sep 15 10:09:28 2008 -From: Alan Stern <stern@rowland.harvard.edu> -Date: Thu, 4 Sep 2008 09:56:35 -0400 (EDT) -Subject: USB: unusual_devs addition for RockChip MP3 player -To: Greg KH <greg@kroah.com>, Phil Dibowitz <phil@ipom.com> -Cc: Adrian Pilchowiec <adi1981@epf.pl>, USB Storage list <usb-storage@lists.one-eyed-alien.net> -Message-ID: <Pine.LNX.4.44L0.0809040954490.2474-100000@iolanthe.rowland.org> - - -This patch (as1136) adds an unusual_devs entry for a version of the -RockChip MP3 player which can't handle the MODE SENSE command used for -write-protect detection. - -Signed-off-by: Alan Stern <stern@rowland.harvard.edu> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/storage/unusual_devs.h | 7 +++++++ - 1 file changed, 7 insertions(+) - ---- a/drivers/usb/storage/unusual_devs.h -+++ b/drivers/usb/storage/unusual_devs.h -@@ -1001,6 +1001,13 @@ UNUSUAL_DEV( 0x069b, 0x3004, 0x0001, 0x - US_SC_DEVICE, US_PR_DEVICE, NULL, - US_FL_FIX_CAPACITY ), - -+/* Reported by Adrian Pilchowiec <adi1981@epf.pl> */ -+UNUSUAL_DEV( 0x071b, 0x3203, 0x0000, 0x0000, -+ "RockChip", -+ "MP3", -+ US_SC_DEVICE, US_PR_DEVICE, NULL, -+ US_FL_NO_WP_DETECT | US_FL_MAX_SECTORS_64), -+ - /* Reported by Massimiliano Ghilardi <massimiliano.ghilardi@gmail.com> - * This USB MP3/AVI player device fails and disconnects if more than 128 - * sectors (64kB) are read/written in a single command, and may be present diff --git a/usb.current/usb-update-of-documentation-usb-anchors.txt.patch b/usb.current/usb-update-of-documentation-usb-anchors.txt.patch deleted file mode 100644 index e17bbe1e704899..00000000000000 --- a/usb.current/usb-update-of-documentation-usb-anchors.txt.patch +++ /dev/null @@ -1,43 +0,0 @@ -From oliver@neukum.org Wed Sep 3 11:17:05 2008 -From: Oliver Neukum <oliver@neukum.org> -Date: Tue, 2 Sep 2008 10:52:08 +0200 -Subject: USB: update of Documentation/usb/anchors.txt -To: greg@kroah.com -Cc: linux-usb@vger.kernel.org -Message-ID: <200809021052.08650.oliver@neukum.org> -Content-Disposition: inline - - -The extended anchor API is documented - -Signed-off-by: Oliver Neukum <oneukum@suse.de> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - Documentation/usb/anchors.txt | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - ---- a/Documentation/usb/anchors.txt -+++ b/Documentation/usb/anchors.txt -@@ -42,9 +42,21 @@ This function kills all URBs associated - are called in the reverse temporal order they were submitted. - This way no data can be reordered. - -+usb_unlink_anchored_urbs() -+-------------------------- -+ -+This function unlinks all URBs associated with an anchor. The URBs -+are processed in the reverse temporal order they were submitted. -+This is similar to usb_kill_anchored_urbs(), but it will not sleep. -+Therefore no guarantee is made that the URBs have been unlinked when -+the call returns. They may be unlinked later but will be unlinked in -+finite time. -+ - usb_wait_anchor_empty_timeout() - ------------------------------- - - This function waits for all URBs associated with an anchor to finish - or a timeout, whichever comes first. Its return value will tell you - whether the timeout was reached. -+ -+ diff --git a/usb/hso-dev_kfree_skb-crash-fix.patch b/usb/hso-dev_kfree_skb-crash-fix.patch deleted file mode 100644 index 858063b349001d..00000000000000 --- a/usb/hso-dev_kfree_skb-crash-fix.patch +++ /dev/null @@ -1,28 +0,0 @@ -From D.Barow@option.com Tue Aug 19 17:52:26 2008 -From: Denis Joseph Barrow <D.Barow@option.com> -Date: Mon, 18 Aug 2008 11:42:00 +0200 -Subject: hso: dev_kfree_skb crash fix -To: Linux USB kernel mailing list <linux-usb@vger.kernel.org> -Message-ID: <48A943E8.6090202@option.com> - -Fixes dev_kfree_skb happening too many times when hso_start_net_device -is called from hso_resume. - -Signed-off-by: Denis Joseph Barrow <D.Barow@option.com> -Cc: Jeff Garzik <jgarzik@pobox.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/net/usb/hso.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/drivers/net/usb/hso.c -+++ b/drivers/net/usb/hso.c -@@ -2613,6 +2613,7 @@ static int hso_resume(struct usb_interfa - "Transmitting lingering data\n"); - hso_net_start_xmit(hso_net->skb_tx_buf, - hso_net->net); -+ hso_net->skb_tx_buf = NULL; - } - result = hso_start_net_device(network_table[i]); - if (result) diff --git a/usb/hso-icon-322-detection-fix.patch b/usb/hso-icon-322-detection-fix.patch deleted file mode 100644 index 7b82040f03ef19..00000000000000 --- a/usb/hso-icon-322-detection-fix.patch +++ /dev/null @@ -1,28 +0,0 @@ -From linux-usb-owner@vger.kernel.org Mon Aug 18 04:04:11 2008 -From: Denis Joseph Barrow <D.Barow@option.com> -Date: Mon, 18 Aug 2008 13:00:41 +0200 -Subject: hso: icon 322 detection fix -To: Linux USB kernel mailing list <linux-usb@vger.kernel.org> -Message-ID: <48A95659.5030108@option.com> - -Fixes Icon-322 detection. - -Signed-off-by: Denis Joseph Barrow <D.Barow@option.com> -Cc: Jeff Garzik <jgarzik@pobox.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/net/usb/hso.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/net/usb/hso.c -+++ b/drivers/net/usb/hso.c -@@ -397,7 +397,7 @@ static const struct usb_device_id hso_id - {default_port_device(0x0af0, 0xc031)}, /* Icon-Edge */ - {icon321_port_device(0x0af0, 0xd013)}, /* Module HSxPA */ - {icon321_port_device(0x0af0, 0xd031)}, /* Icon-321 */ -- {default_port_device(0x0af0, 0xd033)}, /* Icon-322 */ -+ {icon321_port_device(0x0af0, 0xd033)}, /* Icon-322 */ - {USB_DEVICE(0x0af0, 0x7301)}, /* GE40x */ - {USB_DEVICE(0x0af0, 0x7361)}, /* GE40x */ - {USB_DEVICE(0x0af0, 0x7401)}, /* GI 0401 */ diff --git a/usb/usb-add-config_usb_debug_messages-and-usb_dbg.patch b/usb/usb-add-config_usb_debug_messages-and-usb_dbg.patch deleted file mode 100644 index d1d65a4ec98ac3..00000000000000 --- a/usb/usb-add-config_usb_debug_messages-and-usb_dbg.patch +++ /dev/null @@ -1,104 +0,0 @@ -Date: Fri, 08 Aug 2008 14:38:31 -0700 -To: Greg KH <greg@kroah.com> -From: Greg Kroah-Hartman <gregkh@suse.de> -Subject: USB: add CONFIG_USB_DEBUG_MESSAGES and usb_dbg() - -This adds the core function usb_dbg() and a new config option to enable -this. - -It can only be disabled if CONFIG_EMBEDDED is set. - -It allows the usb core debugging messages to be enabled/disabled on the -fly with the usbcore "debug" module parameter. - -Note, other sections of the kernel rely on CONFIG_USB_DEBUG, they will -also need to be converted. - -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/core/Kconfig | 14 ++++++++++++++ - drivers/usb/core/usb.c | 12 ++++++++++-- - drivers/usb/core/usb.h | 14 ++++++++++++++ - 3 files changed, 38 insertions(+), 2 deletions(-) - ---- a/drivers/usb/core/Kconfig -+++ b/drivers/usb/core/Kconfig -@@ -9,6 +9,20 @@ config USB_DEBUG - of debug messages to the system log. Select this if you are having a - problem with USB support and want to see more of what is going on. - -+config USB_DEBUG_MESSAGES -+ bool -+ prompt "USB debugging messages" if EMBEDDED -+ depends on USB -+ default y -+ help -+ Say Y here if you want the USB core & hub drivers to be able to -+ produce debugging messages if needed. The messages can be -+ enabled or disabled with the usbcore.debug module parameter. -+ This option just allows you to save a bit of space if you do not -+ want them to even be built into the kernel. -+ -+ If you have any doubts about this, say Y here. -+ - config USB_ANNOUNCE_NEW_DEVICES - bool "USB announce new devices" - depends on USB ---- a/drivers/usb/core/usb.c -+++ b/drivers/usb/core/usb.c -@@ -61,6 +61,14 @@ MODULE_PARM_DESC(autosuspend, "default a - #define usb_autosuspend_delay 0 - #endif - -+/* USB debugging */ -+#if defined(CONFIG_USB_DEBUG_MESSAGES) -+int usb_debug; -+EXPORT_SYMBOL_GPL(usb_debug); -+ -+module_param_named(debug, usb_debug, bool, 0644); -+MODULE_PARM_DESC(debug, "USB debugging enabled or not"); -+#endif - - /** - * usb_ifnum_to_if - get the interface object with a given interface number -@@ -502,14 +510,14 @@ static struct usb_device *match_device(s - struct usb_device *ret_dev = NULL; - int child; - -- dev_dbg(&dev->dev, "check for vendor %04x, product %04x ...\n", -+ usb_dbg(&dev->dev, "check for vendor %04x, product %04x ...\n", - le16_to_cpu(dev->descriptor.idVendor), - le16_to_cpu(dev->descriptor.idProduct)); - - /* see if this device matches */ - if ((vendor_id == le16_to_cpu(dev->descriptor.idVendor)) && - (product_id == le16_to_cpu(dev->descriptor.idProduct))) { -- dev_dbg(&dev->dev, "matched this device!\n"); -+ usb_dbg(&dev->dev, "matched this device!\n"); - ret_dev = usb_get_dev(dev); - goto exit; - } ---- a/drivers/usb/core/usb.h -+++ b/drivers/usb/core/usb.h -@@ -132,6 +132,20 @@ static inline int is_active(const struct - /* for labeling diagnostics */ - extern const char *usbcore_name; - -+/* USB debugging */ -+#if defined(CONFIG_USB_DEBUG_MESSAGES) -+extern int usb_debug; -+#else -+#define usb_debug 0 -+#endif -+ -+#define usb_dbg(dev, format, arg...) \ -+ do { \ -+ if (usb_debug) \ -+ dev_printk(KERN_DEBUG , dev , format , ## arg); \ -+ } while (0) -+ -+ - /* sysfs stuff */ - extern struct attribute_group *usb_device_groups[]; - extern struct attribute_group *usb_interface_groups[]; diff --git a/usb/usb-convert-the-usb-core-code-to-use-usb_dbg.patch b/usb/usb-convert-the-usb-core-code-to-use-usb_dbg.patch deleted file mode 100644 index ea342de83fb4b4..00000000000000 --- a/usb/usb-convert-the-usb-core-code-to-use-usb_dbg.patch +++ /dev/null @@ -1,1154 +0,0 @@ -Date: Fri, 08 Aug 2008 14:38:31 -0700 -To: Greg KH <greg@kroah.com> -From: Greg Kroah-Hartman <gregkh@suse.de> -Subject: USB: convert the USB core code to use usb_dbg() - -It's a plug-in replacement for dev_dbg() and it lets you turn it on or -off based on the usbcore debug parameter. - -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/core/config.c | 6 - - drivers/usb/core/devio.c | 2 - drivers/usb/core/driver.c | 25 ++++--- - drivers/usb/core/hcd-pci.c | 24 +++--- - drivers/usb/core/hcd.c | 34 +++++---- - drivers/usb/core/hub.c | 160 ++++++++++++++++++++++----------------------- - drivers/usb/core/message.c | 18 ++--- - drivers/usb/core/quirks.c | 2 - drivers/usb/core/urb.c | 3 - 9 files changed, 142 insertions(+), 132 deletions(-) - ---- a/drivers/usb/core/config.c -+++ b/drivers/usb/core/config.c -@@ -169,7 +169,7 @@ static int usb_parse_endpoint(struct dev - USB_DT_INTERFACE, &n); - endpoint->extralen = i; - if (n > 0) -- dev_dbg(ddev, "skipped %d descriptor%s after %s\n", -+ usb_dbg(ddev, "skipped %d descriptor%s after %s\n", - n, plural(n), "endpoint"); - return buffer - buffer0 + i; - -@@ -248,7 +248,7 @@ static int usb_parse_interface(struct de - USB_DT_INTERFACE, &n); - alt->extralen = i; - if (n > 0) -- dev_dbg(ddev, "skipped %d descriptor%s after %s\n", -+ usb_dbg(ddev, "skipped %d descriptor%s after %s\n", - n, plural(n), "interface"); - buffer += i; - size -= i; -@@ -459,7 +459,7 @@ static int usb_parse_configuration(struc - USB_DT_INTERFACE, &n); - config->extralen = i; - if (n > 0) -- dev_dbg(ddev, "skipped %d descriptor%s after %s\n", -+ usb_dbg(ddev, "skipped %d descriptor%s after %s\n", - n, plural(n), "configuration"); - buffer += i; - size -= i; ---- a/drivers/usb/core/devio.c -+++ b/drivers/usb/core/devio.c -@@ -1462,7 +1462,7 @@ static int proc_ioctl(struct dev_state * - case USBDEVFS_DISCONNECT: - if (intf->dev.driver) { - driver = to_usb_driver(intf->dev.driver); -- dev_dbg(&intf->dev, "disconnect by usbfs\n"); -+ usb_dbg(&intf->dev, "disconnect by usbfs\n"); - usb_driver_release_interface(driver, intf); - } else - retval = -ENODATA; ---- a/drivers/usb/core/driver.c -+++ b/drivers/usb/core/driver.c -@@ -157,7 +157,7 @@ static int usb_probe_device(struct devic - struct usb_device *udev; - int error = -ENODEV; - -- dev_dbg(dev, "%s\n", __func__); -+ usb_dbg(dev, "%s\n", __func__); - - if (!is_usb_device(dev)) /* Sanity check */ - return error; -@@ -194,7 +194,7 @@ static int usb_probe_interface(struct de - const struct usb_device_id *id; - int error = -ENODEV; - -- dev_dbg(dev, "%s\n", __func__); -+ usb_dbg(dev, "%s\n", __func__); - - if (is_usb_device(dev)) /* Sanity check */ - return error; -@@ -212,7 +212,7 @@ static int usb_probe_interface(struct de - if (!id) - id = usb_match_dynamic_id(intf, driver); - if (id) { -- dev_dbg(dev, "%s - got id\n", __func__); -+ usb_dbg(dev, "%s - got id\n", __func__); - - error = usb_autoresume_device(udev); - if (error) -@@ -588,8 +588,9 @@ static int usb_uevent(struct device *dev - { - struct usb_device *usb_dev; - -- /* driver is often null here; dev_dbg() would oops */ -- pr_debug("usb %s: uevent\n", dev_name(dev)); -+ /* driver is often null here; usb_dbg() would oops */ -+ if (usb_debug) -+ printk(KERN_DEBUG "usb %s: uevent\n", dev_name(dev)); - - if (is_usb_device(dev)) - usb_dev = to_usb_device(dev); -@@ -599,11 +600,15 @@ static int usb_uevent(struct device *dev - } - - if (usb_dev->devnum < 0) { -- pr_debug("usb %s: already deleted?\n", dev_name(dev)); -+ if (usb_debug) -+ printk(KERN_DEBUG "usb %s: already deleted?\n", -+ dev_name(dev)); - return -ENODEV; - } - if (!usb_dev->bus) { -- pr_debug("usb %s: bus removed?\n", dev_name(dev)); -+ if (usb_debug) -+ printk(KERN_DEBUG "usb %s: bus removed?\n", -+ dev_name(dev)); - return -ENODEV; - } - -@@ -785,7 +790,7 @@ void usb_forced_unbind_intf(struct usb_i - { - struct usb_driver *driver = to_usb_driver(intf->dev.driver); - -- dev_dbg(&intf->dev, "forced unbind\n"); -+ usb_dbg(&intf->dev, "forced unbind\n"); - usb_driver_release_interface(driver, intf); - - /* Mark the interface for later rebinding */ -@@ -809,7 +814,7 @@ void usb_rebind_intf(struct usb_interfac - struct usb_driver *driver = - to_usb_driver(intf->dev.driver); - -- dev_dbg(&intf->dev, "forced unbind\n"); -+ usb_dbg(&intf->dev, "forced unbind\n"); - usb_driver_release_interface(driver, intf); - } - -@@ -1044,7 +1049,7 @@ static int autosuspend_check(struct usb_ - return -EBUSY; - if (intf->needs_remote_wakeup && - !udev->do_remote_wakeup) { -- dev_dbg(&udev->dev, "remote wakeup needed " -+ usb_dbg(&udev->dev, "remote wakeup needed " - "for autosuspend\n"); - return -EOPNOTSUPP; - } ---- a/drivers/usb/core/hcd.c -+++ b/drivers/usb/core/hcd.c -@@ -466,7 +466,7 @@ static int rh_call_control (struct usb_h - break; - case DeviceOutRequest | USB_REQ_SET_ADDRESS: - // wValue == urb->dev->devaddr -- dev_dbg (hcd->self.controller, "root hub device address %d\n", -+ usb_dbg (hcd->self.controller, "root hub device address %d\n", - wValue); - break; - -@@ -482,7 +482,7 @@ static int rh_call_control (struct usb_h - /* FALLTHROUGH */ - case EndpointOutRequest | USB_REQ_CLEAR_FEATURE: - case EndpointOutRequest | USB_REQ_SET_FEATURE: -- dev_dbg (hcd->self.controller, "no endpoint features yet\n"); -+ usb_dbg (hcd->self.controller, "no endpoint features yet\n"); - break; - - /* CLASS REQUESTS (and errors) */ -@@ -510,7 +510,7 @@ error: - if (status) { - len = 0; - if (status != -EPIPE) { -- dev_dbg (hcd->self.controller, -+ usb_dbg (hcd->self.controller, - "CTRL: TypeReq=0x%x val=0x%x " - "idx=0x%x len=%d ==> %d\n", - typeReq, wValue, wIndex, -@@ -626,7 +626,7 @@ static int rh_queue_status (struct usb_h - - spin_lock_irqsave (&hcd_root_hub_lock, flags); - if (hcd->status_urb || urb->transfer_buffer_length < len) { -- dev_dbg (hcd->self.controller, "not queuing rh status urb\n"); -+ usb_dbg (hcd->self.controller, "not queuing rh status urb\n"); - retval = -EINVAL; - goto done; - } -@@ -898,7 +898,7 @@ static int register_root_hub(struct usb_ - retval = usb_get_device_descriptor(usb_dev, USB_DT_DEVICE_SIZE); - if (retval != sizeof usb_dev->descriptor) { - mutex_unlock(&usb_bus_list_lock); -- dev_dbg (parent_dev, "can't read %s device descriptor %d\n", -+ usb_dbg (parent_dev, "can't read %s device descriptor %d\n", - dev_name(&usb_dev->dev), retval); - return (retval < 0) ? retval : -EMSGSIZE; - } -@@ -975,7 +975,9 @@ long usb_calc_bus_time (int speed, int i - tmp = HS_NSECS (bytecount); - return tmp; - default: -- pr_debug ("%s: bogus device speed!\n", usbcore_name); -+ if (usb_debug) -+ printk(KERN_DEBUG "%s: bogus device speed!\n", -+ usbcore_name); - return -1; - } - } -@@ -1389,7 +1391,7 @@ int usb_hcd_unlink_urb (struct urb *urb, - if (retval == 0) - retval = -EINPROGRESS; - else if (retval != -EIDRM && retval != -EBUSY) -- dev_dbg(&urb->dev->dev, "hcd_unlink_urb %p fail %d\n", -+ usb_dbg(&urb->dev->dev, "hcd_unlink_urb %p fail %d\n", - urb, retval); - return retval; - } -@@ -1468,7 +1470,7 @@ rescan: - - /* kick hcd */ - unlink1(hcd, urb, -ESHUTDOWN); -- dev_dbg (hcd->self.controller, -+ usb_dbg (hcd->self.controller, - "shutdown urb %p ep%d%s%s\n", - urb, usb_endpoint_num(&ep->desc), - is_in ? "in" : "out", -@@ -1555,7 +1557,7 @@ int hcd_bus_suspend(struct usb_device *r - int status; - int old_state = hcd->state; - -- dev_dbg(&rhdev->dev, "bus %s%s\n", -+ usb_dbg(&rhdev->dev, "bus %s%s\n", - rhdev->auto_pm ? "auto-" : "", "suspend"); - if (!hcd->driver->bus_suspend) { - status = -ENOENT; -@@ -1568,7 +1570,7 @@ int hcd_bus_suspend(struct usb_device *r - hcd->state = HC_STATE_SUSPENDED; - } else { - hcd->state = old_state; -- dev_dbg(&rhdev->dev, "bus %s fail, err %d\n", -+ usb_dbg(&rhdev->dev, "bus %s fail, err %d\n", - "suspend", status); - } - return status; -@@ -1580,7 +1582,7 @@ int hcd_bus_resume(struct usb_device *rh - int status; - int old_state = hcd->state; - -- dev_dbg(&rhdev->dev, "usb %s%s\n", -+ usb_dbg(&rhdev->dev, "usb %s%s\n", - rhdev->auto_pm ? "auto-" : "", "resume"); - if (!hcd->driver->bus_resume) - return -ENOENT; -@@ -1598,7 +1600,7 @@ int hcd_bus_resume(struct usb_device *rh - hcd->state = HC_STATE_RUNNING; - } else { - hcd->state = old_state; -- dev_dbg(&rhdev->dev, "bus %s fail, err %d\n", -+ usb_dbg(&rhdev->dev, "bus %s fail, err %d\n", - "resume", status); - if (status != -ESHUTDOWN) - usb_hc_died(hcd); -@@ -1769,7 +1771,7 @@ struct usb_hcd *usb_create_hcd (const st - - hcd = kzalloc(sizeof(*hcd) + driver->hcd_priv_size, GFP_KERNEL); - if (!hcd) { -- dev_dbg (dev, "hcd alloc failed\n"); -+ usb_dbg (dev, "hcd alloc failed\n"); - return NULL; - } - dev_set_drvdata(dev, hcd); -@@ -1842,7 +1844,7 @@ int usb_add_hcd(struct usb_hcd *hcd, - * starts talking to them. (Note, bus id is assigned early too.) - */ - if ((retval = hcd_buffer_create(hcd)) != 0) { -- dev_dbg(hcd->self.controller, "pool alloc failed\n"); -+ usb_dbg(hcd->self.controller, "pool alloc failed\n"); - return retval; - } - -@@ -1875,7 +1877,7 @@ int usb_add_hcd(struct usb_hcd *hcd, - /* NOTE: root hub and controller capabilities may not be the same */ - if (device_can_wakeup(hcd->self.controller) - && device_can_wakeup(&hcd->self.root_hub->dev)) -- dev_dbg(hcd->self.controller, "supports USB remote wakeup\n"); -+ usb_dbg(hcd->self.controller, "supports USB remote wakeup\n"); - - /* enable irqs just before we start the controller */ - if (hcd->driver->irq) { -@@ -1964,7 +1966,7 @@ void usb_remove_hcd(struct usb_hcd *hcd) - if (HC_IS_RUNNING (hcd->state)) - hcd->state = HC_STATE_QUIESCING; - -- dev_dbg(hcd->self.controller, "roothub graceful disconnect\n"); -+ usb_dbg(hcd->self.controller, "roothub graceful disconnect\n"); - spin_lock_irq (&hcd_root_hub_lock); - hcd->rh_registered = 0; - spin_unlock_irq (&hcd_root_hub_lock); ---- a/drivers/usb/core/hcd-pci.c -+++ b/drivers/usb/core/hcd-pci.c -@@ -94,13 +94,13 @@ int usb_hcd_pci_probe(struct pci_dev *de - hcd->rsrc_len = pci_resource_len(dev, 0); - if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, - driver->description)) { -- dev_dbg(&dev->dev, "controller already in use\n"); -+ usb_dbg(&dev->dev, "controller already in use\n"); - retval = -EBUSY; - goto err2; - } - hcd->regs = ioremap_nocache(hcd->rsrc_start, hcd->rsrc_len); - if (hcd->regs == NULL) { -- dev_dbg(&dev->dev, "error mapping memory\n"); -+ usb_dbg(&dev->dev, "error mapping memory\n"); - retval = -EFAULT; - goto err3; - } -@@ -121,7 +121,7 @@ int usb_hcd_pci_probe(struct pci_dev *de - break; - } - if (region == PCI_ROM_RESOURCE) { -- dev_dbg(&dev->dev, "no i/o regions available\n"); -+ usb_dbg(&dev->dev, "no i/o regions available\n"); - retval = -EBUSY; - goto err1; - } -@@ -256,12 +256,12 @@ int usb_hcd_pci_suspend(struct pci_dev * - - if (message.event == PM_EVENT_FREEZE || - message.event == PM_EVENT_PRETHAW) { -- dev_dbg(hcd->self.controller, "--> no state change\n"); -+ usb_dbg(hcd->self.controller, "--> no state change\n"); - goto done; - } - - if (!has_pci_pm) { -- dev_dbg(hcd->self.controller, "--> PCI D0/legacy\n"); -+ usb_dbg(hcd->self.controller, "--> PCI D0/legacy\n"); - goto done; - } - -@@ -277,7 +277,7 @@ int usb_hcd_pci_suspend(struct pci_dev * - - wake = wake && device_may_wakeup(hcd->self.controller); - -- dev_dbg(hcd->self.controller, "--> PCI D3%s\n", -+ usb_dbg(hcd->self.controller, "--> PCI D3%s\n", - wake ? "/wakeup" : ""); - - /* Ignore these return values. We rely on pci code to -@@ -287,13 +287,13 @@ int usb_hcd_pci_suspend(struct pci_dev * - (void) pci_enable_wake(dev, PCI_D3hot, wake); - (void) pci_enable_wake(dev, PCI_D3cold, wake); - } else { -- dev_dbg(&dev->dev, "PCI D3 suspend fail, %d\n", -+ usb_dbg(&dev->dev, "PCI D3 suspend fail, %d\n", - retval); - (void) usb_hcd_pci_resume(dev); - } - - } else if (hcd->state != HC_STATE_HALT) { -- dev_dbg(hcd->self.controller, "hcd state %d; not suspended\n", -+ usb_dbg(hcd->self.controller, "hcd state %d; not suspended\n", - hcd->state); - WARN_ON(1); - retval = -EINVAL; -@@ -331,7 +331,7 @@ int usb_hcd_pci_resume(struct pci_dev *d - - hcd = pci_get_drvdata(dev); - if (hcd->state != HC_STATE_SUSPENDED) { -- dev_dbg(hcd->self.controller, -+ usb_dbg(hcd->self.controller, - "can't resume, not suspended!\n"); - return 0; - } -@@ -364,7 +364,7 @@ int usb_hcd_pci_resume(struct pci_dev *d - /* Clean case: power to USB and to HC registers was - * maintained; remote wakeup is easy. - */ -- dev_dbg(hcd->self.controller, "resume from PCI D%d\n", -+ usb_dbg(hcd->self.controller, "resume from PCI D%d\n", - pmcr); - } else { - /* Clean: HC lost Vcc power, D0 uninitialized -@@ -376,7 +376,7 @@ int usb_hcd_pci_resume(struct pci_dev *d - * + after BIOS init - * + after Linux init (HCD statically linked) - */ -- dev_dbg(hcd->self.controller, -+ usb_dbg(hcd->self.controller, - "PCI D0, from previous PCI D%d\n", - dev->current_state); - } -@@ -386,7 +386,7 @@ int usb_hcd_pci_resume(struct pci_dev *d - (void) pci_enable_wake(dev, PCI_D3cold, 0); - } else { - /* Same basic cases: clean (powered/not), dirty */ -- dev_dbg(hcd->self.controller, "PCI legacy resume\n"); -+ usb_dbg(hcd->self.controller, "PCI legacy resume\n"); - } - - /* NOTE: the PCI API itself is asymmetric here. We don't need to ---- a/drivers/usb/core/hub.c -+++ b/drivers/usb/core/hub.c -@@ -211,7 +211,7 @@ static void set_port_led( - int status = set_port_feature(hub->hdev, (selector << 8) | port1, - USB_PORT_FEAT_INDICATOR); - if (status < 0) -- dev_dbg (hub->intfdev, -+ usb_dbg (hub->intfdev, - "port %d indicator %s status %d\n", - port1, - ({ char *s; switch (selector) { -@@ -391,7 +391,7 @@ static void hub_irq(struct urb *urb) - - default: /* presumably an error */ - /* Cause a hub reset after 10 consecutive errors */ -- dev_dbg (hub->intfdev, "transfer --> %d\n", status); -+ usb_dbg (hub->intfdev, "transfer --> %d\n", status); - if ((++hub->nerrors < 10) || hub->error) - goto resubmit; - hub->error = status; -@@ -529,9 +529,9 @@ static void hub_power_on(struct usb_hub - * unless we send these messages to the hub. - */ - if ((wHubCharacteristics & HUB_CHAR_LPSM) < 2) -- dev_dbg(hub->intfdev, "enabling power on all ports\n"); -+ usb_dbg(hub->intfdev, "enabling power on all ports\n"); - else -- dev_dbg(hub->intfdev, "trying to enable port power on " -+ usb_dbg(hub->intfdev, "trying to enable port power on " - "non-switchable hub\n"); - for (port1 = 1; port1 <= hub->descriptor->bNbrPorts; port1++) - set_port_feature(hub->hdev, port1, USB_PORT_FEAT_POWER); -@@ -582,7 +582,7 @@ static int hub_port_disable(struct usb_h - */ - static void hub_port_logical_disconnect(struct usb_hub *hub, int port1) - { -- dev_dbg(hub->intfdev, "logical disconnect on port %d\n", port1); -+ usb_dbg(hub->intfdev, "logical disconnect on port %d\n", port1); - hub_port_disable(hub, port1, 1); - - /* FIXME let caller ask to power down the port: -@@ -625,7 +625,7 @@ static void hub_activate(struct usb_hub - portstatus = portchange = 0; - status = hub_port_status(hub, port1, &portstatus, &portchange); - if (udev || (portstatus & USB_PORT_STAT_CONNECTION)) -- dev_dbg(hub->intfdev, -+ usb_dbg(hub->intfdev, - "port %d: status %04x change %04x\n", - port1, portstatus, portchange); - -@@ -817,33 +817,33 @@ static int hub_configure(struct usb_hub - [((i + 1) / 8)] & (1 << ((i + 1) % 8)) - ? 'F' : 'R'; - portstr[hdev->maxchild] = 0; -- dev_dbg(hub_dev, "compound device; port removable status: %s\n", portstr); -+ usb_dbg(hub_dev, "compound device; port removable status: %s\n", portstr); - } else -- dev_dbg(hub_dev, "standalone hub\n"); -+ usb_dbg(hub_dev, "standalone hub\n"); - - switch (wHubCharacteristics & HUB_CHAR_LPSM) { - case 0x00: -- dev_dbg(hub_dev, "ganged power switching\n"); -+ usb_dbg(hub_dev, "ganged power switching\n"); - break; - case 0x01: -- dev_dbg(hub_dev, "individual port power switching\n"); -+ usb_dbg(hub_dev, "individual port power switching\n"); - break; - case 0x02: - case 0x03: -- dev_dbg(hub_dev, "no power switching (usb 1.0)\n"); -+ usb_dbg(hub_dev, "no power switching (usb 1.0)\n"); - break; - } - - switch (wHubCharacteristics & HUB_CHAR_OCPM) { - case 0x00: -- dev_dbg(hub_dev, "global over-current protection\n"); -+ usb_dbg(hub_dev, "global over-current protection\n"); - break; - case 0x08: -- dev_dbg(hub_dev, "individual port over-current protection\n"); -+ usb_dbg(hub_dev, "individual port over-current protection\n"); - break; - case 0x10: - case 0x18: -- dev_dbg(hub_dev, "no over-current protection\n"); -+ usb_dbg(hub_dev, "no over-current protection\n"); - break; - } - -@@ -854,13 +854,13 @@ static int hub_configure(struct usb_hub - case 0: - break; - case 1: -- dev_dbg(hub_dev, "Single TT\n"); -+ usb_dbg(hub_dev, "Single TT\n"); - hub->tt.hub = hdev; - break; - case 2: - ret = usb_set_interface(hdev, 0, 1); - if (ret == 0) { -- dev_dbg(hub_dev, "TT per port\n"); -+ usb_dbg(hub_dev, "TT per port\n"); - hub->tt.multi = 1; - } else - dev_err(hub_dev, "Using single TT (err %d)\n", -@@ -868,7 +868,7 @@ static int hub_configure(struct usb_hub - hub->tt.hub = hdev; - break; - default: -- dev_dbg(hub_dev, "Unrecognized hub protocol %d\n", -+ usb_dbg(hub_dev, "Unrecognized hub protocol %d\n", - hdev->descriptor.bDeviceProtocol); - break; - } -@@ -878,26 +878,26 @@ static int hub_configure(struct usb_hub - case HUB_TTTT_8_BITS: - if (hdev->descriptor.bDeviceProtocol != 0) { - hub->tt.think_time = 666; -- dev_dbg(hub_dev, "TT requires at most %d " -+ usb_dbg(hub_dev, "TT requires at most %d " - "FS bit times (%d ns)\n", - 8, hub->tt.think_time); - } - break; - case HUB_TTTT_16_BITS: - hub->tt.think_time = 666 * 2; -- dev_dbg(hub_dev, "TT requires at most %d " -+ usb_dbg(hub_dev, "TT requires at most %d " - "FS bit times (%d ns)\n", - 16, hub->tt.think_time); - break; - case HUB_TTTT_24_BITS: - hub->tt.think_time = 666 * 3; -- dev_dbg(hub_dev, "TT requires at most %d " -+ usb_dbg(hub_dev, "TT requires at most %d " - "FS bit times (%d ns)\n", - 24, hub->tt.think_time); - break; - case HUB_TTTT_32_BITS: - hub->tt.think_time = 666 * 4; -- dev_dbg(hub_dev, "TT requires at most %d " -+ usb_dbg(hub_dev, "TT requires at most %d " - "FS bit times (%d ns)\n", - 32, hub->tt.think_time); - break; -@@ -906,10 +906,10 @@ static int hub_configure(struct usb_hub - /* probe() zeroes hub->indicator[] */ - if (wHubCharacteristics & HUB_CHAR_PORTIND) { - hub->has_indicators = 1; -- dev_dbg(hub_dev, "Port indicators are supported\n"); -+ usb_dbg(hub_dev, "Port indicators are supported\n"); - } - -- dev_dbg(hub_dev, "power on to power good time: %dms\n", -+ usb_dbg(hub_dev, "power on to power good time: %dms\n", - hub->descriptor->bPwrOn2PwrGood * 2); - - /* power budgeting mostly matters with bus-powered hubs, -@@ -929,7 +929,7 @@ static int hub_configure(struct usb_hub - hub->limited_power = 1; - } - } else if ((hubstatus & (1 << USB_DEVICE_SELF_POWERED)) == 0) { -- dev_dbg(hub_dev, "hub controller current requirement: %dmA\n", -+ usb_dbg(hub_dev, "hub controller current requirement: %dmA\n", - hub->descriptor->bHubContrCurrent); - hub->limited_power = 1; - if (hdev->maxchild > 0) { -@@ -948,7 +948,7 @@ static int hub_configure(struct usb_hub - hub->mA_per_port = 500; - } - if (hub->mA_per_port < 500) -- dev_dbg(hub_dev, "%umA bus power budget for each child\n", -+ usb_dbg(hub_dev, "%umA bus power budget for each child\n", - hub->mA_per_port); - - ret = hub_hub_status(hub, &hubstatus, &hubchange); -@@ -959,12 +959,12 @@ static int hub_configure(struct usb_hub - - /* local power status reports aren't always correct */ - if (hdev->actconfig->desc.bmAttributes & USB_CONFIG_ATT_SELFPOWER) -- dev_dbg(hub_dev, "local power source is %s\n", -+ usb_dbg(hub_dev, "local power source is %s\n", - (hubstatus & HUB_STATUS_LOCAL_POWER) - ? "lost (inactive)" : "good"); - - if ((wHubCharacteristics & HUB_CHAR_OCPM) == 0) -- dev_dbg(hub_dev, "%sover-current condition exists\n", -+ usb_dbg(hub_dev, "%sover-current condition exists\n", - (hubstatus & HUB_STATUS_OVERCURRENT) ? "" : "no "); - - /* set up the interrupt endpoint -@@ -1090,7 +1090,7 @@ descriptor_error: - - hub = kzalloc(sizeof(*hub), GFP_KERNEL); - if (!hub) { -- dev_dbg (&intf->dev, "couldn't kmalloc hub struct\n"); -+ usb_dbg (&intf->dev, "couldn't kmalloc hub struct\n"); - return -ENOMEM; - } - -@@ -1324,7 +1324,8 @@ void usb_disconnect(struct usb_device ** - int i; - - if (!udev) { -- pr_debug ("%s nodev\n", __func__); -+ if (usb_debug) -+ printk(KERN_DEBUG "%s nodev\n", __func__); - return; - } - -@@ -1347,7 +1348,7 @@ void usb_disconnect(struct usb_device ** - * cleaning up all state associated with the current configuration - * so that the hardware is now fully quiesced. - */ -- dev_dbg (&udev->dev, "unregistering device\n"); -+ usb_dbg (&udev->dev, "unregistering device\n"); - usb_disable_device(udev, 0); - - usb_unlock_device(udev); -@@ -1384,7 +1385,7 @@ static void show_string(struct usb_devic - { - if (!string) - return; -- dev_printk(KERN_INFO, &udev->dev, "%s: %s\n", id, string); -+ dev_info(&udev->dev, "%s: %s\n", id, string); - } - - static void announce_device(struct usb_device *udev) -@@ -1474,7 +1475,7 @@ static int usb_configure_device_otg(stru - if (udev->bus->b_hnp_enable || udev->bus->is_b_host) { - err = usb_port_suspend(udev); - if (err < 0) -- dev_dbg(&udev->dev, "HNP fail, %d\n", err); -+ usb_dbg(&udev->dev, "HNP fail, %d\n", err); - } - err = -ENOTSUPP; - goto fail; -@@ -1736,7 +1737,7 @@ static int hub_port_wait_reset(struct us - if (delay_time >= 2 * HUB_SHORT_RESET_TIME) - delay = HUB_LONG_RESET_TIME; - -- dev_dbg (hub->intfdev, -+ usb_dbg (hub->intfdev, - "port %d not reset yet, waiting %dms\n", - port1, delay); - } -@@ -1765,7 +1766,7 @@ static int hub_port_reset(struct usb_hub - else { - status = hub_port_wait_reset(hub, port1, udev, delay); - if (status && status != -ENOTCONN) -- dev_dbg(hub->intfdev, -+ usb_dbg(hub->intfdev, - "port_wait_reset: err = %d\n", - status); - } -@@ -1788,7 +1789,7 @@ static int hub_port_reset(struct usb_hub - goto done; - } - -- dev_dbg (hub->intfdev, -+ usb_dbg (hub->intfdev, - "port %d not enabled, trying reset again...\n", - port1); - delay = HUB_LONG_RESET_TIME; -@@ -1833,7 +1834,7 @@ static int check_port_resume_type(struct - } - - if (status) { -- dev_dbg(hub->intfdev, -+ usb_dbg(hub->intfdev, - "port %d status %04x.%04x after resume, %d\n", - port1, portchange, portstatus, status); - } else if (udev->reset_resume) { -@@ -1904,7 +1905,7 @@ int usb_port_suspend(struct usb_device * - int port1 = udev->portnum; - int status; - -- // dev_dbg(hub->intfdev, "suspend port %d\n", port1); -+ // usb_dbg(hub->intfdev, "suspend port %d\n", port1); - - /* enable remote wakeup when appropriate; this lets the device - * wake up the upstream hub (including maybe the root hub). -@@ -1919,14 +1920,14 @@ int usb_port_suspend(struct usb_device * - NULL, 0, - USB_CTRL_SET_TIMEOUT); - if (status) -- dev_dbg(&udev->dev, "won't remote wakeup, status %d\n", -+ usb_dbg(&udev->dev, "won't remote wakeup, status %d\n", - status); - } - - /* see 7.1.7.6 */ - status = set_port_feature(hub->hdev, port1, USB_PORT_FEAT_SUSPEND); - if (status) { -- dev_dbg(hub->intfdev, "can't suspend port %d, status %d\n", -+ usb_dbg(hub->intfdev, "can't suspend port %d, status %d\n", - port1, status); - /* paranoia: "should not happen" */ - (void) usb_control_msg(udev, usb_sndctrlpipe(udev, 0), -@@ -1936,7 +1937,7 @@ int usb_port_suspend(struct usb_device * - USB_CTRL_SET_TIMEOUT); - } else { - /* device has up to 10 msec to fully suspend */ -- dev_dbg(&udev->dev, "usb %ssuspend\n", -+ usb_dbg(&udev->dev, "usb %ssuspend\n", - udev->auto_pm ? "auto-" : ""); - usb_set_device_state(udev, USB_STATE_SUSPENDED); - msleep(10); -@@ -1961,7 +1962,7 @@ static int finish_port_resume(struct usb - u16 devstatus; - - /* caller owns the udev device lock */ -- dev_dbg(&udev->dev, "finish %sresume\n", -+ usb_dbg(&udev->dev, "finish %sresume\n", - udev->reset_resume ? "reset-" : ""); - - /* usb ch9 identifies four variants of SUSPENDED, based on what -@@ -1994,14 +1995,14 @@ static int finish_port_resume(struct usb - - /* If a normal resume failed, try doing a reset-resume */ - if (status && !udev->reset_resume && udev->persist_enabled) { -- dev_dbg(&udev->dev, "retry with reset-resume\n"); -+ usb_dbg(&udev->dev, "retry with reset-resume\n"); - udev->reset_resume = 1; - goto retry_reset_resume; - } - } - - if (status) { -- dev_dbg(&udev->dev, "gone after usb resume? status %d\n", -+ usb_dbg(&udev->dev, "gone after usb resume? status %d\n", - status); - } else if (udev->actconfig) { - le16_to_cpus(&devstatus); -@@ -2014,7 +2015,7 @@ static int finish_port_resume(struct usb - NULL, 0, - USB_CTRL_SET_TIMEOUT); - if (status) -- dev_dbg(&udev->dev, "disable remote " -+ usb_dbg(&udev->dev, "disable remote " - "wakeup, status %d\n", status); - } - status = 0; -@@ -2068,7 +2069,7 @@ int usb_port_resume(struct usb_device *u - if (status == 0 && !(portstatus & USB_PORT_STAT_SUSPEND)) - goto SuspendCleared; - -- // dev_dbg(hub->intfdev, "resume port %d\n", port1); -+ // usb_dbg(hub->intfdev, "resume port %d\n", port1); - - set_bit(port1, hub->busy_bits); - -@@ -2076,11 +2077,11 @@ int usb_port_resume(struct usb_device *u - status = clear_port_feature(hub->hdev, - port1, USB_PORT_FEAT_SUSPEND); - if (status) { -- dev_dbg(hub->intfdev, "can't resume port %d, status %d\n", -+ usb_dbg(hub->intfdev, "can't resume port %d, status %d\n", - port1, status); - } else { - /* drive resume for at least 20 msec */ -- dev_dbg(&udev->dev, "usb %sresume\n", -+ usb_dbg(&udev->dev, "usb %sresume\n", - udev->auto_pm ? "auto-" : ""); - msleep(25); - -@@ -2110,7 +2111,7 @@ int usb_port_resume(struct usb_device *u - if (status == 0) - status = finish_port_resume(udev); - if (status < 0) { -- dev_dbg(&udev->dev, "can't resume, status %d\n", status); -+ usb_dbg(&udev->dev, "can't resume, status %d\n", status); - hub_port_logical_disconnect(hub, port1); - } - return status; -@@ -2122,7 +2123,7 @@ static int remote_wakeup(struct usb_devi - int status = 0; - - if (udev->state == USB_STATE_SUSPENDED) { -- dev_dbg(&udev->dev, "usb %sresume\n", "wakeup-"); -+ usb_dbg(&udev->dev, "usb %sresume\n", "wakeup-"); - usb_mark_last_busy(udev); - status = usb_external_resume_device(udev); - } -@@ -2152,10 +2153,10 @@ int usb_port_resume(struct usb_device *u - hub, port1, status, portchange, portstatus); - - if (status) { -- dev_dbg(&udev->dev, "can't resume, status %d\n", status); -+ usb_dbg(&udev->dev, "can't resume, status %d\n", status); - hub_port_logical_disconnect(hub, port1); - } else if (udev->reset_resume) { -- dev_dbg(&udev->dev, "reset-resume\n"); -+ usb_dbg(&udev->dev, "reset-resume\n"); - status = usb_reset_and_verify_device(udev); - } - return status; -@@ -2181,13 +2182,13 @@ static int hub_suspend(struct usb_interf - udev = hdev->children [port1-1]; - if (udev && udev->can_submit) { - if (!hdev->auto_pm) -- dev_dbg(&intf->dev, "port %d nyet suspended\n", -+ usb_dbg(&intf->dev, "port %d nyet suspended\n", - port1); - return -EBUSY; - } - } - -- dev_dbg(&intf->dev, "%s\n", __func__); -+ usb_dbg(&intf->dev, "%s\n", __func__); - - /* stop khubd and related activity */ - hub_quiesce(hub, HUB_SUSPEND); -@@ -2198,7 +2199,7 @@ static int hub_resume(struct usb_interfa - { - struct usb_hub *hub = usb_get_intfdata(intf); - -- dev_dbg(&intf->dev, "%s\n", __func__); -+ usb_dbg(&intf->dev, "%s\n", __func__); - hub_activate(hub, HUB_RESUME); - return 0; - } -@@ -2207,7 +2208,7 @@ static int hub_reset_resume(struct usb_i - { - struct usb_hub *hub = usb_get_intfdata(intf); - -- dev_dbg(&intf->dev, "%s\n", __func__); -+ usb_dbg(&intf->dev, "%s\n", __func__); - hub_activate(hub, HUB_RESET_RESUME); - return 0; - } -@@ -2290,7 +2291,7 @@ static int hub_port_debounce(struct usb_ - msleep(HUB_DEBOUNCE_STEP); - } - -- dev_dbg (hub->intfdev, -+ usb_dbg (hub->intfdev, - "debounce: port %d: total %dms stable %dms status 0x%x\n", - port1, total_time, stable_time, portstatus); - -@@ -2378,7 +2379,7 @@ hub_port_init (struct usb_hub *hub, stru - retval = -ENODEV; - - if (oldspeed != USB_SPEED_UNKNOWN && oldspeed != udev->speed) { -- dev_dbg(&udev->dev, "device reset changed speed!\n"); -+ usb_dbg(&udev->dev, "device reset changed speed!\n"); - goto fail; - } - oldspeed = udev->speed; -@@ -2494,7 +2495,7 @@ hub_port_init (struct usb_hub *hub, stru - if (retval < 0) /* error or disconnect */ - goto fail; - if (oldspeed != udev->speed) { -- dev_dbg(&udev->dev, -+ usb_dbg(&udev->dev, - "device reset changed speed!\n"); - retval = -ENODEV; - goto fail; -@@ -2561,7 +2562,7 @@ hub_port_init (struct usb_hub *hub, stru - retval = -EMSGSIZE; - goto fail; - } -- dev_dbg(&udev->dev, "ep0 maxpacket = %d\n", i); -+ usb_dbg(&udev->dev, "ep0 maxpacket = %d\n", i); - udev->ep0.desc.wMaxPacketSize = cpu_to_le16(i); - usb_ep0_reinit(udev); - } -@@ -2669,7 +2670,7 @@ static void hub_port_connect_change(stru - struct usb_device *udev; - int status, i; - -- dev_dbg (hub_dev, -+ usb_dbg (hub_dev, - "port %d, status %04x, change %04x, %s\n", - port1, portstatus, portchange, portspeed (portstatus)); - -@@ -2800,7 +2801,7 @@ static void hub_port_connect_change(stru - status = usb_get_status(udev, USB_RECIP_DEVICE, 0, - &devstat); - if (status < 2) { -- dev_dbg(&udev->dev, "get status %d ?\n", status); -+ usb_dbg(&udev->dev, "get status %d ?\n", status); - goto loop_disable; - } - le16_to_cpus(&devstat); -@@ -2856,7 +2857,7 @@ static void hub_port_connect_change(stru - - status = hub_power_remaining(hub); - if (status) -- dev_dbg(hub_dev, "%dmA power budget left\n", status); -+ usb_dbg(hub_dev, "%dmA power budget left\n", status); - - return; - -@@ -2920,7 +2921,7 @@ static void hub_events(void) - hdev = hub->hdev; - hub_dev = hub->intfdev; - intf = to_usb_interface(hub_dev); -- dev_dbg(hub_dev, "state %d ports %d chg %04x evt %04x\n", -+ usb_dbg(hub_dev, "state %d ports %d chg %04x evt %04x\n", - hdev->state, hub->descriptor - ? hub->descriptor->bNbrPorts - : 0, -@@ -2944,7 +2945,7 @@ static void hub_events(void) - /* Autoresume */ - ret = usb_autopm_get_interface(intf); - if (ret) { -- dev_dbg(hub_dev, "Can't autoresume: %d\n", ret); -+ usb_dbg(hub_dev, "Can't autoresume: %d\n", ret); - goto loop; - } - -@@ -2953,12 +2954,12 @@ static void hub_events(void) - goto loop_autopm; - - if (hub->error) { -- dev_dbg (hub_dev, "resetting for error %d\n", -+ usb_dbg (hub_dev, "resetting for error %d\n", - hub->error); - - ret = usb_reset_device(hdev); - if (ret) { -- dev_dbg (hub_dev, -+ usb_dbg (hub_dev, - "error resetting hub: %d\n", ret); - goto loop_autopm; - } -@@ -2989,7 +2990,7 @@ static void hub_events(void) - - if (portchange & USB_PORT_STAT_C_ENABLE) { - if (!connect_change) -- dev_dbg (hub_dev, -+ usb_dbg (hub_dev, - "port %d enable change, " - "status %08x\n", - i, portstatus); -@@ -3031,7 +3032,7 @@ static void hub_events(void) - ret = -ENODEV; - hub_port_disable(hub, i, 1); - } -- dev_dbg (hub_dev, -+ usb_dbg (hub_dev, - "resume on port %d, status %d\n", - i, ret); - } -@@ -3046,7 +3047,7 @@ static void hub_events(void) - } - - if (portchange & USB_PORT_STAT_C_RESET) { -- dev_dbg (hub_dev, -+ usb_dbg (hub_dev, - "reset change on port %d\n", - i); - clear_port_feature(hdev, i, -@@ -3065,7 +3066,7 @@ static void hub_events(void) - dev_err (hub_dev, "get_hub_status failed\n"); - else { - if (hubchange & HUB_CHANGE_LOCAL_POWER) { -- dev_dbg (hub_dev, "power change\n"); -+ usb_dbg (hub_dev, "power change\n"); - clear_hub_feature(hdev, C_HUB_LOCAL_POWER); - if (hubstatus & HUB_STATUS_LOCAL_POWER) - /* FIXME: Is this always true? */ -@@ -3074,7 +3075,7 @@ static void hub_events(void) - hub->limited_power = 0; - } - if (hubchange & HUB_CHANGE_OVERCURRENT) { -- dev_dbg (hub_dev, "overcurrent change\n"); -+ usb_dbg (hub_dev, "overcurrent change\n"); - msleep(500); /* Cool down */ - clear_hub_feature(hdev, C_HUB_OVER_CURRENT); - hub_power_on(hub); -@@ -3113,7 +3114,8 @@ static int hub_thread(void *__unused) - kthread_should_stop()); - } while (!kthread_should_stop() || !list_empty(&hub_event_list)); - -- pr_debug("%s: khubd exiting\n", usbcore_name); -+ if (usb_debug) -+ printk(KERN_DEBUG "%s: khubd exiting\n", usbcore_name); - return 0; - } - -@@ -3215,14 +3217,14 @@ static int descriptors_changed(struct us - length = usb_get_descriptor(udev, USB_DT_CONFIG, index, buf, - old_length); - if (length != old_length) { -- dev_dbg(&udev->dev, "config index %d, error %d\n", -+ usb_dbg(&udev->dev, "config index %d, error %d\n", - index, length); - changed = 1; - break; - } - if (memcmp (buf, udev->rawdescriptors[index], old_length) - != 0) { -- dev_dbg(&udev->dev, "config index %d changed (#%d)\n", -+ usb_dbg(&udev->dev, "config index %d changed (#%d)\n", - index, - ((struct usb_config_descriptor *) buf)-> - bConfigurationValue); -@@ -3235,11 +3237,11 @@ static int descriptors_changed(struct us - length = usb_string(udev, udev->descriptor.iSerialNumber, - buf, serial_len); - if (length + 1 != serial_len) { -- dev_dbg(&udev->dev, "serial string error %d\n", -+ usb_dbg(&udev->dev, "serial string error %d\n", - length); - changed = 1; - } else if (memcmp(buf, udev->serial, length) != 0) { -- dev_dbg(&udev->dev, "serial string changed\n"); -+ usb_dbg(&udev->dev, "serial string changed\n"); - changed = 1; - } - } -@@ -3288,14 +3290,14 @@ static int usb_reset_and_verify_device(s - - if (udev->state == USB_STATE_NOTATTACHED || - udev->state == USB_STATE_SUSPENDED) { -- dev_dbg(&udev->dev, "device reset not allowed in state %d\n", -+ usb_dbg(&udev->dev, "device reset not allowed in state %d\n", - udev->state); - return -EINVAL; - } - - if (!parent_hdev) { - /* this requires hcd-specific logic; see OHCI hc_restart() */ -- dev_dbg(&udev->dev, "%s for root hub!\n", __func__); -+ usb_dbg(&udev->dev, "%s for root hub!\n", __func__); - return -EISDIR; - } - parent_hub = hdev_to_hub(parent_hdev); -@@ -3395,7 +3397,7 @@ int usb_reset_device(struct usb_device * - - if (udev->state == USB_STATE_NOTATTACHED || - udev->state == USB_STATE_SUSPENDED) { -- dev_dbg(&udev->dev, "device reset not allowed in state %d\n", -+ usb_dbg(&udev->dev, "device reset not allowed in state %d\n", - udev->state); - return -EINVAL; - } ---- a/drivers/usb/core/message.c -+++ b/drivers/usb/core/message.c -@@ -56,7 +56,7 @@ static int usb_start_wait_urb(struct urb - usb_kill_urb(urb); - retval = (ctx.status == -ENOENT ? -ETIMEDOUT : ctx.status); - -- dev_dbg(&urb->dev->dev, -+ usb_dbg(&urb->dev->dev, - "%s timed out on ep%d%s len=%d/%d\n", - current->comm, - usb_endpoint_num(&urb->ep->desc), -@@ -551,7 +551,7 @@ void usb_sg_wait(struct usb_sg_request * - default: - io->urbs[i]->dev = NULL; - io->urbs[i]->status = retval; -- dev_dbg(&io->dev->dev, "%s, submit --> %d\n", -+ usb_dbg(&io->dev->dev, "%s, submit --> %d\n", - __func__, retval); - usb_sg_cancel(io); - } -@@ -806,7 +806,7 @@ int usb_string(struct usb_device *dev, i - dev->have_langid = 1; - dev->string_langid = tbuf[2] | (tbuf[3] << 8); - /* always use the first langid listed */ -- dev_dbg(&dev->dev, "default language 0x%04x\n", -+ usb_dbg(&dev->dev, "default language 0x%04x\n", - dev->string_langid); - } - } -@@ -828,7 +828,7 @@ int usb_string(struct usb_device *dev, i - err = idx; - - if (tbuf[1] != USB_DT_STRING) -- dev_dbg(&dev->dev, -+ usb_dbg(&dev->dev, - "wrong descriptor type %02x for string %d (\"%s\")\n", - tbuf[1], index, buf); - -@@ -1070,7 +1070,7 @@ void usb_disable_device(struct usb_devic - { - int i; - -- dev_dbg(&dev->dev, "%s nuking %s URBs\n", __func__, -+ usb_dbg(&dev->dev, "%s nuking %s URBs\n", __func__, - skip_ep0 ? "non-ep0" : "all"); - for (i = skip_ep0; i < 16; ++i) { - usb_disable_endpoint(dev, i); -@@ -1089,7 +1089,7 @@ void usb_disable_device(struct usb_devic - interface = dev->actconfig->interface[i]; - if (!device_is_registered(&interface->dev)) - continue; -- dev_dbg(&dev->dev, "unregistering interface %s\n", -+ usb_dbg(&dev->dev, "unregistering interface %s\n", - dev_name(&interface->dev)); - usb_remove_sysfs_intf_files(interface); - device_del(&interface->dev); -@@ -1197,7 +1197,7 @@ int usb_set_interface(struct usb_device - - iface = usb_ifnum_to_if(dev, interface); - if (!iface) { -- dev_dbg(&dev->dev, "selecting invalid interface %d\n", -+ usb_dbg(&dev->dev, "selecting invalid interface %d\n", - interface); - return -EINVAL; - } -@@ -1219,7 +1219,7 @@ int usb_set_interface(struct usb_device - * request if the interface only has one alternate setting. - */ - if (ret == -EPIPE && iface->num_altsetting == 1) { -- dev_dbg(&dev->dev, -+ usb_dbg(&dev->dev, - "manual set_interface for iface %d, alt %d\n", - interface, alternate); - manual = 1; -@@ -1629,7 +1629,7 @@ free_interfaces: - for (i = 0; i < nintf; ++i) { - struct usb_interface *intf = cp->interface[i]; - -- dev_dbg(&dev->dev, -+ usb_dbg(&dev->dev, - "adding %s (config #%d, interface %d)\n", - dev_name(&intf->dev), configuration, - intf->cur_altsetting->desc.bInterfaceNumber); ---- a/drivers/usb/core/quirks.c -+++ b/drivers/usb/core/quirks.c -@@ -96,7 +96,7 @@ void usb_detect_quirks(struct usb_device - if (id) - udev->quirks = (u32)(id->driver_info); - if (udev->quirks) -- dev_dbg(&udev->dev, "USB quirks for this device: %x\n", -+ usb_dbg(&udev->dev, "USB quirks for this device: %x\n", - udev->quirks); - - /* By default, disable autosuspend for all non-hubs */ ---- a/drivers/usb/core/urb.c -+++ b/drivers/usb/core/urb.c -@@ -6,6 +6,7 @@ - #include <linux/log2.h> - #include <linux/usb.h> - #include <linux/wait.h> -+#include "usb.h" - #include "hcd.h" - - #define to_urb(d) container_of(d, struct urb, kref) -@@ -340,7 +341,7 @@ int usb_submit_urb(struct urb *urb, gfp_ - - max = le16_to_cpu(ep->desc.wMaxPacketSize); - if (max <= 0) { -- dev_dbg(&dev->dev, -+ usb_dbg(&dev->dev, - "bogus endpoint ep%d%s in %s (bad maxpacket %d)\n", - usb_endpoint_num(&ep->desc), is_out ? "out" : "in", - __func__, max); diff --git a/usb/usb-convert-the-usb-host-controller-code-to-use-usb_dbg.patch b/usb/usb-convert-the-usb-host-controller-code-to-use-usb_dbg.patch deleted file mode 100644 index ad81b37982f858..00000000000000 --- a/usb/usb-convert-the-usb-host-controller-code-to-use-usb_dbg.patch +++ /dev/null @@ -1,680 +0,0 @@ -Date: Fri, 08 Aug 2008 14:38:31 -0700 -To: Greg KH <greg@kroah.com> -From: Greg Kroah-Hartman <gregkh@suse.de> -Subject: USB: convert the USB host controller code to use usb_dbg() - -It's a plug-in replacement for dev_dbg() and it lets you turn it on or -off based on the usbcore debug parameter. - -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/host/ehci-dbg.c | 2 +- - drivers/usb/host/ehci-fsl.c | 4 ++-- - drivers/usb/host/ehci-hcd.c | 1 + - drivers/usb/host/ehci-ixp4xx.c | 4 ++-- - drivers/usb/host/ehci-orion.c | 4 ++-- - drivers/usb/host/ehci-ppc-of.c | 4 ++-- - drivers/usb/host/ehci-ps3.c | 30 +++++++++++++++--------------- - drivers/usb/host/ehci-q.c | 5 ++--- - drivers/usb/host/ehci-sched.c | 4 ++-- - drivers/usb/host/ohci-at91.c | 4 ++-- - drivers/usb/host/ohci-hcd.c | 1 + - drivers/usb/host/ohci-omap.c | 8 ++++---- - drivers/usb/host/ohci-pnx4008.c | 4 ++-- - drivers/usb/host/ohci-ppc-of.c | 4 ++-- - drivers/usb/host/ohci-ps3.c | 30 +++++++++++++++--------------- - drivers/usb/host/ohci-s3c2410.c | 22 +++++++++++----------- - drivers/usb/host/uhci-hcd.c | 9 +++++---- - drivers/usb/host/uhci-hub.c | 2 +- - drivers/usb/host/uhci-q.c | 8 ++++---- - 19 files changed, 76 insertions(+), 74 deletions(-) - ---- a/drivers/usb/host/ehci-dbg.c -+++ b/drivers/usb/host/ehci-dbg.c -@@ -19,7 +19,7 @@ - /* this file is part of ehci-hcd.c */ - - #define ehci_dbg(ehci, fmt, args...) \ -- dev_dbg (ehci_to_hcd(ehci)->self.controller , fmt , ## args ) -+ usb_dbg (ehci_to_hcd(ehci)->self.controller , fmt , ## args ) - #define ehci_err(ehci, fmt, args...) \ - dev_err (ehci_to_hcd(ehci)->self.controller , fmt , ## args ) - #define ehci_info(ehci, fmt, args...) \ ---- a/drivers/usb/host/ehci-fsl.c -+++ b/drivers/usb/host/ehci-fsl.c -@@ -100,14 +100,14 @@ int usb_hcd_fsl_probe(const struct hc_dr - hcd->rsrc_len = res->end - res->start + 1; - if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, - driver->description)) { -- dev_dbg(&pdev->dev, "controller already in use\n"); -+ usb_dbg(&pdev->dev, "controller already in use\n"); - retval = -EBUSY; - goto err2; - } - hcd->regs = ioremap(hcd->rsrc_start, hcd->rsrc_len); - - if (hcd->regs == NULL) { -- dev_dbg(&pdev->dev, "error mapping memory\n"); -+ usb_dbg(&pdev->dev, "error mapping memory\n"); - retval = -EFAULT; - goto err3; - } ---- a/drivers/usb/host/ehci-hcd.c -+++ b/drivers/usb/host/ehci-hcd.c -@@ -36,6 +36,7 @@ - #include <linux/debugfs.h> - - #include "../core/hcd.h" -+#include "../core/usb.h" - - #include <asm/byteorder.h> - #include <asm/io.h> ---- a/drivers/usb/host/ehci-ixp4xx.c -+++ b/drivers/usb/host/ehci-ixp4xx.c -@@ -101,14 +101,14 @@ static int ixp4xx_ehci_probe(struct plat - - if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, - driver->description)) { -- dev_dbg(&pdev->dev, "controller already in use\n"); -+ usb_dbg(&pdev->dev, "controller already in use\n"); - retval = -EBUSY; - goto fail_request_resource; - } - - hcd->regs = ioremap_nocache(hcd->rsrc_start, hcd->rsrc_len); - if (hcd->regs == NULL) { -- dev_dbg(&pdev->dev, "error mapping memory\n"); -+ usb_dbg(&pdev->dev, "error mapping memory\n"); - retval = -EFAULT; - goto fail_ioremap; - } ---- a/drivers/usb/host/ehci-orion.c -+++ b/drivers/usb/host/ehci-orion.c -@@ -220,14 +220,14 @@ static int __init ehci_orion_drv_probe(s - - if (!request_mem_region(res->start, res->end - res->start + 1, - ehci_orion_hc_driver.description)) { -- dev_dbg(&pdev->dev, "controller already in use\n"); -+ usb_dbg(&pdev->dev, "controller already in use\n"); - err = -EBUSY; - goto err1; - } - - regs = ioremap(res->start, res->end - res->start + 1); - if (regs == NULL) { -- dev_dbg(&pdev->dev, "error mapping memory\n"); -+ usb_dbg(&pdev->dev, "error mapping memory\n"); - err = -EFAULT; - goto err2; - } ---- a/drivers/usb/host/ehci-ppc-of.c -+++ b/drivers/usb/host/ehci-ppc-of.c -@@ -115,7 +115,7 @@ ehci_hcd_ppc_of_probe(struct of_device * - if (usb_disabled()) - return -ENODEV; - -- dev_dbg(&op->dev, "initializing PPC-OF USB Controller\n"); -+ usb_dbg(&op->dev, "initializing PPC-OF USB Controller\n"); - - rv = of_address_to_resource(dn, 0, &res); - if (rv) -@@ -193,7 +193,7 @@ static int ehci_hcd_ppc_of_remove(struct - struct usb_hcd *hcd = dev_get_drvdata(&op->dev); - dev_set_drvdata(&op->dev, NULL); - -- dev_dbg(&op->dev, "stopping PPC-OF USB Controller\n"); -+ usb_dbg(&op->dev, "stopping PPC-OF USB Controller\n"); - - usb_remove_hcd(hcd); - ---- a/drivers/usb/host/ehci-ps3.c -+++ b/drivers/usb/host/ehci-ps3.c -@@ -91,7 +91,7 @@ static int ps3_ehci_probe(struct ps3_sys - result = ps3_open_hv_device(dev); - - if (result) { -- dev_dbg(&dev->core, "%s:%d: ps3_open_hv_device failed\n", -+ usb_dbg(&dev->core, "%s:%d: ps3_open_hv_device failed\n", - __func__, __LINE__); - goto fail_open; - } -@@ -99,7 +99,7 @@ static int ps3_ehci_probe(struct ps3_sys - result = ps3_dma_region_create(dev->d_region); - - if (result) { -- dev_dbg(&dev->core, "%s:%d: ps3_dma_region_create failed: " -+ usb_dbg(&dev->core, "%s:%d: ps3_dma_region_create failed: " - "(%d)\n", __func__, __LINE__, result); - BUG_ON("check region type"); - goto fail_dma_region; -@@ -108,19 +108,19 @@ static int ps3_ehci_probe(struct ps3_sys - result = ps3_mmio_region_create(dev->m_region); - - if (result) { -- dev_dbg(&dev->core, "%s:%d: ps3_map_mmio_region failed\n", -+ usb_dbg(&dev->core, "%s:%d: ps3_map_mmio_region failed\n", - __func__, __LINE__); - result = -EPERM; - goto fail_mmio_region; - } - -- dev_dbg(&dev->core, "%s:%d: mmio mapped_addr %lxh\n", __func__, -+ usb_dbg(&dev->core, "%s:%d: mmio mapped_addr %lxh\n", __func__, - __LINE__, dev->m_region->lpar_addr); - - result = ps3_io_irq_setup(PS3_BINDING_CPU_ANY, dev->interrupt_id, &virq); - - if (result) { -- dev_dbg(&dev->core, "%s:%d: ps3_construct_io_irq(%d) failed.\n", -+ usb_dbg(&dev->core, "%s:%d: ps3_construct_io_irq(%d) failed.\n", - __func__, __LINE__, virq); - result = -EPERM; - goto fail_irq; -@@ -131,7 +131,7 @@ static int ps3_ehci_probe(struct ps3_sys - hcd = usb_create_hcd(&ps3_ehci_hc_driver, &dev->core, dev_name(&dev->core)); - - if (!hcd) { -- dev_dbg(&dev->core, "%s:%d: usb_create_hcd failed\n", __func__, -+ usb_dbg(&dev->core, "%s:%d: usb_create_hcd failed\n", __func__, - __LINE__); - result = -ENOMEM; - goto fail_create_hcd; -@@ -141,25 +141,25 @@ static int ps3_ehci_probe(struct ps3_sys - hcd->rsrc_len = dev->m_region->len; - - if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, hcd_name)) -- dev_dbg(&dev->core, "%s:%d: request_mem_region failed\n", -+ usb_dbg(&dev->core, "%s:%d: request_mem_region failed\n", - __func__, __LINE__); - - hcd->regs = ioremap(dev->m_region->lpar_addr, dev->m_region->len); - - if (!hcd->regs) { -- dev_dbg(&dev->core, "%s:%d: ioremap failed\n", __func__, -+ usb_dbg(&dev->core, "%s:%d: ioremap failed\n", __func__, - __LINE__); - result = -EPERM; - goto fail_ioremap; - } - -- dev_dbg(&dev->core, "%s:%d: hcd->rsrc_start %lxh\n", __func__, __LINE__, -+ usb_dbg(&dev->core, "%s:%d: hcd->rsrc_start %lxh\n", __func__, __LINE__, - (unsigned long)hcd->rsrc_start); -- dev_dbg(&dev->core, "%s:%d: hcd->rsrc_len %lxh\n", __func__, __LINE__, -+ usb_dbg(&dev->core, "%s:%d: hcd->rsrc_len %lxh\n", __func__, __LINE__, - (unsigned long)hcd->rsrc_len); -- dev_dbg(&dev->core, "%s:%d: hcd->regs %lxh\n", __func__, __LINE__, -+ usb_dbg(&dev->core, "%s:%d: hcd->regs %lxh\n", __func__, __LINE__, - (unsigned long)hcd->regs); -- dev_dbg(&dev->core, "%s:%d: virq %lu\n", __func__, __LINE__, -+ usb_dbg(&dev->core, "%s:%d: virq %lu\n", __func__, __LINE__, - (unsigned long)virq); - - ps3_system_bus_set_driver_data(dev, hcd); -@@ -167,7 +167,7 @@ static int ps3_ehci_probe(struct ps3_sys - result = usb_add_hcd(hcd, virq, IRQF_DISABLED); - - if (result) { -- dev_dbg(&dev->core, "%s:%d: usb_add_hcd failed (%d)\n", -+ usb_dbg(&dev->core, "%s:%d: usb_add_hcd failed (%d)\n", - __func__, __LINE__, result); - goto fail_add_hcd; - } -@@ -200,8 +200,8 @@ static int ps3_ehci_remove(struct ps3_sy - - BUG_ON(!hcd); - -- dev_dbg(&dev->core, "%s:%d: regs %p\n", __func__, __LINE__, hcd->regs); -- dev_dbg(&dev->core, "%s:%d: irq %u\n", __func__, __LINE__, hcd->irq); -+ usb_dbg(&dev->core, "%s:%d: regs %p\n", __func__, __LINE__, hcd->regs); -+ usb_dbg(&dev->core, "%s:%d: irq %u\n", __func__, __LINE__, hcd->irq); - - tmp = hcd->irq; - ---- a/drivers/usb/host/ehci-q.c -+++ b/drivers/usb/host/ehci-q.c -@@ -205,13 +205,12 @@ static int qtd_copy_status ( - && (!ehci_is_TDI(ehci) - || urb->dev->tt->hub != - ehci_to_hcd(ehci)->self.root_hub)) { --#ifdef DEBUG - struct usb_device *tt = urb->dev->tt->hub; -- dev_dbg (&tt->dev, -+ usb_dbg (&tt->dev, - "clear tt buffer port %d, a%d ep%d t%08x\n", - urb->dev->ttport, urb->dev->devnum, - usb_pipeendpoint (urb->pipe), token); --#endif /* DEBUG */ -+ - /* REVISIT ARC-derived cores don't clear the root - * hub TT buffer in this way... - */ ---- a/drivers/usb/host/ehci-sched.c -+++ b/drivers/usb/host/ehci-sched.c -@@ -490,7 +490,7 @@ static int qh_link_periodic (struct ehci - unsigned i; - unsigned period = qh->period; - -- dev_dbg (&qh->dev->dev, -+ usb_dbg (&qh->dev->dev, - "link qh%d-%04x/%p start %d [%d/%d us]\n", - period, hc32_to_cpup(ehci, &qh->hw_info2) & (QH_CMASK | QH_SMASK), - qh, qh->start, qh->usecs, qh->c_usecs); -@@ -574,7 +574,7 @@ static void qh_unlink_periodic (struct e - ? ((qh->usecs + qh->c_usecs) / qh->period) - : (qh->usecs * 8); - -- dev_dbg (&qh->dev->dev, -+ usb_dbg (&qh->dev->dev, - "unlink qh%d-%04x/%p start %d [%d/%d us]\n", - qh->period, - hc32_to_cpup(ehci, &qh->hw_info2) & (QH_CMASK | QH_SMASK), ---- a/drivers/usb/host/ohci-at91.c -+++ b/drivers/usb/host/ohci-at91.c -@@ -56,7 +56,7 @@ static void at91_start_hc(struct platfor - struct usb_hcd *hcd = platform_get_drvdata(pdev); - struct ohci_regs __iomem *regs = hcd->regs; - -- dev_dbg(&pdev->dev, "start\n"); -+ usb_dbg(&pdev->dev, "start\n"); - - /* - * Start the USB clocks. -@@ -74,7 +74,7 @@ static void at91_stop_hc(struct platform - struct usb_hcd *hcd = platform_get_drvdata(pdev); - struct ohci_regs __iomem *regs = hcd->regs; - -- dev_dbg(&pdev->dev, "stop\n"); -+ usb_dbg(&pdev->dev, "stop\n"); - - /* - * Put the USB host controller into reset. ---- a/drivers/usb/host/ohci-hcd.c -+++ b/drivers/usb/host/ohci-hcd.c -@@ -45,6 +45,7 @@ - #include <asm/byteorder.h> - - #include "../core/hcd.h" -+#include "../core/usb.h" - - #define DRIVER_VERSION "2006 August 04" - #define DRIVER_AUTHOR "Roman Weissgaerber, David Brownell" ---- a/drivers/usb/host/ohci-omap.c -+++ b/drivers/usb/host/ohci-omap.c -@@ -193,7 +193,7 @@ static int ohci_omap_init(struct usb_hcd - int need_transceiver = (config->otg != 0); - int ret; - -- dev_dbg(hcd->self.controller, "starting USB Controller\n"); -+ usb_dbg(hcd->self.controller, "starting USB Controller\n"); - - if (config->otg) { - ohci_to_hcd(ohci)->self.otg_port = config->otg; -@@ -214,7 +214,7 @@ static int ohci_omap_init(struct usb_hcd - if (ohci->transceiver) { - int status = otg_set_host(ohci->transceiver, - &ohci_to_hcd(ohci)->self); -- dev_dbg(hcd->self.controller, "init %s transceiver, status %d\n", -+ usb_dbg(hcd->self.controller, "init %s transceiver, status %d\n", - ohci->transceiver->label, status); - if (status) { - if (ohci->transceiver) -@@ -281,7 +281,7 @@ static int ohci_omap_init(struct usb_hcd - - static void ohci_omap_stop(struct usb_hcd *hcd) - { -- dev_dbg(hcd->self.controller, "stopping USB Controller\n"); -+ usb_dbg(hcd->self.controller, "stopping USB Controller\n"); - omap_ohci_clock_power(0); - } - -@@ -339,7 +339,7 @@ static int usb_hcd_omap_probe (const str - hcd->rsrc_len = pdev->resource[0].end - pdev->resource[0].start + 1; - - if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, hcd_name)) { -- dev_dbg(&pdev->dev, "request_mem_region failed\n"); -+ usb_dbg(&pdev->dev, "request_mem_region failed\n"); - retval = -EBUSY; - goto err1; - } ---- a/drivers/usb/host/ohci-pnx4008.c -+++ b/drivers/usb/host/ohci-pnx4008.c -@@ -332,7 +332,7 @@ static int __devinit usb_hcd_pnx4008_pro - - int ret = 0, irq; - -- dev_dbg(&pdev->dev, "%s: " DRIVER_INFO " (pnx4008)\n", hcd_name); -+ usb_dbg(&pdev->dev, "%s: " DRIVER_INFO " (pnx4008)\n", hcd_name); - if (usb_disabled()) { - err("USB is disabled"); - ret = -ENODEV; -@@ -399,7 +399,7 @@ static int __devinit usb_hcd_pnx4008_pro - hcd->rsrc_start = pdev->resource[0].start; - hcd->rsrc_len = pdev->resource[0].end - pdev->resource[0].start + 1; - if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, hcd_name)) { -- dev_dbg(&pdev->dev, "request_mem_region failed\n"); -+ usb_dbg(&pdev->dev, "request_mem_region failed\n"); - ret = -ENOMEM; - goto out4; - } ---- a/drivers/usb/host/ohci-ppc-of.c -+++ b/drivers/usb/host/ohci-ppc-of.c -@@ -100,7 +100,7 @@ ohci_hcd_ppc_of_probe(struct of_device * - of_device_is_compatible(dn, "ohci-bigendian") || - of_device_is_compatible(dn, "ohci-be"); - -- dev_dbg(&op->dev, "initializing PPC-OF USB Controller\n"); -+ usb_dbg(&op->dev, "initializing PPC-OF USB Controller\n"); - - rv = of_address_to_resource(dn, 0, &res); - if (rv) -@@ -164,7 +164,7 @@ static int ohci_hcd_ppc_of_remove(struct - struct usb_hcd *hcd = dev_get_drvdata(&op->dev); - dev_set_drvdata(&op->dev, NULL); - -- dev_dbg(&op->dev, "stopping PPC-OF USB Controller\n"); -+ usb_dbg(&op->dev, "stopping PPC-OF USB Controller\n"); - - usb_remove_hcd(hcd); - ---- a/drivers/usb/host/ohci-ps3.c -+++ b/drivers/usb/host/ohci-ps3.c -@@ -91,7 +91,7 @@ static int ps3_ohci_probe(struct ps3_sys - result = ps3_open_hv_device(dev); - - if (result) { -- dev_dbg(&dev->core, "%s:%d: ps3_open_hv_device failed: %s\n", -+ usb_dbg(&dev->core, "%s:%d: ps3_open_hv_device failed: %s\n", - __func__, __LINE__, ps3_result(result)); - result = -EPERM; - goto fail_open; -@@ -100,7 +100,7 @@ static int ps3_ohci_probe(struct ps3_sys - result = ps3_dma_region_create(dev->d_region); - - if (result) { -- dev_dbg(&dev->core, "%s:%d: ps3_dma_region_create failed: " -+ usb_dbg(&dev->core, "%s:%d: ps3_dma_region_create failed: " - "(%d)\n", __func__, __LINE__, result); - BUG_ON("check region type"); - goto fail_dma_region; -@@ -109,19 +109,19 @@ static int ps3_ohci_probe(struct ps3_sys - result = ps3_mmio_region_create(dev->m_region); - - if (result) { -- dev_dbg(&dev->core, "%s:%d: ps3_map_mmio_region failed\n", -+ usb_dbg(&dev->core, "%s:%d: ps3_map_mmio_region failed\n", - __func__, __LINE__); - result = -EPERM; - goto fail_mmio_region; - } - -- dev_dbg(&dev->core, "%s:%d: mmio mapped_addr %lxh\n", __func__, -+ usb_dbg(&dev->core, "%s:%d: mmio mapped_addr %lxh\n", __func__, - __LINE__, dev->m_region->lpar_addr); - - result = ps3_io_irq_setup(PS3_BINDING_CPU_ANY, dev->interrupt_id, &virq); - - if (result) { -- dev_dbg(&dev->core, "%s:%d: ps3_construct_io_irq(%d) failed.\n", -+ usb_dbg(&dev->core, "%s:%d: ps3_construct_io_irq(%d) failed.\n", - __func__, __LINE__, virq); - result = -EPERM; - goto fail_irq; -@@ -132,7 +132,7 @@ static int ps3_ohci_probe(struct ps3_sys - hcd = usb_create_hcd(&ps3_ohci_hc_driver, &dev->core, dev_name(&dev->core)); - - if (!hcd) { -- dev_dbg(&dev->core, "%s:%d: usb_create_hcd failed\n", __func__, -+ usb_dbg(&dev->core, "%s:%d: usb_create_hcd failed\n", __func__, - __LINE__); - result = -ENOMEM; - goto fail_create_hcd; -@@ -142,25 +142,25 @@ static int ps3_ohci_probe(struct ps3_sys - hcd->rsrc_len = dev->m_region->len; - - if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, hcd_name)) -- dev_dbg(&dev->core, "%s:%d: request_mem_region failed\n", -+ usb_dbg(&dev->core, "%s:%d: request_mem_region failed\n", - __func__, __LINE__); - - hcd->regs = ioremap(dev->m_region->lpar_addr, dev->m_region->len); - - if (!hcd->regs) { -- dev_dbg(&dev->core, "%s:%d: ioremap failed\n", __func__, -+ usb_dbg(&dev->core, "%s:%d: ioremap failed\n", __func__, - __LINE__); - result = -EPERM; - goto fail_ioremap; - } - -- dev_dbg(&dev->core, "%s:%d: hcd->rsrc_start %lxh\n", __func__, __LINE__, -+ usb_dbg(&dev->core, "%s:%d: hcd->rsrc_start %lxh\n", __func__, __LINE__, - (unsigned long)hcd->rsrc_start); -- dev_dbg(&dev->core, "%s:%d: hcd->rsrc_len %lxh\n", __func__, __LINE__, -+ usb_dbg(&dev->core, "%s:%d: hcd->rsrc_len %lxh\n", __func__, __LINE__, - (unsigned long)hcd->rsrc_len); -- dev_dbg(&dev->core, "%s:%d: hcd->regs %lxh\n", __func__, __LINE__, -+ usb_dbg(&dev->core, "%s:%d: hcd->regs %lxh\n", __func__, __LINE__, - (unsigned long)hcd->regs); -- dev_dbg(&dev->core, "%s:%d: virq %lu\n", __func__, __LINE__, -+ usb_dbg(&dev->core, "%s:%d: virq %lu\n", __func__, __LINE__, - (unsigned long)virq); - - ps3_system_bus_set_driver_data(dev, hcd); -@@ -168,7 +168,7 @@ static int ps3_ohci_probe(struct ps3_sys - result = usb_add_hcd(hcd, virq, IRQF_DISABLED); - - if (result) { -- dev_dbg(&dev->core, "%s:%d: usb_add_hcd failed (%d)\n", -+ usb_dbg(&dev->core, "%s:%d: usb_add_hcd failed (%d)\n", - __func__, __LINE__, result); - goto fail_add_hcd; - } -@@ -201,8 +201,8 @@ static int ps3_ohci_remove (struct ps3_s - - BUG_ON(!hcd); - -- dev_dbg(&dev->core, "%s:%d: regs %p\n", __func__, __LINE__, hcd->regs); -- dev_dbg(&dev->core, "%s:%d: irq %u\n", __func__, __LINE__, hcd->irq); -+ usb_dbg(&dev->core, "%s:%d: regs %p\n", __func__, __LINE__, hcd->regs); -+ usb_dbg(&dev->core, "%s:%d: irq %u\n", __func__, __LINE__, hcd->irq); - - tmp = hcd->irq; - ---- a/drivers/usb/host/ohci-s3c2410.c -+++ b/drivers/usb/host/ohci-s3c2410.c -@@ -47,7 +47,7 @@ static void s3c2410_start_hc(struct plat - { - struct s3c2410_hcd_info *info = dev->dev.platform_data; - -- dev_dbg(&dev->dev, "s3c2410_start_hc:\n"); -+ usb_dbg(&dev->dev, "s3c2410_start_hc:\n"); - - clk_enable(usb_clk); - mdelay(2); /* let the bus clock stabilise */ -@@ -68,7 +68,7 @@ static void s3c2410_stop_hc(struct platf - { - struct s3c2410_hcd_info *info = dev->dev.platform_data; - -- dev_dbg(&dev->dev, "s3c2410_stop_hc:\n"); -+ usb_dbg(&dev->dev, "s3c2410_stop_hc:\n"); - - if (info != NULL) { - info->report_oc = NULL; -@@ -109,7 +109,7 @@ ohci_s3c2410_hub_status_data (struct usb - for (portno = 0; portno < 2; port++, portno++) { - if (port->oc_changed == 1 && - port->flags & S3C_HCDFLG_USED) { -- dev_dbg(hcd->self.controller, -+ usb_dbg(hcd->self.controller, - "oc change on port %d\n", portno); - - if (orig < 1) -@@ -160,7 +160,7 @@ static int ohci_s3c2410_hub_control ( - int ret = -EINVAL; - u32 *data = (u32 *)buf; - -- dev_dbg(hcd->self.controller, -+ usb_dbg(hcd->self.controller, - "s3c2410_hub_control(%p,0x%04x,0x%04x,0x%04x,%p,%04x)\n", - hcd, typeReq, wValue, wIndex, buf, wLength); - -@@ -178,7 +178,7 @@ static int ohci_s3c2410_hub_control ( - switch (typeReq) { - case SetPortFeature: - if (wValue == USB_PORT_FEAT_POWER) { -- dev_dbg(hcd->self.controller, "SetPortFeat: POWER\n"); -+ usb_dbg(hcd->self.controller, "SetPortFeat: POWER\n"); - s3c2410_usb_set_power(info, wIndex, 1); - goto out; - } -@@ -187,7 +187,7 @@ static int ohci_s3c2410_hub_control ( - case ClearPortFeature: - switch (wValue) { - case USB_PORT_FEAT_C_OVER_CURRENT: -- dev_dbg(hcd->self.controller, -+ usb_dbg(hcd->self.controller, - "ClearPortFeature: C_OVER_CURRENT\n"); - - if (valid_port(wIndex)) { -@@ -198,7 +198,7 @@ static int ohci_s3c2410_hub_control ( - goto out; - - case USB_PORT_FEAT_OVER_CURRENT: -- dev_dbg(hcd->self.controller, -+ usb_dbg(hcd->self.controller, - "ClearPortFeature: OVER_CURRENT\n"); - - if (valid_port(wIndex)) { -@@ -208,7 +208,7 @@ static int ohci_s3c2410_hub_control ( - goto out; - - case USB_PORT_FEAT_POWER: -- dev_dbg(hcd->self.controller, -+ usb_dbg(hcd->self.controller, - "ClearPortFeature: POWER\n"); - - if (valid_port(wIndex)) { -@@ -233,7 +233,7 @@ static int ohci_s3c2410_hub_control ( - if (info->power_control == NULL) - return ret; - -- dev_dbg(hcd->self.controller, "wHubCharacteristics 0x%04x\n", -+ usb_dbg(hcd->self.controller, "wHubCharacteristics 0x%04x\n", - desc->wHubCharacteristics); - - /* remove the old configurations for power-switching, and -@@ -248,7 +248,7 @@ static int ohci_s3c2410_hub_control ( - desc->wHubCharacteristics |= cpu_to_le16(0x0008|0x0001); - } - -- dev_dbg(hcd->self.controller, "wHubCharacteristics after 0x%04x\n", -+ usb_dbg(hcd->self.controller, "wHubCharacteristics after 0x%04x\n", - desc->wHubCharacteristics); - - return ret; -@@ -256,7 +256,7 @@ static int ohci_s3c2410_hub_control ( - case GetPortStatus: - /* check port status */ - -- dev_dbg(hcd->self.controller, "GetPortStatus(%d)\n", wIndex); -+ usb_dbg(hcd->self.controller, "GetPortStatus(%d)\n", wIndex); - - if (valid_port(wIndex)) { - if (info->port[wIndex-1].oc_changed) { ---- a/drivers/usb/host/uhci-hcd.c -+++ b/drivers/usb/host/uhci-hcd.c -@@ -47,6 +47,7 @@ - #include <asm/system.h> - - #include "../core/hcd.h" -+#include "../core/usb.h" - #include "uhci-hcd.h" - #include "pci-quirks.h" - -@@ -265,7 +266,7 @@ __acquires(uhci->lock) - struct usb_device *rhdev = uhci_to_hcd(uhci)->self.root_hub; - - auto_stop = (new_state == UHCI_RH_AUTO_STOPPED); -- dev_dbg(&rhdev->dev, "%s%s\n", __func__, -+ usb_dbg(&rhdev->dev, "%s%s\n", __func__, - (auto_stop ? " (auto-stop)" : "")); - - /* Start off by assuming Resume-Detect interrupts and EGSM work -@@ -371,7 +372,7 @@ static void wakeup_rh(struct uhci_hcd *u - __releases(uhci->lock) - __acquires(uhci->lock) - { -- dev_dbg(&uhci_to_hcd(uhci)->self.root_hub->dev, -+ usb_dbg(&uhci_to_hcd(uhci)->self.root_hub->dev, - "%s%s\n", __func__, - uhci->rh_state == UHCI_RH_AUTO_STOPPED ? - " (auto-start)" : ""); -@@ -775,7 +776,7 @@ static int uhci_pci_suspend(struct usb_h - struct uhci_hcd *uhci = hcd_to_uhci(hcd); - int rc = 0; - -- dev_dbg(uhci_dev(uhci), "%s\n", __func__); -+ usb_dbg(uhci_dev(uhci), "%s\n", __func__); - - spin_lock_irq(&uhci->lock); - if (!test_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags) || uhci->dead) -@@ -811,7 +812,7 @@ static int uhci_pci_resume(struct usb_hc - { - struct uhci_hcd *uhci = hcd_to_uhci(hcd); - -- dev_dbg(uhci_dev(uhci), "%s\n", __func__); -+ usb_dbg(uhci_dev(uhci), "%s\n", __func__); - - /* Since we aren't in D3 any more, it's safe to set this flag - * even if the controller was dead. ---- a/drivers/usb/host/uhci-hub.c -+++ b/drivers/usb/host/uhci-hub.c -@@ -303,7 +303,7 @@ static int uhci_hub_control(struct usb_h - wPortStatus |= USB_PORT_STAT_LOW_SPEED; - - if (wPortChange) -- dev_dbg(uhci_dev(uhci), "port %d portsc %04x,%02x\n", -+ usb_dbg(uhci_dev(uhci), "port %d portsc %04x,%02x\n", - wIndex, status, lstatus); - - *(__le16 *)buf = cpu_to_le16(wPortStatus); ---- a/drivers/usb/host/uhci-q.c -+++ b/drivers/usb/host/uhci-q.c -@@ -649,7 +649,7 @@ static int uhci_check_bandwidth(struct u - - /* Maximum allowable periodic bandwidth is 90%, or 900 us per frame */ - if (minimax_load + qh->load > 900) { -- dev_dbg(uhci_dev(uhci), "bandwidth allocation failed: " -+ usb_dbg(uhci_dev(uhci), "bandwidth allocation failed: " - "period %d, phase %d, %d + %d us\n", - qh->period, qh->phase, minimax_load, qh->load); - return -ENOSPC; -@@ -683,7 +683,7 @@ static void uhci_reserve_bandwidth(struc - break; - } - qh->bandwidth_reserved = 1; -- dev_dbg(uhci_dev(uhci), -+ usb_dbg(uhci_dev(uhci), - "%s dev %d ep%02x-%s, period %d, phase %d, %d us\n", - "reserve", qh->udev->devnum, - qh->hep->desc.bEndpointAddress, p, -@@ -716,7 +716,7 @@ static void uhci_release_bandwidth(struc - break; - } - qh->bandwidth_reserved = 0; -- dev_dbg(uhci_dev(uhci), -+ usb_dbg(uhci_dev(uhci), - "%s dev %d ep%02x-%s, period %d, phase %d, %d us\n", - "release", qh->udev->devnum, - qh->hep->desc.bEndpointAddress, p, -@@ -1169,7 +1169,7 @@ static int uhci_result_common(struct uhc - uhci_packetout(td_token(td))); - if ((debug == 1 && ret != -EPIPE) || debug > 1) { - /* Some debugging code */ -- dev_dbg(&urb->dev->dev, -+ usb_dbg(&urb->dev->dev, - "%s: failed with status %x\n", - __func__, status); - diff --git a/usb/usb-remove-config_usb_debug.patch b/usb/usb-remove-config_usb_debug.patch deleted file mode 100644 index aab1aad055b8d8..00000000000000 --- a/usb/usb-remove-config_usb_debug.patch +++ /dev/null @@ -1,55 +0,0 @@ -Date: Fri, 08 Aug 2008 14:38:31 -0700 -To: Greg KH <greg@kroah.com> -From: Greg Kroah-Hartman <gregkh@suse.de> -Subject: USB: remove CONFIG_USB_DEBUG - -It's no longer needed, so remove it from the system. - -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/core/Kconfig | 8 -------- - drivers/usb/core/Makefile | 4 ---- - drivers/usb/host/Makefile | 4 ---- - 3 files changed, 16 deletions(-) - ---- a/drivers/usb/core/Kconfig -+++ b/drivers/usb/core/Kconfig -@@ -1,14 +1,6 @@ - # - # USB Core configuration - # --config USB_DEBUG -- bool "USB verbose debug messages" -- depends on USB -- help -- Say Y here if you want the USB core & hub drivers to produce a bunch -- of debug messages to the system log. Select this if you are having a -- problem with USB support and want to see more of what is going on. -- - config USB_DEBUG_MESSAGES - bool - prompt "USB debugging messages" if EMBEDDED ---- a/drivers/usb/core/Makefile -+++ b/drivers/usb/core/Makefile -@@ -15,7 +15,3 @@ ifeq ($(CONFIG_USB_DEVICEFS),y) - endif - - obj-$(CONFIG_USB) += usbcore.o -- --ifeq ($(CONFIG_USB_DEBUG),y) --EXTRA_CFLAGS += -DDEBUG --endif ---- a/drivers/usb/host/Makefile -+++ b/drivers/usb/host/Makefile -@@ -2,10 +2,6 @@ - # Makefile for USB Host Controller Drivers - # - --ifeq ($(CONFIG_USB_DEBUG),y) -- EXTRA_CFLAGS += -DDEBUG --endif -- - isp1760-objs := isp1760-hcd.o isp1760-if.o - - obj-$(CONFIG_PCI) += pci-quirks.o @@ -1 +1 @@ -2.6.27-rc7 +2.6.27-rc7-git3 |