[2.6 patch] remove USB_AUDIO and USB_MIDI drivers

[2.6 patch] remove USB_AUDIO and USB_MIDI drivers

[Adrian Bunk]

[-- Attachment #1: Type: text/plain, Size: 780 bytes --]

Since I've gotten exactly zero negative feedback, this patch removes the 
obsolete USB_AUDIO and USB_MIDI drivers.

It also makes the global function usb_get_string() static since this 
function no longer has any external user.


Signed-off-by: Adrian Bunk <bunk@stusta.de>

---

 drivers/usb/Makefile         |    2 
 drivers/usb/class/Kconfig    |   47 
 drivers/usb/class/Makefile   |    2 
 drivers/usb/class/audio.c    | 3870 -----------------------------------
 drivers/usb/class/audio.h    |  110 
 drivers/usb/class/usb-midi.c | 2154 -------------------
 drivers/usb/class/usb-midi.h |  164 -
 drivers/usb/core/message.c   |    5 
 include/linux/usb.h          |    2 
 9 files changed, 2 insertions(+), 6354 deletions(-)

Due to it's size, the patch is attached gzip'ed.

[-- Attachment #2: patch-remove-obsolete-usb-oss.gz --]
[-- Type: application/octet-stream, Size: 41749 bytes --]

Re: [2.6 patch] remove USB_AUDIO and USB_MIDI drivers

[Greg KH]

On Tue, Nov 08, 2005 at 07:12:39PM +0100, Adrian Bunk wrote:
> Since I've gotten exactly zero negative feedback, this patch removes the 
> obsolete USB_AUDIO and USB_MIDI drivers.
> 
> It also makes the global function usb_get_string() static since this 
> function no longer has any external user.
> 
> 
> Signed-off-by: Adrian Bunk <bunk@stusta.de>
> 
> ---
> 
>  drivers/usb/Makefile         |    2 
>  drivers/usb/class/Kconfig    |   47 
>  drivers/usb/class/Makefile   |    2 
>  drivers/usb/class/audio.c    | 3870 -----------------------------------
>  drivers/usb/class/audio.h    |  110 
>  drivers/usb/class/usb-midi.c | 2154 -------------------
>  drivers/usb/class/usb-midi.h |  164 -
>  drivers/usb/core/message.c   |    5 
>  include/linux/usb.h          |    2 
>  9 files changed, 2 insertions(+), 6354 deletions(-)
> 
> Due to it's size, the patch is attached gzip'ed.

Ugh, care to send it not gziped?  I can handle large patches...

And please split the get_string one out into a separate patch.

thanks,

greg k-h

Re: [2.6 patch] remove USB_AUDIO and USB_MIDI drivers

[Adrian Bunk]

On Tue, Nov 08, 2005 at 10:46:38AM -0800, Greg KH wrote:
> On Tue, Nov 08, 2005 at 07:12:39PM +0100, Adrian Bunk wrote:
> > Since I've gotten exactly zero negative feedback, this patch removes the 
> > obsolete USB_AUDIO and USB_MIDI drivers.
> > 
> > It also makes the global function usb_get_string() static since this 
> > function no longer has any external user.
> > 
> > 
> > Signed-off-by: Adrian Bunk <bunk@stusta.de>
> > 
> > ---
> > 
> >  drivers/usb/Makefile         |    2 
> >  drivers/usb/class/Kconfig    |   47 
> >  drivers/usb/class/Makefile   |    2 
> >  drivers/usb/class/audio.c    | 3870 -----------------------------------
> >  drivers/usb/class/audio.h    |  110 
> >  drivers/usb/class/usb-midi.c | 2154 -------------------
> >  drivers/usb/class/usb-midi.h |  164 -
> >  drivers/usb/core/message.c   |    5 
> >  include/linux/usb.h          |    2 
> >  9 files changed, 2 insertions(+), 6354 deletions(-)
> > 
> > Due to it's size, the patch is attached gzip'ed.
> 
> Ugh, care to send it not gziped?  I can handle large patches...

Sure, I'll send it with the Cc' to linux-kernel removed.

> And please split the get_string one out into a separate patch.

OK.

> thanks,
> 
> greg k-h

cu
Adrian

-- 

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed

[2.6 patch] drivers/usb/core/message.c: make usb_get_string() static

[Adrian Bunk]

After the removal of usb-midi.c, there's no longer any external user of 
usb_get_string().


Signed-off-by: Adrian Bunk <bunk@stusta.de>

---

 drivers/usb/core/message.c |    5 ++---
 include/linux/usb.h        |    2 --
 2 files changed, 2 insertions(+), 5 deletions(-)

--- linux-2.6.14-mm1-full/include/linux/usb.h.old	2005-11-08 18:42:15.000000000 +0100
+++ linux-2.6.14-mm1-full/include/linux/usb.h	2005-11-08 18:42:23.000000000 +0100
@@ -1004,8 +1004,6 @@
 	unsigned char descindex, void *buf, int size);
 extern int usb_get_status(struct usb_device *dev,
 	int type, int target, void *data);
-extern int usb_get_string(struct usb_device *dev,
-	unsigned short langid, unsigned char index, void *buf, int size);
 extern int usb_string(struct usb_device *dev, int index,
 	char *buf, size_t size);
 
--- linux-2.6.14-mm1-full/drivers/usb/core/message.c.old	2005-11-08 18:42:32.000000000 +0100
+++ linux-2.6.14-mm1-full/drivers/usb/core/message.c	2005-11-08 18:42:58.000000000 +0100
@@ -637,8 +637,8 @@
  * Returns the number of bytes received on success, or else the status code
  * returned by the underlying usb_control_msg() call.
  */
-int usb_get_string(struct usb_device *dev, unsigned short langid,
-		unsigned char index, void *buf, int size)
+static int usb_get_string(struct usb_device *dev, unsigned short langid,
+			  unsigned char index, void *buf, int size)
 {
 	int i;
 	int result;
@@ -1488,7 +1488,6 @@
 // synchronous control message convenience routines
 EXPORT_SYMBOL(usb_get_descriptor);
 EXPORT_SYMBOL(usb_get_status);
-EXPORT_SYMBOL(usb_get_string);
 EXPORT_SYMBOL(usb_string);
 
 // synchronous calls that also maintain usbcore state