From: Greg KH To: torvalds@transmeta.com Cc: linux-usb-devel@lists.sourceforge.net Subject: [BK PATCH] USB changes for 2.5.6-pre1 Pull from: bk://linuxusb.bkbits.net/linus-2.5 Documentation/usb/auerswald.txt | 4 Documentation/usb/usb-serial.txt | 22 +- drivers/usb/audio.c | 22 -- drivers/usb/auerswald.c | 2 drivers/usb/devices.c | 8 drivers/usb/hcd.c | 421 +++++++++++++++++++++++++++++++++++---- drivers/usb/hcd.h | 85 +++++++ drivers/usb/hcd/ehci-hcd.c | 1 drivers/usb/hcd/ehci-hub.c | 2 drivers/usb/hcd/ehci-mem.c | 2 drivers/usb/hcd/ehci-q.c | 2 drivers/usb/hcd/ehci-sched.c | 5 drivers/usb/hcd/ohci-q.c | 2 drivers/usb/hid-core.c | 3 drivers/usb/serial/Config.help | 7 drivers/usb/serial/Config.in | 2 drivers/usb/serial/belkin_sa.c | 8 drivers/usb/serial/cyberjack.c | 19 - drivers/usb/serial/empeg.c | 21 - drivers/usb/serial/ftdi_sio.c | 13 - drivers/usb/serial/ipaq.c | 23 -- drivers/usb/serial/ipaq.h | 10 drivers/usb/serial/ir-usb.c | 8 drivers/usb/serial/keyspan.c | 5 drivers/usb/serial/keyspan_pda.c | 9 drivers/usb/serial/kl5kusb105.c | 28 -- drivers/usb/serial/mct_u232.c | 15 - drivers/usb/serial/omninet.c | 9 drivers/usb/serial/pl2303.c | 9 drivers/usb/serial/usbserial.c | 320 ++++++++++++++--------------- drivers/usb/serial/visor.c | 233 ++++++--------------- drivers/usb/serial/visor.h | 1 drivers/usb/serial/whiteheat.c | 11 - drivers/usb/uhci.c | 12 - drivers/usb/uhci.h | 1 drivers/usb/usb-ohci.c | 1 drivers/usb/usb-uhci.c | 1 drivers/usb/usb.c | 343 +++---------------------------- include/linux/usb.h | 58 ----- 39 files changed, 808 insertions(+), 940 deletions(-) ------ ChangeSet@1.423, 2002-02-27 15:02:44-08:00, greg@kroah.com USB auerswald driver: - changed the minor number the auerswald driver was using, as it was found out that this number was already in use by another USB driver! Documentation/usb/auerswald.txt | 4 ++-- drivers/usb/auerswald.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) ------ ChangeSet@1.424, 2002-02-27 15:09:12-08:00, david-b@packbell.net [PATCH] hid-core and hotplug This restores a line someone deleted, which affects hotplugging. Basically this restores correct/previous behavior: the HID driver only matches HID devices, not every device that ever connects. drivers/usb/hid-core.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletion(-) ------ ChangeSet@1.425, 2002-02-27 15:11:46-08:00, david-b@packbell.net misc hcd cleanup This is minor cleanup; pulls #includes out of files that aren't intended to compile by themselves. ehci bandwidth recording Here's a minor update to the EHCI interrupt scheduler, recording the bandwidth used by an URB for usbfs. drivers/usb/hcd/ehci-hcd.c | 1 + drivers/usb/hcd/ehci-hub.c | 2 -- drivers/usb/hcd/ehci-mem.c | 2 -- drivers/usb/hcd/ehci-q.c | 2 -- drivers/usb/hcd/ehci-sched.c | 5 +++-- drivers/usb/hcd/ohci-q.c | 2 -- 6 files changed, 4 insertions(+), 10 deletions(-) ------ ChangeSet@1.426, 2002-02-27 15:13:10-08:00, david-b@packbell.net PATCH: audio driver urb allocation This fixes a bug in the audio driver which came from an incorrect conversion from static to dynamic URB allocation. It's against 2.5.5 I noticed this while trying to see exactly how ISO transfers get used. The bug is that while originally the driver statically allocated several structures {urb + N * iso packet descriptors}, the update forgot to allocate the ISO descriptors. Likely not many folk noticed this on 32 bit machines, where sizeof urb == 92, because kmalloc rounds that up to 128, adding 36 bytes of external padding. The ISO descriptors took up 32 bytes of that, which "just happened" to already have been allocated but unused. drivers/usb/audio.c | 22 +++++++++------------- 1 files changed, 9 insertions(+), 13 deletions(-) ------ ChangeSet@1.427, 2002-02-27 15:15:11-08:00, david-b@packbell.net This is another USB API cleanup patch. It's against 2.5.5: - Moves 8 functions from usb.[hc] to hcd.[hc] - Also moves some data structures and types - Now usbdevfs and "old" HCDs #include "hcd.h" - Minor tweaks to the "hcd" layer (one less FIXME) - Minor kernel doc and comment cleanups Basically this continues moving the HCD-only functionality out of the way of normal USB device drivers. Converging "usb_bus" and "usb_hcd" (later!) will be a bit easier too. I did basic sanity tests, there's little to break ... :) There are still a few functions in usb.c that aren't for general driver use. They're mostly for enumeration, in areas where the hub driver and HCD root hubs need to do various kinds of magic. It wasn't clear how to decouple those, they can certainly wait. drivers/usb/devices.c | 8 drivers/usb/hcd.c | 421 ++++++++++++++++++++++++++++++++++++++++++++----- drivers/usb/hcd.h | 85 +++++++++ drivers/usb/usb-ohci.c | 1 drivers/usb/usb-uhci.c | 1 drivers/usb/usb.c | 343 ++++----------------------------------- include/linux/usb.h | 58 ------ 7 files changed, 510 insertions(+), 407 deletions(-) ------ ChangeSet@1.428, 2002-02-27 15:16:43-08:00, johannes@erdfelt.com uhci.c, speed improvements Basically, the patch turns switching off FSBR into a lazy operation with the assumption there will be another transfer shortly afterwards. This works wonders for usb-storage for instance. drivers/usb/uhci.c | 12 +++++++++--- drivers/usb/uhci.h | 1 + 2 files changed, 10 insertions(+), 3 deletions(-) ------ ChangeSet@1.429, 2002-02-27 15:19:42-08:00, ganesh@tuxtop.vxindia.veritas.com usb ipaq driver: Added support for the HP Jornada. Documentation/usb/usb-serial.txt | 22 +++++++++++++--------- drivers/usb/serial/Config.help | 7 ++++--- drivers/usb/serial/Config.in | 2 +- drivers/usb/serial/ipaq.c | 23 ++++++++++------------- drivers/usb/serial/ipaq.h | 10 +++++++--- 5 files changed, 35 insertions(+), 29 deletions(-) ------ ChangeSet@1.430, 2002-02-27 15:21:26-08:00, greg@kroah.com usb serial core: - cleaned up some whitespace issues - changed MOD_INC logic for the generic driver - the port->sem lock is now taken by the serial core, not the individual usb-serial drivers. This is to reduce races. drivers/usb/serial/usbserial.c | 320 ++++++++++++++++++++--------------------- 1 files changed, 159 insertions(+), 161 deletions(-) ------ ChangeSet@1.431, 2002-02-27 15:24:00-08:00, greg@kroah.com usb visor driver: - reworked urb handling, getting rid of lots of code now that we have proper urb reference counting. - removed port locks as the usb-serial core now does this. - added support for the Palm m515 thanks to SilaS drivers/usb/serial/visor.c | 233 +++++++++++++-------------------------------- drivers/usb/serial/visor.h | 1 2 files changed, 73 insertions(+), 161 deletions(-) ------ ChangeSet@1.432, 2002-02-27 15:25:12-08:00, greg@kroah.com usb serial drivers: - removed all usage of port->sem as the usb serial core now does this. drivers/usb/serial/belkin_sa.c | 8 -------- drivers/usb/serial/cyberjack.c | 19 ++----------------- drivers/usb/serial/empeg.c | 21 --------------------- drivers/usb/serial/ftdi_sio.c | 13 ------------- drivers/usb/serial/ir-usb.c | 8 -------- drivers/usb/serial/keyspan.c | 5 ----- drivers/usb/serial/keyspan_pda.c | 9 --------- drivers/usb/serial/kl5kusb105.c | 28 +--------------------------- drivers/usb/serial/mct_u232.c | 15 --------------- drivers/usb/serial/omninet.c | 9 --------- drivers/usb/serial/pl2303.c | 9 --------- drivers/usb/serial/whiteheat.c | 11 ----------- 12 files changed, 3 insertions(+), 152 deletions(-)