Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 21 May 2010 04:26:12 +0000 (21:26 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 21 May 2010 04:26:12 +0000 (21:26 -0700)
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (229 commits)
  USB: remove unused usb_buffer_alloc and usb_buffer_free macros
  usb: musb: update gfp/slab.h includes
  USB: ftdi_sio: fix legacy SIO-device header
  USB: kl5usb105: reimplement using generic framework
  USB: kl5usb105: minor clean ups
  USB: kl5usb105: fix memory leak
  USB: io_ti: use kfifo to implement write buffering
  USB: io_ti: remove unsused private counter
  USB: ti_usb: use kfifo to implement write buffering
  USB: ir-usb: fix incorrect write-buffer length
  USB: aircable: fix incorrect write-buffer length
  USB: safe_serial: straighten out read processing
  USB: safe_serial: reimplement read using generic framework
  USB: safe_serial: reimplement write using generic framework
  usb-storage: always print quirks
  USB: usb-storage: trivial debug improvements
  USB: oti6858: use port write fifo
  USB: oti6858: use kfifo to implement write buffering
  USB: cypress_m8: use kfifo to implement write buffering
  USB: cypress_m8: remove unused drain define
  ...

Fix up conflicts (due to usb_buffer_alloc/free renaming) in
drivers/input/tablet/acecad.c
drivers/input/tablet/kbtab.c
drivers/input/tablet/wacom_sys.c
drivers/media/video/gspca/gspca.c
sound/usb/usbaudio.c

22 files changed:
1  2 
drivers/input/tablet/acecad.c
drivers/input/tablet/kbtab.c
drivers/input/tablet/wacom_sys.c
drivers/input/touchscreen/usbtouchscreen.c
drivers/media/video/au0828/au0828-video.c
drivers/media/video/cx231xx/cx231xx-core.c
drivers/media/video/em28xx/em28xx-core.c
drivers/media/video/gspca/gspca.c
drivers/media/video/hdpvr/hdpvr-video.c
drivers/media/video/tlg2300/pd-main.c
drivers/media/video/tlg2300/pd-video.c
drivers/net/can/usb/ems_usb.c
drivers/net/usb/kaweth.c
drivers/net/wimax/i2400m/usb.c
drivers/net/wireless/ath/ar9170/usb.c
drivers/usb/host/ehci-omap.c
drivers/usb/wusbcore/wa-xfer.c
include/linux/usb/audio.h
include/linux/wait.h
kernel/sched.c
sound/usb/midi.c
sound/usb/misc/ua101.c

index 37d0539fefa0659093bfea9cb5904715c918c6ee,c0470163dc67a69e095d159638c9a42b5c769c8d..aea9a9399a36b43a18663b4fd46d8bd3c7303808
@@@ -246,11 -252,13 +246,11 @@@ static void usb_acecad_disconnect(struc
        struct usb_acecad *acecad = usb_get_intfdata(intf);
  
        usb_set_intfdata(intf, NULL);
 -      if (acecad) {
 -              usb_kill_urb(acecad->irq);
 -              input_unregister_device(acecad->input);
 -              usb_free_urb(acecad->irq);
 -              usb_free_coherent(interface_to_usbdev(intf), 10, acecad->data, acecad->data_dma);
 -              kfree(acecad);
 -      }
 +
 +      input_unregister_device(acecad->input);
 +      usb_free_urb(acecad->irq);
-       usb_buffer_free(acecad->usbdev, 8, acecad->data, acecad->data_dma);
++      usb_free_coherent(acecad->usbdev, 8, acecad->data, acecad->data_dma);
 +      kfree(acecad);
  }
  
  static struct usb_device_id usb_acecad_id_table [] = {
index b9969f1202479bb8946a6e71d38f4bb6fb3457e7,d31b9c793554102cce22a93f257a449e8fe85c94..290f4e57b589a18f440d9d41f01f9c42e7798670
@@@ -173,7 -182,7 +173,7 @@@ static int kbtab_probe(struct usb_inter
        return 0;
  
   fail3:       usb_free_urb(kbtab->irq);
-  fail2:       usb_buffer_free(dev, 8, kbtab->data, kbtab->data_dma);
 - fail2:       usb_free_coherent(dev, 10, kbtab->data, kbtab->data_dma);
++ fail2:       usb_free_coherent(dev, 8, kbtab->data, kbtab->data_dma);
   fail1:       input_free_device(input_dev);
        kfree(kbtab);
        return error;
@@@ -184,11 -193,13 +184,11 @@@ static void kbtab_disconnect(struct usb
        struct kbtab *kbtab = usb_get_intfdata(intf);
  
        usb_set_intfdata(intf, NULL);
 -      if (kbtab) {
 -              usb_kill_urb(kbtab->irq);
 -              input_unregister_device(kbtab->dev);
 -              usb_free_urb(kbtab->irq);
 -              usb_free_coherent(interface_to_usbdev(intf), 10, kbtab->data, kbtab->data_dma);
 -              kfree(kbtab);
 -      }
 +
 +      input_unregister_device(kbtab->dev);
 +      usb_free_urb(kbtab->irq);
-       usb_buffer_free(kbtab->usbdev, 8, kbtab->data, kbtab->data_dma);
++      usb_free_coherent(kbtab->usbdev, 8, kbtab->data, kbtab->data_dma);
 +      kfree(kbtab);
  }
  
  static struct usb_driver kbtab_driver = {
index d90f4e00e51d46b9cf7be9aa4113a8b97e76b826,191197cd83e3c75a784f75e2f535d1b747232939..2dc0c07c04699de92a3a101b1a6f78cf45d7cc48
@@@ -534,11 -632,11 +534,11 @@@ static int wacom_probe(struct usb_inter
        usb_set_intfdata(intf, wacom);
        return 0;
  
 + fail4:       wacom_remove_shared_data(wacom_wac);
   fail3:       usb_free_urb(wacom->irq);
-  fail2:       usb_buffer_free(dev, WACOM_PKGLEN_MAX, wacom_wac->data, wacom->data_dma);
+  fail2:       usb_free_coherent(dev, WACOM_PKGLEN_MAX, wacom_wac->data, wacom->data_dma);
   fail1:       input_free_device(input_dev);
        kfree(wacom);
 -      kfree(wacom_wac);
        return error;
  }
  
@@@ -549,11 -647,11 +549,11 @@@ static void wacom_disconnect(struct usb
        usb_set_intfdata(intf, NULL);
  
        usb_kill_urb(wacom->irq);
 -      input_unregister_device(wacom->dev);
 +      input_unregister_device(wacom->wacom_wac.input);
        usb_free_urb(wacom->irq);
-       usb_buffer_free(interface_to_usbdev(intf), WACOM_PKGLEN_MAX,
+       usb_free_coherent(interface_to_usbdev(intf), WACOM_PKGLEN_MAX,
 -                        wacom->wacom_wac->data, wacom->data_dma);
 -      kfree(wacom->wacom_wac);
 +                      wacom->wacom_wac.data, wacom->data_dma);
 +      wacom_remove_shared_data(&wacom->wacom_wac);
        kfree(wacom);
  }
  
index efe61593878346e3017d480469832c48b7c9f3f9,00713f81d1e2d9a96597106d789af2485d422464..678675bb365256cd289eb31d8095c914163421b7
@@@ -213,7 -213,7 +213,7 @@@ static int alloc_and_submit_int_urb(str
                goto error;
        }
  
-       buffer = usb_buffer_alloc(dev, buffer_len,
 -      buffer = usb_alloc_coherent(dev, ep->wMaxPacketSize,
++      buffer = usb_alloc_coherent(dev, buffer_len,
                                GFP_KERNEL, &urb->transfer_dma);
        if (!buffer) {
                ret = -ENOMEM;
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc kernel/sched.c
Simple merge
Simple merge
Simple merge