From: Greg KH To: torvalds@transmeta.com Cc: linux-usb-devel@lists.sourceforge.net Subject: [BK PATCH] USB changes for 2.5.17 More USB changes for 2.5.17 Pull from: bk://linuxusb.bkbits.net/linus-2.5 MAINTAINERS | 8 ++++ drivers/media/video/cpia_usb.c | 15 ++++++-- drivers/usb/class/audio.c | 2 + drivers/usb/core/devio.c | 1 drivers/usb/core/hcd.c | 9 ----- drivers/usb/core/usb-debug.c | 1 drivers/usb/host/Config.in | 16 ++++----- drivers/usb/host/ehci-sched.c | 9 ----- drivers/usb/host/uhci.c | 41 ++--------------------- drivers/usb/host/usb-uhci-hcd.c | 3 - drivers/usb/host/usb-uhci-q.c | 44 ++++--------------------- drivers/usb/host/usb-uhci.c | 69 ---------------------------------------- drivers/usb/image/scanner.c | 2 + drivers/usb/image/scanner.h | 3 + drivers/usb/media/se401.c | 2 - drivers/usb/media/stv680.c | 2 - include/linux/usb.h | 13 ++++--- 17 files changed, 53 insertions(+), 187 deletions(-) ------ ChangeSet@1.593, 2002-05-22 13:50:48-07:00, greg@kroah.com USB stv680, remove urb->next usage Removed the use of the next field due to the change in the urb structure. drivers/usb/media/stv680.c | 2 -- 1 files changed, 2 deletions(-) ------ ChangeSet@1.592, 2002-05-22 13:49:48-07:00, greg@kroah.com USB se401, remove urb->next usage Removed the use of the next field due to the change in the urb structure. drivers/usb/media/se401.c | 2 -- 1 files changed, 2 deletions(-) ------ ChangeSet@1.591, 2002-05-22 11:59:03-07:00, greg@kroah.com USB build changes turned off the uhci.c and usb-uhci.c drivers in the build process to force people to use the uhci-hcd and usb-uhci-hcd drivers. drivers/usb/host/Config.in | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) ------ ChangeSet@1.590, 2002-05-22 11:47:37-07:00, david-b@pacbell.net [PATCH] audio, set urb->interval This sets urb->interval in two places it hadn't previously been set, allowing things like SOX and XMMS to play through usb audio. Using this and the previous patches, I was able to verify playback of some Ogg Vorbis encoded music using most of the 2.5.17 host controller drivers. However, "uhci-hcd" and "usb-uhci-hcd" did not want to bind the audio driver: reading the config descriptor (in audio.c) stalled rather consistently. That failure was seen with the other USB 1.1 drivers too, but not as consistently. drivers/usb/class/audio.c | 2 ++ 1 files changed, 2 insertions(+) ------ ChangeSet@1.589, 2002-05-22 11:47:20-07:00, david-b@pacbell.net [PATCH] hcds, remove urb->next This makes the hcds stop expecting urb->next to exist. ehci-hcd ... remove obsolete sanity check usb-uhci-hcd ... remove code (wouldn't be called) Two "old style" drivers got updated too (uhci, usb-uhci) so that folk can use them in case of problems with their "new style" analogues. drivers/usb/host/ehci-sched.c | 9 ----- drivers/usb/host/uhci.c | 41 ++--------------------- drivers/usb/host/usb-uhci-hcd.c | 3 - drivers/usb/host/usb-uhci-q.c | 44 ++++--------------------- drivers/usb/host/usb-uhci.c | 69 ---------------------------------------- 5 files changed, 12 insertions(+), 154 deletions(-) ------ ChangeSet@1.588, 2002-05-22 11:47:07-07:00, david-b@pacbell.net [PATCH] cpia_usb, remove urb->next This is the 2.5 version of the sample driver patch I sent around last week. It updates one video driver to work with the updated ISO API: no urb->next (explicit resubmit, with error detection) and explicit transfer interval (HCs must remove 1 msec limit). The 2.4 version is known to work, but usb video in 2.5 seems to be a bit ill so this just fixes the compilation problem created by the first of these patches. drivers/media/video/cpia_usb.c | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) ------ ChangeSet@1.587, 2002-05-22 11:46:54-07:00, david-b@pacbell.net [PATCH] usbcore, remove urb->next Given the discussions of last week, this removes urb->next from the USB core API. This change simplifies the driver API by getting rid of a superfluous feature (and related new-developer confusion), gets rid of a hidden failure mode (drivers can now see resubmit failures), lets us get rid of a HCD feature that isn't consistently implemented, and so on. This will break some code. There are ISO drivers that don't use urb->next (like audio), but most video drivers do. My patch #2 fixes one such driver. My patch #3 fixes host controller drivers, most of which were already converted. drivers/usb/core/devio.c | 1 - drivers/usb/core/hcd.c | 9 --------- drivers/usb/core/usb-debug.c | 1 - include/linux/usb.h | 13 +++++++------ 4 files changed, 7 insertions(+), 17 deletions(-) ------ ChangeSet@1.586, 2002-05-22 10:55:52-07:00, beattie@beattie-home.net [PATCH] change USB scanner maintainer Add Maintainer for USB scanner MAINTAINERS | 8 ++++++++ drivers/usb/image/scanner.c | 2 ++ drivers/usb/image/scanner.h | 3 +++ 3 files changed, 13 insertions(+) ------