diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-21 00:26:12 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-21 00:26:12 -0400 |
commit | 7a9b149212f3716c598afe973b6261fd58453b7a (patch) | |
tree | 477716d84c71da124448b72278e98da28aadbd3d /drivers/input | |
parent | 3d62e3fdce8ef265a3706c52ae1ca6ab84e30f0e (diff) | |
parent | e26bcf37234c67624f62d9fc95f922b8dbda1363 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
* 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
Diffstat (limited to 'drivers/input')
-rw-r--r-- | drivers/input/joystick/xpad.c | 16 | ||||
-rw-r--r-- | drivers/input/misc/ati_remote.c | 12 | ||||
-rw-r--r-- | drivers/input/misc/ati_remote2.c | 4 | ||||
-rw-r--r-- | drivers/input/misc/cm109.c | 28 | ||||
-rw-r--r-- | drivers/input/misc/keyspan_remote.c | 6 | ||||
-rw-r--r-- | drivers/input/misc/powermate.c | 17 | ||||
-rw-r--r-- | drivers/input/misc/yealink.c | 25 | ||||
-rw-r--r-- | drivers/input/mouse/appletouch.c | 12 | ||||
-rw-r--r-- | drivers/input/mouse/bcm5974.c | 24 | ||||
-rw-r--r-- | drivers/input/tablet/acecad.c | 6 | ||||
-rw-r--r-- | drivers/input/tablet/aiptek.c | 14 | ||||
-rw-r--r-- | drivers/input/tablet/gtco.c | 12 | ||||
-rw-r--r-- | drivers/input/tablet/kbtab.c | 6 | ||||
-rw-r--r-- | drivers/input/tablet/wacom_sys.c | 8 | ||||
-rw-r--r-- | drivers/input/touchscreen/usbtouchscreen.c | 8 |
15 files changed, 90 insertions, 108 deletions
diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c index 9b3353b404da..c1087ce4cef9 100644 --- a/drivers/input/joystick/xpad.c +++ b/drivers/input/joystick/xpad.c | |||
@@ -533,8 +533,8 @@ static int xpad_init_output(struct usb_interface *intf, struct usb_xpad *xpad) | |||
533 | if (xpad->xtype != XTYPE_XBOX360 && xpad->xtype != XTYPE_XBOX) | 533 | if (xpad->xtype != XTYPE_XBOX360 && xpad->xtype != XTYPE_XBOX) |
534 | return 0; | 534 | return 0; |
535 | 535 | ||
536 | xpad->odata = usb_buffer_alloc(xpad->udev, XPAD_PKT_LEN, | 536 | xpad->odata = usb_alloc_coherent(xpad->udev, XPAD_PKT_LEN, |
537 | GFP_KERNEL, &xpad->odata_dma); | 537 | GFP_KERNEL, &xpad->odata_dma); |
538 | if (!xpad->odata) | 538 | if (!xpad->odata) |
539 | goto fail1; | 539 | goto fail1; |
540 | 540 | ||
@@ -554,7 +554,7 @@ static int xpad_init_output(struct usb_interface *intf, struct usb_xpad *xpad) | |||
554 | 554 | ||
555 | return 0; | 555 | return 0; |
556 | 556 | ||
557 | fail2: usb_buffer_free(xpad->udev, XPAD_PKT_LEN, xpad->odata, xpad->odata_dma); | 557 | fail2: usb_free_coherent(xpad->udev, XPAD_PKT_LEN, xpad->odata, xpad->odata_dma); |
558 | fail1: return error; | 558 | fail1: return error; |
559 | } | 559 | } |
560 | 560 | ||
@@ -568,7 +568,7 @@ static void xpad_deinit_output(struct usb_xpad *xpad) | |||
568 | { | 568 | { |
569 | if (xpad->xtype == XTYPE_XBOX360 || xpad->xtype == XTYPE_XBOX) { | 569 | if (xpad->xtype == XTYPE_XBOX360 || xpad->xtype == XTYPE_XBOX) { |
570 | usb_free_urb(xpad->irq_out); | 570 | usb_free_urb(xpad->irq_out); |
571 | usb_buffer_free(xpad->udev, XPAD_PKT_LEN, | 571 | usb_free_coherent(xpad->udev, XPAD_PKT_LEN, |
572 | xpad->odata, xpad->odata_dma); | 572 | xpad->odata, xpad->odata_dma); |
573 | } | 573 | } |
574 | } | 574 | } |
@@ -788,8 +788,8 @@ static int xpad_probe(struct usb_interface *intf, const struct usb_device_id *id | |||
788 | if (!xpad || !input_dev) | 788 | if (!xpad || !input_dev) |
789 | goto fail1; | 789 | goto fail1; |
790 | 790 | ||
791 | xpad->idata = usb_buffer_alloc(udev, XPAD_PKT_LEN, | 791 | xpad->idata = usb_alloc_coherent(udev, XPAD_PKT_LEN, |
792 | GFP_KERNEL, &xpad->idata_dma); | 792 | GFP_KERNEL, &xpad->idata_dma); |
793 | if (!xpad->idata) | 793 | if (!xpad->idata) |
794 | goto fail1; | 794 | goto fail1; |
795 | 795 | ||
@@ -942,7 +942,7 @@ static int xpad_probe(struct usb_interface *intf, const struct usb_device_id *id | |||
942 | fail5: usb_kill_urb(xpad->irq_in); | 942 | fail5: usb_kill_urb(xpad->irq_in); |
943 | fail4: usb_free_urb(xpad->irq_in); | 943 | fail4: usb_free_urb(xpad->irq_in); |
944 | fail3: xpad_deinit_output(xpad); | 944 | fail3: xpad_deinit_output(xpad); |
945 | fail2: usb_buffer_free(udev, XPAD_PKT_LEN, xpad->idata, xpad->idata_dma); | 945 | fail2: usb_free_coherent(udev, XPAD_PKT_LEN, xpad->idata, xpad->idata_dma); |
946 | fail1: input_free_device(input_dev); | 946 | fail1: input_free_device(input_dev); |
947 | kfree(xpad); | 947 | kfree(xpad); |
948 | return error; | 948 | return error; |
@@ -964,7 +964,7 @@ static void xpad_disconnect(struct usb_interface *intf) | |||
964 | usb_kill_urb(xpad->irq_in); | 964 | usb_kill_urb(xpad->irq_in); |
965 | } | 965 | } |
966 | usb_free_urb(xpad->irq_in); | 966 | usb_free_urb(xpad->irq_in); |
967 | usb_buffer_free(xpad->udev, XPAD_PKT_LEN, | 967 | usb_free_coherent(xpad->udev, XPAD_PKT_LEN, |
968 | xpad->idata, xpad->idata_dma); | 968 | xpad->idata, xpad->idata_dma); |
969 | kfree(xpad); | 969 | kfree(xpad); |
970 | } | 970 | } |
diff --git a/drivers/input/misc/ati_remote.c b/drivers/input/misc/ati_remote.c index e8bbc619f6df..bce57129afba 100644 --- a/drivers/input/misc/ati_remote.c +++ b/drivers/input/misc/ati_remote.c | |||
@@ -624,13 +624,13 @@ static void ati_remote_irq_in(struct urb *urb) | |||
624 | static int ati_remote_alloc_buffers(struct usb_device *udev, | 624 | static int ati_remote_alloc_buffers(struct usb_device *udev, |
625 | struct ati_remote *ati_remote) | 625 | struct ati_remote *ati_remote) |
626 | { | 626 | { |
627 | ati_remote->inbuf = usb_buffer_alloc(udev, DATA_BUFSIZE, GFP_ATOMIC, | 627 | ati_remote->inbuf = usb_alloc_coherent(udev, DATA_BUFSIZE, GFP_ATOMIC, |
628 | &ati_remote->inbuf_dma); | 628 | &ati_remote->inbuf_dma); |
629 | if (!ati_remote->inbuf) | 629 | if (!ati_remote->inbuf) |
630 | return -1; | 630 | return -1; |
631 | 631 | ||
632 | ati_remote->outbuf = usb_buffer_alloc(udev, DATA_BUFSIZE, GFP_ATOMIC, | 632 | ati_remote->outbuf = usb_alloc_coherent(udev, DATA_BUFSIZE, GFP_ATOMIC, |
633 | &ati_remote->outbuf_dma); | 633 | &ati_remote->outbuf_dma); |
634 | if (!ati_remote->outbuf) | 634 | if (!ati_remote->outbuf) |
635 | return -1; | 635 | return -1; |
636 | 636 | ||
@@ -653,10 +653,10 @@ static void ati_remote_free_buffers(struct ati_remote *ati_remote) | |||
653 | usb_free_urb(ati_remote->irq_urb); | 653 | usb_free_urb(ati_remote->irq_urb); |
654 | usb_free_urb(ati_remote->out_urb); | 654 | usb_free_urb(ati_remote->out_urb); |
655 | 655 | ||
656 | usb_buffer_free(ati_remote->udev, DATA_BUFSIZE, | 656 | usb_free_coherent(ati_remote->udev, DATA_BUFSIZE, |
657 | ati_remote->inbuf, ati_remote->inbuf_dma); | 657 | ati_remote->inbuf, ati_remote->inbuf_dma); |
658 | 658 | ||
659 | usb_buffer_free(ati_remote->udev, DATA_BUFSIZE, | 659 | usb_free_coherent(ati_remote->udev, DATA_BUFSIZE, |
660 | ati_remote->outbuf, ati_remote->outbuf_dma); | 660 | ati_remote->outbuf, ati_remote->outbuf_dma); |
661 | } | 661 | } |
662 | 662 | ||
diff --git a/drivers/input/misc/ati_remote2.c b/drivers/input/misc/ati_remote2.c index 2124b99378bb..e148749b5851 100644 --- a/drivers/input/misc/ati_remote2.c +++ b/drivers/input/misc/ati_remote2.c | |||
@@ -589,7 +589,7 @@ static int ati_remote2_urb_init(struct ati_remote2 *ar2) | |||
589 | int i, pipe, maxp; | 589 | int i, pipe, maxp; |
590 | 590 | ||
591 | for (i = 0; i < 2; i++) { | 591 | for (i = 0; i < 2; i++) { |
592 | ar2->buf[i] = usb_buffer_alloc(udev, 4, GFP_KERNEL, &ar2->buf_dma[i]); | 592 | ar2->buf[i] = usb_alloc_coherent(udev, 4, GFP_KERNEL, &ar2->buf_dma[i]); |
593 | if (!ar2->buf[i]) | 593 | if (!ar2->buf[i]) |
594 | return -ENOMEM; | 594 | return -ENOMEM; |
595 | 595 | ||
@@ -617,7 +617,7 @@ static void ati_remote2_urb_cleanup(struct ati_remote2 *ar2) | |||
617 | 617 | ||
618 | for (i = 0; i < 2; i++) { | 618 | for (i = 0; i < 2; i++) { |
619 | usb_free_urb(ar2->urb[i]); | 619 | usb_free_urb(ar2->urb[i]); |
620 | usb_buffer_free(ar2->udev, 4, ar2->buf[i], ar2->buf_dma[i]); | 620 | usb_free_coherent(ar2->udev, 4, ar2->buf[i], ar2->buf_dma[i]); |
621 | } | 621 | } |
622 | } | 622 | } |
623 | 623 | ||
diff --git a/drivers/input/misc/cm109.c b/drivers/input/misc/cm109.c index 86457feccfc4..2b0eba6619bd 100644 --- a/drivers/input/misc/cm109.c +++ b/drivers/input/misc/cm109.c | |||
@@ -102,7 +102,6 @@ struct cm109_dev { | |||
102 | struct cm109_ctl_packet *ctl_data; | 102 | struct cm109_ctl_packet *ctl_data; |
103 | dma_addr_t ctl_dma; | 103 | dma_addr_t ctl_dma; |
104 | struct usb_ctrlrequest *ctl_req; | 104 | struct usb_ctrlrequest *ctl_req; |
105 | dma_addr_t ctl_req_dma; | ||
106 | struct urb *urb_ctl; | 105 | struct urb *urb_ctl; |
107 | /* | 106 | /* |
108 | * The 3 bitfields below are protected by ctl_submit_lock. | 107 | * The 3 bitfields below are protected by ctl_submit_lock. |
@@ -629,15 +628,13 @@ static const struct usb_device_id cm109_usb_table[] = { | |||
629 | 628 | ||
630 | static void cm109_usb_cleanup(struct cm109_dev *dev) | 629 | static void cm109_usb_cleanup(struct cm109_dev *dev) |
631 | { | 630 | { |
632 | if (dev->ctl_req) | 631 | kfree(dev->ctl_req); |
633 | usb_buffer_free(dev->udev, sizeof(*(dev->ctl_req)), | ||
634 | dev->ctl_req, dev->ctl_req_dma); | ||
635 | if (dev->ctl_data) | 632 | if (dev->ctl_data) |
636 | usb_buffer_free(dev->udev, USB_PKT_LEN, | 633 | usb_free_coherent(dev->udev, USB_PKT_LEN, |
637 | dev->ctl_data, dev->ctl_dma); | 634 | dev->ctl_data, dev->ctl_dma); |
638 | if (dev->irq_data) | 635 | if (dev->irq_data) |
639 | usb_buffer_free(dev->udev, USB_PKT_LEN, | 636 | usb_free_coherent(dev->udev, USB_PKT_LEN, |
640 | dev->irq_data, dev->irq_dma); | 637 | dev->irq_data, dev->irq_dma); |
641 | 638 | ||
642 | usb_free_urb(dev->urb_irq); /* parameter validation in core/urb */ | 639 | usb_free_urb(dev->urb_irq); /* parameter validation in core/urb */ |
643 | usb_free_urb(dev->urb_ctl); /* parameter validation in core/urb */ | 640 | usb_free_urb(dev->urb_ctl); /* parameter validation in core/urb */ |
@@ -686,18 +683,17 @@ static int cm109_usb_probe(struct usb_interface *intf, | |||
686 | goto err_out; | 683 | goto err_out; |
687 | 684 | ||
688 | /* allocate usb buffers */ | 685 | /* allocate usb buffers */ |
689 | dev->irq_data = usb_buffer_alloc(udev, USB_PKT_LEN, | 686 | dev->irq_data = usb_alloc_coherent(udev, USB_PKT_LEN, |
690 | GFP_KERNEL, &dev->irq_dma); | 687 | GFP_KERNEL, &dev->irq_dma); |
691 | if (!dev->irq_data) | 688 | if (!dev->irq_data) |
692 | goto err_out; | 689 | goto err_out; |
693 | 690 | ||
694 | dev->ctl_data = usb_buffer_alloc(udev, USB_PKT_LEN, | 691 | dev->ctl_data = usb_alloc_coherent(udev, USB_PKT_LEN, |
695 | GFP_KERNEL, &dev->ctl_dma); | 692 | GFP_KERNEL, &dev->ctl_dma); |
696 | if (!dev->ctl_data) | 693 | if (!dev->ctl_data) |
697 | goto err_out; | 694 | goto err_out; |
698 | 695 | ||
699 | dev->ctl_req = usb_buffer_alloc(udev, sizeof(*(dev->ctl_req)), | 696 | dev->ctl_req = kmalloc(sizeof(*(dev->ctl_req)), GFP_KERNEL); |
700 | GFP_KERNEL, &dev->ctl_req_dma); | ||
701 | if (!dev->ctl_req) | 697 | if (!dev->ctl_req) |
702 | goto err_out; | 698 | goto err_out; |
703 | 699 | ||
@@ -735,10 +731,8 @@ static int cm109_usb_probe(struct usb_interface *intf, | |||
735 | usb_fill_control_urb(dev->urb_ctl, udev, usb_sndctrlpipe(udev, 0), | 731 | usb_fill_control_urb(dev->urb_ctl, udev, usb_sndctrlpipe(udev, 0), |
736 | (void *)dev->ctl_req, dev->ctl_data, USB_PKT_LEN, | 732 | (void *)dev->ctl_req, dev->ctl_data, USB_PKT_LEN, |
737 | cm109_urb_ctl_callback, dev); | 733 | cm109_urb_ctl_callback, dev); |
738 | dev->urb_ctl->setup_dma = dev->ctl_req_dma; | ||
739 | dev->urb_ctl->transfer_dma = dev->ctl_dma; | 734 | dev->urb_ctl->transfer_dma = dev->ctl_dma; |
740 | dev->urb_ctl->transfer_flags |= URB_NO_SETUP_DMA_MAP | | 735 | dev->urb_ctl->transfer_flags |= URB_NO_TRANSFER_DMA_MAP; |
741 | URB_NO_TRANSFER_DMA_MAP; | ||
742 | dev->urb_ctl->dev = udev; | 736 | dev->urb_ctl->dev = udev; |
743 | 737 | ||
744 | /* find out the physical bus location */ | 738 | /* find out the physical bus location */ |
diff --git a/drivers/input/misc/keyspan_remote.c b/drivers/input/misc/keyspan_remote.c index 86afdd1fdf9d..a93c525475c6 100644 --- a/drivers/input/misc/keyspan_remote.c +++ b/drivers/input/misc/keyspan_remote.c | |||
@@ -464,7 +464,7 @@ static int keyspan_probe(struct usb_interface *interface, const struct usb_devic | |||
464 | remote->in_endpoint = endpoint; | 464 | remote->in_endpoint = endpoint; |
465 | remote->toggle = -1; /* Set to -1 so we will always not match the toggle from the first remote message. */ | 465 | remote->toggle = -1; /* Set to -1 so we will always not match the toggle from the first remote message. */ |
466 | 466 | ||
467 | remote->in_buffer = usb_buffer_alloc(udev, RECV_SIZE, GFP_ATOMIC, &remote->in_dma); | 467 | remote->in_buffer = usb_alloc_coherent(udev, RECV_SIZE, GFP_ATOMIC, &remote->in_dma); |
468 | if (!remote->in_buffer) { | 468 | if (!remote->in_buffer) { |
469 | error = -ENOMEM; | 469 | error = -ENOMEM; |
470 | goto fail1; | 470 | goto fail1; |
@@ -543,7 +543,7 @@ static int keyspan_probe(struct usb_interface *interface, const struct usb_devic | |||
543 | return 0; | 543 | return 0; |
544 | 544 | ||
545 | fail3: usb_free_urb(remote->irq_urb); | 545 | fail3: usb_free_urb(remote->irq_urb); |
546 | fail2: usb_buffer_free(udev, RECV_SIZE, remote->in_buffer, remote->in_dma); | 546 | fail2: usb_free_coherent(udev, RECV_SIZE, remote->in_buffer, remote->in_dma); |
547 | fail1: kfree(remote); | 547 | fail1: kfree(remote); |
548 | input_free_device(input_dev); | 548 | input_free_device(input_dev); |
549 | 549 | ||
@@ -564,7 +564,7 @@ static void keyspan_disconnect(struct usb_interface *interface) | |||
564 | input_unregister_device(remote->input); | 564 | input_unregister_device(remote->input); |
565 | usb_kill_urb(remote->irq_urb); | 565 | usb_kill_urb(remote->irq_urb); |
566 | usb_free_urb(remote->irq_urb); | 566 | usb_free_urb(remote->irq_urb); |
567 | usb_buffer_free(remote->udev, RECV_SIZE, remote->in_buffer, remote->in_dma); | 567 | usb_free_coherent(remote->udev, RECV_SIZE, remote->in_buffer, remote->in_dma); |
568 | kfree(remote); | 568 | kfree(remote); |
569 | } | 569 | } |
570 | } | 570 | } |
diff --git a/drivers/input/misc/powermate.c b/drivers/input/misc/powermate.c index 668913d12044..bf170f6b4422 100644 --- a/drivers/input/misc/powermate.c +++ b/drivers/input/misc/powermate.c | |||
@@ -64,7 +64,6 @@ struct powermate_device { | |||
64 | dma_addr_t data_dma; | 64 | dma_addr_t data_dma; |
65 | struct urb *irq, *config; | 65 | struct urb *irq, *config; |
66 | struct usb_ctrlrequest *configcr; | 66 | struct usb_ctrlrequest *configcr; |
67 | dma_addr_t configcr_dma; | ||
68 | struct usb_device *udev; | 67 | struct usb_device *udev; |
69 | struct input_dev *input; | 68 | struct input_dev *input; |
70 | spinlock_t lock; | 69 | spinlock_t lock; |
@@ -182,8 +181,6 @@ static void powermate_sync_state(struct powermate_device *pm) | |||
182 | usb_fill_control_urb(pm->config, pm->udev, usb_sndctrlpipe(pm->udev, 0), | 181 | usb_fill_control_urb(pm->config, pm->udev, usb_sndctrlpipe(pm->udev, 0), |
183 | (void *) pm->configcr, NULL, 0, | 182 | (void *) pm->configcr, NULL, 0, |
184 | powermate_config_complete, pm); | 183 | powermate_config_complete, pm); |
185 | pm->config->setup_dma = pm->configcr_dma; | ||
186 | pm->config->transfer_flags |= URB_NO_SETUP_DMA_MAP; | ||
187 | 184 | ||
188 | if (usb_submit_urb(pm->config, GFP_ATOMIC)) | 185 | if (usb_submit_urb(pm->config, GFP_ATOMIC)) |
189 | printk(KERN_ERR "powermate: usb_submit_urb(config) failed"); | 186 | printk(KERN_ERR "powermate: usb_submit_urb(config) failed"); |
@@ -276,13 +273,12 @@ static int powermate_input_event(struct input_dev *dev, unsigned int type, unsig | |||
276 | 273 | ||
277 | static int powermate_alloc_buffers(struct usb_device *udev, struct powermate_device *pm) | 274 | static int powermate_alloc_buffers(struct usb_device *udev, struct powermate_device *pm) |
278 | { | 275 | { |
279 | pm->data = usb_buffer_alloc(udev, POWERMATE_PAYLOAD_SIZE_MAX, | 276 | pm->data = usb_alloc_coherent(udev, POWERMATE_PAYLOAD_SIZE_MAX, |
280 | GFP_ATOMIC, &pm->data_dma); | 277 | GFP_ATOMIC, &pm->data_dma); |
281 | if (!pm->data) | 278 | if (!pm->data) |
282 | return -1; | 279 | return -1; |
283 | 280 | ||
284 | pm->configcr = usb_buffer_alloc(udev, sizeof(*(pm->configcr)), | 281 | pm->configcr = kmalloc(sizeof(*(pm->configcr)), GFP_KERNEL); |
285 | GFP_ATOMIC, &pm->configcr_dma); | ||
286 | if (!pm->configcr) | 282 | if (!pm->configcr) |
287 | return -1; | 283 | return -1; |
288 | 284 | ||
@@ -291,10 +287,9 @@ static int powermate_alloc_buffers(struct usb_device *udev, struct powermate_dev | |||
291 | 287 | ||
292 | static void powermate_free_buffers(struct usb_device *udev, struct powermate_device *pm) | 288 | static void powermate_free_buffers(struct usb_device *udev, struct powermate_device *pm) |
293 | { | 289 | { |
294 | usb_buffer_free(udev, POWERMATE_PAYLOAD_SIZE_MAX, | 290 | usb_free_coherent(udev, POWERMATE_PAYLOAD_SIZE_MAX, |
295 | pm->data, pm->data_dma); | 291 | pm->data, pm->data_dma); |
296 | usb_buffer_free(udev, sizeof(*(pm->configcr)), | 292 | kfree(pm->configcr); |
297 | pm->configcr, pm->configcr_dma); | ||
298 | } | 293 | } |
299 | 294 | ||
300 | /* Called whenever a USB device matching one in our supported devices table is connected */ | 295 | /* Called whenever a USB device matching one in our supported devices table is connected */ |
diff --git a/drivers/input/misc/yealink.c b/drivers/input/misc/yealink.c index 93a22ac0f88c..41201c6b5e68 100644 --- a/drivers/input/misc/yealink.c +++ b/drivers/input/misc/yealink.c | |||
@@ -111,7 +111,6 @@ struct yealink_dev { | |||
111 | struct yld_ctl_packet *ctl_data; | 111 | struct yld_ctl_packet *ctl_data; |
112 | dma_addr_t ctl_dma; | 112 | dma_addr_t ctl_dma; |
113 | struct usb_ctrlrequest *ctl_req; | 113 | struct usb_ctrlrequest *ctl_req; |
114 | dma_addr_t ctl_req_dma; | ||
115 | struct urb *urb_ctl; | 114 | struct urb *urb_ctl; |
116 | 115 | ||
117 | char phys[64]; /* physical device path */ | 116 | char phys[64]; /* physical device path */ |
@@ -836,12 +835,9 @@ static int usb_cleanup(struct yealink_dev *yld, int err) | |||
836 | usb_free_urb(yld->urb_irq); | 835 | usb_free_urb(yld->urb_irq); |
837 | usb_free_urb(yld->urb_ctl); | 836 | usb_free_urb(yld->urb_ctl); |
838 | 837 | ||
839 | usb_buffer_free(yld->udev, sizeof(*(yld->ctl_req)), | 838 | kfree(yld->ctl_req); |
840 | yld->ctl_req, yld->ctl_req_dma); | 839 | usb_free_coherent(yld->udev, USB_PKT_LEN, yld->ctl_data, yld->ctl_dma); |
841 | usb_buffer_free(yld->udev, USB_PKT_LEN, | 840 | usb_free_coherent(yld->udev, USB_PKT_LEN, yld->irq_data, yld->irq_dma); |
842 | yld->ctl_data, yld->ctl_dma); | ||
843 | usb_buffer_free(yld->udev, USB_PKT_LEN, | ||
844 | yld->irq_data, yld->irq_dma); | ||
845 | 841 | ||
846 | kfree(yld); | 842 | kfree(yld); |
847 | return err; | 843 | return err; |
@@ -886,18 +882,17 @@ static int usb_probe(struct usb_interface *intf, const struct usb_device_id *id) | |||
886 | return usb_cleanup(yld, -ENOMEM); | 882 | return usb_cleanup(yld, -ENOMEM); |
887 | 883 | ||
888 | /* allocate usb buffers */ | 884 | /* allocate usb buffers */ |
889 | yld->irq_data = usb_buffer_alloc(udev, USB_PKT_LEN, | 885 | yld->irq_data = usb_alloc_coherent(udev, USB_PKT_LEN, |
890 | GFP_ATOMIC, &yld->irq_dma); | 886 | GFP_ATOMIC, &yld->irq_dma); |
891 | if (yld->irq_data == NULL) | 887 | if (yld->irq_data == NULL) |
892 | return usb_cleanup(yld, -ENOMEM); | 888 | return usb_cleanup(yld, -ENOMEM); |
893 | 889 | ||
894 | yld->ctl_data = usb_buffer_alloc(udev, USB_PKT_LEN, | 890 | yld->ctl_data = usb_alloc_coherent(udev, USB_PKT_LEN, |
895 | GFP_ATOMIC, &yld->ctl_dma); | 891 | GFP_ATOMIC, &yld->ctl_dma); |
896 | if (!yld->ctl_data) | 892 | if (!yld->ctl_data) |
897 | return usb_cleanup(yld, -ENOMEM); | 893 | return usb_cleanup(yld, -ENOMEM); |
898 | 894 | ||
899 | yld->ctl_req = usb_buffer_alloc(udev, sizeof(*(yld->ctl_req)), | 895 | yld->ctl_req = kmalloc(sizeof(*(yld->ctl_req)), GFP_KERNEL); |
900 | GFP_ATOMIC, &yld->ctl_req_dma); | ||
901 | if (yld->ctl_req == NULL) | 896 | if (yld->ctl_req == NULL) |
902 | return usb_cleanup(yld, -ENOMEM); | 897 | return usb_cleanup(yld, -ENOMEM); |
903 | 898 | ||
@@ -936,10 +931,8 @@ static int usb_probe(struct usb_interface *intf, const struct usb_device_id *id) | |||
936 | usb_fill_control_urb(yld->urb_ctl, udev, usb_sndctrlpipe(udev, 0), | 931 | usb_fill_control_urb(yld->urb_ctl, udev, usb_sndctrlpipe(udev, 0), |
937 | (void *)yld->ctl_req, yld->ctl_data, USB_PKT_LEN, | 932 | (void *)yld->ctl_req, yld->ctl_data, USB_PKT_LEN, |
938 | urb_ctl_callback, yld); | 933 | urb_ctl_callback, yld); |
939 | yld->urb_ctl->setup_dma = yld->ctl_req_dma; | ||
940 | yld->urb_ctl->transfer_dma = yld->ctl_dma; | 934 | yld->urb_ctl->transfer_dma = yld->ctl_dma; |
941 | yld->urb_ctl->transfer_flags |= URB_NO_SETUP_DMA_MAP | | 935 | yld->urb_ctl->transfer_flags |= URB_NO_TRANSFER_DMA_MAP; |
942 | URB_NO_TRANSFER_DMA_MAP; | ||
943 | yld->urb_ctl->dev = udev; | 936 | yld->urb_ctl->dev = udev; |
944 | 937 | ||
945 | /* find out the physical bus location */ | 938 | /* find out the physical bus location */ |
diff --git a/drivers/input/mouse/appletouch.c b/drivers/input/mouse/appletouch.c index 53ec7ddd1826..05edd75abca0 100644 --- a/drivers/input/mouse/appletouch.c +++ b/drivers/input/mouse/appletouch.c | |||
@@ -806,8 +806,8 @@ static int atp_probe(struct usb_interface *iface, | |||
806 | if (!dev->urb) | 806 | if (!dev->urb) |
807 | goto err_free_devs; | 807 | goto err_free_devs; |
808 | 808 | ||
809 | dev->data = usb_buffer_alloc(dev->udev, dev->info->datalen, GFP_KERNEL, | 809 | dev->data = usb_alloc_coherent(dev->udev, dev->info->datalen, GFP_KERNEL, |
810 | &dev->urb->transfer_dma); | 810 | &dev->urb->transfer_dma); |
811 | if (!dev->data) | 811 | if (!dev->data) |
812 | goto err_free_urb; | 812 | goto err_free_urb; |
813 | 813 | ||
@@ -862,8 +862,8 @@ static int atp_probe(struct usb_interface *iface, | |||
862 | return 0; | 862 | return 0; |
863 | 863 | ||
864 | err_free_buffer: | 864 | err_free_buffer: |
865 | usb_buffer_free(dev->udev, dev->info->datalen, | 865 | usb_free_coherent(dev->udev, dev->info->datalen, |
866 | dev->data, dev->urb->transfer_dma); | 866 | dev->data, dev->urb->transfer_dma); |
867 | err_free_urb: | 867 | err_free_urb: |
868 | usb_free_urb(dev->urb); | 868 | usb_free_urb(dev->urb); |
869 | err_free_devs: | 869 | err_free_devs: |
@@ -881,8 +881,8 @@ static void atp_disconnect(struct usb_interface *iface) | |||
881 | if (dev) { | 881 | if (dev) { |
882 | usb_kill_urb(dev->urb); | 882 | usb_kill_urb(dev->urb); |
883 | input_unregister_device(dev->input); | 883 | input_unregister_device(dev->input); |
884 | usb_buffer_free(dev->udev, dev->info->datalen, | 884 | usb_free_coherent(dev->udev, dev->info->datalen, |
885 | dev->data, dev->urb->transfer_dma); | 885 | dev->data, dev->urb->transfer_dma); |
886 | usb_free_urb(dev->urb); | 886 | usb_free_urb(dev->urb); |
887 | kfree(dev); | 887 | kfree(dev); |
888 | } | 888 | } |
diff --git a/drivers/input/mouse/bcm5974.c b/drivers/input/mouse/bcm5974.c index b89879bd860f..6dedded27222 100644 --- a/drivers/input/mouse/bcm5974.c +++ b/drivers/input/mouse/bcm5974.c | |||
@@ -715,15 +715,15 @@ static int bcm5974_probe(struct usb_interface *iface, | |||
715 | if (!dev->tp_urb) | 715 | if (!dev->tp_urb) |
716 | goto err_free_bt_urb; | 716 | goto err_free_bt_urb; |
717 | 717 | ||
718 | dev->bt_data = usb_buffer_alloc(dev->udev, | 718 | dev->bt_data = usb_alloc_coherent(dev->udev, |
719 | dev->cfg.bt_datalen, GFP_KERNEL, | 719 | dev->cfg.bt_datalen, GFP_KERNEL, |
720 | &dev->bt_urb->transfer_dma); | 720 | &dev->bt_urb->transfer_dma); |
721 | if (!dev->bt_data) | 721 | if (!dev->bt_data) |
722 | goto err_free_urb; | 722 | goto err_free_urb; |
723 | 723 | ||
724 | dev->tp_data = usb_buffer_alloc(dev->udev, | 724 | dev->tp_data = usb_alloc_coherent(dev->udev, |
725 | dev->cfg.tp_datalen, GFP_KERNEL, | 725 | dev->cfg.tp_datalen, GFP_KERNEL, |
726 | &dev->tp_urb->transfer_dma); | 726 | &dev->tp_urb->transfer_dma); |
727 | if (!dev->tp_data) | 727 | if (!dev->tp_data) |
728 | goto err_free_bt_buffer; | 728 | goto err_free_bt_buffer; |
729 | 729 | ||
@@ -765,10 +765,10 @@ static int bcm5974_probe(struct usb_interface *iface, | |||
765 | return 0; | 765 | return 0; |
766 | 766 | ||
767 | err_free_buffer: | 767 | err_free_buffer: |
768 | usb_buffer_free(dev->udev, dev->cfg.tp_datalen, | 768 | usb_free_coherent(dev->udev, dev->cfg.tp_datalen, |
769 | dev->tp_data, dev->tp_urb->transfer_dma); | 769 | dev->tp_data, dev->tp_urb->transfer_dma); |
770 | err_free_bt_buffer: | 770 | err_free_bt_buffer: |
771 | usb_buffer_free(dev->udev, dev->cfg.bt_datalen, | 771 | usb_free_coherent(dev->udev, dev->cfg.bt_datalen, |
772 | dev->bt_data, dev->bt_urb->transfer_dma); | 772 | dev->bt_data, dev->bt_urb->transfer_dma); |
773 | err_free_urb: | 773 | err_free_urb: |
774 | usb_free_urb(dev->tp_urb); | 774 | usb_free_urb(dev->tp_urb); |
@@ -788,10 +788,10 @@ static void bcm5974_disconnect(struct usb_interface *iface) | |||
788 | usb_set_intfdata(iface, NULL); | 788 | usb_set_intfdata(iface, NULL); |
789 | 789 | ||
790 | input_unregister_device(dev->input); | 790 | input_unregister_device(dev->input); |
791 | usb_buffer_free(dev->udev, dev->cfg.tp_datalen, | 791 | usb_free_coherent(dev->udev, dev->cfg.tp_datalen, |
792 | dev->tp_data, dev->tp_urb->transfer_dma); | 792 | dev->tp_data, dev->tp_urb->transfer_dma); |
793 | usb_buffer_free(dev->udev, dev->cfg.bt_datalen, | 793 | usb_free_coherent(dev->udev, dev->cfg.bt_datalen, |
794 | dev->bt_data, dev->bt_urb->transfer_dma); | 794 | dev->bt_data, dev->bt_urb->transfer_dma); |
795 | usb_free_urb(dev->tp_urb); | 795 | usb_free_urb(dev->tp_urb); |
796 | usb_free_urb(dev->bt_urb); | 796 | usb_free_urb(dev->bt_urb); |
797 | kfree(dev); | 797 | kfree(dev); |
diff --git a/drivers/input/tablet/acecad.c b/drivers/input/tablet/acecad.c index 37d0539fefa0..aea9a9399a36 100644 --- a/drivers/input/tablet/acecad.c +++ b/drivers/input/tablet/acecad.c | |||
@@ -155,7 +155,7 @@ static int usb_acecad_probe(struct usb_interface *intf, const struct usb_device_ | |||
155 | goto fail1; | 155 | goto fail1; |
156 | } | 156 | } |
157 | 157 | ||
158 | acecad->data = usb_buffer_alloc(dev, 8, GFP_KERNEL, &acecad->data_dma); | 158 | acecad->data = usb_alloc_coherent(dev, 8, GFP_KERNEL, &acecad->data_dma); |
159 | if (!acecad->data) { | 159 | if (!acecad->data) { |
160 | err= -ENOMEM; | 160 | err= -ENOMEM; |
161 | goto fail1; | 161 | goto fail1; |
@@ -235,7 +235,7 @@ static int usb_acecad_probe(struct usb_interface *intf, const struct usb_device_ | |||
235 | 235 | ||
236 | return 0; | 236 | return 0; |
237 | 237 | ||
238 | fail2: usb_buffer_free(dev, 8, acecad->data, acecad->data_dma); | 238 | fail2: usb_free_coherent(dev, 8, acecad->data, acecad->data_dma); |
239 | fail1: input_free_device(input_dev); | 239 | fail1: input_free_device(input_dev); |
240 | kfree(acecad); | 240 | kfree(acecad); |
241 | return err; | 241 | return err; |
@@ -249,7 +249,7 @@ static void usb_acecad_disconnect(struct usb_interface *intf) | |||
249 | 249 | ||
250 | input_unregister_device(acecad->input); | 250 | input_unregister_device(acecad->input); |
251 | usb_free_urb(acecad->irq); | 251 | usb_free_urb(acecad->irq); |
252 | usb_buffer_free(acecad->usbdev, 8, acecad->data, acecad->data_dma); | 252 | usb_free_coherent(acecad->usbdev, 8, acecad->data, acecad->data_dma); |
253 | kfree(acecad); | 253 | kfree(acecad); |
254 | } | 254 | } |
255 | 255 | ||
diff --git a/drivers/input/tablet/aiptek.c b/drivers/input/tablet/aiptek.c index 4be039d7dcad..51b80b08d467 100644 --- a/drivers/input/tablet/aiptek.c +++ b/drivers/input/tablet/aiptek.c | |||
@@ -1711,8 +1711,8 @@ aiptek_probe(struct usb_interface *intf, const struct usb_device_id *id) | |||
1711 | goto fail1; | 1711 | goto fail1; |
1712 | } | 1712 | } |
1713 | 1713 | ||
1714 | aiptek->data = usb_buffer_alloc(usbdev, AIPTEK_PACKET_LENGTH, | 1714 | aiptek->data = usb_alloc_coherent(usbdev, AIPTEK_PACKET_LENGTH, |
1715 | GFP_ATOMIC, &aiptek->data_dma); | 1715 | GFP_ATOMIC, &aiptek->data_dma); |
1716 | if (!aiptek->data) { | 1716 | if (!aiptek->data) { |
1717 | dev_warn(&intf->dev, "cannot allocate usb buffer\n"); | 1717 | dev_warn(&intf->dev, "cannot allocate usb buffer\n"); |
1718 | goto fail1; | 1718 | goto fail1; |
@@ -1884,8 +1884,8 @@ aiptek_probe(struct usb_interface *intf, const struct usb_device_id *id) | |||
1884 | 1884 | ||
1885 | fail4: sysfs_remove_group(&intf->dev.kobj, &aiptek_attribute_group); | 1885 | fail4: sysfs_remove_group(&intf->dev.kobj, &aiptek_attribute_group); |
1886 | fail3: usb_free_urb(aiptek->urb); | 1886 | fail3: usb_free_urb(aiptek->urb); |
1887 | fail2: usb_buffer_free(usbdev, AIPTEK_PACKET_LENGTH, aiptek->data, | 1887 | fail2: usb_free_coherent(usbdev, AIPTEK_PACKET_LENGTH, aiptek->data, |
1888 | aiptek->data_dma); | 1888 | aiptek->data_dma); |
1889 | fail1: usb_set_intfdata(intf, NULL); | 1889 | fail1: usb_set_intfdata(intf, NULL); |
1890 | input_free_device(inputdev); | 1890 | input_free_device(inputdev); |
1891 | kfree(aiptek); | 1891 | kfree(aiptek); |
@@ -1909,9 +1909,9 @@ static void aiptek_disconnect(struct usb_interface *intf) | |||
1909 | input_unregister_device(aiptek->inputdev); | 1909 | input_unregister_device(aiptek->inputdev); |
1910 | sysfs_remove_group(&intf->dev.kobj, &aiptek_attribute_group); | 1910 | sysfs_remove_group(&intf->dev.kobj, &aiptek_attribute_group); |
1911 | usb_free_urb(aiptek->urb); | 1911 | usb_free_urb(aiptek->urb); |
1912 | usb_buffer_free(interface_to_usbdev(intf), | 1912 | usb_free_coherent(interface_to_usbdev(intf), |
1913 | AIPTEK_PACKET_LENGTH, | 1913 | AIPTEK_PACKET_LENGTH, |
1914 | aiptek->data, aiptek->data_dma); | 1914 | aiptek->data, aiptek->data_dma); |
1915 | kfree(aiptek); | 1915 | kfree(aiptek); |
1916 | } | 1916 | } |
1917 | } | 1917 | } |
diff --git a/drivers/input/tablet/gtco.c b/drivers/input/tablet/gtco.c index 866a9ee1af1a..8ea6afe2e992 100644 --- a/drivers/input/tablet/gtco.c +++ b/drivers/input/tablet/gtco.c | |||
@@ -850,8 +850,8 @@ static int gtco_probe(struct usb_interface *usbinterface, | |||
850 | gtco->usbdev = usb_get_dev(interface_to_usbdev(usbinterface)); | 850 | gtco->usbdev = usb_get_dev(interface_to_usbdev(usbinterface)); |
851 | 851 | ||
852 | /* Allocate some data for incoming reports */ | 852 | /* Allocate some data for incoming reports */ |
853 | gtco->buffer = usb_buffer_alloc(gtco->usbdev, REPORT_MAX_SIZE, | 853 | gtco->buffer = usb_alloc_coherent(gtco->usbdev, REPORT_MAX_SIZE, |
854 | GFP_KERNEL, >co->buf_dma); | 854 | GFP_KERNEL, >co->buf_dma); |
855 | if (!gtco->buffer) { | 855 | if (!gtco->buffer) { |
856 | err("No more memory for us buffers"); | 856 | err("No more memory for us buffers"); |
857 | error = -ENOMEM; | 857 | error = -ENOMEM; |
@@ -982,8 +982,8 @@ static int gtco_probe(struct usb_interface *usbinterface, | |||
982 | err_free_urb: | 982 | err_free_urb: |
983 | usb_free_urb(gtco->urbinfo); | 983 | usb_free_urb(gtco->urbinfo); |
984 | err_free_buf: | 984 | err_free_buf: |
985 | usb_buffer_free(gtco->usbdev, REPORT_MAX_SIZE, | 985 | usb_free_coherent(gtco->usbdev, REPORT_MAX_SIZE, |
986 | gtco->buffer, gtco->buf_dma); | 986 | gtco->buffer, gtco->buf_dma); |
987 | err_free_devs: | 987 | err_free_devs: |
988 | input_free_device(input_dev); | 988 | input_free_device(input_dev); |
989 | kfree(gtco); | 989 | kfree(gtco); |
@@ -1005,8 +1005,8 @@ static void gtco_disconnect(struct usb_interface *interface) | |||
1005 | input_unregister_device(gtco->inputdevice); | 1005 | input_unregister_device(gtco->inputdevice); |
1006 | usb_kill_urb(gtco->urbinfo); | 1006 | usb_kill_urb(gtco->urbinfo); |
1007 | usb_free_urb(gtco->urbinfo); | 1007 | usb_free_urb(gtco->urbinfo); |
1008 | usb_buffer_free(gtco->usbdev, REPORT_MAX_SIZE, | 1008 | usb_free_coherent(gtco->usbdev, REPORT_MAX_SIZE, |
1009 | gtco->buffer, gtco->buf_dma); | 1009 | gtco->buffer, gtco->buf_dma); |
1010 | kfree(gtco); | 1010 | kfree(gtco); |
1011 | } | 1011 | } |
1012 | 1012 | ||
diff --git a/drivers/input/tablet/kbtab.c b/drivers/input/tablet/kbtab.c index b9969f120247..290f4e57b589 100644 --- a/drivers/input/tablet/kbtab.c +++ b/drivers/input/tablet/kbtab.c | |||
@@ -122,7 +122,7 @@ static int kbtab_probe(struct usb_interface *intf, const struct usb_device_id *i | |||
122 | if (!kbtab || !input_dev) | 122 | if (!kbtab || !input_dev) |
123 | goto fail1; | 123 | goto fail1; |
124 | 124 | ||
125 | kbtab->data = usb_buffer_alloc(dev, 8, GFP_KERNEL, &kbtab->data_dma); | 125 | kbtab->data = usb_alloc_coherent(dev, 8, GFP_KERNEL, &kbtab->data_dma); |
126 | if (!kbtab->data) | 126 | if (!kbtab->data) |
127 | goto fail1; | 127 | goto fail1; |
128 | 128 | ||
@@ -173,7 +173,7 @@ static int kbtab_probe(struct usb_interface *intf, const struct usb_device_id *i | |||
173 | return 0; | 173 | return 0; |
174 | 174 | ||
175 | fail3: usb_free_urb(kbtab->irq); | 175 | fail3: usb_free_urb(kbtab->irq); |
176 | fail2: usb_buffer_free(dev, 8, kbtab->data, kbtab->data_dma); | 176 | fail2: usb_free_coherent(dev, 8, kbtab->data, kbtab->data_dma); |
177 | fail1: input_free_device(input_dev); | 177 | fail1: input_free_device(input_dev); |
178 | kfree(kbtab); | 178 | kfree(kbtab); |
179 | return error; | 179 | return error; |
@@ -187,7 +187,7 @@ static void kbtab_disconnect(struct usb_interface *intf) | |||
187 | 187 | ||
188 | input_unregister_device(kbtab->dev); | 188 | input_unregister_device(kbtab->dev); |
189 | usb_free_urb(kbtab->irq); | 189 | usb_free_urb(kbtab->irq); |
190 | usb_buffer_free(kbtab->usbdev, 8, kbtab->data, kbtab->data_dma); | 190 | usb_free_coherent(kbtab->usbdev, 8, kbtab->data, kbtab->data_dma); |
191 | kfree(kbtab); | 191 | kfree(kbtab); |
192 | } | 192 | } |
193 | 193 | ||
diff --git a/drivers/input/tablet/wacom_sys.c b/drivers/input/tablet/wacom_sys.c index d90f4e00e51d..2dc0c07c0469 100644 --- a/drivers/input/tablet/wacom_sys.c +++ b/drivers/input/tablet/wacom_sys.c | |||
@@ -465,8 +465,8 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i | |||
465 | goto fail1; | 465 | goto fail1; |
466 | } | 466 | } |
467 | 467 | ||
468 | wacom_wac->data = usb_buffer_alloc(dev, WACOM_PKGLEN_MAX, | 468 | wacom_wac->data = usb_alloc_coherent(dev, WACOM_PKGLEN_MAX, |
469 | GFP_KERNEL, &wacom->data_dma); | 469 | GFP_KERNEL, &wacom->data_dma); |
470 | if (!wacom_wac->data) { | 470 | if (!wacom_wac->data) { |
471 | error = -ENOMEM; | 471 | error = -ENOMEM; |
472 | goto fail1; | 472 | goto fail1; |
@@ -536,7 +536,7 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i | |||
536 | 536 | ||
537 | fail4: wacom_remove_shared_data(wacom_wac); | 537 | fail4: wacom_remove_shared_data(wacom_wac); |
538 | fail3: usb_free_urb(wacom->irq); | 538 | fail3: usb_free_urb(wacom->irq); |
539 | fail2: usb_buffer_free(dev, WACOM_PKGLEN_MAX, wacom_wac->data, wacom->data_dma); | 539 | fail2: usb_free_coherent(dev, WACOM_PKGLEN_MAX, wacom_wac->data, wacom->data_dma); |
540 | fail1: input_free_device(input_dev); | 540 | fail1: input_free_device(input_dev); |
541 | kfree(wacom); | 541 | kfree(wacom); |
542 | return error; | 542 | return error; |
@@ -551,7 +551,7 @@ static void wacom_disconnect(struct usb_interface *intf) | |||
551 | usb_kill_urb(wacom->irq); | 551 | usb_kill_urb(wacom->irq); |
552 | input_unregister_device(wacom->wacom_wac.input); | 552 | input_unregister_device(wacom->wacom_wac.input); |
553 | usb_free_urb(wacom->irq); | 553 | usb_free_urb(wacom->irq); |
554 | usb_buffer_free(interface_to_usbdev(intf), WACOM_PKGLEN_MAX, | 554 | usb_free_coherent(interface_to_usbdev(intf), WACOM_PKGLEN_MAX, |
555 | wacom->wacom_wac.data, wacom->data_dma); | 555 | wacom->wacom_wac.data, wacom->data_dma); |
556 | wacom_remove_shared_data(&wacom->wacom_wac); | 556 | wacom_remove_shared_data(&wacom->wacom_wac); |
557 | kfree(wacom); | 557 | kfree(wacom); |
diff --git a/drivers/input/touchscreen/usbtouchscreen.c b/drivers/input/touchscreen/usbtouchscreen.c index 0b0ae2e17a60..29a8bbf3f086 100644 --- a/drivers/input/touchscreen/usbtouchscreen.c +++ b/drivers/input/touchscreen/usbtouchscreen.c | |||
@@ -1290,8 +1290,8 @@ static void usbtouch_close(struct input_dev *input) | |||
1290 | static void usbtouch_free_buffers(struct usb_device *udev, | 1290 | static void usbtouch_free_buffers(struct usb_device *udev, |
1291 | struct usbtouch_usb *usbtouch) | 1291 | struct usbtouch_usb *usbtouch) |
1292 | { | 1292 | { |
1293 | usb_buffer_free(udev, usbtouch->type->rept_size, | 1293 | usb_free_coherent(udev, usbtouch->type->rept_size, |
1294 | usbtouch->data, usbtouch->data_dma); | 1294 | usbtouch->data, usbtouch->data_dma); |
1295 | kfree(usbtouch->buffer); | 1295 | kfree(usbtouch->buffer); |
1296 | } | 1296 | } |
1297 | 1297 | ||
@@ -1335,8 +1335,8 @@ static int usbtouch_probe(struct usb_interface *intf, | |||
1335 | if (!type->process_pkt) | 1335 | if (!type->process_pkt) |
1336 | type->process_pkt = usbtouch_process_pkt; | 1336 | type->process_pkt = usbtouch_process_pkt; |
1337 | 1337 | ||
1338 | usbtouch->data = usb_buffer_alloc(udev, type->rept_size, | 1338 | usbtouch->data = usb_alloc_coherent(udev, type->rept_size, |
1339 | GFP_KERNEL, &usbtouch->data_dma); | 1339 | GFP_KERNEL, &usbtouch->data_dma); |
1340 | if (!usbtouch->data) | 1340 | if (!usbtouch->data) |
1341 | goto out_free; | 1341 | goto out_free; |
1342 | 1342 | ||